mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
Patches used in 2009-09-27 build.
This commit is contained in:
@@ -0,0 +1,18 @@
|
||||
Note: use --dry-run, as some patches may need -p1 and others may not apply cleanly.
|
||||
|
||||
r01-config-star.patch # patches config.guess, config.sub
|
||||
r02-configure-in-withGCC4andCrossCompile.patch # same as above, plus additions from `svn diff -r 7:8`
|
||||
r03a-makefile-in.patch # Adds "Haiku" to the OS_ARCH tests.
|
||||
r03b-starmk.patch # More adding "Haiku" to the OS_ARCH tests.
|
||||
r04a-rdef-support-in-Makefile.patch # Adds rdef support to Makefiles.
|
||||
r04b-just-rdefs-no-Makefile.patch # various *.rdef
|
||||
r05-fix-shlibsign.README # Discussion that led to the patch.
|
||||
r05-fix-shlibsign.patch # hack/fix for someone defines true/false to 1/0
|
||||
r06-nss-gcc4.patch # possible gcc4 and header fixes for nss/
|
||||
r07-working-nspr-from-haikuports.patch # applying this instead of 89-unmodified.patch will allow proper compilation, at the cost of losing your newest nspr work.
|
||||
r08-misc.patch # numerous patches. not sure which patches are dependant on each other.
|
||||
# Fonts, AppRunner, AppShell, DragService, nsToolKit, plevent, maybe more.
|
||||
r09-sunbird-options-fix.patch # small fix for Sunbird's option window
|
||||
r11-bookmarks-v2.patch # changes the default startup page, bookmarks, allows UserGuide and Welcome to be fetched locally or from svn
|
||||
r10-grey-menu-color.patch # switches the blue menu highlight selection color for grey.
|
||||
r12-releasenotes.patch # removes the 2nd first-run tab, changes release notes to about:buildconfig
|
||||
5296
www-client/mozilla-firefox/patches/2009-09-27/r01-config-star.patch
Normal file
5296
www-client/mozilla-firefox/patches/2009-09-27/r01-config-star.patch
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,362 @@
|
||||
Index: configure.in
|
||||
===================================================================
|
||||
--- configure.in (revision 7)
|
||||
+++ configure.in (working copy)
|
||||
@@ -880,11 +880,17 @@
|
||||
OS_RELEASE=
|
||||
OS_TEST="${target_cpu}"
|
||||
case "${target_os}" in
|
||||
- linux*) OS_ARCH=Linux ;;
|
||||
- solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
|
||||
- mingw*) OS_ARCH=WINNT ;;
|
||||
- wince*) OS_ARCH=WINCE ;;
|
||||
- darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;;
|
||||
+ linux*) OS_ARCH=Linux ;;
|
||||
+ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
|
||||
+ mingw*) OS_ARCH=WINNT ;;
|
||||
+ wince*) OS_ARCH=WINCE ;;
|
||||
+ darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;;
|
||||
+ beos* | haiku*) OS_ARCH=BeOS OS_TARGET=BeOS ;;
|
||||
+dnl -------------------------------------------------------
|
||||
+dnl Cross-compiling-haiku - This should probably be
|
||||
+dnl beos*) OS_ARCH=BeOS OS_TARGET=BeOS ;;
|
||||
+dnl haiku*) OS_ARCH=Haiku OS_TARGET=Haiku ;;
|
||||
+dnl -------------------------------------------------------
|
||||
esac
|
||||
else
|
||||
OS_TARGET=`uname -s`
|
||||
@@ -1002,6 +1008,14 @@
|
||||
UnixWare)
|
||||
HOST_OS_ARCH=UNIXWARE
|
||||
;;
|
||||
+beos* | haiku*)
|
||||
+ HOST_OS_ARCH=BeOS
|
||||
+ ;;
|
||||
+dnl -------------------------------------------------------
|
||||
+dnl This should probably be
|
||||
+dnl beos*) HOST_OS_ARCH=BeOS ;;
|
||||
+dnl haiku*) HOST_OS_ARCH=Haiku ;;
|
||||
+dnl -------------------------------------------------------
|
||||
esac
|
||||
|
||||
case "$OS_ARCH" in
|
||||
@@ -1338,7 +1352,7 @@
|
||||
dnl System overrides of the defaults for host
|
||||
dnl ========================================================
|
||||
case "$host" in
|
||||
-*-beos*)
|
||||
+*-beos*|*-haiku*)
|
||||
HOST_CFLAGS="$HOST_CFLAGS -DXP_BEOS -DBeOS -DBEOS -D_POSIX_SOURCE -DNO_X11"
|
||||
HOST_NSPR_MDCPUCFG='\"md/_beos.cfg\"'
|
||||
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
|
||||
@@ -1482,17 +1496,35 @@
|
||||
AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
|
||||
;;
|
||||
|
||||
-*-beos*)
|
||||
+*-beos*|*-haiku*)
|
||||
no_x=yes
|
||||
- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@'
|
||||
_PLATFORM_DEFAULT_TOOLKIT="beos"
|
||||
+ TARGET_NSPR_MDCPUCFG='\"md/_beos.cfg\"'
|
||||
+ TARGET_MD_ARCH=beos
|
||||
+
|
||||
+ DSO_PIC_CFLAGS=-fPIC
|
||||
DSO_LDOPTS='-nostart'
|
||||
+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@'
|
||||
+ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@'
|
||||
TK_LIBS='-lbe -lroot'
|
||||
LIBS="$LIBS -lbe"
|
||||
+
|
||||
+ _HAIKU_BUILD=0
|
||||
+
|
||||
if test "$COMPILE_ENVIRONMENT"; then
|
||||
+ AC_CHECK_LIB(network,main,_HAIKU_BUILD=1)
|
||||
+ fi
|
||||
+ if test "$_HAIKU_BUILD" = 1; then
|
||||
+ LIBS="$LIBS -lnetwork"
|
||||
+ AC_DEFINE(XP_HAIKU)
|
||||
+ AC_DEFINE(__BEOS__)
|
||||
+ AC_DEFINE(BONE_VERSION)
|
||||
+ else
|
||||
AC_CHECK_LIB(bind,main,LIBS="$LIBS -lbind")
|
||||
AC_CHECK_LIB(zeta,main,LIBS="$LIBS -lzeta")
|
||||
+ AC_DEFINE(BEOS_ADDON_WORKAROUND)
|
||||
fi
|
||||
+
|
||||
_WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Wno-multichar"
|
||||
_WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wno-multichar"
|
||||
_MOZ_USE_RTTI=1
|
||||
@@ -2692,8 +2724,10 @@
|
||||
])
|
||||
if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \
|
||||
"$ac_cv_have_visibility_class_bug" = "no"; then
|
||||
- VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
|
||||
- WRAP_SYSTEM_INCLUDES=1
|
||||
+ # HACK for Haiku GCC4 -- enforce '-fvisibility=hidden'
|
||||
+ #VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
|
||||
+ #WRAP_SYSTEM_INCLUDES=1
|
||||
+ VISIBILITY_FLAGS='-fvisibility=hidden'
|
||||
else
|
||||
VISIBILITY_FLAGS='-fvisibility=hidden'
|
||||
fi # have visibility pragma bug
|
||||
@@ -2761,6 +2795,8 @@
|
||||
case $target in
|
||||
*-darwin*)
|
||||
;;
|
||||
+*-beos*|*-haiku*)
|
||||
+ ;;
|
||||
*)
|
||||
AC_CHECK_LIB(dl, dlopen,
|
||||
AC_CHECK_HEADER(dlfcn.h,
|
||||
@@ -3125,7 +3161,7 @@
|
||||
fi
|
||||
|
||||
case $target_os in
|
||||
- os2*|msvc*|mks*|cygwin*|mingw*|darwin*|wince*)
|
||||
+ os2*|msvc*|mks*|cygwin*|mingw*|darwin*|wince*|beos*|haiku*)
|
||||
;;
|
||||
*)
|
||||
|
||||
@@ -5242,7 +5278,7 @@
|
||||
dnl Image decoders
|
||||
dnl ========================================================
|
||||
case "$target_os" in
|
||||
-cygwin*|mingw*|msvc*|mks*|os2*|wince*|beos*)
|
||||
+cygwin*|mingw*|msvc*|mks*|os2*|wince*|beos*|haiku*)
|
||||
MOZ_IMG_DECODERS_DEFAULT="$MOZ_IMG_DECODERS_DEFAULT icon"
|
||||
;;
|
||||
darwin*)
|
||||
@@ -5689,7 +5725,7 @@
|
||||
|
||||
MOZ_DEBUG_ENABLE_DEFS="-DDEBUG -D_DEBUG"
|
||||
case "${target_os}" in
|
||||
- beos*)
|
||||
+ beos*|haiku*)
|
||||
MOZ_DEBUG_ENABLE_DEFS="$MOZ_DEBUG_ENABLE_DEFS -DDEBUG_${USER}"
|
||||
;;
|
||||
msvc*|mks*|cygwin*|mingw*|os2*|wince*)
|
||||
@@ -6725,7 +6761,7 @@
|
||||
os2*)
|
||||
MOZ_LIBART_LIBS='-lmoz_art -lm'
|
||||
;;
|
||||
- beos*)
|
||||
+ beos*|haiku*)
|
||||
MOZ_LIBART_LIBS='-lmoz_art_lgpl -lroot -lbe'
|
||||
;;
|
||||
*)
|
||||
@@ -7377,6 +7413,9 @@
|
||||
elif test "$OS_ARCH" = "BeOS"; then
|
||||
AC_DEFINE(XP_BEOS)
|
||||
MOZ_MOVEMAIL=1
|
||||
+elif test "$OS_ARCH" = "Haiku"; then
|
||||
+ AC_DEFINE(XP_BEOS)
|
||||
+ MOZ_MOVEMAIL=1
|
||||
elif test "$OS_ARCH" = "Darwin"; then
|
||||
AC_DEFINE(XP_UNIX)
|
||||
AC_DEFINE(UNIX_ASYNC_DNS)
|
||||
Index: directory/c-sdk/configure.in
|
||||
===================================================================
|
||||
--- directory/c-sdk/configure.in (revision 7)
|
||||
+++ directory/c-sdk/configure.in (working copy)
|
||||
@@ -360,7 +360,7 @@
|
||||
AC_DEFINE(DEBUG)
|
||||
DEFINES="$DEFINES -UNDEBUG"
|
||||
case "${target_os}" in
|
||||
- beos*)
|
||||
+ beos*|haiku*)
|
||||
DEFINES="$DEFINES -DDEBUG_${USER}"
|
||||
;;
|
||||
msvc*|mks*|cygwin*|mingw*|os2*)
|
||||
@@ -563,10 +563,16 @@
|
||||
OS_RELEASE=
|
||||
OS_TEST="${target_cpu}"
|
||||
case "${target_os}" in
|
||||
- linux*) OS_ARCH=Linux ;;
|
||||
- solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
|
||||
- mingw*) OS_ARCH=WINNT ;;
|
||||
- darwin*) OS_ARCH=Darwin ;;
|
||||
+ linux*) OS_ARCH=Linux ;;
|
||||
+ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
|
||||
+ mingw*) OS_ARCH=WINNT ;;
|
||||
+ darwin*) OS_ARCH=Darwin ;;
|
||||
+ beos* | haiku*) OS_ARCH=BeOS OS_TARGET=BeOS ;;
|
||||
+dnl -------------------------------------------------------
|
||||
+dnl Cross-compiling-haiku - This should probably be
|
||||
+dnl beos*) OS_ARCH=BeOS OS_TARGET=BeOS ;;
|
||||
+dnl haiku*) OS_ARCH=Haiku OS_TARGET=Haiku ;;
|
||||
+dnl -------------------------------------------------------
|
||||
esac
|
||||
else
|
||||
OS_ARCH=`uname -s | sed -e 's|/|_|g'`
|
||||
@@ -733,7 +739,7 @@
|
||||
fi
|
||||
WIN_TOP_SRC=`cygpath -a -w $srcdir | sed -e 's|\\\\|/|g'`
|
||||
;;
|
||||
-*-beos*)
|
||||
+*-beos*|*-haiku*)
|
||||
HOST_CFLAGS="$HOST_CFLAGS -DXP_BEOS -DBeOS -DBEOS -D_POSIX_SOURCE"
|
||||
;;
|
||||
*os2*)
|
||||
@@ -812,24 +818,40 @@
|
||||
RESOLVE_LINK_SYMBOLS=1
|
||||
;;
|
||||
|
||||
-*-beos*)
|
||||
+*-beos*|*-haiku*)
|
||||
AC_DEFINE(XP_BEOS)
|
||||
AC_DEFINE(BeOS)
|
||||
AC_DEFINE(BEOS)
|
||||
AC_DEFINE(_POSIX_SOURCE)
|
||||
+ DSO_CFLAGS=-fPIC
|
||||
DSO_LDOPTS=-nostart
|
||||
+
|
||||
MDCPUCFG_H=_beos.cfg
|
||||
USE_BTHREADS=1
|
||||
PR_MD_ARCH_DIR=beos
|
||||
RESOLVE_LINK_SYMBOLS=1
|
||||
+
|
||||
+ _HAIKU_BUILD=0
|
||||
+ AC_CHECK_LIB(network,main,_HAIKU_BUILD=1)
|
||||
+ if test "$_HAIKU_BUILD" = 1; then
|
||||
+ OS_LIBS="$OS_LIBS -lnetwork"
|
||||
+ AC_DEFINE(XP_HAIKU)
|
||||
+ AC_DEFINE(BONE_VERSION)
|
||||
+ else
|
||||
+ AC_CHECK_LIB(bind, gethostbyaddr, [OS_LIBS="$OS_LIBS -lbind -lsocket"])
|
||||
+ fi
|
||||
+
|
||||
case "${target_cpu}" in
|
||||
i*86)
|
||||
- _OPTIMIZE_FLAGS=-O2
|
||||
- _DEBUG_FLAGS='-gdwarf-2 -O0'
|
||||
- MKSHLIB='$(CCC) $(DSO_LDOPTS) -o $@'
|
||||
- AC_CHECK_LIB(bind, gethostbyaddr, [OS_LIBS="$OS_LIBS -lbind -lsocket"])
|
||||
+ AC_DEFINE(i586)
|
||||
+ CPU_ARCH=i586
|
||||
+ _OPTIMIZE_FLAGS=-O3
|
||||
+ _DEBUG_FLAGS='-gdwarf-2 -O0 -fno-inline'
|
||||
+ MKSHLIB='$(CXX) $(DSO_LDOPTS) -o $@'
|
||||
;;
|
||||
powerpc)
|
||||
+ AC_DEFINE(ppc)
|
||||
+ CPU_ARCH=ppc
|
||||
CC=mwcc
|
||||
CCC=mwcc
|
||||
LD=mwld
|
||||
@@ -2095,7 +2117,7 @@
|
||||
fi])
|
||||
|
||||
case "$target" in
|
||||
-*-beos*)
|
||||
+*-beos*|*-haiku*)
|
||||
AC_ARG_WITH(bthreads,
|
||||
[ --with-bthreads Use system bthreads library as thread subsystem (BeOS only)],
|
||||
[ if test "$withval" = "yes"; then
|
||||
Index: nsprpub/configure.in
|
||||
===================================================================
|
||||
--- nsprpub/configure.in (revision 7)
|
||||
+++ nsprpub/configure.in (working copy)
|
||||
@@ -381,7 +381,7 @@
|
||||
DEFINES="$DEFINES -UNDEBUG"
|
||||
|
||||
case "${target_os}" in
|
||||
- beos*)
|
||||
+ beos*|haiku*)
|
||||
DEFINES="$DEFINES -DDEBUG_${USER}"
|
||||
;;
|
||||
msvc*|mks*|cygwin*|mingw*|os2*)
|
||||
@@ -652,6 +652,12 @@
|
||||
solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
|
||||
mingw*) OS_ARCH=WINNT ;;
|
||||
darwin*) OS_ARCH=Darwin ;;
|
||||
+ beos*|haiku*) OS_ARCH=BeOS OS_TARGET=BeOS OS_RELEASE=R5 ;;
|
||||
+dnl -------------------------------------------------------
|
||||
+dnl Cross-compiling-haiku - This should probably be
|
||||
+dnl beos*) OS_ARCH=BeOS OS_TARGET=BeOS OS_RELEASE=R5 ;;
|
||||
+dnl haiku*) OS_ARCH=Haiku OS_TARGET=Haiku OS_RELEASE=R1 ;;
|
||||
+dnl -------------------------------------------------------
|
||||
esac
|
||||
else
|
||||
OS_ARCH=`uname -s | sed -e 's|/|_|g'`
|
||||
@@ -823,7 +829,7 @@
|
||||
CYGWIN_WRAPPER='sh $(topsrcdir)/build/cygwin-wrapper'
|
||||
fi
|
||||
;;
|
||||
-*-beos*)
|
||||
+*-beos*|*-haiku*)
|
||||
HOST_CFLAGS="$HOST_CFLAGS -DXP_BEOS -DBeOS -DBEOS -D_POSIX_SOURCE"
|
||||
;;
|
||||
*os2*)
|
||||
@@ -898,24 +904,40 @@
|
||||
RESOLVE_LINK_SYMBOLS=1
|
||||
;;
|
||||
|
||||
-*-beos*)
|
||||
+*-beos*|*-haiku*)
|
||||
AC_DEFINE(XP_BEOS)
|
||||
AC_DEFINE(BeOS)
|
||||
AC_DEFINE(BEOS)
|
||||
AC_DEFINE(_POSIX_SOURCE)
|
||||
- DSO_LDOPTS=-nostart
|
||||
+ DSO_CFLAGS=-fPIC
|
||||
+ DSO_LDOPTS='-nostart'
|
||||
+
|
||||
MDCPUCFG_H=_beos.cfg
|
||||
USE_BTHREADS=1
|
||||
PR_MD_ARCH_DIR=beos
|
||||
RESOLVE_LINK_SYMBOLS=1
|
||||
+
|
||||
+ _HAIKU_BUILD=0
|
||||
+ AC_CHECK_LIB(network,main,_HAIKU_BUILD=1)
|
||||
+ if test "$_HAIKU_BUILD" = 1; then
|
||||
+ OS_LIBS="$OS_LIBS -lnetwork"
|
||||
+ AC_DEFINE(XP_HAIKU)
|
||||
+ AC_DEFINE(BONE_VERSION)
|
||||
+ else
|
||||
+ AC_CHECK_LIB(bind, gethostbyaddr, [OS_LIBS="$OS_LIBS -lbind -lsocket"])
|
||||
+ fi
|
||||
+
|
||||
case "${target_cpu}" in
|
||||
i*86)
|
||||
- _OPTIMIZE_FLAGS=-O2
|
||||
- _DEBUG_FLAGS='-gdwarf-2 -O0'
|
||||
- MKSHLIB='$(CCC) $(DSO_LDOPTS) -o $@'
|
||||
- AC_CHECK_LIB(bind, gethostbyaddr, [OS_LIBS="$OS_LIBS -lbind -lsocket"])
|
||||
+ AC_DEFINE(i586)
|
||||
+ CPU_ARCH=i586
|
||||
+ _OPTIMIZE_FLAGS=-O3
|
||||
+ _DEBUG_FLAGS='-gdwarf-2 -O0 -fno-inline'
|
||||
+ MKSHLIB='$(CXX) $(DSO_LDOPTS) -o $@'
|
||||
;;
|
||||
powerpc)
|
||||
+ AC_DEFINE(ppc)
|
||||
+ CPU_ARCH=ppc
|
||||
CC=mwcc
|
||||
CCC=mwcc
|
||||
LD=mwld
|
||||
@@ -2245,11 +2267,13 @@
|
||||
|
||||
dnl We don't want anything to link with libdl even if it's present on OS X,
|
||||
dnl since it's not used and not part of the default installation.
|
||||
-dnl The same goes for BeOS.
|
||||
+dnl The same goes for BeOS and Haiku.
|
||||
|
||||
case $target in
|
||||
-*-darwin*|*-beos*)
|
||||
+*-darwin*)
|
||||
;;
|
||||
+*-beos*|*-haiku*)
|
||||
+ ;;
|
||||
*)
|
||||
AC_CHECK_LIB(dl, dlopen,
|
||||
AC_CHECK_HEADER(dlfcn.h,
|
||||
@@ -2438,7 +2462,7 @@
|
||||
fi])
|
||||
|
||||
case "$target" in
|
||||
-*-beos*)
|
||||
+*-beos*|*-haiku*)
|
||||
AC_ARG_WITH(bthreads,
|
||||
[ --with-bthreads Use system bthreads library as thread subsystem
|
||||
(BeOS only)],
|
||||
@@ -0,0 +1,375 @@
|
||||
Index: browser/app/Makefile.in
|
||||
===================================================================
|
||||
--- browser/app/Makefile.in (revision 7)
|
||||
+++ browser/app/Makefile.in (working copy)
|
||||
@@ -151,7 +151,7 @@
|
||||
endif
|
||||
endif
|
||||
|
||||
-ifeq ($(OS_ARCH),BeOS)
|
||||
+ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
BEOS_PROGRAM_RESOURCE = $(srcdir)/apprunner-beos.rsrc
|
||||
ifdef BUILD_STATIC_LIBS
|
||||
OS_LIBS += -ltracker -lgame
|
||||
Index: browser/components/migration/src/Makefile.in
|
||||
===================================================================
|
||||
--- browser/components/migration/src/Makefile.in (revision 7)
|
||||
+++ browser/components/migration/src/Makefile.in (working copy)
|
||||
@@ -78,7 +78,7 @@
|
||||
nsPhoenixProfileMigrator.cpp \
|
||||
$(NULL)
|
||||
|
||||
-ifneq ($(OS_ARCH),BeOS)
|
||||
+ifneq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
CPPSRCS += nsDogbertProfileMigrator.cpp
|
||||
endif
|
||||
|
||||
Index: calendar/libical/src/libical/Makefile.in
|
||||
===================================================================
|
||||
--- calendar/libical/src/libical/Makefile.in (revision 7)
|
||||
+++ calendar/libical/src/libical/Makefile.in (working copy)
|
||||
@@ -89,7 +89,7 @@
|
||||
|
||||
DEFINES += -DHAVE_CONFIG_H
|
||||
|
||||
-ifneq (,$(filter BeOS Darwin OpenVMS NetBSD FreeBSD,$(OS_ARCH)))
|
||||
+ifneq (,$(filter BeOS Haiku Darwin OpenVMS NetBSD FreeBSD,$(OS_ARCH)))
|
||||
DEFINES += -D__USE_BSD=1
|
||||
endif
|
||||
|
||||
Index: calendar/sunbird/app/Makefile.in
|
||||
===================================================================
|
||||
--- calendar/sunbird/app/Makefile.in (revision 7)
|
||||
+++ calendar/sunbird/app/Makefile.in (working copy)
|
||||
@@ -194,7 +194,8 @@
|
||||
endif
|
||||
endif
|
||||
|
||||
-ifeq ($(OS_ARCH),BeOS)
|
||||
+ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
+BEOS_PROGRAM_RESOURCE = $(srcdir)/apprunner-beos.rsrc
|
||||
ifdef BUILD_STATIC_LIBS
|
||||
OS_LIBS += -ltracker -lgame
|
||||
endif
|
||||
Index: directory/c-sdk/ldap/libraries/libldap/Makefile.in
|
||||
===================================================================
|
||||
--- directory/c-sdk/ldap/libraries/libldap/Makefile.in (revision 7)
|
||||
+++ directory/c-sdk/ldap/libraries/libldap/Makefile.in (working copy)
|
||||
@@ -237,7 +237,7 @@
|
||||
SHARED_LIBRARY_LIBS = $(dist_libdir)/lib$(LBER_LIBNAME).a
|
||||
endif
|
||||
|
||||
-ifeq ($(OS_ARCH), BeOS)
|
||||
+ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe
|
||||
endif
|
||||
|
||||
@@ -302,7 +302,7 @@
|
||||
ifdef SO_FILES_TO_REMOVE
|
||||
-$(RM) $(SO_FILES_TO_REMOVE)
|
||||
endif
|
||||
-ifneq (,$(filter AIX Linux HP-UX Darwin BeOS QNX NetBSD OSF1 OpenBSD, $(OS_ARCH)))
|
||||
+ifneq (,$(filter AIX Linux HP-UX Darwin BeOS Haiku QNX NetBSD OSF1 OpenBSD, $(OS_ARCH)))
|
||||
$(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a
|
||||
else
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
Index: directory/c-sdk/ldap/libraries/libprldap/Makefile.in
|
||||
===================================================================
|
||||
--- directory/c-sdk/ldap/libraries/libprldap/Makefile.in (revision 7)
|
||||
+++ directory/c-sdk/ldap/libraries/libprldap/Makefile.in (working copy)
|
||||
@@ -165,7 +165,7 @@
|
||||
EXTRA_LIBS += -L$(dist_libdir) $(DYNAMICNSPR)
|
||||
endif
|
||||
|
||||
-ifeq ($(OS_ARCH), BeOS)
|
||||
+ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
EXTRA_LIBS = -L$(dist_libdir) -l$(LDAP_LIBNAME)
|
||||
EXTRA_LIBS += -L$(dist_libdir) $(DYNAMICNSPR)
|
||||
endif
|
||||
Index: directory/c-sdk/ldap/libraries/libssldap/Makefile
|
||||
===================================================================
|
||||
--- directory/c-sdk/ldap/libraries/libssldap/Makefile (revision 7)
|
||||
+++ directory/c-sdk/ldap/libraries/libssldap/Makefile (working copy)
|
||||
@@ -167,7 +167,7 @@
|
||||
EXTRA_LIBS += $(OS_LIBS)
|
||||
endif
|
||||
|
||||
-ifeq ($(OS_ARCH), BeOS)
|
||||
+ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
EXTRA_LIBS = -L$(dist_libdir) -l$(LDAP_LIBNAME) -l$(PRLDAP_LIBNAME)
|
||||
ifeq ($(NSS_DYNAMIC_SOFTOKN),1)
|
||||
EXTRA_LIBS += -l$(SOFTOKN_LIBNAME)
|
||||
Index: directory/c-sdk/ldap/libraries/libssldap/Makefile.in
|
||||
===================================================================
|
||||
--- directory/c-sdk/ldap/libraries/libssldap/Makefile.in (revision 7)
|
||||
+++ directory/c-sdk/ldap/libraries/libssldap/Makefile.in (working copy)
|
||||
@@ -182,7 +182,7 @@
|
||||
EXTRA_LIBS += $(OS_LIBS)
|
||||
endif
|
||||
|
||||
-ifeq ($(OS_ARCH), BeOS)
|
||||
+ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
EXTRA_LIBS = -L$(dist_libdir) -l$(LDAP_LIBNAME) -l$(PRLDAP_LIBNAME)
|
||||
ifeq ($(NSS_DYNAMIC_SOFTOKN),1)
|
||||
EXTRA_LIBS += -l$(SOFTOKN_LIBNAME)
|
||||
Index: embedding/componentlib/Makefile.in
|
||||
===================================================================
|
||||
--- embedding/componentlib/Makefile.in (revision 7)
|
||||
+++ embedding/componentlib/Makefile.in (working copy)
|
||||
@@ -152,7 +152,7 @@
|
||||
OS_LIBS += ole32.lib shell32.lib
|
||||
endif
|
||||
|
||||
-ifeq ($(OS_ARCH),BeOS)
|
||||
+ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
OS_LIBS += -ltracker
|
||||
endif
|
||||
|
||||
Index: intl/uconv/src/Makefile.in
|
||||
===================================================================
|
||||
--- intl/uconv/src/Makefile.in (revision 7)
|
||||
+++ intl/uconv/src/Makefile.in (working copy)
|
||||
@@ -119,7 +119,7 @@
|
||||
CPPSRCS += nsMacCharset.cpp
|
||||
EXPORT_RESOURCE += maccharset.properties
|
||||
else
|
||||
-ifeq ($(OS_ARCH),BeOS)
|
||||
+ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
CPPSRCS += nsBeOSCharset.cpp
|
||||
else
|
||||
CPPSRCS += nsUNIXCharset.cpp
|
||||
Index: ipc/ipcd/client/src/Makefile.in
|
||||
===================================================================
|
||||
--- ipc/ipcd/client/src/Makefile.in (revision 7)
|
||||
+++ ipc/ipcd/client/src/Makefile.in (working copy)
|
||||
@@ -64,7 +64,7 @@
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
CPPSRCS += ipcConnectionWin.cpp
|
||||
else
|
||||
-ifeq ($(OS_ARCH),BeOS)
|
||||
+ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
CPPSRCS += ipcConnectionStub.cpp
|
||||
else
|
||||
CPPSRCS += ipcConnectionUnix.cpp
|
||||
Index: ipc/ipcd/daemon/src/Makefile.in
|
||||
===================================================================
|
||||
--- ipc/ipcd/daemon/src/Makefile.in (revision 7)
|
||||
+++ ipc/ipcd/daemon/src/Makefile.in (working copy)
|
||||
@@ -59,7 +59,7 @@
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
CPPSRCS += ipcdWin.cpp
|
||||
else
|
||||
-ifeq ($(OS_ARCH),BeOS)
|
||||
+ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
CPPSRCS += ipcdStub.cpp
|
||||
else
|
||||
CPPSRCS += ipcdUnix.cpp
|
||||
Index: js/src/Makefile.in
|
||||
===================================================================
|
||||
--- js/src/Makefile.in (revision 7)
|
||||
+++ js/src/Makefile.in (working copy)
|
||||
@@ -246,7 +246,7 @@
|
||||
LDFLAGS += $(pathsubst -l%,$(NSPR_STATIC_PATH)/%.a,$(NSPR_LIBS))
|
||||
|
||||
# BeOS and HP-UX do not require the extra linking of "-lm"
|
||||
-ifeq (,$(filter BeOS HP-UX WINNT WINCE OpenVMS,$(OS_ARCH)))
|
||||
+ifeq (,$(filter BeOS Haiku HP-UX WINNT WINCE OpenVMS,$(OS_ARCH)))
|
||||
LDFLAGS += -lm
|
||||
endif
|
||||
|
||||
Index: mail/app/Makefile.in
|
||||
===================================================================
|
||||
--- mail/app/Makefile.in (revision 7)
|
||||
+++ mail/app/Makefile.in (working copy)
|
||||
@@ -149,7 +149,7 @@
|
||||
endif
|
||||
endif
|
||||
|
||||
-ifeq ($(OS_ARCH),BeOS)
|
||||
+ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
BEOS_PROGRAM_RESOURCE = $(srcdir)/apprunner-beos.rsrc
|
||||
ifdef BUILD_STATIC_LIBS
|
||||
OS_LIBS += -ltracker -lgame
|
||||
Index: modules/libpr0n/decoders/Makefile.in
|
||||
===================================================================
|
||||
--- modules/libpr0n/decoders/Makefile.in (revision 7)
|
||||
+++ modules/libpr0n/decoders/Makefile.in (working copy)
|
||||
@@ -52,7 +52,7 @@
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
DIRS = icon/os2 icon
|
||||
endif
|
||||
-ifeq ($(OS_ARCH),BeOS)
|
||||
+ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
DIRS = icon/beos icon
|
||||
endif
|
||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||
Index: modules/libpr0n/decoders/icon/Makefile.in
|
||||
===================================================================
|
||||
--- modules/libpr0n/decoders/icon/Makefile.in (revision 7)
|
||||
+++ modules/libpr0n/decoders/icon/Makefile.in (working copy)
|
||||
@@ -82,7 +82,7 @@
|
||||
PLATFORM = mac
|
||||
endif
|
||||
|
||||
-ifeq ($(OS_ARCH),BeOS)
|
||||
+ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
PLATFORM = beos
|
||||
endif
|
||||
|
||||
@@ -102,7 +102,7 @@
|
||||
ifdef MOZ_ENABLE_GNOMEUI
|
||||
USE_ICON_DECODER = 1
|
||||
endif
|
||||
-ifeq (,$(filter-out Darwin OS2 BeOS,$(OS_ARCH)))
|
||||
+ifeq (,$(filter-out Darwin OS2 BeOS Haiku,$(OS_ARCH)))
|
||||
USE_ICON_DECODER = 1
|
||||
endif
|
||||
|
||||
Index: modules/plugin/base/src/Makefile.in
|
||||
===================================================================
|
||||
--- modules/plugin/base/src/Makefile.in (revision 7)
|
||||
+++ modules/plugin/base/src/Makefile.in (working copy)
|
||||
@@ -96,7 +96,7 @@
|
||||
nsJSNPRuntime.cpp \
|
||||
$(NULL)
|
||||
|
||||
-ifeq ($(OS_ARCH), BeOS)
|
||||
+ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
CPPSRCS += nsPluginsDirBeOS.cpp
|
||||
CPPSRCS += nsPluginNativeWindow.cpp
|
||||
else
|
||||
Index: modules/libreg/src/Makefile.in
|
||||
===================================================================
|
||||
--- modules/libreg/src/Makefile.in (revision 7)
|
||||
+++ modules/libreg/src/Makefile.in (working copy)
|
||||
@@ -66,7 +66,7 @@
|
||||
|
||||
DEFINES += -DUSE_BUFFERED_REGISTRY_IO
|
||||
# Memory mapped files are not supported under QNX, Neutrino, HP-UX and BeOS
|
||||
-#ifeq (,$(filter BeOS HP-UX QNX,$(OS_ARCH)))
|
||||
+#ifeq (,$(filter BeOS Haiku HP-UX QNX,$(OS_ARCH)))
|
||||
#CSRCS += mmapio.c
|
||||
#DEFINES += -DUSE_MMAP_REGISTRY_IO
|
||||
#endif
|
||||
Index: nsprpub/lib/prstreams/Makefile.in
|
||||
===================================================================
|
||||
--- nsprpub/lib/prstreams/Makefile.in (revision 7)
|
||||
+++ nsprpub/lib/prstreams/Makefile.in (working copy)
|
||||
@@ -69,7 +69,7 @@
|
||||
endif
|
||||
endif
|
||||
|
||||
-ifeq ($(OS_ARCH), BeOS)
|
||||
+ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
CFLAGS += -frtti -fexceptions
|
||||
endif
|
||||
|
||||
@@ -118,7 +118,7 @@
|
||||
endif
|
||||
endif
|
||||
|
||||
-ifeq ($(OS_ARCH),BeOS)
|
||||
+ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
OS_LIBS = -lstdc++.r4
|
||||
endif
|
||||
|
||||
Index: toolkit/library/Makefile.in
|
||||
===================================================================
|
||||
--- toolkit/library/Makefile.in (revision 7)
|
||||
+++ toolkit/library/Makefile.in (working copy)
|
||||
@@ -364,7 +364,7 @@
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS)
|
||||
endif
|
||||
|
||||
-ifeq ($(OS_ARCH),BeOS)
|
||||
+ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
EXTRA_DSO_LDOPTS += -lbe
|
||||
endif
|
||||
|
||||
Index: xpcom/build/Makefile.in
|
||||
===================================================================
|
||||
--- xpcom/build/Makefile.in (revision 7)
|
||||
+++ xpcom/build/Makefile.in (working copy)
|
||||
@@ -173,7 +173,7 @@
|
||||
EXTRA_DSO_LDOPTS += $(TK_LIBS)
|
||||
endif
|
||||
|
||||
-ifeq ($(OS_ARCH),BeOS)
|
||||
+ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
EXTRA_DSO_LDOPTS += -lbe
|
||||
endif
|
||||
|
||||
Index: xpcom/obsolete/Makefile.in
|
||||
===================================================================
|
||||
--- xpcom/obsolete/Makefile.in (revision 7)
|
||||
+++ xpcom/obsolete/Makefile.in (working copy)
|
||||
@@ -120,7 +120,7 @@
|
||||
EXTRA_DSO_LDOPTS += $(TK_LIBS)
|
||||
endif
|
||||
|
||||
-ifeq ($(OS_ARCH),BeOS)
|
||||
+ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
EXTRA_DSO_LDOPTS += -lbe
|
||||
endif
|
||||
|
||||
Index: xpcom/reflect/xptcall/src/md/unix/Makefile.in
|
||||
===================================================================
|
||||
--- xpcom/reflect/xptcall/src/md/unix/Makefile.in (revision 7)
|
||||
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in (working copy)
|
||||
@@ -95,9 +95,10 @@
|
||||
endif
|
||||
endif
|
||||
#
|
||||
-# BeOS/Intel (uses the same unixish_x86 code)
|
||||
+# BeOS/Intel (uses the same as Linux, works well. Migrate others!)
|
||||
#
|
||||
-ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC)
|
||||
+#ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC)
|
||||
+ifeq (,$(filter-out BeOSBePC HaikuBePC, $(OS_ARCH)$(OS_TEST)))
|
||||
CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp
|
||||
endif
|
||||
#
|
||||
Index: xpinstall/packager/Makefile.in
|
||||
===================================================================
|
||||
--- xpinstall/packager/Makefile.in (revision 7)
|
||||
+++ xpinstall/packager/Makefile.in (working copy)
|
||||
@@ -48,7 +48,7 @@
|
||||
ifeq ($(OS_ARCH),IRIX)
|
||||
STRIP_FLAGS = -f
|
||||
endif
|
||||
-ifeq ($(OS_ARCH),BeOS)
|
||||
+ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
STRIP_FLAGS = -g
|
||||
PLATFORM_EXCLUDE_LIST = ! -name "*.stub" ! -name "$(MOZ_PKG_APPNAME)-bin"
|
||||
endif
|
||||
Index: xulrunner/app/Makefile.in
|
||||
===================================================================
|
||||
--- xulrunner/app/Makefile.in (revision 7)
|
||||
+++ xulrunner/app/Makefile.in (working copy)
|
||||
@@ -59,7 +59,7 @@
|
||||
ifeq ($(USE_SHORT_LIBNAME), 1)
|
||||
PROGRAM = xulrunner$(BIN_SUFFIX)
|
||||
else
|
||||
-ifeq ($(OS_ARCH), BeOS)
|
||||
+ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
PROGRAM = xulrunner$(BIN_SUFFIX)
|
||||
else
|
||||
PROGRAM = xulrunner-bin$(BIN_SUFFIX)
|
||||
@@ -85,7 +85,7 @@
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
CPPSRCS += nsRegisterGREWin.cpp
|
||||
else
|
||||
-ifneq (,$(filter OS2 Darwin,$(OS_ARCH)))
|
||||
+ifneq (,$(filter OS2 Darwin BeOS Haiku,$(OS_ARCH)))
|
||||
CPPSRCS += nsRegisterGREVoid.cpp
|
||||
else
|
||||
CPPSRCS += nsRegisterGREUnix.cpp
|
||||
@@ -174,7 +174,7 @@
|
||||
endif
|
||||
endif
|
||||
|
||||
-ifeq ($(OS_ARCH),BeOS)
|
||||
+ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
OS_LIBS += -ltracker
|
||||
endif
|
||||
|
||||
115
www-client/mozilla-firefox/patches/2009-09-27/r03b-starmk.patch
Normal file
115
www-client/mozilla-firefox/patches/2009-09-27/r03b-starmk.patch
Normal file
@@ -0,0 +1,115 @@
|
||||
Index: config/config.mk
|
||||
===================================================================
|
||||
--- config/config.mk (revision 7)
|
||||
+++ config/config.mk (working copy)
|
||||
@@ -110,9 +110,6 @@
|
||||
LD := $(CC)
|
||||
endif
|
||||
endif
|
||||
-ifeq ($(OS_ARCH),BeOS)
|
||||
-BEOS_ADDON_WORKAROUND = 1
|
||||
-endif
|
||||
|
||||
#
|
||||
# Strip off the excessively long version numbers on these platforms,
|
||||
Index: config/rules.mk
|
||||
===================================================================
|
||||
--- config/rules.mk (revision 7)
|
||||
+++ config/rules.mk (working copy)
|
||||
@@ -517,7 +517,7 @@
|
||||
#
|
||||
# BeOS: add -Bsymbolic flag for components
|
||||
#
|
||||
-ifeq ($(OS_ARCH),BeOS)
|
||||
+ifeq (,$(filter BeOS Haiku,$(OS_ARCH)))
|
||||
ifdef IS_COMPONENT
|
||||
EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
|
||||
endif
|
||||
@@ -827,7 +827,7 @@
|
||||
ifdef MOZ_POST_PROGRAM_COMMAND
|
||||
$(MOZ_POST_PROGRAM_COMMAND) $@
|
||||
endif
|
||||
-ifeq ($(OS_ARCH),BeOS)
|
||||
+ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
ifdef BEOS_PROGRAM_RESOURCE
|
||||
xres -o $@ $(BEOS_PROGRAM_RESOURCE)
|
||||
mimeset $@
|
||||
Index: directory/c-sdk/build.mk
|
||||
===================================================================
|
||||
--- directory/c-sdk/build.mk (revision 7)
|
||||
+++ directory/c-sdk/build.mk (working copy)
|
||||
@@ -442,7 +442,7 @@
|
||||
SO_FILES_TO_REMOVE=so_locations
|
||||
endif
|
||||
|
||||
-ifneq (,$(filter BeOS Darwin NetBSD,$(OS_ARCH)))
|
||||
+ifneq (,$(filter BeOS Haiku Darwin NetBSD,$(OS_ARCH)))
|
||||
LINK_DLL = $(MKSHLIB) $(OBJS)
|
||||
endif
|
||||
|
||||
Index: security/coreconf/config.mk
|
||||
===================================================================
|
||||
--- security/coreconf/config.mk (revision 7)
|
||||
+++ security/coreconf/config.mk (working copy)
|
||||
@@ -68,8 +68,12 @@
|
||||
ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
|
||||
include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
|
||||
else
|
||||
+ifeq ($(OS_ARCH), Haiku)
|
||||
+include $(CORE_DEPTH)/coreconf/BeOS.mk
|
||||
+else
|
||||
include $(CORE_DEPTH)/coreconf/$(OS_TARGET)$(OS_RELEASE).mk
|
||||
endif
|
||||
+endif
|
||||
|
||||
#######################################################################
|
||||
# [4.0] Master "Core Components" source and release <platform> tags #
|
||||
Index: security/nss/lib/ssl/config.mk
|
||||
===================================================================
|
||||
--- security/nss/lib/ssl/config.mk (revision 7)
|
||||
+++ security/nss/lib/ssl/config.mk (working copy)
|
||||
@@ -111,7 +111,7 @@
|
||||
-lnspr4 \
|
||||
$(NULL)
|
||||
|
||||
-ifeq ($(OS_ARCH), BeOS)
|
||||
+ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
EXTRA_SHARED_LIBS += -lbe
|
||||
endif
|
||||
|
||||
Index: toolkit/mozapps/installer/package-name.mk
|
||||
===================================================================
|
||||
--- toolkit/mozapps/installer/package-name.mk (revision 7)
|
||||
+++ toolkit/mozapps/installer/package-name.mk (working copy)
|
||||
@@ -59,6 +59,9 @@
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
MOZ_PKG_PLATFORM := os2
|
||||
endif
|
||||
+ifeq ($(OS_ARCH), Haiku)
|
||||
+MOZ_PKG_PLATFORM := Haiku
|
||||
+endif
|
||||
ifeq ($(OS_ARCH), BeOS)
|
||||
ifeq (,$(filter-out 6.%, $(OS_RELEASE)))
|
||||
MOZ_PKG_PLATFORM := Zeta
|
||||
Index: toolkit/mozapps/installer/packager.mk
|
||||
===================================================================
|
||||
--- toolkit/mozapps/installer/packager.mk (revision 7)
|
||||
+++ toolkit/mozapps/installer/packager.mk (working copy)
|
||||
@@ -48,7 +48,7 @@
|
||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||
MOZ_PKG_FORMAT = DMG
|
||||
else
|
||||
-ifeq (,$(filter-out OS2 WINNT BeOS, $(OS_ARCH)))
|
||||
+ifeq (,$(filter-out OS2 WINNT BeOS Haiku, $(OS_ARCH)))
|
||||
MOZ_PKG_FORMAT = ZIP
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
INSTALLER_DIR = os2
|
||||
@@ -251,7 +251,7 @@
|
||||
ifeq ($(OS_ARCH),IRIX)
|
||||
STRIP_FLAGS = -f
|
||||
endif
|
||||
-ifeq ($(OS_ARCH),BeOS)
|
||||
+ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
STRIP_FLAGS = -g
|
||||
PLATFORM_EXCLUDE_LIST = ! -name "*.stub" ! -name "$(MOZ_PKG_APPNAME)-bin"
|
||||
endif
|
||||
@@ -0,0 +1,140 @@
|
||||
Index: mozilla/browser/app/Makefile.in
|
||||
===================================================================
|
||||
RCS file: /cvsroot/mozilla/browser/app/Makefile.in,v
|
||||
retrieving revision 1.85.2.12
|
||||
diff -u -8 -p -w -r1.85.2.12 Makefile.in
|
||||
--- mozilla/browser/app/Makefile.in 12 May 2008 18:25:50 -0000 1.85.2.12
|
||||
+++ mozilla/browser/app/Makefile.in 8 Jul 2009 21:49:35 -0000
|
||||
@@ -146,17 +150,20 @@ endif
|
||||
ifdef BUILD_STATIC_LIBS
|
||||
RCFLAGS += -DMOZ_STATIC_BUILD
|
||||
endif
|
||||
ifdef DEBUG
|
||||
RCFLAGS += -DDEBUG
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
+ifeq ($(OS_ARCH),Haiku)
|
||||
+BEOS_PROGRAM_RDEF = $(srcdir)/apprunner-beos.rdef
|
||||
+endif
|
||||
BEOS_PROGRAM_RESOURCE = $(srcdir)/apprunner-beos.rsrc
|
||||
ifdef BUILD_STATIC_LIBS
|
||||
OS_LIBS += -ltracker -lgame
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
RESFILE=splashos2.res
|
||||
Index: mozilla/calendar/sunbird/app/Makefile.in
|
||||
===================================================================
|
||||
RCS file: /cvsroot/mozilla/calendar/sunbird/app/Makefile.in,v
|
||||
retrieving revision 1.21.2.23
|
||||
diff -u -8 -p -w -r1.21.2.23 Makefile.in
|
||||
--- mozilla/calendar/sunbird/app/Makefile.in 4 May 2008 01:32:07 -0000 1.21.2.23
|
||||
+++ mozilla/calendar/sunbird/app/Makefile.in 8 Jul 2009 21:50:01 -0000
|
||||
@@ -189,18 +193,21 @@ endif
|
||||
ifdef BUILD_STATIC_LIBS
|
||||
RCFLAGS += -DMOZ_STATIC_BUILD
|
||||
endif
|
||||
ifdef DEBUG
|
||||
RCFLAGS += -DDEBUG
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
+ifeq ($(OS_ARCH),Haiku)
|
||||
+BEOS_PROGRAM_RDEF = $(srcdir)/apprunner-beos.rdef
|
||||
+endif
|
||||
BEOS_PROGRAM_RESOURCE = $(srcdir)/apprunner-beos.rsrc
|
||||
ifdef BUILD_STATIC_LIBS
|
||||
OS_LIBS += -ltracker -lgame
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
RESFILE=splashos2.res
|
||||
RCFLAGS += -DMOZ_SUNBIRD
|
||||
Index: mozilla/config/rules.mk
|
||||
===================================================================
|
||||
RCS file: /cvsroot/mozilla/config/rules.mk,v
|
||||
retrieving revision 3.487.2.9
|
||||
diff -u -8 -p -w -r3.487.2.9 rules.mk
|
||||
--- mozilla/config/rules.mk 18 Dec 2007 21:33:08 -0000 3.487.2.9
|
||||
+++ mozilla/config/rules.mk 8 Jul 2009 21:50:19 -0000
|
||||
@@ -822,17 +826,20 @@ endif # OS2
|
||||
endif # WINCE
|
||||
|
||||
ifdef ENABLE_STRIP
|
||||
$(STRIP) $@
|
||||
endif
|
||||
ifdef MOZ_POST_PROGRAM_COMMAND
|
||||
$(MOZ_POST_PROGRAM_COMMAND) $@
|
||||
endif
|
||||
ifneq (,$(filter BeOS Haiku,$(OS_ARCH)))
|
||||
+ifdef BEOS_PROGRAM_RDEF
|
||||
+ rc -o $(BEOS_PROGRAM_RESOURCE) $(BEOS_PROGRAM_RDEF)
|
||||
+endif
|
||||
ifdef BEOS_PROGRAM_RESOURCE
|
||||
xres -o $@ $(BEOS_PROGRAM_RESOURCE)
|
||||
mimeset $@
|
||||
endif
|
||||
endif # BeOS
|
||||
|
||||
$(HOST_PROGRAM): $(HOST_PROGOBJS) $(HOST_LIBS_DEPS) $(HOST_EXTRA_DEPS) Makefile Makefile.in
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
Index: mozilla/mail/app/Makefile.in
|
||||
===================================================================
|
||||
RCS file: /cvsroot/mozilla/mail/app/Makefile.in,v
|
||||
retrieving revision 1.46.2.10
|
||||
diff -u -8 -p -w -r1.46.2.10 Makefile.in
|
||||
--- mozilla/mail/app/Makefile.in 22 Oct 2008 21:04:53 -0000 1.46.2.10
|
||||
+++ mozilla/mail/app/Makefile.in 8 Jul 2009 21:52:18 -0000
|
||||
@@ -142,17 +146,20 @@ RCFLAGS += -DMOZ_THUNDERBIRD -I$(srcdir)
|
||||
else
|
||||
RCFLAGS += -DMOZ_THUNDERBIRD --include-dir $(srcdir)
|
||||
endif
|
||||
ifdef BUILD_STATIC_LIBS
|
||||
RCFLAGS += -DMOZ_STATIC_BUILD
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq (,$(filter-out BeOS Haiku, $(OS_ARCH)))
|
||||
+ifeq ($(OS_ARCH),Haiku)
|
||||
+BEOS_PROGRAM_RDEF = $(srcdir)/apprunner-beos.rdef
|
||||
+endif
|
||||
BEOS_PROGRAM_RESOURCE = $(srcdir)/apprunner-beos.rsrc
|
||||
ifdef BUILD_STATIC_LIBS
|
||||
OS_LIBS += -ltracker -lgame
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
RESFILE=splashos2.res
|
||||
Index: mozilla/xpfe/bootstrap/Makefile.in
|
||||
===================================================================
|
||||
RCS file: /cvsroot/mozilla/xpfe/bootstrap/Attic/Makefile.in,v
|
||||
retrieving revision 1.283.2.6
|
||||
diff -u -8 -p -w -r1.283.2.6 Makefile.in
|
||||
--- mozilla/xpfe/bootstrap/Makefile.in 29 Sep 2007 20:15:11 -0000 1.283.2.6
|
||||
+++ mozilla/xpfe/bootstrap/Makefile.in 8 Jul 2009 21:54:55 -0000
|
||||
@@ -215,16 +219,19 @@ ifdef GC_LEAK_DETECTOR
|
||||
LIBS += -lboehm
|
||||
endif
|
||||
|
||||
ifdef WRAP_SYSTEM_INCLUDES
|
||||
DEFINES += -DWRAP_SYSTEM_INCLUDES
|
||||
endif
|
||||
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
|
||||
+ifeq ($(OS_ARCH),Haiku)
|
||||
+BEOS_PROGRAM_RDEF = $(srcdir)/apprunner-beos.rdef
|
||||
+endif
|
||||
BEOS_PROGRAM_RESOURCE = $(srcdir)/apprunner-beos.rsrc
|
||||
CPPSRCS += nsNativeAppSupportBeOS.cpp
|
||||
CPPSRCS += nsNativeAppSupportBase.cpp
|
||||
ifdef BUILD_STATIC_LIBS
|
||||
OS_LIBS += -ltracker -lgame
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -0,0 +1,532 @@
|
||||
Index: /generated/bezilla/mozilla/xpfe/apprunner-beos.rdef
|
||||
===================================================================
|
||||
--- /generated/bezilla/mozilla/xpfe/apprunner-beos.rdef (revision 0)
|
||||
+++ /generated/bezilla/mozilla/xpfe/apprunner-beos.rdef (revision 0)
|
||||
@@ -0,0 +1,136 @@
|
||||
+/*
|
||||
+ * BeZillaBrowser.rdef
|
||||
+ */
|
||||
+
|
||||
+resource app_signature "application/x-vnd.Mozilla-SeaMonkey";
|
||||
+
|
||||
+resource app_flags B_SINGLE_LAUNCH;
|
||||
+
|
||||
+resource app_version {
|
||||
+ /*
|
||||
+ * We are using the source code version number
|
||||
+ * for our program version.
|
||||
+ * TODO : implement something better.
|
||||
+ */
|
||||
+ major = 1,
|
||||
+ middle = 8,
|
||||
+ minor = 1,
|
||||
+
|
||||
+ /* 0 = development 1 = alpha 2 = beta
|
||||
+ 3 = gamma 4 = golden master 5 = final */
|
||||
+ variety = 0,
|
||||
+
|
||||
+ internal = 21,
|
||||
+
|
||||
+ short_info = "BeZillaSuite",
|
||||
+ long_info = "BeZillaSuite is based on Mozilla's source code"
|
||||
+};
|
||||
+
|
||||
+resource file_types message {
|
||||
+ "types" = "application/x-vnd.Be.URL.file",
|
||||
+ "types" = "application/x-vnd.Be.URL.ftp",
|
||||
+ "types" = "application/x-vnd.Be.URL.http",
|
||||
+ "types" = "application/x-vnd.Be.URL.https",
|
||||
+ "types" = "application/x-vnd.Be.URL.mailto",
|
||||
+ "types" = "application/x-vnd.Be.URL.news",
|
||||
+ "types" = "text/html"
|
||||
+ /*
|
||||
+ * Should BeZillaSuite include these additional filetypes?
|
||||
+ * note: MailNews has them
|
||||
+ "types" = "applicataion/x-person",
|
||||
+ "types" = "message/rfc822",
|
||||
+ "types" = "text/E-mail",
|
||||
+ "types" = "text/x-email"
|
||||
+ "types" = "text/x-vnd.Be-MailDraft"
|
||||
+ */
|
||||
+};
|
||||
+
|
||||
+resource vector_icon {
|
||||
+ $"6E636966210500020016029E8638A20EBA220EBA9E86384880254A18EA00FFFF"
|
||||
+ $"8002001602BC9D88BB1F643B1F64BC9D884B716D48772700FFFF80020016023B"
|
||||
+ $"F73A0000000000003BF73A49B5114976B000FFFF800200160237A0DDB61AF236"
|
||||
+ $"1AF237A0DD497CAA48588100FFFF800200160238D81CB8152D38152D38D81C48"
|
||||
+ $"420A499FB600FFFF8002001602397095000000000000397095486EDA49100600"
|
||||
+ $"FFFF800200160231E5B2BA0EAF3A0EAF31E5B247DA3349779B00FFFF80020016"
|
||||
+ $"0236BBEFB4543A34543A36BBEF495BDE469BC700FFFF6B0200160236E2E70000"
|
||||
+ $"0000000036E2E74A2CD64670CD00FFFF800200160237AB1000000000000037AB"
|
||||
+ $"104AE1D848449500FFFF5702001602375C10B74516374516375C1048B2B04AE9"
|
||||
+ $"7200FFFF8002001602B07700B74912374912B077004898AD4AD99500FFFF8002"
|
||||
+ $"00160232CFA5BA0B483A0B4832CFA54A3C584BA00E00FFFF8002001602368CB7"
|
||||
+ $"000000000000368CB74B3D5E49752800FFFF4F0200160236A81C000000000000"
|
||||
+ $"36A81C4B94C84A808500FFFF4002000602B738F7362603B62603B738F748BB3F"
|
||||
+ $"4A241700A91212FFD7121202001602B04887376143B76143B0488748D36C44FB"
|
||||
+ $"3100FFFF6B02001602B47620362BAAB62BAAB476204A0C144406C600FFFF8002"
|
||||
+ $"001602B4CAE23409B3B409B3B4CAE24AD8D54611F100FFFF8002001602B328E4"
|
||||
+ $"324E4AB24E4AB328E44B36A648859C00FFFF8002001602B22376311F03B11F03"
|
||||
+ $"B223764B891349FFBC00FFFF80010079009803FF000004006002001602B4E6F3"
|
||||
+ $"319259B19259B4E6F34B2F5D4AA2CA00FFFF0003FFFF0004FFD801FFFF669805"
|
||||
+ $"000200060237889D389554BBFC4A3AB9D0491ADE4A422000FFF9BAFFFFC10402"
|
||||
+ $"0006023882A6389353BB177D3B0378484ADD4AF27700C7E3FFFF392FFF020006"
|
||||
+ $"0237A0CC393C5ABC1AC23A5C164A19B94AFE5400FF9797FFCE3232290633EEEB"
|
||||
+ $"FFFFAAEAABDBAEBBBEAE2BC0CEB389C02424C074B415BFF0B478BFB4B450BFB7"
|
||||
+ $"B455BFB6B455BF8CB436BF14B430BF55B42DBEF5B3FFBE82B33EBBDBB3F2BBCE"
|
||||
+ $"B4D7BBD0B4BABBCBB4DABBC7B4DABBC7B4DABBC8B4DABB45B50ABB45B50ABB44"
|
||||
+ $"B50ABB37B50DBB37B50DBAD6B534BA1EB58DBA78B560BA1EB58DBA12B593BA12"
|
||||
+ $"B593BA0FB596B99BB5D6B99BB5D6B99AB5D6B975B5ECB975B5ECB974B5EDB918"
|
||||
+ $"B626B918B626B917B626B8EDB642B893B681B887B689B86CB69CB7F22AB7B5B7"
|
||||
+ $"2DB7A9B76EB73CB920B755B8C5B6B5B9A4B380BC3AB4F7BB4BB380BC3AB317BC"
|
||||
+ $"7FB33E42B755C332B80EC320B7E7C323B7FBC3522CC3C54FBB03C7E8BAF4C7DB"
|
||||
+ $"BAD1C898BA59CA44BC40CC83BAD4CBC3BDF3CD6FC0A0CDA4C760C888CA38C797"
|
||||
+ $"C90DC879CB7BC6A2CC38C4DCCB9AC3A6CBB6C3DDCBA2C34CCBC2C1EBCA78BF62"
|
||||
+ $"C954BF30C9ADBF3FC934BEE9C900BE83C91DBEC2C927BE17C999BCEAC857BA6B"
|
||||
+ $"C720BABCC767BAABC73FBA2EC7C0B7EEC5B1B563C3F4B6DBC472B66FC405B613"
|
||||
+ $"C427B41BC12CB2F006032FBAF5C05EBAF5C05EBAF7C05C34C05A34C05B34C05A"
|
||||
+ $"34C05B0610EE7AAAAAC693C7B5C9E8C667C896C755CAB5C5D3CB14C47FC521B8"
|
||||
+ $"CDC521B8CDC0B9B834BD7FBA63BC9BBC64B789BF00B92ABE82B789BF00C251BC"
|
||||
+ $"E5C1CCBED1C0BCBE70C324BB51C5B0BB5AC71ABFC8C4E2C044C512C05CCC1E06"
|
||||
+ $"04EEBD7FBA63C521B8CDC0B9B834C521B8CDBF40B50AB87FB7A5BC0CB4F7B87F"
|
||||
+ $"B7A50604FEBD7FBA63C521B8CDC0B9B834C521B8CDBF40B50ABF40B50ABD2DB5"
|
||||
+ $"21B87FB7A5BA8CB5E9B87FB7A50605BB02B3F7BCF4B5CD36B3F7BCF4B789BF00"
|
||||
+ $"BA19BDD6B8DABE8835BD1EBC9BBC64B801B9930A04B87FB7A5BD7FBA63BC9BBC"
|
||||
+ $"64B801B9930A04B3F7BCF4B413C012B789C251B789BF000A04BC7AB801BF99B6"
|
||||
+ $"C0BE1BB43BBCAAB49E0A05BFE1B69AC187B3FFC341B4ABC30EB77BC204B6CF0A"
|
||||
+ $"05C3E9B805C594B69AC6D3B825C637BAECC521B8CD0A06B967C223B8A5C3F1BB"
|
||||
+ $"51C5B0BE70C323BED1C0BCBCE5C1CC0A04B8A5C548B8A5C3F1BB51C5B0BB5AC7"
|
||||
+ $"1A0606BA0ABC41C6A5BB73C983BCF9CB79BBC8CAD5BE40CC23C05CCC1EC044C5"
|
||||
+ $"12BFC8C4E20A04C6A1BBC1C7E5BB6BC8ABBCF7C80EBE920A04C9EA41C8C5BFF3"
|
||||
+ $"CABBC3D4CAE3C2140A06BA90C206BA19C33CBADEC3EBBEA7C1C4BED1C0BCBCE5"
|
||||
+ $"C1CC0A06BC7AB801BCAAB49EBE1BB43BBE33B460BCDAB4C7BCB1B7EC0A04BFE1"
|
||||
+ $"B69AC021B6A1C1ADB40DC187B3FF0A04C3E9B805C594B69AC5B7B6C3C41AB825"
|
||||
+ $"0A04C6A1BBC1C7E5BB6BC7F4BB8EC6B9BBEC0A04C8C5BFF3C9EA41CA07C060C8"
|
||||
+ $"E5C02B0628AAAAAAAAAAAEEFAAA9BACAB4C3BFCAE3C214C9EA41C8C5BFF3C80F"
|
||||
+ $"BE90C8ABBCF7C7F4BB8EC7E5BB6BC6A1BBC1C637BAECC6D3B826C5B7B6C3C594"
|
||||
+ $"B69AC3E9B805C3F9B80FC30EB77BC341B4ABC1ADB40DC187B3FFC068B5C6BF40"
|
||||
+ $"B50ABE9BB514BF03B507BE9BB514BE1BB43BBCAAB49EBC9EB57CBC9EB57CBB34"
|
||||
+ $"B5E3B87FB7A5B9BC29B87FB7A5B801B993B3F7BCF4B5CD36B3F7BCF4B413C012"
|
||||
+ $"B789C251B964C223B8A5C3F1C548BB5AC71ABFC8C4E2C044C512C05CCC1EC693"
|
||||
+ $"C7B5C9B7C688C894C759CAD2C5BECB14C47F0A06BE4DC302BB334EB8F2C3E4B9"
|
||||
+ $"9FC21DBCE5C1CCBEAEC0D1020ABFDBBBF7BFE1BBDFBFC9BC38BF63BC91BF9DBC"
|
||||
+ $"71BEE7BCD8BE03BC31BE4BBCABBE03BC31BE00BC24BE0137BE10BC1ABE4BBC03"
|
||||
+ $"BE30BC0EBE4BBC03BEE9BBBABEE9BBBABEE9BBBABF7BBB58BF7BBB58BF8FBB45"
|
||||
+ $"BFBDBB29BFA9BB3440BB2DBFC3BB34BFC3BB34BFD9BB5BBFE7BBB2BFE7BB85BF"
|
||||
+ $"E7BBC8020ABFD5BC12BFD9BC00BFC3BC4FBF67BC9CBF9CBC80BEFCBCDBBE32BC"
|
||||
+ $"45BE70BCB4BE32BC45BE2BBC39BE30BC41BE3EBC32BE70BC1DBE58BC27BE70BC"
|
||||
+ $"1DBEFEBBDDBEFEBBDDBEFEBBDDBF7EBB84BF7EBB84BF90BB77BFB7BB5CBFA7BB"
|
||||
+ $"66BFBDBB5F40BB6640BB66BFD4BB87BFDCBBD4BFDCBBADBFDCBBEA0605BA02BC"
|
||||
+ $"2BC6AFC155C3BAC269C139C245C1A9C25CC1A9C1A5C3EFBBF5C7310A04BC7AB8"
|
||||
+ $"01BF99B6C0C125B79BBFB3B7FF0A03BFE1B69AC3A0B7D5C204B6CF0A05BCAAC6"
|
||||
+ $"70BCB9C66BBE0FC73AC05BC70BBDF4C7890A04BC34C73FBDE5C88AC04EC88BBD"
|
||||
+ $"C9C8D80A04BB81C817BD6CC9CFC072C973BD505A0A04BB60C971BD4FCB2BC054"
|
||||
+ $"CACFBD33CB790A03C6D944C9E8C6DAC695540A03BD9FBC21BEE9BBBAC059BA77"
|
||||
+ $"0204BF4DBBE8BF4DBC1ABF4DBBB7BF95BB8FBF6FBB8FBFBCBB8FBFD9BBE8BFD9"
|
||||
+ $"BBB7BFD9BC1ABF95BC42BFBCBC42BF6FBC420A04BAD6C37ABBFAC2FDBAD1C336"
|
||||
+ $"BA8CC2FD0606BA0ABC2BC6AF35C98ABCC1CB6BBB88CAC8BE00CC16C049CC29C0"
|
||||
+ $"33C51CBFB5C4EA0A062C472C4E3251364E364730440A06265226592C5C305930"
|
||||
+ $"522A4F0A0632533259385C3C593C5237C5D3290A000100000A010101000A0201"
|
||||
+ $"02000A030103000A040104000A050105000A060106000A070107000A08010800"
|
||||
+ $"0A090109000A0A010A000A0B010B000A0C010C000A0D010D000A0E010E000A0F"
|
||||
+ $"010F000A100110000A110111000A120112000A130113000A140114000A150115"
|
||||
+ $"000A1603161718000A170119000A18011A000A18011B000A18011C000A18011D"
|
||||
+ $"000A18011E000A18011F000A180120000A190121000A180122000A1A0123000A"
|
||||
+ $"1B0124000A1C0125000A1D032627283841B30C15FF01178400040A1D03262728"
|
||||
+ $"3841B30C001501178600040A1E01262041B30C0A1F01272041B30C0A20012820"
|
||||
+ $"41B30C"
|
||||
+};
|
||||
+
|
||||
+
|
||||
Index: /generated/bezilla/mozilla/mail/app/apprunner-beos.rdef
|
||||
===================================================================
|
||||
--- /generated/bezilla/mozilla/mail/app/apprunner-beos.rdef (revision 0)
|
||||
+++ /generated/bezilla/mozilla/mail/app/apprunner-beos.rdef (revision 0)
|
||||
@@ -0,0 +1,126 @@
|
||||
+/*
|
||||
+ * BeZillaBrowser.rdef
|
||||
+ */
|
||||
+
|
||||
+resource app_signature "application/x-vnd.Mozilla-Thunderbird";
|
||||
+
|
||||
+resource app_flags B_SINGLE_LAUNCH;
|
||||
+
|
||||
+resource app_version {
|
||||
+ /*
|
||||
+ * We are using the source code version number
|
||||
+ * for our program version.
|
||||
+ * TODO : implement something better.
|
||||
+ */
|
||||
+ major = 1,
|
||||
+ middle = 8,
|
||||
+ minor = 1,
|
||||
+
|
||||
+ /* 0 = development 1 = alpha 2 = beta
|
||||
+ 3 = gamma 4 = golden master 5 = final */
|
||||
+ variety = 0,
|
||||
+
|
||||
+ internal = 21,
|
||||
+
|
||||
+ short_info = "BeZillaMailNews",
|
||||
+ long_info = "BeZillaMailNews is based on Mozilla's source code"
|
||||
+};
|
||||
+
|
||||
+resource file_types message {
|
||||
+ "types" = "application/x-vnd.Be.URL.mailto",
|
||||
+ "types" = "application/x-vnd.Be.URL.news",
|
||||
+ "types" = "applicataion/x-person",
|
||||
+ "types" = "message/rfc822",
|
||||
+ "types" = "text/E-mail",
|
||||
+ "types" = "text/x-email",
|
||||
+ "types" = "text/x-vnd.Be-MailDraft"
|
||||
+};
|
||||
+
|
||||
+resource vector_icon {
|
||||
+ $"6E636966200500020016029E8638A20EBA220EBA9E86384880254A18EA00FFFF"
|
||||
+ $"8002001602BC9D88BB1F643B1F64BC9D884B716D48772700FFFF80020016023B"
|
||||
+ $"F73A0000000000003BF73A49B5114976B000FFFF800200160237A0DDB61AF236"
|
||||
+ $"1AF237A0DD497CAA48588100FFFF800200160238D81CB8152D38152D38D81C48"
|
||||
+ $"420A499FB600FFFF8002001602397095000000000000397095486EDA49100600"
|
||||
+ $"FFFF800200160231E5B2BA0EAF3A0EAF31E5B247DA3349779B00FFFF80020016"
|
||||
+ $"0236BBEFB4543A34543A36BBEF495BDE469BC700FFFF6B0200160236E2E70000"
|
||||
+ $"0000000036E2E74A2CD64670CD00FFFF800200160237AB1000000000000037AB"
|
||||
+ $"104AE1D848449500FFFF5702001602375C10B74516374516375C1048B2B04AE9"
|
||||
+ $"7200FFFF8002001602B07700B74912374912B077004898AD4AD99500FFFF8002"
|
||||
+ $"00160232CFA5BA0B483A0B4832CFA54A3C584BA00E00FFFF8002001602368CB7"
|
||||
+ $"000000000000368CB74B3D5E49752800FFFF4F0200160236A81C000000000000"
|
||||
+ $"36A81C4B94C84A808500FFFF4002000602B738F7362603B62603B738F748BB3F"
|
||||
+ $"4A241700A91212FFD7121202001602B04887376143B76143B0488748D36C44FB"
|
||||
+ $"3100FFFF6B02001602B47620362BAAB62BAAB476204A0C144406C600FFFF8002"
|
||||
+ $"001602B4CAE23409B3B409B3B4CAE24AD8D54611F100FFFF8002001602B328E4"
|
||||
+ $"324E4AB24E4AB328E44B36A648859C00FFFF8002001602B22376311F03B11F03"
|
||||
+ $"B223764B891349FFBC00FFFF80010079009803FF000004006002001602B4E6F3"
|
||||
+ $"319259B19259B4E6F34B2F5D4AA2CA00FFFF0003FFFF0004FFD801FFFF669805"
|
||||
+ $"0002000602389ECD3AF097BC491F3A09894954654ABDFA00FFFFFFFFD9D09303"
|
||||
+ $"6B5222280633EEEBFFFFAAEAABDBAEBBBEAE2BC0CEB389C02424C074B415BFF0"
|
||||
+ $"B478BFB4B450BFB7B455BFB6B455BF8CB436BF14B430BF55B42DBEF5B3FFBE82"
|
||||
+ $"B33EBBDBB3F2BBCEB4D7BBD0B4BABBCBB4DABBC7B4DABBC7B4DABBC8B4DABB45"
|
||||
+ $"B50ABB45B50ABB44B50ABB37B50DBB37B50DBAD6B534BA1EB58DBA78B560BA1E"
|
||||
+ $"B58DBA12B593BA12B593BA0FB596B99BB5D6B99BB5D6B99AB5D6B975B5ECB975"
|
||||
+ $"B5ECB974B5EDB918B626B918B626B917B626B8EDB642B893B681B887B689B86C"
|
||||
+ $"B69CB7F22AB7B5B72DB7A9B76EB73CB920B755B8C5B6B5B9A4B380BC3AB4F7BB"
|
||||
+ $"4BB380BC3AB317BC7FB33E42B755C332B80EC320B7E7C323B7FBC3522CC3C54F"
|
||||
+ $"BB03C7E8BAF4C7DBBAD1C898BA59CA44BC40CC83BAD4CBC3BDF3CD6FC0A0CDA4"
|
||||
+ $"C760C888CA38C797C90DC879CB7BC6A2CC38C4DCCB9AC3A6CBB6C3DDCBA2C34C"
|
||||
+ $"CBC2C1EBCA78BF62C954BF30C9ADBF3FC934BEE9C900BE83C91DBEC2C927BE17"
|
||||
+ $"C999BCEAC857BA6BC720BABCC767BAABC73FBA2EC7C0B7EEC5B1B563C3F4B6DB"
|
||||
+ $"C472B66FC405B613C427B41BC12CB2F006032FBAF5C05EBAF5C05EBAF7C05C34"
|
||||
+ $"C05A34C05B34C05A34C05B0610EE7AAAAAC693C7B5C9E8C667C896C755CAB5C5"
|
||||
+ $"D3CB14C47FC521B8CDC521B8CDC0B9B834BD7FBA63BC9BBC64B789BF00B92ABE"
|
||||
+ $"82B789BF00C251BCE5C1CCBED1C0BCBE70C324BB51C5B0BB5AC71ABFC8C4E2C0"
|
||||
+ $"44C512C05CCC1E0604EEBD7FBA63C521B8CDC0B9B834C521B8CDBF40B50AB87F"
|
||||
+ $"B7A5BC0CB4F7B87FB7A50604FEBD7FBA63C521B8CDC0B9B834C521B8CDBF40B5"
|
||||
+ $"0ABF40B50ABD2DB521B87FB7A5BA8CB5E9B87FB7A50605BB02B3F7BCF4B5CD36"
|
||||
+ $"B3F7BCF4B789BF00BA19BDD6B8DABE8835BD1EBC9BBC64B801B9930A04B87FB7"
|
||||
+ $"A5BD7FBA63BC9BBC64B801B9930A04B3F7BCF4B413C012B789C251B789BF000A"
|
||||
+ $"04BC7AB801BF99B6C0BE1BB43BBCAAB49E0A05BFE1B69AC187B3FFC341B4ABC3"
|
||||
+ $"0EB77BC204B6CF0A05C3E9B805C594B69AC6D3B825C637BAECC521B8CD0A06B9"
|
||||
+ $"67C223B8A5C3F1BB51C5B0BE70C323BED1C0BCBCE5C1CC0A04B8A5C548B8A5C3"
|
||||
+ $"F1BB51C5B0BB5AC71A0606BA0ABC41C6A5BB73C983BCF9CB79BBC8CAD5BE40CC"
|
||||
+ $"23C05CCC1EC044C512BFC8C4E20A04C6A1BBC1C7E5BB6BC8ABBCF7C80EBE920A"
|
||||
+ $"04C9EA41C8C5BFF3CABBC3D4CAE3C2140A06BA90C206BA19C33CBADEC3EBBEA7"
|
||||
+ $"C1C4BED1C0BCBCE5C1CC0A06BC7AB801BCAAB49EBE1BB43BBE33B460BCDAB4C7"
|
||||
+ $"BCB1B7EC0A04BFE1B69AC021B6A1C1ADB40DC187B3FF0A04C3E9B805C594B69A"
|
||||
+ $"C5B7B6C3C41AB8250A04C6A1BBC1C7E5BB6BC7F4BB8EC6B9BBEC0A04C8C5BFF3"
|
||||
+ $"C9EA41CA07C060C8E5C02B0628AAAAAAAAAAAEEFAAA9BACAB4C3BFCAE3C214C9"
|
||||
+ $"EA41C8C5BFF3C80FBE90C8ABBCF7C7F4BB8EC7E5BB6BC6A1BBC1C637BAECC6D3"
|
||||
+ $"B826C5B7B6C3C594B69AC3E9B805C3F9B80FC30EB77BC341B4ABC1ADB40DC187"
|
||||
+ $"B3FFC068B5C6BF40B50ABE9BB514BF03B507BE9BB514BE1BB43BBCAAB49EBC9E"
|
||||
+ $"B57CBC9EB57CBB34B5E3B87FB7A5B9BC29B87FB7A5B801B993B3F7BCF4B5CD36"
|
||||
+ $"B3F7BCF4B413C012B789C251B964C223B8A5C3F1C548BB5AC71ABFC8C4E2C044"
|
||||
+ $"C512C05CCC1EC693C7B5C9B7C688C894C759CAD2C5BECB14C47F0A06BE4DC302"
|
||||
+ $"BB334EB8F2C3E4B99FC21DBCE5C1CCBEAEC0D1020ABFDBBBF7BFE1BBDFBFC9BC"
|
||||
+ $"38BF63BC91BF9DBC71BEE7BCD8BE03BC31BE4BBCABBE03BC31BE00BC24BE0137"
|
||||
+ $"BE10BC1ABE4BBC03BE30BC0EBE4BBC03BEE9BBBABEE9BBBABEE9BBBABF7BBB58"
|
||||
+ $"BF7BBB58BF8FBB45BFBDBB29BFA9BB3440BB2DBFC3BB34BFC3BB34BFD9BB5BBF"
|
||||
+ $"E7BBB2BFE7BB85BFE7BBC8020ABFD5BC12BFD9BC00BFC3BC4FBF67BC9CBF9CBC"
|
||||
+ $"80BEFCBCDBBE32BC45BE70BCB4BE32BC45BE2BBC39BE30BC41BE3EBC32BE70BC"
|
||||
+ $"1DBE58BC27BE70BC1DBEFEBBDDBEFEBBDDBEFEBBDDBF7EBB84BF7EBB84BF90BB"
|
||||
+ $"77BFB7BB5CBFA7BB66BFBDBB5F40BB6640BB66BFD4BB87BFDCBBD4BFDCBBADBF"
|
||||
+ $"DCBBEA0605BA02BC2BC6AFC155C3BAC269C139C245C1A9C25CC1A9C1A5C3EFBB"
|
||||
+ $"F5C7310A04BC7AB801BF99B6C0C125B79BBFB3B7FF0A03BFE1B69AC3A0B7D5C2"
|
||||
+ $"04B6CF0A05BCAAC670BCB9C66BBE0FC73AC05BC70BBDF4C7890A04BC34C73FBD"
|
||||
+ $"E5C88AC04EC88BBDC9C8D80A04BB81C817BD6CC9CFC072C973BD505A0A04BB60"
|
||||
+ $"C971BD4FCB2BC054CACFBD33CB790A03C6D944C9E8C6DAC695540A03BD9FBC21"
|
||||
+ $"BEE9BBBAC059BA770204BF4DBBE8BF4DBC1ABF4DBBB7BF95BB8FBF6FBB8FBFBC"
|
||||
+ $"BB8FBFD9BBE8BFD9BBB7BFD9BC1ABF95BC42BFBCBC42BF6FBC420A04BAD6C37A"
|
||||
+ $"BBFAC2FDBAD1C336BA8CC2FD0606BA0ABC2BC6AF35C98ABCC1CB6BBB88CAC8BE"
|
||||
+ $"00CC16C049CC29C033C51CBFB5C4EA0A04244C245C3C5C3C4C060AEEFE0E244C"
|
||||
+ $"30542E5432543C4CBB1454BCCAC670BB14543C5CBABCC808BABCC808BA0EC8AC"
|
||||
+ $"3056B9A856B91756B801C808B8B1C8ACB801C808245CB7A954B7A954B5F4C670"
|
||||
+ $"280A000100000A010101000A020102000A030103000A040104000A050105000A"
|
||||
+ $"060106000A070107000A080108000A090109000A0A010A000A0B010B000A0C01"
|
||||
+ $"0C000A0D010D000A0E010E000A0F010F000A100110000A110111000A12011200"
|
||||
+ $"0A130113000A140114000A150115000A1603161718000A170119000A18011A00"
|
||||
+ $"0A18011B000A18011C000A18011D000A18011E000A18011F000A180120000A19"
|
||||
+ $"0121000A180122000A1A0123000A1B0124000A1C0125000A1D012638C018B358"
|
||||
+ $"15FF01178400040A1D012638C018B358001501178600040A1E012620C018B358"
|
||||
+ $"0A1F012720C018B358"
|
||||
+};
|
||||
+
|
||||
+
|
||||
Index: /generated/bezilla/mozilla/calendar/sunbird/app/apprunner-beos.rdef
|
||||
===================================================================
|
||||
--- /generated/bezilla/mozilla/calendar/sunbird/app/apprunner-beos.rdef (revision 0)
|
||||
+++ /generated/bezilla/mozilla/calendar/sunbird/app/apprunner-beos.rdef (revision 0)
|
||||
@@ -0,0 +1,125 @@
|
||||
+/*
|
||||
+ * BeZillaBrowser.rdef
|
||||
+ */
|
||||
+
|
||||
+resource app_signature "application/x-vnd.Mozilla-Sunbird";
|
||||
+
|
||||
+resource app_flags B_SINGLE_LAUNCH;
|
||||
+
|
||||
+resource app_version {
|
||||
+ /*
|
||||
+ * We are using the source code version number
|
||||
+ * for our program version.
|
||||
+ * TODO : implement something better.
|
||||
+ */
|
||||
+ major = 1,
|
||||
+ middle = 8,
|
||||
+ minor = 1,
|
||||
+
|
||||
+ /* 0 = development 1 = alpha 2 = beta
|
||||
+ 3 = gamma 4 = golden master 5 = final */
|
||||
+ variety = 0,
|
||||
+
|
||||
+ internal = 21,
|
||||
+
|
||||
+ short_info = "BeZillaCalendar",
|
||||
+ long_info = "BeZillaCalendar is based on Mozilla's source code"
|
||||
+};
|
||||
+
|
||||
+resource file_types message {
|
||||
+ "types" = "text/csv",
|
||||
+ "types" = "text/calendar"
|
||||
+ /*
|
||||
+ // TODO:
|
||||
+ // .sdb is mimetype application/octet-stream
|
||||
+ // is there a more elegant way to handle it?
|
||||
+ types" = "application/octet-stream"
|
||||
+ */
|
||||
+};
|
||||
+resource vector_icon {
|
||||
+ $"6E636966200500020016029E8638A20EBA220EBA9E86384880254A18EA00FFFF"
|
||||
+ $"8002001602BC9D88BB1F643B1F64BC9D884B716D48772700FFFF80020016023B"
|
||||
+ $"F73A0000000000003BF73A49B5114976B000FFFF800200160237A0DDB61AF236"
|
||||
+ $"1AF237A0DD497CAA48588100FFFF800200160238D81CB8152D38152D38D81C48"
|
||||
+ $"420A499FB600FFFF8002001602397095000000000000397095486EDA49100600"
|
||||
+ $"FFFF800200160231E5B2BA0EAF3A0EAF31E5B247DA3349779B00FFFF80020016"
|
||||
+ $"0236BBEFB4543A34543A36BBEF495BDE469BC700FFFF6B0200160236E2E70000"
|
||||
+ $"0000000036E2E74A2CD64670CD00FFFF800200160237AB1000000000000037AB"
|
||||
+ $"104AE1D848449500FFFF5702001602375C10B74516374516375C1048B2B04AE9"
|
||||
+ $"7200FFFF8002001602B07700B74912374912B077004898AD4AD99500FFFF8002"
|
||||
+ $"00160232CFA5BA0B483A0B4832CFA54A3C584BA00E00FFFF8002001602368CB7"
|
||||
+ $"000000000000368CB74B3D5E49752800FFFF4F0200160236A81C000000000000"
|
||||
+ $"36A81C4B94C84A808500FFFF4002000602B738F7362603B62603B738F748BB3F"
|
||||
+ $"4A241700A91212FFD7121202001602B04887376143B76143B0488748D36C44FB"
|
||||
+ $"3100FFFF6B02001602B47620362BAAB62BAAB476204A0C144406C600FFFF8002"
|
||||
+ $"001602B4CAE23409B3B409B3B4CAE24AD8D54611F100FFFF8002001602B328E4"
|
||||
+ $"324E4AB24E4AB328E44B36A648859C00FFFF8002001602B22376311F03B11F03"
|
||||
+ $"B223764B891349FFBC00FFFF80010079009803FF000004006002001602B4E6F3"
|
||||
+ $"319259B19259B4E6F34B2F5D4AA2CA00FFFF0003FFFF0004FFD801FFFF669805"
|
||||
+ $"000200060239CDA03A935CBC02343AF7494899864A8DDC00FFDB97FFFCAF2902"
|
||||
+ $"0106033B471C0000000000003B36DB472800498C0000F2F2F2AB7D7A7AFFBCA1"
|
||||
+ $"84280633EEEBFFFFAAEAABDBAEBBBEAE2BC0CEB389C02424C074B415BFF0B478"
|
||||
+ $"BFB4B450BFB7B455BFB6B455BF8CB436BF14B430BF55B42DBEF5B3FFBE82B33E"
|
||||
+ $"BBDBB3F2BBCEB4D7BBD0B4BABBCBB4DABBC7B4DABBC7B4DABBC8B4DABB45B50A"
|
||||
+ $"BB45B50ABB44B50ABB37B50DBB37B50DBAD6B534BA1EB58DBA78B560BA1EB58D"
|
||||
+ $"BA12B593BA12B593BA0FB596B99BB5D6B99BB5D6B99AB5D6B975B5ECB975B5EC"
|
||||
+ $"B974B5EDB918B626B918B626B917B626B8EDB642B893B681B887B689B86CB69C"
|
||||
+ $"B7F22AB7B5B72DB7A9B76EB73CB920B755B8C5B6B5B9A4B380BC3AB4F7BB4BB3"
|
||||
+ $"80BC3AB317BC7FB33E42B755C332B80EC320B7E7C323B7FBC3522CC3C54FBB03"
|
||||
+ $"C7E8BAF4C7DBBAD1C898BA59CA44BC40CC83BAD4CBC3BDF3CD6FC0A0CDA4C760"
|
||||
+ $"C888CA38C797C90DC879CB7BC6A2CC38C4DCCB9AC3A6CBB6C3DDCBA2C34CCBC2"
|
||||
+ $"C1EBCA78BF62C954BF30C9ADBF3FC934BEE9C900BE83C91DBEC2C927BE17C999"
|
||||
+ $"BCEAC857BA6BC720BABCC767BAABC73FBA2EC7C0B7EEC5B1B563C3F4B6DBC472"
|
||||
+ $"B66FC405B613C427B41BC12CB2F006032FBAF5C05EBAF5C05EBAF7C05C34C05A"
|
||||
+ $"34C05B34C05A34C05B0610EE7AAAAAC693C7B5C9E8C667C896C755CAB5C5D3CB"
|
||||
+ $"14C47FC521B8CDC521B8CDC0B9B834BD7FBA63BC9BBC64B789BF00B92ABE82B7"
|
||||
+ $"89BF00C251BCE5C1CCBED1C0BCBE70C324BB51C5B0BB5AC71ABFC8C4E2C044C5"
|
||||
+ $"12C05CCC1E0604EEBD7FBA63C521B8CDC0B9B834C521B8CDBF40B50AB87FB7A5"
|
||||
+ $"BC0CB4F7B87FB7A50604FEBD7FBA63C521B8CDC0B9B834C521B8CDBF40B50ABF"
|
||||
+ $"40B50ABD2DB521B87FB7A5BA8CB5E9B87FB7A50605BB02B3F7BCF4B5CD36B3F7"
|
||||
+ $"BCF4B789BF00BA19BDD6B8DABE8835BD1EBC9BBC64B801B9930A04B87FB7A5BD"
|
||||
+ $"7FBA63BC9BBC64B801B9930A04B3F7BCF4B413C012B789C251B789BF000A04BC"
|
||||
+ $"7AB801BF99B6C0BE1BB43BBCAAB49E0A05BFE1B69AC187B3FFC341B4ABC30EB7"
|
||||
+ $"7BC204B6CF0A05C3E9B805C594B69AC6D3B825C637BAECC521B8CD0A06B967C2"
|
||||
+ $"23B8A5C3F1BB51C5B0BE70C323BED1C0BCBCE5C1CC0A04B8A5C548B8A5C3F1BB"
|
||||
+ $"51C5B0BB5AC71A0606BA0ABC41C6A5BB73C983BCF9CB79BBC8CAD5BE40CC23C0"
|
||||
+ $"5CCC1EC044C512BFC8C4E20A04C6A1BBC1C7E5BB6BC8ABBCF7C80EBE920A04C9"
|
||||
+ $"EA41C8C5BFF3CABBC3D4CAE3C2140A06BA90C206BA19C33CBADEC3EBBEA7C1C4"
|
||||
+ $"BED1C0BCBCE5C1CC0A06BC7AB801BCAAB49EBE1BB43BBE33B460BCDAB4C7BCB1"
|
||||
+ $"B7EC0A04BFE1B69AC021B6A1C1ADB40DC187B3FF0A04C3E9B805C594B69AC5B7"
|
||||
+ $"B6C3C41AB8250A04C6A1BBC1C7E5BB6BC7F4BB8EC6B9BBEC0A04C8C5BFF3C9EA"
|
||||
+ $"41CA07C060C8E5C02B0628AAAAAAAAAAAEEFAAA9BACAB4C3BFCAE3C214C9EA41"
|
||||
+ $"C8C5BFF3C80FBE90C8ABBCF7C7F4BB8EC7E5BB6BC6A1BBC1C637BAECC6D3B826"
|
||||
+ $"C5B7B6C3C594B69AC3E9B805C3F9B80FC30EB77BC341B4ABC1ADB40DC187B3FF"
|
||||
+ $"C068B5C6BF40B50ABE9BB514BF03B507BE9BB514BE1BB43BBCAAB49EBC9EB57C"
|
||||
+ $"BC9EB57CBB34B5E3B87FB7A5B9BC29B87FB7A5B801B993B3F7BCF4B5CD36B3F7"
|
||||
+ $"BCF4B413C012B789C251B964C223B8A5C3F1C548BB5AC71ABFC8C4E2C044C512"
|
||||
+ $"C05CCC1EC693C7B5C9B7C688C894C759CAD2C5BECB14C47F0A06BE4DC302BB33"
|
||||
+ $"4EB8F2C3E4B99FC21DBCE5C1CCBEAEC0D1020ABFDBBBF7BFE1BBDFBFC9BC38BF"
|
||||
+ $"63BC91BF9DBC71BEE7BCD8BE03BC31BE4BBCABBE03BC31BE00BC24BE0137BE10"
|
||||
+ $"BC1ABE4BBC03BE30BC0EBE4BBC03BEE9BBBABEE9BBBABEE9BBBABF7BBB58BF7B"
|
||||
+ $"BB58BF8FBB45BFBDBB29BFA9BB3440BB2DBFC3BB34BFC3BB34BFD9BB5BBFE7BB"
|
||||
+ $"B2BFE7BB85BFE7BBC8020ABFD5BC12BFD9BC00BFC3BC4FBF67BC9CBF9CBC80BE"
|
||||
+ $"FCBCDBBE32BC45BE70BCB4BE32BC45BE2BBC39BE30BC41BE3EBC32BE70BC1DBE"
|
||||
+ $"58BC27BE70BC1DBEFEBBDDBEFEBBDDBEFEBBDDBF7EBB84BF7EBB84BF90BB77BF"
|
||||
+ $"B7BB5CBFA7BB66BFBDBB5F40BB6640BB66BFD4BB87BFDCBBD4BFDCBBADBFDCBB"
|
||||
+ $"EA0605BA02BC2BC6AFC155C3BAC269C139C245C1A9C25CC1A9C1A5C3EFBBF5C7"
|
||||
+ $"310A04BC7AB801BF99B6C0C125B79BBFB3B7FF0A03BFE1B69AC3A0B7D5C204B6"
|
||||
+ $"CF0A05BCAAC670BCB9C66BBE0FC73AC05BC70BBDF4C7890A04BC34C73FBDE5C8"
|
||||
+ $"8AC04EC88BBDC9C8D80A04BB81C817BD6CC9CFC072C973BD505A0A04BB60C971"
|
||||
+ $"BD4FCB2BC054CACFBD33CB790A03C6D944C9E8C6DAC695540A03BD9FBC21BEE9"
|
||||
+ $"BBBAC059BA770204BF4DBBE8BF4DBC1ABF4DBBB7BF95BB8FBF6FBB8FBFBCBB8F"
|
||||
+ $"BFD9BBE8BFD9BBB7BFD9BC1ABF95BC42BFBCBC42BF6FBC420A04BAD6C37ABBFA"
|
||||
+ $"C2FDBAD1C336BA8CC2FD0606BA0ABC2BC6AF35C98ABCC1CB6BBB88CAC8BE00CC"
|
||||
+ $"16C049CC29C033C51CBFB5C4EA0A092844284E2A502A5A325A3250344E34442E"
|
||||
+ $"4202042E3AB9753AB7B23A2A3E2ABE112ABFD52E42B7B242B97542323E32BFD5"
|
||||
+ $"32BE11280A000100000A010101000A020102000A030103000A040104000A0501"
|
||||
+ $"05000A060106000A070107000A080108000A090109000A0A010A000A0B010B00"
|
||||
+ $"0A0C010C000A0D010D000A0E010E000A0F010F000A100110000A110111000A12"
|
||||
+ $"0112000A130113000A140114000A150115000A1603161718000A170119000A18"
|
||||
+ $"011A000A18011B000A18011C000A18011D000A18011E000A18011F000A180120"
|
||||
+ $"000A190121000A180122000A1A0123000A1B0124000A1C0125000A1D012630C3"
|
||||
+ $"89B47101178400040A1E012620C389B4710A1D012730C389B47101178400040A"
|
||||
+ $"1F012720C389B471"
|
||||
+};
|
||||
+
|
||||
Index: /generated/bezilla/mozilla/browser/app/apprunner-beos.rdef
|
||||
===================================================================
|
||||
--- /generated/bezilla/mozilla/browser/app/apprunner-beos.rdef (revision 0)
|
||||
+++ /generated/bezilla/mozilla/browser/app/apprunner-beos.rdef (revision 0)
|
||||
@@ -0,0 +1,125 @@
|
||||
+/*
|
||||
+ * BeZillaBrowser.rdef
|
||||
+ */
|
||||
+
|
||||
+resource app_signature "application/x-vnd.Mozilla-Firefox";
|
||||
+
|
||||
+resource app_flags B_SINGLE_LAUNCH;
|
||||
+
|
||||
+resource app_version {
|
||||
+ /*
|
||||
+ * We are using the source code version number
|
||||
+ * for our program version.
|
||||
+ * TODO : implement something better.
|
||||
+ */
|
||||
+ major = 1,
|
||||
+ middle = 8,
|
||||
+ minor = 1,
|
||||
+
|
||||
+ /* 0 = development 1 = alpha 2 = beta
|
||||
+ 3 = gamma 4 = golden master 5 = final */
|
||||
+ variety = 0,
|
||||
+
|
||||
+ internal = 21,
|
||||
+
|
||||
+ short_info = "BeZillaBrowser",
|
||||
+ long_info = "BeZillaBrowser is based on Mozilla's source code"
|
||||
+};
|
||||
+
|
||||
+resource file_types message {
|
||||
+ "types" = "application/x-vnd.Be.URL.file",
|
||||
+ "types" = "application/x-vnd.Be.URL.ftp",
|
||||
+ "types" = "application/x-vnd.Be.URL.http",
|
||||
+ "types" = "application/x-vnd.Be.URL.https",
|
||||
+ "types" = "text/html",
|
||||
+ "types" = "image/gif",
|
||||
+ "types" = "image/png"
|
||||
+};
|
||||
+
|
||||
+resource vector_icon {
|
||||
+ $"6E6369661F0500020016029E8638A20EBA220EBA9E86384880254A18EA00FFFF"
|
||||
+ $"8002001602BC9D88BB1F643B1F64BC9D884B716D48772700FFFF80020016023B"
|
||||
+ $"F73A0000000000003BF73A49B5114976B000FFFF800200160237A0DDB61AF236"
|
||||
+ $"1AF237A0DD497CAA48588100FFFF800200160238D81CB8152D38152D38D81C48"
|
||||
+ $"420A499FB600FFFF8002001602397095000000000000397095486EDA49100600"
|
||||
+ $"FFFF800200160231E5B2BA0EAF3A0EAF31E5B247DA3349779B00FFFF80020016"
|
||||
+ $"0236BBEFB4543A34543A36BBEF495BDE469BC700FFFF6B0200160236E2E70000"
|
||||
+ $"0000000036E2E74A2CD64670CD00FFFF800200160237AB1000000000000037AB"
|
||||
+ $"104AE1D848449500FFFF5702001602375C10B74516374516375C1048B2B04AE9"
|
||||
+ $"7200FFFF8002001602B07700B74912374912B077004898AD4AD99500FFFF8002"
|
||||
+ $"00160232CFA5BA0B483A0B4832CFA54A3C584BA00E00FFFF8002001602368CB7"
|
||||
+ $"000000000000368CB74B3D5E49752800FFFF4F0200160236A81C000000000000"
|
||||
+ $"36A81C4B94C84A808500FFFF4002000602B738F7362603B62603B738F748BB3F"
|
||||
+ $"4A241700A91212FFD7121202001602B04887376143B76143B0488748D36C44FB"
|
||||
+ $"3100FFFF6B02001602B47620362BAAB62BAAB476204A0C144406C600FFFF8002"
|
||||
+ $"001602B4CAE23409B3B409B3B4CAE24AD8D54611F100FFFF8002001602B328E4"
|
||||
+ $"324E4AB24E4AB328E44B36A648859C00FFFF8002001602B22376311F03B11F03"
|
||||
+ $"B223764B891349FFBC00FFFF80010079009803FF000004006002001602B4E6F3"
|
||||
+ $"319259B19259B4E6F34B2F5D4AA2CA00FFFF0003FFFF0004FFD801FFFF669805"
|
||||
+ $"000201060238CC87BD083D3DCC623981954609924A996B00FFB11BFFFFF9C727"
|
||||
+ $"0633EEEBFFFFAAEAABDBAEBBBEAE2BC0CEB389C02424C074B415BFF0B478BFB4"
|
||||
+ $"B450BFB7B455BFB6B455BF8CB436BF14B430BF55B42DBEF5B3FFBE82B33EBBDB"
|
||||
+ $"B3F2BBCEB4D7BBD0B4BABBCBB4DABBC7B4DABBC7B4DABBC8B4DABB45B50ABB45"
|
||||
+ $"B50ABB44B50ABB37B50DBB37B50DBAD6B534BA1EB58DBA78B560BA1EB58DBA12"
|
||||
+ $"B593BA12B593BA0FB596B99BB5D6B99BB5D6B99AB5D6B975B5ECB975B5ECB974"
|
||||
+ $"B5EDB918B626B918B626B917B626B8EDB642B893B681B887B689B86CB69CB7F2"
|
||||
+ $"2AB7B5B72DB7A9B76EB73CB920B755B8C5B6B5B9A4B380BC3AB4F7BB4BB380BC"
|
||||
+ $"3AB317BC7FB33E42B755C332B80EC320B7E7C323B7FBC3522CC3C54FBB03C7E8"
|
||||
+ $"BAF4C7DBBAD1C898BA59CA44BC40CC83BAD4CBC3BDF3CD6FC0A0CDA4C760C888"
|
||||
+ $"CA38C797C90DC879CB7BC6A2CC38C4DCCB9AC3A6CBB6C3DDCBA2C34CCBC2C1EB"
|
||||
+ $"CA78BF62C954BF30C9ADBF3FC934BEE9C900BE83C91DBEC2C927BE17C999BCEA"
|
||||
+ $"C857BA6BC720BABCC767BAABC73FBA2EC7C0B7EEC5B1B563C3F4B6DBC472B66F"
|
||||
+ $"C405B613C427B41BC12CB2F006032FBAF5C05EBAF5C05EBAF7C05C34C05A34C0"
|
||||
+ $"5B34C05A34C05B0610EE7AAAAAC693C7B5C9E8C667C896C755CAB5C5D3CB14C4"
|
||||
+ $"7FC521B8CDC521B8CDC0B9B834BD7FBA63BC9BBC64B789BF00B92ABE82B789BF"
|
||||
+ $"00C251BCE5C1CCBED1C0BCBE70C324BB51C5B0BB5AC71ABFC8C4E2C044C512C0"
|
||||
+ $"5CCC1E0604EEBD7FBA63C521B8CDC0B9B834C521B8CDBF40B50AB87FB7A5BC0C"
|
||||
+ $"B4F7B87FB7A50604FEBD7FBA63C521B8CDC0B9B834C521B8CDBF40B50ABF40B5"
|
||||
+ $"0ABD2DB521B87FB7A5BA8CB5E9B87FB7A50605BB02B3F7BCF4B5CD36B3F7BCF4"
|
||||
+ $"B789BF00BA19BDD6B8DABE8835BD1EBC9BBC64B801B9930A04B87FB7A5BD7FBA"
|
||||
+ $"63BC9BBC64B801B9930A04B3F7BCF4B413C012B789C251B789BF000A04BC7AB8"
|
||||
+ $"01BF99B6C0BE1BB43BBCAAB49E0A05BFE1B69AC187B3FFC341B4ABC30EB77BC2"
|
||||
+ $"04B6CF0A05C3E9B805C594B69AC6D3B825C637BAECC521B8CD0A06B967C223B8"
|
||||
+ $"A5C3F1BB51C5B0BE70C323BED1C0BCBCE5C1CC0A04B8A5C548B8A5C3F1BB51C5"
|
||||
+ $"B0BB5AC71A0606BA0ABC41C6A5BB73C983BCF9CB79BBC8CAD5BE40CC23C05CCC"
|
||||
+ $"1EC044C512BFC8C4E20A04C6A1BBC1C7E5BB6BC8ABBCF7C80EBE920A04C9EA41"
|
||||
+ $"C8C5BFF3CABBC3D4CAE3C2140A06BA90C206BA19C33CBADEC3EBBEA7C1C4BED1"
|
||||
+ $"C0BCBCE5C1CC0A06BC7AB801BCAAB49EBE1BB43BBE33B460BCDAB4C7BCB1B7EC"
|
||||
+ $"0A04BFE1B69AC021B6A1C1ADB40DC187B3FF0A04C3E9B805C594B69AC5B7B6C3"
|
||||
+ $"C41AB8250A04C6A1BBC1C7E5BB6BC7F4BB8EC6B9BBEC0A04C8C5BFF3C9EA41CA"
|
||||
+ $"07C060C8E5C02B0628AAAAAAAAAAAEEFAAA9BACAB4C3BFCAE3C214C9EA41C8C5"
|
||||
+ $"BFF3C80FBE90C8ABBCF7C7F4BB8EC7E5BB6BC6A1BBC1C637BAECC6D3B826C5B7"
|
||||
+ $"B6C3C594B69AC3E9B805C3F9B80FC30EB77BC341B4ABC1ADB40DC187B3FFC068"
|
||||
+ $"B5C6BF40B50ABE9BB514BF03B507BE9BB514BE1BB43BBCAAB49EBC9EB57CBC9E"
|
||||
+ $"B57CBB34B5E3B87FB7A5B9BC29B87FB7A5B801B993B3F7BCF4B5CD36B3F7BCF4"
|
||||
+ $"B413C012B789C251B964C223B8A5C3F1C548BB5AC71ABFC8C4E2C044C512C05C"
|
||||
+ $"CC1EC693C7B5C9B7C688C894C759CAD2C5BECB14C47F0A06BE4DC302BB334EB8"
|
||||
+ $"F2C3E4B99FC21DBCE5C1CCBEAEC0D1020ABFDBBBF7BFE1BBDFBFC9BC38BF63BC"
|
||||
+ $"91BF9DBC71BEE7BCD8BE03BC31BE4BBCABBE03BC31BE00BC24BE0137BE10BC1A"
|
||||
+ $"BE4BBC03BE30BC0EBE4BBC03BEE9BBBABEE9BBBABEE9BBBABF7BBB58BF7BBB58"
|
||||
+ $"BF8FBB45BFBDBB29BFA9BB3440BB2DBFC3BB34BFC3BB34BFD9BB5BBFE7BBB2BF"
|
||||
+ $"E7BB85BFE7BBC8020ABFD5BC12BFD9BC00BFC3BC4FBF67BC9CBF9CBC80BEFCBC"
|
||||
+ $"DBBE32BC45BE70BCB4BE32BC45BE2BBC39BE30BC41BE3EBC32BE70BC1DBE58BC"
|
||||
+ $"27BE70BC1DBEFEBBDDBEFEBBDDBEFEBBDDBF7EBB84BF7EBB84BF90BB77BFB7BB"
|
||||
+ $"5CBFA7BB66BFBDBB5F40BB6640BB66BFD4BB87BFDCBBD4BFDCBBADBFDCBBEA06"
|
||||
+ $"05BA02BC2BC6AFC155C3BAC269C139C245C1A9C25CC1A9C1A5C3EFBBF5C7310A"
|
||||
+ $"04BC7AB801BF99B6C0C125B79BBFB3B7FF0A03BFE1B69AC3A0B7D5C204B6CF0A"
|
||||
+ $"05BCAAC670BCB9C66BBE0FC73AC05BC70BBDF4C7890A04BC34C73FBDE5C88AC0"
|
||||
+ $"4EC88BBDC9C8D80A04BB81C817BD6CC9CFC072C973BD505A0A04BB60C971BD4F"
|
||||
+ $"CB2BC054CACFBD33CB790A03C6D944C9E8C6DAC695540A03BD9FBC21BEE9BBBA"
|
||||
+ $"C059BA770204BF4DBBE8BF4DBC1ABF4DBBB7BF95BB8FBF6FBB8FBFBCBB8FBFD9"
|
||||
+ $"BBE8BFD9BBB7BFD9BC1ABF95BC42BFBCBC42BF6FBC420A04BAD6C37ABBFAC2FD"
|
||||
+ $"BAD1C336BA8CC2FD0606BA0ABC2BC6AF35C98ABCC1CB6BBB88CAC8BE00CC16C0"
|
||||
+ $"49CC29C033C51CBFB5C4EA060DEE1FBF032F442B4F2B48294B244A2953235029"
|
||||
+ $"532354295423542E58265A2E585C3030583058385A3B543B543554355335533B"
|
||||
+ $"503A4A334F354B3348270A000100000A010101000A020102000A030103000A04"
|
||||
+ $"0104000A050105000A060106000A070107000A080108000A090109000A0A010A"
|
||||
+ $"000A0B010B000A0C010C000A0D010D000A0E010E000A0F010F000A100110000A"
|
||||
+ $"110111000A120112000A130113000A140114000A150115000A1603161718000A"
|
||||
+ $"170119000A18011A000A18011B000A18011C000A18011D000A18011E000A1801"
|
||||
+ $"1F000A180120000A190121000A180122000A1A0123000A1B0124000A1C012500"
|
||||
+ $"0A1D012638BFB3B32615FF01178400040A1D012638BFB3B32600150117860004"
|
||||
+ $"0A1E012620BFB3B326"
|
||||
+};
|
||||
+
|
||||
+
|
||||
@@ -0,0 +1,66 @@
|
||||
<mmadia> does this look odd for gcc2
|
||||
<mmadia> #define NUM_ELEM(array) (sizeof(array)/sizeof(array[0])) CK_BBOOL true = CK_TRUE; CK_BBOOL false = CK_FALSE; static PRBool verbose = PR_FALSE;
|
||||
<mmadia> #define NUM_ELEM(array) (sizeof(array)/sizeof(array[0]))
|
||||
<mmadia> CK_BBOOL true = CK_TRUE;
|
||||
<mmadia> CK_BBOOL false = CK_FALSE;
|
||||
<mmadia> static PRBool verbose = PR_FALSE;
|
||||
<mmadia> ignore the first line... bad paste :)
|
||||
<DeadYak> looks fine to me
|
||||
<mmadia> here's the error http://haiku.pastebin.com/d3cf782e4
|
||||
<mmadia> and the full file http://haiku.pastebin.com/d4125cc53
|
||||
<mmu_man> anyone wanna try ?
|
||||
<mmu_man> http://revolf.free.fr/beos/patches/oss-haiku-pci-reservation.diff
|
||||
<DeadYak> might have some macro issues there, it's using a ton of macro defines
|
||||
<DeadYak> mozilla-specific
|
||||
<mmadia> any ideas what the error is indicating?
|
||||
<DeadYak> as I said, something's wrong with one of the macros, looking at the output of gcc -E for that line might be helpful
|
||||
<mmlr> Disreali: does this uid/gid fix also fix the read-only files btw?
|
||||
<DeadYak> I think it was -E let me check
|
||||
<DeadYak> yep
|
||||
<mmadia> -E with -o too ?
|
||||
<DeadYak> yes
|
||||
<DeadYak> it'll write the source after preprocessing to the output file
|
||||
<DeadYak> so you can see what all those macros actually evaluated to
|
||||
<DeadYak> unless that highlights something obvious you'd probably need to enlist tqh though, I know nothing about nspr
|
||||
<mmlr> mmadia: it indicates that someone defines true/false to 1/0
|
||||
<mmlr> so it ends up doing CK_BBOOL 1 = CK_TRUE
|
||||
<mmlr> which is a syntax error
|
||||
<DeadYak> ah oops
|
||||
<DeadYak> totally overlooked that
|
||||
<mmlr> most likely you one of the Be/Haiku headers is indirectly included
|
||||
<mmlr> BeBuild.h I think does define them
|
||||
<mmlr> you could #undef true and #undef false before those lines to make sure
|
||||
<DeadYak> cpp/stl_config.h:# define true 1
|
||||
<DeadYak> that should only be if __STL_NO_BOOL is defined though
|
||||
<mmlr> and since it's a cpp header it shouldn't be used there right?
|
||||
<DeadYak> not seeing any others in the headers offhand
|
||||
<DeadYak> right
|
||||
<DeadYak> only other one I see is build/gcc-2.95.3/stdbool.h: #define true 1
|
||||
<DeadYak> which definitely isn't involved
|
||||
<mmlr> it's included from SupportDefs
|
||||
<mmlr> /* Grandfathering */
|
||||
<mmlr> #ifndef __cplusplus
|
||||
<mmlr> #include <stdbool.h>
|
||||
<mmlr> #endif
|
||||
<DeadYak> yes but that's headers/build
|
||||
<mmlr> also in headers/os
|
||||
<mmlr> it's quite likely that you end up including SupportDefs.h one way or another
|
||||
<mmlr> as it defines our native int types it's included indirectly by most Be/Haiku headers
|
||||
<DeadYak> hm, grep didn't find one in headers/os
|
||||
<DeadYak> at least not one doing that define
|
||||
<mmadia> the #undef seems to have worked for now.
|
||||
<mmlr> nah, it includes stdbool.h in haiku
|
||||
<DeadYak> that one presumably comes from the toolchain?
|
||||
<mmlr> in beos it did define it at that place as far as I remember
|
||||
<DeadYak> stdbool.h that is
|
||||
<mmlr> likely
|
||||
<mmlr> it should be in the gcc headers
|
||||
<DeadYak> that explains that
|
||||
<mmlr> not that I could find it off hand
|
||||
<mmlr> ah, it's in the libgcc headers
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
Index: security/nss/cmd/shlibsign/shlibsign.c
|
||||
===================================================================
|
||||
--- security/nss/cmd/shlibsign/shlibsign.c (revision 7)
|
||||
+++ security/nss/cmd/shlibsign/shlibsign.c (working copy)
|
||||
@@ -83,6 +83,11 @@
|
||||
/* freebl headers */
|
||||
#include "shsign.h"
|
||||
|
||||
+#ifdef XP_BEOS
|
||||
+#undef true
|
||||
+#undef false
|
||||
+#endif
|
||||
+
|
||||
#define NUM_ELEM(array) (sizeof(array)/sizeof(array[0]))
|
||||
CK_BBOOL true = CK_TRUE;
|
||||
CK_BBOOL false = CK_FALSE;
|
||||
@@ -0,0 +1,55 @@
|
||||
Index: security/nss/cmd/lib/secutil.h
|
||||
===================================================================
|
||||
--- security/nss/cmd/lib/secutil.h (revision 7)
|
||||
+++ security/nss/cmd/lib/secutil.h (working copy)
|
||||
@@ -450,7 +450,7 @@
|
||||
|
||||
void printflags(char *trusts, unsigned int flags);
|
||||
|
||||
-#if !defined(XP_UNIX) && !defined(XP_OS2)
|
||||
+#if !defined(XP_UNIX) && !defined(XP_OS2) && !defined(XP_BEOS)
|
||||
extern int ffs(unsigned int i);
|
||||
#endif
|
||||
|
||||
Index: security/nss/lib/dev/ckhelper.c
|
||||
===================================================================
|
||||
--- security/nss/lib/dev/ckhelper.c (revision 7)
|
||||
+++ security/nss/lib/dev/ckhelper.c (working copy)
|
||||
@@ -230,13 +230,13 @@
|
||||
PRStatus *rvStatus
|
||||
)
|
||||
{
|
||||
- CK_BBOOL bool;
|
||||
+ CK_BBOOL boolval;
|
||||
CK_ATTRIBUTE_PTR attr;
|
||||
CK_ATTRIBUTE atemplate = { 0, NULL, 0 };
|
||||
CK_RV ckrv;
|
||||
void *epv = nssSlot_GetCryptokiEPV(slot);
|
||||
attr = &atemplate;
|
||||
- NSS_CK_SET_ATTRIBUTE_VAR(attr, attribute, bool);
|
||||
+ NSS_CK_SET_ATTRIBUTE_VAR(attr, attribute, boolval);
|
||||
nssSession_EnterMonitor(session);
|
||||
ckrv = CKAPI(epv)->C_GetAttributeValue(session->handle, object,
|
||||
&atemplate, 1);
|
||||
@@ -246,7 +246,7 @@
|
||||
return PR_FALSE;
|
||||
}
|
||||
*rvStatus = PR_SUCCESS;
|
||||
- return (PRBool)(bool == CK_TRUE);
|
||||
+ return (PRBool)(boolval == CK_TRUE);
|
||||
}
|
||||
|
||||
NSS_IMPLEMENT PRStatus
|
||||
Index: security/nss/lib/freebl/unix_rand.c
|
||||
===================================================================
|
||||
--- security/nss/lib/freebl/unix_rand.c (revision 7)
|
||||
+++ security/nss/lib/freebl/unix_rand.c (working copy)
|
||||
@@ -669,7 +669,7 @@
|
||||
#endif /* VMS */
|
||||
|
||||
#ifdef BEOS
|
||||
-#include <be/kernel/OS.h>
|
||||
+#include <kernel/OS.h>
|
||||
|
||||
static size_t
|
||||
GetHighResClock(void *buf, size_t maxbytes)
|
||||
File diff suppressed because it is too large
Load Diff
410
www-client/mozilla-firefox/patches/2009-09-27/r08-misc.patch
Normal file
410
www-client/mozilla-firefox/patches/2009-09-27/r08-misc.patch
Normal file
@@ -0,0 +1,410 @@
|
||||
Index: gfx/src/beos/nsFontMetricsBeOS.cpp
|
||||
===================================================================
|
||||
--- gfx/src/beos/nsFontMetricsBeOS.cpp (revision 7)
|
||||
+++ gfx/src/beos/nsFontMetricsBeOS.cpp (working copy)
|
||||
@@ -128,12 +128,12 @@
|
||||
if (!isgeneric)
|
||||
{
|
||||
// non-generic font
|
||||
- if (count_font_styles((font_family)family.get()) <= 0)
|
||||
+ if (count_font_styles((char *) family.get()) <= 0)
|
||||
{
|
||||
// the specified font does not exist on this computer.
|
||||
continue;
|
||||
}
|
||||
- mFontHandle.SetFamilyAndStyle( (font_family)family.get(), NULL );
|
||||
+ mFontHandle.SetFamilyAndStyle( (char *)family.get(), NULL );
|
||||
fontfound = PR_TRUE;
|
||||
break;
|
||||
}
|
||||
@@ -158,9 +158,9 @@
|
||||
prefs->GetBranch("font.name.", getter_AddRefs(branch));
|
||||
branch->GetCharPref(prop, getter_Copies(real_family));
|
||||
|
||||
- if (!real_family.IsEmpty() && real_family.Length() <= B_FONT_FAMILY_LENGTH && count_font_styles((font_family)real_family.get()) > 0)
|
||||
+ if (!real_family.IsEmpty() && real_family.Length() <= B_FONT_FAMILY_LENGTH && count_font_styles((char *)real_family.get()) > 0)
|
||||
{
|
||||
- mFontHandle.SetFamilyAndStyle( (font_family)real_family.get(), NULL );
|
||||
+ mFontHandle.SetFamilyAndStyle( (char *)real_family.get(), NULL );
|
||||
fontfound = PR_TRUE;
|
||||
break;
|
||||
}
|
||||
@@ -414,8 +414,8 @@
|
||||
nsFontMetricsBeOS::FamilyExists(const nsString& aName)
|
||||
{
|
||||
NS_ConvertUTF16toUTF8 family(aName);
|
||||
- printf("exists? %s", (font_family)family.get());
|
||||
- return (count_font_styles((font_family)family.get()) > 0) ? NS_OK : NS_ERROR_FAILURE;
|
||||
+ printf("exists? %s", (char *)family.get());
|
||||
+ return (count_font_styles((char *)family.get()) > 0) ? NS_OK : NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
// useful UTF-8 utility
|
||||
Index: gfx/src/beos/nsRenderingContextBeOS.cpp
|
||||
===================================================================
|
||||
--- gfx/src/beos/nsRenderingContextBeOS.cpp (revision 7)
|
||||
+++ gfx/src/beos/nsRenderingContextBeOS.cpp (working copy)
|
||||
@@ -351,8 +351,11 @@
|
||||
if (mCurrentBFont == nsnull)
|
||||
{
|
||||
if (mFontMetrics)
|
||||
- mFontMetrics->GetFontHandle((nsFontHandle)mCurrentBFont);
|
||||
-
|
||||
+ {
|
||||
+ nsFontHandle fontHandle;
|
||||
+ mFontMetrics->GetFontHandle(fontHandle);
|
||||
+ mCurrentBFont = (BFont *) fontHandle;
|
||||
+ }
|
||||
if (mCurrentBFont)
|
||||
mView->SetFont(mCurrentBFont);
|
||||
else
|
||||
@@ -1127,7 +1130,7 @@
|
||||
NS_IMETHODIMP nsRenderingContextBeOS::GetTextDimensions(const PRUnichar* aString,
|
||||
PRInt32 aLength, PRInt32 aAvailWidth, PRInt32* aBreaks, PRInt32 aNumBreaks,
|
||||
nsTextDimensions& aDimensions, PRInt32& aNumCharsFit, nsTextDimensions& aLastWordDimensions,
|
||||
- PRInt32* aFontID = nsnull)
|
||||
+ PRInt32* aFontID)
|
||||
{
|
||||
nsresult ret_code = NS_ERROR_FAILURE;
|
||||
uint8 utf8buf[1024];
|
||||
@@ -1160,7 +1163,7 @@
|
||||
|
||||
NS_IMETHODIMP nsRenderingContextBeOS::GetTextDimensions(const char* aString, PRInt32 aLength,
|
||||
PRInt32 aAvailWidth,PRInt32* aBreaks, PRInt32 aNumBreaks, nsTextDimensions& aDimensions,
|
||||
- PRInt32& aNumCharsFit, nsTextDimensions& aLastWordDimensions, PRInt32* aFontID = nsnull)
|
||||
+ PRInt32& aNumCharsFit, nsTextDimensions& aLastWordDimensions, PRInt32* aFontID)
|
||||
{
|
||||
// Code is borrowed from win32 implementation including comments.
|
||||
// Minor changes are introduced due multibyte/utf-8 nature of char* strings handling in BeOS.
|
||||
Index: toolkit/xre/nsAppRunner.cpp
|
||||
===================================================================
|
||||
--- toolkit/xre/nsAppRunner.cpp (revision 7)
|
||||
+++ toolkit/xre/nsAppRunner.cpp (working copy)
|
||||
@@ -1361,9 +1361,10 @@
|
||||
#elif defined(XP_BEOS)
|
||||
int32 cookie = 0;
|
||||
image_info info;
|
||||
-
|
||||
+ do {
|
||||
if(get_next_image_info(0, &cookie, &info) != B_OK)
|
||||
return NS_ERROR_FAILURE;
|
||||
+ } while(info.type != B_APP_IMAGE);
|
||||
|
||||
rv = NS_NewNativeLocalFile(nsDependentCString(info.name), PR_TRUE,
|
||||
getter_AddRefs(lf));
|
||||
Index: toolkit/xre/nsXREDirProvider.cpp
|
||||
===================================================================
|
||||
--- toolkit/xre/nsXREDirProvider.cpp (revision 7)
|
||||
+++ toolkit/xre/nsXREDirProvider.cpp (working copy)
|
||||
@@ -76,7 +76,7 @@
|
||||
#include "nsILocalFileMac.h"
|
||||
#endif
|
||||
#ifdef XP_BEOS
|
||||
-#include <be/kernel/image.h>
|
||||
+#include <kernel/image.h>
|
||||
#include <FindDirectory.h>
|
||||
#endif
|
||||
#ifdef XP_UNIX
|
||||
Index: widget/src/beos/nsAppShell.cpp
|
||||
===================================================================
|
||||
--- widget/src/beos/nsAppShell.cpp (revision 7)
|
||||
+++ widget/src/beos/nsAppShell.cpp (working copy)
|
||||
@@ -118,10 +118,28 @@
|
||||
// NOTE: this needs to be run from within the main application thread
|
||||
char portname[64];
|
||||
char semname[64];
|
||||
+ int32 cookie = 0;
|
||||
+ image_info iinfo;
|
||||
+ char *leaf = NULL;
|
||||
+ do {
|
||||
+ if (get_next_image_info(0, &cookie, &iinfo) == B_OK &&
|
||||
+ strlen(iinfo.name) > 0 &&
|
||||
+ (leaf = strrchr(iinfo.name, '/')) != NULL)
|
||||
+ {
|
||||
+ leaf++;
|
||||
+ PR_snprintf(portname, sizeof(portname), "event%lx",
|
||||
+ (long unsigned) find_thread(leaf));
|
||||
+ PR_snprintf(semname, sizeof(semname), "sync%lx",
|
||||
+ (long unsigned) find_thread(leaf));
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
PR_snprintf(portname, sizeof(portname), "event%lx",
|
||||
- (long unsigned) PR_GetCurrentThread());
|
||||
+ (long unsigned) find_thread(0));
|
||||
PR_snprintf(semname, sizeof(semname), "sync%lx",
|
||||
- (long unsigned) PR_GetCurrentThread());
|
||||
+ (long unsigned) find_thread(0));
|
||||
+ }
|
||||
+ } while(iinfo.type != B_APP_IMAGE);
|
||||
|
||||
#ifdef DEBUG
|
||||
printf("nsAppShell::Create portname: %s, semname: %s\n", portname, semname);
|
||||
@@ -342,8 +360,22 @@
|
||||
{
|
||||
// should we check for eventport initialization ?
|
||||
char portname[64];
|
||||
+ int32 cookie = 0;
|
||||
+ image_info iinfo;
|
||||
+ char *leaf = NULL;
|
||||
+ do {
|
||||
+ if (get_next_image_info(0, &cookie, &iinfo) == B_OK &&
|
||||
+ strlen(iinfo.name) > 0 &&
|
||||
+ (leaf = strrchr(iinfo.name, '/')) != NULL)
|
||||
+ {
|
||||
+ leaf++;
|
||||
+ PR_snprintf(portname, sizeof(portname), "event%lx",
|
||||
+ (long unsigned) find_thread(leaf));
|
||||
+ }
|
||||
+ else
|
||||
PR_snprintf(portname, sizeof(portname), "event%lx",
|
||||
- (long unsigned) PR_GetCurrentThread());
|
||||
+ (long unsigned) find_thread(0)/*PR_GetCurrentThread()*/);
|
||||
+ } while(iinfo.type != B_APP_IMAGE);
|
||||
|
||||
if((eventport = find_port(portname)) < 0)
|
||||
{
|
||||
Index: widget/src/beos/nsDragService.cpp
|
||||
===================================================================
|
||||
--- widget/src/beos/nsDragService.cpp (revision 7)
|
||||
+++ widget/src/beos/nsDragService.cpp (working copy)
|
||||
@@ -255,7 +255,7 @@
|
||||
bool noBitmap = true;
|
||||
|
||||
//This is the code for image-dragging, currently disabled. See comments in beginning of file.
|
||||
-# ifdef 0
|
||||
+#if 0
|
||||
do
|
||||
{
|
||||
PRUint32 dataSize;
|
||||
Index: widget/src/beos/nsToolkit.cpp
|
||||
===================================================================
|
||||
--- widget/src/beos/nsToolkit.cpp (revision 7)
|
||||
+++ widget/src/beos/nsToolkit.cpp (working copy)
|
||||
@@ -42,6 +42,7 @@
|
||||
#include "nsSwitchToUIThread.h"
|
||||
#include "plevent.h"
|
||||
#include "prprf.h"
|
||||
+#include <image.h>
|
||||
|
||||
//
|
||||
// Static thread local storage index of the Toolkit
|
||||
@@ -89,10 +90,26 @@
|
||||
delete info;
|
||||
|
||||
// system wide unique names
|
||||
+ int32 cookie = 0;
|
||||
+ image_info iinfo;
|
||||
+ char *leaf = NULL;
|
||||
+ do {
|
||||
+ if (get_next_image_info(0, &cookie, &iinfo) == B_OK &&
|
||||
+ strlen(iinfo.name) > 0 &&
|
||||
+ (leaf = strrchr(iinfo.name, '/')) != NULL)
|
||||
+ {
|
||||
+ leaf++;
|
||||
+ PR_snprintf(portname, sizeof(portname), "event%lx",
|
||||
+ (long unsigned) find_thread(leaf));
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
PR_snprintf(portname, sizeof(portname), "event%lx",
|
||||
- (long unsigned) PR_GetCurrentThread());
|
||||
+ (long unsigned) find_thread(0));
|
||||
+ }
|
||||
+ } while(iinfo.type != B_APP_IMAGE);
|
||||
|
||||
- port_id event = create_port(100, portname);
|
||||
+ port_id event = create_port(200, portname);
|
||||
|
||||
while(read_port(event, &code, &id, sizeof(id)) >= 0)
|
||||
{
|
||||
@@ -130,6 +147,7 @@
|
||||
{
|
||||
localthread = false;
|
||||
mGuiThread = NULL;
|
||||
+ mGUIThreadID = 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -188,6 +206,22 @@
|
||||
}
|
||||
}
|
||||
|
||||
+ image_info iinfo;
|
||||
+ int32 cookie = 0;
|
||||
+ char *leaf = NULL;
|
||||
+ do {
|
||||
+ if (get_next_image_info(0, &cookie, &iinfo) == B_OK &&
|
||||
+ strlen(iinfo.name) > 0 &&
|
||||
+ (leaf = strrchr(iinfo.name, '/')) != NULL)
|
||||
+ {
|
||||
+ leaf++;
|
||||
+ mGUIThreadID = find_thread(leaf);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ mGUIThreadID = find_thread(0);
|
||||
+ }
|
||||
+ } while(iinfo.type != B_APP_IMAGE);
|
||||
// at this point the thread is running
|
||||
PR_ExitMonitor(monitor);
|
||||
PR_DestroyMonitor(monitor);
|
||||
@@ -218,7 +252,22 @@
|
||||
}
|
||||
|
||||
cached = false;
|
||||
-
|
||||
+ image_info iinfo;
|
||||
+ int32 cookie = 0;
|
||||
+ char *leaf = NULL;
|
||||
+ do {
|
||||
+ if (get_next_image_info(0, &cookie, &iinfo) == B_OK &&
|
||||
+ strlen(iinfo.name) > 0 &&
|
||||
+ (leaf = strrchr(iinfo.name, '/')) != NULL)
|
||||
+ {
|
||||
+ leaf++;
|
||||
+ mGUIThreadID = find_thread(leaf);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ mGUIThreadID = find_thread(0);
|
||||
+ }
|
||||
+ } while(iinfo.type != B_APP_IMAGE);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@@ -227,9 +276,8 @@
|
||||
if(! cached)
|
||||
{
|
||||
char portname[64];
|
||||
-
|
||||
PR_snprintf(portname, sizeof(portname), "event%lx",
|
||||
- (long unsigned) mGuiThread);
|
||||
+ (long unsigned) mGUIThreadID);
|
||||
|
||||
eventport = find_port(portname);
|
||||
|
||||
Index: widget/src/beos/nsToolkit.h
|
||||
===================================================================
|
||||
--- widget/src/beos/nsToolkit.h (revision 7)
|
||||
+++ widget/src/beos/nsToolkit.h (working copy)
|
||||
@@ -71,6 +71,7 @@
|
||||
protected:
|
||||
// Thread Id of the "main" Gui thread.
|
||||
PRThread *mGuiThread;
|
||||
+ thread_id mGUIThreadID;
|
||||
static void RunPump(void* arg);
|
||||
void GetInterface();
|
||||
bool cached;
|
||||
Index: xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h
|
||||
===================================================================
|
||||
--- xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h (revision 7)
|
||||
+++ xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h (working copy)
|
||||
@@ -138,8 +138,13 @@
|
||||
#endif
|
||||
|
||||
#elif defined(__BEOS__)
|
||||
+#if (__GNUC__ == 2)
|
||||
#define CFRONT_STYLE_THIS_ADJUST
|
||||
+#else
|
||||
+#define THUNK_BASED_THIS_ADJUST
|
||||
+#endif
|
||||
|
||||
+
|
||||
#elif defined(__sun__) || defined(__sun)
|
||||
#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
|
||||
#define THUNK_BASED_THIS_ADJUST
|
||||
Index: xpcom/threads/plevent.c
|
||||
===================================================================
|
||||
--- xpcom/threads/plevent.c (revision 7)
|
||||
+++ xpcom/threads/plevent.c (working copy)
|
||||
@@ -66,6 +66,8 @@
|
||||
|
||||
#if defined(XP_BEOS)
|
||||
#include <kernel/OS.h>
|
||||
+#include <image.h>
|
||||
+#include <string.h>
|
||||
#endif
|
||||
|
||||
#if defined(XP_MACOSX)
|
||||
@@ -908,10 +910,39 @@
|
||||
|
||||
char portname[64];
|
||||
char semname[64];
|
||||
+
|
||||
+struct _MDThread
|
||||
+{
|
||||
+ thread_id tid;
|
||||
+ sem_id joinSem;
|
||||
+ PRBool is_joining;
|
||||
+};
|
||||
+ struct _MDThread md;
|
||||
+
|
||||
+
|
||||
+//#include "private/primpl.h"
|
||||
+ image_info iinfo;
|
||||
+ int32 icookie = 0;
|
||||
+ char *leaf = NULL;
|
||||
+ do {
|
||||
+ if (get_next_image_info(0, &icookie, &iinfo) == B_OK &&
|
||||
+ strlen(iinfo.name) > 0 &&
|
||||
+ (leaf = strrchr(iinfo.name, '/')) != NULL)
|
||||
+ {
|
||||
+ leaf++;
|
||||
+ PR_snprintf(portname, sizeof(portname), "event%lx",
|
||||
+ (long unsigned) find_thread(leaf));
|
||||
+ PR_snprintf(semname, sizeof(semname), "sync%lx",
|
||||
+ (long unsigned) find_thread(leaf));
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
PR_snprintf(portname, sizeof(portname), "event%lx",
|
||||
- (long unsigned) self->handlerThread);
|
||||
+ (long unsigned) find_thread(0));
|
||||
PR_snprintf(semname, sizeof(semname), "sync%lx",
|
||||
- (long unsigned) self->handlerThread);
|
||||
+ (long unsigned) find_thread(0));
|
||||
+ }
|
||||
+ } while(iinfo.type != B_APP_IMAGE);
|
||||
|
||||
self->eventport = find_port(portname);
|
||||
while(get_next_sem_info(0, &cookie, &info) == B_OK)
|
||||
@@ -931,7 +962,7 @@
|
||||
{
|
||||
delete_port( self->eventport );
|
||||
}
|
||||
- self->eventport = create_port(200, portname);
|
||||
+ self->eventport = create_port(512, portname);
|
||||
/* We don't use the sem, but it has to be there
|
||||
*/
|
||||
create_sem(0, semname);
|
||||
@@ -1264,6 +1295,7 @@
|
||||
thread_id waitingThread;
|
||||
};
|
||||
|
||||
+
|
||||
static PRStatus
|
||||
_pl_NativeNotify(PLEventQueue* self)
|
||||
{
|
||||
@@ -1274,6 +1306,7 @@
|
||||
|
||||
return PR_SUCCESS; /* Is this correct? */
|
||||
}
|
||||
+
|
||||
#endif /* XP_BEOS */
|
||||
|
||||
#if defined(XP_MACOSX)
|
||||
Index: xpfe/bootstrap/nsSigHandlers.cpp
|
||||
===================================================================
|
||||
--- xpfe/bootstrap/nsSigHandlers.cpp (revision 7)
|
||||
+++ xpfe/bootstrap/nsSigHandlers.cpp (working copy)
|
||||
@@ -60,7 +60,8 @@
|
||||
#endif
|
||||
|
||||
#ifdef XP_BEOS
|
||||
-#include <be/app/Application.h>
|
||||
+#include <stdlib.h>
|
||||
+#include <app/Application.h>
|
||||
#include <string.h>
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsIServiceManager.h"
|
||||
@@ -0,0 +1,18 @@
|
||||
Index: calendar/base/content/preferences/preferences.xul
|
||||
===================================================================
|
||||
--- calendar/base/content/preferences/preferences.xul (revision 7)
|
||||
+++ calendar/base/content/preferences/preferences.xul (working copy)
|
||||
@@ -71,8 +71,13 @@
|
||||
style="&prefWindow.styleGNOME;">
|
||||
#endif
|
||||
#endif
|
||||
+#ifdef XP_BEOS
|
||||
+ title="&prefWindow.titleGNOME;"
|
||||
+ style="&prefWindow.styleGNOME;">
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
+
|
||||
<prefpane id="paneGeneral"
|
||||
label="&paneGeneral.title;"
|
||||
onpaneload="gCalendarGeneralPane.init();"
|
||||
@@ -0,0 +1,15 @@
|
||||
Index: widget/src/beos/nsLookAndFeel.cpp
|
||||
===================================================================
|
||||
--- widget/src/beos/nsLookAndFeel.cpp (revision 7)
|
||||
+++ widget/src/beos/nsLookAndFeel.cpp (working copy)
|
||||
@@ -162,9 +162,7 @@
|
||||
case eColor_highlight:
|
||||
case eColor__moz_menuhover:
|
||||
{
|
||||
- // B_MENU_SELECTION_BACKGROUND_COLOR is used for text selection
|
||||
- // this blue colors seems more suitable
|
||||
- color = ui_color(B_KEYBOARD_NAVIGATION_COLOR);
|
||||
+ color = ui_color(B_MENU_SELECTION_BACKGROUND_COLOR );
|
||||
aColor = NS_RGB(color.red, color.green, color.blue);
|
||||
}
|
||||
break;
|
||||
@@ -0,0 +1,428 @@
|
||||
Index: browser/base/jar.mn
|
||||
===================================================================
|
||||
--- browser/base/jar.mn (revision 7)
|
||||
+++ browser/base/jar.mn (working copy)
|
||||
@@ -16,6 +16,12 @@
|
||||
* content/browser/browser.js (content/browser.js)
|
||||
* content/browser/browser.xul (content/browser.xul)
|
||||
* content/browser/credits.xhtml (content/credits.xhtml)
|
||||
+* content/browser/dynamic-welcome-v1.html (content/dynamic-welcome-v1.html)
|
||||
+* content/browser/dynamic-welcome-v2.html (content/dynamic-welcome-v2.html)
|
||||
+* content/browser/dynamic-bebook-v1.html (content/dynamic-bebook-v1.html)
|
||||
+* content/browser/dynamic-bebook-v2.html (content/dynamic-bebook-v2.html)
|
||||
+* content/browser/dynamic-userguide-v1.html (content/dynamic-userguide-v1.html)
|
||||
+* content/browser/dynamic-userguide-v2.html (content/dynamic-userguide-v2.html)
|
||||
* content/browser/EULA.js (content/EULA.js)
|
||||
* content/browser/EULA.xhtml (content/EULA.xhtml)
|
||||
* content/browser/EULA.xul (content/EULA.xul)
|
||||
Index: browser/base/content/browserconfig.properties
|
||||
===================================================================
|
||||
--- browser/base/content/browserconfig.properties (revision 7)
|
||||
+++ browser/base/content/browserconfig.properties (working copy)
|
||||
@@ -1,2 +1,2 @@
|
||||
# Do NOT localize or otherwise change these values
|
||||
-browser.startup.homepage=http://www.mozilla.org/projects/bonecho/
|
||||
+browser.startup.homepage=chrome://browser/content/dynamic-welcome-v1.html
|
||||
Index: browser/locales/en-US/profile/bookmarks.html
|
||||
===================================================================
|
||||
--- browser/locales/en-US/profile/bookmarks.html (revision 7)
|
||||
+++ browser/locales/en-US/profile/bookmarks.html (working copy)
|
||||
@@ -12,15 +12,32 @@
|
||||
<DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">Bookmarks Toolbar Folder</H3>
|
||||
<DD>Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar
|
||||
<DL><p>
|
||||
- <DT><A HREF="http://en-US.www.mozilla.com/en-US/firefox/central/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$GvPhC3">Getting Started</A>
|
||||
- <DT><A HREF="http://en-US.fxfeeds.mozilla.com/en-US/firefox/livebookmarks/" FEEDURL="http://en-US.fxfeeds.mozilla.com/en-US/firefox/headlines.xml" ID="rdf:#$HvPhC3">Latest Headlines</A>
|
||||
+ <DT><A HREF="http://www.haiku-os.org">Haiku WebSite</A>
|
||||
+ <DT><A HREF="http://haiku-files.org/">Nightly Builds</A>
|
||||
</DL><p>
|
||||
<HR>
|
||||
- <DT><H3 ID="rdf:#$ZvPhC3">Mozilla Firefox</H3>
|
||||
+ <DT><H3>BeZilla Browser</H3>
|
||||
<DL><p>
|
||||
- <DT><A HREF="http://en-US.www.mozilla.com/en-US/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">Help and Tutorials</A>
|
||||
- <DT><A HREF="http://en-US.www.mozilla.com/en-US/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">Customize Firefox</A>
|
||||
- <DT><A HREF="http://en-US.www.mozilla.com/en-US/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">Get Involved</A>
|
||||
- <DT><A HREF="http://en-US.www.mozilla.com/en-US/firefox/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">About Us</A>
|
||||
+ <DT><A HREF="http://bezilla.livejournal.com">BeZilla Blog</A>
|
||||
+ <DT><A HREF="http://ports.haiku-files.org/newticket">Report an Issue</A>
|
||||
+ <DT><A HREF="http://ports.haiku-files.org/query?component=www-client%2Fmozilla-firefox&col=id&col=summary&col=status&col=owner&col=type&col=priority&col=milestone&order=priority">View Known Issues</A>
|
||||
</DL><p>
|
||||
+ <DT><H3>Haiku Bookmarks</H3>
|
||||
+ <DL><p>
|
||||
+ <DT><A HREF="http://haiku-files.org/">Nightly Builds</A>
|
||||
+ <DT><A HREF="http://haiku-files.org/files/optional-packages/">Optional Packages</A>
|
||||
+ <DT><A HREF="http://dev.haiku-os.org/">Bug Tracker</A>
|
||||
+ <DT><A HREF="chrome://browser/content/dynamic-userguide-v1.html">Haiku User Guide</A>
|
||||
+ <DT><A HREF="chrome://browser/content/dynamic-bebook-v1.html">BeBook</A>
|
||||
+ <DT><A HREF="chrome://browser/content/dynamic-welcome-v1.html">Welcome</A>
|
||||
+ </DL></p>
|
||||
+ <DT><H3>Software for Haiku</H3>
|
||||
+ <DL><p>
|
||||
+ <DT><A HREF="http://dev.osdrawer.net">OSDrawer.net</A>
|
||||
+ <DT><A HREF="http://www.haikuware.com">HaikuWare</A>
|
||||
+ <DT><A HREF="http://zeta-games.com/">Zeta-Games</A>
|
||||
+ <DT><A HREF="http://www.bebits.com">BeBits</A>
|
||||
+ </DL><p>
|
||||
+ <DT><A HREF="http://www.haiku-os.org">Haiku WebSite</A>
|
||||
+
|
||||
</DL><p>
|
||||
Index: profile/defaults/bookmarks.html
|
||||
===================================================================
|
||||
--- profile/defaults/bookmarks.html (revision 7)
|
||||
+++ profile/defaults/bookmarks.html (working copy)
|
||||
@@ -7,35 +7,34 @@
|
||||
<H1>Bookmarks</H1>
|
||||
|
||||
<DL><p>
|
||||
- <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="NC:PersonalToolbarFolder">Personal Toolbar Folder</H3>
|
||||
- <DL><p>
|
||||
- <DT><A HREF="http://www.mozilla.org/">mozilla.org</A>
|
||||
- <DT><A HREF="http://www.mozillazine.org/">mozillaZine</A>
|
||||
- <DT><A HREF="http://www.mozdev.org/">mozdev.org</A>
|
||||
+ <DT><A HREF="http://en-US.add-ons.mozilla.com/en-US/firefox/bookmarks/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAFo9M%2F3AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAPkSURBVHjaYmAAgrjyOnOGiKxqxT9%2F%2FvwHCCCGuNJKLpAo49KTL%2F5%2F%2F8PMABBADJFZFWwXnn%2F%2FDxJYeOLNf0aQ9AIg48%2Ff%2Fwwfvv1hAAggZpBAYlWdnrqJLcPVE4e%2Bsuy7%2FfH%2F%2B88%2FGdjY2Bj%2BcCqHMey6%2Ben%2F379%2F%2F%2F8B6unZ9ew%2Fy54jV249f6%2Bm9uXnX4Y9qyaoAAQAhAB7%2FwEAAAAAY3h%2BG1RdbeMMCgkB9%2Fr%2BAPL2%2FAC3vsyi5NG6YQFcbnwdZ3F44uru9gAAAQAAUjEVALPT7wDu9v4A5erz%2FgL19vr16PD6AAUHBgDu9PwA%2F%2F8AAO%2F2%2FgD0%2BP0A7e7x8QPYzsX38vj9g%2BPk6hkLFiAxy%2BP4AeHj5%2FXFtp9GonxaagII7AawXyprpf%2F%2FZ5L5%2Fe%2Fv9%2B%2Fff91ZN7nrG0icJSqrkknJxHm1h5Nl0J8%2F%2Fxg%2B%2FwDa%2Febzv39%2FWKQ2TG97ycIvq%2Bvn52oVxMHGxHDj8RcGQT4uEGZyCct98e3LL3YmJ2enNYxAi%2B48%2B8QQaizGIMLFBLaSlYWZgYWDWZaJhY2V%2BcvPfwz%2BeiIMf%2F%2F%2BY9CV4GAQ42Zh%2BPPvP8O%2Fv%2F%2BZmG7cff7u49c%2FDNtufGZgYmJiOHLvG8Pt1z8Yfv3%2Bz%2FDn19%2B3TCd2LNV7%2F%2FU3w7vPvxkWnHzDcOPFd4ZvQBPv3L79aM%2BS3nfMN88d%2BfyXkW0Lq6BiGAs7J8fHT9%2F%2FXTy%2BY82Lp0cdb5889hcgQJNU85JYFMXP%2B5aHqRmmZJ9kKMGAEBgtDCYYY6BFa%2BlrPc6yRf0LYYtZzG4YaNGibUNJVLuIcBNUTLMQM8ZoppdiaXnf9Xlf5z4ounDu4p57f%2Ff8Pt50SH9ZEfUuLehy93yMRBNroVAg6PV2yBbO9c94tK5v7suF3%2FlMs1o8oU27ltvIMic7fJv7uuqLJGa2UpPxlCILICBtGz1pYWooakeoDaTFgBtNWm04zl%2Fkbs53FnZ%2FZO%2BldGbFP5aaP50cj41pigi8XFjF2zp8ivpgsFMFHp0GgrQZL4DuYGCE6f3pzoBnUwRB8sYi4QGKHf7b5d8HiHWpMBsPvLKDeFiHmVEPBN0yMJyMIUhfb6gXbMkr4xtq1J6Z36eLpmiDH508LNShbDzB4kTIATguNsBqA1CHElJDhGdCGWsDkYY%2FTJh3lUelu384yTlzrtgDWVaggvG8qhDnYcEwwWi0wET%2FTNTh9Gh%2FvVn7v%2B2I%2BHlpWXS59ORgfOr7UGRkVNMUAWPtCMnHdbjjATFNKJeKpdLZYQY0crDzLUvfbHxdqfllj6a7p2VVjUqyGhYwPpZFqxYlf6hZ%2F7X3c736%2Fv4LV1blv94gEvsAAAAASUVORK5CYII%3D" ID="rdf:#$CnoJ1">Get Bookmark Add-ons</A>
|
||||
+ <HR>
|
||||
+ <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">Bookmarks Toolbar Folder</H3>
|
||||
+<DD>Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar
|
||||
+ <DL><p>
|
||||
+ <DT><A HREF="http://www.haiku-os.org">Haiku WebSite</A>
|
||||
+ <DT><A HREF="http://haiku-files.org/">Nightly Builds</A>
|
||||
</DL><p>
|
||||
- <DT><H3>Mozilla Project</H3>
|
||||
+ <HR>
|
||||
+ <DT><H3>BeZilla Browser</H3>
|
||||
<DL><p>
|
||||
- <DT><H3>mozilla.org</H3>
|
||||
- <DL><p>
|
||||
- <DT><A HREF="http://www.mozilla.org/">The Mozilla Organization</A>
|
||||
- <DT><A HREF="http://www.seamonkey-project.org/">SeaMonkey Project</a>
|
||||
- <DT><A HREF="http://www.mozilla.org/products/">Mozilla Products</A>
|
||||
- <DT><A HREF="http://www.mozilla.org/feedback.html">Feedback</A>
|
||||
- </DL><p>
|
||||
- <DT><H3>Community & Support</H3>
|
||||
- <DL><p>
|
||||
- <DT><A HREF="http://www.mozillazine.org/">mozillaZine</A>
|
||||
- <DT><A HREF="http://forums.mozillazine.org/viewforum.php?f=40">SeaMonkey Support (mozillaZine)</A>
|
||||
- <DT><A HREF="http://www.mozdev.org/">mozdev.org</A>
|
||||
- <DT><A HREF="http://plugindoc.mozdev.org/">Mozilla Plug-in Information (mozdev)</A>
|
||||
- <DT><A HREF="http://extensionroom.mozdev.org/">Mozilla Extensions (mozdev)</A>
|
||||
- </DL><p>
|
||||
+ <DT><A HREF="http://bezilla.livejournal.com">BeZilla Blog</A>
|
||||
+ <DT><A HREF="http://ports.haiku-files.org/newticket">Report an Issue</A>
|
||||
+ <DT><A HREF="http://ports.haiku-files.org/query?component=www-client%2Fmozilla-firefox&col=id&col=summary&col=status&col=owner&col=type&col=priority&col=milestone&order=priority">View Known Issues</A>
|
||||
</DL><p>
|
||||
- <DT><H3>Search the Web</H3>
|
||||
+ <DT><H3>Haiku Bookmarks</H3>
|
||||
<DL><p>
|
||||
- <DT><A HREF="http://www.google.com/">Google</A>
|
||||
- <DT><A HREF="http://groups.google.com/">Google Groups</A>
|
||||
- <DT><A HREF="http://news.google.com/">Google News</A>
|
||||
+ <DT><A HREF="http://haiku-files.org/">Nightly Builds</A>
|
||||
+ <DT><A HREF="http://haiku-files.org/files/optional-packages/">Optional Packages</A>
|
||||
+ <DT><A HREF="http://dev.haiku-os.org/">Bug Tracker</A>
|
||||
+ </DL></p>
|
||||
+ <DT><H3>Software for Haiku</H3>
|
||||
+ <DL><p>
|
||||
+ <DT><A HREF="http://dev.osdrawer.net">OSDrawer.net</A>
|
||||
+ <DT><A HREF="http://www.haikuware.com">HaikuWare</A>
|
||||
+ <DT><A HREF="http://zeta-games.com/">Zeta-Games</A>
|
||||
+ <DT><A HREF="http://www.bebits.com">BeBits</A>
|
||||
</DL><p>
|
||||
- <HR>
|
||||
+ <DT><A HREF="http://www.haiku-os.org">Haiku WebSite</A>
|
||||
+
|
||||
</DL><p>
|
||||
Index: browser/base/content/dynamic-bebook-v1.html
|
||||
===================================================================
|
||||
--- browser/base/content/dynamic-bebook-v1.html (revision 0)
|
||||
+++ browser/base/content/dynamic-bebook-v1.html (revision 0)
|
||||
@@ -0,0 +1,32 @@
|
||||
+<html>
|
||||
+ <head>
|
||||
+ <title>Opening the welcome page...</title>
|
||||
+ <script type="text/javascript">
|
||||
+ function fileExists(filename) {
|
||||
+ try {
|
||||
+ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||
+ } catch (e) {
|
||||
+ alert("Permission to read file was denied.");
|
||||
+ }
|
||||
+ var file = Components.classes["@mozilla.org/file/local;1"].createInstance(
|
||||
+ Components.interfaces.nsILocalFile);
|
||||
+ file.initWithPath(filename);
|
||||
+ return file.exists();
|
||||
+ }
|
||||
+
|
||||
+ window.onload = function() {
|
||||
+ var url = "http://www.haiku-os.org/legacy-docs/bebook/";
|
||||
+ var localWelcome = "/boot/system/documentation/bebook/index.html";
|
||||
+
|
||||
+ if (fileExists(localWelcome))
|
||||
+ url = "file://" + localWelcome;
|
||||
+
|
||||
+ window.open(url, "_self");
|
||||
+ }
|
||||
+
|
||||
+ </script>
|
||||
+ </head>
|
||||
+ <body>
|
||||
+ Opening the welcome page...
|
||||
+ </body>
|
||||
+</html>
|
||||
Index: browser/base/content/dynamic-bebook-v2.html
|
||||
===================================================================
|
||||
--- browser/base/content/dynamic-bebook-v2.html (revision 0)
|
||||
+++ browser/base/content/dynamic-bebook-v2.html (revision 0)
|
||||
@@ -0,0 +1,56 @@
|
||||
+<?xml version="1.0" encoding="UTF-8" ?>
|
||||
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
|
||||
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US" xml:lang="en-US">
|
||||
+<head>
|
||||
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
|
||||
+<meta name="robots" content="all" />
|
||||
+<title>Welcome to Haiku!</title>
|
||||
+<link rel="stylesheet" type="text/css" href="../Haiku-doc.css" />
|
||||
+<script type="text/javascript">
|
||||
+var xmlhttp;
|
||||
+var offLineWelcomePage = 'file:///boot/system/documentation/bebook/index.html';
|
||||
+var onLineWelcomePage = 'http://www.haiku-os.org/legacy-docs/bebook/';
|
||||
+
|
||||
+function redirect()
|
||||
+{
|
||||
+
|
||||
+xmlhttp=new XMLHttpRequest();
|
||||
+xmlhttp.onreadystatechange=state_Change;
|
||||
+try
|
||||
+{
|
||||
+ xmlhttp.open("GET",offLineWelcomePage);
|
||||
+ xmlhttp.send(null);
|
||||
+}
|
||||
+catch(err)
|
||||
+{
|
||||
+
|
||||
+ window.location = onLineWelcomePage;
|
||||
+}
|
||||
+}
|
||||
+
|
||||
+function state_Change()
|
||||
+{
|
||||
+
|
||||
+if (xmlhttp.readyState==4)
|
||||
+{// 4 = "loaded"
|
||||
+ if (xmlhttp.status==200 ||xmlhttp.status==0)
|
||||
+ {// 200 = "OK"; loading from file:// so no http status set! hence status == 0.
|
||||
+ if(xmlhttp.responseText.length != 0)
|
||||
+ window.location = offLineWelcomePage;
|
||||
+ else
|
||||
+ window.location = onLineWelcomePage;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ alert("Problem retrieving data:" + xmlhttp.statusText);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+}
|
||||
+</script>
|
||||
+</head>
|
||||
+<body onload="redirect()">
|
||||
+</body>
|
||||
+</html>
|
||||
+
|
||||
Index: browser/base/content/dynamic-userguide-v1.html
|
||||
===================================================================
|
||||
--- browser/base/content/dynamic-userguide-v1.html (revision 0)
|
||||
+++ browser/base/content/dynamic-userguide-v1.html (revision 0)
|
||||
@@ -0,0 +1,32 @@
|
||||
+<html>
|
||||
+ <head>
|
||||
+ <title>Opening the welcome page...</title>
|
||||
+ <script type="text/javascript">
|
||||
+ function fileExists(filename) {
|
||||
+ try {
|
||||
+ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||
+ } catch (e) {
|
||||
+ alert("Permission to read file was denied.");
|
||||
+ }
|
||||
+ var file = Components.classes["@mozilla.org/file/local;1"].createInstance(
|
||||
+ Components.interfaces.nsILocalFile);
|
||||
+ file.initWithPath(filename);
|
||||
+ return file.exists();
|
||||
+ }
|
||||
+
|
||||
+ window.onload = function() {
|
||||
+ var url = "http://svn.berlios.de/svnroot/repos/haiku/haiku/trunk/docs/userguide/en/contents.html";
|
||||
+ var localWelcome = "/boot/system/documentation/userguide/en/contents.html";
|
||||
+
|
||||
+ if (fileExists(localWelcome))
|
||||
+ url = "file://" + localWelcome;
|
||||
+
|
||||
+ window.open(url, "_self");
|
||||
+ }
|
||||
+
|
||||
+ </script>
|
||||
+ </head>
|
||||
+ <body>
|
||||
+ Opening the welcome page...
|
||||
+ </body>
|
||||
+</html>
|
||||
Index: browser/base/content/dynamic-userguide-v2.html
|
||||
===================================================================
|
||||
--- browser/base/content/dynamic-userguide-v2.html (revision 0)
|
||||
+++ browser/base/content/dynamic-userguide-v2.html (revision 0)
|
||||
@@ -0,0 +1,56 @@
|
||||
+<?xml version="1.0" encoding="UTF-8" ?>
|
||||
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
|
||||
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US" xml:lang="en-US">
|
||||
+<head>
|
||||
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
|
||||
+<meta name="robots" content="all" />
|
||||
+<title>Welcome to Haiku!</title>
|
||||
+<link rel="stylesheet" type="text/css" href="../Haiku-doc.css" />
|
||||
+<script type="text/javascript">
|
||||
+var xmlhttp;
|
||||
+var offLineWelcomePage = 'file:///boot/system/documentation/userguide/en/contents.html';
|
||||
+var onLineWelcomePage = 'http://svn.berlios.de/svnroot/repos/haiku/haiku/trunk/docs/userguide/en/contents.html';
|
||||
+
|
||||
+function redirect()
|
||||
+{
|
||||
+
|
||||
+xmlhttp=new XMLHttpRequest();
|
||||
+xmlhttp.onreadystatechange=state_Change;
|
||||
+try
|
||||
+{
|
||||
+ xmlhttp.open("GET",offLineWelcomePage);
|
||||
+ xmlhttp.send(null);
|
||||
+}
|
||||
+catch(err)
|
||||
+{
|
||||
+
|
||||
+ window.location = onLineWelcomePage;
|
||||
+}
|
||||
+}
|
||||
+
|
||||
+function state_Change()
|
||||
+{
|
||||
+
|
||||
+if (xmlhttp.readyState==4)
|
||||
+{// 4 = "loaded"
|
||||
+ if (xmlhttp.status==200 ||xmlhttp.status==0)
|
||||
+ {// 200 = "OK"; loading from file:// so no http status set! hence status == 0.
|
||||
+ if(xmlhttp.responseText.length != 0)
|
||||
+ window.location = offLineWelcomePage;
|
||||
+ else
|
||||
+ window.location = onLineWelcomePage;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ alert("Problem retrieving data:" + xmlhttp.statusText);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+}
|
||||
+</script>
|
||||
+</head>
|
||||
+<body onload="redirect()">
|
||||
+</body>
|
||||
+</html>
|
||||
+
|
||||
Index: browser/base/content/dynamic-welcome-v1.html
|
||||
===================================================================
|
||||
--- browser/base/content/dynamic-welcome-v1.html (revision 0)
|
||||
+++ browser/base/content/dynamic-welcome-v1.html (revision 0)
|
||||
@@ -0,0 +1,32 @@
|
||||
+<html>
|
||||
+ <head>
|
||||
+ <title>Opening the welcome page...</title>
|
||||
+ <script type="text/javascript">
|
||||
+ function fileExists(filename) {
|
||||
+ try {
|
||||
+ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||
+ } catch (e) {
|
||||
+ alert("Permission to read file was denied.");
|
||||
+ }
|
||||
+ var file = Components.classes["@mozilla.org/file/local;1"].createInstance(
|
||||
+ Components.interfaces.nsILocalFile);
|
||||
+ file.initWithPath(filename);
|
||||
+ return file.exists();
|
||||
+ }
|
||||
+
|
||||
+ window.onload = function() {
|
||||
+ var url = "http://svn.berlios.de/svnroot/repos/haiku/haiku/trunk/docs/welcome/welcome.html";
|
||||
+ var localWelcome = "/boot/system/documentation/welcome/welcome.html";
|
||||
+
|
||||
+ if (fileExists(localWelcome))
|
||||
+ url = "file://" + localWelcome;
|
||||
+
|
||||
+ window.open(url, "_self");
|
||||
+ }
|
||||
+
|
||||
+ </script>
|
||||
+ </head>
|
||||
+ <body>
|
||||
+ Opening the welcome page...
|
||||
+ </body>
|
||||
+</html>
|
||||
Index: browser/base/content/dynamic-welcome-v2.html
|
||||
===================================================================
|
||||
--- browser/base/content/dynamic-welcome-v2.html (revision 0)
|
||||
+++ browser/base/content/dynamic-welcome-v2.html (revision 0)
|
||||
@@ -0,0 +1,56 @@
|
||||
+<?xml version="1.0" encoding="UTF-8" ?>
|
||||
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
|
||||
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US" xml:lang="en-US">
|
||||
+<head>
|
||||
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
|
||||
+<meta name="robots" content="all" />
|
||||
+<title>Welcome to Haiku!</title>
|
||||
+<link rel="stylesheet" type="text/css" href="../Haiku-doc.css" />
|
||||
+<script type="text/javascript">
|
||||
+var xmlhttp;
|
||||
+var offLineWelcomePage = 'file:///boot/system/documentation/welcome/welcome.html';
|
||||
+var onLineWelcomePage = 'http://svn.berlios.de/svnroot/repos/haiku/haiku/trunk/docs/welcome/welcome.html';
|
||||
+
|
||||
+function redirect()
|
||||
+{
|
||||
+
|
||||
+xmlhttp=new XMLHttpRequest();
|
||||
+xmlhttp.onreadystatechange=state_Change;
|
||||
+try
|
||||
+{
|
||||
+ xmlhttp.open("GET",offLineWelcomePage);
|
||||
+ xmlhttp.send(null);
|
||||
+}
|
||||
+catch(err)
|
||||
+{
|
||||
+
|
||||
+ window.location = onLineWelcomePage;
|
||||
+}
|
||||
+}
|
||||
+
|
||||
+function state_Change()
|
||||
+{
|
||||
+
|
||||
+if (xmlhttp.readyState==4)
|
||||
+{// 4 = "loaded"
|
||||
+ if (xmlhttp.status==200 ||xmlhttp.status==0)
|
||||
+ {// 200 = "OK"; loading from file:// so no http status set! hence status == 0.
|
||||
+ if(xmlhttp.responseText.length != 0)
|
||||
+ window.location = offLineWelcomePage;
|
||||
+ else
|
||||
+ window.location = onLineWelcomePage;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ alert("Problem retrieving data:" + xmlhttp.statusText);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+}
|
||||
+</script>
|
||||
+</head>
|
||||
+<body onload="redirect()">
|
||||
+</body>
|
||||
+</html>
|
||||
+
|
||||
@@ -0,0 +1,19 @@
|
||||
Index: browser/app/firefox-branding.js
|
||||
===================================================================
|
||||
--- browser/app/firefox-branding.js (revision 7)
|
||||
+++ browser/app/firefox-branding.js (working copy)
|
||||
@@ -1,5 +1,4 @@
|
||||
pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/");
|
||||
-pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/");
|
||||
// URL user can browse to manually if for some reason all update installation
|
||||
// attempts fail.
|
||||
pref("app.update.url.manual", "http://www.mozilla.org/products/%APP%/");
|
||||
@@ -8,7 +7,7 @@
|
||||
pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/");
|
||||
|
||||
// Release notes URL
|
||||
-pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/");
|
||||
+pref("app.releaseNotesURL", "about:buildconfig");
|
||||
|
||||
// Search codes belong only in builds with official branding
|
||||
pref("browser.search.param.yahoo-fr", "");
|
||||
Reference in New Issue
Block a user