Recipe updates and fixes.
cover Recipe updates and fixes.
'Alex's patchbombs' have become a sort of running gag between Ross and me, so here's the biggest, bestest bomb yet. Do have a look if there's a recipe that you care about, and let me know. I have also updated the recipes for which Jussi Kukkonen was previously responsible, but I don't necessarily want to take up his recipes permanently :)
The following changes since commit 96967261993f8b583b51cdeccbb1fd06042d2192:
bitbake: toaster/highlight.pack.js: Fix corrupted file (2017-10-10 11:05:08 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib akanavin/package-version-updates
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/package-version-updates
Alexander Kanavin (49):
oprofile: remove the recipe
libpfm4: remove the recipe
glib-2.0: update to 2.54.1
glib-networking: update to 2.54.0
eudev: fix upstream version check
tcf-agent: latest upstream version is now known
go-helloworld: add an acknowledgement of unknown upstream version
dtc: update to 1.4.5
lz4: fix upstream version check
freetype: fix upstream version check
libxslt: update to 1.1.31
vala: update to 0.38.2
btrfs-tools: update to 4.13.2
mpg123: update to 1.25.7
libsolv: update to 0.6.29
libdnf: update to 0.11.0
librepo: update to 1.8.1
dnf: update to 2.7.3
gobject-introspection: update to 1.54.1
boost: update to 1.65.1
gnome-desktop3: Update to 3.26.1
iso-codes: update to 3.76
sysprof: update to 3.26.1
gtk-doc.bbclass: correctly make the list of directories with shared
libraries
webkitgtk: update to 2.18.0
gtk+3: update to 3.22.24
freetype: update to 2.8.1
vulkan: update to 1.0.61.1
xdg-utils: update to 1.1.2
gsettings-desktop-schemas: update to 3.24.1
libsoup-2.4: update to 2.60.1
adwaita-icon-theme: update to 3.26.0
shared-mime-info: update to 1.9
assimp: update to 4.0.1
gdk-pixbuf: update to 2.36.11
hicolor-icon-theme: update to 0.17
libgudev: update to 232
pango: update to 1.40.12
fontconfig: update to 2.12.6
libinput: update to 1.8.3
vte: update to 0.50.1
librsvg: update to 2.40.19
clutter-gtk-1.0: update to 1.8.4
at-spi2-core: update to 2.26.0
at-spi2-atk: update to 2.26.0
atk: update to 2.26.0
glew: update to 2.1.0
maintainers.inc: add Mark Hatle for libmnl maintainers.inc: add Otavio Salvador for go-dep
Chen Qi (1):
ffmpeg: upgrade to 3.3.4
meta/classes/gtk-doc.bbclass | 2 +-
meta/conf/distro/include/distro_alias.inc | 1 -
meta/conf/distro/include/maintainers.inc | 2 +
meta/conf/layer.conf | 1 -
...warning-about-deprecated-paths-in-schemas.patch | 25 +-
...t-hardcode-python-path-into-various-tools.patch | 46 ++
.../Enable-more-tests-while-cross-compiling.patch | 30 +-
.../glib-2.0/glib-2.0/configure-libtool.patch | 38 +-
.../{glib-2.0_2.52.3.bb => glib-2.0_2.54.1.bb} | 5 +-
meta/recipes-core/glib-2.0/glib.inc | 16 +-
...working_2.50.0.bb => glib-networking_2.54.0.bb} | 4 +-
meta/recipes-core/udev/eudev_3.2.2.bb | 1 -
...ith-musl-missing-header-include-for-dev_t.patch | 26 +
.../{btrfs-tools_4.12.bb => btrfs-tools_4.13.2.bb} | 3 +-
...eck-conf.releasever-instead-of-releasever.patch | 31 --
.../dnf/{dnf_2.6.3.bb => dnf_2.7.3.bb} | 3 +-
.../libdnf/{libdnf_0.9.3.bb => libdnf_0.11.0.bb} | 2 +-
...ly-set-the-library-installation-directory.patch | 28 -
...to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch | 49 +-
...-race-when-deleting-temporary-directories.patch | 41 --
...rrect-LRO_SSLVERIFYHOST-with-CURLOPT_SSL_.patch | 40 --
.../librepo/{librepo_git.bb => librepo_1.8.1.bb} | 6 +-
meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 1 -
meta/recipes-devtools/vala/vala.inc | 2 +
.../vala/vala/0001-Disable-valadoc.patch | 32 ++
.../vala/vala/disable-graphviz.patch | 223 ++++++++
.../vala/{vala_0.36.4.bb => vala_0.38.2.bb} | 6 +-
.../go-examples/go-helloworld_0.1.bb | 1 +
.../{libsolv_0.6.28.bb => libsolv_0.6.29.bb} | 2 +-
.../{xdg-utils_1.1.1.bb => xdg-utils_1.1.2.bb} | 4 +-
...-Fix-without-libtiff-not-having-an-effect.patch | 27 +
...ueryloaders-Make-output-more-reproducible.patch | 56 --
.../gdk-pixbuf/gdk-pixbuf/fatal-loader.patch | 39 +-
...{gdk-pixbuf_2.36.8.bb => gdk-pixbuf_2.36.11.bb} | 6 +-
...ble-libseccomp-sycall-filtering-mechanism.patch | 38 ++
...op-thumbnail-don-t-convert-time_t-to-long.patch | 31 +-
...desktop3_3.24.2.bb => gnome-desktop3_3.26.1.bb} | 14 +-
.../0001-Don-t-use-AC_CANONICAL_HOST.patch | 11 +-
...heme_3.24.0.bb => adwaita-icon-theme_3.26.0.bb} | 4 +-
...n_1.52.1.bb => gobject-introspection_1.54.1.bb} | 7 +-
...22.0.bb => gsettings-desktop-schemas_3.24.1.bb} | 4 +-
...Do-not-try-to-initialize-GL-without-libGL.patch | 22 +-
.../0003-Add-disable-opengl-configure-option.patch | 244 +++------
.../gtk+/{gtk+3_3.22.17.bb => gtk+3_3.22.24.bb} | 4 +-
...on-theme_0.15.bb => hicolor-icon-theme_0.17.bb} | 4 +-
.../libgudev/{libgudev_231.bb => libgudev_232.bb} | 4 +-
.../{librsvg_2.40.18.bb => librsvg_2.40.19.bb} | 4 +-
.../clutter/clutter-gtk-1.0_1.8.2.bb | 6 -
.../clutter/clutter-gtk-1.0_1.8.4.bb | 6 +
...src-fcxml.c-avoid-double-free-of-filename.patch | 28 +
.../{fontconfig_2.12.4.bb => fontconfig_2.12.6.bb} | 7 +-
.../{freetype_2.8.bb => freetype_2.8.1.bb} | 6 +-
.../glew/{glew_2.0.0.bb => glew_2.1.0.bb} | 4 +-
.../pango/{pango_1.40.6.bb => pango_1.40.12.bb} | 4 +-
.../vulkan/{assimp_4.0.0.bb => assimp_4.0.1.bb} | 2 +-
.../{vulkan_1.0.51.0.bb => vulkan_1.0.61.1.bb} | 6 +-
.../0001-tools-Fix-race-in-autotools-install.patch | 37 --
.../{libinput_1.8.1.bb => libinput_1.8.3.bb} | 8 +-
meta/recipes-kernel/dtc/dtc.inc | 3 +-
.../dtc/{dtc_1.4.4.bb => dtc_1.4.5.bb} | 2 +-
...Makefile-Add-LDFLAGS-variable-to-SLDFLAGS.patch | 31 --
.../files/fix-misleading-indentation-error.patch | 38 --
meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb | 33 --
meta/recipes-kernel/oprofile/oprofile.inc | 65 ---
...Add-rmb-definition-for-NIOS2-architecture.patch | 30 --
.../0001-Fix-FTBFS-problem-with-GCC-6.patch | 51 --
meta/recipes-kernel/oprofile/oprofile/acinclude.m4 | 581 ---------------------
.../oprofile/oprofile/automake-foreign.patch | 12 -
meta/recipes-kernel/oprofile/oprofile/musl.patch | 46 --
.../oprofile/oprofile-cross-compile-tests.patch | 98 ----
.../oprofile/oprofile/root-home-dir.patch | 44 --
meta/recipes-kernel/oprofile/oprofile/run-ptest | 19 -
meta/recipes-kernel/oprofile/oprofile_1.1.0.bb | 10 -
.../{sysprof_3.24.1.bb => sysprof_3.26.1.bb} | 4 +-
.../ffmpeg/ffmpeg/CVE-2017-14054.patch | 39 --
.../ffmpeg/ffmpeg/CVE-2017-14055.patch | 34 --
.../ffmpeg/ffmpeg/CVE-2017-14056.patch | 51 --
.../ffmpeg/ffmpeg/CVE-2017-14057.patch | 44 --
.../ffmpeg/ffmpeg/CVE-2017-14058.patch | 94 ----
.../ffmpeg/ffmpeg/CVE-2017-14059.patch | 40 --
.../ffmpeg/ffmpeg/CVE-2017-14169.patch | 39 --
.../ffmpeg/ffmpeg/CVE-2017-14170.patch | 49 --
.../ffmpeg/ffmpeg/CVE-2017-14171.patch | 44 --
.../ffmpeg/ffmpeg/CVE-2017-14222.patch | 40 --
.../ffmpeg/ffmpeg/CVE-2017-14223.patch | 38 --
.../ffmpeg/ffmpeg/CVE-2017-14225.patch | 49 --
.../ffmpeg/{ffmpeg_3.3.3.bb => ffmpeg_3.3.4.bb} | 16 +-
.../mpg123/{mpg123_1.25.6.bb => mpg123_1.25.7.bb} | 4 +-
.../webkitgtk/0001-Fix-build-with-musl.patch | 77 +++
...ix-racy-parallel-build-of-WebKit2-4.0.gir.patch | 23 +-
...c-settings-so-that-gtkdoc-generation-work.patch | 21 +-
...bKitMacros-Append-to-I-and-not-to-isystem.patch | 182 +++----
...ng-introspection-files-add-CMAKE_C_FLAGS-.patch | 24 +-
.../detect-atomics-during-configure.patch | 26 +-
meta/recipes-sato/webkit/webkitgtk/gcc7.patch | 23 -
.../recipes-sato/webkit/webkitgtk/musl-fixes.patch | 48 --
.../webkit/webkitgtk/ppc-musl-fix.patch | 26 -
.../{webkitgtk_2.16.6.bb => webkitgtk_2.18.0.bb} | 10 +-
...at-spi2-atk_2.24.1.bb => at-spi2-atk_2.26.0.bb} | 4 +-
.../0001-build-Add-with-systemduserunitdir.patch | 29 +-
.../0001-nls.m4-Take-it-from-gettext-0.15.patch | 54 --
...-spi2-core_2.24.1.bb => at-spi2-core_2.26.0.bb} | 9 +-
.../atk/{atk_2.24.0.bb => atk_2.26.0.bb} | 6 +-
...bjam-native_1.64.0.bb => bjam-native_1.65.1.bb} | 3 +-
.../boost/{boost-1.64.0.inc => boost-1.65.1.inc} | 4 +-
...detail-socket_types.hpp-fix-poll.h-includ.patch | 49 --
.../boost/{boost_1.64.0.bb => boost_1.65.1.bb} | 1 -
...ge-assert-typo-how-was-this-released-with.patch | 37 ++
.../{iso-codes_3.75.bb => iso-codes_3.76.bb} | 4 +-
...libsoup-2.4_2.58.2.bb => libsoup-2.4_2.60.1.bb} | 4 +-
...for-integer-overflow-in-xsltAddTextString.patch | 80 ---
.../libxslt/0001-Link-libraries-with-libm.patch | 48 --
...Use-pkg-config-to-find-gcrypt-and-libxml2.patch | 130 -----
.../{libxslt_1.1.29.bb => libxslt_1.1.31.bb} | 9 +-
meta/recipes-support/lz4/lz4_1.7.4.bb | 1 +
...ed-mime-info_1.8.bb => shared-mime-info_1.9.bb} | 4 +-
.../vte/{vte_0.48.3.bb => vte_0.50.1.bb} | 4 +-
117 files changed, 990 insertions(+), 2902 deletions(-)
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch
rename meta/recipes-core/glib-2.0/{glib-2.0_2.52.3.bb => glib-2.0_2.54.1.bb} (79%)
rename meta/recipes-core/glib-networking/{glib-networking_2.50.0.bb => glib-networking_2.54.0.bb} (88%)
create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch
rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.12.bb => btrfs-tools_4.13.2.bb} (90%)
delete mode 100644 meta/recipes-devtools/dnf/dnf/0001-Check-conf.releasever-instead-of-releasever.patch
rename meta/recipes-devtools/dnf/{dnf_2.6.3.bb => dnf_2.7.3.bb} (95%)
rename meta/recipes-devtools/libdnf/{libdnf_0.9.3.bb => libdnf_0.11.0.bb} (95%)
delete mode 100644 meta/recipes-devtools/librepo/librepo/0001-Correctly-set-the-library-installation-directory.patch
delete mode 100644 meta/recipes-devtools/librepo/librepo/0003-tests-fix-a-race-when-deleting-temporary-directories.patch
delete mode 100644 meta/recipes-devtools/librepo/librepo/0005-Fix-typo-correct-LRO_SSLVERIFYHOST-with-CURLOPT_SSL_.patch
rename meta/recipes-devtools/librepo/{librepo_git.bb => librepo_1.8.1.bb} (68%)
create mode 100644 meta/recipes-devtools/vala/vala/0001-Disable-valadoc.patch
create mode 100644 meta/recipes-devtools/vala/vala/disable-graphviz.patch
rename meta/recipes-devtools/vala/{vala_0.36.4.bb => vala_0.38.2.bb} (44%)
rename meta/recipes-extended/libsolv/{libsolv_0.6.28.bb => libsolv_0.6.29.bb} (95%)
rename meta/recipes-extended/xdg-utils/{xdg-utils_1.1.1.bb => xdg-utils_1.1.2.bb} (89%)
create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch
delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-queryloaders-Make-output-more-reproducible.patch
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.36.8.bb => gdk-pixbuf_2.36.11.bb} (94%)
create mode 100644 meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch
rename meta/recipes-gnome/gnome-desktop/{gnome-desktop3_3.24.2.bb => gnome-desktop3_3.26.1.bb} (66%)
rename meta/recipes-gnome/gnome/{adwaita-icon-theme_3.24.0.bb => adwaita-icon-theme_3.26.0.bb} (93%)
rename meta/recipes-gnome/gobject-introspection/{gobject-introspection_1.52.1.bb => gobject-introspection_1.54.1.bb} (97%)
rename meta/recipes-gnome/gsettings-desktop-schemas/{gsettings-desktop-schemas_3.22.0.bb => gsettings-desktop-schemas_3.24.1.bb} (70%)
rename meta/recipes-gnome/gtk+/{gtk+3_3.22.17.bb => gtk+3_3.22.24.bb} (84%)
rename meta/recipes-gnome/hicolor-icon-theme/{hicolor-icon-theme_0.15.bb => hicolor-icon-theme_0.17.bb} (74%)
rename meta/recipes-gnome/libgudev/{libgudev_231.bb => libgudev_232.bb} (74%)
rename meta/recipes-gnome/librsvg/{librsvg_2.40.18.bb => librsvg_2.40.19.bb} (91%)
delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.2.bb
create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb
create mode 100644 meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch
rename meta/recipes-graphics/fontconfig/{fontconfig_2.12.4.bb => fontconfig_2.12.6.bb} (90%)
rename meta/recipes-graphics/freetype/{freetype_2.8.bb => freetype_2.8.1.bb} (90%)
rename meta/recipes-graphics/glew/{glew_2.0.0.bb => glew_2.1.0.bb} (92%)
rename meta/recipes-graphics/pango/{pango_1.40.6.bb => pango_1.40.12.bb} (92%)
rename meta/recipes-graphics/vulkan/{assimp_4.0.0.bb => assimp_4.0.1.bb} (92%)
rename meta/recipes-graphics/vulkan/{vulkan_1.0.51.0.bb => vulkan_1.0.61.1.bb} (94%)
delete mode 100644 meta/recipes-graphics/wayland/libinput/0001-tools-Fix-race-in-autotools-install.patch
rename meta/recipes-graphics/wayland/{libinput_1.8.1.bb => libinput_1.8.3.bb} (81%)
rename meta/recipes-kernel/dtc/{dtc_1.4.4.bb => dtc_1.4.5.bb} (81%)
delete mode 100644 meta/recipes-kernel/libpfm/files/0001-Makefile-Add-LDFLAGS-variable-to-SLDFLAGS.patch
delete mode 100644 meta/recipes-kernel/libpfm/files/fix-misleading-indentation-error.patch
delete mode 100644 meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb
delete mode 100644 meta/recipes-kernel/oprofile/oprofile.inc
delete mode 100644 meta/recipes-kernel/oprofile/oprofile/0001-Add-rmb-definition-for-NIOS2-architecture.patch
delete mode 100644 meta/recipes-kernel/oprofile/oprofile/0001-Fix-FTBFS-problem-with-GCC-6.patch
delete mode 100644 meta/recipes-kernel/oprofile/oprofile/acinclude.m4
delete mode 100644 meta/recipes-kernel/oprofile/oprofile/automake-foreign.patch
delete mode 100644 meta/recipes-kernel/oprofile/oprofile/musl.patch
delete mode 100644 meta/recipes-kernel/oprofile/oprofile/oprofile-cross-compile-tests.patch
delete mode 100644 meta/recipes-kernel/oprofile/oprofile/root-home-dir.patch
delete mode 100644 meta/recipes-kernel/oprofile/oprofile/run-ptest
delete mode 100644 meta/recipes-kernel/oprofile/oprofile_1.1.0.bb
rename meta/recipes-kernel/sysprof/{sysprof_3.24.1.bb => sysprof_3.26.1.bb} (88%)
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14054.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14055.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14056.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14057.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14058.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14059.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14169.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14170.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14171.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14222.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14223.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14225.patch
rename meta/recipes-multimedia/ffmpeg/{ffmpeg_3.3.3.bb => ffmpeg_3.3.4.bb} (91%)
rename meta/recipes-multimedia/mpg123/{mpg123_1.25.6.bb => mpg123_1.25.7.bb} (94%)
create mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
delete mode 100644 meta/recipes-sato/webkit/webkitgtk/gcc7.patch
delete mode 100644 meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch
delete mode 100644 meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch
rename meta/recipes-sato/webkit/{webkitgtk_2.16.6.bb => webkitgtk_2.18.0.bb} (94%)
rename meta/recipes-support/atk/{at-spi2-atk_2.24.1.bb => at-spi2-atk_2.26.0.bb} (83%)
delete mode 100644 meta/recipes-support/atk/at-spi2-core/0001-nls.m4-Take-it-from-gettext-0.15.patch
rename meta/recipes-support/atk/{at-spi2-core_2.24.1.bb => at-spi2-core_2.26.0.bb} (80%)
rename meta/recipes-support/atk/{atk_2.24.0.bb => atk_2.26.0.bb} (72%)
rename meta/recipes-support/boost/{bjam-native_1.64.0.bb => bjam-native_1.65.1.bb} (68%)
rename meta/recipes-support/boost/{boost-1.64.0.inc => boost-1.65.1.inc} (85%)
delete mode 100644 meta/recipes-support/boost/boost/0001-boost-asio-detail-socket_types.hpp-fix-poll.h-includ.patch
rename meta/recipes-support/boost/{boost_1.64.0.bb => boost_1.65.1.bb} (85%)
create mode 100644 meta/recipes-support/boost/files/0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch
rename meta/recipes-support/iso-codes/{iso-codes_3.75.bb => iso-codes_3.76.bb} (76%)
rename meta/recipes-support/libsoup/{libsoup-2.4_2.58.2.bb => libsoup-2.4_2.60.1.bb} (89%)
delete mode 100644 meta/recipes-support/libxslt/libxslt/0001-Check-for-integer-overflow-in-xsltAddTextString.patch
delete mode 100644 meta/recipes-support/libxslt/libxslt/0001-Link-libraries-with-libm.patch
delete mode 100644 meta/recipes-support/libxslt/libxslt/0001-Use-pkg-config-to-find-gcrypt-and-libxml2.patch
rename meta/recipes-support/libxslt/{libxslt_1.1.29.bb => libxslt_1.1.31.bb} (77%)
rename meta/recipes-support/shared-mime-info/{shared-mime-info_1.8.bb => shared-mime-info_1.9.bb} (43%)
rename meta/recipes-support/vte/{vte_0.48.3.bb => vte_0.50.1.bb} (91%)Signature · 1 line
2.14.1
PATCH 1/50 oprofile: remove the recipe
Perf is the preferred solution, and oprofile is difficult to maintain against musl.
--- meta/conf/distro/include/distro_alias.inc | 1 - meta/conf/layer.conf | 1 - meta/recipes-kernel/oprofile/oprofile.inc | 65 --- ...Add-rmb-definition-for-NIOS2-architecture.patch | 30 -- .../0001-Fix-FTBFS-problem-with-GCC-6.patch | 51 -- meta/recipes-kernel/oprofile/oprofile/acinclude.m4 | 581 --------------------- .../oprofile/oprofile/automake-foreign.patch | 12 - meta/recipes-kernel/oprofile/oprofile/musl.patch | 46 -- .../oprofile/oprofile-cross-compile-tests.patch | 98 ---- .../oprofile/oprofile/root-home-dir.patch | 44 -- meta/recipes-kernel/oprofile/oprofile/run-ptest | 19 - meta/recipes-kernel/oprofile/oprofile_1.1.0.bb | 10 - 12 files changed, 958 deletions(-) delete mode 100644 meta/recipes-kernel/oprofile/oprofile.inc delete mode 100644 meta/recipes-kernel/oprofile/oprofile/0001-Add-rmb-definition-for-NIOS2-architecture.patch delete mode 100644 meta/recipes-kernel/oprofile/oprofile/0001-Fix-FTBFS-problem-with-GCC-6.patch delete mode 100644 meta/recipes-kernel/oprofile/oprofile/acinclude.m4 delete mode 100644 meta/recipes-kernel/oprofile/oprofile/automake-foreign.patch delete mode 100644 meta/recipes-kernel/oprofile/oprofile/musl.patch delete mode 100644 meta/recipes-kernel/oprofile/oprofile/oprofile-cross-compile-tests.patch delete mode 100644 meta/recipes-kernel/oprofile/oprofile/root-home-dir.patch delete mode 100644 meta/recipes-kernel/oprofile/oprofile/run-ptest delete mode 100644 meta/recipes-kernel/oprofile/oprofile_1.1.0.bb
meta/conf/distro/include/distro_alias.inc +0 -1
@@ -278,7 +278,6 @@ DISTRO_PN_ALIAS_pn-opkg-collateral = "OE-Core" DISTRO_PN_ALIAS_pn-opkg-keyrings = "OSPDT upstream=git://git.yoctoproject.org/opkg-utils" DISTRO_PN_ALIAS_pn-opkg-nogpg = "OSPDT upstream=git://git.yoctoproject.org/opkg-utils" DISTRO_PN_ALIAS_pn-opkg-utils = "OSPDT upstream=git://git.yoctoproject.org/opkg-utils" -DISTRO_PN_ALIAS_pn-oprofile = "Debian=oprofile Fedora=oprofile" DISTRO_PN_ALIAS_pn-os-release = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-base = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-core = "OE-Core"
meta/conf/layer.conf +0 -1
@@ -63,7 +63,6 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ font-alias->font-util \ weston-init->weston \ weston-init->kbd \ - oprofile->virtual/kernel \ " # We need to keep bitbake tools in PATH
meta/recipes-kernel/oprofile/oprofile.inc deleted +0 -65
65 lines not on this page · raw message
meta/recipes-kernel/oprofile/oprofile/0001-Add-rmb-definition-for-NIOS2-architecture.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From 34b0d9b1a32fb404a30327a7ae8931c7c75583bf Mon Sep 17 00:00:00 2001 -From: Marek Vasut <[email protected]> -Date: Tue, 9 Feb 2016 02:00:29 +0100 -Subject: [PATCH] Add rmb() definition for NIOS2 architecture - -Signed-off-by: Marek Vasut <[email protected]> -Upstream-Status: Submitted [ http://marc.info/?l=oprofile-list&m=145501915931874&w=2 ] ---- - libperf_events/operf_utils.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libperf_events/operf_utils.h b/libperf_events/operf_utils.h -index 32954cc..8270e53 100644 ---- a/libperf_events/operf_utils.h -+++ b/libperf_events/operf_utils.h -@@ -178,6 +178,11 @@ void op_release_resources(void); - #define cpu_relax() asm volatile("" ::: "memory") - #endif - -+#ifdef __nios2__ -+#define rmb() asm volatile("" ::: "memory") -+#define cpu_relax() asm volatile("" ::: "memory") -+#endif -+ - #ifdef __tile__ - #include <asm/unistd.h> - #define rmb() __insn_mf() --- -2.7.0 -
meta/recipes-kernel/oprofile/oprofile/0001-Fix-FTBFS-problem-with-GCC-6.patch deleted +0 -51
51 lines not on this page · raw message
meta/recipes-kernel/oprofile/oprofile/acinclude.m4 deleted +0 -581
581 lines not on this page · raw message
meta/recipes-kernel/oprofile/oprofile/automake-foreign.patch deleted +0 -12
@@ -1,12 +0,0 @@ -oprofile doesn't want GNU-levels of automake strictness so tell it to be "foreign". - -Upstream-Status: Pending -Signed-off-by: Ross Burton <[email protected]> - -diff --git a/configure.ac b/configure.ac -index 5740585..cf6c316 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -16 +16 @@ AC_CONFIG_SRCDIR([libop/op_config.h]) --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign])
meta/recipes-kernel/oprofile/oprofile/musl.patch deleted +0 -46
46 lines not on this page · raw message
meta/recipes-kernel/oprofile/oprofile/oprofile-cross-compile-tests.patch deleted +0 -98
98 lines not on this page · raw message
meta/recipes-kernel/oprofile/oprofile/root-home-dir.patch deleted +0 -44
44 lines not on this page · raw message
meta/recipes-kernel/oprofile/oprofile/run-ptest deleted +0 -19
@@ -1,19 +0,0 @@ -#!/bin/sh - -saved_dir=$PWD -for dir in */tests ; do - cd $dir - for atest in * ; do - if [ \( -x $atest \) -a \( -f $atest \) ] ; then - ./$atest > ${atest}.stdout 2> ${atest}.stderr - if [ $? = 0 ] ; then - echo "PASS: $dir $atest" - rm ${atest}.stdout ${atest}.stderr - else - echo "FAIL: ${dir}/${atest}" - fi - fi - done - cd $saved_dir -done -
meta/recipes-kernel/oprofile/oprofile_1.1.0.bb deleted +0 -10
@@ -1,10 +0,0 @@ -require oprofile.inc - -DEPENDS += "virtual/kernel" -DEPENDS_append_powerpc64 = " libpfm4" - -SRC_URI[md5sum] = "248c4c069f9476f427fa7195563f9867" -SRC_URI[sha256sum] = "cf759a6de1a6033d5dfc93bda129a9f2e128aecc4238cc657feb0801d1b0366c" - -S = "${WORKDIR}/oprofile-${PV}" -
Signature · 1 line
2.14.1
PATCH 2/50 libpfm4: remove the recipe
In reply to Alexander KanavinIt was required only by oprofile.
--- ...Makefile-Add-LDFLAGS-variable-to-SLDFLAGS.patch | 31 ------------------ .../files/fix-misleading-indentation-error.patch | 38 ---------------------- meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb | 33 ------------------- 3 files changed, 102 deletions(-) delete mode 100644 meta/recipes-kernel/libpfm/files/0001-Makefile-Add-LDFLAGS-variable-to-SLDFLAGS.patch delete mode 100644 meta/recipes-kernel/libpfm/files/fix-misleading-indentation-error.patch delete mode 100644 meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb
meta/recipes-kernel/libpfm/files/0001-Makefile-Add-LDFLAGS-variable-to-SLDFLAGS.patch deleted +0 -31
@@ -1,31 +0,0 @@ -From 272a8a069a8f5f06a1e5dfa0ef12f5f92984728b Mon Sep 17 00:00:00 2001 -From: Noor <[email protected]> -Date: Wed, 12 Aug 2015 20:54:00 +0500 -Subject: [PATCH] Makefile: Add LDFLAGS variable to SLDFLAGS. - -* Add LDFLAGS variable to SLDFLAGS so that extra linker - flags can be sent via this variable. - -Upstream-Status: Submitted [[email protected]] - -Signed-off-by: Noor Ahsan <[email protected]> ---- - lib/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/Makefile b/lib/Makefile -index 1cc8765..4bd92ef 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -187,7 +187,7 @@ CFLAGS += -DCONFIG_PFMLIB_CELL - endif - - ifeq ($(SYS),Linux) --SLDFLAGS=-shared -Wl,-soname -Wl,$(VLIBPFM) -+SLDFLAGS=$(LDFLAGS) -shared -Wl,-soname -Wl,$(VLIBPFM) - SLIBPFM=libpfm.so.$(VERSION).$(REVISION).$(AGE) - VLIBPFM=libpfm.so.$(VERSION) - SOLIBEXT=so --- -1.7.9.5 -
meta/recipes-kernel/libpfm/files/fix-misleading-indentation-error.patch deleted +0 -38
@@ -1,38 +0,0 @@ -Upstream-Status: Pending - -Fix compile error: - -| syst_count.c:346:3: error: this 'for' clause does not guard... [-Werror=misleading-indentation] -| for(c=cmin ; c < cmax; c++) -| ^~~ - -Signed-off-by: Kai Kang <[email protected]> ---- -diff --git a/perf_examples/syst_count.c b/perf_examples/syst_count.c -index 0d53078..2dfb9b9 100644 ---- a/perf_examples/syst_count.c -+++ b/perf_examples/syst_count.c -@@ -343,8 +343,9 @@ measure(void) - - for (delay = 1 ; delay <= options.delay; delay++) { - -- for(c=cmin ; c < cmax; c++) -- start_cpu(c); -+ for(c=cmin ; c < cmax; c++) { -+ start_cpu(c); -+ } - - if (0) { - tv.tv_sec = 0; -@@ -353,8 +354,9 @@ measure(void) - } else - sleep(1); - -- for(c=cmin ; c < cmax; c++) -- stop_cpu(c); -+ for(c=cmin ; c < cmax; c++) { -+ stop_cpu(c); -+ } - - for(c = cmin; c < cmax; c++) { - printf("# %'ds -----\n", delay);
meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb deleted +0 -33
@@ -1,33 +0,0 @@ -SUMMARY = "Monitoring tools exploiting the performance monitoring events" -DESCRIPTION = "This package provides a library, called libpfm4 which is used to develop \ -monitoring tools exploiting the performance monitoring events such as those \ -provided by the Performance Monitoring Unit (PMU) of modern processors." -HOMEPAGE = "http://perfmon2.sourceforge.net/" -BUGTRACKER = "http://sourceforge.net/tracker/?group_id=144822&atid=759953&source=navbar" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=0de488f3bd4424e308e2e399cb99c788" - -SECTION = "devel" - -COMPATIBLE_HOST = "powerpc64" - -SRC_URI = "http://downloads.sourceforge.net/project/perfmon2/${BPN}/libpfm-${PV}.tar.gz \ - file://0001-Makefile-Add-LDFLAGS-variable-to-SLDFLAGS.patch \ - file://fix-misleading-indentation-error.patch \ - " - -SRC_URI[md5sum] = "5077b9022440e4951d96f2d0e73bd487" -SRC_URI[sha256sum] = "5ab1e5b0472550f9037a8800834f6bc3b927690070f69fac0b67284b4b05fd5f" - -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/perfmon2/files/libpfm4/" - -EXTRA_OEMAKE = "DESTDIR=\"${D}\" PREFIX=\"${prefix}\" LIBDIR=\"${libdir}\" LDCONFIG=\"true\"" -EXTRA_OEMAKE_append_powerpc = " ARCH=\"powerpc\"" -EXTRA_OEMAKE_append_powerpc64 = " ARCH=\"powerpc\" BITMODE=\"64\"" - -S = "${WORKDIR}/libpfm-${PV}" - -do_install () { - oe_runmake install -}
Signature · 1 line
2.14.1
PATCH 3/50 glib-2.0: update to 2.54.1
In reply to Alexander KanavinLGPL version has been updated from 2.0 to 2.1, adjust the checksums accordingly.
Rebase various patches.
A few tools have been rewritten from perl (or C) to python, so add a patch that avoids hardcoding the python path in the shebang, and remove previous patching with sed.
---
...warning-about-deprecated-paths-in-schemas.patch | 25 +++++++-----
...t-hardcode-python-path-into-various-tools.patch | 46 ++++++++++++++++++++++
.../Enable-more-tests-while-cross-compiling.patch | 30 ++++++++------
.../glib-2.0/glib-2.0/configure-libtool.patch | 38 ++++--------------
.../{glib-2.0_2.52.3.bb => glib-2.0_2.54.1.bb} | 5 ++-
meta/recipes-core/glib-2.0/glib.inc | 16 +++-----
6 files changed, 95 insertions(+), 65 deletions(-)
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch
rename meta/recipes-core/glib-2.0/{glib-2.0_2.52.3.bb => glib-2.0_2.54.1.bb} (79%)meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch +16 -9
@@ -1,7 +1,7 @@ -From 41534253b6b61ed4769eb6a3966698a50ee73b71 Mon Sep 17 00:00:00 2001 +From 2acf40361eecd17c6981743dabd06e25a9934258 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 12 Jun 2015 17:08:46 +0300 -Subject: [PATCH] Remove the warning about deprecated paths in schemas +Subject: [PATCH 05/10] Remove the warning about deprecated paths in schemas Some schemas in gsettings-desktop-schemas (such as proxy and locale) are still using deprecated paths, as of 3.16.1. This causes warning
@@ -11,26 +11,33 @@ Upstream-Status: Inappropriate Signed-off-by: Alexander Kanavin <[email protected]> --- - gio/glib-compile-schemas.c | 6 ------ - 1 file changed, 6 deletions(-) + gio/glib-compile-schemas.c | 13 ------------- + 1 file changed, 13 deletions(-) diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c -index e42949b..ec79d7c 100644 +index b8de090..130f89b 100644 --- a/gio/glib-compile-schemas.c +++ b/gio/glib-compile-schemas.c -@@ -1202,12 +1202,6 @@ parse_state_start_schema (ParseState *state, +@@ -1219,19 +1219,6 @@ parse_state_start_schema (ParseState *state, return; } - if (path && (g_str_has_prefix (path, "/apps/") || - g_str_has_prefix (path, "/desktop/") || - g_str_has_prefix (path, "/system/"))) -- g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with " -- "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path); +- { +- gchar *message = NULL; +- message = g_strdup_printf (_("Warning: Schema “%s” has path “%s”. " +- "Paths starting with " +- "“/apps/”, “/desktop/” or “/system/” are deprecated."), +- id, path); +- g_printerr ("%s\n", message); +- g_free (message); +- } - state->schema_state = schema_state_new (path, gettext_domain, extends, extends_name, list_of); -- -2.1.4 +2.14.1
meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch new file +46 -0
46 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch +17 -13
@@ -1,7 +1,7 @@ -From 310dfe1bdd16d4b254732fcc202c6211629bc7b6 Mon Sep 17 00:00:00 2001 +From d762907d33b81cf7469b5696c87f2188d2050afb Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <[email protected]> Date: Mon, 9 Nov 2015 11:07:27 +0200 -Subject: [PATCH] Enable more tests while cross-compiling +Subject: [PATCH 06/10] Enable more tests while cross-compiling Upstream disables a few tests while cross-compiling because their build requires running other built binaries. This usually makes sense but in the cross-compile
@@ -9,16 +9,17 @@ case we can depend on glib-2.0-native. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Jussi Kukkonen <[email protected]> + --- - gio/tests/Makefile.am | 8 +++----- - tests/gobject/Makefile.am | 8 +++----- - 2 files changed, 6 insertions(+), 10 deletions(-) + gio/tests/Makefile.am | 10 ++++++---- + tests/gobject/Makefile.am | 8 +++++--- + 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am -index 868873f..533e454 100644 +index acc1da4..9176640 100644 --- a/gio/tests/Makefile.am +++ b/gio/tests/Makefile.am -@@ -503,10 +503,9 @@ test_programs += \ +@@ -516,10 +516,9 @@ test_programs += \ endif # -----------------------------------------------------------------------------
@@ -31,7 +32,7 @@ index 868873f..533e454 100644 test_programs += resources resources_SOURCES = resources.c nodist_resources_SOURCES = test_resources.c test_resources2.c test_resources2.h -@@ -528,7 +527,11 @@ if !ENABLE_INSTALLED_TESTS +@@ -543,7 +542,11 @@ if !ENABLE_INSTALLED_TESTS libresourceplugin_la_LDFLAGS += -rpath / endif
@@ -41,18 +42,18 @@ index 868873f..533e454 100644 +glib_compile_resources=glib-compile-resources +endif - resources.o: test_resources2.h - test_resources.c: test2.gresource.xml Makefile $(shell $(glib_compile_resources) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/test2.gresource.xml) -@@ -545,7 +548,6 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) -- + test-generated.txt: test1.txt + $(AM_V_GEN) echo "Generated" > $@ && \ +@@ -564,7 +567,6 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) -- EXTRA_DIST += test.gresource.xml test1.txt test2.gresource.xml test2.txt test3.gresource.xml test3.txt test4.gresource.xml CLEANFILES += test-generated.txt test_resources.c test_resources2.[ch] plugin_resources.c test.gresource -endif # !CROSS_COMPILING - BUILT_SOURCES += giotypefuncs.c + BUILT_SOURCES += giotypefuncs.inc diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am -index 16f2827..4c2208e 100644 +index 656941d..68555ff 100644 --- a/tests/gobject/Makefile.am +++ b/tests/gobject/Makefile.am @@ -48,10 +48,13 @@ if ENABLE_TIMELOOP
@@ -79,3 +80,6 @@ index 16f2827..4c2208e 100644 dist-hook: $(BUILT_EXTRA_DIST) files='$(BUILT_EXTRA_DIST)'; \ +-- +2.14.1 +
meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch +8 -30
@@ -1,7 +1,7 @@ -From e8740833336c59d6f616a1781b256e648e338c26 Mon Sep 17 00:00:00 2001 +From 1dd1e6ddca5deada049bac2e1ee1fe4ecc5342c5 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 28 Apr 2012 18:24:50 +0200 -Subject: [PATCH] configure: use $host_alias-libtool instead of libtool +Subject: [PATCH 01/10] configure: use $host_alias-libtool instead of libtool directly Poky renames libtool to $host_alias-libtool.
@@ -18,24 +18,16 @@ Rebased to glib-2.31.20+ by Andre McCurdy <[email protected]> Upstream-Status: Inappropriate [configuration] Signed-off-by: Martin Jansa <[email protected]> + --- - configure.ac | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index 1af90c5..f6b7a73 100644 +index 6fa6eb0..b6f78a6 100644 --- a/configure.ac +++ b/configure.ac -@@ -1378,7 +1378,7 @@ if test x"$glib_native_win32" = xyes; then - G_MODULE_LDFLAGS= - else - export SED -- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` -+ G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` - fi - dnl G_MODULE_IMPL= don't reset, so cmd-line can override - G_MODULE_NEED_USCORE=0 -@@ -1427,13 +1427,13 @@ AS_IF([ test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL" ], [ +@@ -1428,9 +1428,9 @@ AS_IF([ test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL" ], [ LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness echo "void glib_plugin_test(void) { }" > plugin.c
@@ -47,20 +39,6 @@ index 1af90c5..f6b7a73 100644 ${LDFLAGS} -module -o plugin.la -export-dynamic \ -shrext ".o" -avoid-version plugin.lo \ -rpath /dont/care >/dev/null 2>&1 -- eval `./libtool --config | grep ^objdir` -+ eval `./$host_alias-libtool --config | grep ^objdir` - AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], - glib_cv_rtldglobal_broken,[ - AC_TRY_RUN([ -@@ -1506,7 +1506,7 @@ fi - - AC_MSG_CHECKING(for the suffix of module shared libraries) - export SED --shrext_cmds=`./libtool --config | grep '^shrext_cmds='` -+shrext_cmds=`./$host_alias-libtool --config | grep '^shrext_cmds='` - eval $shrext_cmds - module=yes eval std_shrext=$shrext_cmds - # chop the initial dot -- -1.9.1 +2.14.1
meta/recipes-core/glib-2.0/glib-2.0_2.54.1.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.52.3.bb +3 -2
@@ -15,9 +15,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ file://0001-Do-not-ignore-return-value-of-write.patch \ file://0001-Test-for-pthread_getname_np-before-using-it.patch \ + file://0010-Do-not-hardcode-python-path-into-various-tools.patch \ " SRC_URI_append_class-native = " file://relocate-modules.patch" -SRC_URI[md5sum] = "89265d0289a436e99cad54491eb21ef4" -SRC_URI[sha256sum] = "25ee7635a7c0fcd4ec91cbc3ae07c7f8f5ce621d8183511f414ded09e7e4e128" +SRC_URI[md5sum] = "f8903002421c44dc6e5b5baab8066f1f" +SRC_URI[sha256sum] = "50c01b1419324f10fbf9b9709ec2164b18586968bdce7540583bf32302cf47a3"
meta/recipes-core/glib-2.0/glib.inc +5 -11
@@ -4,11 +4,11 @@ HOMEPAGE = "https://developer.gnome.org/glib/" # pcre is under BSD; # docs/reference/COPYING is with a 'public domai'-like license! -LICENSE = "LGPLv2+ & BSD & PD" -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://glib/glib.h;beginline=4;endline=17;md5=b4f0f4a399c19e5ebb20c31b79d6bc32 \ - file://gmodule/COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://gmodule/gmodule.h;beginline=4;endline=17;md5=b4f0f4a399c19e5ebb20c31b79d6bc32 \ +LICENSE = "LGPLv2.1+ & BSD & PD" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://glib/glib.h;beginline=4;endline=17;md5=b88abb7f3ad09607e71cb9d530155906 \ + file://gmodule/COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://gmodule/gmodule.h;beginline=4;endline=17;md5=b88abb7f3ad09607e71cb9d530155906 \ file://glib/pcre/COPYING;md5=266ebc3ff74ee9ce6fad65577667c0f4 \ file://glib/pcre/pcre.h;beginline=11;endline=35;md5=de27f2bf633d20a2b7af0b1983423283 \ file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc"
@@ -95,12 +95,6 @@ do_install_append () { rm -f ${D}${datadir}/glib-2.0/codegen/*.pyc rm -f ${D}${datadir}/glib-2.0/codegen/*.pyo - # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location - # for target as /usr/bin/perl, so fix it to /usr/bin/perl. - if [ -f ${D}${bindir}/glib-mkenums ]; then - sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/glib-mkenums - fi - if [ -e ${D}${libdir}/charset.alias ]; then rm -f ${D}${libdir}/charset.alias fi
Signature · 1 line
2.14.1
PATCH 4/50 glib-networking: update to 2.54.0
In reply to Alexander Kanavin---
.../{glib-networking_2.50.0.bb => glib-networking_2.54.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-core/glib-networking/{glib-networking_2.50.0.bb => glib-networking_2.54.0.bb} (88%)meta/recipes-core/glib-networking/glib-networking_2.54.0.bb renamed from meta/recipes-core/glib-networking/glib-networking_2.50.0.bb +2 -2
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" SECTION = "libs" DEPENDS = "glib-2.0" -SRC_URI[archive.md5sum] = "4d06d0224646f274918b1cb6da9a07f6" -SRC_URI[archive.sha256sum] = "3f1a442f3c2a734946983532ce59ed49120319fdb10c938447c373d5e5286bee" +SRC_URI[archive.md5sum] = "45d2f8b650412c05e45b08aa78a3f735" +SRC_URI[archive.sha256sum] = "5961b3779080b72314b373ff5d4790eb7e41b75ca91816ad7a81ef32922f7096" PACKAGECONFIG ??= "ca-certificates gnutls"
Signature · 1 line
2.14.1
PATCH 5/50 eudev: fix upstream version check
In reply to Alexander Kanavin--- meta/recipes-core/udev/eudev_3.2.2.bb | 1 - 1 file changed, 1 deletion(-)
meta/recipes-core/udev/eudev_3.2.2.bb +0 -1
@@ -19,7 +19,6 @@ SRC_URI = "http://dev.gentoo.org/~blueness/${BPN}/${BP}.tar.gz \ file://run.rules \ file://udev.rules \ " -UPSTREAM_CHECK_URI = "https://github.com/gentoo/eudev/releases" SRC_URI[md5sum] = "41e19b70462692fefd072a3f38818b6e" SRC_URI[sha256sum] = "3e4c56ec2fc1854afd0a31f3affa48f922c62d40ee12a0c1a4b4f152ef5b0f63"
Signature · 1 line
2.14.1
PATCH 6/50 tcf-agent: latest upstream version is now known
In reply to Alexander KanavinSo incorrect acknowledgement of it being unknown can be deleted.
--- meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 1 - 1 file changed, 1 deletion(-)
meta/recipes-devtools/tcf-agent/tcf-agent_git.bb +0 -1
@@ -16,7 +16,6 @@ SRC_URI = "git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent;branch=1.4_ne file://tcf-agent.init \ file://tcf-agent.service \ " -UPSTREAM_VERSION_UNKNOWN = "1" DEPENDS = "util-linux openssl" RDEPENDS_${PN} = "bash"
Signature · 1 line
2.14.1
PATCH 7/50 go-helloworld: add an acknowledgement of unknown upstream version
In reply to Alexander KanavinAs upstream has no git tags.
--- meta/recipes-extended/go-examples/go-helloworld_0.1.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-extended/go-examples/go-helloworld_0.1.bb +1 -0
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda SRC_URI = "git://${GO_IMPORT}" SRCREV = "46695d81d1fae905a270fb7db8a4d11a334562fe" +UPSTREAM_VERSION_UNKNOWN = "1" GO_IMPORT = "github.com/golang/example" GO_INSTALL = "${GO_IMPORT}/hello"
Signature · 1 line
2.14.1
PATCH 8/50 dtc: update to 1.4.5
In reply to Alexander KanavinAlso fix upstream check and disable newly added python2-only bindings (as there is no clear need for them and python 2 is deprecated).
---
meta/recipes-kernel/dtc/dtc.inc | 3 ++-
meta/recipes-kernel/dtc/{dtc_1.4.4.bb => dtc_1.4.5.bb} | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
rename meta/recipes-kernel/dtc/{dtc_1.4.4.bb => dtc_1.4.5.bb} (81%)meta/recipes-kernel/dtc/dtc.inc +2 -1
@@ -8,8 +8,9 @@ DEPENDS = "flex-native bison-native" SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git \ file://make_install.patch \ " +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" -EXTRA_OEMAKE='PREFIX="${prefix}" LIBDIR="${libdir}" DESTDIR="${D}"' +EXTRA_OEMAKE='NO_PYTHON=1 PREFIX="${prefix}" LIBDIR="${libdir}" DESTDIR="${D}"' S = "${WORKDIR}/git"
meta/recipes-kernel/dtc/dtc_1.4.5.bb renamed from meta/recipes-kernel/dtc/dtc_1.4.4.bb +1 -1
@@ -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 = "558cd81bdd432769b59bff01240c44f82cfb1a9d" +SRCREV = "22a65c5331c22979d416738eb756b9541672e00d" S = "${WORKDIR}/git"
Signature · 1 line
2.14.1
PATCH 9/50 lz4: fix upstream version check
In reply to Alexander Kanavin--- meta/recipes-support/lz4/lz4_1.7.4.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-support/lz4/lz4_1.7.4.bb +1 -0
@@ -14,6 +14,7 @@ SRC_URI = "git://github.com/lz4/lz4.git \ file://0001-tests-Makefile-don-t-use-LIBDIR-as-variable.patch \ file://run-ptest \ " +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)" S = "${WORKDIR}/git" inherit ptest
Signature · 1 line
2.14.1
PATCH 10/50 freetype: fix upstream version check
In reply to Alexander Kanavin--- meta/recipes-graphics/freetype/freetype_2.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/freetype/freetype_2.8.bb +1 -1
@@ -16,7 +16,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ file://use-right-libtool.patch" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/freetype/files/freetype2/" -UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" +UPSTREAM_CHECK_REGEX = "freetype-(?P<pver>\d+(\.\d+)+)" SRC_URI[md5sum] = "2413ac3eaf508ada019c63959ea81a92" SRC_URI[sha256sum] = "a3c603ed84c3c2495f9c9331fe6bba3bb0ee65e06ec331e0a0fb52158291b40b"
Signature · 1 line
2.14.1
PATCH 11/50 libxslt: update to 1.1.31
In reply to Alexander KanavinDrop upstreamed patches, including pkg-config support patch, as upstream now does use pkg-config.
configure.in is now configure.ac, adjust recipe accordingly.
---
...for-integer-overflow-in-xsltAddTextString.patch | 80 -------------
.../libxslt/0001-Link-libraries-with-libm.patch | 48 --------
...Use-pkg-config-to-find-gcrypt-and-libxml2.patch | 130 ---------------------
.../{libxslt_1.1.29.bb => libxslt_1.1.31.bb} | 9 +-
4 files changed, 3 insertions(+), 264 deletions(-)
delete mode 100644 meta/recipes-support/libxslt/libxslt/0001-Check-for-integer-overflow-in-xsltAddTextString.patch
delete mode 100644 meta/recipes-support/libxslt/libxslt/0001-Link-libraries-with-libm.patch
delete mode 100644 meta/recipes-support/libxslt/libxslt/0001-Use-pkg-config-to-find-gcrypt-and-libxml2.patch
rename meta/recipes-support/libxslt/{libxslt_1.1.29.bb => libxslt_1.1.31.bb} (77%)meta/recipes-support/libxslt/libxslt/0001-Check-for-integer-overflow-in-xsltAddTextString.patch deleted +0 -80
@@ -1,80 +0,0 @@ -From 08ab2774b870de1c7b5a48693df75e8154addae5 Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer <[email protected]> -Date: Thu, 12 Jan 2017 15:39:52 +0100 -Subject: [PATCH] Check for integer overflow in xsltAddTextString - -Limit buffer size in xsltAddTextString to INT_MAX. The issue can be -exploited to trigger an out of bounds write on 64-bit systems. - -Originally reported to Chromium: - -https://crbug.com/676623 - -CVE: CVE-2017-5029 -Upstream-Status: Backport - -Signed-off-by: Fan Xin <[email protected]> - ---- - libxslt/transform.c | 25 ++++++++++++++++++++++--- - libxslt/xsltInternals.h | 4 ++-- - 2 files changed, 24 insertions(+), 5 deletions(-) - -diff --git a/libxslt/transform.c b/libxslt/transform.c -index 519133f..02bff34 100644 ---- a/libxslt/transform.c -+++ b/libxslt/transform.c -@@ -813,13 +813,32 @@ xsltAddTextString(xsltTransformContextPtr ctxt, xmlNodePtr target, - return(target); - - if (ctxt->lasttext == target->content) { -+ int minSize; - -- if (ctxt->lasttuse + len >= ctxt->lasttsize) { -+ /* Check for integer overflow accounting for NUL terminator. */ -+ if (len >= INT_MAX - ctxt->lasttuse) { -+ xsltTransformError(ctxt, NULL, target, -+ "xsltCopyText: text allocation failed\n"); -+ return(NULL); -+ } -+ minSize = ctxt->lasttuse + len + 1; -+ -+ if (ctxt->lasttsize < minSize) { - xmlChar *newbuf; - int size; -+ int extra; -+ -+ /* Double buffer size but increase by at least 100 bytes. */ -+ extra = minSize < 100 ? 100 : minSize; -+ -+ /* Check for integer overflow. */ -+ if (extra > INT_MAX - ctxt->lasttsize) { -+ size = INT_MAX; -+ } -+ else { -+ size = ctxt->lasttsize + extra; -+ } - -- size = ctxt->lasttsize + len + 100; -- size *= 2; - newbuf = (xmlChar *) xmlRealloc(target->content,size); - if (newbuf == NULL) { - xsltTransformError(ctxt, NULL, target, -diff --git a/libxslt/xsltInternals.h b/libxslt/xsltInternals.h -index 060b178..5ad1771 100644 ---- a/libxslt/xsltInternals.h -+++ b/libxslt/xsltInternals.h -@@ -1754,8 +1754,8 @@ struct _xsltTransformContext { - * Speed optimization when coalescing text nodes - */ - const xmlChar *lasttext; /* last text node content */ -- unsigned int lasttsize; /* last text node size */ -- unsigned int lasttuse; /* last text node use */ -+ int lasttsize; /* last text node size */ -+ int lasttuse; /* last text node use */ - /* - * Per Context Debugging - */ --- -1.9.1 -
meta/recipes-support/libxslt/libxslt/0001-Link-libraries-with-libm.patch deleted +0 -48
48 lines not on this page · raw message
meta/recipes-support/libxslt/libxslt/0001-Use-pkg-config-to-find-gcrypt-and-libxml2.patch deleted +0 -130
130 lines not on this page · raw message
meta/recipes-support/libxslt/libxslt_1.1.31.bb renamed from meta/recipes-support/libxslt/libxslt_1.1.29.bb +3 -6
@@ -10,13 +10,10 @@ DEPENDS = "libxml2" SRC_URI = "ftp://xmlsoft.org/libxslt/libxslt-${PV}.tar.gz \ file://pkgconfig_fix.patch \ - file://0001-Use-pkg-config-to-find-gcrypt-and-libxml2.patch \ - file://0001-Link-libraries-with-libm.patch \ - file://0001-Check-for-integer-overflow-in-xsltAddTextString.patch \ " -SRC_URI[md5sum] = "a129d3c44c022de3b9dcf6d6f288d72e" -SRC_URI[sha256sum] = "b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce" +SRC_URI[md5sum] = "14e9842a70fda476065f2eefcbc29af0" +SRC_URI[sha256sum] = "db25e96b6b801144277e67c05b10560ac09dfff82ccd53a154ce86e43622f3ab" UPSTREAM_CHECK_REGEX = "libxslt-(?P<pver>\d+(\.\d+)+)\.tar"
@@ -28,7 +25,7 @@ inherit autotools pkgconfig binconfig-disabled lib_package # We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header do_configure_prepend () { - sed -i -e 's/ansidecl.h//' ${S}/configure.in + sed -i -e 's/ansidecl.h//' ${S}/configure.ac # The timestamps in the 1.1.28 tarball are messed up causing this file to # appear out of date. Touch it so that we don't try to regenerate it.
Signature · 1 line
2.14.1
PATCH 12/50 vala: update to 0.38.2
In reply to Alexander KanavinValadoc has been merged into the main vala tree, so add necessary patches to disable it.
---
meta/recipes-devtools/vala/vala.inc | 2 +
.../vala/vala/0001-Disable-valadoc.patch | 32 +++
.../vala/vala/disable-graphviz.patch | 223 +++++++++++++++++++++
.../vala/{vala_0.36.4.bb => vala_0.38.2.bb} | 6 +-
4 files changed, 261 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-devtools/vala/vala/0001-Disable-valadoc.patch
create mode 100644 meta/recipes-devtools/vala/vala/disable-graphviz.patch
rename meta/recipes-devtools/vala/{vala_0.36.4.bb => vala_0.38.2.bb} (44%)meta/recipes-devtools/vala/vala.inc +2 -0
@@ -34,6 +34,8 @@ EOF chmod +x ${B}/vapigen-wrapper } +EXTRA_OECONF += " --disable-graphviz" + # Vapigen wrapper needs to be available system-wide, because it will be used # to build vapi files from all other packages with vala support do_install_append_class-target() {
meta/recipes-devtools/vala/vala/0001-Disable-valadoc.patch new file +32 -0
@@ -0,0 +1,32 @@ +From b6ca3876e233c724fd460c1579abc4ab63c8d01e Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +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 <[email protected]> +--- + 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 +
meta/recipes-devtools/vala/vala/disable-graphviz.patch new file +223 -0
223 lines not on this page · raw message
meta/recipes-devtools/vala/vala_0.38.2.bb renamed from meta/recipes-devtools/vala/vala_0.36.4.bb +4 -2
@@ -2,7 +2,9 @@ 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] = "3c19014093f1a3d995357253b463082c" -SRC_URI[sha256sum] = "e9f23ce711c1a72ce664d10946fbc5953f01b0b7f2a3562e7a01e362d86de059" +SRC_URI[md5sum] = "720846116448fc20b0ab3c0921e19798" +SRC_URI[sha256sum] = "20d5d9c4fbd17877969dbce27e6428da67138e116b1717cc07b5b75fd6ab78a7"
Signature · 1 line
2.14.1
PATCH 13/50 btrfs-tools: update to 4.13.2
In reply to Alexander Kanavin---
...ith-musl-missing-header-include-for-dev_t.patch | 26 ++++++++++++++++++++++
.../{btrfs-tools_4.12.bb => btrfs-tools_4.13.2.bb} | 3 ++-
2 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch
rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.12.bb => btrfs-tools_4.13.2.bb} (90%)meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch new file +26 -0
@@ -0,0 +1,26 @@ +From bc35c4caebb57cc8b96c30c25432b12ca8dc18d5 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Fri, 6 Oct 2017 15:03:49 +0300 +Subject: [PATCH] Fix build with musl (missing header include for dev_t). + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <[email protected]> +--- + convert/source-fs.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/convert/source-fs.h b/convert/source-fs.h +index 23f3356..6fd770f 100644 +--- a/convert/source-fs.h ++++ b/convert/source-fs.h +@@ -20,6 +20,7 @@ + #include "kerncompat.h" + #include <linux/kdev_t.h> + #include <pthread.h> ++#include <sys/types.h> + + #define CONV_IMAGE_SUBVOL_OBJECTID BTRFS_FIRST_FREE_OBJECTID + +-- +2.14.1 +
meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.2.bb renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.12.bb +2 -1
@@ -14,9 +14,10 @@ DEPENDS = "util-linux attr e2fsprogs lzo acl" DEPENDS_append_class-target = " udev" RDEPENDS_${PN} = "libgcc" -SRCREV = "0607132c3200bcead1426e6dc685432008de95de" +SRCREV = "37f1faef159ebcf91846e7126879b1a413cb29a5" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ file://0001-Makefile-build-mktables-using-native-gcc.patch \ + file://0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch \ " inherit autotools-brokensep pkgconfig manpages
Signature · 1 line
2.14.1
PATCH 14/50 mpg123: update to 1.25.7
In reply to Alexander Kanavin---
meta/recipes-multimedia/mpg123/{mpg123_1.25.6.bb => mpg123_1.25.7.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-multimedia/mpg123/{mpg123_1.25.6.bb => mpg123_1.25.7.bb} (94%)meta/recipes-multimedia/mpg123/mpg123_1.25.7.bb renamed from meta/recipes-multimedia/mpg123/mpg123_1.25.6.bb +2 -2
@@ -11,8 +11,8 @@ LICENSE_FLAGS = "commercial" LIC_FILES_CHKSUM = "file://COPYING;md5=1e86753638d3cf2512528b99079bc4f3" SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2" -SRC_URI[md5sum] = "43336bef78f67c2e66c4f6c288ca1eb3" -SRC_URI[sha256sum] = "0f0458c9b87799bc2c9bf9455279cc4d305e245db43b51a39ef27afe025c5a8e" +SRC_URI[md5sum] = "710f2d8689b24e86376bd64a05d7888b" +SRC_URI[sha256sum] = "31b15ebcf26111b874732e07c8e60de5053ee555eea15fb70c657a4f9f0344f3" inherit autotools pkgconfig
Signature · 1 line
2.14.1
PATCH 15/50 libsolv: update to 0.6.29
In reply to Alexander Kanavin---
meta/recipes-extended/libsolv/{libsolv_0.6.28.bb => libsolv_0.6.29.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-extended/libsolv/{libsolv_0.6.28.bb => libsolv_0.6.29.bb} (95%)meta/recipes-extended/libsolv/libsolv_0.6.29.bb renamed from meta/recipes-extended/libsolv/libsolv_0.6.28.bb +1 -1
@@ -13,7 +13,7 @@ SRC_URI_append_libc-musl = " file://0001-Add-fallback-fopencookie-implementation file://0002-Fixes-to-internal-fopencookie-implementation.patch \ " -SRCREV = "b8a9ddd88eb4e0ab351eb55a53186b5dc5ac0825" +SRCREV = "765be095eaeaef1b1d2a84f6a0e00d5abf677ae9" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git"
Signature · 1 line
2.14.1
PATCH 16/50 libdnf: update to 0.11.0
In reply to Alexander Kanavin---
meta/recipes-devtools/libdnf/{libdnf_0.9.3.bb => libdnf_0.11.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/libdnf/{libdnf_0.9.3.bb => libdnf_0.11.0.bb} (95%)meta/recipes-devtools/libdnf/libdnf_0.11.0.bb renamed from meta/recipes-devtools/libdnf/libdnf_0.9.3.bb +1 -1
@@ -10,7 +10,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf \ file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \ " -SRCREV = "1b19950e82d88eec28d01b4e7c1da712c941201d" +SRCREV = "fbe2c1796d0d5c61f64b0106c9f13ae7cf26974d" S = "${WORKDIR}/git"
Signature · 1 line
2.14.1
PATCH 17/50 librepo: update to 1.8.1
In reply to Alexander KanavinDrop upstreamed patches, rebase the PYTHON_INSTALL_DIR patch.
---
...ly-set-the-library-installation-directory.patch | 28 -------------
...to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch | 49 +++++++++++++++-------
...-race-when-deleting-temporary-directories.patch | 41 ------------------
...rrect-LRO_SSLVERIFYHOST-with-CURLOPT_SSL_.patch | 40 ------------------
.../librepo/{librepo_git.bb => librepo_1.8.1.bb} | 6 +--
5 files changed, 36 insertions(+), 128 deletions(-)
delete mode 100644 meta/recipes-devtools/librepo/librepo/0001-Correctly-set-the-library-installation-directory.patch
delete mode 100644 meta/recipes-devtools/librepo/librepo/0003-tests-fix-a-race-when-deleting-temporary-directories.patch
delete mode 100644 meta/recipes-devtools/librepo/librepo/0005-Fix-typo-correct-LRO_SSLVERIFYHOST-with-CURLOPT_SSL_.patch
rename meta/recipes-devtools/librepo/{librepo_git.bb => librepo_1.8.1.bb} (68%)meta/recipes-devtools/librepo/librepo/0001-Correctly-set-the-library-installation-directory.patch deleted +0 -28
@@ -1,28 +0,0 @@ -From 36d87919223db9b054862ad38cdda8d9222a2bab Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Fri, 30 Dec 2016 18:04:35 +0200 -Subject: [PATCH 1/4] Correctly set the library installation directory - -Upstream-Status: Submitted [https://github.com/rpm-software-management/librepo/pull/110] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - librepo/CMakeLists.txt | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/librepo/CMakeLists.txt b/librepo/CMakeLists.txt -index 2fe76d8..5026def 100644 ---- a/librepo/CMakeLists.txt -+++ b/librepo/CMakeLists.txt -@@ -60,7 +60,8 @@ CONFIGURE_FILE("version.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/version.h" @ONLY) - IF (CMAKE_SIZEOF_VOID_P MATCHES "8") - SET (LIB_SUFFIX "64") - ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8") --SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") -+#SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") -+SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}") - - INSTALL(FILES ${librepo_HEADERS} DESTINATION include/librepo) - INSTALL(TARGETS librepo LIBRARY DESTINATION ${LIB_INSTALL_DIR}) --- -2.11.0 -
meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch +35 -14
76 lines not on this page · raw message
meta/recipes-devtools/librepo/librepo/0003-tests-fix-a-race-when-deleting-temporary-directories.patch deleted +0 -41
41 lines not on this page · raw message
meta/recipes-devtools/librepo/librepo/0005-Fix-typo-correct-LRO_SSLVERIFYHOST-with-CURLOPT_SSL_.patch deleted +0 -40
@@ -1,40 +0,0 @@ -From a4bbbccce6edc1a2d1bd475506e2975fd7696c88 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <[email protected]> -Date: Thu, 8 Jun 2017 16:31:30 +0800 -Subject: [PATCH] Fix typo: correct LRO_SSLVERIFYHOST with - CURLOPT_SSL_VERIFYHOST - -In commit 51d32c6cd88ba0139c32793183fd6a236c1ef456 ---- -Author: Tomas Mlcoch <[email protected]> -Date: Mon May 5 14:31:35 2014 +0200 - - Add LRO_SSLVERIFYPEER and LRO_SSLVERIFYHOST options (RhBug: 1093014) ---- - -It incorrectly setopt CURLOPT_SSL_VERIFYPEER for LRO_SSLVERIFYHOST. -Use CURLOPT_SSL_VERIFYHOST to correct. - -Upstream-Status: Submitted - -Signed-off-by: Hongxu Jia <[email protected]> ---- - librepo/handle.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/librepo/handle.c b/librepo/handle.c -index ccea79b..ff39db4 100644 ---- a/librepo/handle.c -+++ b/librepo/handle.c -@@ -629,7 +629,7 @@ lr_handle_setopt(LrHandle *handle, - - case LRO_SSLVERIFYHOST: - handle->sslverifyhost = va_arg(arg, long) ? 2 : 0; -- c_rc = curl_easy_setopt(c_h, CURLOPT_SSL_VERIFYPEER, handle->sslverifyhost); -+ c_rc = curl_easy_setopt(c_h, CURLOPT_SSL_VERIFYHOST, handle->sslverifyhost); - break; - - case LRO_SSLCLIENTCERT: --- -2.7.4 -
meta/recipes-devtools/librepo/librepo_1.8.1.bb renamed from meta/recipes-devtools/librepo/librepo_git.bb +1 -5
@@ -3,15 +3,11 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "git://github.com/rpm-software-management/librepo.git \ - file://0001-Correctly-set-the-library-installation-directory.patch \ file://0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch \ - file://0003-tests-fix-a-race-when-deleting-temporary-directories.patch \ file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \ - file://0005-Fix-typo-correct-LRO_SSLVERIFYHOST-with-CURLOPT_SSL_.patch \ " -PV = "1.7.20+git${SRCPV}" -SRCREV = "e1137cbbda78fecb192146300790680a5bc811b1" +SRCREV = "7b9b7bf388f3f059529c6f50c40b30919fef30f9" S = "${WORKDIR}/git"
Signature · 1 line
2.14.1
PATCH 18/50 dnf: update to 2.7.3
In reply to Alexander KanavinDrop upstreamed patch.
---
...eck-conf.releasever-instead-of-releasever.patch | 31 ----------------------
.../dnf/{dnf_2.6.3.bb => dnf_2.7.3.bb} | 3 +--
2 files changed, 1 insertion(+), 33 deletions(-)
delete mode 100644 meta/recipes-devtools/dnf/dnf/0001-Check-conf.releasever-instead-of-releasever.patch
rename meta/recipes-devtools/dnf/{dnf_2.6.3.bb => dnf_2.7.3.bb} (95%)meta/recipes-devtools/dnf/dnf/0001-Check-conf.releasever-instead-of-releasever.patch deleted +0 -31
@@ -1,31 +0,0 @@ -From 166833a88a928a574bf9143b9b65f544be482c77 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Fri, 18 Aug 2017 15:55:15 +0300 -Subject: [PATCH] Check conf.releasever instead of releasever - -The substitutions may actually set the conf.releasever correctly, -and so the check should use that instead of the passed-in function -parameter. - -Upstream-Status: Submitted [https://github.com/rpm-software-management/dnf/pull/901] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - dnf/cli/cli.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py -index 2d63420c..167943b8 100644 ---- a/dnf/cli/cli.py -+++ b/dnf/cli/cli.py -@@ -914,7 +914,7 @@ class Cli(object): - conf.releasever = releasever - subst = conf.substitutions - subst.update_from_etc(conf.installroot) -- if releasever is None: -+ if conf.releasever is None: - logger.warning(_("Unable to detect release version (use '--releasever' to specify " - "release version)")) - --- -2.14.1 -
meta/recipes-devtools/dnf/dnf_2.7.3.bb renamed from meta/recipes-devtools/dnf/dnf_2.6.3.bb +1 -2
@@ -10,10 +10,9 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \ file://0001-Do-not-prepend-installroot-to-logdir.patch \ file://0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch \ file://0001-Corretly-install-tmpfiles.d-configuration.patch \ - file://0001-Check-conf.releasever-instead-of-releasever.patch \ " -SRCREV = "be2585183ec4485ee4d5e121f242d8669296f065" +SRCREV = "77c8874f2a7a543aea82ed694b02d60293b5cf0c" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git"
Signature · 1 line
2.14.1
PATCH 19/50 ffmpeg: upgrade to 3.3.4
In reply to Alexander KanavinFrom: Chen Qi <[email protected]>
Upgrade ffmpeg to version 3.3.4. Version 3.3.4 is a bug fix version, and there's no new feature added.
Compared to version 3.3.3, there are 57 new commits. These 57 commits are either bug fix or small tweaks.
Drop CVE patches that were backported from 3.3.4.
---
.../ffmpeg/ffmpeg/CVE-2017-14054.patch | 39 ---------
.../ffmpeg/ffmpeg/CVE-2017-14055.patch | 34 --------
.../ffmpeg/ffmpeg/CVE-2017-14056.patch | 51 ------------
.../ffmpeg/ffmpeg/CVE-2017-14057.patch | 44 ----------
.../ffmpeg/ffmpeg/CVE-2017-14058.patch | 94 ----------------------
.../ffmpeg/ffmpeg/CVE-2017-14059.patch | 40 ---------
.../ffmpeg/ffmpeg/CVE-2017-14169.patch | 39 ---------
.../ffmpeg/ffmpeg/CVE-2017-14170.patch | 49 -----------
.../ffmpeg/ffmpeg/CVE-2017-14171.patch | 44 ----------
.../ffmpeg/ffmpeg/CVE-2017-14222.patch | 40 ---------
.../ffmpeg/ffmpeg/CVE-2017-14223.patch | 38 ---------
.../ffmpeg/ffmpeg/CVE-2017-14225.patch | 49 -----------
.../ffmpeg/{ffmpeg_3.3.3.bb => ffmpeg_3.3.4.bb} | 16 +---
13 files changed, 2 insertions(+), 575 deletions(-)
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14054.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14055.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14056.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14057.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14058.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14059.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14169.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14170.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14171.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14222.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14223.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14225.patch
rename meta/recipes-multimedia/ffmpeg/{ffmpeg_3.3.3.bb => ffmpeg_3.3.4.bb} (91%)meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14054.patch deleted +0 -39
@@ -1,39 +0,0 @@ -From 124eb202e70678539544f6268efc98131f19fa49 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E5=AD=99=E6=B5=A9=20and=20=E5=BC=A0=E6=B4=AA=E4=BA=AE=28?= - =?UTF-8?q?=E6=9C=9B=E5=88=9D=29?= <tony.sh and [email protected]> -Date: Fri, 25 Aug 2017 01:15:28 +0200 -Subject: [PATCH] avformat/rmdec: Fix DoS due to lack of eof check - -Fixes: loop.ivr - -Found-by: Xiaohei and Wangchu from Alibaba Security Team -Signed-off-by: Michael Niedermayer <[email protected]> - -CVE: CVE-2017-14054 -Upstream-Status: Backport - -Signed-off-by: Chen Qi <[email protected]> ---- - libavformat/rmdec.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c -index 178eaea..d6d7d9c 100644 ---- a/libavformat/rmdec.c -+++ b/libavformat/rmdec.c -@@ -1223,8 +1223,11 @@ static int ivr_read_header(AVFormatContext *s) - av_log(s, AV_LOG_DEBUG, "%s = '%s'\n", key, val); - } else if (type == 4) { - av_log(s, AV_LOG_DEBUG, "%s = '0x", key); -- for (j = 0; j < len; j++) -+ for (j = 0; j < len; j++) { -+ if (avio_feof(pb)) -+ return AVERROR_INVALIDDATA; - av_log(s, AV_LOG_DEBUG, "%X", avio_r8(pb)); -+ } - av_log(s, AV_LOG_DEBUG, "'\n"); - } else if (len == 4 && type == 3 && !strncmp(key, "StreamCount", tlen)) { - nb_streams = value = avio_rb32(pb); --- -2.1.0 -
meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14055.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From 4f05e2e2dc1a89f38cd9f0960a6561083d714f1e Mon Sep 17 00:00:00 2001 -From: Michael Niedermayer <[email protected]> -Date: Fri, 25 Aug 2017 01:15:30 +0200 -Subject: [PATCH] avformat/mvdec: Fix DoS due to lack of eof check - -Fixes: loop.mv - -Found-by: Xiaohei and Wangchu from Alibaba Security Team -Signed-off-by: Michael Niedermayer <[email protected]> - -CVE: CVE-2017-14055 -Upstream-Status: Backport - -Signed-off-by: Chen Qi <[email protected]> ---- - libavformat/mvdec.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libavformat/mvdec.c b/libavformat/mvdec.c -index 0e12c8c..f7aa4cb 100644 ---- a/libavformat/mvdec.c -+++ b/libavformat/mvdec.c -@@ -342,6 +342,8 @@ static int mv_read_header(AVFormatContext *avctx) - uint32_t pos = avio_rb32(pb); - uint32_t asize = avio_rb32(pb); - uint32_t vsize = avio_rb32(pb); -+ if (avio_feof(pb)) -+ return AVERROR_INVALIDDATA; - avio_skip(pb, 8); - av_add_index_entry(ast, pos, timestamp, asize, 0, AVINDEX_KEYFRAME); - av_add_index_entry(vst, pos + asize, i, vsize, 0, AVINDEX_KEYFRAME); --- -2.1.0 -
meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14056.patch deleted +0 -51
51 lines not on this page · raw message
meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14057.patch deleted +0 -44
44 lines not on this page · raw message
meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14058.patch deleted +0 -94
94 lines not on this page · raw message
meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14059.patch deleted +0 -40
@@ -1,40 +0,0 @@ -From 7e80b63ecd259d69d383623e75b318bf2bd491f6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E5=AD=99=E6=B5=A9=20and=20=E5=BC=A0=E6=B4=AA=E4=BA=AE=28?= - =?UTF-8?q?=E6=9C=9B=E5=88=9D=29?= <tony.sh and [email protected]> -Date: Fri, 25 Aug 2017 01:15:27 +0200 -Subject: [PATCH] avformat/cinedec: Fix DoS due to lack of eof check - -Fixes: loop.cine - -Found-by: Xiaohei and Wangchu from Alibaba Security Team -Signed-off-by: Michael Niedermayer <[email protected]> - -CVE: CVE-2017-14059 -Upstream-Status: Backport - -Signed-off-by: Chen Qi <[email protected]> ---- - libavformat/cinedec.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/libavformat/cinedec.c b/libavformat/cinedec.c -index 763b93b..de34fb9 100644 ---- a/libavformat/cinedec.c -+++ b/libavformat/cinedec.c -@@ -267,8 +267,12 @@ static int cine_read_header(AVFormatContext *avctx) - - /* parse image offsets */ - avio_seek(pb, offImageOffsets, SEEK_SET); -- for (i = 0; i < st->duration; i++) -+ for (i = 0; i < st->duration; i++) { -+ if (avio_feof(pb)) -+ return AVERROR_INVALIDDATA; -+ - av_add_index_entry(st, avio_rl64(pb), i, 0, 0, AVINDEX_KEYFRAME); -+ } - - return 0; - } --- -2.1.0 -
meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14169.patch deleted +0 -39
@@ -1,39 +0,0 @@ -From 9d00fb9d70ee8c0cc7002b89318c5be00f1bbdad Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E5=AD=99=E6=B5=A9=28=E6=99=93=E9=BB=91=29?= - <[email protected]> -Date: Tue, 29 Aug 2017 23:59:21 +0200 -Subject: [PATCH] avformat/mxfdec: Fix Sign error in mxf_read_primer_pack() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: 20170829B.mxf - -Co-Author: 张洪亮(望初)" <[email protected]> -Found-by: Xiaohei and Wangchu from Alibaba Security Team -Signed-off-by: Michael Niedermayer <[email protected]> - -CVE: CVE-2017-14169 -Upstream-Status: Backport - -Signed-off-by: Chen Qi <[email protected]> ---- - libavformat/mxfdec.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c -index 6adb77d..91731a7 100644 ---- a/libavformat/mxfdec.c -+++ b/libavformat/mxfdec.c -@@ -500,7 +500,7 @@ static int mxf_read_primer_pack(void *arg, AVIOContext *pb, int tag, int size, U - avpriv_request_sample(pb, "Primer pack item length %d", item_len); - return AVERROR_PATCHWELCOME; - } -- if (item_num > 65536) { -+ if (item_num > 65536 || item_num < 0) { - av_log(mxf->fc, AV_LOG_ERROR, "item_num %d is too large\n", item_num); - return AVERROR_INVALIDDATA; - } --- -2.1.0 -
meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14170.patch deleted +0 -49
49 lines not on this page · raw message
meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14171.patch deleted +0 -44
44 lines not on this page · raw message
meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14222.patch deleted +0 -40
@@ -1,40 +0,0 @@ -From 9cb4eb772839c5e1de2855d126bf74ff16d13382 Mon Sep 17 00:00:00 2001 -From: Michael Niedermayer <[email protected]> -Date: Tue, 5 Sep 2017 00:16:29 +0200 -Subject: [PATCH] avformat/mov: Fix DoS in read_tfra() - -Fixes: Missing EOF check in loop -No testcase - -Found-by: Xiaohei and Wangchu from Alibaba Security Team -Signed-off-by: Michael Niedermayer <[email protected]> - -CVE: CVE-2017-14222 -Upstream-Status: Backport - -Signed-off-by: Chen Qi <[email protected]> ---- - libavformat/mov.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/libavformat/mov.c b/libavformat/mov.c -index 994e9c6..2519707 100644 ---- a/libavformat/mov.c -+++ b/libavformat/mov.c -@@ -6094,6 +6094,13 @@ static int read_tfra(MOVContext *mov, AVIOContext *f) - } - for (i = 0; i < index->item_count; i++) { - int64_t time, offset; -+ -+ if (avio_feof(f)) { -+ index->item_count = 0; -+ av_freep(&index->items); -+ return AVERROR_INVALIDDATA; -+ } -+ - if (version == 1) { - time = avio_rb64(f); - offset = avio_rb64(f); --- -2.1.0 -
meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14223.patch deleted +0 -38
@@ -1,38 +0,0 @@ -From afc9c683ed9db01edb357bc8c19edad4282b3a97 Mon Sep 17 00:00:00 2001 -From: Michael Niedermayer <[email protected]> -Date: Tue, 5 Sep 2017 00:16:29 +0200 -Subject: [PATCH] avformat/asfdec: Fix DoS in asf_build_simple_index() - -Fixes: Missing EOF check in loop -No testcase - -Found-by: Xiaohei and Wangchu from Alibaba Security Team -Signed-off-by: Michael Niedermayer <[email protected]> - -CVE: CVE-2017-14223 -Upstream-Status: Backport - -Signed-off-by: Chen Qi <[email protected]> ---- - libavformat/asfdec_f.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c -index f3acbae..cc648b9 100644 ---- a/libavformat/asfdec_f.c -+++ b/libavformat/asfdec_f.c -@@ -1610,6 +1610,11 @@ static int asf_build_simple_index(AVFormatContext *s, int stream_index) - int64_t pos = s->internal->data_offset + s->packet_size * (int64_t)pktnum; - int64_t index_pts = FFMAX(av_rescale(itime, i, 10000) - asf->hdr.preroll, 0); - -+ if (avio_feof(s->pb)) { -+ ret = AVERROR_INVALIDDATA; -+ goto end; -+ } -+ - if (pos != last_pos) { - av_log(s, AV_LOG_DEBUG, "pktnum:%d, pktct:%d pts: %"PRId64"\n", - pktnum, pktct, index_pts); --- -2.1.0 -
meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14225.patch deleted +0 -49
49 lines not on this page · raw message
meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.4.bb renamed from meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.3.bb +2 -14
@@ -26,21 +26,9 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \ file://mips64_cpu_detection.patch \ file://0001-build-fix-for-mips.patch \ - file://CVE-2017-14054.patch \ - file://CVE-2017-14055.patch \ - file://CVE-2017-14056.patch \ - file://CVE-2017-14057.patch \ - file://CVE-2017-14058.patch \ - file://CVE-2017-14059.patch \ - file://CVE-2017-14169.patch \ - file://CVE-2017-14170.patch \ - file://CVE-2017-14171.patch \ - file://CVE-2017-14222.patch \ - file://CVE-2017-14223.patch \ - file://CVE-2017-14225.patch \ " -SRC_URI[md5sum] = "743dc66ebe67180283b92d029f690d0f" -SRC_URI[sha256sum] = "d2a9002cdc6b533b59728827186c044ad02ba64841f1b7cd6c21779875453a1e" +SRC_URI[md5sum] = "e14a0200c78ce5c918427e57cd406a0d" +SRC_URI[sha256sum] = "98b97e1b908dfeb6aeb6d407e5a5eacdfc253a40c2d195f5867ed2d1d46ea957" # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717 ARM_INSTRUCTION_SET = "arm"
Signature · 1 line
2.14.1
PATCH 20/50 gobject-introspection: update to 1.54.1
In reply to Alexander Kanavin---
...ect-introspection_1.52.1.bb => gobject-introspection_1.54.1.bb} | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
rename meta/recipes-gnome/gobject-introspection/{gobject-introspection_1.52.1.bb => gobject-introspection_1.54.1.bb} (97%)meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb renamed from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.52.1.bb +4 -3
@@ -8,15 +8,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=90d577535a3898e1ae5dbf0ae3509a8c \ file://giscanner/sourcescanner.c;endline=22;md5=194d6e0c1d00662f32d030ce44de8d39 \ file://girepository/giregisteredtypeinfo.c;endline=21;md5=661847611ae6979465415f31a759ba27" -SRC_URI = "${GNOME_MIRROR}/${BPN}/1.52/${BPN}-${PV}.tar.xz \ +SRC_URI = "${GNOME_MIRROR}/${BPN}/1.54/${BPN}-${PV}.tar.xz \ file://0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch \ file://0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch \ file://0003-giscanner-add-use-binary-wrapper-option.patch \ file://0004-giscanner-add-a-use-ldd-wrapper-option.patch \ file://0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch \ " -SRC_URI[md5sum] = "34157073991f9eeb0ed953351b65eb61" -SRC_URI[sha256sum] = "2ed0c38d52fe1aa6fc4def0c868fe481cb87b532fc694756b26d6cfab29faff4" +SRC_URI[md5sum] = "126c29e4d54adbed2ed4e2b04483de41" +SRC_URI[sha256sum] = "b88ded5e5f064ab58a93aadecd6d58db2ec9d970648534c63807d4f9a7bb877e" inherit autotools pkgconfig gtk-doc python3native qemu gobject-introspection-data upstream-version-is-even BBCLASSEXTEND = "native"
@@ -132,6 +132,7 @@ FILES_${PN}_append = " ${libdir}/girepository-*/*.typelib" # .gir files go to dev package, as they're needed for developing (but not for running) # things that depends on introspection. FILES_${PN}-dev_append = " ${datadir}/gir-*/*.gir" +FILES_${PN}-dev_append = " ${datadir}/gir-*/*.rnc" # These are used by gobject-based packages # to generate transient introspection binaries
Signature · 1 line
2.14.1
PATCH 21/50 boost: update to 1.65.1
In reply to Alexander KanavinAdd a patch to fix bjam-native compile error (due to mistyped variable name).
Drop upstreamed patch.
---
...bjam-native_1.64.0.bb => bjam-native_1.65.1.bb} | 3 +-
.../boost/{boost-1.64.0.inc => boost-1.65.1.inc} | 4 +-
...detail-socket_types.hpp-fix-poll.h-includ.patch | 49 ----------------------
.../boost/{boost_1.64.0.bb => boost_1.65.1.bb} | 1 -
...ge-assert-typo-how-was-this-released-with.patch | 37 ++++++++++++++++
5 files changed, 41 insertions(+), 53 deletions(-)
rename meta/recipes-support/boost/{bjam-native_1.64.0.bb => bjam-native_1.65.1.bb} (68%)
rename meta/recipes-support/boost/{boost-1.64.0.inc => boost-1.65.1.inc} (85%)
delete mode 100644 meta/recipes-support/boost/boost/0001-boost-asio-detail-socket_types.hpp-fix-poll.h-includ.patch
rename meta/recipes-support/boost/{boost_1.64.0.bb => boost_1.65.1.bb} (85%)
create mode 100644 meta/recipes-support/boost/files/0001-Fix-a-strange-assert-typo-how-was-this-released-with.patchmeta/recipes-support/boost/bjam-native_1.65.1.bb renamed from meta/recipes-support/boost/bjam-native_1.64.0.bb +2 -1
@@ -5,7 +5,8 @@ SECTION = "devel" inherit native -SRC_URI += "file://bjam-native-build-bjam.debug.patch" +SRC_URI += "file://bjam-native-build-bjam.debug.patch \ + file://0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch" do_compile() { ./bootstrap.sh --with-toolset=gcc
meta/recipes-support/boost/boost-1.65.1.inc renamed from meta/recipes-support/boost/boost-1.64.0.inc +2 -2
@@ -12,8 +12,8 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" BOOST_P = "boost_${BOOST_VER}" SRC_URI = "${SOURCEFORGE_MIRROR}/project/boost/boost/${PV}/${BOOST_P}.tar.bz2" -SRC_URI[md5sum] = "93eecce2abed9d2442c9676914709349" -SRC_URI[sha256sum] = "7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332" +SRC_URI[md5sum] = "41d7542ce40e171f3f7982aff008ff0d" +SRC_URI[sha256sum] = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81" UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" UPSTREAM_CHECK_REGEX = "boostorg/release/(?P<pver>.*)/source/"
meta/recipes-support/boost/boost/0001-boost-asio-detail-socket_types.hpp-fix-poll.h-includ.patch deleted +0 -49
49 lines not on this page · raw message
meta/recipes-support/boost/boost_1.65.1.bb renamed from meta/recipes-support/boost/boost_1.64.0.bb +0 -1
@@ -4,7 +4,6 @@ require boost.inc SRC_URI += "\ file://arm-intrinsics.patch \ file://boost-CVE-2012-2677.patch \ - file://0001-boost-asio-detail-socket_types.hpp-fix-poll.h-includ.patch \ file://boost-math-disable-pch-for-gcc.patch \ file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \ file://0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \
meta/recipes-support/boost/files/0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch new file +37 -0
@@ -0,0 +1,37 @@ +From 5685527364198597f25fc1c6236cb64cbc3de44f Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 4 Oct 2017 18:16:08 +0300 +Subject: [PATCH] Fix a strange assert typo; how was this released without + noticing? + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <[email protected]> +--- + tools/build/src/engine/debugger.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/build/src/engine/debugger.c b/tools/build/src/engine/debugger.c +index 802f262..152a7e6 100644 +--- a/tools/build/src/engine/debugger.c ++++ b/tools/build/src/engine/debugger.c +@@ -1092,7 +1092,7 @@ static void debug_start_child( int argc, const char * * argv ) + PROCESS_INFORMATION pi = { NULL, NULL, 0, 0 }; + STARTUPINFO si = { sizeof( STARTUPINFO ), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0 }; +- assert( DEBUG_STATE == DEBUG_NO_CHILD ); ++ assert( debug_state == DEBUG_NO_CHILD ); + if ( ! CreatePipe( &pipe1[ 0 ], &pipe1[ 1 ], &sa, 0 ) ) + { + printf("internal error\n"); +@@ -1176,7 +1176,7 @@ static void debug_start_child( int argc, const char * * argv ) + int read_fd; + int pid; + int i; +- assert( DEBUG_STATE == DEBUG_NO_CHILD ); ++ assert( debug_state == DEBUG_NO_CHILD ); + pipe(pipe1); + pipe(pipe2); + pid = fork(); +-- +2.14.1 +
Signature · 1 line
2.14.1
PATCH 22/50 gnome-desktop3: Update to 3.26.1
In reply to Alexander KanavinAdd a patch to disable libseccomp (not currently used in Yocto).
---
...ble-libseccomp-sycall-filtering-mechanism.patch | 38 ++++++++++++++++++++++
...op-thumbnail-don-t-convert-time_t-to-long.patch | 31 +++++++++---------
...desktop3_3.24.2.bb => gnome-desktop3_3.26.1.bb} | 14 ++++----
3 files changed, 62 insertions(+), 21 deletions(-)
create mode 100644 meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch
rename meta/recipes-gnome/gnome-desktop/{gnome-desktop3_3.24.2.bb => gnome-desktop3_3.26.1.bb} (66%)meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch new file +38 -0
@@ -0,0 +1,38 @@ +From 9dfada06f8d2e02d7a04f793ba6e1d4a2aa5ffb7 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Thu, 5 Oct 2017 14:54:17 +0300 +Subject: [PATCH] Disable libseccomp (sycall filtering mechanism) + +Upstream forgot to make it optional, and it is not currently used in Yocto + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + configure.ac | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 86bcf1f..8911f19 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -157,17 +157,6 @@ else + fi + + SECCOMP_PKG="" +-dnl Check for bubblewrap compatible platform +-case $host_os in +- linux*) +- PKG_CHECK_MODULES(LIBSECCOMP, [libseccomp]) +- SECCOMP_PKG="libseccomp" +- AC_DEFINE_UNQUOTED(_GNU_SOURCE, 1, [Define to include GNU extensions]) +- AC_DEFINE_UNQUOTED(HAVE_BWRAP, 1, [Define to 1 if Bubblewrap support is available]) +- AC_DEFINE([ENABLE_SECCOMP], [1], [Define if using seccomp]) +- AC_DEFINE_UNQUOTED(INSTALL_PREFIX, "$prefix", [Path to library install prefix]) +- ;; +-esac + + dnl pkg-config dependency checks + +-- +2.14.1 +
meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch +16 -15
@@ -1,31 +1,32 @@ -From adfa0c8f9fec1faac4bea6a94d947ea32e585923 Mon Sep 17 00:00:00 2001 +From 9048939b76b3bd10783adb79ed0aaf6cd13895cc Mon Sep 17 00:00:00 2001 From: Christopher Larson <[email protected]> Date: Tue, 13 Dec 2016 20:39:51 -0700 -Subject: [PATCH] gnome-desktop-thumbnail: don't convert time_t to long +Subject: [PATCH 1/2] gnome-desktop-thumbnail: don't convert time_t to long Explicitly use strftime+strptime rather than snprintf+atol. This fixes the build for X32, where long's size doesn't match that of time_t. Upstream-Status: Pending Signed-off-by: Christopher Larson <[email protected]> + --- libgnome-desktop/gnome-desktop-thumbnail.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/libgnome-desktop/gnome-desktop-thumbnail.c b/libgnome-desktop/gnome-desktop-thumbnail.c -index 3946309..b756333 100644 +index e56c3d7..5d96bf3 100644 --- a/libgnome-desktop/gnome-desktop-thumbnail.c +++ b/libgnome-desktop/gnome-desktop-thumbnail.c -@@ -126,6 +126,8 @@ +@@ -120,6 +120,8 @@ * Since: 2.2 */ +#define _XOPEN_SOURCE + #include <config.h> - #include <sys/types.h> - #include <sys/stat.h> -@@ -1483,6 +1485,7 @@ save_thumbnail (GdkPixbuf *pixbuf, + + #include <glib.h> +@@ -1105,6 +1107,7 @@ save_thumbnail (GdkPixbuf *pixbuf, char *tmp_path = NULL; int tmp_fd; char mtime_str[21];
@@ -33,11 +34,11 @@ index 3946309..b756333 100644 gboolean ret = FALSE; GError *error = NULL; const char *width, *height; -@@ -1502,7 +1505,11 @@ save_thumbnail (GdkPixbuf *pixbuf, +@@ -1124,7 +1127,11 @@ save_thumbnail (GdkPixbuf *pixbuf, goto out; close (tmp_fd); -- g_snprintf (mtime_str, 21, "%ld", mtime); +- g_snprintf (mtime_str, 21, "%" G_GINT64_FORMAT, (gint64) mtime); + tmp_mtime = localtime (&mtime); + if (!tmp_mtime) + goto out;
@@ -46,15 +47,15 @@ index 3946309..b756333 100644 width = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Width"); height = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Height"); -@@ -1695,6 +1702,7 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf, +@@ -1319,6 +1326,7 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf, { const char *thumb_uri, *thumb_mtime_str; time_t thumb_mtime; + struct tm tmp_mtime; - + thumb_uri = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::URI"); - if (!thumb_uri) -@@ -1705,7 +1713,11 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf, + if (g_strcmp0 (uri, thumb_uri) != 0) +@@ -1327,7 +1335,11 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf, thumb_mtime_str = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::MTime"); if (!thumb_mtime_str) return FALSE;
@@ -66,7 +67,7 @@ index 3946309..b756333 100644 + return FALSE; if (mtime != thumb_mtime) return FALSE; - + -- -2.8.0 +2.14.1
meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.1.bb renamed from meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.24.2.bb +8 -6
@@ -7,12 +7,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ BPN = "gnome-desktop" inherit gnome pkgconfig upstream-version-is-even gobject-introspection -SRC_URI[archive.md5sum] = "af7c6a243df7a335a010bdc05b34ca93" -SRC_URI[archive.sha256sum] = "8fa1de66a6a75963bffc79b01a60434c71237d44c51beca09c0f714a032d785e" - -SRC_URI += "file://gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch \ - file://0001-configure.ac-Remove-gnome-common-macro-calls.patch \ -" +SRC_URI[archive.md5sum] = "14ee3256680871de11e95c84be9cef58" +SRC_URI[archive.sha256sum] = "92fa697af986fb2c6bc6595f0155c968c17e5d1981a50584ff4fb6fd60124e2f" + +SRC_URI += " \ + file://gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch \ + file://0001-configure.ac-Remove-gnome-common-macro-calls.patch \ + file://0001-Disable-libseccomp-sycall-filtering-mechanism.patch \ + " DEPENDS += "intltool-native gsettings-desktop-schemas gconf virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes udev"
Signature · 1 line
2.14.1
PATCH 23/50 iso-codes: update to 3.76
In reply to Alexander Kanavin---
.../iso-codes/{iso-codes_3.75.bb => iso-codes_3.76.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/iso-codes/{iso-codes_3.75.bb => iso-codes_3.76.bb} (76%)meta/recipes-support/iso-codes/iso-codes_3.76.bb renamed from meta/recipes-support/iso-codes/iso-codes_3.75.bb +2 -2
@@ -3,8 +3,8 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "https://pkg-isocodes.alioth.debian.org/downloads/iso-codes-${PV}.tar.xz" -SRC_URI[md5sum] = "9ba173b69d4360003414f23837597a92" -SRC_URI[sha256sum] = "7335e0301cd77cd4ee019bf5d3709aa79309d49dd66e85ba350caf67e00b00cd" +SRC_URI[md5sum] = "6a3ed31227002f3e40abd793868e78b6" +SRC_URI[sha256sum] = "38ea8c1de7c07d5b4c9603ec65c238c155992a2e2ab0b02725d0926d1ad480c4" # inherit gettext cannot be used, because it adds gettext-native to BASEDEPENDS which # are inhibited by allarch
Signature · 1 line
2.14.1
PATCH 24/50 sysprof: update to 3.26.1
In reply to Alexander Kanavin---
meta/recipes-kernel/sysprof/{sysprof_3.24.1.bb => sysprof_3.26.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-kernel/sysprof/{sysprof_3.24.1.bb => sysprof_3.26.1.bb} (88%)meta/recipes-kernel/sysprof/sysprof_3.26.1.bb renamed from meta/recipes-kernel/sysprof/sysprof_3.24.1.bb +2 -2
@@ -8,14 +8,14 @@ inherit gnomebase gettext systemd upstream-version-is-even DEPENDS = "glib-2.0 libxml2-native glib-2.0-native" +SRC_URI[archive.md5sum] = "6f9f947960ba79bb1269d8ee49b7db78" +SRC_URI[archive.sha256sum] = "d8b9d5c2246696e4a3776a312731dc7c014fbd33478bb14d5512c6f1f35a3b11" SRC_URI += " \ file://define-NT_GNU_BUILD_ID.patch \ file://0001-configure-Add-option-to-enable-disable-polkit.patch \ file://0001-Disable-check-for-polkit-for-UI.patch \ file://0001-Avoid-building-docs.patch \ " -SRC_URI[archive.md5sum] = "2b44ae1d8cd899417294a9c4509d7870" -SRC_URI[archive.sha256sum] = "054eebe2afb6fe3c06ac8c46bc045c42f675d4fd64e6f16cbc602d5c7ce27bec" AUTOTOOLS_AUXDIR = "${S}/build-aux"
Signature · 1 line
2.14.1
PATCH 25/50 gtk-doc.bbclass: correctly make the list of directories with shared libraries
In reply to Alexander KanavinPreviously it was working only if only one shared library was found, and broke when there were several.
--- meta/classes/gtk-doc.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/gtk-doc.bbclass +1 -1
@@ -48,7 +48,7 @@ do_compile_prepend_class-target () { # which may then get deleted (or their dependencies) and potentially segfault export GIO_MODULE_DIR=${STAGING_LIBDIR}/gio/modules-dummy -GIR_EXTRA_LIBS_PATH=\`find ${B} -name *.so -printf %h| tr '\n' ':'\`\$GIR_EXTRA_LIBS_PATH +GIR_EXTRA_LIBS_PATH=\`find ${B} -name *.so -printf "%h\n"|sort|uniq| tr '\n' ':'\`\$GIR_EXTRA_LIBS_PATH GIR_EXTRA_LIBS_PATH=\`find ${B} -name .libs| tr '\n' ':'\`\$GIR_EXTRA_LIBS_PATH if [ -d ".libs" ]; then
Signature · 1 line
2.14.1
PATCH 26/50 webkitgtk: update to 2.18.0
In reply to Alexander Kanavingcc7.patch, musl-fixes.patch, and ppc-musl-fix.patch all change code that is no longer present in upstream tree. However, a patch with different musl fixes has been added.
The rest of the patches are rebased to the new tree.
Libtasn is a new dependency.
---
.../webkitgtk/0001-Fix-build-with-musl.patch | 77 +++++++++
...ix-racy-parallel-build-of-WebKit2-4.0.gir.patch | 23 +--
...c-settings-so-that-gtkdoc-generation-work.patch | 21 +--
...bKitMacros-Append-to-I-and-not-to-isystem.patch | 182 ++++++++-------------
...ng-introspection-files-add-CMAKE_C_FLAGS-.patch | 24 +--
.../detect-atomics-during-configure.patch | 26 ++-
meta/recipes-sato/webkit/webkitgtk/gcc7.patch | 23 ---
.../recipes-sato/webkit/webkitgtk/musl-fixes.patch | 48 ------
.../webkit/webkitgtk/ppc-musl-fix.patch | 26 ---
.../{webkitgtk_2.16.6.bb => webkitgtk_2.18.0.bb} | 10 +-
10 files changed, 206 insertions(+), 254 deletions(-)
create mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
delete mode 100644 meta/recipes-sato/webkit/webkitgtk/gcc7.patch
delete mode 100644 meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch
delete mode 100644 meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch
rename meta/recipes-sato/webkit/{webkitgtk_2.16.6.bb => webkitgtk_2.18.0.bb} (94%)meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch new file +77 -0
@@ -0,0 +1,77 @@ +From 415e31bd5444fa360af58b069f1b9db6607fca7d Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Fri, 6 Oct 2017 17:00:08 +0300 +Subject: [PATCH] Fix build with musl + +Upstream-Status: Inappropriate [needs to use musl-specific defines to be upstreamable] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++----- + Source/WTF/wtf/Platform.h | 2 +- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h +index 95080b9..2bb689c 100644 +--- a/Source/JavaScriptCore/runtime/MachineContext.h ++++ b/Source/JavaScriptCore/runtime/MachineContext.h +@@ -146,7 +146,7 @@ inline void*& stackPointer(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) + + #if CPU(X86) + return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]); +@@ -251,7 +251,7 @@ inline void*& framePointer(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -354,7 +354,7 @@ inline void*& instructionPointer(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -466,7 +466,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -583,7 +583,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) + + // 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 5a2863b..b36c3ff 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -680,7 +680,7 @@ + #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1 + #endif + +-#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) ++#if OS(DARWIN) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) + #define HAVE_MACHINE_CONTEXT 1 + #endif + +-- +2.14.1 +
meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch +12 -11
@@ -1,19 +1,20 @@ -From 5760d346b42807b596f479c81f7a6b42eb36065e Mon Sep 17 00:00:00 2001 +From b7f40eceef0f23bf88090789d4c5845c35f048ae Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Mon, 29 Aug 2016 16:38:11 +0300 -Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir +Subject: [PATCH 4/9] Fix racy parallel build of WebKit2-4.0.gir Upstream-Status: Pending Signed-off-by: Alexander Kanavin <[email protected]> + --- - Source/WebKit2/PlatformGTK.cmake | 9 +++++---- + Source/WebKit/PlatformGTK.cmake | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake -index adaa010..f18cf8a 100644 ---- a/Source/WebKit2/PlatformGTK.cmake -+++ b/Source/WebKit2/PlatformGTK.cmake -@@ -906,8 +906,9 @@ endif () +diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake +index a33c6a86..d83a2e77 100644 +--- a/Source/WebKit/PlatformGTK.cmake ++++ b/Source/WebKit/PlatformGTK.cmake +@@ -1122,8 +1122,9 @@ endif () string(REGEX MATCHALL "-L[^ ]*" INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
@@ -25,7 +26,7 @@ index adaa010..f18cf8a 100644 DEPENDS WebKit2 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= -@@ -950,7 +951,7 @@ add_custom_command( +@@ -1168,7 +1169,7 @@ add_custom_command( add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
@@ -34,7 +35,7 @@ index adaa010..f18cf8a 100644 COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" -@@ -1004,7 +1005,7 @@ add_custom_command( +@@ -1225,7 +1226,7 @@ add_custom_command( add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
@@ -44,5 +45,5 @@ index adaa010..f18cf8a 100644 ) -- -2.9.3 +2.14.1
meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch +11 -10
@@ -1,8 +1,8 @@ -From 4eeeaec775e190cf3f5885d7c6717acebd0201a8 Mon Sep 17 00:00:00 2001 +From 3cc0e5900515cbcedd0447e0bdf487cc8d9a0f8c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Thu, 11 Aug 2016 17:13:51 +0300 -Subject: [PATCH] Tweak gtkdoc settings so that gtkdoc generation works under - OpenEmbedded build system +Subject: [PATCH 5/9] 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
@@ -10,26 +10,27 @@ variable from gtkdoc.py script so that our qemu wrapper is taken into use. Upstream-Status: Inappropriate [oe-specific] Signed-off-by: Alexander Kanavin <[email protected]> + --- Source/PlatformGTK.cmake | 2 +- Tools/gtk/gtkdoc.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake -index af4d2e3..b7b93c7 100644 +index 50b5393f..7a31db51 100644 --- a/Source/PlatformGTK.cmake +++ b/Source/PlatformGTK.cmake -@@ -25,7 +25,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args) +@@ -24,7 +24,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args) add_custom_command( OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}" DEPENDS ${DocumentationDependencies} -- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=${CMAKE_C_FLAGS} ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc ${_extra_args} -+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=${CMAKE_C_FLAGS} LD=${CMAKE_C_COMPILER} LDFLAGS=${CMAKE_C_LINK_FLAGS} RUN=${CMAKE_BINARY_DIR}/gtkdoc-qemuwrapper GIR_EXTRA_LIBS_PATH=${CMAKE_BINARY_DIR}/lib ${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" ${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 touch ${_stamp_name} WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" - ) + VERBATIM diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py -index 4c8237b..c0205f0 100644 +index 48f862a3..18240e42 100644 --- a/Tools/gtk/gtkdoc.py +++ b/Tools/gtk/gtkdoc.py @@ -318,9 +318,9 @@ class GTKDoc(object):
@@ -45,5 +46,5 @@ index 4c8237b..c0205f0 100644 if ldflags: -- -2.8.1 +2.14.1
meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch +69 -113
224 lines not on this page · raw message
meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch +14 -10
@@ -1,23 +1,24 @@ -From bae9f73b2c693b5aa156fed717d6481b60682786 Mon Sep 17 00:00:00 2001 +From 98b1359a0cd87bbdb22cef98ba594440f4c57d92 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 28 Oct 2015 14:18:57 +0200 -Subject: [PATCH] When building introspection files, add CMAKE_C_FLAGS to the - compiler flags. +Subject: [PATCH 2/9] When building introspection files, add CMAKE_C_FLAGS to + the compiler flags. g-ir-compiler is using a C compiler internally, so it needs to set the proper flags for it. Upstream-Status: Pending [review on oe-core list] Signed-off-by: Alexander Kanavin <[email protected]> + --- - Source/WebKit2/PlatformGTK.cmake | 4 ++-- + Source/WebKit/PlatformGTK.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake -=================================================================== ---- webkitgtk-2.12.1.orig/Source/WebKit2/PlatformGTK.cmake -+++ webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake -@@ -910,7 +910,7 @@ add_custom_command( +diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake +index 7f92ae72..a33c6a86 100644 +--- a/Source/WebKit/PlatformGTK.cmake ++++ b/Source/WebKit/PlatformGTK.cmake +@@ -1126,7 +1126,7 @@ add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir DEPENDS WebKit2 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
@@ -26,7 +27,7 @@ Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" ${INTROSPECTION_SCANNER} --quiet -@@ -951,7 +951,7 @@ add_custom_command( +@@ -1169,7 +1169,7 @@ add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
@@ -35,3 +36,6 @@ Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" ${INTROSPECTION_SCANNER} +-- +2.14.1 +
meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch +19 -7
@@ -1,22 +1,31 @@ +From 0b3811771ae6385503f2d949f9433d8f810d2ff9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 17 May 2017 22:34:24 -0700 +Subject: [PATCH 8/9] webkitgtk: Fix build for armv5 + Taken from https://bugs.webkit.org/show_bug.cgi?id=161900 Upstream-Status: Pending Signed-off-by: Khem Raj <[email protected]> -Index: webkitgtk-2.16.1/Source/WTF/wtf/CMakeLists.txt -=================================================================== ---- webkitgtk-2.16.1.orig/Source/WTF/wtf/CMakeLists.txt -+++ webkitgtk-2.16.1/Source/WTF/wtf/CMakeLists.txt -@@ -182,7 +182,6 @@ set(WTF_HEADERS +--- + Source/WTF/wtf/CMakeLists.txt | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt +index 6b5e45b9..46ee3c22 100644 +--- a/Source/WTF/wtf/CMakeLists.txt ++++ b/Source/WTF/wtf/CMakeLists.txt +@@ -205,7 +205,6 @@ set(WTF_HEADERS set(WTF_SOURCES Assertions.cpp - Atomics.cpp AutomaticThread.cpp BitVector.cpp - ClockType.cpp -@@ -301,6 +300,15 @@ if (NOT USE_SYSTEM_MALLOC) + CPUTime.cpp +@@ -336,6 +335,15 @@ if (NOT USE_SYSTEM_MALLOC) list(APPEND WTF_LIBRARIES bmalloc) endif ()
@@ -32,3 +41,6 @@ Index: webkitgtk-2.16.1/Source/WTF/wtf/CMakeLists.txt list(APPEND WTF_SOURCES unicode/icu/CollatorICU.cpp ) +-- +2.14.1 +
meta/recipes-sato/webkit/webkitgtk/gcc7.patch deleted +0 -23
@@ -1,23 +0,0 @@ -Imported from -https://src.fedoraproject.org/cgit/rpms/webkitgtk4.git/plain/gcc7.patch - -Add to CXX flags since webkitgtk uses c++ compiler by default -Fixes -Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h:119:67: error: no matching function for call to 'JSC::JSGenericTypedArrayView<Adaptor>::vector() const' -| return bitwise_cast<const typename Adaptor::Type*>(vector()); - -Signed-off-by: Khem Raj <[email protected] -Upstream-Status: Pending - -diff -up webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake.gcc7 webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake ---- webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake.gcc7 2017-02-21 09:57:13.168916004 +0100 -+++ webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake 2017-02-21 09:58:12.811563156 +0100 -@@ -41,6 +41,8 @@ if (COMPILER_IS_GCC_OR_CLANG) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-exceptions -fno-strict-aliasing") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-strict-aliasing -fno-rtti") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-expansion-to-defined") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-expansion-to-defined") - endif () - - if (COMPILER_IS_CLANG AND CMAKE_GENERATOR STREQUAL "Ninja")
meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch deleted +0 -48
48 lines not on this page · raw message
meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch deleted +0 -26
@@ -1,26 +0,0 @@ -ucontext structure is different between musl and glibc for ppc -therefore its not enough just to check for arch alone, we also -need to check for libc type. - -Fixes errors like - -Source/JavaScriptCore/heap/MachineStackMarker.cpp:90:65: error: 'struct mcontext_t' has no member named 'uc_regs'; did you mean 'gregs'? - thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs; - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <[email protected]> - -Index: webkitgtk-2.16.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp -=================================================================== ---- webkitgtk-2.16.3.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp -+++ webkitgtk-2.16.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp -@@ -88,7 +88,7 @@ static void pthreadSignalHandlerSuspendR - } - - ucontext_t* userContext = static_cast<ucontext_t*>(ucontext); --#if CPU(PPC) -+#if CPU(PPC) && defined(__GLIBC__) - threadData->suspendedMachineContext = *userContext->uc_mcontext.uc_regs; - #else - threadData->suspendedMachineContext = userContext->uc_mcontext;
meta/recipes-sato/webkit/webkitgtk_2.18.0.bb renamed from meta/recipes-sato/webkit/webkitgtk_2.16.6.bb +4 -6
@@ -13,19 +13,17 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \ file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \ - file://musl-fixes.patch \ - file://ppc-musl-fix.patch \ file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ file://x32_support.patch \ file://cross-compile.patch \ - file://gcc7.patch \ file://detect-atomics-during-configure.patch \ file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ + file://0001-Fix-build-with-musl.patch \ " -SRC_URI[md5sum] = "0e2d142a586e4ff79cf0324f4fdbf20c" -SRC_URI[sha256sum] = "fc23650df953123c59b9c0edf3855e7bd55bd107820997fc72375811e1ea4b21" +SRC_URI[md5sum] = "10d86dd5a5b68875654cc38af139f382" +SRC_URI[sha256sum] = "b583e46a3de36a3e80ba33b084ead60512a2046aca01ff61e50e519436e5038d" inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
@@ -37,7 +35,7 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ pango icu bison-native gawk intltool-native libwebp \ atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \ ruby-native libnotify gstreamer1.0-plugins-bad \ - gettext-native glib-2.0 glib-2.0-native \ + gettext-native glib-2.0 glib-2.0-native libtasn1 \ " PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \
Signature · 1 line
2.14.1
PATCH 27/50 gtk+3: update to 3.22.24
In reply to Alexander KanavinRebase Jussi's GL patches.
---
...Do-not-try-to-initialize-GL-without-libGL.patch | 22 +-
.../0003-Add-disable-opengl-configure-option.patch | 244 ++++++---------------
.../gtk+/{gtk+3_3.22.17.bb => gtk+3_3.22.24.bb} | 4 +-
3 files changed, 76 insertions(+), 194 deletions(-)
rename meta/recipes-gnome/gtk+/{gtk+3_3.22.17.bb => gtk+3_3.22.24.bb} (84%)meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch +11 -11
@@ -1,4 +1,4 @@ -From 2d2361f24be1e51201063dbbda570debe8702b6f Mon Sep 17 00:00:00 2001 +From 23a563155406980dfc8cf6f7c2da6cce0ac310f0 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <[email protected]> Date: Fri, 16 Oct 2015 16:35:16 +0300 Subject: [PATCH 2/4] Do not try to initialize GL without libGL
@@ -15,29 +15,29 @@ before calling epoxy APIs. Upstream-Status: Denied Signed-off-by: Jussi Kukkonen <[email protected]> + --- - configure.ac | 7 +++++++ + configure.ac | 6 ++++++ gdk/x11/gdkvisual-x11.c | 5 +++++ - 2 files changed, 12 insertions(+) + 2 files changed, 11 insertions(+) diff --git a/configure.ac b/configure.ac -index f43ac09..965eec9 100644 +index 757fd7c..0a48875 100644 --- a/configure.ac +++ b/configure.ac -@@ -346,6 +346,13 @@ AC_ARG_ENABLE(mir-backend, - [enable the Mir gdk backend])], - [backend_set=yes]) - +@@ -351,6 +351,12 @@ AC_ARG_ENABLE(cloudproviders, + [AS_HELP_STRING([--enable-cloudproviders], + [enable libcloudproviders integration])], + [cloudproviders_set=yes]) +AC_ARG_ENABLE(glx, + [AS_HELP_STRING([--enable-glx], + [When enabled Gdk will try to initialize GLX])]) +AS_IF([test "x$enable_glx" != "xno"], [ + AC_DEFINE([HAVE_GLX], [], [GLX will be available at runtime]) +]) -+ + if test -z "$backend_set"; then if test "$platform_win32" = yes; then - enable_win32_backend=yes diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c index 81479d8..3c8c5c0 100644 --- a/gdk/x11/gdkvisual-x11.c
@@ -56,5 +56,5 @@ index 81479d8..3c8c5c0 100644 gint -- -2.12.0 +2.14.1
meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch +63 -181
362 lines not on this page · raw message
meta/recipes-gnome/gtk+/gtk+3_3.22.24.bb renamed from meta/recipes-gnome/gtk+/gtk+3_3.22.17.bb +2 -2
@@ -8,8 +8,8 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar file://0003-Add-disable-opengl-configure-option.patch \ file://0004-configure.ac-Fix-wayland-protocols-path.patch \ " -SRC_URI[md5sum] = "29f85430cf7cfa8ca8d0703ba65dbe11" -SRC_URI[sha256sum] = "a6c1fb8f229c626a3d9c0e1ce6ea138de7f64a5a6bc799d45fa286fe461c3437" +SRC_URI[md5sum] = "b782a15b7b5b2005a1ce4647fb002a49" +SRC_URI[sha256sum] = "cbb16e4cfc928ab8f5f22f7290616f95f6ebc8c97cc724a2007b07ced833592b" S = "${WORKDIR}/gtk+-${PV}"
Signature · 1 line
2.14.1
PATCH 28/50 freetype: update to 2.8.1
In reply to Alexander Kanavin---
meta/recipes-graphics/freetype/{freetype_2.8.bb => freetype_2.8.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/freetype/{freetype_2.8.bb => freetype_2.8.1.bb} (93%)meta/recipes-graphics/freetype/freetype_2.8.1.bb renamed from meta/recipes-graphics/freetype/freetype_2.8.bb +2 -2
@@ -18,8 +18,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/freetype/files/freetype2/" UPSTREAM_CHECK_REGEX = "freetype-(?P<pver>\d+(\.\d+)+)" -SRC_URI[md5sum] = "2413ac3eaf508ada019c63959ea81a92" -SRC_URI[sha256sum] = "a3c603ed84c3c2495f9c9331fe6bba3bb0ee65e06ec331e0a0fb52158291b40b" +SRC_URI[md5sum] = "bf0a210b6fe781228fa0e4a80691a521" +SRC_URI[sha256sum] = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78" inherit autotools pkgconfig binconfig-disabled multilib_header
Signature · 1 line
2.14.1
PATCH 29/50 vulkan: update to 1.0.61.1
In reply to Alexander Kanavin---
.../vulkan/{vulkan_1.0.51.0.bb => vulkan_1.0.61.1.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/vulkan/{vulkan_1.0.51.0.bb => vulkan_1.0.61.1.bb} (94%)meta/recipes-graphics/vulkan/vulkan_1.0.61.1.bb renamed from meta/recipes-graphics/vulkan/vulkan_1.0.51.0.bb +3 -3
@@ -10,10 +10,10 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99c647ca3d4f6a4b9d8628f757aad156 \ file://loader/loader.c;endline=25;md5=a87cd5442291c23d1fce4eece4cfde9d" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git;branch=sdk-1.0.51 \ +SRC_URI = "git://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git;branch=sdk-1.0.61 \ file://demos-Don-t-build-tri-or-cube.patch \ -" -SRCREV = "8d021e4d5a9f91436f4462df1dafb222908e296d" + " +SRCREV = "7e4888569f0f5d44efbcae94c1000fbea973c1c8" UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git"
Signature · 1 line
2.14.1
PATCH 30/50 xdg-utils: update to 1.1.2
In reply to Alexander Kanavin---
.../xdg-utils/{xdg-utils_1.1.1.bb => xdg-utils_1.1.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/xdg-utils/{xdg-utils_1.1.1.bb => xdg-utils_1.1.2.bb} (89%)meta/recipes-extended/xdg-utils/xdg-utils_1.1.2.bb renamed from meta/recipes-extended/xdg-utils/xdg-utils_1.1.1.bb +2 -2
@@ -22,8 +22,8 @@ SRC_URI = "http://portland.freedesktop.org/download/${BPN}-${PV}.tar.gz \ file://0001-Don-t-build-the-in-script-manual.patch \ " -SRC_URI[md5sum] = "2d0aec6037769a5f138ff404b1bb4b15" -SRC_URI[sha256sum] = "b0dd63a2576e0bb16f1aa78d6ddf7d6784784a098d4df17161cd6a17c7bc4125" +SRC_URI[md5sum] = "361e75eb76c94d19f6f4f330d8ee626b" +SRC_URI[sha256sum] = "951952e2c6bb21214e0bb54e0dffa057d30f5563300225c24c16fba846258bcc" UPSTREAM_CHECK_REGEX = "xdg-utils-(?P<pver>((\d+[\.\-_]*)+)((rc|alpha|beta)\d+)?)\.(tar\.gz|tgz)"
Signature · 1 line
2.14.1
PATCH 31/50 gsettings-desktop-schemas: update to 3.24.1
In reply to Alexander Kanavin---
...-desktop-schemas_3.22.0.bb => gsettings-desktop-schemas_3.24.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/gsettings-desktop-schemas/{gsettings-desktop-schemas_3.22.0.bb => gsettings-desktop-schemas_3.24.1.bb} (70%)meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.24.1.bb renamed from meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.22.0.bb +2 -2
@@ -9,5 +9,5 @@ DEPENDS = "glib-2.0 intltool-native" inherit gnomebase gsettings gettext gobject-introspection upstream-version-is-even -SRC_URI[archive.md5sum] = "5b9056ab6eff42a0117f2912edff5f20" -SRC_URI[archive.sha256sum] = "0f06c7ba34c3a99e4d58b10889496133c9aaad6698ea2d8405d481c7f1a7eae1" +SRC_URI[archive.md5sum] = "796b6ac1eff450261edd521b72e7fe6d" +SRC_URI[archive.sha256sum] = "76a3fa309f9de6074d66848987214f0b128124ba7184c958c15ac78a8ac7eea7"
Signature · 1 line
2.14.1
PATCH 32/50 libsoup-2.4: update to 2.60.1
In reply to Alexander Kanavin---
.../libsoup/{libsoup-2.4_2.58.2.bb => libsoup-2.4_2.60.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/libsoup/{libsoup-2.4_2.58.2.bb => libsoup-2.4_2.60.1.bb} (89%)meta/recipes-support/libsoup/libsoup-2.4_2.60.1.bb renamed from meta/recipes-support/libsoup/libsoup-2.4_2.58.2.bb +2 -2
@@ -11,8 +11,8 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" -SRC_URI[md5sum] = "eb33adb459c2283efc5c7d09ccdbbcfc" -SRC_URI[sha256sum] = "442300ca1b1bf8a3bbf2f788203287ff862542d4fc048f19a92a068a27d17b72" +SRC_URI[md5sum] = "4b3fb98f742d81f1850c0846a40470e2" +SRC_URI[sha256sum] = "023930032b20e6b14764feb847ea80d9e170622dee7370215d6feb9967b6aa9d" S = "${WORKDIR}/libsoup-${PV}"
Signature · 1 line
2.14.1
PATCH 33/50 adwaita-icon-theme: update to 3.26.0
In reply to Alexander Kanavin---
.../adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch | 11 ++++++-----
...aita-icon-theme_3.24.0.bb => adwaita-icon-theme_3.26.0.bb} | 4 ++--
2 files changed, 8 insertions(+), 7 deletions(-)
rename meta/recipes-gnome/gnome/{adwaita-icon-theme_3.24.0.bb => adwaita-icon-theme_3.26.0.bb} (93%)meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch +6 -5
@@ -1,29 +1,30 @@ -From d2b9ad8a80bf9320fe35c9aee8f52e55ebd40e06 Mon Sep 17 00:00:00 2001 +From 88ed996cc9e2b296cacfdbeece4be28a90bab511 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <[email protected]> Date: Tue, 30 May 2017 14:55:49 +0300 -Subject: [PATCH] Don't use AC_CANONICAL_HOST +Subject: [PATCH 1/2] Don't use AC_CANONICAL_HOST This won't work when building allarch (and is only used to find out if target is windows). Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Jussi Kukkonen <[email protected]> + --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac -index d855b7a..6908f59 100644 +index b20eb1a..50c5fd6 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,6 @@ AC_PREREQ(2.53) - AC_INIT([adwaita-icon-theme], [3.24.0], + AC_INIT([adwaita-icon-theme], [3.26.0], [http://bugzilla.gnome.org/enter_bug.cgi?product=adwaita-icon-theme]) -AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([index.theme.in]) -- -2.1.4 +2.14.1
meta/recipes-gnome/gnome/adwaita-icon-theme_3.26.0.bb renamed from meta/recipes-gnome/gnome/adwaita-icon-theme_3.24.0.bb +2 -2
@@ -15,8 +15,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://0001-Run-installation-commands-as-shell-jobs.patch \ " -SRC_URI[md5sum] = "3ccac0d600ffc936d2adfb80e9245bc5" -SRC_URI[sha256sum] = "ccf79ff3bd340254737ce4d28b87f0ccee4b3358cd3cd5cd11dc7b42f41b272a" +SRC_URI[md5sum] = "3218540331a26c3d7a904ffe3d00bed8" +SRC_URI[sha256sum] = "9cad85de19313f5885497aceab0acbb3f08c60fcd5fa5610aeafff37a1d12212" do_install_append() { # Build uses gtk-encode-symbolic-svg to create png versions:
Signature · 1 line
2.14.1
PATCH 34/50 shared-mime-info: update to 1.9
In reply to Alexander Kanavin---
.../{shared-mime-info_1.8.bb => shared-mime-info_1.9.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/shared-mime-info/{shared-mime-info_1.8.bb => shared-mime-info_1.9.bb} (43%)meta/recipes-support/shared-mime-info/shared-mime-info_1.9.bb renamed from meta/recipes-support/shared-mime-info/shared-mime-info_1.8.bb +2 -2
@@ -3,5 +3,5 @@ require shared-mime-info.inc SRC_URI += "file://parallelmake.patch \ file://install-data-hook.patch" -SRC_URI[md5sum] = "f6dcadce764605552fc956563efa058c" -SRC_URI[sha256sum] = "2af55ef1a0319805b74ab40d331a3962c905477d76c086f49e34dc96363589e9" +SRC_URI[md5sum] = "45103889b91242850aa47f09325e798b" +SRC_URI[sha256sum] = "5c0133ec4e228e41bdf52f726d271a2d821499c2ab97afd3aa3d6cf43efcdc83"
Signature · 1 line
2.14.1
PATCH 35/50 assimp: update to 4.0.1
In reply to Alexander Kanavin---
meta/recipes-graphics/vulkan/{assimp_4.0.0.bb => assimp_4.0.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-graphics/vulkan/{assimp_4.0.0.bb => assimp_4.0.1.bb} (92%)meta/recipes-graphics/vulkan/assimp_4.0.1.bb renamed from meta/recipes-graphics/vulkan/assimp_4.0.0.bb +1 -1
@@ -11,7 +11,7 @@ DEPENDS = "zlib" SRC_URI = "git://github.com/assimp/assimp.git" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(\d+(\.\d+)+))" -SRCREV = "52c8d06f5d6498afd66df983da348a6b112f1314" +SRCREV = "eb8639d7c8a056d1c1b1cd42598c84ba3974c41b" S = "${WORKDIR}/git"
Signature · 1 line
2.14.1
PATCH 36/50 gdk-pixbuf: update to 2.36.11
In reply to Alexander KanavinRemove upstreamed 0001-queryloaders-Make-output-more-reproducible.patch
Rebase fatal-loader.patch
Add a patch to fix a libtiff detection issue.
---
...-Fix-without-libtiff-not-having-an-effect.patch | 27 +++++++++++
...ueryloaders-Make-output-more-reproducible.patch | 56 ----------------------
.../gdk-pixbuf/gdk-pixbuf/fatal-loader.patch | 39 ++++++++++-----
...{gdk-pixbuf_2.36.8.bb => gdk-pixbuf_2.36.11.bb} | 6 +--
4 files changed, 56 insertions(+), 72 deletions(-)
create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch
delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-queryloaders-Make-output-more-reproducible.patch
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.36.8.bb => gdk-pixbuf_2.36.11.bb} (94%)meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch new file +27 -0
@@ -0,0 +1,27 @@ +From 460befc992adb32434b0408b453be39a6866ccf8 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Tue, 10 Oct 2017 14:33:18 +0300 +Subject: [PATCH] Fix --without-libtiff not having an effect. + +Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=788770] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 315e0cc..98e780c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -676,7 +676,7 @@ if test x$gio_can_sniff = x; then + AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data]) + fi + +-AM_CONDITIONAL(HAVE_TIFF, test "x$libtiff_found" != x) ++AM_CONDITIONAL(HAVE_TIFF, test "x$libtiff_found" != xno) + AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != x) + AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x) + AM_CONDITIONAL(HAVE_JASPER, test "x$LIBJASPER" != x) +-- +2.14.1 +
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-queryloaders-Make-output-more-reproducible.patch deleted +0 -56
56 lines not on this page · raw message
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch +26 -13
@@ -1,11 +1,20 @@ +From b6a7b30522455cab39a0b9ea8463313380146e70 Mon Sep 17 00:00:00 2001 +From: Ross Burton <[email protected]> +Date: Tue, 1 Apr 2014 17:23:36 +0100 +Subject: [PATCH 3/4] gdk-pixbuf: add an option so that loader errors are fatal + If an environment variable is specified set the return value from main() to non-zero if the loader had errors (missing libraries, generally). Upstream-Status: Pending Signed-off-by: Ross Burton <[email protected]> +--- + gdk-pixbuf/queryloaders.c | 19 +++++++++++++++---- + 1 file changed, 15 insertions(+), 4 deletions(-) + diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c -index a9ca015..395674a 100644 +index a81c804..350bec8 100644 --- a/gdk-pixbuf/queryloaders.c +++ b/gdk-pixbuf/queryloaders.c @@ -146,7 +146,7 @@ write_loader_info (GString *contents, const char *path, GdkPixbufFormat *info)
@@ -47,17 +56,18 @@ index a9ca015..395674a 100644 #ifdef G_OS_WIN32 gchar *libdir; -@@ -360,7 +365,8 @@ int main (int argc, char **argv) - gint len = strlen (dent); - if (len > SOEXT_LEN && - strcmp (dent + len - SOEXT_LEN, SOEXT) == 0) { -- query_module (contents, path, dent); -+ if (!query_module (contents, path, dent)) -+ success = FALSE; - } - } - g_dir_close (dir); -@@ -378,7 +384,8 @@ int main (int argc, char **argv) +@@ -370,7 +375,9 @@ int main (int argc, char **argv) + } + modules = g_list_sort (modules, (GCompareFunc)strcmp); + for (l = modules; l != NULL; l = l->next) +- query_module (contents, path, l->data); ++ if (!query_module (contents, path, l->data)) ++ success = FALSE; ++ + g_list_free_full (modules, g_free); + #else + g_string_append_printf (contents, "# dynamic loading of modules not supported\n"); +@@ -385,7 +392,8 @@ int main (int argc, char **argv) infilename = g_locale_to_utf8 (infilename, -1, NULL, NULL, NULL); #endif
@@ -67,7 +77,7 @@ index a9ca015..395674a 100644 } g_free (cwd); } -@@ -394,5 +401,8 @@ int main (int argc, char **argv) +@@ -401,5 +409,8 @@ int main (int argc, char **argv) else g_print ("%s\n", contents->str);
@@ -77,3 +87,6 @@ index a9ca015..395674a 100644 + else + return 0; } +-- +2.14.1 +
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.11.bb renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.8.bb +3 -3
@@ -18,11 +18,11 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://run-ptest \ file://fatal-loader.patch \ file://0001-Work-around-thumbnailer-cross-compile-failure.patch \ - file://0001-queryloaders-Make-output-more-reproducible.patch \ + file://0001-Fix-without-libtiff-not-having-an-effect.patch \ " -SRC_URI[md5sum] = "e0aaa0061eb12667b32b27472230b962" -SRC_URI[sha256sum] = "5d68e5283cdc0bf9bda99c3e6a1d52ad07a03364fa186b6c26cfc86fcd396a19" +SRC_URI[md5sum] = "6e84e5485c17ce7c25df77fe76eb2d6a" +SRC_URI[sha256sum] = "ae62ab87250413156ed72ef756347b10208c00e76b222d82d9ed361ed9dde2f3" inherit autotools pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package
Signature · 1 line
2.14.1
PATCH 37/50 hicolor-icon-theme: update to 0.17
In reply to Alexander Kanavin---
.../{hicolor-icon-theme_0.15.bb => hicolor-icon-theme_0.17.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/hicolor-icon-theme/{hicolor-icon-theme_0.15.bb => hicolor-icon-theme_0.17.bb} (74%)meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.17.bb renamed from meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.15.bb +2 -2
@@ -6,8 +6,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=f08a446809913fc9b3c718f0eaea0426" SRC_URI = "http://icon-theme.freedesktop.org/releases/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "6aa2b3993a883d85017c7cc0cfc0fb73" -SRC_URI[sha256sum] = "9cc45ac3318c31212ea2d8cb99e64020732393ee7630fa6c1810af5f987033cc" +SRC_URI[md5sum] = "84eec8d6f810240a069c731f1870b474" +SRC_URI[sha256sum] = "317484352271d18cbbcfac3868eab798d67fff1b8402e740baa6ff41d588a9d8" inherit allarch autotools
Signature · 1 line
2.14.1
PATCH 38/50 libgudev: update to 232
In reply to Alexander Kanavin---
meta/recipes-gnome/libgudev/{libgudev_231.bb => libgudev_232.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/libgudev/{libgudev_231.bb => libgudev_232.bb} (74%)meta/recipes-gnome/libgudev/libgudev_232.bb renamed from meta/recipes-gnome/libgudev/libgudev_231.bb +2 -2
@@ -1,7 +1,7 @@ SUMMARY = "GObject wrapper for libudev" HOMEPAGE = "https://wiki.gnome.org/Projects/libgudev" -SRC_URI[archive.md5sum] = "916c10c51ec61131e244c3936bbb2e0c" -SRC_URI[archive.sha256sum] = "3b1ef99d4a8984c35044103d8ddfc3cc52c80035c36abab2bcc5e3532e063f96" +SRC_URI[archive.sha256sum] = "ee4cb2b9c573cdf354f6ed744f01b111d4b5bed3503ffa956cefff50489c7860" +SRC_URI[archive.md5sum] = "6914852377156665567abf8a38d89236" DEPENDS = "glib-2.0 udev"
Signature · 1 line
2.14.1
PATCH 39/50 pango: update to 1.40.12
In reply to Alexander Kanavin---
meta/recipes-graphics/pango/{pango_1.40.6.bb => pango_1.40.12.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/pango/{pango_1.40.6.bb => pango_1.40.12.bb} (92%)meta/recipes-graphics/pango/pango_1.40.12.bb renamed from meta/recipes-graphics/pango/pango_1.40.6.bb +2 -2
@@ -17,8 +17,8 @@ SRC_URI += "file://run-ptest \ file://0001-Drop-introspection-macros-from-acinclude.m4.patch \ file://0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch \ " -SRC_URI[archive.md5sum] = "507c6746fbf53fc9d48c577f1e265de3" -SRC_URI[archive.sha256sum] = "ca152b7383a1e9f7fd74ae96023dc6770dc5043414793bfe768ff06b6759e573" +SRC_URI[archive.sha256sum] = "75f1a9a8e4e2b28cbc078b50c1fa927ee4ded994d1ade97c5603e2d1f3161cfc" +SRC_URI[archive.md5sum] = "9aae7dd5ecc1c2ade4e6951b85004cee" DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz"
Signature · 1 line
2.14.1
PATCH 40/50 fontconfig: update to 2.12.6
In reply to Alexander KanavinAdd a patch to avoid crashing under qemu.
---
...src-fcxml.c-avoid-double-free-of-filename.patch | 28 ++++++++++++++++++++++
.../{fontconfig_2.12.4.bb => fontconfig_2.12.6.bb} | 7 ++++--
2 files changed, 33 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch
rename meta/recipes-graphics/fontconfig/{fontconfig_2.12.4.bb => fontconfig_2.12.6.bb} (90%)meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch new file +28 -0
@@ -0,0 +1,28 @@ +From a163c81ac430cdc292add200f3e6a0c048be4d7e Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 11 Oct 2017 17:40:09 +0300 +Subject: [PATCH] src/fcxml.c: avoid double free() of filename + +It's also freed after bail1, so no need to do it here. + +Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=103221] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + src/fcxml.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/fcxml.c b/src/fcxml.c +index 19ce96a..edb6054 100644 +--- a/src/fcxml.c ++++ b/src/fcxml.c +@@ -3398,7 +3398,6 @@ FcConfigParseAndLoad (FcConfig *config, + + fd = FcOpen ((char *) filename, O_RDONLY); + if (fd == -1) { +- FcStrFree (filename); + goto bail1; + } + +-- +2.14.1 +
meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb renamed from meta/recipes-graphics/fontconfig/fontconfig_2.12.4.bb +5 -2
@@ -22,9 +22,12 @@ DEPENDS = "expat freetype zlib gperf-native" SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ file://revert-static-pkgconfig.patch \ + file://0001-src-fcxml.c-avoid-double-free-of-filename.patch \ " -SRC_URI[md5sum] = "4fb01fc3f41760c41c69e37cc784b658" -SRC_URI[sha256sum] = "fd5a6a663f4c4a00e196523902626654dd0c4a78686cbc6e472f338e50fdf806" + +SRC_URI[md5sum] = "00e748c67fad11e7057a71ed385e8bdb" +SRC_URI[sha256sum] = "064b9ebf060c9e77011733ac9dc0e2ce92870b574cca2405e11f5353a683c334" + do_configure_prepend() { # work around https://bugs.freedesktop.org/show_bug.cgi?id=101280
Signature · 1 line
2.14.1
PATCH 41/50 libinput: update to 1.8.3
In reply to Alexander KanavinDrop upstreamed patch.
---
.../0001-tools-Fix-race-in-autotools-install.patch | 37 ----------------------
.../{libinput_1.8.1.bb => libinput_1.8.3.bb} | 8 ++---
2 files changed, 3 insertions(+), 42 deletions(-)
delete mode 100644 meta/recipes-graphics/wayland/libinput/0001-tools-Fix-race-in-autotools-install.patch
rename meta/recipes-graphics/wayland/{libinput_1.8.1.bb => libinput_1.8.3.bb} (81%)meta/recipes-graphics/wayland/libinput/0001-tools-Fix-race-in-autotools-install.patch deleted +0 -37
@@ -1,37 +0,0 @@ -From 5e8864c5b7a2e258eea041b0ef66dac7fcab9b7f Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <[email protected]> -Date: Wed, 9 Aug 2017 09:47:14 +0300 -Subject: [PATCH] tools: Fix race in (autotools) install -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -exec/data distinction is done based on install dir so compat scripts -must be moved in exec hook. - -This should fix this occasional failure: -| install: cannot change permissions of -| ‘/usr/bin/libinput-debug-events.compat’: No such file or directory - -Signed-off-by: Jussi Kukkonen <[email protected]> -Upstream-Status: Submitted ---- - tools/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/Makefile.am b/tools/Makefile.am -index 2c8660b..7ee8b90 100644 ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -63,7 +63,7 @@ endif - - EXTRA_DIST = make-ptraccel-graphs.sh install-compat-scripts.sh $(bin_SCRIPTS) - --install-data-hook: -+install-exec-hook: - (cd $(DESTDIR)$(bindir) && mv libinput-list-devices.compat libinput-list-devices) - (cd $(DESTDIR)$(bindir) && mv libinput-debug-events.compat libinput-debug-events) - --- -2.13.3 -
meta/recipes-graphics/wayland/libinput_1.8.3.bb renamed from meta/recipes-graphics/wayland/libinput_1.8.1.bb +3 -5
@@ -7,12 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2184aef38ff137ed33ce9a63b9d1eb8f" DEPENDS = "libevdev udev mtdev" -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ - file://0001-tools-Fix-race-in-autotools-install.patch \ -" +SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz" -SRC_URI[md5sum] = "8247f0bb67052ffb272c50c3cb9c5998" -SRC_URI[sha256sum] = "e3590a9037e561a5791c8bd3b34bfd30fad5cacd8cbefc0d75fafe3a41d07147" +SRC_URI[md5sum] = "5265244853ad7cf41232b0d3ee805ab9" +SRC_URI[sha256sum] = "2fe2e2f52f0971a9c43541b8f26582ca8df6ed4bb9050e85eb40d4ff6b13142d" inherit autotools pkgconfig lib_package
Signature · 1 line
2.14.1
PATCH 42/50 vte: update to 0.50.1
In reply to Alexander Kanavin---
meta/recipes-support/vte/{vte_0.48.3.bb => vte_0.50.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/vte/{vte_0.48.3.bb => vte_0.50.1.bb} (91%)meta/recipes-support/vte/vte_0.50.1.bb renamed from meta/recipes-support/vte/vte_0.48.3.bb +2 -2
@@ -11,8 +11,8 @@ inherit gnomebase gtk-doc distro_features_check upstream-version-is-even gobject SRC_URI += "file://0001-Don-t-enable-stack-protection-by-default.patch \ ${@bb.utils.contains('PACKAGECONFIG', 'vala', '', 'file://0001-Add-m4-vapigen.m4.patch', d) } \ " -SRC_URI[archive.md5sum] = "b300675ac5f269aa6eb48fe89a0d726d" -SRC_URI[archive.sha256sum] = "a3a9fb182740b392a45cd3f46fa61a985f68bb6b1817b52daec22034c46158c3" +SRC_URI[archive.md5sum] = "a6f8fec3787e3cb72b3b31a8be6751a4" +SRC_URI[archive.sha256sum] = "cf1708e3e573160e1db107014b3ef70888fefe6b668373fed70e8d1cac45a8c2" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
Signature · 1 line
2.14.1
PATCH 43/50 librsvg: update to 2.40.19
In reply to Alexander Kanavin---
meta/recipes-gnome/librsvg/{librsvg_2.40.18.bb => librsvg_2.40.19.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/librsvg/{librsvg_2.40.18.bb => librsvg_2.40.19.bb} (91%)meta/recipes-gnome/librsvg/librsvg_2.40.19.bb renamed from meta/recipes-gnome/librsvg/librsvg_2.40.18.bb +2 -2
@@ -14,8 +14,8 @@ inherit autotools pkgconfig gnomebase gtk-doc pixbufcache upstream-version-is-ev SRC_URI += "file://gtk-option.patch" -SRC_URI[archive.md5sum] = "eaa5c8a8bbe2600ab5194c0d3b1b621b" -SRC_URI[archive.sha256sum] = "bfc8c488c89c1e7212c478beb95c41b44701636125a3e6dab41187f1485b564c" +SRC_URI[archive.md5sum] = "934eff469b34c732fb91ddb9afd40638" +SRC_URI[archive.sha256sum] = "612b4d8b8609036f5d899be3fe70d9866b5f6ac5c971154c1c0ef7242216c1f7" CACHED_CONFIGUREVARS = "ac_cv_path_GDK_PIXBUF_QUERYLOADERS=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders"
Signature · 1 line
2.14.1
PATCH 44/50 clutter-gtk-1.0: update to 1.8.4
In reply to Alexander Kanavin--- meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.2.bb | 6 ------ meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.2.bb create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb
meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.2.bb deleted +0 -6
@@ -1,6 +0,0 @@ -require clutter-gtk-1.0.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" - -SRC_URI[archive.md5sum] = "6698207ee6e3d5a1c0ffc0a23444e12f" -SRC_URI[archive.sha256sum] = "da27d486325490ad3f65d2abf9413aeb8b4a8f7b559e4b2f73567a5344a26b94"
meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb new file +6 -0
@@ -0,0 +1,6 @@ +require clutter-gtk-1.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" + +SRC_URI[archive.md5sum] = "b363ac9878e2337be887b8ee9e1da00e" +SRC_URI[archive.sha256sum] = "521493ec038973c77edcb8bc5eac23eed41645117894aaee7300b2487cb42b06"
Signature · 1 line
2.14.1
PATCH 45/50 at-spi2-core: update to 2.26.0
In reply to Alexander KanavinDrop 0001-nls.m4-Take-it-from-gettext-0.15.patch as it's now upstreamed.
Remove --disable-xevie option:
https://github.com/GNOME/at-spi2-core/commit/644096a28a47bdf5c6e0c34c9cd5b944df059925
---
.../0001-build-Add-with-systemduserunitdir.patch | 29 ++++++------
.../0001-nls.m4-Take-it-from-gettext-0.15.patch | 54 ----------------------
...-spi2-core_2.24.1.bb => at-spi2-core_2.26.0.bb} | 9 ++--
3 files changed, 20 insertions(+), 72 deletions(-)
delete mode 100644 meta/recipes-support/atk/at-spi2-core/0001-nls.m4-Take-it-from-gettext-0.15.patch
rename meta/recipes-support/atk/{at-spi2-core_2.24.1.bb => at-spi2-core_2.26.0.bb} (80%)meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch +16 -13
@@ -1,4 +1,4 @@ -From 2f47c975ebe52b6916a45ade023ae3bac21bb0e0 Mon Sep 17 00:00:00 2001 +From fa376762b92404b9e3c430054b8c3341ca0fdd8b Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <[email protected]> Date: Tue, 21 Jun 2016 16:00:02 +0300 Subject: [PATCH] build: Add --with-systemduserunitdir
@@ -8,29 +8,30 @@ allow overriding the value. Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=767911] Signed-off-by: Jussi Kukkonen <[email protected]> + --- bus/Makefile.am | 2 +- - configure.ac | 7 +++++++ - 2 files changed, 8 insertions(+), 1 deletion(-) + configure.ac | 9 +++++++++ + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/bus/Makefile.am b/bus/Makefile.am -index b189e02..52fbb0b 100644 +index 688f82a..10cde62 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am -@@ -26,7 +26,7 @@ dbusservice_DATA = org.a11y.Bus.service - org.a11y.Bus.service: org.a11y.Bus.service.in - sed -e $(substitutions) $< > [email protected] && mv [email protected] $@ +@@ -29,7 +29,7 @@ org.a11y.Bus.service: org.a11y.Bus.service.in + EXTRA_DIST += org.a11y.Bus.service.in + CLEANFILES += org.a11y.Bus.service -systemd_userdir = $(prefix)/lib/systemd/user +systemd_userdir = $(systemduserunitdir) systemd_user_DATA = at-spi-dbus-bus.service at-spi-dbus-bus.service: at-spi-dbus-bus.service.in Makefile - sed -e $(substitutions) $< > [email protected] && mv [email protected] $@ + $(AM_V_GEN) $(SED) -e $(substitutions) $< > [email protected] && mv [email protected] $@ diff --git a/configure.ac b/configure.ac -index f9061c2..2b8eeed 100644 +index 8c4fca2..1415cca 100644 --- a/configure.ac +++ b/configure.ac -@@ -183,6 +183,13 @@ else +@@ -146,6 +146,15 @@ else fi AC_SUBST(DBUS_SERVICES_DIR)
@@ -41,9 +42,11 @@ index f9061c2..2b8eeed 100644 + [with_systemduserunitdir=$($PKG_CONFIG --variable=systemduserunitdir systemd)]) +AC_SUBST([systemduserunitdir], [$with_systemduserunitdir]) + - AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums) ++AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums) ++ + GOBJECT_INTROSPECTION_CHECK([1.32.0]) - GOBJECT_INTROSPECTION_CHECK([0.9.6]) + AC_SUBST(LIBTOOL_EXPORT_OPTIONS) -- -2.1.4 +2.14.1
meta/recipes-support/atk/at-spi2-core/0001-nls.m4-Take-it-from-gettext-0.15.patch deleted +0 -54
54 lines not on this page · raw message
meta/recipes-support/atk/at-spi2-core_2.26.0.bb renamed from meta/recipes-support/atk/at-spi2-core_2.24.1.bb +4 -5
@@ -6,12 +6,11 @@ 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://0001-nls.m4-Take-it-from-gettext-0.15.patch \ file://0001-build-Add-with-systemduserunitdir.patch \ - " + " -SRC_URI[md5sum] = "61d0a471e693292934a73f288ebff35c" -SRC_URI[sha256sum] = "1e90d064b937aacfe79a96232ac7e63d28d716e85bd9ff4333f865305a959b5b" +SRC_URI[md5sum] = "ef3de25da46da8f650915205eb7e1a33" +SRC_URI[sha256sum] = "511568a65fda11fdd5ba5d4adfd48d5d76810d0e6ba4f7460f1b2ec0dbbbc337" DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native"
@@ -19,7 +18,7 @@ inherit autotools gtk-doc gettext systemd pkgconfig distro_features_check upstre # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -EXTRA_OECONF = "--disable-xevie \ +EXTRA_OECONF = " \ --with-systemduserunitdir=${systemd_user_unitdir} \ --with-dbus-daemondir=${bindir}"
Signature · 1 line
2.14.1
PATCH 46/50 at-spi2-atk: update to 2.26.0
In reply to Alexander Kanavin---
.../atk/{at-spi2-atk_2.24.1.bb => at-spi2-atk_2.26.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/atk/{at-spi2-atk_2.24.1.bb => at-spi2-atk_2.26.0.bb} (83%)meta/recipes-support/atk/at-spi2-atk_2.26.0.bb renamed from meta/recipes-support/atk/at-spi2-atk_2.24.1.bb +2 -2
@@ -6,8 +6,8 @@ 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" -SRC_URI[md5sum] = "79388fbc4dc7f27394556dd389aeb594" -SRC_URI[sha256sum] = "60dc90ac4f74b8ffe96a9363c25208a443b381bacecfefea6de549f20ed6957d" +SRC_URI[md5sum] = "555d4ca06a1b75c14db67bffac5f4d1f" +SRC_URI[sha256sum] = "d25e528e1406a10c7d9b675aa15e638bcbf0a122ca3681f655a30cce83272fb9" DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core"
Signature · 1 line
2.14.1
PATCH 47/50 atk: update to 2.26.0
In reply to Alexander KanavinRemove --disable-glibtest as ./configure no longer has it.
---
meta/recipes-support/atk/{atk_2.24.0.bb => atk_2.26.0.bb} | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
rename meta/recipes-support/atk/{atk_2.24.0.bb => atk_2.26.0.bb} (72%)meta/recipes-support/atk/atk_2.26.0.bb renamed from meta/recipes-support/atk/atk_2.24.0.bb +2 -4
@@ -12,10 +12,8 @@ DEPENDS = "glib-2.0" inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection -SRC_URI[archive.md5sum] = "3747a80089dfa3c0bbcf21adfff9968b" -SRC_URI[archive.sha256sum] = "bb2daa9a808c73a7a79d2983f333e0ba74be42fc51e3ba1faf2551a636487a49" +SRC_URI[archive.md5sum] = "ee9c329784dead6e386e8b2e0d4d8d6f" +SRC_URI[archive.sha256sum] = "eafe49d5c4546cb723ec98053290d7e0b8d85b3fdb123938213acb7bb4178827" BBCLASSEXTEND = "native" -EXTRA_OECONF = "--disable-glibtest \ - "
Signature · 1 line
2.14.1
PATCH 48/50 glew: update to 2.1.0
In reply to Alexander Kanavin---
meta/recipes-graphics/glew/{glew_2.0.0.bb => glew_2.1.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/glew/{glew_2.0.0.bb => glew_2.1.0.bb} (92%)meta/recipes-graphics/glew/glew_2.1.0.bb renamed from meta/recipes-graphics/glew/glew_2.0.0.bb +2 -2
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ac251558de685c6b9478d89be3149c2" SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ file://no-strip.patch" -SRC_URI[md5sum] = "2a2cd7c98f13854d2fcddae0d2b20411" -SRC_URI[sha256sum] = "c572c30a4e64689c342ba1624130ac98936d7af90c3103f9ce12b8a0c5736764" +SRC_URI[md5sum] = "b2ab12331033ddfaa50dc39345343980" +SRC_URI[sha256sum] = "04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/glew/files/glew" UPSTREAM_CHECK_REGEX = "/glew/(?P<pver>(\d+[\.\-_]*)+)/"
Signature · 1 line
2.14.1
PATCH 49/50 maintainers.inc: add Mark Hatle for libmnl
In reply to Alexander Kanavin--- meta/conf/distro/include/maintainers.inc | 1 + 1 file changed, 1 insertion(+)
meta/conf/distro/include/maintainers.inc +1 -0
@@ -358,6 +358,7 @@ RECIPE_MAINTAINER_pn-libinput = "Jussi Kukkonen <[email protected]>" RECIPE_MAINTAINER_pn-libjson = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-libksba = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-libmatchbox = "Jussi Kukkonen <[email protected]>" +RECIPE_MAINTAINER_pn-libmnl = "Mark Hatle <[email protected]>" RECIPE_MAINTAINER_pn-libmpc = "Khem Raj <[email protected]>" RECIPE_MAINTAINER_pn-libnewt = "Hongxu Jia <[email protected]>" RECIPE_MAINTAINER_pn-libnewt-python = "Hongxu Jia <[email protected]>"
Signature · 1 line
2.14.1
PATCH 50/50 maintainers.inc: add Otavio Salvador for go-dep
In reply to Alexander Kanavin--- meta/conf/distro/include/maintainers.inc | 1 + 1 file changed, 1 insertion(+)
meta/conf/distro/include/maintainers.inc +1 -0
@@ -224,6 +224,7 @@ RECIPE_MAINTAINER_pn-gnupg = "Hongxu Jia <[email protected]>" RECIPE_MAINTAINER_pn-gnutls = "Armin Kuster <[email protected]>" RECIPE_MAINTAINER_pn-go = "Khem Raj <[email protected]>" RECIPE_MAINTAINER_pn-go-cross = "Khem Raj <[email protected]>" +RECIPE_MAINTAINER_pn-go-dep = "Otavio Salvador <[email protected]>" RECIPE_MAINTAINER_pn-go-helloworld = "Khem Raj <[email protected]>" RECIPE_MAINTAINER_pn-go-native = "Khem Raj <[email protected]>" RECIPE_MAINTAINER_pn-gobject-introspection = "Alexander Kanavin <[email protected]>"
Signature · 1 line
2.14.1
Re: [PATCH 49/50] maintainers.inc: add Mark Hatle for libmnl
In reply to Alexander KanavinQuoted 11 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- meta/conf/distro/include/maintainers.inc | 1 + 1 file changed, 1 insertion(+)meta/conf/distro/include/maintainers.inc +0
-0
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-libinput = "Jussi Kukkonen <[email protected]>" · line 364
Quoted 7 lines
meta/conf/distro/include/maintainers.inc +1
-0@@ -358,6 +358,7 @@ RECIPE_MAINTAINER_pn-libinput = "Jussi Kukkonen <[email protected]>" RECIPE_MAINTAINER_pn-libjson = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-libksba = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-libmatchbox = "Jussi Kukkonen <[email protected]>" +RECIPE_MAINTAINER_pn-libmnl = "Mark Hatle <[email protected]>" RECIPE_MAINTAINER_pn-libmpc = "Khem Raj <[email protected]>" RECIPE_MAINTAINER_pn-libnewt = "Hongxu Jia <[email protected]>" RECIPE_MAINTAINER_pn-libnewt-python = "Hongxu Jia <[email protected]>"
NAK. I am not maintaining libmnl.
--Mark
Re: [PATCH 49/50] maintainers.inc: add Mark Hatle for libmnl
Quoted 6 lines · Mark Hatle
Quoted 5 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- meta/conf/distro/include/maintainers.inc | 1 + 1 file changed, 1 insertion(+)
Quoted 15 lines
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-libinput = "Jussi Kukkonen <[email protected]>" · line 364
Quoted 13 lines
meta/conf/distro/include/maintainers.inc +1
-0@@ -358,6 +358,7 @@ RECIPE_MAINTAINER_pn-libinput = "Jussi Kukkonen <[email protected]>" RECIPE_MAINTAINER_pn-libjson = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-libksba = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-libmatchbox = "Jussi Kukkonen <[email protected]>" +RECIPE_MAINTAINER_pn-libmnl = "Mark Hatle <[email protected]>" RECIPE_MAINTAINER_pn-libmpc = "Khem Raj <[email protected]>" RECIPE_MAINTAINER_pn-libnewt = "Hongxu Jia <[email protected]>" RECIPE_MAINTAINER_pn-libnewt-python = "Hongxu Jia <[email protected]>"NAK. I am not maintaining libmnl.
No problem. Add it to my list.
Quoted 7 lines
--Mark
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [PATCH 01/50] oprofile: remove the recipe
In reply to Alexander KanavinQuoted 2 lines · Alexander Kanavin
Perf is the preferred solution, and oprofile is difficult to maintain against musl.
Can we consider moving it to meta-openembedded and maybe relaxing requirements, such as musl compatibility?
Quoted 1,074 lines
Signed-off-by Alexander Kanavin <[email protected]>--- meta/conf/distro/include/distro_alias.inc | 1 - meta/conf/layer.conf | 1 - meta/recipes-kernel/oprofile/oprofile.inc | 65 --- ...Add-rmb-definition-for-NIOS2-architecture.patch | 30 -- .../0001-Fix-FTBFS-problem-with-GCC-6.patch | 51 -- meta/recipes-kernel/oprofile/oprofile/acinclude.m4 | 581 --------------------- .../oprofile/oprofile/automake-foreign.patch | 12 - meta/recipes-kernel/oprofile/oprofile/musl.patch | 46 -- .../oprofile/oprofile-cross-compile-tests.patch | 98 ---- .../oprofile/oprofile/root-home-dir.patch | 44 -- meta/recipes-kernel/oprofile/oprofile/run-ptest | 19 - meta/recipes-kernel/oprofile/oprofile_1.1.0.bb | 10 - 12 files changed, 958 deletions(-) delete mode 100644 meta/recipes-kernel/oprofile/oprofile.inc delete mode 100644 meta/recipes-kernel/oprofile/oprofile/0001-Add-rmb-definition-for-NIOS2-architecture.patch delete mode 100644 meta/recipes-kernel/oprofile/oprofile/0001-Fix-FTBFS-problem-with-GCC-6.patch delete mode 100644 meta/recipes-kernel/oprofile/oprofile/acinclude.m4 delete mode 100644 meta/recipes-kernel/oprofile/oprofile/automake-foreign.patch delete mode 100644 meta/recipes-kernel/oprofile/oprofile/musl.patch delete mode 100644 meta/recipes-kernel/oprofile/oprofile/oprofile-cross-compile-tests.patch delete mode 100644 meta/recipes-kernel/oprofile/oprofile/root-home-dir.patch delete mode 100644 meta/recipes-kernel/oprofile/oprofile/run-ptest delete mode 100644 meta/recipes-kernel/oprofile/oprofile_1.1.0.bbmeta/conf/distro/include/distro_alias.inc +0
-1@@ -278,7 +278,6 @@ DISTRO_PN_ALIAS_pn-opkg-collateral = "OE-Core" DISTRO_PN_ALIAS_pn-opkg-keyrings = "OSPDT upstream=git://git.yoctoproject.org/opkg-utils" DISTRO_PN_ALIAS_pn-opkg-nogpg = "OSPDT upstream=git://git.yoctoproject.org/opkg-utils" DISTRO_PN_ALIAS_pn-opkg-utils = "OSPDT upstream=git://git.yoctoproject.org/opkg-utils" -DISTRO_PN_ALIAS_pn-oprofile = "Debian=oprofile Fedora=oprofile" DISTRO_PN_ALIAS_pn-os-release = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-base = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-core = "OE-Core"meta/conf/layer.conf +0
-1@@ -63,7 +63,6 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ font-alias->font-util \ weston-init->weston \ weston-init->kbd \ - oprofile->virtual/kernel \ " # We need to keep bitbake tools in PATHmeta/recipes-kernel/oprofile/oprofile.inc deleted +0
-65@@ -1,65 +0,0 @@ -SUMMARY = "System-Wide Profiler" -DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \ -of profiling all running code at low overhead." -HOMEPAGE = "http://oprofile.sourceforge.net/news/" -BUGTRACKER = "http://sourceforge.net/tracker/?group_id=16191&atid=116191" - -LICENSE = "LGPLv2.1+ & GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://libopagent/opagent.h;beginline=5;endline=26;md5=4f16f72c7a493d8a4704aa18d03d15c6 \ - " -SECTION = "devel" - -DEPENDS = "popt binutils" -RDEPENDS_${PN} = "binutils-symlinks" -RRECOMMENDS_${PN} = "kernel-vmlinux" - -FILES_${PN} = "${bindir} ${libdir}/${BPN}/lib*${SOLIBS} ${datadir}/${BPN}" -FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/lib*.la" -FILES_${PN}-staticdev += "${libdir}/${BPN}/lib*.a" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ - file://acinclude.m4 \ - file://automake-foreign.patch \ - file://oprofile-cross-compile-tests.patch \ - file://run-ptest \ - file://root-home-dir.patch \ - file://0001-Add-rmb-definition-for-NIOS2-architecture.patch \ - file://0001-Fix-FTBFS-problem-with-GCC-6.patch \ -" -UPSTREAM_CHECK_REGEX = "oprofile-(?P<pver>\d+(\.\d+)+)/" -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/oprofile/files/oprofile/" - -SRC_URI_append_libc-musl = " file://musl.patch" - -inherit autotools pkgconfig ptest - -EXTRA_OECONF = "--with-kernel=${STAGING_DIR_HOST}${prefix} --without-x ac_cv_prog_XSLTPROC=" -do_configure () { - cp ${WORKDIR}/acinclude.m4 ${S}/ - autotools_do_configure -} - -EXTRA_OEMAKE = "SRCDIR=${PTEST_PATH}/libutil++/tests" -do_compile_ptest() { - oe_runmake check -} - -do_install_ptest() { - subdirs="libdb/tests libutil++/tests libregex/tests libutil/tests libop/tests libdb/tests " - for tooltest in ${subdirs} - do - find ${tooltest} -perm /u=x -type f| cpio -pvdu ${D}${PTEST_PATH} - done - - # needed by some libop tests - cp -r events ${D}${PTEST_PATH} - - # needed by libregex regex_test - cp libregex/stl.pat ${D}${PTEST_PATH}/libregex - cp libregex/tests/mangled-name ${D}${PTEST_PATH}/libregex/tests - - # needed by litutil++ file_manip_tests - cp ${S}/libutil++/tests/file_manip_tests.cpp \ - libutil++/tests/file_manip_tests.o ${D}${PTEST_PATH}/libutil++/tests -}meta/recipes-kernel/oprofile/oprofile/0001-Add-rmb-definition-for-NIOS2-architecture.patch deleted +0
-30@@ -1,30 +0,0 @@ -From 34b0d9b1a32fb404a30327a7ae8931c7c75583bf Mon Sep 17 00:00:00 2001 -From: Marek Vasut <[email protected]> -Date: Tue, 9 Feb 2016 02:00:29 +0100 -Subject: [PATCH] Add rmb() definition for NIOS2 architecture - -Signed-off-by: Marek Vasut <[email protected]> -Upstream-Status: Submitted [ http://marc.info/?l=oprofile-list&m=145501915931874&w=2 ] ---- - libperf_events/operf_utils.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libperf_events/operf_utils.h b/libperf_events/operf_utils.h -index 32954cc..8270e53 100644 ---- a/libperf_events/operf_utils.h -+++ b/libperf_events/operf_utils.h -@@ -178,6 +178,11 @@ void op_release_resources(void); - #define cpu_relax() asm volatile("" ::: "memory") - #endif - -+#ifdef __nios2__ -+#define rmb() asm volatile("" ::: "memory") -+#define cpu_relax() asm volatile("" ::: "memory") -+#endif -+ - #ifdef __tile__ - #include <asm/unistd.h> - #define rmb() __insn_mf() --- -2.7.0 -meta/recipes-kernel/oprofile/oprofile/0001-Fix-FTBFS-problem-with-GCC-6.patch deleted +0
-51@@ -1,51 +0,0 @@ -From 39d4d46a0bd504ac708ffe72df87bf74cd12ad30 Mon Sep 17 00:00:00 2001 -From: William Cohen <[email protected]> -Date: Fri, 5 Feb 2016 17:30:19 -0500 -Subject: [PATCH] Fix FTBFS problem with GCC-6 - -GCC-6 is pickier about some of the type conversions causing the Fedora -24 mass rebuild the build of oprofile failed with: - -make[3]: Entering directory '/builddir/build/BUILD/oprofile-1.1.0/libutil++' -g++ -DHAVE_CONFIG_H -I. -I.. -I ../libutil -I ../libop -I ../libpp -W -Wall -fno-common -ftemplate-depth-50 -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -m32 -march=i686 -mtune=atom -fasynchronous-unwind-tables -c -o op_bfd.o op_bfd.cpp -op_bfd.cpp: In member function 'void op_bfd::get_symbol_range(symbol_index_t, long long unsigned int&, long long unsigned int&) const': -op_bfd.cpp:538:47: error: cannot convert 'std::ostream {aka std::basic_ostream<char>}' to 'const bool' in initialization - bool const verbose = cverb << (vbfd & vlevel1); - ^ -op_bfd.cpp:546:7: error: in argument to unary ! - if (!verbose) - ^~~~~~~ - -Avoid the intermediate bool type to make GCC-6 happy. - -Signed-off-by: William Cohen <[email protected]> ---- -Upstream-Status: Backport - - libutil++/op_bfd.cpp | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/libutil++/op_bfd.cpp b/libutil++/op_bfd.cpp -index 389c920..f2eb42b 100644 ---- a/libutil++/op_bfd.cpp -+++ b/libutil++/op_bfd.cpp -@@ -535,15 +535,13 @@ void op_bfd::get_symbol_range(symbol_index_t sym_idx, - { - op_bfd_symbol const & sym = syms[sym_idx]; - -- bool const verbose = cverb << (vbfd & vlevel1); -- - if (anon_obj) - start = sym.vma(); - else - start = sym.filepos(); - end = start + sym.size(); - -- if (!verbose) -+ if (!(cverb << (vbfd & vlevel1))) - return; - - io_state state(cverb << (vbfd & vlevel1)); --- -1.9.1 -meta/recipes-kernel/oprofile/oprofile/acinclude.m4 deleted +0
-581@@ -1,581 +0,0 @@ -dnl AX_KERNEL_OPTION(option, action-if-found, action-if-not-found) -dnl see if autoconf.h defines the option -AC_DEFUN([AX_KERNEL_OPTION], [ -SAVE_CFLAGS=$CFLAGS -CFLAGS="-I$KINC -O2 -D__KERNEL__" -AC_TRY_COMPILE( [#include <linux/config.h>], -[ -#ifndef $1 -break_me_hard(\\\); -#endif -],[$2],[$3],) -CFLAGS=$SAVE_CFLAGS -]) - -dnl Handle the 2.4 module inside module/ -AC_DEFUN([AX_CONFIG_MODULE], -[ -if test ! -f $KINC/linux/autoconf.h; then - AC_MSG_ERROR([no suitably configured kernel include tree found]) -fi - -dnl --- Get Linux kernel version and compile parameters --- - -AC_SUBST(KVERS) -AC_MSG_CHECKING([for kernel version]) -dnl it's like this to handle mandrake's fubar version.h - bug #471448 -eval KVERS=`gcc -I$KINC -E -dM $KINC/linux/version.h | grep -w UTS_RELEASE | awk '{print $[]3}'` -AC_MSG_RESULT([$KVERS]) -case "$KVERS" in -2.2.*|2.4.*) ;; -*) AC_MSG_ERROR([Unsupported kernel version]) -esac - -dnl Check for the minimal kernel version supported -AC_MSG_CHECKING([kernel version]) -AX_KERNEL_VERSION(2, 2, 10, <=, AC_MSG_RESULT([ok]), AC_MSG_ERROR([check html documentation install section])) - -dnl linux/spinlock.h added at some point in past -AC_MSG_CHECKING([for $KINC/linux/spinlock.h]) -if test -f $KINC/linux/spinlock.h; then - EXTRA_CFLAGS_MODULE="$EXTRA_CFLAGS_MODULE -DHAVE_LINUX_SPINLOCK_HEADER" - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) -fi - -AC_MSG_CHECKING([for rtc_lock]) -gcc -I$KINC -E $KINC/linux/mc146818rtc.h | grep rtc_lock >/dev/null -if test "$?" -eq 0; then - EXTRA_CFLAGS_MODULE="$EXTRA_CFLAGS_MODULE -DRTC_LOCK" - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) -fi - -arch="unknown" -AC_MSG_CHECKING(for x86-64 architecture) -AX_KERNEL_OPTION(CONFIG_X86_64, x8664=1, x8664=0) -AX_MSG_RESULT_YN($x8664) -BUILD_HAMMER=no -if test "$x8664" -eq 1; then - arch="x86" - BUILD_HAMMER=yes -else - AC_MSG_CHECKING(for x86 architecture) - AX_KERNEL_OPTION(CONFIG_X86, x86=1, x86=0) - AX_KERNEL_OPTION(CONFIG_X86_WP_WORKS_OK, x86=1, x86=$x86) - AX_MSG_RESULT_YN($x86) - test "$x86" = 1 && arch="x86" - - if test "$arch" = "unknown"; then - AC_MSG_CHECKING(for ia64 architecture) - AX_KERNEL_OPTION(CONFIG_IA64, ia64=1, ia64=0) - AX_MSG_RESULT_YN($ia64) - test "$ia64" = 1 && arch="ia64" - fi - -fi -AC_SUBST(BUILD_HAMMER) - -test "$arch" = "unknown" && AC_MSG_ERROR(Unsupported architecture) - -dnl check to see if kernel verion appropriate for arch -AC_MSG_CHECKING(arch/kernel version combination) -case "$arch" in -ia64) - AX_KERNEL_VERSION(2, 4, 18, <, AC_MSG_RESULT([ok]), - AC_MSG_ERROR([unsupported arch/kernel])) ;; -*) AC_MSG_RESULT([ok]) -esac - -dnl for now we do not support PREEMPT patch -AC_MSG_CHECKING([for preempt patch]) -AX_KERNEL_OPTION(CONFIG_PREEMPT,preempt=1,preempt=0) -AX_MSG_RESULT_YN([$preempt]) -test "$preempt" = 0 || AC_MSG_ERROR([unsupported kernel configuration : CONFIG_PREEMPT]) - -AC_SUBST(KINC) - -MODINSTALLDIR=/lib/modules/$KVERS - -OPROFILE_MODULE_ARCH=$arch -AC_SUBST(OPROFILE_MODULE_ARCH) -] -) - -dnl AX_MSG_RESULT_YN(a) -dnl results "yes" iff a==1, "no" else -AC_DEFUN([AX_MSG_RESULT_YN], [x=no -test "x$1" = "x1" && x=yes -AC_MSG_RESULT($x)]) - -dnl AX_MALLOC_ATTRIBUTE - see if gcc will take __attribute__((malloc)) -AC_DEFUN([AX_MALLOC_ATTRIBUTE], -[ -AC_MSG_CHECKING([whether malloc attribute is understood]) -SAVE_CFLAGS=$CFLAGS -CFLAGS="-Werror $CFLAGS" -AC_TRY_COMPILE(,[ -void monkey() __attribute__((malloc)); -],AC_MSG_RESULT([yes]); AC_DEFINE(MALLOC_ATTRIBUTE_OK, 1, [whether malloc attribute is understood]), AC_MSG_RESULT([no])) -CFLAGS=$SAVE_CFLAGS -] -) - -dnl builtin_expect is used in module we can't add that in config.h -AC_DEFUN([AX_BUILTIN_EXPECT], -[ -AC_MSG_CHECKING([whether __builtin_expect is understood]) -SAVE_CFLAGS=$CFLAGS -CFLAGS="-Werror $CFLAGS" -AC_TRY_LINK(,[ -int i; -if (__builtin_expect(i, 0)) { } -], -AC_MSG_RESULT([yes]); EXTRA_CFLAGS_MODULE="$EXTRA_CFLAGS_MODULE -DEXPECT_OK", -AC_MSG_RESULT([no]);) -CFLAGS=$SAVE_CFLAGS -] -) - -dnl AX_EXTRA_DIRS - Let user specify extra dirs for include/libs -AC_DEFUN([AX_EXTRA_DIRS], -[ -AC_ARG_WITH(extra-includes, -[ --with-extra-includes=DIR add extra include paths], - use_extra_includes="$withval", - use_extra_includes=NO -) -if test -n "$use_extra_includes" && \ - test "$use_extra_includes" != "NO"; then - ac_save_ifs=$IFS - IFS=':' - for dir in $use_extra_includes; do - extra_includes="$extra_includes -I$dir" - done - IFS=$ac_save_ifs - CPPFLAGS="$CPPFLAGS $extra_includes" -fi - -AC_ARG_WITH(extra-libs, -[ --with-extra-libs=DIR add extra library paths], - use_extra_libs=$withval, - use_extra_libs=NO -) -if test -n "$use_extra_libs" && \ - test "$use_extra_libs" != "NO"; then - ac_save_ifs=$IFS - IFS=':' - for dir in $use_extra_libs; do - extra_libraries="$extra_libraries -L$dir" - done - IFS=$ac_save_ifs - LDFLAGS="$LDFLAGS $extra_libraries" -fi -] -) - -dnl AX_POPT_CONST - check popt prototype -AC_DEFUN([AX_POPT_CONST], -[ -AC_MSG_CHECKING([popt prototype]) -SAVE_CXXFLAGS=$CXXFLAGS -CXXFLAGS="-Werror $CXXFLAGS" -AC_TRY_COMPILE([#include <popt.h>], -[ -int c; char **v; -poptGetContext(0, c, v, 0, 0); -], -AC_MSG_RESULT([takes char **]);, -AC_MSG_RESULT([takes const char **]); AC_DEFINE(CONST_POPT, 1, [whether popt prototype takes a const char **])) -CXXFLAGS="$SAVE_CXXFLAGS" -] -) - -dnl AX_CHECK_SSTREAM - check if local sstream is needed to compile OK -AC_DEFUN([AX_CHECK_SSTREAM], -[ -AC_MSG_CHECKING([whether to use included sstream]) -AC_TRY_COMPILE([#include <sstream>], [], -AC_MSG_RESULT([no]);, -AC_MSG_RESULT([yes]); OP_CXXFLAGS="$OP_CXXFLAGS -I\${top_srcdir}/include") -] -) - -dnl AX_CHECK_TYPEDEF(typedef_name, type, action-if-true, action-if-false) -dnl exec action-if-true if typedef_name is a typedef to type else exec -dnl action-if-false -dnl currently work only with type typedef'ed in stddef.h -AC_DEFUN([AX_CHECK_TYPEDEF], [ -dnl AC_LANG_PUSH(C) not in autoconf 2.13 -AC_LANG_SAVE -AC_LANG_C -SAVE_CFLAGS=$CFLAGS -CFLAGS="-Werror $CFLAGS" - -AC_TRY_COMPILE( - [ - #include <stddef.h> - ], - [ - typedef void (*fct1)($1); - typedef void (*fct2)($2); - fct1 f1 = 0; - fct2 f2 = 0; - if (f1 == f2) {} - ], -[$3],[$4]) - -CFLAGS=$SAVE_CFLAGS -AC_LANG_RESTORE -]) - - -dnl AX_TYPEDEFED_NAME(typedef_name, candidate_list, var_name) -dnl set var_name to the typedef name of $1 which must be in canditate_list -dnl else produce a fatal error -AC_DEFUN([AX_TYPEDEFED_NAME], [ - AC_MSG_CHECKING([type of $1]) - for f in $2; do - AX_CHECK_TYPEDEF($1, $f, $3="$f", $3="") - if test -n "${$3}"; then - break - fi - done - if test -n "${$3}"; then - AC_MSG_RESULT([${$3}]) - else - AC_MSG_ERROR([not found]) - fi -]) - -dnl find a binary in the path -AC_DEFUN([QT_FIND_PATH], -[ - AC_MSG_CHECKING([for $1]) - AC_CACHE_VAL(qt_cv_path_$1, - [ - qt_cv_path_$1="NONE" - if test -n "$$2"; then - qt_cv_path_$1="$$2"; - else - dirs="$3" - qt_save_IFS=$IFS - IFS=':' - for dir in $PATH; do - dirs="$dirs $dir" - done - IFS=$qt_save_IFS - - for dir in $dirs; do - if test -x "$dir/$1"; then - if test -n "$5"; then - evalstr="$dir/$1 $5 2>&1 " - if eval $evalstr; then - qt_cv_path_$1="$dir/$1" - break - fi - else - qt_cv_path_$1="$dir/$1" - break - fi - fi - done - fi - ]) - - if test -z "$qt_cv_path_$1" || test "$qt_cv_path_$1" = "NONE"; then - AC_MSG_RESULT(not found) - $4 - else - AC_MSG_RESULT($qt_cv_path_$1) - $2=$qt_cv_path_$1 - fi -]) - -dnl Find the uic compiler on the path or in qt_cv_dir -AC_DEFUN([QT_FIND_UIC], -[ - QT_FIND_PATH(uic, ac_uic, $qt_cv_dir/bin) - if test -z "$ac_uic" -a "$FATAL" = 1; then - AC_MSG_ERROR([uic binary not found in \$PATH or $qt_cv_dir/bin !]) - fi -]) - -dnl Find the right moc in path/qt_cv_dir -AC_DEFUN([QT_FIND_MOC], -[ - QT_FIND_PATH(moc2, ac_moc2, $qt_cv_dir/bin) - QT_FIND_PATH(moc, ac_moc1, $qt_cv_dir/bin) - - if test -n "$ac_moc1" -a -n "$ac_moc2"; then - dnl found both. Prefer Qt3's if it exists else moc2 - $ac_moc1 -v 2>&1 | grep "Qt 3" >/dev/null - if test "$?" = 0; then - ac_moc=$ac_moc1; - else - ac_moc=$ac_moc2; - fi - else - if test -n "$ac_moc1"; then - ac_moc=$ac_moc1; - else - ac_moc=$ac_moc2; - fi - fi - - if test -z "$ac_moc" -a "$FATAL" = 1; then - AC_MSG_ERROR([moc binary not found in \$PATH or $qt_cv_dir/bin !]) - fi -]) - -dnl check a particular libname -AC_DEFUN([QT_TRY_LINK], -[ - SAVE_LIBS="$LIBS" - LIBS="$LIBS $1" - AC_TRY_LINK([ - #include <qglobal.h> - #include <qstring.h> - ], - [ - QString s("mangle_failure"); - #if (QT_VERSION < 221) - break_me_(\\\); - #endif - ], - qt_cv_libname=$1, - ) - LIBS="$SAVE_LIBS" -]) - -dnl check we can do a compile -AC_DEFUN([QT_CHECK_COMPILE], -[ - AC_MSG_CHECKING([for Qt library name]) - - AC_CACHE_VAL(qt_cv_libname, - [ - AC_LANG_CPLUSPLUS - SAVE_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS $QT_INCLUDES $QT_LDFLAGS" - - for libname in -lqt-mt -lqt3 -lqt2 -lqt; - do - QT_TRY_LINK($libname) - if test -n "$qt_cv_libname"; then - break; - fi - done - - CXXFLAGS=$SAVE_CXXFLAGS - ]) - - if test -z "$qt_cv_libname"; then - AC_MSG_RESULT([failed]) - if test "$FATAL" = 1 ; then - AC_MSG_ERROR([Cannot compile a simple Qt executable. Check you have the right \$QTDIR !]) - fi - else - AC_MSG_RESULT([$qt_cv_libname]) - fi -]) - -dnl get Qt version we're using -AC_DEFUN([QT_GET_VERSION], -[ - AC_CACHE_CHECK([Qt version],lyx_cv_qtversion, - [ - AC_LANG_CPLUSPLUS - SAVE_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $QT_INCLUDES" - - cat > conftest.$ac_ext <<EOF -#line __oline__ "configure" -#include "confdefs.h" -#include <qglobal.h> -"%%%"QT_VERSION_STR"%%%" -EOF - lyx_cv_qtversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \ - grep '^"%%%"' 2>/dev/null | \ - sed -e 's/"%%%"//g' -e 's/"//g'` - rm -f conftest.$ac_ext - CPPFLAGS=$SAVE_CPPFLAGS - ]) - - QT_VERSION=$lyx_cv_qtversion - AC_SUBST(QT_VERSION) -]) - -dnl start here -AC_DEFUN([QT_DO_IT_ALL], -[ - dnl Please leave this alone. I use this file in - dnl oprofile. - FATAL=0 - - AC_ARG_WITH(qt-dir, [ --with-qt-dir where the root of Qt is installed ], - [ qt_cv_dir=`eval echo "$withval"/` ]) - - AC_ARG_WITH(qt-includes, [ --with-qt-includes where the Qt includes are. ], - [ qt_cv_includes=`eval echo "$withval"` ]) - - AC_ARG_WITH(qt-libraries, [ --with-qt-libraries where the Qt library is installed.], - [ qt_cv_libraries=`eval echo "$withval"` ]) - - dnl pay attention to $QTDIR unless overridden - if test -z "$qt_cv_dir"; then - qt_cv_dir=$QTDIR - fi - - dnl derive inc/lib if needed - if test -n "$qt_cv_dir"; then - if test -z "$qt_cv_includes"; then - qt_cv_includes=$qt_cv_dir/include - fi - if test -z "$qt_cv_libraries"; then - qt_cv_libraries=$qt_cv_dir/lib - fi - fi - - dnl flags for compilation - QT_INCLUDES= - QT_LDFLAGS= - if test -n "$qt_cv_includes"; then - QT_INCLUDES="-I$qt_cv_includes" - fi - if test -n "$qt_cv_libraries"; then - QT_LDFLAGS="-L$qt_cv_libraries" - fi - AC_SUBST(QT_INCLUDES) - AC_SUBST(QT_LDFLAGS) - - QT_FIND_MOC - MOC=$ac_moc - AC_SUBST(MOC) - QT_FIND_UIC - UIC=$ac_uic - AC_SUBST(UIC) - - QT_CHECK_COMPILE - - QT_LIB=$qt_cv_libname; - AC_SUBST(QT_LIB) - - if test -n "$qt_cv_libname"; then - QT_GET_VERSION - fi -]) - -dnl AX_CXXFLAGS_OPTIONS(var-name, option) -dnl add option to var-name if $CXX support it. -AC_DEFUN([AX_CHECK_PRECOMPILED_HEADER], [ -AC_MSG_CHECKING([whether ${CXX} support precompiled header]) -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -SAVE_CXXFLAGS=$CXXFLAGS -dnl we consider than if -Winvalid-pch is accepted pch will works ... -CXXFLAGS=-Winvalid-pch -dnl but we don't want -Winvalid-pch else compilation will fail due -Werror and -dnl the fact than some pch will be invalid for the given compilation option -AC_TRY_COMPILE(,[;],AC_MSG_RESULT([yes]); $1="${$1} -include bits/stdc++.h", AC_MSG_RESULT([no])) -CXXFLAGS=$SAVE_CXXFLAGS -AC_LANG_RESTORE -]) - -dnl AX_CHECK_DOCBOOK -AC_DEFUN([AX_CHECK_DOCBOOK], [ -# It's just rude to go over the net to build -XSLTPROC_FLAGS=--nonet -DOCBOOK_ROOT= -if test ! -f /etc/xml/catalog; then - for i in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh /usr/share/sgml/docbook/xsl-stylesheets/; - do - if test -d "$i"; then - DOCBOOK_ROOT=$i - fi - done - - # Last resort - try net - if test -z "$DOCBOOK_ROOT"; then - XSLTPROC_FLAGS= - fi -else - XML_CATALOG=/etc/xml/catalog - CAT_ENTRY_START='<!--' - CAT_ENTRY_END='-->' -fi - -AC_CHECK_PROG(XSLTPROC,xsltproc,xsltproc,) -XSLTPROC_WORKS=no -if test -n "$XSLTPROC"; then - AC_MSG_CHECKING([whether xsltproc works]) - - if test -n "$XML_CATALOG"; then - DB_FILE="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl" - else - DB_FILE="$DOCBOOK_ROOT/docbook.xsl" - fi - - $XSLTPROC $XSLTPROC_FLAGS $DB_FILE >/dev/null 2>&1 << END -<?xml version="1.0" encoding='ISO-8859-1'?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> -<book id="test"> -</book> -END - if test "$?" = 0; then - XSLTPROC_WORKS=yes - fi - AC_MSG_RESULT($XSLTPROC_WORKS) -fi -AM_CONDITIONAL(have_xsltproc, test "$XSLTPROC_WORKS" = "yes") - -AC_SUBST(XML_CATALOG) -AC_SUBST(XSLTPROC_FLAGS) -AC_SUBST(DOCBOOK_ROOT) -AC_SUBST(CAT_ENTRY_START) -AC_SUBST(CAT_ENTRY_END) -]) - -dnl AX_CFLAGS_OPTIONS(var-name, option) -dnl add option to var-name if $CC support it. -AC_DEFUN([AX_CFLAGS_OPTION], [ -AC_MSG_CHECKING([whether ${CC} $2 is understood]) -AC_LANG_SAVE -AC_LANG_C -SAVE_CFLAGS=$CFLAGS -CFLAGS=$2 -AC_TRY_COMPILE(,[;],AC_MSG_RESULT([yes]); $1="${$1} $2",AC_MSG_RESULT([no])) -CFLAGS=$SAVE_CFLAGS -AC_LANG_RESTORE -]) - - -dnl AX_CXXFLAGS_OPTIONS(var-name, option) -dnl add option to var-name if $CXX support it. -AC_DEFUN([AX_CXXFLAGS_OPTION], [ -AC_MSG_CHECKING([whether ${CXX} $2 is understood]) -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -SAVE_CXXFLAGS=$CXXFLAGS -CXXFLAGS=$2 -AC_TRY_COMPILE(,[;],AC_MSG_RESULT([yes]); $1="${$1} $2",AC_MSG_RESULT([no])) -CXXFLAGS=$SAVE_CXXFLAGS -AC_LANG_RESTORE -]) - -dnl AX_COPY_IF_CHANGE(source, dest) -dnl copy source to dest if they don't compare equally or if dest doesn't exist -AC_DEFUN([AX_COPY_IF_CHANGE], [ -if test -r $2; then - if cmp $1 $2 > /dev/null; then - echo $2 is unchanged - else - cp -f $1 $2 - fi -else - cp -f $1 $2 -fi -]) -meta/recipes-kernel/oprofile/oprofile/automake-foreign.patch deleted +0
-12@@ -1,12 +0,0 @@ -oprofile doesn't want GNU-levels of automake strictness so tell it to be "foreign". - -Upstream-Status: Pending -Signed-off-by: Ross Burton <[email protected]> - -diff --git a/configure.ac b/configure.ac -index 5740585..cf6c316 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -16 +16 @@ AC_CONFIG_SRCDIR([libop/op_config.h]) --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign])meta/recipes-kernel/oprofile/oprofile/musl.patch deleted +0
-46@@ -1,46 +0,0 @@ -Fix glibc-isms so that oprofile builds with musl. - -Patch taken from openwrt (https://github.com/openwrt-mirror/openwrt/blob/master/package/devel/oprofile/patches/100-musl.patch) - -Upstream-Status: Pending -Signed-off-by: Ross Burton <[email protected]> - ---- a/pe_profiling/operf.cpp -+++ b/pe_profiling/operf.cpp -@@ -857,11 +857,14 @@ static int __delete_old_previous_sample_ - int tflag __attribute__((unused)), - struct FTW *ftwbuf __attribute__((unused))) - { -+ int err; -+ - if (remove(fpath)) { -+ err = errno; - perror("sample data removal error"); -- return FTW_STOP; -+ return err; - } else { -- return FTW_CONTINUE; -+ return 0; - } - } - -@@ -896,7 +899,7 @@ static void convert_sample_data(void) - return; - - if (!operf_options::append) { -- int flags = FTW_DEPTH | FTW_ACTIONRETVAL; -+ int flags = FTW_DEPTH; - errno = 0; - if (nftw(previous_sampledir.c_str(), __delete_old_previous_sample_data, 32, flags) !=0 && - errno != ENOENT) { ---- a/libop/op_events.c -+++ b/libop/op_events.c -@@ -83,7 +83,7 @@ static int parse_hex(char const * str) - static u64 parse_long_hex(char const * str) - { - u64 value; -- if (sscanf(str, "%Lx", &value) != 1) -+ if (sscanf(str, "0x%llx", &value) != 1) - parse_error("expected long hexadecimal value"); - - fflush(stderr);meta/recipes-kernel/oprofile/oprofile/oprofile-cross-compile-tests.patch deleted +0
-98@@ -1,98 +0,0 @@ -Prevent running check tests on host if cross compiling - -This patch enables running the 'make check' tests on the target -in a cross-compiled environment. If not cross-compiling, then 'make - check' builds and executes the tests; no change from this patch. -In a cross-compiling environment, the make variable CROSS_COMPILE is -set which bypasses assiging tests to the makekfile variable TESTS. -Since TESTS is empty, the 'make check' process never tries to run the -tests on the hosts. On the target, the tests must be run manually. - -Also, in the libutil++ tests, a makefile variable SRCDIR is passed into -the compilation phase, pointing to the runtime location of the test -'file-manip-tests'. The mechanism used for a host test, based on -'topdir' doesn't work. Instead, if CROSS_COMPILE is set, the -makefile takes the path of SRCDIR from the build environment and not -from an expression based on the host path 'topdir'. - -Upstream-Status: Pending - -Signed-off-by: Dave Lerner <[email protected]> - -diff --git a/configure.ac b/configure.ac -index 41ece64..ce5a16f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -392,6 +392,7 @@ AC_ARG_ENABLE(account-check, - enable_account_check=$enableval, enable_account_check=yes) - - AM_CONDITIONAL(CHECK_ACCOUNT, test "x$enable_account_check" = "xyes") -+AM_CONDITIONAL(CROSS_COMPILE, test "x$cross_compiling" = "xyes") - - AC_SUBST(OP_CFLAGS) - AC_SUBST(OP_CXXFLAGS) -diff --git a/libdb/tests/Makefile.am b/libdb/tests/Makefile.am -index 8a69003..d820090 100644 ---- a/libdb/tests/Makefile.am -+++ b/libdb/tests/Makefile.am -@@ -13,4 +13,6 @@ check_PROGRAMS = db_test - db_test_SOURCES = db_test.c - db_test_LDADD = ../libodb.a ../../libutil/libutil.a - -+if ! CROSS_COMPILE - TESTS = ${check_PROGRAMS} -+endif -diff --git a/libop/tests/Makefile.am b/libop/tests/Makefile.am -index 8a79eb5..6d417c4 100644 ---- a/libop/tests/Makefile.am -+++ b/libop/tests/Makefile.am -@@ -33,4 +33,6 @@ load_events_files_tests_LDADD = ${COMMON_LIBS} - mangle_tests_SOURCES = mangle_tests.c - mangle_tests_LDADD = ${COMMON_LIBS} - -+if ! CROSS_COMPILE - TESTS = ${check_PROGRAMS} utf8_checker.sh -+endif -diff --git a/libregex/tests/Makefile.am b/libregex/tests/Makefile.am -index 6f19838..1d176f9 100644 ---- a/libregex/tests/Makefile.am -+++ b/libregex/tests/Makefile.am -@@ -18,4 +18,6 @@ java_test_LDADD = \ - - EXTRA_DIST = mangled-name.in - -+if ! CROSS_COMPILE - TESTS = ${check_PROGRAMS} -+endif -diff --git a/libutil++/tests/Makefile.am b/libutil++/tests/Makefile.am -index 51af031..a01ea2d 100644 ---- a/libutil++/tests/Makefile.am -+++ b/libutil++/tests/Makefile.am -@@ -1,7 +1,9 @@ - - REALPATH= readlink -f - -+if ! CROSS_COMPILE - SRCDIR := $(shell $(REALPATH) $(topdir)/libutil++/tests/ ) -+endif - - AM_CPPFLAGS = \ - -I ${top_srcdir}/libutil++ -D SRCDIR="\"$(SRCDIR)/\"" @OP_CPPFLAGS@ -@@ -46,4 +48,6 @@ cached_value_tests_LDADD = ${COMMON_LIBS} - utility_tests_SOURCES = utility_tests.cpp - utility_tests_LDADD = ${COMMON_LIBS} - -+if ! CROSS_COMPILE - TESTS = ${check_PROGRAMS} -+endif -diff --git a/libutil/tests/Makefile.am b/libutil/tests/Makefile.am -index dfcd6ec..e8831b5 100644 ---- a/libutil/tests/Makefile.am -+++ b/libutil/tests/Makefile.am -@@ -12,4 +12,6 @@ file_tests_LDADD = ../libutil.a - string_tests_SOURCES = string_tests.c - string_tests_LDADD = ../libutil.a - -+if ! CROSS_COMPILE - TESTS = ${check_PROGRAMS} -+endifmeta/recipes-kernel/oprofile/oprofile/root-home-dir.patch deleted +0
-44@@ -1,44 +0,0 @@ -oprofile: Determine the root home directory dynamically - -This commit detects the root home directory dynamically with changes to -the oprofile gui app source. - -The commit replaces an earlier fix that detected and adjusted a -'non-standard' root home directory at build time. The advantage of this -patch is that the oprofile tools are adjusted to the current run-time -path to ~root, not the build time path. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Dave Lerner <[email protected]> - -Index: oprofile-1.0.0/doc/oprofile.html -=================================================================== ---- oprofile-1.0.0.orig/doc/oprofile.html 2014-11-03 17:55:31.511034857 +0000 -+++ oprofile-1.0.0/doc/oprofile.html 2014-11-03 17:57:26.415037988 +0000 -@@ -1563,8 +1563,8 @@ - <span class="emphasis"><em>must</em></span> stop it in a controlled manner in order to process - the profile data it has collected. Use <code class="code">kill -SIGINT <operf-PID></code> - for this purpose. It is recommended that when running <span class="command"><strong>operf</strong></span> -- with this option, your current working directory should be <code class="filename">/root</code> or a subdirectory -- of <code class="filename">/root</code> to avoid storing sample data files in locations accessible by regular users. -+ with this option, your current working directory should be <code class="filename">~root</code> or a subdirectory -+ of <code class="filename">~root</code> to avoid storing sample data files in locations accessible by regular users. - </p> - </dd> - <dt> -Index: oprofile-1.0.0/doc/oprofile.xml -=================================================================== ---- oprofile-1.0.0.orig/doc/oprofile.xml 2014-11-03 17:55:31.515034857 +0000 -+++ oprofile-1.0.0/doc/oprofile.xml 2014-11-03 17:58:03.719039005 +0000 -@@ -654,8 +654,8 @@ - <emphasis>must</emphasis> stop it in a controlled manner in order to process - the profile data it has collected. Use <code>kill -SIGINT <operf-PID></code> - for this purpose. It is recommended that when running <command>operf</command> -- with this option, your current working directory should be <filename>/root</filename> or a subdirectory -- of <filename>/root</filename> to avoid storing sample data files in locations accessible by regular users. -+ with this option, your current working directory should be <filename>~root</filename> or a subdirectory -+ of <filename>~root</filename> to avoid storing sample data files in locations accessible by regular users. - </para></listitem> - </varlistentry> - <varlistentry>meta/recipes-kernel/oprofile/oprofile/run-ptest deleted +0
-19@@ -1,19 +0,0 @@ -#!/bin/sh - -saved_dir=$PWD -for dir in */tests ; do - cd $dir - for atest in * ; do - if [ \( -x $atest \) -a \( -f $atest \) ] ; then - ./$atest > ${atest}.stdout 2> ${atest}.stderr - if [ $? = 0 ] ; then - echo "PASS: $dir $atest" - rm ${atest}.stdout ${atest}.stderr - else - echo "FAIL: ${dir}/${atest}" - fi - fi - done - cd $saved_dir -done -meta/recipes-kernel/oprofile/oprofile_1.1.0.bb deleted +0
-10@@ -1,10 +0,0 @@ -require oprofile.inc - -DEPENDS += "virtual/kernel" -DEPENDS_append_powerpc64 = " libpfm4" - -SRC_URI[md5sum] = "248c4c069f9476f427fa7195563f9867" -SRC_URI[sha256sum] = "cf759a6de1a6033d5dfc93bda129a9f2e128aecc4238cc657feb0801d1b0366c" - -S = "${WORKDIR}/oprofile-${PV}" -Signature · 7 lines
2.14.1 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [PATCH 01/50] oprofile: remove the recipe
Quoted 6 lines · Denys Dmytriyenko
Quoted 2 lines · Alexander Kanavin
Perf is the preferred solution, and oprofile is difficult to maintain against musl.
Can we consider moving it to meta-openembedded and maybe relaxing requirements, such as musl compatibility?
I think, if someone maintains it there, it should be fine. Since perf offers same
functionality and supports more machines and maintained better. We probably can maintain it in OE-Core.
Quoted 1,081 lines
Quoted 1,071 lines
Signed-off-by Alexander Kanavin <[email protected]>--- meta/conf/distro/include/distro_alias.inc | 1 - meta/conf/layer.conf | 1 - meta/recipes-kernel/oprofile/oprofile.inc | 65 --- ...Add-rmb-definition-for-NIOS2-architecture.patch | 30 -- .../0001-Fix-FTBFS-problem-with-GCC-6.patch | 51 -- meta/recipes-kernel/oprofile/oprofile/acinclude.m4 | 581 --------------------- .../oprofile/oprofile/automake-foreign.patch | 12 - meta/recipes-kernel/oprofile/oprofile/musl.patch | 46 -- .../oprofile/oprofile-cross-compile-tests.patch | 98 ---- .../oprofile/oprofile/root-home-dir.patch | 44 -- meta/recipes-kernel/oprofile/oprofile/run-ptest | 19 - meta/recipes-kernel/oprofile/oprofile_1.1.0.bb | 10 - 12 files changed, 958 deletions(-) delete mode 100644 meta/recipes-kernel/oprofile/oprofile.inc delete mode 100644 meta/recipes-kernel/oprofile/oprofile/0001-Add-rmb-definition-for-NIOS2-architecture.patch delete mode 100644 meta/recipes-kernel/oprofile/oprofile/0001-Fix-FTBFS-problem-with-GCC-6.patch delete mode 100644 meta/recipes-kernel/oprofile/oprofile/acinclude.m4 delete mode 100644 meta/recipes-kernel/oprofile/oprofile/automake-foreign.patch delete mode 100644 meta/recipes-kernel/oprofile/oprofile/musl.patch delete mode 100644 meta/recipes-kernel/oprofile/oprofile/oprofile-cross-compile-tests.patch delete mode 100644 meta/recipes-kernel/oprofile/oprofile/root-home-dir.patch delete mode 100644 meta/recipes-kernel/oprofile/oprofile/run-ptest delete mode 100644 meta/recipes-kernel/oprofile/oprofile_1.1.0.bbmeta/conf/distro/include/distro_alias.inc +0
-1@@ -278,7 +278,6 @@ DISTRO_PN_ALIAS_pn-opkg-collateral = "OE-Core" DISTRO_PN_ALIAS_pn-opkg-keyrings = "OSPDT upstream=git://git.yoctoproject.org/opkg-utils" DISTRO_PN_ALIAS_pn-opkg-nogpg = "OSPDT upstream=git://git.yoctoproject.org/opkg-utils" DISTRO_PN_ALIAS_pn-opkg-utils = "OSPDT upstream=git://git.yoctoproject.org/opkg-utils" -DISTRO_PN_ALIAS_pn-oprofile = "Debian=oprofile Fedora=oprofile" DISTRO_PN_ALIAS_pn-os-release = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-base = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-core = "OE-Core"meta/conf/layer.conf +0
-1@@ -63,7 +63,6 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ font-alias->font-util \ weston-init->weston \ weston-init->kbd \ - oprofile->virtual/kernel \ " # We need to keep bitbake tools in PATHmeta/recipes-kernel/oprofile/oprofile.inc deleted +0
-65@@ -1,65 +0,0 @@ -SUMMARY = "System-Wide Profiler" -DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \ -of profiling all running code at low overhead." -HOMEPAGE = "http://oprofile.sourceforge.net/news/" -BUGTRACKER = "http://sourceforge.net/tracker/?group_id=16191&atid=116191" - -LICENSE = "LGPLv2.1+ & GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://libopagent/opagent.h;beginline=5;endline=26;md5=4f16f72c7a493d8a4704aa18d03d15c6 \ - " -SECTION = "devel" - -DEPENDS = "popt binutils" -RDEPENDS_${PN} = "binutils-symlinks" -RRECOMMENDS_${PN} = "kernel-vmlinux" - -FILES_${PN} = "${bindir} ${libdir}/${BPN}/lib*${SOLIBS} ${datadir}/${BPN}" -FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/lib*.la" -FILES_${PN}-staticdev += "${libdir}/${BPN}/lib*.a" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ - file://acinclude.m4 \ - file://automake-foreign.patch \ - file://oprofile-cross-compile-tests.patch \ - file://run-ptest \ - file://root-home-dir.patch \ - file://0001-Add-rmb-definition-for-NIOS2-architecture.patch \ - file://0001-Fix-FTBFS-problem-with-GCC-6.patch \ -" -UPSTREAM_CHECK_REGEX = "oprofile-(?P<pver>\d+(\.\d+)+)/" -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/oprofile/files/oprofile/" - -SRC_URI_append_libc-musl = " file://musl.patch" - -inherit autotools pkgconfig ptest - -EXTRA_OECONF = "--with-kernel=${STAGING_DIR_HOST}${prefix} --without-x ac_cv_prog_XSLTPROC=" -do_configure () { - cp ${WORKDIR}/acinclude.m4 ${S}/ - autotools_do_configure -} - -EXTRA_OEMAKE = "SRCDIR=${PTEST_PATH}/libutil++/tests" -do_compile_ptest() { - oe_runmake check -} - -do_install_ptest() { - subdirs="libdb/tests libutil++/tests libregex/tests libutil/tests libop/tests libdb/tests " - for tooltest in ${subdirs} - do - find ${tooltest} -perm /u=x -type f| cpio -pvdu ${D}${PTEST_PATH} - done - - # needed by some libop tests - cp -r events ${D}${PTEST_PATH} - - # needed by libregex regex_test - cp libregex/stl.pat ${D}${PTEST_PATH}/libregex - cp libregex/tests/mangled-name ${D}${PTEST_PATH}/libregex/tests - - # needed by litutil++ file_manip_tests - cp ${S}/libutil++/tests/file_manip_tests.cpp \ - libutil++/tests/file_manip_tests.o ${D}${PTEST_PATH}/libutil++/tests -}meta/recipes-kernel/oprofile/oprofile/0001-Add-rmb-definition-for-NIOS2-architecture.patch deleted +0
-30@@ -1,30 +0,0 @@ -From 34b0d9b1a32fb404a30327a7ae8931c7c75583bf Mon Sep 17 00:00:00 2001 -From: Marek Vasut <[email protected]> -Date: Tue, 9 Feb 2016 02:00:29 +0100 -Subject: [PATCH] Add rmb() definition for NIOS2 architecture - -Signed-off-by: Marek Vasut <[email protected]> -Upstream-Status: Submitted [ http://marc.info/?l=oprofile-list&m=145501915931874&w=2 ] ---- - libperf_events/operf_utils.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libperf_events/operf_utils.h b/libperf_events/operf_utils.h -index 32954cc..8270e53 100644 ---- a/libperf_events/operf_utils.h -+++ b/libperf_events/operf_utils.h -@@ -178,6 +178,11 @@ void op_release_resources(void); - #define cpu_relax() asm volatile("" ::: "memory") - #endif - -+#ifdef __nios2__ -+#define rmb() asm volatile("" ::: "memory") -+#define cpu_relax() asm volatile("" ::: "memory") -+#endif -+ - #ifdef __tile__ - #include <asm/unistd.h> - #define rmb() __insn_mf() --- -2.7.0 -meta/recipes-kernel/oprofile/oprofile/0001-Fix-FTBFS-problem-with-GCC-6.patch deleted +0
-51@@ -1,51 +0,0 @@ -From 39d4d46a0bd504ac708ffe72df87bf74cd12ad30 Mon Sep 17 00:00:00 2001 -From: William Cohen <[email protected]> -Date: Fri, 5 Feb 2016 17:30:19 -0500 -Subject: [PATCH] Fix FTBFS problem with GCC-6 - -GCC-6 is pickier about some of the type conversions causing the Fedora -24 mass rebuild the build of oprofile failed with: - -make[3]: Entering directory '/builddir/build/BUILD/oprofile-1.1.0/libutil++' -g++ -DHAVE_CONFIG_H -I. -I.. -I ../libutil -I ../libop -I ../libpp -W -Wall -fno-common -ftemplate-depth-50 -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -m32 -march=i686 -mtune=atom -fasynchronous-unwind-tables -c -o op_bfd.o op_bfd.cpp -op_bfd.cpp: In member function 'void op_bfd::get_symbol_range(symbol_index_t, long long unsigned int&, long long unsigned int&) const': -op_bfd.cpp:538:47: error: cannot convert 'std::ostream {aka std::basic_ostream<char>}' to 'const bool' in initialization - bool const verbose = cverb << (vbfd & vlevel1); - ^ -op_bfd.cpp:546:7: error: in argument to unary ! - if (!verbose) - ^~~~~~~ - -Avoid the intermediate bool type to make GCC-6 happy. - -Signed-off-by: William Cohen <[email protected]> ---- -Upstream-Status: Backport - - libutil++/op_bfd.cpp | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/libutil++/op_bfd.cpp b/libutil++/op_bfd.cpp -index 389c920..f2eb42b 100644 ---- a/libutil++/op_bfd.cpp -+++ b/libutil++/op_bfd.cpp -@@ -535,15 +535,13 @@ void op_bfd::get_symbol_range(symbol_index_t sym_idx, - { - op_bfd_symbol const & sym = syms[sym_idx]; - -- bool const verbose = cverb << (vbfd & vlevel1); -- - if (anon_obj) - start = sym.vma(); - else - start = sym.filepos(); - end = start + sym.size(); - -- if (!verbose) -+ if (!(cverb << (vbfd & vlevel1))) - return; - - io_state state(cverb << (vbfd & vlevel1)); --- -1.9.1 -meta/recipes-kernel/oprofile/oprofile/acinclude.m4 deleted +0
-581@@ -1,581 +0,0 @@ -dnl AX_KERNEL_OPTION(option, action-if-found, action-if-not-found) -dnl see if autoconf.h defines the option -AC_DEFUN([AX_KERNEL_OPTION], [ -SAVE_CFLAGS=$CFLAGS -CFLAGS="-I$KINC -O2 -D__KERNEL__" -AC_TRY_COMPILE( [#include <linux/config.h>], -[ -#ifndef $1 -break_me_hard(\\\); -#endif -],[$2],[$3],) -CFLAGS=$SAVE_CFLAGS -]) - -dnl Handle the 2.4 module inside module/ -AC_DEFUN([AX_CONFIG_MODULE], -[ -if test ! -f $KINC/linux/autoconf.h; then - AC_MSG_ERROR([no suitably configured kernel include tree found]) -fi - -dnl --- Get Linux kernel version and compile parameters --- - -AC_SUBST(KVERS) -AC_MSG_CHECKING([for kernel version]) -dnl it's like this to handle mandrake's fubar version.h - bug #471448 -eval KVERS=`gcc -I$KINC -E -dM $KINC/linux/version.h | grep -w UTS_RELEASE | awk '{print $[]3}'` -AC_MSG_RESULT([$KVERS]) -case "$KVERS" in -2.2.*|2.4.*) ;; -*) AC_MSG_ERROR([Unsupported kernel version]) -esac - -dnl Check for the minimal kernel version supported -AC_MSG_CHECKING([kernel version]) -AX_KERNEL_VERSION(2, 2, 10, <=, AC_MSG_RESULT([ok]), AC_MSG_ERROR([check html documentation install section])) - -dnl linux/spinlock.h added at some point in past -AC_MSG_CHECKING([for $KINC/linux/spinlock.h]) -if test -f $KINC/linux/spinlock.h; then - EXTRA_CFLAGS_MODULE="$EXTRA_CFLAGS_MODULE -DHAVE_LINUX_SPINLOCK_HEADER" - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) -fi - -AC_MSG_CHECKING([for rtc_lock]) -gcc -I$KINC -E $KINC/linux/mc146818rtc.h | grep rtc_lock >/dev/null -if test "$?" -eq 0; then - EXTRA_CFLAGS_MODULE="$EXTRA_CFLAGS_MODULE -DRTC_LOCK" - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) -fi - -arch="unknown" -AC_MSG_CHECKING(for x86-64 architecture) -AX_KERNEL_OPTION(CONFIG_X86_64, x8664=1, x8664=0) -AX_MSG_RESULT_YN($x8664) -BUILD_HAMMER=no -if test "$x8664" -eq 1; then - arch="x86" - BUILD_HAMMER=yes -else - AC_MSG_CHECKING(for x86 architecture) - AX_KERNEL_OPTION(CONFIG_X86, x86=1, x86=0) - AX_KERNEL_OPTION(CONFIG_X86_WP_WORKS_OK, x86=1, x86=$x86) - AX_MSG_RESULT_YN($x86) - test "$x86" = 1 && arch="x86" - - if test "$arch" = "unknown"; then - AC_MSG_CHECKING(for ia64 architecture) - AX_KERNEL_OPTION(CONFIG_IA64, ia64=1, ia64=0) - AX_MSG_RESULT_YN($ia64) - test "$ia64" = 1 && arch="ia64" - fi - -fi -AC_SUBST(BUILD_HAMMER) - -test "$arch" = "unknown" && AC_MSG_ERROR(Unsupported architecture) - -dnl check to see if kernel verion appropriate for arch -AC_MSG_CHECKING(arch/kernel version combination) -case "$arch" in -ia64) - AX_KERNEL_VERSION(2, 4, 18, <, AC_MSG_RESULT([ok]), - AC_MSG_ERROR([unsupported arch/kernel])) ;; -*) AC_MSG_RESULT([ok]) -esac - -dnl for now we do not support PREEMPT patch -AC_MSG_CHECKING([for preempt patch]) -AX_KERNEL_OPTION(CONFIG_PREEMPT,preempt=1,preempt=0) -AX_MSG_RESULT_YN([$preempt]) -test "$preempt" = 0 || AC_MSG_ERROR([unsupported kernel configuration : CONFIG_PREEMPT]) - -AC_SUBST(KINC) - -MODINSTALLDIR=/lib/modules/$KVERS - -OPROFILE_MODULE_ARCH=$arch -AC_SUBST(OPROFILE_MODULE_ARCH) -] -) - -dnl AX_MSG_RESULT_YN(a) -dnl results "yes" iff a==1, "no" else -AC_DEFUN([AX_MSG_RESULT_YN], [x=no -test "x$1" = "x1" && x=yes -AC_MSG_RESULT($x)]) - -dnl AX_MALLOC_ATTRIBUTE - see if gcc will take __attribute__((malloc)) -AC_DEFUN([AX_MALLOC_ATTRIBUTE], -[ -AC_MSG_CHECKING([whether malloc attribute is understood]) -SAVE_CFLAGS=$CFLAGS -CFLAGS="-Werror $CFLAGS" -AC_TRY_COMPILE(,[ -void monkey() __attribute__((malloc)); -],AC_MSG_RESULT([yes]); AC_DEFINE(MALLOC_ATTRIBUTE_OK, 1, [whether malloc attribute is understood]), AC_MSG_RESULT([no])) -CFLAGS=$SAVE_CFLAGS -] -) - -dnl builtin_expect is used in module we can't add that in config.h -AC_DEFUN([AX_BUILTIN_EXPECT], -[ -AC_MSG_CHECKING([whether __builtin_expect is understood]) -SAVE_CFLAGS=$CFLAGS -CFLAGS="-Werror $CFLAGS" -AC_TRY_LINK(,[ -int i; -if (__builtin_expect(i, 0)) { } -], -AC_MSG_RESULT([yes]); EXTRA_CFLAGS_MODULE="$EXTRA_CFLAGS_MODULE -DEXPECT_OK", -AC_MSG_RESULT([no]);) -CFLAGS=$SAVE_CFLAGS -] -) - -dnl AX_EXTRA_DIRS - Let user specify extra dirs for include/libs -AC_DEFUN([AX_EXTRA_DIRS], -[ -AC_ARG_WITH(extra-includes, -[ --with-extra-includes=DIR add extra include paths], - use_extra_includes="$withval", - use_extra_includes=NO -) -if test -n "$use_extra_includes" && \ - test "$use_extra_includes" != "NO"; then - ac_save_ifs=$IFS - IFS=':' - for dir in $use_extra_includes; do - extra_includes="$extra_includes -I$dir" - done - IFS=$ac_save_ifs - CPPFLAGS="$CPPFLAGS $extra_includes" -fi - -AC_ARG_WITH(extra-libs, -[ --with-extra-libs=DIR add extra library paths], - use_extra_libs=$withval, - use_extra_libs=NO -) -if test -n "$use_extra_libs" && \ - test "$use_extra_libs" != "NO"; then - ac_save_ifs=$IFS - IFS=':' - for dir in $use_extra_libs; do - extra_libraries="$extra_libraries -L$dir" - done - IFS=$ac_save_ifs - LDFLAGS="$LDFLAGS $extra_libraries" -fi -] -) - -dnl AX_POPT_CONST - check popt prototype -AC_DEFUN([AX_POPT_CONST], -[ -AC_MSG_CHECKING([popt prototype]) -SAVE_CXXFLAGS=$CXXFLAGS -CXXFLAGS="-Werror $CXXFLAGS" -AC_TRY_COMPILE([#include <popt.h>], -[ -int c; char **v; -poptGetContext(0, c, v, 0, 0); -], -AC_MSG_RESULT([takes char **]);, -AC_MSG_RESULT([takes const char **]); AC_DEFINE(CONST_POPT, 1, [whether popt prototype takes a const char **])) -CXXFLAGS="$SAVE_CXXFLAGS" -] -) - -dnl AX_CHECK_SSTREAM - check if local sstream is needed to compile OK -AC_DEFUN([AX_CHECK_SSTREAM], -[ -AC_MSG_CHECKING([whether to use included sstream]) -AC_TRY_COMPILE([#include <sstream>], [], -AC_MSG_RESULT([no]);, -AC_MSG_RESULT([yes]); OP_CXXFLAGS="$OP_CXXFLAGS -I\${top_srcdir}/include") -] -) - -dnl AX_CHECK_TYPEDEF(typedef_name, type, action-if-true, action-if-false) -dnl exec action-if-true if typedef_name is a typedef to type else exec -dnl action-if-false -dnl currently work only with type typedef'ed in stddef.h -AC_DEFUN([AX_CHECK_TYPEDEF], [ -dnl AC_LANG_PUSH(C) not in autoconf 2.13 -AC_LANG_SAVE -AC_LANG_C -SAVE_CFLAGS=$CFLAGS -CFLAGS="-Werror $CFLAGS" - -AC_TRY_COMPILE( - [ - #include <stddef.h> - ], - [ - typedef void (*fct1)($1); - typedef void (*fct2)($2); - fct1 f1 = 0; - fct2 f2 = 0; - if (f1 == f2) {} - ], -[$3],[$4]) - -CFLAGS=$SAVE_CFLAGS -AC_LANG_RESTORE -]) - - -dnl AX_TYPEDEFED_NAME(typedef_name, candidate_list, var_name) -dnl set var_name to the typedef name of $1 which must be in canditate_list -dnl else produce a fatal error -AC_DEFUN([AX_TYPEDEFED_NAME], [ - AC_MSG_CHECKING([type of $1]) - for f in $2; do - AX_CHECK_TYPEDEF($1, $f, $3="$f", $3="") - if test -n "${$3}"; then - break - fi - done - if test -n "${$3}"; then - AC_MSG_RESULT([${$3}]) - else - AC_MSG_ERROR([not found]) - fi -]) - -dnl find a binary in the path -AC_DEFUN([QT_FIND_PATH], -[ - AC_MSG_CHECKING([for $1]) - AC_CACHE_VAL(qt_cv_path_$1, - [ - qt_cv_path_$1="NONE" - if test -n "$$2"; then - qt_cv_path_$1="$$2"; - else - dirs="$3" - qt_save_IFS=$IFS - IFS=':' - for dir in $PATH; do - dirs="$dirs $dir" - done - IFS=$qt_save_IFS - - for dir in $dirs; do - if test -x "$dir/$1"; then - if test -n "$5"; then - evalstr="$dir/$1 $5 2>&1 " - if eval $evalstr; then - qt_cv_path_$1="$dir/$1" - break - fi - else - qt_cv_path_$1="$dir/$1" - break - fi - fi - done - fi - ]) - - if test -z "$qt_cv_path_$1" || test "$qt_cv_path_$1" = "NONE"; then - AC_MSG_RESULT(not found) - $4 - else - AC_MSG_RESULT($qt_cv_path_$1) - $2=$qt_cv_path_$1 - fi -]) - -dnl Find the uic compiler on the path or in qt_cv_dir -AC_DEFUN([QT_FIND_UIC], -[ - QT_FIND_PATH(uic, ac_uic, $qt_cv_dir/bin) - if test -z "$ac_uic" -a "$FATAL" = 1; then - AC_MSG_ERROR([uic binary not found in \$PATH or $qt_cv_dir/bin !]) - fi -]) - -dnl Find the right moc in path/qt_cv_dir -AC_DEFUN([QT_FIND_MOC], -[ - QT_FIND_PATH(moc2, ac_moc2, $qt_cv_dir/bin) - QT_FIND_PATH(moc, ac_moc1, $qt_cv_dir/bin) - - if test -n "$ac_moc1" -a -n "$ac_moc2"; then - dnl found both. Prefer Qt3's if it exists else moc2 - $ac_moc1 -v 2>&1 | grep "Qt 3" >/dev/null - if test "$?" = 0; then - ac_moc=$ac_moc1; - else - ac_moc=$ac_moc2; - fi - else - if test -n "$ac_moc1"; then - ac_moc=$ac_moc1; - else - ac_moc=$ac_moc2; - fi - fi - - if test -z "$ac_moc" -a "$FATAL" = 1; then - AC_MSG_ERROR([moc binary not found in \$PATH or $qt_cv_dir/bin !]) - fi -]) - -dnl check a particular libname -AC_DEFUN([QT_TRY_LINK], -[ - SAVE_LIBS="$LIBS" - LIBS="$LIBS $1" - AC_TRY_LINK([ - #include <qglobal.h> - #include <qstring.h> - ], - [ - QString s("mangle_failure"); - #if (QT_VERSION < 221) - break_me_(\\\); - #endif - ], - qt_cv_libname=$1, - ) - LIBS="$SAVE_LIBS" -]) - -dnl check we can do a compile -AC_DEFUN([QT_CHECK_COMPILE], -[ - AC_MSG_CHECKING([for Qt library name]) - - AC_CACHE_VAL(qt_cv_libname, - [ - AC_LANG_CPLUSPLUS - SAVE_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS $QT_INCLUDES $QT_LDFLAGS" - - for libname in -lqt-mt -lqt3 -lqt2 -lqt; - do - QT_TRY_LINK($libname) - if test -n "$qt_cv_libname"; then - break; - fi - done - - CXXFLAGS=$SAVE_CXXFLAGS - ]) - - if test -z "$qt_cv_libname"; then - AC_MSG_RESULT([failed]) - if test "$FATAL" = 1 ; then - AC_MSG_ERROR([Cannot compile a simple Qt executable. Check you have the right \$QTDIR !]) - fi - else - AC_MSG_RESULT([$qt_cv_libname]) - fi -]) - -dnl get Qt version we're using -AC_DEFUN([QT_GET_VERSION], -[ - AC_CACHE_CHECK([Qt version],lyx_cv_qtversion, - [ - AC_LANG_CPLUSPLUS - SAVE_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $QT_INCLUDES" - - cat > conftest.$ac_ext <<EOF -#line __oline__ "configure" -#include "confdefs.h" -#include <qglobal.h> -"%%%"QT_VERSION_STR"%%%" -EOF - lyx_cv_qtversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \ - grep '^"%%%"' 2>/dev/null | \ - sed -e 's/"%%%"//g' -e 's/"//g'` - rm -f conftest.$ac_ext - CPPFLAGS=$SAVE_CPPFLAGS - ]) - - QT_VERSION=$lyx_cv_qtversion - AC_SUBST(QT_VERSION) -]) - -dnl start here -AC_DEFUN([QT_DO_IT_ALL], -[ - dnl Please leave this alone. I use this file in - dnl oprofile. - FATAL=0 - - AC_ARG_WITH(qt-dir, [ --with-qt-dir where the root of Qt is installed ], - [ qt_cv_dir=`eval echo "$withval"/` ]) - - AC_ARG_WITH(qt-includes, [ --with-qt-includes where the Qt includes are. ], - [ qt_cv_includes=`eval echo "$withval"` ]) - - AC_ARG_WITH(qt-libraries, [ --with-qt-libraries where the Qt library is installed.], - [ qt_cv_libraries=`eval echo "$withval"` ]) - - dnl pay attention to $QTDIR unless overridden - if test -z "$qt_cv_dir"; then - qt_cv_dir=$QTDIR - fi - - dnl derive inc/lib if needed - if test -n "$qt_cv_dir"; then - if test -z "$qt_cv_includes"; then - qt_cv_includes=$qt_cv_dir/include - fi - if test -z "$qt_cv_libraries"; then - qt_cv_libraries=$qt_cv_dir/lib - fi - fi - - dnl flags for compilation - QT_INCLUDES= - QT_LDFLAGS= - if test -n "$qt_cv_includes"; then - QT_INCLUDES="-I$qt_cv_includes" - fi - if test -n "$qt_cv_libraries"; then - QT_LDFLAGS="-L$qt_cv_libraries" - fi - AC_SUBST(QT_INCLUDES) - AC_SUBST(QT_LDFLAGS) - - QT_FIND_MOC - MOC=$ac_moc - AC_SUBST(MOC) - QT_FIND_UIC - UIC=$ac_uic - AC_SUBST(UIC) - - QT_CHECK_COMPILE - - QT_LIB=$qt_cv_libname; - AC_SUBST(QT_LIB) - - if test -n "$qt_cv_libname"; then - QT_GET_VERSION - fi -]) - -dnl AX_CXXFLAGS_OPTIONS(var-name, option) -dnl add option to var-name if $CXX support it. -AC_DEFUN([AX_CHECK_PRECOMPILED_HEADER], [ -AC_MSG_CHECKING([whether ${CXX} support precompiled header]) -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -SAVE_CXXFLAGS=$CXXFLAGS -dnl we consider than if -Winvalid-pch is accepted pch will works ... -CXXFLAGS=-Winvalid-pch -dnl but we don't want -Winvalid-pch else compilation will fail due -Werror and -dnl the fact than some pch will be invalid for the given compilation option -AC_TRY_COMPILE(,[;],AC_MSG_RESULT([yes]); $1="${$1} -include bits/stdc++.h", AC_MSG_RESULT([no])) -CXXFLAGS=$SAVE_CXXFLAGS -AC_LANG_RESTORE -]) - -dnl AX_CHECK_DOCBOOK -AC_DEFUN([AX_CHECK_DOCBOOK], [ -# It's just rude to go over the net to build -XSLTPROC_FLAGS=--nonet -DOCBOOK_ROOT= -if test ! -f /etc/xml/catalog; then - for i in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh /usr/share/sgml/docbook/xsl-stylesheets/; - do - if test -d "$i"; then - DOCBOOK_ROOT=$i - fi - done - - # Last resort - try net - if test -z "$DOCBOOK_ROOT"; then - XSLTPROC_FLAGS= - fi -else - XML_CATALOG=/etc/xml/catalog - CAT_ENTRY_START='<!--' - CAT_ENTRY_END='-->' -fi - -AC_CHECK_PROG(XSLTPROC,xsltproc,xsltproc,) -XSLTPROC_WORKS=no -if test -n "$XSLTPROC"; then - AC_MSG_CHECKING([whether xsltproc works]) - - if test -n "$XML_CATALOG"; then - DB_FILE="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl" - else - DB_FILE="$DOCBOOK_ROOT/docbook.xsl" - fi - - $XSLTPROC $XSLTPROC_FLAGS $DB_FILE >/dev/null 2>&1 << END -<?xml version="1.0" encoding='ISO-8859-1'?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> -<book id="test"> -</book> -END - if test "$?" = 0; then - XSLTPROC_WORKS=yes - fi - AC_MSG_RESULT($XSLTPROC_WORKS) -fi -AM_CONDITIONAL(have_xsltproc, test "$XSLTPROC_WORKS" = "yes") - -AC_SUBST(XML_CATALOG) -AC_SUBST(XSLTPROC_FLAGS) -AC_SUBST(DOCBOOK_ROOT) -AC_SUBST(CAT_ENTRY_START) -AC_SUBST(CAT_ENTRY_END) -]) - -dnl AX_CFLAGS_OPTIONS(var-name, option) -dnl add option to var-name if $CC support it. -AC_DEFUN([AX_CFLAGS_OPTION], [ -AC_MSG_CHECKING([whether ${CC} $2 is understood]) -AC_LANG_SAVE -AC_LANG_C -SAVE_CFLAGS=$CFLAGS -CFLAGS=$2 -AC_TRY_COMPILE(,[;],AC_MSG_RESULT([yes]); $1="${$1} $2",AC_MSG_RESULT([no])) -CFLAGS=$SAVE_CFLAGS -AC_LANG_RESTORE -]) - - -dnl AX_CXXFLAGS_OPTIONS(var-name, option) -dnl add option to var-name if $CXX support it. -AC_DEFUN([AX_CXXFLAGS_OPTION], [ -AC_MSG_CHECKING([whether ${CXX} $2 is understood]) -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -SAVE_CXXFLAGS=$CXXFLAGS -CXXFLAGS=$2 -AC_TRY_COMPILE(,[;],AC_MSG_RESULT([yes]); $1="${$1} $2",AC_MSG_RESULT([no])) -CXXFLAGS=$SAVE_CXXFLAGS -AC_LANG_RESTORE -]) - -dnl AX_COPY_IF_CHANGE(source, dest) -dnl copy source to dest if they don't compare equally or if dest doesn't exist -AC_DEFUN([AX_COPY_IF_CHANGE], [ -if test -r $2; then - if cmp $1 $2 > /dev/null; then - echo $2 is unchanged - else - cp -f $1 $2 - fi -else - cp -f $1 $2 -fi -]) -meta/recipes-kernel/oprofile/oprofile/automake-foreign.patch deleted +0
-12@@ -1,12 +0,0 @@ -oprofile doesn't want GNU-levels of automake strictness so tell it to be "foreign". - -Upstream-Status: Pending -Signed-off-by: Ross Burton <[email protected]> - -diff --git a/configure.ac b/configure.ac -index 5740585..cf6c316 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -16 +16 @@ AC_CONFIG_SRCDIR([libop/op_config.h]) --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign])meta/recipes-kernel/oprofile/oprofile/musl.patch deleted +0
-46@@ -1,46 +0,0 @@ -Fix glibc-isms so that oprofile builds with musl. - -Patch taken from openwrt (https://github.com/openwrt-mirror/openwrt/blob/master/package/devel/oprofile/patches/100-musl.patch) - -Upstream-Status: Pending -Signed-off-by: Ross Burton <[email protected]> - ---- a/pe_profiling/operf.cpp -+++ b/pe_profiling/operf.cpp -@@ -857,11 +857,14 @@ static int __delete_old_previous_sample_ - int tflag __attribute__((unused)), - struct FTW *ftwbuf __attribute__((unused))) - { -+ int err; -+ - if (remove(fpath)) { -+ err = errno; - perror("sample data removal error"); -- return FTW_STOP; -+ return err; - } else { -- return FTW_CONTINUE; -+ return 0; - } - } - -@@ -896,7 +899,7 @@ static void convert_sample_data(void) - return; - - if (!operf_options::append) { -- int flags = FTW_DEPTH | FTW_ACTIONRETVAL; -+ int flags = FTW_DEPTH; - errno = 0; - if (nftw(previous_sampledir.c_str(), __delete_old_previous_sample_data, 32, flags) !=0 && - errno != ENOENT) { ---- a/libop/op_events.c -+++ b/libop/op_events.c -@@ -83,7 +83,7 @@ static int parse_hex(char const * str) - static u64 parse_long_hex(char const * str) - { - u64 value; -- if (sscanf(str, "%Lx", &value) != 1) -+ if (sscanf(str, "0x%llx", &value) != 1) - parse_error("expected long hexadecimal value"); - - fflush(stderr);meta/recipes-kernel/oprofile/oprofile/oprofile-cross-compile-tests.patch deleted +0
-98@@ -1,98 +0,0 @@ -Prevent running check tests on host if cross compiling - -This patch enables running the 'make check' tests on the target -in a cross-compiled environment. If not cross-compiling, then 'make - check' builds and executes the tests; no change from this patch. -In a cross-compiling environment, the make variable CROSS_COMPILE is -set which bypasses assiging tests to the makekfile variable TESTS. -Since TESTS is empty, the 'make check' process never tries to run the -tests on the hosts. On the target, the tests must be run manually. - -Also, in the libutil++ tests, a makefile variable SRCDIR is passed into -the compilation phase, pointing to the runtime location of the test -'file-manip-tests'. The mechanism used for a host test, based on -'topdir' doesn't work. Instead, if CROSS_COMPILE is set, the -makefile takes the path of SRCDIR from the build environment and not -from an expression based on the host path 'topdir'. - -Upstream-Status: Pending - -Signed-off-by: Dave Lerner <[email protected]> - -diff --git a/configure.ac b/configure.ac -index 41ece64..ce5a16f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -392,6 +392,7 @@ AC_ARG_ENABLE(account-check, - enable_account_check=$enableval, enable_account_check=yes) - - AM_CONDITIONAL(CHECK_ACCOUNT, test "x$enable_account_check" = "xyes") -+AM_CONDITIONAL(CROSS_COMPILE, test "x$cross_compiling" = "xyes") - - AC_SUBST(OP_CFLAGS) - AC_SUBST(OP_CXXFLAGS) -diff --git a/libdb/tests/Makefile.am b/libdb/tests/Makefile.am -index 8a69003..d820090 100644 ---- a/libdb/tests/Makefile.am -+++ b/libdb/tests/Makefile.am -@@ -13,4 +13,6 @@ check_PROGRAMS = db_test - db_test_SOURCES = db_test.c - db_test_LDADD = ../libodb.a ../../libutil/libutil.a - -+if ! CROSS_COMPILE - TESTS = ${check_PROGRAMS} -+endif -diff --git a/libop/tests/Makefile.am b/libop/tests/Makefile.am -index 8a79eb5..6d417c4 100644 ---- a/libop/tests/Makefile.am -+++ b/libop/tests/Makefile.am -@@ -33,4 +33,6 @@ load_events_files_tests_LDADD = ${COMMON_LIBS} - mangle_tests_SOURCES = mangle_tests.c - mangle_tests_LDADD = ${COMMON_LIBS} - -+if ! CROSS_COMPILE - TESTS = ${check_PROGRAMS} utf8_checker.sh -+endif -diff --git a/libregex/tests/Makefile.am b/libregex/tests/Makefile.am -index 6f19838..1d176f9 100644 ---- a/libregex/tests/Makefile.am -+++ b/libregex/tests/Makefile.am -@@ -18,4 +18,6 @@ java_test_LDADD = \ - - EXTRA_DIST = mangled-name.in - -+if ! CROSS_COMPILE - TESTS = ${check_PROGRAMS} -+endif -diff --git a/libutil++/tests/Makefile.am b/libutil++/tests/Makefile.am -index 51af031..a01ea2d 100644 ---- a/libutil++/tests/Makefile.am -+++ b/libutil++/tests/Makefile.am -@@ -1,7 +1,9 @@ - - REALPATH= readlink -f - -+if ! CROSS_COMPILE - SRCDIR := $(shell $(REALPATH) $(topdir)/libutil++/tests/ ) -+endif - - AM_CPPFLAGS = \ - -I ${top_srcdir}/libutil++ -D SRCDIR="\"$(SRCDIR)/\"" @OP_CPPFLAGS@ -@@ -46,4 +48,6 @@ cached_value_tests_LDADD = ${COMMON_LIBS} - utility_tests_SOURCES = utility_tests.cpp - utility_tests_LDADD = ${COMMON_LIBS} - -+if ! CROSS_COMPILE - TESTS = ${check_PROGRAMS} -+endif -diff --git a/libutil/tests/Makefile.am b/libutil/tests/Makefile.am -index dfcd6ec..e8831b5 100644 ---- a/libutil/tests/Makefile.am -+++ b/libutil/tests/Makefile.am -@@ -12,4 +12,6 @@ file_tests_LDADD = ../libutil.a - string_tests_SOURCES = string_tests.c - string_tests_LDADD = ../libutil.a - -+if ! CROSS_COMPILE - TESTS = ${check_PROGRAMS} -+endifmeta/recipes-kernel/oprofile/oprofile/root-home-dir.patch deleted +0
-44@@ -1,44 +0,0 @@ -oprofile: Determine the root home directory dynamically - -This commit detects the root home directory dynamically with changes to -the oprofile gui app source. - -The commit replaces an earlier fix that detected and adjusted a -'non-standard' root home directory at build time. The advantage of this -patch is that the oprofile tools are adjusted to the current run-time -path to ~root, not the build time path. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Dave Lerner <[email protected]> - -Index: oprofile-1.0.0/doc/oprofile.html -=================================================================== ---- oprofile-1.0.0.orig/doc/oprofile.html 2014-11-03 17:55:31.511034857 +0000 -+++ oprofile-1.0.0/doc/oprofile.html 2014-11-03 17:57:26.415037988 +0000 -@@ -1563,8 +1563,8 @@ - <span class="emphasis"><em>must</em></span> stop it in a controlled manner in order to process - the profile data it has collected. Use <code class="code">kill -SIGINT <operf-PID></code> - for this purpose. It is recommended that when running <span class="command"><strong>operf</strong></span> -- with this option, your current working directory should be <code class="filename">/root</code> or a subdirectory -- of <code class="filename">/root</code> to avoid storing sample data files in locations accessible by regular users. -+ with this option, your current working directory should be <code class="filename">~root</code> or a subdirectory -+ of <code class="filename">~root</code> to avoid storing sample data files in locations accessible by regular users. - </p> - </dd> - <dt> -Index: oprofile-1.0.0/doc/oprofile.xml -=================================================================== ---- oprofile-1.0.0.orig/doc/oprofile.xml 2014-11-03 17:55:31.515034857 +0000 -+++ oprofile-1.0.0/doc/oprofile.xml 2014-11-03 17:58:03.719039005 +0000 -@@ -654,8 +654,8 @@ - <emphasis>must</emphasis> stop it in a controlled manner in order to process - the profile data it has collected. Use <code>kill -SIGINT <operf-PID></code> - for this purpose. It is recommended that when running <command>operf</command> -- with this option, your current working directory should be <filename>/root</filename> or a subdirectory -- of <filename>/root</filename> to avoid storing sample data files in locations accessible by regular users. -+ with this option, your current working directory should be <filename>~root</filename> or a subdirectory -+ of <filename>~root</filename> to avoid storing sample data files in locations accessible by regular users. - </para></listitem> - </varlistentry> - <varlistentry>meta/recipes-kernel/oprofile/oprofile/run-ptest deleted +0
-19@@ -1,19 +0,0 @@ -#!/bin/sh - -saved_dir=$PWD -for dir in */tests ; do - cd $dir - for atest in * ; do - if [ \( -x $atest \) -a \( -f $atest \) ] ; then - ./$atest > ${atest}.stdout 2> ${atest}.stderr - if [ $? = 0 ] ; then - echo "PASS: $dir $atest" - rm ${atest}.stdout ${atest}.stderr - else - echo "FAIL: ${dir}/${atest}" - fi - fi - done - cd $saved_dir -done -meta/recipes-kernel/oprofile/oprofile_1.1.0.bb deleted +0
-11@@ -1,10 +0,0 @@ -require oprofile.inc - -DEPENDS += "virtual/kernel" -DEPENDS_append_powerpc64 = " libpfm4" - -SRC_URI[md5sum] = "248c4c069f9476f427fa7195563f9867" -SRC_URI[sha256sum] = "cf759a6de1a6033d5dfc93bda129a9f2e128aecc4238cc657feb0801d1b0366c" - -S = "${WORKDIR}/oprofile-${PV}" - --2.14.1
Quoted 5 lines
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [PATCH 26/50] webkitgtk: update to 2.18.0
In reply to Alexander KanavinQuoted 33 lines · Alexander Kanavin
gcc7.patch, musl-fixes.patch, and ppc-musl-fix.patch all change code that is no longer present in upstream tree. However, a patch with different musl fixes has been added.
The rest of the patches are rebased to the new tree.
Libtasn is a new dependency.
Signed-off-by Alexander Kanavin <[email protected]>--- .../webkitgtk/0001-Fix-build-with-musl.patch | 77 +++++++++ ...ix-racy-parallel-build-of-WebKit2-4.0.gir.patch | 23 +-- ...c-settings-so-that-gtkdoc-generation-work.patch | 21 +-- ...bKitMacros-Append-to-I-and-not-to-isystem.patch | 182 ++++++++------------- ...ng-introspection-files-add-CMAKE_C_FLAGS-.patch | 24 +-- .../detect-atomics-during-configure.patch | 26 ++- meta/recipes-sato/webkit/webkitgtk/gcc7.patch | 23 --- .../recipes-sato/webkit/webkitgtk/musl-fixes.patch | 48 ------ .../webkit/webkitgtk/ppc-musl-fix.patch | 26 --- .../{webkitgtk_2.16.6.bb => webkitgtk_2.18.0.bb} | 10 +- 10 files changed, 206 insertions(+), 254 deletions(-) create mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch delete mode 100644 meta/recipes-sato/webkit/webkitgtk/gcc7.patch delete mode 100644 meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch delete mode 100644 meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch rename meta/recipes-sato/webkit/{webkitgtk_2.16.6.bb => webkitgtk_2.18.0.bb} (94%)meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch new file +0
-0
meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch line 6
Quoted 6 lines
meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch new file +6
-0@@ -0,0 +1,77 @@ +From 415e31bd5444fa360af58b069f1b9db6607fca7d Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Fri, 6 Oct 2017 17:00:08 +0300 +Subject: [PATCH] Fix build with musl + +Upstream-Status: Inappropriate [needs to use musl-specific defines to be upstreamable]
I think using __GLIBC__ is sub optimal here. So this change should be upstreamable.
Quoted 55 lines
meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch new file +55
-0+Signed-off-by: Alexander Kanavin <[email protected]> +--- + Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++----- + Source/WTF/wtf/Platform.h | 2 +- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h +index 95080b9..2bb689c 100644 +--- a/Source/JavaScriptCore/runtime/MachineContext.h ++++ b/Source/JavaScriptCore/runtime/MachineContext.h +@@ -146,7 +146,7 @@ inline void*& stackPointer(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) + + #if CPU(X86) + return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]); +@@ -251,7 +251,7 @@ inline void*& framePointer(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -354,7 +354,7 @@ inline void*& instructionPointer(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -466,7 +466,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -583,7 +583,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86)
meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch line 71
Quoted 10 lines
meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch new file +10
-0+diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index 5a2863b..b36c3ff 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -680,7 +680,7 @@ + #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1 + #endif + +-#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) ++#if OS(DARWIN) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
We should probably use (OS(LINUX) instead of defined(__linux__) and this could be upstreamed too.
Quoted 621 lines
meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch new file +6
-0+ #define HAVE_MACHINE_CONTEXT 1 + #endif + +-- +2.14.1 +meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch +12
-11@@ -1,19 +1,20 @@ -From 5760d346b42807b596f479c81f7a6b42eb36065e Mon Sep 17 00:00:00 2001 +From b7f40eceef0f23bf88090789d4c5845c35f048ae Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Mon, 29 Aug 2016 16:38:11 +0300 -Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir +Subject: [PATCH 4/9] Fix racy parallel build of WebKit2-4.0.gir Upstream-Status: Pending Signed-off-by: Alexander Kanavin <[email protected]> + --- - Source/WebKit2/PlatformGTK.cmake | 9 +++++---- + Source/WebKit/PlatformGTK.cmake | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake -index adaa010..f18cf8a 100644 ---- a/Source/WebKit2/PlatformGTK.cmake -+++ b/Source/WebKit2/PlatformGTK.cmake -@@ -906,8 +906,9 @@ endif () +diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake +index a33c6a86..d83a2e77 100644 +--- a/Source/WebKit/PlatformGTK.cmake ++++ b/Source/WebKit/PlatformGTK.cmake +@@ -1122,8 +1122,9 @@ endif () string(REGEX MATCHALL "-L[^ ]*" INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")@@ -25,7 +26,7 @@ index adaa010..f18cf8a 100644 DEPENDS WebKit2 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= -@@ -950,7 +951,7 @@ add_custom_command( +@@ -1168,7 +1169,7 @@ add_custom_command( add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir@@ -34,7 +35,7 @@ index adaa010..f18cf8a 100644 COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" -@@ -1004,7 +1005,7 @@ add_custom_command( +@@ -1225,7 +1226,7 @@ add_custom_command( add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib@@ -44,5 +45,5 @@ index adaa010..f18cf8a 100644 ) -- -2.9.3 +2.14.1meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch +11
-10@@ -1,8 +1,8 @@ -From 4eeeaec775e190cf3f5885d7c6717acebd0201a8 Mon Sep 17 00:00:00 2001 +From 3cc0e5900515cbcedd0447e0bdf487cc8d9a0f8c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Thu, 11 Aug 2016 17:13:51 +0300 -Subject: [PATCH] Tweak gtkdoc settings so that gtkdoc generation works under - OpenEmbedded build system +Subject: [PATCH 5/9] 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@@ -10,26 +10,27 @@ variable from gtkdoc.py script so that our qemu wrapper is taken into use. Upstream-Status: Inappropriate [oe-specific] Signed-off-by: Alexander Kanavin <[email protected]> + --- Source/PlatformGTK.cmake | 2 +- Tools/gtk/gtkdoc.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake -index af4d2e3..b7b93c7 100644 +index 50b5393f..7a31db51 100644 --- a/Source/PlatformGTK.cmake +++ b/Source/PlatformGTK.cmake -@@ -25,7 +25,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args) +@@ -24,7 +24,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args) add_custom_command( OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}" DEPENDS ${DocumentationDependencies} -- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=${CMAKE_C_FLAGS} ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc ${_extra_args} -+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=${CMAKE_C_FLAGS} LD=${CMAKE_C_COMPILER} LDFLAGS=${CMAKE_C_LINK_FLAGS} RUN=${CMAKE_BINARY_DIR}/gtkdoc-qemuwrapper GIR_EXTRA_LIBS_PATH=${CMAKE_BINARY_DIR}/lib ${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" ${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 touch ${_stamp_name} WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" - ) + VERBATIM diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py -index 4c8237b..c0205f0 100644 +index 48f862a3..18240e42 100644 --- a/Tools/gtk/gtkdoc.py +++ b/Tools/gtk/gtkdoc.py @@ -318,9 +318,9 @@ class GTKDoc(object):@@ -45,5 +46,5 @@ index 4c8237b..c0205f0 100644 if ldflags: -- -2.8.1 +2.14.1meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch +69
-113@@ -1,7 +1,7 @@ -From 53a00058184cd710c6f4375f4daab49d7e885a30 Mon Sep 17 00:00:00 2001 +From ef832a115b40861c08df333339b1366da49e5393 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sun, 17 Apr 2016 12:35:41 -0700 -Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem +Subject: [PATCH 9/9] WebKitMacros: Append to -I and not to -isystem gcc-6 has now introduced stdlib.h in libstdc++ for better compliance and its including the C library stdlib.h using@@ -15,68 +15,34 @@ and ends up with compile errors e.g. /usr/include/c++/6.0.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory Signed-off-by: Khem Raj <[email protected]> ---- -Upstream-Status: Pending - Source/cmake/WebKitMacros.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) +--- + Source/JavaScriptCore/shell/CMakeLists.txt | 2 +- + Source/WebCore/PlatformGTK.cmake | 6 +++--- + Source/WebKit/PlatformGTK.cmake | 2 +- + Source/cmake/WebKitMacros.cmake | 2 +- + Tools/MiniBrowser/gtk/CMakeLists.txt | 2 +- + Tools/TestWebKitAPI/PlatformGTK.cmake | 2 +- + 6 files changed, 8 insertions(+), 8 deletions(-) -Index: webkitgtk-2.16.5/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt -=================================================================== ---- webkitgtk-2.16.5.orig/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt -+++ webkitgtk-2.16.5/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt -@@ -42,7 +42,7 @@ set(WebKitTestNetscapePlugIn_SYSTEM_INCL - ) - - include_directories(${WebKitTestNetscapePlugIn_INCLUDE_DIRECTORIES}) --include_directories(SYSTEM ${WebKitTestNetscapePlugIn_SYSTEM_INCLUDE_DIRECTORIES}) -+include_directories(${WebKitTestNetscapePlugIn_SYSTEM_INCLUDE_DIRECTORIES}) - - set(WebKitTestNetscapePlugIn_LIBRARIES - ${X11_LIBRARIES} -Index: webkitgtk-2.16.5/Tools/ImageDiff/CMakeLists.txt -=================================================================== ---- webkitgtk-2.16.5.orig/Tools/ImageDiff/CMakeLists.txt -+++ webkitgtk-2.16.5/Tools/ImageDiff/CMakeLists.txt -@@ -9,6 +9,6 @@ set(IMAGE_DIFF_LIBRARIES - WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() - - include_directories(${IMAGE_DIFF_INCLUDE_DIRECTORIES}) --include_directories(SYSTEM ${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES}) -+include_directories(${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES}) - add_executable(ImageDiff ${IMAGE_DIFF_SOURCES}) - target_link_libraries(ImageDiff ${IMAGE_DIFF_LIBRARIES}) -Index: webkitgtk-2.16.5/Tools/MiniBrowser/gtk/CMakeLists.txt -=================================================================== ---- webkitgtk-2.16.5.orig/Tools/MiniBrowser/gtk/CMakeLists.txt -+++ webkitgtk-2.16.5/Tools/MiniBrowser/gtk/CMakeLists.txt -@@ -57,7 +57,7 @@ endif () - add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6) - - include_directories(${MiniBrowser_INCLUDE_DIRECTORIES}) --include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) -+include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) - add_executable(MiniBrowser ${MiniBrowser_SOURCES}) - target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES}) - -Index: webkitgtk-2.16.5/Tools/WebKitTestRunner/CMakeLists.txt -=================================================================== ---- webkitgtk-2.16.5.orig/Tools/WebKitTestRunner/CMakeLists.txt -+++ webkitgtk-2.16.5/Tools/WebKitTestRunner/CMakeLists.txt -@@ -106,7 +106,7 @@ GENERATE_BINDINGS(WebKitTestRunnerBindin - WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() - - include_directories(${WebKitTestRunner_INCLUDE_DIRECTORIES}) --include_directories(SYSTEM ${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES}) -+include_directories(${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES}) +diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt +index bc37dd31..4e49871f 100644 +--- a/Source/JavaScriptCore/shell/CMakeLists.txt ++++ b/Source/JavaScriptCore/shell/CMakeLists.txt +@@ -35,7 +35,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() + WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) + WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES}) + include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES}) +-include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) ++include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) + add_executable(jsc ${JSC_SOURCES}) + target_link_libraries(jsc ${JSC_LIBRARIES}) - add_library(TestRunnerInjectedBundle SHARED ${WebKitTestRunnerInjectedBundle_SOURCES}) - target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunner_LIBRARIES}) -Index: webkitgtk-2.16.5/Source/WebCore/PlatformGTK.cmake -=================================================================== ---- webkitgtk-2.16.5.orig/Source/WebCore/PlatformGTK.cmake -+++ webkitgtk-2.16.5/Source/WebCore/PlatformGTK.cmake -@@ -321,7 +321,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) +diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake +index 73506c74..8eb8b415 100644 +--- a/Source/WebCore/PlatformGTK.cmake ++++ b/Source/WebCore/PlatformGTK.cmake +@@ -281,7 +281,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) ${GTK2_INCLUDE_DIRS} ${GDK2_INCLUDE_DIRS} )@@ -85,7 +51,7 @@ Index: webkitgtk-2.16.5/Source/WebCore/PlatformGTK.cmake ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} ) target_link_libraries(WebCorePlatformGTK2 -@@ -346,7 +346,7 @@ WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCoreP +@@ -305,7 +305,7 @@ add_dependencies(WebCorePlatformGTK WebCore) target_include_directories(WebCorePlatformGTK PRIVATE ${WebCore_INCLUDE_DIRECTORIES} )@@ -94,7 +60,7 @@ Index: webkitgtk-2.16.5/Source/WebCore/PlatformGTK.cmake ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} ${GTK_INCLUDE_DIRS} ${GDK_INCLUDE_DIRS} -@@ -362,7 +362,7 @@ include_directories( +@@ -321,7 +321,7 @@ include_directories( "${WEBCORE_DIR}/bindings/gobject/" )@@ -103,37 +69,11 @@ Index: webkitgtk-2.16.5/Source/WebCore/PlatformGTK.cmake ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} ) -Index: webkitgtk-2.16.5/Tools/TestWebKitAPI/PlatformGTK.cmake -=================================================================== ---- webkitgtk-2.16.5.orig/Tools/TestWebKitAPI/PlatformGTK.cmake -+++ webkitgtk-2.16.5/Tools/TestWebKitAPI/PlatformGTK.cmake -@@ -20,7 +20,7 @@ include_directories( - ${WEBKIT2_DIR}/UIProcess/API/gtk - ) - --include_directories(SYSTEM -+include_directories( - ${GDK3_INCLUDE_DIRS} - ${GLIB_INCLUDE_DIRS} - ${GTK3_INCLUDE_DIRS} -Index: webkitgtk-2.16.5/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt -=================================================================== ---- webkitgtk-2.16.5.orig/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt -+++ webkitgtk-2.16.5/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt -@@ -21,7 +21,7 @@ include_directories( - ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk - ) - --include_directories(SYSTEM -+include_directories( - ${ATSPI_INCLUDE_DIRS} - ${GLIB_INCLUDE_DIRS} - ${GSTREAMER_INCLUDE_DIRS} -Index: webkitgtk-2.16.5/Source/WebKit2/PlatformGTK.cmake -=================================================================== ---- webkitgtk-2.16.5.orig/Source/WebKit2/PlatformGTK.cmake -+++ webkitgtk-2.16.5/Source/WebKit2/PlatformGTK.cmake -@@ -1156,7 +1156,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) +diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake +index d83a2e77..401246f4 100644 +--- a/Source/WebKit/PlatformGTK.cmake ++++ b/Source/WebKit/PlatformGTK.cmake +@@ -1050,7 +1050,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) target_include_directories(WebKitPluginProcess2 PRIVATE ${WebKit2CommonIncludeDirectories} )@@ -142,29 +82,45 @@ Index: webkitgtk-2.16.5/Source/WebKit2/PlatformGTK.cmake ${WebKit2CommonSystemIncludeDirectories} ${GTK2_INCLUDE_DIRS} ${GDK2_INCLUDE_DIRS} -Index: webkitgtk-2.16.5/Source/JavaScriptCore/shell/CMakeLists.txt -=================================================================== ---- webkitgtk-2.16.5.orig/Source/JavaScriptCore/shell/CMakeLists.txt -+++ webkitgtk-2.16.5/Source/JavaScriptCore/shell/CMakeLists.txt -@@ -20,7 +20,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() - - WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) - include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES}) --include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) -+include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) - add_executable(jsc ${JSC_SOURCES}) - target_link_libraries(jsc ${JSC_LIBRARIES}) - -Index: webkitgtk-2.16.5/Source/cmake/WebKitMacros.cmake -=================================================================== ---- webkitgtk-2.16.5.orig/Source/cmake/WebKitMacros.cmake -+++ webkitgtk-2.16.5/Source/cmake/WebKitMacros.cmake -@@ -277,7 +277,7 @@ macro(WEBKIT_WRAP_SOURCELIST) +diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake +index 7bc89543..d9818fa4 100644 +--- a/Source/cmake/WebKitMacros.cmake ++++ b/Source/cmake/WebKitMacros.cmake +@@ -78,7 +78,7 @@ macro(WEBKIT_FRAMEWORK_DECLARE _target) endmacro() macro(WEBKIT_FRAMEWORK _target) - include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES}) + include_directories(${${_target}_SYSTEM_INCLUDE_DIRECTORIES}) - add_library(${_target} ${${_target}_LIBRARY_TYPE} + target_sources(${_target} PRIVATE ${${_target}_HEADERS} ${${_target}_SOURCES} +diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt +index e832a86d..ce92c864 100644 +--- a/Tools/MiniBrowser/gtk/CMakeLists.txt ++++ b/Tools/MiniBrowser/gtk/CMakeLists.txt +@@ -57,7 +57,7 @@ endif () + add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6) + + include_directories(${MiniBrowser_INCLUDE_DIRECTORIES}) +-include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) ++include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) + add_executable(MiniBrowser ${MiniBrowser_SOURCES}) + target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES}) + +diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake +index 1be3dd52..7bdddf37 100644 +--- a/Tools/TestWebKitAPI/PlatformGTK.cmake ++++ b/Tools/TestWebKitAPI/PlatformGTK.cmake +@@ -20,7 +20,7 @@ include_directories( + ${WEBKIT2_DIR}/UIProcess/API/gtk + ) + +-include_directories(SYSTEM ++include_directories( + ${GDK3_INCLUDE_DIRS} + ${GLIB_INCLUDE_DIRS} + ${GTK3_INCLUDE_DIRS} +-- +2.14.1 +meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch +14
-10@@ -1,23 +1,24 @@ -From bae9f73b2c693b5aa156fed717d6481b60682786 Mon Sep 17 00:00:00 2001 +From 98b1359a0cd87bbdb22cef98ba594440f4c57d92 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 28 Oct 2015 14:18:57 +0200 -Subject: [PATCH] When building introspection files, add CMAKE_C_FLAGS to the - compiler flags. +Subject: [PATCH 2/9] When building introspection files, add CMAKE_C_FLAGS to + the compiler flags. g-ir-compiler is using a C compiler internally, so it needs to set the proper flags for it. Upstream-Status: Pending [review on oe-core list] Signed-off-by: Alexander Kanavin <[email protected]> + --- - Source/WebKit2/PlatformGTK.cmake | 4 ++-- + Source/WebKit/PlatformGTK.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake -=================================================================== ---- webkitgtk-2.12.1.orig/Source/WebKit2/PlatformGTK.cmake -+++ webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake -@@ -910,7 +910,7 @@ add_custom_command( +diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake +index 7f92ae72..a33c6a86 100644 +--- a/Source/WebKit/PlatformGTK.cmake ++++ b/Source/WebKit/PlatformGTK.cmake +@@ -1126,7 +1126,7 @@ add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir DEPENDS WebKit2 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir@@ -26,7 +27,7 @@ Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" ${INTROSPECTION_SCANNER} --quiet -@@ -951,7 +951,7 @@ add_custom_command( +@@ -1169,7 +1169,7 @@ add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir@@ -35,3 +36,6 @@ Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" ${INTROSPECTION_SCANNER} +-- +2.14.1 +meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch +19
-7@@ -1,22 +1,31 @@ +From 0b3811771ae6385503f2d949f9433d8f810d2ff9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 17 May 2017 22:34:24 -0700 +Subject: [PATCH 8/9] webkitgtk: Fix build for armv5 + Taken from https://bugs.webkit.org/show_bug.cgi?id=161900 Upstream-Status: Pending Signed-off-by: Khem Raj <[email protected]> -Index: webkitgtk-2.16.1/Source/WTF/wtf/CMakeLists.txt -=================================================================== ---- webkitgtk-2.16.1.orig/Source/WTF/wtf/CMakeLists.txt -+++ webkitgtk-2.16.1/Source/WTF/wtf/CMakeLists.txt -@@ -182,7 +182,6 @@ set(WTF_HEADERS +--- + Source/WTF/wtf/CMakeLists.txt | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt +index 6b5e45b9..46ee3c22 100644 +--- a/Source/WTF/wtf/CMakeLists.txt ++++ b/Source/WTF/wtf/CMakeLists.txt +@@ -205,7 +205,6 @@ set(WTF_HEADERS set(WTF_SOURCES Assertions.cpp - Atomics.cpp AutomaticThread.cpp BitVector.cpp - ClockType.cpp -@@ -301,6 +300,15 @@ if (NOT USE_SYSTEM_MALLOC) + CPUTime.cpp +@@ -336,6 +335,15 @@ if (NOT USE_SYSTEM_MALLOC) list(APPEND WTF_LIBRARIES bmalloc) endif ()@@ -32,3 +41,6 @@ Index: webkitgtk-2.16.1/Source/WTF/wtf/CMakeLists.txt list(APPEND WTF_SOURCES unicode/icu/CollatorICU.cpp ) +-- +2.14.1 +meta/recipes-sato/webkit/webkitgtk/gcc7.patch deleted +0
-23@@ -1,23 +0,0 @@ -Imported from -https://src.fedoraproject.org/cgit/rpms/webkitgtk4.git/plain/gcc7.patch - -Add to CXX flags since webkitgtk uses c++ compiler by default -Fixes -Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h:119:67: error: no matching function for call to 'JSC::JSGenericTypedArrayView<Adaptor>::vector() const' -| return bitwise_cast<const typename Adaptor::Type*>(vector()); - -Signed-off-by: Khem Raj <[email protected] -Upstream-Status: Pending - -diff -up webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake.gcc7 webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake ---- webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake.gcc7 2017-02-21 09:57:13.168916004 +0100 -+++ webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake 2017-02-21 09:58:12.811563156 +0100 -@@ -41,6 +41,8 @@ if (COMPILER_IS_GCC_OR_CLANG) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-exceptions -fno-strict-aliasing") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-strict-aliasing -fno-rtti") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-expansion-to-defined") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-expansion-to-defined") - endif () - - if (COMPILER_IS_CLANG AND CMAKE_GENERATOR STREQUAL "Ninja")meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch deleted +0
-48@@ -1,48 +0,0 @@ -Replace __GLIBC__ with __linux__ since musl also supports it -so checking __linux__ is more accomodating - -See http://git.alpinelinux.org/cgit/aports/tree/community/webkit2gtk/musl-fixes.patch?id=219435d86d7e8fac9474344a7431c62bd2525184 - -Upstream-Status: Pending -Signed-off-by: Khem Raj <[email protected]> - -Index: webkitgtk-2.12.1/Source/JavaScriptCore/heap/MachineStackMarker.cpp -=================================================================== ---- webkitgtk-2.12.1.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp -+++ webkitgtk-2.12.1/Source/JavaScriptCore/heap/MachineStackMarker.cpp -@@ -566,7 +566,7 @@ void* MachineThreads::Thread::Registers: - #error Unknown Architecture - #endif - --#elif defined(__GLIBC__) && ENABLE(JIT) -+#elif defined(__linux__) && ENABLE(JIT) - - #if CPU(X86) - return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]); -@@ -665,7 +665,7 @@ void* MachineThreads::Thread::Registers: - #error Unknown Architecture - #endif - --#elif defined(__GLIBC__) -+#elif defined(__linux__) // glibc and musl - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) -@@ -747,7 +747,7 @@ void* MachineThreads::Thread::Registers: - #error Unknown Architecture - #endif - --#elif defined(__GLIBC__) -+#elif defined(__linux__) // glibc and musl - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) -@@ -838,7 +838,7 @@ void* MachineThreads::Thread::Registers: - #error Unknown Architecture - #endif - --#elif defined(__GLIBC__) -+#elif defined(__linux__) // glibc and musl - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86)meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch deleted +0
-26@@ -1,26 +0,0 @@ -ucontext structure is different between musl and glibc for ppc -therefore its not enough just to check for arch alone, we also -need to check for libc type. - -Fixes errors like - -Source/JavaScriptCore/heap/MachineStackMarker.cpp:90:65: error: 'struct mcontext_t' has no member named 'uc_regs'; did you mean 'gregs'? - thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs; - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <[email protected]> - -Index: webkitgtk-2.16.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp -=================================================================== ---- webkitgtk-2.16.3.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp -+++ webkitgtk-2.16.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp -@@ -88,7 +88,7 @@ static void pthreadSignalHandlerSuspendR - } - - ucontext_t* userContext = static_cast<ucontext_t*>(ucontext); --#if CPU(PPC) -+#if CPU(PPC) && defined(__GLIBC__) - threadData->suspendedMachineContext = *userContext->uc_mcontext.uc_regs; - #else - threadData->suspendedMachineContext = userContext->uc_mcontext;meta/recipes-sato/webkit/webkitgtk_2.18.0.bb renamed from meta/recipes-sato/webkit/webkitgtk_2.16.6.bb +4
-7@@ -13,19 +13,17 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \ file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \ - file://musl-fixes.patch \ - file://ppc-musl-fix.patch \ file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ file://x32_support.patch \ file://cross-compile.patch \ - file://gcc7.patch \ file://detect-atomics-during-configure.patch \ file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ + file://0001-Fix-build-with-musl.patch \ " -SRC_URI[md5sum] = "0e2d142a586e4ff79cf0324f4fdbf20c" -SRC_URI[sha256sum] = "fc23650df953123c59b9c0edf3855e7bd55bd107820997fc72375811e1ea4b21" +SRC_URI[md5sum] = "10d86dd5a5b68875654cc38af139f382" +SRC_URI[sha256sum] = "b583e46a3de36a3e80ba33b084ead60512a2046aca01ff61e50e519436e5038d" inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc@@ -37,7 +35,7 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ pango icu bison-native gawk intltool-native libwebp \ atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \ ruby-native libnotify gstreamer1.0-plugins-bad \ - gettext-native glib-2.0 glib-2.0-native \ + gettext-native glib-2.0 glib-2.0-native libtasn1 \ " PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ --2.14.1
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [PATCH 49/50] maintainers.inc: add Mark Hatle for libmnl
In reply to Khem RajQuoted 5 lines · Khem Raj
Quoted 2 lines
NAK. I am not maintaining libmnl.
No problem. Add it to my list.
Thanks, I updated the patch in the git branch.
Alex
Re: [PATCH 01/50] oprofile: remove the recipe
In reply to Khem RajQuoted 5 lines · Khem Raj
Quoted 4 lines · Denys Dmytriyenko
Quoted 2 lines · Alexander Kanavin
Perf is the preferred solution, and oprofile is difficult to maintain against musl.
Quoted 7 lines
Quoted 2 lines
Can we consider moving it to meta-openembedded and maybe relaxing requirements, such as musl compatibility?
I think, if someone maintains it there, it should be fine. Since perf offers same
functionality and supports more machines and maintained better. We probably can maintain it in OE-Core.
Yep. Denys, can you prepare a patch and send it to oe-devel list then please?
Alex
Re: [PATCH 26/50] webkitgtk: update to 2.18.0
In reply to Khem RajQuoted 11 lines · Khem Raj
Quoted 1 line
+Upstream-Status: Inappropriate [needs to use musl-specific defines to be upstreamable]
I think using
__GLIBC__is sub optimal here. So this change should be upstreamable.Quoted 2 lines
+-#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) ++#if OS(DARWIN) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))We should probably use (OS(LINUX) instead of
defined(__linux__)and this could be upstreamed too.
I'm not sure if LINUX or __linux___ is optimal either. Perhaps__GLIBC___ || __musl___ would be better?
I've changed the upstream-status to Pending in the branch.
Alex
Re: [PATCH 26/50] webkitgtk: update to 2.18.0
Quoted 15 lines · Alexander Kanavin
Quoted 14 lines · Khem Raj
Quoted 3 lines
+Upstream-Status: Inappropriate [needs to use musl-specific defines to be upstreamable]
I think using
__GLIBC__is sub optimal here. So this change should be upstreamable.Quoted 4 lines
+-#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) ++#if OS(DARWIN) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
Quoted 7 lines
Quoted 3 lines
We should probably use (OS(LINUX) instead of
defined(__linux__)and this could be upstreamed too.I'm not sure if LINUX or
__linux___is optimal either.Perhaps__GLIBC___||__musl___would be better?
musl intentionally does not have a define to identify C library, since this has historicslly made libc hide lot of trash under this carpet.
most of times people assume __GLIBC__ == linux which ofcourse it not true.
Quoted 3 lines
I've changed the upstream-status to Pending in the branch.
OK
Quoted 1 line
Alex
Re: [PATCH 03/50] glib-2.0: update to 2.54.1
In reply to Alexander KanavinQuoted 9 lines · Alexander Kanavin
LGPL version has been updated from 2.0 to 2.1, adjust the checksums accordingly.
Rebase various patches.
A few tools have been rewritten from perl (or C) to python, so add a patch that avoids hardcoding the python path in the shebang, and remove previous patching with sed.
Signed-off-by Alexander Kanavin <[email protected]>
Alistair
Quoted 323 lines
--- ...warning-about-deprecated-paths-in-schemas.patch | 25 +++++++----- ...t-hardcode-python-path-into-various-tools.patch | 46 ++++++++++++++++++++++ .../Enable-more-tests-while-cross-compiling.patch | 30 ++++++++------ .../glib-2.0/glib-2.0/configure-libtool.patch | 38 ++++-------------- .../{glib-2.0_2.52.3.bb => glib-2.0_2.54.1.bb} | 5 ++- meta/recipes-core/glib-2.0/glib.inc | 16 +++----- 6 files changed, 95 insertions(+), 65 deletions(-) create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch rename meta/recipes-core/glib-2.0/{glib-2.0_2.52.3.bb => glib-2.0_2.54.1.bb} (79%)meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch +16
-9@@ -1,7 +1,7 @@ -From 41534253b6b61ed4769eb6a3966698a50ee73b71 Mon Sep 17 00:00:00 2001 +From 2acf40361eecd17c6981743dabd06e25a9934258 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 12 Jun 2015 17:08:46 +0300 -Subject: [PATCH] Remove the warning about deprecated paths in schemas +Subject: [PATCH 05/10] Remove the warning about deprecated paths in schemas Some schemas in gsettings-desktop-schemas (such as proxy and locale) are still using deprecated paths, as of 3.16.1. This causes warning@@ -11,26 +11,33 @@ Upstream-Status: Inappropriate Signed-off-by: Alexander Kanavin <[email protected]> --- - gio/glib-compile-schemas.c | 6 ------ - 1 file changed, 6 deletions(-) + gio/glib-compile-schemas.c | 13 ------------- + 1 file changed, 13 deletions(-) diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c -index e42949b..ec79d7c 100644 +index b8de090..130f89b 100644 --- a/gio/glib-compile-schemas.c +++ b/gio/glib-compile-schemas.c -@@ -1202,12 +1202,6 @@ parse_state_start_schema (ParseState *state, +@@ -1219,19 +1219,6 @@ parse_state_start_schema (ParseState *state, return; } - if (path && (g_str_has_prefix (path, "/apps/") || - g_str_has_prefix (path, "/desktop/") || - g_str_has_prefix (path, "/system/"))) -- g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with " -- "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path); +- { +- gchar *message = NULL; +- message = g_strdup_printf (_("Warning: Schema “%s” has path “%s”. " +- "Paths starting with " +- "“/apps/”, “/desktop/” or “/system/” are deprecated."), +- id, path); +- g_printerr ("%s\n", message); +- g_free (message); +- } - state->schema_state = schema_state_new (path, gettext_domain, extends, extends_name, list_of); -- -2.1.4 +2.14.1meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch new file +46
-0@@ -0,0 +1,46 @@ +From b9160d951b9af647b97766c57295ca4f45cf9521 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Tue, 3 Oct 2017 10:45:55 +0300 +Subject: [PATCH 10/10] Do not hardcode python path into various tools + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + gio/gdbus-2.0/codegen/gdbus-codegen.in | 2 +- + gobject/glib-genmarshal.in | 2 +- + gobject/glib-mkenums.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in +index 8050981..e693ef3 100644 +--- a/gio/gdbus-2.0/codegen/gdbus-codegen.in ++++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in +@@ -1,4 +1,4 @@ +-#!/usr/bin/env @PYTHON@ ++#!/usr/bin/env python3 + + # GDBus - GLib D-Bus Library + # +diff --git a/gobject/glib-genmarshal.in b/gobject/glib-genmarshal.in +index 09e8408..b2f9d99 100755 +--- a/gobject/glib-genmarshal.in ++++ b/gobject/glib-genmarshal.in +@@ -1,4 +1,4 @@ +-#!/usr/bin/env @PYTHON@ ++#!/usr/bin/env python3 + + # pylint: disable=too-many-lines, missing-docstring, invalid-name + +diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in +index d4bfd11..051fce4 100755 +--- a/gobject/glib-mkenums.in ++++ b/gobject/glib-mkenums.in +@@ -1,4 +1,4 @@ +-#!/usr/bin/env @PYTHON@ ++#!/usr/bin/env python3 + + # If the code below looks horrible and unpythonic, do not panic. + # +-- +2.14.1 +meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch +17
-13@@ -1,7 +1,7 @@ -From 310dfe1bdd16d4b254732fcc202c6211629bc7b6 Mon Sep 17 00:00:00 2001 +From d762907d33b81cf7469b5696c87f2188d2050afb Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <[email protected]> Date: Mon, 9 Nov 2015 11:07:27 +0200 -Subject: [PATCH] Enable more tests while cross-compiling +Subject: [PATCH 06/10] Enable more tests while cross-compiling Upstream disables a few tests while cross-compiling because their build requires running other built binaries. This usually makes sense but in the cross-compile@@ -9,16 +9,17 @@ case we can depend on glib-2.0-native. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Jussi Kukkonen <[email protected]> + --- - gio/tests/Makefile.am | 8 +++----- - tests/gobject/Makefile.am | 8 +++----- - 2 files changed, 6 insertions(+), 10 deletions(-) + gio/tests/Makefile.am | 10 ++++++---- + tests/gobject/Makefile.am | 8 +++++--- + 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am -index 868873f..533e454 100644 +index acc1da4..9176640 100644 --- a/gio/tests/Makefile.am +++ b/gio/tests/Makefile.am -@@ -503,10 +503,9 @@ test_programs += \ +@@ -516,10 +516,9 @@ test_programs += \ endif # -----------------------------------------------------------------------------@@ -31,7 +32,7 @@ index 868873f..533e454 100644 test_programs += resources resources_SOURCES = resources.c nodist_resources_SOURCES = test_resources.c test_resources2.c test_resources2.h -@@ -528,7 +527,11 @@ if !ENABLE_INSTALLED_TESTS +@@ -543,7 +542,11 @@ if !ENABLE_INSTALLED_TESTS libresourceplugin_la_LDFLAGS += -rpath / endif@@ -41,18 +42,18 @@ index 868873f..533e454 100644 +glib_compile_resources=glib-compile-resources +endif - resources.o: test_resources2.h - test_resources.c: test2.gresource.xml Makefile $(shell $(glib_compile_resources) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/test2.gresource.xml) -@@ -545,7 +548,6 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) -- + test-generated.txt: test1.txt + $(AM_V_GEN) echo "Generated" > $@ && \ +@@ -564,7 +567,6 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) -- EXTRA_DIST += test.gresource.xml test1.txt test2.gresource.xml test2.txt test3.gresource.xml test3.txt test4.gresource.xml CLEANFILES += test-generated.txt test_resources.c test_resources2.[ch] plugin_resources.c test.gresource -endif # !CROSS_COMPILING - BUILT_SOURCES += giotypefuncs.c + BUILT_SOURCES += giotypefuncs.inc diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am -index 16f2827..4c2208e 100644 +index 656941d..68555ff 100644 --- a/tests/gobject/Makefile.am +++ b/tests/gobject/Makefile.am @@ -48,10 +48,13 @@ if ENABLE_TIMELOOP@@ -79,3 +80,6 @@ index 16f2827..4c2208e 100644 dist-hook: $(BUILT_EXTRA_DIST) files='$(BUILT_EXTRA_DIST)'; \ +-- +2.14.1 +meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch +8
-30@@ -1,7 +1,7 @@ -From e8740833336c59d6f616a1781b256e648e338c26 Mon Sep 17 00:00:00 2001 +From 1dd1e6ddca5deada049bac2e1ee1fe4ecc5342c5 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 28 Apr 2012 18:24:50 +0200 -Subject: [PATCH] configure: use $host_alias-libtool instead of libtool +Subject: [PATCH 01/10] configure: use $host_alias-libtool instead of libtool directly Poky renames libtool to $host_alias-libtool.@@ -18,24 +18,16 @@ Rebased to glib-2.31.20+ by Andre McCurdy <[email protected]> Upstream-Status: Inappropriate [configuration] Signed-off-by: Martin Jansa <[email protected]> + --- - configure.ac | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index 1af90c5..f6b7a73 100644 +index 6fa6eb0..b6f78a6 100644 --- a/configure.ac +++ b/configure.ac -@@ -1378,7 +1378,7 @@ if test x"$glib_native_win32" = xyes; then - G_MODULE_LDFLAGS= - else - export SED -- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` -+ G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` - fi - dnl G_MODULE_IMPL= don't reset, so cmd-line can override - G_MODULE_NEED_USCORE=0 -@@ -1427,13 +1427,13 @@ AS_IF([ test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL" ], [ +@@ -1428,9 +1428,9 @@ AS_IF([ test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL" ], [ LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness echo "void glib_plugin_test(void) { }" > plugin.c@@ -47,20 +39,6 @@ index 1af90c5..f6b7a73 100644 ${LDFLAGS} -module -o plugin.la -export-dynamic \ -shrext ".o" -avoid-version plugin.lo \ -rpath /dont/care >/dev/null 2>&1 -- eval `./libtool --config | grep ^objdir` -+ eval `./$host_alias-libtool --config | grep ^objdir` - AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], - glib_cv_rtldglobal_broken,[ - AC_TRY_RUN([ -@@ -1506,7 +1506,7 @@ fi - - AC_MSG_CHECKING(for the suffix of module shared libraries) - export SED --shrext_cmds=`./libtool --config | grep '^shrext_cmds='` -+shrext_cmds=`./$host_alias-libtool --config | grep '^shrext_cmds='` - eval $shrext_cmds - module=yes eval std_shrext=$shrext_cmds - # chop the initial dot -- -1.9.1 +2.14.1meta/recipes-core/glib-2.0/glib-2.0_2.54.1.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.52.3.bb +3
-2@@ -15,9 +15,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ file://0001-Do-not-ignore-return-value-of-write.patch \ file://0001-Test-for-pthread_getname_np-before-using-it.patch \ + file://0010-Do-not-hardcode-python-path-into-various-tools.patch \ " SRC_URI_append_class-native = " file://relocate-modules.patch" -SRC_URI[md5sum] = "89265d0289a436e99cad54491eb21ef4" -SRC_URI[sha256sum] = "25ee7635a7c0fcd4ec91cbc3ae07c7f8f5ce621d8183511f414ded09e7e4e128" +SRC_URI[md5sum] = "f8903002421c44dc6e5b5baab8066f1f" +SRC_URI[sha256sum] = "50c01b1419324f10fbf9b9709ec2164b18586968bdce7540583bf32302cf47a3"meta/recipes-core/glib-2.0/glib.inc +5
-12@@ -4,11 +4,11 @@ HOMEPAGE = "https://developer.gnome.org/glib/" # pcre is under BSD; # docs/reference/COPYING is with a 'public domai'-like license! -LICENSE = "LGPLv2+ & BSD & PD" -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://glib/glib.h;beginline=4;endline=17;md5=b4f0f4a399c19e5ebb20c31b79d6bc32 \ - file://gmodule/COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://gmodule/gmodule.h;beginline=4;endline=17;md5=b4f0f4a399c19e5ebb20c31b79d6bc32 \ +LICENSE = "LGPLv2.1+ & BSD & PD" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://glib/glib.h;beginline=4;endline=17;md5=b88abb7f3ad09607e71cb9d530155906 \ + file://gmodule/COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://gmodule/gmodule.h;beginline=4;endline=17;md5=b88abb7f3ad09607e71cb9d530155906 \ file://glib/pcre/COPYING;md5=266ebc3ff74ee9ce6fad65577667c0f4 \ file://glib/pcre/pcre.h;beginline=11;endline=35;md5=de27f2bf633d20a2b7af0b1983423283 \ file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc"@@ -95,12 +95,6 @@ do_install_append () { rm -f ${D}${datadir}/glib-2.0/codegen/*.pyc rm -f ${D}${datadir}/glib-2.0/codegen/*.pyo - # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location - # for target as /usr/bin/perl, so fix it to /usr/bin/perl. - if [ -f ${D}${bindir}/glib-mkenums ]; then - sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/glib-mkenums - fi - if [ -e ${D}${libdir}/charset.alias ]; then rm -f ${D}${libdir}/charset.alias fi --2.14.1
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [PATCH 45/50] at-spi2-core: update to 2.26.0
In reply to Alexander KanavinQuoted 6 lines · Alexander Kanavin
Drop 0001-nls.m4-Take-it-from-gettext-0.15.patch as it's now upstreamed.
Remove --disable-xevie option:
https://github.com/GNOME/at-spi2-core/commit/644096a28a47bdf5c6e0c34c9cd5b944df059925
My bonus QA checks found this:
WARNING: at-spi2-core-2.26.0-r0 do_configure: QA Issue: at-spi2-core depends on intltool but doesn't use it [configure-depends]
Ross