From 140cbc69b8eef7c6cca68f9437f93f6c6a9fa7e4 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Tue, 8 Mar 2011 11:58:39 -0300 Subject: thunderbird-libre-3.1.9-1 --- thunderbird-libre/PKGBUILD | 84 ++++++++++++++++++++++++ thunderbird-libre/gnuzilla-addons.patch | 36 ++++++++++ thunderbird-libre/mozconfig | 38 +++++++++++ thunderbird-libre/python2.7.patch | 11 ++++ thunderbird-libre/thunderbird-3.0-lang.patch | 11 ++++ thunderbird-libre/thunderbird-appversion.patch | 12 ++++ thunderbird-libre/thunderbird-preferences.patch | 30 +++++++++ thunderbird-libre/thunderbird-shared-error.patch | 15 +++++ thunderbird-libre/thunderbird.desktop | 13 ++++ thunderbird-libre/thunderbird.install | 11 ++++ thunderbird-libre/xulrunner-png14.patch | 11 ++++ 11 files changed, 272 insertions(+) create mode 100644 thunderbird-libre/PKGBUILD create mode 100644 thunderbird-libre/gnuzilla-addons.patch create mode 100644 thunderbird-libre/mozconfig create mode 100644 thunderbird-libre/python2.7.patch create mode 100644 thunderbird-libre/thunderbird-3.0-lang.patch create mode 100644 thunderbird-libre/thunderbird-appversion.patch create mode 100644 thunderbird-libre/thunderbird-preferences.patch create mode 100644 thunderbird-libre/thunderbird-shared-error.patch create mode 100644 thunderbird-libre/thunderbird.desktop create mode 100644 thunderbird-libre/thunderbird.install create mode 100644 thunderbird-libre/xulrunner-png14.patch diff --git a/thunderbird-libre/PKGBUILD b/thunderbird-libre/PKGBUILD new file mode 100644 index 000000000..c43f30076 --- /dev/null +++ b/thunderbird-libre/PKGBUILD @@ -0,0 +1,84 @@ +# $Id$ +# Contributor: Alexander Baldeck +# Contributor: Dale Blount +# Contributor: Anders Bostrom +CARCH=x86_64 +pkgname=thunderbird-libre +pkgver=3.1.9 +pkgrel=1 +pkgdesc="Standalone Mail/News reader, with GNUZilla addons" +arch=('i686' 'x86_64') +license=('MPL' 'GPL') +url="http://www.mozilla.org/projects/thunderbird" +depends=('gtk2' 'gcc-libs' 'mozilla-common' 'nss' 'libxt' 'shared-mime-info' 'alsa-lib' 'dbus-glib' 'hunspell' 'sqlite3>=3.7.4' 'desktop-file-utils') +makedepends=('zip' 'pkg-config' 'libgnomeui' 'python2' 'libidl2' 'wireless_tools' 'autoconf2.13') +optdepends=('libcanberra: for sound support') +replaces=('thunderbird') +conflicts=('thunderbird') +provides=("thunderbird=$pkgver") +install=thunderbird.install +source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${pkgver}/source/thunderbird-${pkgver}.source.tar.bz2 + mozconfig + thunderbird.desktop + thunderbird-3.0-lang.patch + thunderbird-appversion.patch + thunderbird-shared-error.patch + thunderbird-preferences.patch + xulrunner-png14.patch + python2.7.patch + gnuzilla-addons.patch) +md5sums=('e6917c419d3aaa8083a1d4b53fb80d8c' + 'c1551d308480d241247c5662d8bebbcb' + '37457073c7f6feeb86c053701d23197f' + '25b6fe16ac24cd5c852213e5c1adb272' + '48ffcdb877a69d383b7d354e330f7658' + '3dca714ee8054634e6dfdb059464dc42' + '1d4f9978e8228ace523b18a09cf41e4e' + '989b15f6bc9e2e9233fe4c6b23f412b1' + '78a4d0c920cbb8ec6a9a36974cd775ef' + 'f272e37db4bcaef993b58a87a7db3bf5') + +build() { + cd "${srcdir}/comm-1.9.2" + patch -Np1 -i "${srcdir}/thunderbird-3.0-lang.patch" + patch -Np1 -i "${srcdir}/thunderbird-appversion.patch" + patch -Np1 -i "${srcdir}/thunderbird-shared-error.patch" + patch -Np1 -i "${srcdir}/thunderbird-preferences.patch" + patch -Np0 -i "${srcdir}/xulrunner-png14.patch" + patch -Np0 -i "${srcdir}/python2.7.patch" + + pushd mail/app/profile >/dev/null + patch -Np0 -i "${srcdir}/gnuzilla-addons.patch" + popd >/dev/null + + cp "${srcdir}/mozconfig" .mozconfig + unset CXXFLAGS + unset CFLAGS + + export LDFLAGS="-Wl,-rpath,/usr/lib/thunderbird-3.1" + + make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" +} + +package() { + cd "${srcdir}/comm-1.9.2" + make -j1 DESTDIR="${pkgdir}" install + + #Remove included dictionaries, add symlink to system myspell path. + #Note: this will cause file conflicts when users have installed dictionaries in the old location + rm -rf "${pkgdir}/usr/lib/thunderbird-3.1/dictionaries" + ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/thunderbird-3.1/dictionaries" + + rm -rf "${pkgdir}/usr/bin/defaults" + + install -m755 -d "${pkgdir}/usr/share/applications" + install -m755 -d "${pkgdir}/usr/share/pixmaps" + + install -m644 mail/branding/unofficial/mailicon48.png \ + "${pkgdir}/usr/share/pixmaps/thunderbird.png" + + install -m644 "${srcdir}/thunderbird.desktop" \ + "${pkgdir}/usr/share/applications/" + + rm -f ${pkgdir}/usr/lib/pkgconfig/thunderbird-ns{s,pr}.pc +} diff --git a/thunderbird-libre/gnuzilla-addons.patch b/thunderbird-libre/gnuzilla-addons.patch new file mode 100644 index 000000000..2c0e4a68f --- /dev/null +++ b/thunderbird-libre/gnuzilla-addons.patch @@ -0,0 +1,36 @@ +--- usr/lib/thunderbird-3.1/defaults/pref/all-thunderbird.js 2011-03-04 17:28:11.000000000 -0300 ++++ all-thunderbird.js 2011-03-08 11:22:31.437207173 -0300 +@@ -144,9 +144,9 @@ + pref("extensions.update.interval", 86400); // Check for updates to Extensions and + // Themes every day + // Non-symmetric (not shared by extensions) extension-specific [update] preferences +-pref("extensions.getMoreExtensionsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/extensions/"); +-pref("extensions.getMoreThemesURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/themes/"); +-pref("extensions.getMorePluginsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/plugins/"); ++pref("extensions.getMoreExtensionsURL", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getMorePluginsURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + pref("extensions.dss.enabled", false); // Dynamic Skin Switching + pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next + +@@ -155,14 +155,14 @@ + + // Preferences for the Get Add-ons pane + pref("extensions.getAddons.showPane", true); +-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/%APP%"); ++pref("extensions.getAddons.browseAddons", "http://www.gnu.org/software/gnuzilla/addons.html"); + pref("extensions.getAddons.maxResults", 5); +-pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/recommended"); +-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%"); ++pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.recommended.url", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html"); + +-pref("xpinstall.whitelist.add", "addons.mozilla.org"); ++pref("xpinstall.whitelist.add", "www.gnu.org"); + pref("xpinstall.whitelist.add.36", "getpersonas.com"); + + pref("mail.shell.checkDefaultClient", true); diff --git a/thunderbird-libre/mozconfig b/thunderbird-libre/mozconfig new file mode 100644 index 000000000..4281bffa1 --- /dev/null +++ b/thunderbird-libre/mozconfig @@ -0,0 +1,38 @@ +mk_add_options MOZ_CO_PROJECT=mail +ac_add_options --enable-application=mail + +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-png +ac_add_options --with-system-mng +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --with-pthreads +ac_add_options --disable-debug +ac_add_options --disable-tests +ac_add_options --disable-installer +ac_add_options --disable-updater +ac_add_options --disable-crashreporter +ac_add_options --disable-official-branding +ac_add_options --disable-xprint +ac_add_options --enable-default-toolkit=cairo-gtk2 +ac_add_options --enable-strip +ac_add_options --enable-pango +ac_add_options --enable-xft +#disabled because of bugs with cairo 1.10 +#ac_add_options --enable-system-cairo +ac_add_options --enable-svg +ac_add_options --enable-canvas +ac_add_options --enable-optimize +ac_add_options --prefix=/usr +ac_add_options --with-branding=mail/branding/unofficial + +export BUILD_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 +export USE_SHORT_LIBNAME=1 +mk_add_options BUILD_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options USE_SHORT_LIBNAME=1 + diff --git a/thunderbird-libre/python2.7.patch b/thunderbird-libre/python2.7.patch new file mode 100644 index 000000000..2d159d479 --- /dev/null +++ b/thunderbird-libre/python2.7.patch @@ -0,0 +1,11 @@ +--- configure.in 2010-10-13 08:37:29.000000000 -0700 ++++ configure.in~ 2010-10-19 10:32:06.360019362 -0700 +@@ -878,7 +878,7 @@ + AC_MSG_RESULT([yes]) + fi + +-MOZ_PATH_PROGS(PYTHON, $PYTHON python2.6 python2.5 python2.4 python) ++MOZ_PATH_PROGS(PYTHON, $PYTHON python2.7 python2.6 python2.5 python2.4 python) + if test -z "$PYTHON"; then + AC_MSG_ERROR([python was not found in \$PATH]) + fi diff --git a/thunderbird-libre/thunderbird-3.0-lang.patch b/thunderbird-libre/thunderbird-3.0-lang.patch new file mode 100644 index 000000000..b9f4a5cde --- /dev/null +++ b/thunderbird-libre/thunderbird-3.0-lang.patch @@ -0,0 +1,11 @@ +--- comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-10-11 02:12:44.000000000 +0200 ++++ comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-09-16 02:56:45.000000000 +0200 +@@ -890,7 +890,7 @@ + pref("intl.charset.detector", "chrome://global/locale/intl.properties"); + pref("intl.charset.default", "chrome://global-platform/locale/intl.properties"); + pref("intl.ellipsis", "chrome://global-platform/locale/intl.properties"); +-pref("intl.locale.matchOS", false); ++pref("intl.locale.matchOS", true); + // fallback charset list for Unicode conversion (converting from Unicode) + // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes) + // for ISO-8859-1 diff --git a/thunderbird-libre/thunderbird-appversion.patch b/thunderbird-libre/thunderbird-appversion.patch new file mode 100644 index 000000000..3f7a54686 --- /dev/null +++ b/thunderbird-libre/thunderbird-appversion.patch @@ -0,0 +1,12 @@ +diff -Nru comm-1.9.2.orig/mail/installer/Makefile.in comm-1.9.2/mail/installer/Makefile.in +--- comm-1.9.2.orig/mail/installer/Makefile.in 2010-04-30 22:41:37.000000000 +0300 ++++ comm-1.9.2/mail/installer/Makefile.in 2010-05-05 20:20:29.551660469 +0300 +@@ -42,6 +42,8 @@ + + include $(DEPTH)/config/autoconf.mk + ++MOZ_APP_VERSION="3.1" ++ + include $(topsrcdir)/config/rules.mk + + MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in diff --git a/thunderbird-libre/thunderbird-preferences.patch b/thunderbird-libre/thunderbird-preferences.patch new file mode 100644 index 000000000..627f02434 --- /dev/null +++ b/thunderbird-libre/thunderbird-preferences.patch @@ -0,0 +1,30 @@ +diff -Nur comm-1.9.2.orig/mail/app/profile/all-thunderbird.js comm-1.9.2/mail/app/profile/all-thunderbird.js +--- comm-1.9.2.orig/mail/app/profile/all-thunderbird.js 2010-06-23 20:43:08.000000000 +0300 ++++ comm-1.9.2/mail/app/profile/all-thunderbird.js 2010-06-25 00:37:36.518929684 +0300 +@@ -125,7 +125,7 @@ + pref("app.update.showInstalledUI", false); + + // Release notes URL +-pref("app.releaseNotesURL", "http://live.mozillamessaging.com/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); ++pref("app.releaseNotesURL", "http://www.mozillamessaging.com/%APP%/%VERSION%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); + + // Base URL for web-based support pages. + pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/%APP%/%APPBUILDID%/"); +diff -Nur comm-1.9.2.orig/mail/branding/nightly/thunderbird-branding.js comm-1.9.2/mail/branding/nightly/thunderbird-branding.js +--- comm-1.9.2.orig/mail/branding/nightly/thunderbird-branding.js 2010-06-23 20:43:08.000000000 +0300 ++++ comm-1.9.2/mail/branding/nightly/thunderbird-branding.js 2010-06-25 00:36:10.605569121 +0300 +@@ -1,11 +1,11 @@ + // Default start page +-pref("mailnews.start_page.url","https://live.mozillamessaging.com/%APP%/start?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); ++pref("mailnews.start_page.url","https://www.mozillamessaging.com/%APP%/%VERSION%/start?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); + + // first launch welcome page +-pref("mailnews.start_page.welcome_url","https://live.mozillamessaging.com/%APP%/firstrun?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); ++pref("mailnews.start_page.welcome_url","https://www.mozillamessaging.com/%APP%/%VERSION%/firstrun?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); + + // start page override to load after an update +-pref("mailnews.start_page.override_url","https://live.mozillamessaging.com/%APP%/whatsnew?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); ++pref("mailnews.start_page.override_url","https://www.mozillamessaging.com/%APP%/%VERSION%/whatsnew?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); + + // Interval: Time between checks for a new version (in seconds) + // nightly=8 hours, official=24 hours diff --git a/thunderbird-libre/thunderbird-shared-error.patch b/thunderbird-libre/thunderbird-shared-error.patch new file mode 100644 index 000000000..ae41bbc1e --- /dev/null +++ b/thunderbird-libre/thunderbird-shared-error.patch @@ -0,0 +1,15 @@ +diff -up comm-central/mail/installer/Makefile.in.shared-error comm-central/mail/installer/Makefile.in +--- comm-central/mail/installer/Makefile.in.shared-error 2009-09-16 13:47:43.000000000 +0200 ++++ comm-central/mail/installer/Makefile.in 2009-09-16 13:48:25.000000000 +0200 +@@ -95,9 +95,11 @@ endif + # mozconfig instead. + ifndef MAIL_PKG_SHARED + ifndef BUILD_STATIC_LIBS ++ifeq (BUILD_STATIC_LIBS, 1) + $(error you need an "--enable-static" build to package a build) + endif + endif ++endif + + # On mozilla-central, packager.mk uses core_abspath to redefine DIST + # As the comm-central config.mk doesn't set it, do it ourselves instead diff --git a/thunderbird-libre/thunderbird.desktop b/thunderbird-libre/thunderbird.desktop new file mode 100644 index 000000000..93ffead78 --- /dev/null +++ b/thunderbird-libre/thunderbird.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Version=1.0 +Name=Thunderbird +Comment=Mail & News Reader +GenericName=Mail Client & News Reader +Exec=thunderbird +TryExec=thunderbird +Icon=thunderbird +Terminal=false +Type=Application +Categories=Network;Email; +MimeType=message/rfc822;x-scheme-handler/mailto; +StartupNotify=true diff --git a/thunderbird-libre/thunderbird.install b/thunderbird-libre/thunderbird.install new file mode 100644 index 000000000..660593cf5 --- /dev/null +++ b/thunderbird-libre/thunderbird.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/thunderbird-libre/xulrunner-png14.patch b/thunderbird-libre/xulrunner-png14.patch new file mode 100644 index 000000000..1dc0ecda5 --- /dev/null +++ b/thunderbird-libre/xulrunner-png14.patch @@ -0,0 +1,11 @@ +--- mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig 2010-01-17 00:15:53.979744638 +0100 ++++ mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp 2010-01-17 00:16:07.855993411 +0100 +@@ -135,7 +135,7 @@ + + // initialize + mPNG = png_create_write_struct(PNG_LIBPNG_VER_STRING, +- png_voidp_NULL, ++ NULL, + ErrorCallback, + ErrorCallback); + if (! mPNG) -- cgit v1.2.3-54-g00ecf From f8b272306d2229de2b62acc19782d067d01fa737 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Tue, 8 Mar 2011 12:06:01 -0300 Subject: thunderbird-libre-3.1.9-1 --- thunderbird-libre/PKGBUILD | 1 - 1 file changed, 1 deletion(-) diff --git a/thunderbird-libre/PKGBUILD b/thunderbird-libre/PKGBUILD index c43f30076..d5f546e3d 100644 --- a/thunderbird-libre/PKGBUILD +++ b/thunderbird-libre/PKGBUILD @@ -2,7 +2,6 @@ # Contributor: Alexander Baldeck # Contributor: Dale Blount # Contributor: Anders Bostrom -CARCH=x86_64 pkgname=thunderbird-libre pkgver=3.1.9 pkgrel=1 -- cgit v1.2.3-54-g00ecf From 2555d120024bfa1fcdbddef864fff96154492d79 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Tue, 8 Mar 2011 13:57:49 -0300 Subject: seamonkey-libre-2.0.12-1 --- libre/seamonkey-libre/PKGBUILD | 56 +++++++++++++++ libre/seamonkey-libre/gnuzilla-addons.patch | 29 ++++++++ libre/seamonkey-libre/mozconfig | 30 ++++++++ libre/seamonkey-libre/python27.patch | 11 +++ libre/seamonkey-libre/seamonkey-2.0-lang.patch | 11 +++ libre/seamonkey-libre/seamonkey-appversion.patch | 12 ++++ libre/seamonkey-libre/seamonkey.desktop | 11 +++ libre/thunderbird-libre/thunderbird-3.0-lang.patch | 11 +++ .../thunderbird-libre/thunderbird-appversion.patch | 12 ++++ .../thunderbird-preferences.patch | 30 ++++++++ .../thunderbird-shared-error.patch | 15 ++++ libre/thunderbird-libre/thunderbird.desktop | 13 ++++ libre/thunderbird-libre/thunderbird.install | 11 +++ libre/thunderbird-libre/xulrunner-png14.patch | 11 +++ thunderbird-libre/PKGBUILD | 83 ---------------------- thunderbird-libre/gnuzilla-addons.patch | 36 ---------- thunderbird-libre/mozconfig | 38 ---------- thunderbird-libre/python2.7.patch | 11 --- thunderbird-libre/thunderbird-3.0-lang.patch | 11 --- thunderbird-libre/thunderbird-appversion.patch | 12 ---- thunderbird-libre/thunderbird-preferences.patch | 30 -------- thunderbird-libre/thunderbird-shared-error.patch | 15 ---- thunderbird-libre/thunderbird.desktop | 13 ---- thunderbird-libre/thunderbird.install | 11 --- thunderbird-libre/xulrunner-png14.patch | 11 --- 25 files changed, 263 insertions(+), 271 deletions(-) create mode 100644 libre/seamonkey-libre/PKGBUILD create mode 100644 libre/seamonkey-libre/gnuzilla-addons.patch create mode 100644 libre/seamonkey-libre/mozconfig create mode 100644 libre/seamonkey-libre/python27.patch create mode 100644 libre/seamonkey-libre/seamonkey-2.0-lang.patch create mode 100644 libre/seamonkey-libre/seamonkey-appversion.patch create mode 100644 libre/seamonkey-libre/seamonkey.desktop create mode 100644 libre/thunderbird-libre/thunderbird-3.0-lang.patch create mode 100644 libre/thunderbird-libre/thunderbird-appversion.patch create mode 100644 libre/thunderbird-libre/thunderbird-preferences.patch create mode 100644 libre/thunderbird-libre/thunderbird-shared-error.patch create mode 100644 libre/thunderbird-libre/thunderbird.desktop create mode 100644 libre/thunderbird-libre/thunderbird.install create mode 100644 libre/thunderbird-libre/xulrunner-png14.patch delete mode 100644 thunderbird-libre/PKGBUILD delete mode 100644 thunderbird-libre/gnuzilla-addons.patch delete mode 100644 thunderbird-libre/mozconfig delete mode 100644 thunderbird-libre/python2.7.patch delete mode 100644 thunderbird-libre/thunderbird-3.0-lang.patch delete mode 100644 thunderbird-libre/thunderbird-appversion.patch delete mode 100644 thunderbird-libre/thunderbird-preferences.patch delete mode 100644 thunderbird-libre/thunderbird-shared-error.patch delete mode 100644 thunderbird-libre/thunderbird.desktop delete mode 100644 thunderbird-libre/thunderbird.install delete mode 100644 thunderbird-libre/xulrunner-png14.patch diff --git a/libre/seamonkey-libre/PKGBUILD b/libre/seamonkey-libre/PKGBUILD new file mode 100644 index 000000000..343f3e3ed --- /dev/null +++ b/libre/seamonkey-libre/PKGBUILD @@ -0,0 +1,56 @@ +# $Id$ +# Maintainer: Jan de Groot +pkgname=seamonkey-libre +pkgver=2.0.12 +pkgrel=1 +pkgdesc="SeaMonkey internet suite, with GNUZilla addons" +arch=('i686' 'x86_64') +license=('MPL') +depends=('gtk2' 'mozilla-common' 'nss' 'libxt' 'gcc-libs' 'alsa-lib' 'dbus-glib') +makedepends=('zip' 'pkg-config' 'libgnomeui>=2.24.2' 'python2' 'libidl2' 'autoconf2.13') +replaces=('mozilla' 'seamonkey') +conflicts=('seamonkey') +provides=("seamonkey=$pkgver") +url="http://www.mozilla.org/projects/seamonkey" +source=(http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/${pkgver}/source/seamonkey-${pkgver}.source.tar.bz2 + mozconfig + seamonkey.desktop + seamonkey-appversion.patch + seamonkey-2.0-lang.patch + python27.patch + gnuzilla-addons.patch) +md5sums=('681328d58a71d23e52ebe986a8eca3fd' + '4978159e4921892e34dcd7e9804f0437' + '448848e65efcbf1b2be2873b66b6cd48' + 'a4275fc48361c80f676e96fdb28bd74e' + '25b6fe16ac24cd5c852213e5c1adb272' + '47e57931d65c71baafcf0e4f9160e876' + '178073b25aa41ffc601bcd9ddf1f69de') + +build() { + cd "${srcdir}/comm-1.9.1" + patch -Np1 -i "${srcdir}/seamonkey-appversion.patch" + patch -Np1 -i "${srcdir}/seamonkey-2.0-lang.patch" + patch -Np0 -i "${srcdir}/python27.patch" + + pushd suite/browser >/dev/null + patch -Np0 -i "${srcdir}/gnuzilla-addons.patch" + popd >/dev/null + + cp "${srcdir}/mozconfig" .mozconfig + unset CFLAGS + unset CXXFLAGS + + export LDFLAGS="-Wl,-rpath,/usr/lib/seamonkey-2.0" + + make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" + make -j1 DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/applications" + install -m755 -d "${pkgdir}/usr/share/pixmaps" + install -m644 "${srcdir}/comm-1.9.1/suite/branding/icons/gtk/seamonkey.png" \ + "${pkgdir}/usr/share/pixmaps/" + install -m644 "${srcdir}/seamonkey.desktop" "${pkgdir}/usr/share/applications/" + + rm -f "${pkgdir}/usr/lib/pkgconfig/"seamonkey-ns{s,pr}.pc +} diff --git a/libre/seamonkey-libre/gnuzilla-addons.patch b/libre/seamonkey-libre/gnuzilla-addons.patch new file mode 100644 index 000000000..6cf586e7a --- /dev/null +++ b/libre/seamonkey-libre/gnuzilla-addons.patch @@ -0,0 +1,29 @@ +--- usr/lib/seamonkey-2.0/defaults/pref/browser-prefs.js 2011-03-03 06:47:16.000000000 -0300 ++++ browser-prefs.js 2011-03-08 12:02:29.616789776 -0300 +@@ -465,12 +465,12 @@ + + // Preferences for the Get Add-ons pane + pref("extensions.getAddons.showPane", true); +-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/%APP%"); ++pref("extensions.getAddons.browseAddons", "http://www.gnu.org/software/gnuzilla/addons.html"); + pref("extensions.getAddons.maxResults", 5); +-pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/recommended"); +-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%"); ++pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.recommended.url", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // Non-symmetric (not shared by extensions) extension-specific [update] preferences + pref("extensions.getMoreExtensionsURL", "chrome://branding/locale/brand.properties"); +@@ -557,7 +557,7 @@ + // Disables default plugin for Plugin Finder Service + pref("plugin.default_plugin_disabled", true); + // plugin finder service url +-pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%"); ++pref("pfs.datasource.url", "http://www.gnu.org/software/gnuzilla/addons.html"); + pref("plugins.hide_infobar_for_missing_plugin", false); + + //@line 584 "/build/src/comm-1.9.1/suite/browser/browser-prefs.js" diff --git a/libre/seamonkey-libre/mozconfig b/libre/seamonkey-libre/mozconfig new file mode 100644 index 000000000..4eb1b51ea --- /dev/null +++ b/libre/seamonkey-libre/mozconfig @@ -0,0 +1,30 @@ +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-png +ac_add_options --with-pthreads +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-installer +ac_add_options --disable-crashreporter +ac_add_options --enable-optimize +ac_add_options --enable-xinerama +ac_add_options --enable-default-toolkit=cairo-gtk2 +ac_add_options --disable-xprint +ac_add_options --enable-strip +ac_add_options --enable-pango +#disabled due to bugs with cairo 1.10 +#ac_add_options --enable-system-cairo +ac_add_options --enable-svg +ac_add_options --enable-canvas +ac_add_options --prefix=/usr +ac_add_options --mandir=/usr/share/man +ac_add_options --enable-crypto +ac_add_options --enable-application=suite +ac_cv_visibility_pragma=no + +export BUILD_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 diff --git a/libre/seamonkey-libre/python27.patch b/libre/seamonkey-libre/python27.patch new file mode 100644 index 000000000..f00681fd2 --- /dev/null +++ b/libre/seamonkey-libre/python27.patch @@ -0,0 +1,11 @@ +--- configure.in~ 2010-10-20 17:43:42.843358798 -0700 ++++ configure.in 2010-10-20 17:43:16.373359032 -0700 +@@ -874,7 +874,7 @@ + AC_MSG_RESULT([yes]) + fi + +-AC_PATH_PROGS(PYTHON, $PYTHON python2.5 python2.4 python) ++AC_PATH_PROGS(PYTHON, $PYTHON python2.7 python2.5 python2.4 python) + if test -z "$PYTHON"; then + AC_MSG_ERROR([python was not found in \$PATH]) + fi diff --git a/libre/seamonkey-libre/seamonkey-2.0-lang.patch b/libre/seamonkey-libre/seamonkey-2.0-lang.patch new file mode 100644 index 000000000..b9f4a5cde --- /dev/null +++ b/libre/seamonkey-libre/seamonkey-2.0-lang.patch @@ -0,0 +1,11 @@ +--- comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-10-11 02:12:44.000000000 +0200 ++++ comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-09-16 02:56:45.000000000 +0200 +@@ -890,7 +890,7 @@ + pref("intl.charset.detector", "chrome://global/locale/intl.properties"); + pref("intl.charset.default", "chrome://global-platform/locale/intl.properties"); + pref("intl.ellipsis", "chrome://global-platform/locale/intl.properties"); +-pref("intl.locale.matchOS", false); ++pref("intl.locale.matchOS", true); + // fallback charset list for Unicode conversion (converting from Unicode) + // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes) + // for ISO-8859-1 diff --git a/libre/seamonkey-libre/seamonkey-appversion.patch b/libre/seamonkey-libre/seamonkey-appversion.patch new file mode 100644 index 000000000..0c34cf477 --- /dev/null +++ b/libre/seamonkey-libre/seamonkey-appversion.patch @@ -0,0 +1,12 @@ +diff -Nur comm-1.9.1.orig/suite/installer/Makefile.in comm-1.9.1/suite/installer/Makefile.in +--- comm-1.9.1.orig/suite/installer/Makefile.in 2010-01-04 23:01:34.000000000 +0200 ++++ comm-1.9.1/suite/installer/Makefile.in 2010-01-11 22:38:44.000000000 +0200 +@@ -42,6 +42,8 @@ + + include $(DEPTH)/config/autoconf.mk + ++MOZ_APP_VERSION="2.0" ++ + NO_PKG_FILES = \ + $(MOZ_APP_NAME)-config \ + xpcshell* \ diff --git a/libre/seamonkey-libre/seamonkey.desktop b/libre/seamonkey-libre/seamonkey.desktop new file mode 100644 index 000000000..084082aea --- /dev/null +++ b/libre/seamonkey-libre/seamonkey.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Exec=seamonkey %u +Icon=seamonkey +Type=Application +Terminal=false +MultipleArgs=false +Name=SeaMonkey internet suite +MimeType=text/html +StartupNotify=false +Categories=Application;Network; diff --git a/libre/thunderbird-libre/thunderbird-3.0-lang.patch b/libre/thunderbird-libre/thunderbird-3.0-lang.patch new file mode 100644 index 000000000..b9f4a5cde --- /dev/null +++ b/libre/thunderbird-libre/thunderbird-3.0-lang.patch @@ -0,0 +1,11 @@ +--- comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-10-11 02:12:44.000000000 +0200 ++++ comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-09-16 02:56:45.000000000 +0200 +@@ -890,7 +890,7 @@ + pref("intl.charset.detector", "chrome://global/locale/intl.properties"); + pref("intl.charset.default", "chrome://global-platform/locale/intl.properties"); + pref("intl.ellipsis", "chrome://global-platform/locale/intl.properties"); +-pref("intl.locale.matchOS", false); ++pref("intl.locale.matchOS", true); + // fallback charset list for Unicode conversion (converting from Unicode) + // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes) + // for ISO-8859-1 diff --git a/libre/thunderbird-libre/thunderbird-appversion.patch b/libre/thunderbird-libre/thunderbird-appversion.patch new file mode 100644 index 000000000..3f7a54686 --- /dev/null +++ b/libre/thunderbird-libre/thunderbird-appversion.patch @@ -0,0 +1,12 @@ +diff -Nru comm-1.9.2.orig/mail/installer/Makefile.in comm-1.9.2/mail/installer/Makefile.in +--- comm-1.9.2.orig/mail/installer/Makefile.in 2010-04-30 22:41:37.000000000 +0300 ++++ comm-1.9.2/mail/installer/Makefile.in 2010-05-05 20:20:29.551660469 +0300 +@@ -42,6 +42,8 @@ + + include $(DEPTH)/config/autoconf.mk + ++MOZ_APP_VERSION="3.1" ++ + include $(topsrcdir)/config/rules.mk + + MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in diff --git a/libre/thunderbird-libre/thunderbird-preferences.patch b/libre/thunderbird-libre/thunderbird-preferences.patch new file mode 100644 index 000000000..627f02434 --- /dev/null +++ b/libre/thunderbird-libre/thunderbird-preferences.patch @@ -0,0 +1,30 @@ +diff -Nur comm-1.9.2.orig/mail/app/profile/all-thunderbird.js comm-1.9.2/mail/app/profile/all-thunderbird.js +--- comm-1.9.2.orig/mail/app/profile/all-thunderbird.js 2010-06-23 20:43:08.000000000 +0300 ++++ comm-1.9.2/mail/app/profile/all-thunderbird.js 2010-06-25 00:37:36.518929684 +0300 +@@ -125,7 +125,7 @@ + pref("app.update.showInstalledUI", false); + + // Release notes URL +-pref("app.releaseNotesURL", "http://live.mozillamessaging.com/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); ++pref("app.releaseNotesURL", "http://www.mozillamessaging.com/%APP%/%VERSION%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); + + // Base URL for web-based support pages. + pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/%APP%/%APPBUILDID%/"); +diff -Nur comm-1.9.2.orig/mail/branding/nightly/thunderbird-branding.js comm-1.9.2/mail/branding/nightly/thunderbird-branding.js +--- comm-1.9.2.orig/mail/branding/nightly/thunderbird-branding.js 2010-06-23 20:43:08.000000000 +0300 ++++ comm-1.9.2/mail/branding/nightly/thunderbird-branding.js 2010-06-25 00:36:10.605569121 +0300 +@@ -1,11 +1,11 @@ + // Default start page +-pref("mailnews.start_page.url","https://live.mozillamessaging.com/%APP%/start?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); ++pref("mailnews.start_page.url","https://www.mozillamessaging.com/%APP%/%VERSION%/start?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); + + // first launch welcome page +-pref("mailnews.start_page.welcome_url","https://live.mozillamessaging.com/%APP%/firstrun?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); ++pref("mailnews.start_page.welcome_url","https://www.mozillamessaging.com/%APP%/%VERSION%/firstrun?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); + + // start page override to load after an update +-pref("mailnews.start_page.override_url","https://live.mozillamessaging.com/%APP%/whatsnew?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); ++pref("mailnews.start_page.override_url","https://www.mozillamessaging.com/%APP%/%VERSION%/whatsnew?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); + + // Interval: Time between checks for a new version (in seconds) + // nightly=8 hours, official=24 hours diff --git a/libre/thunderbird-libre/thunderbird-shared-error.patch b/libre/thunderbird-libre/thunderbird-shared-error.patch new file mode 100644 index 000000000..ae41bbc1e --- /dev/null +++ b/libre/thunderbird-libre/thunderbird-shared-error.patch @@ -0,0 +1,15 @@ +diff -up comm-central/mail/installer/Makefile.in.shared-error comm-central/mail/installer/Makefile.in +--- comm-central/mail/installer/Makefile.in.shared-error 2009-09-16 13:47:43.000000000 +0200 ++++ comm-central/mail/installer/Makefile.in 2009-09-16 13:48:25.000000000 +0200 +@@ -95,9 +95,11 @@ endif + # mozconfig instead. + ifndef MAIL_PKG_SHARED + ifndef BUILD_STATIC_LIBS ++ifeq (BUILD_STATIC_LIBS, 1) + $(error you need an "--enable-static" build to package a build) + endif + endif ++endif + + # On mozilla-central, packager.mk uses core_abspath to redefine DIST + # As the comm-central config.mk doesn't set it, do it ourselves instead diff --git a/libre/thunderbird-libre/thunderbird.desktop b/libre/thunderbird-libre/thunderbird.desktop new file mode 100644 index 000000000..93ffead78 --- /dev/null +++ b/libre/thunderbird-libre/thunderbird.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Version=1.0 +Name=Thunderbird +Comment=Mail & News Reader +GenericName=Mail Client & News Reader +Exec=thunderbird +TryExec=thunderbird +Icon=thunderbird +Terminal=false +Type=Application +Categories=Network;Email; +MimeType=message/rfc822;x-scheme-handler/mailto; +StartupNotify=true diff --git a/libre/thunderbird-libre/thunderbird.install b/libre/thunderbird-libre/thunderbird.install new file mode 100644 index 000000000..660593cf5 --- /dev/null +++ b/libre/thunderbird-libre/thunderbird.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/thunderbird-libre/xulrunner-png14.patch b/libre/thunderbird-libre/xulrunner-png14.patch new file mode 100644 index 000000000..1dc0ecda5 --- /dev/null +++ b/libre/thunderbird-libre/xulrunner-png14.patch @@ -0,0 +1,11 @@ +--- mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig 2010-01-17 00:15:53.979744638 +0100 ++++ mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp 2010-01-17 00:16:07.855993411 +0100 +@@ -135,7 +135,7 @@ + + // initialize + mPNG = png_create_write_struct(PNG_LIBPNG_VER_STRING, +- png_voidp_NULL, ++ NULL, + ErrorCallback, + ErrorCallback); + if (! mPNG) diff --git a/thunderbird-libre/PKGBUILD b/thunderbird-libre/PKGBUILD deleted file mode 100644 index d5f546e3d..000000000 --- a/thunderbird-libre/PKGBUILD +++ /dev/null @@ -1,83 +0,0 @@ -# $Id$ -# Contributor: Alexander Baldeck -# Contributor: Dale Blount -# Contributor: Anders Bostrom -pkgname=thunderbird-libre -pkgver=3.1.9 -pkgrel=1 -pkgdesc="Standalone Mail/News reader, with GNUZilla addons" -arch=('i686' 'x86_64') -license=('MPL' 'GPL') -url="http://www.mozilla.org/projects/thunderbird" -depends=('gtk2' 'gcc-libs' 'mozilla-common' 'nss' 'libxt' 'shared-mime-info' 'alsa-lib' 'dbus-glib' 'hunspell' 'sqlite3>=3.7.4' 'desktop-file-utils') -makedepends=('zip' 'pkg-config' 'libgnomeui' 'python2' 'libidl2' 'wireless_tools' 'autoconf2.13') -optdepends=('libcanberra: for sound support') -replaces=('thunderbird') -conflicts=('thunderbird') -provides=("thunderbird=$pkgver") -install=thunderbird.install -source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${pkgver}/source/thunderbird-${pkgver}.source.tar.bz2 - mozconfig - thunderbird.desktop - thunderbird-3.0-lang.patch - thunderbird-appversion.patch - thunderbird-shared-error.patch - thunderbird-preferences.patch - xulrunner-png14.patch - python2.7.patch - gnuzilla-addons.patch) -md5sums=('e6917c419d3aaa8083a1d4b53fb80d8c' - 'c1551d308480d241247c5662d8bebbcb' - '37457073c7f6feeb86c053701d23197f' - '25b6fe16ac24cd5c852213e5c1adb272' - '48ffcdb877a69d383b7d354e330f7658' - '3dca714ee8054634e6dfdb059464dc42' - '1d4f9978e8228ace523b18a09cf41e4e' - '989b15f6bc9e2e9233fe4c6b23f412b1' - '78a4d0c920cbb8ec6a9a36974cd775ef' - 'f272e37db4bcaef993b58a87a7db3bf5') - -build() { - cd "${srcdir}/comm-1.9.2" - patch -Np1 -i "${srcdir}/thunderbird-3.0-lang.patch" - patch -Np1 -i "${srcdir}/thunderbird-appversion.patch" - patch -Np1 -i "${srcdir}/thunderbird-shared-error.patch" - patch -Np1 -i "${srcdir}/thunderbird-preferences.patch" - patch -Np0 -i "${srcdir}/xulrunner-png14.patch" - patch -Np0 -i "${srcdir}/python2.7.patch" - - pushd mail/app/profile >/dev/null - patch -Np0 -i "${srcdir}/gnuzilla-addons.patch" - popd >/dev/null - - cp "${srcdir}/mozconfig" .mozconfig - unset CXXFLAGS - unset CFLAGS - - export LDFLAGS="-Wl,-rpath,/usr/lib/thunderbird-3.1" - - make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" -} - -package() { - cd "${srcdir}/comm-1.9.2" - make -j1 DESTDIR="${pkgdir}" install - - #Remove included dictionaries, add symlink to system myspell path. - #Note: this will cause file conflicts when users have installed dictionaries in the old location - rm -rf "${pkgdir}/usr/lib/thunderbird-3.1/dictionaries" - ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/thunderbird-3.1/dictionaries" - - rm -rf "${pkgdir}/usr/bin/defaults" - - install -m755 -d "${pkgdir}/usr/share/applications" - install -m755 -d "${pkgdir}/usr/share/pixmaps" - - install -m644 mail/branding/unofficial/mailicon48.png \ - "${pkgdir}/usr/share/pixmaps/thunderbird.png" - - install -m644 "${srcdir}/thunderbird.desktop" \ - "${pkgdir}/usr/share/applications/" - - rm -f ${pkgdir}/usr/lib/pkgconfig/thunderbird-ns{s,pr}.pc -} diff --git a/thunderbird-libre/gnuzilla-addons.patch b/thunderbird-libre/gnuzilla-addons.patch deleted file mode 100644 index 2c0e4a68f..000000000 --- a/thunderbird-libre/gnuzilla-addons.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- usr/lib/thunderbird-3.1/defaults/pref/all-thunderbird.js 2011-03-04 17:28:11.000000000 -0300 -+++ all-thunderbird.js 2011-03-08 11:22:31.437207173 -0300 -@@ -144,9 +144,9 @@ - pref("extensions.update.interval", 86400); // Check for updates to Extensions and - // Themes every day - // Non-symmetric (not shared by extensions) extension-specific [update] preferences --pref("extensions.getMoreExtensionsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/extensions/"); --pref("extensions.getMoreThemesURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/themes/"); --pref("extensions.getMorePluginsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/plugins/"); -+pref("extensions.getMoreExtensionsURL", "http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getMorePluginsURL", "http://www.gnu.org/software/gnuzilla/addons.html"); - pref("extensions.dss.enabled", false); // Dynamic Skin Switching - pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next - -@@ -155,14 +155,14 @@ - - // Preferences for the Get Add-ons pane - pref("extensions.getAddons.showPane", true); --pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/%APP%"); -+pref("extensions.getAddons.browseAddons", "http://www.gnu.org/software/gnuzilla/addons.html"); - pref("extensions.getAddons.maxResults", 5); --pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/recommended"); --pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%"); --pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%"); --pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%"); -+pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.recommended.url", "http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html"); - --pref("xpinstall.whitelist.add", "addons.mozilla.org"); -+pref("xpinstall.whitelist.add", "www.gnu.org"); - pref("xpinstall.whitelist.add.36", "getpersonas.com"); - - pref("mail.shell.checkDefaultClient", true); diff --git a/thunderbird-libre/mozconfig b/thunderbird-libre/mozconfig deleted file mode 100644 index 4281bffa1..000000000 --- a/thunderbird-libre/mozconfig +++ /dev/null @@ -1,38 +0,0 @@ -mk_add_options MOZ_CO_PROJECT=mail -ac_add_options --enable-application=mail - -ac_add_options --with-system-nspr -ac_add_options --with-system-nss -ac_add_options --with-system-jpeg -ac_add_options --with-system-zlib -ac_add_options --with-system-png -ac_add_options --with-system-mng -ac_add_options --enable-system-hunspell -ac_add_options --enable-system-sqlite -ac_add_options --with-pthreads -ac_add_options --disable-debug -ac_add_options --disable-tests -ac_add_options --disable-installer -ac_add_options --disable-updater -ac_add_options --disable-crashreporter -ac_add_options --disable-official-branding -ac_add_options --disable-xprint -ac_add_options --enable-default-toolkit=cairo-gtk2 -ac_add_options --enable-strip -ac_add_options --enable-pango -ac_add_options --enable-xft -#disabled because of bugs with cairo 1.10 -#ac_add_options --enable-system-cairo -ac_add_options --enable-svg -ac_add_options --enable-canvas -ac_add_options --enable-optimize -ac_add_options --prefix=/usr -ac_add_options --with-branding=mail/branding/unofficial - -export BUILD_OFFICIAL=1 -export MOZILLA_OFFICIAL=1 -export USE_SHORT_LIBNAME=1 -mk_add_options BUILD_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 -mk_add_options USE_SHORT_LIBNAME=1 - diff --git a/thunderbird-libre/python2.7.patch b/thunderbird-libre/python2.7.patch deleted file mode 100644 index 2d159d479..000000000 --- a/thunderbird-libre/python2.7.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in 2010-10-13 08:37:29.000000000 -0700 -+++ configure.in~ 2010-10-19 10:32:06.360019362 -0700 -@@ -878,7 +878,7 @@ - AC_MSG_RESULT([yes]) - fi - --MOZ_PATH_PROGS(PYTHON, $PYTHON python2.6 python2.5 python2.4 python) -+MOZ_PATH_PROGS(PYTHON, $PYTHON python2.7 python2.6 python2.5 python2.4 python) - if test -z "$PYTHON"; then - AC_MSG_ERROR([python was not found in \$PATH]) - fi diff --git a/thunderbird-libre/thunderbird-3.0-lang.patch b/thunderbird-libre/thunderbird-3.0-lang.patch deleted file mode 100644 index b9f4a5cde..000000000 --- a/thunderbird-libre/thunderbird-3.0-lang.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-10-11 02:12:44.000000000 +0200 -+++ comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-09-16 02:56:45.000000000 +0200 -@@ -890,7 +890,7 @@ - pref("intl.charset.detector", "chrome://global/locale/intl.properties"); - pref("intl.charset.default", "chrome://global-platform/locale/intl.properties"); - pref("intl.ellipsis", "chrome://global-platform/locale/intl.properties"); --pref("intl.locale.matchOS", false); -+pref("intl.locale.matchOS", true); - // fallback charset list for Unicode conversion (converting from Unicode) - // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes) - // for ISO-8859-1 diff --git a/thunderbird-libre/thunderbird-appversion.patch b/thunderbird-libre/thunderbird-appversion.patch deleted file mode 100644 index 3f7a54686..000000000 --- a/thunderbird-libre/thunderbird-appversion.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru comm-1.9.2.orig/mail/installer/Makefile.in comm-1.9.2/mail/installer/Makefile.in ---- comm-1.9.2.orig/mail/installer/Makefile.in 2010-04-30 22:41:37.000000000 +0300 -+++ comm-1.9.2/mail/installer/Makefile.in 2010-05-05 20:20:29.551660469 +0300 -@@ -42,6 +42,8 @@ - - include $(DEPTH)/config/autoconf.mk - -+MOZ_APP_VERSION="3.1" -+ - include $(topsrcdir)/config/rules.mk - - MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in diff --git a/thunderbird-libre/thunderbird-preferences.patch b/thunderbird-libre/thunderbird-preferences.patch deleted file mode 100644 index 627f02434..000000000 --- a/thunderbird-libre/thunderbird-preferences.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Nur comm-1.9.2.orig/mail/app/profile/all-thunderbird.js comm-1.9.2/mail/app/profile/all-thunderbird.js ---- comm-1.9.2.orig/mail/app/profile/all-thunderbird.js 2010-06-23 20:43:08.000000000 +0300 -+++ comm-1.9.2/mail/app/profile/all-thunderbird.js 2010-06-25 00:37:36.518929684 +0300 -@@ -125,7 +125,7 @@ - pref("app.update.showInstalledUI", false); - - // Release notes URL --pref("app.releaseNotesURL", "http://live.mozillamessaging.com/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); -+pref("app.releaseNotesURL", "http://www.mozillamessaging.com/%APP%/%VERSION%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); - - // Base URL for web-based support pages. - pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/%APP%/%APPBUILDID%/"); -diff -Nur comm-1.9.2.orig/mail/branding/nightly/thunderbird-branding.js comm-1.9.2/mail/branding/nightly/thunderbird-branding.js ---- comm-1.9.2.orig/mail/branding/nightly/thunderbird-branding.js 2010-06-23 20:43:08.000000000 +0300 -+++ comm-1.9.2/mail/branding/nightly/thunderbird-branding.js 2010-06-25 00:36:10.605569121 +0300 -@@ -1,11 +1,11 @@ - // Default start page --pref("mailnews.start_page.url","https://live.mozillamessaging.com/%APP%/start?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); -+pref("mailnews.start_page.url","https://www.mozillamessaging.com/%APP%/%VERSION%/start?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); - - // first launch welcome page --pref("mailnews.start_page.welcome_url","https://live.mozillamessaging.com/%APP%/firstrun?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); -+pref("mailnews.start_page.welcome_url","https://www.mozillamessaging.com/%APP%/%VERSION%/firstrun?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); - - // start page override to load after an update --pref("mailnews.start_page.override_url","https://live.mozillamessaging.com/%APP%/whatsnew?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); -+pref("mailnews.start_page.override_url","https://www.mozillamessaging.com/%APP%/%VERSION%/whatsnew?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); - - // Interval: Time between checks for a new version (in seconds) - // nightly=8 hours, official=24 hours diff --git a/thunderbird-libre/thunderbird-shared-error.patch b/thunderbird-libre/thunderbird-shared-error.patch deleted file mode 100644 index ae41bbc1e..000000000 --- a/thunderbird-libre/thunderbird-shared-error.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up comm-central/mail/installer/Makefile.in.shared-error comm-central/mail/installer/Makefile.in ---- comm-central/mail/installer/Makefile.in.shared-error 2009-09-16 13:47:43.000000000 +0200 -+++ comm-central/mail/installer/Makefile.in 2009-09-16 13:48:25.000000000 +0200 -@@ -95,9 +95,11 @@ endif - # mozconfig instead. - ifndef MAIL_PKG_SHARED - ifndef BUILD_STATIC_LIBS -+ifeq (BUILD_STATIC_LIBS, 1) - $(error you need an "--enable-static" build to package a build) - endif - endif -+endif - - # On mozilla-central, packager.mk uses core_abspath to redefine DIST - # As the comm-central config.mk doesn't set it, do it ourselves instead diff --git a/thunderbird-libre/thunderbird.desktop b/thunderbird-libre/thunderbird.desktop deleted file mode 100644 index 93ffead78..000000000 --- a/thunderbird-libre/thunderbird.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Thunderbird -Comment=Mail & News Reader -GenericName=Mail Client & News Reader -Exec=thunderbird -TryExec=thunderbird -Icon=thunderbird -Terminal=false -Type=Application -Categories=Network;Email; -MimeType=message/rfc822;x-scheme-handler/mailto; -StartupNotify=true diff --git a/thunderbird-libre/thunderbird.install b/thunderbird-libre/thunderbird.install deleted file mode 100644 index 660593cf5..000000000 --- a/thunderbird-libre/thunderbird.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/thunderbird-libre/xulrunner-png14.patch b/thunderbird-libre/xulrunner-png14.patch deleted file mode 100644 index 1dc0ecda5..000000000 --- a/thunderbird-libre/xulrunner-png14.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig 2010-01-17 00:15:53.979744638 +0100 -+++ mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp 2010-01-17 00:16:07.855993411 +0100 -@@ -135,7 +135,7 @@ - - // initialize - mPNG = png_create_write_struct(PNG_LIBPNG_VER_STRING, -- png_voidp_NULL, -+ NULL, - ErrorCallback, - ErrorCallback); - if (! mPNG) -- cgit v1.2.3-54-g00ecf From 0fda9e0a8501d54972674e1c9232c7f2a0160fac Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Tue, 8 Mar 2011 14:08:21 -0300 Subject: thunderbird-libre-3.1.9-1 --- libre/thunderbird-libre/PKGBUILD | 83 +++++++++++++++++++++++++++ libre/thunderbird-libre/gnuzilla-addons.patch | 36 ++++++++++++ libre/thunderbird-libre/mozconfig | 38 ++++++++++++ libre/thunderbird-libre/python2.7.patch | 11 ++++ 4 files changed, 168 insertions(+) create mode 100644 libre/thunderbird-libre/PKGBUILD create mode 100644 libre/thunderbird-libre/gnuzilla-addons.patch create mode 100644 libre/thunderbird-libre/mozconfig create mode 100644 libre/thunderbird-libre/python2.7.patch diff --git a/libre/thunderbird-libre/PKGBUILD b/libre/thunderbird-libre/PKGBUILD new file mode 100644 index 000000000..d5f546e3d --- /dev/null +++ b/libre/thunderbird-libre/PKGBUILD @@ -0,0 +1,83 @@ +# $Id$ +# Contributor: Alexander Baldeck +# Contributor: Dale Blount +# Contributor: Anders Bostrom +pkgname=thunderbird-libre +pkgver=3.1.9 +pkgrel=1 +pkgdesc="Standalone Mail/News reader, with GNUZilla addons" +arch=('i686' 'x86_64') +license=('MPL' 'GPL') +url="http://www.mozilla.org/projects/thunderbird" +depends=('gtk2' 'gcc-libs' 'mozilla-common' 'nss' 'libxt' 'shared-mime-info' 'alsa-lib' 'dbus-glib' 'hunspell' 'sqlite3>=3.7.4' 'desktop-file-utils') +makedepends=('zip' 'pkg-config' 'libgnomeui' 'python2' 'libidl2' 'wireless_tools' 'autoconf2.13') +optdepends=('libcanberra: for sound support') +replaces=('thunderbird') +conflicts=('thunderbird') +provides=("thunderbird=$pkgver") +install=thunderbird.install +source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${pkgver}/source/thunderbird-${pkgver}.source.tar.bz2 + mozconfig + thunderbird.desktop + thunderbird-3.0-lang.patch + thunderbird-appversion.patch + thunderbird-shared-error.patch + thunderbird-preferences.patch + xulrunner-png14.patch + python2.7.patch + gnuzilla-addons.patch) +md5sums=('e6917c419d3aaa8083a1d4b53fb80d8c' + 'c1551d308480d241247c5662d8bebbcb' + '37457073c7f6feeb86c053701d23197f' + '25b6fe16ac24cd5c852213e5c1adb272' + '48ffcdb877a69d383b7d354e330f7658' + '3dca714ee8054634e6dfdb059464dc42' + '1d4f9978e8228ace523b18a09cf41e4e' + '989b15f6bc9e2e9233fe4c6b23f412b1' + '78a4d0c920cbb8ec6a9a36974cd775ef' + 'f272e37db4bcaef993b58a87a7db3bf5') + +build() { + cd "${srcdir}/comm-1.9.2" + patch -Np1 -i "${srcdir}/thunderbird-3.0-lang.patch" + patch -Np1 -i "${srcdir}/thunderbird-appversion.patch" + patch -Np1 -i "${srcdir}/thunderbird-shared-error.patch" + patch -Np1 -i "${srcdir}/thunderbird-preferences.patch" + patch -Np0 -i "${srcdir}/xulrunner-png14.patch" + patch -Np0 -i "${srcdir}/python2.7.patch" + + pushd mail/app/profile >/dev/null + patch -Np0 -i "${srcdir}/gnuzilla-addons.patch" + popd >/dev/null + + cp "${srcdir}/mozconfig" .mozconfig + unset CXXFLAGS + unset CFLAGS + + export LDFLAGS="-Wl,-rpath,/usr/lib/thunderbird-3.1" + + make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" +} + +package() { + cd "${srcdir}/comm-1.9.2" + make -j1 DESTDIR="${pkgdir}" install + + #Remove included dictionaries, add symlink to system myspell path. + #Note: this will cause file conflicts when users have installed dictionaries in the old location + rm -rf "${pkgdir}/usr/lib/thunderbird-3.1/dictionaries" + ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/thunderbird-3.1/dictionaries" + + rm -rf "${pkgdir}/usr/bin/defaults" + + install -m755 -d "${pkgdir}/usr/share/applications" + install -m755 -d "${pkgdir}/usr/share/pixmaps" + + install -m644 mail/branding/unofficial/mailicon48.png \ + "${pkgdir}/usr/share/pixmaps/thunderbird.png" + + install -m644 "${srcdir}/thunderbird.desktop" \ + "${pkgdir}/usr/share/applications/" + + rm -f ${pkgdir}/usr/lib/pkgconfig/thunderbird-ns{s,pr}.pc +} diff --git a/libre/thunderbird-libre/gnuzilla-addons.patch b/libre/thunderbird-libre/gnuzilla-addons.patch new file mode 100644 index 000000000..2c0e4a68f --- /dev/null +++ b/libre/thunderbird-libre/gnuzilla-addons.patch @@ -0,0 +1,36 @@ +--- usr/lib/thunderbird-3.1/defaults/pref/all-thunderbird.js 2011-03-04 17:28:11.000000000 -0300 ++++ all-thunderbird.js 2011-03-08 11:22:31.437207173 -0300 +@@ -144,9 +144,9 @@ + pref("extensions.update.interval", 86400); // Check for updates to Extensions and + // Themes every day + // Non-symmetric (not shared by extensions) extension-specific [update] preferences +-pref("extensions.getMoreExtensionsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/extensions/"); +-pref("extensions.getMoreThemesURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/themes/"); +-pref("extensions.getMorePluginsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/plugins/"); ++pref("extensions.getMoreExtensionsURL", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getMorePluginsURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + pref("extensions.dss.enabled", false); // Dynamic Skin Switching + pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next + +@@ -155,14 +155,14 @@ + + // Preferences for the Get Add-ons pane + pref("extensions.getAddons.showPane", true); +-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/%APP%"); ++pref("extensions.getAddons.browseAddons", "http://www.gnu.org/software/gnuzilla/addons.html"); + pref("extensions.getAddons.maxResults", 5); +-pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/recommended"); +-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%"); ++pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.recommended.url", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html"); + +-pref("xpinstall.whitelist.add", "addons.mozilla.org"); ++pref("xpinstall.whitelist.add", "www.gnu.org"); + pref("xpinstall.whitelist.add.36", "getpersonas.com"); + + pref("mail.shell.checkDefaultClient", true); diff --git a/libre/thunderbird-libre/mozconfig b/libre/thunderbird-libre/mozconfig new file mode 100644 index 000000000..4281bffa1 --- /dev/null +++ b/libre/thunderbird-libre/mozconfig @@ -0,0 +1,38 @@ +mk_add_options MOZ_CO_PROJECT=mail +ac_add_options --enable-application=mail + +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-png +ac_add_options --with-system-mng +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --with-pthreads +ac_add_options --disable-debug +ac_add_options --disable-tests +ac_add_options --disable-installer +ac_add_options --disable-updater +ac_add_options --disable-crashreporter +ac_add_options --disable-official-branding +ac_add_options --disable-xprint +ac_add_options --enable-default-toolkit=cairo-gtk2 +ac_add_options --enable-strip +ac_add_options --enable-pango +ac_add_options --enable-xft +#disabled because of bugs with cairo 1.10 +#ac_add_options --enable-system-cairo +ac_add_options --enable-svg +ac_add_options --enable-canvas +ac_add_options --enable-optimize +ac_add_options --prefix=/usr +ac_add_options --with-branding=mail/branding/unofficial + +export BUILD_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 +export USE_SHORT_LIBNAME=1 +mk_add_options BUILD_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options USE_SHORT_LIBNAME=1 + diff --git a/libre/thunderbird-libre/python2.7.patch b/libre/thunderbird-libre/python2.7.patch new file mode 100644 index 000000000..2d159d479 --- /dev/null +++ b/libre/thunderbird-libre/python2.7.patch @@ -0,0 +1,11 @@ +--- configure.in 2010-10-13 08:37:29.000000000 -0700 ++++ configure.in~ 2010-10-19 10:32:06.360019362 -0700 +@@ -878,7 +878,7 @@ + AC_MSG_RESULT([yes]) + fi + +-MOZ_PATH_PROGS(PYTHON, $PYTHON python2.6 python2.5 python2.4 python) ++MOZ_PATH_PROGS(PYTHON, $PYTHON python2.7 python2.6 python2.5 python2.4 python) + if test -z "$PYTHON"; then + AC_MSG_ERROR([python was not found in \$PATH]) + fi -- cgit v1.2.3-54-g00ecf