summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--packages/fvwm/.mtn2git_empty0
-rw-r--r--packages/fvwm/files/.mtn2git_empty0
-rw-r--r--packages/fvwm/files/acinclude.m4.patch32
-rw-r--r--packages/fvwm/files/oe-configure.ac.patch56
-rw-r--r--packages/fvwm/files/upstream-configure.ac.patch26
-rw-r--r--packages/fvwm/fvwm_2.5.26.bb46
-rw-r--r--packages/gnome/gconf_2.6.1.bb9
7 files changed, 166 insertions, 3 deletions
diff --git a/packages/fvwm/.mtn2git_empty b/packages/fvwm/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/fvwm/.mtn2git_empty
diff --git a/packages/fvwm/files/.mtn2git_empty b/packages/fvwm/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/fvwm/files/.mtn2git_empty
diff --git a/packages/fvwm/files/acinclude.m4.patch b/packages/fvwm/files/acinclude.m4.patch
new file mode 100644
index 0000000000..59c4275bf3
--- /dev/null
+++ b/packages/fvwm/files/acinclude.m4.patch
@@ -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 | \
diff --git a/packages/fvwm/files/oe-configure.ac.patch b/packages/fvwm/files/oe-configure.ac.patch
new file mode 100644
index 0000000000..c140cff5dd
--- /dev/null
+++ b/packages/fvwm/files/oe-configure.ac.patch
@@ -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 */
diff --git a/packages/fvwm/files/upstream-configure.ac.patch b/packages/fvwm/files/upstream-configure.ac.patch
new file mode 100644
index 0000000000..e897d58fed
--- /dev/null
+++ b/packages/fvwm/files/upstream-configure.ac.patch
@@ -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"
diff --git a/packages/fvwm/fvwm_2.5.26.bb b/packages/fvwm/fvwm_2.5.26.bb
new file mode 100644
index 0000000000..10677aea6a
--- /dev/null
+++ b/packages/fvwm/fvwm_2.5.26.bb
@@ -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 \
+"
+
diff --git a/packages/gnome/gconf_2.6.1.bb b/packages/gnome/gconf_2.6.1.bb
index fc2089e091..9b9db4abb4 100644
--- a/packages/gnome/gconf_2.6.1.bb
+++ b/packages/gnome/gconf_2.6.1.bb
@@ -3,7 +3,7 @@ SECTION = "x11/gnome"
LICENSE = "LGPL"
DEPENDS = "orbit2 glib-2.0 libxml2"
ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
-PR = "r1"
+PR = "r2"
S = "${WORKDIR}/GConf-${PV}"
@@ -20,7 +20,10 @@ do_compile() {
}
do_stage() {
- autotools_stage_all
+ oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR}
+ install -d ${STAGING_INCDIR}/gconf/2/gconf/
+ ( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/2/gconf/$i; done )
+ install -m 0644 gconf.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
}
do_install() {
@@ -28,4 +31,4 @@ do_install() {
}
FILES_${PN} += " ${libdir}/GConf/*"
-FILES_gconf-dbg += "${libdir}/*/*/.debug"
+FILES_${PN}-dbg += "${libdir}/*/*/.debug"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 22:00:13 +0000