mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-27 20:07:25 +00:00
Code Issues Projects Releases Wiki Activity

fvwm: Upgrade to 2.6.9

Browse Source 
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>
This commit is contained in:
Khem Raj
2019-12-16 09:36:26 -08:00
parent a1a2d55ad4
commit e595651343
2 changed files with 1 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch
-17
View File
@@ -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 most definitely is not. It is accomplished by trying to execute
a program, which does not work when cross compiling. 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] Upstream-Status: inappropriate [OE specific]
Signed-off-by: Jarmo Jaakkola <jarmo.jaakkola@vincit.fi> Signed-off-by: Jarmo Jaakkola <jarmo.jaakkola@vincit.fi>
Signed-off-by: Riku Hämäläinen <riku.hamalainen@ge.com> 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], AH_VERBATIM([_COMPAT_OLD_KEYSYMDEF],
[#ifdef COMPAT_OLD_KEYSYMDEF [#ifdef COMPAT_OLD_KEYSYMDEF
# define XK_Page_Up XK_Prior # 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 1.9.1
meta-oe/recipes-graphics/fvwm/fvwm_2.6.8.bb → meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb
+1 -4
View File
@@ -31,14 +31,12 @@ DEPENDS = " \
zlib \ zlib \
" "
PV = "2.6.8"
SRC_URI = " \ SRC_URI = " \
git://github.com/fvwmorg/fvwm.git;protocol=https \ git://github.com/fvwmorg/fvwm.git;protocol=https \
file://0001-Fix-compilation-for-disabled-gnome.patch \ file://0001-Fix-compilation-for-disabled-gnome.patch \
" "
SRCREV = "dc6a396bfe5cd6c53eb1df103c3af505d0899f90" SRCREV = "88eab6dc16da6e5dd25fe97fbb56b96ef0d58657"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
@@ -55,7 +53,6 @@ EXTRA_OECONF = " \
--disable-fontconfigtest \ --disable-fontconfigtest \
--disable-htmldoc \ --disable-htmldoc \
--disable-imlibtest \ --disable-imlibtest \
--disable-mandoc \
--disable-nls \ --disable-nls \
--disable-perllib \ --disable-perllib \
--disable-rsvg \ --disable-rsvg \