* [PATCH 02/19] dtc: upgrade 1.4.7 -> 1.5.0
2019-04-15 10:54 [PATCH 01/19] gobject-introspection: update to 1.60.1 Alexander Kanavin
@ 2019-04-15 10:54 ` Alexander Kanavin
2019-04-15 10:54 ` [PATCH 03/19] webkitgtk: update to 2.24.0 Alexander Kanavin
` (17 subsequent siblings)
18 siblings, 0 replies; 25+ messages in thread
From: Alexander Kanavin @ 2019-04-15 10:54 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-kernel/dtc/dtc.inc | 2 ++
meta/recipes-kernel/dtc/{dtc_1.4.7.bb => dtc_1.5.0.bb} | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
rename meta/recipes-kernel/dtc/{dtc_1.4.7.bb => dtc_1.5.0.bb} (81%)
diff --git a/meta/recipes-kernel/dtc/dtc.inc b/meta/recipes-kernel/dtc/dtc.inc
index 7a923bf5206..0650e3c82e6 100644
--- a/meta/recipes-kernel/dtc/dtc.inc
+++ b/meta/recipes-kernel/dtc/dtc.inc
@@ -12,6 +12,8 @@ UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
EXTRA_OEMAKE='NO_PYTHON=1 PREFIX="${prefix}" LIBDIR="${libdir}" DESTDIR="${D}"'
+inherit pkgconfig
+
S = "${WORKDIR}/git"
do_install () {
diff --git a/meta/recipes-kernel/dtc/dtc_1.4.7.bb b/meta/recipes-kernel/dtc/dtc_1.5.0.bb
similarity index 81%
rename from meta/recipes-kernel/dtc/dtc_1.4.7.bb
rename to meta/recipes-kernel/dtc/dtc_1.5.0.bb
index 6ce462a7f49..a9c131706ce 100644
--- a/meta/recipes-kernel/dtc/dtc_1.4.7.bb
+++ b/meta/recipes-kernel/dtc/dtc_1.5.0.bb
@@ -3,7 +3,7 @@ require dtc.inc
LIC_FILES_CHKSUM = "file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c"
-SRCREV = "88f18909db731a627456f26d779445f84e449536"
+SRCREV = "d37f6b20107e952064e3f77e9d6915a9c09d10a6"
S = "${WORKDIR}/git"
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 03/19] webkitgtk: update to 2.24.0
2019-04-15 10:54 [PATCH 01/19] gobject-introspection: update to 1.60.1 Alexander Kanavin
2019-04-15 10:54 ` [PATCH 02/19] dtc: upgrade 1.4.7 -> 1.5.0 Alexander Kanavin
@ 2019-04-15 10:54 ` Alexander Kanavin
2019-04-15 10:54 ` [PATCH 04/19] libdazzle: update to 3.32.1 Alexander Kanavin
` (16 subsequent siblings)
18 siblings, 0 replies; 25+ messages in thread
From: Alexander Kanavin @ 2019-04-15 10:54 UTC (permalink / raw)
To: openembedded-core
Drop bad_optional_access.patch, as the code it tweaks has
been removed upstream.
Rebase other patches.
Add an option for jpeg2000 support.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../webkitgtk/0001-Fix-build-with-musl.patch | 12 +++---
...tings-so-that-gtkdoc-generation-work.patch | 37 +++++++++----------
...acros-Append-to-I-and-not-to-isystem.patch | 32 ++++++++--------
.../webkitgtk/bad_optional_access.patch | 35 ------------------
...ebkitgtk_2.22.7.bb => webkitgtk_2.24.0.bb} | 6 +--
5 files changed, 42 insertions(+), 80 deletions(-)
delete mode 100644 meta/recipes-sato/webkit/webkitgtk/bad_optional_access.patch
rename meta/recipes-sato/webkit/{webkitgtk_2.22.7.bb => webkitgtk_2.24.0.bb} (96%)
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
index d9a18e0ce93..0c145c7ebd7 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
@@ -1,4 +1,4 @@
-From 322966273a8e085829261a397af37de0fbf51aad Mon Sep 17 00:00:00 2001
+From c4d4d9f1aa74addefdad40294cf16d9e0b3dd6ec Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 6 Oct 2017 17:00:08 +0300
Subject: [PATCH] Fix build with musl
@@ -12,7 +12,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h
-index 836d755..7665d25 100644
+index 823964c2..00841146 100644
--- a/Source/JavaScriptCore/runtime/MachineContext.h
+++ b/Source/JavaScriptCore/runtime/MachineContext.h
@@ -188,7 +188,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext)
@@ -61,12 +61,12 @@ index 836d755..7665d25 100644
// The following sequence depends on glibc's sys/ucontext.h.
#if CPU(X86)
diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
-index a841946..1e5c7dd 100644
+index 34f7cb14..32ad9150 100644
--- a/Source/WTF/wtf/Platform.h
+++ b/Source/WTF/wtf/Platform.h
-@@ -701,7 +701,7 @@
- #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
- #endif
+@@ -714,7 +714,7 @@
+
+ #endif /* OS(DARWIN) */
-#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
+#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__linux__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch
index 83fd5129a01..664cea9c759 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch
@@ -1,8 +1,8 @@
-From 9b09974003097c9a408bbeea568996768efe705b Mon Sep 17 00:00:00 2001
+From d3796ad1a19233ee5d3492a5560d7ede882f89cf Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 11 Aug 2016 17:13:51 +0300
-Subject: [PATCH 05/10] Tweak gtkdoc settings so that gtkdoc generation works
- under OpenEmbedded build system
+Subject: [PATCH] Tweak gtkdoc settings so that gtkdoc generation works under
+ OpenEmbedded build system
This requires setting a few environment variables so that the transient
binary is build and linked correctly, and disabling the tweaks to RUN
@@ -12,28 +12,28 @@ Upstream-Status: Inappropriate [oe-specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
- Source/PlatformGTK.cmake | 2 +-
- Tools/gtk/gtkdoc.py | 4 ++--
+ Source/cmake/GtkDoc.cmake | 2 +-
+ Tools/gtkdoc/gtkdoc.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
-diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake
-index 50b5393..7a31db5 100644
---- a/Source/PlatformGTK.cmake
-+++ b/Source/PlatformGTK.cmake
-@@ -24,7 +24,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args)
+diff --git a/Source/cmake/GtkDoc.cmake b/Source/cmake/GtkDoc.cmake
+index 2ee05550..6cb6313d 100644
+--- a/Source/cmake/GtkDoc.cmake
++++ b/Source/cmake/GtkDoc.cmake
+@@ -4,7 +4,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args)
add_custom_command(
OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}"
DEPENDS ${DocumentationDependencies}
-- COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc ${_extra_args}
-+ COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LD=${CMAKE_C_COMPILER}" "LDFLAGS=${CMAKE_C_LINK_FLAGS}" "RUN=${CMAKE_BINARY_DIR}/gtkdoc-qemuwrapper" ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc -v ${_extra_args}
+- COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args}
++ COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LD=${CMAKE_C_COMPILER}" "LDFLAGS=${CMAKE_C_LINK_FLAGS}" "RUN=${CMAKE_BINARY_DIR}/gtkdoc-qemuwrapper" ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args}
COMMAND touch ${_stamp_name}
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
VERBATIM
-diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py
-index 03c8e8e..34fbaff 100644
---- a/Tools/gtk/gtkdoc.py
-+++ b/Tools/gtk/gtkdoc.py
-@@ -318,9 +318,9 @@ class GTKDoc(object):
+diff --git a/Tools/gtkdoc/gtkdoc.py b/Tools/gtkdoc/gtkdoc.py
+index 81ee8cdc..3e11c2f0 100644
+--- a/Tools/gtkdoc/gtkdoc.py
++++ b/Tools/gtkdoc/gtkdoc.py
+@@ -317,9 +317,9 @@ class GTKDoc(object):
additional_ldflags = '%s %s' % (additional_ldflags, arg)
ldflags = ' "-L%s" %s ' % (self.library_path, additional_ldflags) + ldflags
current_ld_library_path = env.get('LD_LIBRARY_PATH')
@@ -45,6 +45,3 @@ index 03c8e8e..34fbaff 100644
env['LD_LIBRARY_PATH'] = self.library_path
if ldflags:
---
-2.15.1
-
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch b/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
index b31026448c3..e71905d26a1 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
@@ -1,4 +1,4 @@
-From e1c6540f7984bd48e1e2d80d965fa82c70de3c20 Mon Sep 17 00:00:00 2001
+From d1634e56a2589ec62325011bf77d480a67123b52 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 17 Apr 2016 12:35:41 -0700
Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem
@@ -28,10 +28,10 @@ Upstream-Status: Pending
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
-index b3c7e0b..88446de 100644
+index 87153e35..cd0beed4 100644
--- a/Source/JavaScriptCore/shell/CMakeLists.txt
+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
-@@ -35,7 +35,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
+@@ -36,7 +36,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES})
include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES} ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES})
@@ -41,10 +41,10 @@ index b3c7e0b..88446de 100644
target_link_libraries(jsc ${JSC_LIBRARIES})
diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
-index f7d8d70a..3c27b8bc 100644
+index e0dd9cd9..a2997f3e 100644
--- a/Source/WebCore/PlatformGTK.cmake
+++ b/Source/WebCore/PlatformGTK.cmake
-@@ -157,7 +157,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
+@@ -164,7 +164,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
target_include_directories(WebCorePlatformGTK2 PRIVATE
${WebCore_INCLUDE_DIRECTORIES}
)
@@ -53,7 +53,7 @@ index f7d8d70a..3c27b8bc 100644
${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
${GTK2_INCLUDE_DIRS}
${GDK2_INCLUDE_DIRS}
-@@ -183,7 +183,7 @@ add_dependencies(WebCorePlatformGTK WebCore)
+@@ -190,7 +190,7 @@ add_dependencies(WebCorePlatformGTK WebCore)
target_include_directories(WebCorePlatformGTK PRIVATE
${WebCore_INCLUDE_DIRECTORIES}
)
@@ -62,7 +62,7 @@ index f7d8d70a..3c27b8bc 100644
${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
${GTK_INCLUDE_DIRS}
${GDK_INCLUDE_DIRS}
-@@ -199,7 +199,7 @@ include_directories(
+@@ -206,7 +206,7 @@ include_directories(
"${WEBCORE_DIR}/bindings/gobject/"
)
@@ -72,10 +72,10 @@ index f7d8d70a..3c27b8bc 100644
)
diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
-index 8c6ebb5..772c243 100644
+index 693bbdfe..20e3802f 100644
--- a/Source/WebKit/PlatformGTK.cmake
+++ b/Source/WebKit/PlatformGTK.cmake
-@@ -655,7 +655,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
+@@ -664,7 +664,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
target_include_directories(WebKitPluginProcess2 PRIVATE
${WebKitCommonIncludeDirectories}
)
@@ -85,10 +85,10 @@ index 8c6ebb5..772c243 100644
${GTK2_INCLUDE_DIRS}
${GDK2_INCLUDE_DIRS}
diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
-index a1e7e8f..ce24274 100644
+index 6d58d57e..976e2362 100644
--- a/Source/cmake/WebKitMacros.cmake
+++ b/Source/cmake/WebKitMacros.cmake
-@@ -134,7 +134,7 @@ macro(WEBKIT_FRAMEWORK _target)
+@@ -152,7 +152,7 @@ macro(WEBKIT_FRAMEWORK _target)
${${_target}_SOURCES}
)
target_include_directories(${_target} PUBLIC "$<BUILD_INTERFACE:${${_target}_INCLUDE_DIRECTORIES}>")
@@ -98,10 +98,10 @@ index a1e7e8f..ce24274 100644
target_link_libraries(${_target} ${${_target}_LIBRARIES})
set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}")
diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt
-index dc2b61e..0128dca 100644
+index a0d32059..f259ade2 100644
--- a/Tools/MiniBrowser/gtk/CMakeLists.txt
+++ b/Tools/MiniBrowser/gtk/CMakeLists.txt
-@@ -57,7 +57,7 @@ endif ()
+@@ -59,7 +59,7 @@ endif ()
add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6)
include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
@@ -111,10 +111,10 @@ index dc2b61e..0128dca 100644
target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake
-index 4aef695..a14b163 100644
+index 8dd0e146..d037fc35 100644
--- a/Tools/TestWebKitAPI/PlatformGTK.cmake
+++ b/Tools/TestWebKitAPI/PlatformGTK.cmake
-@@ -20,7 +20,7 @@ include_directories(
+@@ -22,7 +22,7 @@ include_directories(
${WEBKIT_DIR}/UIProcess/API/gtk
)
@@ -122,4 +122,4 @@ index 4aef695..a14b163 100644
+include_directories(
${GDK3_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
- ${GTK3_INCLUDE_DIRS}
+ ${GSTREAMER_INCLUDE_DIRS}
diff --git a/meta/recipes-sato/webkit/webkitgtk/bad_optional_access.patch b/meta/recipes-sato/webkit/webkitgtk/bad_optional_access.patch
deleted file mode 100644
index 9d0d50b79e5..00000000000
--- a/meta/recipes-sato/webkit/webkitgtk/bad_optional_access.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-unbreak build with libc++ 7
-
-based on
-https://svnweb.freebsd.org/ports/head/www/webkit2-gtk3/files/patch-Source_WTF_wtf_Optional.h?view=markup&pathrev=477812
-
-Fixes
-
-/usr/include/c++/v1/optional:171:29: error: redefinition of 'bad_optional_access'
-class _LIBCPP_EXCEPTION_ABI bad_optional_access
- ^
-DerivedSources/ForwardingHeaders/wtf/Optional.h:295:7: note: previous definition is here
-class bad_optional_access : public std::logic_error {
- ^
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/Source/WTF/wtf/Optional.h
-+++ b/Source/WTF/wtf/Optional.h
-@@ -276,14 +276,14 @@ struct nullopt_t
- };
- constexpr nullopt_t nullopt{nullopt_t::init()};
-
--
-+# if !defined(_LIBCPP_VERSION) || _LIBCPP_VERSION < 7000
- // 20.5.8, class bad_optional_access
- class bad_optional_access : public std::logic_error {
- public:
- explicit bad_optional_access(const std::string& what_arg) : std::logic_error{what_arg} {}
- explicit bad_optional_access(const char* what_arg) : std::logic_error{what_arg} {}
- };
--
-+# endif // _LIBCPP_VERSION < 7000
-
- template <class T>
- union storage_t
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.22.7.bb b/meta/recipes-sato/webkit/webkitgtk_2.24.0.bb
similarity index 96%
rename from meta/recipes-sato/webkit/webkitgtk_2.22.7.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.24.0.bb
index 301bf10ceac..4a82dae9ef6 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.22.7.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.24.0.bb
@@ -20,11 +20,10 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
file://0001-Fix-build-with-musl.patch \
file://detect-gstreamer-gl.patch \
- file://bad_optional_access.patch \
"
-SRC_URI[md5sum] = "47386c10a9c3975f933c85404f35ff3b"
-SRC_URI[sha256sum] = "4be6f7d605cd0a690fd26e8aa83b089a33ad9d419148eafcfb60580dd2af30ff"
+SRC_URI[md5sum] = "576d69c598b3e36c73441052d02466de"
+SRC_URI[sha256sum] = "2e4ad1503fe482ceb5a83cf70ac9cd42f37eb718555a4d6844fe4c59a9214407"
inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
@@ -56,6 +55,7 @@ PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret"
PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen"
# Source is at https://github.com/google/woff2
PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2"
+PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg"
EXTRA_OECMAKE = " \
-DPORT=GTK \
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 04/19] libdazzle: update to 3.32.1
2019-04-15 10:54 [PATCH 01/19] gobject-introspection: update to 1.60.1 Alexander Kanavin
2019-04-15 10:54 ` [PATCH 02/19] dtc: upgrade 1.4.7 -> 1.5.0 Alexander Kanavin
2019-04-15 10:54 ` [PATCH 03/19] webkitgtk: update to 2.24.0 Alexander Kanavin
@ 2019-04-15 10:54 ` Alexander Kanavin
2019-04-15 10:54 ` [PATCH 05/19] epiphany: update to 3.32.1.2 Alexander Kanavin
` (15 subsequent siblings)
18 siblings, 0 replies; 25+ messages in thread
From: Alexander Kanavin @ 2019-04-15 10:54 UTC (permalink / raw)
To: openembedded-core
Remove a patch as the problem was fixed upstream.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...ine-so-that-gir-compilation-succeeds.patch | 26 -------------------
...ibdazzle_3.30.2.bb => libdazzle_3.32.1.bb} | 5 ++--
2 files changed, 2 insertions(+), 29 deletions(-)
delete mode 100644 meta/recipes-gnome/libdazzle/libdazzle/0001-Add-a-define-so-that-gir-compilation-succeeds.patch
rename meta/recipes-gnome/libdazzle/{libdazzle_3.30.2.bb => libdazzle_3.32.1.bb} (64%)
diff --git a/meta/recipes-gnome/libdazzle/libdazzle/0001-Add-a-define-so-that-gir-compilation-succeeds.patch b/meta/recipes-gnome/libdazzle/libdazzle/0001-Add-a-define-so-that-gir-compilation-succeeds.patch
deleted file mode 100644
index c959d43972f..00000000000
--- a/meta/recipes-gnome/libdazzle/libdazzle/0001-Add-a-define-so-that-gir-compilation-succeeds.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 546d53c3515e8a488a204763437d1fa0917097e5 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Tue, 11 Dec 2018 12:39:30 +0100
-Subject: [PATCH] Add a define so that gir compilation succeeds
-
-For some reason meson 0.49.0 does not anymore pass global arguments to gir compiler.
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- src/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/meson.build b/src/meson.build
-index 6ff8a6a..f0b2887 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -132,7 +132,7 @@ if get_option('with_introspection')
- install_dir_gir: girdir,
- install_dir_typelib: typelibdir,
- export_packages: libdazzle_package,
-- extra_args: [ '--c-include=dazzle.h', '--quiet' ],
-+ extra_args: [ '--c-include=dazzle.h', '--quiet', '-DDAZZLE_COMPILATION' ],
- )
-
- if get_option('with_vapi')
diff --git a/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb b/meta/recipes-gnome/libdazzle/libdazzle_3.32.1.bb
similarity index 64%
rename from meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb
rename to meta/recipes-gnome/libdazzle/libdazzle_3.32.1.bb
index c112857f2c8..dac59f86b31 100644
--- a/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb
+++ b/meta/recipes-gnome/libdazzle/libdazzle_3.32.1.bb
@@ -7,9 +7,8 @@ inherit gnomebase upstream-version-is-even vala distro_features_check gobject-in
DEPENDS = "glib-2.0-native glib-2.0 gtk+3"
-SRC_URI += " file://0001-Add-a-define-so-that-gir-compilation-succeeds.patch"
-SRC_URI[archive.md5sum] = "24e2e1b914a34f5b8868a9507d1f3c4c"
-SRC_URI[archive.sha256sum] = "78770eae9fa15ac5acb9c733d29459330b2540affbf72933119e36dbd90b36d5"
+SRC_URI[archive.md5sum] = "5f6455ebc47e86f63b9579997137f391"
+SRC_URI[archive.sha256sum] = "238da19fdcc3ae9bb0c2d781d099fb8c6ec70c4dd3dffad80d230344ecc3f972"
GIR_MESON_OPTION = 'with_introspection'
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 05/19] epiphany: update to 3.32.1.2
2019-04-15 10:54 [PATCH 01/19] gobject-introspection: update to 1.60.1 Alexander Kanavin
` (2 preceding siblings ...)
2019-04-15 10:54 ` [PATCH 04/19] libdazzle: update to 3.32.1 Alexander Kanavin
@ 2019-04-15 10:54 ` Alexander Kanavin
2019-04-15 20:00 ` Richard Purdie
2019-04-15 10:54 ` [PATCH 06/19] vala: update to 0.44.3 Alexander Kanavin
` (14 subsequent siblings)
18 siblings, 1 reply; 25+ messages in thread
From: Alexander Kanavin @ 2019-04-15 10:54 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../epiphany/{epiphany_3.30.3.bb => epiphany_3.32.1.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/epiphany/{epiphany_3.30.3.bb => epiphany_3.32.1.2.bb} (85%)
diff --git a/meta/recipes-gnome/epiphany/epiphany_3.30.3.bb b/meta/recipes-gnome/epiphany/epiphany_3.32.1.2.bb
similarity index 85%
rename from meta/recipes-gnome/epiphany/epiphany_3.30.3.bb
rename to meta/recipes-gnome/epiphany/epiphany_3.32.1.2.bb
index a64c82f48bf..9641619e3f2 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.30.3.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_3.32.1.2.bb
@@ -13,8 +13,8 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl"
SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
file://0002-help-meson.build-disable-the-use-of-yelp.patch \
"
-SRC_URI[archive.md5sum] = "fd05702b1c9bcb6a0633de54c4a6ccd2"
-SRC_URI[archive.sha256sum] = "76cdb8db6af2da8c3371a73e2dfd5ba64867b5f1e65fa9621f35348a42ff0d17"
+SRC_URI[archive.md5sum] = "93faec353e9f62519859e6164350fd5d"
+SRC_URI[archive.sha256sum] = "a8284fb9bbc8b7914a154a8eac1598c8b59ae421e0d685146fb48198427926be"
EXTRA_OEMESON += " -Ddistributor_name=${DISTRO}"
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 06/19] vala: update to 0.44.3
2019-04-15 10:54 [PATCH 01/19] gobject-introspection: update to 1.60.1 Alexander Kanavin
` (3 preceding siblings ...)
2019-04-15 10:54 ` [PATCH 05/19] epiphany: update to 3.32.1.2 Alexander Kanavin
@ 2019-04-15 10:54 ` Alexander Kanavin
2019-04-17 4:04 ` Khem Raj
2019-04-15 10:54 ` [PATCH 07/19] libdnf: update to 0.28.1 Alexander Kanavin
` (13 subsequent siblings)
18 siblings, 1 reply; 25+ messages in thread
From: Alexander Kanavin @ 2019-04-15 10:54 UTC (permalink / raw)
To: openembedded-core
Remove valadoc-related patches, as upstream added an option to disable it;
adjust the recipe accordingly.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-devtools/vala/vala.inc | 2 +-
.../vala/vala/0001-Disable-valadoc.patch | 32 ---
.../vala/vala/disable-graphviz.patch | 226 ------------------
meta/recipes-devtools/vala/vala_0.42.5.bb | 10 -
meta/recipes-devtools/vala/vala_0.44.3.bb | 8 +
5 files changed, 9 insertions(+), 269 deletions(-)
delete mode 100644 meta/recipes-devtools/vala/vala/0001-Disable-valadoc.patch
delete mode 100644 meta/recipes-devtools/vala/vala/disable-graphviz.patch
delete mode 100644 meta/recipes-devtools/vala/vala_0.42.5.bb
create mode 100644 meta/recipes-devtools/vala/vala_0.44.3.bb
diff --git a/meta/recipes-devtools/vala/vala.inc b/meta/recipes-devtools/vala/vala.inc
index f680640ca68..703ed1aa8d0 100644
--- a/meta/recipes-devtools/vala/vala.inc
+++ b/meta/recipes-devtools/vala/vala.inc
@@ -37,7 +37,7 @@ EOF
chmod +x ${B}/vapigen-wrapper
}
-EXTRA_OECONF += " --disable-graphviz"
+EXTRA_OECONF += " --disable-valadoc"
# Vapigen wrapper needs to be available system-wide, because it will be used
# to build vapi files from all other packages with vala support
diff --git a/meta/recipes-devtools/vala/vala/0001-Disable-valadoc.patch b/meta/recipes-devtools/vala/vala/0001-Disable-valadoc.patch
deleted file mode 100644
index 9b27b7fd14a..00000000000
--- a/meta/recipes-devtools/vala/vala/0001-Disable-valadoc.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b6ca3876e233c724fd460c1579abc4ab63c8d01e Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Wed, 4 Oct 2017 15:23:08 +0300
-Subject: [PATCH] Disable valadoc
-
-Valadoc is a documentation generator for Vala sources, which was
-recently merged into the main vala source tree. Unsurprisingly,
-it's broken in cross-compile environment in multiple ways,
-so let's fix it some other time.
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- Makefile.am | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index e5dc0cc..813b3fc 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -13,8 +13,6 @@ SUBDIRS = \
- doc \
- gobject-introspection \
- vapigen \
-- libvaladoc \
-- valadoc \
- $(NULL)
-
- if ENABLE_UNVERSIONED
---
-2.14.1
-
diff --git a/meta/recipes-devtools/vala/vala/disable-graphviz.patch b/meta/recipes-devtools/vala/vala/disable-graphviz.patch
deleted file mode 100644
index e521bc854b3..00000000000
--- a/meta/recipes-devtools/vala/vala/disable-graphviz.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-From b2723ff18b70c67c8a7fab5375a7f3c442d49790 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Wed, 6 Sep 2017 18:52:55 +0200
-Subject: [PATCH] libvaladoc: Allow disabling the graphviz dependency of
-
- valadoc
-
-https://bugzilla.gnome.org/show_bug.cgi?id=787375
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-Upstream-Status: Submitted [bugzilla link above]
-
----
- configure.ac | 60 ++++++++++++++-------------
- libvaladoc/Makefile.am | 25 ++++++++---
- libvaladoc/html/basicdoclet.vala | 8 ++++
- libvaladoc/html/htmlmarkupwriter.vala | 4 ++
- 4 files changed, 63 insertions(+), 34 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 730c72d..af81986 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -119,34 +119,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
- AC_SUBST(GMODULE_CFLAGS)
- AC_SUBST(GMODULE_LIBS)
-
--PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
--AC_MSG_CHECKING([for CGRAPH])
--cgraph_tmp_LIBADD="$LIBADD"
--cgraph_tmp_CFLAGS="$CFLAGS"
--LIBADD="$LIBADD $LIBGVC_LIBS"
--CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
--AC_RUN_IFELSE(
-- [AC_LANG_SOURCE([
-- #include <gvc.h>
--
-- int main(void) {
-- #ifdef WITH_CGRAPH
-- return 0;
-- #else
-- return -1;
-- #endif
-- }
-- ])], [
-- AC_MSG_RESULT([yes])
-- VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
-- have_cgraph=yes
-- ], [
-- AC_MSG_RESULT([no])
-- have_cgraph=no
-- ]
--)
--LIBADD="$cgraph_tmp_LIBADD"
--CFLAGS="$cgraph_tmp_CFLAGS"
-+AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes)
-+if test x$enable_graphviz = xyes; then
-+ PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
-+ AC_MSG_CHECKING([for CGRAPH])
-+ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ"
-+ cgraph_tmp_LIBADD="$LIBADD"
-+ cgraph_tmp_CFLAGS="$CFLAGS"
-+ LIBADD="$LIBADD $LIBGVC_LIBS"
-+ CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
-+ AC_RUN_IFELSE(
-+ [AC_LANG_SOURCE([
-+ #include <gvc.h>
-+ int main(void) {
-+ #ifdef WITH_CGRAPH
-+ return 0;
-+ #else
-+ return -1;
-+ #endif
-+ }
-+ ])], [
-+ AC_MSG_RESULT([yes])
-+ VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
-+ have_cgraph=yes
-+ ], [
-+ AC_MSG_RESULT([no])
-+ have_cgraph=no
-+ ]
-+ )
-+ LIBADD="$cgraph_tmp_LIBADD"
-+ CFLAGS="$cgraph_tmp_CFLAGS"
-+fi
-+AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes)
- AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes")
-
- AC_PATH_PROG([XSLTPROC], [xsltproc], :)
-diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am
-index f3f790e..3c5dc4c 100644
---- a/libvaladoc/Makefile.am
-+++ b/libvaladoc/Makefile.am
-@@ -128,10 +128,6 @@ libvaladoc_la_VALASOURCES = \
- content/tablerow.vala \
- content/taglet.vala \
- content/text.vala \
-- charts/chart.vala \
-- charts/chartfactory.vala \
-- charts/hierarchychart.vala \
-- charts/simplechartfactory.vala \
- parser/manyrule.vala \
- parser/oneofrule.vala \
- parser/optionalrule.vala \
-@@ -158,13 +154,24 @@ libvaladoc_la_VALASOURCES = \
- highlighter/codetoken.vala \
- highlighter/highlighter.vala \
- html/basicdoclet.vala \
-- html/htmlchartfactory.vala \
- html/linkhelper.vala \
- html/cssclassresolver.vala \
- html/htmlmarkupwriter.vala \
- html/htmlrenderer.vala \
- $(NULL)
-
-+if ENABLE_GRAPHVIZ
-+libvaladoc_la_VALASOURCES += \
-+ charts/chart.vala \
-+ charts/chartfactory.vala \
-+ charts/hierarchychart.vala \
-+ charts/simplechartfactory.vala \
-+ html/htmlchartfactory.vala \
-+ $(NULL)
-+
-+LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc
-+endif
-+
- libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \
- libvaladoc.vala.stamp \
- $(libvaladoc_la_VALASOURCES:.vala=.c) \
-@@ -184,11 +191,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES)
- --library valadoc \
- --vapi valadoc@PACKAGE_SUFFIX@.vapi \
- --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \
-- --vapidir $(top_srcdir)/vapi --pkg libgvc \
- --vapidir $(top_srcdir)/gee --pkg gee \
- --vapidir $(top_srcdir)/vala --pkg vala \
- --vapidir $(top_srcdir)/ccode --pkg ccode \
- --vapidir $(top_srcdir)/codegen --pkg codegen \
-+ $(LIBGVC_PKG) \
- --pkg config \
- $(filter %.vala %.c,$^)
- touch $@
-@@ -217,6 +224,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc
-
- valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc
- cp $< $@
-+if !ENABLE_GRAPHVIZ
-+ sed -i "s/libgvc //g" $@
-+endif
-
- vapidir = $(datadir)/vala/vapi
- dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi
-@@ -224,6 +234,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps
-
- valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps
- cp $< $@
-+if !ENABLE_GRAPHVIZ
-+ sed -i "s/libgvc//g" $@
-+endif
-
- EXTRA_DIST = \
- $(libvaladoc_la_VALASOURCES) \
-diff --git a/libvaladoc/html/basicdoclet.vala b/libvaladoc/html/basicdoclet.vala
-index 192e488..ec09602 100644
---- a/libvaladoc/html/basicdoclet.vala
-+++ b/libvaladoc/html/basicdoclet.vala
-@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
- protected HtmlRenderer _renderer;
- protected Html.MarkupWriter writer;
- protected Html.CssClassResolver cssresolver;
-+#if HAVE_GRAPHVIZ
- protected Charts.Factory image_factory;
-+#else
-+ protected void* image_factory;
-+#endif
- protected ErrorReporter reporter;
- protected string package_list_link = "../index.html";
-
-@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
- this.linker = new LinkHelper ();
-
- _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver);
-+#if HAVE_GRAPHVIZ
- this.image_factory = new SimpleChartFactory (settings, linker);
-+#endif
- }
-
-
-@@ -1026,6 +1032,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
- }
-
- protected void write_image_block (Api.Node element) {
-+#if HAVE_GRAPHVIZ
- if (element is Class || element is Interface || element is Struct) {
- unowned string format = (settings.use_svg_images ? "svg" : "png");
- var chart = new Charts.Hierarchy (image_factory, element);
-@@ -1045,6 +1052,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
- this.get_img_path_html (element, format)});
- writer.add_usemap (chart);
- }
-+#endif
- }
-
- public void write_namespace_content (Namespace node, Api.Node? parent) {
-diff --git a/libvaladoc/html/htmlmarkupwriter.vala b/libvaladoc/html/htmlmarkupwriter.vala
-index 5aa4afd..e79b0b8 100644
---- a/libvaladoc/html/htmlmarkupwriter.vala
-+++ b/libvaladoc/html/htmlmarkupwriter.vala
-@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter {
- }
- }
-
-+#if HAVE_GRAPHVIZ
- public unowned MarkupWriter add_usemap (Charts.Chart chart) {
- string? buf = (string?) chart.write_buffer ("cmapx");
- if (buf != null) {
- raw_text ("\n");
- raw_text ((!) buf);
- }
-+#else
-+ public unowned MarkupWriter add_usemap (void* chart) {
-+#endif
-
- return this;
- }
diff --git a/meta/recipes-devtools/vala/vala_0.42.5.bb b/meta/recipes-devtools/vala/vala_0.42.5.bb
deleted file mode 100644
index eea17661604..00000000000
--- a/meta/recipes-devtools/vala/vala_0.42.5.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-SRC_URI += " file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch \
- file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \
- file://disable-graphviz.patch \
- file://0001-Disable-valadoc.patch \
-"
-
-SRC_URI[md5sum] = "d204eb4fa210995e731e2a9a01c8c772"
-SRC_URI[sha256sum] = "8c33b4abc0573d364781bbfe54a1668ed34956902e471191a31cf05dc87c6e12"
diff --git a/meta/recipes-devtools/vala/vala_0.44.3.bb b/meta/recipes-devtools/vala/vala_0.44.3.bb
new file mode 100644
index 00000000000..fe6a5fcdcbd
--- /dev/null
+++ b/meta/recipes-devtools/vala/vala_0.44.3.bb
@@ -0,0 +1,8 @@
+require ${BPN}.inc
+
+SRC_URI += "file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch \
+ file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \
+ "
+
+SRC_URI[md5sum] = "25f97c1b46ae0b60b5cc49cbc044eca2"
+SRC_URI[sha256sum] = "8553b422484af88be1685d8b47f7b0df36ae4477c3e77e89ab22276ffed1eae9"
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH 06/19] vala: update to 0.44.3
2019-04-15 10:54 ` [PATCH 06/19] vala: update to 0.44.3 Alexander Kanavin
@ 2019-04-17 4:04 ` Khem Raj
0 siblings, 0 replies; 25+ messages in thread
From: Khem Raj @ 2019-04-17 4:04 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: Patches and discussions about the oe-core layer
This means we need to update xfce4-vala recipe at same time
see
https://errors.yoctoproject.org/Errors/Details/237659/
On Mon, Apr 15, 2019 at 3:56 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> Remove valadoc-related patches, as upstream added an option to disable it;
> adjust the recipe accordingly.
>
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
> meta/recipes-devtools/vala/vala.inc | 2 +-
> .../vala/vala/0001-Disable-valadoc.patch | 32 ---
> .../vala/vala/disable-graphviz.patch | 226 ------------------
> meta/recipes-devtools/vala/vala_0.42.5.bb | 10 -
> meta/recipes-devtools/vala/vala_0.44.3.bb | 8 +
> 5 files changed, 9 insertions(+), 269 deletions(-)
> delete mode 100644 meta/recipes-devtools/vala/vala/0001-Disable-valadoc.patch
> delete mode 100644 meta/recipes-devtools/vala/vala/disable-graphviz.patch
> delete mode 100644 meta/recipes-devtools/vala/vala_0.42.5.bb
> create mode 100644 meta/recipes-devtools/vala/vala_0.44.3.bb
>
> diff --git a/meta/recipes-devtools/vala/vala.inc b/meta/recipes-devtools/vala/vala.inc
> index f680640ca68..703ed1aa8d0 100644
> --- a/meta/recipes-devtools/vala/vala.inc
> +++ b/meta/recipes-devtools/vala/vala.inc
> @@ -37,7 +37,7 @@ EOF
> chmod +x ${B}/vapigen-wrapper
> }
>
> -EXTRA_OECONF += " --disable-graphviz"
> +EXTRA_OECONF += " --disable-valadoc"
>
> # Vapigen wrapper needs to be available system-wide, because it will be used
> # to build vapi files from all other packages with vala support
> diff --git a/meta/recipes-devtools/vala/vala/0001-Disable-valadoc.patch b/meta/recipes-devtools/vala/vala/0001-Disable-valadoc.patch
> deleted file mode 100644
> index 9b27b7fd14a..00000000000
> --- a/meta/recipes-devtools/vala/vala/0001-Disable-valadoc.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -From b6ca3876e233c724fd460c1579abc4ab63c8d01e Mon Sep 17 00:00:00 2001
> -From: Alexander Kanavin <alex.kanavin@gmail.com>
> -Date: Wed, 4 Oct 2017 15:23:08 +0300
> -Subject: [PATCH] Disable valadoc
> -
> -Valadoc is a documentation generator for Vala sources, which was
> -recently merged into the main vala source tree. Unsurprisingly,
> -it's broken in cross-compile environment in multiple ways,
> -so let's fix it some other time.
> -
> -Upstream-Status: Inappropriate [oe-core specific]
> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ----
> - Makefile.am | 2 --
> - 1 file changed, 2 deletions(-)
> -
> -diff --git a/Makefile.am b/Makefile.am
> -index e5dc0cc..813b3fc 100644
> ---- a/Makefile.am
> -+++ b/Makefile.am
> -@@ -13,8 +13,6 @@ SUBDIRS = \
> - doc \
> - gobject-introspection \
> - vapigen \
> -- libvaladoc \
> -- valadoc \
> - $(NULL)
> -
> - if ENABLE_UNVERSIONED
> ---
> -2.14.1
> -
> diff --git a/meta/recipes-devtools/vala/vala/disable-graphviz.patch b/meta/recipes-devtools/vala/vala/disable-graphviz.patch
> deleted file mode 100644
> index e521bc854b3..00000000000
> --- a/meta/recipes-devtools/vala/vala/disable-graphviz.patch
> +++ /dev/null
> @@ -1,226 +0,0 @@
> -From b2723ff18b70c67c8a7fab5375a7f3c442d49790 Mon Sep 17 00:00:00 2001
> -From: Rico Tzschichholz <ricotz@ubuntu.com>
> -Date: Wed, 6 Sep 2017 18:52:55 +0200
> -Subject: [PATCH] libvaladoc: Allow disabling the graphviz dependency of
> -
> - valadoc
> -
> -https://bugzilla.gnome.org/show_bug.cgi?id=787375
> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> -Upstream-Status: Submitted [bugzilla link above]
> -
> ----
> - configure.ac | 60 ++++++++++++++-------------
> - libvaladoc/Makefile.am | 25 ++++++++---
> - libvaladoc/html/basicdoclet.vala | 8 ++++
> - libvaladoc/html/htmlmarkupwriter.vala | 4 ++
> - 4 files changed, 63 insertions(+), 34 deletions(-)
> -
> -diff --git a/configure.ac b/configure.ac
> -index 730c72d..af81986 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -119,34 +119,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
> - AC_SUBST(GMODULE_CFLAGS)
> - AC_SUBST(GMODULE_LIBS)
> -
> --PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
> --AC_MSG_CHECKING([for CGRAPH])
> --cgraph_tmp_LIBADD="$LIBADD"
> --cgraph_tmp_CFLAGS="$CFLAGS"
> --LIBADD="$LIBADD $LIBGVC_LIBS"
> --CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
> --AC_RUN_IFELSE(
> -- [AC_LANG_SOURCE([
> -- #include <gvc.h>
> --
> -- int main(void) {
> -- #ifdef WITH_CGRAPH
> -- return 0;
> -- #else
> -- return -1;
> -- #endif
> -- }
> -- ])], [
> -- AC_MSG_RESULT([yes])
> -- VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
> -- have_cgraph=yes
> -- ], [
> -- AC_MSG_RESULT([no])
> -- have_cgraph=no
> -- ]
> --)
> --LIBADD="$cgraph_tmp_LIBADD"
> --CFLAGS="$cgraph_tmp_CFLAGS"
> -+AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes)
> -+if test x$enable_graphviz = xyes; then
> -+ PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
> -+ AC_MSG_CHECKING([for CGRAPH])
> -+ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ"
> -+ cgraph_tmp_LIBADD="$LIBADD"
> -+ cgraph_tmp_CFLAGS="$CFLAGS"
> -+ LIBADD="$LIBADD $LIBGVC_LIBS"
> -+ CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
> -+ AC_RUN_IFELSE(
> -+ [AC_LANG_SOURCE([
> -+ #include <gvc.h>
> -+ int main(void) {
> -+ #ifdef WITH_CGRAPH
> -+ return 0;
> -+ #else
> -+ return -1;
> -+ #endif
> -+ }
> -+ ])], [
> -+ AC_MSG_RESULT([yes])
> -+ VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
> -+ have_cgraph=yes
> -+ ], [
> -+ AC_MSG_RESULT([no])
> -+ have_cgraph=no
> -+ ]
> -+ )
> -+ LIBADD="$cgraph_tmp_LIBADD"
> -+ CFLAGS="$cgraph_tmp_CFLAGS"
> -+fi
> -+AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes)
> - AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes")
> -
> - AC_PATH_PROG([XSLTPROC], [xsltproc], :)
> -diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am
> -index f3f790e..3c5dc4c 100644
> ---- a/libvaladoc/Makefile.am
> -+++ b/libvaladoc/Makefile.am
> -@@ -128,10 +128,6 @@ libvaladoc_la_VALASOURCES = \
> - content/tablerow.vala \
> - content/taglet.vala \
> - content/text.vala \
> -- charts/chart.vala \
> -- charts/chartfactory.vala \
> -- charts/hierarchychart.vala \
> -- charts/simplechartfactory.vala \
> - parser/manyrule.vala \
> - parser/oneofrule.vala \
> - parser/optionalrule.vala \
> -@@ -158,13 +154,24 @@ libvaladoc_la_VALASOURCES = \
> - highlighter/codetoken.vala \
> - highlighter/highlighter.vala \
> - html/basicdoclet.vala \
> -- html/htmlchartfactory.vala \
> - html/linkhelper.vala \
> - html/cssclassresolver.vala \
> - html/htmlmarkupwriter.vala \
> - html/htmlrenderer.vala \
> - $(NULL)
> -
> -+if ENABLE_GRAPHVIZ
> -+libvaladoc_la_VALASOURCES += \
> -+ charts/chart.vala \
> -+ charts/chartfactory.vala \
> -+ charts/hierarchychart.vala \
> -+ charts/simplechartfactory.vala \
> -+ html/htmlchartfactory.vala \
> -+ $(NULL)
> -+
> -+LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc
> -+endif
> -+
> - libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \
> - libvaladoc.vala.stamp \
> - $(libvaladoc_la_VALASOURCES:.vala=.c) \
> -@@ -184,11 +191,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES)
> - --library valadoc \
> - --vapi valadoc@PACKAGE_SUFFIX@.vapi \
> - --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \
> -- --vapidir $(top_srcdir)/vapi --pkg libgvc \
> - --vapidir $(top_srcdir)/gee --pkg gee \
> - --vapidir $(top_srcdir)/vala --pkg vala \
> - --vapidir $(top_srcdir)/ccode --pkg ccode \
> - --vapidir $(top_srcdir)/codegen --pkg codegen \
> -+ $(LIBGVC_PKG) \
> - --pkg config \
> - $(filter %.vala %.c,$^)
> - touch $@
> -@@ -217,6 +224,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc
> -
> - valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc
> - cp $< $@
> -+if !ENABLE_GRAPHVIZ
> -+ sed -i "s/libgvc //g" $@
> -+endif
> -
> - vapidir = $(datadir)/vala/vapi
> - dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi
> -@@ -224,6 +234,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps
> -
> - valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps
> - cp $< $@
> -+if !ENABLE_GRAPHVIZ
> -+ sed -i "s/libgvc//g" $@
> -+endif
> -
> - EXTRA_DIST = \
> - $(libvaladoc_la_VALASOURCES) \
> -diff --git a/libvaladoc/html/basicdoclet.vala b/libvaladoc/html/basicdoclet.vala
> -index 192e488..ec09602 100644
> ---- a/libvaladoc/html/basicdoclet.vala
> -+++ b/libvaladoc/html/basicdoclet.vala
> -@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
> - protected HtmlRenderer _renderer;
> - protected Html.MarkupWriter writer;
> - protected Html.CssClassResolver cssresolver;
> -+#if HAVE_GRAPHVIZ
> - protected Charts.Factory image_factory;
> -+#else
> -+ protected void* image_factory;
> -+#endif
> - protected ErrorReporter reporter;
> - protected string package_list_link = "../index.html";
> -
> -@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
> - this.linker = new LinkHelper ();
> -
> - _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver);
> -+#if HAVE_GRAPHVIZ
> - this.image_factory = new SimpleChartFactory (settings, linker);
> -+#endif
> - }
> -
> -
> -@@ -1026,6 +1032,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
> - }
> -
> - protected void write_image_block (Api.Node element) {
> -+#if HAVE_GRAPHVIZ
> - if (element is Class || element is Interface || element is Struct) {
> - unowned string format = (settings.use_svg_images ? "svg" : "png");
> - var chart = new Charts.Hierarchy (image_factory, element);
> -@@ -1045,6 +1052,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
> - this.get_img_path_html (element, format)});
> - writer.add_usemap (chart);
> - }
> -+#endif
> - }
> -
> - public void write_namespace_content (Namespace node, Api.Node? parent) {
> -diff --git a/libvaladoc/html/htmlmarkupwriter.vala b/libvaladoc/html/htmlmarkupwriter.vala
> -index 5aa4afd..e79b0b8 100644
> ---- a/libvaladoc/html/htmlmarkupwriter.vala
> -+++ b/libvaladoc/html/htmlmarkupwriter.vala
> -@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter {
> - }
> - }
> -
> -+#if HAVE_GRAPHVIZ
> - public unowned MarkupWriter add_usemap (Charts.Chart chart) {
> - string? buf = (string?) chart.write_buffer ("cmapx");
> - if (buf != null) {
> - raw_text ("\n");
> - raw_text ((!) buf);
> - }
> -+#else
> -+ public unowned MarkupWriter add_usemap (void* chart) {
> -+#endif
> -
> - return this;
> - }
> diff --git a/meta/recipes-devtools/vala/vala_0.42.5.bb b/meta/recipes-devtools/vala/vala_0.42.5.bb
> deleted file mode 100644
> index eea17661604..00000000000
> --- a/meta/recipes-devtools/vala/vala_0.42.5.bb
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -require ${BPN}.inc
> -
> -SRC_URI += " file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch \
> - file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \
> - file://disable-graphviz.patch \
> - file://0001-Disable-valadoc.patch \
> -"
> -
> -SRC_URI[md5sum] = "d204eb4fa210995e731e2a9a01c8c772"
> -SRC_URI[sha256sum] = "8c33b4abc0573d364781bbfe54a1668ed34956902e471191a31cf05dc87c6e12"
> diff --git a/meta/recipes-devtools/vala/vala_0.44.3.bb b/meta/recipes-devtools/vala/vala_0.44.3.bb
> new file mode 100644
> index 00000000000..fe6a5fcdcbd
> --- /dev/null
> +++ b/meta/recipes-devtools/vala/vala_0.44.3.bb
> @@ -0,0 +1,8 @@
> +require ${BPN}.inc
> +
> +SRC_URI += "file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch \
> + file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \
> + "
> +
> +SRC_URI[md5sum] = "25f97c1b46ae0b60b5cc49cbc044eca2"
> +SRC_URI[sha256sum] = "8553b422484af88be1685d8b47f7b0df36ae4477c3e77e89ab22276ffed1eae9"
> --
> 2.17.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 07/19] libdnf: update to 0.28.1
2019-04-15 10:54 [PATCH 01/19] gobject-introspection: update to 1.60.1 Alexander Kanavin
` (4 preceding siblings ...)
2019-04-15 10:54 ` [PATCH 06/19] vala: update to 0.44.3 Alexander Kanavin
@ 2019-04-15 10:54 ` Alexander Kanavin
2019-04-15 10:54 ` [PATCH 08/19] libcomps: upgrade 0.1.10 -> 0.1.11 Alexander Kanavin
` (12 subsequent siblings)
18 siblings, 0 replies; 25+ messages in thread
From: Alexander Kanavin @ 2019-04-15 10:54 UTC (permalink / raw)
To: openembedded-core
Remove upstreamed 0001-include-missing-string-and-errno.h-headers.patch
Rebase the other patches.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../libdnf/0001-Add-WITH_TESTS-option.patch | 44 ++++++-------
...or-both-libsolv-and-libsolvext-libdn.patch | 16 ++---
...e-missing-string-and-errno.h-headers.patch | 65 -------------------
...ables-with-pkg-config-cmake-s-own-mo.patch | 20 +++---
.../{libdnf_0.26.0.bb => libdnf_0.28.1.bb} | 3 +-
5 files changed, 41 insertions(+), 107 deletions(-)
delete mode 100644 meta/recipes-devtools/libdnf/libdnf/0001-include-missing-string-and-errno.h-headers.patch
rename meta/recipes-devtools/libdnf/{libdnf_0.26.0.bb => libdnf_0.28.1.bb} (90%)
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-Add-WITH_TESTS-option.patch b/meta/recipes-devtools/libdnf/libdnf/0001-Add-WITH_TESTS-option.patch
index 7c8131b4be8..3c87d4d8b33 100644
--- a/meta/recipes-devtools/libdnf/libdnf/0001-Add-WITH_TESTS-option.patch
+++ b/meta/recipes-devtools/libdnf/libdnf/0001-Add-WITH_TESTS-option.patch
@@ -1,4 +1,4 @@
-From 0d0155c4dd6c0b3305ea2ab0e10b0f84d024a6e1 Mon Sep 17 00:00:00 2001
+From e5a50db749b2b02e9e0cff9f7b639020e8ac76da Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Tue, 6 Nov 2018 13:54:43 +0100
Subject: [PATCH] Add WITH_TESTS option
@@ -14,36 +14,36 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
2 files changed, 5 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b73a03d7..a9e0200f 100644
+index ce88b9e3..7a99320a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -36,6 +36,7 @@ OPTION(WITH_MAN "Enables hawkey man page generation" ON)
- OPTION(WITH_HTML "Enables hawkey HTML generation" ON)
+@@ -32,6 +32,7 @@ option(WITH_HTML "Enables hawkey HTML generation" ON)
+ option(WITH_MAN "Enables hawkey man page generation" ON)
+ option(ENABLE_RHSM_SUPPORT "Build with Red Hat Subscription Manager support?" OFF)
+ option(ENABLE_SOLV_URPMREORDER "Build with support for URPM-like solution reordering?" OFF)
++option(WITH_TESTS "Enables unit tests" ON)
- OPTION(WITH_BINDINGS "Enables python/SWIG bindings" ON)
-+OPTION(WITH_TESTS "Enables unit tests" ON)
- OPTION (ENABLE_SOLV_URPMREORDER "Build with support for URPM-like solution reordering?" OFF)
- option (ENABLE_RHSM_SUPPORT "Build with Red Hat Subscription Manager support?" OFF)
-@@ -122,8 +123,10 @@ IF (WITH_BINDINGS)
- # ADD_SUBDIRECTORY (bindings/perl)
- ADD_SUBDIRECTORY (bindings/python)
- ENDIF()
+ # load pkg-config first; it's required by other modules
+@@ -158,8 +159,10 @@ endif()
+
+
+ # build tests
+IF (WITH_TESTS)
- ENABLE_TESTING()
- ADD_SUBDIRECTORY (tests)
+ enable_testing()
+ add_subdirectory(tests)
+ENDIF()
- IF (WITH_BINDINGS)
- ADD_SUBDIRECTORY (python/hawkey)
- ADD_SUBDIRECTORY (docs/hawkey)
+ if(WITH_BINDINGS)
+ add_subdirectory(python/hawkey)
+ endif()
diff --git a/python/hawkey/CMakeLists.txt b/python/hawkey/CMakeLists.txt
-index 3c0b3c0c..31466ed9 100644
+index d9645346..84d17204 100644
--- a/python/hawkey/CMakeLists.txt
+++ b/python/hawkey/CMakeLists.txt
-@@ -49,4 +49,6 @@ TARGET_LINK_LIBRARIES(_hawkeymodule ${PYTHON_LIBRARY})
- INSTALL(FILES __init__.py DESTINATION ${PYTHON_INSTALL_DIR}/hawkey)
- INSTALL(TARGETS _hawkeymodule LIBRARY DESTINATION ${PYTHON_INSTALL_DIR}/hawkey)
+@@ -50,4 +50,6 @@ target_link_libraries(_hawkeymodule ${PYTHON_LIBRARY})
+ install(FILES __init__.py DESTINATION ${PYTHON_INSTALL_DIR}/hawkey)
+ install(TARGETS _hawkeymodule LIBRARY DESTINATION ${PYTHON_INSTALL_DIR}/hawkey)
+IF (WITH_TESTS)
- ADD_SUBDIRECTORY(tests)
+ add_subdirectory(tests)
+ENDIF()
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch b/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch
index 246db34154a..10450defbec 100644
--- a/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch
+++ b/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch
@@ -1,4 +1,4 @@
-From c139a6c929cff93dbb9b8279e97263fc9e055727 Mon Sep 17 00:00:00 2001
+From 9294cd19e5e3121fb8d37b44ee82dd7c4b3ab2c7 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Tue, 7 Feb 2017 12:16:03 +0200
Subject: [PATCH] Get parameters for both libsolv and libsolvext (libdnf is
@@ -13,15 +13,15 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cd91f08..6422534 100644
+index b722d4fb..ce88b9e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -46,7 +46,7 @@ endif(APPLE)
- PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.46.0 REQUIRED)
- pkg_check_modules(SMARTCOLS REQUIRED smartcols)
- FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb)
+@@ -45,7 +45,7 @@ endif()
+
+ # build dependencies
+ find_package(Gpgme REQUIRED)
-PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv)
+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv libsolvext)
set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES})
- if (ENABLE_RHSM_SUPPORT)
- pkg_check_modules (RHSM REQUIRED librhsm>=0.0.3)
+ find_package(OpenSSL REQUIRED)
+
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-include-missing-string-and-errno.h-headers.patch b/meta/recipes-devtools/libdnf/libdnf/0001-include-missing-string-and-errno.h-headers.patch
deleted file mode 100644
index 62de7848207..00000000000
--- a/meta/recipes-devtools/libdnf/libdnf/0001-include-missing-string-and-errno.h-headers.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From ccc89ff0c1f8e55a4a22444d051925408f265df1 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 30 Jan 2019 10:32:11 -0800
-Subject: [PATCH] include missing <string> and errno.h headers
-
-This is unearthed when compiling with clang/libc++
-
-Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/677]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libdnf/conf/ConfigParser.hpp | 1 +
- libdnf/module/modulemd/ModuleProfile.hpp | 1 +
- libdnf/sack/changelog.hpp | 1 +
- libdnf/utils/smartcols/Cell.hpp | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/libdnf/conf/ConfigParser.hpp b/libdnf/conf/ConfigParser.hpp
-index 97f25500..2a3851fa 100644
---- a/libdnf/conf/ConfigParser.hpp
-+++ b/libdnf/conf/ConfigParser.hpp
-@@ -23,6 +23,7 @@
-
- #include <map>
- #include <stdexcept>
-+#include <string>
- #include <utility>
-
- namespace libdnf {
-diff --git a/libdnf/module/modulemd/ModuleProfile.hpp b/libdnf/module/modulemd/ModuleProfile.hpp
-index ab018deb..8d996ff4 100644
---- a/libdnf/module/modulemd/ModuleProfile.hpp
-+++ b/libdnf/module/modulemd/ModuleProfile.hpp
-@@ -23,6 +23,7 @@
-
-
- #include <memory>
-+#include <string>
- #include <vector>
-
- #include <modulemd/modulemd.h>
-diff --git a/libdnf/sack/changelog.hpp b/libdnf/sack/changelog.hpp
-index a3d3fc44..d830c414 100644
---- a/libdnf/sack/changelog.hpp
-+++ b/libdnf/sack/changelog.hpp
-@@ -23,6 +23,7 @@
- #define __CHANGELOG_HPP
-
- #include <ctime>
-+#include <string>
-
- namespace libdnf {
-
-diff --git a/libdnf/utils/smartcols/Cell.hpp b/libdnf/utils/smartcols/Cell.hpp
-index 2e811dee..b90f0050 100644
---- a/libdnf/utils/smartcols/Cell.hpp
-+++ b/libdnf/utils/smartcols/Cell.hpp
-@@ -22,6 +22,7 @@
- #define LIBDNF_CELL_HPP
-
- #include <libsmartcols/libsmartcols.h>
-+#include <cerrno>
- #include <string>
- #include <stdexcept>
-
diff --git a/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch b/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch
index 80b1ed7bf18..475c8f120ba 100644
--- a/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch
+++ b/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch
@@ -1,4 +1,4 @@
-From 2bcd0b9f6310bacdc554e077e85319a5e90e5ce0 Mon Sep 17 00:00:00 2001
+From 18c2c06017784cd641cc8a3deee5fc472008f7f4 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 30 Dec 2016 18:24:50 +0200
Subject: [PATCH] Set libsolv variables with pkg-config (cmake's own module
@@ -13,16 +13,16 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0b405cb..cd91f08 100644
+index 16b63308..b722d4fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -46,7 +46,8 @@ endif(APPLE)
- PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.46.0 REQUIRED)
- pkg_check_modules(SMARTCOLS REQUIRED smartcols)
- FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb)
--find_package (LibSolv 0.6.30 REQUIRED COMPONENTS ext)
+@@ -45,7 +45,8 @@ endif()
+
+ # build dependencies
+ find_package(Gpgme REQUIRED)
+-find_package(LibSolv 0.6.30 REQUIRED COMPONENTS ext)
+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv)
+set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES})
- if (ENABLE_RHSM_SUPPORT)
- pkg_check_modules (RHSM REQUIRED librhsm>=0.0.3)
- include_directories (${RHSM_INCLUDE_DIRS})
+ find_package(OpenSSL REQUIRED)
+
+
diff --git a/meta/recipes-devtools/libdnf/libdnf_0.26.0.bb b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb
similarity index 90%
rename from meta/recipes-devtools/libdnf/libdnf_0.26.0.bb
rename to meta/recipes-devtools/libdnf/libdnf_0.28.1.bb
index 9c2247c237d..4ff294c32cb 100644
--- a/meta/recipes-devtools/libdnf/libdnf_0.26.0.bb
+++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb
@@ -7,10 +7,9 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf \
file://0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch \
file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \
file://0001-Add-WITH_TESTS-option.patch \
- file://0001-include-missing-string-and-errno.h-headers.patch \
"
-SRCREV = "bd23204aa83d10e3d293a9f2d496cba6070f6a4d"
+SRCREV = "751f89045b80d58c0d05800f74357cf78cdf7e77"
S = "${WORKDIR}/git"
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 08/19] libcomps: upgrade 0.1.10 -> 0.1.11
2019-04-15 10:54 [PATCH 01/19] gobject-introspection: update to 1.60.1 Alexander Kanavin
` (5 preceding siblings ...)
2019-04-15 10:54 ` [PATCH 07/19] libdnf: update to 0.28.1 Alexander Kanavin
@ 2019-04-15 10:54 ` Alexander Kanavin
2019-04-15 10:54 ` [PATCH 09/19] dnf: upgrade 4.1.0 -> 4.2.2 Alexander Kanavin
` (11 subsequent siblings)
18 siblings, 0 replies; 25+ messages in thread
From: Alexander Kanavin @ 2019-04-15 10:54 UTC (permalink / raw)
To: openembedded-core
Remove upstreamed patch.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...-library-installation-path-correctly.patch | 27 -------------------
.../recipes-devtools/libcomps/libcomps_git.bb | 5 ++--
2 files changed, 2 insertions(+), 30 deletions(-)
delete mode 100644 meta/recipes-devtools/libcomps/libcomps/0002-Set-library-installation-path-correctly.patch
diff --git a/meta/recipes-devtools/libcomps/libcomps/0002-Set-library-installation-path-correctly.patch b/meta/recipes-devtools/libcomps/libcomps/0002-Set-library-installation-path-correctly.patch
deleted file mode 100644
index dc3d9763523..00000000000
--- a/meta/recipes-devtools/libcomps/libcomps/0002-Set-library-installation-path-correctly.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b1f61296e2f16c2b9a39c5501e4538628ff01ab4 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Fri, 30 Dec 2016 18:26:00 +0200
-Subject: [PATCH 2/2] Set library installation path correctly
-
-Upstream-Status: Submitted [https://github.com/rpm-software-management/libcomps/pull/32]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- libcomps/src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libcomps/src/CMakeLists.txt b/libcomps/src/CMakeLists.txt
-index e553d77..e2eef9c 100644
---- a/libcomps/src/CMakeLists.txt
-+++ b/libcomps/src/CMakeLists.txt
-@@ -52,7 +52,7 @@ add_dependencies(libcomps src-copy)
- IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
- SET (LIB_SUFFIX "64")
- ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
--set (LIB_INST_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
-+set (LIB_INST_DIR ${CMAKE_INSTALL_LIBDIR})
-
-
- install (FILES ${libcomps_HEADERS} DESTINATION include/libcomps)
---
-2.11.0
-
diff --git a/meta/recipes-devtools/libcomps/libcomps_git.bb b/meta/recipes-devtools/libcomps/libcomps_git.bb
index ff6820851fe..372c3c35804 100644
--- a/meta/recipes-devtools/libcomps/libcomps_git.bb
+++ b/meta/recipes-devtools/libcomps/libcomps_git.bb
@@ -4,13 +4,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "git://github.com/rpm-software-management/libcomps.git \
file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
- file://0002-Set-library-installation-path-correctly.patch \
file://0001-Make-__comps_objmrtree_all-static-inline.patch \
file://0001-Add-crc32.c-to-sources-list.patch \
"
-PV = "0.1.10"
-SRCREV = "86a82fcd155c27092340d15a34f5c75c4da88243"
+PV = "0.1.11"
+SRCREV = "d868a79b76fb980d1371c28124ae07f00d2b63a9"
S = "${WORKDIR}/git"
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 09/19] dnf: upgrade 4.1.0 -> 4.2.2
2019-04-15 10:54 [PATCH 01/19] gobject-introspection: update to 1.60.1 Alexander Kanavin
` (6 preceding siblings ...)
2019-04-15 10:54 ` [PATCH 08/19] libcomps: upgrade 0.1.10 -> 0.1.11 Alexander Kanavin
@ 2019-04-15 10:54 ` Alexander Kanavin
2019-04-15 10:54 ` [PATCH 10/19] btrfs-tools: upgrade 4.20.1 -> 4.20.2 Alexander Kanavin
` (10 subsequent siblings)
18 siblings, 0 replies; 25+ messages in thread
From: Alexander Kanavin @ 2019-04-15 10:54 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-devtools/dnf/{dnf_4.1.0.bb => dnf_4.2.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/dnf/{dnf_4.1.0.bb => dnf_4.2.2.bb} (98%)
diff --git a/meta/recipes-devtools/dnf/dnf_4.1.0.bb b/meta/recipes-devtools/dnf/dnf_4.2.2.bb
similarity index 98%
rename from meta/recipes-devtools/dnf/dnf_4.1.0.bb
rename to meta/recipes-devtools/dnf/dnf_4.2.2.bb
index d45023eb0c0..3970b411217 100644
--- a/meta/recipes-devtools/dnf/dnf_4.1.0.bb
+++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb
@@ -12,7 +12,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \
file://0030-Run-python-scripts-using-env.patch \
"
-SRCREV = "ad9b2175517c896c898cf9c8660e9b9b688ac5c7"
+SRCREV = "9947306a55271b8b7c9e2b6e3b7d582885b6045d"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
S = "${WORKDIR}/git"
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 10/19] btrfs-tools: upgrade 4.20.1 -> 4.20.2
2019-04-15 10:54 [PATCH 01/19] gobject-introspection: update to 1.60.1 Alexander Kanavin
` (7 preceding siblings ...)
2019-04-15 10:54 ` [PATCH 09/19] dnf: upgrade 4.1.0 -> 4.2.2 Alexander Kanavin
@ 2019-04-15 10:54 ` Alexander Kanavin
2019-04-15 10:54 ` [PATCH 11/19] meson: update to 0.50.0 Alexander Kanavin
` (9 subsequent siblings)
18 siblings, 0 replies; 25+ messages in thread
From: Alexander Kanavin @ 2019-04-15 10:54 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../{btrfs-tools_4.20.1.bb => btrfs-tools_4.20.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.20.1.bb => btrfs-tools_4.20.2.bb} (96%)
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.20.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.20.2.bb
similarity index 96%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.20.1.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_4.20.2.bb
index 3647232dc68..a1e7309664a 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.20.1.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.20.2.bb
@@ -14,7 +14,7 @@ DEPENDS = "util-linux attr e2fsprogs lzo acl python3-setuptools-native"
DEPENDS_append_class-target = " udev"
RDEPENDS_${PN} = "libgcc"
-SRCREV = "6c33832b8c7bf2d7b64d6aed023c0bda43a03311"
+SRCREV = "5c748404b97035463c79ba4e5fd41b6858535509"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
file://0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch \
file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 11/19] meson: update to 0.50.0
2019-04-15 10:54 [PATCH 01/19] gobject-introspection: update to 1.60.1 Alexander Kanavin
` (8 preceding siblings ...)
2019-04-15 10:54 ` [PATCH 10/19] btrfs-tools: upgrade 4.20.1 -> 4.20.2 Alexander Kanavin
@ 2019-04-15 10:54 ` Alexander Kanavin
2019-04-23 9:28 ` Burton, Ross
2019-04-15 10:54 ` [PATCH 12/19] libmodulemd: update to 2.2.3 Alexander Kanavin
` (8 subsequent siblings)
18 siblings, 1 reply; 25+ messages in thread
From: Alexander Kanavin @ 2019-04-15 10:54 UTC (permalink / raw)
To: openembedded-core
Remove 0001-Linker-rules-move-cross_args-in-front-of-output_args.patch
as the upstream code has been completely reworked; if the issues pops up
again, we need to re-write the fix.
Rebase:
0001-Make-CPU-family-warnings-fatal.patch
0001-environment.py-detect-windows-also-if-the-system-str.patch
0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
0002-Support-building-allarch-recipes-again.patch
Add 0001-mesonbuild-environment.py-check-environment-for-vari.patch
as particularly we set windows resource compiler through an
environment variable WINDRES. This has replaced the
0001-modules-windows-split-WINDRES-env-variable.patch as the code
has been refactored.
Add 0001-mesonbuild-environment.py-do-not-determine-whether-a.patch
for a more robust detection of cross builds.
Replace many-cross.patch with corresponding backports from upcoming 0.50.1:
0007-mesonbuild-allow-multiple-cross-file-options.patch
load-configs-generalise-search-path.patch
Drop cross-libdir.patch as it has been merged upstream.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-devtools/meson/meson.inc | 14 +-
...e-cross_args-in-front-of-output_args.patch | 30 ----
.../0001-Make-CPU-family-warnings-fatal.patch | 35 ++--
...tect-windows-also-if-the-system-str.patch} | 16 +-
...sues-that-arise-when-cross-compiling.patch | 2 +-
...onment.py-check-environment-for-vari.patch | 28 +++
...onment.py-do-not-determine-whether-a.patch | 30 ++++
...s-windows-split-WINDRES-env-variable.patch | 26 ---
...pport-building-allarch-recipes-again.patch | 16 +-
...d-allow-multiple-cross-file-options.patch} | 162 ++++++++----------
.../meson/meson/cross-libdir.patch | 35 ----
.../load-configs-generalise-search-path.patch | 50 ++++++
.../{meson_0.49.2.bb => meson_0.50.0.bb} | 0
...on_0.49.2.bb => nativesdk-meson_0.50.0.bb} | 0
14 files changed, 222 insertions(+), 222 deletions(-)
delete mode 100644 meta/recipes-devtools/meson/meson/0001-Linker-rules-move-cross_args-in-front-of-output_args.patch
rename meta/recipes-devtools/meson/meson/{0002-environment.py-detect-windows-also-if-the-system-str.patch => 0001-environment.py-detect-windows-also-if-the-system-str.patch} (59%)
create mode 100644 meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-check-environment-for-vari.patch
create mode 100644 meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch
delete mode 100644 meta/recipes-devtools/meson/meson/0001-modules-windows-split-WINDRES-env-variable.patch
rename meta/recipes-devtools/meson/meson/{many-cross.patch => 0007-mesonbuild-allow-multiple-cross-file-options.patch} (54%)
delete mode 100644 meta/recipes-devtools/meson/meson/cross-libdir.patch
create mode 100644 meta/recipes-devtools/meson/meson/load-configs-generalise-search-path.patch
rename meta/recipes-devtools/meson/{meson_0.49.2.bb => meson_0.50.0.bb} (100%)
rename meta/recipes-devtools/meson/{nativesdk-meson_0.49.2.bb => nativesdk-meson_0.50.0.bb} (100%)
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index 2d18f72c0c1..6d743fbe142 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -7,18 +7,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${PV}.tar.gz \
file://0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch \
file://0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch \
- file://0001-Linker-rules-move-cross_args-in-front-of-output_args.patch \
file://0003-native_bindir.patch \
file://0001-python-module-do-not-manipulate-the-environment-when.patch \
file://disable-rpath-handling.patch \
- file://0001-modules-windows-split-WINDRES-env-variable.patch \
- file://0002-environment.py-detect-windows-also-if-the-system-str.patch \
file://cross-prop-default.patch \
- file://many-cross.patch \
- file://cross-libdir.patch \
+ file://load-configs-generalise-search-path.patch \
+ file://0007-mesonbuild-allow-multiple-cross-file-options.patch \
+ file://0001-environment.py-detect-windows-also-if-the-system-str.patch \
+ file://0001-mesonbuild-environment.py-do-not-determine-whether-a.patch \
+ file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
"
-SRC_URI[sha256sum] = "ef9f14326ec1e30d3ba1a26df0f92826ede5a79255ad723af78a2691c37109fd"
-SRC_URI[md5sum] = "0267b0871266056184c484792572c682"
+SRC_URI[sha256sum] = "2a1bc42dda58206fb922cda5e1ca95cc03ad126321d26acc47d3493ec4e7021f"
+SRC_URI[md5sum] = "433483107fda4616eaf33de7e7083a84"
SRC_URI_append_class-native = " \
file://0001-Make-CPU-family-warnings-fatal.patch \
diff --git a/meta/recipes-devtools/meson/meson/0001-Linker-rules-move-cross_args-in-front-of-output_args.patch b/meta/recipes-devtools/meson/meson/0001-Linker-rules-move-cross_args-in-front-of-output_args.patch
deleted file mode 100644
index 97778c32eb5..00000000000
--- a/meta/recipes-devtools/meson/meson/0001-Linker-rules-move-cross_args-in-front-of-output_args.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 4676224dbdff0f7107e8cbdbe0eab19c855f1454 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Fri, 17 Nov 2017 13:18:28 +0200
-Subject: [PATCH] Linker rules: move {cross_args} in front of {output_args}
-
-The previous order was found to break linking in some cases
-(e.g. when -no-pic -fno-PIC was present in {cross_args}.
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- mesonbuild/backend/ninjabackend.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
-index bb281e1..969b70e 100644
---- a/mesonbuild/backend/ninjabackend.py
-+++ b/mesonbuild/backend/ninjabackend.py
-@@ -1501,7 +1501,7 @@ int dummy;
- rspfile_content = $ARGS {output_args} $in $LINK_ARGS {cross_args} $aliasing
- '''
- else:
-- command_template = ' command = {executable} $ARGS {output_args} $in $LINK_ARGS {cross_args} $aliasing\n'
-+ command_template = ' command = {executable} $ARGS {cross_args} {output_args} $in $LINK_ARGS $aliasing\n'
- command = command_template.format(
- executable=' '.join(compiler.get_linker_exelist()),
- cross_args=' '.join(cross_args),
---
-2.15.0
-
diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
index fbc3f5ad827..2580b1e366e 100644
--- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
+++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
@@ -1,4 +1,4 @@
-From 2db829d865bb6464ac15dbb4a58c9a675e296866 Mon Sep 17 00:00:00 2001
+From f76d2bf09f7ffd871d068c4ac4c4be083f5fb07f Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Tue, 3 Jul 2018 13:59:09 +0100
Subject: [PATCH] Make CPU family warnings fatal
@@ -7,15 +7,29 @@ Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
- mesonbuild/environment.py | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
+ mesonbuild/envconfig.py | 2 +-
+ mesonbuild/environment.py | 4 +---
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
+index f2510c1..b9841fe 100644
+--- a/mesonbuild/envconfig.py
++++ b/mesonbuild/envconfig.py
+@@ -178,7 +178,7 @@ class MachineInfo:
+
+ cpu_family = literal['cpu_family']
+ if cpu_family not in known_cpu_families:
+- mlog.warning('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % cpu_family)
++ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % cpu_family)
+
+ endian = literal['endian']
+ if endian not in ('little', 'big'):
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 2ccd31e..5fcf9df 100644
+index 4c1c5ac..a5a7461 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
-@@ -265,9 +265,7 @@ def detect_cpu_family(compilers):
- # below.
+@@ -242,9 +242,7 @@ def detect_cpu_family(compilers):
+ trial = 'parisc'
if trial not in known_cpu_families:
- mlog.warning('Unknown CPU family {!r}, please report this at '
@@ -25,12 +39,3 @@ index 2ccd31e..5fcf9df 100644
return trial
-@@ -1232,7 +1230,7 @@ class MachineInfo:
-
- cpu_family = literal['cpu_family']
- if cpu_family not in known_cpu_families:
-- mlog.warning('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % cpu_family)
-+ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % cpu_family)
-
- endian = literal['endian']
- if endian not in ('little', 'big'):
diff --git a/meta/recipes-devtools/meson/meson/0002-environment.py-detect-windows-also-if-the-system-str.patch b/meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch
similarity index 59%
rename from meta/recipes-devtools/meson/meson/0002-environment.py-detect-windows-also-if-the-system-str.patch
rename to meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch
index 1be5d663291..f6043190af0 100644
--- a/meta/recipes-devtools/meson/meson/0002-environment.py-detect-windows-also-if-the-system-str.patch
+++ b/meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch
@@ -1,20 +1,20 @@
-From 7bf4c2c02eb7fe1bf24b23e3ba2d7df36495e0aa Mon Sep 17 00:00:00 2001
+From 63b78b7990c5d60f7bc674a26f655caa0bec3c49 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Wed, 13 Feb 2019 17:45:09 +0100
+Date: Mon, 25 Mar 2019 17:17:06 +0100
Subject: [PATCH] environment.py: detect windows also if the system string
contains 'mingw'
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
- mesonbuild/environment.py | 2 +-
+ mesonbuild/envconfig.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index b4fc0dc..845077e 100644
---- a/mesonbuild/environment.py
-+++ b/mesonbuild/environment.py
-@@ -1247,7 +1247,7 @@ class MachineInfo:
+diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
+index f2510c1..5309ef4 100644
+--- a/mesonbuild/envconfig.py
++++ b/mesonbuild/envconfig.py
+@@ -194,7 +194,7 @@ class MachineInfo:
"""
Machine is windows?
"""
diff --git a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
index 11fd9ed3acc..7c3238bf91a 100644
--- a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
+++ b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
@@ -27,7 +27,7 @@ index bf49770..7c5a363 100644
'--mode=' + mode]
if namespace:
args.append('--namespace=' + namespace)
-+ gtkdoc_exe_wrapper = state.environment.cross_info.config["properties"].get('gtkdoc_exe_wrapper', None)
++ gtkdoc_exe_wrapper = state.environment.properties.host.get('gtkdoc_exe_wrapper', None)
+ if gtkdoc_exe_wrapper is not None:
+ args.append('--run=' + gtkdoc_exe_wrapper)
+
diff --git a/meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-check-environment-for-vari.patch b/meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-check-environment-for-vari.patch
new file mode 100644
index 00000000000..fadb2734f4b
--- /dev/null
+++ b/meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-check-environment-for-vari.patch
@@ -0,0 +1,28 @@
+From 63e79329b5dd00882f0cea56a6d907a831b94171 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Mon, 25 Mar 2019 18:52:48 +0100
+Subject: [PATCH] mesonbuild/environment.py: check environment for various
+ binaries
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ mesonbuild/environment.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
+index 6e5d689..bbfd87d 100644
+--- a/mesonbuild/environment.py
++++ b/mesonbuild/environment.py
+@@ -398,7 +398,7 @@ class Environment:
+ config = MesonConfigFile.from_config_parser(
+ coredata.load_configs(self.coredata.cross_files, 'cross'))
+ self.properties.host = Properties(config.get('properties', {}), False)
+- self.binaries.host = BinaryTable(config.get('binaries', {}), False)
++ self.binaries.host = BinaryTable(config.get('binaries', {}), True)
+ if 'host_machine' in config:
+ self.machines.host = MachineInfo.from_literal(config['host_machine'])
+ if 'target_machine' in config:
+--
+2.17.1
+
diff --git a/meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch b/meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch
new file mode 100644
index 00000000000..e64e13b8360
--- /dev/null
+++ b/meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch
@@ -0,0 +1,30 @@
+From c040f0dbace3259c80f3710bc019433b9c817940 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Mon, 25 Mar 2019 18:18:33 +0100
+Subject: [PATCH] mesonbuild/environment.py: do not determine whether a build
+ is cross by comparing architectures
+
+This can, and does, go wrong when our host architecture is same as the target one(e.g. x86_64).
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ mesonbuild/environment.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
+index 4c1c5ac..6e5d689 100644
+--- a/mesonbuild/environment.py
++++ b/mesonbuild/environment.py
+@@ -478,7 +478,7 @@ class Environment:
+ self.first_invocation = True
+
+ def is_cross_build(self):
+- return not self.machines.matches_build_machine(MachineChoice.HOST)
++ return self.need_exe_wrapper()
+
+ def dump_coredata(self):
+ return coredata.save(self.coredata, self.get_build_dir())
+--
+2.17.1
+
diff --git a/meta/recipes-devtools/meson/meson/0001-modules-windows-split-WINDRES-env-variable.patch b/meta/recipes-devtools/meson/meson/0001-modules-windows-split-WINDRES-env-variable.patch
deleted file mode 100644
index c334e6dd66b..00000000000
--- a/meta/recipes-devtools/meson/meson/0001-modules-windows-split-WINDRES-env-variable.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5293d0f5067b2aeefe9ce3c175c972de367589bc Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Wed, 13 Feb 2019 17:43:54 +0100
-Subject: [PATCH] modules/windows: split WINDRES env variable
-
-As it may contain not just the binary, but also the arguments to it.
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- mesonbuild/modules/windows.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mesonbuild/modules/windows.py b/mesonbuild/modules/windows.py
-index d185d89..dbaeb9b 100644
---- a/mesonbuild/modules/windows.py
-+++ b/mesonbuild/modules/windows.py
-@@ -56,7 +56,7 @@ class WindowsModule(ExtensionModule):
- if 'WINDRES' in os.environ:
- # Pick-up env var WINDRES if set. This is often used for
- # specifying an arch-specific windres.
-- rescomp = ExternalProgram('windres', command=os.environ.get('WINDRES'), silent=True)
-+ rescomp = ExternalProgram('windres', command=os.environ.get('WINDRES').split(), silent=True)
-
- if not rescomp or not rescomp.found():
- # Take windres from the config file after the environment, which is
diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
index 81548cdfb85..f0ea61bac55 100644
--- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
+++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
@@ -1,4 +1,4 @@
-From f8419d5f279f1fb9b5e7eead4f1579bce7cb0e4e Mon Sep 17 00:00:00 2001
+From 755902910ad124095c671b3c7f057e6513d9c0c6 Mon Sep 17 00:00:00 2001
From: Peter Kjellerstedt <pkj@axis.com>
Date: Thu, 26 Jul 2018 16:32:49 +0200
Subject: [PATCH] Support building allarch recipes again
@@ -9,15 +9,15 @@ Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
- mesonbuild/environment.py | 1 +
+ mesonbuild/envconfig.py | 1 +
1 file changed, 1 insertion(+)
-diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 5fcf9df..b4fc0dc 100644
---- a/mesonbuild/environment.py
-+++ b/mesonbuild/environment.py
-@@ -72,6 +72,7 @@ from .compilers import (
- build_filename = 'meson.build'
+diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
+index b9841fe..9c0487e 100644
+--- a/mesonbuild/envconfig.py
++++ b/mesonbuild/envconfig.py
+@@ -34,6 +34,7 @@ from . import mlog
+
known_cpu_families = (
+ 'allarch',
diff --git a/meta/recipes-devtools/meson/meson/many-cross.patch b/meta/recipes-devtools/meson/meson/0007-mesonbuild-allow-multiple-cross-file-options.patch
similarity index 54%
rename from meta/recipes-devtools/meson/meson/many-cross.patch
rename to meta/recipes-devtools/meson/meson/0007-mesonbuild-allow-multiple-cross-file-options.patch
index d04c28b8a38..6c2949c0e8b 100644
--- a/meta/recipes-devtools/meson/meson/many-cross.patch
+++ b/meta/recipes-devtools/meson/meson/0007-mesonbuild-allow-multiple-cross-file-options.patch
@@ -1,4 +1,7 @@
-mesonbuild: allow multiple --cross-file options
+From 07ae4f949b8402cff178dd12c210d9a726ffe2da Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@intel.com>
+Date: Mon, 18 Mar 2019 17:27:57 +0000
+Subject: [PATCH] mesonbuild: allow multiple --cross-file options
Just like --native-file, allow multiple --cross-file options. This is mostly
unifying the logic between cross_files and config_files.
@@ -6,11 +9,30 @@ unifying the logic between cross_files and config_files.
Upstream-Status: Backport [will be in 0.50.1]
Signed-off-by: Ross Burton <ross.burton@intel.com>
+---
+ .../markdown/snippets/multiple-cross-files.md | 3 ++
+ mesonbuild/backend/backends.py | 3 +-
+ mesonbuild/coredata.py | 52 +++----------------
+ mesonbuild/environment.py | 5 +-
+ mesonbuild/msetup.py | 4 +-
+ mesonbuild/munstable_coredata.py | 5 +-
+ 6 files changed, 20 insertions(+), 52 deletions(-)
+ create mode 100644 docs/markdown/snippets/multiple-cross-files.md
+
+diff --git a/docs/markdown/snippets/multiple-cross-files.md b/docs/markdown/snippets/multiple-cross-files.md
+new file mode 100644
+index 0000000..de229be
+--- /dev/null
++++ b/docs/markdown/snippets/multiple-cross-files.md
+@@ -0,0 +1,3 @@
++## Multipe cross files can be specified
++
++`--cross-file` can be passed multiple times, with the configuration files overlaying the same way as `--native-file`.
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
-index 40402513..4b9bcb59 100644
+index 4d35d22..5b270d3 100644
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
-@@ -726,8 +726,7 @@ class Backend:
+@@ -788,8 +788,7 @@ class Backend:
deps = [os.path.join(self.build_to_src, df)
for df in self.interpreter.get_build_def_files()]
if self.environment.is_cross_build():
@@ -21,39 +43,19 @@ index 40402513..4b9bcb59 100644
if os.path.exists(os.path.join(self.environment.get_source_dir(), 'meson_options.txt')):
deps.append(os.path.join(self.build_to_src, 'meson_options.txt'))
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py
-index c3f5a745..ff810683 100644
+index 066ad30..d80e9a0 100644
--- a/mesonbuild/coredata.py
+++ b/mesonbuild/coredata.py
-@@ -201,8 +201,8 @@ class UserFeatureOption(UserComboOption):
- return self.value == 'auto'
-
-
--def load_configs(filenames):
-- """Load native files."""
-+def load_configs(filenames, subdir):
-+ """Load configuration files from a named subdirectory."""
- def gen():
- for f in filenames:
- f = os.path.expanduser(os.path.expandvars(f))
-@@ -215,7 +215,7 @@ def load_configs(filenames):
- os.environ.get('XDG_DATA_HOME', os.path.expanduser('~/.local/share')),
- ] + os.environ.get('XDG_DATA_DIRS', '/usr/local/share:/usr/share').split(':')
- for path in paths:
-- path_to_try = os.path.join(path, 'meson', 'native', f)
-+ path_to_try = os.path.join(path, 'meson', subdir, f)
- if os.path.isfile(path_to_try):
- yield path_to_try
- break
-@@ -291,7 +291,7 @@ class CoreData:
- self.compiler_options = {}
+@@ -265,7 +265,7 @@ class CoreData:
+ self.compiler_options = PerMachine({}, {}, {})
self.base_options = {}
- self.external_preprocess_args = {} # CPPFLAGS only
+ self.external_preprocess_args = PerMachine({}, {}, {}) # CPPFLAGS only
- self.cross_file = self.__load_cross_file(options.cross_file)
+ self.cross_files = self.__load_config_files(options.cross_file)
self.compilers = OrderedDict()
self.cross_compilers = OrderedDict()
self.deps = OrderedDict()
-@@ -301,52 +301,14 @@ class CoreData:
+@@ -276,57 +276,19 @@ class CoreData:
@staticmethod
def __load_config_files(filenames):
@@ -105,10 +107,16 @@ index c3f5a745..ff810683 100644
-
- raise MesonException('Cannot find specified cross file: ' + filename)
-
+ def libdir_cross_fixup(self):
+ # By default set libdir to "lib" when cross compiling since
+ # getting the "system default" is always wrong on multiarch
+ # platforms as it gets a value like lib/x86_64-linux-gnu.
+- if self.cross_file is not None:
++ if self.cross_files:
+ self.builtins['libdir'].value = 'lib'
+
def sanitize_prefix(self, prefix):
- if not os.path.isabs(prefix):
- raise MesonException('prefix value {!r} must be an absolute path'
-@@ -558,8 +520,8 @@ def read_cmd_line_file(build_dir, options):
+@@ -642,8 +604,8 @@ def read_cmd_line_file(build_dir, options):
options.cmd_line_options = d
properties = config['properties']
@@ -119,7 +127,7 @@ index c3f5a745..ff810683 100644
if not options.native_file:
# This will be a string in the form: "['first', 'second', ...]", use
# literal_eval to get it into the list of strings.
-@@ -570,7 +532,7 @@ def write_cmd_line_file(build_dir, options):
+@@ -654,7 +616,7 @@ def write_cmd_line_file(build_dir, options):
config = CmdLineFileParser()
properties = {}
@@ -129,50 +137,26 @@ index c3f5a745..ff810683 100644
if options.native_file:
properties['native_file'] = options.native_file
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 6d86daf9..406ab8b8 100644
+index c25ef33..4c1c5ac 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
-@@ -355,8 +355,8 @@ class Environment:
- self.machines = MachineInfos()
- # Will be fully initialized later using compilers later.
- self.machines.detect_build()
-- if self.coredata.cross_file:
-- self.cross_info = CrossBuildInfo(self.coredata.cross_file)
-+ if self.coredata.cross_files:
-+ self.cross_info = CrossBuildInfo(self.coredata.cross_files)
- if 'exe_wrapper' in self.cross_info.config['binaries']:
- from .dependencies import ExternalProgram
- self.exe_wrapper = ExternalProgram.from_bin_list(
-@@ -373,7 +373,7 @@ class Environment:
+@@ -394,8 +394,9 @@ class Environment:
+ self.binaries.build = BinaryTable(config.get('binaries', {}))
+ self.paths.build = Directories(**config.get('paths', {}))
- if self.coredata.config_files:
- self.config_info = coredata.ConfigData(
-- coredata.load_configs(self.coredata.config_files))
-+ coredata.load_configs(self.coredata.config_files, 'native'))
- else:
- self.config_info = coredata.ConfigData()
-
-@@ -1113,13 +1113,8 @@ class CrossBuildInfo:
- def ok_type(self, i):
- return isinstance(i, (str, int, bool))
-
-- def parse_datafile(self, filename):
-- config = configparser.ConfigParser()
-- try:
-- with open(filename, 'r') as f:
-- config.read_file(f, filename)
-- except FileNotFoundError:
-- raise EnvironmentException('File not found: %s.' % filename)
-+ def parse_datafile(self, filenames):
-+ config = coredata.load_configs(filenames, 'cross')
- # This is a bit hackish at the moment.
- for s in config.sections():
- self.config[s] = {}
+- if self.coredata.cross_file is not None:
+- config = MesonConfigFile.parse_datafile(self.coredata.cross_file)
++ if self.coredata.cross_files:
++ config = MesonConfigFile.from_config_parser(
++ coredata.load_configs(self.coredata.cross_files, 'cross'))
+ self.properties.host = Properties(config.get('properties', {}), False)
+ self.binaries.host = BinaryTable(config.get('binaries', {}), False)
+ if 'host_machine' in config:
diff --git a/mesonbuild/msetup.py b/mesonbuild/msetup.py
-index 56a0e9a7..f0a1ae19 100644
+index 023afdb..6e8ca83 100644
--- a/mesonbuild/msetup.py
+++ b/mesonbuild/msetup.py
-@@ -27,7 +27,9 @@ from .mesonlib import MesonException
+@@ -29,7 +29,9 @@ from .mesonlib import MesonException
def add_arguments(parser):
coredata.register_builtin_arguments(parser)
@@ -183,25 +167,19 @@ index 56a0e9a7..f0a1ae19 100644
help='File describing cross compilation environment.')
parser.add_argument('--native-file',
default=[],
-diff --git a/run_unittests.py b/run_unittests.py
-index e6874b25..1d247291 100755
---- a/run_unittests.py
-+++ b/run_unittests.py
-@@ -529,7 +529,7 @@ class InternalTests(unittest.TestCase):
- config.write(configfile)
- configfile.flush()
- configfile.close()
-- detected_value = mesonbuild.environment.CrossBuildInfo(configfile.name).need_exe_wrapper()
-+ detected_value = mesonbuild.environment.CrossBuildInfo((configfile.name,)).need_exe_wrapper()
- os.unlink(configfilename)
-
- desired_value = not detected_value
-@@ -541,7 +541,7 @@ class InternalTests(unittest.TestCase):
- configfilename = configfile.name
- config.write(configfile)
- configfile.close()
-- forced_value = mesonbuild.environment.CrossBuildInfo(configfile.name).need_exe_wrapper()
-+ forced_value = mesonbuild.environment.CrossBuildInfo((configfile.name,)).need_exe_wrapper()
- os.unlink(configfilename)
-
- self.assertEqual(forced_value, desired_value)
+diff --git a/mesonbuild/munstable_coredata.py b/mesonbuild/munstable_coredata.py
+index 78f3f34..913f942 100644
+--- a/mesonbuild/munstable_coredata.py
++++ b/mesonbuild/munstable_coredata.py
+@@ -81,8 +81,9 @@ def run(options):
+ print('Last seen PKGCONFIG enviroment variable value: ' + v)
+ elif k == 'version':
+ print('Meson version: ' + v)
+- elif k == 'cross_file':
+- print('Cross File: ' + (v or 'None'))
++ elif k == 'cross_files':
++ if v:
++ print('Cross File: ' + ' '.join(v))
+ elif k == 'config_files':
+ if v:
+ print('Native File: ' + ' '.join(v))
diff --git a/meta/recipes-devtools/meson/meson/cross-libdir.patch b/meta/recipes-devtools/meson/meson/cross-libdir.patch
deleted file mode 100644
index 7395fdbdaa6..00000000000
--- a/meta/recipes-devtools/meson/meson/cross-libdir.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From ce24f0d6a9be22ba61d80cd254e0409de2eaffd7 Mon Sep 17 00:00:00 2001
-From: Jussi Pakkanen <jpakkane@gmail.com>
-Date: Thu, 27 Dec 2018 23:43:35 +0200
-Subject: [PATCH] Default libdir is "lib" when cross compiling. Closes #2535.
-
----
-diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py
-index ff810683..9ee23a69 100644
---- a/mesonbuild/coredata.py
-+++ b/mesonbuild/coredata.py
-@@ -298,6 +298,7 @@ class CoreData:
- # Only to print a warning if it changes between Meson invocations.
- self.pkgconf_envvar = os.environ.get('PKG_CONFIG_PATH', '')
- self.config_files = self.__load_config_files(options.native_file)
-+ self.libdir_cross_fixup()
-
- @staticmethod
- def __load_config_files(filenames):
-@@ -309,6 +310,13 @@ class CoreData:
- for f in filenames]
- return filenames
-
-+ def libdir_cross_fixup(self):
-+ # By default set libdir to "lib" when cross compiling since
-+ # getting the "system default" is always wrong on multiarch
-+ # platforms as it gets a value like lib/x86_64-linux-gnu.
-+ if self.cross_files:
-+ self.builtins['libdir'].value = 'lib'
-+
- def sanitize_prefix(self, prefix):
- if not os.path.isabs(prefix):
- raise MesonException('prefix value {!r} must be an absolute path'
diff --git a/meta/recipes-devtools/meson/meson/load-configs-generalise-search-path.patch b/meta/recipes-devtools/meson/meson/load-configs-generalise-search-path.patch
new file mode 100644
index 00000000000..fc02576f5bd
--- /dev/null
+++ b/meta/recipes-devtools/meson/meson/load-configs-generalise-search-path.patch
@@ -0,0 +1,50 @@
+From d57dd1092e84e08ee15d7063b6c56bd6d864f2e1 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@intel.com>
+Date: Mon, 18 Mar 2019 16:16:56 +0000
+Subject: [PATCH] load_configs: generalise the search path
+
+Instead of hard-coding the fact that load_configs() searches for files under
+meson/native, pass in the subdirectory allowing the cross-file code to use the
+same logic.
+---
+ mesonbuild/coredata.py | 6 +++---
+ mesonbuild/environment.py | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py
+index fba90fa369..6e60917d10 100644
+--- a/mesonbuild/coredata.py
++++ b/mesonbuild/coredata.py
+@@ -211,8 +211,8 @@ def is_auto(self):
+ return self.value == 'auto'
+
+
+-def load_configs(filenames):
+- """Load native files."""
++def load_configs(filenames, subdir):
++ """Load configuration files from a named subdirectory."""
+ def gen():
+ for f in filenames:
+ f = os.path.expanduser(os.path.expandvars(f))
+@@ -225,7 +225,7 @@ def gen():
+ os.environ.get('XDG_DATA_HOME', os.path.expanduser('~/.local/share')),
+ ] + os.environ.get('XDG_DATA_DIRS', '/usr/local/share:/usr/share').split(':')
+ for path in paths:
+- path_to_try = os.path.join(path, 'meson', 'native', f)
++ path_to_try = os.path.join(path, 'meson', subdir, f)
+ if os.path.isfile(path_to_try):
+ yield path_to_try
+ break
+diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
+index 58adb06960..92a00dd7bf 100644
+--- a/mesonbuild/environment.py
++++ b/mesonbuild/environment.py
+@@ -408,7 +408,7 @@ def __init__(self, source_dir, build_dir, options):
+
+ if self.coredata.config_files is not None:
+ config = MesonConfigFile.from_config_parser(
+- coredata.load_configs(self.coredata.config_files))
++ coredata.load_configs(self.coredata.config_files, 'native'))
+ self.binaries.build = BinaryTable(config.get('binaries', {}))
+ self.paths.build = Directories(**config.get('paths', {}))
+
diff --git a/meta/recipes-devtools/meson/meson_0.49.2.bb b/meta/recipes-devtools/meson/meson_0.50.0.bb
similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.49.2.bb
rename to meta/recipes-devtools/meson/meson_0.50.0.bb
diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.49.2.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.50.0.bb
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.49.2.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.50.0.bb
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH 11/19] meson: update to 0.50.0
2019-04-15 10:54 ` [PATCH 11/19] meson: update to 0.50.0 Alexander Kanavin
@ 2019-04-23 9:28 ` Burton, Ross
0 siblings, 0 replies; 25+ messages in thread
From: Burton, Ross @ 2019-04-23 9:28 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: OE-core
On Mon, 15 Apr 2019 at 11:56, Alexander Kanavin <alex.kanavin@gmail.com> wrote:
> +++ b/meta/recipes-devtools/meson/meson/load-configs-generalise-search-path.patch
> @@ -0,0 +1,50 @@
> +From d57dd1092e84e08ee15d7063b6c56bd6d864f2e1 Mon Sep 17 00:00:00 2001
> +From: Ross Burton <ross.burton@intel.com>
> +Date: Mon, 18 Mar 2019 16:16:56 +0000
> +Subject: [PATCH] load_configs: generalise the search path
> +
> +Instead of hard-coding the fact that load_configs() searches for files under
> +meson/native, pass in the subdirectory allowing the cross-file code to use the
> +same logic.
> +---
> + mesonbuild/coredata.py | 6 +++---
> + mesonbuild/environment.py | 2 +-
> + 2 files changed, 4 insertions(+), 4 deletions(-)
> +
> +diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py
> +index fba90fa369..6e60917d10 100644
> +--- a/mesonbuild/coredata.py
> ++++ b/mesonbuild/coredata.py
> +@@ -211,8 +211,8 @@ def is_auto(self):
> + return self.value == 'auto'
> +
> +
> +-def load_configs(filenames):
> +- """Load native files."""
> ++def load_configs(filenames, subdir):
> ++ """Load configuration files from a named subdirectory."""
> + def gen():
> + for f in filenames:
> + f = os.path.expanduser(os.path.expandvars(f))
> +@@ -225,7 +225,7 @@ def gen():
> + os.environ.get('XDG_DATA_HOME', os.path.expanduser('~/.local/share')),
> + ] + os.environ.get('XDG_DATA_DIRS', '/usr/local/share:/usr/share').split(':')
> + for path in paths:
> +- path_to_try = os.path.join(path, 'meson', 'native', f)
> ++ path_to_try = os.path.join(path, 'meson', subdir, f)
> + if os.path.isfile(path_to_try):
> + yield path_to_try
> + break
> +diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
> +index 58adb06960..92a00dd7bf 100644
> +--- a/mesonbuild/environment.py
> ++++ b/mesonbuild/environment.py
> +@@ -408,7 +408,7 @@ def __init__(self, source_dir, build_dir, options):
> +
> + if self.coredata.config_files is not None:
> + config = MesonConfigFile.from_config_parser(
> +- coredata.load_configs(self.coredata.config_files))
> ++ coredata.load_configs(self.coredata.config_files, 'native'))
> + self.binaries.build = BinaryTable(config.get('binaries', {}))
> + self.paths.build = Directories(**config.get('paths', {}))
> +
Missing Upstream-Status and Signed-off-by, can you add those please.
Ross
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 12/19] libmodulemd: update to 2.2.3
2019-04-15 10:54 [PATCH 01/19] gobject-introspection: update to 1.60.1 Alexander Kanavin
` (9 preceding siblings ...)
2019-04-15 10:54 ` [PATCH 11/19] meson: update to 0.50.0 Alexander Kanavin
@ 2019-04-15 10:54 ` Alexander Kanavin
2019-04-15 10:54 ` [PATCH 13/19] at-spi2-core: fix meson 0.50 build Alexander Kanavin
` (7 subsequent siblings)
18 siblings, 0 replies; 25+ messages in thread
From: Alexander Kanavin @ 2019-04-15 10:54 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-devtools/libmodulemd/libmodulemd_git.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
index 84012e41934..40715c06ee2 100644
--- a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
+++ b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
@@ -7,8 +7,8 @@ SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https \
file://0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch \
"
-PV = "2.1.0"
-SRCREV = "072e6ee791fe7822a6d423bdac7e4a5cbb118bce"
+PV = "2.2.3"
+SRCREV = "4c75c6f8b39ee57aebe8fd36ef84808e893048c0"
S = "${WORKDIR}/git"
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 13/19] at-spi2-core: fix meson 0.50 build
2019-04-15 10:54 [PATCH 01/19] gobject-introspection: update to 1.60.1 Alexander Kanavin
` (10 preceding siblings ...)
2019-04-15 10:54 ` [PATCH 12/19] libmodulemd: update to 2.2.3 Alexander Kanavin
@ 2019-04-15 10:54 ` Alexander Kanavin
2019-04-15 10:54 ` [PATCH 14/19] ffmpeg: update to 4.1.3 Alexander Kanavin
` (6 subsequent siblings)
18 siblings, 0 replies; 25+ messages in thread
From: Alexander Kanavin @ 2019-04-15 10:54 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../atk/at-spi2-core/meson-0.50-fix.patch | 31 +++++++++++++++++++
.../atk/at-spi2-core_2.30.0.bb | 1 +
2 files changed, 32 insertions(+)
create mode 100644 meta/recipes-support/atk/at-spi2-core/meson-0.50-fix.patch
diff --git a/meta/recipes-support/atk/at-spi2-core/meson-0.50-fix.patch b/meta/recipes-support/atk/at-spi2-core/meson-0.50-fix.patch
new file mode 100644
index 00000000000..fbdf7d0e2ea
--- /dev/null
+++ b/meta/recipes-support/atk/at-spi2-core/meson-0.50-fix.patch
@@ -0,0 +1,31 @@
+From 44a812ea51223d82f21a098a2d45fcc5c329ce7a Mon Sep 17 00:00:00 2001
+From: Tobias Stoeckmann <tobias@stoeckmann.org>
+Date: Tue, 12 Mar 2019 11:46:24 +0100
+Subject: [PATCH] Fix meson.build for meson 0.50.0.
+
+Since meson 0.50.0 it is not possible anymore to specify an
+absolute directory for subdir. To keep current functionality,
+use install_dir instead.
+
+atspi/meson.build:60:0: ERROR: Subdir keyword must not be an absolute path.
+
+Upstream-Status: Backport
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
+---
+ atspi/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/atspi/meson.build b/atspi/meson.build
+index b7a9357..2a6915d 100644
+--- a/atspi/meson.build
++++ b/atspi/meson.build
+@@ -57,7 +57,7 @@ atspi_headers = [
+
+ atspi_includedir = join_paths(get_option('prefix'), get_option('includedir'), 'at-spi-2.0', 'atspi')
+
+-install_headers(atspi_headers, subdir: atspi_includedir)
++install_headers(atspi_headers, install_dir: atspi_includedir)
+
+ atspi_enums = gnome.mkenums('atspi-enum-types',
+ sources: [ 'atspi-constants.h', 'atspi-types.h' ],
diff --git a/meta/recipes-support/atk/at-spi2-core_2.30.0.bb b/meta/recipes-support/atk/at-spi2-core_2.30.0.bb
index 06fb7195b64..36e8a9ef486 100644
--- a/meta/recipes-support/atk/at-spi2-core_2.30.0.bb
+++ b/meta/recipes-support/atk/at-spi2-core_2.30.0.bb
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886"
MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
+ file://meson-0.50-fix.patch \
"
SRC_URI[md5sum] = "d4f22c66b3210ffe6b10d01c04e008b5"
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 14/19] ffmpeg: update to 4.1.3
2019-04-15 10:54 [PATCH 01/19] gobject-introspection: update to 1.60.1 Alexander Kanavin
` (11 preceding siblings ...)
2019-04-15 10:54 ` [PATCH 13/19] at-spi2-core: fix meson 0.50 build Alexander Kanavin
@ 2019-04-15 10:54 ` Alexander Kanavin
2019-04-15 10:54 ` [PATCH 15/19] icu: update to 64.1 Alexander Kanavin
` (5 subsequent siblings)
18 siblings, 0 replies; 25+ messages in thread
From: Alexander Kanavin @ 2019-04-15 10:54 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../ffmpeg/{ffmpeg_4.1.2.bb => ffmpeg_4.1.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-multimedia/ffmpeg/{ffmpeg_4.1.2.bb => ffmpeg_4.1.3.bb} (97%)
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.1.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.1.3.bb
similarity index 97%
rename from meta/recipes-multimedia/ffmpeg/ffmpeg_4.1.2.bb
rename to meta/recipes-multimedia/ffmpeg/ffmpeg_4.1.3.bb
index e76fe7cbbfc..994a792ded4 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.1.2.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.1.3.bb
@@ -26,8 +26,8 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
file://mips64_cpu_detection.patch \
"
-SRC_URI[md5sum] = "8f7f0a6c5d81ff20d9d65d000a6b419d"
-SRC_URI[sha256sum] = "b95f0ae44798ab1434155ac7f81f30a7e9760a02282e4b5898372c22a335347b"
+SRC_URI[md5sum] = "dcc20dd2682ea01c678b7b8324339d43"
+SRC_URI[sha256sum] = "0c3020452880581a8face91595b239198078645e7d7184273b8bcc7758beb63d"
# Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
ARM_INSTRUCTION_SET_armv4 = "arm"
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 15/19] icu: update to 64.1
2019-04-15 10:54 [PATCH 01/19] gobject-introspection: update to 1.60.1 Alexander Kanavin
` (12 preceding siblings ...)
2019-04-15 10:54 ` [PATCH 14/19] ffmpeg: update to 4.1.3 Alexander Kanavin
@ 2019-04-15 10:54 ` Alexander Kanavin
2019-04-15 19:58 ` Richard Purdie
2019-04-15 10:54 ` [PATCH 16/19] python: update to 2.7.16 Alexander Kanavin
` (4 subsequent siblings)
18 siblings, 1 reply; 25+ messages in thread
From: Alexander Kanavin @ 2019-04-15 10:54 UTC (permalink / raw)
To: openembedded-core
License-update: copyright years changed.
Drop upstreamed/backported patches.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../icu/icu/0002-Add-ARC-support.patch | 27 --------
.../icu/icu/CVE-2018-18928.patch | 63 -------------------
.../icu/{icu_63.1.bb => icu_64.1.bb} | 8 +--
3 files changed, 3 insertions(+), 95 deletions(-)
delete mode 100644 meta/recipes-support/icu/icu/0002-Add-ARC-support.patch
delete mode 100644 meta/recipes-support/icu/icu/CVE-2018-18928.patch
rename meta/recipes-support/icu/{icu_63.1.bb => icu_64.1.bb} (70%)
diff --git a/meta/recipes-support/icu/icu/0002-Add-ARC-support.patch b/meta/recipes-support/icu/icu/0002-Add-ARC-support.patch
deleted file mode 100644
index 20e3d8356c4..00000000000
--- a/meta/recipes-support/icu/icu/0002-Add-ARC-support.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From fcfd57105b4bdb30d906df152ef01748fa95daff Mon Sep 17 00:00:00 2001
-From: Alexey Brodkin <abrodkin@synopsys.com>
-Date: Thu, 13 Sep 2018 17:13:20 +0300
-Subject: [PATCH] icu: Add ARC support
-
-Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
-
-Upstream-Status: Submitted [ https://github.com/unicode-org/icu/pull/149 ]
----
- i18n/double-conversion-utils.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/i18n/double-conversion-utils.h b/i18n/double-conversion-utils.h
-index 57fc49b231a3..0bd3e8340673 100644
---- a/i18n/double-conversion-utils.h
-+++ b/i18n/double-conversion-utils.h
-@@ -86,7 +86,7 @@ inline void abort_noreturn() { abort(); }
- defined(__SH4__) || defined(__alpha__) || \
- defined(_MIPS_ARCH_MIPS32R2) || \
- defined(__AARCH64EL__) || defined(__aarch64__) || \
-- defined(__riscv)
-+ defined(__riscv) || defined(__arc__)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
- #elif defined(__mc68000__)
- #undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS
-2.17.1
-
diff --git a/meta/recipes-support/icu/icu/CVE-2018-18928.patch b/meta/recipes-support/icu/icu/CVE-2018-18928.patch
deleted file mode 100644
index 19c50e4e76a..00000000000
--- a/meta/recipes-support/icu/icu/CVE-2018-18928.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-CVE: CVE-2018-18928
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From 53d8c8f3d181d87a6aa925b449b51c4a2c922a51 Mon Sep 17 00:00:00 2001
-From: Shane Carr <shane@unicode.org>
-Date: Mon, 29 Oct 2018 23:52:44 -0700
-Subject: [PATCH] ICU-20246 Fixing another integer overflow in number parsing.
-
----
- i18n/fmtable.cpp | 2 +-
- i18n/number_decimalquantity.cpp | 5 ++++-
- test/intltest/numfmtst.cpp | 8 ++++++++
- 6 files changed, 31 insertions(+), 4 deletions(-)
-
-diff --git a/i18n/fmtable.cpp b/i18n/fmtable.cpp
-index 45c7024fc29..8601d95f4a6 100644
---- a/i18n/fmtable.cpp
-+++ b/i18n/fmtable.cpp
-@@ -734,7 +734,7 @@ CharString *Formattable::internalGetCharString(UErrorCode &status) {
- // not print scientific notation for magnitudes greater than -5 and smaller than some amount (+5?).
- if (fDecimalQuantity->isZero()) {
- fDecimalStr->append("0", -1, status);
-- } else if (std::abs(fDecimalQuantity->getMagnitude()) < 5) {
-+ } else if (fDecimalQuantity->getMagnitude() != INT32_MIN && std::abs(fDecimalQuantity->getMagnitude()) < 5) {
- fDecimalStr->appendInvariantChars(fDecimalQuantity->toPlainString(), status);
- } else {
- fDecimalStr->appendInvariantChars(fDecimalQuantity->toScientificString(), status);
-diff --git a/i18n/number_decimalquantity.cpp b/i18n/number_decimalquantity.cpp
-index 47b930a564b..d5dd7ae694c 100644
---- a/i18n/number_decimalquantity.cpp
-+++ b/i18n/number_decimalquantity.cpp
-@@ -898,7 +898,10 @@ UnicodeString DecimalQuantity::toScientificString() const {
- }
- result.append(u'E');
- int32_t _scale = upperPos + scale;
-- if (_scale < 0) {
-+ if (_scale == INT32_MIN) {
-+ result.append({u"-2147483648", -1});
-+ return result;
-+ } else if (_scale < 0) {
- _scale *= -1;
- result.append(u'-');
- } else {
-diff --git a/test/intltest/numfmtst.cpp b/test/intltest/numfmtst.cpp
-index 34355939113..8d52dc122bf 100644
---- a/test/intltest/numfmtst.cpp
-+++ b/test/intltest/numfmtst.cpp
-@@ -9226,6 +9226,14 @@ void NumberFormatTest::Test20037_ScientificIntegerOverflow() {
- assertEquals(u"Should not overflow and should parse only the first exponent",
- u"1E-2147483647",
- {sp.data(), sp.length(), US_INV});
-+
-+ // Test edge case overflow of exponent
-+ result = Formattable();
-+ nf->parse(u".0003e-2147483644", result, status);
-+ sp = result.getDecimalNumber(status);
-+ assertEquals(u"Should not overflow",
-+ u"3E-2147483648",
-+ {sp.data(), sp.length(), US_INV});
- }
-
- void NumberFormatTest::Test13840_ParseLongStringCrash() {
diff --git a/meta/recipes-support/icu/icu_63.1.bb b/meta/recipes-support/icu/icu_64.1.bb
similarity index 70%
rename from meta/recipes-support/icu/icu_63.1.bb
rename to meta/recipes-support/icu/icu_64.1.bb
index 961f022ad7a..e624b775a7e 100644
--- a/meta/recipes-support/icu/icu_63.1.bb
+++ b/meta/recipes-support/icu/icu_64.1.bb
@@ -1,6 +1,6 @@
require icu.inc
-LIC_FILES_CHKSUM = "file://../LICENSE;md5=63752c57bd0b365c9af9f427ef79c819"
+LIC_FILES_CHKSUM = "file://../LICENSE;md5=8bc5d32052a96f214cbdd1e53dfc935d"
def icu_download_version(d):
pvsplit = d.getVar('PV').split('.')
@@ -16,15 +16,13 @@ BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV
SRC_URI = "${BASE_SRC_URI} \
file://icu-pkgdata-large-cmd.patch \
file://fix-install-manx.patch \
- file://0002-Add-ARC-support.patch \
- file://CVE-2018-18928.patch \
"
SRC_URI_append_class-target = "\
file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
"
-SRC_URI[md5sum] = "9e40f6055294284df958200e308bce50"
-SRC_URI[sha256sum] = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d"
+SRC_URI[md5sum] = "f150be2231c13bb45206d79e0242372b"
+SRC_URI[sha256sum] = "92f1b7b9d51b396679c17f35a2112423361b8da3c1b9de00aa94fd768ae296e6"
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/"
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 16/19] python: update to 2.7.16
2019-04-15 10:54 [PATCH 01/19] gobject-introspection: update to 1.60.1 Alexander Kanavin
` (13 preceding siblings ...)
2019-04-15 10:54 ` [PATCH 15/19] icu: update to 64.1 Alexander Kanavin
@ 2019-04-15 10:54 ` Alexander Kanavin
2019-04-15 10:54 ` [PATCH 17/19] python: update to 3.7.3 Alexander Kanavin
` (3 subsequent siblings)
18 siblings, 0 replies; 25+ messages in thread
From: Alexander Kanavin @ 2019-04-15 10:54 UTC (permalink / raw)
To: openembedded-core
Drop backported patches
License-update: copyright years
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...tive_2.7.15.bb => python-native_2.7.16.bb} | 2 -
meta/recipes-devtools/python/python.inc | 11 +-
...e-XML_SetHashSalt-in-_elementtree-GH.patch | 96 --------------
...st_ssl-when-a-filename-cannot-be-enc.patch | 55 --------
...3-ciphers-for-OpenSSL-1.1.1-GH-6976-.patch | 120 ------------------
...-Convert-shutil._call_external_zip-t.patch | 67 ----------
...ssing-closing-wrapper-in-test_tls1_3.patch | 37 ------
...st_ssl.test_options-to-account-for-O.patch | 37 ------
...st_default_ecdh_curve-needs-no-tlsv1.patch | 34 -----
.../{python_2.7.15.bb => python_2.7.16.bb} | 56 ++++----
10 files changed, 29 insertions(+), 486 deletions(-)
rename meta/recipes-devtools/python/{python-native_2.7.15.bb => python-native_2.7.16.bb} (96%)
delete mode 100644 meta/recipes-devtools/python/python/0001-2.7-bpo-34623-Use-XML_SetHashSalt-in-_elementtree-GH.patch
delete mode 100644 meta/recipes-devtools/python/python/0001-bpo-33354-Fix-test_ssl-when-a-filename-cannot-be-enc.patch
delete mode 100644 meta/recipes-devtools/python/python/0001-bpo-33570-TLS-1.3-ciphers-for-OpenSSL-1.1.1-GH-6976-.patch
delete mode 100644 meta/recipes-devtools/python/python/0001-closes-bpo-34540-Convert-shutil._call_external_zip-t.patch
delete mode 100644 meta/recipes-devtools/python/python/0002-bpo-34818-Add-missing-closing-wrapper-in-test_tls1_3.patch
delete mode 100644 meta/recipes-devtools/python/python/0003-bpo-34834-Fix-test_ssl.test_options-to-account-for-O.patch
delete mode 100644 meta/recipes-devtools/python/python/0004-bpo-34836-fix-test_default_ecdh_curve-needs-no-tlsv1.patch
rename meta/recipes-devtools/python/{python_2.7.15.bb => python_2.7.16.bb} (86%)
diff --git a/meta/recipes-devtools/python/python-native_2.7.15.bb b/meta/recipes-devtools/python/python-native_2.7.16.bb
similarity index 96%
rename from meta/recipes-devtools/python/python-native_2.7.15.bb
rename to meta/recipes-devtools/python/python-native_2.7.16.bb
index 26d67df6b83..b7442800d98 100644
--- a/meta/recipes-devtools/python/python-native_2.7.15.bb
+++ b/meta/recipes-devtools/python/python-native_2.7.16.bb
@@ -1,7 +1,6 @@
require python.inc
EXTRANATIVEPATH += "bzip2-native"
DEPENDS = "openssl-native bzip2-replacement-native zlib-native readline-native sqlite3-native expat-native gdbm-native db-native"
-PR = "${INC_PR}.1"
SRC_URI += "\
file://05-enable-ctypes-cross-build.patch \
@@ -17,7 +16,6 @@ SRC_URI += "\
file://parallel-makeinst-create-bindir.patch \
file://revert_use_of_sysconfigdata.patch \
file://0001-python-native-fix-one-do_populate_sysroot-warning.patch \
- file://0001-2.7-bpo-34623-Use-XML_SetHashSalt-in-_elementtree-GH.patch \
"
S = "${WORKDIR}/Python-${PV}"
diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc
index 66923678b1d..779df535215 100644
--- a/meta/recipes-devtools/python/python.inc
+++ b/meta/recipes-devtools/python/python.inc
@@ -5,18 +5,13 @@ SECTION = "devel/python"
# bump this on every change in contrib/python/generate-manifest-2.7.py
INC_PR = "r1"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=f257cc14f81685691652a3d3e1b5d754"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e466242989bd33c1bd2b6a526a742498"
SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
- file://0001-bpo-33570-TLS-1.3-ciphers-for-OpenSSL-1.1.1-GH-6976-.patch \
- file://0002-bpo-34818-Add-missing-closing-wrapper-in-test_tls1_3.patch \
- file://0003-bpo-34834-Fix-test_ssl.test_options-to-account-for-O.patch \
- file://0004-bpo-34836-fix-test_default_ecdh_curve-needs-no-tlsv1.patch \
- file://0001-bpo-33354-Fix-test_ssl-when-a-filename-cannot-be-enc.patch \
"
-SRC_URI[md5sum] = "a80ae3cc478460b922242f43a1b4094d"
-SRC_URI[sha256sum] = "22d9b1ac5b26135ad2b8c2901a9413537e08749a753356ee913c84dbd2df5574"
+SRC_URI[md5sum] = "30157d85a2c0479c09ea2cbe61f2aaf5"
+SRC_URI[sha256sum] = "f222ef602647eecb6853681156d32de4450a2c39f4de93bd5b20235f2e660ed7"
# python recipe is actually python 2.x
# also, exclude pre-releases for both python 2.x and 3.x
diff --git a/meta/recipes-devtools/python/python/0001-2.7-bpo-34623-Use-XML_SetHashSalt-in-_elementtree-GH.patch b/meta/recipes-devtools/python/python/0001-2.7-bpo-34623-Use-XML_SetHashSalt-in-_elementtree-GH.patch
deleted file mode 100644
index 3c0d6622966..00000000000
--- a/meta/recipes-devtools/python/python/0001-2.7-bpo-34623-Use-XML_SetHashSalt-in-_elementtree-GH.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 3ffc80959f01f9fde548f1632694b9f950c2dd7c Mon Sep 17 00:00:00 2001
-From: Christian Heimes <christian@python.org>
-Date: Tue, 18 Sep 2018 15:13:09 +0200
-Subject: [PATCH] [2.7] bpo-34623: Use XML_SetHashSalt in _elementtree
- (GH-9146) (GH-9394)
-
-The C accelerated _elementtree module now initializes hash randomization
-salt from _Py_HashSecret instead of libexpat's default CPRNG.
-
-Signed-off-by: Christian Heimes <christian@python.org>
-
-https://bugs.python.org/issue34623.
-(cherry picked from commit cb5778f00ce48631c7140f33ba242496aaf7102b)
-
-Co-authored-by: Christian Heimes <christian@python.org>
-
-
-
-https://bugs.python.org/issue34623
-
-Upstream-Status: Backport
-CVE: CVE-2018-14647
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
----
- Include/pyexpat.h | 4 +++-
- Misc/NEWS.d/next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst | 2 ++
- Modules/_elementtree.c | 5 +++++
- Modules/pyexpat.c | 5 +++++
- 4 files changed, 15 insertions(+), 1 deletion(-)
- create mode 100644 Misc/NEWS.d/next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst
-
-diff --git a/Include/pyexpat.h b/Include/pyexpat.h
-index 5340ef5..3fc5fa5 100644
---- a/Include/pyexpat.h
-+++ b/Include/pyexpat.h
-@@ -3,7 +3,7 @@
-
- /* note: you must import expat.h before importing this module! */
-
--#define PyExpat_CAPI_MAGIC "pyexpat.expat_CAPI 1.0"
-+#define PyExpat_CAPI_MAGIC "pyexpat.expat_CAPI 1.1"
- #define PyExpat_CAPSULE_NAME "pyexpat.expat_CAPI"
-
- struct PyExpat_CAPI
-@@ -43,6 +43,8 @@ struct PyExpat_CAPI
- XML_Parser parser, XML_UnknownEncodingHandler handler,
- void *encodingHandlerData);
- void (*SetUserData)(XML_Parser parser, void *userData);
-+ /* might be none for expat < 2.1.0 */
-+ int (*SetHashSalt)(XML_Parser parser, unsigned long hash_salt);
- /* always add new stuff to the end! */
- };
-
-diff --git a/Misc/NEWS.d/next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst b/Misc/NEWS.d/next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst
-new file mode 100644
-index 0000000..31ad92e
---- /dev/null
-+++ b/Misc/NEWS.d/next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst
-@@ -0,0 +1,2 @@
-+The C accelerated _elementtree module now initializes hash randomization
-+salt from _Py_HashSecret instead of libexpat's default CSPRNG.
-diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
-index 1d316a1..a19cbf7 100644
---- a/Modules/_elementtree.c
-+++ b/Modules/_elementtree.c
-@@ -2574,6 +2574,11 @@ xmlparser(PyObject* self_, PyObject* args, PyObject* kw)
- PyErr_NoMemory();
- return NULL;
- }
-+ /* expat < 2.1.0 has no XML_SetHashSalt() */
-+ if (EXPAT(SetHashSalt) != NULL) {
-+ EXPAT(SetHashSalt)(self->parser,
-+ (unsigned long)_Py_HashSecret.prefix);
-+ }
-
- ALLOC(sizeof(XMLParserObject), "create expatparser");
-
-diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
-index 2b4d312..1f8c0d7 100644
---- a/Modules/pyexpat.c
-+++ b/Modules/pyexpat.c
-@@ -2042,6 +2042,11 @@ MODULE_INITFUNC(void)
- capi.SetProcessingInstructionHandler = XML_SetProcessingInstructionHandler;
- capi.SetUnknownEncodingHandler = XML_SetUnknownEncodingHandler;
- capi.SetUserData = XML_SetUserData;
-+#if XML_COMBINED_VERSION >= 20100
-+ capi.SetHashSalt = XML_SetHashSalt;
-+#else
-+ capi.SetHashSalt = NULL;
-+#endif
-
- /* export using capsule */
- capi_object = PyCapsule_New(&capi, PyExpat_CAPSULE_NAME, NULL);
---
-2.7.4
-
diff --git a/meta/recipes-devtools/python/python/0001-bpo-33354-Fix-test_ssl-when-a-filename-cannot-be-enc.patch b/meta/recipes-devtools/python/python/0001-bpo-33354-Fix-test_ssl-when-a-filename-cannot-be-enc.patch
deleted file mode 100644
index 4c0b3577b24..00000000000
--- a/meta/recipes-devtools/python/python/0001-bpo-33354-Fix-test_ssl-when-a-filename-cannot-be-enc.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 19f6bd06af3c7fc0db5f96878aaa68f5589ff13e Mon Sep 17 00:00:00 2001
-From: Pablo Galindo <Pablogsal@gmail.com>
-Date: Thu, 24 May 2018 23:20:44 +0100
-Subject: [PATCH] bpo-33354: Fix test_ssl when a filename cannot be encoded
- (GH-6613)
-
-Skip test_load_dh_params() of test_ssl when Python filesystem encoding
-cannot encode the provided path.
-
-Upstream-Status: Backport [https://github.com/python/cpython/commit/19f6bd06af3c7fc0db5f96878aaa68f5589ff13e]
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- Lib/test/test_ssl.py | 9 ++++++++-
- .../next/Tests/2018-04-26-22-39-17.bpo-33354.g35-44.rst | 2 ++
- 2 files changed, 10 insertions(+), 1 deletion(-)
- create mode 100644 Misc/NEWS.d/next/Tests/2018-04-26-22-39-17.bpo-33354.g35-44.rst
-
-diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
-index b59fe73f04..7ced90fdf6 100644
---- a/Lib/test/test_ssl.py
-+++ b/Lib/test/test_ssl.py
-@@ -989,6 +989,13 @@ class ContextTests(unittest.TestCase):
-
-
- def test_load_dh_params(self):
-+ filename = u'dhpäräm.pem'
-+ fs_encoding = sys.getfilesystemencoding()
-+ try:
-+ filename.encode(fs_encoding)
-+ except UnicodeEncodeError:
-+ self.skipTest("filename %r cannot be encoded to the filesystem encoding %r" % (filename, fs_encoding))
-+
- ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
- ctx.load_dh_params(DHFILE)
- if os.name != 'nt':
-@@ -1001,7 +1008,7 @@ class ContextTests(unittest.TestCase):
- with self.assertRaises(ssl.SSLError) as cm:
- ctx.load_dh_params(CERTFILE)
- with support.temp_dir() as d:
-- fname = os.path.join(d, u'dhpäräm.pem')
-+ fname = os.path.join(d, filename)
- shutil.copy(DHFILE, fname)
- ctx.load_dh_params(fname)
-
-diff --git a/Misc/NEWS.d/next/Tests/2018-04-26-22-39-17.bpo-33354.g35-44.rst b/Misc/NEWS.d/next/Tests/2018-04-26-22-39-17.bpo-33354.g35-44.rst
-new file mode 100644
-index 0000000000..c66cecac32
---- /dev/null
-+++ b/Misc/NEWS.d/next/Tests/2018-04-26-22-39-17.bpo-33354.g35-44.rst
-@@ -0,0 +1,2 @@
-+Skip ``test_ssl.test_load_dh_params`` when Python filesystem encoding cannot encode the
-+provided path.
---
-2.17.1
-
diff --git a/meta/recipes-devtools/python/python/0001-bpo-33570-TLS-1.3-ciphers-for-OpenSSL-1.1.1-GH-6976-.patch b/meta/recipes-devtools/python/python/0001-bpo-33570-TLS-1.3-ciphers-for-OpenSSL-1.1.1-GH-6976-.patch
deleted file mode 100644
index 1f70562fc06..00000000000
--- a/meta/recipes-devtools/python/python/0001-bpo-33570-TLS-1.3-ciphers-for-OpenSSL-1.1.1-GH-6976-.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From a333351592f097220fc862911b34d3a300f0985e Mon Sep 17 00:00:00 2001
-From: Christian Heimes <christian@python.org>
-Date: Wed, 15 Aug 2018 09:07:28 +0200
-Subject: [PATCH 1/4] bpo-33570: TLS 1.3 ciphers for OpenSSL 1.1.1 (GH-6976)
- (GH-8760)
-
-Change TLS 1.3 cipher suite settings for compatibility with OpenSSL
-1.1.1-pre6 and newer. OpenSSL 1.1.1 will have TLS 1.3 cipers enabled by
-default.
-
-Also update multissltests to test with latest OpenSSL.
-
-Signed-off-by: Christian Heimes <christian@python.org>.
-(cherry picked from commit 3e630c541b35c96bfe5619165255e559f577ee71)
-
-Co-authored-by: Christian Heimes <christian@python.org>
-
-Upstream-Status: Accepted [https://github.com/python/cpython/pull/8771]
-
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- Doc/library/ssl.rst | 8 ++--
- Lib/test/test_ssl.py | 37 +++++++++++--------
- .../2018-05-18-21-50-47.bpo-33570.7CZy4t.rst | 3 ++
- 3 files changed, 27 insertions(+), 21 deletions(-)
- create mode 100644 Misc/NEWS.d/next/Library/2018-05-18-21-50-47.bpo-33570.7CZy4t.rst
-
-diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
-index 0421031772..7c7c85b833 100644
---- a/Doc/library/ssl.rst
-+++ b/Doc/library/ssl.rst
-@@ -294,11 +294,6 @@ purposes.
-
- 3DES was dropped from the default cipher string.
-
-- .. versionchanged:: 2.7.15
--
-- TLS 1.3 cipher suites TLS_AES_128_GCM_SHA256, TLS_AES_256_GCM_SHA384,
-- and TLS_CHACHA20_POLY1305_SHA256 were added to the default cipher string.
--
- .. function:: _https_verify_certificates(enable=True)
-
- Specifies whether or not server certificates are verified when creating
-@@ -1179,6 +1174,9 @@ to speed up repeated connections from the same clients.
- when connected, the :meth:`SSLSocket.cipher` method of SSL sockets will
- give the currently selected cipher.
-
-+ OpenSSL 1.1.1 has TLS 1.3 cipher suites enabled by default. The suites
-+ cannot be disabled with :meth:`~SSLContext.set_ciphers`.
-+
- .. method:: SSLContext.set_alpn_protocols(protocols)
-
- Specify which protocols the socket should advertise during the SSL/TLS
-diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
-index dc14e22ad1..f51572e319 100644
---- a/Lib/test/test_ssl.py
-+++ b/Lib/test/test_ssl.py
-@@ -2772,19 +2772,24 @@ else:
- sock.do_handshake()
- self.assertEqual(cm.exception.errno, errno.ENOTCONN)
-
-- def test_default_ciphers(self):
-- context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
-- try:
-- # Force a set of weak ciphers on our client context
-- context.set_ciphers("DES")
-- except ssl.SSLError:
-- self.skipTest("no DES cipher available")
-- with ThreadedEchoServer(CERTFILE,
-- ssl_version=ssl.PROTOCOL_SSLv23,
-- chatty=False) as server:
-- with closing(context.wrap_socket(socket.socket())) as s:
-- with self.assertRaises(ssl.SSLError):
-- s.connect((HOST, server.port))
-+ def test_no_shared_ciphers(self):
-+ server_context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
-+ server_context.load_cert_chain(SIGNED_CERTFILE)
-+ client_context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
-+ client_context.verify_mode = ssl.CERT_REQUIRED
-+ client_context.check_hostname = True
-+
-+ # OpenSSL enables all TLS 1.3 ciphers, enforce TLS 1.2 for test
-+ client_context.options |= ssl.OP_NO_TLSv1_3
-+ # Force different suites on client and master
-+ client_context.set_ciphers("AES128")
-+ server_context.set_ciphers("AES256")
-+ with ThreadedEchoServer(context=server_context) as server:
-+ s = client_context.wrap_socket(
-+ socket.socket(),
-+ server_hostname="localhost")
-+ with self.assertRaises(ssl.SSLError):
-+ s.connect((HOST, server.port))
- self.assertIn("no shared cipher", str(server.conn_errors[0]))
-
- def test_version_basic(self):
-@@ -2815,9 +2820,9 @@ else:
- with context.wrap_socket(socket.socket()) as s:
- s.connect((HOST, server.port))
- self.assertIn(s.cipher()[0], [
-- 'TLS13-AES-256-GCM-SHA384',
-- 'TLS13-CHACHA20-POLY1305-SHA256',
-- 'TLS13-AES-128-GCM-SHA256',
-+ 'TLS_AES_256_GCM_SHA384',
-+ 'TLS_CHACHA20_POLY1305_SHA256',
-+ 'TLS_AES_128_GCM_SHA256',
- ])
-
- @unittest.skipUnless(ssl.HAS_ECDH, "test requires ECDH-enabled OpenSSL")
-diff --git a/Misc/NEWS.d/next/Library/2018-05-18-21-50-47.bpo-33570.7CZy4t.rst b/Misc/NEWS.d/next/Library/2018-05-18-21-50-47.bpo-33570.7CZy4t.rst
-new file mode 100644
-index 0000000000..bd719a47e8
---- /dev/null
-+++ b/Misc/NEWS.d/next/Library/2018-05-18-21-50-47.bpo-33570.7CZy4t.rst
-@@ -0,0 +1,3 @@
-+Change TLS 1.3 cipher suite settings for compatibility with OpenSSL
-+1.1.1-pre6 and newer. OpenSSL 1.1.1 will have TLS 1.3 cipers enabled by
-+default.
---
-2.17.1
-
diff --git a/meta/recipes-devtools/python/python/0001-closes-bpo-34540-Convert-shutil._call_external_zip-t.patch b/meta/recipes-devtools/python/python/0001-closes-bpo-34540-Convert-shutil._call_external_zip-t.patch
deleted file mode 100644
index 125db8512a9..00000000000
--- a/meta/recipes-devtools/python/python/0001-closes-bpo-34540-Convert-shutil._call_external_zip-t.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From c7e692c61dc091d07dee573f5f424b6b427ff056 Mon Sep 17 00:00:00 2001
-From: Benjamin Peterson <benjamin@python.org>
-Date: Wed, 29 Aug 2018 21:59:21 -0700
-Subject: [PATCH] closes bpo-34540: Convert shutil._call_external_zip to use
- subprocess rather than distutils.spawn. (GH-8985)
-
-Upstream-Status: Backport
-CVE: CVE-2018-1000802
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
----
- Lib/shutil.py | 16 ++++++++++------
- .../Security/2018-08-28-22-11-54.bpo-34540.gfQ0TM.rst | 3 +++
- 2 files changed, 13 insertions(+), 6 deletions(-)
- create mode 100644 Misc/NEWS.d/next/Security/2018-08-28-22-11-54.bpo-34540.gfQ0TM.rst
-
-diff --git a/Lib/shutil.py b/Lib/shutil.py
-index 3462f7c..0ab1a06 100644
---- a/Lib/shutil.py
-+++ b/Lib/shutil.py
-@@ -413,17 +413,21 @@ def _make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0,
-
- return archive_name
-
--def _call_external_zip(base_dir, zip_filename, verbose=False, dry_run=False):
-+def _call_external_zip(base_dir, zip_filename, verbose, dry_run, logger):
- # XXX see if we want to keep an external call here
- if verbose:
- zipoptions = "-r"
- else:
- zipoptions = "-rq"
-- from distutils.errors import DistutilsExecError
-- from distutils.spawn import spawn
-+ cmd = ["zip", zipoptions, zip_filename, base_dir]
-+ if logger is not None:
-+ logger.info(' '.join(cmd))
-+ if dry_run:
-+ return
-+ import subprocess
- try:
-- spawn(["zip", zipoptions, zip_filename, base_dir], dry_run=dry_run)
-- except DistutilsExecError:
-+ subprocess.check_call(cmd)
-+ except subprocess.CalledProcessError:
- # XXX really should distinguish between "couldn't find
- # external 'zip' command" and "zip failed".
- raise ExecError, \
-@@ -458,7 +462,7 @@ def _make_zipfile(base_name, base_dir, verbose=0, dry_run=0, logger=None):
- zipfile = None
-
- if zipfile is None:
-- _call_external_zip(base_dir, zip_filename, verbose, dry_run)
-+ _call_external_zip(base_dir, zip_filename, verbose, dry_run, logger)
- else:
- if logger is not None:
- logger.info("creating '%s' and adding '%s' to it",
-diff --git a/Misc/NEWS.d/next/Security/2018-08-28-22-11-54.bpo-34540.gfQ0TM.rst b/Misc/NEWS.d/next/Security/2018-08-28-22-11-54.bpo-34540.gfQ0TM.rst
-new file mode 100644
-index 0000000..4f68696
---- /dev/null
-+++ b/Misc/NEWS.d/next/Security/2018-08-28-22-11-54.bpo-34540.gfQ0TM.rst
-@@ -0,0 +1,3 @@
-+When ``shutil.make_archive`` falls back to the external ``zip`` problem, it
-+uses :mod:`subprocess` to invoke it rather than :mod:`distutils.spawn`. This
-+closes a possible shell injection vector.
---
-2.7.4
-
diff --git a/meta/recipes-devtools/python/python/0002-bpo-34818-Add-missing-closing-wrapper-in-test_tls1_3.patch b/meta/recipes-devtools/python/python/0002-bpo-34818-Add-missing-closing-wrapper-in-test_tls1_3.patch
deleted file mode 100644
index 96882712e95..00000000000
--- a/meta/recipes-devtools/python/python/0002-bpo-34818-Add-missing-closing-wrapper-in-test_tls1_3.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 0e1f3856a7e1511fb64d99646c54ddf3897cd444 Mon Sep 17 00:00:00 2001
-From: Dimitri John Ledkov <xnox@ubuntu.com>
-Date: Fri, 28 Sep 2018 14:15:52 +0100
-Subject: [PATCH 2/4] bpo-34818: Add missing closing() wrapper in test_tls1_3.
-
-Python 2.7 socket classes do not implement context manager protocol,
-hence closing() is required around it. Resolves testcase error
-traceback.
-
-Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
-
-https://bugs.python.org/issue34818
-
-Patch taken from Ubuntu.
-
-Upstream-Status: Submitted [https://github.com/python/cpython/pull/9622]
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- Lib/test/test_ssl.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
-index f51572e319..7a14053cee 100644
---- a/Lib/test/test_ssl.py
-+++ b/Lib/test/test_ssl.py
-@@ -2817,7 +2817,7 @@ else:
- ssl.OP_NO_TLSv1 | ssl.OP_NO_TLSv1_1 | ssl.OP_NO_TLSv1_2
- )
- with ThreadedEchoServer(context=context) as server:
-- with context.wrap_socket(socket.socket()) as s:
-+ with closing(context.wrap_socket(socket.socket())) as s:
- s.connect((HOST, server.port))
- self.assertIn(s.cipher()[0], [
- 'TLS_AES_256_GCM_SHA384',
---
-2.17.1
-
diff --git a/meta/recipes-devtools/python/python/0003-bpo-34834-Fix-test_ssl.test_options-to-account-for-O.patch b/meta/recipes-devtools/python/python/0003-bpo-34834-Fix-test_ssl.test_options-to-account-for-O.patch
deleted file mode 100644
index 77016cb430a..00000000000
--- a/meta/recipes-devtools/python/python/0003-bpo-34834-Fix-test_ssl.test_options-to-account-for-O.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 8b06d56d26eee289fec22b9b72ab4c7cc3d6c482 Mon Sep 17 00:00:00 2001
-From: Dimitri John Ledkov <xnox@ubuntu.com>
-Date: Fri, 28 Sep 2018 16:34:16 +0100
-Subject: [PATCH 3/4] bpo-34834: Fix test_ssl.test_options to account for
- OP_ENABLE_MIDDLEBOX_COMPAT.
-
-Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
-
-https://bugs.python.org/issue34834
-
-Patch taken from Ubuntu.
-Upstream-Status: Submitted [https://github.com/python/cpython/pull/9624]
-
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- Lib/test/test_ssl.py | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
-index 7a14053cee..efc906a5ba 100644
---- a/Lib/test/test_ssl.py
-+++ b/Lib/test/test_ssl.py
-@@ -777,6 +777,11 @@ class ContextTests(unittest.TestCase):
- default = (ssl.OP_ALL | ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3)
- if not IS_LIBRESSL and ssl.OPENSSL_VERSION_INFO >= (1, 1, 0):
- default |= ssl.OP_NO_COMPRESSION
-+ if not IS_LIBRESSL and ssl.OPENSSL_VERSION_INFO >= (1, 1, 1):
-+ # define MIDDLEBOX constant, as python2.7 does not know about it
-+ # but it is used by default.
-+ OP_ENABLE_MIDDLEBOX_COMPAT = 1048576L
-+ default |= OP_ENABLE_MIDDLEBOX_COMPAT
- self.assertEqual(default, ctx.options)
- ctx.options |= ssl.OP_NO_TLSv1
- self.assertEqual(default | ssl.OP_NO_TLSv1, ctx.options)
---
-2.17.1
-
diff --git a/meta/recipes-devtools/python/python/0004-bpo-34836-fix-test_default_ecdh_curve-needs-no-tlsv1.patch b/meta/recipes-devtools/python/python/0004-bpo-34836-fix-test_default_ecdh_curve-needs-no-tlsv1.patch
deleted file mode 100644
index 39e1bcfc862..00000000000
--- a/meta/recipes-devtools/python/python/0004-bpo-34836-fix-test_default_ecdh_curve-needs-no-tlsv1.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 946a7969345c6697697effd226ec396d3fea05b7 Mon Sep 17 00:00:00 2001
-From: Dimitri John Ledkov <xnox@ubuntu.com>
-Date: Fri, 28 Sep 2018 17:30:19 +0100
-Subject: [PATCH 4/4] bpo-34836: fix test_default_ecdh_curve, needs no tlsv1.3.
-
-Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
-
-https://bugs.python.org/issue34836
-
-Patch taken from Ubuntu.
-Upstream-Status: Submitted [https://github.com/python/cpython/pull/9626]
-
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- Lib/test/test_ssl.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
-index efc906a5ba..4a3286cd5f 100644
---- a/Lib/test/test_ssl.py
-+++ b/Lib/test/test_ssl.py
-@@ -2836,6 +2836,9 @@ else:
- # should be enabled by default on SSL contexts.
- context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
- context.load_cert_chain(CERTFILE)
-+ # TLSv1.3 defaults to PFS key agreement and no longer has KEA in
-+ # cipher name.
-+ context.options |= ssl.OP_NO_TLSv1_3
- # Prior to OpenSSL 1.0.0, ECDH ciphers have to be enabled
- # explicitly using the 'ECCdraft' cipher alias. Otherwise,
- # our default cipher list should prefer ECDH-based ciphers
---
-2.17.1
-
diff --git a/meta/recipes-devtools/python/python_2.7.15.bb b/meta/recipes-devtools/python/python_2.7.16.bb
similarity index 86%
rename from meta/recipes-devtools/python/python_2.7.15.bb
rename to meta/recipes-devtools/python/python_2.7.16.bb
index 62051a227b8..0e7dd2b3fb8 100644
--- a/meta/recipes-devtools/python/python_2.7.15.bb
+++ b/meta/recipes-devtools/python/python_2.7.16.bb
@@ -3,38 +3,34 @@ require python.inc
DEPENDS = "python-native libffi bzip2 gdbm openssl \
readline sqlite3 zlib virtual/crypt"
-PR = "${INC_PR}"
-
DISTRO_SRC_URI ?= "file://sitecustomize.py"
DISTRO_SRC_URI_linuxstdbase = ""
-SRC_URI += "\
- file://01-use-proper-tools-for-cross-build.patch \
- file://03-fix-tkinter-detection.patch \
- file://06-avoid_usr_lib_termcap_path_in_linking.patch \
- ${DISTRO_SRC_URI} \
- file://multilib.patch \
- file://cgi_py.patch \
- file://setup_py_skip_cross_import_check.patch \
- file://add-md5module-support.patch \
- file://host_include_contamination.patch \
- file://fix_for_using_different_libdir.patch \
- file://setuptweaks.patch \
- file://check-if-target-is-64b-not-host.patch \
- file://search_db_h_in_inc_dirs_and_avoid_warning.patch \
- ${@bb.utils.contains('PACKAGECONFIG', 'tk', '', 'file://avoid_warning_about_tkinter.patch', d)} \
- file://avoid_warning_for_sunos_specific_module.patch \
- file://python-2.7.3-remove-bsdb-rpath.patch \
- file://run-ptest \
- file://parallel-makeinst-create-bindir.patch \
- file://use_sysroot_ncurses_instead_of_host.patch \
- file://add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch \
- file://pass-missing-libraries-to-Extension-for-mul.patch \
- file://support_SOURCE_DATE_EPOCH_in_py_compile_2.7.patch \
- file://float-endian.patch \
- file://0001-closes-bpo-34540-Convert-shutil._call_external_zip-t.patch \
- file://0001-2.7-bpo-34623-Use-XML_SetHashSalt-in-_elementtree-GH.patch \
- file://0001-python2-use-cc_basename-to-replace-CC-for-checking-c.patch \
-"
+SRC_URI += " \
+ file://01-use-proper-tools-for-cross-build.patch \
+ file://03-fix-tkinter-detection.patch \
+ file://06-avoid_usr_lib_termcap_path_in_linking.patch \
+ ${DISTRO_SRC_URI} \
+ file://multilib.patch \
+ file://cgi_py.patch \
+ file://setup_py_skip_cross_import_check.patch \
+ file://add-md5module-support.patch \
+ file://host_include_contamination.patch \
+ file://fix_for_using_different_libdir.patch \
+ file://setuptweaks.patch \
+ file://check-if-target-is-64b-not-host.patch \
+ file://search_db_h_in_inc_dirs_and_avoid_warning.patch \
+ ${@bb.utils.contains('PACKAGECONFIG', 'tk', '', 'file://avoid_warning_about_tkinter.patch', d)} \
+ file://avoid_warning_for_sunos_specific_module.patch \
+ file://python-2.7.3-remove-bsdb-rpath.patch \
+ file://run-ptest \
+ file://parallel-makeinst-create-bindir.patch \
+ file://use_sysroot_ncurses_instead_of_host.patch \
+ file://add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch \
+ file://pass-missing-libraries-to-Extension-for-mul.patch \
+ file://support_SOURCE_DATE_EPOCH_in_py_compile_2.7.patch \
+ file://float-endian.patch \
+ file://0001-python2-use-cc_basename-to-replace-CC-for-checking-c.patch \
+ "
S = "${WORKDIR}/Python-${PV}"
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 17/19] python: update to 3.7.3
2019-04-15 10:54 [PATCH 01/19] gobject-introspection: update to 1.60.1 Alexander Kanavin
` (14 preceding siblings ...)
2019-04-15 10:54 ` [PATCH 16/19] python: update to 2.7.16 Alexander Kanavin
@ 2019-04-15 10:54 ` Alexander Kanavin
2019-04-15 10:54 ` [PATCH 18/19] python3-pygobject: update to 3.32.0 Alexander Kanavin
` (2 subsequent siblings)
18 siblings, 0 replies; 25+ messages in thread
From: Alexander Kanavin @ 2019-04-15 10:54 UTC (permalink / raw)
To: openembedded-core
License-update: copyright years
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...stutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch | 2 +-
.../12-distutils-prefix-is-inside-staging-area.patch | 2 +-
.../python/{python3_3.7.2.bb => python3_3.7.3.bb} | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
rename meta/recipes-devtools/python/{python3_3.7.2.bb => python3_3.7.3.bb} (98%)
diff --git a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
index 8083345a4e0..1741f5753b4 100644
--- a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
+++ b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
@@ -1,4 +1,4 @@
-From 4865615a2bc2b78c739e4c33f536712c7f9af061 Mon Sep 17 00:00:00 2001
+From 17796e353acf08acd604610f34840a4a9d2f4b54 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 31 Jan 2019 16:46:30 +0100
Subject: [PATCH] distutils/sysconfig: append
diff --git a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
index dcc0932c7f2..35213171bdb 100644
--- a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
+++ b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
@@ -1,4 +1,4 @@
-From 1397979ee445ff6826aa5469511e003539f77bb2 Mon Sep 17 00:00:00 2001
+From 12900d498bb77bcc990868a80eaf0ab257b88fff Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 14 May 2013 15:00:26 -0700
Subject: [PATCH] python3: Add target and native recipes
diff --git a/meta/recipes-devtools/python/python3_3.7.2.bb b/meta/recipes-devtools/python/python3_3.7.3.bb
similarity index 98%
rename from meta/recipes-devtools/python/python3_3.7.2.bb
rename to meta/recipes-devtools/python/python3_3.7.3.bb
index 6464aafa409..ea46b0535b9 100644
--- a/meta/recipes-devtools/python/python3_3.7.2.bb
+++ b/meta/recipes-devtools/python/python3_3.7.3.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.python.org"
LICENSE = "PSFv2"
SECTION = "devel/python"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=f257cc14f81685691652a3d3e1b5d754"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e466242989bd33c1bd2b6a526a742498"
SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
file://run-ptest \
@@ -29,8 +29,8 @@ SRC_URI_append_class-native = " \
file://12-distutils-prefix-is-inside-staging-area.patch \
"
-SRC_URI[md5sum] = "df6ec36011808205beda239c72f947cb"
-SRC_URI[sha256sum] = "d83fe8ce51b1bb48bbcf0550fd265b9a75cdfdfa93f916f9e700aef8444bf1bb"
+SRC_URI[md5sum] = "93df27aec0cd18d6d42173e601ffbbfd"
+SRC_URI[sha256sum] = "da60b54064d4cfcd9c26576f6df2690e62085123826cff2e667e72a91952d318"
# exclude pre-releases for both python 2.x and 3.x
UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 18/19] python3-pygobject: update to 3.32.0
2019-04-15 10:54 [PATCH 01/19] gobject-introspection: update to 1.60.1 Alexander Kanavin
` (15 preceding siblings ...)
2019-04-15 10:54 ` [PATCH 17/19] python: update to 3.7.3 Alexander Kanavin
@ 2019-04-15 10:54 ` Alexander Kanavin
2019-04-16 8:19 ` Richard Purdie
2019-04-15 10:54 ` [PATCH 19/19] python-numpy: update to 1.16.2 Alexander Kanavin
2019-04-17 21:04 ` [PATCH 01/19] gobject-introspection: update to 1.60.1 Khem Raj
18 siblings, 1 reply; 25+ messages in thread
From: Alexander Kanavin @ 2019-04-15 10:54 UTC (permalink / raw)
To: openembedded-core
Switch to meson build system.
Add a patch to disable tests.
Add "introspection" to unknown configure option whitelist, as
this recipe needs g-i unconditionally.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../0001-Do-not-build-tests.patch | 26 +++++++++++++++++++
..._3.28.3.bb => python3-pygobject_3.32.0.bb} | 10 ++++---
2 files changed, 33 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-devtools/python/python3-pygobject/0001-Do-not-build-tests.patch
rename meta/recipes-devtools/python/{python3-pygobject_3.28.3.bb => python3-pygobject_3.32.0.bb} (68%)
diff --git a/meta/recipes-devtools/python/python3-pygobject/0001-Do-not-build-tests.patch b/meta/recipes-devtools/python/python3-pygobject/0001-Do-not-build-tests.patch
new file mode 100644
index 00000000000..626a82cb095
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-pygobject/0001-Do-not-build-tests.patch
@@ -0,0 +1,26 @@
+From c125a806de951359ab7e302b0584f7c92fa451ad Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Fri, 12 Apr 2019 16:25:58 +0200
+Subject: [PATCH] Do not build tests
+
+They require installing tests from g-i, which we do not do.
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index a63d771..b3925d0 100644
+--- a/meson.build
++++ b/meson.build
+@@ -174,4 +174,4 @@ configure_file(input : 'PKG-INFO.in',
+
+ subdir('gi')
+ subdir('pygtkcompat')
+-subdir('tests')
++#subdir('tests')
+--
+2.17.1
+
diff --git a/meta/recipes-devtools/python/python3-pygobject_3.28.3.bb b/meta/recipes-devtools/python/python3-pygobject_3.32.0.bb
similarity index 68%
rename from meta/recipes-devtools/python/python3-pygobject_3.28.3.bb
rename to meta/recipes-devtools/python/python3-pygobject_3.32.0.bb
index 313af227b62..c2676b35022 100644
--- a/meta/recipes-devtools/python/python3-pygobject_3.28.3.bb
+++ b/meta/recipes-devtools/python/python3-pygobject_3.32.0.bb
@@ -3,6 +3,7 @@ SECTION = "devel/python"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
+GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase distutils3-base gobject-introspection upstream-version-is-even
DEPENDS += "python3 glib-2.0"
@@ -10,10 +11,13 @@ DEPENDS += "python3 glib-2.0"
SRCNAME="pygobject"
SRC_URI = " \
http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz \
+ file://0001-Do-not-build-tests.patch \
"
-SRC_URI[md5sum] = "3bac63c86bb963aa401f97859464aa90"
-SRC_URI[sha256sum] = "3dd3e21015d06e00482ea665fc1733b77e754a6ab656a5db5d7f7bfaf31ad0b0"
+UNKNOWN_CONFIGURE_WHITELIST = "introspection"
+
+SRC_URI[md5sum] = "6e39bca1d19a27cde4435061dd59578a"
+SRC_URI[sha256sum] = "83f4d7e59fde6bc6b0d39c5e5208574802f759bc525a4cb8e7265dfcba45ef29"
S = "${WORKDIR}/${SRCNAME}-${PV}"
@@ -21,7 +25,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', [ 'directfb', 'wa
# python3-pycairo is checked on configuration -> DEPENDS
# we don't link against python3-pycairo -> RDEPENDS
-PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo python3-pycairo, python3-pycairo"
+PACKAGECONFIG[cairo] = "-Dpycairo=true,-Dpycairo=false, cairo python3-pycairo, python3-pycairo"
RDEPENDS_${PN} += "python3-setuptools"
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH 18/19] python3-pygobject: update to 3.32.0
2019-04-15 10:54 ` [PATCH 18/19] python3-pygobject: update to 3.32.0 Alexander Kanavin
@ 2019-04-16 8:19 ` Richard Purdie
0 siblings, 0 replies; 25+ messages in thread
From: Richard Purdie @ 2019-04-16 8:19 UTC (permalink / raw)
To: Alexander Kanavin, openembedded-core
On Mon, 2019-04-15 at 12:54 +0200, Alexander Kanavin wrote:
> Switch to meson build system.
>
> Add a patch to disable tests.
>
> Add "introspection" to unknown configure option whitelist, as
> this recipe needs g-i unconditionally.
>
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
> .../0001-Do-not-build-tests.patch | 26
> +++++++++++++++++++
> ..._3.28.3.bb => python3-pygobject_3.32.0.bb} | 10 ++++---
> 2 files changed, 33 insertions(+), 3 deletions(-)
> create mode 100644 meta/recipes-devtools/python/python3-
> pygobject/0001-Do-not-build-tests.patch
> rename meta/recipes-devtools/python/{python3-pygobject_3.28.3.bb =>
> python3-pygobject_3.32.0.bb} (68%)
Seems to have an issue with multilib?
https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/519
Cheers,
Richard
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 19/19] python-numpy: update to 1.16.2
2019-04-15 10:54 [PATCH 01/19] gobject-introspection: update to 1.60.1 Alexander Kanavin
` (16 preceding siblings ...)
2019-04-15 10:54 ` [PATCH 18/19] python3-pygobject: update to 3.32.0 Alexander Kanavin
@ 2019-04-15 10:54 ` Alexander Kanavin
2019-04-17 21:04 ` [PATCH 01/19] gobject-introspection: update to 1.60.1 Khem Raj
18 siblings, 0 replies; 25+ messages in thread
From: Alexander Kanavin @ 2019-04-15 10:54 UTC (permalink / raw)
To: openembedded-core
Drop files/fix_shebang_f2py.patch as the code has been removed upstream.
License-update: copyright years, file paths.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...-and-so-on-for-libraries-by-default-.patch | 16 +++++-----
.../0001-npy_cpu-Add-riscv-support.patch | 14 ++++-----
.../python-numpy/files/fix_shebang_f2py.patch | 29 -------------------
.../python-numpy/python-numpy.inc | 10 +++----
...numpy_1.14.5.bb => python-numpy_1.16.2.bb} | 0
...umpy_1.14.5.bb => python3-numpy_1.16.2.bb} | 1 +
6 files changed, 18 insertions(+), 52 deletions(-)
delete mode 100644 meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch
rename meta/recipes-devtools/python-numpy/{python-numpy_1.14.5.bb => python-numpy_1.16.2.bb} (100%)
rename meta/recipes-devtools/python-numpy/{python3-numpy_1.14.5.bb => python3-numpy_1.16.2.bb} (97%)
diff --git a/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch b/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
index 516ccd7b9bd..8fe0d1a27ee 100644
--- a/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
+++ b/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
@@ -1,7 +1,8 @@
-From c8c6649b29a08f82e1d6761a6d62ce5f632313c5 Mon Sep 17 00:00:00 2001
+From c14554c7e2fff8dd559dfb41e7dd11392c6f85e3 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 10 Dec 2015 13:20:30 +0200
-Subject: [PATCH 1/3] Don't search /usr and so on for libraries by default to
+Subject: [PATCH] Don't search /usr and so on for libraries by default to
+
avoid host contamination.
Upstream-Status: Inappropriate (As the code stands, this is a hack)
@@ -9,16 +10,16 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
- numpy/distutils/system_info.py | 50 +++++-------------------------------------
+ numpy/distutils/system_info.py | 50 ++++------------------------------
1 file changed, 6 insertions(+), 44 deletions(-)
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
-index bea120c..544e056 100644
+index 2424943..bf56a6d 100644
--- a/numpy/distutils/system_info.py
+++ b/numpy/distutils/system_info.py
-@@ -262,51 +262,13 @@ if sys.platform == 'win32':
+@@ -274,51 +274,13 @@ if sys.platform == 'win32':
add_system_root(os.path.join(conda_dir, 'Library'))
-
+
else:
- default_lib_dirs = libpaths(['/usr/local/lib', '/opt/lib', '/usr/lib',
- '/opt/local/lib', '/sw/lib'], platform_bits)
@@ -74,6 +75,3 @@ index bea120c..544e056 100644
if os.path.join(sys.prefix, 'lib') not in default_lib_dirs:
default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib'))
---
-2.16.1
-
diff --git a/meta/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch b/meta/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch
index 4f5c4f5f0da..4decfe66ee1 100644
--- a/meta/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch
+++ b/meta/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch
@@ -1,21 +1,20 @@
-From 30fb1bf9244bb0789c02ec7c98a923acc7200206 Mon Sep 17 00:00:00 2001
+From 629891f67601275c9c4de0bb01afcf1a8c44fa3f Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 16 Mar 2018 19:55:21 -0700
Subject: [PATCH] npy_cpu: Add riscv support
Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
Upstream-Status: Submitted [https://github.com/numpy/numpy/pull/10761]
-
+---
numpy/core/include/numpy/npy_cpu.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/numpy/core/include/numpy/npy_cpu.h b/numpy/core/include/numpy/npy_cpu.h
-index 84653ea18..9e88db873 100644
+index 5edd8f4..e1e4796 100644
--- a/numpy/core/include/numpy/npy_cpu.h
+++ b/numpy/core/include/numpy/npy_cpu.h
-@@ -78,6 +78,8 @@
- #define NPY_CPU_AARCH64
+@@ -96,6 +96,8 @@
+ #define NPY_CPU_OR1K
#elif defined(__mc68000__)
#define NPY_CPU_M68K
+#elif defined(__riscv)
@@ -23,6 +22,3 @@ index 84653ea18..9e88db873 100644
#elif defined(__arc__) && defined(__LITTLE_ENDIAN__)
#define NPY_CPU_ARCEL
#elif defined(__arc__) && defined(__BIG_ENDIAN__)
---
-2.16.2
-
diff --git a/meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch b/meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch
deleted file mode 100644
index 8be6e4d21f9..00000000000
--- a/meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-Avoids using python from the HOSTs native sysroot for f2py,
-uses TARGET env python instead.
-
-Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
-
-Index: numpy-1.11.0/numpy/f2py/setup.py
-===================================================================
---- numpy-1.11.0.orig/numpy/f2py/setup.py
-+++ numpy-1.11.0/numpy/f2py/setup.py
-@@ -37,10 +37,13 @@ def _get_f2py_shebang():
- should be ``#!python`` rather than ``#!`` followed by the contents of
- ``sys.executable``.
- """
-- if set(('bdist_wheel', 'bdist_egg', 'bdist_wininst',
-- 'bdist_rpm')).intersection(sys.argv):
-- return '#!python'
-- return '#!' + sys.executable
-+ #if set(('bdist_wheel', 'bdist_egg', 'bdist_wininst',
-+ # 'bdist_rpm')).intersection(sys.argv):
-+ # return '#!python'
-+ #return '#!' + sys.executable
-+
-+ # On OE, we need to avoid using the HOSTs python-native, we return env python instead
-+ return '#!/usr/bin/env python'
-
-
- def configuration(parent_package='', top_path=None):
diff --git a/meta/recipes-devtools/python-numpy/python-numpy.inc b/meta/recipes-devtools/python-numpy/python-numpy.inc
index 1b51f7baaf2..43c8960a184 100644
--- a/meta/recipes-devtools/python-numpy/python-numpy.inc
+++ b/meta/recipes-devtools/python-numpy/python-numpy.inc
@@ -1,17 +1,17 @@
SUMMARY = "A sophisticated Numeric Processing Package for Python"
SECTION = "devel/python"
LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fc53b33304171d132128ebe82ea4a645"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d26bde5432613cce2334b93985576231"
SRCNAME = "numpy"
SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${SRCNAME}-${PV}.tar.gz \
file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \
- file://fix_shebang_f2py.patch \
file://0001-npy_cpu-Add-riscv-support.patch \
- ${CONFIGFILESURI} "
-SRC_URI[md5sum] = "e3189ee851c3a0e2e6e4c6e80a711ec8"
-SRC_URI[sha256sum] = "1b4a02758fb68a65ea986d808867f1d6383219c234aef553a8741818e795b529"
+ ${CONFIGFILESURI} \
+ "
+SRC_URI[md5sum] = "4fc754be7ec3e0f80b042d907e99f4ad"
+SRC_URI[sha256sum] = "8088221e6e27da8d5907729f0bfe798f526836f22cc59ae83a0f867e67416a3e"
UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases"
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
diff --git a/meta/recipes-devtools/python-numpy/python-numpy_1.14.5.bb b/meta/recipes-devtools/python-numpy/python-numpy_1.16.2.bb
similarity index 100%
rename from meta/recipes-devtools/python-numpy/python-numpy_1.14.5.bb
rename to meta/recipes-devtools/python-numpy/python-numpy_1.16.2.bb
diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.14.5.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.16.2.bb
similarity index 97%
rename from meta/recipes-devtools/python-numpy/python3-numpy_1.14.5.bb
rename to meta/recipes-devtools/python-numpy/python3-numpy_1.16.2.bb
index 915e6f8c2b3..d388e88d25e 100644
--- a/meta/recipes-devtools/python-numpy/python3-numpy_1.14.5.bb
+++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.16.2.bb
@@ -1,2 +1,3 @@
inherit setuptools3
require python-numpy.inc
+
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH 01/19] gobject-introspection: update to 1.60.1
2019-04-15 10:54 [PATCH 01/19] gobject-introspection: update to 1.60.1 Alexander Kanavin
` (17 preceding siblings ...)
2019-04-15 10:54 ` [PATCH 19/19] python-numpy: update to 1.16.2 Alexander Kanavin
@ 2019-04-17 21:04 ` Khem Raj
18 siblings, 0 replies; 25+ messages in thread
From: Khem Raj @ 2019-04-17 21:04 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: Patches and discussions about the oe-core layer
evince fails see
https://errors.yoctoproject.org/Errors/Details/237724/
and reported elsewhere as well
https://gitlab.gnome.org/GNOME/gobject-introspection/issues/229
On Mon, Apr 15, 2019 at 3:55 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> Drop upstreamed patches:
> 0010-meson-add-option-gir-dir-prefix.patch
> 0002-g-ir-tools-respect-gir_dir_prefix.patch
> 0001-configure.ac-make-GIR_DIR-configurable.patch
>
> Rebase the rest.
>
> Upstream has renamed the gir_dir_prefix option, adjust the recipe.
>
> Add a patch to disable tests in cross builds, as previously meson
> build system didn't actually build them.
>
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
> ...t-cross-compilation-support-to-meson.patch | 37 ++++-----
> ...pository-directory-for-native-builds.patch | 12 +--
> ...lete-upstream-attempt-at-cross-compi.patch | 8 +-
> ...nfigure.ac-make-GIR_DIR-configurable.patch | 68 -----------------
> ...scanner-add-a-lib-dirs-envvar-option.patch | 16 ++--
> ...-error-return-codes-from-ldd-wrapper.patch | 7 +-
> ...d-disable-tests-when-cross-compiling.patch | 26 +++++++
> ...-host-gi-gi-cross-wrapper-gi-ldd-wra.patch | 10 +--
> ...02-g-ir-tools-respect-gir_dir_prefix.patch | 76 -------------------
> ...canner-add-use-binary-wrapper-option.patch | 8 +-
> ...scanner-add-a-use-ldd-wrapper-option.patch | 10 +--
> ...g-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch | 10 +--
> ...0010-meson-add-option-gir-dir-prefix.patch | 66 ----------------
> ...8.3.bb => gobject-introspection_1.60.1.bb} | 10 +--
> 14 files changed, 91 insertions(+), 273 deletions(-)
> delete mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-configure.ac-make-GIR_DIR-configurable.patch
> create mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-disable-tests-when-cross-compiling.patch
> delete mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-g-ir-tools-respect-gir_dir_prefix.patch
> delete mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0010-meson-add-option-gir-dir-prefix.patch
> rename meta/recipes-gnome/gobject-introspection/{gobject-introspection_1.58.3.bb => gobject-introspection_1.60.1.bb} (96%)
>
> diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch
> index 80c9e71ad57..5747d61c192 100644
> --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch
> +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch
> @@ -1,4 +1,4 @@
> -From ea25a5a755bc839d5b504aac207f860ae68109bc Mon Sep 17 00:00:00 2001
> +From 2b3bce1526b538dc2c7fa223eaf9808858aa1b06 Mon Sep 17 00:00:00 2001
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> Date: Thu, 15 Nov 2018 15:10:05 +0100
> Subject: [PATCH] Port cross-compilation support to meson
> @@ -7,16 +7,16 @@ Upstream-Status: Pending
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>
> ---
> - gir/meson.build | 59 ++++++++++++++++++++++++++++++++++-------------
> - meson.build | 4 +++-
> - meson_options.txt | 20 ++++++++++++++++
> - 3 files changed, 66 insertions(+), 17 deletions(-)
> + gir/meson.build | 62 ++++++++++++++++++++++++++++++++++-------------
> + meson.build | 4 ++-
> + meson_options.txt | 20 +++++++++++++++
> + 3 files changed, 68 insertions(+), 18 deletions(-)
>
> diff --git a/gir/meson.build b/gir/meson.build
> -index 1cb514a..f873068 100644
> +index 85ae575..327c134 100644
> --- a/gir/meson.build
> +++ b/gir/meson.build
> -@@ -36,15 +36,27 @@ gir_files = [
> +@@ -36,16 +36,29 @@ gir_files = [
> typelibdir = join_paths(get_option('libdir'), 'girepository-1.0')
> install_data(gir_files, install_dir: girdir)
>
> @@ -25,6 +25,7 @@ index 1cb514a..f873068 100644
> - girscanner,
> - '--output=@OUTPUT@',
> - '--no-libtool',
> +- '--quiet',
> - '--reparse-validate',
> - '--add-include-path', join_paths(meson.current_build_dir()),
> - '--add-include-path', join_paths(meson.current_source_dir()),
> @@ -34,6 +35,7 @@ index 1cb514a..f873068 100644
> + 'g-ir-scanner',
> + '--output=@OUTPUT@',
> + '--no-libtool',
> ++ '--quiet',
> + '--reparse-validate',
> + '--add-include-path', join_paths(meson.current_build_dir()),
> + '--add-include-path', join_paths(meson.current_source_dir()),
> @@ -44,6 +46,7 @@ index 1cb514a..f873068 100644
> + girscanner,
> + '--output=@OUTPUT@',
> + '--no-libtool',
> ++ '--quiet',
> + '--reparse-validate',
> + '--add-include-path', join_paths(meson.current_build_dir()),
> + '--add-include-path', join_paths(meson.current_source_dir()),
> @@ -53,7 +56,7 @@ index 1cb514a..f873068 100644
>
> dep_type = glib_dep.type_name()
> if dep_type == 'internal'
> -@@ -57,6 +69,12 @@ if dep_type == 'internal'
> +@@ -58,6 +71,12 @@ if dep_type == 'internal'
> '--extra-library=glib-2.0', '--extra-library=gobject-2.0']
> endif
>
> @@ -66,7 +69,7 @@ index 1cb514a..f873068 100644
> # Take a glob and print to newlines
> globber = '''
> from glob import glob
> -@@ -83,8 +101,8 @@ glib_command = scanner_command + [
> +@@ -84,8 +103,8 @@ glib_command = scanner_command + [
>
> if dep_type == 'pkgconfig'
> glib_command += ['--external-library', '--pkg=glib-2.0']
> @@ -77,7 +80,7 @@ index 1cb514a..f873068 100644
> glib_libincdir = join_paths(glib_libdir, 'glib-2.0', 'include')
> glib_files += join_paths(glib_incdir, 'gobject', 'glib-types.h')
> glib_files += join_paths(glib_libincdir, 'glibconfig.h')
> -@@ -338,7 +356,7 @@ endforeach
> +@@ -339,7 +358,7 @@ endforeach
> if giounix_dep.found()
> if dep_type == 'pkgconfig'
> gio_command += ['--pkg=gio-unix-2.0']
> @@ -86,10 +89,10 @@ index 1cb514a..f873068 100644
> # Get the installed gio-unix header list
> ret = run_command(python, '-c', globber.format(join_paths(giounix_includedir, 'gio', '*.h')))
> if ret.returncode() != 0
> -@@ -416,15 +434,24 @@ gir_files += custom_target('gir-girepository',
> - ]
> +@@ -422,15 +441,24 @@ gir_files += custom_target('gir-girepository',
> )
>
> + typelibs = []
> +if get_option('enable-gi-cross-wrapper') != ''
> + gircompiler_command = [get_option('enable-gi-cross-wrapper'), gircompiler.full_path(), '-o', '@OUTPUT@', '@INPUT@',
> + '--includedir', meson.current_build_dir(),
> @@ -103,7 +106,7 @@ index 1cb514a..f873068 100644
> +endif
> +
> foreach gir : gir_files
> - custom_target('generate-typelib-@0@'.format(gir).underscorify(),
> + typelibs += custom_target('generate-typelib-@0@'.format(gir).underscorify(),
> input: gir,
> output: '@BASENAME@.typelib',
> depends: [gobject_gir, ],
> @@ -116,10 +119,10 @@ index 1cb514a..f873068 100644
> install_dir: typelibdir,
> )
> diff --git a/meson.build b/meson.build
> -index 17acd82..e0bb495 100644
> +index 95bbd2b..f7baefd 100644
> --- a/meson.build
> +++ b/meson.build
> -@@ -81,7 +81,9 @@ libffi_dep = dependency('libffi',
> +@@ -163,7 +163,9 @@ endif
> subdir('girepository')
> subdir('tools')
> subdir('giscanner')
> @@ -131,11 +134,11 @@ index 17acd82..e0bb495 100644
> subdir('docs')
> subdir('tests')
> diff --git a/meson_options.txt b/meson_options.txt
> -index ee6958d..b168142 100644
> +index 445a68a..a325511 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
> @@ -25,3 +25,23 @@ option('python', type: 'string', value: 'python3',
> - option('gir-dir-prefix', type: 'string',
> + option('gir_dir_prefix', type: 'string',
> description: 'Intermediate prefix for gir installation under ${prefix}'
> )
> +
> diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
> index a91d22afa7c..a4f45a142dd 100644
> --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
> +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
> @@ -1,4 +1,4 @@
> -From 7ea8c83d84a05f686128e652a5447fb5f6fb68be Mon Sep 17 00:00:00 2001
> +From 8f01066e935a7323ff6e53f27ed1b5fb74fa11eb Mon Sep 17 00:00:00 2001
> From: Sascha Silbe <x-yo17@se-silbe.de>
> Date: Fri, 8 Jun 2018 13:55:10 +0200
> Subject: [PATCH] Relocate the repository directory for native builds
> @@ -21,7 +21,7 @@ Signed-off-by: Sascha Silbe <x-yo17@se-silbe.de>
> 2 files changed, 14 insertions(+), 3 deletions(-)
>
> diff --git a/girepository/girepository.c b/girepository/girepository.c
> -index c1fa3d3..efa557e 100644
> +index ca5dc2b..7a4d17f 100644
> --- a/girepository/girepository.c
> +++ b/girepository/girepository.c
> @@ -21,6 +21,8 @@
> @@ -42,7 +42,7 @@ index c1fa3d3..efa557e 100644
> /**
> * SECTION:girepository
> * @short_description: GObject Introspection repository manager
> -@@ -188,9 +192,16 @@ init_globals (void)
> +@@ -212,9 +216,16 @@ init_globals (void)
> g_free (custom_dirs);
> }
>
> @@ -62,12 +62,12 @@ index c1fa3d3..efa557e 100644
> typelib_search_path = g_slist_prepend (typelib_search_path, typelib_dir);
>
> diff --git a/girepository/meson.build b/girepository/meson.build
> -index 6a8c5b5..8892f2a 100644
> +index 0261e1a..4cb646f 100644
> --- a/girepository/meson.build
> +++ b/girepository/meson.build
> -@@ -27,7 +27,7 @@ girepo_internals_lib = static_library('girepository-internals',
> +@@ -36,7 +36,7 @@ girepo_internals_lib = static_library('girepository-internals',
> ],
> - c_args: gi_hidden_visibility_cflags,
> + c_args: gi_hidden_visibility_cflags + custom_c_args,
> include_directories : configinc,
> - dependencies: [girepo_gthash_dep, libffi_dep],
> + dependencies: [girepo_gthash_dep, libffi_dep, cc.find_library('dl')],
> diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
> index 86cd4ead2a0..d1fdc068c08 100644
> --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
> +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
> @@ -1,4 +1,4 @@
> -From ca0fb17e268c176ac89df081b1efa4a42989f014 Mon Sep 17 00:00:00 2001
> +From 8a57aa0ac6c2f00b9b7a7fc177431f7643399e70 Mon Sep 17 00:00:00 2001
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> Date: Wed, 23 Mar 2016 17:07:28 +0200
> Subject: [PATCH] Revert an incomplete upstream attempt at cross-compile
> @@ -13,7 +13,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> 2 files changed, 10 deletions(-)
>
> diff --git a/common.mk b/common.mk
> -index b778f7a..e26c637 100644
> +index 64fb02f..77e819d 100644
> --- a/common.mk
> +++ b/common.mk
> @@ -24,12 +24,8 @@ INTROSPECTION_SCANNER_ARGS = \
> @@ -30,10 +30,10 @@ index b778f7a..e26c637 100644
>
> INTROSPECTION_COMPILER_ARGS = \
> diff --git a/giscanner/gdumpparser.py b/giscanner/gdumpparser.py
> -index cd9d94d..b41772c 100644
> +index 1730fee..26bab84 100644
> --- a/giscanner/gdumpparser.py
> +++ b/giscanner/gdumpparser.py
> -@@ -161,12 +161,6 @@ blob containing data gleaned from GObject's primitive introspection."""
> +@@ -156,12 +156,6 @@ blob containing data gleaned from GObject's primitive introspection."""
> out_path = os.path.join(self._binary.tmpdir, 'dump.xml')
>
> args = []
> diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-configure.ac-make-GIR_DIR-configurable.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-configure.ac-make-GIR_DIR-configurable.patch
> deleted file mode 100644
> index e0402f8f493..00000000000
> --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-configure.ac-make-GIR_DIR-configurable.patch
> +++ /dev/null
> @@ -1,68 +0,0 @@
> -configure.ac: make GIR_DIR configurable
> -
> -Some .gir files such as GLib-2.0.gir are arch related which contain such
> -as lengths of pointers that they are different for 64 and 32 bit target.
> -It causes install file conflicts for multilib when intall
> -gobject-introspection and lib32-gobject-introspection both.
> -
> -Add configure option 'with-gir-dir-prefix' for autotools to make .gir
> -could be installed to a configured path such as ${libdir}. And update
> -girdir in .pc files as well.
> -
> -Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/gobject-introspection/commit/3301c7e]
> -
> -Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ----
> - configure.ac | 7 +++++--
> - gobject-introspection-1.0.pc.in | 2 +-
> - gobject-introspection-no-export-1.0.pc.in | 2 +-
> - 3 files changed, 7 insertions(+), 4 deletions(-)
> -
> -diff --git a/configure.ac b/configure.ac
> -index b4294c57..60506947 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -114,9 +114,12 @@ GIR_SUFFIX="gir-1.0"
> - AC_SUBST(GIR_SUFFIX)
> - AC_DEFINE_UNQUOTED(GIR_SUFFIX, "$GIR_SUFFIX", [Name of the gir directory])
> -
> --GIR_DIR="$EXPANDED_DATADIR/$GIR_SUFFIX"
> -+AC_ARG_WITH([gir-dir-prefix],
> -+ [AS_HELP_STRING([--with-gir-dir-prefix], [Directory prefix for gir installation])],
> -+ [GIR_DIR_PREFIX="$withval"], [GIR_DIR_PREFIX="$EXPANDED_DATADIR"])
> -+GIR_DIR="$GIR_DIR_PREFIX/$GIR_SUFFIX"
> - AC_SUBST(GIR_DIR)
> --AC_DEFINE_UNQUOTED(GIR_DIR, "$GIR_DIR", [Director prefix for gir installation])
> -+AC_DEFINE_UNQUOTED(GIR_DIR, "$GIR_DIR", [Directory prefix for gir installation])
> -
> - PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.58.0])
> -
> -diff --git a/gobject-introspection-1.0.pc.in b/gobject-introspection-1.0.pc.in
> -index a08b5d27..3409856c 100644
> ---- a/gobject-introspection-1.0.pc.in
> -+++ b/gobject-introspection-1.0.pc.in
> -@@ -10,7 +10,7 @@ g_ir_scanner=${bindir}/g-ir-scanner
> - g_ir_compiler=${bindir}/g-ir-compiler@EXEEXT@
> - g_ir_generate=${bindir}/g-ir-generate@EXEEXT@
> - gidatadir=${datadir}/gobject-introspection-1.0
> --girdir=${datadir}/gir-1.0
> -+girdir=@GIR_DIR@
> - typelibdir=${libdir}/girepository-1.0
> -
> - Cflags: -I${includedir}/gobject-introspection-1.0 @FFI_PC_CFLAGS@
> -diff --git a/gobject-introspection-no-export-1.0.pc.in b/gobject-introspection-no-export-1.0.pc.in
> -index d214d22d..745aaade 100644
> ---- a/gobject-introspection-no-export-1.0.pc.in
> -+++ b/gobject-introspection-no-export-1.0.pc.in
> -@@ -9,7 +9,7 @@ includedir=@includedir@
> - g_ir_scanner=${bindir}/g-ir-scanner
> - g_ir_compiler=${bindir}/g-ir-compiler@EXEEXT@
> - g_ir_generate=${bindir}/g-ir-generate@EXEEXT@
> --girdir=${datadir}/gir-1.0
> -+girdir=@GIR_DIR@
> - typelibdir=${libdir}/girepository-1.0
> -
> - Cflags: -I${includedir}/gobject-introspection-1.0 @FFI_PC_CFLAGS@
> ---
> -2.17.0
> -
> diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch
> index e9338e92e29..ddd955354de 100644
> --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch
> +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch
> @@ -1,4 +1,4 @@
> -From 3fea5e83803f4cfef21b2e06e37a6ba56f2bb914 Mon Sep 17 00:00:00 2001
> +From 6653c28f0b76aad86e26c512b03efcec6d9d9e95 Mon Sep 17 00:00:00 2001
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> Date: Wed, 3 Jan 2018 17:02:01 +0200
> Subject: [PATCH] giscanner: add a --lib-dirs-envvar option
> @@ -19,10 +19,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> 3 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
> -index c003828..8a8ba2b 100644
> +index 32c9296..3fb262b 100644
> --- a/giscanner/ccompiler.py
> +++ b/giscanner/ccompiler.py
> -@@ -109,7 +109,7 @@ class CCompiler(object):
> +@@ -174,7 +174,7 @@ class CCompiler(object):
>
> self._cflags_no_deprecation_warnings = "-Wno-deprecated-declarations"
>
> @@ -31,7 +31,7 @@ index c003828..8a8ba2b 100644
> # An "internal" link is where the library to be introspected
> # is being built in the current directory.
>
> -@@ -119,7 +119,7 @@ class CCompiler(object):
> +@@ -184,7 +184,7 @@ class CCompiler(object):
> if os.name == 'nt':
> runtime_path_envvar = ['LIB', 'PATH']
> else:
> @@ -41,10 +41,10 @@ index c003828..8a8ba2b 100644
> # (This flag is not supported nor needed for Visual C++)
> args.append('-L.')
> diff --git a/giscanner/dumper.py b/giscanner/dumper.py
> -index 2c668f5..2e515a0 100644
> +index 2b851a5..10a7c39 100644
> --- a/giscanner/dumper.py
> +++ b/giscanner/dumper.py
> -@@ -249,7 +249,8 @@ class DumpCompiler(object):
> +@@ -244,7 +244,8 @@ class DumpCompiler(object):
> libtool,
> self._options.libraries,
> self._options.extra_libraries,
> @@ -55,10 +55,10 @@ index 2c668f5..2e515a0 100644
>
> else:
> diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
> -index 5cb793e..87227e2 100644
> +index 9013562..9c9fe12 100644
> --- a/giscanner/scannermain.py
> +++ b/giscanner/scannermain.py
> -@@ -132,6 +132,9 @@ def _get_option_parser():
> +@@ -126,6 +126,9 @@ def _get_option_parser():
> parser.add_option("", "--use-ldd-wrapper",
> action="store", dest="ldd_wrapper", default=None,
> help="wrapper to use instead of ldd (useful when cross-compiling)")
> diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch
> index 9167f042e5b..b484b5e9e6e 100644
> --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch
> +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch
> @@ -1,4 +1,4 @@
> -From f128cbeead687bfc6532cc1f2cc3e2dc5a2b5b30 Mon Sep 17 00:00:00 2001
> +From f742da8b3913f4818d3f419117076afe62f4dbf4 Mon Sep 17 00:00:00 2001
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> Date: Wed, 5 Sep 2018 16:46:52 +0200
> Subject: [PATCH] giscanner: ignore error return codes from ldd-wrapper
> @@ -8,15 +8,16 @@ It is not an error per se, but it breaks subprocess.check_output().
>
> Upstream-Status: Inappropriate [oe-core specific]
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> +
> ---
> giscanner/shlibs.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
> -index 01d21a3..3bd3250 100644
> +index d67df95..80352a6 100644
> --- a/giscanner/shlibs.py
> +++ b/giscanner/shlibs.py
> -@@ -108,7 +108,7 @@ def _resolve_non_libtool(options, binary, libraries):
> +@@ -102,7 +102,7 @@ def _resolve_non_libtool(options, binary, libraries):
> args.extend(['otool', '-L', binary.args[0]])
> else:
> args.extend(['ldd', binary.args[0]])
> diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-disable-tests-when-cross-compiling.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-disable-tests-when-cross-compiling.patch
> new file mode 100644
> index 00000000000..c4951b22bb3
> --- /dev/null
> +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-disable-tests-when-cross-compiling.patch
> @@ -0,0 +1,26 @@
> +From 2c384187cc22113c0c9b1cd233948118f7c085ef Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex.kanavin@gmail.com>
> +Date: Mon, 25 Mar 2019 13:28:48 +0100
> +Subject: [PATCH] meson.build: disable tests when cross-compiling
> +
> +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/64]
> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> +---
> + meson.build | 4 +++-
> + 1 file changed, 3 insertions(+), 1 deletion(-)
> +
> +diff --git a/meson.build b/meson.build
> +index 2544ff3..4c16fe5 100644
> +--- a/meson.build
> ++++ b/meson.build
> +@@ -168,7 +168,9 @@ if get_option('enable-introspection-data') == true
> + endif
> + subdir('examples')
> + subdir('docs')
> +-subdir('tests')
> ++if not meson.is_cross_build()
> ++ subdir('tests')
> ++endif
> +
> + install_data('Makefile.introspection', install_dir: join_paths(get_option('datadir'), 'gobject-introspection-1.0'))
> + install_data('m4/introspection.m4', install_dir: join_paths(get_option('datadir'), 'aclocal'))
> diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
> index 03ef2b00590..e4fffcf6133 100644
> --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
> +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
> @@ -1,4 +1,4 @@
> -From a28cc8413b68bec5b4cf2ee5f37b40a8965490a5 Mon Sep 17 00:00:00 2001
> +From 2335d22e4c64db3d5dfc16ac65468b9dd66db8ac Mon Sep 17 00:00:00 2001
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> Date: Mon, 19 Oct 2015 18:29:21 +0300
> Subject: [PATCH] configure.ac: add host-gi, gi-cross-wrapper, gi-ldd-wrapper
> @@ -34,7 +34,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> 4 files changed, 87 insertions(+), 1 deletion(-)
>
> diff --git a/Makefile.am b/Makefile.am
> -index 44ed115..2a1fa56 100644
> +index 952bf71..797a3bd 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -21,7 +21,9 @@ include Makefile-cmph.am
> @@ -48,7 +48,7 @@ index 44ed115..2a1fa56 100644
>
> ## Process this file with automake to produce Makefile.in
> diff --git a/common.mk b/common.mk
> -index e26c637..9f3a65f 100644
> +index 77e819d..379ab53 100644
> --- a/common.mk
> +++ b/common.mk
> @@ -6,6 +6,15 @@
> @@ -132,10 +132,10 @@ index e26c637..9f3a65f 100644
> INTROSPECTION_DOCTOOL_ARGS = \
> --add-include-path=$(srcdir) \
> diff --git a/configure.ac b/configure.ac
> -index d48e6c3..ed5f8a2 100644
> +index 885da70..cd8108b 100644
> --- a/configure.ac
> +++ b/configure.ac
> -@@ -367,6 +367,48 @@ dnl
> +@@ -383,6 +383,48 @@ dnl
> AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x])
> AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x])
>
> diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-g-ir-tools-respect-gir_dir_prefix.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-g-ir-tools-respect-gir_dir_prefix.patch
> deleted file mode 100644
> index 5e4176725c3..00000000000
> --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-g-ir-tools-respect-gir_dir_prefix.patch
> +++ /dev/null
> @@ -1,76 +0,0 @@
> -g-ir-tools: respect gir_dir_prefix
> -
> -Configure option gir_dir_prefix is used to configure install dir for
> -.gir files, so add its value to include file search paths.
> -
> -Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/gobject-introspection/commit/3fe995a]
> -
> -Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ----
> - Makefile-tools.am | 2 +-
> - giscanner/transformer.py | 1 +
> - tests/warn/warningtester.py | 1 +
> - tools/g-ir-tool-template.in | 10 ++++++++++
> - 6 files changed, 15 insertions(+), 2 deletions(-)
> -
> -diff --git a/Makefile-tools.am b/Makefile-tools.am
> -index c70d9850..fcaf1e01 100644
> ---- a/Makefile-tools.am
> -+++ b/Makefile-tools.am
> -@@ -9,7 +9,7 @@ EXTRA_DIST += \
> - tools/g-ir-tool-template.in \
> - tools/meson.build
> -
> --TOOL_SUBSTITUTIONS = -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON_CMD\@,\/usr\/bin\/env\ $(PYTHON),
> -+TOOL_SUBSTITUTIONS = -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON_CMD\@,\/usr\/bin\/env\ $(PYTHON), -e s,@GIR_DIR\@,$(GIR_DIR),g
> -
> - g-ir-scanner: tools/g-ir-tool-template.in _giscanner.la Makefile
> - $(AM_V_GEN) sed $(TOOL_SUBSTITUTIONS) -e s,@TOOL_MODULE\@,scannermain, -e s,@TOOL_FUNCTION\@,scanner_main, $< > $@.tmp && mv $@.tmp $@
> -diff --git a/giscanner/transformer.py b/giscanner/transformer.py
> -index 335e229f..2c412339 100644
> ---- a/giscanner/transformer.py
> -+++ b/giscanner/transformer.py
> -@@ -184,6 +184,7 @@ None."""
> - def _get_gi_data_dirs(self):
> - data_dirs = utils.get_system_data_dirs()
> - data_dirs.append(DATADIR)
> -+ data_dirs.append(GIRDIR)
> - if os.name != 'nt':
> - # For backwards compatibility, was always unconditionally added to the list.
> - data_dirs.append('/usr/share')
> -diff --git a/tests/warn/warningtester.py b/tests/warn/warningtester.py
> -index f17c8889..be5aec13 100644
> ---- a/tests/warn/warningtester.py
> -+++ b/tests/warn/warningtester.py
> -@@ -18,6 +18,7 @@ sys.path.insert(0, path)
> -
> - # Not correct, but enough to get the tests going uninstalled
> - builtins.__dict__['DATADIR'] = path
> -+builtins.__dict__['GIRDIR'] = ''
> -
> - from giscanner.annotationparser import GtkDocCommentBlockParser
> - from giscanner.ast import Include, Namespace
> -diff --git a/tools/g-ir-tool-template.in b/tools/g-ir-tool-template.in
> -index ed33d16b..b9cf0911 100755
> ---- a/tools/g-ir-tool-template.in
> -+++ b/tools/g-ir-tool-template.in
> -@@ -60,6 +60,16 @@ if not os.path.isdir(os.path.join(datadir, 'gir-1.0')):
> -
> - builtins.__dict__['DATADIR'] = datadir
> -
> -+# Respect gir_dir_prefix for meson and autotools
> -+girdir = ''
> -+# for meson
> -+if '@gir_dir_prefix@' and not '@gir_dir_prefix@'.startswith('@'):
> -+ girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@'))
> -+# for autotools
> -+elif '@GIR_DIR@' and not '@GIR_DIR@'.startswith('@'):
> -+ girdir = os.path.dirname(os.path.abspath('@GIR_DIR@'))
> -+builtins.__dict__['GIRDIR'] = girdir
> -+
> - # Again, relative paths first so that the installation prefix is relocatable
> - pylibdir = os.path.abspath(os.path.join(filedir, '..', 'lib', 'gobject-introspection'))
> -
> ---
> -2.17.0
> -
> diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch
> index 45fe27ad61f..b954dcebd84 100644
> --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch
> +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch
> @@ -1,4 +1,4 @@
> -From 46dbe963aa6435591c87e788cdb54bc0daeac42e Mon Sep 17 00:00:00 2001
> +From 5f985fd8a24764ccb38af6335d4584d7e33fc3a1 Mon Sep 17 00:00:00 2001
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> Date: Mon, 19 Oct 2015 18:26:40 +0300
> Subject: [PATCH] giscanner: add --use-binary-wrapper option
> @@ -16,10 +16,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> 1 file changed, 14 insertions(+)
>
> diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
> -index ccb14e9..061def0 100644
> +index c004fb1..0b6a2d2 100644
> --- a/giscanner/scannermain.py
> +++ b/giscanner/scannermain.py
> -@@ -126,6 +126,9 @@ def _get_option_parser():
> +@@ -120,6 +120,9 @@ def _get_option_parser():
> parser.add_option("", "--program",
> action="store", dest="program", default=None,
> help="program to execute")
> @@ -29,7 +29,7 @@ index ccb14e9..061def0 100644
> parser.add_option("", "--program-arg",
> action="append", dest="program_args", default=[],
> help="extra arguments to program")
> -@@ -418,6 +421,17 @@ def create_binary(transformer, options, args):
> +@@ -417,6 +420,17 @@ def create_binary(transformer, options, args):
> gdump_parser.get_error_quark_functions())
>
> shlibs = resolve_shlibs(options, binary, options.libraries)
> diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch
> index 2e36b64bab7..79264ed0865 100644
> --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch
> +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch
> @@ -1,4 +1,4 @@
> -From eba2b999e81d81b5f43bb1f0ab33881786bebdec Mon Sep 17 00:00:00 2001
> +From cba7807888a4a1f1d630d16c51c89859209334b3 Mon Sep 17 00:00:00 2001
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> Date: Fri, 30 Oct 2015 16:28:46 +0200
> Subject: [PATCH] giscanner: add a --use-ldd-wrapper option
> @@ -15,10 +15,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> 2 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
> -index 061def0..5cb793e 100644
> +index 0b6a2d2..9013562 100644
> --- a/giscanner/scannermain.py
> +++ b/giscanner/scannermain.py
> -@@ -129,6 +129,9 @@ def _get_option_parser():
> +@@ -123,6 +123,9 @@ def _get_option_parser():
> parser.add_option("", "--use-binary-wrapper",
> action="store", dest="wrapper", default=None,
> help="wrapper to use for running programs (useful when cross-compiling)")
> @@ -29,10 +29,10 @@ index 061def0..5cb793e 100644
> action="append", dest="program_args", default=[],
> help="extra arguments to program")
> diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
> -index 7b7b2d0..01d21a3 100644
> +index 2c61f2f..d67df95 100644
> --- a/giscanner/shlibs.py
> +++ b/giscanner/shlibs.py
> -@@ -102,7 +102,9 @@ def _resolve_non_libtool(options, binary, libraries):
> +@@ -96,7 +96,9 @@ def _resolve_non_libtool(options, binary, libraries):
> args.extend(libtool)
> args.append('--mode=execute')
> platform_system = platform.system()
> diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch
> index 2a31117b138..74622680d6d 100644
> --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch
> +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch
> @@ -1,4 +1,4 @@
> -From a97d060933932e478c03f1de9513b69bc459eefc Mon Sep 17 00:00:00 2001
> +From 74dab0fb6104ab6b715a24b783f8e8dfa5f83617 Mon Sep 17 00:00:00 2001
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> Date: Thu, 8 Oct 2015 18:30:35 +0300
> Subject: [PATCH] Prefix pkg-config paths with PKG_CONFIG_SYSROOT_DIR
> @@ -16,7 +16,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> 2 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/Makefile-gir.am b/Makefile-gir.am
> -index 2cd7358..eaf0afd 100644
> +index b59b0a6..24a50c2 100644
> --- a/Makefile-gir.am
> +++ b/Makefile-gir.am
> @@ -58,8 +58,8 @@ else
> @@ -41,7 +41,7 @@ index 2cd7358..eaf0afd 100644
>
> GOBJECT_LIBRARY=gobject-2.0
>
> -@@ -123,8 +123,8 @@ GObject_2_0_gir_FILES = \
> +@@ -124,8 +124,8 @@ GObject_2_0_gir_FILES = \
> BUILT_GIRSOURCES += GObject-2.0.gir
>
> # gmodule
> @@ -52,7 +52,7 @@ index 2cd7358..eaf0afd 100644
>
> GMODULE_LIBRARY=gmodule-2.0
>
> -@@ -149,13 +149,13 @@ GModule_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/gmodule.h \
> +@@ -150,13 +150,13 @@ GModule_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/gmodule.h \
> BUILT_GIRSOURCES += GModule-2.0.gir
>
> # gio
> @@ -66,7 +66,7 @@ index 2cd7358..eaf0afd 100644
> if HAVE_GIO_UNIX
> -GIO_UNIX_INCLUDEDIR = $(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0
> +GIO_UNIX_INCLUDEDIR = $(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0
> - GIO_UNIX_HDRS = $(GIO_UNIX_INCLUDEDIR)/gio/*.h
> + GIO_UNIX_HDRS = $(wildcard $(GIO_UNIX_INCLUDEDIR)/gio/*.h)
> GIO_UNIX_PACKAGES = gio-unix-2.0
> else
> diff --git a/m4/introspection.m4 b/m4/introspection.m4
> diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0010-meson-add-option-gir-dir-prefix.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0010-meson-add-option-gir-dir-prefix.patch
> deleted file mode 100644
> index 8eec5f867ee..00000000000
> --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0010-meson-add-option-gir-dir-prefix.patch
> +++ /dev/null
> @@ -1,66 +0,0 @@
> -From bbc34f00fd30a13eafc607a956de60d822260355 Mon Sep 17 00:00:00 2001
> -From: Kai Kang <kai.kang@windriver.com>
> -Date: Fri, 14 Sep 2018 01:26:38 -0700
> -Subject: [PATCH] meson: add option 'gir-dir-prefix'
> -
> -Add option 'gir-dir-prefix' for meson to make the installation path of
> -.gir files could be configured which has been done for autoconf.
> -
> -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gobject-introspection/commit/3938b86f5289c2b28a5ec42965b8da4b509445c4]
> -Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ----
> - gir/meson.build | 1 -
> - meson.build | 8 +++++++-
> - meson_options.txt | 4 ++++
> - 3 files changed, 11 insertions(+), 2 deletions(-)
> -
> -diff --git a/gir/meson.build b/gir/meson.build
> -index 607bbc4..1cb514a 100644
> ---- a/gir/meson.build
> -+++ b/gir/meson.build
> -@@ -34,7 +34,6 @@ gir_files = [
> - ]
> -
> - typelibdir = join_paths(get_option('libdir'), 'girepository-1.0')
> --girdir = join_paths(get_option('datadir'), 'gir-1.0')
> - install_data(gir_files, install_dir: girdir)
> -
> - scanner_command = [
> -diff --git a/meson.build b/meson.build
> -index a1432f7..17acd82 100644
> ---- a/meson.build
> -+++ b/meson.build
> -@@ -18,7 +18,12 @@ python = pymod.find_installation(get_option('python'))
> - cc = meson.get_compiler('c')
> - config = configuration_data()
> - config.set_quoted('GIR_SUFFIX', 'gir-1.0')
> --config.set_quoted('GIR_DIR', join_paths(get_option('prefix'), get_option('datadir'), 'gir-1.0'))
> -+gir_dir_prefix = get_option('gir-dir-prefix')
> -+if gir_dir_prefix == ''
> -+ gir_dir_prefix = get_option('datadir')
> -+endif
> -+girdir = join_paths(get_option('prefix'), gir_dir_prefix, 'gir-1.0')
> -+config.set_quoted('GIR_DIR', girdir)
> - config.set_quoted('GOBJECT_INTROSPECTION_LIBDIR', join_paths(get_option('prefix'), get_option('libdir')))
> -
> - foreach type : ['char', 'short', 'int', 'long']
> -@@ -93,6 +98,7 @@ pkgconfig_conf.set('libdir', join_paths('${prefix}', get_option('libdir')))
> - pkgconfig_conf.set('datarootdir', join_paths('${prefix}', get_option('datadir')))
> - pkgconfig_conf.set('datadir', '${datarootdir}')
> - pkgconfig_conf.set('includedir', join_paths('${prefix}', get_option('includedir')))
> -+pkgconfig_conf.set('GIR_DIR', join_paths('${prefix}', gir_dir_prefix, 'gir-1.0'))
> - if host_system == 'windows' or host_system == 'cygwin'
> - pkgconfig_conf.set('EXEEXT', '.exe')
> - else
> -diff --git a/meson_options.txt b/meson_options.txt
> -index 49726be..ee6958d 100644
> ---- a/meson_options.txt
> -+++ b/meson_options.txt
> -@@ -21,3 +21,7 @@ option('cairo-libname', type: 'string',
> - option('python', type: 'string', value: 'python3',
> - description: 'Path or name of the Python interpreter to build for'
> - )
> -+
> -+option('gir-dir-prefix', type: 'string',
> -+ description: 'Intermediate prefix for gir installation under ${prefix}'
> -+)
> diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.3.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.60.1.bb
> similarity index 96%
> rename from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.3.bb
> rename to meta/recipes-gnome/gobject-introspection/gobject-introspection_1.60.1.bb
> index 4ff9b7bf4bc..f87597f190c 100644
> --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.3.bb
> +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.60.1.bb
> @@ -17,14 +17,12 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-$
> file://0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch \
> file://0001-giscanner-add-a-lib-dirs-envvar-option.patch \
> file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \
> - file://0001-configure.ac-make-GIR_DIR-configurable.patch \
> - file://0002-g-ir-tools-respect-gir_dir_prefix.patch \
> - file://0010-meson-add-option-gir-dir-prefix.patch \
> file://0001-Port-cross-compilation-support-to-meson.patch \
> + file://0001-meson.build-disable-tests-when-cross-compiling.patch \
> "
>
> -SRC_URI[md5sum] = "182432c1f33886be8f4da073218b597d"
> -SRC_URI[sha256sum] = "025b632bbd944dcf11fc50d19a0ca086b83baf92b3e34936d008180d28cdc3c8"
> +SRC_URI[md5sum] = "46fc8a98f6563e64947ac3d574632525"
> +SRC_URI[sha256sum] = "d844d1499ecd36f3ec8a3573616186d36626ec0c9a7981939e99aa02e9c824b3"
>
> SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch"
>
> @@ -56,7 +54,7 @@ EXTRA_OEMESON_class-target = " \
> -Denable-gi-ldd-wrapper=${B}/g-ir-scanner-lddwrapper \
> -Dpkgconfig-sysroot-path=${PKG_CONFIG_SYSROOT_DIR} \
> ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Denable-introspection-data=true', '-Denable-introspection-data=false', d)} \
> - ${@'-Dgir-dir-prefix=${libdir}' if d.getVar('MULTILIBS') else ''} \
> + ${@'-Dgir_dir_prefix=${libdir}' if d.getVar('MULTILIBS') else ''} \
> "
>
> # Need to ensure ld.so.conf exists so prelink-native works
> --
> 2.17.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 25+ messages in thread