BeZilla: rename recipe to include version

* make use of browser.mozconfig
* move $libDir/firefox-2.0.0.22pre to $appsDir/BeZilla
* rearrange libs
* create devel package
* add Deskbar link
* use haiku-widget-theme
* add missing zip requires
* mozconfig clean-up
This commit is contained in:
Sergei Reznikov
2015-04-20 10:40:29 +03:00
parent cb2aa6e7ff
commit b09ca67402
4 changed files with 200 additions and 103 deletions

View File

@@ -0,0 +1,111 @@
SUMMARY="Bezilla is a version of Firefox 2 for Haiku"
DESCRIPTION="Bezilla is an open source web browser. \
It achieves balance between ease of use and customization, catering to the \
needs of both casual and power users."
HOMEPAGE="https://github.com/mmadia/bezilla"
SRC_URI="git+https://github.com/mmadia/bezilla.git#686254"
REVISION="1"
LICENSE="MPL v1.1"
COPYRIGHT="1998-1999 Netscape Communications Corporation"
ARCHITECTURES="x86_gcc2 x86 ?arm"
SECONDARY_ARCHITECTURES="x86_gcc2 x86 ?arm"
PROVIDES="
bezilla$secondaryArchSuffix = $portVersion
cmd:firefox$secondaryArchSuffix = $portVersion
app:BeZilla$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
"
BUILD_REQUIRES="
devel:libidl$secondaryArchSuffix
devel:libglib$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel
cmd:gcc$secondaryArchSuffix
cmd:make
cmd:m4
cmd:gawk
cmd:perl
cmd:xargs
cmd:tar
cmd:zip
cmd:autoconf_2.13$secondaryArchSuffix
"
PATCHES="bezilla-2.0.0.22.patchset"
BUILD()
{
cd mozilla
autoconf-2.13
pushd nsprpub
autoconf-2.13
popd
pushd directory/c-sdk
autoconf-2.13
popd
export MOZCONFIG=../supporting-files/mozilla-configs/browser.mozconfig
runConfigure --omit-dirs 'docDir dataRootDir' configure
make $jobArgs
}
INSTALL()
{
cd mozilla
make install
mkdir $appsDir
mv $libDir/firefox-2.0.0.22pre $appsDir/BeZilla
mv $appsDir/BeZilla/firefox-bin $appsDir/BeZilla/BeZilla
# creating the lib and add-ons
mkdir $appsDir/BeZilla/lib
mkdir $appsDir/BeZilla/add-ons
# arranging the files in lib and add-ons directories
cd $appsDir/BeZilla
mv libnspr4.so libnss3.so libnssutil3.so libplc4.so libplds4.so \
libsmime3.so libsoftokn3.so libsqlite3.so libssl3.so libxpcom.so \
libxpcom_compat.so libxpcom_core.so lib
mv libfreebl3.so libnssckbi.so libnssdbm3.so libxpistub.so add-ons
cp $sourceDir/supporting-files/persdict.dat $appsDir/BeZilla/defaults/profile
cp $sourceDir/supporting-files/haiku-widget-theme/browser/classic.jar $appsDir/BeZilla/chrome
ln -sf ../lib/libsoftokn3.so add-ons
fixPkgconfig
packageEntries devel \
$developDir \
$dataDir/idl \
$dataDir/aclocal \
$binDir/firefox-config
# TODO: fix $dist_bin/$MOZILLA_BIN in cmd:firefox script
addAppDeskbarSymlink $appsDir/BeZilla/BeZilla
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
bezilla${secondaryArchSuffix}_devel = $portVersion
cmd:firefox_config$secondaryArchSuffix = $portVersion
"
REQUIRES_devel="
bezilla$secondaryArchSuffix == $portVersion base
"

View File

@@ -1,72 +0,0 @@
SUMMARY="Bezilla is a version of Firefox 2 for Haiku"
DESCRIPTION="Bezilla is an open source web browser. \
It achieves balance between ease of use and customization, catering to the \
needs of both casual and power users."
HOMEPAGE="https://github.com/mmadia/bezilla"
SRC_URI="git+https://github.com/mmadia/bezilla.git#686254"
REVISION="1"
LICENSE="MPL v1.1"
COPYRIGHT="1998-1999 Netscape Communications Corporation"
ARCHITECTURES="x86_gcc2 x86 ?arm"
SECONDARY_ARCHITECTURES="x86_gcc2 x86 ?arm"
PROVIDES="
bezilla$secondaryArchSuffix = $portVersion
app:Bezilla$secondaryArchSuffix = $portVersion
cmd:Bezilla_config$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
"
BUILD_REQUIRES="
devel:libidl$secondaryArchSuffix
devel:libglib$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel
cmd:gcc$secondaryArchSuffix
cmd:make
cmd:m4
cmd:gawk
cmd:perl
cmd:xargs
cmd:tar
cmd:autoconf_2.13$secondaryArchSuffix
"
PATCHES="bezilla-git.patchset"
BUILD()
{
cd mozilla
autoconf-2.13
cd nsprpub
autoconf-2.13
cd ..
cd directory/c-sdk
autoconf-2.13
cd ../..
runConfigure --omit-dirs 'docDir dataRootDir' ./configure \
--enable-application=browser --disable-canvas \
--disable-svg --disable-updater
make
}
INSTALL()
{
cd mozilla
make install
mkdir $appsDir
mv $binDir/firefox $appsDir/Bezilla
mv $libDir/firefox-2.0.0.22pre/firefox-bin $libDir/firefox-2.0.0.22pre/Bezilla-bin
mv $binDir/firefox-config $binDir/Bezilla-config
}

View File

@@ -0,0 +1,89 @@
From efbeffb0cdcd1322ef47fb433767ef6f81e7a1a8 Mon Sep 17 00:00:00 2001
From: Theodore Kokkoris <t.kokkoris@gmail.com>
Date: Fri, 12 Dec 2014 13:45:46 +0200
Subject: Enable Haiku support in configure.in
diff --git a/mozilla/configure.in b/mozilla/configure.in
index 23cc7e7..9bd8cb5 100755
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -885,12 +885,8 @@ if test -n "$CROSS_COMPILE"; then
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 -------------------------------------------------------
+ beos*) OS_ARCH=BeOS OS_TARGET=BeOS ;;
+ haiku*) OS_ARCH=Haiku OS_TARGET=Haiku ;;
esac
else
OS_TARGET=`uname -s`
--
2.2.2
From f5292ed6041e2642a85aa086355f11102ca8c659 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Sun, 19 Apr 2015 20:59:27 +0300
Subject: mozconfig clean-up
diff --git a/supporting-files/mozilla-configs/browser.mozconfig b/supporting-files/mozilla-configs/browser.mozconfig
index 43bac3b..fd639b6 100644
--- a/supporting-files/mozilla-configs/browser.mozconfig
+++ b/supporting-files/mozilla-configs/browser.mozconfig
@@ -4,6 +4,8 @@
. $topsrcdir/browser/config/mozconfig
mk_add_options MOZ_CO_PROJECT=browser
+mk_add_options MOZ_APP_DISPLAYNAME=BeZilla
+mk_add_options MOZ_LIBDIR=$prefix/BeZilla
# Required to download the right version of the source code
mk_add_options MOZ_CO_TAG=MOZILLA_1_8_BRANCH
@@ -13,19 +15,11 @@ mk_add_options CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
# -----------------------------------------------------
# --- EDIT THESE VALUES TO REFLECT YOUR LOCAL BUILD ---
-export GLIB_CONFIG=/boot/common/bin/glib-config
-mk_add_options GLIB_CONFIG=/boot/common/bin/glib-config
-
-export LIBIDL_CONFIG=/boot/common/bin/libIDL-config
-mk_add_options LIBIDL_CONFIG=/boot/common/bin/libIDL-config
# --- Set the outputdir for the build ---
mk_add_options MOZ_OBJDIR=/moz_obj/browser
-# autoconf 2.13 was built by
-#./configure --prefix=/boot/common/autoconf-2.13 --program-suffix=-2.13 --bindir=/boot/common/bin/
-# make && make install
-export AUTOCONF='/boot/common/bin/autoconf-2.13 -m /boot/common/autoconf-2.13/share/autoconf'
+export AUTOCONF='autoconf-2.13'
# -----------------------------------------------------
# Automatic updates not currently supported on BeOS. Delete this when we add this feature.
@@ -40,7 +34,7 @@ ac_add_options --disable-canvas
# Utilize Haiku's default shared libraries
ac_add_options --with-system-jpeg
-#ac_add_options --with-system-png
+ac_add_options --with-system-png
ac_add_options --with-system-zlib
ac_add_options --enable-nspr-threads
@@ -62,6 +56,7 @@ ac_add_options --enable-static --disable-shared
ac_add_options --enable-strip
ac_add_options --enable-reorder
ac_add_options --enable-js-static-build
+ac_add_options --disable-debug
#ac_add_options --enable-elf-dynstr-gc # doesn't build in gcc2. gcc4 untested.
# ----------------------------------------------------------------------------
--
2.2.2

View File

@@ -1,31 +0,0 @@
From 7b84740f39ed0292e8f726705590ba24581c2c52 Mon Sep 17 00:00:00 2001
From: Theodore Kokkoris <t.kokkoris@gmail.com>
Date: Fri, 12 Dec 2014 13:45:46 +0200
Subject: [PATCH] Enable Haiku support in configure.in
---
mozilla/configure.in | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/mozilla/configure.in b/mozilla/configure.in
index 23cc7e7..9bd8cb5 100755
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -885,12 +885,8 @@ if test -n "$CROSS_COMPILE"; then
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 -------------------------------------------------------
+ beos*) OS_ARCH=BeOS OS_TARGET=BeOS ;;
+ haiku*) OS_ARCH=Haiku OS_TARGET=Haiku ;;
esac
else
OS_TARGET=`uname -s`
--
1.8.3.4