summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libre/p7zip-libre/7zFM.desktop1
-rw-r--r--libre/p7zip-libre/PKGBUILD33
-rw-r--r--libre/p7zip-libre/install1
-rwxr-xr-xlibre/p7zip-libre/unzip18
-rw-r--r--libre/thunderbird-libre/PKGBUILD19
-rw-r--r--libre/thunderbird-libre/thunderbird-3.0-lang.patch11
-rw-r--r--libre/thunderbird-libre/thunderbird-install-dir.patch1
-rw-r--r--libre/thunderbird-libre/vendor.js9
8 files changed, 33 insertions, 60 deletions
diff --git a/libre/p7zip-libre/7zFM.desktop b/libre/p7zip-libre/7zFM.desktop
index 9d8e72920..62b8e8562 100644
--- a/libre/p7zip-libre/7zFM.desktop
+++ b/libre/p7zip-libre/7zFM.desktop
@@ -7,4 +7,3 @@ Categories=GTK;Utility;Archiving;Compression;
Terminal=false
Icon=p7zip
Exec=7zFM
-
diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD
index 61d0d5d71..2e6ab6e01 100644
--- a/libre/p7zip-libre/PKGBUILD
+++ b/libre/p7zip-libre/PKGBUILD
@@ -8,25 +8,24 @@
pkgname=p7zip-libre
_pkgname=${pkgname%-libre}
pkgver=9.20.1
-pkgrel=4
+pkgrel=6
pkgdesc='Command-line version of the 7zip compressed file archiver without Rar'
url='http://p7zip.sourceforge.net/'
license=('GPL')
-arch=('i686' 'x86_64')
-provides=("p7zip=$pkgver" 'unzip')
-conflicts=('p7zip' 'unzip')
-replaces=('p7zip' 'unzip')
+arch=('i686' 'x86_64' 'mips64el')
+provides=("p7zip=$pkgver")
+conflicts=('p7zip')
+replaces=('p7zip')
+depends=('gcc-libs' 'bash')
optdepends=('wxgtk: GUI'
'desktop-file-utils: desktop entries')
makedepends=('yasm' 'nasm' 'wxgtk')
source=("http://repo.parabolagnulinux.org/other/${pkgname}_${pkgver}.tar.bz2"
'p7zip-libre.patch'
- 'unzip' # unzip replacement
'7zFM.desktop')
-md5sums=('c1eaf537e382b93adaa64713c96089fb'
- '5b938c94cf80179137ea560dde510951'
- '371af657bfb81a97bbeb5439896c814a'
- '5b1c13139c42024d73abb67708ab6864')
+sha1sums=('4cffac613e7f3d8fc3c60677491b83a2d5cf16c9'
+ '8fc0e6e80aeec371a8c80e7a6082594ac6d08aed'
+ 'f2c370d6f1b286b7ce9a2804e22541b755616a40')
install=install
mksource() {
@@ -52,11 +51,12 @@ mksource() {
build() {
cd "${srcdir}/${_pkgname}_${pkgver}"
- [[ $CARCH = x86_64 ]] \
- && cp makefile.linux_amd64_asm makefile.machine \
- || cp makefile.linux_x86_asm_gcc_4.X makefile.machine
+ case $CARCH in
+ x86_64) cp makefile.linux_amd64_asm makefile.machine ;;
+ i686) cp makefile.linux_x86_asm_gcc_4.X makefile.machine ;;
+ esac
- make all4 OPTFLAGS="${CXXFLAGS}"
+ make all4 OPTFLAGS="${CXXFLAGS}"
}
package() {
@@ -68,7 +68,6 @@ package() {
DEST_MAN="/usr/share/man"
# Integration with stuff...
- install -D contrib/VirtualFileSystemForMidnightCommander/u7z "${pkgdir}"/usr/lib/mc/extfs.d/u7z
install -D GUI/p7zip_32.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/p7zip.png
install -d "${pkgdir}"/usr/share/{applications,kde4/services/ServiceMenus}
cp GUI/kde4/* "${pkgdir}"/usr/share/kde4/services/ServiceMenus/
@@ -79,8 +78,4 @@ package() {
cp -r GUI/help "${pkgdir}"/usr/lib/p7zip/
chmod -R u+w "${pkgdir}/usr"
-
-# Install unzip replacement script
- install -D -m755 "${srcdir}/unzip" "${pkgdir}/usr/bin/unzip"
}
-
diff --git a/libre/p7zip-libre/install b/libre/p7zip-libre/install
index 2502df4a6..7f3cc4358 100644
--- a/libre/p7zip-libre/install
+++ b/libre/p7zip-libre/install
@@ -11,4 +11,3 @@ post_upgrade() {
post_remove() {
post_install
}
-
diff --git a/libre/p7zip-libre/unzip b/libre/p7zip-libre/unzip
deleted file mode 100755
index 201dc826c..000000000
--- a/libre/p7zip-libre/unzip
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-# unzip replacement written by Henry Jensen <hjensen@gmx.de>
-
-Opts=""
-cm="x"
-while getopts plvtTZ opt
-do
- case $opt in
- p) Opts="$Opts -so";;
- v|l) cm="l";;
- t) cm="t";;
- T|Z) ;;
- \?)break;;
- esac
-done
-shift $((OPTIND-1))
-
-7z $cm $Opts "$@"
diff --git a/libre/thunderbird-libre/PKGBUILD b/libre/thunderbird-libre/PKGBUILD
index 9ac8350ce..6a517c112 100644
--- a/libre/thunderbird-libre/PKGBUILD
+++ b/libre/thunderbird-libre/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 145298 2011-12-21 14:25:49Z ibiru $
+# $Id: PKGBUILD 145619 2011-12-24 12:00:02Z ibiru $
# Contributor: Alexander Baldeck <alexander@archlinux.org>
# Contributor: Dale Blount <dale@archlinux.org>
# Contributor: Anders Bostrom <anders.bostrom@home.se>
pkgname=thunderbird-libre
-pkgver=9.0
+pkgver=9.0.1
pkgrel=1
pkgdesc="Standalone Mail/News reader"
arch=('i686' 'x86_64')
license=('MPL' 'GPL')
url="http://www.mozilla.org/thunderbird/"
depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite3' 'startup-notification')
-makedepends=('p7zip-libre' 'zip' 'pkg-config' 'python2' 'libidl2' 'wireless_tools' 'yasm' 'mesa')
+makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa')
optdepends=('libcanberra: for sound support')
replaces=('thunderbird')
conflicts=('thunderbird')
@@ -19,19 +19,18 @@ 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-install-dir.patch
- channel-prefs.js)
-md5sums=('681bdf6362945b59b2bec23f8aecc7e7'
+ channel-prefs.js
+ vendor.js)
+md5sums=('a5904751dbd33074682b438b732fdbab'
'ca98c2bf1017b33e19dae22fdcef2e73'
'af3e5b344d2edf1c7d61bb0a5a96de9a'
- '25b6fe16ac24cd5c852213e5c1adb272'
'aea906acf72c43dd82ead2fabcc1c6db'
- '476ec205162340fb0679f522c9d31c3b')
+ '476ec205162340fb0679f522c9d31c3b'
+ '5a53179d14ae9631b7afe5e4d0fc0b25')
build() {
cd "$srcdir/comm-release"
- patch -Np1 -i "$srcdir/thunderbird-3.0-lang.patch"
patch -Np1 -i "$srcdir/thunderbird-install-dir.patch"
cp "$srcdir/mozconfig" .mozconfig
@@ -46,6 +45,8 @@ package() {
cd "$srcdir/comm-release"
make -j1 -f client.mk DESTDIR="$pkgdir" install
+ install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/thunderbird/defaults/pref/"
+
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"
diff --git a/libre/thunderbird-libre/thunderbird-3.0-lang.patch b/libre/thunderbird-libre/thunderbird-3.0-lang.patch
deleted file mode 100644
index b9f4a5cde..000000000
--- a/libre/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/libre/thunderbird-libre/thunderbird-install-dir.patch b/libre/thunderbird-libre/thunderbird-install-dir.patch
index fc6e24c4c..74e692bf2 100644
--- a/libre/thunderbird-libre/thunderbird-install-dir.patch
+++ b/libre/thunderbird-libre/thunderbird-install-dir.patch
@@ -40,4 +40,3 @@ diff -Nur comm-beta.orig/mozilla/js/src/config/autoconf.mk.in comm-beta/mozilla/
TOP_DIST = @TOP_DIST@
ifneq (,$(filter /%,$(TOP_DIST)))
-
diff --git a/libre/thunderbird-libre/vendor.js b/libre/thunderbird-libre/vendor.js
new file mode 100644
index 000000000..170b505a8
--- /dev/null
+++ b/libre/thunderbird-libre/vendor.js
@@ -0,0 +1,9 @@
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
+// Disable default mailer checking.
+pref("mail.shell.checkDefaultMail", false);
+
+// Don't disable our bundled extensions in the application directory
+pref("extensions.autoDisableScopes", 11);
+pref("extensions.shownSelectionUI", true);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-13 06:55:09 +0000