diff options
Diffstat (limited to 'external/meta-openembedded/meta-oe/recipes-graphics/fvwm')
-rw-r--r-- | external/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch | 34 | ||||
-rw-r--r-- | external/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0002-Avoid-absolute-symlinks.patch | 27 | ||||
-rw-r--r-- | external/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb (renamed from external/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.7.bb) | 11 |
3 files changed, 4 insertions, 68 deletions
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch b/external/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch index 5a764745..50003e33 100644 --- a/external/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch +++ b/external/meta-openembedded/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> @@ -27,22 +23,7 @@ diff --git a/configure.ac b/configure.ac index 48ce264..fab7b44 100644 --- a/configure.ac +++ b/configure.ac -@@ -1413,23 +1413,7 @@ else - problem_gdkimlib=": Failed on gdk-imlib, see config.log" - fi - --GNOME_INIT_HOOK -- --# Unfortunately we have 2 gnome supports: WM hints and gnome libs. --# The $with_gnomehints below refers to the first, not GNOME_INIT_HOOK. --if test ! x"$enable_gnome_hints" = xno; then -- with_gnomehints=yes -- problem_gnomehints="" --else -- with_gnomehints=no -- problem_gnomehints=": Explicitly disabled" --fi -- +@@ -1413,8 +1413,4 @@ else # Define some compatibility macros needed for config.h. -mg_DEFINE_IF_NOT([#include <X11/keysym.h>], - [defined XK_Page_Up && defined XK_Page_Down], @@ -51,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/external/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0002-Avoid-absolute-symlinks.patch b/external/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0002-Avoid-absolute-symlinks.patch deleted file mode 100644 index 756cc86e..00000000 --- a/external/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0002-Avoid-absolute-symlinks.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Sebastian Reichel <sebastian.reichel@collabora.co.uk> -Date: Tue, 29 Auf 2017 16:08:42 +0200 -Subject: [PATCH] Avoid absolute symlinks - -Avoid usage of absolute symlinks, which breaks yocto builds -since pyro. - -Upstream-Status: Pending -Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> - -diff --git a/default-config/Makefile.am b/default-config/Makefile.am -index 5e16d095a137..5404145a742c 100644 ---- a/default-config/Makefile.am -+++ b/default-config/Makefile.am -@@ -17,9 +17,9 @@ EXTRA_DIST = images \ - - install-data-hook: - cp -r $(srcdir)/images $(inst_location) -- ln -sf $(inst_location)/FvwmScript-DateTime $(inst_location)/.. -- ln -sf $(inst_location)/FvwmScript-ConfirmQuit $(inst_location)/.. -- ln -sf $(inst_location)/FvwmScript-ConfirmCopyConfig $(inst_location)/.. -+ ln -sf default-config/FvwmScript-DateTime $(inst_location)/.. -+ ln -sf default-config/FvwmScript-ConfirmQuit $(inst_location)/.. -+ ln -sf default-config/FvwmScript-ConfirmCopyConfig $(inst_location)/.. - - uninstall-hook: - rm -fr $(DESTDIR)/$(configdir) diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.7.bb b/external/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb index cb851bfd..51f5a4ec 100644 --- a/external/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.7.bb +++ b/external/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb @@ -2,7 +2,7 @@ SUMMARY = "F Virtual Window Manager " HOMEPAGE = "http://www.fvwm.org/" SECTION = "x11/wm" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=363fbcfb59124689af72c914560eaf6e" +LIC_FILES_CHKSUM = "file://COPYING;md5=f8204787357db6ea518dcc9b6cf08388" DEPENDS = " \ bison-native \ @@ -31,19 +31,16 @@ DEPENDS = " \ zlib \ " -PV = "2.6.7+git${SRCPV}" - SRC_URI = " \ git://github.com/fvwmorg/fvwm.git;protocol=https \ file://0001-Fix-compilation-for-disabled-gnome.patch \ - file://0002-Avoid-absolute-symlinks.patch \ " -SRCREV = "597a4e296da4f21e71a17facab297e016a3a80a8" +SRCREV = "88eab6dc16da6e5dd25fe97fbb56b96ef0d58657" S = "${WORKDIR}/git" -inherit autotools gettext update-alternatives pkgconfig pythonnative perlnative distro_features_check +inherit autotools gettext update-alternatives pkgconfig python3native perlnative features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" @@ -54,10 +51,8 @@ ALTERNATIVE_PRIORITY[x-window-manager] = "20" EXTRA_OECONF = " \ --disable-bidi \ --disable-fontconfigtest \ - --disable-freetypetest \ --disable-htmldoc \ --disable-imlibtest \ - --disable-mandoc \ --disable-nls \ --disable-perllib \ --disable-rsvg \ |