[oe-commits] org.oe.dev fvwm: initial release. closes 4439.
jay4mail commit
oe at amethyst.openembedded.net
Mon Sep 1 17:55:37 UTC 2008
fvwm: initial release. closes 4439.
* commit by Laibsch
Author: jay4mail at gmail.com
Branch: org.openembedded.dev
Revision: de7fa612bd9d4ae1e7ffb3f036835b8023dfa1ca
ViewMTN: http://monotone.openembedded.org/revision/info/de7fa612bd9d4ae1e7ffb3f036835b8023dfa1ca
Files:
1
packages/fvwm
packages/fvwm/files
packages/fvwm/files/acinclude.m4.patch
packages/fvwm/files/oe-configure.ac.patch
packages/fvwm/files/upstream-configure.ac.patch
packages/fvwm/fvwm_2.5.26.bb
Diffs:
#
# mt diff -r7a532019bad5cc5b06e691460db82ce1459b3398 -rde7fa612bd9d4ae1e7ffb3f036835b8023dfa1ca
#
#
#
# add_dir "packages/fvwm"
#
# add_dir "packages/fvwm/files"
#
# add_file "packages/fvwm/files/acinclude.m4.patch"
# content [561b9b06c336299032206d93e32b80521024c017]
#
# add_file "packages/fvwm/files/oe-configure.ac.patch"
# content [4e865a38ec6a1a3c6e368c12c0ce2f135e54ae75]
#
# add_file "packages/fvwm/files/upstream-configure.ac.patch"
# content [a568633c0100b87cff00930b1f23aa83bda56e84]
#
# add_file "packages/fvwm/fvwm_2.5.26.bb"
# content [93a5c0c7fcfc00221d47c5c222ec083b77226ece]
#
============================================================
--- packages/fvwm/files/acinclude.m4.patch 561b9b06c336299032206d93e32b80521024c017
+++ packages/fvwm/files/acinclude.m4.patch 561b9b06c336299032206d93e32b80521024c017
@@ -0,0 +1,32 @@
+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 | \
============================================================
--- packages/fvwm/files/oe-configure.ac.patch 4e865a38ec6a1a3c6e368c12c0ce2f135e54ae75
+++ packages/fvwm/files/oe-configure.ac.patch 4e865a38ec6a1a3c6e368c12c0ce2f135e54ae75
@@ -0,0 +1,56 @@
+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 */
============================================================
--- packages/fvwm/files/upstream-configure.ac.patch a568633c0100b87cff00930b1f23aa83bda56e84
+++ packages/fvwm/files/upstream-configure.ac.patch a568633c0100b87cff00930b1f23aa83bda56e84
@@ -0,0 +1,26 @@
+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"
============================================================
--- packages/fvwm/fvwm_2.5.26.bb 93a5c0c7fcfc00221d47c5c222ec083b77226ece
+++ packages/fvwm/fvwm_2.5.26.bb 93a5c0c7fcfc00221d47c5c222ec083b77226ece
@@ -0,0 +1,46 @@
+SECTION = "x11/wm"
+DESCRIPTION = "FVWM Window Manager"
+LICENSE = "GPL"
+DEPENDS = "virtual/libx11 libxext libxfixes libxpm xrandr xft libxml2 zlib libice libxau libxcb libxcursor libxdmcp libxrender libpng librsvg fontconfig libstroke"
+
+SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2 \
+ file://oe-configure.ac.patch;patch=1 \
+ file://upstream-configure.ac.patch;patch=1 \
+ file://acinclude.m4.patch;patch=1 \
+ "
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-xinerama --disable-bidi --disable-perllib \
+ --disable-gtk --without-gnome --without-imlib \
+ --disable-freetypetest --disable-fontconfigtest --disable-xfttest \
+ --disable-imlibtest --disable-sm \
+ "
+
+PACKAGES =+ "${PN}-perl"
+
+FILES_${PN}-dbg += " \
+ ${libexecdir}/${PN}/${PV}/.debug \
+ ${bindir}/${PN}-bug \
+"
+
+FILES_${PN}-dev += "${bindir}/${PN}-config"
+
+FILES_${PN}-perl = " \
+ ${bindir}/${PN}-convert-2.4 \
+ ${bindir}/${PN}-convert-2.6 \
+ ${bindir}/${PN}-menu* \
+ ${bindir}/${PN}-perllib \
+ ${libexecdir}/${PN}/${PV}/FvwmPerl \
+ ${libexecdir}/${PN}/${PV}/FvwmCommand.pm \
+ ${libexecdir}/${PN}/${PV}/FvwmConsoleC.pl \
+ ${libexecdir}/${PN}/${PV}/FvwmDebug \
+ ${libexecdir}/${PN}/${PV}/FvwmGtkDebug \
+ ${libexecdir}/${PN}/${PV}/FvwmTabs \
+ ${libexecdir}/${PN}/${PV}/FvwmWindowMenu \
+ ${datadir}/${PN}/FvwmScript-ComExample \
+ ${datadir}/${PN}/FvwmScript-Setup95 \
+ ${datadir}/${PN}/fvwm-script-setup95.pl \
+ ${datadir}/${PN}/fvwm-script-ComExample.pl \
+"
+
More information about the Openembedded-commits
mailing list