mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-04-02 02:49:12 +00:00
fvwm: Upgrade to 2.6.9
Drop manpage disable part from existing patch
An upstream patch [1] helps manpage creation
[1] 0fdf2815bc
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
a1a2d55ad4
commit
e595651343
@ -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
|
||||
|
||||
|
||||
@ -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 \
|
||||
Loading…
x
Reference in New Issue
Block a user