From 1a8972ec397cf7a077f27a32b7602247787bf7a2 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Wed, 10 Mar 2010 16:37:05 +0100
Subject: [PATCH] fennec: - remove package fennec, will be developed in
 webbrowser-integration branch

---
 packages/web/fennec/build                     | 104 ------------------
 packages/web/fennec/install                   |  30 -----
 ...fennec-crosscompiling_change_dirs-0.1.diff |  63 -----------
 .../fennec-disable_phonetools-0.1.diff        |  11 --
 .../patches/fennec-start_fullscreen-0.1.diff  |  13 ---
 .../patches/fennec_modify_keycodes-0.1.diff   |  55 ---------
 packages/web/fennec/url                       |   1 -
 7 files changed, 277 deletions(-)
 delete mode 100755 packages/web/fennec/build
 delete mode 100755 packages/web/fennec/install
 delete mode 100644 packages/web/fennec/patches/010-fennec-crosscompiling_change_dirs-0.1.diff
 delete mode 100644 packages/web/fennec/patches/fennec-disable_phonetools-0.1.diff
 delete mode 100644 packages/web/fennec/patches/fennec-start_fullscreen-0.1.diff
 delete mode 100644 packages/web/fennec/patches/fennec_modify_keycodes-0.1.diff
 delete mode 100644 packages/web/fennec/url

diff --git a/packages/web/fennec/build b/packages/web/fennec/build
deleted file mode 100755
index 0f7f928a27..0000000000
--- a/packages/web/fennec/build
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-
-. config/options
-
-$SCRIPTS/build toolchain
-$SCRIPTS/build alsa-lib
-$SCRIPTS/build gtk+
-$SCRIPTS/build libIDL
-$SCRIPTS/build libIDL-host
-
-# set some variables
-  MOZ_OPT_FLAGS=`echo $TARGET_CFLAGS | sed -e 's/-Wall//'`
-  MOZ_OPT_FLAGS=`echo $MOZ_OPT_FLAGS | sed -e 's/-D_FILE_OFFSET_BITS=64//'`
-
-# set crosscompiling related variables
-  export CROSS_COMPILE=yes
-  export HOST_CC="$HOST_CC"
-  export HOST_CXX="$HOST_CXX"
-  export HOST_CFLAGS="$HOST_CFLAGS"
-  export HOST_CXXFLAGS="$HOST_CXXFLAGS"
-  export HOST_LDFLAGS="$HOST_LDFLAGS"
-  export HOST_RANLIB="$HOST_RANLIB"
-  export HOST_AR="$HOST_AR"
-  export HOST_LIBIDL_CONFIG="$ROOT/$TOOLCHAIN/bin/libIDL-config-2"
-
-# set some other variables
-  export CFLAGS=$MOZ_OPT_FLAGS
-  export CXXFLAGS=$MOZ_OPT_FLAGS
-  export LDFLAGS="-Wl,-rpath,/usr/lib/fennec/xulrunner"
-
-cd $PKG_BUILD
-
-# configure xulrunner and fennec
-cat > .mozconfig <<EOF
-  mk_add_options MOZ_BUILD_PROJECTS="xulrunner mobile" # browser"
-  mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/.build
-
-# some variables needed for crosscompiling
-  ac_add_options --host=$TARGET_NAME
-  ac_add_options --build=$HOST_NAME
-
-# General config
-  ac_add_options --prefix=/usr
-  ac_add_options --enable-debug
-  # ac_add_options --disable-mobile-optimize
-  ac_add_options --enable-optimize
-  # ac_add_options --disable-optimize
-  # ac_cv_visibility_pragma=no
-  # ac_add_options --enable-timeline
-  # ac_add_options --enable-default-toolkit=gtk2
-  ##ac_add_options --enable-installer
-  # ac_add_options --enable-logging
-  ##ac_add_options --enable-updater
-  ##ac_add_options --enable-plugins
-  ##ac_add_options --disable-view-source
-  # ac_add_options --disable-printing
-  # ac_add_options --disable-xprint
-  ac_add_options --disable-libnotify
-  ##   ac_add_options --with-libIDL
-  # ac_add_options --disable-parental-controls
-  ac_add_options --with-system-bz2
-  ac_add_options --with-system-jpeg
-  ac_add_options --with-system-png
-  ac_add_options --with-system-zlib
-  # ac_add_options --enable-canvas
-  # ac_add_options --enable-safe-browsing
-  # ac_add_options --enable-svg
-  ac_add_options --enable-system-cairo
-  # ac_add_options --enable-system-sqlite
-
-  ac_add_options --disable-tests
-  ac_add_options --disable-dbus
-  ac_add_options --disable-crashreporter
-  ##ac_add_options --enable-libxul
-  ac_add_options --disable-gnomevfs
-  ac_add_options --disable-gnomeui
-  #ac_add_options --enable-extensions=python/xpcom,default
-
-# Xulrunner related options
-  ac_add_app_options xulrunner --enable-application=xulrunner
-  ac_add_app_options xulrunner --disable-javaxpcom
-
-# Fennec related options
-  ac_add_app_options mobile --enable-application=mobile
-#  ac_add_app_options mobile --with-system-libxul
-  ac_add_app_options mobile --with-libxul-sdk=../xulrunner/dist
-
-# configure will be automatically generated using the 'autoconf-2.13'
-# command. If autoconf-2.13 isn't the right name for your system, as
-# is the case on OS X using MacPorts, use the real command name as
-# demonstrated below.
-  mk_add_options AUTOCONF=autoconf-2.13
-EOF
-
-make -f client.mk build MOZ_MAKE_FLAGS="-j1" STRIP=/bin/true
-
-rm -rf .build/mobile/xulrunner/dist/bin/xpidl
-rm -rf .build/mobile/xulrunner/dist/bin/xpt_dump
-rm -rf .build/mobile/xulrunner/dist/bin/xpt_link
-rm -rf .build/mobile/xulrunner/dist/bin/xulrunner
-rm -rf .build/mobile/xulrunner/dist/bin/xpcshell
-rm -rf .build/mobile/xulrunner/dist/bin/nspr-config
-
-#rm -rf .build/mobile/dist/bin/fennec
diff --git a/packages/web/fennec/install b/packages/web/fennec/install
deleted file mode 100755
index 11aca9b4f1..0000000000
--- a/packages/web/fennec/install
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-. config/options
-
-$SCRIPTS/install alsa-lib
-$SCRIPTS/install gtk+
-$SCRIPTS/install libIDL
-
-# copy source with -L to follow the syslinks
-#mkdir -p $INSTALL/usr/lib/xulrunner
-#  cp -LR $PKG_BUILD/.build/xulrunner/dist/bin/* $INSTALL/usr/lib/xulrunner
-
-#for i in `ls $PKG_BUILD/.build/xulrunner/dist/bin/*.so`; do
-#  SO_FILE=`basename $i`
-#  ln -sf /usr/lib/xulrunner/$SO_FILE $INSTALL/usr/lib/$SO_FILE
-#done
-
-mkdir -p $INSTALL/usr/lib/fennec
-  cp -LR $PKG_BUILD/.build/mobile/dist/bin/* $INSTALL/usr/lib/fennec
-
-mkdir -p $INSTALL/usr/bin
-  ln -sf /usr/lib/fennec/fennec $INSTALL/usr/bin/fennec
-
-#  cat > $INSTALL/usr/bin/fennec <<EOF
-##!/bin/sh
-#
-#/usr/lib/xulrunner/xulrunner-bin /usr/lib/fennec/application.ini $@
-#EOF
-
-#chmod +x $INSTALL/usr/bin/fennec
\ No newline at end of file
diff --git a/packages/web/fennec/patches/010-fennec-crosscompiling_change_dirs-0.1.diff b/packages/web/fennec/patches/010-fennec-crosscompiling_change_dirs-0.1.diff
deleted file mode 100644
index f2cae2a847..0000000000
--- a/packages/web/fennec/patches/010-fennec-crosscompiling_change_dirs-0.1.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Naur fennec-1.0rc3.repack/config/autoconf.mk.in fennec-1.0rc3.repack.patch/config/autoconf.mk.in
---- fennec-1.0rc3.repack/config/autoconf.mk.in	2010-01-27 05:20:55.000000000 +0100
-+++ fennec-1.0rc3.repack.patch/config/autoconf.mk.in	2010-02-02 16:06:29.631066553 +0100
-@@ -58,14 +58,14 @@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
--includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir	= @includedir@/$(MOZ_APP_NAME)
- libdir		= @libdir@
- datadir		= @datadir@
- mandir		= @mandir@
--idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+idldir		= $(datadir)/idl/$(MOZ_APP_NAME)
- 
--installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir	= $(libdir)/$(MOZ_APP_NAME)
-+sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
- 
- DIST		= $(DEPTH)/dist
- LIBXUL_SDK      = @LIBXUL_SDK@
-diff -Naur fennec-1.0rc3.repack/js/src/config/autoconf.mk.in fennec-1.0rc3.repack.patch/js/src/config/autoconf.mk.in
---- fennec-1.0rc3.repack/js/src/config/autoconf.mk.in	2010-01-27 05:21:05.000000000 +0100
-+++ fennec-1.0rc3.repack.patch/js/src/config/autoconf.mk.in	2010-02-02 16:05:29.363066752 +0100
-@@ -61,8 +61,8 @@
- datadir		= @datadir@
- mandir		= @mandir@
- 
--installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir	= $(libdir)/$(MOZ_APP_NAME)
-+sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
- 
- TOP_DIST	= @TOP_DIST@
- ifneq (,$(filter /%,$(TOP_DIST)))
-diff -Naur fennec-1.0rc3.repack/toolkit/mozapps/installer/packager.mk fennec-1.0rc3.repack.patch/toolkit/mozapps/installer/packager.mk
---- fennec-1.0rc3.repack/toolkit/mozapps/installer/packager.mk	2010-01-27 05:21:32.000000000 +0100
-+++ fennec-1.0rc3.repack.patch/toolkit/mozapps/installer/packager.mk	2010-02-02 16:10:37.660066944 +0100
-@@ -454,7 +454,7 @@
- 	  (cd $(DESTDIR)$(installdir) && tar -xf -)
- 	$(NSINSTALL) -D $(DESTDIR)$(bindir)
- 	$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
--	ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
-+	ln -s $(DESTDIR)$(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
- ifdef INSTALL_SDK # Here comes the hard part
- 	$(NSINSTALL) -D $(DESTDIR)$(includedir)
- 	(cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \
-@@ -469,10 +469,10 @@
- 	fi
- 	(cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -)
- 	$(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl
--	ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib
--	ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin
--	ln -s $(includedir) $(DESTDIR)$(sdkdir)/include
--	ln -s $(idldir) $(DESTDIR)$(sdkdir)/idl
-+	ln -s $(DESTDIR)$(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib
-+	ln -s $(DESTDIR)$(installdir) $(DESTDIR)$(sdkdir)/bin
-+	ln -s $(DESTDIR)$(includedir) $(DESTDIR)$(sdkdir)/include
-+	ln -s $(DESTDIR)$(idldir) $(DESTDIR)$(sdkdir)/idl
- endif # INSTALL_SDK
- 
- make-sdk:
diff --git a/packages/web/fennec/patches/fennec-disable_phonetools-0.1.diff b/packages/web/fennec/patches/fennec-disable_phonetools-0.1.diff
deleted file mode 100644
index 3875244ee9..0000000000
--- a/packages/web/fennec/patches/fennec-disable_phonetools-0.1.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur mozilla-1.9.2/mobile/components/Makefile.in mozilla-1.9.2.patch/mobile/components/Makefile.in
---- mozilla-1.9.2/mobile/components/Makefile.in	2010-01-27 05:28:53.000000000 +0100
-+++ mozilla-1.9.2.patch/mobile/components/Makefile.in	2010-01-31 21:55:01.826947596 +0100
-@@ -66,7 +66,6 @@
- 	$(NULL)
- 
- DIRS = protocols \
--        phone \
-         $(NULL)
- 
- include $(topsrcdir)/config/rules.mk
diff --git a/packages/web/fennec/patches/fennec-start_fullscreen-0.1.diff b/packages/web/fennec/patches/fennec-start_fullscreen-0.1.diff
deleted file mode 100644
index c7781f04fc..0000000000
--- a/packages/web/fennec/patches/fennec-start_fullscreen-0.1.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur fennec-latest.orig/mobile/chrome/content/browser.xul fennec-latest.patch/mobile/chrome/content/browser.xul
---- fennec-latest.orig/mobile/chrome/content/browser.xul	2010-02-06 23:19:12.000000000 +0100
-+++ fennec-latest.patch/mobile/chrome/content/browser.xul	2010-02-08 22:19:50.575981168 +0100
-@@ -61,8 +61,7 @@
- #elifdef MOZ_PLATFORM_HILDON
-         sizemode="fullscreen"
- #else
--        width="800"
--        height="500"
-+        sizemode="fullscreen"
- #endif
-         onkeypress="onDebugKeyPress(event);"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
diff --git a/packages/web/fennec/patches/fennec_modify_keycodes-0.1.diff b/packages/web/fennec/patches/fennec_modify_keycodes-0.1.diff
deleted file mode 100644
index a232a943cc..0000000000
--- a/packages/web/fennec/patches/fennec_modify_keycodes-0.1.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Naur fennec-latest.orig/mobile/chrome/content/browser.xul fennec-latest.patch/mobile/chrome/content/browser.xul
---- fennec-latest.orig/mobile/chrome/content/browser.xul	2010-02-08 22:38:14.542981051 +0100
-+++ fennec-latest.patch/mobile/chrome/content/browser.xul	2010-02-08 23:13:02.153106002 +0100
-@@ -143,37 +143,29 @@
- 
-   <keyset id="mainKeyset">
-     <!-- basic navigation -->
--    <key id="key_back" keycode="VK_LEFT" command="cmd_back" modifiers="control"/>
--    <key id="key_forward" keycode="VK_RIGHT" command="cmd_forward" modifiers="control"/>
--    <key id="key_back2" keycode="VK_BACK" command="cmd_back"/>
--    <key id="key_forward2" keycode="VK_BACK" command="cmd_forward" modifiers="shift"/>
--#ifndef MOZ_PLATFORM_HILDON
-+    <key id="key_back" keycode="VK_LEFT" command="cmd_back" modifiers="alt"/>
-+    <key id="key_forward" keycode="VK_RIGHT" command="cmd_forward" modifiers="alt"/>
-     <key id="key_reload" keycode="VK_F5" command="cmd_reload"/>
--#else
--    <!-- F5 on maemo is "home" which is a task switching key -->
--#endif
--    <key id="key_focusURL" key="l" modifiers="accel" command="cmd_openLocation"/>
-+    <key id="key_focusURL" key="l" modifiers="alt" command="cmd_openLocation"/>
- 
-     <!-- scrolling -->
-     <key id="key_pageUp" keycode="VK_UP" modifiers="shift" command="cmd_scrollPageUp"/>
-     <key id="key_pageDown" keycode="VK_DOWN" modifiers="shift" command="cmd_scrollPageDown"/>
- 
-     <!-- misc -->
--    <key id="key_zoomin" keycode="VK_UP" modifiers="accel" command="cmd_zoomin"/>
--    <key id="key_zoomout" keycode="VK_DOWN" modifiers="accel" command="cmd_zoomout"/>
--#ifndef WINCE
--    <key id="key_quit" key="q" modifiers="accel" command="cmd_quit"/>
--    <key id="key_menu" keycode="VK_F4" command="cmd_menu"/>
--    <key id="key_fullscreen" keycode="VK_F6" command="cmd_fullscreen"/>
--#else
--    <key id="key_quit" keycode="VK_F4" command="cmd_quit"/>
--    <key id="key_zoomin2" keycode="VK_F1" command="cmd_zoomin"/>
--    <key id="key_zoomout2" keycode="VK_F2" command="cmd_zoomout"/>
--#endif
-+    <key id="key_zoomin" key="+" modifiers="alt" command="cmd_zoomin"/>
-+    <key id="key_zoomout" key="-" modifiers="alt" command="cmd_zoomout"/>
-+    <key id="key_quit" keycode="VK_F4" modifiers="alt" command="cmd_quit"/>
-+    <key id="key_close" key="x" modifiers="alt" command="cmd_close"/>
-+    <key id="key_menu" key="m" modifiers="alt" command="cmd_menu"/>
-+    <key id="key_actions" key="a" modifiers="alt" command="cmd_actions"/>
-+    <key id="key_go" keycode="VK_ENTER" modifiers="alt" command="cmd_go"/>
-+    <key id="key_go2" keycode="VK_RETURN" modifiers="alt" command="cmd_go"/>
-+    <key id="key_bookmark" key="b" modifiers="alt" command="cmd_star"/>
- 
-     <!-- tabs -->
--    <key id="key_newTab" key="t" modifiers="accel" command="cmd_newTab"/>
--    <key id="key_closeTab" key="w" modifiers="accel" command="cmd_closeTab"/>
-+    <key id="key_newTab" key="t" modifiers="alt" command="cmd_newTab"/>
-+    <key id="key_closeTab" key="w" modifiers="alt" command="cmd_closeTab"/>
-   </keyset>
- 
-   <stack flex="1" id="stack">
diff --git a/packages/web/fennec/url b/packages/web/fennec/url
deleted file mode 100644
index b7cd23c646..0000000000
--- a/packages/web/fennec/url
+++ /dev/null
@@ -1 +0,0 @@
-http://sources.openelec.tv/svn/fennec-37982.1334.tar.bz2