From d8fffe3c07078203b39f5704a3f3007eea2c92f8 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Fri, 10 May 2019 14:55:05 +0300 Subject: fvwm: Upgrade 2.6.7 -> 2.6.8 Remove patches applied upstream. pkg-config is now used when checking for freetype. The licence did not change by the changes to COPYING. Signed-off-by: Adrian Bunk Signed-off-by: Khem Raj --- .../0001-Fix-compilation-for-disabled-gnome.patch | 17 +-- .../fvwm/fvwm/0002-Avoid-absolute-symlinks.patch | 27 ----- meta-oe/recipes-graphics/fvwm/fvwm_2.6.7.bb | 114 --------------------- meta-oe/recipes-graphics/fvwm/fvwm_2.6.8.bb | 112 ++++++++++++++++++++ 4 files changed, 113 insertions(+), 157 deletions(-) delete mode 100644 meta-oe/recipes-graphics/fvwm/fvwm/0002-Avoid-absolute-symlinks.patch delete mode 100644 meta-oe/recipes-graphics/fvwm/fvwm_2.6.7.bb create mode 100644 meta-oe/recipes-graphics/fvwm/fvwm_2.6.8.bb 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 5a76474558..e81d395b9c 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 @@ -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 ], - [defined XK_Page_Up && defined XK_Page_Down], diff --git a/meta-oe/recipes-graphics/fvwm/fvwm/0002-Avoid-absolute-symlinks.patch b/meta-oe/recipes-graphics/fvwm/fvwm/0002-Avoid-absolute-symlinks.patch deleted file mode 100644 index 756cc86e87..0000000000 --- a/meta-oe/recipes-graphics/fvwm/fvwm/0002-Avoid-absolute-symlinks.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Sebastian Reichel -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 - -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-oe/recipes-graphics/fvwm/fvwm_2.6.7.bb b/meta-oe/recipes-graphics/fvwm/fvwm_2.6.7.bb deleted file mode 100644 index cb851bfd96..0000000000 --- a/meta-oe/recipes-graphics/fvwm/fvwm_2.6.7.bb +++ /dev/null @@ -1,114 +0,0 @@ -SUMMARY = "F Virtual Window Manager " -HOMEPAGE = "http://www.fvwm.org/" -SECTION = "x11/wm" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=363fbcfb59124689af72c914560eaf6e" - -DEPENDS = " \ - bison-native \ - flex-native \ - freetype-native \ - gettext-native \ - libxslt-native \ - fontconfig \ - libice \ - libpng \ - librsvg \ - libsm \ - libxau \ - libxcb \ - libxcursor \ - libxdmcp \ - libxext \ - libxfixes \ - libxft \ - libxinerama \ - libxml2 \ - libxrender \ - libxt \ - virtual/libx11 \ - xrandr \ - 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" - -S = "${WORKDIR}/git" - -inherit autotools gettext update-alternatives pkgconfig pythonnative perlnative distro_features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -ALTERNATIVE_${PN} = "x-window-manager" -ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/fvwm" -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 \ - --disable-shape \ - --disable-sm \ - --disable-xfttest \ - --with-imlib-exec-prefix=/nonexistent \ - --with-imlib-prefix=/nonexistent \ - --without-ncurses-library \ - --without-readline-library \ - --without-rplay-library \ - --without-stroke-library \ - --without-termcap-library \ - --without-xpm-library \ - ac_cv_func_mkstemp=no \ - has_safety_mkstemp=yes \ -" - -# show the exact commands in the log file -EXTRA_OEMAKE = " \ - V=1 \ -" - -do_install_append() { - install -d -m 0755 ${D}/${sysconfdir}/xdg/fvwm - # You can install the config file here - - install -d -m 0755 ${D}/${datadir}/fvwm - touch ${D}/${datadir}/fvwm/ConfigFvwmDefaults -} - -# the only needed packages (note: locale packages are automatically generated -# as well) -PACKAGES = " \ - ${PN} \ - ${PN}-dbg \ -" - -# minimal set of binaries -FILES_${PN} = " \ - ${bindir}/fvwm \ - ${bindir}/fvwm-root \ - ${datadir}/fvwm/ConfigFvwmDefaults \ -" - -RDEPENDS_${PN} = " \ - xuser-account \ -" - -# by default a lot of stuff is installed and it's not easy to control what to -# install, so install everything, but skip the check -INSANE_SKIP_${PN} = " \ - installed-vs-shipped \ -" diff --git a/meta-oe/recipes-graphics/fvwm/fvwm_2.6.8.bb b/meta-oe/recipes-graphics/fvwm/fvwm_2.6.8.bb new file mode 100644 index 0000000000..e1c3158bb0 --- /dev/null +++ b/meta-oe/recipes-graphics/fvwm/fvwm_2.6.8.bb @@ -0,0 +1,112 @@ +SUMMARY = "F Virtual Window Manager " +HOMEPAGE = "http://www.fvwm.org/" +SECTION = "x11/wm" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=f8204787357db6ea518dcc9b6cf08388" + +DEPENDS = " \ + bison-native \ + flex-native \ + freetype-native \ + gettext-native \ + libxslt-native \ + fontconfig \ + libice \ + libpng \ + librsvg \ + libsm \ + libxau \ + libxcb \ + libxcursor \ + libxdmcp \ + libxext \ + libxfixes \ + libxft \ + libxinerama \ + libxml2 \ + libxrender \ + libxt \ + virtual/libx11 \ + xrandr \ + 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" + +S = "${WORKDIR}/git" + +inherit autotools gettext update-alternatives pkgconfig pythonnative perlnative distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +ALTERNATIVE_${PN} = "x-window-manager" +ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/fvwm" +ALTERNATIVE_PRIORITY[x-window-manager] = "20" + +EXTRA_OECONF = " \ + --disable-bidi \ + --disable-fontconfigtest \ + --disable-htmldoc \ + --disable-imlibtest \ + --disable-mandoc \ + --disable-nls \ + --disable-perllib \ + --disable-rsvg \ + --disable-shape \ + --disable-sm \ + --disable-xfttest \ + --with-imlib-exec-prefix=/nonexistent \ + --with-imlib-prefix=/nonexistent \ + --without-ncurses-library \ + --without-readline-library \ + --without-rplay-library \ + --without-stroke-library \ + --without-termcap-library \ + --without-xpm-library \ + ac_cv_func_mkstemp=no \ + has_safety_mkstemp=yes \ +" + +# show the exact commands in the log file +EXTRA_OEMAKE = " \ + V=1 \ +" + +do_install_append() { + install -d -m 0755 ${D}/${sysconfdir}/xdg/fvwm + # You can install the config file here + + install -d -m 0755 ${D}/${datadir}/fvwm + touch ${D}/${datadir}/fvwm/ConfigFvwmDefaults +} + +# the only needed packages (note: locale packages are automatically generated +# as well) +PACKAGES = " \ + ${PN} \ + ${PN}-dbg \ +" + +# minimal set of binaries +FILES_${PN} = " \ + ${bindir}/fvwm \ + ${bindir}/fvwm-root \ + ${datadir}/fvwm/ConfigFvwmDefaults \ +" + +RDEPENDS_${PN} = " \ + xuser-account \ +" + +# by default a lot of stuff is installed and it's not easy to control what to +# install, so install everything, but skip the check +INSANE_SKIP_${PN} = " \ + installed-vs-shipped \ +" -- cgit v1.2.3-54-g00ecf