mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-07-15 15:37:03 +00:00
Code Issues Projects Releases Wiki Activity

packages: Separate out most of the remaining packages into recipes

Browse Source 
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie
2010-09-01 19:09:11 +01:00
parent caab7fc509
commit d62ee7eaf2
569 changed files with 0 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/packages/libidl/libidl_0.8.12.bb
-16
View File
@@ -1,16 +0,0 @@
LICENSE = "LGPL"
DESCRIPTION = "Library for parsing CORBA IDL files"
SECTION = "gnome/libs"
DEPENDS = "glib-2.0 flex"
PR = "r4"
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-${PV}.tar.bz2"
S = "${WORKDIR}/libIDL-${PV}"
BINCONFIG_GLOB = "*-config-2"
inherit autotools pkgconfig binconfig
FILES_${PN} = "${libdir}/*.so.*"
FILES_${PN}-dev += " ${bindir}"
BBCLASSEXTEND = "native"
meta/packages/librds/librds_0.0.1.bb
-11
View File
@@ -1,11 +0,0 @@
DESCRIPTION = "A software library for accessing RDS data"
HOMEPAGE = "http://rdsd.berlios.de/"
SECTION = "libs"
PROVIDES = "librds"
LICENSE = "GPLv2"
PR = "r1"
SRC_URI = "http://download.berlios.de/rdsd/librds-${PV}.tar.gz"
inherit autotools pkgconfig
meta/packages/mozilla-headless/mozilla-headless-services/confighack.patch
-13
View File
@@ -1,13 +0,0 @@
Index: places-glib/configure.ac
===================================================================
--- places-glib.orig/configure.ac 2009-04-17 10:29:15.000000000 +0100
+++ places-glib/configure.ac 2009-04-17 10:29:44.000000000 +0100
@@ -99,6 +99,8 @@
PKG_CHECK_MODULES(GLIB, [glib-2.0])
PKG_CHECK_MODULES(DBUS, [dbus-glib-1])
+XUL_LIBS="$XUL_LIBS -lmozjs"
+
MOZHOME=`${PKG_CONFIG} --variable=prefix mozilla-headless`"/lib/xulrunner-"`${PKG_CONFIG} --modversion mozilla-headless`
AC_SUBST([MOZHOME])
meta/packages/mozilla-headless/mozilla-headless-services_git.bb
-14
View File
@@ -1,14 +0,0 @@
SRC_URI = "git://git.moblin.org/mozilla-headless-services.git;protocol=git \
file://confighack.patch;patch=1"
PV = "0.1+git${SRCPV}"
PR = "r1"
DEPENDS = "glib-2.0 dbus mozilla-headless json-glib"
EXTRA_OECONF = "--enable-gnome-proxy"
S = "${WORKDIR}/git"
FILES_${PN} += "${datadir}/dbus-1/services"
inherit autotools
meta/packages/mozilla-headless/mozilla-headless/0001-Adds-initial-Gtk-clipboard-support-to-moz-headless.patch
-1478
View File
File diff suppressed because it is too large Load Diff
meta/packages/mozilla-headless/mozilla-headless/autoconffix.patch
-66
View File
@@ -1,66 +0,0 @@
Fixes to enable building with latest autoconf and automake
RP 2/2/10
Index: offscreen/js/ctypes/libffi/configure.ac
===================================================================
--- offscreen.orig/js/ctypes/libffi/configure.ac 2010-02-02 19:53:16.753906134 +0000
+++ offscreen/js/ctypes/libffi/configure.ac 2010-02-02 19:53:21.895155509 +0000
@@ -17,10 +17,10 @@
# the wrong, non-multilib-adjusted value will be used in multilibs.
# As a side effect, we have to subst CFLAGS ourselves.
-m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS])
+m4_rename_force([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS])
m4_define([_AC_ARG_VAR_PRECIOUS],[])
AC_PROG_CC
-m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
+m4_rename_force([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
AC_SUBST(CFLAGS)
Index: offscreen/modules/libpr0n/build/Makefile.in
===================================================================
--- offscreen.orig/modules/libpr0n/build/Makefile.in 2010-02-02 19:53:16.783906873 +0000
+++ offscreen/modules/libpr0n/build/Makefile.in 2010-02-02 19:53:21.895155509 +0000
@@ -92,6 +92,7 @@
export::
@{ \
+ \
$(foreach d,$(filter-out icon,$(MOZ_IMG_DECODERS)), \
echo "#define IMG_BUILD_DECODER_${d}";) \
$(foreach d,$(MOZ_IMG_ENCODERS), \
Index: offscreen/configure.in
===================================================================
--- offscreen.orig/configure.in 2010-02-02 19:53:28.493904163 +0000
+++ offscreen/configure.in 2010-02-02 16:33:09.000000000 +0000
@@ -3250,11 +3250,7 @@
dnl ========================================================
AC_CHECK_LIB(Xext, XShmCreateImage, _HAVE_XSHM_XEXT=1,,
$XLIBS $XEXT_LIBS)
- AC_CHECK_HEADER(X11/extensions/XShm.h)
- if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" &&
- test -n "$_HAVE_XSHM_XEXT"; then
- AC_DEFINE(HAVE_XSHM)
- fi
+ AC_DEFINE(HAVE_XSHM)
dnl ========================================================
dnl = Check for XIE
@@ -8120,15 +8116,7 @@
fi # COMPILE_ENVIRONMENT
if test "$USE_FC_FREETYPE"; then
- if test "$COMPILE_ENVIRONMENT"; then
- _SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $FT2_CFLAGS"
- AC_CHECK_HEADERS(fontconfig/fcfreetype.h, ,
- [AC_MSG_ERROR(Can't find header fontconfig/fcfreetype.h.)])
- CPPFLAGS="$_SAVE_CPPFLAGS"
- else
AC_DEFINE(HAVE_FONTCONFIG_FCFREETYPE_H)
- fi
fi
dnl Set various defines and substitutions
meta/packages/mozilla-headless/mozilla-headless/buildfixhack.patch
-14
View File
@@ -1,14 +0,0 @@
diff -r ad8be5166ccd layout/generic/nsFrame.h
--- a/layout/generic/nsFrame.h Tue Nov 17 19:24:56 2009 +0000
+++ b/layout/generic/nsFrame.h Thu Nov 19 12:33:38 2009 +0000
@@ -151,7 +151,7 @@
// Left undefined; nsFrame objects are never allocated from the heap.
void* operator new(size_t sz) CPP_THROW_NEW;
-protected:
+public:
// Overridden to prevent the global delete from being called, since
// the memory came out of an arena instead of the heap.
//
meta/packages/mozilla-headless/mozilla-headless/configurefix-1a622cb7c384.patch
-764
View File
@@ -1,764 +0,0 @@
Index: offscreen/configure.in
===================================================================
--- offscreen.orig/configure.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/configure.in 2009-06-12 14:15:55.000000000 +0100
@@ -62,7 +62,6 @@
AC_PREREQ(2.13)
AC_INIT(config/config.mk)
-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
AC_CANONICAL_SYSTEM
TARGET_CPU="${target_cpu}"
TARGET_VENDOR="${target_vendor}"
@@ -103,7 +102,6 @@
_SUBDIR_HOST_CFLAGS="$HOST_CFLAGS"
_SUBDIR_HOST_CXXFLAGS="$HOST_CXXFLAGS"
_SUBDIR_HOST_LDFLAGS="$HOST_LDFLAGS"
-_SUBDIR_CONFIG_ARGS="$ac_configure_args"
dnl Set the version number of the libs included with mozilla
dnl ========================================================
@@ -135,6 +133,9 @@
MSMANIFEST_TOOL=
+ac_cv_have_usable_wchar_v2=no
+ac_cv_have_usable_wchar_option_v2=no
+
dnl Set various checks
dnl ========================================================
MISSING_X=
@@ -285,7 +286,7 @@
;;
esac
-if test -n "$CROSS_COMPILE" && test "$target" != "$host"; then
+
echo "cross compiling from $host to $target"
cross_compiling=yes
@@ -323,7 +324,7 @@
AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
AC_TRY_COMPILE([], [return(0);],
- [ac_cv_prog_hostcc_works=1 AC_MSG_RESULT([yes])],
+ [ac_cv_prog_hostcc_works=1; AC_MSG_RESULT([yes])],
AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
CC="$HOST_CXX"
@@ -331,7 +332,7 @@
AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
AC_TRY_COMPILE([], [return(0);],
- [ac_cv_prog_hostcxx_works=1 AC_MSG_RESULT([yes])],
+ [ac_cv_prog_hostcxx_works=1; AC_MSG_RESULT([yes])],
AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
CC=$_SAVE_CC
@@ -352,7 +353,7 @@
;;
esac
- AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", :)
+ CC="${target_alias}-gcc"
unset ac_cv_prog_CC
AC_PROG_CC
AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
@@ -376,37 +377,6 @@
AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", :)
AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", :)
AC_DEFINE(CROSS_COMPILE)
-else
- AC_PROG_CC
- AC_PROG_CXX
- AC_PROG_RANLIB
- MOZ_PATH_PROGS(AS, $AS as, $CC)
- AC_CHECK_PROGS(AR, ar, :)
- AC_CHECK_PROGS(LD, ld, :)
- AC_CHECK_PROGS(STRIP, strip, :)
- AC_CHECK_PROGS(WINDRES, windres, :)
- if test -z "$HOST_CC"; then
- HOST_CC="$CC"
- fi
- if test -z "$HOST_CFLAGS"; then
- HOST_CFLAGS="$CFLAGS"
- fi
- if test -z "$HOST_CXX"; then
- HOST_CXX="$CXX"
- fi
- if test -z "$HOST_CXXFLAGS"; then
- HOST_CXXFLAGS="$CXXFLAGS"
- fi
- if test -z "$HOST_LDFLAGS"; then
- HOST_LDFLAGS="$LDFLAGS"
- fi
- if test -z "$HOST_RANLIB"; then
- HOST_RANLIB="$RANLIB"
- fi
- if test -z "$HOST_AR"; then
- HOST_AR="$AR"
- fi
-fi
GNU_AS=
GNU_LD=
@@ -1606,6 +1576,7 @@
'
dnl test that the macros actually work:
+ac_cv_static_assertion_macros_work="yes"
AC_MSG_CHECKING(that static assertion macros used in autoconf tests work)
AC_CACHE_VAL(ac_cv_static_assertion_macros_work,
[AC_LANG_SAVE
@@ -2767,9 +2738,13 @@
AC_LANG_C
AC_HEADER_STDC
AC_C_CONST
+ac_cv_type_mode_t=yes
AC_TYPE_MODE_T
+ac_cv_type_off_t=yes
AC_TYPE_OFF_T
+ac_cv_type_pid_t=yes
AC_TYPE_PID_T
+ac_cv_type_size_t=yes
AC_TYPE_SIZE_T
AC_STRUCT_ST_BLKSIZE
AC_MSG_CHECKING(for siginfo_t)
@@ -3152,19 +3127,9 @@
dnl We don't want to link against libm or libpthread on Darwin since
dnl they both are just symlinks to libSystem and explicitly linking
dnl against libSystem causes issues when debugging (see bug 299601).
-case $target in
-*-darwin*)
- ;;
-*-beos*)
- ;;
-*)
AC_CHECK_LIB(m, atan)
AC_CHECK_LIB(dl, dlopen,
- AC_CHECK_HEADER(dlfcn.h,
- LIBS="-ldl $LIBS"
- AC_DEFINE(HAVE_LIBDL)))
- ;;
-esac
+ AC_DEFINE(HAVE_LIBDL))
_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -D_GNU_SOURCE"
@@ -7007,18 +6972,13 @@
# Demangle only for debug or trace-malloc builds
MOZ_DEMANGLE_SYMBOLS=
-if test "$HAVE_DEMANGLE" -a "$HAVE_GCC3_ABI" && test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC"; then
- MOZ_DEMANGLE_SYMBOLS=1
- AC_DEFINE(MOZ_DEMANGLE_SYMBOLS)
-fi
+
AC_SUBST(MOZ_DEMANGLE_SYMBOLS)
dnl ========================================================
dnl = Support for gcc stack unwinding (from gcc 3.3)
dnl ========================================================
-if test "$HAVE_GCC3_ABI" && test -z "$SKIP_LIBRARY_CHECKS"; then
- AC_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
-fi
+
dnl ========================================================
dnl =
@@ -7530,10 +7490,7 @@
dnl if no gtk/libIDL1 or gtk2/libIDL2 combination was found, fall back
dnl to either libIDL1 or libIDL2.
if test -z "$_LIBIDL_FOUND"; then
- AM_PATH_LIBIDL($LIBIDL_VERSION,_LIBIDL_FOUND=1)
- if test -z "$_LIBIDL_FOUND"; then
PKG_CHECK_MODULES(LIBIDL, libIDL-2.0 >= 0.8.0,_LIBIDL_FOUND=1)
- fi
fi
dnl
dnl If we don't have a libIDL config program & not cross-compiling,
@@ -7605,13 +7562,7 @@
fi
if test -z "$SKIP_PATH_CHECKS"; then
-if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then
- if test "$MOZ_ENABLE_GTK2" || test "$USE_ELF_DYNSTR_GC" || test "$MOZ_ENABLE_HEADLESS"; then
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3.7 gobject-2.0)
- else
- AM_PATH_GLIB(${GLIB_VERSION})
- fi
-fi
fi
if test -z "${GLIB_GMODULE_LIBS}" -a -n "${GLIB_CONFIG}"; then
@@ -8457,10 +8408,7 @@
HAVE_WCRTOMB
"
-AC_CONFIG_HEADER(
-netwerk/necko-config.h
-xpcom/xpcom-config.h
-xpcom/xpcom-private.h
+AC_CONFIG_HEADER(netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h
)
# Save the defines header file before autoconf removes it.
@@ -8519,31 +8467,11 @@
dnl To add new Makefiles, edit allmakefiles.sh.
dnl allmakefiles.sh sets the variable, MAKEFILES.
. ${srcdir}/allmakefiles.sh
-dnl
-dnl Run a perl script to quickly create the makefiles.
-dnl If it succeeds, it outputs a shell command to set CONFIG_FILES
-dnl for the files it cannot handle correctly. This way, config.status
-dnl will handle these files.
-dnl If it fails, nothing is set and config.status will run as usual.
-dnl
-dnl This does not change the $MAKEFILES variable.
-dnl
-dnl OpenVMS gets a line overflow on the long eval command, so use a temp file.
-dnl
-if test -z "${AS_PERL}"; then
-echo $MAKEFILES | ${PERL} $srcdir/build/autoconf/acoutput-fast.pl > conftest.sh
-else
-echo $MAKEFILES | ${PERL} $srcdir/build/autoconf/acoutput-fast.pl -nowrap --cygwin-srcdir=$srcdir > conftest.sh
-fi
-. ./conftest.sh
-rm conftest.sh
echo $MAKEFILES > unallmakefiles
mv -f config/autoconf.mk config/autoconf.mk.orig 2> /dev/null
-AC_OUTPUT($MAKEFILES)
-
dnl Prevent the regeneration of cairo-features.h forcing rebuilds of gfx stuff
if test "$CAIRO_FEATURES_H"; then
if cmp -s $CAIRO_FEATURES_H "$CAIRO_FEATURES_H".orig; then
@@ -8569,14 +8497,14 @@
HOST_LDFLAGS="$_SUBDIR_HOST_LDFLAGS"
RC=
-unset MAKEFILES
-unset CONFIG_FILES
+#unset MAKEFILES
+#unset CONFIG_FILES
# No need to run subconfigures when building with LIBXUL_SDK_DIR
if test "$COMPILE_ENVIRONMENT" -a -z "$LIBXUL_SDK_DIR"; then
if test -z "$MOZ_NATIVE_NSPR"; then
- ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
+ ac_configure_args="$ac_configure_args --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
if test -z "$MOZ_DEBUG"; then
ac_configure_args="$ac_configure_args --disable-debug"
fi
@@ -8592,8 +8520,7 @@
if test -n "$USE_ARM_KUSER"; then
ac_configure_args="$ac_configure_args --with-arm-kuser"
fi
- AC_OUTPUT_SUBDIRS(nsprpub)
- ac_configure_args="$_SUBDIR_CONFIG_ARGS"
+ AC_CONFIG_SUBDIRS(nsprpub)
fi
if test -z "$MOZ_NATIVE_NSPR"; then
@@ -8610,7 +8537,6 @@
# Run the SpiderMonkey 'configure' script.
dist=$MOZ_BUILD_ROOT/dist
-ac_configure_args="$_SUBDIR_CONFIG_ARGS"
ac_configure_args="$ac_configure_args --enable-threadsafe"
if test -z "$MOZ_NATIVE_NSPR"; then
ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'"
@@ -8627,11 +8553,14 @@
export MOZ_MEMORY_LDFLAGS
fi
fi
-AC_OUTPUT_SUBDIRS(js/src)
-ac_configure_args="$_SUBDIR_CONFIG_ARGS"
+AC_CONFIG_SUBDIRS(js/src)
fi # COMPILE_ENVIRONMENT && !LIBXUL_SDK_DIR
+m4_pattern_allow(AS_BIN)
+
+AC_OUTPUT($MAKEFILES)
+
dnl Prevent the regeneration of autoconf.mk forcing rebuilds of the world
dnl Needs to be at the end to respect possible changes from NSPR configure
if cmp -s config/autoconf.mk config/autoconf.mk.orig; then
Index: offscreen/js/src/configure.in
===================================================================
--- offscreen.orig/js/src/configure.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/js/src/configure.in 2009-06-12 14:15:55.000000000 +0100
@@ -62,7 +62,6 @@
AC_PREREQ(2.13)
AC_INIT(jsapi.h)
-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
AC_CONFIG_HEADER(js-config.h)
AC_CANONICAL_SYSTEM
TARGET_CPU="${target_cpu}"
@@ -101,6 +100,9 @@
_SUBDIR_HOST_LDFLAGS="$HOST_LDFLAGS"
_SUBDIR_CONFIG_ARGS="$ac_configure_args"
+ac_cv_have_usable_wchar_v2=no
+ac_cv_have_usable_wchar_option_v2=no
+
dnl Set the version number of the libs included with mozilla
dnl ========================================================
NSPR_VERSION=4
@@ -113,6 +115,8 @@
MSMANIFEST_TOOL=
+m4_pattern_allow(AS_BIN)
+
dnl Set various checks
dnl ========================================================
MISSING_X=
@@ -198,7 +202,7 @@
if test "$COMPILE_ENVIRONMENT"; then
-if test "$target" != "$host"; then
+
echo "cross compiling from $host to $target"
_SAVE_CC="$CC"
@@ -235,7 +239,7 @@
AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
AC_TRY_COMPILE([], [return(0);],
- [ac_cv_prog_hostcc_works=1 AC_MSG_RESULT([yes])],
+ [ac_cv_prog_hostcc_works=1; AC_MSG_RESULT([yes])],
AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
CC="$HOST_CXX"
@@ -243,7 +247,7 @@
AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
AC_TRY_COMPILE([], [return(0);],
- [ac_cv_prog_hostcxx_works=1 AC_MSG_RESULT([yes])],
+ [ac_cv_prog_hostcxx_works=1; AC_MSG_RESULT([yes])],
AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
CC=$_SAVE_CC
@@ -298,7 +302,7 @@
;;
esac
- AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", :)
+ CC="${target_alias}-gcc"
unset ac_cv_prog_CC
AC_PROG_CC
AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
@@ -328,37 +332,6 @@
dnl able to run ppc code in a translated environment, making a cross
dnl compiler appear native. So we override that here.
cross_compiling=yes
-else
- AC_PROG_CC
- AC_PROG_CXX
- AC_PROG_RANLIB
- MOZ_PATH_PROGS(AS, $AS as, $CC)
- AC_CHECK_PROGS(AR, ar, :)
- AC_CHECK_PROGS(LD, ld, :)
- AC_CHECK_PROGS(STRIP, strip, :)
- AC_CHECK_PROGS(WINDRES, windres, :)
- if test -z "$HOST_CC"; then
- HOST_CC="$CC"
- fi
- if test -z "$HOST_CFLAGS"; then
- HOST_CFLAGS="$CFLAGS"
- fi
- if test -z "$HOST_CXX"; then
- HOST_CXX="$CXX"
- fi
- if test -z "$HOST_CXXFLAGS"; then
- HOST_CXXFLAGS="$CXXFLAGS"
- fi
- if test -z "$HOST_LDFLAGS"; then
- HOST_LDFLAGS="$LDFLAGS"
- fi
- if test -z "$HOST_RANLIB"; then
- HOST_RANLIB="$RANLIB"
- fi
- if test -z "$HOST_AR"; then
- HOST_AR="$AR"
- fi
-fi
GNU_AS=
GNU_LD=
@@ -1424,6 +1397,8 @@
fi # GNU_CC
fi # COMPILE_ENVIRONMENT
+ac_cv_static_assertion_macros_work=yes
+
dnl =================================================================
dnl Set up and test static assertion macros used to avoid AC_TRY_RUN,
dnl which is bad when cross compiling.
@@ -2579,9 +2554,13 @@
AC_LANG_C
AC_HEADER_STDC
AC_C_CONST
+ac_cv_type_mode_t=yes
AC_TYPE_MODE_T
+ac_cv_type_off_t=yes
AC_TYPE_OFF_T
+ac_cv_type_pid_t=yes
AC_TYPE_PID_T
+ac_cv_type_size_t=yes
AC_TYPE_SIZE_T
AC_STRUCT_ST_BLKSIZE
AC_MSG_CHECKING(for siginfo_t)
@@ -2606,7 +2585,8 @@
AC_CHECK_HEADER(stdint.h)
if test "$ac_cv_header_stdint_h" = yes; then
- AC_DEFINE(JS_HAVE_STDINT_H)
+ AC_DEFINE(JS_HAVE_STDINT_H, 1, [have stdint.h])
+ AC_DEFINE(HAVE_STDINT_H)
else
dnl We'll figure them out for ourselves. List more likely types
dnl earlier. If we ever really encounter a size for which none of
@@ -3004,10 +2984,7 @@
;;
*)
AC_CHECK_LIB(m, atan)
- AC_CHECK_LIB(dl, dlopen,
- AC_CHECK_HEADER(dlfcn.h,
- LIBS="-ldl $LIBS"
- AC_DEFINE(HAVE_LIBDL)))
+ AC_CHECK_LIB(dl, dlopen, AC_DEFINE(HAVE_LIBDL))
;;
esac
@@ -3903,6 +3880,7 @@
[ --with-nspr-libs=LIBS Pass LIBS to LD when linking code that uses NSPR.
See --with-nspr-cflags for more details.],
NSPR_LIBS=$withval)
+$NSPR_LIBS="$NSPR_LIBS -L$(LIBXUL_DIST)/sdk/lib"
AC_SUBST(NSPR_CFLAGS)
AC_SUBST(NSPR_LIBS)
@@ -4512,18 +4490,11 @@
# Demangle only for debug or trace-malloc builds
MOZ_DEMANGLE_SYMBOLS=
-if test "$HAVE_DEMANGLE" -a "$HAVE_GCC3_ABI" && test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC"; then
- MOZ_DEMANGLE_SYMBOLS=1
- AC_DEFINE(MOZ_DEMANGLE_SYMBOLS)
-fi
AC_SUBST(MOZ_DEMANGLE_SYMBOLS)
dnl ========================================================
dnl = Support for gcc stack unwinding (from gcc 3.3)
dnl ========================================================
-if test "$HAVE_GCC3_ABI" && test -z "$SKIP_LIBRARY_CHECKS"; then
- AC_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
-fi
dnl ========================================================
dnl =
@@ -5231,6 +5202,8 @@
done
AC_SUBST(LIBS_PATH)
+
+
dnl ========================================================
dnl JavaScript shell
dnl ========================================================
@@ -5371,3 +5344,4 @@
# 'js-config' in Makefile.in.
AC_MSG_RESULT(invoking make to create js-config script)
$MAKE js-config
+
Index: offscreen/nsprpub/configure.in
===================================================================
--- offscreen.orig/nsprpub/configure.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/nsprpub/configure.in 2009-06-12 14:15:55.000000000 +0100
@@ -42,7 +42,6 @@
AC_PREREQ(2.12)
AC_INIT(config/libc_r.h)
-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
AC_CANONICAL_SYSTEM
dnl ========================================================
@@ -396,7 +395,7 @@
dnl ========================================================
dnl Checks for compilers.
dnl ========================================================
-if test "$target" != "$host"; then
+
echo "cross compiling from $host to $target"
cross_compiling=yes
@@ -423,7 +422,7 @@
AC_MSG_CHECKING([whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
AC_TRY_COMPILE([], [return(0);],
- [ac_cv_prog_host_cc_works=1 AC_MSG_RESULT([yes])],
+ [ac_cv_prog_host_cc_works=1; AC_MSG_RESULT([yes])],
AC_MSG_ERROR([installation or configuration problem: $host compiler $HOST_CC cannot create executables.]) )
CC=$_SAVE_CC
@@ -444,7 +443,7 @@
;;
esac
- AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", echo)
+ CC="${target_alias}-gcc"
unset ac_cv_prog_CC
AC_PROG_CC
if test -n "$USE_CPLUS"; then
@@ -470,30 +469,6 @@
AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", echo)
AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", echo)
-else
- AC_PROG_CC
- if test -n "$USE_CPLUS"; then
- if test "$CC" = "cl" -a -z "$CXX"; then
- CXX=$CC
- else
- AC_PROG_CXX
- fi
- fi
- AC_PROG_CPP
- AC_PROG_RANLIB
- AC_PATH_PROGS(AS, as, $CC)
- AC_PATH_PROGS(AR, ar, echo not_ar)
- AC_PATH_PROGS(LD, ld link, echo not_ld)
- AC_PATH_PROGS(STRIP, strip, echo not_strip)
- AC_PATH_PROGS(WINDRES, windres, echo not_windres)
- if test -z "$HOST_CC"; then
- HOST_CC="$CC"
- fi
- if test -z "$HOST_CFLAGS"; then
- HOST_CFLAGS="$CFLAGS"
- fi
-fi
-
if test "$GCC" = "yes"; then
GNU_CC=1
fi
@@ -514,11 +489,8 @@
;;
esac
-if test "$cross_compiling" = "yes"; then
+
CROSS_COMPILE=1
-else
- CROSS_COMPILE=
-fi
dnl ========================================================
dnl Check for gcc -pipe support
@@ -2283,10 +2255,7 @@
*-darwin*|*-beos*)
;;
*)
- AC_CHECK_LIB(dl, dlopen,
- AC_CHECK_HEADER(dlfcn.h,
- OS_LIBS="-ldl $OS_LIBS"))
- ;;
+ AC_CHECK_LIB(dl, dlopen)
esac
@@ -2904,6 +2873,8 @@
dnl pr/tests/w16gui/Makefile
dnl tools/Makefile
+m4_pattern_allow(AS_BIN)
+
if test -z "$USE_PTHREADS" && test -z "$USE_BTHREADS"; then
MAKEFILES="$MAKEFILES pr/src/threads/combined/Makefile"
elif test -n "$USE_PTHREADS"; then
@@ -2919,3 +2890,5 @@
echo $MAKEFILES > unallmakefiles
AC_OUTPUT([$MAKEFILES], [chmod +x config/nspr-config])
+
+
Index: offscreen/js/src/Makefile.in
===================================================================
--- offscreen.orig/js/src/Makefile.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/js/src/Makefile.in 2009-06-12 14:15:55.000000000 +0100
@@ -514,20 +514,8 @@
export:: jsautocfg.h
-ifeq (,$(CROSS_COMPILE)$(GNU_CC)$(filter-out WINNT,$(OS_ARCH)))
jsautocfg.h:
touch $@
-else
-ifeq ($(OS_ARCH),WINCE)
-jsautocfg.h:
- touch $@
-else
-jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX)
- @rm -f $@ jsautocfg.tmp
- ./jscpucfg > jsautocfg.tmp
- mv jsautocfg.tmp $@
-endif
-endif
# jscpucfg is a strange target
# Needs to be built with the host compiler but needs to include
@@ -557,7 +545,7 @@
echo no need to build jscpucfg $<
else
jscpucfg$(HOST_BIN_SUFFIX): jscpucfg.cpp Makefile.in
- $(HOST_CXX) $(HOST_CXXFLAGS) $(JSCPUCFG_DEFINES) $(DEFINES) $(NSPR_CFLAGS) $(HOST_OUTOPTION)$@ $<
+ $(HOST_CXX) $(HOST_CXXFLAGS) $(JSCPUCFG_DEFINES) $(DEFINES) -I$(DIST)/sdk/include $(NSPR_CFLAGS) $(HOST_OUTOPTION)$@ $<
endif
endif
Index: offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp
===================================================================
--- offscreen.orig/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-06-12 14:15:55.000000000 +0100
@@ -47,6 +47,8 @@
#include <stdarg.h>
+#include "mozilla-config.h"
+
#include "prlog.h"
#include "nsCOMPtr.h"
Index: offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
===================================================================
--- offscreen.orig/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-06-12 14:15:55.000000000 +0100
@@ -39,6 +39,8 @@
*
* ***** END LICENSE BLOCK ***** */
+#include "mozilla-config.h"
+
#if !defined(XPCONNECT_STANDALONE) && !defined(NO_SUBSCRIPT_LOADER)
#include "mozJSSubScriptLoader.h"
Index: offscreen/modules/lcms/include/icc34.h
===================================================================
--- offscreen.orig/modules/lcms/include/icc34.h 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/modules/lcms/include/icc34.h 2009-06-12 14:15:55.000000000 +0100
@@ -144,7 +144,7 @@
*/
-#ifdef PACKAGE_NAME
+#if 0
/*
June 9, 2003, Adapted for use with configure by Bob Friesenhahn
Added the stupid check for autoconf by Marti Maria.
Index: offscreen/toolkit/mozapps/update/src/updater/Makefile.in
===================================================================
--- offscreen.orig/toolkit/mozapps/update/src/updater/Makefile.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/toolkit/mozapps/update/src/updater/Makefile.in 2009-06-12 14:15:55.000000000 +0100
@@ -60,7 +60,7 @@
LIBS += \
$(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
- $(BZ2_LIBS) \
+ $(BZ2_LIBS) -lpthread \
$(NULL)
ifeq ($(OS_ARCH),WINNT)
Index: offscreen/xpcom/sample/program/Makefile.in
===================================================================
--- offscreen.orig/xpcom/sample/program/Makefile.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/xpcom/sample/program/Makefile.in 2009-06-12 14:15:55.000000000 +0100
@@ -57,7 +57,7 @@
# that the application be linked against the XPCOM dynamic library or the NSPR
# dynamic libraries.
LIBS = \
- $(XPCOM_STANDALONE_GLUE_LDOPTS) \
+ $(XPCOM_STANDALONE_GLUE_LDOPTS) -ldl \
$(NULL)
# Need to link with CoreFoundation on Mac
Index: offscreen/xpcom/tools/registry/Makefile.in
===================================================================
--- offscreen.orig/xpcom/tools/registry/Makefile.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/xpcom/tools/registry/Makefile.in 2009-06-12 14:15:55.000000000 +0100
@@ -54,7 +54,7 @@
SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
LIBS = \
- $(XPCOM_STANDALONE_GLUE_LDOPTS) \
+ $(XPCOM_STANDALONE_GLUE_LDOPTS) -ldl \
$(NULL)
# Need to link with CoreFoundation on Mac
Index: offscreen/xulrunner/app/Makefile.in
===================================================================
--- offscreen.orig/xulrunner/app/Makefile.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/xulrunner/app/Makefile.in 2009-06-12 14:15:55.000000000 +0100
@@ -184,7 +184,7 @@
RCFLAGS += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
endif
-LIBS += $(JEMALLOC_LIBS)
+LIBS += $(JEMALLOC_LIBS) -lpthread -ldl
include $(topsrcdir)/config/rules.mk
Index: offscreen/xulrunner/stub/Makefile.in
===================================================================
--- offscreen.orig/xulrunner/stub/Makefile.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/xulrunner/stub/Makefile.in 2009-06-12 14:15:55.000000000 +0100
@@ -101,7 +101,7 @@
endif
endif
-LIBS += $(JEMALLOC_LIBS)
+LIBS += $(JEMALLOC_LIBS) -lpthread -ldl
include $(topsrcdir)/config/rules.mk
Index: offscreen/modules/plugin/test/testplugin/Makefile.in
===================================================================
--- offscreen.orig/modules/plugin/test/testplugin/Makefile.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/modules/plugin/test/testplugin/Makefile.in 2009-06-12 14:15:55.000000000 +0100
@@ -63,9 +63,7 @@
CMMSRCS = nptest_macosx.mm
endif
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
CPPSRCS += nptest_gtk2.cpp
-endif
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
CPPSRCS += nptest_os2.cpp
Index: offscreen/js/src/aclocal.m4
===================================================================
--- offscreen.orig/js/src/aclocal.m4 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/js/src/aclocal.m4 2009-06-12 14:15:55.000000000 +0100
@@ -9,4 +9,3 @@
builtin(include, build/autoconf/moznbytetype.m4)dnl
builtin(include, build/autoconf/mozprog.m4)dnl
-MOZ_PROG_CHECKMSYS()
Index: offscreen/toolkit/toolkit-makefiles.sh
===================================================================
--- offscreen.orig/toolkit/toolkit-makefiles.sh 2009-06-12 14:19:59.000000000 +0100
+++ offscreen/toolkit/toolkit-makefiles.sh 2009-06-12 14:20:09.000000000 +0100
@@ -342,7 +342,6 @@
modules/plugin/sdk/samples/Makefile
modules/plugin/sdk/samples/common/Makefile
modules/plugin/sdk/samples/basic/windows/Makefile
- modules/plugin/sdk/samples/basic/unix/Makefile
modules/plugin/sdk/samples/winless/windows/Makefile
"
meta/packages/mozilla-headless/mozilla-headless/configurefix.patch
-774
View File
@@ -1,774 +0,0 @@
Index: offscreen/configure.in
===================================================================
--- offscreen.orig/configure.in 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/configure.in 2009-12-09 13:38:51.000000000 +0000
@@ -64,7 +64,6 @@
AC_PREREQ(2.13)
AC_INIT(config/config.mk)
-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
AC_CANONICAL_SYSTEM
TARGET_CPU="${target_cpu}"
TARGET_VENDOR="${target_vendor}"
@@ -106,7 +105,6 @@
_SUBDIR_HOST_CFLAGS="$HOST_CFLAGS"
_SUBDIR_HOST_CXXFLAGS="$HOST_CXXFLAGS"
_SUBDIR_HOST_LDFLAGS="$HOST_LDFLAGS"
-_SUBDIR_CONFIG_ARGS="$ac_configure_args"
dnl Set the version number of the libs included with mozilla
dnl ========================================================
@@ -139,6 +137,9 @@
MSMANIFEST_TOOL=
+ac_cv_have_usable_wchar_v2=no
+ac_cv_have_usable_wchar_option_v2=no
+
dnl Set various checks
dnl ========================================================
MISSING_X=
@@ -308,7 +309,7 @@
;;
esac
-if test -n "$CROSS_COMPILE" && test "$target" != "$host"; then
+
echo "cross compiling from $host to $target"
cross_compiling=yes
@@ -346,7 +347,7 @@
AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
AC_TRY_COMPILE([], [return(0);],
- [ac_cv_prog_hostcc_works=1 AC_MSG_RESULT([yes])],
+ [ac_cv_prog_hostcc_works=1; AC_MSG_RESULT([yes])],
AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
CC="$HOST_CXX"
@@ -354,7 +355,7 @@
AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
AC_TRY_COMPILE([], [return(0);],
- [ac_cv_prog_hostcxx_works=1 AC_MSG_RESULT([yes])],
+ [ac_cv_prog_hostcxx_works=1; AC_MSG_RESULT([yes])],
AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
CC=$_SAVE_CC
@@ -375,7 +376,7 @@
;;
esac
- AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", :)
+ CC="${target_alias}-gcc"
unset ac_cv_prog_CC
AC_PROG_CC
AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
@@ -399,37 +400,6 @@
AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", :)
AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", :)
AC_DEFINE(CROSS_COMPILE)
-else
- AC_PROG_CC
- AC_PROG_CXX
- AC_PROG_RANLIB
- MOZ_PATH_PROGS(AS, $AS as, $CC)
- AC_CHECK_PROGS(AR, ar, :)
- AC_CHECK_PROGS(LD, ld, :)
- AC_CHECK_PROGS(STRIP, strip, :)
- AC_CHECK_PROGS(WINDRES, windres, :)
- if test -z "$HOST_CC"; then
- HOST_CC="$CC"
- fi
- if test -z "$HOST_CFLAGS"; then
- HOST_CFLAGS="$CFLAGS"
- fi
- if test -z "$HOST_CXX"; then
- HOST_CXX="$CXX"
- fi
- if test -z "$HOST_CXXFLAGS"; then
- HOST_CXXFLAGS="$CXXFLAGS"
- fi
- if test -z "$HOST_LDFLAGS"; then
- HOST_LDFLAGS="$LDFLAGS"
- fi
- if test -z "$HOST_RANLIB"; then
- HOST_RANLIB="$RANLIB"
- fi
- if test -z "$HOST_AR"; then
- HOST_AR="$AR"
- fi
-fi
GNU_AS=
GNU_LD=
@@ -1586,6 +1556,7 @@
'
dnl test that the macros actually work:
+ac_cv_static_assertion_macros_work="yes"
AC_MSG_CHECKING(that static assertion macros used in autoconf tests work)
AC_CACHE_VAL(ac_cv_static_assertion_macros_work,
[AC_LANG_SAVE
@@ -2770,9 +2741,13 @@
AC_LANG_C
AC_HEADER_STDC
AC_C_CONST
+ac_cv_type_mode_t=yes
AC_TYPE_MODE_T
+ac_cv_type_off_t=yes
AC_TYPE_OFF_T
+ac_cv_type_pid_t=yes
AC_TYPE_PID_T
+ac_cv_type_size_t=yes
AC_TYPE_SIZE_T
AC_STRUCT_ST_BLKSIZE
AC_MSG_CHECKING(for siginfo_t)
@@ -3174,21 +3149,9 @@
dnl We don't want to link against libm or libpthread on Darwin since
dnl they both are just symlinks to libSystem and explicitly linking
dnl against libSystem causes issues when debugging (see bug 299601).
-case $target in
-*-darwin*)
- ;;
-*-beos*)
- ;;
-*-os2*)
- ;;
-*)
AC_CHECK_LIB(m, atan)
AC_CHECK_LIB(dl, dlopen,
- AC_CHECK_HEADER(dlfcn.h,
- LIBS="-ldl $LIBS"
- AC_DEFINE(HAVE_LIBDL)))
- ;;
-esac
+ AC_DEFINE(HAVE_LIBDL))
_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -D_GNU_SOURCE"
@@ -6889,18 +6852,13 @@
# Demangle only for debug or trace-malloc builds
MOZ_DEMANGLE_SYMBOLS=
-if test "$HAVE_DEMANGLE" -a "$HAVE_GCC3_ABI" && test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC"; then
- MOZ_DEMANGLE_SYMBOLS=1
- AC_DEFINE(MOZ_DEMANGLE_SYMBOLS)
-fi
+
AC_SUBST(MOZ_DEMANGLE_SYMBOLS)
dnl ========================================================
dnl = Support for gcc stack unwinding (from gcc 3.3)
dnl ========================================================
-if test "$HAVE_GCC3_ABI" && test -z "$SKIP_LIBRARY_CHECKS"; then
- AC_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
-fi
+
dnl ========================================================
dnl =
@@ -7420,10 +7378,7 @@
dnl if no gtk/libIDL1 or gtk2/libIDL2 combination was found, fall back
dnl to either libIDL1 or libIDL2.
if test -z "$_LIBIDL_FOUND"; then
- AM_PATH_LIBIDL($LIBIDL_VERSION,_LIBIDL_FOUND=1)
- if test -z "$_LIBIDL_FOUND"; then
PKG_CHECK_MODULES(LIBIDL, libIDL-2.0 >= 0.8.0,_LIBIDL_FOUND=1)
- fi
fi
dnl
dnl If we don't have a libIDL config program & not cross-compiling,
@@ -7495,13 +7450,7 @@
fi
if test -z "$SKIP_PATH_CHECKS"; then
-if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then
- if test "$MOZ_ENABLE_GTK2" || test "$USE_ELF_DYNSTR_GC" || test "$MOZ_ENABLE_HEADLESS"; then
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3.7 gobject-2.0)
- else
- AM_PATH_GLIB(${GLIB_VERSION})
- fi
-fi
fi
if test -z "${GLIB_GMODULE_LIBS}" -a -n "${GLIB_CONFIG}"; then
@@ -8278,10 +8227,7 @@
HAVE_WCRTOMB
"
-AC_CONFIG_HEADER(
-netwerk/necko-config.h
-xpcom/xpcom-config.h
-xpcom/xpcom-private.h
+AC_CONFIG_HEADER(netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h
)
# Save the defines header file before autoconf removes it.
@@ -8340,31 +8286,11 @@
dnl To add new Makefiles, edit allmakefiles.sh.
dnl allmakefiles.sh sets the variable, MAKEFILES.
. ${srcdir}/allmakefiles.sh
-dnl
-dnl Run a perl script to quickly create the makefiles.
-dnl If it succeeds, it outputs a shell command to set CONFIG_FILES
-dnl for the files it cannot handle correctly. This way, config.status
-dnl will handle these files.
-dnl If it fails, nothing is set and config.status will run as usual.
-dnl
-dnl This does not change the $MAKEFILES variable.
-dnl
-dnl OpenVMS gets a line overflow on the long eval command, so use a temp file.
-dnl
-if test -z "${AS_PERL}"; then
-echo $MAKEFILES | ${PERL} $srcdir/build/autoconf/acoutput-fast.pl > conftest.sh
-else
-echo $MAKEFILES | ${PERL} $srcdir/build/autoconf/acoutput-fast.pl -nowrap --cygwin-srcdir=$srcdir > conftest.sh
-fi
-. ./conftest.sh
-rm conftest.sh
echo $MAKEFILES > unallmakefiles
mv -f config/autoconf.mk config/autoconf.mk.orig 2> /dev/null
-AC_OUTPUT($MAKEFILES)
-
dnl Prevent the regeneration of cairo-features.h forcing rebuilds of gfx stuff
if test "$CAIRO_FEATURES_H"; then
if cmp -s $CAIRO_FEATURES_H "$CAIRO_FEATURES_H".orig; then
@@ -8390,14 +8316,14 @@
HOST_LDFLAGS="$_SUBDIR_HOST_LDFLAGS"
RC=
-unset MAKEFILES
-unset CONFIG_FILES
+#unset MAKEFILES
+#unset CONFIG_FILES
# No need to run subconfigures when building with LIBXUL_SDK_DIR
if test "$COMPILE_ENVIRONMENT" -a -z "$LIBXUL_SDK_DIR"; then
if test -z "$MOZ_NATIVE_NSPR"; then
- ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
+ ac_configure_args="$ac_configure_args --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
if test -z "$MOZ_DEBUG"; then
ac_configure_args="$ac_configure_args --disable-debug"
fi
@@ -8413,8 +8339,7 @@
if test -n "$USE_ARM_KUSER"; then
ac_configure_args="$ac_configure_args --with-arm-kuser"
fi
- AC_OUTPUT_SUBDIRS(nsprpub)
- ac_configure_args="$_SUBDIR_CONFIG_ARGS"
+ AC_CONFIG_SUBDIRS(nsprpub)
fi
if test -z "$MOZ_NATIVE_NSPR"; then
@@ -8431,7 +8356,6 @@
# Run the SpiderMonkey 'configure' script.
dist=$MOZ_BUILD_ROOT/dist
-ac_configure_args="$_SUBDIR_CONFIG_ARGS"
ac_configure_args="$ac_configure_args --enable-threadsafe"
if test -z "$MOZ_NATIVE_NSPR"; then
ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'"
@@ -8448,8 +8372,7 @@
export MOZ_MEMORY_LDFLAGS
fi
fi
-AC_OUTPUT_SUBDIRS(js/src)
-ac_configure_args="$_SUBDIR_CONFIG_ARGS"
+AC_CONFIG_SUBDIRS(js/src)
# Build jsctypes on the platforms we can.
if test "$BUILD_CTYPES"; then
@@ -8465,20 +8388,14 @@
if test -n "$CROSS_COMPILE"; then
ac_configure_args="$ac_configure_args --build=$build --host=$target"
fi
- if test "$SOLARIS_SUNPRO_CC"; then
- # Always use gcc for libffi on Solaris
- old_cache_file=$cache_file
- cache_file=js/ctypes/libffi/config.cache
- ac_configure_args="$ac_configure_args CC=gcc"
- AC_OUTPUT_SUBDIRS(js/ctypes/libffi)
- cache_file=$old_cache_file
- else
- AC_OUTPUT_SUBDIRS(js/ctypes/libffi)
- fi
- ac_configure_args="$_SUBDIR_CONFIG_ARGS"
+ AC_CONFIG_SUBDIRS(js/ctypes/libffi)
fi
fi
+m4_pattern_allow(AS_BIN)
+
+AC_OUTPUT($MAKEFILES)
+
fi # COMPILE_ENVIRONMENT && !LIBXUL_SDK_DIR
dnl Prevent the regeneration of autoconf.mk forcing rebuilds of the world
Index: offscreen/js/src/configure.in
===================================================================
--- offscreen.orig/js/src/configure.in 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/js/src/configure.in 2009-12-09 13:38:51.000000000 +0000
@@ -62,7 +62,6 @@
AC_PREREQ(2.13)
AC_INIT(jsapi.h)
-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
AC_CONFIG_HEADER(js-config.h)
AC_CANONICAL_SYSTEM
TARGET_CPU="${target_cpu}"
@@ -101,6 +100,9 @@
_SUBDIR_HOST_LDFLAGS="$HOST_LDFLAGS"
_SUBDIR_CONFIG_ARGS="$ac_configure_args"
+ac_cv_have_usable_wchar_v2=no
+ac_cv_have_usable_wchar_option_v2=no
+
dnl Set the version number of the libs included with mozilla
dnl ========================================================
NSPR_VERSION=4
@@ -113,6 +115,8 @@
MSMANIFEST_TOOL=
+m4_pattern_allow(AS_BIN)
+
dnl Set various checks
dnl ========================================================
MISSING_X=
@@ -212,7 +216,7 @@
if test "$COMPILE_ENVIRONMENT"; then
-if test "$target" != "$host"; then
+
echo "cross compiling from $host to $target"
_SAVE_CC="$CC"
@@ -249,7 +253,7 @@
AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
AC_TRY_COMPILE([], [return(0);],
- [ac_cv_prog_hostcc_works=1 AC_MSG_RESULT([yes])],
+ [ac_cv_prog_hostcc_works=1; AC_MSG_RESULT([yes])],
AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
CC="$HOST_CXX"
@@ -257,7 +261,7 @@
AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
AC_TRY_COMPILE([], [return(0);],
- [ac_cv_prog_hostcxx_works=1 AC_MSG_RESULT([yes])],
+ [ac_cv_prog_hostcxx_works=1; AC_MSG_RESULT([yes])],
AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
CC=$_SAVE_CC
@@ -312,7 +316,7 @@
;;
esac
- AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", :)
+ CC="${target_alias}-gcc"
unset ac_cv_prog_CC
AC_PROG_CC
AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
@@ -342,37 +346,6 @@
dnl able to run ppc code in a translated environment, making a cross
dnl compiler appear native. So we override that here.
cross_compiling=yes
-else
- AC_PROG_CC
- AC_PROG_CXX
- AC_PROG_RANLIB
- MOZ_PATH_PROGS(AS, $AS as, $CC)
- AC_CHECK_PROGS(AR, ar, :)
- AC_CHECK_PROGS(LD, ld, :)
- AC_CHECK_PROGS(STRIP, strip, :)
- AC_CHECK_PROGS(WINDRES, windres, :)
- if test -z "$HOST_CC"; then
- HOST_CC="$CC"
- fi
- if test -z "$HOST_CFLAGS"; then
- HOST_CFLAGS="$CFLAGS"
- fi
- if test -z "$HOST_CXX"; then
- HOST_CXX="$CXX"
- fi
- if test -z "$HOST_CXXFLAGS"; then
- HOST_CXXFLAGS="$CXXFLAGS"
- fi
- if test -z "$HOST_LDFLAGS"; then
- HOST_LDFLAGS="$LDFLAGS"
- fi
- if test -z "$HOST_RANLIB"; then
- HOST_RANLIB="$RANLIB"
- fi
- if test -z "$HOST_AR"; then
- HOST_AR="$AR"
- fi
-fi
GNU_AS=
GNU_LD=
@@ -1370,6 +1343,8 @@
fi # GNU_CC
fi # COMPILE_ENVIRONMENT
+ac_cv_static_assertion_macros_work=yes
+
dnl =================================================================
dnl Set up and test static assertion macros used to avoid AC_TRY_RUN,
dnl which is bad when cross compiling.
@@ -2557,9 +2532,13 @@
AC_LANG_C
AC_HEADER_STDC
AC_C_CONST
+ac_cv_type_mode_t=yes
AC_TYPE_MODE_T
+ac_cv_type_off_t=yes
AC_TYPE_OFF_T
+ac_cv_type_pid_t=yes
AC_TYPE_PID_T
+ac_cv_type_size_t=yes
AC_TYPE_SIZE_T
AC_STRUCT_ST_BLKSIZE
AC_MSG_CHECKING(for siginfo_t)
@@ -2584,7 +2563,8 @@
AC_CHECK_HEADER(stdint.h)
if test "$ac_cv_header_stdint_h" = yes; then
- AC_DEFINE(JS_HAVE_STDINT_H)
+ AC_DEFINE(JS_HAVE_STDINT_H, 1, [have stdint.h])
+ AC_DEFINE(HAVE_STDINT_H)
else
dnl We'll figure them out for ourselves. List more likely types
dnl earlier. If we ever really encounter a size for which none of
@@ -2938,10 +2918,7 @@
;;
*)
AC_CHECK_LIB(m, atan)
- AC_CHECK_LIB(dl, dlopen,
- AC_CHECK_HEADER(dlfcn.h,
- LIBS="-ldl $LIBS"
- AC_DEFINE(HAVE_LIBDL)))
+ AC_CHECK_LIB(dl, dlopen, AC_DEFINE(HAVE_LIBDL))
;;
esac
@@ -3847,6 +3824,7 @@
[ --with-nspr-libs=LIBS Pass LIBS to LD when linking code that uses NSPR.
See --with-nspr-cflags for more details.],
NSPR_LIBS=$withval)
+$NSPR_LIBS="$NSPR_LIBS -L$(LIBXUL_DIST)/sdk/lib"
AC_SUBST(NSPR_CFLAGS)
AC_SUBST(NSPR_LIBS)
@@ -4386,18 +4364,11 @@
# Demangle only for debug or trace-malloc builds
MOZ_DEMANGLE_SYMBOLS=
-if test "$HAVE_DEMANGLE" -a "$HAVE_GCC3_ABI" && test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC"; then
- MOZ_DEMANGLE_SYMBOLS=1
- AC_DEFINE(MOZ_DEMANGLE_SYMBOLS)
-fi
AC_SUBST(MOZ_DEMANGLE_SYMBOLS)
dnl ========================================================
dnl = Support for gcc stack unwinding (from gcc 3.3)
dnl ========================================================
-if test "$HAVE_GCC3_ABI" && test -z "$SKIP_LIBRARY_CHECKS"; then
- AC_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
-fi
dnl ========================================================
dnl =
@@ -5097,6 +5068,8 @@
AC_HAVE_FUNCS(setlocale)
+
+
dnl ========================================================
dnl Use cygwin wrapper for win32 builds, except MSYS/MinGW
dnl ========================================================
@@ -5234,3 +5207,4 @@
# 'js-config' in Makefile.in.
AC_MSG_RESULT(invoking make to create js-config script)
$MAKE js-config
+
Index: offscreen/nsprpub/configure.in
===================================================================
--- offscreen.orig/nsprpub/configure.in 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/nsprpub/configure.in 2009-12-09 13:10:12.000000000 +0000
@@ -42,7 +42,6 @@
AC_PREREQ(2.12)
AC_INIT(config/libc_r.h)
-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
AC_CANONICAL_SYSTEM
dnl ========================================================
@@ -396,7 +395,7 @@
dnl ========================================================
dnl Checks for compilers.
dnl ========================================================
-if test "$target" != "$host"; then
+
echo "cross compiling from $host to $target"
cross_compiling=yes
@@ -423,7 +422,7 @@
AC_MSG_CHECKING([whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
AC_TRY_COMPILE([], [return(0);],
- [ac_cv_prog_host_cc_works=1 AC_MSG_RESULT([yes])],
+ [ac_cv_prog_host_cc_works=1; AC_MSG_RESULT([yes])],
AC_MSG_ERROR([installation or configuration problem: $host compiler $HOST_CC cannot create executables.]) )
CC=$_SAVE_CC
@@ -444,7 +443,7 @@
;;
esac
- AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", echo)
+ CC="${target_alias}-gcc"
unset ac_cv_prog_CC
AC_PROG_CC
if test -n "$USE_CPLUS"; then
@@ -470,30 +469,6 @@
AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", echo)
AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", echo)
-else
- AC_PROG_CC
- if test -n "$USE_CPLUS"; then
- if test "$CC" = "cl" -a -z "$CXX"; then
- CXX=$CC
- else
- AC_PROG_CXX
- fi
- fi
- AC_PROG_CPP
- AC_PROG_RANLIB
- AC_PATH_PROGS(AS, as, $CC)
- AC_PATH_PROGS(AR, ar, echo not_ar)
- AC_PATH_PROGS(LD, ld link, echo not_ld)
- AC_PATH_PROGS(STRIP, strip, echo not_strip)
- AC_PATH_PROGS(WINDRES, windres, echo not_windres)
- if test -z "$HOST_CC"; then
- HOST_CC="$CC"
- fi
- if test -z "$HOST_CFLAGS"; then
- HOST_CFLAGS="$CFLAGS"
- fi
-fi
-
if test "$GCC" = "yes"; then
GNU_CC=1
fi
@@ -514,11 +489,8 @@
;;
esac
-if test "$cross_compiling" = "yes"; then
+
CROSS_COMPILE=1
-else
- CROSS_COMPILE=
-fi
dnl ========================================================
dnl Check for gcc -pipe support
@@ -2286,10 +2258,7 @@
*-darwin*|*-beos*|*-os2*)
;;
*)
- AC_CHECK_LIB(dl, dlopen,
- AC_CHECK_HEADER(dlfcn.h,
- OS_LIBS="-ldl $OS_LIBS"))
- ;;
+ AC_CHECK_LIB(dl, dlopen)
esac
@@ -2907,6 +2876,8 @@
dnl pr/tests/w16gui/Makefile
dnl tools/Makefile
+m4_pattern_allow(AS_BIN)
+
if test -z "$USE_PTHREADS" && test -z "$USE_BTHREADS"; then
MAKEFILES="$MAKEFILES pr/src/threads/combined/Makefile"
elif test -n "$USE_PTHREADS"; then
@@ -2922,3 +2893,5 @@
echo $MAKEFILES > unallmakefiles
AC_OUTPUT([$MAKEFILES], [chmod +x config/nspr-config])
+
+
Index: offscreen/js/src/Makefile.in
===================================================================
--- offscreen.orig/js/src/Makefile.in 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/js/src/Makefile.in 2009-12-09 13:10:12.000000000 +0000
@@ -513,20 +513,8 @@
export:: jsautocfg.h
-ifeq (,$(CROSS_COMPILE)$(GNU_CC)$(filter-out WINNT,$(OS_ARCH)))
jsautocfg.h:
touch $@
-else
-ifeq ($(OS_ARCH),WINCE)
-jsautocfg.h:
- touch $@
-else
-jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX)
- @rm -f $@ jsautocfg.tmp
- ./jscpucfg > jsautocfg.tmp
- mv jsautocfg.tmp $@
-endif
-endif
# jscpucfg is a strange target
# Needs to be built with the host compiler but needs to include
@@ -556,7 +544,7 @@
echo no need to build jscpucfg $<
else
jscpucfg$(HOST_BIN_SUFFIX): jscpucfg.cpp Makefile.in
- $(HOST_CXX) $(HOST_CXXFLAGS) $(JSCPUCFG_DEFINES) $(DEFINES) $(NSPR_CFLAGS) $(HOST_OUTOPTION)$@ $<
+ $(HOST_CXX) $(HOST_CXXFLAGS) $(JSCPUCFG_DEFINES) $(DEFINES) -I$(DIST)/sdk/include $(NSPR_CFLAGS) $(HOST_OUTOPTION)$@ $<
endif
endif
Index: offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp
===================================================================
--- offscreen.orig/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-12-09 13:10:12.000000000 +0000
@@ -47,6 +47,8 @@
#include <stdarg.h>
+#include "mozilla-config.h"
+
#include "prlog.h"
#include "nsCOMPtr.h"
Index: offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
===================================================================
--- offscreen.orig/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-12-09 13:10:12.000000000 +0000
@@ -39,6 +39,8 @@
*
* ***** END LICENSE BLOCK ***** */
+#include "mozilla-config.h"
+
#if !defined(XPCONNECT_STANDALONE) && !defined(NO_SUBSCRIPT_LOADER)
#include "mozJSSubScriptLoader.h"
Index: offscreen/toolkit/mozapps/update/src/updater/Makefile.in
===================================================================
--- offscreen.orig/toolkit/mozapps/update/src/updater/Makefile.in 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/toolkit/mozapps/update/src/updater/Makefile.in 2009-12-09 13:10:12.000000000 +0000
@@ -56,7 +56,7 @@
LIBS += \
$(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
- $(BZ2_LIBS) \
+ $(BZ2_LIBS) -lpthread \
$(NULL)
ifeq ($(OS_ARCH),WINNT)
Index: offscreen/xpcom/sample/program/Makefile.in
===================================================================
--- offscreen.orig/xpcom/sample/program/Makefile.in 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/xpcom/sample/program/Makefile.in 2009-12-09 13:10:12.000000000 +0000
@@ -57,7 +57,7 @@
# that the application be linked against the XPCOM dynamic library or the NSPR
# dynamic libraries.
LIBS = \
- $(XPCOM_STANDALONE_GLUE_LDOPTS) \
+ $(XPCOM_STANDALONE_GLUE_LDOPTS) -ldl \
$(NULL)
# Need to link with CoreFoundation on Mac
Index: offscreen/xpcom/tools/registry/Makefile.in
===================================================================
--- offscreen.orig/xpcom/tools/registry/Makefile.in 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/xpcom/tools/registry/Makefile.in 2009-12-09 13:10:12.000000000 +0000
@@ -54,7 +54,7 @@
SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
LIBS = \
- $(XPCOM_STANDALONE_GLUE_LDOPTS) \
+ $(XPCOM_STANDALONE_GLUE_LDOPTS) -ldl \
$(NULL)
# Need to link with CoreFoundation on Mac
Index: offscreen/xulrunner/app/Makefile.in
===================================================================
--- offscreen.orig/xulrunner/app/Makefile.in 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/xulrunner/app/Makefile.in 2009-12-09 13:10:12.000000000 +0000
@@ -173,7 +173,7 @@
RCFLAGS += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
endif
-LIBS += $(JEMALLOC_LIBS)
+LIBS += $(JEMALLOC_LIBS) -lpthread -ldl
include $(topsrcdir)/config/rules.mk
Index: offscreen/xulrunner/stub/Makefile.in
===================================================================
--- offscreen.orig/xulrunner/stub/Makefile.in 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/xulrunner/stub/Makefile.in 2009-12-09 13:10:12.000000000 +0000
@@ -100,7 +100,7 @@
endif
endif
-LIBS += $(JEMALLOC_LIBS)
+LIBS += $(JEMALLOC_LIBS) -lpthread -ldl
include $(topsrcdir)/config/rules.mk
Index: offscreen/modules/plugin/test/testplugin/Makefile.in
===================================================================
--- offscreen.orig/modules/plugin/test/testplugin/Makefile.in 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/modules/plugin/test/testplugin/Makefile.in 2009-12-09 13:10:12.000000000 +0000
@@ -60,9 +60,7 @@
CMMSRCS = nptest_macosx.mm
endif
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
CPPSRCS += nptest_gtk2.cpp
-endif
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
CPPSRCS += nptest_os2.cpp
Index: offscreen/js/src/aclocal.m4
===================================================================
--- offscreen.orig/js/src/aclocal.m4 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/js/src/aclocal.m4 2009-12-09 13:39:01.000000000 +0000
@@ -8,6 +8,4 @@
builtin(include, build/autoconf/altoptions.m4)dnl
builtin(include, build/autoconf/moznbytetype.m4)dnl
builtin(include, build/autoconf/mozprog.m4)dnl
-builtin(include, build/autoconf/acwinpaths.m4)dnl
-MOZ_PROG_CHECKMSYS()
Index: offscreen/toolkit/toolkit-makefiles.sh
===================================================================
--- offscreen.orig/toolkit/toolkit-makefiles.sh 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/toolkit/toolkit-makefiles.sh 2009-12-09 13:10:12.000000000 +0000
@@ -369,7 +369,6 @@
modules/plugin/sdk/samples/Makefile
modules/plugin/sdk/samples/common/Makefile
modules/plugin/sdk/samples/basic/windows/Makefile
- modules/plugin/sdk/samples/basic/unix/Makefile
modules/plugin/sdk/samples/winless/windows/Makefile
"
meta/packages/mozilla-headless/mozilla-headless/i386/jsautocfg.h
-21
View File
@@ -1,21 +0,0 @@
#ifndef js_cpucfg___
#define js_cpucfg___
/* AUTOMATICALLY GENERATED - DO NOT EDIT */
#define IS_LITTLE_ENDIAN 1
#undef IS_BIG_ENDIAN
#define JS_BYTES_PER_WORD 4L
#define JS_BYTES_PER_DOUBLE 8L
#define JS_BITS_PER_WORD_LOG2 5L
#define JS_ALIGN_OF_POINTER 4L
#define JS_THREADSAFE 1
#define JS_STACK_GROWTH_DIRECTION (-1)
#define JS_HAVE_LONG_LONG
#endif /* js_cpucfg___ */
meta/packages/mozilla-headless/mozilla-headless/i486/jsautocfg.h
-21
View File
@@ -1,21 +0,0 @@
#ifndef js_cpucfg___
#define js_cpucfg___
/* AUTOMATICALLY GENERATED - DO NOT EDIT */
#define IS_LITTLE_ENDIAN 1
#undef IS_BIG_ENDIAN
#define JS_BYTES_PER_WORD 4L
#define JS_BYTES_PER_DOUBLE 8L
#define JS_BITS_PER_WORD_LOG2 5L
#define JS_ALIGN_OF_POINTER 4L
#define JS_THREADSAFE 1
#define JS_STACK_GROWTH_DIRECTION (-1)
#define JS_HAVE_LONG_LONG
#endif /* js_cpucfg___ */
meta/packages/mozilla-headless/mozilla-headless/i586/jsautocfg.h
-21
View File
@@ -1,21 +0,0 @@
#ifndef js_cpucfg___
#define js_cpucfg___
/* AUTOMATICALLY GENERATED - DO NOT EDIT */
#define IS_LITTLE_ENDIAN 1
#undef IS_BIG_ENDIAN
#define JS_BYTES_PER_WORD 4L
#define JS_BYTES_PER_DOUBLE 8L
#define JS_BITS_PER_WORD_LOG2 5L
#define JS_ALIGN_OF_POINTER 4L
#define JS_THREADSAFE 1
#define JS_STACK_GROWTH_DIRECTION (-1)
#define JS_HAVE_LONG_LONG
#endif /* js_cpucfg___ */
meta/packages/mozilla-headless/mozilla-headless/i686/jsautocfg.h
-21
View File
@@ -1,21 +0,0 @@
#ifndef js_cpucfg___
#define js_cpucfg___
/* AUTOMATICALLY GENERATED - DO NOT EDIT */
#define IS_LITTLE_ENDIAN 1
#undef IS_BIG_ENDIAN
#define JS_BYTES_PER_WORD 4L
#define JS_BYTES_PER_DOUBLE 8L
#define JS_BITS_PER_WORD_LOG2 5L
#define JS_ALIGN_OF_POINTER 4L
#define JS_THREADSAFE 1
#define JS_STACK_GROWTH_DIRECTION (-1)
#define JS_HAVE_LONG_LONG
#endif /* js_cpucfg___ */
meta/packages/mozilla-headless/mozilla-headless/mozconfig
-23
View File
@@ -1,23 +0,0 @@
# this line sets the directory for all build output
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj-headless-release
# comment out the previous line and uncomment these two for a debug build
#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj-headless-debug
#ac_add_options --disable-optimize --enable-debug
# this is the line that enables the headless implementation
ac_add_options --enable-default-toolkit=cairo-headless
# comment out the previous line and uncomment these two for a GTK build
#ac_add_options --enable-system-cairo
#ac_add_options --enable-default-toolkit=cairo-gtk2
ac_add_options --disable-tests
ac_add_options --disable-javaxpcom
ac_add_options --enable-application=xulrunner
ac_add_options --enable-pango
ac_add_options --disable-printing
ac_add_options --disable-crashreporter
ac_add_options --enable-plugins
ac_add_options --disable-accessibility
mk_add_options MOZ_CO_PROJECT=xulrunner
meta/packages/mozilla-headless/mozilla-headless/mozilla-jemalloc.patch
-24
View File
@@ -1,24 +0,0 @@
diff -r f1af606531f5 memory/jemalloc/jemalloc.h
--- a/memory/jemalloc/jemalloc.h Sat Nov 22 20:22:22 2008 +0100
+++ b/memory/jemalloc/jemalloc.h Mon Dec 01 16:53:06 2008 -0500
@@ -45,14 +45,14 @@
} jemalloc_stats_t;
#ifndef MOZ_MEMORY_DARWIN
-void *malloc(size_t size);
-void *valloc(size_t size);
-void *calloc(size_t num, size_t size);
-void *realloc(void *ptr, size_t size);
-void free(void *ptr);
+void *malloc(size_t size) __THROW __attribute_malloc__ __wur;
+void *valloc(size_t size) __THROW __attribute_malloc__ __wur;
+void *calloc(size_t num, size_t size) __THROW __attribute_malloc__ __wur;
+void *realloc(void *ptr, size_t size) __THROW __attribute_malloc__ __wur;
+void free(void *ptr) __THROW __attribute_malloc__ __wur;
#endif
-int posix_memalign(void **memptr, size_t alignment, size_t size);
+int posix_memalign(void **memptr, size_t alignment, size_t size) __THROW __attribute_malloc__ __wur;
void *memalign(size_t alignment, size_t size);
size_t malloc_usable_size(const void *ptr);
void jemalloc_stats(jemalloc_stats_t *stats);
meta/packages/mozilla-headless/mozilla-headless/removebadrpath-1a622cb7c384.patch
-26
View File
@@ -1,26 +0,0 @@
Index: offscreen/js/src/configure.in
===================================================================
--- offscreen.orig/js/src/configure.in 2009-06-17 14:31:40.000000000 +0100
+++ offscreen/js/src/configure.in 2009-06-17 14:31:40.000000000 +0100
@@ -880,7 +880,7 @@
HOST_AR_FLAGS='$(AR_FLAGS)'
MOZ_JS_LIBS='-L$(libdir) -lmozjs'
-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib'
+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin'
MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom_compat'
Index: offscreen/configure.in
===================================================================
--- offscreen.orig/configure.in 2009-06-17 15:09:44.000000000 +0100
+++ offscreen/configure.in 2009-06-17 15:10:00.000000000 +0100
@@ -1060,7 +1060,7 @@
MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core'
-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin'
XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom'
LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
meta/packages/mozilla-headless/mozilla-headless/removebadrpath.patch
-44
View File
@@ -1,44 +0,0 @@
Index: offscreen/js/src/configure.in
===================================================================
--- offscreen.orig/js/src/configure.in 2009-12-09 13:38:51.000000000 +0000
+++ offscreen/js/src/configure.in 2009-12-09 14:14:08.000000000 +0000
@@ -858,7 +858,7 @@
HOST_AR_FLAGS='$(AR_FLAGS)'
MOZ_JS_LIBS='-L$(libdir) -lmozjs'
-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib'
+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin'
MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
@@ -3824,7 +3824,7 @@
[ --with-nspr-libs=LIBS Pass LIBS to LD when linking code that uses NSPR.
See --with-nspr-cflags for more details.],
NSPR_LIBS=$withval)
-$NSPR_LIBS="$NSPR_LIBS -L$(LIBXUL_DIST)/sdk/lib"
+NSPR_LIBS="$NSPR_LIBS -L$(LIBXUL_DIST)/sdk/lib"
AC_SUBST(NSPR_CFLAGS)
AC_SUBST(NSPR_LIBS)
Index: offscreen/configure.in
===================================================================
--- offscreen.orig/configure.in 2009-12-09 13:38:51.000000000 +0000
+++ offscreen/configure.in 2009-12-09 14:31:33.000000000 +0000
@@ -1041,7 +1041,7 @@
MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core'
-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin'
XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom'
LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
@@ -8378,7 +8378,7 @@
if test "$BUILD_CTYPES"; then
# Run the libffi 'configure' script on platforms that it supports.
if test -z "$_MSC_VER"; then
- ac_configure_args="--disable-shared --enable-static --disable-raw-api"
+ ac_configure_args="$ac_configure_args --disable-shared --enable-static --disable-raw-api"
if test "$MOZ_DEBUG"; then
ac_configure_args="$ac_configure_args --enable-debug"
fi
meta/packages/mozilla-headless/mozilla-headless_hg.bb
-99
View File
@@ -1,99 +0,0 @@
#file://0001-Adds-initial-Gtk-clipboard-support-to-moz-headless.patch;patch=1 \
SRC_URI = "hg://hg.mozilla.org/incubator;protocol=http;module=offscreen \
file://configurefix-1a622cb7c384.patch;patch=1;rev=1a622cb7c384 \
file://configurefix.patch;patch=1;notrev=1a622cb7c384 \
file://mozilla-jemalloc.patch;patch=1 \
file://removebadrpath-1a622cb7c384.patch;patch=1;rev=1a622cb7c384 \
file://removebadrpath.patch;patch=1;notrev=1a622cb7c384 \
file://buildfixhack.patch;patch=1;notrev=1a622cb7c384 \
file://autoconffix.patch;patch=1 \
file://jsautocfg.h \
file://mozconfig"
PV = "0.2+hg-1.0+${SRCPV}"
PR = "r10"
S = "${WORKDIR}/offscreen"
DEPENDS = "gconf gnome-vfs pango dbus-glib alsa-lib libidl-native sqlite3 libidl"
FILES_${PN} += "${libdir}/xulrunner-${XULVERSION} ${libdir}/xulrunner-devel-${XULVERSION}/sdk/lib/*.so"
FILES_${PN}-dev += "${libdir}/xulrunner-devel-${XULVERSION}"
FILES_${PN}-dbg += "${libdir}/xulrunner-devel-${XULVERSION}/sdk/lib/.debug"
# Mozilla's build rules search for -L paths to find libraries. Its
# not clever enough to know where the sysroot is and hence finds host
# object files which is bad. We therefore tell pkg-config not to hide
# paths. See config/rules.mk and the LIBS_DEPS and _LIBDIRS variables.
export PKG_CONFIG_ALLOW_SYSTEM_LIBS = "1"
TARGET_CC_ARCH = ""
CFLAGS = "${TARGET_CFLAGS}"
TARGET_CFLAGS = "-Os -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32 -march=core2 -msse3 -mtune=generic -mfpmath=sse -fasynchronous-unwind-tables"
LDFLAGS = "${TARGET_LDFLAGS}"
TARGET_LDFLAGS = "-Wl,-rpath,${libdir}/xulrunner-${XULVERSION}"
export target_alias=${TARGET_PREFIX}
inherit autotools mozilla
acpaths = "-I ${S}/build/autoconf "
export topsrcdir = "${S}"
do_configure () {
if [ "${SRCREV}" != "1a622cb7c384" ]; then
rm -rf ${S}/build/autoconf/acwinpaths.m4
rm -rf ${S}/js/src/build/autoconf/acwinpaths.m4
rm -rf ${S}/nsprpub/build/autoconf/acwinpaths.m4
mkdir -p ${S}/js/src/dist/include
ln -fs ../../../../nsprpub/dist/include/nspr ${S}/js/src/dist/include/nsprpub
fi
cp ${S}/build/autoconf/install-sh ${S}
autotools_do_configure
# Yes, we run this twice. The first pass sets up npsrpub-config which then
# sets the values correctly on the second try. Ick.
autotools_do_configure
}
do_compile () {
cp ${WORKDIR}/jsautocfg.h ${S}/js/src/
#oe_runmake -f client.mk build_all
base_do_compile
}
XULVERSION = "1.9.3a1pre"
do_install_append () {
install -d ${D}${sysconfdir}/ld.so.conf.d/
echo ${libdir}/xulrunner-${XULVERSION}/ > ${D}${sysconfdir}/ld.so.conf.d/mozilla-headless
}
EXTRA_OECONF =+ "--enable-application=xulrunner --enable-default-toolkit=cairo-headless --with-pthreads \
--enable-pango --enable-optimize --disable-debug --disable-tests \
--disable-printing --disable-crashreporter --disable-accessibility \
--disable-javaxpcom --enable-plugins --enable-system-sqlite --disable-necko-wifi"
export LIBXUL_DIST="${S}/dist"
SYSROOT_PREPROCESS_FUNCS += "mozilla_sysroot_preprocess"
mozilla_sysroot_preprocess () {
autotools_stage_dir ${D}/${libdir}/xulrunner-${XULVERSION} ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-${XULVERSION}/
autotools_stage_dir ${D}/${libdir}/xulrunner-devel-${XULVERSION} ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/
ln -fs ${STAGING_DIR_HOST}${libdir}/xulrunner-${XULVERSION}/ ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/bin
ln -fs ${STAGING_DIR_HOST}${datadir}/xulrunner-${XULVERSION}/unstable/ ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/idl
ln -fs ${STAGING_DIR_HOST}${includedir}/xulrunner-${XULVERSION}/unstable/ ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/include
ln -fs ${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/sdk/lib/ ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/lib
install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}
install -m 755 ${S}/dist/host/bin/host_xpidl ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/xpidl
}
__anonymous () {
if bb.data.getVar("SRCREV", d, True) == "1a622cb7c384":
bb.data.setVar("XULVERSION", "1.9.2a1pre", d)
}
meta/packages/mozilla/files/eabi-fix.patch
-66
View File
@@ -1,66 +0,0 @@
http://lists.debian.org/debian-arm/2007/05/msg00039.html
From: Lennert Buytenhek <buytenh@wantstofly.org>
Hi,
The reason that building nss (i.e., firefox) would segfault on ARM EABI
systems is an assumption about the layout of the jmp_buf structure in
the nspr library (which nss depends on) that does hold on old-ABI but
no longer holds on EABI. The attached patch fixes this assumption,
and fixes the shlibsign segfault during the building of nss (it also
fixes a floating point byte order assumption.)
Looks sane?
It's of course a stupid idea to depend on a particular layout of the
jmp_buf structure in application programs, but oh well. People write
ugly buggy code, film at 11.
--- mozilla/nsprpub/pr/src/misc/prdtoa.c.orig 2007-05-06 02:39:00.000000000 +0200
+++ mozilla/nsprpub/pr/src/misc/prdtoa.c 2007-05-06 02:39:22.000000000 +0200
@@ -59,8 +59,8 @@
/* FIXME: deal with freelist and p5s. */
}
-#if defined(__arm) || defined(__arm__) || defined(__arm26__) \
- || defined(__arm32__)
+#if (defined(__arm) || defined(__arm__) || defined(__arm26__) \
+ || defined(__arm32__)) && !defined(__ARM_EABI__) && !defined(__ARMEB__)
#define IEEE_ARM
#elif defined(IS_LITTLE_ENDIAN)
#define IEEE_8087
--- mozilla/nsprpub/pr/include/md/_linux.h.orig 2007-05-06 02:39:45.000000000 +0200
+++ mozilla/nsprpub/pr/include/md/_linux.h 2007-05-06 02:40:57.000000000 +0200
@@ -346,7 +346,7 @@
#error "Linux/MIPS pre-glibc2 not supported yet"
#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
-#elif defined(__arm__)
+#elif defined(__arm__) && !defined(__ARM_EABI__)
/* ARM/Linux */
#if defined(__GLIBC__) && __GLIBC__ >= 2
#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[20]
@@ -358,6 +358,18 @@
#error "ARM/Linux pre-glibc2 not supported yet"
#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
+#elif defined(__arm__) && defined(__ARM_EABI__)
+/* ARM/Linux */
+#if defined(__GLIBC__) && __GLIBC__ >= 2
+#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[8]
+#define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[7] = (val))
+#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t))
+#define _MD_GET_FP_PTR(_t) (&(_t)->md.context[0].__jmpbuf[7])
+#define _MD_SP_TYPE __ptr_t
+#else
+#error "ARM/Linux pre-glibc2 not supported yet"
+#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
+
#else
#error "Unknown CPU architecture"
meta/packages/mozilla/files/eabi-fix2.patch
-56
View File
@@ -1,56 +0,0 @@
https://bugzilla.mozilla.org/show_bug.cgi?id=369722
Index: js/src/jsnum.h
===================================================================
RCS file: /cvsroot/mozilla/js/src/jsnum.h,v
retrieving revision 3.27
diff -p -u -8 -r3.27 jsnum.h
--- mozilla/js/src/jsnum.h 21 Dec 2006 01:00:32 -0000 3.27
+++ mozilla/js/src/jsnum.h 8 Feb 2007 12:13:01 -0000
@@ -52,23 +52,24 @@ JS_BEGIN_EXTERN_C
/*
* Stefan Hanske <sh990154@mail.uni-greifswald.de> reports:
* ARM is a little endian architecture but 64 bit double words are stored
* differently: the 32 bit words are in little endian byte order, the two words
* are stored in big endian`s way.
*/
-#if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__)
-#define CPU_IS_ARM
+#if !defined(__ARM_EABI__) && \
+ (defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__))
+#define IEEE_ARM
#endif
typedef union jsdpun {
struct {
-#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM)
+#if defined(IS_LITTLE_ENDIAN) && !defined(IEEE_ARM)
uint32 lo, hi;
#else
uint32 hi, lo;
#endif
} s;
jsdouble d;
} jsdpun;
@@ -87,17 +88,17 @@ typedef union jsdpun {
#else /* not or old GNUC */
/*
* We don't know of any non-gcc compilers that perform alias optimization,
* so this code should work.
*/
-#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM)
+#if defined(IS_LITTLE_ENDIAN) && !defined(IEEE_ARM)
#define JSDOUBLE_HI32(x) (((uint32 *)&(x))[1])
#define JSDOUBLE_LO32(x) (((uint32 *)&(x))[0])
#else
#define JSDOUBLE_HI32(x) (((uint32 *)&(x))[0])
#define JSDOUBLE_LO32(x) (((uint32 *)&(x))[1])
#endif
#define JSDOUBLE_SET_HI32(x, y) (JSDOUBLE_HI32(x)=(y))
meta/packages/mozilla/files/eabi-fix3.patch
-15
View File
@@ -1,15 +0,0 @@
From: Marcin Juszkiewicz <openembedded@hrw.one.pl>
Index: mozilla/extensions/transformiix/source/base/Double.cpp
===================================================================
--- mozilla.orig/extensions/transformiix/source/base/Double.cpp 2007-05-09 11:21:34.000000000 +0200
+++ mozilla/extensions/transformiix/source/base/Double.cpp 2007-05-09 11:23:59.000000000 +0200
@@ -71,7 +71,7 @@
* are stored in big endian`s way.
*/
-#if defined(__arm) || defined(__arm32__) || defined(_arm26__) || defined(__arm__)
+#if !defined(__ARM_EABI__) && defined(__arm) || defined(__arm32__) || defined(_arm26__) || defined(__arm__)
#define CPU_IS_ARM
#endif
meta/packages/mozilla/files/minimo.desktop
-9
View File
@@ -1,9 +0,0 @@
[Desktop Entry]
Name=Minimo
Comment=Minimo web browser
Exec=minimo http://www.mozilla.org/projects/minimo/home.html
Terminal=0
Type=Application
Icon=minimo.png
Categories=Application;Network;
StartupNotify=True
meta/packages/mozilla/files/minimo.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.2 KiB

meta/packages/mozilla/minimo/bug-322806.diff
-13
View File
@@ -1,13 +0,0 @@
See https://bugzilla.mozilla.org/show_bug.cgi?id=322806 and http://bugs.openembedded.org/show_bug.cgi?id=1600
--- /tmp/xptcinvoke_arm.cpp 2006-12-10 20:02:57.000000000 +0100
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp 2006-12-10 20:03:54.592227000 +0100
@@ -212,7 +212,7 @@
"add sp, sp, r4 \n\t" /* restore stack pointer */
"mov %0, r0 \n\t" /* the result... */
: "=r" (result)
- : "r" (&my_params)
+ : "r" (&my_params), "m" (my_params)
: "r0", "r1", "r2", "r3", "r4", "ip", "lr", "sp"
);
meta/packages/mozilla/minimo/minimo
-4
View File
@@ -1,4 +0,0 @@
#!/bin/sh
export MOZILLA_FIVE_HOME=/usr/lib/mozilla-minimo
export LD_LIBRARY_PATH=${MOZILLA_FIVE_HOME}
exec ${MOZILLA_FIVE_HOME}/minimo "$@"
meta/packages/mozilla/minimo/minimo.patch
-356
View File
@@ -1,356 +0,0 @@
Index: mozilla/content/html/content/src/nsFormSubmission.cpp
===================================================================
--- mozilla.orig/content/html/content/src/nsFormSubmission.cpp 2005-07-13 18:55:59.000000000 +0200
+++ mozilla/content/html/content/src/nsFormSubmission.cpp 2007-05-10 12:11:20.000000000 +0200
@@ -1315,11 +1315,6 @@
nsresult rv = NS_OK;
nsCAutoString charset(aCharset);
- // canonical name is passed so that we just have to check against
- // *our* canonical names listed in charsetaliases.properties
- if (charset.EqualsLiteral("ISO-8859-1")) {
- charset.AssignLiteral("windows-1252");
- }
// use UTF-8 for UTF-16* and UTF-32* (per WHATWG and existing practice of
// MS IE/Opera).
Index: mozilla/embedding/base/Makefile.in
===================================================================
--- mozilla.orig/embedding/base/Makefile.in 2006-02-14 06:28:31.000000000 +0100
+++ mozilla/embedding/base/Makefile.in 2007-05-10 12:11:20.000000000 +0200
@@ -43,6 +43,7 @@
MODULE = embed_base
LIBRARY_NAME = embed_base_s
+EXPORT_LIBRARY = 1
XPIDL_MODULE = embed_base
include $(DEPTH)/config/autoconf.mk
Index: mozilla/js/src/Makefile.in
===================================================================
--- mozilla.orig/js/src/Makefile.in 2006-07-28 00:56:20.000000000 +0200
+++ mozilla/js/src/Makefile.in 2007-05-10 12:11:21.000000000 +0200
@@ -46,6 +46,7 @@
MODULE = js
LIBRARY_NAME = mozjs
+EXPORT_LIBRARY = 1
LIB_IS_C_ONLY = 1
GRE_MODULE = 1
Index: mozilla/minimo/Makefile.in
===================================================================
--- mozilla.orig/minimo/Makefile.in 2006-07-24 21:40:53.000000000 +0200
+++ mozilla/minimo/Makefile.in 2007-05-10 12:13:46.000000000 +0200
@@ -41,6 +41,6 @@
include $(DEPTH)/config/autoconf.mk
-DIRS = config components chrome locales customization base extensions
+DIRS = config chrome locales customization base extensions
include $(topsrcdir)/config/rules.mk
Index: mozilla/minimo/base/Makefile.in
===================================================================
--- mozilla.orig/minimo/base/Makefile.in 2006-08-09 17:42:26.000000000 +0200
+++ mozilla/minimo/base/Makefile.in 2007-05-10 12:11:21.000000000 +0200
@@ -96,7 +96,6 @@
# this should move into the toolkit!
LOCAL_INCLUDES = -I$(srcdir) -I$(topsrcdir)/xpfe/browser/src/
-CPPSRCS += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
ifdef WINCE
RCINCLUDE = wince/SplashScreen.rc
@@ -143,10 +142,6 @@
endif
-FINAL_LINK_COMPS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-comps
-FINAL_LINK_COMP_NAMES=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-names
-FINAL_LINK_LIBS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-libs
-
include $(topsrcdir)/config/static-config.mk
EXTRA_DEPS += $(STATIC_EXTRA_DEPS)
@@ -180,14 +175,11 @@
# (same as in mozilla/js/src/Makefile.in)
ifdef WINCE
LDFLAGS += -OPT:NOICF
+else
+# Hack to work around libxpcom_core.a / libunicharutil_s.a link order problem.
+LDFLAGS += -u NS_StringGetData_P -u NS_StringGetMutableData_P
endif
-export::
- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserStatusFilter.cpp .
- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserInstance.cpp .
-
-
-GARBAGE += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
ifdef WINCE
package::
Index: mozilla/minimo/base/Minimo.cpp
===================================================================
--- mozilla.orig/minimo/base/Minimo.cpp 2006-10-27 22:30:36.000000000 +0200
+++ mozilla/minimo/base/Minimo.cpp 2007-05-10 12:13:21.000000000 +0200
@@ -813,6 +813,8 @@
#ifdef MOZ_WIDGET_GTK2
gtk_set_locale();
gtk_init(&argc, &argv);
+ gtk_widget_set_default_visual(gdk_rgb_get_visual());
+ gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
#endif
#ifdef HACKY_PRE_LOAD_LIBRARY
Index: mozilla/minimo/base/SplashScreen.cpp
===================================================================
--- mozilla.orig/minimo/base/SplashScreen.cpp 2006-08-21 21:00:24.000000000 +0200
+++ mozilla/minimo/base/SplashScreen.cpp 2007-05-10 12:11:22.000000000 +0200
@@ -202,9 +202,24 @@
void KillSplashScreen() {}
void GetScreenSize(unsigned long* x, unsigned long* y)
{
+#ifdef MOZ_WIDGET_GTK2
+ GdkDisplay* display = gdk_display_get_default();
+ if (display != NULL)
+ {
+ GdkScreen *screen;
+ screen = gdk_display_get_default_screen(display);
+ *x = gdk_screen_get_width(screen);
+ *y = gdk_screen_get_height(screen);
+ }
+ else
+ {
+#endif
// we need to figure this out.
*x = 240;
*y = 320;
+#ifdef MOZ_WIDGET_GTK2
+ }
+#endif
}
Index: mozilla/minimo/config/linux_package.sh
===================================================================
--- mozilla.orig/minimo/config/linux_package.sh 2006-06-30 18:35:19.000000000 +0200
+++ mozilla/minimo/config/linux_package.sh 2007-05-10 12:11:22.000000000 +0200
@@ -29,9 +29,7 @@
cp -pRL bin/libnssckbi.so minimo
cp -pRL bin/libsmime3.so minimo
cp -pRL bin/libsoftokn3.so minimo
-cp -pRL bin/libsoftokn3.chk minimo
cp -pRL bin/libfreebl3.so minimo
-cp -pRL bin/libfreebl3.chk minimo
cp -pRL bin/libssl3.so minimo
mkdir -p minimo/chrome
@@ -62,8 +60,6 @@
cp -pRL bin/components/nsHelperAppDlg.js minimo/components
cp -pRL bin/components/nsProgressDialog.js minimo/components
-cp -pRL bin/extensions/spatial-navigation@extensions.mozilla.org/components/* minimo/components
-
mkdir -p minimo/greprefs
cp -pRL bin/greprefs/* minimo/greprefs
@@ -80,7 +76,7 @@
echo Linking XPT files.
-bin/xpt_link minimo/components/all.xpt bin/components/*.xpt
+host/bin/host_xpt_link minimo/components/all.xpt bin/components/*.xpt
echo Chewing on chrome
Index: mozilla/profile/dirserviceprovider/src/Makefile.in
===================================================================
--- mozilla.orig/profile/dirserviceprovider/src/Makefile.in 2005-04-06 05:35:21.000000000 +0200
+++ mozilla/profile/dirserviceprovider/src/Makefile.in 2007-05-10 12:11:23.000000000 +0200
@@ -44,6 +44,7 @@
MODULE = profdirserviceprovider
LIBRARY_NAME = profdirserviceprovider_s
+EXPORT_LIBRARY = 1
MOZILLA_INTERNAL_API = 1
REQUIRES = xpcom \
Index: mozilla/security/coreconf/Linux.mk
===================================================================
--- mozilla.orig/security/coreconf/Linux.mk 2006-02-03 23:26:36.000000000 +0100
+++ mozilla/security/coreconf/Linux.mk 2007-05-10 12:11:23.000000000 +0200
@@ -117,6 +117,10 @@
OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
CPU_ARCH = mips
else
+ifeq ($(OS_TEST),arm)
+ OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+ CPU_ARCH = arm
+else
OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
CPU_ARCH = x86
endif
@@ -133,6 +137,7 @@
endif
endif
endif
+endif
LIBC_TAG = _glibc
Index: mozilla/security/coreconf/arch.mk
===================================================================
--- mozilla.orig/security/coreconf/arch.mk 2006-02-03 23:26:36.000000000 +0100
+++ mozilla/security/coreconf/arch.mk 2007-05-10 12:11:24.000000000 +0200
@@ -60,18 +60,14 @@
64BIT_TAG=
endif
-OS_ARCH := $(subst /,_,$(shell uname -s))
+OS_ARCH := Linux
#
# Attempt to differentiate between sparc and x86 Solaris
#
-OS_TEST := $(shell uname -m)
-ifeq ($(OS_TEST),i86pc)
- OS_RELEASE := $(shell uname -r)_$(OS_TEST)
-else
- OS_RELEASE := $(shell uname -r)
-endif
+OS_TEST := arm
+OS_RELEASE := 2.6
#
# Force the IRIX64 machines to use IRIX.
Index: mozilla/toolkit/components/build/Makefile.in
===================================================================
--- mozilla.orig/toolkit/components/build/Makefile.in 2006-07-13 22:08:29.000000000 +0200
+++ mozilla/toolkit/components/build/Makefile.in 2007-05-10 12:11:27.000000000 +0200
@@ -112,7 +112,6 @@
$(NULL)
SHARED_LIBRARY_LIBS = \
- ../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \
$(NULL)
ifdef MOZ_XPINSTALL
Index: mozilla/toolkit/components/startup/src/Makefile.in
===================================================================
--- mozilla.orig/toolkit/components/startup/src/Makefile.in 2005-07-27 22:42:44.000000000 +0200
+++ mozilla/toolkit/components/startup/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200
@@ -43,6 +43,7 @@
MODULE = toolkitcomps
LIBRARY_NAME = appstartup_s
+EXPORT_LIBRARY = 1
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
Index: mozilla/toolkit/xre/Makefile.in
===================================================================
--- mozilla.orig/toolkit/xre/Makefile.in 2007-02-06 08:13:20.000000000 +0100
+++ mozilla/toolkit/xre/Makefile.in 2007-05-10 12:11:27.000000000 +0200
@@ -45,7 +45,6 @@
MODULE = xulapp
LIBRARY_NAME = xulapp_s
-EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1
REQUIRES = \
@@ -180,14 +179,6 @@
include $(topsrcdir)/config/rules.mk
-ifdef BUILD_STATIC_LIBS
-export::
- @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMP_NAMES) Apprunner
-# embedding/browser/gtk/src/Makefile.in sucks! we need to add an empty line to
-# FINAL_LINK_COMPS to keep the two lists in sync :-(
- @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMPS) ""
-endif
-
LOCAL_INCLUDES += \
-I$(srcdir) \
-I$(topsrcdir)/xpfe/bootstrap \
Index: mozilla/xpcom/build/Makefile.in
===================================================================
--- mozilla.orig/xpcom/build/Makefile.in 2006-01-29 17:51:02.000000000 +0100
+++ mozilla/xpcom/build/Makefile.in 2007-05-10 12:11:27.000000000 +0200
@@ -61,7 +61,7 @@
endif
# Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list
-#EXPORT_LIBRARY = 1
+EXPORT_LIBRARY = 1
GRE_MODULE = 1
MOZILLA_INTERNAL_API = 1
Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp
===================================================================
--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 2004-04-18 16:18:18.000000000 +0200
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 2007-05-10 12:11:27.000000000 +0200
@@ -45,9 +45,9 @@
#endif
/* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */
-static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
+nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
-static nsresult
+nsresult
PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args)
{
#define PARAM_BUFFER_COUNT 16
Index: mozilla/xpfe/browser/src/Makefile.in
===================================================================
--- mozilla.orig/xpfe/browser/src/Makefile.in 2005-03-18 22:23:45.000000000 +0100
+++ mozilla/xpfe/browser/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200
@@ -44,6 +44,7 @@
MODULE = browser
LIBRARY_NAME = mozbrwsr_s
+EXPORT_LIBRARY = 1
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
MODULE_NAME = nsBrowserModule
Index: mozilla/xpfe/components/build/Makefile.in
===================================================================
--- mozilla.orig/xpfe/components/build/Makefile.in 2005-09-27 02:15:25.000000000 +0200
+++ mozilla/xpfe/components/build/Makefile.in 2007-05-10 12:11:27.000000000 +0200
@@ -44,7 +44,6 @@
MODULE = appcomps
LIBRARY_NAME = appcomps
-EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = application
LIBXUL_LIBRARY = 1
Index: mozilla/xpfe/components/filepicker/src/Makefile.in
===================================================================
--- mozilla.orig/xpfe/components/filepicker/src/Makefile.in 2006-05-22 18:29:32.000000000 +0200
+++ mozilla/xpfe/components/filepicker/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200
@@ -47,7 +47,6 @@
MODULE = filepicker
LIBRARY_NAME = fileview
SHORT_LIBNAME = fileview
-EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsFileViewModule
MOZILLA_INTERNAL_API = 1
Index: mozilla/xpfe/components/find/src/Makefile.in
===================================================================
--- mozilla.orig/xpfe/components/find/src/Makefile.in 2005-03-18 22:23:46.000000000 +0100
+++ mozilla/xpfe/components/find/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200
@@ -45,7 +45,6 @@
MODULE = appcomps
XPIDL_MODULE = mozfind
LIBRARY_NAME = mozfind
-EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsFindComponent
LIBXUL_LIBRARY = 1
meta/packages/mozilla/minimo/minimo.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.2 KiB

meta/packages/mozilla/minimo/mozconfig
-36
View File
@@ -1,36 +0,0 @@
# mozilla/configure: Features and packages:
ac_add_options --enable-application=minimo
ac_add_options --enable-default-toolkit=gtk2
ac_add_options --disable-freetype2
ac_add_options --enable-xft
ac_add_options --disable-postscript
ac_add_options --disable-xprint
ac_add_options --disable-gnomevfs
ac_add_options --disable-gnomeui
ac_add_options --disable-jsd
ac_add_options --disable-plugins
ac_add_options --disable-view-source
ac_add_options --disable-accessibility
ac_add_options --disable-xpinstall
ac_add_options --enable-single-profile
ac_add_options --disable-jsloader
ac_add_options --disable-printing
ac_add_options --enable-native-uconv
ac_add_options --enable-plaintext-editor-only
ac_add_options --disable-xpcom-obsolete
ac_add_options --disable-pref-extensions
ac_add_options --disable-extensions
ac_add_options --enable-image-decoders=png,gif,jpeg
ac_add_options --disable-mathml
ac_add_options --disable-installer
ac_add_options --disable-updater
ac_add_options --disable-tests
ac_add_options --enable-optimize=-Os
ac_add_options --disable-logging
ac_add_options --enable-strip
ac_add_options --enable-elf-dynstr-gc
ac_add_options --disable-shared
ac_add_options --enable-static
ac_add_options --disable-profilesharing
ac_add_options --disable-profilelocking
meta/packages/mozilla/minimo_cvs.bb
-153
View File
@@ -1,153 +0,0 @@
DESCRIPTION = "A minimal version of the Mozilla web browser for mobile devices"
SECTION = "x11/network"
LICENSE = "MPL/GPL/LGPL"
HOMEPAGE = "http://www.mozilla.org/projects/minimo/"
PRIORITY = "optional"
DEPENDS = "libxrender xt xft fontconfig freetype libidl dbus-glib pango atk gtk+ libidl-native"
CVSSVR = "cvs-mirror.mozilla.org"
BRTAG = "MOZILLA_1_8_BRANCH"
MOZDATE = "20070510"
PV = "0.02+cvs${MOZDATE}"
PR = "r3"
SRC_URI = "cvs://anonymous@${CVSSVR}/cvsroot;module=mozilla;tag=${BRTAG};date=${MOZDATE} \
file://minimo.patch;patch=1 \
file://bug-322806.diff;patch=1 \
file://mozconfig \
file://minimo \
file://eabi-fix.patch;patch=1 \
file://eabi-fix2.patch;patch=1 \
file://eabi-fix3.patch;patch=1 \
file://minimo.desktop \
file://minimo.png"
inherit autotools
S = "${WORKDIR}/mozilla"
export MOZCONFIG = "${WORKDIR}/mozconfig"
export CROSS_COMPILE="1"
export ac_cv_prog_HOST_CC="${BUILD_CC}"
export ac_cv_prog_HOST_CFLAGS="${BUILD_CFLAGS}"
export ac_cv_prog_HOST_CXX="${BUILD_CXX}"
export ac_cv_prog_HOST_CXXFLAGS="${BUILD_CXXFLAGS}"
export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2"
mozdir="${libdir}/mozilla-minimo"
EXTRA_OECONF += "--build=${BUILD_SYS} --host=${BUILD_SYS} --target=${TARGET_SYS} "
do_configure() {
cd ${S}
oe_runmake -f client.mk CONFIGURE_ARGS="${EXTRA_OECONF}" configure
sed -i s:${TARGET_PREFIX}strip:echo:g config/autoconf.mk
}
do_compile() {
cd ${S}
oe_runmake -f client.mk build
}
do_install() {
cd ${WORKDIR}
install -d ${D}${bindir}
install -m 0755 minimo ${D}${bindir}
install -d ${D}${datadir}/applications
install -m 0644 minimo.desktop ${D}${datadir}/applications
install -d ${D}/${datadir}/pixmaps
install -m 0644 minimo.png ${D}${datadir}/pixmaps
cd ${S}
./minimo/config/linux_package.sh ${S} ${S}/minimo/config
cd dist/minimo
install -d ${D}${mozdir}
install -m 0755 minimo ${D}${mozdir}
install -m 0755 libfreebl3.so ${D}${mozdir}
install -m 0755 libnspr4.so ${D}${mozdir}
install -m 0755 libnss3.so ${D}${mozdir}
install -m 0755 libnssckbi.so ${D}${mozdir}
install -m 0755 libplc4.so ${D}${mozdir}
install -m 0755 libplds4.so ${D}${mozdir}
install -m 0755 libsmime3.so ${D}${mozdir}
install -m 0755 libsoftokn3.so ${D}${mozdir}
install -m 0755 libssl3.so ${D}${mozdir}
install -d ${D}${mozdir}/chrome
install -m 0644 chrome/classic.jar ${D}${mozdir}/chrome
install -m 0644 chrome/classic.manifest ${D}${mozdir}/chrome
install -m 0644 chrome/en-US.jar ${D}${mozdir}/chrome
install -m 0644 chrome/en-US.manifest ${D}${mozdir}/chrome
install -m 0644 chrome/minimo-skin-vga.jar ${D}${mozdir}/chrome
install -m 0644 chrome/minimo-skin-vga.manifest ${D}${mozdir}/chrome
install -m 0644 chrome/minimo-skin.jar ${D}${mozdir}/chrome
install -m 0644 chrome/minimo-skin.manifest ${D}${mozdir}/chrome
install -m 0644 chrome/minimo.jar ${D}${mozdir}/chrome
install -m 0644 chrome/minimo.manifest ${D}${mozdir}/chrome
install -m 0644 chrome/pippki.jar ${D}${mozdir}/chrome
install -m 0644 chrome/pippki.manifest ${D}${mozdir}/chrome
install -m 0644 chrome/toolkit.jar ${D}${mozdir}/chrome
install -m 0644 chrome/toolkit.manifest ${D}${mozdir}/chrome
install -d ${D}${mozdir}/components
install -m 0644 components/all.xpt ${D}${mozdir}/components
install -m 0644 components/nsHelperAppDlg.js ${D}${mozdir}/components
install -m 0644 components/nsProgressDialog.js ${D}${mozdir}/components
install -d ${D}${mozdir}/greprefs
install -m 0644 greprefs/all.js ${D}${mozdir}/greprefs
install -m 0644 greprefs/security-prefs.js ${D}${mozdir}/greprefs
install -d ${D}${mozdir}/res
install -m 0644 res/forms.css ${D}${mozdir}/res
install -m 0644 res/html.css ${D}${mozdir}/res
install -m 0644 res/quirk.css ${D}${mozdir}/res
install -m 0644 res/ua.css ${D}${mozdir}/res
install -m 0644 res/arrow.gif ${D}${mozdir}/res
install -m 0644 res/arrowd.gif ${D}${mozdir}/res
install -m 0644 res/broken-image.gif ${D}${mozdir}/res
install -m 0644 res/loading-image.gif ${D}${mozdir}/res
install -m 0644 res/charsetData.properties ${D}${mozdir}/res
install -m 0644 res/charsetalias.properties ${D}${mozdir}/res
install -m 0644 res/langGroups.properties ${D}${mozdir}/res
install -m 0644 res/language.properties ${D}${mozdir}/res
install -m 0644 res/unixcharset.properties ${D}${mozdir}/res
install -d ${D}${mozdir}/res/dtd
install -m 0644 res/dtd/xhtml11.dtd ${D}${mozdir}/res/dtd
install -d ${D}${mozdir}/res/entityTables
install -m 0644 res/entityTables/html40Latin1.properties ${D}${mozdir}/res/entityTables
install -m 0644 res/entityTables/html40Special.properties ${D}${mozdir}/res/entityTables
install -m 0644 res/entityTables/html40Symbols.properties ${D}${mozdir}/res/entityTables
install -m 0644 res/entityTables/htmlEntityVersions.properties ${D}${mozdir}/res/entityTables
install -m 0644 res/entityTables/transliterate.properties ${D}${mozdir}/res/entityTables
install -d ${D}${mozdir}/res/fonts
install -m 0644 res/fonts/fontEncoding.properties ${D}${mozdir}/res/fonts
install -m 0644 res/fonts/pangoFontEncoding.properties ${D}${mozdir}/res/fonts
install -d ${D}${mozdir}/res/html
install -m 0644 res/html/gopher-audio.gif ${D}${mozdir}/res/html
install -m 0644 res/html/gopher-binary.gif ${D}${mozdir}/res/html
install -m 0644 res/html/gopher-find.gif ${D}${mozdir}/res/html
install -m 0644 res/html/gopher-image.gif ${D}${mozdir}/res/html
install -m 0644 res/html/gopher-menu.gif ${D}${mozdir}/res/html
install -m 0644 res/html/gopher-movie.gif ${D}${mozdir}/res/html
install -m 0644 res/html/gopher-sound.gif ${D}${mozdir}/res/html
install -m 0644 res/html/gopher-telnet.gif ${D}${mozdir}/res/html
install -m 0644 res/html/gopher-text.gif ${D}${mozdir}/res/html
install -m 0644 res/html/gopher-unknown.gif ${D}${mozdir}/res/html
}
FILES_${PN}-dbg += "${libdir}/mozilla-minimo/.debug*"
FILES_${PN} += "${mozdir}"
meta/packages/networkmanager/files/70NetworkManagerApplet.shbg
-4
View File
@@ -1,4 +0,0 @@
#!/bin/sh
# Wait for the desktop to say its finished loading
dbus-wait org.matchbox_project.desktop Loaded
exec /usr/bin/nm-applet
meta/packages/networkmanager/files/99_networkmanager
-1
View File
@@ -1 +0,0 @@
d root root 0700 /var/run/NetworkManager none
meta/packages/networkmanager/files/NetworkManager
-43
View File
@@ -1,43 +0,0 @@
#!/bin/sh
#
### BEGIN INIT INFO
# Provides: NetworkManager
# Required-Start: $remote_fs dbus hal
# Required-Stop: $remote_fs dbus hal
# Should-Start: $syslog
# Should-Stop: $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: network connection manager
# Description: Daemon for automatically switching network
# connections to the best available connection.
### END INIT INFO
. /etc/profile
case $1 in
'start')
echo -n "Starting NetworkManager daemon: NetworkManager"
/usr/sbin/NetworkManager
/usr/sbin/NetworkManagerDispatcher
/usr/sbin/wpa_supplicant -u &
echo "."
;;
'stop')
echo -n "Stopping NetworkManager daemon: NetworkManager"
kill `ps |grep /usr/sbin/NetworkManagerDispatcher | grep -v grep | cut "-d " -f2`
kill `ps |grep /usr/sbin/NetworkManager | grep -v grep | cut "-d " -f2`
kill `ps |grep /usr/sbin/wpa_supplicant | grep -v grep | cut "-d " -f2`
echo "."
;;
'restart')
$0 stop
$0 start
;;
*)
echo "Usage: $0 { start | stop | restart }"
;;
esac
meta/packages/networkmanager/files/allow-disabling.patch
-45
View File
@@ -1,45 +0,0 @@
Allow interfaces to be ignored by networkmanager by creation of a
/etc/network/nm-disabled-INTERFACENAME file.
RP - 16/7/2008
Index: trunk/src/backends/NetworkManagerDebian.c
===================================================================
--- trunk.orig/src/backends/NetworkManagerDebian.c 2008-07-15 19:23:11.000000000 +0100
+++ trunk/src/backends/NetworkManagerDebian.c 2008-07-15 19:37:05.000000000 +0100
@@ -29,6 +29,7 @@
#include <stdio.h>
#include <sys/types.h>
+#include <sys/stat.h>
#include <signal.h>
#include <arpa/inet.h>
#include "NetworkManagerGeneric.h"
@@ -374,12 +375,25 @@
/*
* nm_system_device_get_disabled
*
- * Return whether the distro-specific system config tells us to use
- * dhcp for this device.
+ * Return whether the distro-specific system config tells us to interact
+ * with this device.
*
*/
gboolean nm_system_device_get_disabled (NMDevice *dev)
{
+ struct stat statbuf;
+ gchar *filepath;
+
+ g_return_val_if_fail (dev != NULL, FALSE);
+
+ filepath = g_strdup_printf (SYSCONFDIR"/network/nm-disabled-%s", nm_device_get_iface (dev));
+
+ if (stat(filepath, &statbuf) == 0) {
+ g_free(filepath);
+ return TRUE;
+ }
+
+ g_free(filepath);
return FALSE;
}
meta/packages/networkmanager/files/applet-no-animation.patch
-234
View File
@@ -1,234 +0,0 @@
Index: trunk/src/applet.c
===================================================================
--- trunk.orig/src/applet.c 2008-02-06 20:30:04.000000000 +0000
+++ trunk/src/applet.c 2008-02-06 20:46:59.000000000 +0000
@@ -111,8 +111,6 @@
static void nma_init (NMApplet *applet)
{
- applet->animation_id = 0;
- applet->animation_step = 0;
applet->passphrase_dialog = NULL;
applet->icon_theme = NULL;
#ifdef ENABLE_NOTIFY
@@ -1006,20 +1004,6 @@
}
}
-static gboolean
-vpn_animation_timeout (gpointer data)
-{
- NMApplet *applet = NM_APPLET (data);
-
- foo_set_icon (applet, applet->vpn_connecting_icons[applet->animation_step], ICON_LAYER_VPN);
-
- applet->animation_step++;
- if (applet->animation_step >= NUM_VPN_CONNECTING_FRAMES)
- applet->animation_step = 0;
-
- return TRUE;
-}
-
static void
vpn_connection_state_changed (NMVPNConnection *connection,
NMVPNConnectionState state,
@@ -1030,10 +1014,6 @@
switch (state) {
case NM_VPN_CONNECTION_STATE_ACTIVATED:
- if (applet->animation_id) {
- g_source_remove (applet->animation_id);
- applet->animation_id = 0;
- }
foo_set_icon (applet, applet->vpn_lock_icon, ICON_LAYER_VPN);
// vpn_connection_info_set_last_attempt_success (info, TRUE);
break;
@@ -1041,10 +1021,7 @@
case NM_VPN_CONNECTION_STATE_NEED_AUTH:
case NM_VPN_CONNECTION_STATE_CONNECT:
case NM_VPN_CONNECTION_STATE_IP_CONFIG_GET:
- if (applet->animation_id == 0) {
- applet->animation_step = 0;
- applet->animation_id = g_timeout_add (100, vpn_animation_timeout, applet);
- }
+ foo_set_icon (applet, applet->network_connecting_icon, ICON_LAYER_VPN);
break;
case NM_VPN_CONNECTION_STATE_FAILED:
// vpn_connection_info_set_last_attempt_success (info, FALSE);
@@ -1053,10 +1030,6 @@
g_hash_table_remove (applet->vpn_connections, nm_vpn_connection_get_name (connection));
/* Fall through */
default:
- if (applet->animation_id) {
- g_source_remove (applet->animation_id);
- applet->animation_id = 0;
- }
foo_set_icon (applet, NULL, ICON_LAYER_VPN);
break;
}
@@ -2295,45 +2268,6 @@
} FooAnimationTimeoutInfo;
static void
-foo_animation_timeout_info_destroy (gpointer data)
-{
- g_slice_free (FooAnimationTimeoutInfo, data);
-}
-
-static gboolean
-foo_animation_timeout (gpointer data)
-{
- FooAnimationTimeoutInfo *info = (FooAnimationTimeoutInfo *) data;
- NMApplet *applet = info->applet;
- int stage = -1;
-
- switch (info->state) {
- case NM_DEVICE_STATE_PREPARE:
- stage = 0;
- break;
- case NM_DEVICE_STATE_CONFIG:
- stage = 1;
- break;
- case NM_DEVICE_STATE_IP_CONFIG:
- stage = 2;
- break;
- default:
- break;
- }
-
- if (stage >= 0)
- foo_set_icon (applet,
- applet->network_connecting_icons[stage][applet->animation_step],
- ICON_LAYER_LINK);
-
- applet->animation_step++;
- if (applet->animation_step >= NUM_CONNECTING_FRAMES)
- applet->animation_step = 0;
-
- return TRUE;
-}
-
-static void
foo_common_state_change (NMDevice *device, NMDeviceState state, NMApplet *applet)
{
FooAnimationTimeoutInfo *info;
@@ -2345,11 +2279,7 @@
info = g_slice_new (FooAnimationTimeoutInfo);
info->applet = applet;
info->state = state;
- applet->animation_step = 0;
- applet->animation_id = g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE,
- 100, foo_animation_timeout,
- info,
- foo_animation_timeout_info_destroy);
+ foo_set_icon (applet, applet->network_connecting_icon, ICON_LAYER_LINK);
break;
case NM_DEVICE_STATE_ACTIVATED:
break;
@@ -2602,12 +2532,6 @@
NMApplet *applet = NM_APPLET (user_data);
gboolean handled = FALSE;
- applet->animation_step = 0;
- if (applet->animation_id) {
- g_source_remove (applet->animation_id);
- applet->animation_id = 0;
- }
-
clear_active_connections (applet);
applet->active_connections = nm_client_get_active_connections (applet->nm_client);
@@ -3166,17 +3090,8 @@
if (applet->wireless_100_icon)
g_object_unref (applet->wireless_100_icon);
- for (i = 0; i < NUM_CONNECTING_STAGES; i++) {
- int j;
-
- for (j = 0; j < NUM_CONNECTING_FRAMES; j++)
- if (applet->network_connecting_icons[i][j])
- g_object_unref (applet->network_connecting_icons[i][j]);
- }
-
- for (i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++)
- if (applet->vpn_connecting_icons[i])
- g_object_unref (applet->vpn_connecting_icons[i]);
+ if (applet->network_connecting_icon)
+ g_object_unref (applet->network_connecting_icon);
nma_icons_zero (applet);
}
@@ -3196,16 +3111,7 @@
applet->wireless_75_icon = NULL;
applet->wireless_100_icon = NULL;
- for (i = 0; i < NUM_CONNECTING_STAGES; i++)
- {
- int j;
-
- for (j = 0; j < NUM_CONNECTING_FRAMES; j++)
- applet->network_connecting_icons[i][j] = NULL;
- }
-
- for (i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++)
- applet->vpn_connecting_icons[i] = NULL;
+ applet->network_connecting_icon = NULL;
applet->icons_loaded = FALSE;
}
@@ -3257,28 +3163,7 @@
ICON_LOAD(applet->wireless_75_icon, "nm-signal-75");
ICON_LOAD(applet->wireless_100_icon, "nm-signal-100");
- for (i = 0; i < NUM_CONNECTING_STAGES; i++)
- {
- int j;
-
- for (j = 0; j < NUM_CONNECTING_FRAMES; j++)
- {
- char *name;
-
- name = g_strdup_printf ("nm-stage%02d-connecting%02d", i+1, j+1);
- ICON_LOAD(applet->network_connecting_icons[i][j], name);
- g_free (name);
- }
- }
-
- for (i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++)
- {
- char *name;
-
- name = g_strdup_printf ("nm-vpn-connecting%02d", i+1);
- ICON_LOAD(applet->vpn_connecting_icons[i], name);
- g_free (name);
- }
+ ICON_LOAD(applet->network_connecting_icon, "nm-connecting");
success = TRUE;
Index: trunk/src/applet.h
===================================================================
--- trunk.orig/src/applet.h 2008-02-06 20:30:06.000000000 +0000
+++ trunk/src/applet.h 2008-02-06 20:46:05.000000000 +0000
@@ -111,20 +111,12 @@
GdkPixbuf * wireless_50_icon;
GdkPixbuf * wireless_75_icon;
GdkPixbuf * wireless_100_icon;
-#define NUM_CONNECTING_STAGES 3
-#define NUM_CONNECTING_FRAMES 11
- GdkPixbuf * network_connecting_icons[NUM_CONNECTING_STAGES][NUM_CONNECTING_FRAMES];
-#define NUM_VPN_CONNECTING_FRAMES 14
- GdkPixbuf * vpn_connecting_icons[NUM_VPN_CONNECTING_FRAMES];
+ GdkPixbuf * network_connecting_icon;
GdkPixbuf * vpn_lock_icon;
/* Active status icon pixbufs */
GdkPixbuf * icon_layers[ICON_LAYER_MAX + 1];
- /* Animation stuff */
- int animation_step;
- guint animation_id;
-
/* Direct UI elements */
#ifdef HAVE_STATUS_ICON
GtkStatusIcon * status_icon;
meta/packages/networkmanager/files/applet-no-gnome.diff
-59
View File
@@ -1,59 +0,0 @@
---
configure.ac | 3 +--
src/main.c | 8 ++++++++
2 files changed, 9 insertions(+), 2 deletions(-)
Index: src/main.c
===================================================================
--- src/main.c.orig 2007-09-26 10:39:16.000000000 +0100
+++ src/main.c 2007-09-26 10:39:37.000000000 +0100
@@ -27,7 +27,9 @@
#include <string.h>
#include <gtk/gtk.h>
+#if 0
#include <libgnomeui/libgnomeui.h>
+#endif
#include <glib/gi18n-lib.h>
#include "applet.h"
@@ -36,11 +38,15 @@
int main (int argc, char *argv[])
{
NMApplet * applet;
+#if 0
GnomeProgram * program;
program = gnome_program_init ("nm-applet", VERSION, LIBGNOMEUI_MODULE,
argc, argv,
GNOME_PARAM_NONE, GNOME_PARAM_NONE);
+#else
+ gtk_init (&argc, &argv);
+#endif
bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -53,7 +59,9 @@ int main (int argc, char *argv[])
gtk_main ();
g_object_unref (applet);
+#if 0
g_object_unref (program);
+#endif
exit (0);
}
Index: configure.ac
===================================================================
--- configure.ac.orig 2007-09-26 10:39:30.000000000 +0100
+++ configure.ac 2007-09-26 10:39:37.000000000 +0100
@@ -65,8 +65,7 @@ PKG_CHECK_MODULES(NMA,
gtk+-2.0 >= 2.6
libglade-2.0
gconf-2.0
- gnome-keyring-1
- libgnomeui-2.0])
+ gnome-keyring-1])
##### Find out the version of DBUS we're using
dbus_version=`pkg-config --modversion dbus-1`
meta/packages/networkmanager/files/libnlfix.patch
-29
View File
@@ -1,29 +0,0 @@
Index: trunk/src/nm-netlink.c
===================================================================
--- trunk.orig/src/nm-netlink.c 2007-09-25 22:37:50.000000000 +0100
+++ trunk/src/nm-netlink.c 2009-05-16 12:44:26.000000000 +0100
@@ -52,16 +52,20 @@
struct nl_handle *
nm_netlink_get_default_handle (void)
{
+ struct nl_cb *cb;
+
if (def_nl_handle)
return def_nl_handle;
- def_nl_handle = nl_handle_alloc_nondefault (NL_CB_VERBOSE);
- g_assert (def_nl_handle);
+ cb = nl_cb_alloc(NL_CB_VERBOSE);
+ def_nl_handle = nl_handle_alloc_cb (cb);
+ if (!def_nl_handle) {
+ nm_warning ("couldn't allocate netlink handle.");
+ return NULL;
+ }
- nl_handle_set_pid (def_nl_handle, (pthread_self () << 16 | getpid ()));
if (nl_connect (def_nl_handle, NETLINK_ROUTE) < 0) {
nm_error ("couldn't connect to netlink: %s", nl_geterror ());
- nl_handle_destroy (def_nl_handle);
return NULL;
}
meta/packages/networkmanager/files/makefile-fix.patch
-17
View File
@@ -1,17 +0,0 @@
This line causes libtool to try and create a program which fails since there is no
main(). This is hidden with libtool 1.5.10 but appears with 2.2.2.
RP - 14/4/08
Index: trunk/src/ppp-manager/Makefile.am
===================================================================
--- trunk.orig/src/ppp-manager/Makefile.am 2008-04-14 23:00:54.000000000 +0100
+++ trunk/src/ppp-manager/Makefile.am 2008-04-14 23:01:24.000000000 +0100
@@ -25,7 +25,6 @@
$(top_builddir)/src/marshallers/libmarshallers.la
nm_pppd_plugindir = $(libdir)
-nm_pppd_plugin_PROGRAMS = nm-pppd-plugin.so
nm_pppd_plugin_so_SOURCES = \
nm-pppd-plugin.c \
meta/packages/networkmanager/files/nmutil-fix.patch
-12
View File
@@ -1,12 +0,0 @@
Index: trunk/configure.ac
===================================================================
--- trunk.orig/configure.ac 2009-01-08 10:49:26.000000000 -0600
+++ trunk/configure.ac 2009-01-08 12:00:34.000000000 -0600
@@ -62,6 +62,7 @@
glib-2.0 >= 2.10
NetworkManager >= 0.7.0
libnm_glib
+ libnm-util
gtk+-2.0 >= 2.6
libglade-2.0
gconf-2.0
meta/packages/networkmanager/files/no-restarts.diff
-21
View File
@@ -1,21 +0,0 @@
Index: src/backends/NetworkManagerDebian.c
===================================================================
--- src/backends/NetworkManagerDebian.c (revision 2881)
+++ src/backends/NetworkManagerDebian.c (working copy)
@@ -204,8 +204,6 @@
*/
void nm_system_update_dns (void)
{
- nm_spawn_process ("/usr/sbin/invoke-rc.d nscd restart");
-
}
@@ -218,7 +216,6 @@
*/
void nm_system_restart_mdns_responder (void)
{
- nm_spawn_process ("/usr/bin/killall -q -USR1 mDNSResponder");
}
meta/packages/networkmanager/files/no_vpn.patch
-13
View File
@@ -1,13 +0,0 @@
Index: trunk/src/applet.c
===================================================================
--- trunk.orig/src/applet.c 2008-02-29 17:47:39.000000000 +0000
+++ trunk/src/applet.c 2008-02-29 17:48:38.000000000 +0000
@@ -1783,7 +1783,7 @@
}
nma_menu_add_devices (menu, applet);
- nma_menu_add_vpn_submenu (menu, applet);
+ //nma_menu_add_vpn_submenu (menu, applet);
gtk_widget_show_all (applet->menu);
meta/packages/networkmanager/networkmanager-applet_svn.bb
-33
View File
@@ -1,33 +0,0 @@
DESCRIPTION = "GTK+ applet for NetworkManager"
HOMEPAGE = "http://projects.gnome.org/NetworkManager/"
BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?query_format=specific&order=relevance+desc&bug_status=__open__&product=NetworkManager&content="
LICENSE = "GPLv2+ & LGPLv2.1+"
DEPENDS = "networkmanager dbus-glib libglade gconf gnome-keyring"
#TODO DEPENDS libnotify
RDEPENDS = "networkmanager dbus-wait"
PR = "r7"
inherit gnome gtk-icon-cache
SRC_URI = "svn://svn.gnome.org/svn/network-manager-applet/;module=trunk;proto=http \
file://applet-no-gnome.diff;patch=1;pnum=0 \
file://applet-no-animation.patch;patch=1 \
file://no_vpn.patch;patch=1 \
file://nmutil-fix.patch;patch=1 \
file://70NetworkManagerApplet.shbg"
PV = "0.0+svnr${SRCREV}"
S = "${WORKDIR}/trunk"
FILES_${PN} += "${datadir}/nm-applet/ \
${datadir}/gnome-vpn-properties/ \
${datadir}/gnome/autostart/"
do_install_append () {
install -d ${D}${sysconfdir}/X11/Xsession.d/
install -m 755 ${WORKDIR}/70NetworkManagerApplet.shbg ${D}${sysconfdir}/X11/Xsession.d/
}
#TODO: remove if libnotify in DEPENDS
EXTRA_OECONF += "--without-libnotify"
meta/packages/networkmanager/networkmanager_svn.bb
-51
View File
@@ -1,51 +0,0 @@
DESCRIPTION = "NetworkManager"
HOMEPAGE = "http://projects.gnome.org/NetworkManager/"
BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?query_format=specific&order=relevance+desc&bug_status=__open__&product=NetworkManager&content="
SECTION = "net/misc"
LICENSE = "GPLv2+ & LGPLv2+"
PRIORITY = "optional"
DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp gnome-common polkit"
RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client"
PV = "0.7+svnr${SRCREV}"
PR = "r10"
SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \
file://no-restarts.diff;patch=1;pnum=0 \
file://libnlfix.patch;patch=1 \
file://makefile-fix.patch;patch=1 \
file://allow-disabling.patch;patch=1 \
file://NetworkManager \
file://99_networkmanager"
EXTRA_OECONF = "--with-distro=debian \
--with-ip=/sbin/ip"
# TODO: will /bin/ip from busybox do?
S = "${WORKDIR}/trunk"
inherit autotools pkgconfig update-rc.d
INITSCRIPT_NAME = "NetworkManager"
INITSCRIPT_PARAMS = "defaults 22"
do_install_append () {
install -d ${D}/etc/default/volatiles
install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles
# This overwrites the provided init script
install -m 0755 ${WORKDIR}/NetworkManager ${D}/etc/init.d/
rmdir ${D}/var/run/NetworkManager
rmdir ${D}/var/run
}
PACKAGES =+ "libnmutil libnmglib"
FILES_libnmutil += "${libdir}/libnm-util.so.*"
FILES_libnmglib += "${libdir}/libnm_glib.so.*"
FILES_${PN}-dev = "${includedir}/* \
${libdir}/*.so \
${libdir}/*.a \
${libdir}/pkgconfig/*.pc \
${datadir}/NetworkManager/gdb-cmd"
meta/packages/smart/smart_1.1.bb
-29
View File
@@ -1,29 +0,0 @@
DESCRIPTION = "Next generation package handling tool."
HOMEPAGE = "http://labix.org/smart/"
LICENSE = "GPL v2+"
DEPENDS = "zlib python desktop-file-utils-native python-pygtk rpm"
SRC_URI = "http://labix.org/download/smart/smart-1.1.tar.bz2"
S = "${WORKDIR}/smart-${PV}"
inherit distutils
FILES_${PN} += "/usr/share/lib/${PYTHON_DIR}/site-packages/smart/interfaces/images/*.png \
/usr/share/lib/${PYTHON_DIR/site-packages/smart/backends/"
FILES_${PN}-doc += "/usr/share/share/man/man8/smart.8"
FILES_${PN}-locale += "/usr/share/share/locale/es_ES/LC_MESSAGES/smart.mo \
/usr/share/share/locale/it/LC_MESSAGES/smart.mo \
/usr/share/share/locale/de/LC_MESSAGES/smart.mo \
/usr/share/share/locale/ru/LC_MESSAGES/smart.mo \
/usr/share/share/locale/sv/LC_MESSAGES/smart.mo \
/usr/share/share/locale/fr/LC_MESSAGES/smart.mo \
/usr/share/share/locale/hu/LC_MESSAGES/smart.mo \
/usr/share/share/locale/zh_TW/LC_MESSAGES/smart.mo \
/usr/share/share/locale/pt_BR/LC_MESSAGES/smart.mo \
/usr/share/share/locale/zh_CN/LC_MESSAGES/smart.mo"
FILES_${PN}-dbg += "/usr/lib/${PYTHON_DIR}/site-packages/smart/backends/rpm/.debug \
/usr/lib/${PYTHON_DIR}/site-packages/smart/backends/deb/.debug \"
meta/packages/tar/tar-1.17/m4extensions.patch
Vendored
-28
View File
@@ -1,28 +0,0 @@
# Define AC_USE_SYSTEM_EXTENSIONS only if it was previously undefined.
# This is needed to configure correctly with newer versions of autoconf.
--- tar-1.17/m4/extensions.m4.orig 2010-07-22 22:21:35.000000000 -0700
+++ tar-1.17/m4/extensions.m4 2010-07-22 22:23:41.000000000 -0700
@@ -1,4 +1,4 @@
-# serial 4 -*- Autoconf -*-
+# serial 5 -*- Autoconf -*-
# Enable extensions on systems that normally disable them.
# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
@@ -16,6 +16,7 @@
# ------------------------
# Enable extensions on systems that normally disable them,
# typically due to standards-conformance issues.
+m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [], [
AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
[
AC_BEFORE([$0], [AC_COMPILE_IFELSE])
@@ -48,7 +49,7 @@
AC_DEFINE([__EXTENSIONS__])
AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
AC_DEFINE([_TANDEM_SOURCE])
-])
+])])
# gl_USE_SYSTEM_EXTENSIONS
# ------------------------
meta/packages/tar/tar.inc
-25
View File
@@ -1,25 +0,0 @@
DESCRIPTION = "GNU tar saves many files together into a single tape \
or disk archive, and can restore individual files from the archive."
HOMEPAGE = "http://www.gnu.org/software/tar/"
SECTION = "base"
SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2"
inherit autotools gettext
do_install () {
autotools_do_install
install -d ${D}${base_bindir}
mv ${D}${bindir}/tar ${D}${base_bindir}/tar.${PN}
mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN}
}
pkg_postinst_${PN} () {
update-alternatives --install ${base_bindir}/tar tar tar.${PN} 100
update-alternatives --install ${libexecdir}/rmt rmt rmt.${PN} 100
}
pkg_prerm_${PN} () {
update-alternatives --remove tar tar.${PN}
update-alternatives --remove rmt rmt.${PN}
}
meta/packages/tar/tar_1.17.bb
-14
View File
@@ -1,14 +0,0 @@
require tar.inc
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
PR = "r0"
SRC_URI += "file://m4extensions.patch"
SRC_URI[md5sum] = "c6c4f1c075dbf0f75c29737faa58f290"
SRC_URI[sha256sum] = "19f9021dda51a16295e4706e80870e71f87107675e51c176a491eba0fc4ca492"
# Required to build with gcc 4.3 and later:
CFLAGS += "-fgnu89-inline"
meta/packages/tar/tar_1.23.bb
-9
View File
@@ -1,9 +0,0 @@
require tar.inc
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
PR = "r0"
SRC_URI[md5sum] = "41e2ca4b924ec7860e51b43ad06cdb7e"
SRC_URI[sha256sum] = "c9328372db62fbb1d94c9e4e3cefc961111af46de47085b635359c00a0eebe36"
meta/packages/apmd/apmd-3.2.2-14/apmd_proxy → meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd_proxy
View File
meta/packages/apmd/apmd-3.2.2-14/apmd_proxy.conf → meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd_proxy.conf
View File
meta/packages/apmd/apmd-3.2.2-14/default → meta/recipes-bsp/apmd/apmd-3.2.2-14/default
View File
meta/packages/apmd/apmd-3.2.2-14/init → meta/recipes-bsp/apmd/apmd-3.2.2-14/init
View File
meta/packages/apmd/apmd-3.2.2-14/libtool.patch → meta/recipes-bsp/apmd/apmd-3.2.2-14/libtool.patch
View File
meta/packages/apmd/apmd-3.2.2-14/unlinux.patch → meta/recipes-bsp/apmd/apmd-3.2.2-14/unlinux.patch
View File
meta/packages/apmd/apmd-3.2.2-14/workaround.patch → meta/recipes-bsp/apmd/apmd-3.2.2-14/workaround.patch
View File
meta/packages/apmd/apmd_3.2.2-14.bb → meta/recipes-bsp/apmd/apmd_3.2.2-14.bb
View File
meta/packages/hostap/files/hostap-fw-load.patch → meta/recipes-bsp/hostap/files/hostap-fw-load.patch
View File
meta/packages/hostap/files/hostap_cs.conf → meta/recipes-bsp/hostap/files/hostap_cs.conf
View File
meta/packages/hostap/files/hostap_cs.conf-upstream → meta/recipes-bsp/hostap/files/hostap_cs.conf-upstream
View File
meta/packages/hostap/files/hostap_cs.modalias → meta/recipes-bsp/hostap/files/hostap_cs.modalias
View File
meta/packages/hostap/hostap-conf_1.0.bb → meta/recipes-bsp/hostap/hostap-conf_1.0.bb
View File
meta/packages/hostap/hostap-utils.inc → meta/recipes-bsp/hostap/hostap-utils.inc
View File
meta/packages/hostap/hostap-utils_0.4.7.bb → meta/recipes-bsp/hostap/hostap-utils_0.4.7.bb
View File
meta/packages/lrzsz/lrzsz-0.12.20/autotools.patch → meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools.patch
View File
meta/packages/lrzsz/lrzsz-0.12.20/gettext.patch → meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch
View File
meta/packages/lrzsz/lrzsz-0.12.20/makefile.patch → meta/recipes-bsp/lrzsz/lrzsz-0.12.20/makefile.patch
View File
meta/packages/lrzsz/lrzsz_0.12.20.bb → meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
View File
meta/packages/pm-utils/pm-utils_1.3.0.bb → meta/recipes-bsp/pm-utils/pm-utils_1.3.0.bb
View File
meta/packages/oh/qemu-config.bb → meta/recipes-bsp/qemu-config/qemu-config.bb
View File
meta/packages/oh/qemu-config/anjuta-remote-run → meta/recipes-bsp/qemu-config/qemu-config/anjuta-remote-run
View File
meta/packages/oh/qemu-config/distcc.sh → meta/recipes-bsp/qemu-config/qemu-config/distcc.sh
View File
meta/packages/oh/qemu-config/exports → meta/recipes-bsp/qemu-config/qemu-config/exports
View File
meta/packages/oh/qemu-config/qemu-autostart → meta/recipes-bsp/qemu-config/qemu-config/qemu-autostart
View File
meta/packages/oh/qemu-config/qemuarm/shutdown.desktop → meta/recipes-bsp/qemu-config/qemu-config/qemuarm/shutdown.desktop
View File
meta/packages/oh/qemu-config/shutdown.desktop → meta/recipes-bsp/qemu-config/qemu-config/shutdown.desktop
View File
meta/packages/setserial/setserial_2.17.bb → meta/recipes-bsp/setserial/setserial_2.17.bb
View File
meta/packages/uboot/files/fix-arm920t-eabi.patch → meta/recipes-bsp/uboot/files/fix-arm920t-eabi.patch
View File
meta/packages/uboot/u-boot-mkimage-native_1.3.2.bb → meta/recipes-bsp/uboot/u-boot-mkimage-native_1.3.2.bb
View File
meta/packages/uboot/u-boot-mkimage_2009.08.bb → meta/recipes-bsp/uboot/u-boot-mkimage_2009.08.bb
View File
meta/packages/uboot/u-boot-omap3-git/beagleboard/name.patch → meta/recipes-bsp/uboot/u-boot-omap3-git/beagleboard/name.patch
View File
meta/packages/uboot/u-boot-omap3_git.bb → meta/recipes-bsp/uboot/u-boot-omap3_git.bb
View File
meta/packages/uboot/u-boot.inc → meta/recipes-bsp/uboot/u-boot.inc
View File
meta/packages/oh/usbinit.bb → meta/recipes-bsp/usbinit/usbinit.bb
View File
meta/packages/oh/usbinit/usb-gether → meta/recipes-bsp/usbinit/usbinit/usb-gether
View File
meta/packages/usbutils/usbutils_0.86.bb → meta/recipes-bsp/usbutils/usbutils_0.86.bb
View File
meta/packages/dhcp/dhcp-4.1.1-P1/dhcp-3.0.3-dhclient-dbus.patch → meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/dhcp-3.0.3-dhclient-dbus.patch
View File
meta/packages/dhcp/dhcp-4.1.1-P1/fix-client-path.patch → meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/fix-client-path.patch
View File
meta/packages/dhcp/dhcp-4.1.1-P1/fixincludes.patch → meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/fixincludes.patch
View File
meta/packages/dhcp/dhcp-4.1.1-P1/noattrmode.patch → meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/noattrmode.patch
View File
meta/packages/dhcp/dhcp-4.1.1-P1/site.h → meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/site.h
View File
meta/packages/dhcp/dhcp3.inc → meta/recipes-connectivity/dhcp/dhcp3.inc
View File
meta/packages/dhcp/dhcp4.inc → meta/recipes-connectivity/dhcp/dhcp4.inc
View File
meta/packages/dhcp/dhcp_4.1.1-P1.bb → meta/recipes-connectivity/dhcp/dhcp_4.1.1-P1.bb
View File
meta/packages/dhcp/files/default-relay → meta/recipes-connectivity/dhcp/files/default-relay
View File
meta/packages/dhcp/files/default-server → meta/recipes-connectivity/dhcp/files/default-server
View File
meta/packages/dhcp/files/dhclient.conf → meta/recipes-connectivity/dhcp/files/dhclient.conf
View File
meta/packages/dhcp/files/dhcpd.conf → meta/recipes-connectivity/dhcp/files/dhcpd.conf
View File
meta/packages/dhcp/files/init-relay → meta/recipes-connectivity/dhcp/files/init-relay
View File
meta/packages/dhcp/files/init-server → meta/recipes-connectivity/dhcp/files/init-server
View File
meta/packages/farsight/farsight2_0.0.9.bb → meta/recipes-connectivity/farsight/farsight2_0.0.9.bb
View File
meta/packages/farsight/libnice_0.0.6.bb → meta/recipes-connectivity/farsight/libnice_0.0.6.bb
View File

Some files were not shown because too many files have changed in this diff Show More