diff options
Diffstat (limited to 'packages')
22 files changed, 295 insertions, 670 deletions
diff --git a/packages/less/less-381/configure.patch b/packages/less/less-381/configure.patch deleted file mode 100644 index 2f054ba639..0000000000 --- a/packages/less/less-381/configure.patch +++ /dev/null @@ -1,243 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- less-381/./configure.ac~configure -+++ less-381/./configure.ac -@@ -9,7 +9,7 @@ - # contact the author, see the README file. - - # Autoconf initialization. --AC_INIT(less, 1) -+AC_INIT([less],[1]) - AC_CONFIG_SRCDIR([forwback.c]) - AC_CONFIG_HEADER([defines.h]) - -@@ -56,8 +56,7 @@ - TERMLIBS="-lxcurses" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -69,8 +68,7 @@ - TERMLIBS="-lncurses" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -82,8 +80,7 @@ - TERMLIBS="-lcurses" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -96,8 +93,7 @@ - TERMLIBS="-lcurses -ltermcap" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -111,8 +107,7 @@ - TERMLIBS="-ltermcap" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -124,8 +119,7 @@ - TERMLIBS="-lcurses -ltermlib" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -200,14 +194,11 @@ - # Checks for identifiers. - AC_TYPE_OFF_T - AC_MSG_CHECKING(for void) --AC_TRY_COMPILE(, [void *foo = 0;], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_VOID)], [AC_MSG_RESULT(no)]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[void *foo = 0;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_VOID)],[AC_MSG_RESULT(no)]) - AC_MSG_CHECKING(for const) --AC_TRY_COMPILE(, [const int foo = 0;], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_CONST)], [AC_MSG_RESULT(no)]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[const int foo = 0;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_CONST)],[AC_MSG_RESULT(no)]) - AC_MSG_CHECKING(for time_t) --AC_TRY_COMPILE([#include <time.h>], [time_t t = 0;], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_TIME_T)], [AC_MSG_RESULT(no)]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[time_t t = 0;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_TIME_T)],[AC_MSG_RESULT(no)]) - - # Checks for library functions. - AC_TYPE_SIGNAL -@@ -217,14 +208,13 @@ - AC_CHECK_FUNC(tcgetattr, AC_DEFINE(HAVE_TERMIOS_FUNCS)) - - AC_MSG_CHECKING(for fileno) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #if HAVE_STDIO_H - #include <stdio.h> --#endif], [static int x; x = fileno(stdin);], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FILENO)], [AC_MSG_RESULT(no)]) -+#endif]], [[static int x; x = fileno(stdin);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FILENO)],[AC_MSG_RESULT(no)]) - - AC_MSG_CHECKING(for strerror) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #if HAVE_STDIO_H - #include <stdio.h> - #endif -@@ -233,68 +223,56 @@ - #endif - #if HAVE_ERRNO_H - #include <errno.h> --#endif], [static char *x; x = strerror(0);], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STRERROR)], [AC_MSG_RESULT(no)]) -+#endif]], [[static char *x; x = strerror(0);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STRERROR)],[AC_MSG_RESULT(no)]) - - AC_MSG_CHECKING(for sys_errlist) --AC_TRY_LINK(, [extern char *sys_errlist[]; static char **x; x = sys_errlist;], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SYS_ERRLIST)], [AC_MSG_RESULT(no)]) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[extern char *sys_errlist[]; static char **x; x = sys_errlist;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SYS_ERRLIST)],[AC_MSG_RESULT(no)]) - - AC_MSG_CHECKING(for sigset_t) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include <signal.h> --], [sigset_t s; s = 0;], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SIGSET_T)], [AC_MSG_RESULT(no)]) -+]], [[sigset_t s; s = 0;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SIGSET_T)],[AC_MSG_RESULT(no)]) - - AC_MSG_CHECKING(for sigemptyset) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include <signal.h> --], [sigset_t s; sigemptyset(&s);], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SIGEMPTYSET)], [AC_MSG_RESULT(no)]) -+]], [[sigset_t s; sigemptyset(&s);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SIGEMPTYSET)],[AC_MSG_RESULT(no)]) - - have_errno=no - AC_MSG_CHECKING(for errno) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #if HAVE_ERRNO_H - #include <errno.h> --#endif], [static int x; x = errno;], -- [AC_MSG_RESULT(yes - in errno.h); AC_DEFINE(HAVE_ERRNO) have_errno=yes]) -+#endif]], [[static int x; x = errno;]])],[AC_MSG_RESULT(yes - in errno.h); AC_DEFINE(HAVE_ERRNO) have_errno=yes],[]) - if test $have_errno = no; then --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #if HAVE_ERRNO_H - #include <errno.h> --#endif], [extern int errno; static int x; x = errno;], -- [AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_ERRNO) AC_DEFINE(MUST_DEFINE_ERRNO)], -- [AC_MSG_RESULT(no)]) -+#endif]], [[extern int errno; static int x; x = errno;]])],[AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_ERRNO) AC_DEFINE(MUST_DEFINE_ERRNO)],[AC_MSG_RESULT(no)]) - fi - - AC_MSG_CHECKING(for locale) --AC_TRY_LINK([#include <locale.h> --#include <ctype.h>], [setlocale(LC_CTYPE,""); isprint(0); iscntrl(0);], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LOCALE)], [AC_MSG_RESULT(no)]) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <locale.h> -+#include <ctype.h>]], [[setlocale(LC_CTYPE,""); isprint(0); iscntrl(0);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LOCALE)],[AC_MSG_RESULT(no)]) - AC_MSG_CHECKING(for ctype functions) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #if HAVE_CTYPE_H - #include <ctype.h> --#endif], [static int x; x = isupper(x); x = tolower(x); x = toupper(x);], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_UPPER_LOWER)], [AC_MSG_RESULT(no)]) -+#endif]], [[static int x; x = isupper(x); x = tolower(x); x = toupper(x);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_UPPER_LOWER)],[AC_MSG_RESULT(no)]) - - # Checks for external variable ospeed in the termcap library. - have_ospeed=no - AC_MSG_CHECKING(termcap for ospeed) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include <sys/types.h> - #if HAVE_TERMIOS_H - #include <termios.h> - #endif - #if HAVE_TERMCAP_H - #include <termcap.h> --#endif], [ospeed = 0;], --[AC_MSG_RESULT(yes - in termcap.h); AC_DEFINE(HAVE_OSPEED) have_ospeed=yes]) -+#endif]], [[ospeed = 0;]])],[AC_MSG_RESULT(yes - in termcap.h); AC_DEFINE(HAVE_OSPEED) have_ospeed=yes],[]) - if test $have_ospeed = no; then --AC_TRY_LINK(, [extern short ospeed; ospeed = 0;], -- [AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_OSPEED) AC_DEFINE(MUST_DEFINE_OSPEED)], -- [AC_MSG_RESULT(no)]) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[extern short ospeed; ospeed = 0;]])],[AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_OSPEED) AC_DEFINE(MUST_DEFINE_OSPEED)],[AC_MSG_RESULT(no)]) - fi - - # Checks for regular expression functions. -@@ -311,7 +289,7 @@ - if test $WANT_REGEX = auto -o $WANT_REGEX = posix; then - # Some versions of Solaris have a regcomp() function, but it doesn't work! - # So we run a test program. If we're cross-compiling, do it the old way. --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include <sys/types.h> - #include <regex.h> - main() { regex_t r; regmatch_t rm; char *text = "xabcy"; -@@ -322,19 +300,16 @@ - #else - if (rm.rm_sp != text + 1) exit(1); /* check for correct offset */ - #endif --exit(0); }], -- have_posix_regex=yes, have_posix_regex=no, have_posix_regex=unknown) -+exit(0); }]])],[have_posix_regex=yes],[have_posix_regex=no],[have_posix_regex=unknown]) - if test $have_posix_regex = yes; then - AC_MSG_RESULT(using POSIX regcomp) - AC_DEFINE(HAVE_POSIX_REGCOMP) - have_regex=yes - elif test $have_posix_regex = unknown; then -- AC_TRY_LINK([ -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include <sys/types.h> --#include <regex.h>], -- [regex_t *r; regfree(r);], -- AC_MSG_RESULT(using POSIX regcomp) -- AC_DEFINE(HAVE_POSIX_REGCOMP) have_regex=yes) -+#include <regex.h>]], [[regex_t *r; regfree(r);]])],[AC_MSG_RESULT(using POSIX regcomp) -+ AC_DEFINE(HAVE_POSIX_REGCOMP) have_regex=yes],[]) - else - AC_MSG_RESULT(no) - fi -@@ -357,9 +332,8 @@ - - if test $have_regex = no; then - if test $WANT_REGEX = auto -o $WANT_REGEX = regcomp; then --AC_TRY_LINK([ --#include "regexp.h"], [regcomp("");], --AC_MSG_RESULT(using V8 regcomp); AC_DEFINE(HAVE_V8_REGCOMP) have_regex=yes) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -+#include "regexp.h"]], [[regcomp("");]])],[AC_MSG_RESULT(using V8 regcomp); AC_DEFINE(HAVE_V8_REGCOMP) have_regex=yes],[]) - fi - fi - diff --git a/packages/less/less-382/.mtn2git_empty b/packages/less/less-382/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/less/less-382/.mtn2git_empty +++ /dev/null diff --git a/packages/less/less-382/configure.patch b/packages/less/less-382/configure.patch deleted file mode 100644 index 2f054ba639..0000000000 --- a/packages/less/less-382/configure.patch +++ /dev/null @@ -1,243 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- less-381/./configure.ac~configure -+++ less-381/./configure.ac -@@ -9,7 +9,7 @@ - # contact the author, see the README file. - - # Autoconf initialization. --AC_INIT(less, 1) -+AC_INIT([less],[1]) - AC_CONFIG_SRCDIR([forwback.c]) - AC_CONFIG_HEADER([defines.h]) - -@@ -56,8 +56,7 @@ - TERMLIBS="-lxcurses" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -69,8 +68,7 @@ - TERMLIBS="-lncurses" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -82,8 +80,7 @@ - TERMLIBS="-lcurses" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -96,8 +93,7 @@ - TERMLIBS="-lcurses -ltermcap" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -111,8 +107,7 @@ - TERMLIBS="-ltermcap" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -124,8 +119,7 @@ - TERMLIBS="-lcurses -ltermlib" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -200,14 +194,11 @@ - # Checks for identifiers. - AC_TYPE_OFF_T - AC_MSG_CHECKING(for void) --AC_TRY_COMPILE(, [void *foo = 0;], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_VOID)], [AC_MSG_RESULT(no)]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[void *foo = 0;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_VOID)],[AC_MSG_RESULT(no)]) - AC_MSG_CHECKING(for const) --AC_TRY_COMPILE(, [const int foo = 0;], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_CONST)], [AC_MSG_RESULT(no)]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[const int foo = 0;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_CONST)],[AC_MSG_RESULT(no)]) - AC_MSG_CHECKING(for time_t) --AC_TRY_COMPILE([#include <time.h>], [time_t t = 0;], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_TIME_T)], [AC_MSG_RESULT(no)]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[time_t t = 0;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_TIME_T)],[AC_MSG_RESULT(no)]) - - # Checks for library functions. - AC_TYPE_SIGNAL -@@ -217,14 +208,13 @@ - AC_CHECK_FUNC(tcgetattr, AC_DEFINE(HAVE_TERMIOS_FUNCS)) - - AC_MSG_CHECKING(for fileno) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #if HAVE_STDIO_H - #include <stdio.h> --#endif], [static int x; x = fileno(stdin);], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FILENO)], [AC_MSG_RESULT(no)]) -+#endif]], [[static int x; x = fileno(stdin);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FILENO)],[AC_MSG_RESULT(no)]) - - AC_MSG_CHECKING(for strerror) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #if HAVE_STDIO_H - #include <stdio.h> - #endif -@@ -233,68 +223,56 @@ - #endif - #if HAVE_ERRNO_H - #include <errno.h> --#endif], [static char *x; x = strerror(0);], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STRERROR)], [AC_MSG_RESULT(no)]) -+#endif]], [[static char *x; x = strerror(0);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STRERROR)],[AC_MSG_RESULT(no)]) - - AC_MSG_CHECKING(for sys_errlist) --AC_TRY_LINK(, [extern char *sys_errlist[]; static char **x; x = sys_errlist;], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SYS_ERRLIST)], [AC_MSG_RESULT(no)]) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[extern char *sys_errlist[]; static char **x; x = sys_errlist;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SYS_ERRLIST)],[AC_MSG_RESULT(no)]) - - AC_MSG_CHECKING(for sigset_t) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include <signal.h> --], [sigset_t s; s = 0;], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SIGSET_T)], [AC_MSG_RESULT(no)]) -+]], [[sigset_t s; s = 0;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SIGSET_T)],[AC_MSG_RESULT(no)]) - - AC_MSG_CHECKING(for sigemptyset) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include <signal.h> --], [sigset_t s; sigemptyset(&s);], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SIGEMPTYSET)], [AC_MSG_RESULT(no)]) -+]], [[sigset_t s; sigemptyset(&s);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SIGEMPTYSET)],[AC_MSG_RESULT(no)]) - - have_errno=no - AC_MSG_CHECKING(for errno) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #if HAVE_ERRNO_H - #include <errno.h> --#endif], [static int x; x = errno;], -- [AC_MSG_RESULT(yes - in errno.h); AC_DEFINE(HAVE_ERRNO) have_errno=yes]) -+#endif]], [[static int x; x = errno;]])],[AC_MSG_RESULT(yes - in errno.h); AC_DEFINE(HAVE_ERRNO) have_errno=yes],[]) - if test $have_errno = no; then --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #if HAVE_ERRNO_H - #include <errno.h> --#endif], [extern int errno; static int x; x = errno;], -- [AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_ERRNO) AC_DEFINE(MUST_DEFINE_ERRNO)], -- [AC_MSG_RESULT(no)]) -+#endif]], [[extern int errno; static int x; x = errno;]])],[AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_ERRNO) AC_DEFINE(MUST_DEFINE_ERRNO)],[AC_MSG_RESULT(no)]) - fi - - AC_MSG_CHECKING(for locale) --AC_TRY_LINK([#include <locale.h> --#include <ctype.h>], [setlocale(LC_CTYPE,""); isprint(0); iscntrl(0);], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LOCALE)], [AC_MSG_RESULT(no)]) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <locale.h> -+#include <ctype.h>]], [[setlocale(LC_CTYPE,""); isprint(0); iscntrl(0);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LOCALE)],[AC_MSG_RESULT(no)]) - AC_MSG_CHECKING(for ctype functions) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #if HAVE_CTYPE_H - #include <ctype.h> --#endif], [static int x; x = isupper(x); x = tolower(x); x = toupper(x);], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_UPPER_LOWER)], [AC_MSG_RESULT(no)]) -+#endif]], [[static int x; x = isupper(x); x = tolower(x); x = toupper(x);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_UPPER_LOWER)],[AC_MSG_RESULT(no)]) - - # Checks for external variable ospeed in the termcap library. - have_ospeed=no - AC_MSG_CHECKING(termcap for ospeed) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include <sys/types.h> - #if HAVE_TERMIOS_H - #include <termios.h> - #endif - #if HAVE_TERMCAP_H - #include <termcap.h> --#endif], [ospeed = 0;], --[AC_MSG_RESULT(yes - in termcap.h); AC_DEFINE(HAVE_OSPEED) have_ospeed=yes]) -+#endif]], [[ospeed = 0;]])],[AC_MSG_RESULT(yes - in termcap.h); AC_DEFINE(HAVE_OSPEED) have_ospeed=yes],[]) - if test $have_ospeed = no; then --AC_TRY_LINK(, [extern short ospeed; ospeed = 0;], -- [AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_OSPEED) AC_DEFINE(MUST_DEFINE_OSPEED)], -- [AC_MSG_RESULT(no)]) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[extern short ospeed; ospeed = 0;]])],[AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_OSPEED) AC_DEFINE(MUST_DEFINE_OSPEED)],[AC_MSG_RESULT(no)]) - fi - - # Checks for regular expression functions. -@@ -311,7 +289,7 @@ - if test $WANT_REGEX = auto -o $WANT_REGEX = posix; then - # Some versions of Solaris have a regcomp() function, but it doesn't work! - # So we run a test program. If we're cross-compiling, do it the old way. --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include <sys/types.h> - #include <regex.h> - main() { regex_t r; regmatch_t rm; char *text = "xabcy"; -@@ -322,19 +300,16 @@ - #else - if (rm.rm_sp != text + 1) exit(1); /* check for correct offset */ - #endif --exit(0); }], -- have_posix_regex=yes, have_posix_regex=no, have_posix_regex=unknown) -+exit(0); }]])],[have_posix_regex=yes],[have_posix_regex=no],[have_posix_regex=unknown]) - if test $have_posix_regex = yes; then - AC_MSG_RESULT(using POSIX regcomp) - AC_DEFINE(HAVE_POSIX_REGCOMP) - have_regex=yes - elif test $have_posix_regex = unknown; then -- AC_TRY_LINK([ -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include <sys/types.h> --#include <regex.h>], -- [regex_t *r; regfree(r);], -- AC_MSG_RESULT(using POSIX regcomp) -- AC_DEFINE(HAVE_POSIX_REGCOMP) have_regex=yes) -+#include <regex.h>]], [[regex_t *r; regfree(r);]])],[AC_MSG_RESULT(using POSIX regcomp) -+ AC_DEFINE(HAVE_POSIX_REGCOMP) have_regex=yes],[]) - else - AC_MSG_RESULT(no) - fi -@@ -357,9 +332,8 @@ - - if test $have_regex = no; then - if test $WANT_REGEX = auto -o $WANT_REGEX = regcomp; then --AC_TRY_LINK([ --#include "regexp.h"], [regcomp("");], --AC_MSG_RESULT(using V8 regcomp); AC_DEFINE(HAVE_V8_REGCOMP) have_regex=yes) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -+#include "regexp.h"]], [[regcomp("");]])],[AC_MSG_RESULT(using V8 regcomp); AC_DEFINE(HAVE_V8_REGCOMP) have_regex=yes],[]) - fi - fi - diff --git a/packages/less/less_381.bb b/packages/less/less_381.bb deleted file mode 100644 index 6702292423..0000000000 --- a/packages/less/less_381.bb +++ /dev/null @@ -1,14 +0,0 @@ -SECTION = "console/utils" -DEPENDS = "ncurses" -DESCRIPTION = "Less is a program similar to more, i.e. a terminal \ -based program for viewing text files and the output from other \ -programs. Less offers many features beyond those that more does." -LICENSE = "GPL" -SRC_URI = "${GNU_MIRROR}/less/less-${PV}.tar.gz \ - file://configure.patch;patch=1" - -inherit autotools - -do_install () { - oe_runmake 'bindir=${D}${bindir}' 'mandir=${D}${mandir}' install -} diff --git a/packages/less/less_406.bb b/packages/less/less_406.bb new file mode 100644 index 0000000000..c8ef2fc6e6 --- /dev/null +++ b/packages/less/less_406.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Less is a program similar to more, i.e. a terminal \ +based program for viewing text files and the output from other \ +programs. Less offers many features beyond those that more does." +HOMEPAGE = "http://www.greenwoodsoftware.com/" +SECTION = "console/utils" +LICENSE = "BSD" +DEPENDS = "ncurses" + +SRC_URI = "http://www.greenwoodsoftware.com/less/less-406.tar.gz " + +inherit autotools update-alternatives + +do_install () { + oe_runmake 'bindir=${D}${bindir}' 'mandir=${D}${mandir}' install + mv ${D}${bindir}/less ${D}${bindir}/less.${PN} +} + +ALTERNATIVE_NAME = "less" +ALTERNATIVE_PATH = "less.${PN}" +ALTERNATIVE_PRIORITY = "100" diff --git a/packages/less/less-381/.mtn2git_empty b/packages/midpath/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/less/less-381/.mtn2git_empty +++ b/packages/midpath/files/.mtn2git_empty diff --git a/packages/midpath/files/shellscript.patch b/packages/midpath/files/shellscript.patch new file mode 100644 index 0000000000..17c39d0810 --- /dev/null +++ b/packages/midpath/files/shellscript.patch @@ -0,0 +1,27 @@ +Index: midpath-0.1/bin/midpath-test-cacao-cldc.sh +=================================================================== +--- midpath-0.1.orig/bin/midpath-test-cacao-cldc.sh 2007-07-03 22:09:33.000000000 +0200 ++++ midpath-0.1/bin/midpath-test-cacao-cldc.sh 2007-08-24 22:31:32.000000000 +0200 +@@ -3,19 +3,13 @@ + # Adapt the next line to your environment + JAVA_CMD=cacao + +-if [ "$MIDPATH_HOME" = "" ]; then +- MIDPATH_HOME=$(pwd)/.. +-fi ++MIDPATH_HOME= + + # Set the classpath +-BCP=$MIDPATH_HOME/dist/cldc1.1.jar:$MIDPATH_HOME/dist/midpath.jar:$MIDPATH_HOME/resources-embedded:$MIDPATH_HOME/dist/sdljava-cldc.jar:$MIDPATH_HOME/dist/escher-x11-cldc.jar:$MIDPATH_HOME/dist/kxml2-2.3.0.jar ++BCP=$MIDPATH_HOME/cldc1.1.jar:$MIDPATH_HOME/midpath.jar:$MIDPATH_HOME/resources-embedded:$MIDPATH_HOME/sdljava-cldc.jar:$MIDPATH_HOME/escher-x11-cldc.jar:$MIDPATH_HOME/kxml2-2.3.0.jar + # Add the MIDlet jar to the classpath (must be loaded by the main + # classloader yet) +-BCP=$BCP:$MIDPATH_HOME/dist/midpath-tests.jar +- +-# Path of the native libraries +-JLP=$MIDPATH_HOME/dist +-export LD_LIBRARY_PATH=$JLP ++BCP=$BCP:$MIDPATH_HOME/midpath-tests.jar + + CLASS=org.thenesis.midpath.main.StandardMIDletLauncher + # The classname of the MIDlet (we have to set it manually yet) diff --git a/packages/midpath/midpath-alsa_svn.bb b/packages/midpath/midpath-alsa_0.1.bb index 7d230f3cd0..940a1ea8a2 100644 --- a/packages/midpath/midpath-alsa_svn.bb +++ b/packages/midpath/midpath-alsa_0.1.bb @@ -20,15 +20,14 @@ mkdir -p ${S}/dist # Build the ALSA native part cd ${S}/native/alsa make || exit 1 -cp *.so ${S}/dist } do_install() { install -d ${D}${libdir} - install -m 0644 dist/libmidpathalsa.so ${D}${libdir} - install -d ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration - install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration/ + install -m 0644 ${S}/native/alsa/libmidpathalsa.so ${D}${libdir} + install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration + install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/ } do_stage() { @@ -38,5 +37,7 @@ do_stage() { PACKAGES = "${PN}" FILES_${PN} = "${libdir}/libmidpathalsa.so \ - ${libdir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ + ${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ " + +CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg" diff --git a/packages/midpath/midpath-cldc-native_0.1.bb b/packages/midpath/midpath-cldc-native_0.1.bb new file mode 100644 index 0000000000..27700d2e61 --- /dev/null +++ b/packages/midpath/midpath-cldc-native_0.1.bb @@ -0,0 +1,14 @@ + +inherit native + +require midpath-cldc_${PV}.bb + + +PROVIDES = "virtual/cldc-api-1.1-native" +RPROVIDES = " " + +PACKAGES = " " + +do_install() { + : +} diff --git a/packages/midpath/midpath-cldc-sdl_0.1.bb b/packages/midpath/midpath-cldc-sdl_0.1.bb new file mode 100644 index 0000000000..d00cbfc619 --- /dev/null +++ b/packages/midpath/midpath-cldc-sdl_0.1.bb @@ -0,0 +1,43 @@ + +require midpath.inc + +do_configure() { + + cd ${S}/resources-embedded/com/sun/midp/configuration + sed -i -e "s|ui.backend:AWT|ui.backend:SDL|" \ + -e "s|bitsPerPixel:32|bitsPerPixel:16|" \ + configuration.cfg + +} + + +do_compile() { + +mkdir -p ${S}/dist + +# Build SDLJava for CLDC +cd ${S}/external/sdljava-cldc +make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH}:${GNU_CLASSPATH_PATH} -sourcepath ${S}/external/sdljava-cldc -source 1.3 -target 1.1" || exit 1 +make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH}:${GNU_CLASSPATH_PATH} -source 1.3 -target 1.1" JAR_FILE="sdljava-cldc.jar" JAR_FLAGS="cvf" || exit 1 + +} + +do_install() { + install -d ${D}${datadir}/java + install -m 0644 ${S}/external/sdljava-cldc/sdljava-cldc.jar ${D}${datadir}/java + install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration + install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/ +} + +do_stage() { + install -d ${STAGING_DATADIR}/java + install -m 0644 ${S}/external/sdljava-cldc/sdljava-cldc.jar ${STAGING_DATADIR}/java +} + +PACKAGES = "${PN}" + +FILES_${PN} = "${datadir}/java/sdljava-cldc.jar \ + ${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ + " + +CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg" diff --git a/packages/midpath/midpath-cldc-x11_svn.bb b/packages/midpath/midpath-cldc-x11_0.1.bb index 1aac20265b..30ca378436 100644 --- a/packages/midpath/midpath-cldc-x11_svn.bb +++ b/packages/midpath/midpath-cldc-x11_0.1.bb @@ -1,10 +1,7 @@ -require midpath_${PV}.bb +require midpath.inc -DEPENDS += "virtual/libx11 virtual/cldc-api-1.1" -RDEPENDS = "libx11" - -CLDC_PATH = ${STAGING_LIBDIR}/java/cldc1.1.jar +DEPENDS += " virtual/libx11 virtual/cldc-api-1.1" do_configure() { @@ -21,23 +18,23 @@ mkdir -p ${S}/dist cd ${S}/external/escher-cldc/core make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -sourcepath ${S}/external/escher-cldc/core -source 1.3 -target 1.1" || exit 1 make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -source 1.3 -target 1.1" JAR_FILE="escher-x11-cldc.jar" JAR_FLAGS="cvf" || exit 1 -cp ${S}/external/escher-cldc/core/escher-x11-cldc.jar ${S}/dist } do_install() { - install -d ${D}${libdir} - install -m 0644 dist/escher-x11-cldc.jar ${D}${libdir} - install -d ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration - install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration/ + install -d ${D}${datadir} + install -m 0644 ${S}/external/escher-cldc/core/escher-x11-cldc.jar ${D}${datadir} + install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration + install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/ } do_stage() { - : + install -d ${STAGING_DATADIR}/java + install -m 0644 ${S}/external/escher-cldc/core/escher-x11-cldc.jar ${STAGING_DATADIR}/java } PACKAGES = "${PN}" -FILES_${PN} = "${libdir}/java/escher-x11-cldc.jar \ - ${libdir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ +FILES_${PN} = "${datadir}/java/escher-x11-cldc.jar \ + ${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ " diff --git a/packages/midpath/midpath-native_svn.bb b/packages/midpath/midpath-cldc_0.1.bb index dfc9ca6c4e..24ffc61332 100644 --- a/packages/midpath/midpath-native_svn.bb +++ b/packages/midpath/midpath-cldc_0.1.bb @@ -1,19 +1,10 @@ -inherit native +require midpath.inc -require midpath_${PV}.bb - -DEPENDS = "ecj-native fastjar-native classpath-minimal-native" -PROVIDES = "virtual/cldc-api-1.1-native" - -PACKAGES = " " - - -do_configure() { - : -} +PROVIDES = "virtual/cldc-api-1.1" do_compile() { + mkdir -p ${S}/dist # Build CLDC1.1 @@ -25,10 +16,22 @@ make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath . -source 1.3 -targe cd ${S}/src/cldc-glue make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/external/cldc1.1/classes -sourcepath ${S}/src/cldc-glue -source 1.3 -target 1.1" make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/external/cldc1.1/classes -source 1.3 -target 1.1" CLASS_DIR=${S}/external/cldc1.1/classes -# Make a jar -fastjar cvf ${S}/dist/cldc1.1.jar -C ${S}/external/cldc1.1/classes . +# Make a jar +${FASTJAR_CMD} cvf ${S}/dist/cldc1.1.jar -C ${S}/external/cldc1.1/classes . + + } do_install() { - : + install -d ${D}${datadir}/java + install -m 0644 dist/cldc1.1.jar ${D}${datadir}/java } + +do_stage() { + install -d ${STAGING_DATADIR}/java + install -m 0644 dist/cldc1.1.jar ${STAGING_DATADIR}/java +} + +PACKAGES = "${PN}" + +FILES_${PN} = "${datadir}/java/cldc1.1.jar" diff --git a/packages/midpath/midpath-gtk_svn.bb b/packages/midpath/midpath-gtk_0.1.bb index 3ee0d40f3d..680b4e259d 100644 --- a/packages/midpath/midpath-gtk_svn.bb +++ b/packages/midpath/midpath-gtk_0.1.bb @@ -1,8 +1,7 @@ -require midpath_${PV}.bb +require midpath.inc DEPENDS += "gtk+" -RDEPENDS = "gtk+" do_configure() { @@ -21,15 +20,14 @@ mkdir -p ${S}/dist # Build the GTK native part cd ${S}/native/gtk make || exit 1 -cp *.so ${S}/dist } do_install() { install -d ${D}${libdir} - install -m 0644 dist/libmidpathgtk.so ${D}${libdir} - install -d ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration - install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration/ + install -m 0644 ${S}/native/gtk/libmidpathgtk.so ${D}${libdir} + install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration + install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/ } do_stage() { @@ -39,5 +37,6 @@ do_stage() { PACKAGES = "${PN}" FILES_${PN} = "${libdir}/libmidpathgtk.so \ - ${libdir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ + ${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ " +CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg" diff --git a/packages/midpath/midpath-qt3x11_svn.bb b/packages/midpath/midpath-qt3x11_0.1.bb index 30e855a636..1d44706db9 100644 --- a/packages/midpath/midpath-qt3x11_svn.bb +++ b/packages/midpath/midpath-qt3x11_0.1.bb @@ -1,8 +1,7 @@ -require midpath_${PV}.bb +require midpath.inc -DEPENDS += "qt-mt" -RDEPENDS = "qt-mt" +DEPENDS += " qt-mt" RCONFILCTS = "midpath-qte" inherit qt3x11 @@ -26,15 +25,14 @@ mkdir -p ${S}/dist # Build the QT native part cd ${S}/native/qt make || exit 1 -cp *.so ${S}/dist } do_install() { install -d ${D}${libdir} - install -m 0644 dist/libmidpathqt.so ${D}${libdir} - install -d ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration - install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration/ + install -m 0644 ${S}/native/qt/libmidpathqt.so ${D}${libdir} + install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration + install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/ } do_stage() { @@ -44,5 +42,7 @@ do_stage() { PACKAGES = "${PN}" FILES_${PN} = "${libdir}/libmidpathqt.so \ - ${libdir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ + ${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ " + +CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg" diff --git a/packages/midpath/midpath-qte_svn.bb b/packages/midpath/midpath-qte_0.1.bb index 478883e559..e37825bf57 100644 --- a/packages/midpath/midpath-qte_svn.bb +++ b/packages/midpath/midpath-qte_0.1.bb @@ -1,8 +1,7 @@ -require midpath_${PV}.bb +require midpath.inc -DEPENDS += "qte-mt" -RDEPENDS = "qte-mt" +DEPENDS += " qte-mt" RCONFLICTS = "midpath-qt3x11" do_configure() { @@ -24,15 +23,14 @@ mkdir -p ${S}/dist # Build the QT native part cd ${S}/native/qt make || exit 1 -cp *.so ${S}/dist } do_install() { install -d ${D}${libdir} - install -m 0644 dist/libmidpathqt.so ${D}${libdir} - install -d ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration - install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration/ + install -m 0644 ${S}/native/qt/libmidpathqt.so ${D}${libdir} + install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration + install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/ } do_stage() { @@ -42,5 +40,7 @@ do_stage() { PACKAGES = "${PN}" FILES_${PN} = "${libdir}/libmidpathqt.so \ - ${libdir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ + ${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ " + +CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg" diff --git a/packages/midpath/midpath-test_0.1.bb b/packages/midpath/midpath-test_0.1.bb new file mode 100644 index 0000000000..14bfdc97f0 --- /dev/null +++ b/packages/midpath/midpath-test_0.1.bb @@ -0,0 +1,46 @@ + +require midpath.inc + +SRC_URI += "file://shellscript.patch;patch=1" + +DEPENDS += " midpath" +RDEPENDS += " midpath" + +CLDC_PATH = ${STAGING_DATADIR}/java/cldc1.1.jar + +do_configure() { + + cd ${S}/bin + sed -i -e "s|MIDPATH_HOME=|MIDPATH_HOME=${datadir}/java|" \ + midpath-test-cacao-cldc.sh + +} + +do_compile() { + +cd ${S}/tests +make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${STAGING_DATADIR}/java/midpath.jar:${CLDC_PATH} -sourcepath ${S}/tests -source 1.3 -target 1.1" || exit 1 +make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${STAGING_DATADIR}/java/midpath.jar:${CLDC_PATH} -source 1.3 -target 1.1" JAR_FILE="midpath-tests.jar" JAR_FLAGS="cvf" || exit 1 + +} + +do_install() { + install -d ${D}${bindir} +# install -m 0755 bin/graphical_launcher-j2se.sh ${D}${bindir} +# install -m 0755 bin/midpath-test.sh ${D}${bindir} + install -m 0755 bin/midpath-test-cacao-cldc.sh ${D}${bindir} + install -d ${D}${datadir}/java + install -m 0644 ${S}/tests/midpath-tests.jar ${D}${datadir}/java +} + +do_stage() { + : +} + +PACKAGES = "${PN}" + +FILES_${PN} = "${datadir}/java/midpath-tests.jar \ +# ${bindir}/graphical_launcher-j2se.sh \ +# ${bindir}/midpath-test.sh \ + ${bindir}/midpath-test-cacao-cldc.sh \ + " diff --git a/packages/midpath/midpath.inc b/packages/midpath/midpath.inc new file mode 100644 index 0000000000..7f6e4f3d31 --- /dev/null +++ b/packages/midpath/midpath.inc @@ -0,0 +1,22 @@ +DESCRIPTION = "MIDPath is a Java library which provides a MIDP2 implementation" +HOMEPAGE = "http://midpath.thenesis.org/" +LICENSE = "GPL" +PRIORITY = "optional" +SECTION = "interpreters" +PR = "r0" + +SRC_URI = "http://downloads.sourceforge.net/midpath/midpath-${PV}.tar.gz" + +S = "${WORKDIR}/midpath-${PV}" + +DEPENDS = "ecj-native fastjar-native classpath-minimal" + +JAVAC_CMD = "${STAGING_BINDIR_NATIVE}/ecj" + +FASTJAR_CMD = "${STAGING_BINDIR_NATIVE}/fastjar" + +JAVA_PATH = "${STAGING_DATADIR}/java" + +GNU_CLASSPATH_PATH = "${JAVA_PATH}/classpath-minimal/glibj.zip" + +CLDC_PATH = ${JAVA_PATH}/cldc1.1.jar diff --git a/packages/midpath/midpath_0.1.bb b/packages/midpath/midpath_0.1.bb new file mode 100644 index 0000000000..3501144701 --- /dev/null +++ b/packages/midpath/midpath_0.1.bb @@ -0,0 +1,61 @@ + +require midpath.inc + +DEPENDS += " kxml2 midpath-cldc midpath-cldc-x11 midpath-cldc-sdl" +RSUGGESTS += " kxml2" + +do_compile() { + +mkdir -p ${S}/dist + +# Build MP3 library +cd ${S}/external/jlayerme-cldc/src +make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -sourcepath ${S}/external/jlayerme-cldc/src -source 1.3 -target 1.1" || exit 1 +make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -source 1.3 -target 1.1" JAR_FILE="jlayerme-cldc.jar" JAR_FLAGS="cvf" || exit 1 +cp ${S}/external/jlayerme-cldc/src/jlayerme-cldc.jar ${S}/dist + +# Build OGG library +cd ${S}/external/jorbis-cldc/src +make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -sourcepath ${S}/external/jorbis-cldc/src -source 1.3 -target 1.1" || exit 1 +make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -source 1.3 -target 1.1" JAR_FILE="jorbis-cldc.jar" JAR_FLAGS="cvf" || exit 1 +cp ${S}/external/jorbis-cldc/src/jorbis-cldc.jar ${S}/dist + +# Build Bluetooth library +cd ${S}/external/javabluetooth/src +make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${GNU_CLASSPATH_PATH}:${CLDC_PATH}:${S}/lib/RXTXcomm.jar -sourcepath ${S}/external/javabluetooth/src -source 1.3 -target 1.1" || exit 1 +make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${GNU_CLASSPATH_PATH}:${CLDC_PATH}:${S}/lib/RXTXcomm.jar -source 1.3 -target 1.1" JAR_FILE="jsr82-bluetooth.jar" JAR_FLAGS="cvf" || exit 1 +cp ${S}/external/javabluetooth/src/jsr82-bluetooth.jar ${S}/dist + +# Build MIDPath +cd ${S}/src/core +make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH}:${GNU_CLASSPATH_PATH}:${JAVA_PATH}/sdljava-cldc.jar:${JAVA_PATH}/escher-x11-cldc.jar:${S}/dist/jlayerme-cldc.jar:${S}/dist/jorbis-cldc.jar:${S}/dist/jsr82-bluetooth.jar:${JAVA_PATH}/kxml2-2.3.0.jar:${S}/lib/swt.jar -sourcepath ${S}/src/core -source 1.3 -target 1.1" || exit 1 +make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH}:${GNU_CLASSPATH_PATH}:${JAVA_PATH}/sdljava-cldc.jar:${JAVA_PATH}/dist/escher-x11-cldc.jar:${S}/dist/jlayerme-cldc.jar:${S}/dist/jorbis-cldc.jar:${S}/dist/jsr82-bluetooth.jar:${JAVA_PATH}/lib/kxml2-2.3.0.jar:${S}/lib/swt.jar -source 1.3 -target 1.1" CLASS_DIR=${S}/src/core/classes || exit 1 +# Compile JVM.java separately as it can't be compiled against cldc.jar +${JAVAC_CMD} -bootclasspath ${GNU_CLASSPATH_PATH} -source 1.3 -target 1.1 -d ${S}/src/core/classes com/sun/cldchi/jvm/JVM.java +${FASTJAR_CMD} cvf ${S}/dist/midpath.jar -C ${S}/src/core/classes . + +} + +do_install() { + install -d ${D}${datadir}/java + install -m 0644 dist/midpath.jar ${D}${datadir}/java + install -d ${D}${datadir}/java/resources-embedded + cp -rf resources-embedded/ ${D}${datadir}/java/ +} + +do_stage() { + install -d ${STAGING_DATADIR}/java + install -m 0644 dist/midpath.jar ${STAGING_DATADIR}/java +} + +PACKAGES = "${PN}" + +FILES_${PN} = "${datadir}/java/midpath.jar \ + ${datadir}/java/resources-embedded/com/sun/midp/configuration/ \ + ${datadir}/java/resources-embedded/com/sun/midp/configuration/chameleon/ \ + ${datadir}/java/resources-embedded/com/sun/midp/configuration/l10n/ \ + ${datadir}/java/resources-embedded/com/sun/midp/chameleon/skins/resources/images/ \ + + ${datadir}/java/resources-embedded/org/thenesis/midpath/font/bdf/ \ + " +CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg" diff --git a/packages/midpath/midpath_svn.bb b/packages/midpath/midpath_svn.bb deleted file mode 100644 index 1813c26a0b..0000000000 --- a/packages/midpath/midpath_svn.bb +++ /dev/null @@ -1,113 +0,0 @@ -DESCRIPTION = "MIDPath is a Java library which provides a MIDP2 implementation" -HOMEPAGE = "http://midpath.thenesis.org/" -LICENSE = "GPL" -PRIORITY = "optional" -SECTION = "interpreters" - -SRC_URI = "svn://midpath.svn.sourceforge.net/svnroot/midpath;module=trunk;proto=https" - -S = "${WORKDIR}/trunk" - -DEPENDS = "ecj-native fastjar-native classpath-minimal" -PROVIDES = "virtual/cldc-api-1.1" -RPROVIDES_midpath-cldc = "virtual/cldc-api-1.1" - -JAVAC_CMD=${STAGING_BINDIR_NATIVE}/ecj - -FASTJAR_CMD=${STAGING_BINDIR_NATIVE}/fastjar - -GNU_CLASSPATH_PATH=${STAGING_LIBDIR}/java/classpath-minimal/glibj.zip - -do_compile() { - -mkdir -p ${S}/dist - -# Build CLDC1.1 -# Build base classes -cd ${S}/external/cldc1.1/src -make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath . -source 1.3 -target 1.1" || exit 1 -make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath . -source 1.3 -target 1.1" CLASS_DIR=${S}/external/cldc1.1/classes || exit 1 -# Build CLDC extra classes for MIDP2 -cd ${S}/src/cldc-glue -make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/external/cldc1.1/classes -sourcepath ${S}/src/cldc-glue -source 1.3 -target 1.1" -make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/external/cldc1.1/classes -source 1.3 -target 1.1" CLASS_DIR=${S}/external/cldc1.1/classes -# Make a jar -${FASTJAR_CMD} cvf ${S}/dist/cldc1.1.jar -C ${S}/external/cldc1.1/classes . - -CLDC_PATH=${S}/dist/cldc1.1.jar - -# Build SDLJava for CLDC -cd ${S}/external/sdljava-cldc -make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath $CLDC_PATH:${GNU_CLASSPATH_PATH} -sourcepath ${S}/external/sdljava-cldc -source 1.3 -target 1.1" || exit 1 -make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath $CLDC_PATH:${GNU_CLASSPATH_PATH} -source 1.3 -target 1.1" JAR_FILE="sdljava-cldc.jar" JAR_FLAGS="cvf" || exit 1 -cp ${S}/external/sdljava-cldc/sdljava-cldc.jar ${S}/dist - -# Build Escher X11 library -cd ${S}/external/escher-cldc/core -make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath $CLDC_PATH -sourcepath ${S}/external/escher-cldc/core -source 1.3 -target 1.1" || exit 1 -make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath $CLDC_PATH -source 1.3 -target 1.1" JAR_FILE="escher-x11-cldc.jar" JAR_FLAGS="cvf" || exit 1 -cp ${S}/external/escher-cldc/core/escher-x11-cldc.jar ${S}/dist - -# Build MP3 library -cd ${S}/external/jlayerme-cldc/src -make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath $CLDC_PATH -sourcepath ${S}/external/jlayerme-cldc/src -source 1.3 -target 1.1" || exit 1 -make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath $CLDC_PATH -source 1.3 -target 1.1" JAR_FILE="jlayerme-cldc.jar" JAR_FLAGS="cvf" || exit 1 -cp ${S}/external/jlayerme-cldc/src/jlayerme-cldc.jar ${S}/dist - -# Build OGG library -cd ${S}/external/jorbis-cldc/src -make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath $CLDC_PATH -sourcepath ${S}/external/jorbis-cldc/src -source 1.3 -target 1.1" || exit 1 -make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath $CLDC_PATH -source 1.3 -target 1.1" JAR_FILE="jorbis-cldc.jar" JAR_FLAGS="cvf" || exit 1 -cp ${S}/external/jorbis-cldc/src/jorbis-cldc.jar ${S}/dist - -# Build Bluetooth library -cd ${S}/external/javabluetooth/src -make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${GNU_CLASSPATH_PATH}:$CLDC_PATH:${S}/lib/RXTXcomm.jar -sourcepath ${S}/external/javabluetooth/src -source 1.3 -target 1.1" || exit 1 -make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${GNU_CLASSPATH_PATH}:$CLDC_PATH:${S}/lib/RXTXcomm.jar -source 1.3 -target 1.1" JAR_FILE="jsr82-bluetooth.jar" JAR_FLAGS="cvf" || exit 1 -cp ${S}/external/javabluetooth/src/jsr82-bluetooth.jar ${S}/dist - -# Build MIDPath -cd ${S}/src/core -make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath $CLDC_PATH:${GNU_CLASSPATH_PATH}:${S}/dist/sdljava-cldc.jar:${S}/dist/escher-x11-cldc.jar:${S}/dist/jlayerme-cldc.jar:${S}/dist/jorbis-cldc.jar:${S}/dist/jsr82-bluetooth.jar:${S}/lib/kxml2-2.3.0.jar:${S}/lib/swt.jar -sourcepath ${S}/src/core -source 1.3 -target 1.1" || exit 1 -make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath $CLDC_PATH:${GNU_CLASSPATH_PATH}:${S}/dist/sdljava-cldc.jar:${S}/dist/escher-x11-cldc.jar:${S}/dist/jlayerme-cldc.jar:${S}/dist/jorbis-cldc.jar:${S}/dist/jsr82-bluetooth.jar:${S}/lib/kxml2-2.3.0.jar:${S}/lib/swt.jar -source 1.3 -target 1.1" CLASS_DIR=${S}/src/core/classes || exit 1 -# Compile JVM.java separately as it can't be compiled against cldc.jar -${JAVAC_CMD} -bootclasspath ${GNU_CLASSPATH_PATH} -source 1.3 -target 1.1 -d ${S}/src/core/classes com/sun/cldchi/jvm/JVM.java -${FASTJAR_CMD} cvf ${S}/dist/midpath.jar -C ${S}/src/core/classes . - -cd ${S}/tests -make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/dist/midpath.jar:$CLDC_PATH -sourcepath ${S}/tests -source 1.3 -target 1.1" || exit 1 -make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/dist/midpath.jar:$CLDC_PATH -source 1.3 -target 1.1" JAR_FILE="midpath-tests.jar" JAR_FLAGS="cvf" || exit 1 -cp ${S}/tests/midpath-tests.jar ${S}/dist - -# Add other required libraries to the dist directory -cp ${S}/lib/kxml2-2.3.0.jar ${S}/dist -} - -do_install() { - install -d ${D}${libdir}/java - install -m 0644 dist/*.jar ${D}${libdir}/java - install -d ${D}${libdir}/java/resources-embedded - cp -rf resources-embedded/* ${D}${libdir}/java/resources-embedded/ - rm -rf ${D}${libdir}/java/resources-embedded/.svn -} - -do_stage() { - install -d ${STAGING_LIBDIR}/java - install -m 0644 dist/cldc1.1.jar ${STAGING_LIBDIR}/java -} - -PACKAGES = "${PN} ${PN}-cldc" - -FILES_${PN} = "${libdir}/java/midpath.jar \ - ${libdir}/java/midpath-tests.jar \ - ${libdir}/java/kxml2-2.3.0.jar \ - ${libdir}/java/resources-embedded/com/sun/midp/configuration/ \ - ${libdir}/java/resources-embedded/com/sun/midp/configuration/chameleon/ \ - ${libdir}/java/resources-embedded/com/sun/midp/configuration/l10n/ \ - ${libdir}/java/resources-embedded/com/sun/midp/chameleon/skins/resources/images/ \ - - ${libdir}/java/resources-embedded/org/thenesis/midpath/font/bdf/ \ - " -FILES_${PN}-cldc = "${libdir}/java/cldc1.1.jar" - -CONFFILES_${PN} = "${libdir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg" diff --git a/packages/powertop/powertop_1.5.bb b/packages/powertop/powertop_1.8.bb index ab84161ddc..ab84161ddc 100644 --- a/packages/powertop/powertop_1.5.bb +++ b/packages/powertop/powertop_1.8.bb diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index 968af909f3..1a0b4b0ba0 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -31,6 +31,11 @@ FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bin FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy ${libdir}/modules ${libdir}/xorg/modules /etc/X11 " FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled" +FILES_${PN}-dbg += "${libdir}//xorg/modules/.debug \ + ${libdir}/xorg/modules/*/.debug \ + ${libdir}//xorg/modules/*/*/.debug \ + " + do_stage() { autotools_stage_all } diff --git a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb index b04ef19038..a05360a65d 100644 --- a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb +++ b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb @@ -2,7 +2,7 @@ MESA_VER = "6.5.2" require xorg-xserver-common.inc PE = "1" -PR = "r1" +PR = "r2" SRC_URI += "file://drmfix.patch;patch=1" |