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/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch | |
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/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch')
-rw-r--r-- | meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch | 17 |
1 files changed, 0 insertions, 17 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 e81d395b9..50003e331 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 | |||
10 | most definitely is not. It is accomplished by trying to execute | 10 | most definitely is not. It is accomplished by trying to execute |
11 | a program, which does not work when cross compiling. | 11 | a program, which does not work when cross compiling. |
12 | 12 | ||
13 | The fvwm(1) man page is created from Docbook XML which is set for | ||
14 | a Windows code page that is not available when compiling. Easiest is | ||
15 | to just not create the man page as those are not needed on the monitor. | ||
16 | |||
17 | Upstream-Status: inappropriate [OE specific] | 13 | Upstream-Status: inappropriate [OE specific] |
18 | Signed-off-by: Jarmo Jaakkola <jarmo.jaakkola@vincit.fi> | 14 | Signed-off-by: Jarmo Jaakkola <jarmo.jaakkola@vincit.fi> |
19 | Signed-off-by: Riku Hämäläinen <riku.hamalainen@ge.com> | 15 | Signed-off-by: Riku Hämäläinen <riku.hamalainen@ge.com> |
@@ -36,19 +32,6 @@ index 48ce264..fab7b44 100644 | |||
36 | AH_VERBATIM([_COMPAT_OLD_KEYSYMDEF], | 32 | AH_VERBATIM([_COMPAT_OLD_KEYSYMDEF], |
37 | [#ifdef COMPAT_OLD_KEYSYMDEF | 33 | [#ifdef COMPAT_OLD_KEYSYMDEF |
38 | # define XK_Page_Up XK_Prior | 34 | # define XK_Page_Up XK_Prior |
39 | diff --git a/doc/fvwm/Makefile.am b/doc/fvwm/Makefile.am | ||
40 | index cddb102..ff00149 100755 | ||
41 | --- a/doc/fvwm/Makefile.am | ||
42 | +++ b/doc/fvwm/Makefile.am | ||
43 | @@ -10,7 +10,7 @@ XSL_PROFILE = $(srcdir)/../docbook-xsl/profiling/profile.xsl | ||
44 | HTML_FILES = fvwm.man.html | ||
45 | XML_FILES = @DOC_SECTIONS_XML_PATH@ | ||
46 | EXTRA_DIST = @DOC_SECTIONS_XML@ $(man_MANS) sections | ||
47 | -man_MANS = fvwm.1 | ||
48 | +man_MANS = | ||
49 | |||
50 | if FVWM_BUILD_HTMLDOC | ||
51 | doc_DATA = $(HTML_FILES) | ||
52 | -- | 35 | -- |
53 | 1.9.1 | 36 | 1.9.1 |
54 | 37 | ||