summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-12-02 12:29:38 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2012-12-02 12:29:38 +0100
commite4dbf4a68c8fa1708c76293d66570139c7230480 (patch)
tree18abec3ac8480db92071e1a455cac011b36ef9a7
parenta401ccff8f6c40e4a7ca78b49637ad7732141811 (diff)
parent98ba4ae196183c2d9b1cc2d61cf1ee82302863e3 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/chmsee/PKGBUILD community/mksh/PKGBUILD
-rw-r--r--community/chmsee/PKGBUILD21
-rw-r--r--community/mksh/PKGBUILD24
-rw-r--r--community/pidgin-hotkeys/PKGBUILD31
-rw-r--r--community/pidgin-hotkeys/pidgin-hotkeys.patch24
-rw-r--r--community/renameutils/PKGBUILD32
-rw-r--r--community/yaws/PKGBUILD13
-rw-r--r--community/yaws/yaws.service12
-rw-r--r--extra/accountsservice/32bit-crash.patch26
-rw-r--r--extra/accountsservice/PKGBUILD10
-rw-r--r--extra/brltty/PKGBUILD18
-rw-r--r--extra/intel-tbb/PKGBUILD10
-rw-r--r--extra/ntfs-3g_ntfsprogs/PKGBUILD3
-rw-r--r--libre/iceweasel-i18n/PKGBUILD180
-rw-r--r--libre/iceweasel-libre/PKGBUILD10
-rw-r--r--libre/iceweasel-libre/libre.patch24
-rw-r--r--libre/xulrunner-libre/PKGBUILD17
-rw-r--r--libre/xulrunner-libre/shared-libs.patch12
17 files changed, 299 insertions, 168 deletions
diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD
index 703fa5616..a6b13afe9 100644
--- a/community/chmsee/PKGBUILD
+++ b/community/chmsee/PKGBUILD
@@ -1,34 +1,35 @@
-# $Id: PKGBUILD 78574 2012-10-21 09:16:19Z lcarlier $
+# $Id: PKGBUILD 80747 2012-12-01 21:09:55Z lcarlier $
# Maintainer : Laurent Carlier <lordheavym@gmail.com>
# Contributor: dionydonny <dionydonny@gmail.com>
# Contributor: Ermanno <erm67@yahoo.it>
pkgname=chmsee
-pkgver=1.99.13
-pkgrel=2
+pkgver=1.99.15
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner."
url="http://chmsee.googlecode.com/"
license=('GPL')
-depends=('xulrunner>=13.0' 'chmlib' 'desktop-file-utils')
+depends=('xulrunner>=17.0' 'chmlib' 'desktop-file-utils')
makedepends=('python2')
-source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver
+#source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver
+source=(https://github.com/jungleji/chmsee/archive/b2a3c2ad32bfe9db067665ea1928d7e130d1b5e7.zip
chmsee)
install=chmsee.install
-md5sums=('6ea077c593bdadaafb278cce9165fba2'
+md5sums=('87a7adef3a120bae2f9b963596ddb593'
'242a9390bc943cc38237fa71137fb26c')
build() {
- cd ${srcdir}/jungleji-chmsee-*/src
+ cd ${srcdir}/chmsee-*/src
cp Makefile.arch Makefile
- sed -i -e 's/15.*/16.*/g' ../application.ini
+ #sed -i -e 's/15.*/17.*/g' ../application.ini
- make
+ make -j1
}
package() {
- cd ${srcdir}/jungleji-chmsee-*
+ cd ${srcdir}/chmsee-*
install -d ${pkgdir}/usr/share/chmsee
cp -a * ${pkgdir}/usr/share/chmsee
diff --git a/community/mksh/PKGBUILD b/community/mksh/PKGBUILD
index aeb555ecc..460532db8 100644
--- a/community/mksh/PKGBUILD
+++ b/community/mksh/PKGBUILD
@@ -1,28 +1,24 @@
-# $Id: PKGBUILD 68994 2012-04-07 09:57:09Z ttopper $
+# $Id: PKGBUILD 80731 2012-12-01 17:21:44Z ttoepper $
# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
# Contributor: Daniel Hommel <dhommel@gmail.com>
pkgname=mksh
-pkgver=R40f
+pkgver=R41
pkgrel=1
-pkgdesc="The MirBSD Korn Shell - an enhanced version of the public domain ksh"
-url="http://mirbsd.de/mksh"
-license=("custom")
-makedepends=('cpio')
+pkgdesc='The MirBSD Korn Shell - an enhanced version of the public domain ksh'
+url='https://www.mirbsd.org/mksh.htm'
+license=('custom')
arch=('i686' 'x86_64' 'mips64el')
install=mksh.install
-source=("https://www.mirbsd.org/MirOS/dist/mir/mksh/$pkgname-$pkgver.cpio.gz"
- "https://www.mirbsd.org/TaC-mksh.txt")
+source=("https://www.mirbsd.org/MirOS/dist/mir/mksh/$pkgname-$pkgver.tgz"
+ 'https://www.mirbsd.org/TaC-mksh.txt')
depends=('gcc-libs')
-md5sums=('22c9570660c2efadf36de7b620d06966'
- '0016ef61a990bcd763604da7ae2beb25')
+md5sums=('70eca50d9340412714ef09b7060ebde9'
+ '124164b14263f5ee09d2135fffce7282')
build() {
- cd "$srcdir"
- # makepkg can't extract cpio files
- cpio -mid < "$pkgname-$pkgver.cpio"
-
cd "$srcdir/$pkgname"
+
sh Build.sh -r -c lto
./test.sh
gzip -n9 mksh.1
diff --git a/community/pidgin-hotkeys/PKGBUILD b/community/pidgin-hotkeys/PKGBUILD
new file mode 100644
index 000000000..bd2130cab
--- /dev/null
+++ b/community/pidgin-hotkeys/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 80723 2012-12-01 13:56:24Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: detto <detto-brumm@freenet.de>
+
+pkgname=pidgin-hotkeys
+pkgver=0.2.4
+pkgrel=2
+pkgdesc="A Pidgin plugin that allows you to define global hotkeys."
+arch=('i686' 'x86_64')
+url="http://pidgin-hotkeys.sourceforge.net"
+license=('GPL')
+depends=('pidgin')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ "pidgin-hotkeys.patch")
+md5sums=('553aae7319861af9e8716bfe0ba45c30'
+ '0726353af56270164d7af88470722dd0')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ patch -Np0 -i ../pidgin-hotkeys.patch
+
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
diff --git a/community/pidgin-hotkeys/pidgin-hotkeys.patch b/community/pidgin-hotkeys/pidgin-hotkeys.patch
new file mode 100644
index 000000000..427295981
--- /dev/null
+++ b/community/pidgin-hotkeys/pidgin-hotkeys.patch
@@ -0,0 +1,24 @@
+--- src/hotkeys.c 2007-06-22 20:37:00.000000000 +0200
++++ src/hotkeys.c 2008-04-18 16:08:46.000000000 +0200
+@@ -152,15 +152,19 @@
+
+ if ((l = get_pending_list(1)))
+ {
+- pidgin_conv_present_conversation((PurpleConversation *)l->data);
++ PurpleConversation *conv = l->data;
++ pidgin_conv_present_conversation(conv);
+
+ #ifdef GDK_WINDOWING_X11
+ {
+ GtkWindow *gtkwindow;
++ PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
+
+- gtkwindow = GTK_WINDOW(pidgin_conv_get_window(PIDGIN_CONVERSATION((PurpleConversation *)l->data))->window);
++ gtkwindow = GTK_WINDOW(pidgin_conv_get_window(PIDGIN_CONVERSATION(conv))->window);
+ /*gtk_window_present(gtkwindow);*/
+ hacky_active_window(GTK_WIDGET(gtkwindow));
++
++ pidgin_conv_window_switch_gtkconv(gtkconv->win, gtkconv);
+ }
+ #endif
+ g_list_free(l);
diff --git a/community/renameutils/PKGBUILD b/community/renameutils/PKGBUILD
new file mode 100644
index 000000000..143afa37b
--- /dev/null
+++ b/community/renameutils/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 80733 2012-12-01 17:49:39Z kkeen $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Patrik Hautala <phloyd@iki.fi>
+
+pkgname=renameutils
+pkgver=0.12.0
+pkgrel=2
+pkgdesc="A set of programs designed to make renaming of files faster and less cumbersome"
+arch=('i686' 'x86_64')
+url="http://www.nongnu.org/renameutils/"
+license=('GPL')
+depends=('readline')
+source=(http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz)
+sha256sums=('cbd2f002027ccf5a923135c3f529c6d17fabbca7d85506a394ca37694a9eb4a3')
+
+build() {
+ cd "${srcdir}/$pkgname-$pkgver/src"
+ sed -i 's/($bindir)/$(bindir)/' Makefile.am
+ sed -i 's/($bindir)/$(bindir)/' Makefile.in
+
+ cd "${srcdir}/$pkgname-$pkgver"
+
+ ./configure --prefix=/usr
+ make
+}
+
+package () {
+ cd "${srcdir}/$pkgname-$pkgver"
+
+ install -d "${pkgdir}/usr/bin"
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/community/yaws/PKGBUILD b/community/yaws/PKGBUILD
index caca5f8c7..f88fe5655 100644
--- a/community/yaws/PKGBUILD
+++ b/community/yaws/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 80662 2012-11-28 22:06:10Z arodseth $
+# $Id: PKGBUILD 80743 2012-12-01 19:51:02Z arodseth $
# Maintainer: Vesa Kaihlavirta
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Patrick Smits <mail@patricksmits.net>
pkgname=yaws
pkgver=1.95
-pkgrel=1
+pkgrel=3
pkgdesc='Yet Another Web Server, pure Erlang HTTP server/framework'
arch=('x86_64' 'i686' 'mips64el')
url='http://yaws.hyber.org/'
@@ -13,8 +14,10 @@ depends=('pam' 'erlang')
backup=('etc/yaws/yaws.conf')
options=('!emptydirs')
install=$pkgname.install
-source=("http://yaws.hyber.org/download/$pkgname-$pkgver.tar.gz")
-sha256sums=('e4efae836561f5e8a1324a5c9ab63fb82468e9dc93dc95cb4cb6248ab6b95406')
+source=("http://yaws.hyber.org/download/$pkgname-$pkgver.tar.gz"
+ "$pkgname.service")
+sha256sums=('e4efae836561f5e8a1324a5c9ab63fb82468e9dc93dc95cb4cb6248ab6b95406'
+ 'cce672e0bc73f536186bdbb8ac139d8000db4bd67f5fdeff84fdc4b4f8bd84f9')
build() {
cd "$pkgname-$pkgver"
@@ -34,6 +37,8 @@ package() {
install -d "$pkgdir/usr/lib/erlang/lib"
ln -s /usr/lib/yaws "$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver"
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ install -Dm644 "$srcdir/$pkgname.service" \
+ "$pkgdir/usr/lib/systemd/system/$pkgname.service"
}
# vim:set ts=2 sw=2 et:
diff --git a/community/yaws/yaws.service b/community/yaws/yaws.service
new file mode 100644
index 000000000..48f9bb8ef
--- /dev/null
+++ b/community/yaws/yaws.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=A fast lightweight webserver.
+After=syslog.target network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/yaws --daemon --heart
+ExecReload=/usr/bin/yaws --hup
+ExecStop=/usr/bin/yaws --stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/accountsservice/32bit-crash.patch b/extra/accountsservice/32bit-crash.patch
new file mode 100644
index 000000000..87b5d308e
--- /dev/null
+++ b/extra/accountsservice/32bit-crash.patch
@@ -0,0 +1,26 @@
+From 4d5166d1833e42d81b854374aa6e73f83a67a70e Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Tue, 27 Nov 2012 23:30:45 +0000
+Subject: Fix a crash on 32bit systems
+
+The login-frequency property of the User interface is defined
+as uint64 type. Therefore, when setting it with g_object_set,
+a 64bit value is collected, and passing an int might lead to
+bad things.
+https://bugs.freedesktop.org/show_bug.cgi?id=57343
+---
+diff --git a/src/daemon.c b/src/daemon.c
+index ed3a114..4d6f3ab 100644
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -207,7 +207,7 @@ daemon_local_user_is_excluded (Daemon *daemon, const gchar *username, const gcha
+ #ifdef HAVE_UTMPX_H
+
+ typedef struct {
+- int frequency;
++ guint64 frequency;
+ gint64 time;
+ GList *previous_logins;
+ } UserAccounting;
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD
index c09df7964..eb8be47cb 100644
--- a/extra/accountsservice/PKGBUILD
+++ b/extra/accountsservice/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 171876 2012-11-22 07:10:34Z heftig $
+# $Id: PKGBUILD 172182 2012-12-01 09:02:32Z heftig $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=accountsservice
pkgver=0.6.29
-pkgrel=1
+pkgrel=2
pkgdesc="D-Bus interface for user account query and manipulation"
arch=(i686 x86_64 'mips64el')
url="http://www.freedesktop.org/software/accountsservice/"
@@ -11,13 +11,15 @@ license=('GPL3')
depends=('glib2' 'polkit' 'systemd')
makedepends=('intltool' 'gobject-introspection' 'vala')
options=('!libtool')
-source=($url/$pkgname-$pkgver.tar.xz more-exclusions.patch)
+source=($url/$pkgname-$pkgver.tar.xz more-exclusions.patch 32bit-crash.patch)
md5sums=('396c16f39711e24bb7cc685a170befa3'
- '1d5cf127e5aac407fe7c37b2f4fd503c')
+ '1d5cf127e5aac407fe7c37b2f4fd503c'
+ '2d364b82e7bb1df4aaae70e9ac5be0ba')
build() {
cd $pkgname-$pkgver
patch -Np1 -i ../more-exclusions.patch
+ patch -Np1 -i ../32bit-crash.patch
./configure --prefix=/usr --sysconfdir=/etc \
--libexecdir=/usr/lib/accountsservice \
--with-systemdsystemunitdir=/usr/lib/systemd/system \
diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD
index d80fa52f0..08ab767ba 100644
--- a/extra/brltty/PKGBUILD
+++ b/extra/brltty/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 171512 2012-11-18 10:27:37Z andyrtr $
+# $Id: PKGBUILD 172193 2012-12-02 04:25:56Z stephane $
# Maintainer:
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
pkgname=brltty
-pkgver=4.3
-pkgrel=7
+pkgver=4.4
+pkgrel=1
pkgdesc="Braille display driver for Linux/Unix"
arch=('i686' 'x86_64' 'mips64el')
url="http://mielke.cc/brltty"
@@ -19,8 +19,11 @@ install=brltty.install
source=(http://mielke.cc/$pkgname/releases/$pkgname-$pkgver.tar.gz
'brltty'
'brltty.conf'
- 'brltty.service')
-
+ 'brltty.service')
+md5sums=('8ebe96efe679f5f6ccff08928fec5b26'
+ '831ebaf0c56091702929c68805d20c4f'
+ 'a8ab8b3dd059e96e1734bc9cdcf844fc'
+ '7acecd700b9f94d76fe4a6ad56cb0448')
build() {
cd "$srcdir/$pkgname-$pkgver"
./configure --prefix=/usr \
@@ -30,7 +33,6 @@ build() {
--with-screen-driver=a2 \
--enable-gpm \
--disable-java-bindings \
- --disable-caml-bindings \
PYTHON=/usr/bin/python2
make
@@ -44,7 +46,3 @@ package() {
install -D -m644 Documents/brltty.conf "$pkgdir/etc/brltty.conf"
install -D -m644 "$srcdir/brltty.service" "$pkgdir/usr/lib/systemd/system/brltty.service"
}
-md5sums=('5ada573f88df32b6150db3b9a620e20b'
- '831ebaf0c56091702929c68805d20c4f'
- 'a8ab8b3dd059e96e1734bc9cdcf844fc'
- '7acecd700b9f94d76fe4a6ad56cb0448')
diff --git a/extra/intel-tbb/PKGBUILD b/extra/intel-tbb/PKGBUILD
index 51dfef170..e98b0f201 100644
--- a/extra/intel-tbb/PKGBUILD
+++ b/extra/intel-tbb/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 170541 2012-11-08 12:12:44Z stephane $
+# $Id: PKGBUILD 172195 2012-12-02 04:41:05Z stephane $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Thomas Dziedzic < gostrc at gmail >
# Contributor: Denis Martinez <deuns.martinez AT gmail.com>
pkgname=intel-tbb
-pkgver=4.1_20120718
-pkgrel=2
+pkgver=4.1_20121003
+pkgrel=1
pkgdesc='High level abstract threading library'
arch=('i686' 'x86_64')
url='http://www.threadingbuildingblocks.org/'
license=('GPL')
depends=('gcc-libs')
-source=("http://threadingbuildingblocks.org/uploads/77/188/4.1/tbb${pkgver/\./}oss_src.tgz")
-sha1sums=('3fad942c867f032dc5ddeccd7ca19606eda7065d')
+source=("http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb${pkgver/\./}oss_src.tgz")
+sha1sums=('072333068fa278635582846eaaa22d51c0100e09')
build() {
cd "${srcdir}"/tbb${pkgver/\./}oss
diff --git a/extra/ntfs-3g_ntfsprogs/PKGBUILD b/extra/ntfs-3g_ntfsprogs/PKGBUILD
index d39d54e68..1dc642329 100644
--- a/extra/ntfs-3g_ntfsprogs/PKGBUILD
+++ b/extra/ntfs-3g_ntfsprogs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 171906 2012-11-23 08:19:20Z tomegun $
+# $Id: PKGBUILD 172190 2012-12-01 14:32:58Z dreisner $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Ronald van Haren <ronald.archlinux.org>
# Contributor: Thomas Bächler <thomas.archlinux.org>
@@ -35,6 +35,7 @@ package_ntfs-3g() {
mv "$pkgdir"/bin/* "$pkgdir"/usr/bin/
rm -rf "$pkgdir"/{s,}bin
+ rmdir "$pkgdir/lib"
cd "$pkgdir"/usr/bin
ln -s ntfs-3g mount.ntfs
diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD
index 406cb3c32..6dbc74148 100644
--- a/libre/iceweasel-i18n/PKGBUILD
+++ b/libre/iceweasel-i18n/PKGBUILD
@@ -9,7 +9,7 @@
# - Run 'make'. It will take care of everything else for you.
_debname=iceweasel
-_debver=17.0
+_debver=17.0.1
_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -20,7 +20,7 @@ pkgbase=iceweasel-i18n
pkgname=($(for lang in ${_langpacks[@]}
do echo $pkgbase-$lang | tr A-Z a-z
done))
-_pkgver=17.0
+_pkgver=17.0.1
pkgver=${_debver}.${_debrel}
pkgrel=1
@@ -56,91 +56,91 @@ package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() {
"
done
-md5sums=('aca195b6aa9da7fbf568c08f66f966f2'
- 'e026ffecfd999b9ec8a38f3f2f29f4b5'
- '4e1e3a700a7c64556fe7281447b2ee08'
- '68586be8b467b4faf8e0822817a8a844'
- '0855365b830c4558ec23b0976d258356'
- '0e4857a39eab45b03607f0a18d469be6'
- '3d47320eb012880e38344237cd2ee1ff'
- 'd37290ecae4792f97302347c2d9b72fa'
- 'ff8b22a9853a0876b42254dc856f8222'
- '1d57aefb5d8200756e5751b6b660ba69'
- 'b527326e74cb330a0e2ec36f47930e90'
- '8a4ad51e5a9328b3437a5b1dc0ecf613'
- 'c58a6d0ae9bc48d01775f91d84c8afda'
- '01ffe65230eaf9551ea45d6d2d607cdc'
- '735c3e03920964711b9914710fe37b56'
- 'e25a3627c72b4e7a52bf00ccc087aa69'
- 'f576d51ac7fa505133f75634af3a14dc'
- 'd82798c091826fcff1552240669bf72d'
- 'cdd5ec962ed5507eb63ff3cb42f77e19'
- '8ff7b9281ffecc76831315ce3423db93'
- 'e53f4816e34487e6c659dff373aae482'
- 'cf7793dfcbf18d97ffd7168228767da8'
- '20ca3aee8bf43c675f7fb160f5f3359e'
- '228e40322a1fcf6fed867fec81b7c702'
- 'a17b3619eeb977c11e5f99b527c26c12'
- '180b5a570d1117d0f08c7ca9f43e9796'
- 'c1a2dc0954ec3d58de0b46f9efb56c86'
- 'df546f876542bd474656fc27bfea8afe'
- 'fdb7d6212ed888759422222018289c27'
- 'af55d3b4ab09fefde72a14f2d869bedb'
- 'a0235aace986ccf2f66b8f7e3b7878af'
- '4550a84b0884a7eb2530031b8cf7bd13'
- '1a81ba0771c82680cb10182247503703'
- '99950e68df786e47b896e784bd749d53'
- '81f8ff7132d27e04ef18e743aeb7e6b5'
- 'bffdcadd6c0e44013eca8d3cb3ff4e91'
- '44726dde95fb92a9c96de3424784b420'
- 'e70e64366cb381b583e19945ec78f465'
- '38fcd722bc60540ecb347b52237595d2'
- 'dfcc1dad5e95a1460737c70ccd4b5735'
- '941183e99dc85e6b8a834a52f101784a'
- 'eb2e91b9991161891d039eb4c40a25a3'
- '7c509a226c72005e5c9bf4e83bb80abf'
- 'cf7ce1659ee0af3fd6e9fccf6b0b7d62'
- 'ab47d4c2d8ecf8c9a093529edc4cdd17'
- '236cfdaa476eabe1d89e5d03ae83c5f0'
- 'ab572cadb8b952aa0d165ff796f92084'
- '8c7396b7010b6afe8b1cc5625405762c'
- '2adac2f2c2bfc1216b3d7e3944e5a6c5'
- 'fc544cdd63ce46d72694f296b90e807d'
- '46ebea9850dd4f8b5bc8134b0e00fa88'
- '8459c0e2ee2ad97b8828b3ae458c7a30'
- '212ad5e037ae26e06a29e96076a46d88'
- '483f0bc2b12782d93aff4ebd6c9d72bc'
- '69331b072dc1978c7aedc05105b3dab7'
- '9c325dc249e935e32c1bf573a8bf8a03'
- 'dc065160d7d7109aca5e5abee88a38dd'
- '63e0f6e5123b976ba91679e4b0668117'
- '670301325560f01a65a1516c063ba0ab'
- 'bf5754aa9937ca01796724bad4128348'
- 'd37a9af438ede3c95c4147776c1881c7'
- '00b6aa1338665c1ddd830332eba3e869'
- 'fd6df56ae64208669b771cd44edbdf22'
- 'd28ba0c094d0ac6ca8839b6f24b8e36d'
- 'ddb04a9c43a0a7e3a410a56292abeab0'
- '195d2b735f34c04505ca68c0f614805a'
- '6fc7618c6bd4143a8f1e58a560b7a9b2'
- 'aa1558345b96e6cc3b0c9c22fe3540a8'
- '37a43a703b46f3275f960abd9852bae3'
- '523d2d66af36dbd862156fefd183169a'
- 'af4e4651a8e379d9ca151ae3180d4090'
- '79240b7df3c53d122ddf7c734e83fdfa'
- '4bc316dfd0cbb235e787f031155a70f4'
- 'e04f0b6cb1c79345a989feeaba6adba0'
- '4d294d9984a14c7f703a9e92a5144de9'
- 'b1d70ed8d43a3655c2134c7ee32552b3'
- '4b0decc563ef2f308cb76691e7a20ef6'
- 'eec9a1717554a85671d4971757cb302d'
- '588bb4c21d74f3db326ca527dc9fe593'
- '704173008a109a4ca888bce6abdd1ea0'
- '8c230dd567c576ca9e2d7cd40923623c'
- '6dd510df2583839646268121db4ee517'
- '2b915a4d899364934bc04e3ffe693279'
- '3ac196603d06fa52746c56b431f0778d'
- '90ff7e2af56d59cefb941043e6bcd5d5'
- '77a39f2723940c6312798c65dbb602dc'
- 'd7fe6dded2ac3aa1dc697e3b46c8d4d5'
- 'feff9895b8d7678e208947c40c7f53e0') \ No newline at end of file
+md5sums=('c99d7605c0e0bb0d77e71cd54f305a9a'
+ '1f4aeabf6c28fcf6539d13f65f8b366b'
+ 'cb9cc5f721d81442f1a93d134054f23c'
+ 'f926850d2071114f4ba719230ce43168'
+ '8c414a4f8d6d137dcca41b203fce4d0c'
+ 'a16081e4da9daf6df5f6fcce2000cec1'
+ '88dd4c5837485acea83e97f3cb4f1e31'
+ '8751f0a634656ba973c53f96d1fa34e1'
+ 'a3905a8a62c0b5ba4c11fee49ad6d184'
+ '740667ba651f0562b45bbfe63b8ec84e'
+ '85a7a4de61e5546487dae32849ae63f2'
+ '3d00ad2734c890930441d6cd919f11c8'
+ '80a49422e0973ed8d6fd7920cf0a4379'
+ '30ce51ca764b091c59df5c08e35e8a7f'
+ '3fdbb51a5cbea3f6a7c43534a8c67d5a'
+ '1eacf81985d9993b2b94f98fd4c453e0'
+ 'ccd6c210bf596909137c4159580042eb'
+ '688c3eeca95418703bf6c2cb0dbe18d0'
+ '3830cab7a1b48890588cfbeb42444a22'
+ '6924436432149b668e14c3595602af79'
+ 'ae6007384d85dbd14fbe6496e0b9e47b'
+ '3859dac30bf0ec9d49419c83b116407e'
+ '4c200fc11efb425ba1ed0c6254f323a5'
+ '200f856b50a7485a1d5447cbf8dee77c'
+ '5b8d0c552c0ca7abb48ef4e94908edd2'
+ 'c6dde21438789ccf4c666afc22ee713c'
+ 'b234e98c5155fb597fa6f5b1242492ec'
+ '5abfc72599632a0ac85f18b4f706ee71'
+ 'a78698a63ef66d5532601f76f48613c3'
+ 'cca18bf0e95da80578d1e71a7592a545'
+ '9213e16598b0595710583956fa95dfff'
+ '120a4a00c1775a8445d35266b3157112'
+ 'cf94d425550530b34e355ed445618626'
+ 'dbf451ef9ecf1816973ac4dffe7e2b8e'
+ '87a12e25b99886ac25cb0d9f0ca201ad'
+ '0efff47ab838fd320c710ffd46ee3a57'
+ '28e5d445e7a91ddd64d50478b05edb51'
+ '770dcdf1a8d6d2db64dadb6e4f6149fb'
+ '7732b021cdf73ace33cb41609b327f3d'
+ 'ac79148f7bbdeff056d10cf0542f6ea0'
+ '4718bff38f0a6c8ec7b41df148255f34'
+ '2edcd565c19828e3d4a2da19f8529edd'
+ '531c54a91d509e768b55bfd88a96a527'
+ 'c8a4d346560350fd45533e52c0e6a15e'
+ '707d055b9d86ba16b2a44376a6cf3fb9'
+ '66b2b23c7e16840554521c748a22d083'
+ '61e53be2eeb528742c19d3a13252a961'
+ '89c23536240f86a776fb62728297e13d'
+ '535f68d0cfa4dee9df0cddbee42a4c94'
+ '7c91dc4f2bbcdac2f8547caad24516ea'
+ '4476b94e676b3cfb309f972f7c42da1b'
+ '792700b40ba53de7de5b48187b604b29'
+ '500861d2d8bebc85596a3ee343adb75e'
+ 'b2f5d243b28a9137189b6fa001c0207e'
+ 'a36a7b1785532e659d3b972e4e767f45'
+ '46509bb591bf54b6fed025814bfc11bf'
+ '715a3f8c2fcdab17b24ce61f55c49183'
+ '658226211d66a724d0335a173ef8512f'
+ 'ecb41c7536c95cf2ca118d7ab6b7d357'
+ '3b832ba3a5d1543809395171e5a105f6'
+ '46380a60795095514004bc19c512e1c5'
+ 'fba979124cd393f1164a59e3b9183ccc'
+ 'db0e3b1146b0350e23e35958ee896aa5'
+ '665140babab027228eb195b6c0e83d4e'
+ 'e71a740bfc52d25968f8e2c4c1896897'
+ '47bd00559728578bfc257b80c72ce393'
+ '0b77be5ee8a66f5b819f9bf032f1b744'
+ '38df23959bd6940a82e78f76a00cc973'
+ 'b6c74d7b9cf5f6722c661bdba78c3769'
+ '481db49b914f33d6c594ecebbc291e4c'
+ '6a680e3aa71a39a1d59f877535eb7bbc'
+ '9ee935f09dc89b42db9ad8db3473717d'
+ 'e9ad600f21766465aed4ae8473290077'
+ 'b70d217d69692ea3fb26e87fa468f4eb'
+ '32b73226e95ae47dc11a554a7208d960'
+ '5b78c67c024c683f4c0f1bc9931a2b28'
+ 'f7a347a3d5679d82340d227474de938f'
+ '2939f738602daee17e63e14374db86be'
+ '73bead055152cd4885b9834691c9066a'
+ '722a0d2212060e2044cbac859db3e063'
+ '8f259efea0bf1b67fd4b4dae492e2e00'
+ '03c2a59eab8ef4ad3687b91c07f96165'
+ '726317125b44225273307235f609d341'
+ 'b75b729e9ab3ff9a908115ab520339a9'
+ 'cd696e70fdb4f5ab9d50040abea46b82'
+ 'cdd2dba79e929e6585799d7f3f7fa7d4'
+ '0b611a362d7e566805c2df474ff407b6'
+ 'de6037c0a65e7b86e0929637156ba587') \ No newline at end of file
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index fe987068a..709f72608 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -14,7 +14,7 @@ _pgo=false
# We're getting this from Debian Experimental
_debname=iceweasel
-_debver=17.0
+_debver=17.0.1
_debrel=1
[ "$CARCH" == "mips64el" ] && { _debver=13.0.1; _debrel=2; }
_debrepo=http://ftp.debian.org/debian/pool/main/
@@ -23,7 +23,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=iceweasel
pkgname=iceweasel-libre
pkgver=${_debver}.${_debrel}
-pkgrel=3
+pkgrel=1
if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
if $_pgo; then
@@ -53,12 +53,12 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
vendor.js
shared-libs.patch
Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-md5sums=('3e555026478026987753b4859ec91d3b'
- '9b07815d94b8190c780fac10009025b9'
+md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f'
+ '1bbf435ff33f9824de23c0b13fbfb452'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- '3956dd8d3c153c2d8a608065a6d522c0'
+ '1570f4402cd46ffffeb7e302b2fb285d'
'abf5ecb74caa857abb42bcfbb3442d9c'
'0d053487907de4376d67d8f499c5502b'
'52e52f840a49eb1d14be1c0065b03a93'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index c257f04fe..d0f392be3 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -165,15 +165,6 @@ diff -Naur iceweasel-14.0.1.orig/mobile/android/app/mobile.js iceweasel-14.0.1.o
/* preference for the locale picker */
pref("extensions.getLocales.get.url", "");
-@@ -259,7 +259,7 @@
- pref("dom.disable_window_find", true);
-
- pref("keyword.enabled", true);
--pref("keyword.URL", "");
-+pref("keyword.URL", "https://duckduckgo.com/html/?q=");
-
- pref("accessibility.typeaheadfind", false);
- pref("accessibility.typeaheadfind.timeout", 5000);
diff -urN iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul iceweasel-13.0/layout/ipc/test-ipcbrowser.xul
--- iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul 2012-06-01 09:04:06.000000000 -0300
+++ iceweasel-13.0/layout/ipc/test-ipcbrowser.xul 2012-06-05 20:44:00.714006926 -0300
@@ -213,14 +204,14 @@ diff -urN iceweasel-14.0.1.orig/mobile/xul/app/mobile.js iceweasel-14.0.1/mobile
pref("keyword.enabled", true);
-pref("keyword.URL", "https://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=");
-+pref("keyword.URL", "https://duckduckgo.com/html/?q=");
++pref("keyword.URL", "");
pref("accessibility.typeaheadfind", false);
pref("accessibility.typeaheadfind.timeout", 5000);
diff -urN iceweasel-17.0.orig/mobile/locales/en-US/chrome/region.properties iceweasel-17.0/mobile/locales/en-US/chrome/region.properties
--- iceweasel-17.0.orig/mobile/locales/en-US/chrome/region.properties 2012-11-20 00:46:15.000000000 -0200
-+++ iceweasel-17.0/mobile/locales/en-US/chrome/region.properties 2012-11-28 12:42:29.600175386 -0200
-@@ -3,34 +3,10 @@
++++ iceweasel-17.0/mobile/locales/en-US/chrome/region.properties 2012-11-30 01:51:40.078652322 -0200
+@@ -3,34 +3,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# Default search engine
@@ -236,9 +227,8 @@ diff -urN iceweasel-17.0.orig/mobile/locales/en-US/chrome/region.properties icew
-browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s
-browser.contentHandlers.types.1.title=Google
-browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s
-+browser.search.order.1=DuckDuckGo HTML
-
- # Keyword URL (for location bar searches)
+-
+-# Keyword URL (for location bar searches)
-keyword.URL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
-
-# increment this number when anything gets changed in the list below. This will
@@ -257,7 +247,7 @@ diff -urN iceweasel-17.0.orig/mobile/locales/en-US/chrome/region.properties icew
-gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s
-gecko.handlerService.schemes.mailto.1.name=Gmail
-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
-+keyword.URL=https://duckduckgo.com/html/?q=
++browser.search.order.1=DuckDuckGo HTML
diff -urN iceweasel-14.0.orig/modules/libpref/src/init/all.js iceweasel-14.0/modules/libpref/src/init/all.js
--- iceweasel-14.0.orig/modules/libpref/src/init/all.js 2012-06-01 09:04:16.000000000 -0300
+++ iceweasel-14.0/modules/libpref/src/init/all.js 2012-06-05 20:55:41.569045759 -0300
@@ -266,7 +256,7 @@ diff -urN iceweasel-14.0.orig/modules/libpref/src/init/all.js iceweasel-14.0/mod
// The first character after a period must be alphabetic.
-pref("keyword.URL", "https://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL", "https://duckduckgo.com/html/?q=");
++pref("keyword.URL", "");
pref("keyword.enabled", false);
pref("general.useragent.locale", "chrome://global/locale/intl.properties");
pref("general.useragent.compatMode.firefox", false);
diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD
index e9cd2a447..1d485e6d5 100644
--- a/libre/xulrunner-libre/PKGBUILD
+++ b/libre/xulrunner-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 160908 2012-06-06 17:03:39Z ibiru $
+# $Id: PKGBUILD 172187 2012-12-01 13:09:58Z foutrelis $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
@@ -6,7 +6,7 @@
# We're getting this from Debian Experimental
_debname=iceweasel
-_debver=17.0
+_debver=17.0.1
_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -25,15 +25,17 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
"${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
mozconfig
mozilla-pkgconfig.patch
+ shared-libs.patch
Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
options=('!emptydirs')
conflicts=('xulrunner')
provides=("xulrunner=${_debver}")
replaces=('xulrunner-oss' 'xulrunner')
-md5sums=('3e555026478026987753b4859ec91d3b'
- '9b07815d94b8190c780fac10009025b9'
+md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f'
+ '1bbf435ff33f9824de23c0b13fbfb452'
'f2f4f4a573f549e8b494e33b3ad226bc'
'27271ce647a83906ef7a24605e840d61'
+ '52e52f840a49eb1d14be1c0065b03a93'
'65f68090d2a69b467bd2707d0c4ea3bd')
build() {
@@ -63,6 +65,7 @@ build() {
#fix libdir/sdkdir - fedora
patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch"
+ patch -Np1 -i "$srcdir/shared-libs.patch"
export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-${_debver::4}"
export PYTHON="/usr/bin/python2"
@@ -83,8 +86,6 @@ package() {
echo "/usr/lib/xulrunner-${_debver::4}" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf
chmod +x "${pkgdir}/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/xpt.py"
- sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/xpt.py"
- sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/header.py"
- sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/typelib.py"
- sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/xpidl.py"
+ sed -i 's|!/usr/bin/env python$|!/usr/bin/env python2|' \
+ "$pkgdir"/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/{xpt,header,typelib,xpidl}.py
}
diff --git a/libre/xulrunner-libre/shared-libs.patch b/libre/xulrunner-libre/shared-libs.patch
new file mode 100644
index 000000000..1f22b2b0d
--- /dev/null
+++ b/libre/xulrunner-libre/shared-libs.patch
@@ -0,0 +1,12 @@
+diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in
+--- mozilla-release.orig/browser/installer/Makefile.in 2012-07-17 16:19:29.480356991 +0000
++++ mozilla-release/browser/installer/Makefile.in 2012-07-17 17:32:41.250937293 +0000
+@@ -50,7 +50,7 @@
+ MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
+ # Some files have been already bundled with xulrunner
+ ifndef SYSTEM_LIBXUL
+-MOZ_PKG_FATAL_WARNINGS = 1
++MOZ_PKG_FATAL_WARNINGS = 0
+ endif
+
+ MOZ_NONLOCALIZED_PKG_LIST = \