From b87ae0b91ea42525f3aefb9da79827d543f6d5fc Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Sat, 27 Nov 2004 22:52:00 +0000 Subject: blow away some old versions of matchbox BKrev: 41a90510pTJUJLrgQ2Cdult4sebUOA --- matchbox-wm/matchbox-wm-0.8.1/m4.patch | 699 --------------------- .../kbdconfig_keylaunch_simpad.patch | 12 - .../matchbox-wm-0.8.2/net-showing-desktop.patch | 24 - matchbox-wm/matchbox-wm-0.8/m4.patch | 699 --------------------- matchbox-wm/matchbox-wm_0.8.1.oe | 26 - matchbox-wm/matchbox-wm_0.8.2.oe | 29 - matchbox-wm/matchbox-wm_0.8.oe | 15 - 7 files changed, 1504 deletions(-) delete mode 100644 matchbox-wm/matchbox-wm-0.8.1/m4.patch delete mode 100644 matchbox-wm/matchbox-wm-0.8.2/kbdconfig_keylaunch_simpad.patch delete mode 100644 matchbox-wm/matchbox-wm-0.8.2/net-showing-desktop.patch delete mode 100644 matchbox-wm/matchbox-wm-0.8/m4.patch delete mode 100644 matchbox-wm/matchbox-wm_0.8.1.oe delete mode 100644 matchbox-wm/matchbox-wm_0.8.2.oe delete mode 100644 matchbox-wm/matchbox-wm_0.8.oe diff --git a/matchbox-wm/matchbox-wm-0.8.1/m4.patch b/matchbox-wm/matchbox-wm-0.8.1/m4.patch deleted file mode 100644 index 4d2d59c32f..0000000000 --- a/matchbox-wm/matchbox-wm-0.8.1/m4.patch +++ /dev/null @@ -1,699 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- /dev/null 2003-09-23 18:19:32.000000000 -0400 -+++ matchbox-window-manager-0.8/m4/gconf.m4 2004-03-11 16:41:56.000000000 -0500 -@@ -0,0 +1,33 @@ -+dnl AM_GCONF_SOURCE_2 -+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas -+dnl (i.e. pass to gconftool-2 -+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where -+dnl you should install foo.schemas files -+dnl -+ -+AC_DEFUN(AM_GCONF_SOURCE_2, -+[ -+ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then -+ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` -+ else -+ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE -+ fi -+ -+ AC_ARG_WITH(gconf-source, -+ [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) -+ -+ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) -+ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) -+ -+ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then -+ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas/' -+ else -+ GCONF_SCHEMA_FILE_DIR=$GCONF_SCHEMA_FILE_DIR -+ fi -+ -+ AC_ARG_WITH(gconf-schema-file-dir, -+ [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) -+ -+ AC_SUBST(GCONF_SCHEMA_FILE_DIR) -+ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) -+]) ---- /dev/null 2003-09-23 18:19:32.000000000 -0400 -+++ matchbox-window-manager-0.8/m4/glib-2.0.m4 2004-03-11 16:42:20.000000000 -0500 -@@ -0,0 +1,212 @@ -+# Configure paths for GLIB -+# Owen Taylor 1997-2001 -+ -+dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or -+dnl gthread is specified in MODULES, pass to pkg-config -+dnl -+AC_DEFUN(AM_PATH_GLIB_2_0, -+[dnl -+dnl Get the cflags and libraries from pkg-config -+dnl -+AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], -+ , enable_glibtest=yes) -+ -+ pkg_config_args=glib-2.0 -+ for module in . $4 -+ do -+ case "$module" in -+ gmodule) -+ pkg_config_args="$pkg_config_args gmodule-2.0" -+ ;; -+ gobject) -+ pkg_config_args="$pkg_config_args gobject-2.0" -+ ;; -+ gthread) -+ pkg_config_args="$pkg_config_args gthread-2.0" -+ ;; -+ esac -+ done -+ -+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+ -+ no_glib="" -+ -+ if test x$PKG_CONFIG != xno ; then -+ if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then -+ : -+ else -+ echo *** pkg-config too old; version 0.7 or better required. -+ no_glib=yes -+ PKG_CONFIG=no -+ fi -+ else -+ no_glib=yes -+ fi -+ -+ min_glib_version=ifelse([$1], ,2.0.0,$1) -+ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) -+ -+ if test x$PKG_CONFIG != xno ; then -+ ## don't try to run the test against uninstalled libtool libs -+ if $PKG_CONFIG --uninstalled $pkg_config_args; then -+ echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" -+ enable_glibtest=no -+ fi -+ -+ if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then -+ : -+ else -+ no_glib=yes -+ fi -+ fi -+ -+ if test x"$no_glib" = x ; then -+ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` -+ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` -+ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` -+ -+ GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` -+ GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` -+ glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ if test "x$enable_glibtest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GLIB_CFLAGS" -+ LIBS="$GLIB_LIBS $LIBS" -+dnl -+dnl Now check if the installed GLIB is sufficiently new. (Also sanity -+dnl checks the results of pkg-config to some extent) -+dnl -+ rm -f conf.glibtest -+ AC_TRY_RUN([ -+#include -+#include -+#include -+ -+int -+main () -+{ -+ int major, minor, micro; -+ char *tmp_version; -+ -+ system ("touch conf.glibtest"); -+ -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = g_strdup("$min_glib_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_glib_version"); -+ exit(1); -+ } -+ -+ if ((glib_major_version != $glib_config_major_version) || -+ (glib_minor_version != $glib_config_minor_version) || -+ (glib_micro_version != $glib_config_micro_version)) -+ { -+ printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", -+ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, -+ glib_major_version, glib_minor_version, glib_micro_version); -+ printf ("*** was found! If pkg-config was correct, then it is best\n"); -+ printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); -+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); -+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -+ printf("*** required on your system.\n"); -+ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); -+ printf("*** to point to the correct configuration files\n"); -+ } -+ else if ((glib_major_version != GLIB_MAJOR_VERSION) || -+ (glib_minor_version != GLIB_MINOR_VERSION) || -+ (glib_micro_version != GLIB_MICRO_VERSION)) -+ { -+ printf("*** GLIB header files (version %d.%d.%d) do not match\n", -+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); -+ printf("*** library (version %d.%d.%d)\n", -+ glib_major_version, glib_minor_version, glib_micro_version); -+ } -+ else -+ { -+ if ((glib_major_version > major) || -+ ((glib_major_version == major) && (glib_minor_version > minor)) || -+ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", -+ glib_major_version, glib_minor_version, glib_micro_version); -+ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", -+ major, minor, micro); -+ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); -+ printf("***\n"); -+ printf("*** If you have already installed a sufficiently new version, this error\n"); -+ printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); -+ printf("*** being found. The easiest way to fix this is to remove the old version\n"); -+ printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); -+ printf("*** correct copy of pkg-config. (In this case, you will have to\n"); -+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -+ printf("*** so that the correct libraries are found at run-time))\n"); -+ } -+ } -+ return 1; -+} -+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_glib" = x ; then -+ AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ if test "$PKG_CONFIG" = "no" ; then -+ echo "*** A new enough version of pkg-config was not found." -+ echo "*** See http://www.freedesktop.org/software/pkgconfig/" -+ else -+ if test -f conf.glibtest ; then -+ : -+ else -+ echo "*** Could not run GLIB test program, checking why..." -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GLIB_CFLAGS" -+ LIBS="$LIBS $GLIB_LIBS" -+ AC_TRY_LINK([ -+#include -+#include -+], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], -+ [ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding GLIB or finding the wrong" -+ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], -+ [ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ GLIB_CFLAGS="" -+ GLIB_LIBS="" -+ GLIB_GENMARSHAL="" -+ GOBJECT_QUERY="" -+ GLIB_MKENUMS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ AC_SUBST(GLIB_CFLAGS) -+ AC_SUBST(GLIB_LIBS) -+ AC_SUBST(GLIB_GENMARSHAL) -+ AC_SUBST(GOBJECT_QUERY) -+ AC_SUBST(GLIB_MKENUMS) -+ rm -f conf.glibtest -+]) ---- /dev/null 2003-09-23 18:19:32.000000000 -0400 -+++ matchbox-window-manager-0.8/m4/glib-gettext.m4 2004-03-11 16:42:20.000000000 -0500 -@@ -0,0 +1,380 @@ -+# Copyright (C) 1995-2002 Free Software Foundation, Inc. -+# Copyright (C) 2001-2003 Red Hat, Inc. -+# -+# This file is free software, distributed under the terms of the GNU -+# General Public License. As a special exception to the GNU General -+# Public License, this file may be distributed as part of a program -+# that contains a configuration script generated by Autoconf, under -+# the same distribution terms as the rest of that program. -+# -+# This file can be copied and used freely without restrictions. It can -+# be used in projects which are not available under the GNU Public License -+# but which still want to provide support for the GNU gettext functionality. -+# -+# Macro to add for using GNU gettext. -+# Ulrich Drepper , 1995, 1996 -+# -+# Modified to never use included libintl. -+# Owen Taylor , 12/15/1998 -+# -+# Major rework to remove unused code -+# Owen Taylor , 12/11/2002 -+# -+# Added better handling of ALL_LINGUAS from GNU gettext version -+# written by Bruno Haible, Owen Taylor 5/30/3002 -+ -+# -+# We need this here as well, since someone might use autoconf-2.5x -+# to configure GLib then an older version to configure a package -+# using AM_GLIB_GNU_GETTEXT -+AC_PREREQ(2.53) -+ -+dnl -+dnl We go to great lengths to make sure that aclocal won't -+dnl try to pull in the installed version of these macros -+dnl when running aclocal in the glib directory. -+dnl -+m4_copy([AC_DEFUN],[glib_DEFUN]) -+m4_copy([AC_REQUIRE],[glib_REQUIRE]) -+dnl -+dnl At the end, if we're not within glib, we'll define the public -+dnl definitions in terms of our private definitions. -+dnl -+ -+# GLIB_LC_MESSAGES -+#-------------------- -+glib_DEFUN([GLIB_LC_MESSAGES], -+ [AC_CHECK_HEADERS([locale.h]) -+ if test $ac_cv_header_locale_h = yes; then -+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, -+ [AC_TRY_LINK([#include ], [return LC_MESSAGES], -+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) -+ if test $am_cv_val_LC_MESSAGES = yes; then -+ AC_DEFINE(HAVE_LC_MESSAGES, 1, -+ [Define if your file defines LC_MESSAGES.]) -+ fi -+ fi]) -+ -+# GLIB_PATH_PROG_WITH_TEST -+#---------------------------- -+dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -+glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], -+[# Extract the first word of "$2", so it can be a program name with args. -+set dummy $2; ac_word=[$]2 -+AC_MSG_CHECKING([for $ac_word]) -+AC_CACHE_VAL(ac_cv_path_$1, -+[case "[$]$1" in -+ /*) -+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -+ for ac_dir in ifelse([$5], , $PATH, [$5]); do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ if [$3]; then -+ ac_cv_path_$1="$ac_dir/$ac_word" -+ break -+ fi -+ fi -+ done -+ IFS="$ac_save_ifs" -+dnl If no 4th arg is given, leave the cache variable unset, -+dnl so AC_PATH_PROGS will keep looking. -+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -+])dnl -+ ;; -+esac])dnl -+$1="$ac_cv_path_$1" -+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then -+ AC_MSG_RESULT([$]$1) -+else -+ AC_MSG_RESULT(no) -+fi -+AC_SUBST($1)dnl -+]) -+ -+# GLIB_WITH_NLS -+#----------------- -+glib_DEFUN([GLIB_WITH_NLS], -+ dnl NLS is obligatory -+ [USE_NLS=yes -+ AC_SUBST(USE_NLS) -+ -+ gt_cv_have_gettext=no -+ -+ CATOBJEXT=NONE -+ XGETTEXT=: -+ INTLLIBS= -+ -+ AC_CHECK_HEADER(libintl.h, -+ [gt_cv_func_dgettext_libintl="no" -+ libintl_extra_libs="" -+ -+ # -+ # First check in libc -+ # -+ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, -+ [AC_TRY_LINK([ -+#include -+], -+ [return (int) dgettext ("","")], -+ gt_cv_func_dgettext_libc=yes, -+ gt_cv_func_dgettext_libc=no) -+ ]) -+ -+ if test "$gt_cv_func_dgettext_libc" = "yes" ; then -+ AC_CHECK_FUNCS(bind_textdomain_codeset) -+ fi -+ -+ # -+ # If we don't have everything we want, check in libintl -+ # -+ if test "$gt_cv_func_dgettext_libc" != "yes" \ -+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then -+ -+ AC_CHECK_LIB(intl, bindtextdomain, -+ [AC_CHECK_LIB(intl, dgettext, -+ gt_cv_func_dgettext_libintl=yes)]) -+ -+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then -+ AC_MSG_CHECKING([if -liconv is needed to use gettext]) -+ AC_MSG_RESULT([]) -+ AC_CHECK_LIB(intl, dcgettext, -+ [gt_cv_func_dgettext_libintl=yes -+ libintl_extra_libs=-liconv], -+ :,-liconv) -+ fi -+ -+ # -+ # If we found libintl, then check in it for bind_textdomain_codeset(); -+ # we'll prefer libc if neither have bind_textdomain_codeset(), -+ # and both have dgettext -+ # -+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then -+ glib_save_LIBS="$LIBS" -+ LIBS="$LIBS -lintl $libintl_extra_libs" -+ unset ac_cv_func_bind_textdomain_codeset -+ AC_CHECK_FUNCS(bind_textdomain_codeset) -+ LIBS="$glib_save_LIBS" -+ -+ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then -+ gt_cv_func_dgettext_libc=no -+ else -+ if test "$gt_cv_func_dgettext_libc" = "yes"; then -+ gt_cv_func_dgettext_libintl=no -+ fi -+ fi -+ fi -+ fi -+ -+ if test "$gt_cv_func_dgettext_libc" = "yes" \ -+ || test "$gt_cv_func_dgettext_libintl" = "yes"; then -+ gt_cv_have_gettext=yes -+ fi -+ -+ if test "$gt_cv_func_dgettext_libintl" = "yes"; then -+ INTLLIBS="-lintl $libintl_extra_libs" -+ fi -+ -+ if test "$gt_cv_have_gettext" = "yes"; then -+ AC_DEFINE(HAVE_GETTEXT,1, -+ [Define if the GNU gettext() function is already present or preinstalled.]) -+ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, -+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl -+ if test "$MSGFMT" != "no"; then -+ glib_save_LIBS="$LIBS" -+ LIBS="$LIBS $INTLLIBS" -+ AC_CHECK_FUNCS(dcgettext) -+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -+ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, -+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) -+ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; -+ return _nl_msg_cat_cntr], -+ [CATOBJEXT=.gmo -+ DATADIRNAME=share], -+ [case $host in -+ *-*-solaris*) -+ dnl On Solaris, if bind_textdomain_codeset is in libc, -+ dnl GNU format message catalog is always supported, -+ dnl since both are added to the libc all together. -+ dnl Hence, we'd like to go with DATADIRNAME=share and -+ dnl and CATOBJEXT=.gmo in this case. -+ AC_CHECK_FUNC(bind_textdomain_codeset, -+ [CATOBJEXT=.gmo -+ DATADIRNAME=share], -+ [CATOBJEXT=.mo -+ DATADIRNAME=lib]) -+ ;; -+ *) -+ CATOBJEXT=.mo -+ DATADIRNAME=lib -+ ;; -+ esac]) -+ LIBS="$glib_save_LIBS" -+ INSTOBJEXT=.mo -+ else -+ gt_cv_have_gettext=no -+ fi -+ fi -+ ]) -+ -+ if test "$gt_cv_have_gettext" = "yes" ; then -+ AC_DEFINE(ENABLE_NLS, 1, -+ [always defined to indicate that i18n is enabled]) -+ fi -+ -+ dnl Test whether we really found GNU xgettext. -+ if test "$XGETTEXT" != ":"; then -+ dnl If it is not GNU xgettext we define it as : so that the -+ dnl Makefiles still can work. -+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then -+ : ; -+ else -+ AC_MSG_RESULT( -+ [found xgettext program is not GNU xgettext; ignore it]) -+ XGETTEXT=":" -+ fi -+ fi -+ -+ # We need to process the po/ directory. -+ POSUB=po -+ -+ AC_OUTPUT_COMMANDS( -+ [case "$CONFIG_FILES" in *po/Makefile.in*) -+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile -+ esac]) -+ -+ dnl These rules are solely for the distribution goal. While doing this -+ dnl we only have to keep exactly one list of the available catalogs -+ dnl in configure.in. -+ for lang in $ALL_LINGUAS; do -+ GMOFILES="$GMOFILES $lang.gmo" -+ POFILES="$POFILES $lang.po" -+ done -+ -+ dnl Make all variables we use known to autoconf. -+ AC_SUBST(CATALOGS) -+ AC_SUBST(CATOBJEXT) -+ AC_SUBST(DATADIRNAME) -+ AC_SUBST(GMOFILES) -+ AC_SUBST(INSTOBJEXT) -+ AC_SUBST(INTLLIBS) -+ AC_SUBST(PO_IN_DATADIR_TRUE) -+ AC_SUBST(PO_IN_DATADIR_FALSE) -+ AC_SUBST(POFILES) -+ AC_SUBST(POSUB) -+ ]) -+ -+# AM_GLIB_GNU_GETTEXT -+# ------------------- -+# Do checks necessary for use of gettext. If a suitable implementation -+# of gettext is found in either in libintl or in the C library, -+# it will set INTLLIBS to the libraries needed for use of gettext -+# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable -+# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() -+# on various variables needed by the Makefile.in.in installed by -+# glib-gettextize. -+dnl -+glib_DEFUN(GLIB_GNU_GETTEXT, -+ [AC_REQUIRE([AC_PROG_CC])dnl -+ AC_REQUIRE([AC_HEADER_STDC])dnl -+ -+ GLIB_LC_MESSAGES -+ GLIB_WITH_NLS -+ -+ if test "$gt_cv_have_gettext" = "yes"; then -+ if test "x$ALL_LINGUAS" = "x"; then -+ LINGUAS= -+ else -+ AC_MSG_CHECKING(for catalogs to be installed) -+ NEW_LINGUAS= -+ for presentlang in $ALL_LINGUAS; do -+ useit=no -+ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then -+ desiredlanguages="$LINGUAS" -+ else -+ desiredlanguages="$ALL_LINGUAS" -+ fi -+ for desiredlang in $desiredlanguages; do -+ # Use the presentlang catalog if desiredlang is -+ # a. equal to presentlang, or -+ # b. a variant of presentlang (because in this case, -+ # presentlang can be used as a fallback for messages -+ # which are not translated in the desiredlang catalog). -+ case "$desiredlang" in -+ "$presentlang"*) useit=yes;; -+ esac -+ done -+ if test $useit = yes; then -+ NEW_LINGUAS="$NEW_LINGUAS $presentlang" -+ fi -+ done -+ LINGUAS=$NEW_LINGUAS -+ AC_MSG_RESULT($LINGUAS) -+ fi -+ -+ dnl Construct list of names of catalog files to be constructed. -+ if test -n "$LINGUAS"; then -+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done -+ fi -+ fi -+ -+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly -+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir). -+ dnl Try to locate is. -+ MKINSTALLDIRS= -+ if test -n "$ac_aux_dir"; then -+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" -+ fi -+ if test -z "$MKINSTALLDIRS"; then -+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" -+ fi -+ AC_SUBST(MKINSTALLDIRS) -+ -+ dnl Generate list of files to be processed by xgettext which will -+ dnl be included in po/Makefile. -+ test -d po || mkdir po -+ if test "x$srcdir" != "x."; then -+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then -+ posrcprefix="$srcdir/" -+ else -+ posrcprefix="../$srcdir/" -+ fi -+ else -+ posrcprefix="../" -+ fi -+ rm -f po/POTFILES -+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ -+ < $srcdir/po/POTFILES.in > po/POTFILES -+ ]) -+ -+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) -+# ------------------------------- -+# Define VARIABLE to the location where catalog files will -+# be installed by po/Makefile. -+glib_DEFUN(GLIB_DEFINE_LOCALEDIR, -+[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl -+glib_save_prefix="$prefix" -+glib_save_exec_prefix="$exec_prefix" -+test "x$prefix" = xNONE && prefix=$ac_default_prefix -+test "x$exec_prefix" = xNONE && exec_prefix=$prefix -+if test "x$CATOBJEXT" = "x.mo" ; then -+ localedir=`eval echo "${libdir}/locale"` -+else -+ localedir=`eval echo "${datadir}/locale"` -+fi -+prefix="$glib_save_prefix" -+exec_prefix="$glib_save_exec_prefix" -+AC_DEFINE_UNQUOTED($1, "$localedir", -+ [Define the location where the catalogs will be installed]) -+]) -+ -+dnl -+dnl Now the definitions that aclocal will find -+dnl -+ifdef(glib_configure_in,[],[ -+AC_DEFUN(AM_GLIB_GNU_GETTEXT,[GLIB_GNU_GETTEXT($@)]) -+AC_DEFUN(AM_GLIB_DEFINE_LOCALEDIR,[GLIB_DEFINE_LOCALEDIR($@)]) -+])dnl ---- /dev/null 2003-09-23 18:19:32.000000000 -0400 -+++ matchbox-window-manager-0.8/m4/pkg.m4 2004-03-11 16:42:20.000000000 -0500 -@@ -0,0 +1,57 @@ -+ -+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) -+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page -+dnl also defines GSTUFF_PKG_ERRORS on error -+AC_DEFUN(PKG_CHECK_MODULES, [ -+ succeeded=no -+ -+ if test -z "$PKG_CONFIG"; then -+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+ fi -+ -+ if test "$PKG_CONFIG" = "no" ; then -+ echo "*** The pkg-config script could not be found. Make sure it is" -+ echo "*** in your path, or set the PKG_CONFIG environment variable" -+ echo "*** to the full path to pkg-config." -+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." -+ else -+ PKG_CONFIG_MIN_VERSION=0.9.0 -+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then -+ AC_MSG_CHECKING(for $2) -+ -+ if $PKG_CONFIG --exists "$2" ; then -+ AC_MSG_RESULT(yes) -+ succeeded=yes -+ -+ AC_MSG_CHECKING($1_CFLAGS) -+ $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` -+ AC_MSG_RESULT($$1_CFLAGS) -+ -+ AC_MSG_CHECKING($1_LIBS) -+ $1_LIBS=`$PKG_CONFIG --libs "$2"` -+ AC_MSG_RESULT($$1_LIBS) -+ else -+ $1_CFLAGS="" -+ $1_LIBS="" -+ ## If we have a custom action on failure, don't print errors, but -+ ## do set a variable so people can do so. -+ $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` -+ ifelse([$4], ,echo $$1_PKG_ERRORS,) -+ fi -+ -+ AC_SUBST($1_CFLAGS) -+ AC_SUBST($1_LIBS) -+ else -+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." -+ echo "*** See http://www.freedesktop.org/software/pkgconfig" -+ fi -+ fi -+ -+ if test $succeeded = yes; then -+ ifelse([$3], , :, [$3]) -+ else -+ ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) -+ fi -+]) -+ -+ diff --git a/matchbox-wm/matchbox-wm-0.8.2/kbdconfig_keylaunch_simpad.patch b/matchbox-wm/matchbox-wm-0.8.2/kbdconfig_keylaunch_simpad.patch deleted file mode 100644 index 8fd1dc3f4b..0000000000 --- a/matchbox-wm/matchbox-wm-0.8.2/kbdconfig_keylaunch_simpad.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- data/kbdconfig~ 2004-07-11 00:59:25.000000000 +0200 -+++ data/kbdconfig 2004-07-11 00:59:25.000000000 +0200 -@@ -28,7 +28,8 @@ - escape=!mbcontrol -mbmenu - f4=close - --f11=fullscreen -+#Please don't do this, it breaks suspending on SimPad -+#f11=fullscreen - - ### super should be windows keys - diff --git a/matchbox-wm/matchbox-wm-0.8.2/net-showing-desktop.patch b/matchbox-wm/matchbox-wm-0.8.2/net-showing-desktop.patch deleted file mode 100644 index ef0dc09c11..0000000000 --- a/matchbox-wm/matchbox-wm-0.8.2/net-showing-desktop.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: ewmh.c -=================================================================== -RCS file: /cvs/apps/matchbox/matchbox-window-manager/src/ewmh.c,v -retrieving revision 1.4 -retrieving revision 1.5 -diff -u -r1.4 -r1.5 ---- matchbox/src/ewmh.c 22 Apr 2004 09:34:24 -0000 1.4 -+++ matchbox/src/ewmh.c 4 Jun 2004 15:48:48 -0000 1.5 -@@ -194,10 +194,11 @@ - } else if (e->message_type == w->atoms[_NET_SHOW_DESKTOP] - && wm_get_desktop(w) ) { - dbg("%s() got desktop message\n", __func__); -- if (e->data.l[0] == 1 && !(w->flags & DESKTOP_RAISED_FLAG)) -- { /* Show the desktop */ -- wm_toggle_desktop(w); -- } else { /* Hide the desktop */ -+ if (e->data.l[0] == 1) -+ { /* Show the desktop, if not shown */ -+ if (!(w->flags & DESKTOP_RAISED_FLAG)) -+ wm_toggle_desktop(w); -+ } else { /* Hide the desktop, if shown */ - if (w->flags & DESKTOP_RAISED_FLAG) - wm_toggle_desktop(w); - } diff --git a/matchbox-wm/matchbox-wm-0.8/m4.patch b/matchbox-wm/matchbox-wm-0.8/m4.patch deleted file mode 100644 index 4d2d59c32f..0000000000 --- a/matchbox-wm/matchbox-wm-0.8/m4.patch +++ /dev/null @@ -1,699 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- /dev/null 2003-09-23 18:19:32.000000000 -0400 -+++ matchbox-window-manager-0.8/m4/gconf.m4 2004-03-11 16:41:56.000000000 -0500 -@@ -0,0 +1,33 @@ -+dnl AM_GCONF_SOURCE_2 -+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas -+dnl (i.e. pass to gconftool-2 -+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where -+dnl you should install foo.schemas files -+dnl -+ -+AC_DEFUN(AM_GCONF_SOURCE_2, -+[ -+ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then -+ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` -+ else -+ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE -+ fi -+ -+ AC_ARG_WITH(gconf-source, -+ [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) -+ -+ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) -+ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) -+ -+ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then -+ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas/' -+ else -+ GCONF_SCHEMA_FILE_DIR=$GCONF_SCHEMA_FILE_DIR -+ fi -+ -+ AC_ARG_WITH(gconf-schema-file-dir, -+ [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) -+ -+ AC_SUBST(GCONF_SCHEMA_FILE_DIR) -+ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) -+]) ---- /dev/null 2003-09-23 18:19:32.000000000 -0400 -+++ matchbox-window-manager-0.8/m4/glib-2.0.m4 2004-03-11 16:42:20.000000000 -0500 -@@ -0,0 +1,212 @@ -+# Configure paths for GLIB -+# Owen Taylor 1997-2001 -+ -+dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or -+dnl gthread is specified in MODULES, pass to pkg-config -+dnl -+AC_DEFUN(AM_PATH_GLIB_2_0, -+[dnl -+dnl Get the cflags and libraries from pkg-config -+dnl -+AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], -+ , enable_glibtest=yes) -+ -+ pkg_config_args=glib-2.0 -+ for module in . $4 -+ do -+ case "$module" in -+ gmodule) -+ pkg_config_args="$pkg_config_args gmodule-2.0" -+ ;; -+ gobject) -+ pkg_config_args="$pkg_config_args gobject-2.0" -+ ;; -+ gthread) -+ pkg_config_args="$pkg_config_args gthread-2.0" -+ ;; -+ esac -+ done -+ -+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+ -+ no_glib="" -+ -+ if test x$PKG_CONFIG != xno ; then -+ if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then -+ : -+ else -+ echo *** pkg-config too old; version 0.7 or better required. -+ no_glib=yes -+ PKG_CONFIG=no -+ fi -+ else -+ no_glib=yes -+ fi -+ -+ min_glib_version=ifelse([$1], ,2.0.0,$1) -+ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) -+ -+ if test x$PKG_CONFIG != xno ; then -+ ## don't try to run the test against uninstalled libtool libs -+ if $PKG_CONFIG --uninstalled $pkg_config_args; then -+ echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" -+ enable_glibtest=no -+ fi -+ -+ if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then -+ : -+ else -+ no_glib=yes -+ fi -+ fi -+ -+ if test x"$no_glib" = x ; then -+ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` -+ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` -+ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` -+ -+ GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` -+ GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` -+ glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ if test "x$enable_glibtest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GLIB_CFLAGS" -+ LIBS="$GLIB_LIBS $LIBS" -+dnl -+dnl Now check if the installed GLIB is sufficiently new. (Also sanity -+dnl checks the results of pkg-config to some extent) -+dnl -+ rm -f conf.glibtest -+ AC_TRY_RUN([ -+#include -+#include -+#include -+ -+int -+main () -+{ -+ int major, minor, micro; -+ char *tmp_version; -+ -+ system ("touch conf.glibtest"); -+ -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = g_strdup("$min_glib_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_glib_version"); -+ exit(1); -+ } -+ -+ if ((glib_major_version != $glib_config_major_version) || -+ (glib_minor_version != $glib_config_minor_version) || -+ (glib_micro_version != $glib_config_micro_version)) -+ { -+ printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", -+ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, -+ glib_major_version, glib_minor_version, glib_micro_version); -+ printf ("*** was found! If pkg-config was correct, then it is best\n"); -+ printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); -+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); -+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -+ printf("*** required on your system.\n"); -+ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); -+ printf("*** to point to the correct configuration files\n"); -+ } -+ else if ((glib_major_version != GLIB_MAJOR_VERSION) || -+ (glib_minor_version != GLIB_MINOR_VERSION) || -+ (glib_micro_version != GLIB_MICRO_VERSION)) -+ { -+ printf("*** GLIB header files (version %d.%d.%d) do not match\n", -+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); -+ printf("*** library (version %d.%d.%d)\n", -+ glib_major_version, glib_minor_version, glib_micro_version); -+ } -+ else -+ { -+ if ((glib_major_version > major) || -+ ((glib_major_version == major) && (glib_minor_version > minor)) || -+ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", -+ glib_major_version, glib_minor_version, glib_micro_version); -+ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", -+ major, minor, micro); -+ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); -+ printf("***\n"); -+ printf("*** If you have already installed a sufficiently new version, this error\n"); -+ printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); -+ printf("*** being found. The easiest way to fix this is to remove the old version\n"); -+ printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); -+ printf("*** correct copy of pkg-config. (In this case, you will have to\n"); -+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -+ printf("*** so that the correct libraries are found at run-time))\n"); -+ } -+ } -+ return 1; -+} -+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_glib" = x ; then -+ AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ if test "$PKG_CONFIG" = "no" ; then -+ echo "*** A new enough version of pkg-config was not found." -+ echo "*** See http://www.freedesktop.org/software/pkgconfig/" -+ else -+ if test -f conf.glibtest ; then -+ : -+ else -+ echo "*** Could not run GLIB test program, checking why..." -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GLIB_CFLAGS" -+ LIBS="$LIBS $GLIB_LIBS" -+ AC_TRY_LINK([ -+#include -+#include -+], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], -+ [ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding GLIB or finding the wrong" -+ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], -+ [ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ GLIB_CFLAGS="" -+ GLIB_LIBS="" -+ GLIB_GENMARSHAL="" -+ GOBJECT_QUERY="" -+ GLIB_MKENUMS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ AC_SUBST(GLIB_CFLAGS) -+ AC_SUBST(GLIB_LIBS) -+ AC_SUBST(GLIB_GENMARSHAL) -+ AC_SUBST(GOBJECT_QUERY) -+ AC_SUBST(GLIB_MKENUMS) -+ rm -f conf.glibtest -+]) ---- /dev/null 2003-09-23 18:19:32.000000000 -0400 -+++ matchbox-window-manager-0.8/m4/glib-gettext.m4 2004-03-11 16:42:20.000000000 -0500 -@@ -0,0 +1,380 @@ -+# Copyright (C) 1995-2002 Free Software Foundation, Inc. -+# Copyright (C) 2001-2003 Red Hat, Inc. -+# -+# This file is free software, distributed under the terms of the GNU -+# General Public License. As a special exception to the GNU General -+# Public License, this file may be distributed as part of a program -+# that contains a configuration script generated by Autoconf, under -+# the same distribution terms as the rest of that program. -+# -+# This file can be copied and used freely without restrictions. It can -+# be used in projects which are not available under the GNU Public License -+# but which still want to provide support for the GNU gettext functionality. -+# -+# Macro to add for using GNU gettext. -+# Ulrich Drepper , 1995, 1996 -+# -+# Modified to never use included libintl. -+# Owen Taylor , 12/15/1998 -+# -+# Major rework to remove unused code -+# Owen Taylor , 12/11/2002 -+# -+# Added better handling of ALL_LINGUAS from GNU gettext version -+# written by Bruno Haible, Owen Taylor 5/30/3002 -+ -+# -+# We need this here as well, since someone might use autoconf-2.5x -+# to configure GLib then an older version to configure a package -+# using AM_GLIB_GNU_GETTEXT -+AC_PREREQ(2.53) -+ -+dnl -+dnl We go to great lengths to make sure that aclocal won't -+dnl try to pull in the installed version of these macros -+dnl when running aclocal in the glib directory. -+dnl -+m4_copy([AC_DEFUN],[glib_DEFUN]) -+m4_copy([AC_REQUIRE],[glib_REQUIRE]) -+dnl -+dnl At the end, if we're not within glib, we'll define the public -+dnl definitions in terms of our private definitions. -+dnl -+ -+# GLIB_LC_MESSAGES -+#-------------------- -+glib_DEFUN([GLIB_LC_MESSAGES], -+ [AC_CHECK_HEADERS([locale.h]) -+ if test $ac_cv_header_locale_h = yes; then -+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, -+ [AC_TRY_LINK([#include ], [return LC_MESSAGES], -+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) -+ if test $am_cv_val_LC_MESSAGES = yes; then -+ AC_DEFINE(HAVE_LC_MESSAGES, 1, -+ [Define if your file defines LC_MESSAGES.]) -+ fi -+ fi]) -+ -+# GLIB_PATH_PROG_WITH_TEST -+#---------------------------- -+dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -+glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], -+[# Extract the first word of "$2", so it can be a program name with args. -+set dummy $2; ac_word=[$]2 -+AC_MSG_CHECKING([for $ac_word]) -+AC_CACHE_VAL(ac_cv_path_$1, -+[case "[$]$1" in -+ /*) -+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -+ for ac_dir in ifelse([$5], , $PATH, [$5]); do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ if [$3]; then -+ ac_cv_path_$1="$ac_dir/$ac_word" -+ break -+ fi -+ fi -+ done -+ IFS="$ac_save_ifs" -+dnl If no 4th arg is given, leave the cache variable unset, -+dnl so AC_PATH_PROGS will keep looking. -+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -+])dnl -+ ;; -+esac])dnl -+$1="$ac_cv_path_$1" -+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then -+ AC_MSG_RESULT([$]$1) -+else -+ AC_MSG_RESULT(no) -+fi -+AC_SUBST($1)dnl -+]) -+ -+# GLIB_WITH_NLS -+#----------------- -+glib_DEFUN([GLIB_WITH_NLS], -+ dnl NLS is obligatory -+ [USE_NLS=yes -+ AC_SUBST(USE_NLS) -+ -+ gt_cv_have_gettext=no -+ -+ CATOBJEXT=NONE -+ XGETTEXT=: -+ INTLLIBS= -+ -+ AC_CHECK_HEADER(libintl.h, -+ [gt_cv_func_dgettext_libintl="no" -+ libintl_extra_libs="" -+ -+ # -+ # First check in libc -+ # -+ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, -+ [AC_TRY_LINK([ -+#include -+], -+ [return (int) dgettext ("","")], -+ gt_cv_func_dgettext_libc=yes, -+ gt_cv_func_dgettext_libc=no) -+ ]) -+ -+ if test "$gt_cv_func_dgettext_libc" = "yes" ; then -+ AC_CHECK_FUNCS(bind_textdomain_codeset) -+ fi -+ -+ # -+ # If we don't have everything we want, check in libintl -+ # -+ if test "$gt_cv_func_dgettext_libc" != "yes" \ -+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then -+ -+ AC_CHECK_LIB(intl, bindtextdomain, -+ [AC_CHECK_LIB(intl, dgettext, -+ gt_cv_func_dgettext_libintl=yes)]) -+ -+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then -+ AC_MSG_CHECKING([if -liconv is needed to use gettext]) -+ AC_MSG_RESULT([]) -+ AC_CHECK_LIB(intl, dcgettext, -+ [gt_cv_func_dgettext_libintl=yes -+ libintl_extra_libs=-liconv], -+ :,-liconv) -+ fi -+ -+ # -+ # If we found libintl, then check in it for bind_textdomain_codeset(); -+ # we'll prefer libc if neither have bind_textdomain_codeset(), -+ # and both have dgettext -+ # -+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then -+ glib_save_LIBS="$LIBS" -+ LIBS="$LIBS -lintl $libintl_extra_libs" -+ unset ac_cv_func_bind_textdomain_codeset -+ AC_CHECK_FUNCS(bind_textdomain_codeset) -+ LIBS="$glib_save_LIBS" -+ -+ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then -+ gt_cv_func_dgettext_libc=no -+ else -+ if test "$gt_cv_func_dgettext_libc" = "yes"; then -+ gt_cv_func_dgettext_libintl=no -+ fi -+ fi -+ fi -+ fi -+ -+ if test "$gt_cv_func_dgettext_libc" = "yes" \ -+ || test "$gt_cv_func_dgettext_libintl" = "yes"; then -+ gt_cv_have_gettext=yes -+ fi -+ -+ if test "$gt_cv_func_dgettext_libintl" = "yes"; then -+ INTLLIBS="-lintl $libintl_extra_libs" -+ fi -+ -+ if test "$gt_cv_have_gettext" = "yes"; then -+ AC_DEFINE(HAVE_GETTEXT,1, -+ [Define if the GNU gettext() function is already present or preinstalled.]) -+ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, -+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl -+ if test "$MSGFMT" != "no"; then -+ glib_save_LIBS="$LIBS" -+ LIBS="$LIBS $INTLLIBS" -+ AC_CHECK_FUNCS(dcgettext) -+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -+ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, -+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) -+ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; -+ return _nl_msg_cat_cntr], -+ [CATOBJEXT=.gmo -+ DATADIRNAME=share], -+ [case $host in -+ *-*-solaris*) -+ dnl On Solaris, if bind_textdomain_codeset is in libc, -+ dnl GNU format message catalog is always supported, -+ dnl since both are added to the libc all together. -+ dnl Hence, we'd like to go with DATADIRNAME=share and -+ dnl and CATOBJEXT=.gmo in this case. -+ AC_CHECK_FUNC(bind_textdomain_codeset, -+ [CATOBJEXT=.gmo -+ DATADIRNAME=share], -+ [CATOBJEXT=.mo -+ DATADIRNAME=lib]) -+ ;; -+ *) -+ CATOBJEXT=.mo -+ DATADIRNAME=lib -+ ;; -+ esac]) -+ LIBS="$glib_save_LIBS" -+ INSTOBJEXT=.mo -+ else -+ gt_cv_have_gettext=no -+ fi -+ fi -+ ]) -+ -+ if test "$gt_cv_have_gettext" = "yes" ; then -+ AC_DEFINE(ENABLE_NLS, 1, -+ [always defined to indicate that i18n is enabled]) -+ fi -+ -+ dnl Test whether we really found GNU xgettext. -+ if test "$XGETTEXT" != ":"; then -+ dnl If it is not GNU xgettext we define it as : so that the -+ dnl Makefiles still can work. -+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then -+ : ; -+ else -+ AC_MSG_RESULT( -+ [found xgettext program is not GNU xgettext; ignore it]) -+ XGETTEXT=":" -+ fi -+ fi -+ -+ # We need to process the po/ directory. -+ POSUB=po -+ -+ AC_OUTPUT_COMMANDS( -+ [case "$CONFIG_FILES" in *po/Makefile.in*) -+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile -+ esac]) -+ -+ dnl These rules are solely for the distribution goal. While doing this -+ dnl we only have to keep exactly one list of the available catalogs -+ dnl in configure.in. -+ for lang in $ALL_LINGUAS; do -+ GMOFILES="$GMOFILES $lang.gmo" -+ POFILES="$POFILES $lang.po" -+ done -+ -+ dnl Make all variables we use known to autoconf. -+ AC_SUBST(CATALOGS) -+ AC_SUBST(CATOBJEXT) -+ AC_SUBST(DATADIRNAME) -+ AC_SUBST(GMOFILES) -+ AC_SUBST(INSTOBJEXT) -+ AC_SUBST(INTLLIBS) -+ AC_SUBST(PO_IN_DATADIR_TRUE) -+ AC_SUBST(PO_IN_DATADIR_FALSE) -+ AC_SUBST(POFILES) -+ AC_SUBST(POSUB) -+ ]) -+ -+# AM_GLIB_GNU_GETTEXT -+# ------------------- -+# Do checks necessary for use of gettext. If a suitable implementation -+# of gettext is found in either in libintl or in the C library, -+# it will set INTLLIBS to the libraries needed for use of gettext -+# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable -+# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() -+# on various variables needed by the Makefile.in.in installed by -+# glib-gettextize. -+dnl -+glib_DEFUN(GLIB_GNU_GETTEXT, -+ [AC_REQUIRE([AC_PROG_CC])dnl -+ AC_REQUIRE([AC_HEADER_STDC])dnl -+ -+ GLIB_LC_MESSAGES -+ GLIB_WITH_NLS -+ -+ if test "$gt_cv_have_gettext" = "yes"; then -+ if test "x$ALL_LINGUAS" = "x"; then -+ LINGUAS= -+ else -+ AC_MSG_CHECKING(for catalogs to be installed) -+ NEW_LINGUAS= -+ for presentlang in $ALL_LINGUAS; do -+ useit=no -+ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then -+ desiredlanguages="$LINGUAS" -+ else -+ desiredlanguages="$ALL_LINGUAS" -+ fi -+ for desiredlang in $desiredlanguages; do -+ # Use the presentlang catalog if desiredlang is -+ # a. equal to presentlang, or -+ # b. a variant of presentlang (because in this case, -+ # presentlang can be used as a fallback for messages -+ # which are not translated in the desiredlang catalog). -+ case "$desiredlang" in -+ "$presentlang"*) useit=yes;; -+ esac -+ done -+ if test $useit = yes; then -+ NEW_LINGUAS="$NEW_LINGUAS $presentlang" -+ fi -+ done -+ LINGUAS=$NEW_LINGUAS -+ AC_MSG_RESULT($LINGUAS) -+ fi -+ -+ dnl Construct list of names of catalog files to be constructed. -+ if test -n "$LINGUAS"; then -+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done -+ fi -+ fi -+ -+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly -+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir). -+ dnl Try to locate is. -+ MKINSTALLDIRS= -+ if test -n "$ac_aux_dir"; then -+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" -+ fi -+ if test -z "$MKINSTALLDIRS"; then -+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" -+ fi -+ AC_SUBST(MKINSTALLDIRS) -+ -+ dnl Generate list of files to be processed by xgettext which will -+ dnl be included in po/Makefile. -+ test -d po || mkdir po -+ if test "x$srcdir" != "x."; then -+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then -+ posrcprefix="$srcdir/" -+ else -+ posrcprefix="../$srcdir/" -+ fi -+ else -+ posrcprefix="../" -+ fi -+ rm -f po/POTFILES -+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ -+ < $srcdir/po/POTFILES.in > po/POTFILES -+ ]) -+ -+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) -+# ------------------------------- -+# Define VARIABLE to the location where catalog files will -+# be installed by po/Makefile. -+glib_DEFUN(GLIB_DEFINE_LOCALEDIR, -+[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl -+glib_save_prefix="$prefix" -+glib_save_exec_prefix="$exec_prefix" -+test "x$prefix" = xNONE && prefix=$ac_default_prefix -+test "x$exec_prefix" = xNONE && exec_prefix=$prefix -+if test "x$CATOBJEXT" = "x.mo" ; then -+ localedir=`eval echo "${libdir}/locale"` -+else -+ localedir=`eval echo "${datadir}/locale"` -+fi -+prefix="$glib_save_prefix" -+exec_prefix="$glib_save_exec_prefix" -+AC_DEFINE_UNQUOTED($1, "$localedir", -+ [Define the location where the catalogs will be installed]) -+]) -+ -+dnl -+dnl Now the definitions that aclocal will find -+dnl -+ifdef(glib_configure_in,[],[ -+AC_DEFUN(AM_GLIB_GNU_GETTEXT,[GLIB_GNU_GETTEXT($@)]) -+AC_DEFUN(AM_GLIB_DEFINE_LOCALEDIR,[GLIB_DEFINE_LOCALEDIR($@)]) -+])dnl ---- /dev/null 2003-09-23 18:19:32.000000000 -0400 -+++ matchbox-window-manager-0.8/m4/pkg.m4 2004-03-11 16:42:20.000000000 -0500 -@@ -0,0 +1,57 @@ -+ -+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) -+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page -+dnl also defines GSTUFF_PKG_ERRORS on error -+AC_DEFUN(PKG_CHECK_MODULES, [ -+ succeeded=no -+ -+ if test -z "$PKG_CONFIG"; then -+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+ fi -+ -+ if test "$PKG_CONFIG" = "no" ; then -+ echo "*** The pkg-config script could not be found. Make sure it is" -+ echo "*** in your path, or set the PKG_CONFIG environment variable" -+ echo "*** to the full path to pkg-config." -+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." -+ else -+ PKG_CONFIG_MIN_VERSION=0.9.0 -+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then -+ AC_MSG_CHECKING(for $2) -+ -+ if $PKG_CONFIG --exists "$2" ; then -+ AC_MSG_RESULT(yes) -+ succeeded=yes -+ -+ AC_MSG_CHECKING($1_CFLAGS) -+ $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` -+ AC_MSG_RESULT($$1_CFLAGS) -+ -+ AC_MSG_CHECKING($1_LIBS) -+ $1_LIBS=`$PKG_CONFIG --libs "$2"` -+ AC_MSG_RESULT($$1_LIBS) -+ else -+ $1_CFLAGS="" -+ $1_LIBS="" -+ ## If we have a custom action on failure, don't print errors, but -+ ## do set a variable so people can do so. -+ $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` -+ ifelse([$4], ,echo $$1_PKG_ERRORS,) -+ fi -+ -+ AC_SUBST($1_CFLAGS) -+ AC_SUBST($1_LIBS) -+ else -+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." -+ echo "*** See http://www.freedesktop.org/software/pkgconfig" -+ fi -+ fi -+ -+ if test $succeeded = yes; then -+ ifelse([$3], , :, [$3]) -+ else -+ ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) -+ fi -+]) -+ -+ diff --git a/matchbox-wm/matchbox-wm_0.8.1.oe b/matchbox-wm/matchbox-wm_0.8.1.oe deleted file mode 100644 index c69374c0e1..0000000000 --- a/matchbox-wm/matchbox-wm_0.8.1.oe +++ /dev/null @@ -1,26 +0,0 @@ -SECTION = "x11/wm" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" -DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf" - -SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \ - file://m4.patch;patch=1" -S = "${WORKDIR}/matchbox-window-manager-${PV}" - -inherit autotools pkgconfig - -FILES_${PN} = "${bindir} \ - ${datadir}/matchbox \ - ${datadir}/themes/blondie/matchbox \ - ${datadir}/themes/bluebox/matchbox \ - ${datadir}/themes/borillo/matchbox" - -EXTRA_OECONF = "--enable-composite --enable-startup-notification --enable-expat" - -pkg_postinst() { -update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/matchbox-session 10 -} - -pkg_postrm() { -update-alternatives --remove x-window-manager /usr/bin/matchbox-session -} diff --git a/matchbox-wm/matchbox-wm_0.8.2.oe b/matchbox-wm/matchbox-wm_0.8.2.oe deleted file mode 100644 index b42c90407e..0000000000 --- a/matchbox-wm/matchbox-wm_0.8.2.oe +++ /dev/null @@ -1,29 +0,0 @@ -SECTION = "x11/wm" -PR = "r3" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" -DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common" -RDEPENDS = "matchbox-common" - -SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \ - file://net-showing-desktop.patch;patch=1 \ - file://kbdconfig_keylaunch_simpad.patch;patch=1;pnum=0" -S = "${WORKDIR}/matchbox-window-manager-${PV}" - -inherit autotools pkgconfig - -FILES_${PN} = "${bindir} \ - ${datadir}/matchbox \ - ${datadir}/themes/blondie/matchbox \ - ${datadir}/themes/bluebox/matchbox \ - ${datadir}/themes/borillo/matchbox" - -EXTRA_OECONF = "--enable-composite --enable-startup-notification --enable-expat" - -pkg_postinst() { -update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/matchbox-session 10 -} - -pkg_postrm() { -update-alternatives --remove x-window-manager /usr/bin/matchbox-session -} diff --git a/matchbox-wm/matchbox-wm_0.8.oe b/matchbox-wm/matchbox-wm_0.8.oe deleted file mode 100644 index dfaaf0d822..0000000000 --- a/matchbox-wm/matchbox-wm_0.8.oe +++ /dev/null @@ -1,15 +0,0 @@ -SECTION = "x11/wm" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" -DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender gconf" -RDEPENDS = "libmatchbox" - -SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-window-manager/${PV}/matchbox-window-manager-${PV}.tar.bz2 \ - file://m4.patch;patch=1" -S = "${WORKDIR}/matchbox-window-manager-${PV}" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--enable-composite" -# --enable-startup-notification -# --enable-expat -- cgit v1.2.3