diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-graphics/fvwm')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch | 17 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0002-Avoid-absolute-symlinks.patch | 27 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.8.bb (renamed from meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.7.bb) | 8 |
3 files changed, 4 insertions, 48 deletions
diff --git a/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch b/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch index 5a7647455..e81d395b9 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch @@ -27,22 +27,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], diff --git a/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0002-Avoid-absolute-symlinks.patch b/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0002-Avoid-absolute-symlinks.patch deleted file mode 100644 index 756cc86e8..000000000 --- a/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/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.7.bb b/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.8.bb index cb851bfd9..e1c3158bb 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.7.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.8.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,15 +31,14 @@ DEPENDS = " \ zlib \ " -PV = "2.6.7+git${SRCPV}" +PV = "2.6.8" 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 = "dc6a396bfe5cd6c53eb1df103c3af505d0899f90" S = "${WORKDIR}/git" @@ -54,7 +53,6 @@ ALTERNATIVE_PRIORITY[x-window-manager] = "20" EXTRA_OECONF = " \ --disable-bidi \ --disable-fontconfigtest \ - --disable-freetypetest \ --disable-htmldoc \ --disable-imlibtest \ --disable-mandoc \ |