diff options
Diffstat (limited to 'packages/fvwm/files')
-rw-r--r-- | packages/fvwm/files/acinclude.m4.patch | 32 | ||||
-rw-r--r-- | packages/fvwm/files/oe-configure.ac.patch | 56 | ||||
-rw-r--r-- | packages/fvwm/files/upstream-configure.ac.patch | 26 |
3 files changed, 0 insertions, 114 deletions
diff --git a/packages/fvwm/files/acinclude.m4.patch b/packages/fvwm/files/acinclude.m4.patch deleted file mode 100644 index 59c4275bf3..0000000000 --- a/packages/fvwm/files/acinclude.m4.patch +++ /dev/null @@ -1,32 +0,0 @@ -upstream: OE-only -origin: Yuri Bushmelev <jay4mail at gmail.com> -comment: disable xft-config calls while cross-compiling ---- fvwm-2.5.26/acinclude.m4.orig 2008-06-10 01:53:46.000000000 +0400 -+++ fvwm-2.5.26/acinclude.m4 2008-06-10 01:53:51.000000000 +0400 -@@ -1225,14 +1225,14 @@ - XFT_CONFIG=$xft_config_prefix/bin/xft-config - fi - fi --AC_PATH_PROG(XFT_CONFIG, xft-config, no) -+dnl AC_PATH_PROG(XFT_CONFIG, xft-config, no) - - min_xft_version=ifelse([$1], ,2.0.0,$1) - AC_MSG_CHECKING(for Xft - version >= $min_xft_version) - no_xft="" - pkg_config_xft_exists="" - --if test "$XFT_CONFIG" = "no" ; then -+dnl if test "$XFT_CONFIG" = "no" ; then - if test "x$PKG_CONFIG" != "xno" ; then - if $PKG_CONFIG --exists 'xft' ; then - if $PKG_CONFIG --exists 'xft >= $1' ; then -@@ -1249,7 +1249,8 @@ - else - no_xft=yes - fi --else -+dnl else -+if false; then - XFT_CFLAGS=`$XFT_CONFIG $xft_config_args --cflags` - XFT_LIBS=`$XFT_CONFIG $xft_config_args --libs` - xft_config_major_version=`$XFT_CONFIG $xft_config_args --version | \ diff --git a/packages/fvwm/files/oe-configure.ac.patch b/packages/fvwm/files/oe-configure.ac.patch deleted file mode 100644 index c140cff5dd..0000000000 --- a/packages/fvwm/files/oe-configure.ac.patch +++ /dev/null @@ -1,56 +0,0 @@ -upstream: OE-only -origin: Yuri Bushmelev <jay4mail at gmail.com> -comment: disable mkstemp() safety check, X11/keysym.h check and old libstroke check ---- fvwm-2.5.26/configure.ac.orig 2008-06-11 15:44:28.000000000 +0400 -+++ fvwm-2.5.26/configure.ac 2008-06-11 15:44:46.000000000 +0400 -@@ -1405,7 +1407,8 @@ - - # check for mkstemp, see the discution on this subject on the fvwm workers - # list (2001-02-16 and 2001-02-24) --AM_SAFETY_CHECK_MKSTEMP -+#AM_SAFETY_CHECK_MKSTEMP -+AC_DEFINE(HAVE_SAFETY_MKSTEMP) - - # If we do not have atexit(), then check for on_exit() - if test x$ac_cv_func_atexit = xno; then -@@ -1465,23 +1468,23 @@ - problem_gnomehints=": Explicitly disabled" - fi - --# Define some compatibility macros needed for config.h. --mg_DEFINE_IF_NOT([#include <X11/keysym.h>], -- [defined XK_Page_Up && defined XK_Page_Down], -- [COMPAT_OLD_KEYSYMDEF], [$X_CFLAGS], -- [Old AIX systems (3.2.5) don't define some common keysyms.]) --AH_VERBATIM([_COMPAT_OLD_KEYSYMDEF], --[#ifdef COMPAT_OLD_KEYSYMDEF --# define XK_Page_Up XK_Prior --# define XK_Page_Down XK_Next --#endif]) -- --if test x"$with_stroke" = xyes; then -- mg_DEFINE_IF_NOT([#include <stroke.h>], -- [defined STROKE_MAX_SEQUENCE], -- [COMPAT_OLD_LIBSTROKE], [$stroke_CFLAGS], -- [Old libstroke <= 0.4 does not use STROKE_ prefix for constants.]) --fi -+## Define some compatibility macros needed for config.h. -+#mg_DEFINE_IF_NOT([#include <X11/keysym.h>], -+# [defined XK_Page_Up && defined XK_Page_Down], -+# [COMPAT_OLD_KEYSYMDEF], [$X_CFLAGS], -+# [Old AIX systems (3.2.5) don't define some common keysyms.]) -+#AH_VERBATIM([_COMPAT_OLD_KEYSYMDEF], -+#[#ifdef COMPAT_OLD_KEYSYMDEF -+## define XK_Page_Up XK_Prior -+## define XK_Page_Down XK_Next -+##endif]) -+ -+#if test x"$with_stroke" = xyes; then -+# mg_DEFINE_IF_NOT([#include <stroke.h>], -+# [defined STROKE_MAX_SEQUENCE], -+# [COMPAT_OLD_LIBSTROKE], [$stroke_CFLAGS], -+# [Old libstroke <= 0.4 does not use STROKE_ prefix for constants.]) -+#fi - AH_VERBATIM([_COMPAT_OLD_LIBSTROKE], - [#ifdef COMPAT_OLD_LIBSTROKE - /* currently we only use one constant */ diff --git a/packages/fvwm/files/upstream-configure.ac.patch b/packages/fvwm/files/upstream-configure.ac.patch deleted file mode 100644 index e897d58fed..0000000000 --- a/packages/fvwm/files/upstream-configure.ac.patch +++ /dev/null @@ -1,26 +0,0 @@ -upstream: http://fvwm.lair.be/viewtopic.php?f=49&t=2107 -status: pending -origin: Yuri Bushmelev <jay4mail at gmail.com> -comment: fixes libs detection in configure when cross-compiling ---- fvwm-2.5.26/configure.ac.orig 2008-06-11 15:44:28.000000000 +0400 -+++ fvwm-2.5.26/configure.ac 2008-06-11 15:44:46.000000000 +0400 -@@ -792,7 +792,8 @@ - problem_xpm=": Internal xpm detection logic error" - fi - fi], -- [with_xpm=no; problem_xpm=": Xpm test error, see config.log"]) -+ [with_xpm=no; problem_xpm=": Xpm test error, see config.log"], -+ [echo $ac_n "cross compiling; assumed OK... $ac_c"]) - AC_MSG_RESULT($with_xpm) - CPPFLAGS="$my_CPPFLAGS" - LIBS="$my_LIBS" -@@ -840,7 +841,8 @@ - problem_png=": Internal png detection logic error" - fi - fi], -- [with_png="no"; problem_png=": png test error, see config.log"]) -+ [with_png="no"; problem_png=": png test error, see config.log"], -+ [echo $ac_n "cross compiling; assumed OK... $ac_c"]) - AC_MSG_RESULT($with_png) - CPPFLAGS="$my_CPPFLAGS" - LIBS="$my_LIBS" |