diff options
author | Adrian Bunk <bunk@stusta.de> | 2019-05-10 14:55:05 +0300 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-05-10 09:19:22 -0700 |
commit | d8fffe3c07078203b39f5704a3f3007eea2c92f8 (patch) | |
tree | b50a61317c5905f859a8df1c5989ccb08f02ce64 /meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch | |
parent | 8e8ac88ff5aa8158796fd3724bd3f7840c2d5735 (diff) | |
download | meta-openembedded-d8fffe3c07078203b39f5704a3f3007eea2c92f8.tar.gz |
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 <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch')
-rw-r--r-- | meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch | 17 |
1 files changed, 1 insertions, 16 deletions
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 5a7647455..e81d395b9 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 | |||
27 | index 48ce264..fab7b44 100644 | 27 | index 48ce264..fab7b44 100644 |
28 | --- a/configure.ac | 28 | --- a/configure.ac |
29 | +++ b/configure.ac | 29 | +++ b/configure.ac |
30 | @@ -1413,23 +1413,7 @@ else | 30 | @@ -1413,8 +1413,4 @@ else |
31 | problem_gdkimlib=": Failed on gdk-imlib, see config.log" | ||
32 | fi | ||
33 | |||
34 | -GNOME_INIT_HOOK | ||
35 | - | ||
36 | -# Unfortunately we have 2 gnome supports: WM hints and gnome libs. | ||
37 | -# The $with_gnomehints below refers to the first, not GNOME_INIT_HOOK. | ||
38 | -if test ! x"$enable_gnome_hints" = xno; then | ||
39 | - with_gnomehints=yes | ||
40 | - problem_gnomehints="" | ||
41 | -else | ||
42 | - with_gnomehints=no | ||
43 | - problem_gnomehints=": Explicitly disabled" | ||
44 | -fi | ||
45 | - | ||
46 | # Define some compatibility macros needed for config.h. | 31 | # Define some compatibility macros needed for config.h. |
47 | -mg_DEFINE_IF_NOT([#include <X11/keysym.h>], | 32 | -mg_DEFINE_IF_NOT([#include <X11/keysym.h>], |
48 | - [defined XK_Page_Up && defined XK_Page_Down], | 33 | - [defined XK_Page_Up && defined XK_Page_Down], |