diff options
Diffstat (limited to 'testing')
-rw-r--r-- | testing/thunderbird/0002-Use-C99-math-isfinite.patch | 43 | ||||
-rw-r--r-- | testing/thunderbird/0004-xulrunner-malloc_usable_size.patch | 25 | ||||
-rw-r--r-- | testing/thunderbird/APKBUILD | 100 | ||||
-rw-r--r-- | testing/thunderbird/finite.patch | 26 | ||||
-rw-r--r-- | testing/thunderbird/jemalloc-libs.patch | 11 | ||||
-rw-r--r-- | testing/thunderbird/mozalloc_usable_size.patch | 11 | ||||
-rw-r--r-- | testing/thunderbird/mozconfig | 40 | ||||
-rw-r--r-- | testing/thunderbird/thunderbird.desktop | 13 | ||||
-rw-r--r-- | testing/thunderbird/xpt.py.patch | 11 |
9 files changed, 0 insertions, 280 deletions
diff --git a/testing/thunderbird/0002-Use-C99-math-isfinite.patch b/testing/thunderbird/0002-Use-C99-math-isfinite.patch deleted file mode 100644 index 3d85a69288..0000000000 --- a/testing/thunderbird/0002-Use-C99-math-isfinite.patch +++ /dev/null @@ -1,43 +0,0 @@ -From cdb9db4c1c593dbe22db4f389a62fce034f31f2d Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Fri, 25 Nov 2011 08:30:51 +0000 -Subject: [PATCH 2/4] Use C99 math isfinite - ---- - js/src/ctypes/CTypes.cpp | 2 +- - xpcom/ds/nsMathUtils.h | 6 +++++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/js/src/ctypes/CTypes.cpp b/js/src/ctypes/CTypes.cpp -index 5c0f886..a3b1ae6 100644 ---- a/js/src/ctypes/CTypes.cpp -+++ b/js/src/ctypes/CTypes.cpp -@@ -467,7 +467,7 @@ static inline bool FloatIsFinite(jsdouble f) { - #ifdef WIN32 - return _finite(f) != 0; - #else -- return finite(f); -+ return isfinite(f); - #endif - } - -diff --git a/xpcom/ds/nsMathUtils.h b/xpcom/ds/nsMathUtils.h -index 21ffbec..2e80476 100644 ---- a/xpcom/ds/nsMathUtils.h -+++ b/xpcom/ds/nsMathUtils.h -@@ -131,7 +131,11 @@ inline NS_HIDDEN_(bool) NS_finite(double d) - // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800. - return !!_finite(d); - #else -- return finite(d); -+#ifdef _GLIBCXX_CMATH -+ return std::isfinite(d); -+#else -+ return isfinite(d); -+#endif - #endif - } - --- -1.7.7.4 - diff --git a/testing/thunderbird/0004-xulrunner-malloc_usable_size.patch b/testing/thunderbird/0004-xulrunner-malloc_usable_size.patch deleted file mode 100644 index aae416c7da..0000000000 --- a/testing/thunderbird/0004-xulrunner-malloc_usable_size.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a2a15c826a5e1743ba71288543b9e144603fba26 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Fri, 25 Nov 2011 08:40:53 +0000 -Subject: [PATCH 4/4] xulrunner: malloc_usable_size - ---- - memory/mozalloc/mozalloc.cpp | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/memory/mozalloc/mozalloc.cpp b/memory/mozalloc/mozalloc.cpp -index 58e5192..500c651 100644 ---- a/memory/mozalloc/mozalloc.cpp -+++ b/memory/mozalloc/mozalloc.cpp -@@ -267,7 +267,7 @@ moz_malloc_usable_size(void *ptr) - #if defined(XP_MACOSX) - return malloc_size(ptr); - #elif defined(MOZ_MEMORY) -- return malloc_usable_size(ptr); -+ return 0; - #elif defined(XP_WIN) - return _msize(ptr); - #else --- -1.7.7.4 - diff --git a/testing/thunderbird/APKBUILD b/testing/thunderbird/APKBUILD deleted file mode 100644 index ae94b46dba..0000000000 --- a/testing/thunderbird/APKBUILD +++ /dev/null @@ -1,100 +0,0 @@ -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> -pkgname=thunderbird -pkgver=8.0 -_pkgver=$pkgver -_xulver=8.0 -pkgrel=0 -pkgdesc="Mozilla Thunderbird mail/newsgroup client" -url="http://www.mozilla.org/projects/thunderbird/" -arch="all" -license="MPLv1.1 or GPLv2+ or LGPLv2+" -depends="xulrunner>=${_xulver} zip" -makedepends=" - alsa-lib-dev - cairo-dev - curl-dev - dbus-glib-dev - gtk+2.0-dev - hicolor-icon-theme - hunspell-dev - libevent-dev - libidl-dev - libnotify-dev - libvpx-dev - libx11-dev - libxext-dev - libxt-dev - mesa-dev - nspr-dev - nss-dev - python - sqlite-dev - startup-notification-dev - wireless-tools-dev - xulrunner-dev>=${_xulver} - yasm - " -install="" -subpackages="" -source="http://releases.mozilla.org/pub/mozilla.org/${pkgname}/releases/${pkgver}/source/${pkgname}-${_pkgver}.source.tar.bz2 - mozconfig - thunderbird.desktop - xpt.py.patch - jemalloc-libs.patch - " -# mozalloc_usable_size.patch -# finite.patch - -_builddir="${srcdir}/comm-release" -_mozappdir=/usr/lib/thunderbird-$pkgver - -prepare() { - local i - - cd "$_builddir" - - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done - - cp "${srcdir}/mozconfig" .mozconfig || return 1 - echo "ac_add_options --with-libxul-sdk=$(pkg-config --variable=sdkdir libxul)" >> .mozconfig -} - -build() { - cd "$_builddir" - - # mozilla's buildsystem is on drugs - export CFLAGS="$(echo $CFLAGS | sed -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g')" - export CXXFLAGS="$CFLAGS -std=gnu++0x" - -# export LDFLAGS="-Wl,-rpath,${_mozappdir}" - make -j1 -f client.mk build \ - STRIP="/bin/true" \ - MOZ_MAKE_FLAGS="$MAKEOPTS" || return 1 -} - -package() { - cd "$_builddir" - make -j1 DESTDIR="$pkgdir" -f client.mk install || return 1 - - for i in 16x16 22x22 24x24 32x32 48x48 256x256; do - install -Dm644 other-licenses/branding/thunderbird/mailicon${i/x*/}.png \ - "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png" - done - - install -Dm644 "$srcdir"/$pkgname.desktop \ - "$pkgdir"/usr/share/applications/$pkgname.desktop || return 1 - - # xulrunner stub launcher has changed to using a symlink overlay... - # go figure - ln -sf /usr/lib/xulrunner-${_xulver} ${pkgdir}/$_mozappdir/xulrunner -} - -md5sums="332f60036aebdce7dec6ee2b1af4941d thunderbird-8.0.source.tar.bz2 -ca98c2bf1017b33e19dae22fdcef2e73 mozconfig -af3e5b344d2edf1c7d61bb0a5a96de9a thunderbird.desktop -c872ba4217937bbbb6d2ab469a3bf95a xpt.py.patch -7f4d92ea8800a34b3c23569c7993f092 jemalloc-libs.patch" diff --git a/testing/thunderbird/finite.patch b/testing/thunderbird/finite.patch deleted file mode 100644 index 63927ab82a..0000000000 --- a/testing/thunderbird/finite.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- ./mozilla/js/src/ctypes/CTypes.cpp.orig -+++ ./mozilla/js/src/ctypes/CTypes.cpp -@@ -467,7 +467,7 @@ - #ifdef WIN32 - return _finite(f) != 0; - #else -- return finite(f); -+ return isfinite(f); - #endif - } - ---- ./mozilla/xpcom/ds/nsMathUtils.h -+++ ./mozilla/xpcom/ds/nsMathUtils.h -@@ -131,7 +131,11 @@ inline NS_HIDDEN_(bool) NS_finite(double d) - // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800. - return !!_finite(d); - #else -- return finite(d); -+#ifdef _GLIBCXX_CMATH -+ return std::isfinite(d); -+#else -+ return isfinite(d); -+#endif - #endif - } - diff --git a/testing/thunderbird/jemalloc-libs.patch b/testing/thunderbird/jemalloc-libs.patch deleted file mode 100644 index e7968986b6..0000000000 --- a/testing/thunderbird/jemalloc-libs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./mail/app/Makefile.in.orig -+++ ./mail/app/Makefile.in -@@ -172,8 +172,6 @@ - RCFLAGS += -DTHUNDERBIRD_ICO=\"$(DIST)/branding/thunderbird.ico\" - endif - --LIBS += $(JEMALLOC_LIBS) -- - include $(topsrcdir)/config/rules.mk - - ifdef MOZILLA_OFFICIAL diff --git a/testing/thunderbird/mozalloc_usable_size.patch b/testing/thunderbird/mozalloc_usable_size.patch deleted file mode 100644 index 9b6740dcee..0000000000 --- a/testing/thunderbird/mozalloc_usable_size.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./mozilla/memory/mozalloc/mozalloc.cpp.orig -+++ ./mozilla/memory/mozalloc/mozalloc.cpp -@@ -266,7 +266,7 @@ - - #if defined(XP_MACOSX) - return malloc_size(ptr); --#elif defined(MOZ_MEMORY) -+#elif defined(MOZ_MEMORY) && !defined(__UCLIBC__) - return malloc_usable_size(ptr); - #elif defined(XP_WIN) - return _msize(ptr); diff --git a/testing/thunderbird/mozconfig b/testing/thunderbird/mozconfig deleted file mode 100644 index 85ed8a6484..0000000000 --- a/testing/thunderbird/mozconfig +++ /dev/null @@ -1,40 +0,0 @@ -mk_add_options MOZ_CO_PROJECT=mail -ac_add_options --enable-application=mail - -ac_add_options --prefix=/usr -ac_add_options --libdir=/usr/lib - -# System libraries -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-bz2 -ac_add_options --with-system-png -ac_add_options --with-system-libevent -ac_add_options --with-system-libvpx -ac_add_options --enable-system-hunspell -ac_add_options --enable-system-sqlite -ac_add_options --enable-system-ffi -ac_add_options --enable-system-cairo -ac_add_options --enable-system-pixman -ac_add_options --with-pthreads - -# Features -ac_add_options --enable-official-branding -ac_add_options --enable-safe-browsing -ac_add_options --enable-startup-notification -ac_add_options --enable-gio - -ac_add_options --disable-gnomevfs -ac_add_options --disable-crashreporter -ac_add_options --disable-updater -ac_add_options --disable-tests -ac_add_options --disable-mochitest -ac_add_options --disable-installer - -# Optimization -ac_add_options --enable-optimize - -export MOZILLA_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 diff --git a/testing/thunderbird/thunderbird.desktop b/testing/thunderbird/thunderbird.desktop deleted file mode 100644 index a626e52bad..0000000000 --- a/testing/thunderbird/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 %u -TryExec=thunderbird -Icon=thunderbird -Terminal=false -Type=Application -Categories=Network;Email; -MimeType=message/rfc822;x-scheme-handler/mailto; -StartupNotify=true diff --git a/testing/thunderbird/xpt.py.patch b/testing/thunderbird/xpt.py.patch deleted file mode 100644 index 1718e8707f..0000000000 --- a/testing/thunderbird/xpt.py.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./config/config.mk.orig -+++ ./config/config.mk -@@ -368,7 +368,7 @@ - else - XPIDL_COMPILE = $(CYGWIN_WRAPPER) $(LIBXUL_DIST)/bin/xpidl$(BIN_SUFFIX) - endif --XPIDL_LINK = $(PYTHON) $(SDK_BIN_DIR)/xpt.py link -+XPIDL_LINK = $(PYTHON) $(LIBXUL_DIST)/sdk/bin/xpt.py link - - INCLUDES = \ - $(LOCAL_INCLUDES) \ |