diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2019-12-16 09:36:26 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2019-12-16 19:41:37 -0800 |
| commit | e595651343a0c380e699fa5137b8597e06e98edb (patch) | |
| tree | 91ce54f1f6fe7b0d6f7c10c823269133b317ff15 /meta-oe/recipes-graphics | |
| parent | a1a2d55ad46d2211ff54e5ae31e8e8916a620367 (diff) | |
| download | meta-openembedded-e595651343a0c380e699fa5137b8597e06e98edb.tar.gz | |
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 <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics')
| -rw-r--r-- | meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch | 17 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb (renamed from meta-oe/recipes-graphics/fvwm/fvwm_2.6.8.bb) | 5 |
2 files changed, 1 insertions, 21 deletions
diff --git a/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch b/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch index e81d395b9c..50003e3318 100644 --- a/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch +++ b/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch @@ -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 <jarmo.jaakkola@vincit.fi> Signed-off-by: Riku Hämäläinen <riku.hamalainen@ge.com> @@ -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 diff --git a/meta-oe/recipes-graphics/fvwm/fvwm_2.6.8.bb b/meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb index b3cb01aaa7..d1ba482039 100644 --- a/meta-oe/recipes-graphics/fvwm/fvwm_2.6.8.bb +++ b/meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb @@ -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 \ |