From 1e444cb13eae9bf0bd034c517e29a46b880bf444 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Sun, 3 Jun 2012 11:26:37 -0300
Subject: kdelibs-libre-4.8.3-3: Disable HUPnP support to fix crashes
---
libre/kdelibs-libre/PKGBUILD | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
(limited to 'libre')
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index b031d3c90..9799d2b5e 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 159699 2012-05-26 07:40:36Z andrea $
+# $Id: PKGBUILD 160657 2012-06-03 10:02:50Z andrea $
# Maintainer: Andrea Scarpino
# Maintainer (Parabola): André Silva
@@ -6,7 +6,7 @@
_pkgname=kdelibs
pkgname=kdelibs-libre
pkgver=4.8.3
-pkgrel=2.1
+pkgrel=3
pkgdesc="KDE Core Libraries"
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
@@ -15,7 +15,7 @@ depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee'
'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit'
- 'media-player-info' 'herqq')
+ 'media-player-info')
makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
provides=("kdelibs=$pkgver")
replaces=('kdelibs-experimental' 'kdelibs')
@@ -53,7 +53,8 @@ build() {
-DSYSCONF_INSTALL_DIR=/etc \
-DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
-DKDE_DEFAULT_HOME='.kde4' \
- -DWITH_FAM=OFF
+ -DWITH_FAM=OFF \
+ -DWITH_HUpnp=OFF
make
}
--
cgit v1.2.3-54-g00ecf
From 132d363edbe7cc16f803a93e36818523fe7b4d63 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Mon, 4 Jun 2012 17:10:30 -0300
Subject: filesystem-2012.6-1: updating new version adding os-release
---
libre/filesystem/PKGBUILD | 28 ++++++++++++++--------------
libre/filesystem/os-release | 8 ++++++++
2 files changed, 22 insertions(+), 14 deletions(-)
create mode 100644 libre/filesystem/os-release
(limited to 'libre')
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 94d5390ab..d77f392b6 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 158070 2012-05-02 11:53:48Z tomegun $
+# $Id: PKGBUILD 160716 2012-06-04 15:02:22Z dreisner $
# Maintainer: Tom Gundersen
# Maintainer (Parabola): fauno
-# Contributor (Parabola): André Silva
+# Maintainer (Parabola): André Silva
pkgname=filesystem
-pkgver=2012.2
-pkgrel=5
+pkgver=2012.6
+pkgrel=1
pkgdesc='Base filesystem for Parabola'
arch=('any')
license=('GPL')
@@ -17,8 +17,8 @@ backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc
'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf'
'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue')
source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf'
- 'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'resolv.conf' 'shells'
- 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first')
+ 'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf'
+ 'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first')
md5sums=('772fe869b921698cc3e6fde73c4ac85a'
'6be47d893fd49b2e4a8c0e811b350861'
'13753e4e0964f3652b0cc60a28528bdf'
@@ -31,6 +31,7 @@ md5sums=('772fe869b921698cc3e6fde73c4ac85a'
'e5d8323a4dbee7a6d0d2a19cbf4b819f'
'7bc65f234dfb6abf24e7c3b03e86f4ff'
'd41d8cd98f00b204e9800998ecf8427e'
+ '0e145e18fea8fd190b30d45764f5707c'
'6f48288b6fcaf0065fcb7b0e525413e0'
'22518e922891f9359f971f4f5b4e793c'
'd2dc4e39dbdea75b107f91789e3274ab'
@@ -43,10 +44,11 @@ package() {
#
# setup root filesystem
#
- for d in bin boot dev etc home media mnt sbin usr var opt srv/http sys run; do
+ for d in boot dev etc home media mnt usr var opt srv/http run; do
install -d -m755 ${d}
done
install -d -m555 proc
+ install -d -m555 sys
install -d -m0750 root
install -d -m1777 tmp
# vsftpd won't run with write perms on /srv/ftp
@@ -54,7 +56,7 @@ package() {
# setup /etc
install -d etc/{ld.so.conf.d,skel,profile.d}
- for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf passwd resolv.conf securetty shells profile; do
+ for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf os-release passwd resolv.conf securetty shells profile; do
install -m644 ${srcdir}/${f} etc/
done
ln -s /proc/self/mounts etc/mtab
@@ -65,17 +67,15 @@ package() {
install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf
# setup /var
- for d in cache/man local opt log/old lib/misc empty run; do
+ for d in cache/man local opt log/old lib/misc empty; do
install -d -m755 var/${d}
done
- install -d -m1777 var/{tmp,spool/mail,lock}
+ install -d -m1777 var/{tmp,spool/mail}
# allow setgid games to write scores
install -d -m775 -g games var/games
ln -s spool/mail var/mail
- # not ready yet, needs possible change in pacman or other magic
- # is fixed by initscripts on next boot
-# ln -s ../run var/run
-# ln -s ../run/lock var/lock
+ ln -s ../run var/run
+ ln -s ../run/lock var/lock
#
# setup /usr hierarchy
diff --git a/libre/filesystem/os-release b/libre/filesystem/os-release
new file mode 100644
index 000000000..fe5f20b4f
--- /dev/null
+++ b/libre/filesystem/os-release
@@ -0,0 +1,8 @@
+NAME="Parabola"
+ID=parabola
+ID_LIKE=arch
+PRETTY_NAME="Parabola GNU/Linux-libre"
+ANSI_COLOR="1;35"
+HOME_URL="https://parabolagnulinux.org/"
+BUG_REPORT_URL="https://labs.parabola.nu/"
+
--
cgit v1.2.3-54-g00ecf
From ef720933b45c43f7f8ac4d2a0f2df2b83e908d99 Mon Sep 17 00:00:00 2001
From: Jorginho
Date: Tue, 5 Jun 2012 00:15:55 +0200
Subject: updating hplip-libre
---
libre/hplip-libre/PKGBUILD | 24 +++++++++++++++++++-----
libre/hplip-libre/hplip.install | 8 ++++++++
2 files changed, 27 insertions(+), 5 deletions(-)
(limited to 'libre')
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index 81b24e100..c2cec2e13 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,4 +1,5 @@
# $Id: PKGBUILD 144357 2011-12-05 03:44:51Z eric $
+# Maintainer: Tom Gundersen
# Maintainer : Rémy Oudompheng
# Contributor: Morgan LEFIEUX
# Contributor (Parabola): Jorge López
@@ -6,7 +7,7 @@
_pkgname=hplip
pkgname=hplip-libre
pkgver=3.12.4
-pkgrel=1
+pkgrel=4
pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
arch=('i686' 'x86_64')
url="http://hplipopensource.com"
@@ -28,24 +29,39 @@ provides=("${_pkgname}=${pkgver}")
options=('!libtool')
install=hplip.install
source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc})
+md5sums=('a063f76aa47edab55a3f31ff2558df07'
+ '2fe18f4091afb3dec200271dc7836128')
build() {
cd "$srcdir/$_pkgname-$pkgver"
export PYTHON=python2
+
find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.py
sed -i 's|python ./print.py|python2 ./print.py|' scan.py
sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
- sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py
+ sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py
sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
+ # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
+ # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+ # The hpcups driver does not use foomatic-rip
+ local i
+ for i in ppd/hpijs/*.ppd.gz ; do
+ rm -f ${i}.temp
+ gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+ gzip > ${i}.temp || return 1
+ mv ${i}.temp ${i}
+ done
+
export AUTOMAKE='automake --foreign'
autoreconf --force --install
./configure --prefix=/usr \
--enable-qt4 \
- --enable-foomatic-rip-hplip-install \
+ --disable-foomatic-rip-hplip-install \
--enable-foomatic-ppd-install \
--enable-hpcups-install \
--enable-new-hpcups \
@@ -70,5 +86,3 @@ package() {
mv "$pkgdir"/lib/udev "$pkgdir"/usr/lib/
rm "$pkgdir"/lib -r
}
-md5sums=('a063f76aa47edab55a3f31ff2558df07'
- '2fe18f4091afb3dec200271dc7836128')
diff --git a/libre/hplip-libre/hplip.install b/libre/hplip-libre/hplip.install
index cb0eaf8e8..74532cde3 100644
--- a/libre/hplip-libre/hplip.install
+++ b/libre/hplip-libre/hplip.install
@@ -8,3 +8,11 @@ NOTE
EOF
}
+
+post_upgrade() {
+ if [ "`vercmp $2 3.12.4-2`" -lt 0 ]; then
+ # important upgrade notice
+ echo "> Please remove your printer in cups, then add it"
+ echo "> back and reconfigure it to make it work again!"
+ fi
+}
--
cgit v1.2.3-54-g00ecf
From 72ce55a51818eaec322e402cd986b30f0d961223 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 5 Jun 2012 12:42:36 -0300
Subject: linux-libre-3.4.1-1: updating version
---
libre/linux-libre/PKGBUILD | 15 +++++++--------
libre/linux-libre/config.i686 | 4 +++-
libre/linux-libre/config.x86_64 | 6 ++++--
libre/linux-libre/linux-libre.install | 2 +-
4 files changed, 15 insertions(+), 12 deletions(-)
(limited to 'libre')
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index ae3f19ae1..8fc90c884 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -12,18 +12,17 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -
# pkgname=linux-custom # Build kernel with a different name
_kernelname=-LIBRE
_basekernel=3.4
-#_sublevel=6
-#pkgver=${_basekernel}.${_sublevel}
-pkgver=${_basekernel}
-_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver
-pkgrel=1.2
+_sublevel=1
+pkgver=${_basekernel}.${_sublevel}
+_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
makedepends=('xmlto' 'docbook-xsl')
options=('!strip')
source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
- #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
+ "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
# the main kernel config files
'config.i686' 'config.x86_64'
# standard config files for mkinitcpio ramdisk
@@ -35,7 +34,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'i915-fix-ghost-tv-output.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
- #'6d9d139e4b53802615833372728cc0e4'
+ '9b5bcbc2f77807f66a50d5e34d4ce42e'
'631bee7d8e6e125f859fc51200699685'
'54f6db6c3b747fbee10cb02460ba66f0'
'e49ac236dfeef709f91a3d993ea7b62c'
@@ -44,7 +43,7 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
'04b21c79df0a952c22d681dd4f4562df'
'9d3c56a4b999c8bfbd4018089a62f662'
'263725f20c0b9eb9c353040792d644e5'
- 'de092ff42e61e88a67f50c351c2ad7c0')
+ 'f70a4bf0ee00d8be680cfbd65459836d')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 0bea26739..a6e1a6310 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -411,6 +411,7 @@ CONFIG_X86_REBOOTFIXUPS=y
CONFIG_MICROCODE=m
# CONFIG_MICROCODE_INTEL is not set
# CONFIG_MICROCODE_AMD is not set
+CONFIG_MICROCODE_OLD_INTERFACE=y
CONFIG_X86_MSR=m
CONFIG_X86_CPUID=m
# CONFIG_NOHIGHMEM is not set
@@ -5177,7 +5178,8 @@ CONFIG_DELL_RBU=m
CONFIG_DCDBAS=m
CONFIG_DMIID=y
CONFIG_DMI_SYSFS=m
-# CONFIG_ISCSI_IBFT_FIND is not set
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
# CONFIG_GOOGLE_FIRMWARE is not set
#
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 8a4734dac..9f3698ac2 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.4.0-1 Kernel Configuration
+# Linux/x86_64 3.4.1-1 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -389,6 +389,7 @@ CONFIG_I8K=m
CONFIG_MICROCODE=m
# CONFIG_MICROCODE_INTEL is not set
# CONFIG_MICROCODE_AMD is not set
+CONFIG_MICROCODE_OLD_INTERFACE=y
CONFIG_X86_MSR=m
CONFIG_X86_CPUID=m
CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
@@ -4949,7 +4950,8 @@ CONFIG_DELL_RBU=m
CONFIG_DCDBAS=m
CONFIG_DMIID=y
CONFIG_DMI_SYSFS=m
-# CONFIG_ISCSI_IBFT_FIND is not set
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
# CONFIG_GOOGLE_FIRMWARE is not set
#
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 6a2a2795a..74143e1cd 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=
-KERNEL_VERSION=3.4.0-1.2-LIBRE
+KERNEL_VERSION=3.4.1-1-LIBRE
post_install () {
# updating module dependencies
--
cgit v1.2.3-54-g00ecf
From 421402c1b6f8cd3de57405c3025e44561c290c79 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 5 Jun 2012 12:52:18 -0300
Subject: linux-libre-3.4.1-1: fixing md5sums
---
libre/linux-libre/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'libre')
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 8fc90c884..219659c25 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -35,8 +35,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
'9b5bcbc2f77807f66a50d5e34d4ce42e'
- '631bee7d8e6e125f859fc51200699685'
- '54f6db6c3b747fbee10cb02460ba66f0'
+ '669c3f9d5c6a2109bad8e511287826c3'
+ '454231e14419e56a5281eb7bc6fde83e'
'e49ac236dfeef709f91a3d993ea7b62c'
'2967cecc3af9f954ccc822fd63dca6ff'
'8267264d9a8966e57fdacd1fa1fc65c4'
--
cgit v1.2.3-54-g00ecf
From bc8cf47612516f8680ddd3a48b17288deaeebdf0 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 5 Jun 2012 14:49:47 -0300
Subject: gstreamer0.10-bad-libre-0.10.23-2: updating version and adding
wildmidi dependency
---
libre/gstreamer0.10-bad-libre/PKGBUILD | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
(limited to 'libre')
diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD
index c27cf61f9..b74958e3c 100644
--- a/libre/gstreamer0.10-bad-libre/PKGBUILD
+++ b/libre/gstreamer0.10-bad-libre/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 153262 2012-03-12 17:29:57Z jgc $
+# $Id: PKGBUILD 160766 2012-06-05 08:51:20Z jgc $
# Maintainer: Jan de Groot
# Maintainer (Parabola): fauno
-# Contributor (Parabola): André Silva
+# Maintainer (Parabola): André Silva
pkgbase=gstreamer0.10-bad-libre
pkgname=('gstreamer0.10-bad-libre' 'gstreamer0.10-bad-libre-plugins')
pkgver=0.10.23
-pkgrel=1.2
+pkgrel=2
arch=('i686' 'x86_64')
license=('LGPL' 'GPL')
-makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg')
+makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg' 'wildmidi')
url="http://gstreamer.freedesktop.org/"
options=(!libtool !emptydirs)
source=(${url}/src/gst-plugins-bad/gst-plugins-bad-${pkgver}.tar.xz)
@@ -26,10 +26,15 @@ build() {
sed -e 's/gst sys ext/gst/' -i Makefile
}
+# Disable for now: 2 tests fail, one of them is because of not having a camera during build.
+#check() {
+# cd "${srcdir}/gst-plugins-bad-${pkgver}"
+# make check
+#}
+
package_gstreamer0.10-bad-libre() {
pkgdesc="GStreamer Multimedia Framework Bad Plugin libraries (gst-plugins-bad)"
depends=('gstreamer0.10-base>=0.10.34')
- groups=('gstreamer0.10-plugins')
provides=("gstreamer0.10-bad=$pkgver")
conflicts=('gstreamer0.10-bad')
replaces=('gstreamer0.10-bad')
@@ -40,7 +45,7 @@ package_gstreamer0.10-bad-libre() {
package_gstreamer0.10-bad-libre-plugins() {
pkgdesc="GStreamer Multimedia Framework Bad Plugins (gst-plugins-bad)"
- depends=("gstreamer0.10-bad-libre=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'libvdpau' 'soundtouch' 'libass' 'schroedinger' 'libvpx' 'gsm' 'rtmpdump' 'libgme' 'libsndfile' 'librsvg')
+ depends=("gstreamer0.10-bad-libre=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'libvdpau' 'soundtouch' 'libass' 'schroedinger' 'libvpx' 'gsm' 'rtmpdump' 'libgme' 'libsndfile' 'librsvg' 'wildmidi')
groups=('gstreamer0.10-plugins')
install=gstreamer0.10-bad-plugins.install
provides=("gstreamer0.10-bad-plugins=$pkgver")
--
cgit v1.2.3-54-g00ecf
From 0a3de2fc0660c75247b0c136ac58c10e6b543338 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 5 Jun 2012 17:11:22 -0300
Subject: linux-libre-lts-3.0.33-1: updating version
---
libre/linux-libre-lts/PKGBUILD | 12 ++++++------
libre/linux-libre-lts/config.i686 | 3 ++-
libre/linux-libre-lts/config.x86_64 | 3 ++-
libre/linux-libre-lts/linux-libre-lts.install | 2 +-
4 files changed, 11 insertions(+), 9 deletions(-)
(limited to 'libre')
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 3593442f9..6ca3d1e8b 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -9,9 +9,9 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE kerne
# pkgname=linux-custom # Build kernel with a different name
_kernelname=-LIBRE-LTS
_basekernel=3.0
-_sublevel=32
+_sublevel=33
pkgver=${_basekernel}.${_sublevel}
-_lxopkgver=${_basekernel}.31 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.32 # nearly always the same as pkgver
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
@@ -32,9 +32,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'ext4-options.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('5f64180fe7df4e574dac5911b78f5067'
- '1fc88c19baf04fbb37385712ad9c4d57'
- 'df7e69a7b238c6492b589cc2beb894d2'
- '2ef390e115d6ae1c074c30fec9258442'
+ '3076be33631914b638eb9f313dc17d08'
+ '9cfcf3807201ce44aa720571232a10ce'
+ '8bb5c5aa217202c3ac3798ba7798e07d'
'c072b17032e80debc6a8626299245d46'
'2967cecc3af9f954ccc822fd63dca6ff'
'8267264d9a8966e57fdacd1fa1fc65c4'
@@ -42,7 +42,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
'9d3c56a4b999c8bfbd4018089a62f662'
'263725f20c0b9eb9c353040792d644e5'
'f36222e7ce20c8e4dc27376f9be60f6c'
- 'bacdceaf5ce186cfe69dffc89cd246a0')
+ '9c4fed22ad8ea99a54d20c22a63ad3d7')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686
index 7094b2731..83bab0f8c 100644
--- a/libre/linux-libre-lts/config.i686
+++ b/libre/linux-libre-lts/config.i686
@@ -4998,7 +4998,8 @@ CONFIG_DELL_RBU=m
CONFIG_DCDBAS=m
CONFIG_DMIID=y
CONFIG_DMI_SYSFS=m
-# CONFIG_ISCSI_IBFT_FIND is not set
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
CONFIG_SIGMA=m
# CONFIG_GOOGLE_FIRMWARE is not set
diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64
index f7cd1263b..fa7be5e5b 100644
--- a/libre/linux-libre-lts/config.x86_64
+++ b/libre/linux-libre-lts/config.x86_64
@@ -4739,7 +4739,8 @@ CONFIG_DELL_RBU=m
CONFIG_DCDBAS=m
CONFIG_DMIID=y
CONFIG_DMI_SYSFS=m
-# CONFIG_ISCSI_IBFT_FIND is not set
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
CONFIG_SIGMA=m
# CONFIG_GOOGLE_FIRMWARE is not set
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 6cd9761a7..b6a6f731c 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.32-1-LIBRE-LTS
+KERNEL_VERSION=3.0.33-1-LIBRE-LTS
post_install () {
# updating module dependencies
--
cgit v1.2.3-54-g00ecf
From 04c8955a74d466f3642e94a8da2aecc23b7a7b0e Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 5 Jun 2012 18:21:59 -0300
Subject: iceweasel-13.0.1-1: updating version
---
libre/iceweasel-libre/PKGBUILD | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
(limited to 'libre')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 85ede7409..8d0c63f13 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -12,8 +12,8 @@ _pgo=false
# We're getting this from Debian Sid
_debname=iceweasel
-_debver=12.0
-_debrel=7
+_debver=13.0
+_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -50,9 +50,9 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
iceweasel-install-dir.patch
region.properties
vendor.js)
-md5sums=('b45f57bfe21b0e6db4f0683e794917cb'
- '08aa0a949d9cbb26116490f7878a62fe'
- 'd7ad1c025d2442427a06cc702906ef0d'
+md5sums=('e440446bb92dc1c0311346c68024590b'
+ 'cb8bfb543002a5d78db7e8661f9f87ec'
+ 'a9848e41461776bc4bf8d2de824b1204'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
--
cgit v1.2.3-54-g00ecf
From 36c538f1b0b84cc8fe8895553f9348ba68f1b09e Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 5 Jun 2012 22:11:10 -0300
Subject: iceweasel-libre-13.0.1-1: fixing issues
---
...Make-the-Reset-Firefox-feature-more-gener.patch | 271 +++++++++++++++++++++
libre/iceweasel-libre/PKGBUILD | 17 +-
libre/iceweasel-libre/libre.patch | 98 ++++----
3 files changed, 328 insertions(+), 58 deletions(-)
create mode 100644 libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
(limited to 'libre')
diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
new file mode 100644
index 000000000..4da03a569
--- /dev/null
+++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -0,0 +1,271 @@
+From: Mike Hommey
+Date: Tue, 5 Jun 2012 08:57:06 +0200
+Subject: Bug 756390 - Make the "Reset Firefox" feature more generic
+
+---
+ browser/components/migration/content/migration.js | 15 ++++++++++-----
+ browser/components/migration/content/migration.xul | 2 +-
+ .../migration/src/BrowserProfileMigrators.manifest | 2 +-
+ .../components/migration/src/FirefoxProfileMigrator.js | 2 +-
+ browser/components/migration/src/ProfileMigrator.js | 4 ++++
+ .../en-US/chrome/browser/migration/migration.dtd | 2 --
+ .../en-US/chrome/browser/migration/migration.properties | 11 +++++------
+ toolkit/content/aboutSupport.js | 8 ++++----
+ toolkit/content/jar.mn | 2 +-
+ toolkit/content/resetProfile.js | 6 ++----
+ toolkit/profile/nsIProfileMigrator.idl | 10 +++++++++-
+ toolkit/xre/nsAppRunner.cpp | 2 +-
+ 83 files changed, 394 insertions(+), 382 deletions(-)
+
+diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js
+index ffb0c34..442a5ff 100644
+--- a/browser/components/migration/content/migration.js
++++ b/browser/components/migration/content/migration.js
+@@ -314,7 +314,7 @@ var MigrationWizard = {
+ }
+
+ var bundle = document.getElementById("brandBundle");
+- // These strings don't exist when not using official branding. If that's
++ // These strings may not exist when not using official branding. If that's
+ // the case, just skip this page.
+ try {
+ var pageTitle = bundle.getString("homePageMigrationPageTitle");
+@@ -346,8 +346,8 @@ var MigrationWizard = {
+ case "chrome":
+ source = "sourceNameChrome";
+ break;
+- case "firefox":
+- source = "sourceNameFirefox";
++ case "self":
++ source = "brand";
+ break;
+ }
+
+@@ -357,8 +357,13 @@ var MigrationWizard = {
+ var oldHomePageURL = this._migrator.sourceHomePageURL;
+
+ if (oldHomePageURL && source) {
+- var bundle2 = document.getElementById("bundle");
+- var appName = bundle2.getString(source);
++ var appName;
++ if (source == "brand") {
++ appName = bundle.GetStringFromName("brandFullName");
++ } else {
++ var bundle2 = document.getElementById("bundle");
++ appName = bundle2.getString(source);
++ }
+ var oldHomePageLabel = bundle.getFormattedString("homePageImport",
+ [appName]);
+ var oldHomePage = document.getElementById("oldHomePage");
+diff --git a/browser/components/migration/content/migration.xul b/browser/components/migration/content/migration.xul
+index f8653b1..f3ac62a 100644
+--- a/browser/components/migration/content/migration.xul
++++ b/browser/components/migration/content/migration.xul
+@@ -76,7 +76,7 @@
+ #endif
+ #endif
+
+-
++
+
+
+
+diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/src/BrowserProfileMigrators.manifest
+index f49e481..e490ddf 100644
+--- a/browser/components/migration/src/BrowserProfileMigrators.manifest
++++ b/browser/components/migration/src/BrowserProfileMigrators.manifest
+@@ -3,4 +3,4 @@ contract @mozilla.org/toolkit/profile-migrator;1 {6F8BB968-C14F-4D6F-9733-6C6737
+ component {4cec1de4-1671-4fc3-a53e-6c539dc77a26} ChromeProfileMigrator.js
+ contract @mozilla.org/profile/migrator;1?app=browser&type=chrome {4cec1de4-1671-4fc3-a53e-6c539dc77a26}
+ component {91185366-ba97-4438-acba-48deaca63386} FirefoxProfileMigrator.js
+-contract @mozilla.org/profile/migrator;1?app=browser&type=firefox {91185366-ba97-4438-acba-48deaca63386}
++contract @mozilla.org/profile/migrator;1?app=browser&type=self {91185366-ba97-4438-acba-48deaca63386}
+diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js
+index 7b4a6e4..add5bc4 100644
+--- a/browser/components/migration/src/FirefoxProfileMigrator.js
++++ b/browser/components/migration/src/FirefoxProfileMigrator.js
+@@ -448,7 +448,7 @@ FirefoxProfileMigrator.prototype = {
+ ]),
+
+ classDescription: "Firefox Profile Migrator",
+- contractID: "@mozilla.org/profile/migrator;1?app=browser&type=firefox",
++ contractID: "@mozilla.org/profile/migrator;1?app=browser&type=self",
+ classID: Components.ID("{91185366-ba97-4438-acba-48deaca63386}")
+ };
+
+diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/src/ProfileMigrator.js
+index ea66675..fe4df10 100644
+--- a/browser/components/migration/src/ProfileMigrator.js
++++ b/browser/components/migration/src/ProfileMigrator.js
+@@ -51,6 +51,10 @@ ProfileMigrator.prototype = {
+ params);
+ },
+
++ canMigrate: function PM__canMigrate(aMigratorKey) {
++ return "@mozilla.org/profile/migrator;1?app=browser&type=" + aMigratorKey in Cc;
++ },
++
+ _toCString: function PM__toCString(aStr) {
+ let cstr = Cc["@mozilla.org/supports-cstring;1"].
+ createInstance(Ci.nsISupportsCString);
+diff --git a/browser/locales/en-US/chrome/browser/migration/migration.dtd b/browser/locales/en-US/chrome/browser/migration/migration.dtd
+index 86e9d0b..8df7864 100644
+--- a/browser/locales/en-US/chrome/browser/migration/migration.dtd
++++ b/browser/locales/en-US/chrome/browser/migration/migration.dtd
+@@ -13,8 +13,6 @@
+
+
+
+-
+-
+
+
+
+diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/browser/locales/en-US/chrome/browser/migration/migration.properties
+index 495ed78..0272654 100644
+--- a/browser/locales/en-US/chrome/browser/migration/migration.properties
++++ b/browser/locales/en-US/chrome/browser/migration/migration.properties
+@@ -4,7 +4,6 @@ profileName_format=%S %S
+ sourceNameIE=Internet Explorer
+ sourceNameSafari=Safari
+ sourceNameChrome=Google Chrome
+-sourceNameFirefox=Mozilla Firefox
+
+ importedBookmarksFolder=From %S
+ importedSearchURLsFolder=Keyword Searches (From %S)
+@@ -21,27 +20,27 @@ importedSafariBookmarks=From Safari
+ 2_ie=Cookies
+ 2_safari=Cookies
+ 2_chrome=Cookies
+-2_firefox=Cookies
++2_self=Cookies
+
+ 4_ie=Browsing History
+ 4_safari=Browsing History
+ 4_chrome=Browsing History
+-4_firefox=Browsing History
++4_self=Browsing History
+
+ 8_ie=Saved Form History
+ 8_safari=Saved Form History
+ 8_chrome=Saved Form History
+-8_firefox=Saved Form History
++8_self=Saved Form History
+
+ 16_ie=Saved Passwords
+ 16_safari=Saved Passwords
+ 16_chrome=Saved Passwords
+-16_firefox=Saved Passwords
++16_self=Saved Passwords
+
+ 32_ie=Favorites
+ 32_safari=Bookmarks
+ 32_chrome=Bookmarks
+-32_firefox=Bookmarks
++32_self=Bookmarks
+
+ 64_ie=Other Data
+ 64_safari=Other Data
+diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js
+index c86d80c..ff1ccfe 100644
+--- a/toolkit/content/aboutSupport.js
++++ b/toolkit/content/aboutSupport.js
+@@ -608,13 +608,13 @@ function populateResetBox() {
+ .getService(Ci.nsIToolkitProfileService);
+ let currentProfileDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
+
+-#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
+-#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
+-
+ // Only show the reset box for the default profile if the self-migrator used for reset exists.
+ try {
+ if (!currentProfileDir.equals(profileService.selectedProfile.rootDir) ||
+- !("@mozilla.org/profile/migrator;1?app=" + MOZ_BUILD_APP + "&type=" + MOZ_APP_NAME in Cc))
++ !("@mozilla.org/toolkit/profile-migrator;1" in Cc))
++ return;
++ let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator);
++ if (!("canMigrate" in pm) || !pm.canMigrate("self"))
+ return;
+ document.getElementById("reset-box").style.visibility = "visible";
+ } catch (e) {
+diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
+index 6f0d2d6..da7342b 100644
+--- a/toolkit/content/jar.mn
++++ b/toolkit/content/jar.mn
+@@ -38,7 +38,7 @@ toolkit.jar:
+ + content/global/mozilla.xhtml (mozilla.xhtml)
+ *+ content/global/nsDragAndDrop.js (nsDragAndDrop.js)
+ content/global/resetProfile.css (resetProfile.css)
+-* content/global/resetProfile.js (resetProfile.js)
++ content/global/resetProfile.js (resetProfile.js)
+ * content/global/resetProfile.xul (resetProfile.xul)
+ * content/global/treeUtils.js (treeUtils.js)
+ *+ content/global/viewZoomOverlay.js (viewZoomOverlay.js)
+diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js
+index 975a9ed..d8e46b1 100644
+--- a/toolkit/content/resetProfile.js
++++ b/toolkit/content/resetProfile.js
+@@ -6,12 +6,10 @@ Components.utils.import("resource://gre/modules/Services.jsm");
+
+ // based on onImportItemsPageShow from migration.js
+ function onResetProfileLoad() {
+-#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
+-#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
+ const MAX_MIGRATED_TYPES = 16;
+
+ var migratedItems = document.getElementById("migratedItems");
+- var bundle = Services.strings.createBundle("chrome://" + MOZ_BUILD_APP +
++ var bundle = Services.strings.createBundle("chrome://browser" +
+ "/locale/migration/migration.properties");
+
+ // Loop over possible data to migrate to give the user a list of what will be preserved. This
+@@ -21,7 +19,7 @@ function onResetProfileLoad() {
+ var itemID = Math.pow(2, i);
+ try {
+ var checkbox = document.createElement("label");
+- checkbox.setAttribute("value", bundle.GetStringFromName(itemID + "_" + MOZ_APP_NAME));
++ checkbox.setAttribute("value", bundle.GetStringFromName(itemID + "_self"));
+ migratedItems.appendChild(checkbox);
+ } catch (x) {
+ // Catch exceptions when the string for a data type doesn't exist because it's not migrated
+diff --git a/toolkit/profile/nsIProfileMigrator.idl b/toolkit/profile/nsIProfileMigrator.idl
+index e941336..5b264af 100644
+--- a/toolkit/profile/nsIProfileMigrator.idl
++++ b/toolkit/profile/nsIProfileMigrator.idl
+@@ -69,7 +69,7 @@ interface nsIProfileStartup : nsISupports
+ * @client Toolkit (Startup code)
+ * @obtainable service, contractid("@mozilla.org/toolkit/profile-migrator;1")
+ */
+-[scriptable, uuid(3df284a5-2258-4d46-a664-761ecdc04c22)]
++[scriptable, uuid(96d9ab66-082c-4a9e-82ad-f8c21b391342)]
+ interface nsIProfileMigrator : nsISupports
+ {
+ /**
+@@ -92,6 +92,14 @@ interface nsIProfileMigrator : nsISupports
+ * @note The startup code ignores COM exceptions thrown from this method.
+ */
+ void migrate(in nsIProfileStartup aStartup, in ACString aKey);
++
++ /**
++ * Returns whether a given migration type is supported.
++ *
++ * @param aKey Migrator key
++ * @returns whether the migrator key is supported.
++ */
++ bool canMigrate(in ACString aKey);
+ };
+
+ %{C++
+diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
+index 32eef5c..dbe1580 100644
+--- a/toolkit/xre/nsAppRunner.cpp
++++ b/toolkit/xre/nsAppRunner.cpp
+@@ -3561,7 +3561,7 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
+ if (gDoProfileReset) {
+ // Automatically migrate from the current application if we just
+ // reset the profile.
+- aKey = MOZ_APP_NAME;
++ aKey = "self";
+ pm->Migrate(&dirProvider, aKey);
+ // Set the new profile as the default after migration.
+ rv = SetCurrentProfileAsDefault(profileSvc, profD);
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 8d0c63f13..bc2066080 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -3,6 +3,7 @@
# Contributor: Figue
# Contributor (Parabola): fauno
# Contributor (Parabola): vando
+# Contributor (Parabola): André Silva
# Contributor (Arch): Jakub Schmidtke
# Thank you very much to the older contributors:
# Contributor: evr
@@ -49,17 +50,19 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
libre.patch
iceweasel-install-dir.patch
region.properties
- vendor.js)
+ vendor.js
+ Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
md5sums=('e440446bb92dc1c0311346c68024590b'
'cb8bfb543002a5d78db7e8661f9f87ec'
'a9848e41461776bc4bf8d2de824b1204'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- '64be2fab525189c285ee04495d628035'
+ '1c23b150a9c2eeb378f167a1dfa09d89'
'e529742c0a425648087bc3ce537fe4c5'
'f1c76e7e244257856a386ca2de69bdf0'
- '0d053487907de4376d67d8f499c5502b')
+ '0d053487907de4376d67d8f499c5502b'
+ '41ce105f0c1877fe22e0c0ec45e09565')
if [ "$_pkgname" != "$pkgname" ]; then
provides+=("$_pkgname=$pkgver")
@@ -71,6 +74,7 @@ dpkg-source() {
export QUILT_PATCHES=debian/patches
export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
export QUILT_DIFF_ARGS='--no-timestamps'
+ export DEBIAN_BRANDING_DIR="debian/branding"
mv mozilla-release "${_debname}-${_debver}"
mv debian "${_debname}-${_debver}"
cd "${_debname}-${_debver}"
@@ -78,6 +82,9 @@ dpkg-source() {
# Doesn't apply and seems unimportant
rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true
+# This patch doesn't works in some parts due that has patches for others locales languages, source code doesn't has it
+ rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true
+
quilt push -a
find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this?
cd ..
@@ -98,6 +105,10 @@ if [ $NOEXTRACT -eq 0 ]; then
patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
patch -Np1 -i "$srcdir/xulrunner-copy-stub.patch" # small fix
patch -Np1 -i "$srcdir/libre.patch"
+
+# Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+ patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch"
+
fi
cd "$srcdir/mozilla-build"
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index ecebbb3ce..7b4e6a395 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -1,13 +1,13 @@
-diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/browser/app/profile/firefox.js
---- mozilla-build/browser/app/profile/firefox.js.orig 2012-03-20 01:04:55.890545738 -0300
-+++ mozilla-build/browser/app/profile/firefox.js 2012-03-20 01:05:03.330545430 -0300
+diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.0/browser/app/profile/firefox.js
+--- mozilla-build.orig/browser/app/profile/firefox.js 2012-06-01 09:03:47.000000000 -0300
++++ mozilla-build/browser/app/profile/firefox.js 2012-06-05 19:53:08.847012282 -0300
@@ -64,11 +64,11 @@
// Preferences for AMO integration
pref("extensions.getAddons.cache.enabled", true);
pref("extensions.getAddons.maxResults", 15);
-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%");
-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&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%/firefox/search?q=%TERMS%");
+-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox");
-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
+pref("extensions.getAddons.get.url", "");
@@ -18,7 +18,7 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br
// Blocklist preferences
pref("extensions.blocklist.enabled", true);
-@@ -80,7 +80,7 @@
+@@ -92,7 +92,7 @@
pref("extensions.autoDisableScopes", 15);
// Dictionary download preference
@@ -27,7 +27,7 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br
// The minimum delay in seconds for the timer to fire.
// default=2 minutes
-@@ -200,7 +200,7 @@
+@@ -218,7 +218,7 @@
pref("extensions.update.interval", 86400); // Check for updates to Extensions and
// Themes every day
// Non-symmetric (not shared by extensions) extension-specific [update] preferences
@@ -36,7 +36,7 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br
pref("extensions.dss.enabled", false); // Dynamic Skin Switching
pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next
// restart.
-@@ -234,7 +234,7 @@
+@@ -252,7 +252,7 @@
// 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
// The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
pref("browser.startup.page", 1);
@@ -45,7 +45,7 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br
// This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
// this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
-@@ -324,7 +324,7 @@
+@@ -345,7 +345,7 @@
pref("browser.download.manager.resumeOnWakeDelay", 10000);
// search engines URL
@@ -54,7 +54,7 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br
// pointer to the default engine name
pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties");
-@@ -563,7 +563,7 @@
+@@ -593,7 +593,7 @@
pref("accessibility.typeaheadfind.flashBar", 1);
// plugin finder service url
@@ -63,21 +63,9 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br
// by default we show an infobar message when pages require plugins the user has not installed, or are outdated
pref("plugins.hide_infobar_for_missing_plugin", false);
-diff -urN iceweasel-9.0.1.orig/browser/base/content/syncSetup.js iceweasel-9.0.1/browser/base/content/syncSetup.js
---- iceweasel-9.0.1.orig/browser/base/content/syncSetup.js 2011-12-16 20:29:12.000000000 +0000
-+++ iceweasel-9.0.1/browser/base/content/syncSetup.js 2011-12-21 10:05:15.888062669 +0000
-@@ -59,7 +59,7 @@
- // Broader than we'd like, but after this changed from api-secure.recaptcha.net
- // we had no choice. At least we only do this for the duration of setup.
- // See discussion in Bugs 508112 and 653307.
--const RECAPTCHA_DOMAIN = "https://www.google.com";
-+const RECAPTCHA_DOMAIN = "https://www.duckduckgo.com";
-
- Cu.import("resource://services-sync/main.js");
- Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-diff -urN iceweasel-9.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-9.0.1/browser/locales/en-US/chrome/browser-region/region.properties
---- iceweasel-9.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-16 20:29:13.000000000 +0000
-+++ iceweasel-9.0.1/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-21 09:55:31.032062468 +0000
+diff -urN iceweasel-13.0.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-13.0/browser/locales/en-US/chrome/browser-region/region.properties
+--- mozilla-build.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-01 09:03:48.000000000 -0300
++++ mozilla-build/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-05 20:07:51.593611484 -0300
@@ -1,8 +1,8 @@
# Default search engine
-browser.search.defaultenginename=Google
@@ -98,9 +86,9 @@ diff -urN iceweasel-9.0.1.orig/browser/locales/en-US/chrome/browser-region/regio
# increment this number when anything gets changed in the list below. This will
# cause Firefox to re-read these prefs and inject any new handlers into the
-diff -urN iceweasel-9.0.1.orig/build/pgo/blueprint/elements.html iceweasel-9.0.1/build/pgo/blueprint/elements.html
---- iceweasel-9.0.1.orig/build/pgo/blueprint/elements.html 2011-12-16 20:29:13.000000000 +0000
-+++ iceweasel-9.0.1/build/pgo/blueprint/elements.html 2011-12-21 10:04:42.988062659 +0000
+diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/build/pgo/blueprint/elements.html
+--- mozilla-build.orig/build/pgo/blueprint/elements.html 2012-06-01 09:03:49.000000000 -0300
++++ mozilla-build/build/pgo/blueprint/elements.html 2012-06-05 20:37:22.059133787 -0300
@@ -143,7 +143,7 @@
@@ -110,10 +98,10 @@ diff -urN iceweasel-9.0.1.orig/build/pgo/blueprint/elements.html iceweasel-9.0.1
<abbr> abbr - extended text when mouseover.
-diff -urN iceweasel-9.0.1.orig/dom/ipc/test.xul iceweasel-9.0.1/dom/ipc/test.xul
---- iceweasel-9.0.1.orig/dom/ipc/test.xul 2011-12-16 20:29:17.000000000 +0000
-+++ iceweasel-9.0.1/dom/ipc/test.xul 2011-12-21 10:03:33.224062635 +0000
-@@ -301,6 +301,6 @@
+diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul
+--- mozilla-build.orig/dom/ipc/test.xul 2012-06-01 09:03:55.000000000 -0300
++++ mozilla-build/dom/ipc/test.xul 2012-06-05 20:40:59.453890004 -0300
+@@ -294,6 +294,6 @@
oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
@@ -121,9 +109,9 @@ diff -urN iceweasel-9.0.1.orig/dom/ipc/test.xul iceweasel-9.0.1/dom/ipc/test.xul
+
-diff -urN iceweasel-9.0.1.orig/layout/ipc/test-ipcbrowser.xul iceweasel-9.0.1/layout/ipc/test-ipcbrowser.xul
---- iceweasel-9.0.1.orig/layout/ipc/test-ipcbrowser.xul 2011-12-16 20:29:28.000000000 +0000
-+++ iceweasel-9.0.1/layout/ipc/test-ipcbrowser.xul 2011-12-21 10:03:06.408062626 +0000
+diff -urN iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul iceweasel-13.0/layout/ipc/test-ipcbrowser.xul
+--- mozilla-build.orig/layout/ipc/test-ipcbrowser.xul 2012-06-01 09:04:06.000000000 -0300
++++ mozilla-build/layout/ipc/test-ipcbrowser.xul 2012-06-05 20:44:00.714006926 -0300
@@ -69,6 +69,6 @@
label="setViewportScale"/>
@@ -132,16 +120,16 @@ diff -urN iceweasel-9.0.1.orig/layout/ipc/test-ipcbrowser.xul iceweasel-9.0.1/la
+
-diff -urN iceweasel-9.0.1.orig/mobile/xul/app/mobile.js iceweasel-9.0.1/mobile/xul/app/mobile.js
---- mozilla-build/mobile/xul/app/mobile.js.orig 2012-03-20 01:02:30.300551777 -0300
-+++ mozilla-build/mobile/xul/app/mobile.js 2012-03-20 01:02:40.820551342 -0300
-@@ -220,13 +220,12 @@
+diff -urN iceweasel-13.0.orig/mobile/xul/app/mobile.js iceweasel-13.0/mobile/xul/app/mobile.js
+--- mozilla-build.orig/mobile/xul/app/mobile.js 2012-06-01 09:04:14.000000000 -0300
++++ mozilla-build/mobile/xul/app/mobile.js 2012-06-05 20:48:20.193241600 -0300
+@@ -221,13 +221,12 @@
/* preferences for the Get Add-ons pane */
pref("extensions.getAddons.cache.enabled", true);
pref("extensions.getAddons.maxResults", 15);
-pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/recommended/");
-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/search?q=%TERMS%");
+-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%");
-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/mobile/");
-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
@@ -155,8 +143,8 @@ diff -urN iceweasel-9.0.1.orig/mobile/xul/app/mobile.js iceweasel-9.0.1/mobile/x
/* preference for the locale picker */
pref("extensions.getLocales.get.url", "");
-@@ -239,7 +240,7 @@
- pref("privacy.popups.showBrowserMessage", true);
+@@ -247,7 +246,7 @@
+ pref("dom.disable_window_open_dialog_feature", true);
pref("keyword.enabled", true);
-pref("keyword.URL", "http://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=");
@@ -164,9 +152,9 @@ diff -urN iceweasel-9.0.1.orig/mobile/xul/app/mobile.js iceweasel-9.0.1/mobile/x
pref("accessibility.typeaheadfind", false);
pref("accessibility.typeaheadfind.timeout", 5000);
-diff -urN iceweasel-9.0.1.orig/mobile/locales/en-US/chrome/region.properties iceweasel-9.0.1/mobile/locales/en-US/chrome/region.properties
---- iceweasel-9.0.1.orig/mobile/locales/en-US/chrome/region.properties 2011-12-16 20:29:36.000000000 +0000
-+++ iceweasel-9.0.1/mobile/locales/en-US/chrome/region.properties 2011-12-21 09:54:17.560062443 +0000
+diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties iceweasel-13.0/mobile/locales/en-US/chrome/region.properties
+--- mozilla-build.orig/mobile/locales/en-US/chrome/region.properties 2012-06-01 09:04:14.000000000 -0300
++++ mozilla-build/mobile/locales/en-US/chrome/region.properties 2012-06-05 20:53:03.264432170 -0300
@@ -1,8 +1,8 @@
# Default search engine
-browser.search.defaultenginename=Google
@@ -187,9 +175,9 @@ diff -urN iceweasel-9.0.1.orig/mobile/locales/en-US/chrome/region.properties ice
# increment this number when anything gets changed in the list below. This will
# cause Firefox to re-read these prefs and inject any new handlers into the
-diff -urN iceweasel-9.0.1.orig/modules/libpref/src/init/all.js iceweasel-9.0.1/modules/libpref/src/init/all.js
---- iceweasel-9.0.1.orig/modules/libpref/src/init/all.js 2011-12-21 09:07:20.000000000 +0000
-+++ iceweasel-9.0.1/modules/libpref/src/init/all.js 2011-12-21 10:09:17.136062754 +0000
+diff -urN iceweasel-13.0.orig/modules/libpref/src/init/all.js iceweasel-13.0/modules/libpref/src/init/all.js
+--- mozilla-build.orig/modules/libpref/src/init/all.js 2012-06-01 09:04:16.000000000 -0300
++++ mozilla-build/modules/libpref/src/init/all.js 2012-06-05 20:55:41.569045759 -0300
@@ -47,7 +47,7 @@
// SYNTAX HINTS: dashes are delimiters. Use underscores instead.
// The first character after a period must be alphabetic.
@@ -199,9 +187,9 @@ diff -urN iceweasel-9.0.1.orig/modules/libpref/src/init/all.js iceweasel-9.0.1/m
pref("keyword.enabled", false);
pref("general.useragent.locale", "chrome://global/locale/intl.properties");
pref("general.useragent.compatMode.firefox", false);
-diff -urN iceweasel-9.0.1.orig/toolkit/locales/en-US/chrome/global-region/region.properties iceweasel-9.0.1/toolkit/locales/en-US/chrome/global-region/region.properties
---- iceweasel-9.0.1.orig/toolkit/locales/en-US/chrome/global-region/region.properties 2011-12-16 20:29:43.000000000 +0000
-+++ iceweasel-9.0.1/toolkit/locales/en-US/chrome/global-region/region.properties 2011-12-21 12:51:31.188066096 +0000
+diff -urN iceweasel-13.0.orig/toolkit/locales/en-US/chrome/global-region/region.properties iceweasel-13.0/toolkit/locales/en-US/chrome/global-region/region.properties
+--- mozilla-build.orig/toolkit/locales/en-US/chrome/global-region/region.properties 2012-06-01 09:04:20.000000000 -0300
++++ mozilla-build/toolkit/locales/en-US/chrome/global-region/region.properties 2012-06-05 20:58:59.068158482 -0300
@@ -4,10 +4,10 @@
pluginStartupMessage=Starting Plugin for type
@@ -219,15 +207,15 @@ diff -urN iceweasel-9.0.1.orig/toolkit/locales/en-US/chrome/global-region/region
+plugindoc_label=gnuzilla.gnu.org
+plugindoc_url=http://www.gnu.org/s/gnuzilla/addons.html
---- iceweasel-10.0.orig/browser/locales/generic/profile/bookmarks.html.in 2012-02-07 15:40:34.279657460 -0300
-+++ iceweasel-10.0/browser/locales/generic/profile/bookmarks.html.in 2012-02-07 15:40:19.226324812 -0300
-@@ -11,13 +11,13 @@
+diff -urN iceweasel-13.0.orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-13.0/browser/locales/generic/profile/bookmarks.html.in
+--- mozilla-build.orig/browser/locales/generic/profile/bookmarks.html.in 2012-06-01 09:03:48.000000000 -0300
++++ mozilla-build/browser/locales/generic/profile/bookmarks.html.in 2012-06-05 21:03:38.239300038 -0300
+@@ -11,13 +11,12 @@
@bookmarks_toolbarfolder@
@bookmarks_toolbarfolder_description@
-
- @getting_started@
-+
- ConnochaetOS
-+
- Parabola
++
- Parabola GNU/Linux-libre
@firefox_heading@
--
cgit v1.2.3-54-g00ecf
From c8c4a569ec440eba905cd7b95c2c630d0e0db577 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 5 Jun 2012 22:14:39 -0300
Subject: iceweasel-libre-13.0.1-1: fixing issues
---
libre/iceweasel-libre/PKGBUILD | 1 -
1 file changed, 1 deletion(-)
(limited to 'libre')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index bc2066080..3875bbc3d 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -74,7 +74,6 @@ dpkg-source() {
export QUILT_PATCHES=debian/patches
export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
export QUILT_DIFF_ARGS='--no-timestamps'
- export DEBIAN_BRANDING_DIR="debian/branding"
mv mozilla-release "${_debname}-${_debver}"
mv debian "${_debname}-${_debver}"
cd "${_debname}-${_debver}"
--
cgit v1.2.3-54-g00ecf
From e6d9e255ac142fcebe9ee82d21d6e13db0a5c692 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 6 Jun 2012 00:41:19 -0300
Subject: iceweasel-i18n-13.0.1-1: updating version
---
libre/iceweasel-i18n/PKGBUILD | 174 +++++++++++++++++++++---------------------
1 file changed, 87 insertions(+), 87 deletions(-)
(limited to 'libre')
diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD
index b03b8196b..8e03cb882 100644
--- a/libre/iceweasel-i18n/PKGBUILD
+++ b/libre/iceweasel-i18n/PKGBUILD
@@ -9,12 +9,12 @@
# - Run 'make'. It will take care of everything else for you.
_debname=iceweasel
-_debver=12.0
-_debrel=7
+_debver=13.0
+_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-_langpacks=(af ak ar as ast be bg bn-BD bn-IN br bs ca csb cs cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW zu)
+_langpacks=(af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW zu)
pkgbase=iceweasel-i18n
pkgname=($(for lang in ${_langpacks[@]}
@@ -56,87 +56,87 @@ package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() {
"
done
-md5sums=('5ff63ad5c05d6d1b6602ad5741a0ebbe'
- 'ba39d79b5d311942e638668e2e4ed2c9'
- '7f090255a9fe67dd690659ee174ee7a8'
- '4c6bd176a604e52c72d9d879aa16ef92'
- '2a5589be415e0fe395c16d59cdc7c91a'
- '9e7908cee8a30ca2514bfb30ad8a73a1'
- '19d7de55b66a939400384d5ff463b6e8'
- 'd9270f14e3119d6395345a1e211ae6be'
- '3becb7d177c66b261a21af21b7ec9cb5'
- '68758f2d56daa04c456b53852b811ae6'
- 'c128c138f022a1d81313fcbfa332dfe3'
- 'af0f6166f137fcd886e39e6f09c6bdf1'
- 'fea6cbd83d51a6c07b36ff33ffc0dd64'
- 'cf2c157ee82b06ca7d10fed9f0c3e71a'
- '85816cd36489cbee7e3ac8ebde0f6217'
- 'a34727f3cb2e32133a280978dc354b01'
- 'e31213480521b80600207fd67adda16a'
- '53b15a8b5ef4659bf67dc66ba946e2d2'
- '4fa7defd9b33e26231e3d236b0fd9d8c'
- '6788e9cdd0cc01b82d9a49800ce809ed'
- '26cbb5f5afe5fbaa26716a297b6b2a46'
- 'df5c334e257805af2ebdf685a643e706'
- '898a92607281f0263d670b4eb28ca224'
- '8aa4093d5f55587dcf951201301c5246'
- '1f4531c0c5f41a5095d811c107d276ac'
- '907f8599e1e4a342b3b19072661cc72e'
- '4db5b7af448becc5dd56e0a0cb9f908d'
- '0fb24139ee7ea7b7c340d31e9e58ae04'
- '7ff7ae7d1cd9a713dad7070c38dd4f42'
- 'f8f6385a9f6c1ecaa8d299ac72aa046e'
- '49c99a2a04144e6b33cafed7e33b47ea'
- 'bc9a4b47fd087ceefce8745a2cedd615'
- 'd7a4703936bfde284cc46d68dede421f'
- '615df26846bf62714466a7e1dd2a7e5e'
- '3c666f8153645a9d958753eb5e910ef2'
- '5217d26e9f4465db7433e77b7bbc5233'
- 'd3ffdf2ece6ca4d84fc0061371690b28'
- 'ccf85e0bc3be22824e1aa5ad99873248'
- 'e3bf49a5c040bf88583d5aa1b886eeea'
- 'a3c545319134c7febf801bb45722ab6f'
- '48c9d21d50e2b5ccb3c0d1a5f8b46bb5'
- 'df6a5bedd8f5684f8b8b3f6fc11e7ceb'
- 'f82373a67a80e8ab9c39678e3eb92353'
- '72084f9a0960ca6d3ac4a3b16b27e6e5'
- '66763631a58e597fbd0e69f73bf08c94'
- 'af8c4e38439d6ad799eb071a9e59742f'
- 'fba1d988df08fbd991b961a35ccfd56e'
- 'b1792658b67d09c6cb1b28c73253668a'
- 'd0398797d63b6ba71478cb6ea00bae35'
- '8cb0fa6026c0303b603969563b2ef911'
- 'f1d6d2f4a6a937f802040dc295e4e112'
- '0f57699e98cc355de7c3bdaccbbfb832'
- '7b86f62efab9124feda8793fda381a3a'
- '84f27e886c65c91a2aeb3cfc9bfddff4'
- 'b55de8bc0f7c5a24de8b53a2fea82478'
- '954f672c975029c170e7a77156e23557'
- 'f4758ff2db7be02c7498f635c17505a3'
- 'f24a6033051be1d638790dc5b1fa9198'
- '573df4582c8fd6941b044f40900d4c99'
- 'a413353b6d7b50659b681d76cdd8f776'
- '3a9147ba480b4aececbc70aa33fc9917'
- '37319736f6e25d70add33217eff30818'
- '2a4bc9f1c0b55f37e7fc92ef3ab8cf5d'
- '1fff9acffe3326545beb09c740d44b6b'
- '62d690efe261982864d3fa32e0239a96'
- '082d3648630d6598a39f677da29cff36'
- '228708e4516f88e68f829f1a9db61c57'
- '9cc41239414fdc754c3b793f1d7e3687'
- '760e3e973ba13d237eeec5242d2ac844'
- '631e269b9b67af6a5051c66fe83817c0'
- '0a87ae60bf970f9fa37b00d9682e2213'
- 'dc02816eb0a9abe9ebd92aa80b7d494a'
- '11d5de175fc96065d89d06474f6aaeeb'
- '5e0d0cfe252ad6209ca1fb5dba69e0f7'
- 'ddb128f54193c45b88640cf157420f3b'
- '53d1ecb05a575de362868efcfdd6043f'
- 'b7440790e099bc475f5e5fe18440dbe4'
- '6affd9862729c6c6697f96464c7475bc'
- 'd6ddadc8f0d32c2c3e601ae825881fac'
- '4dfb121fdaab263e650fe741f6d353c3'
- '45b4d8707e1bfd30e0b5393bb2e09533'
- '51d955380bd47c8c6709a6a47b54f600'
- '9f6818419d059157cb995a86892ad1f7'
- 'b7a7679359068b22efc4ba5902a7db39')
+md5sums=('e35b6b08fb314569174a12fb5d289f21'
+ 'f7b4e4e93fc8a34b38af201d3dc5665d'
+ '16b41103c5ae2325884d266a4fa6ef2e'
+ '86829f63977541a6f8b241b352891fc8'
+ '442b5518d9e91a577de05e5e7bd4c1a3'
+ '771de4f956802cd2199e9a153ad7e93b'
+ '55612034c6b9aed03268f9387f6af846'
+ '00a47e3c42377a060d3b73a015a53615'
+ '10b1bd554a5390b15e441ee631663052'
+ '54780d957f68d12c1a22a014b099f504'
+ 'dcdbb703a40aec783f62a994765a6298'
+ 'eddaa79e00457f6a8ecab407fac979b1'
+ '49b6f4928bc1d0411368809ba47580b3'
+ 'd0570b0084e5ec860626887e08ccdd90'
+ 'a19c12048002e057afc3d1ca5bae4ad9'
+ '0a492ec08fa304b4bf6d83a65b549ff9'
+ '76f67c9ee46feca9d18d2bb30014816f'
+ 'c3d9f562c28598307c740e4d4dd7348e'
+ '7567922156989828cd5c0e28a315e195'
+ 'df91ab90a3e1fef34f5848a9f6444468'
+ '7d8e45e6e3da8b7d4a1cf94548583262'
+ 'a661b6a102c5d98de9649d86cab880e0'
+ '51695205bfdddf982bb746cf4468ea1b'
+ '19de09fc98cde75bfa88c5274eff7cae'
+ 'a59ef12c791749a6eca60ee001617751'
+ '53cbe9dfb8b124d579fcabaf8dcfafce'
+ '44de34e679070df84e74dee75c70c544'
+ 'ee98508a21f6ff480f65924c1069965d'
+ '9827926ba6f4bba2858410b998fcb05b'
+ '0833c07b595ce249a384b1dda8f34963'
+ '0f3f0c3cf0813e91f570141b7e0212a4'
+ 'f6fd9346dc9a0c16058ad765a808809b'
+ '8284e350944633e38c86d3ce6b30a23e'
+ 'f67a900d496426c87478ad9bbc6ebbb0'
+ '3d67d29fcf015a4726a3b63c3e56efa6'
+ 'a4dd7eecd30aa8e5675239ecb2aac643'
+ '17e14278b65190304b174fe2cb7f0ba7'
+ '7919d3e268fbe9a9385ae61da767972a'
+ '8ca4ea94c9433fa93270d6942f7bbdca'
+ '163c71e0d58891e4e4812c6f410b34e3'
+ '3e343f4039ba87817cbe4209f0828da2'
+ 'c0993d2d4409635d5a5cc55a5dc22afa'
+ '9e9ebb4b90e64dc3bda9912ec68f5919'
+ 'bf8f1b84ea8dbea3b35bef433cf0f513'
+ 'f3c00bf1812f3f2ed940372100ef6baa'
+ 'b8789e2547a5c507297fd75d10c61e47'
+ '8cafb2f5804a985f521d0fd8c4ac38e6'
+ 'e74a59d6927b4f56804a412a70354be2'
+ '4d680519a811201ebf57944201c92522'
+ 'fe24a7f2620b8743604784bc56600b0f'
+ 'dfdb2c6b135ab98e2652c19136496c12'
+ '504fdcaf8730829d5c6d48b5fa8c89a8'
+ '459400531f8414c5b527a98cf5c854cd'
+ 'b24b7067ba0a293f12e23a80998de2b8'
+ '2ffebdb22377309bacfa4f35e78e53ee'
+ '7f32199165b0aeca6dffb43ddd4e7934'
+ '9cddba25c3042a29d43e7d986ae9a2fe'
+ 'b10c6b5ba44de100402a451fb0f87a0b'
+ '7ff013fd4b1eb6343d4d94c80697b0b8'
+ '24987ec9124fe40503d6218943f7f2c1'
+ '88ccdd6115de5e0e121aba11d8881f9d'
+ 'f53d6573ab123cc740edff0a0f051214'
+ 'bb8ebd84fbb6e85716633730986f8afb'
+ '308ab080c1a1978916d50277d7b1e170'
+ '6954762d9100f3f59f83a04833c6fc8b'
+ '11cbdb81af5cb5691b362a6fbb54522e'
+ '06df7af5c296be68853fbcaf6c11d354'
+ '321f8f412ad21213ee4bc9e5831e6061'
+ '4f7177bab3fb5e3f31f954e73403803f'
+ '6edd087d6c667739687426922961cdcf'
+ 'b3d74b6ceab4befa4c42d245cbdfdbe4'
+ '3f6df88d121bd305740014e1677328f8'
+ 'df58cc660670b906925aa22a5136aeaf'
+ '590727cebf9bdb599358b4b2d3ed40f9'
+ 'f4d0f0184e77f3ea9585296b820de2cd'
+ 'd074f5f4167585fc62ae802b7929669e'
+ 'd5810f44cc19b5629183da39b234f92c'
+ '777d7caca99c317c3e71f464f53983d6'
+ 'f9cfe429a139e450c3bb859d2224441c'
+ '468a90cc6648bd4ed7b39afc3e3dc253'
+ 'de53d77cc1cd0126de3f00ddc24afe08'
+ 'dddedd2b83b3083ce01ae25824a2eaf5'
+ '1e3122decb28bf37b630f84b05e02be8'
+ '9666c6e23b39f07d3b0b286e7514e3fd')
--
cgit v1.2.3-54-g00ecf
From 5cd5d2171660435cd34470577be150e2a01d1b5e Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 6 Jun 2012 03:42:52 -0300
Subject: texlive-core-libre: adding specific version on provides
---
libre/texlive-core-libre/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'libre')
diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD
index be42680ad..eb120c0ad 100644
--- a/libre/texlive-core-libre/PKGBUILD
+++ b/libre/texlive-core-libre/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=texlive-core-libre
_pkgname=texlive-core
pkgver=2011.24722
_revnr=${pkgver#2011.}
-pkgrel=1
+pkgrel=1.1
pkgdesc="TeX Live core distribution"
license=('GPL')
arch=(any)
@@ -21,7 +21,7 @@ optdepends=(
)
groups=('texlive-most')
conflicts=('tetex' 'texlive-latex3' 'texlive-core')
-provides=('tetex' 'texlive-latex3' 'texlive-core')
+provides=('tetex' 'texlive-latex3' "texlive-core=$pkgver")
replaces=('tetex' 'texlive-latex3' 'texlive-core')
url='http://tug.org/texlive/'
source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"
--
cgit v1.2.3-54-g00ecf
From 1c27f57b1a28074a50e05aaa73c47ef55127e318 Mon Sep 17 00:00:00 2001
From: Luke Shumaker
Date: Wed, 6 Jun 2012 09:19:56 -0400
Subject: rename libre/apache-ant{-libre,} and add more optional dependencies
---
libre/apache-ant-libre/PKGBUILD | 72 ------------------
libre/apache-ant-libre/ant_diagnostics.patch | 23 ------
libre/apache-ant-libre/apache-ant.csh | 2 -
libre/apache-ant-libre/apache-ant.sh | 3 -
libre/apache-ant/PKGBUILD | 108 +++++++++++++++++++++++++++
libre/apache-ant/apache-ant.csh | 3 +
libre/apache-ant/apache-ant.sh | 2 +
7 files changed, 113 insertions(+), 100 deletions(-)
delete mode 100644 libre/apache-ant-libre/PKGBUILD
delete mode 100644 libre/apache-ant-libre/ant_diagnostics.patch
delete mode 100644 libre/apache-ant-libre/apache-ant.csh
delete mode 100644 libre/apache-ant-libre/apache-ant.sh
create mode 100644 libre/apache-ant/PKGBUILD
create mode 100644 libre/apache-ant/apache-ant.csh
create mode 100644 libre/apache-ant/apache-ant.sh
(limited to 'libre')
diff --git a/libre/apache-ant-libre/PKGBUILD b/libre/apache-ant-libre/PKGBUILD
deleted file mode 100644
index 9f5ef223b..000000000
--- a/libre/apache-ant-libre/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# Maintainer (Arch): Paul Mattal
-# Contributor: Andrew Wright
-
-_pkgname=apache-ant
-pkgname=apache-ant-libre
-pkgver=1.8.2
-
-provides=("$_pkgname=$pkgver")
-replaces=("$_pkgname")
-conflicts=("$_pkgname")
-
-pkgrel=3
-pkgdesc="A java-based build tool"
-arch=('any')
-license=('APACHE')
-url="http://ant.apache.org/"
-depends=('java-environment')
-makedepends=('junit')
-optdepends=('junit: to have JUnit on the classpath in javac tasks')
-source=(http://archive.apache.org/dist/ant/source/${_pkgname}-${pkgver}-src.tar.bz2
- ${_pkgname}.sh ${_pkgname}.csh
- ant_diagnostics.patch)
-
-build() {
- # This directory is what becomes
- # http://archive.apache.org/dist/ant/binaries/${pkgname}-${pkgver}-bin.tar.bz2
- # which is what Arch uses
- rm -rf "${srcdir}"/${_pkgname}-${pkgver}-bin
- mkdir -p "${srcdir}"/${_pkgname}-${pkgver}-bin
-
- cd "${srcdir}"/${_pkgname}-${pkgver}
- ln -sf /usr/share/java/junit.jar lib/optional # JUnit isn't really optional
- sh build.sh -Ddist.dir="${srcdir}"/${_pkgname}-${pkgver}-bin dist
-}
-
-package() {
- # install profile.d script
- install -dm755 "${pkgdir}"/etc/profile.d
- install -m755 "${srcdir}"/${_pkgname}.{csh,sh} "${pkgdir}"/etc/profile.d/
-
- # Get the ANT_HOME env var
- source "${srcdir}"/${_pkgname}.sh
-
- cd "${srcdir}"/${_pkgname}-${pkgver}-bin
- install -dm755 "${pkgdir}"/${ANT_HOME}/{bin,lib}
-
- install -m644 ./lib/*.jar "${pkgdir}"/${ANT_HOME}/lib
- cp -Rp ./etc "${pkgdir}"/${ANT_HOME}
-
- # Do not copy Windows .bat/.cmd files
- find ./bin -type f -a ! -name \*.bat -a ! -name \*.cmd \
- -exec install -m755 {} "${pkgdir}"/${ANT_HOME}/bin \;
-
- # symlink to junit so it's on the javac build path for ant
- # matches behavior on ubuntu 9 and makes sense for compatibility
- # http://bugs.archlinux.org/task/15229
- ln -sf /usr/share/java/junit.jar "${pkgdir}"/usr/share/java/apache-ant/lib/
-
- # fix python2 path
- sed -i 's|/usr/bin/python|/usr/bin/python2|' "${pkgdir}"/usr/share/java/apache-ant/bin/runant.py
-
- # The license says the NOTICE file should be redistributed for derivative
- # works, so lets supply it.
- cd "${srcdir}"/${_pkgname}-${pkgver}
- install -dm755 "${pkgdir}"/usr/share/licenses/${_pkgname}
- install -m644 LICENSE NOTICE "${pkgdir}"/usr/share/licenses/${_pkgname}
-}
-
-md5sums=('0d9e108afcd15b820150b8085c96d2b1'
- '593ee6ebd9b8ec321534a028e686880f'
- '475b684eb8202c09cbb51496cd8ee1e0'
- 'cbaab423be40a6e63f0fde901b91eb50')
diff --git a/libre/apache-ant-libre/ant_diagnostics.patch b/libre/apache-ant-libre/ant_diagnostics.patch
deleted file mode 100644
index 38148b45c..000000000
--- a/libre/apache-ant-libre/ant_diagnostics.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/src/main/org/apache/tools/ant/Diagnostics.java
-+++ b/src/main/org/apache/tools/ant/Diagnostics.java
-@@ -179,7 +179,10 @@
- * @param clazz the class to get the information from.
- * @since Ant 1.8.0
- */
-- private static URL getClassLocation(Class clazz) {
-+ private static URL getClassLocation(Class clazz) {
-+ if (clazz.getProtectionDomain().getCodeSource() == null) {
-+ return null;
-+ }
- return clazz.getProtectionDomain().getCodeSource().getLocation();
- }
-
-@@ -241,7 +244,7 @@
- }
- Transformer transformer = null;
- try {
-- transformer = transformerFactory.newTransformer();
-+ transformer = transformerFactory.newTransformer();
- } catch (Exception e) {
- // ignore
- ignoreThrowable(e);
diff --git a/libre/apache-ant-libre/apache-ant.csh b/libre/apache-ant-libre/apache-ant.csh
deleted file mode 100644
index b6a6d5840..000000000
--- a/libre/apache-ant-libre/apache-ant.csh
+++ /dev/null
@@ -1,2 +0,0 @@
-setenv ANT_HOME /usr/share/java/apache-ant
-setenv PATH ${PATH}:${ANT_HOME}/bin
diff --git a/libre/apache-ant-libre/apache-ant.sh b/libre/apache-ant-libre/apache-ant.sh
deleted file mode 100644
index ab602fb28..000000000
--- a/libre/apache-ant-libre/apache-ant.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-export ANT_HOME=/usr/share/java/apache-ant
-export PATH=$PATH:$ANT_HOME/bin
-
diff --git a/libre/apache-ant/PKGBUILD b/libre/apache-ant/PKGBUILD
new file mode 100644
index 000000000..b6b429442
--- /dev/null
+++ b/libre/apache-ant/PKGBUILD
@@ -0,0 +1,108 @@
+# Maintainer: Luke Shumaker
+# Maintainer (Arch): Paul Mattal
+# Contributor: Andrew Wright
+
+pkgname=apache-ant
+pkgver=1.8.2
+
+provides=("apache-ant-libre=$pkgver")
+replaces=("apache-ant-libre")
+conflicts=("apache-ant-libre")
+
+pkgrel=4.2
+pkgdesc="A Java-based build tool"
+arch=('any')
+license=('Apache')
+url="http://ant.apache.org/"
+_mirror=http://archive.apache.org/dist
+source=($_mirror/ant/source/${pkgname}-${pkgver}-src.tar.bz2
+ ${pkgname}.sh ${pkgname}.csh)
+depends=('java-environment')
+
+# This list is adapted from https://ant.apache.org/manual/install.html#librarydependencies
+declare -A _opts
+_opts[junit]='to have JUnit on the classpath in javac tasks;/usr/share/java/junit.jar'
+_opts[xalan-java]=' task;/usr/share/java/xalan.jar'
+_opts[antlr2]=' task;/usr/share/java/antlr2.jar::antlr.jar'
+#_opts[java-bsf]='