fvwm: Upgrade to 2.6.9
PATCH 1/2 fvwm: Upgrade to 2.6.9
Drop manpage disable part from existing patch
An upstream patch [1] helps manpage creation
[1] https://github.com/fvwmorg/fvwm/commit/0fdf2815bc09edaf4c0ecb45d47ad12d00863239
Signed-off-by Khem Raj <[email protected]>
---
...001-Fix-compilation-for-disabled-gnome.patch | 17 -----------------
.../fvwm/{fvwm_2.6.8.bb => fvwm_2.6.9.bb} | 5 +----
2 files changed, 1 insertion(+), 21 deletions(-)
rename meta-oe/recipes-graphics/fvwm/{fvwm_2.6.8.bb => fvwm_2.6.9.bb} (96%)meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch +0 -17
@@ -10,10 +10,6 @@ COMPAT_OLD_KEYSYMDEF is a check for a legacy system, which our system most definitely is not. It is accomplished by trying to execute a program, which does not work when cross compiling. -The fvwm(1) man page is created from Docbook XML which is set for -a Windows code page that is not available when compiling. Easiest is -to just not create the man page as those are not needed on the monitor. - Upstream-Status: inappropriate [OE specific] Signed-off-by: Jarmo Jaakkola <[email protected]> Signed-off-by: Riku Hämäläinen <[email protected]>
@@ -36,19 +32,6 @@ index 48ce264..fab7b44 100644 AH_VERBATIM([_COMPAT_OLD_KEYSYMDEF], [#ifdef COMPAT_OLD_KEYSYMDEF # define XK_Page_Up XK_Prior -diff --git a/doc/fvwm/Makefile.am b/doc/fvwm/Makefile.am -index cddb102..ff00149 100755 ---- a/doc/fvwm/Makefile.am -+++ b/doc/fvwm/Makefile.am -@@ -10,7 +10,7 @@ XSL_PROFILE = $(srcdir)/../docbook-xsl/profiling/profile.xsl - HTML_FILES = fvwm.man.html - XML_FILES = @DOC_SECTIONS_XML_PATH@ - EXTRA_DIST = @DOC_SECTIONS_XML@ $(man_MANS) sections --man_MANS = fvwm.1 -+man_MANS = - - if FVWM_BUILD_HTMLDOC - doc_DATA = $(HTML_FILES) -- 1.9.1
meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb renamed from meta-oe/recipes-graphics/fvwm/fvwm_2.6.8.bb +1 -4
@@ -31,14 +31,12 @@ DEPENDS = " \ zlib \ " -PV = "2.6.8" - SRC_URI = " \ git://github.com/fvwmorg/fvwm.git;protocol=https \ file://0001-Fix-compilation-for-disabled-gnome.patch \ " -SRCREV = "dc6a396bfe5cd6c53eb1df103c3af505d0899f90" +SRCREV = "88eab6dc16da6e5dd25fe97fbb56b96ef0d58657" S = "${WORKDIR}/git"
@@ -55,7 +53,6 @@ EXTRA_OECONF = " \ --disable-fontconfigtest \ --disable-htmldoc \ --disable-imlibtest \ - --disable-mandoc \ --disable-nls \ --disable-perllib \ --disable-rsvg \
Signature · 1 line
2.24.1
PATCH 2/2 nlohmann-json: Upgrade to 3.7.3
Rename recipe to express PV
Signed-off-by Khem Raj <[email protected]>
---
.../{nlohmann-json_git.bb => nlohmann-json_3.7.3.bb} | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
rename meta-oe/recipes-devtools/nlohmann-json/{nlohmann-json_git.bb => nlohmann-json_3.7.3.bb} (89%)meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.7.3.bb renamed from meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb +1 -3
@@ -6,9 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=f5f7c71504da070bcf4f090205ce1080" SRC_URI = "git://github.com/nlohmann/json.git" -PV = "3.7.0+git${SRCPV}" - -SRCREV = "ea60d40f4a60a47d3be9560d8f7bc37c163fe47b" +SRCREV = "e7b3b40b5a95bc74b9a7f662830a27c49ffc01b4" S = "${WORKDIR}/git"
Signature · 1 line
2.24.1
Re: [meta-oe][PATCH 2/2] nlohmann-json: Upgrade to 3.7.3
Quoted 17 lines · Khem Raj
Rename recipe to express PV
Signed-off-by Khem Raj <[email protected]>--- .../{nlohmann-json_git.bb => nlohmann-json_3.7.3.bb} | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) rename meta-oe/recipes-devtools/nlohmann-json/{nlohmann-json_git.bb => nlohmann-json_3.7.3.bb} (89%)meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.7.3.bb renamed from meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb +0
-0
meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.7.3.bb LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=f5f7c71504da070bcf4f090205ce1080" · line 7
Quoted 2 lines
meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.7.3.bb renamed from meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb +0
-0@@ -6,9 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=f5f7c71504da070bcf4f090205ce1080" SRC_URI = "git://github.com/nlohmann/json.git"
Since this is a release tag, it also needed adding nobranch=1 to SRC_URI which is what is staged in master-next
Quoted 11 lines
meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.7.3.bb renamed from meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb +1
-4-PV = "3.7.0+git${SRCPV}" - -SRCREV = "ea60d40f4a60a47d3be9560d8f7bc37c163fe47b" +SRCREV = "e7b3b40b5a95bc74b9a7f662830a27c49ffc01b4" S = "${WORKDIR}/git" --2.24.1