libinput: add ptest
PATCH 1/17 libinput: add ptest
The test takes about 17 minutes, and fully passes.
--- meta/conf/distro/include/ptest-packagelists.inc | 1 + meta/recipes-graphics/wayland/libinput/run-ptest | 9 +++++++++ meta/recipes-graphics/wayland/libinput_1.15.2.bb | 8 +++++--- 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-graphics/wayland/libinput/run-ptest
meta/conf/distro/include/ptest-packagelists.inc +1 -0
@@ -72,6 +72,7 @@ PTESTS_SLOW = "\ glib-2.0-ptest \ gstreamer1.0-ptest \ libevent-ptest \ + libinput-ptest \ lttng-tools-ptest \ openssh-ptest \ openssl-ptest \
meta/recipes-graphics/wayland/libinput/run-ptest new file +9 -0
@@ -0,0 +1,9 @@ +#!/bin/sh + +/usr/libexec/libinput/libinput-test-suite +if [ $? -eq 0 ]; then + echo 'PASS: libinput-test-suite' +else + echo 'FAIL: libinput-test-suite' +fi +
meta/recipes-graphics/wayland/libinput_1.15.2.bb +5 -3
@@ -10,9 +10,10 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=1f2ea9ebff3a2c6d458faf58492efb63" -DEPENDS = "libevdev udev mtdev" +DEPENDS = "libevdev udev mtdev libcheck" SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ + file://run-ptest \ file://determinism.patch \ " SRC_URI[md5sum] = "eb6bd2907ad33d53954d70dfb881a643"
@@ -20,7 +21,7 @@ SRC_URI[sha256sum] = "971c3fbfb624f95c911adeb2803c372e4e3647d1b98f278f660051f834 UPSTREAM_CHECK_REGEX = "libinput-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" -inherit meson pkgconfig lib_package +inherit meson pkgconfig lib_package ptest PACKAGECONFIG ??= "" PACKAGECONFIG[libwacom] = "-Dlibwacom=true,-Dlibwacom=false,libwacom"
@@ -30,7 +31,7 @@ UDEVDIR = "`pkg-config --variable=udevdir udev`" EXTRA_OEMESON += "-Dudev-dir=${UDEVDIR} \ -Ddocumentation=false \ - -Dtests=false \ + ${@bb.utils.contains('PTEST_ENABLED', '1', '-Dtests=true -Dinstall-tests=true', '-Dtests=false -Dinstall-tests=false', d)} \ -Dzshcompletiondir=no" # package name changed in 1.8.1 upgrade: make sure package upgrades work
@@ -38,3 +39,4 @@ RPROVIDES_${PN} = "libinput" RREPLACES_${PN} = "libinput" RCONFLICTS_${PN} = "libinput" +FILES_${PN}-ptest += "${libexecdir}/libinput/libinput-test-suite"
Signature · 1 line
2.26.1
PATCH 2/17 libinput: update 1.15.2 -> 1.15.5
---
.../wayland/{libinput_1.15.2.bb => libinput_1.15.5.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/wayland/{libinput_1.15.2.bb => libinput_1.15.5.bb} (91%)meta/recipes-graphics/wayland/libinput_1.15.5.bb renamed from meta/recipes-graphics/wayland/libinput_1.15.2.bb +2 -2
@@ -16,8 +16,8 @@ SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ file://run-ptest \ file://determinism.patch \ " -SRC_URI[md5sum] = "eb6bd2907ad33d53954d70dfb881a643" -SRC_URI[sha256sum] = "971c3fbfb624f95c911adeb2803c372e4e3647d1b98f278f660051f834597747" +SRC_URI[md5sum] = "c9a1b15bb932eaf22f840efe4c3f84eb" +SRC_URI[sha256sum] = "a90efc8f423c3094f2f9f372fb92381b2f3aad62e8b5882a8abe333aa8249c97" UPSTREAM_CHECK_REGEX = "libinput-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
Signature · 1 line
2.26.1
PATCH 3/17 logrotate: update to 3.16.0
In reply to Alexander Kanavin---
...ual.patch => 0001-Update-the-manual.patch} | 15 +++++------
.../logrotate/act-as-mv-when-rotate.patch | 25 +++++++++----------
.../disable-check-different-filesystems.patch | 14 +++++------
...ogrotate_3.15.1.bb => logrotate_3.16.0.bb} | 6 ++---
4 files changed, 29 insertions(+), 31 deletions(-)
rename meta/recipes-extended/logrotate/logrotate/{update-the-manual.patch => 0001-Update-the-manual.patch} (70%)
rename meta/recipes-extended/logrotate/{logrotate_3.15.1.bb => logrotate_3.16.0.bb} (95%)meta/recipes-extended/logrotate/logrotate/0001-Update-the-manual.patch renamed from meta/recipes-extended/logrotate/logrotate/update-the-manual.patch +8 -7
@@ -1,4 +1,4 @@ -From bf22e8805df69344f6f20cea390e829a22fa741b Mon Sep 17 00:00:00 2001 +From 3e2cfa88b6538bb0fee3d9a6e99622055d05ac4a Mon Sep 17 00:00:00 2001 From: Robert Yang <[email protected]> Date: Tue, 17 Feb 2015 21:14:37 -0800 Subject: [PATCH] Update the manual
@@ -8,23 +8,24 @@ Update the manual for rotating on different filesystems. Upstream-Status: Pending Signed-off-by: Robert Yang <[email protected]> + --- logrotate.8.in | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/logrotate.8.in b/logrotate.8.in -index 951e406..581bf48 100644 +index 98fea91..70b4c44 100644 --- a/logrotate.8.in +++ b/logrotate.8.in -@@ -445,12 +445,10 @@ Do not rotate the log if it is empty (this overrides the \fBifempty\fR option). +@@ -202,12 +202,10 @@ at all (use with caution, may waste performance and disk space). Default is 0. .TP \fBolddir \fIdirectory\fR --Logs are moved into \fIdirectory\fR for rotation. The \fIdirectory\fR must be +-Logs are moved into \fIdirectory\fR for rotation. The \fIdirectory\fR must be -on the same physical device as the log file being rotated, unless \fBcopy\fR, --\fBcopytruncate\fR or \fBrenamecopy\fR option is used. The \fIdirectory\fR +-\fBcopytruncate\fR or \fBrenamecopy\fR option is used. The \fIdirectory\fR -is assumed to be relative to the directory holding the log file --unless an absolute path name is specified. When this option is used all +-unless an absolute path name is specified. When this option is used all -old versions of the log end up in \fIdirectory\fR. This option may be +Logs are moved into \fIdirectory\fR for rotation. The \fIdirectory\fR +is assumed to be relative to the directory holding the log file unless
@@ -34,5 +35,5 @@ index 951e406..581bf48 100644 .TP -- -1.8.3.1 +2.24.0
meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch +12 -13
@@ -1,4 +1,4 @@ -From c637948ebab5aff5641700c5cf613321ca0a6e6b Mon Sep 17 00:00:00 2001 +From ef1ea905831c5bcd63e04149571c10d75ff8f028 Mon Sep 17 00:00:00 2001 From: Robert Yang <[email protected]> Date: Tue, 17 Feb 2015 21:08:07 -0800 Subject: [PATCH] Act as the "mv" command when rotate log
@@ -9,15 +9,16 @@ read and write. Upstream-Status: Pending Signed-off-by: Robert Yang <[email protected]> + --- logrotate.c | 71 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 59 insertions(+), 12 deletions(-) diff --git a/logrotate.c b/logrotate.c -index 54dac90..bf3ec23 100644 +index 25902bc..afa1a90 100644 --- a/logrotate.c +++ b/logrotate.c -@@ -1360,6 +1360,53 @@ static int findNeedRotating(struct logInfo *log, int logNum, int force) +@@ -1434,6 +1434,53 @@ static int findNeedRotating(struct logInfo *log, int logNum, int force) return 0; }
@@ -71,7 +72,7 @@ index 54dac90..bf3ec23 100644 /* find the rotated file with the highest index */ static int findLastRotated(const struct logNames *rotNames, const char *fileext, const char *compext) -@@ -1800,15 +1847,15 @@ static int prerotateSingleLog(struct logInfo *log, int logNum, +@@ -1911,15 +1958,15 @@ static int prerotateSingleLog(struct logInfo *log, int logNum, } message(MESS_DEBUG,
@@ -90,7 +91,7 @@ index 54dac90..bf3ec23 100644 oldName, newName, strerror(errno)); hasErrors = 1; } -@@ -1891,21 +1938,21 @@ static int rotateSingleLog(struct logInfo *log, int logNum, +@@ -2002,10 +2049,10 @@ static int rotateSingleLog(struct logInfo *log, int logNum, return 1; }
@@ -104,7 +105,8 @@ index 54dac90..bf3ec23 100644 log->files[logNum], tmpFilename, strerror(errno)); hasErrors = 1; - } +@@ -2014,11 +2061,11 @@ static int rotateSingleLog(struct logInfo *log, int logNum, + free(tmpFilename); } else { - message(MESS_DEBUG, "renaming %s to %s\n", log->files[logNum],
@@ -118,7 +120,7 @@ index 54dac90..bf3ec23 100644 log->files[logNum], rotNames->finalName, strerror(errno)); hasErrors = 1; -@@ -2297,7 +2344,7 @@ static int rotateLogSet(struct logInfo *log, int force) +@@ -2424,7 +2471,7 @@ static int rotateLogSet(struct logInfo *log, int force) return hasErrors; }
@@ -127,7 +129,7 @@ index 54dac90..bf3ec23 100644 { struct logState *p; FILE *f; -@@ -2460,7 +2507,7 @@ static int writeState(const char *stateFilename) +@@ -2629,7 +2676,7 @@ static int writeState(const char *stateFilename) fclose(f); if (error == 0) {
@@ -135,8 +137,8 @@ index 54dac90..bf3ec23 100644 + if (mvFile(tmpFilename, stateFilename, log, prev_acl)) { unlink(tmpFilename); error = 1; - message(MESS_ERROR, "error renaming temp state file %s\n", -@@ -2805,7 +2852,7 @@ int main(int argc, const char **argv) + message(MESS_ERROR, "error renaming temp state file %s to %s\n", +@@ -2987,7 +3034,7 @@ int main(int argc, const char **argv) rc |= rotateLogSet(log, force); if (!debug)
@@ -145,6 +147,3 @@ index 54dac90..bf3ec23 100644 return (rc != 0); } --- -2.18.1 -
meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch +6 -8
@@ -1,4 +1,4 @@ -From e47796c8e8270a3d14f0b06af8a9e916c2225514 Mon Sep 17 00:00:00 2001 +From a3fdf3dbdd6ecc0f2550a765dcb9bb274bce8ea8 Mon Sep 17 00:00:00 2001 From: Robert Yang <[email protected]> Date: Tue, 8 Jan 2019 06:27:06 +0000 Subject: [PATCH] Disable the check for different filesystems
@@ -9,18 +9,19 @@ disable the check for different filesystems. Upstream-Status: Pending Signed-off-by: Robert Yang <[email protected]> + --- config.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/config.c b/config.c -index 633b843..99a4a3b 100644 +index f027c7e..026136c 100644 --- a/config.c +++ b/config.c -@@ -1765,15 +1765,6 @@ duperror: - goto error; - } +@@ -1873,15 +1873,6 @@ duperror: } + + free(ld); - - if (sb.st_dev != sb2.st_dev - && !(newlog->flags & (LOG_FLAG_COPYTRUNCATE | LOG_FLAG_COPY | LOG_FLAG_TMPFILENAME))) {
@@ -33,6 +34,3 @@ index 633b843..99a4a3b 100644 } } --- -2.18.1 -
meta/recipes-extended/logrotate/logrotate_3.16.0.bb renamed from meta/recipes-extended/logrotate/logrotate_3.15.1.bb +3 -3
@@ -21,12 +21,12 @@ UPSTREAM_CHECK_REGEX = "logrotate-(?P<pver>\d+(\.\d+)+).tar" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ file://act-as-mv-when-rotate.patch \ - file://update-the-manual.patch \ + file://0001-Update-the-manual.patch \ file://disable-check-different-filesystems.patch \ " -SRC_URI[md5sum] = "afe109afea749c306ff489203fde6beb" -SRC_URI[sha256sum] = "491fec9e89f1372f02a0ab66579aa2e9d63cac5178dfa672c204c88e693a908b" +SRC_URI[md5sum] = "faf729e0e24bfaafaa677bc6deb46ed8" +SRC_URI[sha256sum] = "442f6fdf61c349eeae5f76799878b88fe45a11c8863a38b618bac6988f4a7ce5" PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)}"
Signature · 1 line
2.26.1
PATCH 4/17 rt-tests: further exclusion of development versions
In reply to Alexander Kanavin--- meta/recipes-rt/rt-tests/rt-tests.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-rt/rt-tests/rt-tests.inc +2 -2
@@ -3,8 +3,8 @@ SRCREV = "dff174f994f547a5785d32454865f140daacb0f5" PE = "1" SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git" -# 1.2 to 1.5 seem to be development versions -UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(?!1\.[2-6])(\d+(\.\d+)+))" +# 1.2 and up seem to be development versions +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(?!1\.[2-8])(\d+(\.\d+)+))" S = "${WORKDIR}/git"
Signature · 1 line
2.26.1
PATCH 5/17 kmscube: update to latest commit
In reply to Alexander KanavinDrop a mali-specific patch that was never ported to meson or accepted upstream.
--- ...bo_map-_unmap-and-use-it-or-avoid-it.patch | 117 ------------------ meta/recipes-graphics/kmscube/kmscube_git.bb | 5 +- 2 files changed, 2 insertions(+), 120 deletions(-) delete mode 100644 meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch
meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch deleted +0 -117
@@ -1,117 +0,0 @@ -From a91c588b5a4122506e7fe949c37d530621bdd997 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20D=C3=ADaz?= <[email protected]> -Date: Tue, 11 Jul 2017 14:50:37 -0500 -Subject: [PATCH] Detect gst_bo_map/_unmap and use it (or avoid it) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Those functions are not available on libMali, thus breaking -builds and creating havoc. - -Removing the specific parts of the code that deal with -gbm_bo_map() and gbm_bo_unmap() renders the kmscube utility -a little less useful, but still valuable. - -Signed-off-by: Daniel Díaz <[email protected]> -Cc: Rob Clark <[email protected]> -Reviewed-by: Eric Engestrom <[email protected]> - -Upstream-Status: Submitted [https://lists.freedesktop.org/archives/mesa-dev/2017-July/163020.html] -Signed-off-by: Zoltan Kuscsik <[email protected]> ---- - Makefile.am | 5 ++++- - configure.ac | 3 +++ - gst-decoder.c | 7 ++++++- - kmscube.c | 4 ++++ - 4 files changed, 17 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index ba064e4..3a0a50b 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -43,7 +43,6 @@ kmscube_SOURCES = \ - common.c \ - common.h \ - cube-smooth.c \ -- cube-tex.c \ - drm-atomic.c \ - drm-common.c \ - drm-common.h \ -@@ -68,3 +67,7 @@ texturator_SOURCES = \ - drm-common.c \ - drm-legacy.c \ - texturator.c -+ -+if ENABLE_GBM_MAP -+kmscube_SOURCES += cube-tex.c -+endif -diff --git a/configure.ac b/configure.ac -index 6be6541..3d20121 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -49,5 +49,8 @@ if test "x$HAVE_GST" = "xyes"; then - fi - AM_CONDITIONAL(ENABLE_GST, [test "x$HAVE_GST" = "xyes"]) - -+AC_CHECK_LIB([gbm], [gbm_bo_map], [HAVE_GBM_BO_MAP=yes], []) -+AM_CONDITIONAL(ENABLE_GBM_MAP, [test "x$HAVE_GBM_BO_MAP" = "xyes"]) -+ - AC_CONFIG_FILES([Makefile]) - AC_OUTPUT -diff --git a/gst-decoder.c b/gst-decoder.c -index 5431014..0aa7a55 100644 ---- a/gst-decoder.c -+++ b/gst-decoder.c -@@ -332,6 +332,7 @@ set_last_frame(struct decoder *dec, EGLImage frame, GstSample *samp) - dec->last_samp = samp; - } - -+#if HAVE_GBM_BO_MAP - // TODO this could probably be a helper re-used by cube-tex: - static int - buf_to_fd(const struct gbm *gbm, int size, void *ptr) -@@ -357,6 +358,7 @@ buf_to_fd(const struct gbm *gbm, int size, void *ptr) - - return fd; - } -+#endif - - static EGLImage - buffer_to_image(struct decoder *dec, GstBuffer *buf) -@@ -410,12 +412,15 @@ buffer_to_image(struct decoder *dec, GstBuffer *buf) - - if (is_dmabuf_mem) { - dmabuf_fd = dup(gst_dmabuf_memory_get_fd(mem)); -- } else { -+ } -+#if HAVE_GBM_BO_MAP -+ else { - GstMapInfo map_info; - gst_buffer_map(buf, &map_info, GST_MAP_READ); - dmabuf_fd = buf_to_fd(dec->gbm, map_info.size, map_info.data); - gst_buffer_unmap(buf, &map_info); - } -+#endif - - if (dmabuf_fd < 0) { - GST_ERROR("could not obtain DMABUF FD"); -diff --git a/kmscube.c b/kmscube.c -index 81803be..e93da67 100644 ---- a/kmscube.c -+++ b/kmscube.c -@@ -166,7 +166,11 @@ int main(int argc, char *argv[]) - else if (mode == VIDEO) - egl = init_cube_video(gbm, video, samples); - else -+#if HAVE_GBM_BO_MAP - egl = init_cube_tex(gbm, mode, samples); -+#else -+ printf("gbm_bo_map() support missing\n"); -+#endif - - if (!egl) { - printf("failed to initialize EGL\n"); --- -2.22.0 -
meta/recipes-graphics/kmscube/kmscube_git.bb +2 -3
@@ -6,9 +6,8 @@ DEPENDS = "virtual/libgles2 virtual/egl libdrm" LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb" -SRCREV = "76bb57d539cb43d267e561024c34e031bf351e04" -SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https \ - file://detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch" +SRCREV = "4660a7dca6512b6e658759d00cff7d4ad2a2059d" +SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https" UPSTREAM_CHECK_COMMITS = "1" S = "${WORKDIR}/git"
Signature · 1 line
2.26.1
Re: [OE-core] [PATCH 05/17] kmscube: update to latest commit
Quoted 3 lines · Alexander Kanavin
Drop a mali-specific patch that was never ported to meson or accepted upstream.
Does this mean it wont work with systems with mali gpu drivers any more?
if so, then its a regression, we should not drop patches just like that perhaps.
Quoted 150 lines
Signed-off-by Alexander Kanavin <[email protected]>--- ...bo_map-_unmap-and-use-it-or-avoid-it.patch | 117 ------------------ meta/recipes-graphics/kmscube/kmscube_git.bb | 5 +- 2 files changed, 2 insertions(+), 120 deletions(-)delete mode 100644
meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patchmeta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch deleted +0
-117@@ -1,117 +0,0 @@ -From a91c588b5a4122506e7fe949c37d530621bdd997 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20D=C3=ADaz?= <[email protected]> -Date: Tue, 11 Jul 2017 14:50:37 -0500 -Subject: [PATCH] Detect gst_bo_map/_unmap and use it (or avoid it) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Those functions are not available on libMali, thus breaking -builds and creating havoc. - -Removing the specific parts of the code that deal with -gbm_bo_map() and gbm_bo_unmap() renders the kmscube utility -a little less useful, but still valuable. - -Signed-off-by: Daniel Díaz <[email protected]> -Cc: Rob Clark <[email protected]> -Reviewed-by: Eric Engestrom <[email protected]> - -Upstream-Status: Submitted [https://lists.freedesktop.org/archives/mesa-dev/2017-July/163020.html] -Signed-off-by: Zoltan Kuscsik <[email protected]> ---- - Makefile.am | 5 ++++- - configure.ac | 3 +++ - gst-decoder.c | 7 ++++++- - kmscube.c | 4 ++++ - 4 files changed, 17 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index ba064e4..3a0a50b 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -43,7 +43,6 @@ kmscube_SOURCES = \ - common.c \ - common.h \ - cube-smooth.c \ -- cube-tex.c \ - drm-atomic.c \ - drm-common.c \ - drm-common.h \ -@@ -68,3 +67,7 @@ texturator_SOURCES = \ - drm-common.c \ - drm-legacy.c \ - texturator.c -+ -+if ENABLE_GBM_MAP -+kmscube_SOURCES += cube-tex.c -+endif -diff --git a/configure.ac b/configure.ac -index 6be6541..3d20121 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -49,5 +49,8 @@ if test "x$HAVE_GST" = "xyes"; then - fi - AM_CONDITIONAL(ENABLE_GST, [test "x$HAVE_GST" = "xyes"]) - -+AC_CHECK_LIB([gbm], [gbm_bo_map], [HAVE_GBM_BO_MAP=yes], []) -+AM_CONDITIONAL(ENABLE_GBM_MAP, [test "x$HAVE_GBM_BO_MAP" = "xyes"]) -+ - AC_CONFIG_FILES([Makefile]) - AC_OUTPUT -diff --git a/gst-decoder.c b/gst-decoder.c -index 5431014..0aa7a55 100644 ---- a/gst-decoder.c -+++ b/gst-decoder.c -@@ -332,6 +332,7 @@ set_last_frame(struct decoder *dec, EGLImage frame, GstSample *samp) - dec->last_samp = samp; - } - -+#if HAVE_GBM_BO_MAP - // TODO this could probably be a helper re-used by cube-tex: - static int - buf_to_fd(const struct gbm *gbm, int size, void *ptr) -@@ -357,6 +358,7 @@ buf_to_fd(const struct gbm *gbm, int size, void *ptr) - - return fd; - } -+#endif - - static EGLImage - buffer_to_image(struct decoder *dec, GstBuffer *buf) -@@ -410,12 +412,15 @@ buffer_to_image(struct decoder *dec, GstBuffer *buf) - - if (is_dmabuf_mem) { - dmabuf_fd = dup(gst_dmabuf_memory_get_fd(mem)); -- } else { -+ } -+#if HAVE_GBM_BO_MAP -+ else { - GstMapInfo map_info; - gst_buffer_map(buf, &map_info, GST_MAP_READ); - dmabuf_fd = buf_to_fd(dec->gbm, map_info.size, map_info.data); - gst_buffer_unmap(buf, &map_info); - } -+#endif - - if (dmabuf_fd < 0) { - GST_ERROR("could not obtain DMABUF FD"); -diff --git a/kmscube.c b/kmscube.c -index 81803be..e93da67 100644 ---- a/kmscube.c -+++ b/kmscube.c -@@ -166,7 +166,11 @@ int main(int argc, char *argv[]) - else if (mode == VIDEO) - egl = init_cube_video(gbm, video, samples); - else -+#if HAVE_GBM_BO_MAP - egl = init_cube_tex(gbm, mode, samples); -+#else -+ printf("gbm_bo_map() support missing\n"); -+#endif - - if (!egl) { - printf("failed to initialize EGL\n"); --- -2.22.0 -meta/recipes-graphics/kmscube/kmscube_git.bb +2
-3@@ -6,9 +6,8 @@ DEPENDS = "virtual/libgles2 virtual/egl libdrm" LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb" -SRCREV = "76bb57d539cb43d267e561024c34e031bf351e04" -SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https \ - file://detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch" +SRCREV = "4660a7dca6512b6e658759d00cff7d4ad2a2059d" +SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https" UPSTREAM_CHECK_COMMITS = "1" S = "${WORKDIR}/git"
Re: [OE-core] [PATCH 05/17] kmscube: update to latest commit
Quoted 5 lines · Khem Raj
Does this mean it wont work with systems with mali gpu drivers any more?
if so, then its a regression, we should not drop patches just like that perhaps.
The patch is unmaintained, hasn't worked since kmscube was switched to meson, and there is no way for me to test it or even understand it. Anyone with an interest in mali should do the work of getting it upstream, just tossing custom things into oe-core does not mean they will be kept there forever.
Alex
Re: [OE-core] [PATCH 05/17] kmscube: update to latest commit
Quoted 9 lines · Alexander Kanavin
On Thu, 30 Apr 2020 at 17:46, Khem Raj <[email protected] <mailto:[email protected]>> wrote:
Does this mean it wont work with systems with mali gpu drivers any more?
if so, then its a regression, we should not drop patches just like that perhaps.
The patch is unmaintained, hasn't worked since kmscube was switched to meson, and there is no way for me to test it or even understand it. Anyone with an interest in mali should do the work of getting it upstream, just tossing custom things into oe-core does not mean they will be kept there forever.
I see if it has not worked for long, it should perhaps ok. and meta-arm might be better location for this if needed.
When we accept patches, we sign up for some maintenance.
I think it was appropriate when it was added, we did not keep it up. We switched to meson without porting it, perhaps it should have done then
Quoted 2 lines
Alex
Re: [OE-core] [PATCH 05/17] kmscube: update to latest commit
Quoted 4 lines · Khem Raj
Quoted 3 lines · Alexander Kanavin
On Thu, 30 Apr 2020 at 17:46, Khem Raj <[email protected] <mailto:[email protected]>> wrote:
Quoted 8 lines
Quoted 8 lines
Does this mean it wont work with systems with mali gpu drivers any more?
if so, then its a regression, we should not drop patches just like that perhaps.
The patch is unmaintained, hasn't worked since kmscube was switched to meson, and there is no way for me to test it or even understand it.
"No way to understand it" seems a little over dramatic :-) It's testing for the availability of a function (gbm_bo_map) within a library (libgbm) and then making some code and one of the source files conditional on the result of the test.
https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/Libraries.html
Quoted 16 lines
Quoted 3 lines
Anyone with an interest in mali should do the work of getting it upstream, just tossing custom things into oe-core does not mean they will be kept there forever.
I see if it has not worked for long, it should perhaps ok. and meta-arm might be better location for this if needed.
When we accept patches, we sign up for some maintenance.
I think it was appropriate when it was added, we did not keep it up. We switched to meson without porting it, perhaps it should have done then
Quoted 2 lines
Alex
Re: [OE-core] [PATCH 05/17] kmscube: update to latest commit
Quoted 9 lines · Andre McCurdy
"No way to understand it" seems a little over dramatic :-) It's testing for the availability of a function (
gbm_bo_map) within a library (libgbm) and then making some code and one of the source files conditional on the result of the test.https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/Libraries.html
Andre, I would be more sympathetic to this, if more people would actually work on core recipe upgrades, but alas, it seems like it's now me alone, despite all the mail that AUH sends to supposed 'maintainers'. I have about 60 updates queued [1], and 60 more yet to come, so when I see a patch like this (not trivial to rebase, abandoned by original submitter, not possible to test), I simply drop it so that progress can be made. If you can help, please do.
[1]
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=akanavin/package-version-updates
Alex
Re: [OE-core] [PATCH 05/17] kmscube: update to latest commit
Quoted 8 lines · Alexander Kanavin
On Thu, 30 Apr 2020 at 22:05, Andre McCurdy <[email protected] <mailto:[email protected]>> wrote:
"No way to understand it" seems a little over dramatic :-) It's testing for the availability of a function (
gbm_bo_map) within a library (libgbm) and then making some code and one of the source files conditional on the result of the test.
Quoted 4 lines
https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/Libraries.html
Andre, I would be more sympathetic to this, if more people would actually work on core recipe upgrades, but alas, it seems like it's now me alone, despite all the mail that AUH sends to supposed 'maintainers'. I have about 60 updates queued [1], and 60 more yet to come, so when I see a patch like this (not trivial to rebase, abandoned by original submitter, not possible to test), I simply drop it so that progress can be made. If you can help, please do.
your effort is appreaciated. Core however has to serve wider usecases, so that should be considered as well, so ploughing ahead while is good being mindful about regressing usecases is equally important. All of us have same challanges.
Re: [OE-core] [PATCH 05/17] kmscube: update to latest commit
In reply to Alexander KanavinQuoted 10 lines · Alexander Kanavin
Quoted 7 lines · Andre McCurdy
"No way to understand it" seems a little over dramatic :-) It's testing for the availability of a function (
gbm_bo_map) within a library (libgbm) and then making some code and one of the source files conditional on the result of the test.https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/Libraries.html
Andre, I would be more sympathetic to this, if more people would actually work on core recipe upgrades, but alas, it seems like it's now me alone, despite all the mail that AUH sends to supposed 'maintainers'. I have about 60 updates queued [1], and 60 more yet to come, so when I see a patch like this (not trivial to rebase, abandoned by original submitter, not possible to test), I simply drop it so that progress can be made. If you can help, please do.
Has anyone tried to contact the original submitter? If they are not responsive then there are other Linaro folks active on the list who could possibly help out.
AUH is a great tool but it does seem to create a division between those in the exclusive little club of recipe maintainers and the rest of us. If you want to reduce your workload then maybe you could remove yourself as maintainer for some of your recipes? If that leaves recipes without a maintainer then maybe they should default to "community support" with AUH emails being sent to the mailing list instead of the named individual?
Re: [OE-core] [PATCH 05/17] kmscube: update to latest commit
Quoted 8 lines · Andre McCurdy
AUH is a great tool but it does seem to create a division between those in the exclusive little club of recipe maintainers and the rest of us. If you want to reduce your workload then maybe you could remove yourself as maintainer for some of your recipes? If that leaves recipes without a maintainer then maybe they should default to "community support" with AUH emails being sent to the mailing list instead of the named individual?
Actually that may not be a bad idea. Listing maintainers explicitly and sending them private email just doesn't seem to work out: many of the currently listed ones just silently ignore AUH mails, and don't bother to unlist themselves, and those who do act are an exception. So those many can be replaced with the oe-core mailing list email, so the patches (or information about why smth couldn't be updated) end up here, where interested parties could pick it up. There'll be a monthly avalanche of proposed patches. Thoughts?
Alex
PATCH 6/17 xcb-proto: update to 1.14
In reply to Alexander Kanavin---
.../xorg-proto/{xcb-proto_1.13.bb => xcb-proto_1.14.bb} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/xorg-proto/{xcb-proto_1.13.bb => xcb-proto_1.14.bb} (82%)meta/recipes-graphics/xorg-proto/xcb-proto_1.14.bb renamed from meta/recipes-graphics/xorg-proto/xcb-proto_1.13.bb +2 -3
@@ -11,9 +11,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \ file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65" -SRC_URI = "http://xcb.freedesktop.org/dist/${BP}.tar.bz2" -SRC_URI[md5sum] = "abe9aa4886138150bbc04ae4f29b90e3" -SRC_URI[sha256sum] = "7b98721e669be80284e9bbfeab02d2d0d54cd11172b72271e47a2fe875e2bde1" +SRC_URI = "http://xcb.freedesktop.org/dist/${BP}.tar.xz" +SRC_URI[sha256sum] = "186a3ceb26f9b4a015f5a44dcc814c93033a5fc39684f36f1ecc79834416a605" inherit autotools pkgconfig python3native
Signature · 1 line
2.26.1
PATCH 7/17 libxcb: update to 1.14
In reply to Alexander KanavinDrop a patch as the problem is fixed upstream.
---
.../xorg-lib/libxcb/xcbincludedir.patch | 28 -------------------
.../{libxcb_1.13.1.bb => libxcb_1.14.bb} | 6 ++--
2 files changed, 2 insertions(+), 32 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch
rename meta/recipes-graphics/xorg-lib/{libxcb_1.13.1.bb => libxcb_1.14.bb} (80%)meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch deleted +0 -28
@@ -1,28 +0,0 @@ -As pkg-config --variable doesn't respect the sysroot, add the pkg-config sysroot -to the beginning of variables that are used later on the host. - -Upstream-Status: Pending -Signed-off-by: Ross Burton <[email protected]> - -diff --git a/configure.ac b/configure.ac -index 94da4f7..d29cd6a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -64,7 +64,7 @@ AC_SUBST(NEEDED) - - # Find the xcb-proto protocol descriptions - AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR) --XCBPROTO_XCBINCLUDEDIR=`$PKG_CONFIG --variable=xcbincludedir xcb-proto` -+XCBPROTO_XCBINCLUDEDIR=$PKG_CONFIG_SYSROOT_DIR/`$PKG_CONFIG --variable=xcbincludedir xcb-proto` - AC_MSG_RESULT($XCBPROTO_XCBINCLUDEDIR) - AC_SUBST(XCBPROTO_XCBINCLUDEDIR) - -@@ -74,7 +74,7 @@ AC_SUBST(XCBPROTO_VERSION) - - # Find the xcbgen Python package - AC_MSG_CHECKING(XCBPROTO_XCBPYTHONDIR) --XCBPROTO_XCBPYTHONDIR=`$PKG_CONFIG --variable=pythondir xcb-proto` -+XCBPROTO_XCBPYTHONDIR=$PKG_CONFIG_SYSROOT_DIR/`$PKG_CONFIG --variable=pythondir xcb-proto` - AC_MSG_RESULT($XCBPROTO_XCBPYTHONDIR) - AC_SUBST(XCBPROTO_XCBPYTHONDIR) -
meta/recipes-graphics/xorg-lib/libxcb_1.14.bb renamed from meta/recipes-graphics/xorg-lib/libxcb_1.13.1.bb +2 -4
@@ -9,13 +9,11 @@ SECTION = "x11/libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" -SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \ - file://xcbincludedir.patch \ +SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.xz \ file://disable-check.patch \ " -SRC_URI[md5sum] = "f33cdfc67346f7217a9326c0d8679975" -SRC_URI[sha256sum] = "a89fb7af7a11f43d2ce84a844a4b38df688c092bf4b67683aef179cdf2a647c4" +SRC_URI[sha256sum] = "a55ed6db98d43469801262d81dc2572ed124edc3db31059d4e9916eb9f844c34" BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.26.1
PATCH 8/17 mc: update to 4.8.24
In reply to Alexander Kanavin---
...Add-option-to-control-configure-args.patch | 99 ----------------
...29-configure.ac-drop-bundled-gettext.patch | 110 ------------------
.../mc/{mc_4.8.23.bb => mc_4.8.24.bb} | 6 +-
3 files changed, 2 insertions(+), 213 deletions(-)
delete mode 100644 meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch
delete mode 100644 meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch
rename meta/recipes-extended/mc/{mc_4.8.23.bb => mc_4.8.24.bb} (88%)meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch deleted +0 -99
@@ -1,99 +0,0 @@ -From a54501d3c9541bc8600225aa2d42531f93c6def7 Mon Sep 17 00:00:00 2001 -From: Joshua Watt <[email protected]> -Date: Sat, 9 Nov 2019 20:01:48 -0600 -Subject: [PATCH] Add option to control configure args - -Embedding the configure time options into the executable can lead to -non-reproducible builds, since configure options often have embedded -paths. Add a configure time option to control if the configure args are -embedded so this can be disabled. - -Upstream-Status: Submitted [https://midnight-commander.org/ticket/4031] -Signed-off-by: Joshua Watt <[email protected]> ---- - configure.ac | 6 ++++++ - src/args.c | 6 ++++++ - src/textconf.c | 2 ++ - 3 files changed, 14 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 19d1a76be..a1948f6b9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -544,6 +544,12 @@ dnl Clarify do we really need GModule - AM_CONDITIONAL([HAVE_GMODULE], [test -n "$g_module_supported" && \ - test x"$textmode_x11_support" = x"yes" -o x"$enable_aspell" = x"yes"]) - -+AC_ARG_ENABLE([configure-args], -+ AS_HELP_STRING([--enable-configure-args], [Handle all compiler warnings as errors])) -+if test "x$enable_configure_args" != xno; then -+ AC_DEFINE([ENABLE_CONFIGURE_ARGS], 1, [Define to enable showing configure arguments in help]) -+fi -+ - AC_DEFINE_UNQUOTED([MC_CONFIGURE_ARGS], ["$ac_configure_args"], [MC configure arguments]) - - AC_CONFIG_FILES( -diff --git a/src/args.c b/src/args.c -index baef1a1c8..f8dc24020 100644 ---- a/src/args.c -+++ b/src/args.c -@@ -95,7 +95,9 @@ static gboolean mc_args__nouse_subshell = FALSE; - #endif /* ENABLE_SUBSHELL */ - static gboolean mc_args__show_datadirs = FALSE; - static gboolean mc_args__show_datadirs_extended = FALSE; -+#ifdef ENABLE_CONFIGURE_ARGS - static gboolean mc_args__show_configure_opts = FALSE; -+#endif - - static GOptionGroup *main_group; - -@@ -125,6 +127,7 @@ static const GOptionEntry argument_main_table[] = { - NULL - }, - -+#ifdef ENABLE_CONFIGURE_ARGS - /* show configure options */ - { - "configure-options", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, -@@ -132,6 +135,7 @@ static const GOptionEntry argument_main_table[] = { - N_("Print configure options"), - NULL - }, -+#endif - - { - "printwd", 'P', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING, -@@ -758,11 +762,13 @@ mc_args_show_info (void) - return FALSE; - } - -+#ifdef ENABLE_CONFIGURE_ARGS - if (mc_args__show_configure_opts) - { - show_configure_options (); - return FALSE; - } -+#endif - - return TRUE; - } -diff --git a/src/textconf.c b/src/textconf.c -index 1e0613e58..f39b9e028 100644 ---- a/src/textconf.c -+++ b/src/textconf.c -@@ -232,10 +232,12 @@ show_datadirs_extended (void) - - /* --------------------------------------------------------------------------------------------- */ - -+#ifdef ENABLE_CONFIGURE_ARGS - void - show_configure_options (void) - { - (void) printf ("%s\n", MC_CONFIGURE_ARGS); - } -+#endif - - /* --------------------------------------------------------------------------------------------- */ --- -2.23.0 -
meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch deleted +0 -110
110 lines not on this page · raw message
meta/recipes-extended/mc/mc_4.8.24.bb renamed from meta/recipes-extended/mc/mc_4.8.23.bb +2 -4
@@ -9,12 +9,10 @@ RRECOMMENDS_${PN} = "ncurses-terminfo" SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ file://0001-mc-replace-perl-w-with-use-warnings.patch \ - file://0001-Add-option-to-control-configure-args.patch \ - file://0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch \ file://nomandate.patch \ " -SRC_URI[md5sum] = "152927ac29cf0e61d7d019f261bb7d89" -SRC_URI[sha256sum] = "238c4552545dcf3065359bd50753abbb150c1b22ec5a36eaa02c82808293267d" +SRC_URI[md5sum] = "2621de1fa9058a9c41a4248becc969f9" +SRC_URI[sha256sum] = "cfcc4d0546d0c3a88645a8bf71612ed36647ea3264d973b1f28183a0c84bae34" inherit autotools gettext pkgconfig
Signature · 1 line
2.26.1
Re: [OE-core] [PATCH 08/17] mc: update to 4.8.24
Quoted 9 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- ...Add-option-to-control-configure-args.patch | 99 ---------------- ...29-configure.ac-drop-bundled-gettext.patch | 110 ------------------ .../mc/{mc_4.8.23.bb => mc_4.8.24.bb} | 6 +- 3 files changed, 2 insertions(+), 213 deletions(-) delete mode 100644 meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch delete mode 100644 meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch rename meta/recipes-extended/mc/{mc_4.8.23.bb => mc_4.8.24.bb} (88%)
https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/1843
Cheers,
Richard
PATCH 9/17 ghostscript: do not hardcode version in SRC_URI
In reply to Alexander Kanavin--- meta/recipes-extended/ghostscript/ghostscript_9.50.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
meta/recipes-extended/ghostscript/ghostscript_9.50.bb +5 -1
@@ -19,7 +19,11 @@ DEPENDS_class-native = "libpng-native" UPSTREAM_CHECK_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" -SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs950/${BPN}-${PV}.tar.gz \ +def gs_verdir(v): + return "".join(v.split(".")) + + +SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${@gs_verdir("${PV}")}/${BPN}-${PV}.tar.gz \ file://ghostscript-9.15-parallel-make.patch \ file://ghostscript-9.16-Werror-return-type.patch \ file://do-not-check-local-libpng-source.patch \
Signature · 1 line
2.26.1
PATCH 10/17 ghostscript: update 9.50 -> 9.52
In reply to Alexander KanavinDrop all custom objarch.h files; ghostscript nowadays generates that with autoconf.
Freetype can no longer be disabled.
Building out of source tree is broken.
---
.../do-not-check-local-libpng-source.patch | 37 ++++------
.../ghostscript/CVE-2019-14869-0001.patch | 70 -------------------
.../ghostscript/ghostscript/aarch64/objarch.h | 40 -----------
.../ghostscript/ghostscript/arm/objarch.h | 40 -----------
.../ghostscript/ghostscript/armeb/objarch.h | 40 -----------
.../ghostscript-9.02-genarch.patch | 38 ----------
.../ghostscript/ghostscript/i586/objarch.h | 41 -----------
.../ghostscript/microblaze/objarch.h | 40 -----------
.../ghostscript/microblazeel/objarch.h | 40 -----------
.../ghostscript/mipsarchn32eb/objarch.h | 40 -----------
.../ghostscript/mipsarchn32el/objarch.h | 40 -----------
.../ghostscript/mipsarchn64eb/objarch.h | 40 -----------
.../ghostscript/mipsarchn64el/objarch.h | 40 -----------
.../ghostscript/mipsarcho32eb/objarch.h | 40 -----------
.../ghostscript/mipsarcho32el/objarch.h | 40 -----------
.../ghostscript/ghostscript/nios2/objarch.h | 40 -----------
.../ghostscript/ghostscript/powerpc/objarch.h | 40 -----------
.../ghostscript/powerpc64/objarch.h | 40 -----------
.../ghostscript/powerpc64le/objarch.h | 40 -----------
.../ghostscript/ghostscript/x86-64/objarch.h | 40 -----------
...hostscript_9.50.bb => ghostscript_9.52.bb} | 19 ++---
21 files changed, 19 insertions(+), 826 deletions(-)
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-14869-0001.patch
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/aarch64/objarch.h
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/arm/objarch.h
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/armeb/objarch.h
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/i586/objarch.h
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/microblazeel/objarch.h
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/mipsarchn32eb/objarch.h
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/mipsarchn32el/objarch.h
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/mipsarchn64eb/objarch.h
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/mipsarchn64el/objarch.h
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/mipsarcho32eb/objarch.h
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/mipsarcho32el/objarch.h
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/nios2/objarch.h
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.h
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/powerpc64/objarch.h
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/powerpc64le/objarch.h
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/x86-64/objarch.h
rename meta/recipes-extended/ghostscript/{ghostscript_9.50.bb => ghostscript_9.52.bb} (89%)meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch +15 -22
@@ -1,7 +1,7 @@ -From a954bf29a5f906b3151dffbecb5856e02e1565da Mon Sep 17 00:00:00 2001 +From 2adaa7366064a8f18af864eda74e52877a89620c Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Mon, 18 Jan 2016 01:00:30 -0500 -Subject: [PATCH 03/10] configure.ac: do not check local png source +Subject: [PATCH] configure.ac: do not check local png source In oe-core, it did not need to compile local libpng source in ghostscript, so do not check local png
@@ -11,28 +11,21 @@ libpng library. Upstream-Status: Inappropriate [OE-Core specific] Signed-off-by: Hongxu Jia <[email protected]> + --- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 9341930..80a60b1 100644 +index 698abd3..e65ac8b 100644 --- a/configure.ac +++ b/configure.ac -@@ -1114,11 +1114,11 @@ AC_SUBST(ZLIBDIR) - AC_SUBST(FT_SYS_ZLIB) - - dnl png for the png output device; it also requires zlib --LIBPNGDIR=src -+LIBPNGDIR=$srcdir/libpng - PNGDEVS='' - PNGDEVS_ALL='png48 png16m pnggray pngmono pngmonod png256 png16 pngalpha' - AC_MSG_CHECKING([for local png library source]) --if test -f $srcdir/libpng/pngread.c; then -+if false; then - AC_MSG_RESULT([yes]) - SHARE_LIBPNG=0 - LIBPNGDIR=$srcdir/libpng --- -1.8.3.1 - +@@ -1241,7 +1241,7 @@ else + PNGDEVS='' + PNGDEVS_ALL='png48 png16m pnggray pngmono pngmonod png256 png16 pngalpha' + AC_MSG_CHECKING([for local png library source]) +- if test -f $srcdir/libpng/pngread.c; then ++ if false; then + AC_MSG_RESULT([yes]) + SHARE_LIBPNG=0 + LIBPNGDIR=$srcdir/libpng
meta/recipes-extended/ghostscript/ghostscript/CVE-2019-14869-0001.patch deleted +0 -70
70 lines not on this page · raw message
meta/recipes-extended/ghostscript/ghostscript/aarch64/objarch.h deleted +0 -40
@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 8 -#define ARCH_ALIGN_PTR_MOD 8 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 3 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 8 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/ghostscript/arm/objarch.h deleted +0 -40
@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 4 -#define ARCH_ALIGN_PTR_MOD 4 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 2 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 4 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/ghostscript/armeb/objarch.h deleted +0 -40
@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 4 -#define ARCH_ALIGN_PTR_MOD 4 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 2 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 4 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 1 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch deleted +0 -38
@@ -1,38 +0,0 @@ -From c076d0fc970f190f723018258790c79b59daba2e Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <[email protected]> -Date: Sat, 11 May 2019 21:20:27 +0800 -Subject: [PATCH] not generate objarch.h at compile time - -Import patch from windriver linux for cross compilation, and split -patches into oe way under different directories such as i586, powerpc etc -according to Richard's opinion. - -Upstream-Status: Pending - -Signed-off-by: Kang Kai <[email protected]> -Signed-off-by: Wenzong Fan <[email protected]> - -Rebase to 9.27 -Signed-off-by: Hongxu Jia <[email protected]> ---- - base/lib.mak | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/base/lib.mak b/base/lib.mak -index 3ed088a..5af2b43 100644 ---- a/base/lib.mak -+++ b/base/lib.mak -@@ -87,8 +87,8 @@ arch_h=$(GLGEN)arch.h - stdpre_h=$(GLSRC)stdpre.h - stdint__h=$(GLSRC)stdint_.h - --$(GLGEN)arch.h : $(GENARCH_XE) -- $(EXP)$(GENARCH_XE) $(GLGEN)arch.h $(TARGET_ARCH_FILE) -+##$(GLGEN)arch.h : $(GENARCH_XE) -+## $(EXP)$(GENARCH_XE) $(GLGEN)arch.h $(TARGET_ARCH_FILE) - - # Platform interfaces - --- -2.7.4 -
meta/recipes-extended/ghostscript/ghostscript/i586/objarch.h deleted +0 -41
41 lines not on this page · raw message
meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h deleted +0 -40
@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 4 -#define ARCH_ALIGN_PTR_MOD 4 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 4 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 2 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 4 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 1 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/ghostscript/microblazeel/objarch.h deleted +0 -40
@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 4 -#define ARCH_ALIGN_PTR_MOD 4 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 4 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 2 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 4 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/ghostscript/mipsarchn32eb/objarch.h deleted +0 -40
@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 8 -#define ARCH_ALIGN_PTR_MOD 8 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 3 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 8 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 1 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/ghostscript/mipsarchn32el/objarch.h deleted +0 -40
@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 8 -#define ARCH_ALIGN_PTR_MOD 8 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 3 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 8 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/ghostscript/mipsarchn64eb/objarch.h deleted +0 -40
@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 8 -#define ARCH_ALIGN_PTR_MOD 8 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 3 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 8 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 1 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/ghostscript/mipsarchn64el/objarch.h deleted +0 -40
@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 8 -#define ARCH_ALIGN_PTR_MOD 8 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 3 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 8 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/ghostscript/mipsarcho32eb/objarch.h deleted +0 -40
@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 4 -#define ARCH_ALIGN_PTR_MOD 4 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 2 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 4 -#define ARCH_SIZEOF_PTR 4 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 1 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/ghostscript/mipsarcho32el/objarch.h deleted +0 -40
@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 4 -#define ARCH_ALIGN_PTR_MOD 4 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 2 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 4 -#define ARCH_SIZEOF_PTR 4 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/ghostscript/nios2/objarch.h deleted +0 -40
@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 4 -#define ARCH_ALIGN_PTR_MOD 4 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 4 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 2 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 4 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.h deleted +0 -40
@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 4 -#define ARCH_ALIGN_PTR_MOD 4 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 2 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 4 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 1 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/ghostscript/powerpc64/objarch.h deleted +0 -40
@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 8 -#define ARCH_ALIGN_PTR_MOD 8 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 3 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 8 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 1 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/ghostscript/powerpc64le/objarch.h deleted +0 -40
@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 8 -#define ARCH_ALIGN_PTR_MOD 8 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 3 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 8 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/ghostscript/x86-64/objarch.h deleted +0 -40
@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 8 -#define ARCH_ALIGN_PTR_MOD 8 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 3 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 8 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/ghostscript_9.52.bb renamed from meta/recipes-extended/ghostscript/ghostscript_9.50.bb +4 -15
@@ -29,13 +29,10 @@ SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/d file://do-not-check-local-libpng-source.patch \ file://avoid-host-contamination.patch \ file://mkdir-p.patch \ - file://CVE-2019-14869-0001.patch \ " SRC_URI = "${SRC_URI_BASE} \ file://ghostscript-9.21-prevent_recompiling.patch \ - file://ghostscript-9.02-genarch.patch \ - file://objarch.h \ file://cups-no-gcrypt.patch \ "
@@ -44,8 +41,8 @@ SRC_URI_class-native = "${SRC_URI_BASE} \ file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \ " -SRC_URI[md5sum] = "00970cf622bd5b46f68eec9383753870" -SRC_URI[sha256sum] = "0f53e89fd647815828fc5171613e860e8535b68f7afbc91bf89aee886769ce89" +SRC_URI[md5sum] = "0f6964ab9b83a63b7e373f136243f901" +SRC_URI[sha256sum] = "c2501d8e8e0814c4a5aa7e443e230e73d7af7f70287546f7b697e5ef49e32176" # Put something like #
@@ -76,7 +73,7 @@ EXTRA_OECONF_class-native = "--without-x --with-system-libtiff=no \ --without-jbig2dec --without-libpaper \ --with-fontpath=${datadir}/fonts \ --without-libidn --disable-fontconfig \ - --disable-freetype --disable-cups" + --enable-freetype --disable-cups " # This has been fixed upstream but for now we need to subvert the check for time.h # http://bugs.ghostscript.com/show_bug.cgi?id=692443
@@ -84,15 +81,7 @@ EXTRA_OECONF_class-native = "--without-x --with-system-libtiff=no \ CFLAGS += "-DHAVE_SYS_TIME_H=1" BUILD_CFLAGS += "-DHAVE_SYS_TIME_H=1" -inherit autotools - -do_configure_prepend () { - mkdir -p obj - mkdir -p soobj - if [ -e ${WORKDIR}/objarch.h ]; then - cp ${WORKDIR}/objarch.h obj/arch.h - fi -} +inherit autotools-brokensep do_configure_append () { # copy tools from the native ghostscript build
Signature · 1 line
2.26.1
Re: [OE-core] [PATCH 10/17] ghostscript: update 9.50 -> 9.52
Quoted 3 lines · Alexander Kanavin
Drop all custom
objarch.hfiles; ghostscript nowadays generates that with autoconf.
they were generated in past too, but they were not cross compiler safe. has that changed ?
Quoted 1,070 lines
Freetype can no longer be disabled.
Building out of source tree is broken.
Signed-off-by Alexander Kanavin <[email protected]>--- .../do-not-check-local-libpng-source.patch | 37 ++++------ .../ghostscript/CVE-2019-14869-0001.patch | 70 ------------------- .../ghostscript/ghostscript/aarch64/objarch.h | 40 ----------- .../ghostscript/ghostscript/arm/objarch.h | 40 ----------- .../ghostscript/ghostscript/armeb/objarch.h | 40 ----------- .../ghostscript-9.02-genarch.patch | 38 ---------- .../ghostscript/ghostscript/i586/objarch.h | 41 ----------- .../ghostscript/microblaze/objarch.h | 40 ----------- .../ghostscript/microblazeel/objarch.h | 40 ----------- .../ghostscript/mipsarchn32eb/objarch.h | 40 ----------- .../ghostscript/mipsarchn32el/objarch.h | 40 ----------- .../ghostscript/mipsarchn64eb/objarch.h | 40 ----------- .../ghostscript/mipsarchn64el/objarch.h | 40 ----------- .../ghostscript/mipsarcho32eb/objarch.h | 40 ----------- .../ghostscript/mipsarcho32el/objarch.h | 40 ----------- .../ghostscript/ghostscript/nios2/objarch.h | 40 ----------- .../ghostscript/ghostscript/powerpc/objarch.h | 40 ----------- .../ghostscript/powerpc64/objarch.h | 40 ----------- .../ghostscript/powerpc64le/objarch.h | 40 ----------- .../ghostscript/ghostscript/x86-64/objarch.h | 40 ----------- ...hostscript_9.50.bb => ghostscript_9.52.bb} | 19 ++--- 21 files changed, 19 insertions(+), 826 deletions(-)delete mode 100644
meta/recipes-extended/ghostscript/ghostscript/CVE-2019-14869-0001.patchdelete mode 100644meta/recipes-extended/ghostscript/ghostscript/aarch64/objarch.hdelete mode 100644meta/recipes-extended/ghostscript/ghostscript/arm/objarch.hdelete mode 100644meta/recipes-extended/ghostscript/ghostscript/armeb/objarch.hdelete mode 100644meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patchdelete mode 100644meta/recipes-extended/ghostscript/ghostscript/i586/objarch.hdelete mode 100644meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.hdelete mode 100644meta/recipes-extended/ghostscript/ghostscript/microblazeel/objarch.hdelete mode 100644meta/recipes-extended/ghostscript/ghostscript/mipsarchn32eb/objarch.hdelete mode 100644meta/recipes-extended/ghostscript/ghostscript/mipsarchn32el/objarch.hdelete mode 100644meta/recipes-extended/ghostscript/ghostscript/mipsarchn64eb/objarch.hdelete mode 100644meta/recipes-extended/ghostscript/ghostscript/mipsarchn64el/objarch.hdelete mode 100644meta/recipes-extended/ghostscript/ghostscript/mipsarcho32eb/objarch.hdelete mode 100644meta/recipes-extended/ghostscript/ghostscript/mipsarcho32el/objarch.hdelete mode 100644meta/recipes-extended/ghostscript/ghostscript/nios2/objarch.hdelete mode 100644meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.hdelete mode 100644meta/recipes-extended/ghostscript/ghostscript/powerpc64/objarch.hdelete mode 100644meta/recipes-extended/ghostscript/ghostscript/powerpc64le/objarch.hdelete mode 100644meta/recipes-extended/ghostscript/ghostscript/x86-64/objarch.hrename meta/recipes-extended/ghostscript/{ghostscript_9.50.bb => ghostscript_9.52.bb} (89%)meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch +15
-22@@ -1,7 +1,7 @@ -From a954bf29a5f906b3151dffbecb5856e02e1565da Mon Sep 17 00:00:00 2001 +From 2adaa7366064a8f18af864eda74e52877a89620c Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Mon, 18 Jan 2016 01:00:30 -0500 -Subject: [PATCH 03/10] configure.ac: do not check local png source +Subject: [PATCH] configure.ac: do not check local png source In oe-core, it did not need to compile local libpng source in ghostscript, so do not check local png@@ -11,28 +11,21 @@ libpng library. Upstream-Status: Inappropriate [OE-Core specific] Signed-off-by: Hongxu Jia <[email protected]> + --- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 9341930..80a60b1 100644 +index 698abd3..e65ac8b 100644 --- a/configure.ac +++ b/configure.ac -@@ -1114,11 +1114,11 @@ AC_SUBST(ZLIBDIR) - AC_SUBST(FT_SYS_ZLIB) - - dnl png for the png output device; it also requires zlib --LIBPNGDIR=src -+LIBPNGDIR=$srcdir/libpng - PNGDEVS='' - PNGDEVS_ALL='png48 png16m pnggray pngmono pngmonod png256 png16 pngalpha' - AC_MSG_CHECKING([for local png library source]) --if test -f $srcdir/libpng/pngread.c; then -+if false; then - AC_MSG_RESULT([yes]) - SHARE_LIBPNG=0 - LIBPNGDIR=$srcdir/libpng --- -1.8.3.1 - +@@ -1241,7 +1241,7 @@ else + PNGDEVS='' + PNGDEVS_ALL='png48 png16m pnggray pngmono pngmonod png256 png16 pngalpha' + AC_MSG_CHECKING([for local png library source]) +- if test -f $srcdir/libpng/pngread.c; then ++ if false; then + AC_MSG_RESULT([yes]) + SHARE_LIBPNG=0 + LIBPNGDIR=$srcdir/libpngmeta/recipes-extended/ghostscript/ghostscript/CVE-2019-14869-0001.patch deleted +0
-70@@ -1,70 +0,0 @@ -From 485904772c5f0aa1140032746e5a0abfc40f4cef Mon Sep 17 00:00:00 2001 -From: Chris Liddell <[email protected]> -Date: Tue, 5 Nov 2019 09:45:27 +0000 -Subject: [PATCH] Bug 701841: remove .forceput from /.charkeys - -When loading Type 1 or Truetype fonts from disk, we attempt to extend the glyph -name table to include all identifiable glyph names from the Adobe Glyph List. - -In the case of Type 1 fonts, the font itself (almost always) marks the -CharStrings dictionary as read-only, hence we have to use .forceput for that -case. - -But for Truetype fonts, the CharStrings dictionary is created internally and is -not read-only until *after* we have fully populated it (including the extended -glyph names from the AGL), hence there is no need for .forceput, and no need to -carry the security risk of using it. - -Replace with regular put. - -CVE: CVE-2019-14869 -Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git] - -Signed-off-by: Stefan Ghinea <[email protected]> ---- - Resource/Init/gs_ttf.ps | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Resource/Init/gs_ttf.ps b/Resource/Init/gs_ttf.ps -index e34967d..5354ff0 100644 ---- a/Resource/Init/gs_ttf.ps -+++ b/Resource/Init/gs_ttf.ps -@@ -1301,7 +1301,7 @@ currentdict /.pickcmap_with_no_xlatmap .undef - TTFDEBUG { (\n1 setting alias: ) print dup ==only - ( to be the same as ) print 2 index //== exec } if - -- 7 index 2 index 3 -1 roll exch .forceput -+ 7 index 2 index 3 -1 roll exch put - } forall - pop pop pop - } -@@ -1319,7 +1319,7 @@ currentdict /.pickcmap_with_no_xlatmap .undef - exch pop - TTFDEBUG { (\n2 setting alias: ) print 1 index ==only - ( to use glyph index: ) print dup //== exec } if -- 5 index 3 1 roll .forceput -+ 5 index 3 1 roll put - //false - } - { -@@ -1336,7 +1336,7 @@ currentdict /.pickcmap_with_no_xlatmap .undef - { % CharStrings(dict) isunicode(boolean) cmap(dict) RAGL(dict) gname(name) codep(integer) gindex(integer) - TTFDEBUG { (\3 nsetting alias: ) print 1 index ==only - ( to be index: ) print dup //== exec } if -- exch pop 5 index 3 1 roll .forceput -+ exch pop 5 index 3 1 roll put - } - { - pop pop -@@ -1366,7 +1366,7 @@ currentdict /.pickcmap_with_no_xlatmap .undef - } ifelse - ] - TTFDEBUG { (Encoding: ) print dup === flush } if --} .bind executeonly odef % hides .forceput -+} .bind odef - - % ---------------- CIDFontType 2 font loading ---------------- % - --- -2.20.1 -meta/recipes-extended/ghostscript/ghostscript/aarch64/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 8 -#define ARCH_ALIGN_PTR_MOD 8 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 3 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 8 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1meta/recipes-extended/ghostscript/ghostscript/arm/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 4 -#define ARCH_ALIGN_PTR_MOD 4 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 2 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 4 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1meta/recipes-extended/ghostscript/ghostscript/armeb/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 4 -#define ARCH_ALIGN_PTR_MOD 4 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 2 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 4 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 1 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch deleted +0
-38@@ -1,38 +0,0 @@ -From c076d0fc970f190f723018258790c79b59daba2e Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <[email protected]> -Date: Sat, 11 May 2019 21:20:27 +0800 -Subject: [PATCH] not generate objarch.h at compile time - -Import patch from windriver linux for cross compilation, and split -patches into oe way under different directories such as i586, powerpc etc -according to Richard's opinion. - -Upstream-Status: Pending - -Signed-off-by: Kang Kai <[email protected]> -Signed-off-by: Wenzong Fan <[email protected]> - -Rebase to 9.27 -Signed-off-by: Hongxu Jia <[email protected]> ---- - base/lib.mak | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/base/lib.mak b/base/lib.mak -index 3ed088a..5af2b43 100644 ---- a/base/lib.mak -+++ b/base/lib.mak -@@ -87,8 +87,8 @@ arch_h=$(GLGEN)arch.h - stdpre_h=$(GLSRC)stdpre.h - stdint__h=$(GLSRC)stdint_.h - --$(GLGEN)arch.h : $(GENARCH_XE) -- $(EXP)$(GENARCH_XE) $(GLGEN)arch.h $(TARGET_ARCH_FILE) -+##$(GLGEN)arch.h : $(GENARCH_XE) -+## $(EXP)$(GENARCH_XE) $(GLGEN)arch.h $(TARGET_ARCH_FILE) - - # Platform interfaces - --- -2.7.4 -meta/recipes-extended/ghostscript/ghostscript/i586/objarch.h deleted +0
-41@@ -1,41 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 4 -#define ARCH_ALIGN_PTR_MOD 4 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 4 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 2 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 4 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1 -meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 4 -#define ARCH_ALIGN_PTR_MOD 4 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 4 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 2 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 4 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 1 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1meta/recipes-extended/ghostscript/ghostscript/microblazeel/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 4 -#define ARCH_ALIGN_PTR_MOD 4 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 4 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 2 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 4 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1meta/recipes-extended/ghostscript/ghostscript/mipsarchn32eb/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 8 -#define ARCH_ALIGN_PTR_MOD 8 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 3 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 8 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 1 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1meta/recipes-extended/ghostscript/ghostscript/mipsarchn32el/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 8 -#define ARCH_ALIGN_PTR_MOD 8 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 3 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 8 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1meta/recipes-extended/ghostscript/ghostscript/mipsarchn64eb/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 8 -#define ARCH_ALIGN_PTR_MOD 8 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 3 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 8 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 1 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1meta/recipes-extended/ghostscript/ghostscript/mipsarchn64el/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 8 -#define ARCH_ALIGN_PTR_MOD 8 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 3 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 8 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1meta/recipes-extended/ghostscript/ghostscript/mipsarcho32eb/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 4 -#define ARCH_ALIGN_PTR_MOD 4 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 2 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 4 -#define ARCH_SIZEOF_PTR 4 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 1 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1meta/recipes-extended/ghostscript/ghostscript/mipsarcho32el/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 4 -#define ARCH_ALIGN_PTR_MOD 4 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 2 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 4 -#define ARCH_SIZEOF_PTR 4 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1meta/recipes-extended/ghostscript/ghostscript/nios2/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 4 -#define ARCH_ALIGN_PTR_MOD 4 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 4 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 2 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 4 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 4 -#define ARCH_ALIGN_PTR_MOD 4 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 2 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 4 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 1 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1meta/recipes-extended/ghostscript/ghostscript/powerpc64/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 8 -#define ARCH_ALIGN_PTR_MOD 8 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 3 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 8 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 1 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1meta/recipes-extended/ghostscript/ghostscript/powerpc64le/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 8 -#define ARCH_ALIGN_PTR_MOD 8 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 3 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 8 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1meta/recipes-extended/ghostscript/ghostscript/x86-64/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 8 -#define ARCH_ALIGN_PTR_MOD 8 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 3 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 8 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1meta/recipes-extended/ghostscript/ghostscript_9.52.bb renamed from meta/recipes-extended/ghostscript/ghostscript_9.50.bb +4
-15@@ -29,13 +29,10 @@ SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/d file://do-not-check-local-libpng-source.patch \ file://avoid-host-contamination.patch \ file://mkdir-p.patch \ - file://CVE-2019-14869-0001.patch \ " SRC_URI = "${SRC_URI_BASE} \ file://ghostscript-9.21-prevent_recompiling.patch \ - file://ghostscript-9.02-genarch.patch \ - file://objarch.h \ file://cups-no-gcrypt.patch \ "@@ -44,8 +41,8 @@ SRC_URI_class-native = "${SRC_URI_BASE} \ file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \ " -SRC_URI[md5sum] = "00970cf622bd5b46f68eec9383753870" -SRC_URI[sha256sum] = "0f53e89fd647815828fc5171613e860e8535b68f7afbc91bf89aee886769ce89" +SRC_URI[md5sum] = "0f6964ab9b83a63b7e373f136243f901" +SRC_URI[sha256sum] = "c2501d8e8e0814c4a5aa7e443e230e73d7af7f70287546f7b697e5ef49e32176" # Put something like #@@ -76,7 +73,7 @@ EXTRA_OECONF_class-native = "--without-x --with-system-libtiff=no \ --without-jbig2dec --without-libpaper \ --with-fontpath=${datadir}/fonts \ --without-libidn --disable-fontconfig \ - --disable-freetype --disable-cups" + --enable-freetype --disable-cups " # This has been fixed upstream but for now we need to subvert the check for time.h # http://bugs.ghostscript.com/show_bug.cgi?id=692443@@ -84,15 +81,7 @@ EXTRA_OECONF_class-native = "--without-x --with-system-libtiff=no \ CFLAGS += "-DHAVE_SYS_TIME_H=1" BUILD_CFLAGS += "-DHAVE_SYS_TIME_H=1" -inherit autotools - -do_configure_prepend () { - mkdir -p obj - mkdir -p soobj - if [ -e ${WORKDIR}/objarch.h ]; then - cp ${WORKDIR}/objarch.h obj/arch.h - fi -} +inherit autotools-brokensep do_configure_append () { # copy tools from the native ghostscript build
Re: [OE-core] [PATCH 10/17] ghostscript: update 9.50 -> 9.52
As far as I understand, yes:
This seems to be cross-compiler safe to me: $host does not match $build (which implies the block is meant for cross compile scenarios), and the macros are all determined via AC_CHECK_SIZEOF/AC_CHECK_ALIGNOF which are cross compile safe.
https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/Generic-Compiler-Characteristics.html
Alex
Quoted 1,163 lines · Khem Raj
they were generated in past too, but they were not cross compiler safe. has that changed ?
Quoted 28 lines
Freetype can no longer be disabled.
Building out of source tree is broken.
Signed-off-by Alexander Kanavin <[email protected]>--- .../do-not-check-local-libpng-source.patch | 37 ++++------ .../ghostscript/CVE-2019-14869-0001.patch | 70 ------------------- .../ghostscript/ghostscript/aarch64/objarch.h | 40 ----------- .../ghostscript/ghostscript/arm/objarch.h | 40 ----------- .../ghostscript/ghostscript/armeb/objarch.h | 40 ----------- .../ghostscript-9.02-genarch.patch | 38 ---------- .../ghostscript/ghostscript/i586/objarch.h | 41 ----------- .../ghostscript/microblaze/objarch.h | 40 ----------- .../ghostscript/microblazeel/objarch.h | 40 ----------- .../ghostscript/mipsarchn32eb/objarch.h | 40 ----------- .../ghostscript/mipsarchn32el/objarch.h | 40 ----------- .../ghostscript/mipsarchn64eb/objarch.h | 40 ----------- .../ghostscript/mipsarchn64el/objarch.h | 40 ----------- .../ghostscript/mipsarcho32eb/objarch.h | 40 ----------- .../ghostscript/mipsarcho32el/objarch.h | 40 ----------- .../ghostscript/ghostscript/nios2/objarch.h | 40 ----------- .../ghostscript/ghostscript/powerpc/objarch.h | 40 ----------- .../ghostscript/powerpc64/objarch.h | 40 ----------- .../ghostscript/powerpc64le/objarch.h | 40 ----------- .../ghostscript/ghostscript/x86-64/objarch.h | 40 ----------- ...hostscript_9.50.bb => ghostscript_9.52.bb} | 19 ++--- 21 files changed, 19 insertions(+), 826 deletions(-)Quoted 1 line
delete mode 100644
meta/recipes-extended/ghostscript/ghostscript/CVE-2019-14869-0001.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ghostscript/ghostscript/aarch64/objarch.hQuoted 1 line
delete mode 100644
meta/recipes-extended/ghostscript/ghostscript/arm/objarch.hQuoted 1 line
delete mode 100644
meta/recipes-extended/ghostscript/ghostscript/armeb/objarch.hQuoted 1 line
delete mode 100644
meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ghostscript/ghostscript/i586/objarch.hQuoted 1 line
delete mode 100644
meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.hQuoted 1 line
delete mode 100644
meta/recipes-extended/ghostscript/ghostscript/microblazeel/objarch.hQuoted 1 line
delete mode 100644
meta/recipes-extended/ghostscript/ghostscript/mipsarchn32eb/objarch.hQuoted 1 line
delete mode 100644
meta/recipes-extended/ghostscript/ghostscript/mipsarchn32el/objarch.hQuoted 1 line
delete mode 100644
meta/recipes-extended/ghostscript/ghostscript/mipsarchn64eb/objarch.hQuoted 1 line
delete mode 100644
meta/recipes-extended/ghostscript/ghostscript/mipsarchn64el/objarch.hQuoted 1 line
delete mode 100644
meta/recipes-extended/ghostscript/ghostscript/mipsarcho32eb/objarch.hQuoted 1 line
delete mode 100644
meta/recipes-extended/ghostscript/ghostscript/mipsarcho32el/objarch.hQuoted 1 line
delete mode 100644
meta/recipes-extended/ghostscript/ghostscript/nios2/objarch.hQuoted 1 line
delete mode 100644
meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.hQuoted 1 line
delete mode 100644
meta/recipes-extended/ghostscript/ghostscript/powerpc64/objarch.hQuoted 1 line
delete mode 100644
meta/recipes-extended/ghostscript/ghostscript/powerpc64le/objarch.hQuoted 1 line
delete mode 100644
meta/recipes-extended/ghostscript/ghostscript/x86-64/objarch.hQuoted 1 line
rename meta/recipes-extended/ghostscript/{ghostscript_9.50.bb =>
ghostscript_9.52.bb} (89%)
Quoted 2 lines
diff --git
a/meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patchb/meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patchQuoted 2 lines
index
5834ffaf9f..a9afb9948c100644
---
a/meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patchQuoted 1 line
+++
b/meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patchQuoted 24 lines
meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch +6
-5@@ -1,7 +1,7 @@ -From a954bf29a5f906b3151dffbecb5856e02e1565da Mon Sep 17 00:00:00 2001 +From 2adaa7366064a8f18af864eda74e52877a89620c Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Mon, 18 Jan 2016 01:00:30 -0500 -Subject: [PATCH 03/10] configure.ac: do not check local png source +Subject: [PATCH] configure.ac: do not check local png source In oe-core, it did not need to compile local libpng source in ghostscript, so do not check local png@@ -11,28 +11,21 @@ libpng library. Upstream-Status: Inappropriate [OE-Core specific] Signed-off-by: Hongxu Jia <[email protected]> + --- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 9341930..80a60b1 100644 +index 698abd3..e65ac8b 100644meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch libpng library. · line 29
Quoted 10 lines
meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch +0
-8--- a/configure.ac +++ b/configure.ac -@@ -1114,11 +1114,11 @@ AC_SUBST(ZLIBDIR) - AC_SUBST(FT_SYS_ZLIB) - - dnl png for the png output device; it also requires zlib --LIBPNGDIR=src -+LIBPNGDIR=$srcdir/libpng - PNGDEVS='' - PNGDEVS_ALL='png48 png16m pnggray pngmono pngmonod png256 png16pngalpha'
meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch libpng library.
Quoted 12 lines
meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch +3
-9- AC_MSG_CHECKING([for local png library source]) --if test -f $srcdir/libpng/pngread.c; then -+if false; then - AC_MSG_RESULT([yes]) - SHARE_LIBPNG=0 - LIBPNGDIR=$srcdir/libpng --- -1.8.3.1 - +@@ -1241,7 +1241,7 @@ else + PNGDEVS='' + PNGDEVS_ALL='png48 png16m pnggray pngmono pngmonod png256 png16pngalpha'
Quoted 7 lines
meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch +6
-0+ AC_MSG_CHECKING([for local png library source]) +- if test -f $srcdir/libpng/pngread.c; then ++ if false; then + AC_MSG_RESULT([yes]) + SHARE_LIBPNG=0 + LIBPNGDIR=$srcdir/libpngdiff --git
a/meta/recipes-extended/ghostscript/ghostscript/CVE-2019-14869-0001.patchb/meta/recipes-extended/ghostscript/ghostscript/CVE-2019-14869-0001.patchQuoted 3 lines
deleted file mode 100644
index 715ec1c450..0000000000
---
a/meta/recipes-extended/ghostscript/ghostscript/CVE-2019-14869-0001.patchmeta/recipes-extended/ghostscript/ghostscript/CVE-2019-14869-0001.patch line 6
Quoted 8 lines
+++
/dev/nullmeta/recipes-extended/ghostscript/ghostscript/CVE-2019-14869-0001.patch deleted +0
-6@@ -1,70 +0,0 @@ -From 485904772c5f0aa1140032746e5a0abfc40f4cef Mon Sep 17 00:00:00 2001 -From: Chris Liddell <[email protected]> -Date: Tue, 5 Nov 2019 09:45:27 +0000 -Subject: [PATCH] Bug 701841: remove .forceput from /.charkeys - -When loading Type 1 or Truetype fonts from disk, we attempt to extendthe glyph
Review line 7
Quoted 1 line
(quoted diff) +0
-1-name table to include all identifiable glyph names from the Adobe GlyphList.
meta/recipes-extended/ghostscript/ghostscript/CVE-2019-14869-0001.patch
Quoted 3 lines
meta/recipes-extended/ghostscript/ghostscript/CVE-2019-14869-0001.patch deleted +0
-3- -In the case of Type 1 fonts, the font itself (almost always) marks the -CharStrings dictionary as read-only, hence we have to use .forceput forthat
meta/recipes-extended/ghostscript/ghostscript/CVE-2019-14869-0001.patch
Quoted 3 lines
meta/recipes-extended/ghostscript/ghostscript/CVE-2019-14869-0001.patch deleted +0
-3-case. - -But for Truetype fonts, the CharStrings dictionary is createdinternally and is
Review line 14
Quoted 1 line
(quoted diff) +0
-1-not read-only until *after* we have fully populated it (including theextended
Review line 15
Quoted 1 line
(quoted diff) +0
-1-glyph names from the AGL), hence there is no need for .forceput, and noneed to
Quoted 26 lines
meta/recipes-extended/ghostscript/ghostscript/CVE-2019-14869-0001.patch deleted +0
-26-carry the security risk of using it. - -Replace with regular put. - -CVE: CVE-2019-14869 -Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git] - -Signed-off-by: Stefan Ghinea <[email protected]> ---- - Resource/Init/gs_ttf.ps | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Resource/Init/gs_ttf.ps b/Resource/Init/gs_ttf.ps -index e34967d..5354ff0 100644 ---- a/Resource/Init/gs_ttf.ps -+++ b/Resource/Init/gs_ttf.ps -@@ -1301,7 +1301,7 @@ currentdict /.pickcmap_with_no_xlatmap .undef - TTFDEBUG { (\n1 setting alias: ) print dup ==only - ( to be the same as ) print 2 index //== exec } if - -- 7 index 2 index 3 -1 roll exch .forceput -+ 7 index 2 index 3 -1 roll exch put - } forall - pop pop pop - } -@@ -1319,7 +1319,7 @@ currentdict /.pickcmap_with_no_xlatmap .undefmeta/recipes-extended/ghostscript/ghostscript/CVE-2019-14869-0001.patch
Quoted 10 lines
meta/recipes-extended/ghostscript/ghostscript/CVE-2019-14869-0001.patch deleted +0
-10- exch pop - TTFDEBUG { (\n2 setting alias: ) print 1 index ==only - ( to use glyph index: ) print dup //== exec } if -- 5 index 3 1 roll .forceput -+ 5 index 3 1 roll put - //false - } - { -@@ -1336,7 +1336,7 @@ currentdict /.pickcmap_with_no_xlatmap .undef - { % CharStrings(dict)isunicode(boolean) cmap(dict) RAGL(dict) gname(name) codep(integer) gindex(integer)
Quoted 19 lines
meta/recipes-extended/ghostscript/ghostscript/CVE-2019-14869-0001.patch deleted +0
-19- TTFDEBUG { (\3 nsetting alias: ) print 1 index ==only - ( to be index: ) print dup //== exec } if -- exch pop 5 index 3 1 roll .forceput -+ exch pop 5 index 3 1 roll put - } - { - pop pop -@@ -1366,7 +1366,7 @@ currentdict /.pickcmap_with_no_xlatmap .undef - } ifelse - ] - TTFDEBUG { (Encoding: ) print dup === flush } if --} .bind executeonly odef % hides .forceput -+} .bind odef - - % ---------------- CIDFontType 2 font loading ---------------- % - --- -2.20.1 -Quoted 1 line
diff --git
a/meta/recipes-extended/ghostscript/ghostscript/aarch64/objarch.hb/meta/recipes-extended/ghostscript/ghostscript/aarch64/objarch.hReview
Quoted 46 lines
deleted file mode 100644
index a05de29def..0000000000meta/recipes-extended/ghostscript/ghostscript/aarch64/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 8 -#define ARCH_ALIGN_PTR_MOD 8 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 3 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 8 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1(quoted diff) +0
-0
b/meta/recipes-extended/ghostscript/ghostscript/arm/objarch.hQuoted 45 lines
deleted file mode 100644
index e8772cd958..0000000000meta/recipes-extended/ghostscript/ghostscript/arm/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 4 -#define ARCH_ALIGN_PTR_MOD 4 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 2 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 4 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1Quoted 1 line
diff --git
a/meta/recipes-extended/ghostscript/ghostscript/armeb/objarch.hb/meta/recipes-extended/ghostscript/ghostscript/armeb/objarch.hQuoted 45 lines
deleted file mode 100644
index 359097f356..0000000000meta/recipes-extended/ghostscript/ghostscript/armeb/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 4 -#define ARCH_ALIGN_PTR_MOD 4 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 2 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 4 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 1 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1Quoted 1 line
diff --git
a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patchb/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patchQuoted 3 lines
deleted file mode 100644
index 7b70bb8e2c..0000000000
---
a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patchmeta/recipes-extended/ghostscript/ghostscript/armeb/objarch.h line 7
Quoted 9 lines
+++
/dev/nullmeta/recipes-extended/ghostscript/ghostscript/armeb/objarch.h deleted +0
-7@@ -1,38 +0,0 @@ -From c076d0fc970f190f723018258790c79b59daba2e Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <[email protected]> -Date: Sat, 11 May 2019 21:20:27 +0800 -Subject: [PATCH] not generate objarch.h at compile time - -Import patch from windriver linux for cross compilation, and split -patches into oe way under different directories such as i586, powerpcetc
Quoted 31 lines
meta/recipes-extended/ghostscript/ghostscript/armeb/objarch.h deleted +0
-31-according to Richard's opinion. - -Upstream-Status: Pending - -Signed-off-by: Kang Kai <[email protected]> -Signed-off-by: Wenzong Fan <[email protected]> - -Rebase to 9.27 -Signed-off-by: Hongxu Jia <[email protected]> ---- - base/lib.mak |4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/base/lib.mak b/base/lib.mak -index 3ed088a..5af2b43 100644 ---- a/base/lib.mak -+++ b/base/lib.mak -@@ -87,8 +87,8 @@ arch_h=$(GLGEN)arch.h - stdpre_h=$(GLSRC)stdpre.h - stdint__h=$(GLSRC)stdint_.h - --$(GLGEN)arch.h : $(GENARCH_XE) -- $(EXP)$(GENARCH_XE) $(GLGEN)arch.h $(TARGET_ARCH_FILE) -+##$(GLGEN)arch.h : $(GENARCH_XE) -+## $(EXP)$(GENARCH_XE) $(GLGEN)arch.h $(TARGET_ARCH_FILE) - - # Platform interfaces - --- -2.7.4 -Quoted 1 line
diff --git
a/meta/recipes-extended/ghostscript/ghostscript/i586/objarch.hb/meta/recipes-extended/ghostscript/ghostscript/i586/objarch.hQuoted 46 lines
deleted file mode 100644
index 5817b7a6d7..0000000000meta/recipes-extended/ghostscript/ghostscript/i586/objarch.h deleted +0
-41@@ -1,41 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 4 -#define ARCH_ALIGN_PTR_MOD 4 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 4 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 2 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 4 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1 -Quoted 1 line
diff --git
a/meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.hb/meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.hQuoted 45 lines
deleted file mode 100644
index 63232fdfa6..0000000000meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 4 -#define ARCH_ALIGN_PTR_MOD 4 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 4 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 2 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 4 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 1 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1Quoted 1 line
diff --git
a/meta/recipes-extended/ghostscript/ghostscript/microblazeel/objarch.hb/meta/recipes-extended/ghostscript/ghostscript/microblazeel/objarch.hQuoted 3 lines
deleted file mode 100644
index 3ec8101681..0000000000
---
a/meta/recipes-extended/ghostscript/ghostscript/microblazeel/objarch.hQuoted 42 lines
+++
/dev/nullmeta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 4 -#define ARCH_ALIGN_PTR_MOD 4 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 4 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 2 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 4 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1Quoted 1 line
diff --git
a/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32eb/objarch.hb/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32eb/objarch.hQuoted 3 lines
deleted file mode 100644
index 0d0a16bfa3..0000000000
---
a/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32eb/objarch.hQuoted 42 lines
+++
/dev/nullmeta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 8 -#define ARCH_ALIGN_PTR_MOD 8 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 3 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 8 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 1 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1Quoted 1 line
diff --git
a/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32el/objarch.hb/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32el/objarch.hQuoted 3 lines
deleted file mode 100644
index a05de29def..0000000000
---
a/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32el/objarch.hQuoted 42 lines
+++
/dev/nullmeta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 8 -#define ARCH_ALIGN_PTR_MOD 8 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 3 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 8 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1Quoted 1 line
diff --git
a/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64eb/objarch.hb/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64eb/objarch.hQuoted 3 lines
deleted file mode 100644
index 0d0a16bfa3..0000000000
---
a/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64eb/objarch.hQuoted 42 lines
+++
/dev/nullmeta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 8 -#define ARCH_ALIGN_PTR_MOD 8 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 3 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 8 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 1 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1Quoted 1 line
diff --git
a/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64el/objarch.hb/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64el/objarch.hQuoted 3 lines
deleted file mode 100644
index a05de29def..0000000000
---
a/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64el/objarch.hQuoted 42 lines
+++
/dev/nullmeta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 8 -#define ARCH_ALIGN_PTR_MOD 8 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 3 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 8 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1Quoted 1 line
diff --git
a/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32eb/objarch.hb/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32eb/objarch.hQuoted 3 lines
deleted file mode 100644
index b8b637cca2..0000000000
---
a/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32eb/objarch.hQuoted 42 lines
+++
/dev/nullmeta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 4 -#define ARCH_ALIGN_PTR_MOD 4 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 2 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 4 -#define ARCH_SIZEOF_PTR 4 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 1 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1Quoted 1 line
diff --git
a/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32el/objarch.hb/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32el/objarch.hQuoted 3 lines
deleted file mode 100644
index 29f90ddf85..0000000000
---
a/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32el/objarch.hQuoted 42 lines
+++
/dev/nullmeta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 4 -#define ARCH_ALIGN_PTR_MOD 4 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 2 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 4 -#define ARCH_SIZEOF_PTR 4 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1Quoted 1 line
diff --git
a/meta/recipes-extended/ghostscript/ghostscript/nios2/objarch.hb/meta/recipes-extended/ghostscript/ghostscript/nios2/objarch.hQuoted 45 lines
deleted file mode 100644
index 3ec8101681..0000000000meta/recipes-extended/ghostscript/ghostscript/nios2/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 4 -#define ARCH_ALIGN_PTR_MOD 4 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 4 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 2 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 4 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1Quoted 1 line
diff --git
a/meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.hb/meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.hQuoted 45 lines
deleted file mode 100644
index 359097f356..0000000000meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 4 -#define ARCH_ALIGN_PTR_MOD 4 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 2 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 4 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 1 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1Quoted 1 line
diff --git
a/meta/recipes-extended/ghostscript/ghostscript/powerpc64/objarch.hb/meta/recipes-extended/ghostscript/ghostscript/powerpc64/objarch.hQuoted 45 lines
deleted file mode 100644
index 0d0a16bfa3..0000000000meta/recipes-extended/ghostscript/ghostscript/powerpc64/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 8 -#define ARCH_ALIGN_PTR_MOD 8 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 3 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 8 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 1 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1Quoted 1 line
diff --git
a/meta/recipes-extended/ghostscript/ghostscript/powerpc64le/objarch.hb/meta/recipes-extended/ghostscript/ghostscript/powerpc64le/objarch.hQuoted 45 lines
deleted file mode 100644
index a05de29def..0000000000meta/recipes-extended/ghostscript/ghostscript/powerpc64le/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 8 -#define ARCH_ALIGN_PTR_MOD 8 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 3 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 8 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1Quoted 1 line
diff --git
a/meta/recipes-extended/ghostscript/ghostscript/x86-64/objarch.hb/meta/recipes-extended/ghostscript/ghostscript/x86-64/objarch.hReview
Quoted 46 lines
deleted file mode 100644
index a05de29def..0000000000meta/recipes-extended/ghostscript/ghostscript/x86-64/objarch.h deleted +0
-40@@ -1,40 +0,0 @@ -/* Parameters derived from machine and compiler architecture. */ -/* This file is generated mechanically by genarch.c. */ - -/* ---------------- Scalar alignments ---------------- */ - -#define ARCH_ALIGN_SHORT_MOD 2 -#define ARCH_ALIGN_INT_MOD 4 -#define ARCH_ALIGN_LONG_MOD 8 -#define ARCH_ALIGN_PTR_MOD 8 -#define ARCH_ALIGN_FLOAT_MOD 4 -#define ARCH_ALIGN_DOUBLE_MOD 8 - -/* ---------------- Scalar sizes ---------------- */ - -#define ARCH_LOG2_SIZEOF_CHAR 0 -#define ARCH_LOG2_SIZEOF_SHORT 1 -#define ARCH_LOG2_SIZEOF_INT 2 -#define ARCH_LOG2_SIZEOF_LONG 3 -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#define ARCH_SIZEOF_PTR 8 -#define ARCH_SIZEOF_FLOAT 4 -#define ARCH_SIZEOF_DOUBLE 8 -#define ARCH_FLOAT_MANTISSA_BITS 24 -#define ARCH_DOUBLE_MANTISSA_BITS 53 - -/* ---------------- Unsigned max values ---------------- */ - -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) - -/* ---------------- Miscellaneous ---------------- */ - -#define ARCH_IS_BIG_ENDIAN 0 -#define ARCH_PTRS_ARE_SIGNED 0 -#define ARCH_FLOATS_ARE_IEEE 1 -#define ARCH_ARITH_RSHIFT 2 -#define ARCH_DIV_NEG_POS_TRUNCATES 1(quoted diff) +0
-0b/meta/recipes-extended/ghostscript/ghostscript_9.52.bb
meta/recipes-extended/ghostscript/ghostscript_9.52.bb SRC_URI_BASE = "
Quoted 7 lines
similarity index 89%
rename from meta/recipes-extended/ghostscript/ghostscript_9.50.bb rename to meta/recipes-extended/ghostscript/ghostscript_9.52.bb index5e8af8dc11..4cdb6e00d8100644meta/recipes-extended/ghostscript/ghostscript_9.52.bb renamed from meta/recipes-extended/ghostscript/ghostscript_9.50.bb +0
-0@@ -29,13 +29,10 @@ SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/d
Quoted 14 lines
meta/recipes-extended/ghostscript/ghostscript_9.52.bb renamed from meta/recipes-extended/ghostscript/ghostscript_9.50.bb +0
-3file://do-not-check-local-libpng-source.patch \ file://avoid-host-contamination.patch \ file://mkdir-p.patch \ - file://CVE-2019-14869-0001.patch \ " SRC_URI = "${SRC_URI_BASE} \ file://ghostscript-9.21-prevent_recompiling.patch \ - file://ghostscript-9.02-genarch.patch \ - file://objarch.h \ file://cups-no-gcrypt.patch \ "meta/recipes-extended/ghostscript/ghostscript_9.52.bb SRC_URI_class-native = "${SRC_URI_BASE} \ · line 41
Quoted 1 line
meta/recipes-extended/ghostscript/ghostscript_9.52.bb renamed from meta/recipes-extended/ghostscript/ghostscript_9.50.bb +0
-0@@ -44,8 +41,8 @@ SRC_URI_class-native = "${SRC_URI_BASE} \file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \
meta/recipes-extended/ghostscript/ghostscript_9.52.bb SRC_URI_class-native = "${SRC_URI_BASE} \
Quoted 4 lines
meta/recipes-extended/ghostscript/ghostscript_9.52.bb renamed from meta/recipes-extended/ghostscript/ghostscript_9.50.bb +0
-2" -SRC_URI[md5sum] = "00970cf622bd5b46f68eec9383753870" -SRC_URI[sha256sum] ="
0f53e89fd647815828fc5171613e860e8535b68f7afbc91bf89aee886769ce89"meta/recipes-extended/ghostscript/ghostscript_9.52.bb SRC_URI_class-native = "${SRC_URI_BASE} \ · line 45
Quoted 2 lines
meta/recipes-extended/ghostscript/ghostscript_9.52.bb renamed from meta/recipes-extended/ghostscript/ghostscript_9.50.bb +2
-0+SRC_URI[md5sum] = "0f6964ab9b83a63b7e373f136243f901" +SRC_URI[sha256sum] ="
c2501d8e8e0814c4a5aa7e443e230e73d7af7f70287546f7b697e5ef49e32176"meta/recipes-extended/ghostscript/ghostscript_9.52.bb EXTRA_OECONF_class-native = "--without-x
Quoted 4 lines
meta/recipes-extended/ghostscript/ghostscript_9.52.bb renamed from meta/recipes-extended/ghostscript/ghostscript_9.50.bb +0
-0# Put something like #@@ -76,7 +73,7 @@ EXTRA_OECONF_class-native = "--without-x--with-system-libtiff=no \
meta/recipes-extended/ghostscript/ghostscript_9.52.bb EXTRA_OECONF_class-native = "--without-x --with-system-libtiff=no \
Quoted 7 lines
meta/recipes-extended/ghostscript/ghostscript_9.52.bb renamed from meta/recipes-extended/ghostscript/ghostscript_9.50.bb +1
-1--without-jbig2dec --without-libpaper \ --with-fontpath=${datadir}/fonts \ --without-libidn --disable-fontconfig \ - --disable-freetype --disable-cups" + --enable-freetype --disable-cups " # This has been fixed upstream but for now we need to subvert thecheck for
time.hmeta/recipes-extended/ghostscript/ghostscript_9.52.bb EXTRA_OECONF_class-native = "--without-x
Quoted 2 lines
meta/recipes-extended/ghostscript/ghostscript_9.52.bb renamed from meta/recipes-extended/ghostscript/ghostscript_9.50.bb +0
-0# http://bugs.ghostscript.com/show_bug.cgi?id=692443@@ -84,15 +81,7 @@ EXTRA_OECONF_class-native = "--without-x--with-system-libtiff=no \
Quoted 20 lines
meta/recipes-extended/ghostscript/ghostscript_9.52.bb renamed from meta/recipes-extended/ghostscript/ghostscript_9.50.bb +1
-9CFLAGS += "-DHAVE_SYS_TIME_H=1" BUILD_CFLAGS += "-DHAVE_SYS_TIME_H=1" -inherit autotools - -do_configure_prepend () { - mkdir -p obj - mkdir -p soobj - if [ -e ${WORKDIR}/objarch.h ]; then - cp ${WORKDIR}/objarch.h obj/arch.h - fi -} +inherit autotools-brokensep do_configure_append () { # copy tools from the native ghostscript build
Re: [OE-core] [PATCH 10/17] ghostscript: update 9.50 -> 9.52
Quoted 8 lines · Alexander Kanavin
As far as I understand, yes:
This seems to be cross-compiler safe to me: $host does not match $build (which implies the block is meant for cross compile scenarios), and the macros are all determined via AC_CHECK_SIZEOF/AC_CHECK_ALIGNOF which are cross compile safe.
https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/Generic-Compiler-Characteristics.html
OK, thats good to know. Perhaps worth comparing the headers its generating for something like arm or mips on a 64bit build host and see if it matches with what cached headers had.
Quoted 1,204 lines
Alex
On Thu, 30 Apr 2020 at 17:48, Khem Raj <[email protected] <mailto:[email protected]>> wrote:
they were generated in past too, but they were not cross compiler safe. has that changed ? > Freetype can no longer be disabled. > > Building out of source tree is broken. > > Signed-off-by: Alexander Kanavin <[email protected] <mailto:[email protected]>> > --- > .../do-not-check-local-libpng-source.patch | 37 ++++------ > .../ghostscript/CVE-2019-14869-0001.patch | 70 ------------------- > .../ghostscript/ghostscript/aarch64/objarch.h | 40 ----------- > .../ghostscript/ghostscript/arm/objarch.h | 40 ----------- > .../ghostscript/ghostscript/armeb/objarch.h | 40 ----------- > .../ghostscript-9.02-genarch.patch | 38 ---------- > .../ghostscript/ghostscript/i586/objarch.h | 41 ----------- > .../ghostscript/microblaze/objarch.h | 40 ----------- > .../ghostscript/microblazeel/objarch.h | 40 ----------- > .../ghostscript/mipsarchn32eb/objarch.h | 40 ----------- > .../ghostscript/mipsarchn32el/objarch.h | 40 ----------- > .../ghostscript/mipsarchn64eb/objarch.h | 40 ----------- > .../ghostscript/mipsarchn64el/objarch.h | 40 ----------- > .../ghostscript/mipsarcho32eb/objarch.h | 40 ----------- > .../ghostscript/mipsarcho32el/objarch.h | 40 ----------- > .../ghostscript/ghostscript/nios2/objarch.h | 40 ----------- > .../ghostscript/ghostscript/powerpc/objarch.h | 40 ----------- > .../ghostscript/powerpc64/objarch.h | 40 ----------- > .../ghostscript/powerpc64le/objarch.h | 40 ----------- > .../ghostscript/ghostscript/x86-64/objarch.h | 40 ----------- > ...hostscript_9.50.bb <http://hostscript_9.50.bb> => ghostscript_9.52.bb <http://ghostscript_9.52.bb>} | 19 ++--- > 21 files changed, 19 insertions(+), 826 deletions(-) > delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-14869-0001.patch > delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/aarch64/objarch.h > delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/arm/objarch.h > delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/armeb/objarch.h > delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch > delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/i586/objarch.h > delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h > delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/microblazeel/objarch.h > delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/mipsarchn32eb/objarch.h > delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/mipsarchn32el/objarch.h > delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/mipsarchn64eb/objarch.h > delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/mipsarchn64el/objarch.h > delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/mipsarcho32eb/objarch.h > delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/mipsarcho32el/objarch.h > delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/nios2/objarch.h > delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.h > delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/powerpc64/objarch.h > delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/powerpc64le/objarch.h > delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/x86-64/objarch.h > rename meta/recipes-extended/ghostscript/{ghostscript_9.50.bb <http://ghostscript_9.50.bb> => ghostscript_9.52.bb <http://ghostscript_9.52.bb>} (89%) > > diff --git a/meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch b/meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch > index 5834ffaf9f..a9afb9948c 100644 > --- a/meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch > +++ b/meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch > @@ -1,7 +1,7 @@ > -From a954bf29a5f906b3151dffbecb5856e02e1565da Mon Sep 17 00:00:00 2001 > +From 2adaa7366064a8f18af864eda74e52877a89620c Mon Sep 17 00:00:00 2001 > From: Hongxu Jia <[email protected] <mailto:[email protected]>> > Date: Mon, 18 Jan 2016 01:00:30 -0500 > -Subject: [PATCH 03/10] configure.ac <http://configure.ac>: do not check local png source > +Subject: [PATCH] configure.ac <http://configure.ac>: do not check local png source > > In oe-core, it did not need to compile local libpng > source in ghostscript, so do not check local png > @@ -11,28 +11,21 @@ libpng library. > Upstream-Status: Inappropriate [OE-Core specific] > > Signed-off-by: Hongxu Jia <[email protected] <mailto:[email protected]>> > + > --- > - configure.ac <http://configure.ac> | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > + configure.ac <http://configure.ac> | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configure.ac <http://configure.ac> b/configure.ac <http://configure.ac> > -index 9341930..80a60b1 100644 > +index 698abd3..e65ac8b 100644 > --- a/configure.ac <http://configure.ac> > +++ b/configure.ac <http://configure.ac> > -@@ -1114,11 +1114,11 @@ AC_SUBST(ZLIBDIR) > - AC_SUBST(FT_SYS_ZLIB) > - > - dnl png for the png output device; it also requires zlib > --LIBPNGDIR=src > -+LIBPNGDIR=$srcdir/libpng > - PNGDEVS='' > - PNGDEVS_ALL='png48 png16m pnggray pngmono pngmonod png256 png16 pngalpha' > - AC_MSG_CHECKING([for local png library source]) > --if test -f $srcdir/libpng/pngread.c; then > -+if false; then > - AC_MSG_RESULT([yes]) > - SHARE_LIBPNG=0 > - LIBPNGDIR=$srcdir/libpng > --- > -1.8.3.1 > - > +@@ -1241,7 +1241,7 @@ else > + PNGDEVS='' > + PNGDEVS_ALL='png48 png16m pnggray pngmono pngmonod png256 png16 pngalpha' > + AC_MSG_CHECKING([for local png library source]) > +- if test -f $srcdir/libpng/pngread.c; then > ++ if false; then > + AC_MSG_RESULT([yes]) > + SHARE_LIBPNG=0 > + LIBPNGDIR=$srcdir/libpng > diff --git a/meta/recipes-extended/ghostscript/ghostscript/CVE-2019-14869-0001.patch b/meta/recipes-extended/ghostscript/ghostscript/CVE-2019-14869-0001.patch > deleted file mode 100644 > index 715ec1c450..0000000000 > --- a/meta/recipes-extended/ghostscript/ghostscript/CVE-2019-14869-0001.patch > +++ /dev/null > @@ -1,70 +0,0 @@ > -From 485904772c5f0aa1140032746e5a0abfc40f4cef Mon Sep 17 00:00:00 2001 > -From: Chris Liddell <[email protected] <mailto:[email protected]>> > -Date: Tue, 5 Nov 2019 09:45:27 +0000 > -Subject: [PATCH] Bug 701841: remove .forceput from /.charkeys > - > -When loading Type 1 or Truetype fonts from disk, we attempt to extend the glyph > -name table to include all identifiable glyph names from the Adobe Glyph List. > - > -In the case of Type 1 fonts, the font itself (almost always) marks the > -CharStrings dictionary as read-only, hence we have to use .forceput for that > -case. > - > -But for Truetype fonts, the CharStrings dictionary is created internally and is > -not read-only until *after* we have fully populated it (including the extended > -glyph names from the AGL), hence there is no need for .forceput, and no need to > -carry the security risk of using it. > - > -Replace with regular put. > - > -CVE: CVE-2019-14869 > -Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git <http://git.ghostscript.com/ghostpdl.git>] > - > -Signed-off-by: Stefan Ghinea <[email protected] <mailto:[email protected]>> > ---- > - Resource/Init/gs_ttf.ps <http://gs_ttf.ps> | 8 ++++---- > - 1 file changed, 4 insertions(+), 4 deletions(-) > - > -diff --git a/Resource/Init/gs_ttf.ps <http://gs_ttf.ps> b/Resource/Init/gs_ttf.ps <http://gs_ttf.ps> > -index e34967d..5354ff0 100644 > ---- a/Resource/Init/gs_ttf.ps <http://gs_ttf.ps> > -+++ b/Resource/Init/gs_ttf.ps <http://gs_ttf.ps> > -@@ -1301,7 +1301,7 @@ currentdict /.pickcmap_with_no_xlatmap .undef > - TTFDEBUG { (\n1 setting alias: ) print dup ==only > - ( to be the same as ) print 2 index //== exec } if > - > -- 7 index 2 index 3 -1 roll exch .forceput > -+ 7 index 2 index 3 -1 roll exch put > - } forall > - pop pop pop > - } > -@@ -1319,7 +1319,7 @@ currentdict /.pickcmap_with_no_xlatmap .undef > - exch pop > - TTFDEBUG { (\n2 setting alias: ) print 1 index ==only > - ( to use glyph index: ) print dup //== exec } if > -- 5 index 3 1 roll .forceput > -+ 5 index 3 1 roll put > - //false > - } > - { > -@@ -1336,7 +1336,7 @@ currentdict /.pickcmap_with_no_xlatmap .undef > - { % CharStrings(dict) isunicode(boolean) cmap(dict) RAGL(dict) gname(name) codep(integer) gindex(integer) > - TTFDEBUG { (\3 nsetting alias: ) print 1 index ==only > - ( to be index: ) print dup //== exec } if > -- exch pop 5 index 3 1 roll .forceput > -+ exch pop 5 index 3 1 roll put > - } > - { > - pop pop > -@@ -1366,7 +1366,7 @@ currentdict /.pickcmap_with_no_xlatmap .undef > - } ifelse > - ] > - TTFDEBUG { (Encoding: ) print dup === flush } if > --} .bind executeonly odef % hides .forceput > -+} .bind odef > - > - % ---------------- CIDFontType 2 font loading ---------------- % > - > --- > -2.20.1 > - > diff --git a/meta/recipes-extended/ghostscript/ghostscript/aarch64/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/aarch64/objarch.h > deleted file mode 100644 > index a05de29def..0000000000 > --- a/meta/recipes-extended/ghostscript/ghostscript/aarch64/objarch.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -/* Parameters derived from machine and compiler architecture. */ > -/* This file is generated mechanically by genarch.c. */ > - > - /* ---------------- Scalar alignments ---------------- */ > - > -#define ARCH_ALIGN_SHORT_MOD 2 > -#define ARCH_ALIGN_INT_MOD 4 > -#define ARCH_ALIGN_LONG_MOD 8 > -#define ARCH_ALIGN_PTR_MOD 8 > -#define ARCH_ALIGN_FLOAT_MOD 4 > -#define ARCH_ALIGN_DOUBLE_MOD 8 > - > - /* ---------------- Scalar sizes ---------------- */ > - > -#define ARCH_LOG2_SIZEOF_CHAR 0 > -#define ARCH_LOG2_SIZEOF_SHORT 1 > -#define ARCH_LOG2_SIZEOF_INT 2 > -#define ARCH_LOG2_SIZEOF_LONG 3 > -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 > -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 > -#define ARCH_SIZEOF_PTR 8 > -#define ARCH_SIZEOF_FLOAT 4 > -#define ARCH_SIZEOF_DOUBLE 8 > -#define ARCH_FLOAT_MANTISSA_BITS 24 > -#define ARCH_DOUBLE_MANTISSA_BITS 53 > - > - /* ---------------- Unsigned max values ---------------- */ > - > -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) > -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) > -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) > -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) > - > - /* ---------------- Miscellaneous ---------------- */ > - > -#define ARCH_IS_BIG_ENDIAN 0 > -#define ARCH_PTRS_ARE_SIGNED 0 > -#define ARCH_FLOATS_ARE_IEEE 1 > -#define ARCH_ARITH_RSHIFT 2 > -#define ARCH_DIV_NEG_POS_TRUNCATES 1 > diff --git a/meta/recipes-extended/ghostscript/ghostscript/arm/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/arm/objarch.h > deleted file mode 100644 > index e8772cd958..0000000000 > --- a/meta/recipes-extended/ghostscript/ghostscript/arm/objarch.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -/* Parameters derived from machine and compiler architecture. */ > -/* This file is generated mechanically by genarch.c. */ > - > - /* ---------------- Scalar alignments ---------------- */ > - > -#define ARCH_ALIGN_SHORT_MOD 2 > -#define ARCH_ALIGN_INT_MOD 4 > -#define ARCH_ALIGN_LONG_MOD 4 > -#define ARCH_ALIGN_PTR_MOD 4 > -#define ARCH_ALIGN_FLOAT_MOD 4 > -#define ARCH_ALIGN_DOUBLE_MOD 8 > - > - /* ---------------- Scalar sizes ---------------- */ > - > -#define ARCH_LOG2_SIZEOF_CHAR 0 > -#define ARCH_LOG2_SIZEOF_SHORT 1 > -#define ARCH_LOG2_SIZEOF_INT 2 > -#define ARCH_LOG2_SIZEOF_LONG 2 > -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 > -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 > -#define ARCH_SIZEOF_PTR 4 > -#define ARCH_SIZEOF_FLOAT 4 > -#define ARCH_SIZEOF_DOUBLE 8 > -#define ARCH_FLOAT_MANTISSA_BITS 24 > -#define ARCH_DOUBLE_MANTISSA_BITS 53 > - > - /* ---------------- Unsigned max values ---------------- */ > - > -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) > -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) > -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) > -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) > - > - /* ---------------- Miscellaneous ---------------- */ > - > -#define ARCH_IS_BIG_ENDIAN 0 > -#define ARCH_PTRS_ARE_SIGNED 0 > -#define ARCH_FLOATS_ARE_IEEE 1 > -#define ARCH_ARITH_RSHIFT 2 > -#define ARCH_DIV_NEG_POS_TRUNCATES 1 > diff --git a/meta/recipes-extended/ghostscript/ghostscript/armeb/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/armeb/objarch.h > deleted file mode 100644 > index 359097f356..0000000000 > --- a/meta/recipes-extended/ghostscript/ghostscript/armeb/objarch.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -/* Parameters derived from machine and compiler architecture. */ > -/* This file is generated mechanically by genarch.c. */ > - > - /* ---------------- Scalar alignments ---------------- */ > - > -#define ARCH_ALIGN_SHORT_MOD 2 > -#define ARCH_ALIGN_INT_MOD 4 > -#define ARCH_ALIGN_LONG_MOD 4 > -#define ARCH_ALIGN_PTR_MOD 4 > -#define ARCH_ALIGN_FLOAT_MOD 4 > -#define ARCH_ALIGN_DOUBLE_MOD 8 > - > - /* ---------------- Scalar sizes ---------------- */ > - > -#define ARCH_LOG2_SIZEOF_CHAR 0 > -#define ARCH_LOG2_SIZEOF_SHORT 1 > -#define ARCH_LOG2_SIZEOF_INT 2 > -#define ARCH_LOG2_SIZEOF_LONG 2 > -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 > -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 > -#define ARCH_SIZEOF_PTR 4 > -#define ARCH_SIZEOF_FLOAT 4 > -#define ARCH_SIZEOF_DOUBLE 8 > -#define ARCH_FLOAT_MANTISSA_BITS 24 > -#define ARCH_DOUBLE_MANTISSA_BITS 53 > - > - /* ---------------- Unsigned max values ---------------- */ > - > -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) > -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) > -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) > -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) > - > - /* ---------------- Miscellaneous ---------------- */ > - > -#define ARCH_IS_BIG_ENDIAN 1 > -#define ARCH_PTRS_ARE_SIGNED 0 > -#define ARCH_FLOATS_ARE_IEEE 1 > -#define ARCH_ARITH_RSHIFT 2 > -#define ARCH_DIV_NEG_POS_TRUNCATES 1 > diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch > deleted file mode 100644 > index 7b70bb8e2c..0000000000 > --- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch > +++ /dev/null > @@ -1,38 +0,0 @@ > -From c076d0fc970f190f723018258790c79b59daba2e Mon Sep 17 00:00:00 2001 > -From: Hongxu Jia <[email protected] <mailto:[email protected]>> > -Date: Sat, 11 May 2019 21:20:27 +0800 > -Subject: [PATCH] not generate objarch.h at compile time > - > -Import patch from windriver linux for cross compilation, and split > -patches into oe way under different directories such as i586, powerpc etc > -according to Richard's opinion. > - > -Upstream-Status: Pending > - > -Signed-off-by: Kang Kai <[email protected] <mailto:[email protected]>> > -Signed-off-by: Wenzong Fan <[email protected] <mailto:[email protected]>> > - > -Rebase to 9.27 > -Signed-off-by: Hongxu Jia <[email protected] <mailto:[email protected]>> > ---- > - base/lib.mak | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/base/lib.mak b/base/lib.mak > -index 3ed088a..5af2b43 100644 > ---- a/base/lib.mak > -+++ b/base/lib.mak > -@@ -87,8 +87,8 @@ arch_h=$(GLGEN)arch.h > - stdpre_h=$(GLSRC)stdpre.h > - stdint__h=$(GLSRC)stdint_.h > - > --$(GLGEN)arch.h : $(GENARCH_XE) > -- $(EXP)$(GENARCH_XE) $(GLGEN)arch.h $(TARGET_ARCH_FILE) > -+##$(GLGEN)arch.h : $(GENARCH_XE) > -+## $(EXP)$(GENARCH_XE) $(GLGEN)arch.h $(TARGET_ARCH_FILE) > - > - # Platform interfaces > - > --- > -2.7.4 > - > diff --git a/meta/recipes-extended/ghostscript/ghostscript/i586/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/i586/objarch.h > deleted file mode 100644 > index 5817b7a6d7..0000000000 > --- a/meta/recipes-extended/ghostscript/ghostscript/i586/objarch.h > +++ /dev/null > @@ -1,41 +0,0 @@ > -/* Parameters derived from machine and compiler architecture. */ > -/* This file is generated mechanically by genarch.c. */ > - > - /* ---------------- Scalar alignments ---------------- */ > - > -#define ARCH_ALIGN_SHORT_MOD 2 > -#define ARCH_ALIGN_INT_MOD 4 > -#define ARCH_ALIGN_LONG_MOD 4 > -#define ARCH_ALIGN_PTR_MOD 4 > -#define ARCH_ALIGN_FLOAT_MOD 4 > -#define ARCH_ALIGN_DOUBLE_MOD 4 > - > - /* ---------------- Scalar sizes ---------------- */ > - > -#define ARCH_LOG2_SIZEOF_CHAR 0 > -#define ARCH_LOG2_SIZEOF_SHORT 1 > -#define ARCH_LOG2_SIZEOF_INT 2 > -#define ARCH_LOG2_SIZEOF_LONG 2 > -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 > -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 > -#define ARCH_SIZEOF_PTR 4 > -#define ARCH_SIZEOF_FLOAT 4 > -#define ARCH_SIZEOF_DOUBLE 8 > -#define ARCH_FLOAT_MANTISSA_BITS 24 > -#define ARCH_DOUBLE_MANTISSA_BITS 53 > - > - /* ---------------- Unsigned max values ---------------- */ > - > -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) > -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) > -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) > -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) > - > - /* ---------------- Miscellaneous ---------------- */ > - > -#define ARCH_IS_BIG_ENDIAN 0 > -#define ARCH_PTRS_ARE_SIGNED 0 > -#define ARCH_FLOATS_ARE_IEEE 1 > -#define ARCH_ARITH_RSHIFT 2 > -#define ARCH_DIV_NEG_POS_TRUNCATES 1 > - > diff --git a/meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h > deleted file mode 100644 > index 63232fdfa6..0000000000 > --- a/meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -/* Parameters derived from machine and compiler architecture. */ > -/* This file is generated mechanically by genarch.c. */ > - > - /* ---------------- Scalar alignments ---------------- */ > - > -#define ARCH_ALIGN_SHORT_MOD 2 > -#define ARCH_ALIGN_INT_MOD 4 > -#define ARCH_ALIGN_LONG_MOD 4 > -#define ARCH_ALIGN_PTR_MOD 4 > -#define ARCH_ALIGN_FLOAT_MOD 4 > -#define ARCH_ALIGN_DOUBLE_MOD 4 > - > - /* ---------------- Scalar sizes ---------------- */ > - > -#define ARCH_LOG2_SIZEOF_CHAR 0 > -#define ARCH_LOG2_SIZEOF_SHORT 1 > -#define ARCH_LOG2_SIZEOF_INT 2 > -#define ARCH_LOG2_SIZEOF_LONG 2 > -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 > -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 > -#define ARCH_SIZEOF_PTR 4 > -#define ARCH_SIZEOF_FLOAT 4 > -#define ARCH_SIZEOF_DOUBLE 8 > -#define ARCH_FLOAT_MANTISSA_BITS 24 > -#define ARCH_DOUBLE_MANTISSA_BITS 53 > - > - /* ---------------- Unsigned max values ---------------- */ > - > -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) > -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) > -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) > -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) > - > - /* ---------------- Miscellaneous ---------------- */ > - > -#define ARCH_IS_BIG_ENDIAN 1 > -#define ARCH_PTRS_ARE_SIGNED 0 > -#define ARCH_FLOATS_ARE_IEEE 1 > -#define ARCH_ARITH_RSHIFT 2 > -#define ARCH_DIV_NEG_POS_TRUNCATES 1 > diff --git a/meta/recipes-extended/ghostscript/ghostscript/microblazeel/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/microblazeel/objarch.h > deleted file mode 100644 > index 3ec8101681..0000000000 > --- a/meta/recipes-extended/ghostscript/ghostscript/microblazeel/objarch.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -/* Parameters derived from machine and compiler architecture. */ > -/* This file is generated mechanically by genarch.c. */ > - > - /* ---------------- Scalar alignments ---------------- */ > - > -#define ARCH_ALIGN_SHORT_MOD 2 > -#define ARCH_ALIGN_INT_MOD 4 > -#define ARCH_ALIGN_LONG_MOD 4 > -#define ARCH_ALIGN_PTR_MOD 4 > -#define ARCH_ALIGN_FLOAT_MOD 4 > -#define ARCH_ALIGN_DOUBLE_MOD 4 > - > - /* ---------------- Scalar sizes ---------------- */ > - > -#define ARCH_LOG2_SIZEOF_CHAR 0 > -#define ARCH_LOG2_SIZEOF_SHORT 1 > -#define ARCH_LOG2_SIZEOF_INT 2 > -#define ARCH_LOG2_SIZEOF_LONG 2 > -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 > -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 > -#define ARCH_SIZEOF_PTR 4 > -#define ARCH_SIZEOF_FLOAT 4 > -#define ARCH_SIZEOF_DOUBLE 8 > -#define ARCH_FLOAT_MANTISSA_BITS 24 > -#define ARCH_DOUBLE_MANTISSA_BITS 53 > - > - /* ---------------- Unsigned max values ---------------- */ > - > -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) > -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) > -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) > -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) > - > - /* ---------------- Miscellaneous ---------------- */ > - > -#define ARCH_IS_BIG_ENDIAN 0 > -#define ARCH_PTRS_ARE_SIGNED 0 > -#define ARCH_FLOATS_ARE_IEEE 1 > -#define ARCH_ARITH_RSHIFT 2 > -#define ARCH_DIV_NEG_POS_TRUNCATES 1 > diff --git a/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32eb/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32eb/objarch.h > deleted file mode 100644 > index 0d0a16bfa3..0000000000 > --- a/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32eb/objarch.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -/* Parameters derived from machine and compiler architecture. */ > -/* This file is generated mechanically by genarch.c. */ > - > - /* ---------------- Scalar alignments ---------------- */ > - > -#define ARCH_ALIGN_SHORT_MOD 2 > -#define ARCH_ALIGN_INT_MOD 4 > -#define ARCH_ALIGN_LONG_MOD 8 > -#define ARCH_ALIGN_PTR_MOD 8 > -#define ARCH_ALIGN_FLOAT_MOD 4 > -#define ARCH_ALIGN_DOUBLE_MOD 8 > - > - /* ---------------- Scalar sizes ---------------- */ > - > -#define ARCH_LOG2_SIZEOF_CHAR 0 > -#define ARCH_LOG2_SIZEOF_SHORT 1 > -#define ARCH_LOG2_SIZEOF_INT 2 > -#define ARCH_LOG2_SIZEOF_LONG 3 > -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 > -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 > -#define ARCH_SIZEOF_PTR 8 > -#define ARCH_SIZEOF_FLOAT 4 > -#define ARCH_SIZEOF_DOUBLE 8 > -#define ARCH_FLOAT_MANTISSA_BITS 24 > -#define ARCH_DOUBLE_MANTISSA_BITS 53 > - > - /* ---------------- Unsigned max values ---------------- */ > - > -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) > -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) > -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) > -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) > - > - /* ---------------- Miscellaneous ---------------- */ > - > -#define ARCH_IS_BIG_ENDIAN 1 > -#define ARCH_PTRS_ARE_SIGNED 0 > -#define ARCH_FLOATS_ARE_IEEE 1 > -#define ARCH_ARITH_RSHIFT 2 > -#define ARCH_DIV_NEG_POS_TRUNCATES 1 > diff --git a/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32el/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32el/objarch.h > deleted file mode 100644 > index a05de29def..0000000000 > --- a/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32el/objarch.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -/* Parameters derived from machine and compiler architecture. */ > -/* This file is generated mechanically by genarch.c. */ > - > - /* ---------------- Scalar alignments ---------------- */ > - > -#define ARCH_ALIGN_SHORT_MOD 2 > -#define ARCH_ALIGN_INT_MOD 4 > -#define ARCH_ALIGN_LONG_MOD 8 > -#define ARCH_ALIGN_PTR_MOD 8 > -#define ARCH_ALIGN_FLOAT_MOD 4 > -#define ARCH_ALIGN_DOUBLE_MOD 8 > - > - /* ---------------- Scalar sizes ---------------- */ > - > -#define ARCH_LOG2_SIZEOF_CHAR 0 > -#define ARCH_LOG2_SIZEOF_SHORT 1 > -#define ARCH_LOG2_SIZEOF_INT 2 > -#define ARCH_LOG2_SIZEOF_LONG 3 > -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 > -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 > -#define ARCH_SIZEOF_PTR 8 > -#define ARCH_SIZEOF_FLOAT 4 > -#define ARCH_SIZEOF_DOUBLE 8 > -#define ARCH_FLOAT_MANTISSA_BITS 24 > -#define ARCH_DOUBLE_MANTISSA_BITS 53 > - > - /* ---------------- Unsigned max values ---------------- */ > - > -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) > -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) > -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) > -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) > - > - /* ---------------- Miscellaneous ---------------- */ > - > -#define ARCH_IS_BIG_ENDIAN 0 > -#define ARCH_PTRS_ARE_SIGNED 0 > -#define ARCH_FLOATS_ARE_IEEE 1 > -#define ARCH_ARITH_RSHIFT 2 > -#define ARCH_DIV_NEG_POS_TRUNCATES 1 > diff --git a/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64eb/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64eb/objarch.h > deleted file mode 100644 > index 0d0a16bfa3..0000000000 > --- a/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64eb/objarch.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -/* Parameters derived from machine and compiler architecture. */ > -/* This file is generated mechanically by genarch.c. */ > - > - /* ---------------- Scalar alignments ---------------- */ > - > -#define ARCH_ALIGN_SHORT_MOD 2 > -#define ARCH_ALIGN_INT_MOD 4 > -#define ARCH_ALIGN_LONG_MOD 8 > -#define ARCH_ALIGN_PTR_MOD 8 > -#define ARCH_ALIGN_FLOAT_MOD 4 > -#define ARCH_ALIGN_DOUBLE_MOD 8 > - > - /* ---------------- Scalar sizes ---------------- */ > - > -#define ARCH_LOG2_SIZEOF_CHAR 0 > -#define ARCH_LOG2_SIZEOF_SHORT 1 > -#define ARCH_LOG2_SIZEOF_INT 2 > -#define ARCH_LOG2_SIZEOF_LONG 3 > -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 > -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 > -#define ARCH_SIZEOF_PTR 8 > -#define ARCH_SIZEOF_FLOAT 4 > -#define ARCH_SIZEOF_DOUBLE 8 > -#define ARCH_FLOAT_MANTISSA_BITS 24 > -#define ARCH_DOUBLE_MANTISSA_BITS 53 > - > - /* ---------------- Unsigned max values ---------------- */ > - > -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) > -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) > -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) > -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) > - > - /* ---------------- Miscellaneous ---------------- */ > - > -#define ARCH_IS_BIG_ENDIAN 1 > -#define ARCH_PTRS_ARE_SIGNED 0 > -#define ARCH_FLOATS_ARE_IEEE 1 > -#define ARCH_ARITH_RSHIFT 2 > -#define ARCH_DIV_NEG_POS_TRUNCATES 1 > diff --git a/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64el/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64el/objarch.h > deleted file mode 100644 > index a05de29def..0000000000 > --- a/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64el/objarch.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -/* Parameters derived from machine and compiler architecture. */ > -/* This file is generated mechanically by genarch.c. */ > - > - /* ---------------- Scalar alignments ---------------- */ > - > -#define ARCH_ALIGN_SHORT_MOD 2 > -#define ARCH_ALIGN_INT_MOD 4 > -#define ARCH_ALIGN_LONG_MOD 8 > -#define ARCH_ALIGN_PTR_MOD 8 > -#define ARCH_ALIGN_FLOAT_MOD 4 > -#define ARCH_ALIGN_DOUBLE_MOD 8 > - > - /* ---------------- Scalar sizes ---------------- */ > - > -#define ARCH_LOG2_SIZEOF_CHAR 0 > -#define ARCH_LOG2_SIZEOF_SHORT 1 > -#define ARCH_LOG2_SIZEOF_INT 2 > -#define ARCH_LOG2_SIZEOF_LONG 3 > -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 > -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 > -#define ARCH_SIZEOF_PTR 8 > -#define ARCH_SIZEOF_FLOAT 4 > -#define ARCH_SIZEOF_DOUBLE 8 > -#define ARCH_FLOAT_MANTISSA_BITS 24 > -#define ARCH_DOUBLE_MANTISSA_BITS 53 > - > - /* ---------------- Unsigned max values ---------------- */ > - > -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) > -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) > -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) > -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) > - > - /* ---------------- Miscellaneous ---------------- */ > - > -#define ARCH_IS_BIG_ENDIAN 0 > -#define ARCH_PTRS_ARE_SIGNED 0 > -#define ARCH_FLOATS_ARE_IEEE 1 > -#define ARCH_ARITH_RSHIFT 2 > -#define ARCH_DIV_NEG_POS_TRUNCATES 1 > diff --git a/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32eb/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32eb/objarch.h > deleted file mode 100644 > index b8b637cca2..0000000000 > --- a/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32eb/objarch.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -/* Parameters derived from machine and compiler architecture. */ > -/* This file is generated mechanically by genarch.c. */ > - > - /* ---------------- Scalar alignments ---------------- */ > - > -#define ARCH_ALIGN_SHORT_MOD 2 > -#define ARCH_ALIGN_INT_MOD 4 > -#define ARCH_ALIGN_LONG_MOD 4 > -#define ARCH_ALIGN_PTR_MOD 4 > -#define ARCH_ALIGN_FLOAT_MOD 4 > -#define ARCH_ALIGN_DOUBLE_MOD 8 > - > - /* ---------------- Scalar sizes ---------------- */ > - > -#define ARCH_LOG2_SIZEOF_CHAR 0 > -#define ARCH_LOG2_SIZEOF_SHORT 1 > -#define ARCH_LOG2_SIZEOF_INT 2 > -#define ARCH_LOG2_SIZEOF_LONG 2 > -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 > -#define ARCH_SIZEOF_GX_COLOR_INDEX 4 > -#define ARCH_SIZEOF_PTR 4 > -#define ARCH_SIZEOF_FLOAT 4 > -#define ARCH_SIZEOF_DOUBLE 8 > -#define ARCH_FLOAT_MANTISSA_BITS 24 > -#define ARCH_DOUBLE_MANTISSA_BITS 53 > - > - /* ---------------- Unsigned max values ---------------- */ > - > -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) > -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) > -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) > -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) > - > - /* ---------------- Miscellaneous ---------------- */ > - > -#define ARCH_IS_BIG_ENDIAN 1 > -#define ARCH_PTRS_ARE_SIGNED 0 > -#define ARCH_FLOATS_ARE_IEEE 1 > -#define ARCH_ARITH_RSHIFT 2 > -#define ARCH_DIV_NEG_POS_TRUNCATES 1 > diff --git a/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32el/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32el/objarch.h > deleted file mode 100644 > index 29f90ddf85..0000000000 > --- a/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32el/objarch.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -/* Parameters derived from machine and compiler architecture. */ > -/* This file is generated mechanically by genarch.c. */ > - > - /* ---------------- Scalar alignments ---------------- */ > - > -#define ARCH_ALIGN_SHORT_MOD 2 > -#define ARCH_ALIGN_INT_MOD 4 > -#define ARCH_ALIGN_LONG_MOD 4 > -#define ARCH_ALIGN_PTR_MOD 4 > -#define ARCH_ALIGN_FLOAT_MOD 4 > -#define ARCH_ALIGN_DOUBLE_MOD 8 > - > - /* ---------------- Scalar sizes ---------------- */ > - > -#define ARCH_LOG2_SIZEOF_CHAR 0 > -#define ARCH_LOG2_SIZEOF_SHORT 1 > -#define ARCH_LOG2_SIZEOF_INT 2 > -#define ARCH_LOG2_SIZEOF_LONG 2 > -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 > -#define ARCH_SIZEOF_GX_COLOR_INDEX 4 > -#define ARCH_SIZEOF_PTR 4 > -#define ARCH_SIZEOF_FLOAT 4 > -#define ARCH_SIZEOF_DOUBLE 8 > -#define ARCH_FLOAT_MANTISSA_BITS 24 > -#define ARCH_DOUBLE_MANTISSA_BITS 53 > - > - /* ---------------- Unsigned max values ---------------- */ > - > -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) > -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) > -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) > -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) > - > - /* ---------------- Miscellaneous ---------------- */ > - > -#define ARCH_IS_BIG_ENDIAN 0 > -#define ARCH_PTRS_ARE_SIGNED 0 > -#define ARCH_FLOATS_ARE_IEEE 1 > -#define ARCH_ARITH_RSHIFT 2 > -#define ARCH_DIV_NEG_POS_TRUNCATES 1 > diff --git a/meta/recipes-extended/ghostscript/ghostscript/nios2/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/nios2/objarch.h > deleted file mode 100644 > index 3ec8101681..0000000000 > --- a/meta/recipes-extended/ghostscript/ghostscript/nios2/objarch.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -/* Parameters derived from machine and compiler architecture. */ > -/* This file is generated mechanically by genarch.c. */ > - > - /* ---------------- Scalar alignments ---------------- */ > - > -#define ARCH_ALIGN_SHORT_MOD 2 > -#define ARCH_ALIGN_INT_MOD 4 > -#define ARCH_ALIGN_LONG_MOD 4 > -#define ARCH_ALIGN_PTR_MOD 4 > -#define ARCH_ALIGN_FLOAT_MOD 4 > -#define ARCH_ALIGN_DOUBLE_MOD 4 > - > - /* ---------------- Scalar sizes ---------------- */ > - > -#define ARCH_LOG2_SIZEOF_CHAR 0 > -#define ARCH_LOG2_SIZEOF_SHORT 1 > -#define ARCH_LOG2_SIZEOF_INT 2 > -#define ARCH_LOG2_SIZEOF_LONG 2 > -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 > -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 > -#define ARCH_SIZEOF_PTR 4 > -#define ARCH_SIZEOF_FLOAT 4 > -#define ARCH_SIZEOF_DOUBLE 8 > -#define ARCH_FLOAT_MANTISSA_BITS 24 > -#define ARCH_DOUBLE_MANTISSA_BITS 53 > - > - /* ---------------- Unsigned max values ---------------- */ > - > -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) > -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) > -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) > -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) > - > - /* ---------------- Miscellaneous ---------------- */ > - > -#define ARCH_IS_BIG_ENDIAN 0 > -#define ARCH_PTRS_ARE_SIGNED 0 > -#define ARCH_FLOATS_ARE_IEEE 1 > -#define ARCH_ARITH_RSHIFT 2 > -#define ARCH_DIV_NEG_POS_TRUNCATES 1 > diff --git a/meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.h > deleted file mode 100644 > index 359097f356..0000000000 > --- a/meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -/* Parameters derived from machine and compiler architecture. */ > -/* This file is generated mechanically by genarch.c. */ > - > - /* ---------------- Scalar alignments ---------------- */ > - > -#define ARCH_ALIGN_SHORT_MOD 2 > -#define ARCH_ALIGN_INT_MOD 4 > -#define ARCH_ALIGN_LONG_MOD 4 > -#define ARCH_ALIGN_PTR_MOD 4 > -#define ARCH_ALIGN_FLOAT_MOD 4 > -#define ARCH_ALIGN_DOUBLE_MOD 8 > - > - /* ---------------- Scalar sizes ---------------- */ > - > -#define ARCH_LOG2_SIZEOF_CHAR 0 > -#define ARCH_LOG2_SIZEOF_SHORT 1 > -#define ARCH_LOG2_SIZEOF_INT 2 > -#define ARCH_LOG2_SIZEOF_LONG 2 > -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 > -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 > -#define ARCH_SIZEOF_PTR 4 > -#define ARCH_SIZEOF_FLOAT 4 > -#define ARCH_SIZEOF_DOUBLE 8 > -#define ARCH_FLOAT_MANTISSA_BITS 24 > -#define ARCH_DOUBLE_MANTISSA_BITS 53 > - > - /* ---------------- Unsigned max values ---------------- */ > - > -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) > -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) > -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) > -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) > - > - /* ---------------- Miscellaneous ---------------- */ > - > -#define ARCH_IS_BIG_ENDIAN 1 > -#define ARCH_PTRS_ARE_SIGNED 0 > -#define ARCH_FLOATS_ARE_IEEE 1 > -#define ARCH_ARITH_RSHIFT 2 > -#define ARCH_DIV_NEG_POS_TRUNCATES 1 > diff --git a/meta/recipes-extended/ghostscript/ghostscript/powerpc64/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/powerpc64/objarch.h > deleted file mode 100644 > index 0d0a16bfa3..0000000000 > --- a/meta/recipes-extended/ghostscript/ghostscript/powerpc64/objarch.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -/* Parameters derived from machine and compiler architecture. */ > -/* This file is generated mechanically by genarch.c. */ > - > - /* ---------------- Scalar alignments ---------------- */ > - > -#define ARCH_ALIGN_SHORT_MOD 2 > -#define ARCH_ALIGN_INT_MOD 4 > -#define ARCH_ALIGN_LONG_MOD 8 > -#define ARCH_ALIGN_PTR_MOD 8 > -#define ARCH_ALIGN_FLOAT_MOD 4 > -#define ARCH_ALIGN_DOUBLE_MOD 8 > - > - /* ---------------- Scalar sizes ---------------- */ > - > -#define ARCH_LOG2_SIZEOF_CHAR 0 > -#define ARCH_LOG2_SIZEOF_SHORT 1 > -#define ARCH_LOG2_SIZEOF_INT 2 > -#define ARCH_LOG2_SIZEOF_LONG 3 > -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 > -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 > -#define ARCH_SIZEOF_PTR 8 > -#define ARCH_SIZEOF_FLOAT 4 > -#define ARCH_SIZEOF_DOUBLE 8 > -#define ARCH_FLOAT_MANTISSA_BITS 24 > -#define ARCH_DOUBLE_MANTISSA_BITS 53 > - > - /* ---------------- Unsigned max values ---------------- */ > - > -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) > -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) > -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) > -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) > - > - /* ---------------- Miscellaneous ---------------- */ > - > -#define ARCH_IS_BIG_ENDIAN 1 > -#define ARCH_PTRS_ARE_SIGNED 0 > -#define ARCH_FLOATS_ARE_IEEE 1 > -#define ARCH_ARITH_RSHIFT 2 > -#define ARCH_DIV_NEG_POS_TRUNCATES 1 > diff --git a/meta/recipes-extended/ghostscript/ghostscript/powerpc64le/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/powerpc64le/objarch.h > deleted file mode 100644 > index a05de29def..0000000000 > --- a/meta/recipes-extended/ghostscript/ghostscript/powerpc64le/objarch.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -/* Parameters derived from machine and compiler architecture. */ > -/* This file is generated mechanically by genarch.c. */ > - > - /* ---------------- Scalar alignments ---------------- */ > - > -#define ARCH_ALIGN_SHORT_MOD 2 > -#define ARCH_ALIGN_INT_MOD 4 > -#define ARCH_ALIGN_LONG_MOD 8 > -#define ARCH_ALIGN_PTR_MOD 8 > -#define ARCH_ALIGN_FLOAT_MOD 4 > -#define ARCH_ALIGN_DOUBLE_MOD 8 > - > - /* ---------------- Scalar sizes ---------------- */ > - > -#define ARCH_LOG2_SIZEOF_CHAR 0 > -#define ARCH_LOG2_SIZEOF_SHORT 1 > -#define ARCH_LOG2_SIZEOF_INT 2 > -#define ARCH_LOG2_SIZEOF_LONG 3 > -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 > -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 > -#define ARCH_SIZEOF_PTR 8 > -#define ARCH_SIZEOF_FLOAT 4 > -#define ARCH_SIZEOF_DOUBLE 8 > -#define ARCH_FLOAT_MANTISSA_BITS 24 > -#define ARCH_DOUBLE_MANTISSA_BITS 53 > - > - /* ---------------- Unsigned max values ---------------- */ > - > -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) > -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) > -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) > -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) > - > - /* ---------------- Miscellaneous ---------------- */ > - > -#define ARCH_IS_BIG_ENDIAN 0 > -#define ARCH_PTRS_ARE_SIGNED 0 > -#define ARCH_FLOATS_ARE_IEEE 1 > -#define ARCH_ARITH_RSHIFT 2 > -#define ARCH_DIV_NEG_POS_TRUNCATES 1 > diff --git a/meta/recipes-extended/ghostscript/ghostscript/x86-64/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/x86-64/objarch.h > deleted file mode 100644 > index a05de29def..0000000000 > --- a/meta/recipes-extended/ghostscript/ghostscript/x86-64/objarch.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -/* Parameters derived from machine and compiler architecture. */ > -/* This file is generated mechanically by genarch.c. */ > - > - /* ---------------- Scalar alignments ---------------- */ > - > -#define ARCH_ALIGN_SHORT_MOD 2 > -#define ARCH_ALIGN_INT_MOD 4 > -#define ARCH_ALIGN_LONG_MOD 8 > -#define ARCH_ALIGN_PTR_MOD 8 > -#define ARCH_ALIGN_FLOAT_MOD 4 > -#define ARCH_ALIGN_DOUBLE_MOD 8 > - > - /* ---------------- Scalar sizes ---------------- */ > - > -#define ARCH_LOG2_SIZEOF_CHAR 0 > -#define ARCH_LOG2_SIZEOF_SHORT 1 > -#define ARCH_LOG2_SIZEOF_INT 2 > -#define ARCH_LOG2_SIZEOF_LONG 3 > -#define ARCH_LOG2_SIZEOF_LONG_LONG 3 > -#define ARCH_SIZEOF_GX_COLOR_INDEX 8 > -#define ARCH_SIZEOF_PTR 8 > -#define ARCH_SIZEOF_FLOAT 4 > -#define ARCH_SIZEOF_DOUBLE 8 > -#define ARCH_FLOAT_MANTISSA_BITS 24 > -#define ARCH_DOUBLE_MANTISSA_BITS 53 > - > - /* ---------------- Unsigned max values ---------------- */ > - > -#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) > -#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) > -#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) > -#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) > - > - /* ---------------- Miscellaneous ---------------- */ > - > -#define ARCH_IS_BIG_ENDIAN 0 > -#define ARCH_PTRS_ARE_SIGNED 0 > -#define ARCH_FLOATS_ARE_IEEE 1 > -#define ARCH_ARITH_RSHIFT 2 > -#define ARCH_DIV_NEG_POS_TRUNCATES 1 > diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.50.bb <http://ghostscript_9.50.bb> b/meta/recipes-extended/ghostscript/ghostscript_9.52.bb <http://ghostscript_9.52.bb> > similarity index 89% > rename from meta/recipes-extended/ghostscript/ghostscript_9.50.bb <http://ghostscript_9.50.bb> > rename to meta/recipes-extended/ghostscript/ghostscript_9.52.bb <http://ghostscript_9.52.bb> > index 5e8af8dc11..4cdb6e00d8 100644 > --- a/meta/recipes-extended/ghostscript/ghostscript_9.50.bb <http://ghostscript_9.50.bb> > +++ b/meta/recipes-extended/ghostscript/ghostscript_9.52.bb <http://ghostscript_9.52.bb> > @@ -29,13 +29,10 @@ SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/d > file://do-not-check-local-libpng-source.patch \ > file://avoid-host-contamination.patch \ > file://mkdir-p.patch \ > - file://CVE-2019-14869-0001.patch \ > " > > SRC_URI = "${SRC_URI_BASE} \ > file://ghostscript-9.21-prevent_recompiling.patch \ > - file://ghostscript-9.02-genarch.patch \ > - file://objarch.h \ > file://cups-no-gcrypt.patch \ > " > > @@ -44,8 +41,8 @@ SRC_URI_class-native = "${SRC_URI_BASE} \ > file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \ > " > > -SRC_URI[md5sum] = "00970cf622bd5b46f68eec9383753870" > -SRC_URI[sha256sum] = "0f53e89fd647815828fc5171613e860e8535b68f7afbc91bf89aee886769ce89" > +SRC_URI[md5sum] = "0f6964ab9b83a63b7e373f136243f901" > +SRC_URI[sha256sum] = "c2501d8e8e0814c4a5aa7e443e230e73d7af7f70287546f7b697e5ef49e32176" > > # Put something like > # > @@ -76,7 +73,7 @@ EXTRA_OECONF_class-native = "--without-x --with-system-libtiff=no \ > --without-jbig2dec --without-libpaper \ > --with-fontpath=${datadir}/fonts \ > --without-libidn --disable-fontconfig \ > - --disable-freetype --disable-cups" > + --enable-freetype --disable-cups " > > # This has been fixed upstream but for now we need to subvert the check for time.h > # http://bugs.ghostscript.com/show_bug.cgi?id=692443 > @@ -84,15 +81,7 @@ EXTRA_OECONF_class-native = "--without-x --with-system-libtiff=no \ > CFLAGS += "-DHAVE_SYS_TIME_H=1" > BUILD_CFLAGS += "-DHAVE_SYS_TIME_H=1" > > -inherit autotools > - > -do_configure_prepend () { > - mkdir -p obj > - mkdir -p soobj > - if [ -e ${WORKDIR}/objarch.h ]; then > - cp ${WORKDIR}/objarch.h obj/arch.h > - fi > -} > +inherit autotools-brokensep > > do_configure_append () { > # copy tools from the native ghostscript build > > > >
PATCH 11/17 webkitgtk: update to 2.28.2
In reply to Alexander Kanavin---
.../webkitgtk/0001-Fix-build-with-musl.patch | 30 +++++++++----------
...tings-so-that-gtkdoc-generation-work.patch | 8 ++---
.../webkit/webkitgtk/x32_support.patch | 30 -------------------
...ebkitgtk_2.26.4.bb => webkitgtk_2.28.2.bb} | 5 ++--
4 files changed, 21 insertions(+), 52 deletions(-)
delete mode 100644 meta/recipes-sato/webkit/webkitgtk/x32_support.patch
rename meta/recipes-sato/webkit/{webkitgtk_2.26.4.bb => webkitgtk_2.28.2.bb} (97%)meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch +15 -15
@@ -1,4 +1,4 @@ -From c4d4d9f1aa74addefdad40294cf16d9e0b3dd6ec Mon Sep 17 00:00:00 2001 +From 828a500d5be62ba6fc94bd4fac3fe4bf1b1d4f6d 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
@@ -8,14 +8,14 @@ Signed-off-by: Alexander Kanavin <[email protected]> --- Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++----- - Source/WTF/wtf/Platform.h | 2 +- + Source/WTF/wtf/PlatformHave.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h -index 823964c2..00841146 100644 +index c5052527..95ef98b5 100644 --- a/Source/JavaScriptCore/runtime/MachineContext.h +++ b/Source/JavaScriptCore/runtime/MachineContext.h -@@ -188,7 +188,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext) +@@ -196,7 +196,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext) #error Unknown Architecture #endif
@@ -24,7 +24,7 @@ index 823964c2..00841146 100644 #if CPU(X86) return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]); -@@ -335,7 +335,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext) +@@ -347,7 +347,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext) #error Unknown Architecture #endif
@@ -33,7 +33,7 @@ index 823964c2..00841146 100644 // The following sequence depends on glibc's sys/ucontext.h. #if CPU(X86) -@@ -482,7 +482,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext) +@@ -498,7 +498,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext) #error Unknown Architecture #endif
@@ -42,7 +42,7 @@ index 823964c2..00841146 100644 // The following sequence depends on glibc's sys/ucontext.h. #if CPU(X86) -@@ -639,7 +639,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) +@@ -656,7 +656,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) #error Unknown Architecture #endif
@@ -51,7 +51,7 @@ index 823964c2..00841146 100644 // The following sequence depends on glibc's sys/ucontext.h. #if CPU(X86) -@@ -756,7 +756,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) +@@ -773,7 +773,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) #error Unknown Architecture #endif
@@ -60,13 +60,13 @@ index 823964c2..00841146 100644 // The following sequence depends on glibc's sys/ucontext.h. #if CPU(X86) -diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h -index 34f7cb14..32ad9150 100644 ---- a/Source/WTF/wtf/Platform.h -+++ b/Source/WTF/wtf/Platform.h -@@ -714,7 +714,7 @@ - - #endif /* OS(DARWIN) */ +diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h +index daca20fe..53eae6ba 100644 +--- a/Source/WTF/wtf/PlatformHave.h ++++ b/Source/WTF/wtf/PlatformHave.h +@@ -222,7 +222,7 @@ + #define HAVE_HOSTED_CORE_ANIMATION 1 + #endif -#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) +#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__linux__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch +4 -4
@@ -1,4 +1,4 @@ -From 4b5e02212a31b82fc9b3becad90542274816fc29 Mon Sep 17 00:00:00 2001 +From 1c7e7a385387d7febf633bbb6d2b99ece523e719 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
@@ -17,15 +17,15 @@ Signed-off-by: Alexander Kanavin <[email protected]> 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/cmake/GtkDoc.cmake b/Source/cmake/GtkDoc.cmake -index b0fb31ca..6cb6313d 100644 +index 18e86448..102c873a 100644 --- a/Source/cmake/GtkDoc.cmake +++ b/Source/cmake/GtkDoc.cmake @@ -4,7 +4,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args) add_custom_command( OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}" DEPENDS ${DocumentationDependencies} -- COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LDFLAGS=${CMAKE_EXE_LINKER_FLAGS}" ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args} -+ COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LD=${CMAKE_C_COMPILER}" "LDFLAGS=${CMAKE_C_LINK_FLAGS}" "RUN=${CMAKE_BINARY_DIR}/gtkdoc-qemuwrapper" ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args} +- COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LDFLAGS=${CMAKE_EXE_LINKER_FLAGS}" ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args} ++ COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LD=${CMAKE_C_COMPILER}" "LDFLAGS=${CMAKE_C_LINK_FLAGS}" "RUN=${CMAKE_BINARY_DIR}/gtkdoc-qemuwrapper" ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args} COMMAND touch ${_stamp_name} WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" VERBATIM
meta/recipes-sato/webkit/webkitgtk/x32_support.patch deleted +0 -30
@@ -1,30 +0,0 @@ -Signed-off-by: Christopher Larson <[email protected]> -Upstream-Status: Pending - -From 897563a0397266d8ceb058f172e16b06419b2593 Mon Sep 17 00:00:00 2001 -From: Daniel Schepler <[email protected]> -Date: Mon, 26 Mar 2018 17:48:34 +0300 -Subject: [PATCH] Fix FTBFS in x32 - -=================================================================== - ---- - Source/WTF/wtf/Platform.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h -index 850e298..551c047 100644 ---- a/Source/WTF/wtf/Platform.h -+++ b/Source/WTF/wtf/Platform.h -@@ -132,7 +132,11 @@ - /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */ - #if defined(__x86_64__) \ - || defined(_M_X64) -+#ifdef __ILP32__ -+#define WTF_CPU_X86_64_32 1 -+#else - #define WTF_CPU_X86_64 1 -+#endif - #define WTF_CPU_X86_SSE2 1 - #define WTF_CPU_KNOWN 1 - #endif
meta/recipes-sato/webkit/webkitgtk_2.28.2.bb renamed from meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +2 -3
@@ -16,13 +16,12 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ file://0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch \ - file://x32_support.patch \ file://cross-compile.patch \ file://0001-Fix-build-with-musl.patch \ file://include_array.patch \ " -SRC_URI[md5sum] = "60f881729f3b71244b7f6e58790073e0" -SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b66569934b113f" +SRC_URI[md5sum] = "ec0ef870ca37e3a5ebbead2f268a28ec" +SRC_URI[sha256sum] = "b9d23525cfd8d22c37b5d964a9fe9a8ce7583042a2f8d3922e71e6bbc68c30bd" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc
Signature · 1 line
2.26.1
PATCH 12/17 python3-gitdb: update to 4.0.4
In reply to Alexander KanavinLicense-Update: text reformatting
---
meta/recipes-devtools/python/python-gitdb.inc | 5 ++---
.../{python3-gitdb_2.0.6.bb => python3-gitdb_4.0.4.bb} | 0
2 files changed, 2 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/python/{python3-gitdb_2.0.6.bb => python3-gitdb_4.0.4.bb} (100%)meta/recipes-devtools/python/python-gitdb.inc +2 -3
@@ -6,10 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=59e5ecb13339a936eedf83282eaf4528" inherit pypi -PYPI_PACKAGE = "gitdb2" +PYPI_PACKAGE = "gitdb" -SRC_URI[md5sum] = "1a7ea3362e405f8a5634f7ee53636094" -SRC_URI[sha256sum] = "1b6df1433567a51a4a9c1a5a0de977aa351a405cc56d7d35f3388bad1f630350" +SRC_URI[sha256sum] = "6f0ecd46f99bb4874e5678d628c3a198e2b4ef38daea2756a2bfd8df7dd5c1a5" DEPENDS = "${PYTHON_PN}-async ${PYTHON_PN}-setuptools-native ${PYTHON_PN}-smmap"
meta/recipes-devtools/python/python3-gitdb_4.0.4.bb renamed from meta/recipes-devtools/python/python3-gitdb_2.0.6.bb +0 -0
Signature · 1 line
2.26.1
PATCH 13/17 libevdev: update to 1.9.0
In reply to Alexander Kanavin---
.../libevdev/libevdev/determinism.patch | 53 +++++++++++--------
.../{libevdev_1.8.0.bb => libevdev_1.9.0.bb} | 4 +-
2 files changed, 33 insertions(+), 24 deletions(-)
rename meta/recipes-support/libevdev/{libevdev_1.8.0.bb => libevdev_1.9.0.bb} (78%)meta/recipes-support/libevdev/libevdev/determinism.patch +31 -22
@@ -1,3 +1,8 @@ +From 4f196323aba5b0f49979826533c65633b8a9b6a2 Mon Sep 17 00:00:00 2001 +From: Richard Purdie <[email protected]> +Date: Fri, 7 Feb 2020 12:29:56 +0000 +Subject: [PATCH] libevdev: Fix determinism issue + The order of dict values is not deterministic leading to differing header file generation. Sort to remove this inconsistency.
@@ -6,29 +11,33 @@ RP 2020/2/7 Signed-off-by: Richard Purdie <[email protected]> Upstream-Status: Pending -Index: a/libevdev/make-event-names.py -=================================================================== +--- + libevdev/make-event-names.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libevdev/make-event-names.py b/libevdev/make-event-names.py +index 88addd7..c973e2a 100755 --- a/libevdev/make-event-names.py +++ b/libevdev/make-event-names.py -@@ -67,10 +67,10 @@ def print_bits(bits, prefix): - if not hasattr(bits, prefix): - return - print("static const char * const %s_map[%s_MAX + 1] = {" % (prefix, prefix.upper())) -- for val, name in list(getattr(bits, prefix).items()): -+ for val, name in sorted(list(getattr(bits, prefix).items())): - print(" [%s] = \"%s\"," % (name, name)) - if prefix == "key": -- for val, name in list(getattr(bits, "btn").items()): -+ for val, name in sorted(list(getattr(bits, "btn").items())): - print(" [%s] = \"%s\"," % (name, name)) - print("};") - print("") -@@ -111,7 +111,7 @@ def print_lookup(bits, prefix): - if not hasattr(bits, prefix): - return +@@ -70,10 +70,10 @@ def print_bits(bits, prefix): + if not hasattr(bits, prefix): + return + print("static const char * const %s_map[%s_MAX + 1] = {" % (prefix, prefix.upper())) +- for val, name in list(getattr(bits, prefix).items()): ++ for val, name in sorted(list(getattr(bits, prefix).items())): + print(" [%s] = \"%s\"," % (name, name)) + if prefix == "key": +- for val, name in list(getattr(bits, "btn").items()): ++ for val, name in sorted(list(getattr(bits, "btn").items())): + print(" [%s] = \"%s\"," % (name, name)) + print("};") + print("") +@@ -118,7 +118,7 @@ def print_lookup(bits, prefix): + if not hasattr(bits, prefix): + return -- names = list(getattr(bits, prefix).items()) -+ names = sorted(list(getattr(bits, prefix).items())) - if prefix == "btn": - names = names + btn_additional; +- names = list(getattr(bits, prefix).items()) ++ names = sorted(list(getattr(bits, prefix).items())) + if prefix == "btn": + names = names + btn_additional
meta/recipes-support/libevdev/libevdev_1.9.0.bb renamed from meta/recipes-support/libevdev/libevdev_1.8.0.bb +2 -2
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=75aae0d38feea6fda97ca381cb9132eb \ SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz \ file://determinism.patch" -SRC_URI[md5sum] = "879631080be18526737e33b63d848039" -SRC_URI[sha256sum] = "20d3cae4efd277f485abdf8f2a7c46588e539998b5a08c2c4d368218379d4211" +SRC_URI[md5sum] = "13c3f0911f9326d4b9fa103365f84421" +SRC_URI[sha256sum] = "e7e18a64264f2dea19b6c50a481f8c062529d42919ccda0bc861495bce28eb9e" inherit autotools pkgconfig
Signature · 1 line
2.26.1
PATCH 14/17 coreutils: update to 8.32
In reply to Alexander KanavinLicense-Update: copyright years, http changed to https
---
.../coreutils/fix-selinux-flask.patch | 13 ++++-------
.../remove-usr-local-lib-from-m4.patch | 23 ++++++++++++++-----
.../strtod_fix_clash_with_strtold.patch | 10 +++-----
.../{coreutils_8.31.bb => coreutils_8.32.bb} | 11 +++++----
4 files changed, 31 insertions(+), 26 deletions(-)
rename meta/recipes-core/coreutils/{coreutils_8.31.bb => coreutils_8.32.bb} (95%)meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch +5 -8
@@ -1,4 +1,4 @@ -From a1d360509fa3a4aff57eedcd528cc0347a87531d Mon Sep 17 00:00:00 2001 +From 7e20a7242ba2657f73311bbf5278093da67f0721 Mon Sep 17 00:00:00 2001 From: Robert Yang <[email protected]> Date: Tue, 16 Sep 2014 01:59:08 -0700 Subject: [PATCH] gnulib-comp.m4: selinux/flask.h should respect to
@@ -13,20 +13,20 @@ compilation terminated. Upstream-Status: Pending Signed-off-by: Robert Yang <[email protected]> + --- - m4/gnulib-comp.m4 | 2 +- + m4/gnulib-comp.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 -index 472d3a0..5f09734 100644 +index dead90e..0abf0bd 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 -@@ -1730,11 +1730,11 @@ AC_DEFUN([gl_INIT], +@@ -1860,10 +1860,10 @@ AC_DEFUN([gl_INIT], AC_LIBOBJ([select]) fi gl_SYS_SELECT_MODULE_INDICATOR([select]) - AC_CHECK_HEADERS([selinux/flask.h]) - AC_LIBOBJ([selinux-at]) gl_HEADERS_SELINUX_SELINUX_H gl_HEADERS_SELINUX_CONTEXT_H if test "$with_selinux" != no && test "$ac_cv_header_selinux_selinux_h" = yes; then
@@ -34,6 +34,3 @@ index 472d3a0..5f09734 100644 AC_LIBOBJ([getfilecon]) fi gl_SERVENT --- -1.7.9.5 -
meta/recipes-core/coreutils/coreutils/remove-usr-local-lib-from-m4.patch +17 -6
@@ -1,3 +1,8 @@ +From a26530083a29eeee910bfd606ecc621acecd547a Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 3 Aug 2011 14:12:30 -0700 +Subject: [PATCH] coreutils: Fix build on uclibc + We have problem using hardcoded directories like /usr/local here which will be checked for cross builds. This is a special case which is valid for AIX only. We do not have AIX as one of our supported
@@ -8,11 +13,15 @@ Signed-off-by: Khem Raj <[email protected]> Upstream-Status: Inappropriate [Upstream does care for AIX while we may not] -Index: coreutils-8.14/m4/getloadavg.m4 -=================================================================== ---- coreutils-8.14.orig/m4/getloadavg.m4 2011-09-19 08:09:24.000000000 -0700 -+++ coreutils-8.14/m4/getloadavg.m4 2011-10-19 21:42:00.385533357 -0700 -@@ -41,16 +41,6 @@ +--- + m4/getloadavg.m4 | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 +index 8e96965..63782a2 100644 +--- a/m4/getloadavg.m4 ++++ b/m4/getloadavg.m4 +@@ -41,18 +41,6 @@ AC_CHECK_FUNC([getloadavg], [], [LIBS="-lutil $LIBS" gl_func_getloadavg_done=yes]) fi
@@ -20,7 +29,9 @@ Index: coreutils-8.14/m4/getloadavg.m4 - # There is a commonly available library for RS/6000 AIX. - # Since it is not a standard part of AIX, it might be installed locally. - gl_getloadavg_LIBS=$LIBS -- LIBS="-L/usr/local/lib $LIBS" +- if test $cross_compiling != yes; then +- LIBS="-L/usr/local/lib $LIBS" +- fi - AC_CHECK_LIB([getloadavg], [getloadavg], - [LIBS="-lgetloadavg $LIBS" gl_func_getloadavg_done=yes], - [LIBS=$gl_getloadavg_LIBS])
meta/recipes-core/coreutils/coreutils/strtod_fix_clash_with_strtold.patch +3 -7
@@ -1,4 +1,4 @@ -From 0562b040fa17f1722ba2b3096067b45d0582ca53 Mon Sep 17 00:00:00 2001 +From 134137671bd771bf0205b87a735c545dbcdbb4b3 Mon Sep 17 00:00:00 2001 From: Paul Eggert <[email protected]> Date: Mon, 11 Mar 2019 16:40:29 -0700 Subject: [PATCH] strtod: fix clash with strtold
@@ -14,12 +14,11 @@ Upstream-Status: Backport [rhel5] Signed-off-by: Oleksandr Kravchuk <[email protected]> --- - ChangeLog | 9 +++++++++ lib/strtod.c | 11 +++++------ - 2 files changed, 14 insertions(+), 6 deletions(-) + 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/strtod.c b/lib/strtod.c -index b9eaa51b4..69b1564e1 100644 +index b9eaa51..69b1564 100644 --- a/lib/strtod.c +++ b/lib/strtod.c @@ -294,16 +294,15 @@ parse_number (const char *nptr,
@@ -51,6 +50,3 @@ index b9eaa51b4..69b1564e1 100644 + return minus_zero (); return negative ? -num : num; } --- -2.20.1 -
meta/recipes-core/coreutils/coreutils_8.32.bb renamed from meta/recipes-core/coreutils/coreutils_8.31.bb +6 -5
@@ -5,8 +5,9 @@ every system." HOMEPAGE = "http://www.gnu.org/software/coreutils/" BUGTRACKER = "http://debbugs.gnu.org/coreutils" LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ - file://src/ls.c;beginline=1;endline=15;md5=c456f9896277a0543e3866777ccc0255" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ + file://src/ls.c;beginline=1;endline=15;md5=b7d80abf5b279320fb0e4b1007ed108b \ + " DEPENDS = "gmp libcap" DEPENDS_class-native = ""
@@ -19,12 +20,12 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ file://disable-ls-output-quoting.patch \ file://0001-local.mk-fix-cross-compiling-problem.patch \ file://run-ptest \ - " + " SRC_URI_append_libc-musl = "file://strtod_fix_clash_with_strtold.patch" -SRC_URI[md5sum] = "0009a224d8e288e8ec406ef0161f9293" -SRC_URI[sha256sum] = "ff7a9c918edce6b4f4b2725e3f9b37b0c4d193531cac49a48b56c4d0d3a9e9fd" +SRC_URI[md5sum] = "022042695b7d5bcf1a93559a9735e668" +SRC_URI[sha256sum] = "4458d8de7849df44ccab15e16b1548b285224dbba5f08fac070c1c0e0bcc4cfa" EXTRA_OECONF_class-native = "--without-gmp" EXTRA_OECONF_class-target = "--enable-install-program=arch,hostname --libexecdir=${libdir}"
Signature · 1 line
2.26.1
Re: [OE-core] [PATCH 14/17] coreutils: update to 8.32
Quoted 186 lines · Alexander Kanavin
License-Update: copyright years, http changed to https
Signed-off-by Alexander Kanavin <[email protected]>--- .../coreutils/fix-selinux-flask.patch | 13 ++++------- .../remove-usr-local-lib-from-m4.patch | 23 ++++++++++++++--- -- .../strtod_fix_clash_with_strtold.patch | 10 +++----- .../{coreutils_8.31.bb => coreutils_8.32.bb} | 11 +++++---- 4 files changed, 31 insertions(+), 26 deletions(-) rename meta/recipes-core/coreutils/{coreutils_8.31.bb =>coreutils_8.32.bb} (95%)
(quoted diff) +0
-0flask.patch b/meta/recipes-core/coreutils/coreutils/fix-selinux- flask.patch
index9d1ae55d47..173a57925b100644meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch +0
-1@@ -1,4 +1,4 @@ -From a1d360509fa3a4aff57eedcd528cc0347a87531d Mon Sep 17 00:00:002001
+From7e20a7242ba2657f73311bbf5278093da67f0721Mon Sep 17 00:00:00 2001
From: Robert Yang <[email protected]>
Date: Tue, 16 Sep 2014 01:59:08 -0700
Subject: [PATCH] gnulib-comp.m4:selinux/flask.hshould respect tometa/recipes-core/coreutils/coreutils/fix-selinux-flask.patch +4
-4@@ -13,20 +13,20 @@ compilation terminated. Upstream-Status: Pending Signed-off-by: Robert Yang <[email protected]> + --- - m4/gnulib-comp.m4 | 2 +- + m4/gnulib-comp.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 -index 472d3a0..5f09734 100644 +index dead90e..0abf0bd 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 -@@ -1730,11 +1730,11 @@ AC_DEFUN([gl_INIT], +@@ -1860,10 +1860,10 @@ AC_DEFUN([gl_INIT], AC_LIBOBJ([select]) fi gl_SYS_SELECT_MODULE_INDICATOR([select]) - AC_CHECK_HEADERS([selinux/flask.h]) - AC_LIBOBJ([selinux-at]) gl_HEADERS_SELINUX_SELINUX_H gl_HEADERS_SELINUX_CONTEXT_H if test "$with_selinux" != no && test"$ac_cv_header_selinux_selinux_h" = yes; then
meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch +0
-3@@ -34,6 +34,3 @@ index 472d3a0..5f09734 100644 AC_LIBOBJ([getfilecon]) fi gl_SERVENT --- -1.7.9.5 -(quoted diff) +0
-0lib-from-m4.patch b/meta/recipes-core/coreutils/coreutils/remove-usr- local-lib-from-m4.patch
index2ef8a548ac..1a8a9b9983100644
--- a/meta/recipes-core/coreutils/coreutils/remove-usr-local-lib- from-m4.patch
+++ b/meta/recipes-core/coreutils/coreutils/remove-usr-local-lib- from-m4.patch(quoted diff) +1
-0@@ -1,3 +1,8 @@ +From a26530083a29eeee910bfd606ecc621acecd547a Mon Sep 17 00:00:002001
meta/recipes-core/coreutils/coreutils/remove-usr-local-lib-from-m4.patch +4
-0+From: Khem Raj <[email protected]> +Date: Wed, 3 Aug 2011 14:12:30 -0700 +Subject: [PATCH] coreutils: Fix build on uclibc + We have problem using hardcoded directories like /usr/local here which will be checked for cross builds. This is a special case which is valid for AIX only. We do not have AIX as one of our supported@@ -8,11 +13,15 @@ Signed-off-by: Khem Raj <[email protected]> Upstream-Status: Inappropriate [Upstream does care for AIX while wemay not]
-Index: coreutils-8.14/m4/getloadavg.m4
-===================================================================
---- coreutils-8.14.orig/m4/getloadavg.m4 2011-09-19
08:09:24.000000000 -0700
-+++ coreutils-8.14/m4/getloadavg.m4 2011-10-19 21:42:00.385533357
-0700
-@@ -41,16 +41,6 @@+--- + m4/getloadavg.m4 | 12 ------------+ 1 file changed, 12 deletions(-)
meta/recipes-core/coreutils/coreutils/remove-usr-local-lib-from-m4.patch +6
-0+ +diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 +index 8e96965..63782a2 100644 +--- a/m4/getloadavg.m4 ++++ b/m4/getloadavg.m4 +@@ -41,18 +41,6 @@ AC_CHECK_FUNC([getloadavg], [], [LIBS="-lutil $LIBS" gl_func_getloadavg_done=yes]) fi@@ -20,7 +29,9 @@ Index: coreutils-8.14/m4/getloadavg.m4 - # There is a commonly available library for RS/6000 AIX. - # Since it is not a standard part of AIX, it might beinstalled locally.
- gl_getloadavg_LIBS=$LIBS -- LIBS="-L/usr/local/lib $LIBS" +- if test $cross_compiling != yes; then +- LIBS="-L/usr/local/lib $LIBS" +- fi - AC_CHECK_LIB([getloadavg], [getloadavg], - [LIBS="-lgetloadavg $LIBS"gl_func_getloadavg_done=yes],
- [LIBS=$gl_getloadavg_LIBS])(quoted diff) +0
-0
core/coreutils/coreutils/strtod_fix_clash_with_strtold.patchb/meta/recipes-core/coreutils/coreutils/strtod_fix_clash_with_strtold.patchindex77770093cd..fd629a5d2a100644
--- a/meta/recipes-core/coreutils/coreutils/strtod_fix_clash_with_strtold.patch+++ b/meta/recipes-core/coreutils/coreutils/strtod_fix_clash_with_strtold.patch(quoted diff) +0
-1@@ -1,4 +1,4 @@ -From 0562b040fa17f1722ba2b3096067b45d0582ca53 Mon Sep 17 00:00:002001
+From134137671bd771bf0205b87a735c545dbcdbb4b3Mon Sep 17 00:00:00 2001
From: Paul Eggert <[email protected]>
Date: Mon, 11 Mar 2019 16:40:29 -0700
Subject: [PATCH] strtod: fix clash with strtold(quoted diff) +0
-0@@ -14,12 +14,11 @@ Upstream-Status: Backport [rhel5] Signed-off-by: Oleksandr Kravchuk <---
- ChangeLog | 9 +++++++++lib/strtod.c | 11 +++++------- 2 files changed, 14 insertions(+), 6 deletions(-)
+ 1 file changed, 5 insertions(+), 6 deletions(-)diff --git
a/lib/strtod.cb/lib/strtod.cmeta/recipes-core/coreutils/coreutils/strtod_fix_clash_with_strtold.patch +1
-4-index b9eaa51b4..69b1564e1 100644 +index b9eaa51..69b1564 100644 --- a/lib/strtod.c +++ b/lib/strtod.c @@ -294,16 +294,15 @@ parse_number (const char *nptr,@@ -51,6 +50,3 @@ index b9eaa51b4..69b1564e1 100644 + return minus_zero (); return negative ? -num : num; } --- -2.20.1 -meta/recipes-core/coreutils/coreutils_8.32.bb renamed from meta/recipes-core/coreutils/coreutils_8.31.bb +0
-2@@ -5,8 +5,9 @@ every system." HOMEPAGE = "http://www.gnu.org/software/coreutils/" BUGTRACKER = "http://debbugs.gnu.org/coreutils" LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ - file://src/ls.c;beginline=1;endline=15;md5=c456f
9896277a0543e3866777ccc0255" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
+ file://src/ls.c;beginline=1;endline=15;md5=b7d80abf5b279320fb0e4b1007ed108b\meta/recipes-core/coreutils/coreutils_8.32.bb renamed from meta/recipes-core/coreutils/coreutils_8.31.bb +2
-1+ " DEPENDS = "gmp libcap" DEPENDS_class-native = ""@@ -19,12 +20,12 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ file://disable-ls-output-quoting.patch \ file://0001-local.mk-fix-cross-compiling-problem.patch \ file://run-ptest \ - " + " SRC_URI_append_libc-musl =
Quoted 1 line
"file://strtod_fix_clash_with_strtold.patch"
Musl specific failure:
https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1840
Re: [OE-core] [PATCH 14/17] coreutils: update to 8.32
In reply to Alexander KanavinQuoted 11 lines · Alexander Kanavin
License-Update: copyright years, http changed to https
Signed-off-by Alexander Kanavin <[email protected]>--- .../coreutils/fix-selinux-flask.patch | 13 ++++------- .../remove-usr-local-lib-from-m4.patch | 23 ++++++++++++++--- -- .../strtod_fix_clash_with_strtold.patch | 10 +++----- .../{coreutils_8.31.bb => coreutils_8.32.bb} | 11 +++++---- 4 files changed, 31 insertions(+), 26 deletions(-) rename meta/recipes-core/coreutils/{coreutils_8.31.bb =>coreutils_8.32.bb} (95%)
Fails to build on arm hosts:
https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/1833
Cheers,
Richard
PATCH 15/17 python3-dbusmock: add recipe from meta-oe
In reply to Alexander KanavinThis is needed for glib ptests.
--- meta/conf/distro/include/maintainers.inc | 1 + .../python/python3-dbusmock_0.19.bb | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 meta/recipes-devtools/python/python3-dbusmock_0.19.bb
meta/conf/distro/include/maintainers.inc +1 -0
@@ -576,6 +576,7 @@ RECIPE_MAINTAINER_pn-python3 = "Oleksandr Kravchuk <open.source@oleksandr-kravch RECIPE_MAINTAINER_pn-python3-async = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER_pn-python3-cython = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER_pn-python3-dbus = "Oleksandr Kravchuk <[email protected]>" +RECIPE_MAINTAINER_pn-python3-dbusmock = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER_pn-python3-docutils = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER_pn-python3-extras = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER_pn-python3-git = "Oleksandr Kravchuk <[email protected]>"
meta/recipes-devtools/python/python3-dbusmock_0.19.bb new file +16 -0
@@ -0,0 +1,16 @@ +SUMMARY = "With this program/Python library you can easily create mock objects on D-Bus" + +LICENSE = "GPL-3.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" + +SRC_URI[sha256sum] = "497f30eed2fcd5deaa2633b9622e4e99af4bdfba4e972b350ba630bac6fc86c2" + +PYPI_PACKAGE = "python-dbusmock" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-dbus \ + ${PYTHON_PN}-pygobject \ + ${PYTHON_PN}-xml \ + "
Signature · 1 line
2.26.1
PATCH 16/17 glib-2.0: update 2.62.4 -> 2.64.2
In reply to Alexander KanavinAdd a couple of missing ptest dependencies.
Drop backports.
---
...-Do-not-ignore-return-value-of-write.patch | 6 +-
...t-write-bindir-into-pkg-config-files.patch | 10 +-
...0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | 7 +-
...-gio-querymodules-as-libexec_PROGRAM.patch | 6 +-
...ng-about-deprecated-paths-in-schemas.patch | 11 +-
...-correctly-when-building-with-mingw3.patch | 22 ++--
...ces.c-comment-out-a-build-host-only-.patch | 3 +-
...on-Run-atomics-test-on-clang-as-well.patch | 10 +-
...dcode-python-path-into-various-tools.patch | 14 +--
...-GSource-iterator-if-iteration-can-m.patch | 43 -------
...-memory-leaks-and-memory-corruption-.patch | 109 ------------------
...e-mutex-unlocking-in-destructor-righ.patch | 36 ------
...ble-more-tests-while-cross-compiling.patch | 32 ++---
.../glib-2.0/glib-2.0/relocate-modules.patch | 10 +-
...{glib-2.0_2.62.4.bb => glib-2.0_2.64.2.bb} | 7 +-
meta/recipes-core/glib-2.0/glib.inc | 4 +-
16 files changed, 66 insertions(+), 264 deletions(-)
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0011-GMainContext-Fix-GSource-iterator-if-iteration-can-m.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0012-GMainContext-Fix-memory-leaks-and-memory-corruption-.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0013-GMainContext-Move-mutex-unlocking-in-destructor-righ.patch
rename meta/recipes-core/glib-2.0/{glib-2.0_2.62.4.bb => glib-2.0_2.64.2.bb} (83%)meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch +3 -3
@@ -1,4 +1,4 @@ -From d250652782b65b071b7cc8f01f2db833df104e0e Mon Sep 17 00:00:00 2001 +From 658c034d92027dc8af5f784cae852123fac79b19 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sat, 16 Apr 2016 13:28:59 -0700 Subject: [PATCH] Do not ignore return value of write()
@@ -16,10 +16,10 @@ Signed-off-by: Khem Raj <[email protected]> 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/glib/tests/unix.c b/glib/tests/unix.c -index 9d55a6c..a07f945 100644 +index 7639d06..f941141 100644 --- a/glib/tests/unix.c +++ b/glib/tests/unix.c -@@ -32,14 +32,15 @@ test_pipe (void) +@@ -33,14 +33,15 @@ test_pipe (void) GError *error = NULL; int pipefd[2]; char buf[1024];
meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch +5 -5
@@ -1,4 +1,4 @@ -From 60b36289ac314ad972cf81c1acd19f6f2e58ff25 Mon Sep 17 00:00:00 2001 +From 0797a40627a4cb5439a24b872edc65356dceaaf0 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 15 Feb 2019 11:17:27 +0100 Subject: [PATCH] Do not write $bindir into pkg-config files
@@ -16,13 +16,13 @@ Signed-off-by: Alexander Kanavin <[email protected]> 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gio/meson.build b/gio/meson.build -index 71e88c4..8ce3987 100644 +index 532b086..98468a3 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -831,14 +831,14 @@ pkg.generate(libgio, +@@ -820,14 +820,14 @@ pkg.generate(libgio, 'schemasdir=' + join_paths('${datadir}', schemas_subdir), 'bindir=' + join_paths('${prefix}', get_option('bindir')), - 'giomoduledir=' + giomodulesdir, + 'giomoduledir=' + pkgconfig_giomodulesdir, - 'gio=' + join_paths('${bindir}', 'gio'), - 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'), - 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'),
@@ -43,7 +43,7 @@ index 71e88c4..8ce3987 100644 install_dir : glib_pkgconfigreldir, filebase : 'gio-2.0', diff --git a/glib/meson.build b/glib/meson.build -index 91a48f1..978fb73 100644 +index aaf5f00..1e0992b 100644 --- a/glib/meson.build +++ b/glib/meson.build @@ -375,9 +375,9 @@ pkg.generate(libglib,
meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch +2 -5
@@ -1,4 +1,4 @@ -From 15f807481de53942525b48952c5b6bbb9fb66542 Mon Sep 17 00:00:00 2001 +From c94e669de98a3892c699bd8d0d2b5164b2de747e Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sat, 15 Mar 2014 22:42:29 -0700 Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux
@@ -9,7 +9,7 @@ based systems therefore lets set DATADIRNAME to "share". Signed-off-by: Khem Raj <[email protected]> Upstream-Status: Pending -%% original patch: uclibc_musl_translation.patch + --- m4macros/glib-gettext.m4 | 4 ++++ 1 file changed, 4 insertions(+)
@@ -29,6 +29,3 @@ index df6fbf0..47db864 100644 *) CATOBJEXT=.mo DATADIRNAME=lib --- -2.17.1 -
meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch +3 -3
@@ -1,4 +1,4 @@ -From d29dfba67b1808eea6d428085f95b6e42cf2d1e4 Mon Sep 17 00:00:00 2001 +From 0015db45cd1bfefc04959dffab5dabeead93136f Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <[email protected]> Date: Tue, 22 Mar 2016 15:14:58 +0200 Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM
@@ -14,10 +14,10 @@ Upstream-Status: Inappropriate [OE specific] 1 file changed, 1 insertion(+) diff --git a/gio/meson.build b/gio/meson.build -index 4e5e021..90a741a 100644 +index 2ef60ed..532b086 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -940,6 +940,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu +@@ -936,6 +936,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu c_args : gio_c_args, # intl.lib is not compatible with SAFESEH link_args : noseh_link_args,
meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch +4 -7
@@ -1,7 +1,7 @@ -From 2acf40361eecd17c6981743dabd06e25a9934258 Mon Sep 17 00:00:00 2001 +From 4f47b8a8d650d185aa61aec2f56a283522a723c4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 12 Jun 2015 17:08:46 +0300 -Subject: [PATCH 05/10] Remove the warning about deprecated paths in schemas +Subject: [PATCH] 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
@@ -15,10 +15,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 13 deletions(-) diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c -index b8de090..130f89b 100644 +index 7888120..7acbd5b 100644 --- a/gio/glib-compile-schemas.c +++ b/gio/glib-compile-schemas.c -@@ -1219,19 +1219,6 @@ parse_state_start_schema (ParseState *state, +@@ -1232,19 +1232,6 @@ parse_state_start_schema (ParseState *state, return; }
@@ -38,6 +38,3 @@ index b8de090..130f89b 100644 state->schema_state = schema_state_new (path, gettext_domain, extends, extends_name, list_of); --- -2.14.1 -
meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +11 -11
@@ -1,4 +1,4 @@ -From cfff734af6bff6a30a649f784ecf698658c01884 Mon Sep 17 00:00:00 2001 +From d3334e83ae0da9ca184eb9c8daf0854544ece023 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 13 Feb 2019 15:32:05 +0100 Subject: [PATCH] Set host_machine correctly when building with mingw32
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gio/tests/meson.build b/gio/tests/meson.build -index 95aafc1..9025eb2 100644 +index dab65d2..e8bb2ee 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build -@@ -13,7 +13,7 @@ test_c_args = [ +@@ -12,7 +12,7 @@ test_c_args = [ '-UG_DISABLE_ASSERT', ]
@@ -26,7 +26,7 @@ index 95aafc1..9025eb2 100644 common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] endif -@@ -120,7 +120,7 @@ if dbus1_dep.found() +@@ -132,7 +132,7 @@ else endif # Test programs buildable on UNIX only
@@ -35,7 +35,7 @@ index 95aafc1..9025eb2 100644 gio_tests += { 'file' : {}, 'gdbus-peer' : { -@@ -332,7 +332,7 @@ if host_machine.system() != 'windows' +@@ -384,7 +384,7 @@ if host_machine.system() != 'windows' endif # unix # Test programs buildable on Windows only
@@ -44,7 +44,7 @@ index 95aafc1..9025eb2 100644 gio_tests += {'win32-streams' : {}} endif -@@ -397,7 +397,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' +@@ -454,7 +454,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' } endif
@@ -54,10 +54,10 @@ index 95aafc1..9025eb2 100644 'gdbus-example-unix-fd-client' : { 'install' : false, diff --git a/glib/tests/meson.build b/glib/tests/meson.build -index c47133f..cad975f 100644 +index 3dedafc..94605e6 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build -@@ -132,7 +132,7 @@ if glib_conf.has('HAVE_EVENTFD') +@@ -134,7 +134,7 @@ if glib_conf.has('HAVE_EVENTFD') } endif
@@ -67,7 +67,7 @@ index c47133f..cad975f 100644 glib_tests += { 'gpoll' : { diff --git a/meson.build b/meson.build -index 717d1bc..2a3beb8 100644 +index e1b4b79..afb6eaa 100644 --- a/meson.build +++ b/meson.build @@ -32,6 +32,9 @@ else
@@ -81,10 +81,10 @@ index 717d1bc..2a3beb8 100644 glib_version = meson.project_version() glib_api_version = '2.0' diff --git a/tests/meson.build b/tests/meson.build -index ce30442..5710f2c 100644 +index 6741f8f..12fdc90 100644 --- a/tests/meson.build +++ b/tests/meson.build -@@ -66,7 +66,7 @@ test_extra_programs = { +@@ -73,7 +73,7 @@ test_extra_programs = { 'unicode-collate' : {}, }
meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch +2 -1
@@ -1,4 +1,4 @@ -From 730803f2bc3f2f1a74f4db809a224066e7eae114 Mon Sep 17 00:00:00 2001 +From 92de6c7eb30b961b24a2dce812d5276487b7d23d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 8 Jan 2020 18:22:46 +0100 Subject: [PATCH] gio/tests/resources.c: comment out a build host-only test
@@ -8,6 +8,7 @@ not cross-compatible (hardcodes ld and objcopy). Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <[email protected]> + --- gio/tests/resources.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch +4 -6
@@ -1,4 +1,4 @@ -From cce617bec254e327ed7bcad60f58208024c6dc42 Mon Sep 17 00:00:00 2001 +From 4b97f457b7b44117e27d2a218c4b68e7fe3fe4ce Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sat, 12 Oct 2019 17:46:26 -0700 Subject: [PATCH] meson: Run atomics test on clang as well
@@ -9,15 +9,16 @@ Fixes Upstream-Status: Pending Signed-off-by: Khem Raj <[email protected]> + --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 9731de4..c678931 100644 +index afb6eaa..6aa70f5 100644 --- a/meson.build +++ b/meson.build -@@ -1634,7 +1634,7 @@ atomicdefine = ''' +@@ -1692,7 +1692,7 @@ atomicdefine = ''' # We know that we can always use real ("lock free") atomic operations with MSVC if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops') have_atomic_lock_free = true
@@ -26,6 +27,3 @@ index 9731de4..c678931 100644 # Old gcc release may provide # __sync_bool_compare_and_swap but doesn't define # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 --- -2.23.0 -
meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch +6 -8
@@ -1,10 +1,11 @@ -From b9160d951b9af647b97766c57295ca4f45cf9521 Mon Sep 17 00:00:00 2001 +From 79ce7e545dd3a93f77d2146d50b6fa061fbceed9 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 +Subject: [PATCH] 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 +-
@@ -12,7 +13,7 @@ Signed-off-by: Alexander Kanavin <[email protected]> 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 100755 +index 67d3675..4e92a7a 100755 --- a/gio/gdbus-2.0/codegen/gdbus-codegen.in +++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in @@ -1,4 +1,4 @@
@@ -22,7 +23,7 @@ index 8050981..e693ef3 100755 # GDBus - GLib D-Bus Library # diff --git a/gobject/glib-genmarshal.in b/gobject/glib-genmarshal.in -index 09e8408..b2f9d99 100755 +index 7380f24..c8abeaa 100755 --- a/gobject/glib-genmarshal.in +++ b/gobject/glib-genmarshal.in @@ -1,4 +1,4 @@
@@ -32,7 +33,7 @@ index 09e8408..b2f9d99 100755 # 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 +index 91ad779..3ebef62 100755 --- a/gobject/glib-mkenums.in +++ b/gobject/glib-mkenums.in @@ -1,4 +1,4 @@
@@ -41,6 +42,3 @@ index d4bfd11..051fce4 100755 # If the code below looks horrible and unpythonic, do not panic. # --- -2.14.1 -
meta/recipes-core/glib-2.0/glib-2.0/0011-GMainContext-Fix-GSource-iterator-if-iteration-can-m.patch deleted +0 -43
43 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0/0012-GMainContext-Fix-memory-leaks-and-memory-corruption-.patch deleted +0 -109
109 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0/0013-GMainContext-Move-mutex-unlocking-in-destructor-righ.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From 3e9d85f1b75e2b1096d9643563d7d17380752fc7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <[email protected]> -Date: Tue, 11 Feb 2020 09:34:38 +0200 -Subject: [PATCH] GMainContext - Move mutex unlocking in destructor right - before freeing the mutex - -This does not have any behaviour changes but is cleaner. The mutex is -only unlocked now after all operations on the context are done and right -before freeing the mutex and the context itself. - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/730a75fc8e8271c38fbd5363d1f77a00876b9ddc] - ---- - glib/gmain.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/glib/gmain.c b/glib/gmain.c -index 10ba2f8..b1df470 100644 ---- a/glib/gmain.c -+++ b/glib/gmain.c -@@ -584,7 +584,6 @@ g_main_context_unref (GMainContext *context) - source = s_iter->data; - g_source_destroy_internal (source, context, TRUE); - } -- UNLOCK_CONTEXT (context); - - for (sl_iter = context->source_lists; sl_iter; sl_iter = sl_iter->next) - { -@@ -595,6 +594,7 @@ g_main_context_unref (GMainContext *context) - - g_hash_table_destroy (context->sources); - -+ UNLOCK_CONTEXT (context); - g_mutex_clear (&context->mutex); - - g_ptr_array_free (context->pending_dispatches, TRUE);
meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch +16 -16
@@ -1,4 +1,4 @@ -From 0061d66057dfd7e7267772df60b36474fb180eed Mon Sep 17 00:00:00 2001 +From 7cde170afe6854d674b50e32b4c1d3b511be9abe 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
@@ -15,10 +15,10 @@ Signed-off-by: Jussi Kukkonen <[email protected]> 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gio/tests/meson.build b/gio/tests/meson.build -index 382dfcc..c171717 100644 +index 788cf97..dab65d2 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build -@@ -191,7 +191,7 @@ if host_machine.system() != 'windows' +@@ -203,7 +203,7 @@ if host_machine.system() != 'windows' # Test programs that need to bring up a session bus (requires dbus-daemon) have_dbus_daemon = find_program('dbus-daemon', required : false).found()
@@ -27,8 +27,8 @@ index 382dfcc..c171717 100644 annotate_args = [ '--annotate', 'org.project.Bar', 'Key1', 'Value1', '--annotate', 'org.project.Bar', 'org.gtk.GDBus.Internal', 'Value2', -@@ -465,12 +465,12 @@ if installed_tests_enabled - install_data('static-link.py', install_dir : installed_tests_execdir) +@@ -548,12 +548,12 @@ if installed_tests_enabled + endforeach endif -if not meson.is_cross_build() or meson.has_exe_wrapper()
@@ -42,7 +42,7 @@ index 382dfcc..c171717 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--generate-source', -@@ -494,7 +494,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -577,7 +577,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() test_gresource = custom_target('test.gresource', input : 'test.gresource.xml', output : 'test.gresource',
@@ -51,7 +51,7 @@ index 382dfcc..c171717 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--sourcedir=' + meson.current_build_dir(), -@@ -505,7 +505,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -588,7 +588,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() test_resources2_c = custom_target('test_resources2.c', input : 'test3.gresource.xml', output : 'test_resources2.c',
@@ -60,7 +60,7 @@ index 382dfcc..c171717 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--generate', -@@ -516,7 +516,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -599,7 +599,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() test_resources2_h = custom_target('test_resources2.h', input : 'test3.gresource.xml', output : 'test_resources2.h',
@@ -69,7 +69,7 @@ index 382dfcc..c171717 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--generate', -@@ -528,7 +528,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -611,7 +611,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() input : 'test2.gresource.xml', depends : big_test_resource, output : 'test_resources.c',
@@ -78,7 +78,7 @@ index 382dfcc..c171717 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--sourcedir=' + meson.current_build_dir(), -@@ -539,7 +539,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -622,7 +622,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() digit_test_resources_c = custom_target('digit_test_resources.c', input : '111_digit_test.gresource.xml', output : 'digit_test_resources.c',
@@ -87,7 +87,7 @@ index 382dfcc..c171717 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--sourcedir=' + meson.current_build_dir(), -@@ -550,7 +550,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -633,7 +633,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() digit_test_resources_h = custom_target('digit_test_resources.h', input : '111_digit_test.gresource.xml', output : 'digit_test_resources.h',
@@ -96,11 +96,11 @@ index 382dfcc..c171717 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--generate', -@@ -579,11 +579,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() - # LLVM once that support is in a stable release. - objcopy = find_program('objcopy', required : false) +@@ -668,11 +668,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() -- if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() + ld = find_program('ld', required : false) + +- if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() and objcopy_supports_add_symbol and ld.found() + if not meson.is_cross_build() test_gresource_binary = custom_target('test5.gresource', input : 'test5.gresource.xml',
@@ -110,7 +110,7 @@ index 382dfcc..c171717 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--sourcedir=' + meson.current_build_dir(), -@@ -595,7 +595,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -684,7 +684,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() test_resources_binary_c = custom_target('test_resources_binary.c', input : 'test5.gresource.xml', output : 'test_resources_binary.c',
meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +5 -5
@@ -1,4 +1,4 @@ -From 8c623acdbea3ecc2812bbaafcfc892758fa978da Mon Sep 17 00:00:00 2001 +From 2a715765c6ceb2e8b4cc42e060aee75016111d1a Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Fri, 11 Mar 2016 15:35:55 +0000 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
@@ -19,11 +19,11 @@ Signed-off-by: Jussi Kukkonen <[email protected]> 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gio/giomodule.c b/gio/giomodule.c -index 1007abd..5380982 100644 +index c420260..a023745 100644 --- a/gio/giomodule.c +++ b/gio/giomodule.c -@@ -44,6 +44,8 @@ - #include "gnetworkmonitor.h" +@@ -47,6 +47,8 @@ + #include "gmemorymonitordbus.h" #ifdef G_OS_WIN32 #include "gregistrysettingsbackend.h" +#else
@@ -32,7 +32,7 @@ index 1007abd..5380982 100644 #include <glib/gstdio.h> @@ -1158,7 +1160,15 @@ get_gio_module_dir (void) - #endif + NULL); g_free (install_dir); #else - module_dir = g_strdup (GIO_MODULE_DIR);
meta/recipes-core/glib-2.0/glib-2.0_2.64.2.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb +2 -5
@@ -16,15 +16,12 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ - file://0011-GMainContext-Fix-GSource-iterator-if-iteration-can-m.patch \ - file://0012-GMainContext-Fix-memory-leaks-and-memory-corruption-.patch \ - file://0013-GMainContext-Move-mutex-unlocking-in-destructor-righ.patch \ " SRC_URI_append_class-native = " file://relocate-modules.patch" -SRC_URI[md5sum] = "d52234ecba128932bed90bbc3553bfe5" -SRC_URI[sha256sum] = "4c84030d77fa9712135dfa8036ad663925655ae95b1d19399b6200e869925bbc" +SRC_URI[md5sum] = "78b6bda8664763a09bd12d864c0ba46c" +SRC_URI[sha256sum] = "9a2f21ed8f13b9303399de13a0252b7cbcede593d26971378ec6cb90e87f2277" # Find any meson cross files in FILESPATH that are relevant for the current # build (using siteinfo) and add them to EXTRA_OEMESON.
meta/recipes-core/glib-2.0/glib.inc +3 -1
@@ -42,7 +42,7 @@ PACKAGECONFIG ??= "system-pcre libmount \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" # To use the system pcre it must be configured with --enable-unicode-properties PACKAGECONFIG[system-pcre] = "-Dinternal_pcre=false,-Dinternal_pcre=true,libpcre" -PACKAGECONFIG[libmount] = "-Dlibmount=true,-Dlibmount=false,util-linux" +PACKAGECONFIG[libmount] = "-Dlibmount=enabled,-Dlibmount=disabled,util-linux" PACKAGECONFIG[manpages] = "-Dman=true, -Dman=false, libxslt-native xmlto-native" # libelf is auto-detected without a configuration option PACKAGECONFIG[libelf] = ",,elfutils"
@@ -168,6 +168,8 @@ RDEPENDS_${PN}-ptest += "\ ${PN}-locale-th \ python3-core \ python3-modules \ + python3-dbusmock \ + ${PN}-codegen \ " RDEPENDS_${PN}-ptest_append_libc-glibc = "\
Signature · 1 line
2.26.1
Re: [OE-core] [PATCH 16/17] glib-2.0: update 2.62.4 -> 2.64.2
Quoted 1 line · Alexander Kanavin
Add a couple of missing ptest dependencies.
That causes problems for non-gplv3:
https://autobuilder.yoctoproject.org/typhoon/#/builders/75/builds/1848
Quoted 1 line
Drop backports.
and more strangely:
https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/466
which looks liek a gtk-doc issue?
Cheers,
Richard
Re: [OE-core] [PATCH 16/17] glib-2.0: update 2.62.4 -> 2.64.2
Quoted 6 lines · Richard Purdie
Quoted 1 line · Alexander Kanavin
Add a couple of missing ptest dependencies.
That causes problems for non-gplv3:
https://autobuilder.yoctoproject.org/typhoon/#/builders/75/builds/1848
"Missing or unbuildable dependency chain was: ['core-image-minimal', 'packagegroup-core-boot', 'udev', 'glib-2.0', 'python3-dbusmock']" The offending package is pulled in via ptests RDEPENDS.
This can be addressed either viaDISTRO_FEATURES_remove = "ptest"
or setting license restrictions per-image:
INCOMPATIBLE_LICENSE_pn-core-image-minimal = "GPL-3.0 LGPL-3.0"
I prefer the latter - thoughts?
Alex
Re: [OE-core] [PATCH 16/17] glib-2.0: update 2.62.4 -> 2.64.2
Other than the non-gpl3 issue, I have corrected the issues, and just sent the updated patches.
Alex
Quoted 24 lines · Alexander Kanavin
Quoted 6 lines · Richard Purdie
Quoted 1 line · Alexander Kanavin
Add a couple of missing ptest dependencies.
That causes problems for non-gplv3:
https://autobuilder.yoctoproject.org/typhoon/#/builders/75/builds/1848"Missing or unbuildable dependency chain was: ['core-image-minimal', 'packagegroup-core-boot', 'udev', 'glib-2.0', 'python3-dbusmock']" The offending package is pulled in via ptests RDEPENDS.
This can be addressed either via
DISTRO_FEATURES_remove= "ptest"or setting license restrictions per-image:
INCOMPATIBLE_LICENSE_pn-core-image-minimal = "GPL-3.0 LGPL-3.0"I prefer the latter - thoughts?
Alex
PATCH 17/17 glib-networking: update to 2.64.2
In reply to Alexander Kanavin---
.../{glib-networking_2.62.3.bb => glib-networking_2.64.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-core/glib-networking/{glib-networking_2.62.3.bb => glib-networking_2.64.2.bb} (88%)meta/recipes-core/glib-networking/glib-networking_2.64.2.bb renamed from meta/recipes-core/glib-networking/glib-networking_2.62.3.bb +2 -2
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SECTION = "libs" DEPENDS = "glib-2.0" -SRC_URI[archive.md5sum] = "a758ca62bd54982a798b39c744cbf783" -SRC_URI[archive.sha256sum] = "8ca1f86f23a76b5c7640624f7d5490705c78e81375e1741c9a1c41ce7f8f7ff7" +SRC_URI[archive.md5sum] = "7f8c7ffe2616be4ef4232f2574353dab" +SRC_URI[archive.sha256sum] = "45def0715c551f9b0b41a4e4f730ac95f3d5d4f3de8162260fbf9421cff695a7" PACKAGECONFIG ??= "gnutls"
Signature · 1 line
2.26.1
Quoted 9 lines · Alexander Kanavin
The test takes about 17 minutes, and fully passes.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/conf/distro/include/ptest-packagelists.inc | 1 + meta/recipes-graphics/wayland/libinput/run-ptest | 9 +++++++++ meta/recipes-graphics/wayland/libinput_1.15.2.bb | 8 +++++--- 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-graphics/wayland/libinput/run-ptest
Still has a reproducibility issue:
https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/900
(and the other selftests in the build)
Cheers,
Richard