diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-12 22:42:22 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-12 22:42:22 +0100 |
commit | 811e6165dc55e497bf39ac2e7d2e66b01018a016 (patch) | |
tree | 682a04b9f8ca2397d386334130a24849dcd7b947 | |
parent | 3d0f5590897ab1d8d66572ad1787162ee7d537e7 (diff) | |
download | abslibre-811e6165dc55e497bf39ac2e7d2e66b01018a016.tar.gz abslibre-811e6165dc55e497bf39ac2e7d2e66b01018a016.tar.bz2 abslibre-811e6165dc55e497bf39ac2e7d2e66b01018a016.zip |
Update seamonkey-libre.
-rw-r--r-- | libre/seamonkey-libre/PKGBUILD | 66 | ||||
-rw-r--r-- | libre/seamonkey-libre/gnuzilla-addons.patch | 43 | ||||
-rw-r--r-- | libre/seamonkey-libre/libvpx.patch | 12 | ||||
-rw-r--r-- | libre/seamonkey-libre/mozconfig | 41 | ||||
-rw-r--r-- | libre/seamonkey-libre/seamonkey-appversion.patch | 12 | ||||
-rw-r--r-- | libre/seamonkey-libre/seamonkey.desktop | 2 | ||||
-rw-r--r-- | libre/seamonkey-libre/seamonkey.install | 12 |
7 files changed, 103 insertions, 85 deletions
diff --git a/libre/seamonkey-libre/PKGBUILD b/libre/seamonkey-libre/PKGBUILD index 343f3e3ed..41cd99b4c 100644 --- a/libre/seamonkey-libre/PKGBUILD +++ b/libre/seamonkey-libre/PKGBUILD @@ -1,56 +1,58 @@ -# $Id$ +# $Id: PKGBUILD 149871 2012-02-11 11:12:41Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> +_pkgname=seamonkey pkgname=seamonkey-libre -pkgver=2.0.12 +pkgver=2.7.1 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') +depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite3' 'startup-notification') +makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'yasm' 'wireless_tools' 'mesa' 'autoconf2.13') replaces=('mozilla' 'seamonkey') conflicts=('seamonkey') provides=("seamonkey=$pkgver") +install=$_pkgname.install url="http://www.mozilla.org/projects/seamonkey" -source=(http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/${pkgver}/source/seamonkey-${pkgver}.source.tar.bz2 +source=(ftp://releases.mozilla.org/pub/mozilla.org/$_pkgname/releases/$pkgver/source/$_pkgname-$pkgver.source.tar.bz2 mozconfig seamonkey.desktop - seamonkey-appversion.patch seamonkey-2.0-lang.patch - python27.patch + libvpx.patch gnuzilla-addons.patch) -md5sums=('681328d58a71d23e52ebe986a8eca3fd' - '4978159e4921892e34dcd7e9804f0437' - '448848e65efcbf1b2be2873b66b6cd48' - 'a4275fc48361c80f676e96fdb28bd74e' +md5sums=('a16764e55ef8e59c469dc44b63459ad6' + 'd02b5f002a7cdf8d15dccd2548d09256' + '6119a2254716752c9d08e366f8d4c048' '25b6fe16ac24cd5c852213e5c1adb272' - '47e57931d65c71baafcf0e4f9160e876' - '178073b25aa41ffc601bcd9ddf1f69de') + '5b2aaff7dfe7f1f94ad965905b20e782' + '4347c7be7e48a9987765552f4f6362bc') 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" + cd "$srcdir/comm-release" + patch -Np1 -i "$srcdir/seamonkey-2.0-lang.patch" + patch -Np1 -i "$srcdir/libvpx.patch" + patch -Np1 -i "${srcdir}/gnuzilla-addons.patch" - pushd suite/browser >/dev/null - patch -Np0 -i "${srcdir}/gnuzilla-addons.patch" - popd >/dev/null + cp "$srcdir/mozconfig" .mozconfig + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/seamonkey-$pkgver" - cp "${srcdir}/mozconfig" .mozconfig - unset CFLAGS - unset CXXFLAGS + make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" +} + +package() { + cd "$srcdir/comm-release" - export LDFLAGS="-Wl,-rpath,/usr/lib/seamonkey-2.0" + make -j1 -f client.mk DESTDIR="$pkgdir" install - make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" - make -j1 DESTDIR="${pkgdir}" install + rm -rf "$pkgdir"/usr/lib/seamonkey-$pkgver/{dictionaries,hyphenation} + ln -sf /usr/share/hunspell "$pkgdir/usr/lib/seamonkey-$pkgver/dictionaries" + ln -sf /usr/share/hyphen "$pkgdir/usr/lib/seamonkey-$pkgver/hyphenation" - 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/" + install -m755 -d "$pkgdir/usr/share/applications" + install -m755 -d "$pkgdir/usr/share/pixmaps" + install -m644 suite/branding/nightly/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 + 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 index 6cf586e7a..ae95052c5 100644 --- a/libre/seamonkey-libre/gnuzilla-addons.patch +++ b/libre/seamonkey-libre/gnuzilla-addons.patch @@ -1,29 +1,28 @@ ---- 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%"); +diff -ru comm-release.orig/suite/browser/browser-prefs.js comm-release/suite/browser/browser-prefs.js +--- comm-release.orig/suite/browser/browser-prefs.js 2012-02-12 21:59:22.006597211 +0100 ++++ comm-release/suite/browser/browser-prefs.js 2012-02-12 22:03:37.727232650 +0100 +@@ -587,10 +587,10 @@ + // Preferences for AMO integration + pref("extensions.getAddons.cache.enabled", true); // also toggles personalized recommendations + pref("extensions.getAddons.maxResults", 15); +-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); -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.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=seamonkey"); +-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%"); ++pref("extensions.getAddons.get.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("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // getMoreThemes is used by our UI under our switch theme menu + pref("extensions.getMoreThemesURL", "chrome://branding/locale/brand.properties"); +@@ -715,7 +715,7 @@ + #endif - // 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" + pref("plugins.update.url", "http://www.mozilla.com/%LOCALE%/plugincheck/"); + pref("plugins.update.notifyUser", false); + pref("plugins.hide_infobar_for_outdated_plugin", false); +Tylko w comm-release/suite/browser: browser-prefs.js~ diff --git a/libre/seamonkey-libre/libvpx.patch b/libre/seamonkey-libre/libvpx.patch new file mode 100644 index 000000000..d0f9a0f4c --- /dev/null +++ b/libre/seamonkey-libre/libvpx.patch @@ -0,0 +1,12 @@ +diff -Nur comm-release.orig/mozilla/configure.in comm-release/mozilla/configure.in +--- comm-release.orig/mozilla/configure.in 2012-02-05 18:02:17.376830377 +0000 ++++ comm-release/mozilla/configure.in 2012-02-05 18:03:25.246274275 +0000 +@@ -5629,7 +5629,7 @@ + dnl v0.9.6 one to check for. + AC_TRY_COMPILE([ + #include <vpx/vpx_decoder.h> +- #if !defined(VPX_CODEC_USE_INPUT_PARTITION) ++ #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS) + #error "test failed." + #endif + ], diff --git a/libre/seamonkey-libre/mozconfig b/libre/seamonkey-libre/mozconfig index 4eb1b51ea..8257f8e4f 100644 --- a/libre/seamonkey-libre/mozconfig +++ b/libre/seamonkey-libre/mozconfig @@ -1,30 +1,35 @@ +ac_add_options --enable-application=suite + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + 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-cairo ac_add_options --with-pthreads + +# Features +ac_add_options --enable-startup-notification +ac_add_options --enable-safe-browsing +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-debug +ac_add_options --disable-mochitest ac_add_options --disable-installer -ac_add_options --disable-crashreporter + +# Optimization 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/seamonkey-appversion.patch b/libre/seamonkey-libre/seamonkey-appversion.patch deleted file mode 100644 index 0c34cf477..000000000 --- a/libre/seamonkey-libre/seamonkey-appversion.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 index 084082aea..dd92a2432 100644 --- a/libre/seamonkey-libre/seamonkey.desktop +++ b/libre/seamonkey-libre/seamonkey.desktop @@ -6,6 +6,6 @@ Type=Application Terminal=false MultipleArgs=false Name=SeaMonkey internet suite -MimeType=text/html +MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;message/rfc822;x-scheme-handler/mailto; StartupNotify=false Categories=Application;Network; diff --git a/libre/seamonkey-libre/seamonkey.install b/libre/seamonkey-libre/seamonkey.install new file mode 100644 index 000000000..709ad81f2 --- /dev/null +++ b/libre/seamonkey-libre/seamonkey.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} |