From b49197504a83cf560f3fab084ff4c92834cdd16a Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Sun, 16 May 2004 19:19:43 +0000 Subject: [PATCH] Rene Rebe: vast x11/mozilla cleanups and modularization now also honoring prefix correctly ... added thunderbird and firefox (both inheriting mozilla build system) [2004051014175701031] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2982 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/x11/firefox/firefox.cache | 36 +++++++++ package/x11/firefox/firefox.conf | 49 ++++++++++++ package/x11/firefox/firefox.desc | 42 ++++++++++ package/x11/firefox/gcc34.patch | 13 ++++ package/x11/mozilla/mozilla.conf | 77 +++++++++++++------ package/x11/mozilla/set-ldpath.patch.disabled | 33 -------- package/x11/thunderbird/thunderbird.cache | 36 +++++++++ package/x11/thunderbird/thunderbird.conf | 49 ++++++++++++ package/x11/thunderbird/thunderbird.desc | 43 +++++++++++ 9 files changed, 322 insertions(+), 56 deletions(-) create mode 100644 package/x11/firefox/firefox.cache create mode 100644 package/x11/firefox/firefox.conf create mode 100644 package/x11/firefox/firefox.desc create mode 100644 package/x11/firefox/gcc34.patch delete mode 100644 package/x11/mozilla/set-ldpath.patch.disabled create mode 100644 package/x11/thunderbird/thunderbird.cache create mode 100644 package/x11/thunderbird/thunderbird.conf create mode 100644 package/x11/thunderbird/thunderbird.desc diff --git a/package/x11/firefox/firefox.cache b/package/x11/firefox/firefox.cache new file mode 100644 index 000000000..1f1517ba4 --- /dev/null +++ b/package/x11/firefox/firefox.cache @@ -0,0 +1,36 @@ +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/x11/mozilla/mozilla.cache +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[TIMESTAMP] 1073195105 Sun Jan 4 06:45:05 2004 +[CONFIG-ID] 2.0.0-rc5-x86-pentium-mmx-32-reference +[ROCKVER] 2.0.0-rc5 + +[LOGS] 5-mozilla.log 9-mozilla.log + +[BUILDTIME] 357758 (9) +[SIZE] 66.60 MB, 4364 files + +[DEP] atk bash binutils bzip2 coreutils diffutils expat findutils freetype +[DEP] gawk gcc3 glib glibc23 grep gtk+ libidl linux24-header make mozilla +[DEP] net-tools pango patch perl5 pkgconfig sed sysfiles tar xfree86 +[DEP] zip zlib + diff --git a/package/x11/firefox/firefox.conf b/package/x11/firefox/firefox.conf new file mode 100644 index 000000000..34f635817 --- /dev/null +++ b/package/x11/firefox/firefox.conf @@ -0,0 +1,49 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/x11/mozilla/mozilla.conf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. A copy of the GNU General Public +# License can be found at Documentation/COPYING. +# +# Many people helped and are helping developing ROCK Linux. Please +# have a look at http://www.rocklinux.org/ and the Documentation/TEAM +# file for details. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +if [ $prefix_auto = 1 ] ; then + prefix="opt/firefox" + set_confopt +fi + +# inherit all the complex mozilla stuff +. package/x11/mozilla/mozilla.conf + +# and overwrite the main function +moz_main() { + # maybe obsolete ... to be checked + export MOZILLA_OFFICIAL=1 BUILD_OFFICIAL=1 + export MOZILLA_FIVE_HOME=$libdir/firefox-$ver + + moz_fixup + moz_implant_version + + cat >> .mozconfig <<-EOT +. \$topsrcdir/browser/config/mozconfig +EOT + + moz_configure + + moz_build + moz_install +} + diff --git a/package/x11/firefox/firefox.desc b/package/x11/firefox/firefox.desc new file mode 100644 index 000000000..197593c32 --- /dev/null +++ b/package/x11/firefox/firefox.desc @@ -0,0 +1,42 @@ + +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/x11/mozilla/mozilla.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] A full-featured web brower + +[T] Firefox is a speedy, full-featured browser that makes browsing more +[T] efficient than ever before. + +[U] http://www.mozilla.org/products/firefox/ + +[A] The Mozilla Community +[M] Rene Rebe + +[C] extra/office + +[L] MPL +[S] Beta +[V] 0.8 +[P] X -----5---9 531.000 + +[D] 0 firefox-source-0.8.tar.bz2 http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.8/ + diff --git a/package/x11/firefox/gcc34.patch b/package/x11/firefox/gcc34.patch new file mode 100644 index 000000000..0b931396f --- /dev/null +++ b/package/x11/firefox/gcc34.patch @@ -0,0 +1,13 @@ +--- mozilla/gfx/public/nsRegion.h 2003-03-25 03:57:42.000000000 +0100 ++++ mozilla-fixed/gfx/public/nsRegion.h 2004-05-05 23:52:57.000000000 +0200 +@@ -233,8 +233,9 @@ + void MoveInto (nsRegion& aDestRegion, const RgnRect* aStartRect); + void MoveInto (nsRegion& aDestRegion) + { MoveInto (aDestRegion, mRectListHead.next); } +- ++public: + nsRegion (const nsRegion& aRegion); // Prevent copying of regions ++private: + nsRegion& operator = (const nsRegion& aRegion); + }; + diff --git a/package/x11/mozilla/mozilla.conf b/package/x11/mozilla/mozilla.conf index 63599a60c..2c9b6da54 100644 --- a/package/x11/mozilla/mozilla.conf +++ b/package/x11/mozilla/mozilla.conf @@ -20,7 +20,9 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -main_mozilla() { +moz_fixup() { + # clear a possible existing .mozconfig + echo -n "" > .mozconfig # fix the milestone.txt - if present and needed if [ -f config/milestone.txt ] ; then @@ -30,48 +32,78 @@ main_mozilla() { echo "$ver" >> config/milestone.txt fi fi +} - export MOZILLA_OFFICIAL=1 BUILD_OFFICIAL=1 - export MOZILLA_FIVE_HOME=$root/usr/lib/mozilla-$ver - +moz_implant_version() { # replace the 00... build-id with s.th. useful sed -i "s,0000000000,ROCK Linux - $rockver," xpfe/global/build.dtd.in +} - cat > .mozconfig <<-EOP +moz_configure() { + cat >> .mozconfig <<-EOT # sh # Build configuration script # Options for client.mk. # mk_add_options MOZ_MAKE_FLAGS=-j4 # Options for 'configure' (same as command-line options). -ac_add_options --prefix=$root/usr -ac_add_options --sysconfdir=$root/etc +ac_add_options --prefix=$root/$prefix +ac_add_options --sysconfdir=$root/etc/$pkg ac_add_options --localstatedir=$root/var ac_add_options --host=$arch_target ac_add_options --disable-debug +ac_add_options --enable-optimize ac_add_options --disable-dtd-debug ac_add_options --disable-tests ac_add_options --disable-pedantic +ac_add_options --enable-xft +ac_add_options --enable-default-toolkit=gtk2 +export BUILD_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 +EOT +} + +moz_build() { + eval_config_command $( eval echo $confopt ) + eval $MAKE -f client.mk build +} + +moz_install() { + eval $MAKE install +} + +moz_main() { + # maybe obsolete ... to be checked + export MOZILLA_OFFICIAL=1 BUILD_OFFICIAL=1 + export MOZILLA_FIVE_HOME=$libdir/mozilla-$ver + + moz_fixup + moz_implant_version + + moz_configure + + cat >> .mozconfig <<-EOT ac_add_options --enable-calendar ac_add_options --with-extensions ac_add_options --enable-extensions=default,venkman,inspector ac_add_options --enable-jsd ac_add_options --enable-mathml -#ac_add_options --enable-svg +ac_add_options --enable-svg ac_add_options --enable-crypto ac_add_options --enable-module=psm -ac_add_options --enable-xft -ac_add_options --enable-default-toolkit=gtk2 -EOP +EOT - eval $MAKE -f client.mk build ; eval $MAKE install + moz_build + moz_install echo "Copy all mozilla include files" \ "(required for building galeon, evolution, etc.) ..." - cp -v xpcom/base/nscore.h $root/usr/include/mozilla-$ver/xpcom/ - cp -v xpcom/glue/nsDebug.h $root/usr/include/mozilla-$ver/xpcom/ - cp -rL dist/include/* $root/usr/include/mozilla-$ver/ - cp -rL dist/public/* $root/usr/include/mozilla-$ver/ + cp -v xpcom/base/nscore.h $includedir/mozilla-$ver/xpcom/ + cp -v xpcom/glue/nsDebug.h $includedir/mozilla-$ver/xpcom/ + cp -rL dist/include/* $includedir/mozilla-$ver/ + cp -rL dist/public/* $includedir/mozilla-$ver/ echo "Run the component registration ..." cd $MOZILLA_FIVE_HOME @@ -84,16 +116,15 @@ EOP EOT echo "Creating library symlinks ..." - cd $root/usr/lib ; - for i in ldap50 nspr4 nss3 plc4 plds4 prldap50 smime3 softokn3 ssl3; do - ln -sf $root/usr/lib/mozilla-$ver/lib${i}.so $root/usr/lib/lib${i}.so + cd $libdir + for i in ldap50 nspr4 nss3 plc4 plds4 prldap50 smime3 softokn3 ssl3 ; do + ln -sf $libdir/mozilla-$ver/lib${i}.so $libdir/lib${i}.so done } -# from time to time the tarball does include .CVS directories, and a cleanup -# in this fat directory is a bit expensive, and the files should not make -# and problem ... +# cleanups in this fat directory are a bit expensive nocvsinsrcdir=0 +chownsrcdir=0 -custmain="main_mozilla" +custmain="moz_main" diff --git a/package/x11/mozilla/set-ldpath.patch.disabled b/package/x11/mozilla/set-ldpath.patch.disabled deleted file mode 100644 index d2a8c808a..000000000 --- a/package/x11/mozilla/set-ldpath.patch.disabled +++ /dev/null @@ -1,33 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/x11/mozilla/set-ldpath.patch.disabled -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./xpfe/bootstrap/mozilla.orig Thu Dec 20 04:26:48 2001 -+++ ./xpfe/bootstrap/mozilla Thu Dec 20 04:28:21 2001 -@@ -38,6 +38,11 @@ - debugging=0 - MOZILLA_BIN="mozilla-bin" - -+if [ -z "$LD_LIBRARY_PATH" ] ; then -+ export "LD_LIBRARY_PATH=/usr/lib/mozilla/compat-libs" -+else -+ export "LD_LIBRARY_PATH=/usr/lib/mozilla/compat-libs:$LD_LIBRARY_PATH" -+fi - if [ "$OSTYPE" = "beos" ]; then - mimeset -F $MOZILLA_BIN - fi diff --git a/package/x11/thunderbird/thunderbird.cache b/package/x11/thunderbird/thunderbird.cache new file mode 100644 index 000000000..1f1517ba4 --- /dev/null +++ b/package/x11/thunderbird/thunderbird.cache @@ -0,0 +1,36 @@ +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/x11/mozilla/mozilla.cache +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[TIMESTAMP] 1073195105 Sun Jan 4 06:45:05 2004 +[CONFIG-ID] 2.0.0-rc5-x86-pentium-mmx-32-reference +[ROCKVER] 2.0.0-rc5 + +[LOGS] 5-mozilla.log 9-mozilla.log + +[BUILDTIME] 357758 (9) +[SIZE] 66.60 MB, 4364 files + +[DEP] atk bash binutils bzip2 coreutils diffutils expat findutils freetype +[DEP] gawk gcc3 glib glibc23 grep gtk+ libidl linux24-header make mozilla +[DEP] net-tools pango patch perl5 pkgconfig sed sysfiles tar xfree86 +[DEP] zip zlib + diff --git a/package/x11/thunderbird/thunderbird.conf b/package/x11/thunderbird/thunderbird.conf new file mode 100644 index 000000000..0361e7137 --- /dev/null +++ b/package/x11/thunderbird/thunderbird.conf @@ -0,0 +1,49 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/x11/mozilla/mozilla.conf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. A copy of the GNU General Public +# License can be found at Documentation/COPYING. +# +# Many people helped and are helping developing ROCK Linux. Please +# have a look at http://www.rocklinux.org/ and the Documentation/TEAM +# file for details. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +if [ $prefix_auto = 1 ] ; then + prefix="opt/firefox" + set_confopt +fi + +# inherit all the complex mozilla stuff +. package/x11/mozilla/mozilla.conf + +# and overwrite the main function +moz_main() { + # maybe obsolete ... to be checked + export MOZILLA_OFFICIAL=1 BUILD_OFFICIAL=1 + export MOZILLA_FIVE_HOME=$libdir/thunderbird-$ver + + moz_fixup + moz_implant_version + + cat >> .mozconfig <<-EOT +. \$topsrcdir/mail/config/mozconfig +EOT + + moz_configure + + moz_build + moz_install +} + diff --git a/package/x11/thunderbird/thunderbird.desc b/package/x11/thunderbird/thunderbird.desc new file mode 100644 index 000000000..370f51e0b --- /dev/null +++ b/package/x11/thunderbird/thunderbird.desc @@ -0,0 +1,43 @@ + +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/x11/mozilla/mozilla.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] A full-featured Mail Client + +[T] Thunderbird makes emailing safer, faster and easier than ever before +[T] with the industry's best implementations of features such as intelligent +[T] spam filters, a built-in spell checker, extension support, and much more. + +[U] http://www.mozilla.org/products/thunderbird/ + +[A] The Mozilla Community +[M] Rene Rebe + +[C] extra/office + +[L] MPL +[S] Beta +[V] 0.6 +[P] X -----5---9 531.000 + +[D] 0 thunderbird-source-0.6.tar.bz2 http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/0.6/ +