diff options
Diffstat (limited to 'libre')
72 files changed, 1694 insertions, 1039 deletions
diff --git a/libre/acpi_call/PKGBUILD b/libre/acpi_call/PKGBUILD index f45d83e5c..3ad505a61 100644 --- a/libre/acpi_call/PKGBUILD +++ b/libre/acpi_call/PKGBUILD @@ -9,11 +9,11 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=4.0 - _archrel=28 + _archrel=30 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 - _archrel=17 + _archrel=21 _parabolarel=1 elif [[ ${_kernelname} == -grsec ]]; then _basekernel=3.19 diff --git a/libre/asciidoc/PKGBUILD b/libre/asciidoc/PKGBUILD new file mode 100644 index 000000000..8ef3debd3 --- /dev/null +++ b/libre/asciidoc/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 118968 2014-09-14 16:00:30Z bluewind $ +# Contributor (Arch): Chris Brannon <cmbrannon79@gmail.com> +# Contributor (Arch): Geoffroy Carrier <geoffroy@archlinux.org> +# Contributor (Arch): Dan McGee <dan@archlinux.org> +# Contributor (Arch): Jaroslaw Rosiek <philosoph@interia.pl> +# Contributor (Arch): Darwin Bautista <djclue917@gmail.com> +# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us> +# Maintainer (Arch): Florian Pritz <flo@xinu.at> +# Maintainer: André Silva <emulatorman@parabola.nu> + +pkgname=asciidoc +pkgver=8.6.9 +pkgrel=2.parabola1 +pkgdesc='Text document format for short documents, articles, books and UNIX man pages, without nonfree fop recommendation' +arch=('any') +url='http://www.methods.co.nz/asciidoc/' +license=('GPL') +depends=('python2' 'libxslt' 'docbook-xsl') +optdepends=('lilypond: music-filter' + 'imagemagick: music-filter (used in conjunction with lilypond)' + 'source-highlight: source-highlight-filter' + 'dblatex: pdf generation' + 'lynx: text generation' + 'w3m: text generation (alternative to lynx)') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('c59018f105be8d022714b826b0be130a') + +prepare() { + cd ${pkgname}-${pkgver} + + # python2 fix + for file in asciidocapi.py a2x.py asciidoc.py filters/music/music2png.py filters/latex/latex2png.py \ + filters/code/code-filter.py filters/graphviz/graphviz2png.py; do + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file + done + #sed -i -e 's_sys:python_sys:python2_g' -e 's_sys3:python_sys3:python2_g' xhtml11.conf + #sed -i 's_sys:python_sys:python2_g' xhtml11-quirks.conf + #sed -i -e 's/{python}/{python2}/g' \ + #-e 's#{language@python:py:#{language@python2:py:#' \ + #filters/source/source-highlight-filter.conf \ + #html5.conf xhtml11.conf xhtml11-quirks.conf + #sed -i -e "s#'python'#'python2'#g" filters/code/code-filter.py +} + +build() { + cd ${pkgname}-${pkgver} + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc +} + +package() { + cd ${pkgname}-${pkgver} + + make install DESTDIR=${pkgdir} + + install -Dm644 asciidocapi.py \ + ${pkgdir}/usr/lib/python2.7/site-packages/asciidocapi.py + + # fix FS#21579 - [asciidoc] 8.6.2-2 "asciidoc" table style doesn't work (mismatched python version) + #sed -i 's/python/python2/' \ + #${pkgdir}/etc/asciidoc/asciidoc.conf +} diff --git a/libre/atool/PKGBUILD b/libre/atool/PKGBUILD index dca366b88..b136ac05c 100644 --- a/libre/atool/PKGBUILD +++ b/libre/atool/PKGBUILD @@ -8,7 +8,7 @@ pkgname=atool pkgver=0.39.0 -pkgrel=3.parabola1 +pkgrel=3.parabola2 pkgdesc="A script for managing file archives of various types, without nonfree unace and unrar support" arch=('any') url="http://www.nongnu.org/$pkgname/" @@ -19,7 +19,6 @@ conflicts=("$pkgname-libre") optdepends=("bzip2: for using $pkgname with bzip2 compressed archives" "cpio: for using $pkgname with cpio archives" "gzip: for using $pkgname with gzip compressed archives" - "lha: for using $pkgname with lha, lharc and similar archives" "xz: for using $pkgname with lzma compressed archives" "lzop: for using $pkgname with lzop compressed archives" "p7zip: for using $pkgname with 7z archives" diff --git a/libre/bbswitch/PKGBUILD b/libre/bbswitch/PKGBUILD index b165aed0b..42b18c2a1 100644 --- a/libre/bbswitch/PKGBUILD +++ b/libre/bbswitch/PKGBUILD @@ -9,11 +9,11 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=4.0 - _archrel=30 + _archrel=32 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 - _archrel=8 + _archrel=10 _parabolarel=1 elif [[ ${_kernelname} == -grsec ]]; then _basekernel=3.19 diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD index 2accda59e..704831dcc 100644 --- a/libre/blender/PKGBUILD +++ b/libre/blender/PKGBUILD @@ -29,7 +29,7 @@ _pkgver=2.74 _depver=${_pkgver%[a-z]} [[ $_git == no ]] && pkgver=$_pkgver [[ $_git == yes ]] && pkgver=$_pkgver.git1.$_gitcommit -pkgrel=2.parabola1 +pkgrel=3.parabola1 epoch=16 _jpgver=1.5 _llvmver=3.5 diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD index 83b760053..d4939e203 100644 --- a/libre/calibre/PKGBUILD +++ b/libre/calibre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 132635 2015-05-02 09:40:48Z jelle $ +# $Id: PKGBUILD 133492 2015-05-15 10:21:09Z jelle $ # Maintainer (Arch): Jelle van der Waa <jelle@vdwaa.nl> # Maintainer (Arch): Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org> @@ -9,7 +9,7 @@ pkgname=calibre _pkgname=$pkgname-libre -pkgver=2.27.0 +pkgver=2.28.0 pkgrel=1.parabola1 pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives" arch=('i686' 'x86_64' 'mips64el') @@ -32,8 +32,8 @@ install=$pkgname.install mksource=("http://download.$pkgname-ebook.com/${pkgver}/$pkgname-${pkgver}.tar.xz") source=("https://repo.parabola.nu/other/${_pkgname}/${_pkgname}-${pkgver}.tar.xz" 'libre.patch') -mkmd5sums=('a41aa53d514b095fc269cefa69bf88e5') -md5sums=('4bcef173cc7775bc82c0d5e17c78f5eb' +mkmd5sums=('1837c57d4c115049c3749e03ca3378ba') +md5sums=('36639a9ebd87beab162135130bbfa628' '466d44b66e40a94ede272093ccd9ade4') mksource(){ diff --git a/libre/doublecmd/PKGBUILD b/libre/doublecmd/PKGBUILD index 77c199aef..3304cef44 100644 --- a/libre/doublecmd/PKGBUILD +++ b/libre/doublecmd/PKGBUILD @@ -1,5 +1,5 @@ # vim:set ft=sh: -# $Id: PKGBUILD 130194 2015-03-29 12:38:40Z idevolder $ +# $Id: PKGBUILD 133195 2015-05-10 18:42:31Z idevolder $ # Maintainer (Arch): BlackIkeEagle <ike DOT devolder AT gmail DOT com> # Contributor (Arch): (sirocco AT ngs.ru) # Maintainer: André Silva <emulatorman@parabola.nu> @@ -7,7 +7,7 @@ pkgbase=doublecmd _pkgbase=$pkgbase-libre pkgname=("$pkgbase-gtk2" "$pkgbase-qt") -pkgver=0.6.1 +pkgver=0.6.2 _helpver=0.6.0 pkgrel=1.parabola1 url="http://$pkgbase.sourceforge.net/" @@ -106,8 +106,8 @@ package_doublecmd-qt() { cp -a * "$pkgdir/usr/share/$pkgbase/doc/" } -mksha256sums=('f5e06488edc5e1d7c7e6f4affd9f205341e5158524bd903e3a4bd5fda5a17642') -sha256sums=('dfab32bb8991b51818e3af00aefbce5d3e91f1256916caa9aaf67746a558f973' +mksha256sums=('76564e927b9bf372dec585df6a65880cfd6ff06086f8c56e7bcf9bbde960e3bb') +sha256sums=('a20c8c8a8aafe1729b0491c3f6c01f5b871166deeaf5c4954373310ee0b2597a' 'd50a58f0e8c25c07720f2afd987213f330dfce268e2aef349d1da3de2eef1c39' '16560ad7403ffbee1800384768828e1fad924d03068c6248b68a78c393fc4e20' '610b470ce9961d851b5dcc93d5103e70ea6b3b719df404c7c49b2d11909b8951' diff --git a/libre/epdfview/PKGBUILD b/libre/epdfview/PKGBUILD index adef21e0e..a8e27d41f 100644 --- a/libre/epdfview/PKGBUILD +++ b/libre/epdfview/PKGBUILD @@ -1,6 +1,6 @@ -# $Id: PKGBUILD 105182 2014-02-02 12:39:48Z bpiotrowski $ -# Maintainer (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org> +# $Id: PKGBUILD 133276 2015-05-12 02:42:33Z kkeen $ # Maintainer (Arch): Kyle Keen <keenerd@gmail.com> +# Contributor (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor (Arch): schuay <jakob.gruber@gmail.com> # Contributor (Arch): Tom K <tomk@runbox.com> # Contributor (Arch): Thayer Williams <thayer@archlinux.org> @@ -9,7 +9,7 @@ pkgname=epdfview pkgver=0.1.8 -pkgrel=5.parabola1 +pkgrel=6.parabola1 pkgdesc='Lightweight PDF document viewer, without nonfree suggestions' url="http://freecode.com/projects/$pkgname" arch=('i686' 'x86_64' 'mips64el') @@ -22,11 +22,13 @@ install="$pkgname.install" source=(ftp://ftp.slackware.com/.1/blfs/conglomeration/$pkgname/$pkgname-$pkgver.tar.bz2 $pkgname-0.1.8-swap-the-blue-and-red-channel.patch $pkgname-0.1.8-glib2-headers.patch - $pkgname-0.1.8-modern-cups.patch) + $pkgname-0.1.8-modern-cups.patch + $pkgname-0.1.8-pictures.patch) md5sums=('e50285b01612169b2594fea375f53ae4' '7f9ea101a41f5b4e999fd024f423d41f' '2fffa9c7cd4c5f0744803591c2f162a3' - '5c2cf5612d2a7dfe6cf005b94aeb5ada') + '5c2cf5612d2a7dfe6cf005b94aeb5ada' + '60064c976f273d86d6254c71b583cf4d') prepare() { cd $pkgname-$pkgver @@ -37,7 +39,8 @@ prepare() { patch -p1 -i ../$pkgname-0.1.8-swap-the-blue-and-red-channel.patch patch -p1 -i ../$pkgname-0.1.8-glib2-headers.patch # FS#30116 - patch -p1 -i ../$pkgname-0.1.8-modern-cups.patch # FS#32511 + patch -p1 -i ../$pkgname-0.1.8-modern-cups.patch # FS#32511 + patch -p1 -i ../$pkgname-0.1.8-pictures.patch # FS#44936 } build() { diff --git a/libre/epdfview/epdfview-0.1.8-pictures.patch b/libre/epdfview/epdfview-0.1.8-pictures.patch new file mode 100644 index 000000000..5c42cb266 --- /dev/null +++ b/libre/epdfview/epdfview-0.1.8-pictures.patch @@ -0,0 +1,13 @@ +diff --git a/src/PDFDocument.cxx b/src/PDFDocument.cxx +index df5d75f..782f806 100644 +--- a/src/PDFDocument.cxx ++++ b/src/PDFDocument.cxx +@@ -616,7 +616,7 @@ PDFDocument::renderPage (gint pageNum) + #if defined (HAVE_POPPLER_0_17_0) + cairo_surface_t *surface = cairo_image_surface_create_for_data ( + renderedPage->getData (), +- CAIRO_FORMAT_RGB24, width, height, ++ CAIRO_FORMAT_ARGB32, width, height, + renderedPage->getRowStride ()); + cairo_t *context = cairo_create (surface); + cairo_save(context); diff --git a/libre/epiphany/PKGBUILD b/libre/epiphany/PKGBUILD index 791e2363d..32ac2da01 100644 --- a/libre/epiphany/PKGBUILD +++ b/libre/epiphany/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 234618 2015-03-24 11:52:11Z jgc $ +# $Id: PKGBUILD 239267 2015-05-12 21:57:11Z heftig $ # Maintainer (Arch): Jan de Groot <jgc@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> # Contributor: Márcio Silva <coadde@parabola.nu> pkgname=epiphany -pkgver=3.16.0 +pkgver=3.16.1 pkgrel=1.parabola1 install=epiphany.install pkgdesc="A GNOME web browser based on the WebKit rendering engine, with DuckDuckGo HTML support" @@ -18,7 +18,7 @@ options=('!emptydirs') groups=('gnome') url="https://wiki.gnome.org/Apps/Web" source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('e8471b492649ee2a5dbbb76ac9225f0131f95895c3962bc2842799e872d82cae') +sha256sums=('4e59a13c299d1ce726871958e1925b42f93d8c73bf1bb0decf79749be00e9666') prepare() { cd $pkgname-$pkgver diff --git a/libre/file-roller/PKGBUILD b/libre/file-roller/PKGBUILD index 5dd047e9b..6429a5434 100644 --- a/libre/file-roller/PKGBUILD +++ b/libre/file-roller/PKGBUILD @@ -1,16 +1,19 @@ -# $Id: PKGBUILD 236427 2015-04-14 01:29:45Z heftig $ +# $Id: PKGBUILD 239484 2015-05-17 10:06:23Z heftig $ # Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor (Arch): Jan de Groot <jgc@archlinux.org> pkgname=file-roller -pkgver=3.16.1 -pkgrel=1.parabola1 +pkgver=3.16.2 +pkgrel=2.parabola1 pkgdesc="Create and modify archives, with unar support included and nonfree unace recommendation removed" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'libarchive' 'file' 'json-glib' 'libnotify' 'p7zip' 'unar') +depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'libarchive' 'file' 'json-glib' 'libnotify' 'p7zip' + 'zip' 'unzip') makedepends=('intltool' 'pkg-config' 'libnautilus-extension' 'itstool' 'docbook-xsl') -optdepends=('lrzip: lrzip archive support') +optdepends=('libarchive: better RAR archive support' + 'lrzip: lrzip archive support' + 'cdrkit: ISO image support') groups=('gnome-extra') replaces=("${pkgname}-libre" "${pkgname}-parabola") conflicts=("${pkgname}-libre" "${pkgname}-parabola") @@ -18,7 +21,7 @@ options=('!emptydirs') install=file-roller.install url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('d0e3cf1af1bc30e29e6bbf9444fed859092e999bc4686541c021d6c1f6a58689') +sha256sums=('60897ff24d4822395a227b62811c3b8768b701844961e93303d6d6d9463d7e3f') build() { cd $pkgname-$pkgver diff --git a/libre/gnome-boxes/PKGBUILD b/libre/gnome-boxes/PKGBUILD index e253e733f..6a66da448 100644 --- a/libre/gnome-boxes/PKGBUILD +++ b/libre/gnome-boxes/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 131333 2015-04-14 01:31:01Z heftig $ +# $Id: PKGBUILD 133347 2015-05-12 21:58:44Z heftig $ # Maintainer (Arch): Balló György <ballogyor+arch at gmail dot com> # Contributor (Arch): Stefano Facchini <stefano.facchini@gmail.com> # Maintainer: André Silva <emulatorman@parabola.nu> # Contributor: Daniel Milewski <niitotantei@gmail.com> pkgname=gnome-boxes -pkgver=3.16.1 +pkgver=3.16.2 pkgrel=1.parabola1 pkgdesc="Simple GNOME 3 application to access remote or virtual systems, without nonfree system logos" arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ makedepends=('gobject-introspection' 'intltool' 'itstool' 'spice-protocol' 'vala install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::4}/$pkgname-$pkgver.tar.xz libre.patch) -sha256sums=('41efae4e6906c9f4b687d996cb07316e71dbdae6f619a497801ab26557e8480d' +sha256sums=('f5fecb1ba0769e2a3dbec31e6149fffbcbd59946e4dbab31fb3ec28a16e41995' '73ea08076d1e2608e27969fbf3127b5f45a659b2a8a89b04e349b519ce1d07ba') prepare() { diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD index b2a89bb28..476ea454e 100644 --- a/libre/icedove-l10n/PKGBUILD +++ b/libre/icedove-l10n/PKGBUILD @@ -4,8 +4,8 @@ epoch=1 _pkgbase=icedove pkgbase=$_pkgbase-l10n -_pkgver=31.6.0 -pkgver=31.6.0.deb1 +_pkgver=31.7.0 +pkgver=31.7.0.deb1 pkgrel=1 pkgdesc="Language pack for Debian ${_pkgbase^}." arch=('any') @@ -114,58 +114,58 @@ _package() { sha256sums=('49b419449431d8d64e20427a2e7105e3ac1ffc41e677a5f9a8eb276f5b82df4a' 'acc2cf95661be7cb8928fca89e08d0681685409ff2428e4e3d25baf1af427b38' - '469ba3e8822685b1b16131da5c50dd3b7372cc92a932f61569d9734daaea2eac' - '26bccf23d234e2ecef00733909bb432969c72cb74527adecc2ae59022b43ca97' - '95540e5f60de453d2281951beb7df8bd78ca91bc88437fcbbc6bb16844d31b90' - 'd7e08d395b768f1de63ced97518f8dbf6a747273264fae3d241cc0ae17a3e867' - '2e69e0b9d95a4018d658cf831dcfd7c8897534ce078d492a96a215dee9bb940c' - '4b7d3ef6c5df11058772483fe7945c3691e2cd8e8236963f4d19b23b4bb1f329' - '735bf46013112a854b3f283714bb0847c475cc068e63c6a3485f1631feae27bf' - '23619105a28386b9cd927f65fd59223a1378fc09134b00864cd21d119c762857' - '117129fbc2fdd5e6572942b600b1049189a7fd91852011c5c92c44bf042362a3' - '2d181ce84bf62a45118941f52e70a5987c610356dca4df48e0e88fc95b45da37' - '90608f577f5ef31c9003b6e2ea937dbf0435f3c06aa1eba561bbf8309568c90c' - 'fde93bbf9ff06e121870bf496418bc1703e0a2d0c5f27bcc3d130d2304921f67' - '11e68ba7462dc8df41a43a1e4c04f6865c8f46e96295abfd6366559204c89cd9' - 'b600ba8e2543eedc1833f6b936a70f25b9553dbc6835879d65dc14749e6db4fb' - '9017824378160bfe10d41bb2decbbc5a60a4db9199bff614c2b63cf40b3d310d' - 'd81f38f094ad0b962bc8fa6e11b57031748f3ca52c0ae0e335d704210e1f63f0' - 'a4f47a340b5623317756cd861705e96aba343a3175bc738bfdc72634859deed2' - '3a66f399789c0375d5e908a23ab306fb64eab8a4c35588112b0c83e027635987' - '38f52c3ae85908354964f816f3e83b12c26899b3112cd3de6d7c2672a35e86dc' - '0deaef241661c4fb34b159528297b7a922a5bacc103fd62e6d5fa73cb129a2d3' - '628c3682e167f87b50aed76ac02fe5e069015fb850eabdc79bfe41d0d2b239e0' - '41cd7af4039f99ba71d30c61764c2b5079c5b23aa6d8bbeb1d7eb5ba76d9915a' - '80788599aba0058d055e14c6931adfc5c3fcafdab2b3f82c765e82ba85cd6618' - 'f2b3dc16e00792dcb23da705428ac694510df99a2365eb92587d814015f91c33' - 'e866fdc131fdb5e384aa3905f41bea5498941a6cbfa73af9c933e3368869c30b' - '975596a745b826d545ab70c000663a3464b22edefb23e97a128d1d8f3c1c3020' - '99288ff622c443eb2701c5cc041705ecbb02afd99d59276c0aea04147f955335' - '746d6a546528e49a5f66a88704a9adfb2d6605dd1148de42ec1ce8427190176d' - '68ba2fd9b48b844d5d3470986ed344917a8021794fe67108c626e5945a2a1e7f' - '48adc76231ef558458a23d91c1055e22b3100412499344cb2f5f17ebbed96c88' - '282169e68a88f96299feaf19cf8c779817c29fa0f9e381691b912988562e3009' - 'f42996017694aa23dfa6d785f165461347cbefc1841ba841d403cc9a7e6cd9cd' - '71d61ba20fb60f7f57e0cc3633f6e4cdbff36fd5a55392646db97d162bd452f2' - '7a135a00b3106249147d5d023e17710266c9f32b0e55496d59387571164db82d' - 'ae50880cfada890136723afd10f7e4ff6edb958bc8cce8c34c9298d8e34d20d3' - '1b6b140130026c86e2f9aacc10fa6e642cee186c67c2a23b350e9bfea3ac828e' - 'b4da0cd42307642492a73ef30e652394927530471b1d71897ce6fc28c53f25d9' - 'ad3e92b8ec4caae1d2228e33e4c55ab46f7ece5eefb5ead17ff76c092fc75be3' - '1a67a4855350a6e13ffcd15da4a546bd830bc4cdb6cc69e75f769c04415c9e45' - 'b3a9c93f19297092f77c3018ccff6b863c333fc60edcbfd7baa503d290cbb091' - '3e511b47615ff491d99d524cdfea9aaf97ec6d2fa44080b32a512a7c8a9a54b9' - 'fbe0f58f8ad2bce7d9a589cdff6bd4f25661aaf8ee3984ea0ecb1390b21a89ff' - '0faa4cea2a9b11329f337c583f9660afd3b243560e6c46709b141192f1957b02' - '2314272354b7eee77ad7ac35c76efcf4d72951062f9ec55ddce0fcb4ae69a6c6' - '0597c8b782f7c5386e926a27798e7f35a39d623e8c3056b1e9a7ce2849268541' - '2f49d57813524da0e686587dc2a442eaec1ba90b53cab4294a99833ba62d8aed' - 'b2df645d03d2b103760a8372792183ad7202c96cbbcd00334ebf15c0532576d8' - '95a3053e4749dd6236e4aa9d23f0fac65151cfb494103c550ac79b644c3a14db' - 'aac574c17163d1ba286677c696d654e667afe9d7eee48b89cf0cfdca86ccb03c' - '9134c27513ee9f4eb51a7b343624e73ba0e74f00372b3fe0dc31f317843da181' - '4f82c2e827b5b5955e476cd92ea5ee3e6ded7b7d608dede7fadb04423704249a' - '2b53c55a0301cf5d5fa64473d1dc97706fef163d96d2af013a90b950fc4be0fd' - '9ff8daa9ee8fcbae042c582e8038505775c0bff64f02d5d482ad275928e3af3b' - 'b2a613f62cb45b4c136cc402e7e54f1737358c63466944d4753b47e7b212e84e' - 'a424e49bb2fa28e4d87e94714d3076cd756760316a5499ae5e7d0cf3e7d50efc') + 'fac353e1067852ccac7bc23a958c54fdebd2aad30ad9551a07deb23811046d79' + '4e39fb7792c7fe787bb9d9f3a03ac57da15e9b353a51f1602afcffc3e0e0ffa8' + '8be5b81c0a747d89ff9f586d726706718711a01ffd70ecbed9fe00352fb795dd' + '7ab3641502204c37108430f5be2f78a161b1aa5a63561c8edcf0186a7f509df6' + '51cf109e8416775e656a1431630f3f4a6b0bde3e44744449283d0666284698bf' + '97bbaea547340a56f528d8675b04a596369fb9b63245e20acd76d74211f7a668' + '49d3df068e9edcf17ed99754bd45c7d00c50f4bacd7a5484ab86018197258523' + 'd491ebf429f56ad21632bc476f9364857ee838a330ff1b966cae2e8ec5a944e8' + 'c95a6ce7d22eca56f365f05805393a1b52a5427af02a447f9dba1cd1559dd7c7' + '0debd56af6d8872d525e62ae8fd609620c3a66a425817dec83d701346fd766ba' + '9b3ca0a7df6b8bc91274b2b757dfb909beb04815cf51b377b22755114776b536' + 'd8d4dc74889792dc9b434f11a8934d5363dafb07aada75068809f1d3ceba7d66' + 'c4e5def480042a55d8532129f3bd5226004b98f5dd3991eeb429a35152f4391e' + 'e0bf50d99447934d0f9865329469559308ab54c32d2d64321a9742b3aa4be063' + '162a5c3879bb4d826b8cfea0dd68cf13f29d417bac79cc2482dd78d76cc0a8f7' + '9f5846d2147eeb8a834a282abc80ef1cd58389faaf4a0dfedfc4e91cd28faaf5' + 'bba78265515862435a7aa19345460c0bdd192be207550f6a9ac0cdb7de535ac8' + 'bdf3d4bf05bc66951c9d861af635c791fd3513f578fe32a9ccc150aa81ba6304' + '5700997d79942d74db684fddb255ee1e5a1b10b0c7c0df875b917dbba91f9607' + 'ed3f3e4bbba12218a0025747257cdaefceb4f37ce65fbf8e3ec1746cacf62d62' + '788127820d6404540b698794a9008990f77005056ec1f15da05785087729c178' + 'f688f29b6e4032d6f6fd9b3e7ae20d2f94f7ae34e977bcb1ea1e9b4393ac9f4d' + '52ba67336de4d8d19ac1d29d22df362af9e8b43a2cb800a0303b51e0b6d4c4fb' + '39519209cf6c19208e8c677439b3cad194d9d14f7ff3814c189890d6285b7af7' + '7abab0668491b42dff80e8b656407b9489f8a133a58f0ca42f8c83a1973efd77' + 'ec4d3c63698bc825fee4a2dedde66a7796fef0efee8df307d8f233f382ba784a' + 'f22b7f8a56d6b92448d4b1cf471fdad56cef13e8668a472e833a8efc8400b53f' + '40c62742c10f08f1b93e68b026b48b849dcf323f99987720be19c0bc0f4fbb7f' + '1007cd1f3f72deecdbfbb3ec54837955f53235de4b39405158eec9dd74750246' + '6de47224c4342a1fc1c81d8ec0bab90cdacb4b4e54709e9590c2bd341fbfbae7' + '4e3f6637cccafab04d665bb66b2d808797384c3b322a4375efcb9a3be480fe7f' + '6c962ee2ce9051223897ace9fa6d7c60ffb7e95b103a52bad0f17803efcfeaf2' + '9dbde5ddc20a9512320490318f5f6278d5626357f3b17401482a439a4f6be654' + '51a38f39dfc18d945a0985a23d0b7770f8fe3cebf8a28f22fd92bb288345a9b0' + '784ba5505afef70f492a85651c632da974c01bf1c5a945ff132df40b077304d7' + 'cfd312de7632a96facd36acdc00a04bc571101d655c5c8f70300d3f982b58366' + 'e444889660a60b44a3e5e6fc94972e2b8a2b97e0fa8959b41bcacacfc8be931d' + '3ef71ff4f72e28f15ea76764be9179cefdbf92a2270e87dad557cbf6d6c44f36' + '298f9a4a205a77e471f96e38d12dbba00b6fb9ddf89b496e8b5eb106d1f33c97' + 'e01d684612fd224536e9cb21f44ace5cab81bf8fd15e8e5265847df1b2407a59' + '0d2606836428595232daf0aedbafea4935e641658712fd99e34668e686c0d2e7' + '7de4b8e3ffcf3ac7ced5aeae0ca84d1e9c8603646e54473665505e1f1ac66925' + '38b372432b02c42703e3f425946cee6a42918d574f7bff7df5f9997ddb076f64' + '3441d57aeedf15c5a29800e8f544b8571d41e5ed5a381d8bb2087cda97074970' + 'dcd56d713daa7b6fb03d64219797e159eab8bef2e7eb9bd7999c0b285a24d153' + '7e7fb8287b9255aa8988bf63677e0bed8ae30c0da5ac7d83ba1300ba2bca41d3' + 'b9270889a4905233e450be25d61e4a1359a057bc6c021d5aba23a941cde56123' + '0ef471cf54c052214d5169189a72efc0e8d65801e482aeff413ffc7c822c1651' + '803529203aded6bf1194a6d5d575f5e16f8a4a249a68878650c5469e92512923' + '3529d8a55ea5458edf24059d55178b6c4935aa82b604bc1c46e4b4bffb88234b' + 'e83e64f528b12b1550efb28ba4dea51e7912ab2af470c1382d78e01d9dc3a3ff' + '12c2001834af439d1a0f95ed3f416788672d41c5b02481d26e54f66e721c83a6' + '7a20d9842117105f4ac641d602977cf20d4149564593adba0f3415976fd7b52d' + 'f582fac503f385ceb59761134ed24170ded9f65861106ff77219040b169e6a37' + '3b60993a3c85f61ef57b02334d3a71d864e9e6609ec29f398c1f60094cad43a3') diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD index 0f2f95f04..d86927420 100644 --- a/libre/icedove/PKGBUILD +++ b/libre/icedove/PKGBUILD @@ -3,7 +3,7 @@ # We're getting this from Debian Sid _debname=icedove -_debver=31.6.0 +_debver=31.7.0 _debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } pkgname=${_debname} epoch=1 pkgver=${_debver}.${_debrel} -pkgrel=2 +pkgrel=1 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird." arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') @@ -28,16 +28,14 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz" mozconfig ${pkgname}.desktop ${pkgname}-install-dir.patch - vendor.js - rhbz-966424.patch) + vendor.js) options=(!emptydirs) -sha256sums=('9011da6632434d6ee991cc69f4e040a194d998ce3a04e5c3a05f21fc361124dc' - 'ac73365adcccf126b97432cfd60828da667b2eb82512ae252cf577939d666fd9' +sha256sums=('00ce17575690400e22e7ce21dc5b3b4f71092b7708ee9aad74448d1401da8794' + '04c30b4e72819b764bc463d36c39f55741d3e47ae994ba89fd14e63fe32c6561' '09a0041f7f12498d933284b3d3a44e19002515accaff767d145a8f404b79e86a' - 'a0be56fc87f255804e00e7c85abbc4731ebdaa8938858f1f8ac47dd2f17c0b8b' + '0b0d25067c64c6b829c84e5259ffca978e3971f85acc8483f47bdbed5b0b5b6a' '24599eab8862476744fe1619a9a53a5b8cdcab30b3fc5767512f31d3529bd05d' - 'b44f0eb82dce8a02aa71f0eab4b0d820e5383f613becc62cc995aac8638b54ec' - '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a') + 'b44f0eb82dce8a02aa71f0eab4b0d820e5383f613becc62cc995aac8638b54ec') prepare() { export DEBIAN_BUILD="comm-esr31" @@ -59,6 +57,9 @@ prepare() { install -Dm644 "debian/app-icons/${pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${pkgname}/content/icon${i/x*/}.png" done + # We are doing it from sed commands + rm -v debian/patches/fixes/vp8_impl.cc-backporting-naming-for-constants.patch || true + quilt push -av # Fix paths on makefile @@ -89,9 +90,6 @@ prepare() { cp "${srcdir}/mozconfig" .mozconfig - # https://bugs.archlinux.org/task/41689 - patch -Np1 -d mozilla -i ../../rhbz-966424.patch - # configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure diff --git a/libre/icedove/icedove.desktop b/libre/icedove/icedove.desktop index f39d5823c..1ba43e0b3 100644 --- a/libre/icedove/icedove.desktop +++ b/libre/icedove/icedove.desktop @@ -1,32 +1,5 @@ [Desktop Entry] Name=Icedove -Name[ast]=Veceru de corréu Icedove -Name[ca]=Client de correu Icedove -Name[cs]=Poštovní klient Icedove -Name[da]=Icedove - e-post/nyhedsgruppe -Name[de]=Icedove-E-Mail und -Nachrichten -Name[el]=Ηλεκτρονική αλληλογραφία Icedove -Name[es]=Cliente de correo Icedove -Name[fi]=Icedove-sähköposti -Name[fr]=Messagerie Icedove -Name[gl]=Cliente de correo Icedove -Name[he]=Icedove דוא״ל/חדשות -Name[hr]=Icedove e-pošta/novosti -Name[hu]=Icedove levelezőkliens -Name[it]=Email Icedove -Name[ja]=Icedove メールクライアント -Name[ko]=Icedove -Name[nl]=Icedove e-mail/nieuws -Name[pl]=Klient poczty Icedove -Name[pt_BR]=Cliente de E-mail Icedove -Name[ru]=Почтовый клиент Icedove -Name[sk]=Icedove - poštový klient -Name[sv]=E-postklienten Icedove -Name[ug]=Icedove ئېلخەت/خەۋەر -Name[uk]=Поштова програма Icedove -Name[vi]=Trình điện thư Icedove -Name[zh_CN]=Icedove 邮件/新闻 -Name[zh_TW]=Icedove 郵件 Comment=Send and receive mail with Icedove Comment[ast]=Lleer y escribir corréu electrónicu Comment[ca]=Llegiu i escriviu correu @@ -82,164 +55,119 @@ GenericName[uk]=Поштова програма GenericName[vi]=Phần mềm khách quản lý thư điện tử GenericName[zh_CN]=邮件新闻客户端 GenericName[zh_TW]=郵件用戶端 -Keywords=Email;E-mail;Newsgroup;Feed;RSS; -Keywords[ast]=Corréu;Corréu-e;Noticies;Discusiones;Mensaxes;Canales;RSS; -Keywords[ca]=Correu;Email;E-mail;Mailing;Llistes;Notícies;RSS; -Keywords[cs]=Email;E-mail;Pošta;Elektronická pošta;Diskusní skupiny;Čtečka;RSS; -Keywords[da]=Email;E-mail;Epost;E-post;E-brev;Newsgroup;Nyhedsgruppe;Nyhedskilde;Usenet;Feed;RSS; -Keywords[de]=Mail;E-Mail;Newsgroup;Nachrichten;Feed;RSS;Post;News;Usenet;online;lesen;schreiben; -Keywords[el]=Email;E-mail;Newsgroup;Feed;RSS;ημαιλ;Αλληλογραφία;Ροή;ΡΣΣ;Συζητήσεις;Γράμματα; -Keywords[es]=Email;Correo electrónico;Noticias;Discusiones;Mensajes;Canales;RSS; -Keywords[fi]=Mail;E-Mail;Email;Newsgroup;Feed;RSS;posti;sähköposti;maili;meili;Usenet;uutisryhmät;syöte; -Keywords[fr]=Mails;Mels;E-Mails;Emails;Courriels;Courriers;Newsgroup;Feed;RSS;Poster;Icedove;Lire;Écrire; -Keywords[he]=דוא"ל;דוא״ל;מייל;אי-מייל;אימייל;הודעות;מוזילה;תאנדרבירד;ת׳אנדרבירד;ת'אנדרבירד;ת׳אנדרברד;ת'אנדרברד;דואל; -Keywords[hr]=email;e-mail;e-pošta;pošta;RSS; -Keywords[hu]=Email;E-mail;Levél;Levelezés;Hírcsoport;Feed;Hírforrás;RSS; -Keywords[it]=Email;Mail;Posta;Newsgroup;Feed;RSS; -Keywords[is]=tölvupóstur;rafpóstur;fréttir;fréttahópar;samtöl;skilaboð;fréttastraumar;RSS; -Keywords[ja]=Eメール;イーメール;mail;e-mail;email;メール;電子メール;ニュースグループ;ネットニュース;RSS;フィードリーダー;書く;読む;Icedove; -Keywords[nl]=Email;E-mail;Newsgroup;Feed;RSS;Nieuwsgroep;Post; -Keywords[ru]=Email;E-mail;Newsgroup;Feed;RSS;почта;письма;новости;фиды; -Keywords[sk]=Email;E-mail;Elektronická pošta;Diskusné skupiny;Čítačka kanálov;RSS; -Keywords[uk]=Email;E-mail;Newsgroup;Feed;RSS;пошта;новини;подачі;стрічка; -Keywords[vi]=Mail;E-Mail;Email;Newsgroup;Feed;RSS;Thư điện tử;Gửi thư; -Keywords[zh_CN]=Mail;E-Mail;Email;Newsgroup;Feed;RSS;电子;邮件;新闻;Icedove;tb;雷鸟;电邮;邮箱;阅读器; Exec=icedove %u Terminal=false -X-MultipleArgs=false Type=Application Icon=icedove Categories=Network;Email; MimeType=message/rfc822;x-scheme-handler/mailto;application/x-xpinstall; StartupNotify=true -Actions=Compose;Contacts; +Actions=ComposeMessage;OpenAddressBook; -[Desktop Action Compose] -Name=Compose New Message -Name[af]=Skryf 'n nuwe boodskap -Name[ar]=حرر رسالة جديدة -Name[ast]=Redactar un mensaxe nuevu -Name[be]=Напісаць ліст -Name[bg]=Ново писмо -Name[bn]=নতুন বার্তা লিখুন -Name[br]=Sevel ur gemennadenn nevez -Name[bs]=Napiši novu poruku -Name[ca]=Redacta un missatge nou +[Desktop Action ComposeMessage] +Name=Write new message +Name[ar]=اكتب رسالة جديدة +Name[ast]=Redactar mensaxe nuevu +Name[be]=Напісаць новы ліст +Name[bg]=Съставяне на ново съобщение +Name[br]=Skrivañ ur gemennadenn nevez +Name[ca]=Escriu un missatge nou Name[cs]=Napsat novou zprávu -Name[cy]=Cyfansoddi Neges Newydd -Name[da]=Skriv en ny besked -Name[de]=Neue Nachricht erstellen +Name[da]=Skriv en ny meddelelse +Name[de]=Neue Nachricht verfassen Name[el]=Σύνταξη νέου μηνύματος -Name[eo]=Redakti novan mesaĝon -Name[es]=Redactar un mensaje nuevo -Name[et]=Koosta uus sõnum -Name[eu]=Mezu Berria Idatzi -Name[fi]=Luo uusi viesti -Name[fr]=Rédiger un nouveau courriel -Name[gd]=Co-chuir Teachdaireachd Ùr -Name[gl]=Redactar unha nova mensaxe -Name[he]=חיבור הודעה חדשה -Name[hi]=नया संदेश लिखें -Name[hr]=Nova poruka +Name[es_AR]=Escribir un nuevo mensaje +Name[es_ES]=Redactar nuevo mensaje +Name[et]=Kirjuta uus kiri +Name[eu]=Idatzi mezu berria +Name[fi]=Kirjoita uusi viesti +Name[fr]=Rédiger un nouveau message +Name[fy_NL]=Skriuw in nij berjocht +Name[ga_IE]=Scríobh teachtaireacht nua +Name[gd]=Sgrìobh teachdaireachd ùr +Name[gl]=Escribir unha nova mensaxe +Name[he]=כתיבת הודעה חדשה +Name[hr]=Piši novu poruku Name[hu]=Új üzenet írása -Name[hy]=Նամակ գրել -Name[id]=Buat Pesan Baru -Name[is]=Skrifa nýtt bréf -Name[it]=Componi nuovo messaggio -Name[ja]=新しいメッセージの作成 -Name[kk]=Жаңа хат жазу -Name[kn]=ಹೊಸ ಸಂದೇಶವನ್ನು ಸಂಯೋಜಿಸು -Name[ko]=새 메시지 쓰기 -Name[ku]=Peyameke nû biafirînê +Name[hy_AM]=Գրել նոր նամակ +Name[is]=SKrifa nýjan póst +Name[it]=Scrivi nuovo messaggio +Name[ja]=新しいメッセージを作成する +Name[ko]=새 메시지 작성 Name[lt]=Rašyti naują laišką -Name[lv]=Sacerēt jaunu vēstuli -Name[mk]=Состави нова порака -Name[ml]=പുതിയ സന്ദേശം രചിക്കുക -Name[mr]=नवीन संदेश लिहा. -Name[nb]=Skriv en ny melding -Name[nl]=Nieuw bericht opstellen -Name[nn]=Skriv ei ny melding -Name[pl]=Utwórz nową wiadomość -Name[pt]=Criar nova mensagem -Name[pt_BR]=Compor nova mensagem -Name[ro]=Compune un mesaj nou -Name[ru]=Написать письмо -Name[si]=නව පණිවිඩයක් අරඹන්න -Name[sk]=Napísať novú správu +Name[nb_NO]=Skriv ny melding +Name[nl]=Nieuw bericht aanmaken +Name[nn_NO]=Skriv ny melding +Name[pl]=Nowa wiadomość +Name[pt_BR]=Nova mensagem +Name[pt_PT]=Escrever nova mensagem +Name[rm]=Scriver in nov messadi +Name[ro]=Scrie un mesaj nou +Name[ru]=Создать новое сообщение +Name[si]=නව ලිපියක් ලියන්න +Name[sk]=Nová e-mailová správa Name[sl]=Sestavi novo sporočilo -Name[sq]=Krijo Mesazh të Ri -Name[sr]=Састави нову поруку -Name[sv]=Skriv nytt meddelande -Name[ta]=புதிய செய்தியை உருவாக்கு -Name[te]=కొత్త సందేశాన్ని రచించు -Name[th]=สร้างข้อความใหม่ -Name[tr]=Yeni İleti Oluştur -Name[uk]=Написати нове повідомлення -Name[zh_CN]=撰写新消息 -Name[zh_TW]=撰寫新郵件 +Name[sq]=Shkruani mesazh të ri +Name[sr]=Писање нове поруке +Name[sv_SE]=Skriv ett nytt meddelande +Name[ta_LK]=புதிய செய்தியை எழுதுக +Name[tr]=Yeni ileti yaz +Name[uk]=Написати нового листа +Name[vi]=Viết thư mới +Name[zh_CN]=编写新消息 +Name[zh_TW]=寫一封新訊息 Exec=icedove -compose -[Desktop Action Contacts] -Name=Contacts -Name[af]=Kontakte -Name[ar]=المتراسلين -Name[ast]=Contautos -Name[be]=Кантакты -Name[bg]=Контакти -Name[bn]=পরিচিতি সমূহ -Name[br]=Darempredoù -Name[bs]=Kontakti -Name[ca]=Contactes -Name[cs]=Kontakty -Name[cy]=Cysylltiadau -Name[da]=Kontakter -Name[de]=Kontakte -Name[el]=Επαφές -Name[eo]=Kontaktoj -Name[es]=Contactos -Name[et]=Kontaktid -Name[eu]=Kontaktuak -Name[fi]=Yhteystiedot -Name[fr]=Carnet d'adresses -Name[gd]=Buntanasan -Name[gl]=Contactos -Name[he]=אנשי קשר -Name[hi]=संपर्क -Name[hr]=Kontakti -Name[hu]=Névjegyek -Name[hy]=Կապորդներ -Name[id]=Kontak -Name[is]=Tengiliðir -Name[it]=Contatti -Name[ja]=連絡先 -Name[kk]=Байланыс жазулары -Name[kn]=ಸಂಪರ್ಕಗಳು -Name[ko]=연락처 -Name[ku]=Tekilî -Name[lt]=Kontaktai -Name[lv]=Kontakti -Name[mk]=Контакти -Name[ml]=വിലാസങ്ങള് -Name[mr]=संपर्क -Name[nb]=Kontakter -Name[nl]=Contacten -Name[nn]=Kontaktar -Name[pl]=Kontakty -Name[pt]=Contactos -Name[pt_BR]=Contatos -Name[ro]=Contacte -Name[ru]=Контакты -Name[si]=සබඳතා -Name[sk]=Kontakty -Name[sl]=Stiki -Name[sq]=Kontaktet -Name[sr]=Контакти -Name[sv]=Kontakter -Name[ta]=தொடர்புகள் -Name[te]=పరిచయాలు -Name[th]=รายชื่อติดต่อ -Name[tr]=Kişiler -Name[uk]=Контакти -Name[zh_CN]=联系人 -Name[zh_TW]=連絡人 +[Desktop Action OpenAddressBook] +Name=Open address book +Name[ar]=افتح دفتر العناوين +Name[ast]=Abrir llibreta de direiciones +Name[be]=Адкрыць адрасную кнігу +Name[bg]=Отваряне на адресник +Name[br]=Digeriñ ur c'harned chomlec'hioù +Name[ca]=Obre la llibreta d'adreces +Name[cs]=Otevřít Adresář +Name[da]=Åbn adressebog +Name[de]=Adressbuch öffnen +Name[el]=Άνοιγμα ευρετηρίου διευθύνσεων +Name[es_AR]=Abrir libreta de direcciones +Name[es_ES]=Abrir libreta de direcciones +Name[et]=Ava aadressiraamat +Name[eu]=Ireki helbide-liburua +Name[fi]=Avaa osoitekirja +Name[fr]=Ouvrir un carnet d'adresses +Name[fy_NL]=Iepenje adresboek +Name[ga_IE]=Oscail leabhar seoltaí +Name[gd]=Fosgail leabhar-sheòlaidhean +Name[gl]=Abrir a axenda de enderezos +Name[he]=פתיחת ספר כתובות +Name[hr]=Otvori adresar +Name[hu]=Címjegyzék megnyitása +Name[hy_AM]=Բացել Հասցեագիրքը +Name[is]=Opna nafnaskrá +Name[it]=Apri rubrica +Name[ja]=アドレス帳を開く +Name[ko]=주소록 열기 +Name[lt]=Atverti adresų knygą +Name[nb_NO]=Åpne adressebok +Name[nl]=Adresboek openen +Name[nn_NO]=Opne adressebok +Name[pl]=Książka adresowa +Name[pt_BR]=Catálogo de endereços +Name[pt_PT]=Abrir livro de endereços +Name[rm]=Avrir il cudeschet d'adressas +Name[ro]=Deschide agenda de contacte +Name[ru]=Открыть адресную книгу +Name[si]=ලිපින පොත විවෘත කරන්න +Name[sk]=Otvoriť adresár +Name[sl]=Odpri adressar +Name[sq]=Hapni libër adresash +Name[sr]=Отвори адресар +Name[sv_SE]=Öppna adressboken +Name[ta_LK]=முகவரி பத்தகத்தை திறக்க +Name[tr]=Adres defterini aç +Name[uk]=Відкрити адресну книгу +Name[vi]=Mở sổ địa chỉ +Name[zh_CN]=打开通讯录 +Name[zh_TW]=開啟通訊錄 Exec=icedove -addressbook diff --git a/libre/icedove/rhbz-966424.patch b/libre/icedove/rhbz-966424.patch deleted file mode 100644 index c4c332e9e..000000000 --- a/libre/icedove/rhbz-966424.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/toolkit/modules/CertUtils.jsm -+++ b/toolkit/modules/CertUtils.jsm -@@ -170,17 +170,19 @@ this.checkCert = - issuerCert = issuerCert.QueryInterface(Ci.nsIX509Cert3); - var tokenNames = issuerCert.getAllTokenNames({}); - - if (!tokenNames || !tokenNames.some(isBuiltinToken)) - throw new Ce(certNotBuiltInErr, Cr.NS_ERROR_ABORT); - } - - function isBuiltinToken(tokenName) { -- return tokenName == "Builtin Object Token"; -+ return tokenName == "Builtin Object Token" || -+ tokenName == "Default Trust" || -+ tokenName == "System Trust"; - } - - /** - * This class implements nsIBadCertListener. Its job is to prevent "bad cert" - * security dialogs from being shown to the user. It is better to simply fail - * if the certificate is bad. See bug 304286. - * - * @param aAllowNonBuiltInCerts (optional) diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index 92aaca15b..d1cf77654 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: fauno <fauno@kiwwwi.com.ar> # Contributor: Figue <ffigue@gmail.com> -_debver=37.0.2 +_debver=38.0.1 _debrel=deb1 epoch=1 _pkgbase=iceweasel @@ -160,91 +160,91 @@ _package() { } sha256sums=('6ab481740fdd48790329217a1bbe1fc7d2438bbdc1f767e21ba3d66084f4afcf' - '46df91da1b1f3df067419a53f443f7f42bcd818dbd8f657c504870e9db663802' - '2590b8aa4a585a65804cc4807665e76ea017afd3d0b339d95936a7bc4a12a8bc' - '6394f641e50af7be6ec2e06cfae325e984f9733abb64d14e93053822a4806024' - 'f24db9ae64128546972b08461ed82c8e40e8ca80ec5bdc7fd48f248514b208e5' - 'c93596f85d5557b533d9fbf4a3785643885551609b79a3240bd38522b4ec4f35' - 'fc88e4f63b2ae3cae96c2c272c2c5fda4a6a29461eb37e5394fb4cc92827a21d' - '7888e43366080da53a429cc386e100fdaf88f50c13d0ee43a8abbef6c5a1cb21' - 'f2ed4b3a7ccfa994bf4715c43f235185d6a7812a34ca34a4be9a4a8c9de2cc87' - '26fec282a3c1466b918a1a443990d7c06160be5a9f29b5cca95442c40c7bdeea' - 'd0fdd728ba4115f44d894175f8fda6c0045a41d2013f83d4ec016eb3ba736d26' - 'e7628c1eda64f5b3ea1f1710472333c40290d0c9e3d21f1ec54b1a47059d926d' - '2314ab923d5ede048f2eb3b2e93a84f1acb895b40fb7491c37d9bc8a08b7b2bf' - 'cec666e55649cf193b887499bae2508702e9561d1983f66bab243a350b2413be' - '12a2905ff151bd5f210a2f2c3efa9815beb5db2c9ee3d11416845253a9167f1f' - 'a92af5e7a48f7d34fb8c68adbf1c9592637c7598cde4d6e6145b9a66b04f5578' - '4f2f68c37120863e23dc286ebacc13a49c03ed3d6d94cf2d82eef7829bc289b9' - 'c28437d8b449f8ba303e230b8eff098a562dd63e48bf17487327bb841fb88792' - 'c3aa43888b1ded108b787f313cf837915579f84aa7e3b00c48a9157241259716' - '96165ece3c25386a74acf16825404cd0cbb98396df5a51b2791d5cf2e1821614' - 'd23e4144f323fdd9629dbab91ae5b6eff1eb8b95358cea53c4cf43185533938b' - '72214132772ba4d12fb27fbe024ce9620595b596d234727e74bc543c2abfdd9c' - '20efde5f2a53aac94b082618d173b71731cdc5320bf5dac1d8e840851530a7e2' - '71c2601875e8354e5ba51c59d63988ff6cac178e5ab13ebc7426520461a22d29' - '30f1625e802a0dc9be7213483b258660b7cbae05ac50a7d323763d056e5e9fc2' - '3a7d65c752b009504800bd22d8cfab699681526e9fec24e67db6da31f5ff536d' - 'f2cd4d92f2b6088771108de25228b0ce5ea255e9ee35bbbf950a09c9ff95553b' - 'b0719b04dc9592f5efcaf7a8ca022f3291a45e898b9d881ce68e1e22e00c3efe' - '82944255040c681b71f31ffc686f706711d00d18f01b75a73d1b78f306e444be' - '6894b549aa3775c6d06d43232fcf461cb644db47e1c2b8639f49e19e602b6e4b' - '039dc23e10288be2f24e59438e8ae1aed82782018820f2062da171b83cf46b0e' - '1dae292f8366aa065c405a07707bfa03ed2bb359c5f1ee3a4da7bc4641b2eded' - 'c6addc7af1a16310bd164963f1b346136dd828a5da2918b65ca9f42653712e44' - 'acf5b304315b78b7d64c43816774202a2b657735e52891baba57801e4ce51d19' - 'aee124897df46eefd2f34020f8356e478dd808b2c2454115a2fe89672982f6e9' - '202b66f9ba36e5aa21a53fbcdbda41daf7cc5b811dd21588895e8246472e99f4' - 'baaec2219b2fcc7b22f771ed2db825488d3a8220712f257cab3fa0546fb088a3' - '8f8c97cacf7df7b0bbfa145d643e684dd5ce33baa4ae451e4b7b778e748ea83a' - '7fca605daf0525a43d9ec5de9bc931ba4d758177e9c2bac249230270739be2ca' - '8c742add184120ccf6fa5298a1ffd503af07a9522a2c0fa9041a9ecf7486c042' - '221b0deb134ed158b7634d0622f0f1bb3cb42b3f082d306d629041a8e1f8be7a' - '0c636f0975dfb8f476f4f8eb14533de9b380eccecca7cfe7eeffdaaaedd9628c' - '49eea65ca9c6bab4d1b487b21f1393d9fa1a8f41b04380f466509fc51b590e41' - '18563024ef2d44f24d28160a3e64cd55c17e77e146bc78e58bc6bd683582e334' - 'df2f8b7055096ddcd7d4f1664416e8676eaae81fd0c14786a3887a2215d11488' - '220233daf918d1d21f7eb4168183df55545f5701a9ad7c335bc19410d0078592' - '2c358e388d019ab5617b4385204ae8423030fbfe78853d8da0485f9c798e8fd7' - '8ba54a5d6346fc4e2905ce9c492a2c52b43872741f87d0be416628479a5fe1d5' - '6fa794685b60b14d61d066509e87c9178af68bf7f34c08891f071002dc78241d' - '2155e7780d829952f12c590a49927cf008e28de789e5faa3d364a2144f9dbf77' - 'b2db3f40e7cd0f7a24ddeab5edd2902299a8c9e247d98b408c2df1d97c174925' - 'aef01c5c7f9e14fafa4dca6547d670067eb0f7cdf7dd5281bb224d0d21967e1d' - 'fbbc6db0f8d48f1c7bdd4a471c73c9cc82fbcfd7bd0b8d79a9b1a8719b49e4af' - '1f245ca7e43e5f88f86d978891ee4c89e28f2352973afa9befbe35691d164e29' - '0efa33921795ede12c4e01f595e442226f715183b146c899f50def9ad6a9b0bc' - '621df89a873179d47765b2c2fb79fca4f0b4fe9eb3471d9d760a1ba15eddebf1' - 'e0890fe61843a1942e4e95c0c923d2945bb90a4a39171f780a0ddd2fe94e470a' - '6a3d778cdfc1eef899a14177609ba2a930a1559992652e833c294d7f02e36eb5' - 'b10f4108a12becfcd672a2bf136258bbc42d09d6c06a24bedd83d45069ea56ed' - '02c0fbdb20b1cd2c464a49598febfcf9bd419732080b5a4b57311577dacb1c8a' - '2ecd6df50258eae99ab7bf7608df8cd98030902943192f2de7fc981231f9d245' - '6ada08c6af7c26a1882073b5b024f90fda8b8b2582ec38448c3e163dfed581cb' - '4b695792624e41699218e4030f6ceb0a0870cc2938f892ee463475afb29f6692' - '42dd38b838f174af760aff8e8e3567c9d76e113d88de17da1347bcfe3454eb41' - 'da586ee0b3cf471fe549c728b8d206c374cfe9c63e21f835868a92b88aa017ed' - '2593444bd5cc24dbde3b1d3a4c01cfd117be2950c252a0f93f65c5f40959d74c' - '62c04d53d34449f6d3f53ad07ab315ed6d8e377d82bb80d80d923904f2907a23' - '13c3b617012140a685d3d9be8221f08128ca22ef61efc8c1113907555ed6f928' - '9a0304a8736634f69db6ee759fe094f872c007735a2f14223c34622e00741c47' - '1c21185e07a6a557b5ae8510cf30c63c95caa8e60c5322fd4b779bc4fabbdb0c' - '948b257ddda17c8f5f4b7b86f47a1a1bf998b634451cd00639e9353b27cdcd97' - 'cca61891ce1787f750ecb527e62dd7a128c83b01aa6adf617db8fecd44fe8fda' - '62d42387ecbcfe849003cbb66d519be0a05b28a44ca52162fef9dfc166fd8d96' - '6172487c0adce3d9233ab24484168dfd482d91bfc2d73eb26934642b01e7edc8' - '09ddd532bde2ceca72174e92b5853354f3d35bc58934d7d390e3e2f04ebb5a75' - 'bc0fe33659f7f81a584f3f3f2d2f31fc1a716b882c72d88479058fd18288086e' - '091a9e2e1caee9d95a6697a5e9c7618c9c538fbc2a6fa44f0b17ed992c56277b' - '905bdabfabf2fb3ee761be8d3cf8ef6f583f6a0918e283c5e4bffcabedf42708' - '4bbdb5efd6a2b5d0dc8125654bf5ac868cca5666092213d6083e894530d58f95' - 'efdd83dca77c3cc63aefab5ee8d9a28b4436fae1ed2cb1c503fe81423845abf6' - 'a00f9011c6c971c09918766ed072feee05e60668c4622849f234ec2ddcb84c61' - '7d501554b35afab436d400b10691a34f85c6e13ff9b01f7a4ba6f423e6029f5d' - '5eeafacdbd59e29a26899aef707363df83158bdbcc692bf65d826a71b53ee6db' - 'cdf01aa75b3ab9fa6aa880b1a4ea91e3cc086b233a5174674d9895a0e1dbdcc8' - 'a6c373b4bf80bd15fe15faf37c55ae69eb3552d35104c137d1a982bdd12d82b2' - 'e9280e553402a42436b7025253c3a686e1b6cd7d4718ccce743ef9c64b177a10' - 'f8bac7ecec29c7185b2c682cf7b48ead1f3610f9a6fe98f328d846d50bc1c77c' - '77a8555b964fa3baae54b88d8c329854ae2b04ff0825a88750aabbad9801a5c4' - '402338eb236ffc3d963da03cde1bf8e8d20f902042cd4a9bb84906da25335261') + 'fad6315dd1caae75e9fb05ae23baad58b375882eeec3daf32c2cdf37a83b6504' + 'b9abd689e8e6b7082745919a7939870782aa90d48c0e90aa6c1b82f16e85e782' + '476fc24dcd4da851e54220bfa123944fb162543118ede89c1be42a2a71ae61c2' + 'f8ef47446e1819e912211c5a60689f15bdc351d8eefdd2cc10b3f49f67eb17e7' + 'c5f54afd5c22b97acd960e21fa892da3319c5966a6538dd7139bf57e2a9eaa26' + 'dabf1bc4f5f9e6a5bf8274f053291449dbcb6625fbd40f23a6917e2c1556ac7f' + 'e78e5c6b4b3f2cf254a8cde4c09fb60e02b0ea9ec7dab92e44a0fdf1da84e0ae' + '2492c2612d80c9e2a6ba0cd8901fad155b83e37ff5c29bc6a192d5dd1034360c' + '395032e27b55d8dc9ef6d60f0eecc2e82bf7097e96465b3d4f09efa94306c287' + 'c0b9b2ea96fba3bafb0aa5c6d1385c466897000ed1803727d3ed41a5486a01de' + '9d1b1d6e35e09c19c16dfaf8cddc196385a4890778d63c3b3b548adf57e780fe' + '3a764b4ad540ebaaa0a341f68dd365d1352b8e7d6f9f25f2cad94192296a102e' + '02861e0e2e395baa18e315891c48da5e519ce2f4b8f7706ae6845897609e359c' + '8c0c4d94cfd079ba755f1e0381baec3f06b517cf81b92fef933eac91f47a6da5' + '84cf492e816d7d54d9fbd6efa7d2e731a7a7335f913fc438f6e6c011d8b530a4' + 'b6965520beb1e080103ca28d6bcf66d9a892ea5cd204d4c301e03971138f1e67' + '371253c9e7c7e451d39f7a0f4de2c933723e10832e43fdd2cb70931544639258' + '2b3e44d0a232a65b3ec81fd4d872cf125c0d7f4a96bf8e5f1bfb6b666a97e953' + '4159cec4572feeabb8d84ddff4ccc1e11152a9c4a96a86492073eaf6c85cbae6' + '6432745599c7ebc5c4b3cb5b92d0974530c39af13d0388a5ea00fffae6259a99' + '1deb1aeed20e63ee908aa14e3777768c80d2798f78a94779133efeb9fab51319' + 'eabcb35500514a1f788586368225938be825e78f8f45a113ac8ea57858e54f60' + 'ccb56a546181ff63052e0fd1672e3a54233d9a90a34a5579eaaeb8bb8d9bc515' + '4accd730bb991b6321225c994a5307c9093515519339627b2b71ba93ddd54095' + '46a48f053b3e65fc39bf2ec06f693b0f3b5b691c1b3d5205e023561cbccfabb2' + '0008140022d1457fb0390ace4398cd14bb4e4196186545c571081e625e06997e' + '300322e4a72de37fa11a1ef92abe30083efa1df6510420bcbad54b9b144eb6af' + 'a646a99d31d54f2d0aca6b518c1c4d1059adab95493e20256531348dd984c650' + 'a6a4ca57e11c938aebda1c8954e14d23e40eec08d1635f04a22108907e3393ff' + '5764a8012586616b4bbd039c3b0ba463c5509c5ffbbcbd6404a1e0b1fd4cf2c3' + 'ff5bc97dab31f3b8ff8061ca28e5e5ac8b10bf41e878ae5ef8bf3bf3db6f570e' + '8b8c2aff5ea3322c107c2455f7fc8238101e04f131a246088d12570e709531b1' + '5fcab669d2ef961a0f8c9aa8cd45533ff57443e215c698bb4d5a66e08f2ad2ef' + 'f5c7d5032ce766faae306e033fddba9b55bfda01abcc826947eea71f420f2ce9' + 'b7cb4bb9083f468e632f271b438251bdbce93200a085983f74088b73e7fed8c8' + '921058ee68b5939d49a67f1ed282601611e8fafb1b5539fca02a3fb0a34820c7' + '8c5ba2521e4f8961bc2b843294a0bda0769a43ef7108e95025dd256c87e0319f' + '5eb664ebba8f5aae10035918dabb36a0a74c7f0dff44b4e318ded7f06c228b79' + '8417c5f90c5cd265320792d6ee0e39f7d5aad2ab0cfd1fa74f7ff43d5ab3f4c8' + '7847ae29fb0e2523967d39e7f35b5360ec7eb4d9c381ee9dc433ab9ab4ecff19' + '082c067984e823d15699df95af87a19e4402eb744fa32458c3b4d4a76b8fbc6c' + '9b44cb8d6b505cfbb639cad5a6960a4635d6154df3653c6a68ff75e0fc46aa92' + 'ed1836874b38d5ea81a2ab6e43be00205008932bab57204d33ccf6841d473457' + 'cccfd8af1986973c05b08312530a2368863a60416808bfe3c79cb517cecf3bde' + 'f00584939eadf71608d21ebfe1be6d955bed91ea5c92c7c2b62611ffaa8e1faa' + '79a3b41f3b5ad2c77ca3da5076aa3d26c2e02ece91e617f4c9552f8b873c240c' + '2fddb5d2d196a78a10097011b545a75b79dfc39c4a7b0ce86588111d04ae3a60' + '47a83cdb97cded6f53d740786968cc89f44901fc3dad44be44bd041a483955ab' + 'ac782b93a980504afeb1e9647a9c27bc6ea433873acf70d1faf7307a0f826bdd' + '1d1e39d4f4af2ad8bc0a4551a7e4ccd94e58fe1500fed720c67d3fce026c17ac' + '7a95b4f9b0569f61d5e9db865eeb17d77d3a7d1e0d34a2a79386642ffaeecd40' + '715ad1ac863b8c0f785af3615f63cbc233e14bcca4a95281d0fcf317354fb5e8' + '37c872eabf16c325f8e238c1a28deb3e389223756f9b6e7ef7036fb9a6f3b795' + '51e3647a861b854620f2d7834db5f393d87ba9fea8181648a97f7b5a1ca099ea' + '8f1ffa69dd901cd34ddd5e5803b266a2c4de9035a26245809920f43150ca50f8' + '075752bb779b8dd95fde734e08695abea6a7a397061422f2f3dde067fa5769a8' + '11d640b6fc807406e2f48f83cd4aae063404d03ca3472e2f2c1fdd986dd2564e' + '53e5de731266e0dbae9304d0c08103146bfa18a9bf8cb41793b0a9c266b8b68e' + '11829251bcb1284027117b7acfebf5b3254de7aa741b01d5424aa5c261117b87' + 'c1e5ccbb27c8297a2d1e2058a04056b55a2cd30e09337c5a37c3593483445e47' + 'c99c8e6a035d03b2c66aaccedf84ec5c45283d77ecf353fa6df96826a097101b' + '43ee7a7cf0eef6ade8c362d7648e77d65a39933d28e8334c546da2295682c657' + '8b6183bd587b0d7debe0c249bd2f90892e7d3928aaaa77f8d2d74ba550016881' + '7fbd81d54900d39bbd3941f55f971dfba711f229de8a95c46b3d5e259abd8b47' + 'e7f18dd60b15df485a5e1cb7ff0f77de337d492242192411481df6f7c3998d8b' + 'ef2bb8083468723fd30c34975e05e19ed5990b9e4cc084f30a00755b046be730' + 'cde2befb40649ba789abe323b17743e98d59f159397f0a15278894b05da977e6' + '356754c904a158f145c0982c95b072f827df756160c221f2a6d058f12ab7bca7' + '048849ec5ef9b7370253b311fc06e3c393f350bcb2d213a3343fd84b88297f7e' + '092a4688117d825353c145f59304948afefae0c41e7292b2bb0aab71c1954e3e' + '5c3d34afaef1264b13913bb8effa9065218f246777d3c65e5f163301ce05fb9a' + '509681ca7287445a555a12b20b861945473d91b3a8f4620378366aea34c996a5' + '8fd03ff8d698723cbf5de90efeff30e421997133c103dd04f2efe0d4922ac707' + 'cf27afe1ec0dfa56952829fa1cccfbfaafbd3ad266f9184342d4a69e0182d0b7' + 'c4aa602c53d14c88f3dd29409771c4ce5789dde7c9a372ca86056aeffed0dcd1' + '6a9003bcbe6a4a6d4b1e79b43b1de31e6158d0938a010aaf919880ee9fccf5a6' + '6c41d02ae765d9faf5c46f1ea0f006e68b99b2fa2def8434c0c07df973505860' + 'ddb0b69cabbb5cf05652a3eaf717d02f9044c42e1ca7f8579f504adf2e8771ee' + 'ce3ecc80f22979f68e9e322141bdf63f146655d2732dea95e7ed8b600c936a88' + '465c55d25945ec29f2b699b0a7868473b79bbbad4a4ee37c8e3503fd0a8d2e10' + 'c2ff6b33985422c90594e70f7929d48c5455ac679a6f607770726cab836c8211' + 'a146ba43195b37ac045f432268d874ebf70ac7045e9d596a3a06fa31e56ae21b' + '574bea26c62bae18a904df48d454da2eab06a41d004ed982956b63af78adaf67' + 'c05f2515d7fdd7c3e47f57e8b98554266116a49d58efeb933d6641d44fe21613' + 'ea29f07460c4ce0a6112a083d8c0df877b868eb5ef9558b4aa74b67dcd3f23bb' + 'b1be098710db8d1d6fffca2a1a34b8a0193abd98641ebd70bb60f70a493351c5' + '7958a4277974e4c2ded813ba6423575a1aa390a663ff99ea154909c80296431c' + 'e3f921f80afe8ecc14e2dcb5adb692be2c4e1964ce17b431d3ed6d2fcc577455') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 073ac707e..8afcd744b 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -16,7 +16,7 @@ _pgo=true # We're getting this from Debian Experimental _debname=iceweasel -_debver=37.0.2 +_debver=38.0.1 _debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -52,10 +52,10 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" $pkgname-install-dir.patch vendor.js $pkgname-fixed-loading-icon.png) -sha256sums=('a9af34b1e1a0851c9e65d2908104b4baab8162080b345c568ecc519c375d5728' - '6ec89b187f2a7ed3a092f0f727b6f0e729c3d36d0d0511080253b2c4222949f9' - '831720c1efd6e67d54e70cf4e2b02f9554aa6c914315be6dd2ca837adbbdcabd' - 'fcb11b3e6bef5afb2f41b631c98d05d10f30bae3afda28ad8d29b98db5187909' +sha256sums=('a0011a4e9078cc2e50a48f76fef3506360d3ab32507b0eef47404dc6d3bd022c' + '490daa2deafd0db5a1193b236cf9f595e7330f2edf61b19950d3e52cf0ad6481' + 'aa354e7d4ebe6bc7618dd4bee86c17a55911df27684a7e47b2f4189bb1fc5832' + '659d7740dd7ace5cc4b806a414245e52322492f0b19b45084b2957839c677255' '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' '2257dc69886bd0b72c48675a27c3a88b9cf6b598252c9e9f1c99763180684fc3' '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d' @@ -140,9 +140,6 @@ prepare() { # WebRTC build tries to execute "python" and expects Python 2 ln -s /usr/bin/python2 "$srcdir/path/python" - # Use gold, as Mozilla can use some of its features, such as safe ICF - #ln -s /usr/bin/ld.gold "$srcdir/path/ld" - # configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch index 5e1f7dad4..dea9cc18e 100644 --- a/libre/iceweasel/libre.patch +++ b/libre/iceweasel/libre.patch @@ -158,8 +158,8 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi } diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js ---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2015-03-26 23:20:16.000000000 -0300 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2015-04-01 18:31:13.921464580 -0300 +--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2015-05-08 13:55:12.000000000 -0300 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2015-05-15 06:52:57.450189850 -0300 @@ -5,155 +5,44 @@ "use strict"; @@ -478,7 +478,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil function onSearchSubmit(aEvent) { let searchText = document.getElementById("searchText"); -@@ -380,144 +156,6 @@ +@@ -381,144 +157,6 @@ document.dispatchEvent(event); } @@ -737,8 +737,8 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/too <!-- LOCALIZATION NOTE (options.selectAdditionalTools.label): This is the label for - the heading of group of checkboxes corresponding to the developer tools diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/webide.dtd mozilla-release/browser/locales/en-US/chrome/browser/devtools/webide.dtd ---- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/webide.dtd 2015-02-23 05:39:34.000000000 -0200 -+++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/webide.dtd 2015-02-25 21:33:17.993024651 -0200 +--- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/webide.dtd 2015-05-08 13:55:16.000000000 -0300 ++++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/webide.dtd 2015-05-15 06:52:57.473522026 -0300 @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> @@ -748,7 +748,7 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/web <!ENTITY projectMenu_label "Project"> <!ENTITY projectMenu_accesskey "P"> -@@ -56,7 +56,7 @@ +@@ -58,7 +58,7 @@ <!ENTITY projectButton_label "Open App"> <!ENTITY runtimeButton_label "Select Runtime"> @@ -835,8 +835,8 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in mozilla-release/browser/locales/generic/profile/bookmarks.html.in ---- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in 2015-01-09 02:38:16.000000000 -0200 -+++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2015-01-16 15:03:01.408257268 -0200 +--- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in 2015-05-08 13:55:16.000000000 -0300 ++++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2015-05-15 07:20:33.941389259 -0300 @@ -15,13 +15,20 @@ <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3> <DD>@bookmarks_toolbarfolder_description@ @@ -847,10 +847,10 @@ diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in - <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3> + <DT><H3 ID="rdf:#$YvPhC3">Parabola GNU/Linux-libre</H3> <DL><p> -- <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A> -- <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A> -- <DT><A HREF="https://www.mozilla.org/@AB_CD@/contribute/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A> -- <DT><A HREF="https://www.mozilla.org/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A> +- <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gwMDAsTBZbkNwAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAABNElEQVQ4y8WSsU0DURBE3yyWIaAJaqAAN4DPSL6AlIACKIEOyJEgRsIgOOkiInJqgAKowNg7BHdn7MOksNl+zZ//dvbDf5cAiklp22BdVtXdeTEpDYDB9m1VzU6OJuVp2NdEQCaI96fH2YHG4+mDduKYNMYINTcjcGbXzQVDEAphG0k48zUsajIbnAiMIXThpW8EICE0RAK4dvoKg9NIcTiQ589otyHOZLnwqK5nLwBFUZ4igc3iM0d1ff8CMC6mZ6Ihiaqq3gi1aUAnArD00SW1fq5OLBg0ymYmSZsR2/t4e/rGyCLW0sbp3oq+yTYqVgytQWui2FS7XYF7GFprY921T4CNQt8zr47dNzCkIX7y/jBtH+v+RGMQrc828W8pApnZbmEVQp/Ae7BlOy2ttib81/UFc+WRWEbjckIAAAAASUVORK5CYII=" ID="rdf:#$22iCK1">@firefox_help@</A> +- <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gwMDAsTBZbkNwAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAABNElEQVQ4y8WSsU0DURBE3yyWIaAJaqAAN4DPSL6AlIACKIEOyJEgRsIgOOkiInJqgAKowNg7BHdn7MOksNl+zZ//dvbDf5cAiklp22BdVtXdeTEpDYDB9m1VzU6OJuVp2NdEQCaI96fH2YHG4+mDduKYNMYINTcjcGbXzQVDEAphG0k48zUsajIbnAiMIXThpW8EICE0RAK4dvoKg9NIcTiQ589otyHOZLnwqK5nLwBFUZ4igc3iM0d1ff8CMC6mZ6Ihiaqq3gi1aUAnArD00SW1fq5OLBg0ymYmSZsR2/t4e/rGyCLW0sbp3oq+yTYqVgytQWui2FS7XYF7GFprY921T4CNQt8zr47dNzCkIX7y/jBtH+v+RGMQrc828W8pApnZbmEVQp/Ae7BlOy2ttib81/UFc+WRWEbjckIAAAAASUVORK5CYII=" ID="rdf:#$32iCK1">@firefox_customize@</A> +- <DT><A HREF="https://www.mozilla.org/@AB_CD@/contribute/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gwMDAsTBZbkNwAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAABNElEQVQ4y8WSsU0DURBE3yyWIaAJaqAAN4DPSL6AlIACKIEOyJEgRsIgOOkiInJqgAKowNg7BHdn7MOksNl+zZ//dvbDf5cAiklp22BdVtXdeTEpDYDB9m1VzU6OJuVp2NdEQCaI96fH2YHG4+mDduKYNMYINTcjcGbXzQVDEAphG0k48zUsajIbnAiMIXThpW8EICE0RAK4dvoKg9NIcTiQ589otyHOZLnwqK5nLwBFUZ4igc3iM0d1ff8CMC6mZ6Ihiaqq3gi1aUAnArD00SW1fq5OLBg0ymYmSZsR2/t4e/rGyCLW0sbp3oq+yTYqVgytQWui2FS7XYF7GFprY921T4CNQt8zr47dNzCkIX7y/jBtH+v+RGMQrc828W8pApnZbmEVQp/Ae7BlOy2ttib81/UFc+WRWEbjckIAAAAASUVORK5CYII=" ID="rdf:#$42iCK1">@firefox_community@</A> +- <DT><A HREF="https://www.mozilla.org/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gwMDAsTBZbkNwAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAABNElEQVQ4y8WSsU0DURBE3yyWIaAJaqAAN4DPSL6AlIACKIEOyJEgRsIgOOkiInJqgAKowNg7BHdn7MOksNl+zZ//dvbDf5cAiklp22BdVtXdeTEpDYDB9m1VzU6OJuVp2NdEQCaI96fH2YHG4+mDduKYNMYINTcjcGbXzQVDEAphG0k48zUsajIbnAiMIXThpW8EICE0RAK4dvoKg9NIcTiQ589otyHOZLnwqK5nLwBFUZ4igc3iM0d1ff8CMC6mZ6Ihiaqq3gi1aUAnArD00SW1fq5OLBg0ymYmSZsR2/t4e/rGyCLW0sbp3oq+yTYqVgytQWui2FS7XYF7GFprY921T4CNQt8zr47dNzCkIX7y/jBtH+v+RGMQrc828W8pApnZbmEVQp/Ae7BlOy2ttib81/UFc+WRWEbjckIAAAAASUVORK5CYII=" ID="rdf:#$52iCK1">@firefox_about@</A> + <DT><A HREF="https://www.parabola.nu/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre</A> + <DT><A HREF="https://www.parabola.nu/packages/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Packages</A> + <DT><A HREF="https://wiki.parabola.nu/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Wiki</A> @@ -858,10 +858,10 @@ diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in + </DL><p> + <DT><H3 ID="rdf:#$ZvPhC3">Free Software Foundation</H3> + <DL><p> -+ <DT><A HREF="http://www.fsf.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC">Free Software Foundation</A> -+ <DT><A HREF="http://libreplanet.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACfElEQVQ4jZXTS0hUcRTH8f+9M3fGd0gRRq1a2bZdBAotWtS6TQtB6IHgKzRy0UKqjRaRCAq+R21MDMsUR83JR5fJxhmaK2lzsWAWw+ToEHJxgnFm7reFIgza66z/58P/dzhHcESZpsluIsFPwyCVSmGa5lHPEEIIkdGYTqPPvqUlP4fK8nJ2DINYNEq71YJ3fv4QlAGkUynaj+VRdfUK7580M52rEN/ZYWNjg2GrjEMSPFXsmOn0YcA0TZ4V5tNZUkJTTTWfJiZIJhJ8U1VczwcZs0o4JUHzufM0ZGcf/OQASCaTxGIxDMNA00P8iEbpuXyJ8Tw77+wWJhWZQYuVbiHoFIKwpmUC4XCYzc1NDMMgHo9z8+IFvl6/xsf7D9ArbjOpyAxLEt1C0CUErfvJDwBd14lEImxvb/N9fR1fgY3egmyWsq0sO/poUyw4pb3mLiFolyRM09wDEokEfr+fUChEJBJh4HgBS7kKn92zLIy9ZriqklFZwiEEHfsRRp1O0un0HpDa3cU9M8PKygp3Tp5AzbKgZlmYt1uYtkn02q0MyYKmnBxWNI27Nhtut5tkMrkHmKZJbWkpqqryQpFxKTJTisyEVeaVRWJIlqgpLuZRWRkejwe/34/P58ucwZvWVhYXF5l2uejIzeHGqbM4ZYmB/dy1hUV8mJpibm4On8/H1tbW4T1YXV3F6/WysLDA5Pg4nfsDe5yfz8OiIjweD5qmEQwGf7/KwWCQtbU1NE2jRZbpEoI2SWKqr49lVUXX9T/fAkAgEKC/e5SW6mo6hKD+zGn6e0bw+/x/PyaA9S/rvOwfobGukfpbddyraMDR7iCwHPg34H9KCCF+Abts3KCj/p6aAAAAAElFTkSuQmCC">LibrePlanet</A> -+ <DT><A HREF="http://www.gnu.org/software/gnuzilla/addons.html" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC">Free addons</A> -+ <DT><A HREF="http://www.h-node.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC">h-node</A> ++ <DT><A HREF="https://www.fsf.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC">Free Software Foundation</A> ++ <DT><A HREF="https://www.gnu.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC">The GNU Operating System and the Free Software Movement</A> ++ <DT><A HREF="https://libreplanet.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACfElEQVQ4jZXTS0hUcRTH8f+9M3fGd0gRRq1a2bZdBAotWtS6TQtB6IHgKzRy0UKqjRaRCAq+R21MDMsUR83JR5fJxhmaK2lzsWAWw+ToEHJxgnFm7reFIgza66z/58P/dzhHcESZpsluIsFPwyCVSmGa5lHPEEIIkdGYTqPPvqUlP4fK8nJ2DINYNEq71YJ3fv4QlAGkUynaj+VRdfUK7580M52rEN/ZYWNjg2GrjEMSPFXsmOn0YcA0TZ4V5tNZUkJTTTWfJiZIJhJ8U1VczwcZs0o4JUHzufM0ZGcf/OQASCaTxGIxDMNA00P8iEbpuXyJ8Tw77+wWJhWZQYuVbiHoFIKwpmUC4XCYzc1NDMMgHo9z8+IFvl6/xsf7D9ArbjOpyAxLEt1C0CUErfvJDwBd14lEImxvb/N9fR1fgY3egmyWsq0sO/poUyw4pb3mLiFolyRM09wDEokEfr+fUChEJBJh4HgBS7kKn92zLIy9ZriqklFZwiEEHfsRRp1O0un0HpDa3cU9M8PKygp3Tp5AzbKgZlmYt1uYtkn02q0MyYKmnBxWNI27Nhtut5tkMrkHmKZJbWkpqqryQpFxKTJTisyEVeaVRWJIlqgpLuZRWRkejwe/34/P58ucwZvWVhYXF5l2uejIzeHGqbM4ZYmB/dy1hUV8mJpibm4On8/H1tbW4T1YXV3F6/WysLDA5Pg4nfsDe5yfz8OiIjweD5qmEQwGf7/KwWCQtbU1NE2jRZbpEoI2SWKqr49lVUXX9T/fAkAgEKC/e5SW6mo6hKD+zGn6e0bw+/x/PyaA9S/rvOwfobGukfpbddyraMDR7iCwHPg34H9KCCF+Abts3KCj/p6aAAAAAElFTkSuQmCC">LibrePlanet</A> ++ <DT><A HREF="https://www.h-node.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC">h-node</A> </DL><p> </DL><p> diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/browser/modules/AboutHome.jsm @@ -876,7 +876,7 @@ diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/bro Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); Components.utils.import("resource://gre/modules/Services.jsm"); -@@ -20,66 +20,6 @@ +@@ -20,68 +20,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "Promise", "resource://gre/modules/Promise.jsm"); @@ -887,7 +887,9 @@ diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/bro -const STARTPAGE_VERSION = 4; - -this.AboutHomeUtils = { -- get snippetsVersion() STARTPAGE_VERSION, +- get snippetsVersion() { +- return STARTPAGE_VERSION; +- }, - - /* - * showKnowYourRights - Determines if the user should be shown the @@ -943,7 +945,7 @@ diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/bro /** * This code provides services to the about:home page. Whenever * about:home needs to do something chrome-privileged, it sends a -@@ -242,18 +182,9 @@ +@@ -246,18 +184,9 @@ }).then(function(engineName) { let data = { showRestoreLastSession: ss.canRestoreLastSession, diff --git a/libre/iceweasel/mozconfig b/libre/iceweasel/mozconfig index ab1196522..4b6e783a9 100644 --- a/libre/iceweasel/mozconfig +++ b/libre/iceweasel/mozconfig @@ -35,6 +35,7 @@ ac_add_options --disable-debug-symbols # Parabola features ac_add_options --disable-safe-browsing +ac_add_options --disable-eme # Other mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir diff --git a/libre/kdebase-konqueror/PKGBUILD b/libre/kdebase-konqueror/PKGBUILD index 0b8c3fb2b..617b33bf4 100644 --- a/libre/kdebase-konqueror/PKGBUILD +++ b/libre/kdebase-konqueror/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 238288 2015-04-30 08:34:07Z arojas $ +# $Id: PKGBUILD 238946 2015-05-10 20:32:14Z arojas $ # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> @@ -6,8 +6,8 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname='kdebase-konqueror' -pkgver=15.04.0 -pkgrel=3.parabola1 +pkgver=15.04.1 +pkgrel=1.parabola1 arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/internet/konqueror/" license=('GPL' 'LGPL' 'FDL') @@ -16,10 +16,9 @@ conflicts=('kdebase-nsplugins' 'kdebase-konqueror-libre') replaces=('kdebase-nsplugins' 'kdebase-konqueror-libre') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'baloo4-widgets') source=("http://download.kde.org/stable/applications/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" - 'konq-about-fsdg.diff' 'dolphin-places.patch') -sha1sums=('18ec78a547ca68b110d3b82a12a0001bf62d0b66' - 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a' - 'a3c0536eece94ac288184ceaed3b6bde9241f2dc') + 'konq-about-fsdg.diff') +sha1sums=('099c2d63bd3482936966445950fa290a6dc43550' + 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a') pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') optdepends=('kwebkitpart: to enable webkit engine') @@ -31,8 +30,6 @@ prepare() { cd kde-baseapps-${pkgver} # Don't recommend nonfree software or Google. patch -Np1 -i "${srcdir}/konq-about-fsdg.diff" - # Fix disappearing bookmarks in Dolphin https://bugs.kde.org/show_bug.cgi?id=345174 - patch -p1 -i "$srcdir"/dolphin-places.patch } build() { diff --git a/libre/kdebase-konqueror/dolphin-places.patch b/libre/kdebase-konqueror/dolphin-places.patch deleted file mode 100644 index 2a2bfcba1..000000000 --- a/libre/kdebase-konqueror/dolphin-places.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Emmanuel Pescosta <emmanuelpescosta099@gmail.com> -Date: Thu, 30 Apr 2015 08:12:24 +0000 -Subject: Use user-places.xbel instead of bookmarks.xml in places model. -X-Git-Url: http://quickgit.kde.org/?p=kde-baseapps.git&a=commitdiff&h=270d2affaafcc9e87ba14f82bfe579e22607e2d2 ---- -Use user-places.xbel instead of bookmarks.xml in places model. - -FIXED-IN: 15.04.1 -CCBUG: 345174 ---- - - ---- a/dolphin/src/panels/places/placesitemmodel.cpp -+++ b/dolphin/src/panels/places/placesitemmodel.cpp -@@ -85,8 +85,8 @@ - Baloo::IndexerConfig config; - m_fileIndexingEnabled = config.fileIndexingEnabled(); - #endif -- const QString file = KStandardDirs::locateLocal("data", "kfileplaces/bookmarks.xml"); -- m_bookmarkManager = KBookmarkManager::managerForFile(file, "kfilePlaces"); -+ const QString file = KStandardDirs().localxdgdatadir() + "user-places.xbel"; -+ m_bookmarkManager = KBookmarkManager::managerForExternalFile(file); - - createSystemBookmarks(); - initializeAvailableDevices(); - diff --git a/libre/kdebase-runtime/PKGBUILD b/libre/kdebase-runtime/PKGBUILD index 7d17fd5f3..14c7a85a9 100644 --- a/libre/kdebase-runtime/PKGBUILD +++ b/libre/kdebase-runtime/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 237798 2015-04-20 18:54:26Z arojas $ +# $Id: PKGBUILD 238946 2015-05-10 20:32:14Z arojas $ # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> @@ -6,8 +6,8 @@ pkgbase=kdebase-runtime pkgname=kdebase-runtime -pkgver=15.04.0 -pkgrel=4.parabola1 +pkgver=15.04.1 +pkgrel=1.parabola1 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kde-runtime' @@ -17,7 +17,7 @@ makedepends=('kdelibs' 'libkactivities4' 'smbclient' 'libssh' 'libcanberra' 'lib source=("http://download.kde.org/stable/applications/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" 'duckduckgo_html.desktop' 'duckduckgo_lite.desktop') -sha1sums=('5cbfec48ead85a1cd3dab675b98623dd4a831d91' +sha1sums=('73ac23a97bc81b3e988a214ee1342743e516c74c' 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd' 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b') diff --git a/libre/kdelibs/PKGBUILD b/libre/kdelibs/PKGBUILD index 066aad9b7..9c11da583 100644 --- a/libre/kdelibs/PKGBUILD +++ b/libre/kdelibs/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 238284 2015-04-30 08:28:34Z arojas $ +# $Id: PKGBUILD 238946 2015-05-10 20:32:14Z arojas $ # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=kdelibs -pkgver=4.14.7 -_kdeappver=15.04.0 -pkgrel=2.parabola1 +pkgver=4.14.8 +_kdeappver=15.04.1 +pkgrel=1.parabola1 pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -21,12 +21,11 @@ depends=('attica-qt4' 'libxss' 'krb5' 'qca' 'libdbusmenu-qt' 'polkit-qt4' makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa' 'grantlee-qt4') install=${pkgname}.install source=("http://download.kde.org/stable/applications/${_kdeappver}/src/${pkgname}-${pkgver}.tar.xz" - 'kde-applications-menu.patch' 'khtml-fsdg.diff' 'qt4.patch' 'dolphin-places.patch') -sha1sums=('6de82328f692717b97ad6833109a564a7b6a0a9a' + 'kde-applications-menu.patch' 'khtml-fsdg.diff' 'qt4.patch') +sha1sums=('98b174dbbbef340bcfc11b819405d8e838cac34c' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'a1502a964081ad583a00cf90c56e74bf60121830' - 'ed1f57ee661e5c7440efcaba7e51d2554709701c' - 'a53959b740b66054f981139430f91885657d5e94') + 'ed1f57ee661e5c7440efcaba7e51d2554709701c') prepare() { mkdir build @@ -37,8 +36,6 @@ prepare() { patch -p1 -i "${srcdir}"/khtml-fsdg.diff # qmake refers to Qt5 patch -p1 -i "${srcdir}"/qt4.patch - # fix disappearing bookmarks in Dolphin https://bugs.kde.org/show_bug.cgi?id=345174 - patch -p1 -i "$srcdir"/dolphin-places.patch } build() { diff --git a/libre/kdelibs/dolphin-places.patch b/libre/kdelibs/dolphin-places.patch deleted file mode 100644 index a43812eff..000000000 --- a/libre/kdelibs/dolphin-places.patch +++ /dev/null @@ -1,119 +0,0 @@ -From: Emmanuel Pescosta <emmanuelpescosta099@gmail.com> -Date: Wed, 29 Apr 2015 14:02:02 +0000 -Subject: Remove bookmarks syncing from KFilePlacesModel and use user-places.xbel only. -X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=5c0a31a2f2a46aa44b8c34baae67b6951b2abcaf ---- -Remove bookmarks syncing from KFilePlacesModel and use user-places.xbel only. - -FIXED-IN: 4.14.8 -BUG: 345174 -REVIEW: 123568 ---- - - ---- a/kfile/CMakeLists.txt -+++ b/kfile/CMakeLists.txt -@@ -22,7 +22,6 @@ - kfilewidget.cpp - kfileplacesitem.cpp - kfileplacesmodel.cpp -- kfileplacessharedbookmarks.cpp - kfileplacesview.cpp - kfileplaceeditdialog.cpp - kfilepreviewgenerator.cpp - ---- a/kfile/kfileplacesmodel.cpp -+++ b/kfile/kfileplacesmodel.cpp -@@ -19,7 +19,6 @@ - */ - #include "kfileplacesmodel.h" - #include "kfileplacesitem_p.h" --#include "kfileplacessharedbookmarks_p.h" - - #ifdef _WIN32_WCE - #include "Windows.h" -@@ -61,10 +60,9 @@ - class KFilePlacesModel::Private - { - public: -- Private(KFilePlacesModel *self) : q(self), bookmarkManager(0), sharedBookmarks(0) {} -+ Private(KFilePlacesModel *self) : q(self), bookmarkManager(0) {} - ~Private() - { -- delete sharedBookmarks; - qDeleteAll(items); - } - -@@ -76,7 +74,6 @@ - - Solid::Predicate predicate; - KBookmarkManager *bookmarkManager; -- KFilePlacesSharedBookmarks * sharedBookmarks; - - void reloadAndSignal(); - QList<KFilePlacesItem *> loadBookmarkList(); -@@ -93,8 +90,8 @@ - KFilePlacesModel::KFilePlacesModel(QObject *parent) - : QAbstractItemModel(parent), d(new Private(this)) - { -- const QString file = KStandardDirs::locateLocal("data", "kfileplaces/bookmarks.xml"); -- d->bookmarkManager = KBookmarkManager::managerForFile(file, "kfilePlaces"); -+ const QString file = KStandardDirs().localxdgdatadir() + "user-places.xbel"; -+ d->bookmarkManager = KBookmarkManager::managerForExternalFile(file); - - // Let's put some places in there if it's empty. We have a corner case here: - // Given you have bookmarked some folders (which have been saved on -@@ -145,9 +142,6 @@ - // user-places.xbel will be filled later). (ereslibre) - d->bookmarkManager->saveAs(file); - } -- -- // create after, so if we have own places, they are added afterwards, in case of equal priorities -- d->sharedBookmarks = new KFilePlacesSharedBookmarks(d->bookmarkManager); - - QString predicate("[[[[ StorageVolume.ignored == false AND [ StorageVolume.usage == 'FileSystem' OR StorageVolume.usage == 'Encrypted' ]]" - " OR " -@@ -632,8 +626,6 @@ - return false; - } - -- d->sharedBookmarks->updateSharedBookmarks(); -- - d->reloadAndSignal(); - - return true; -@@ -660,8 +652,6 @@ - KFilePlacesItem *item = static_cast<KFilePlacesItem*>(after.internalPointer()); - d->bookmarkManager->root().moveBookmark(bookmark, item->bookmark()); - } -- -- d->sharedBookmarks->updateSharedBookmarks(); - - d->reloadAndSignal(); - } -@@ -684,8 +674,6 @@ - bookmark.setIcon(iconName); - bookmark.setMetaDataItem("OnlyInApp", appName); - -- d->sharedBookmarks->updateSharedBookmarks(); -- - d->reloadAndSignal(); - emit dataChanged(index, index); - } -@@ -703,7 +691,6 @@ - if (bookmark.isNull()) return; - - d->bookmarkManager->root().deleteBookmark(bookmark); -- d->sharedBookmarks->updateSharedBookmarks(); - d->reloadAndSignal(); - } - -@@ -718,8 +705,6 @@ - if (bookmark.isNull()) return; - - bookmark.setMetaDataItem("IsHidden", (hidden ? "true" : "false")); -- -- d->sharedBookmarks->updateSharedBookmarks(); - - d->reloadAndSignal(); - emit dataChanged(index, index); diff --git a/libre/kdenetwork-kopete/PKGBUILD b/libre/kdenetwork-kopete/PKGBUILD index fb715f7e1..87290ac9a 100644 --- a/libre/kdenetwork-kopete/PKGBUILD +++ b/libre/kdenetwork-kopete/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 236016 2015-04-10 06:56:26Z arojas $ +# $Id: PKGBUILD 238946 2015-05-10 20:32:14Z arojas $ # Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=kdenetwork-kopete -pkgver=15.04.0 +pkgver=15.04.1 pkgrel=1.parabola1 pkgdesc='Instant Messenger, without nonfree Skype support' url='http://kde.org/applications/internet/kopete/' @@ -17,7 +17,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepim-libkdepim' 'mediastreamer' 'libg optdepends=('mediastreamer: jingle support' 'libgadu: Gadu-Gadu protocol') install=${pkgname}.install source=("http://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz") -sha1sums=('c287f0fdfc179d97a634320dd54aebcba08561d9') +sha1sums=('18d3061ecfc7e287408d3842ed690e128520fd40') prepare() { cd kopete-${pkgver} diff --git a/libre/kdeutils-ark/PKGBUILD b/libre/kdeutils-ark/PKGBUILD index 50b8c2b7c..0d73786c4 100644 --- a/libre/kdeutils-ark/PKGBUILD +++ b/libre/kdeutils-ark/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 236016 2015-04-10 06:56:26Z arojas $ +# $Id: PKGBUILD 238946 2015-05-10 20:32:14Z arojas $ # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=kdeutils-ark -pkgver=15.04.0 +pkgver=15.04.1 pkgrel=1.parabola1 pkgdesc='Archiving Tool, with unar support' url='http://kde.org/applications/utilities/ark/' @@ -19,7 +19,7 @@ optdepends=('p7zip' 'zip' 'unzip' 'unar') install=${pkgname}.install source=("http://download.kde.org/stable/applications/${pkgver}/src/ark-${pkgver}.tar.xz" 'ark-unar-06.patch') -sha1sums=('7f5d5bd32ab472e2c17f51d9ee19d16cdb9c9fbe' +sha1sums=('dcfe0c465c9c51b402d2192058126caee206ad8c' 'a0a836950f185d9b2245204579f969203036fdec') prepare() { diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 75e5c9649..d67658e7e 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -9,11 +9,11 @@ pkgdesc="Programs for Parabola development" url="https://projects.parabola.nu/packages/libretools.git/" license=('GPL3' 'GPL2') -pkgver=20150105.1 -_libretools_commit=9c33131ece34a52341b1a31606d56329371fcce8 -_devtools_commit=5f4e575914fd597d31e5b9edd203eb6a8aa1306a -md5sums=('bcb043b5869e5b2b26d470f0b631d4b3' - '4fbe3aa6e7f87fa720547a8832d3419c') +pkgver=20150526 +_libretools_commit=a608070d29143f11826725ae0261bf0dcd902bc2 +_devtools_commit=b04dc724f01f47107b31b791950d22c27aca7d9b +md5sums=('81c7681cb6e8b94fa87e18cd8e4ef61a' + '84ce76368ddca3bd02198ebc4e85ab3f') _packages_url=https://projects.parabola.nu/packages source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2 diff --git a/libre/liferea/PKGBUILD b/libre/liferea/PKGBUILD index 18933bb68..96bb8e6a2 100644 --- a/libre/liferea/PKGBUILD +++ b/libre/liferea/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 232403 2015-03-02 03:49:28Z eric $ +# $Id: PKGBUILD 238777 2015-05-09 23:20:06Z eric $ # Maintainer (Arch): Eric Bélanger <eric@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> # Contributor: bitlord pkgname=liferea -pkgver=1.10.14 +pkgver=1.10.15 pkgrel=1.parabola1 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ conflicts=('liferea-libre') license=('GPL') depends=('webkitgtk' 'libnotify' 'json-glib' 'libpeas' 'python2-gobject' 'gnome-icon-theme' 'desktop-file-utils') -makedepends=('intltool') +makedepends=('intltool' 'gobject-introspection') optdepends=('gnome-keyring: for keyring plugin support' 'libgnome-keyring: for keyring plugin support' 'gst-plugins-base: for media player plugin support' @@ -24,8 +24,8 @@ options=('!emptydirs') install=liferea.install source=(https://github.com/lwindolf/liferea/releases/download/v${pkgver}/liferea-${pkgver}.tar.bz2 remove-non-free-suggestions.patch) -sha1sums=('ffdd505d01473b1ec29a3da292632f474b9b83fb' - '855de60c91b5fee71c7ec88dd04b7d24a02dc0d1') +sha1sums=('5325d1fc06417abd4de5568fa87daf0c7f3e9c82' + 'e787f9209415ed2574e54b020cf449268ece3583') build() { cd liferea-${pkgver} diff --git a/libre/liferea/remove-non-free-suggestions.patch b/libre/liferea/remove-non-free-suggestions.patch index 5024f19ee..b2a01bb49 100644 --- a/libre/liferea/remove-non-free-suggestions.patch +++ b/libre/liferea/remove-non-free-suggestions.patch @@ -1,20 +1,19 @@ -diff --git a/src/browser.c b/src/browser.c -index f91901f..28b0c2b 100644 ---- a/src/browser.c -+++ b/src/browser.c -@@ -35,23 +35,16 @@ static struct browser browsers[] = { +diff -Nur liferea-1.10.15.orig/src/browser.c liferea-1.10.15/src/browser.c +--- liferea-1.10.15.orig/src/browser.c 2015-04-20 18:22:55.000000000 -0300 ++++ liferea-1.10.15/src/browser.c 2015-05-11 05:02:46.503659599 -0300 +@@ -35,23 +35,16 @@ NULL, NULL }, { - /* tested with Firefox 1.5 and 2.0 */ - "firefox", "Firefox", "firefox \"%s\"", -- NULL, "firefox -a firefox -remote \"openURL(%s)\"", -- NULL, "firefox -a firefox -remote 'openURL(%s,new-window)'", -- NULL, "firefox -a firefox -remote 'openURL(%s,new-tab)'" -+ "iceweasel", "Iceweasel", "iceweasel %s", -+ NULL, "iceweasel \"%s\"", -+ NULL, "iceweasel -new-window \"%s\"", -+ NULL, "iceweasel -new-tab \"%s\"" +- "firefox \"%s\"", NULL, +- "firefox -a firefox -new-window \"%s\"", NULL, +- "firefox -a firefox -new-tab \"%s\"", NULL ++ "icecat", "Icecat", "icecat \"%s\"", ++ "icecat \"%s\"", NULL, ++ "icecat -a icecat -new-window \"%s\"", NULL, ++ "icecat -a icecat -new-tab \"%s\"", NULL }, { - "google-chrome", "Chrome", "google-chrome \"%s\"", @@ -27,14 +26,14 @@ index f91901f..28b0c2b 100644 - "opera \"%s\"", "opera -remote \"openURL(%s)\"", - "opera -newwindow \"%s\"", NULL, - "opera -newpage \"%s\"", NULL -+ "icecat", "Icecat", "icecat %s", -+ NULL, "icecat \"%s\"", -+ NULL, "icecat -new-window \"%s\"", -+ NULL, "icecat -new-tab \"%s\"" ++ "iceweasel", "Iceweasel", "iceweasel \"%s\"", ++ "iceweasel \"%s\"", NULL, ++ "iceweasel -a iceweasel -new-window \"%s\"", NULL, ++ "iceweasel -a iceweasel -new-tab \"%s\"", NULL }, { "epiphany", "Epiphany", "epiphany \"%s\"", -@@ -60,13 +53,6 @@ static struct browser browsers[] = { +@@ -60,13 +53,6 @@ "epiphany -n \"%s\"", NULL }, { diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD index 7b378033e..770e5d75a 100644 --- a/libre/linux-libre-api-headers/PKGBUILD +++ b/libre/linux-libre-api-headers/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 231100 2015-02-07 10:33:26Z allan $ +# $Id: PKGBUILD 237944 2015-04-23 05:19:11Z allan $ # Maintainer (Arch): Allan McRae <allan@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> # Contributor: Luke Shumaker <lukeshu@sbcglobal.net> @@ -6,8 +6,8 @@ # toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=linux-libre-api-headers -_pkgbasever=3.18-gnu -_pkgver=3.18.5-gnu +_pkgbasever=4.0-gnu +_pkgver=${_pkgbasever} _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*} @@ -21,12 +21,10 @@ provides=( "linux-api-headers=${_archpkgver}") conflicts=('linux-api-headers') replaces=( 'linux-api-headers') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz.sign" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz.sign") -md5sums=('b3c2a6827813398dde7e8a2d4e02a2c3' - 'SKIP' - '703db9a7b1c55dcbb2878eaa8e38b0e4' + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz.sign") + #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz" + #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz.sign") +md5sums=('87edb0b508abb8d8484bc08daa2ee96d' 'SKIP') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva diff --git a/libre/linux-libre-grsec/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch b/libre/linux-libre-grsec/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch deleted file mode 100644 index 4e801b3cc..000000000 --- a/libre/linux-libre-grsec/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch +++ /dev/null @@ -1,66 +0,0 @@ -From b27b2ff4bd6f0327ee550baa0397ccf0a559821f Mon Sep 17 00:00:00 2001 -From: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Wed, 1 Apr 2015 13:40:48 +0200 -Subject: [PATCH] drm/i915: Dont enable CS_PARSER_ERROR interrupts at all - -We stopped handling them in - -commit aaecdf611a05cac26a94713bad25297e60225c29 -Author: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Tue Nov 4 15:52:22 2014 +0100 - - drm/i915: Stop gathering error states for CS error interrupts - -but just clearing is apparently not enough: A sufficiently dead gpu -left behind by firmware (*cough* coreboot *cough*) can keep the gpu in -an endless loop of such interrupts, eventually leading to the nmi -firing. And definitely to what looks like a machine hang. - -Since we don't even enable these interrupts on gen5+ let's do the same -on earlier platforms. - -Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=93171 -Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> ---- - drivers/gpu/drm/i915/i915_irq.c | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c -index 14ecb4d13a1a..6d494432b19f 100644 ---- a/drivers/gpu/drm/i915/i915_irq.c -+++ b/drivers/gpu/drm/i915/i915_irq.c -@@ -3598,14 +3598,12 @@ static int i8xx_irq_postinstall(struct drm_device *dev) - ~(I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | - I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT | -- I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT); -+ I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT); - I915_WRITE16(IMR, dev_priv->irq_mask); - - I915_WRITE16(IER, - I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT | - I915_USER_INTERRUPT); - POSTING_READ16(IER); - -@@ -3767,14 +3765,12 @@ static int i915_irq_postinstall(struct drm_device *dev) - I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | - I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT | -- I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT); -+ I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT); - - enable_mask = - I915_ASLE_INTERRUPT | - I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT | - I915_USER_INTERRUPT; - - if (I915_HAS_HOTPLUG(dev)) { --- -2.1.4 - diff --git a/libre/linux-libre/4.0-rc7-37af2c8aae-loongson-community.patch b/libre/linux-libre-grsec/4.0.2-ae91f13af5-loongson-community.patch index 36edc2945..c550ff3da 100644 --- a/libre/linux-libre/4.0-rc7-37af2c8aae-loongson-community.patch +++ b/libre/linux-libre-grsec/4.0.2-ae91f13af5-loongson-community.patch @@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile -index 54430f9..09d9a42 100644 +index 0649a60..d43fa5e 100644 --- a/Makefile +++ b/Makefile @@ -297,8 +297,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ @@ -2174,19 +2174,20 @@ index 0000000..b296220 + gdium_usb_host_fixup); +#endif diff --git a/arch/mips/power/hibernate.S b/arch/mips/power/hibernate.S -index 32a7c82..3a89502 100644 +index e7567c8..498e42d 100644 --- a/arch/mips/power/hibernate.S +++ b/arch/mips/power/hibernate.S -@@ -43,7 +43,9 @@ LEAF(swsusp_arch_resume) - bne t1, t3, 1b - PTR_L t0, PBE_NEXT(t0) - bnez t0, 0b +@@ -30,8 +30,10 @@ LEAF(swsusp_arch_suspend) + END(swsusp_arch_suspend) + + LEAF(swsusp_arch_resume) +#if !defined(CONFIG_MACH_LOONGSON) || !defined(CONFIG_CPU_LOONGSON2) /* Commit 771004298d broke Loongson2. */ - jal local_flush_tlb_all /* Avoid TLB mismatch after kernel resume */ + /* Avoid TLB mismatch during and after kernel resume */ + jal local_flush_tlb_all +#endif - PTR_LA t0, saved_regs - PTR_L ra, PT_R31(t0) - PTR_L sp, PT_R29(t0) + PTR_L t0, restore_pblist + 0: + PTR_L t1, PBE_ADDRESS(t0) /* source */ diff --git a/drivers/cpufreq/loongson2_cpufreq.c b/drivers/cpufreq/loongson2_cpufreq.c index fc897ba..ac60f6b 100644 --- a/drivers/cpufreq/loongson2_cpufreq.c @@ -2475,10 +2476,10 @@ index 0000000..67cc095 +MODULE_LICENSE("GPL"); + diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h -index 9c47867..a3e1258 100644 +index 7fe5590..3087a7f 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -1021,6 +1021,9 @@ +@@ -1025,6 +1025,9 @@ #define USB_VENDOR_ID_ZYTRONIC 0x14c8 #define USB_DEVICE_ID_ZYTRONIC_ZXY100 0x0005 diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD index b23737a31..d946e9050 100644 --- a/libre/linux-libre-grsec/PKGBUILD +++ b/libre/linux-libre-grsec/PKGBUILD @@ -12,9 +12,9 @@ pkgbase=linux-libre-grsec # Build kernel with -grsec localname _pkgbasever=4.0-gnu -_pkgver=4.0.1-gnu +_pkgver=4.0.4-gnu _grsecver=3.1 -_timestamp=201505042053 +_timestamp=201505222222 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -33,37 +33,35 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz.sign" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz.sign" - "https://grsecurity.net/test/grsecurity-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch" - "https://grsecurity.net/test/grsecurity-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch.sig" + "https://repo.parabola.nu/other/grsecurity-libre/test/grsecurity-libre-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch" + "https://repo.parabola.nu/other/grsecurity-libre/test/grsecurity-libre-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch.sig" # the main kernel config files 'config.i686' 'config.x86_64' 'config.mips64el' # standard config files for mkinitcpio ramdisk 'linux.preset' 'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm} 'change-default-console-loglevel.patch' - '0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch' # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/ # Note: Makefile patching was removed due which we are using specific flags from grsecurity patch - '4.0-rc7-37af2c8aae-loongson-community.patch') + '4.0.2-ae91f13af5-loongson-community.patch') sha256sums=('0e2dd5be12c1f82ab3d03b89cbe3f1a20e14332ec42c102efb226a6283fdd38a' 'SKIP' - 'b99335ed7c60ba2701d81923de4e3e9efbbfa3ad0782e7d94cd48b92adb1fbd6' + 'e447de9a53c5aefd25f0474f3304ab87076b88353badaae20dcbd85712e85e61' 'SKIP' - '9944bf62201fa0ad86bc9d4a5e0368d64967b626933261868b2402547abd039b' + '880b46fd8ac5690587aa0a8db8445956bbab62d12b72c28b78a5dfe05d3ef5b7' 'SKIP' - 'd1b2bfc86563d522562850556a2dd39f41b91b992cb4d839551e44e8d9df0ae3' - '92580d3bd2f8c66ccc9467e9a4bfbc012e90a3d32953503750309313755a3ea2' - 'cfb811c37f4b04bbc93cd87c5d1fa3bff2bcdd6e28bffce703d49beb9f3877d6' + 'd4e66b81d29d5048f072b3eda89b12e1564c2b3c9d0e27f9efbd7290b52cc9ee' + '5c12d80d81dbde43c138acf69a036640a28c8b49c02c8547033a60a0fecc9f08' + '3383ed8dfa70ec91275e52c12965c2e265fffe494c2ee1904c20e3d2773a5993' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a' '13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '66cb2d859b253bc4e793baa3c0b95523d647a773b957dbc79b3eaacccf8692b5' - '8a070d193bc54db696b38ac844cfbfd62724f483ad74c9a288ccab462c32f80e') + '13e141279af2bc17decfc041e015710daac9a6cd1c9b4e871a76cb8f916b9e22') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva - 'DE9452CE46F42094907F108B44D1C0F82525FE49' # Bradley Spengler + 'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva ) _kernelname=${pkgbase#linux-libre} @@ -84,8 +82,8 @@ prepare() { patch -p1 -i "${srcdir}/patch-${_pkgbasever}-${_pkgver}" fi - # add grsecurity patches - patch -Np1 -i "${srcdir}/grsecurity-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch" + # add grsecurity patches (without nonfree bnx2 firmware patching) + patch -Np1 -i "${srcdir}/grsecurity-libre-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch" rm localversion-grsec # add freedo as boot logo @@ -100,13 +98,9 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" - # drm/i915: Stop gathering error states for CS error interrupts - # https://bugzilla.kernel.org/show_bug.cgi?id=93171 - patch -p1 -i "${srcdir}/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch" - # Adding loongson-community patch if [ "${CARCH}" == "mips64el" ]; then - patch -p1 -i ${srcdir}/4.0-rc7-37af2c8aae-loongson-community.patch + patch -p1 -i ${srcdir}/4.0.2-ae91f13af5-loongson-community.patch fi cat "${srcdir}/config.${CARCH}" > ./.config diff --git a/libre/linux-libre-grsec/config.i686 b/libre/linux-libre-grsec/config.i686 index 703e061c3..34d4907b2 100644 --- a/libre/linux-libre-grsec/config.i686 +++ b/libre/linux-libre-grsec/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.0.1-gnu-201505031602-1-grsec Kernel Configuration +# Linux/x86 4.0.4-gnu-201505182014-1-grsec Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -151,8 +151,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -# CONFIG_MEMCG_KMEM is not set +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y @@ -838,7 +838,7 @@ CONFIG_TCP_CONG_DCTCP=m CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set +CONFIG_TCP_MD5SIG=y CONFIG_IPV6=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y @@ -3190,6 +3190,7 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_AD714X_SPI=m +# CONFIG_INPUT_ARIZONA_HAPTICS is not set CONFIG_INPUT_BMA150=m CONFIG_INPUT_E3X0_BUTTON=m CONFIG_INPUT_PCSPKR=m @@ -3646,7 +3647,7 @@ CONFIG_POWER_RESET_GPIO=y # CONFIG_POWER_RESET_RESTART is not set # CONFIG_POWER_RESET_SYSCON is not set CONFIG_POWER_AVS=y -CONFIG_HWMON=m +CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3804,6 +3805,7 @@ CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_OF=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set @@ -4313,6 +4315,7 @@ CONFIG_RADIO_SI4713=m CONFIG_USB_SI4713=m CONFIG_PLATFORM_SI4713=m CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI476X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m @@ -4824,8 +4827,10 @@ CONFIG_SOUND_OSS_CORE=y CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m +CONFIG_SND_DMAENGINE_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_JACK=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m @@ -5036,7 +5041,109 @@ CONFIG_SND_BEBOB=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m -# CONFIG_SND_SOC is not set +CONFIG_SND_SOC=m +CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y +# CONFIG_SND_ATMEL_SOC is not set +CONFIG_SND_DESIGNWARE_I2S=m + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +# CONFIG_SND_SOC_FSL_ASRC is not set +# CONFIG_SND_SOC_FSL_SAI is not set +# CONFIG_SND_SOC_FSL_SSI is not set +# CONFIG_SND_SOC_FSL_SPDIF is not set +# CONFIG_SND_SOC_FSL_ESAI is not set +# CONFIG_SND_SOC_IMX_AUDMUX is not set +CONFIG_SND_SST_MFLD_PLATFORM=m +CONFIG_SND_SST_IPC=m +CONFIG_SND_SST_IPC_ACPI=m +CONFIG_SND_SOC_INTEL_SST=m +CONFIG_SND_SOC_INTEL_SST_ACPI=m +CONFIG_SND_SOC_INTEL_HASWELL=m +CONFIG_SND_SOC_INTEL_BAYTRAIL=m +CONFIG_SND_SOC_INTEL_HASWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m +CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m +# CONFIG_SND_SOC_XTFPGA_I2S is not set +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +# CONFIG_SND_SOC_ADAU1701 is not set +# CONFIG_SND_SOC_AK4104 is not set +# CONFIG_SND_SOC_AK4554 is not set +# CONFIG_SND_SOC_AK4642 is not set +# CONFIG_SND_SOC_AK5386 is not set +# CONFIG_SND_SOC_ALC5623 is not set +# CONFIG_SND_SOC_CS35L32 is not set +# CONFIG_SND_SOC_CS42L51_I2C is not set +# CONFIG_SND_SOC_CS42L52 is not set +# CONFIG_SND_SOC_CS42L56 is not set +# CONFIG_SND_SOC_CS42L73 is not set +# CONFIG_SND_SOC_CS4265 is not set +# CONFIG_SND_SOC_CS4270 is not set +# CONFIG_SND_SOC_CS4271_I2C is not set +# CONFIG_SND_SOC_CS4271_SPI is not set +# CONFIG_SND_SOC_CS42XX8_I2C is not set +CONFIG_SND_SOC_HDMI_CODEC=m +# CONFIG_SND_SOC_ES8328 is not set +CONFIG_SND_SOC_MAX98090=m +# CONFIG_SND_SOC_PCM1681 is not set +# CONFIG_SND_SOC_PCM1792A is not set +# CONFIG_SND_SOC_PCM512x_I2C is not set +# CONFIG_SND_SOC_PCM512x_SPI is not set +CONFIG_SND_SOC_RL6231=m +CONFIG_SND_SOC_RT286=m +# CONFIG_SND_SOC_RT5631 is not set +CONFIG_SND_SOC_RT5640=m +CONFIG_SND_SOC_RT5645=m +CONFIG_SND_SOC_RT5670=m +# CONFIG_SND_SOC_RT5677_SPI is not set +# CONFIG_SND_SOC_SGTL5000 is not set +CONFIG_SND_SOC_SI476X=m +# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set +CONFIG_SND_SOC_SPDIF=m +# CONFIG_SND_SOC_SSM2602_SPI is not set +# CONFIG_SND_SOC_SSM2602_I2C is not set +# CONFIG_SND_SOC_SSM4567 is not set +# CONFIG_SND_SOC_STA32X is not set +# CONFIG_SND_SOC_STA350 is not set +# CONFIG_SND_SOC_TAS2552 is not set +# CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TFA9879 is not set +# CONFIG_SND_SOC_TLV320AIC23_I2C is not set +# CONFIG_SND_SOC_TLV320AIC23_SPI is not set +# CONFIG_SND_SOC_TLV320AIC31XX is not set +# CONFIG_SND_SOC_TLV320AIC3X is not set +# CONFIG_SND_SOC_TS3A227E is not set +# CONFIG_SND_SOC_WM8510 is not set +# CONFIG_SND_SOC_WM8523 is not set +# CONFIG_SND_SOC_WM8580 is not set +# CONFIG_SND_SOC_WM8711 is not set +# CONFIG_SND_SOC_WM8728 is not set +# CONFIG_SND_SOC_WM8731 is not set +# CONFIG_SND_SOC_WM8737 is not set +# CONFIG_SND_SOC_WM8741 is not set +# CONFIG_SND_SOC_WM8750 is not set +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8770 is not set +# CONFIG_SND_SOC_WM8776 is not set +# CONFIG_SND_SOC_WM8804 is not set +# CONFIG_SND_SOC_WM8903 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_TPA6130A2 is not set +CONFIG_SND_SIMPLE_CARD=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m @@ -6233,6 +6340,7 @@ CONFIG_EXTCON=m # Extcon Device Drivers # # CONFIG_EXTCON_ADC_JACK is not set +# CONFIG_EXTCON_ARIZONA is not set CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_RT8973A is not set CONFIG_EXTCON_SM5502=m @@ -7307,7 +7415,7 @@ CONFIG_CRYPTO_CRC32_PCLMUL=m CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m diff --git a/libre/linux-libre-grsec/config.mips64el b/libre/linux-libre-grsec/config.mips64el index 599589376..f7001ed72 100644 --- a/libre/linux-libre-grsec/config.mips64el +++ b/libre/linux-libre-grsec/config.mips64el @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/mips 4.0.1-gnu-201505042053-1-grsec Kernel Configuration +# Linux/mips 4.0.4-gnu-201505182014-1-grsec Kernel Configuration # CONFIG_MIPS=y @@ -271,8 +271,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -# CONFIG_MEMCG_KMEM is not set +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -626,7 +626,7 @@ CONFIG_TCP_CONG_ILLINOIS=m CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set +CONFIG_TCP_MD5SIG=y CONFIG_IPV6=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y @@ -2811,6 +2811,7 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_AD714X_SPI=m +# CONFIG_INPUT_ARIZONA_HAPTICS is not set CONFIG_INPUT_BMA150=m # CONFIG_INPUT_E3X0_BUTTON is not set CONFIG_INPUT_MC13783_PWRBUTTON=m @@ -3184,7 +3185,7 @@ CONFIG_POWER_RESET=y # CONFIG_POWER_RESET_BRCMSTB is not set # CONFIG_POWER_RESET_RESTART is not set CONFIG_POWER_AVS=y -CONFIG_HWMON=m +CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3324,6 +3325,7 @@ CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set @@ -3778,6 +3780,7 @@ CONFIG_RADIO_SI4713=m CONFIG_USB_SI4713=m CONFIG_PLATFORM_SI4713=m CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI476X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m @@ -4231,6 +4234,7 @@ CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_JACK=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m @@ -4395,7 +4399,87 @@ CONFIG_SND_BEBOB=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m -# CONFIG_SND_SOC is not set +CONFIG_SND_SOC=m +# CONFIG_SND_ATMEL_SOC is not set + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +# CONFIG_SND_SOC_FSL_ASRC is not set +# CONFIG_SND_SOC_FSL_SAI is not set +# CONFIG_SND_SOC_FSL_SSI is not set +# CONFIG_SND_SOC_FSL_SPDIF is not set +# CONFIG_SND_SOC_FSL_ESAI is not set +# CONFIG_SND_SOC_IMX_AUDMUX is not set +# CONFIG_SND_SOC_XTFPGA_I2S is not set +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +# CONFIG_SND_SOC_ADAU1701 is not set +# CONFIG_SND_SOC_AK4104 is not set +# CONFIG_SND_SOC_AK4554 is not set +# CONFIG_SND_SOC_AK4642 is not set +# CONFIG_SND_SOC_AK5386 is not set +# CONFIG_SND_SOC_ALC5623 is not set +# CONFIG_SND_SOC_CS35L32 is not set +# CONFIG_SND_SOC_CS42L51_I2C is not set +# CONFIG_SND_SOC_CS42L52 is not set +# CONFIG_SND_SOC_CS42L56 is not set +# CONFIG_SND_SOC_CS42L73 is not set +# CONFIG_SND_SOC_CS4265 is not set +# CONFIG_SND_SOC_CS4270 is not set +# CONFIG_SND_SOC_CS4271_I2C is not set +# CONFIG_SND_SOC_CS4271_SPI is not set +# CONFIG_SND_SOC_CS42XX8_I2C is not set +CONFIG_SND_SOC_HDMI_CODEC=m +# CONFIG_SND_SOC_ES8328 is not set +# CONFIG_SND_SOC_PCM1681 is not set +# CONFIG_SND_SOC_PCM1792A is not set +# CONFIG_SND_SOC_PCM512x_I2C is not set +# CONFIG_SND_SOC_PCM512x_SPI is not set +# CONFIG_SND_SOC_RT5631 is not set +# CONFIG_SND_SOC_RT5677_SPI is not set +# CONFIG_SND_SOC_SGTL5000 is not set +CONFIG_SND_SOC_SI476X=m +# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set +CONFIG_SND_SOC_SPDIF=m +# CONFIG_SND_SOC_SSM2602_SPI is not set +# CONFIG_SND_SOC_SSM2602_I2C is not set +# CONFIG_SND_SOC_SSM4567 is not set +# CONFIG_SND_SOC_STA32X is not set +# CONFIG_SND_SOC_STA350 is not set +# CONFIG_SND_SOC_TAS2552 is not set +# CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TFA9879 is not set +# CONFIG_SND_SOC_TLV320AIC23_I2C is not set +# CONFIG_SND_SOC_TLV320AIC23_SPI is not set +# CONFIG_SND_SOC_TLV320AIC31XX is not set +# CONFIG_SND_SOC_TLV320AIC3X is not set +# CONFIG_SND_SOC_TS3A227E is not set +# CONFIG_SND_SOC_WM8510 is not set +# CONFIG_SND_SOC_WM8523 is not set +# CONFIG_SND_SOC_WM8580 is not set +# CONFIG_SND_SOC_WM8711 is not set +# CONFIG_SND_SOC_WM8728 is not set +# CONFIG_SND_SOC_WM8731 is not set +# CONFIG_SND_SOC_WM8737 is not set +# CONFIG_SND_SOC_WM8741 is not set +# CONFIG_SND_SOC_WM8750 is not set +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8770 is not set +# CONFIG_SND_SOC_WM8776 is not set +# CONFIG_SND_SOC_WM8804 is not set +# CONFIG_SND_SOC_WM8903 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_TPA6130A2 is not set +CONFIG_SND_SIMPLE_CARD=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m @@ -5380,6 +5464,7 @@ CONFIG_EXTCON=m # Extcon Device Drivers # # CONFIG_EXTCON_ADC_JACK is not set +# CONFIG_EXTCON_ARIZONA is not set CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_RT8973A is not set # CONFIG_EXTCON_SM5502 is not set @@ -6365,7 +6450,7 @@ CONFIG_CRYPTO_CRC32=m CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m diff --git a/libre/linux-libre-grsec/config.x86_64 b/libre/linux-libre-grsec/config.x86_64 index 53dc4920d..b5f475fac 100644 --- a/libre/linux-libre-grsec/config.x86_64 +++ b/libre/linux-libre-grsec/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.0.1-gnu-201505031602-1-grsec Kernel Configuration +# Linux/x86 4.0.4-gnu-201505182014-1-grsec Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -159,8 +159,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -# CONFIG_MEMCG_KMEM is not set +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y @@ -822,7 +822,7 @@ CONFIG_TCP_CONG_DCTCP=m CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set +CONFIG_TCP_MD5SIG=y CONFIG_IPV6=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y @@ -3079,6 +3079,7 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_AD714X_SPI=m +# CONFIG_INPUT_ARIZONA_HAPTICS is not set CONFIG_INPUT_BMA150=m CONFIG_INPUT_E3X0_BUTTON=m CONFIG_INPUT_PCSPKR=m @@ -3496,7 +3497,7 @@ CONFIG_CHARGER_BQ24735=m CONFIG_POWER_RESET=y # CONFIG_POWER_RESET_RESTART is not set CONFIG_POWER_AVS=y -CONFIG_HWMON=m +CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3653,6 +3654,7 @@ CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set @@ -4142,6 +4144,7 @@ CONFIG_RADIO_SI4713=m CONFIG_USB_SI4713=m CONFIG_PLATFORM_SI4713=m CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI476X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m @@ -4632,8 +4635,10 @@ CONFIG_SOUND_OSS_CORE=y CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m +CONFIG_SND_DMAENGINE_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_JACK=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m @@ -4803,7 +4808,109 @@ CONFIG_SND_BEBOB=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m -# CONFIG_SND_SOC is not set +CONFIG_SND_SOC=m +CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y +# CONFIG_SND_ATMEL_SOC is not set +CONFIG_SND_DESIGNWARE_I2S=m + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +# CONFIG_SND_SOC_FSL_ASRC is not set +# CONFIG_SND_SOC_FSL_SAI is not set +# CONFIG_SND_SOC_FSL_SSI is not set +# CONFIG_SND_SOC_FSL_SPDIF is not set +# CONFIG_SND_SOC_FSL_ESAI is not set +# CONFIG_SND_SOC_IMX_AUDMUX is not set +CONFIG_SND_SST_MFLD_PLATFORM=m +CONFIG_SND_SST_IPC=m +CONFIG_SND_SST_IPC_ACPI=m +CONFIG_SND_SOC_INTEL_SST=m +CONFIG_SND_SOC_INTEL_SST_ACPI=m +CONFIG_SND_SOC_INTEL_HASWELL=m +CONFIG_SND_SOC_INTEL_BAYTRAIL=m +CONFIG_SND_SOC_INTEL_HASWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m +CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m +# CONFIG_SND_SOC_XTFPGA_I2S is not set +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +# CONFIG_SND_SOC_ADAU1701 is not set +# CONFIG_SND_SOC_AK4104 is not set +# CONFIG_SND_SOC_AK4554 is not set +# CONFIG_SND_SOC_AK4642 is not set +# CONFIG_SND_SOC_AK5386 is not set +# CONFIG_SND_SOC_ALC5623 is not set +# CONFIG_SND_SOC_CS35L32 is not set +# CONFIG_SND_SOC_CS42L51_I2C is not set +# CONFIG_SND_SOC_CS42L52 is not set +# CONFIG_SND_SOC_CS42L56 is not set +# CONFIG_SND_SOC_CS42L73 is not set +# CONFIG_SND_SOC_CS4265 is not set +# CONFIG_SND_SOC_CS4270 is not set +# CONFIG_SND_SOC_CS4271_I2C is not set +# CONFIG_SND_SOC_CS4271_SPI is not set +# CONFIG_SND_SOC_CS42XX8_I2C is not set +CONFIG_SND_SOC_HDMI_CODEC=m +# CONFIG_SND_SOC_ES8328 is not set +CONFIG_SND_SOC_MAX98090=m +# CONFIG_SND_SOC_PCM1681 is not set +# CONFIG_SND_SOC_PCM1792A is not set +# CONFIG_SND_SOC_PCM512x_I2C is not set +# CONFIG_SND_SOC_PCM512x_SPI is not set +CONFIG_SND_SOC_RL6231=m +CONFIG_SND_SOC_RT286=m +# CONFIG_SND_SOC_RT5631 is not set +CONFIG_SND_SOC_RT5640=m +CONFIG_SND_SOC_RT5645=m +CONFIG_SND_SOC_RT5670=m +# CONFIG_SND_SOC_RT5677_SPI is not set +# CONFIG_SND_SOC_SGTL5000 is not set +CONFIG_SND_SOC_SI476X=m +# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set +CONFIG_SND_SOC_SPDIF=m +# CONFIG_SND_SOC_SSM2602_SPI is not set +# CONFIG_SND_SOC_SSM2602_I2C is not set +# CONFIG_SND_SOC_SSM4567 is not set +# CONFIG_SND_SOC_STA32X is not set +# CONFIG_SND_SOC_STA350 is not set +# CONFIG_SND_SOC_TAS2552 is not set +# CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TFA9879 is not set +# CONFIG_SND_SOC_TLV320AIC23_I2C is not set +# CONFIG_SND_SOC_TLV320AIC23_SPI is not set +# CONFIG_SND_SOC_TLV320AIC31XX is not set +# CONFIG_SND_SOC_TLV320AIC3X is not set +# CONFIG_SND_SOC_TS3A227E is not set +# CONFIG_SND_SOC_WM8510 is not set +# CONFIG_SND_SOC_WM8523 is not set +# CONFIG_SND_SOC_WM8580 is not set +# CONFIG_SND_SOC_WM8711 is not set +# CONFIG_SND_SOC_WM8728 is not set +# CONFIG_SND_SOC_WM8731 is not set +# CONFIG_SND_SOC_WM8737 is not set +# CONFIG_SND_SOC_WM8741 is not set +# CONFIG_SND_SOC_WM8750 is not set +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8770 is not set +# CONFIG_SND_SOC_WM8776 is not set +# CONFIG_SND_SOC_WM8804 is not set +# CONFIG_SND_SOC_WM8903 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_TPA6130A2 is not set +CONFIG_SND_SIMPLE_CARD=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m @@ -5930,6 +6037,7 @@ CONFIG_EXTCON=m # Extcon Device Drivers # # CONFIG_EXTCON_ADC_JACK is not set +# CONFIG_EXTCON_ARIZONA is not set CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_RT8973A is not set CONFIG_EXTCON_SM5502=m @@ -7001,7 +7109,7 @@ CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index fa2557be6..3916be539 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-lts # Build kernel with -lts localname _pkgbasever=3.14-gnu -_pkgver=3.14.40-gnu +_pkgver=3.14.43-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -38,15 +38,16 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch' '0003-module-remove-MODULE_GENERIC_TABLE.patch' '0006-genksyms-fix-typeof-handling.patch' + 'gcc5_buildfixes.diff' # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/ '3.14.26-8475f027b4-loongson-community.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'SKIP' - 'ce132b3c3e72019cea2ab9bf5cb11871531ee60f06157e9ed8edf2115fa07693' + '1c8d7336a4176e3a96de49688cb268cc5e7a44063d32a2597a339094f3f7cc16' 'SKIP' - 'a3d5c9546d61a84c93e59ba0a5cd725715b87cb1171aa224ff1ff960331e3fb1' - '66edce909f5e051966c42ed104effb2fb706ef1340a4e248b184059f0ae90ab8' - '18a94cb727c2cae80b1dbd3cddbb1e5484458d4c01b026b69cea68bc2df162d7' + 'b4cc9c49948fc1d571c27ddeddd93b5b499ccc17fb06fa75bfe41ecddfbc12e4' + '3fa8ce26aea9b5e596ccfc842baa3f2a8be8ef4a62bc13d75e8da2bafd89141c' + 'f15f2cf744d402e575713e4d500b82e7bcf8983aef5c97f82dcc9400ba4487f0' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a' @@ -56,6 +57,7 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29' '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d' 'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7' + '470d6d019d288dce02b4a9758a34ea71d41715663a19a164749212a470a131e7' '7c2d1e257acce0ea6f260f3acf18e30e21c12a9a6b3d7d1d4097dafd287388e2') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva @@ -83,6 +85,12 @@ prepare() { install -m644 -t drivers/video/logo \ "${srcdir}/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm} + # buildfixes for gcc5 + # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/scsi/qla2xxx/qla_nx2.c?id=9493c2422cae272d6f1f567cbb424195defe4176 + # https://lkml.org/lkml/2014/11/9/27 + # https://lkml.org/lkml/2014/12/14/55 + patch -p1 -i "${srcdir}/gcc5_buildfixes.diff" + # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index 70e91244f..cd24fdfcb 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -1870,7 +1870,7 @@ CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m -CONFIG_MEGARAID_SAS=m +# CONFIG_MEGARAID_SAS is not set CONFIG_SCSI_MPT2SAS=m CONFIG_SCSI_MPT2SAS_MAX_SGE=128 # CONFIG_SCSI_MPT2SAS_LOGGING is not set @@ -5631,21 +5631,21 @@ CONFIG_FB_OLPC_DCON=m CONFIG_FB_OLPC_DCON_1=y CONFIG_FB_OLPC_DCON_1_5=y # CONFIG_PANEL is not set -CONFIG_R8187SE=m +# CONFIG_R8187SE is not set CONFIG_RTL8192U=m CONFIG_RTLLIB=m CONFIG_RTLLIB_CRYPTO_CCMP=m CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m -CONFIG_RTL8192E=m -CONFIG_R8712U=m +# CONFIG_RTL8192E is not set +# CONFIG_R8712U is not set CONFIG_R8188EU=m CONFIG_88EU_AP_MODE=y CONFIG_88EU_P2P=y CONFIG_R8821AE=m CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set -CONFIG_RTS5208=m +# CONFIG_RTS5208 is not set # CONFIG_RTS5208_DEBUG is not set # CONFIG_TRANZPORT is not set CONFIG_IDE_PHISON=m @@ -5655,8 +5655,8 @@ CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m CONFIG_VT6656=m CONFIG_DX_SEP=m -CONFIG_WLAGS49_H2=m -CONFIG_WLAGS49_H25=m +# CONFIG_WLAGS49_H2 is not set +# CONFIG_WLAGS49_H25 is not set CONFIG_FB_SM7XX=m CONFIG_CRYSTALHD=m CONFIG_FB_XGI=m diff --git a/libre/linux-libre-lts/config.mips64el b/libre/linux-libre-lts/config.mips64el index 96a39960a..96426a215 100644 --- a/libre/linux-libre-lts/config.mips64el +++ b/libre/linux-libre-lts/config.mips64el @@ -1603,7 +1603,7 @@ CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m -CONFIG_MEGARAID_SAS=m +# CONFIG_MEGARAID_SAS is not set CONFIG_SCSI_MPT2SAS=m CONFIG_SCSI_MPT2SAS_MAX_SGE=128 # CONFIG_SCSI_MPT2SAS_LOGGING is not set @@ -5051,21 +5051,21 @@ CONFIG_COMEDI_DAS08=m CONFIG_COMEDI_NI_LABPC=m CONFIG_COMEDI_NI_TIO=m # CONFIG_PANEL is not set -CONFIG_R8187SE=m +# CONFIG_R8187SE is not set CONFIG_RTL8192U=m CONFIG_RTLLIB=m CONFIG_RTLLIB_CRYPTO_CCMP=m CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m -CONFIG_RTL8192E=m -CONFIG_R8712U=m +# CONFIG_RTL8192E is not set +# CONFIG_R8712U is not set CONFIG_R8188EU=m CONFIG_88EU_AP_MODE=y CONFIG_88EU_P2P=y CONFIG_R8821AE=m CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set -CONFIG_RTS5208=m +# CONFIG_RTS5208 is not set # CONFIG_RTS5208_DEBUG is not set # CONFIG_TRANZPORT is not set CONFIG_IDE_PHISON=m @@ -5075,8 +5075,8 @@ CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m CONFIG_VT6656=m CONFIG_DX_SEP=m -CONFIG_WLAGS49_H2=m -CONFIG_WLAGS49_H25=m +# CONFIG_WLAGS49_H2 is not set +# CONFIG_WLAGS49_H25 is not set CONFIG_FB_SM7XX=m CONFIG_CRYSTALHD=m CONFIG_FB_XGI=m diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64 index 71b21d7c9..ec000e4ac 100644 --- a/libre/linux-libre-lts/config.x86_64 +++ b/libre/linux-libre-lts/config.x86_64 @@ -1834,7 +1834,7 @@ CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m -CONFIG_MEGARAID_SAS=m +# CONFIG_MEGARAID_SAS is not set CONFIG_SCSI_MPT2SAS=m CONFIG_SCSI_MPT2SAS_MAX_SGE=128 # CONFIG_SCSI_MPT2SAS_LOGGING is not set @@ -5420,21 +5420,21 @@ CONFIG_COMEDI_DAS08=m CONFIG_COMEDI_NI_LABPC=m CONFIG_COMEDI_NI_TIO=m # CONFIG_PANEL is not set -CONFIG_R8187SE=m +# CONFIG_R8187SE is not set CONFIG_RTL8192U=m CONFIG_RTLLIB=m CONFIG_RTLLIB_CRYPTO_CCMP=m CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m -CONFIG_RTL8192E=m -CONFIG_R8712U=m +# CONFIG_RTL8192E is not set +# CONFIG_R8712U is not set CONFIG_R8188EU=m CONFIG_88EU_AP_MODE=y CONFIG_88EU_P2P=y CONFIG_R8821AE=m CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set -CONFIG_RTS5208=m +# CONFIG_RTS5208 is not set # CONFIG_RTS5208_DEBUG is not set # CONFIG_TRANZPORT is not set CONFIG_IDE_PHISON=m @@ -5444,8 +5444,8 @@ CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m CONFIG_VT6656=m CONFIG_DX_SEP=m -CONFIG_WLAGS49_H2=m -CONFIG_WLAGS49_H25=m +# CONFIG_WLAGS49_H2 is not set +# CONFIG_WLAGS49_H25 is not set CONFIG_FB_SM7XX=m CONFIG_CRYSTALHD=m CONFIG_FB_XGI=m diff --git a/libre/linux-libre-lts/gcc5_buildfixes.diff b/libre/linux-libre-lts/gcc5_buildfixes.diff new file mode 100644 index 000000000..f29d60674 --- /dev/null +++ b/libre/linux-libre-lts/gcc5_buildfixes.diff @@ -0,0 +1,115 @@ +From 9493c2422cae272d6f1f567cbb424195defe4176 Mon Sep 17 00:00:00 2001 +From: Chen Gang <gang.chen.5i5j@gmail.com> +Date: Sat, 1 Nov 2014 19:46:12 +0800 +Subject: qla2xxx: remove redundant declaration in 'qla_gbl.h' + +Remove 2 redundant extern inline functions: qla8044_set_qsnt_ready() and +qla8044_need_reset_handler(). At present, within upstream next kernel +source code, they are only used within "drivers/scsi/qla2xxx/qla_nx2.c". + +The related error and warnings (with allmodconfig under tile): + + CC [M] drivers/scsi/qla2xxx/qla_nx2.o + drivers/scsi/qla2xxx/qla_nx2.c:1633:1: error: static declaration of 'qla8044_need_reset_handler' follows non-static declaration + qla8044_need_reset_handler(struct scsi_qla_host *vha) + ^ + In file included from drivers/scsi/qla2xxx/qla_def.h:3706:0, + from drivers/scsi/qla2xxx/qla_nx2.c:11: + drivers/scsi/qla2xxx/qla_gbl.h:756:20: note: previous declaration of 'qla8044_need_reset_handler' was here + extern inline void qla8044_need_reset_handler(struct scsi_qla_host *vha); + ^ + drivers/scsi/qla2xxx/qla_gbl.h:756:20: warning: inline function 'qla8044_need_reset_handler' declared but never defined + make[3]: *** [drivers/scsi/qla2xxx/qla_nx2.o] Error 1 + make[2]: *** [drivers/scsi/qla2xxx] Error 2 + make[1]: *** [drivers/scsi] Error 2 + make: *** [drivers] Error 2 + + CC [M] drivers/scsi/qla2xxx/qla_tmpl.o + In file included from drivers/scsi/qla2xxx/qla_def.h:3706:0, + from drivers/scsi/qla2xxx/qla_tmpl.c:7: + drivers/scsi/qla2xxx/qla_gbl.h:755:20: warning: inline function 'qla8044_set_qsnt_ready' declared but never defined + extern inline void qla8044_set_qsnt_ready(struct scsi_qla_host *vha); + ^ + +Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com> +Acked-by: Saurav Kashyap <saurav.kashyap@qlogic.com> +Signed-off-by: Christoph Hellwig <hch@lst.de> + +diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h +index b1865a7..7686bfe 100644 +--- a/drivers/scsi/qla2xxx/qla_gbl.h ++++ b/drivers/scsi/qla2xxx/qla_gbl.h +@@ -752,8 +752,6 @@ extern void qla8044_set_idc_dontreset(struct scsi_qla_host *ha); + extern int qla8044_rd_direct(struct scsi_qla_host *vha, const uint32_t crb_reg); + extern void qla8044_wr_direct(struct scsi_qla_host *vha, + const uint32_t crb_reg, const uint32_t value); +-extern inline void qla8044_set_qsnt_ready(struct scsi_qla_host *vha); +-extern inline void qla8044_need_reset_handler(struct scsi_qla_host *vha); + extern int qla8044_device_state_handler(struct scsi_qla_host *vha); + extern void qla8044_clear_qsnt_ready(struct scsi_qla_host *vha); + extern void qla8044_clear_drv_active(struct qla_hw_data *); +diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c +index 24a8528..ed4d6b6 100644 +--- a/drivers/scsi/qla2xxx/qla_nx2.c ++++ b/drivers/scsi/qla2xxx/qla_nx2.c +@@ -238,7 +238,7 @@ qla8044_rmw_crb_reg(struct scsi_qla_host *vha, + return; + } + +-inline void ++static inline void + qla8044_set_qsnt_ready(struct scsi_qla_host *vha) + { + uint32_t qsnt_state; +-- +cgit v0.10.2 + +diff --git a/lib/mpi/mpi-inline.h b/lib/mpi/mpi-inline.h +index e2b3985..c245ea3 100644 +--- a/lib/mpi/mpi-inline.h ++++ b/lib/mpi/mpi-inline.h +@@ -30,7 +30,7 @@ + #define G10_MPI_INLINE_H + + #ifndef G10_MPI_INLINE_DECL +-#define G10_MPI_INLINE_DECL extern inline ++#define G10_MPI_INLINE_DECL static inline + #endif + + G10_MPI_INLINE_DECL mpi_limb_t +diff --git a/lib/mpi/mpi-internal.h b/lib/mpi/mpi-internal.h +index 60cf765..91ef8ac 100644 +--- a/lib/mpi/mpi-internal.h ++++ b/lib/mpi/mpi-internal.h +@@ -168,20 +168,24 @@ void mpi_rshift_limbs(MPI a, unsigned int count); + int mpi_lshift_limbs(MPI a, unsigned int count); + + /*-- mpihelp-add.c --*/ ++#ifndef __GNUC__ + mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, + mpi_size_t s1_size, mpi_limb_t s2_limb); +-mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, +- mpi_ptr_t s2_ptr, mpi_size_t size); + mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size, + mpi_ptr_t s2_ptr, mpi_size_t s2_size); ++#endif ++mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, ++ mpi_ptr_t s2_ptr, mpi_size_t size); + + /*-- mpihelp-sub.c --*/ ++#ifndef __GNUC__ + mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, + mpi_size_t s1_size, mpi_limb_t s2_limb); +-mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, +- mpi_ptr_t s2_ptr, mpi_size_t size); + mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size, + mpi_ptr_t s2_ptr, mpi_size_t s2_size); ++#endif ++mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, ++ mpi_ptr_t s2_ptr, mpi_size_t size); + + /*-- mpihelp-cmp.c --*/ + int mpihelp_cmp(mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size); +-- +1.9.3 + diff --git a/libre/linux-libre/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch b/libre/linux-libre/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch deleted file mode 100644 index 4e801b3cc..000000000 --- a/libre/linux-libre/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch +++ /dev/null @@ -1,66 +0,0 @@ -From b27b2ff4bd6f0327ee550baa0397ccf0a559821f Mon Sep 17 00:00:00 2001 -From: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Wed, 1 Apr 2015 13:40:48 +0200 -Subject: [PATCH] drm/i915: Dont enable CS_PARSER_ERROR interrupts at all - -We stopped handling them in - -commit aaecdf611a05cac26a94713bad25297e60225c29 -Author: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Tue Nov 4 15:52:22 2014 +0100 - - drm/i915: Stop gathering error states for CS error interrupts - -but just clearing is apparently not enough: A sufficiently dead gpu -left behind by firmware (*cough* coreboot *cough*) can keep the gpu in -an endless loop of such interrupts, eventually leading to the nmi -firing. And definitely to what looks like a machine hang. - -Since we don't even enable these interrupts on gen5+ let's do the same -on earlier platforms. - -Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=93171 -Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> ---- - drivers/gpu/drm/i915/i915_irq.c | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c -index 14ecb4d13a1a..6d494432b19f 100644 ---- a/drivers/gpu/drm/i915/i915_irq.c -+++ b/drivers/gpu/drm/i915/i915_irq.c -@@ -3598,14 +3598,12 @@ static int i8xx_irq_postinstall(struct drm_device *dev) - ~(I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | - I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT | -- I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT); -+ I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT); - I915_WRITE16(IMR, dev_priv->irq_mask); - - I915_WRITE16(IER, - I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT | - I915_USER_INTERRUPT); - POSTING_READ16(IER); - -@@ -3767,14 +3765,12 @@ static int i915_irq_postinstall(struct drm_device *dev) - I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | - I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT | -- I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT); -+ I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT); - - enable_mask = - I915_ASLE_INTERRUPT | - I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT | - I915_USER_INTERRUPT; - - if (I915_HAS_HOTPLUG(dev)) { --- -2.1.4 - diff --git a/libre/linux-libre-grsec/4.0-rc7-37af2c8aae-loongson-community.patch b/libre/linux-libre/4.0.2-ae91f13af5-loongson-community.patch index 5fb2ec0b7..c550ff3da 100644 --- a/libre/linux-libre-grsec/4.0-rc7-37af2c8aae-loongson-community.patch +++ b/libre/linux-libre/4.0.2-ae91f13af5-loongson-community.patch @@ -1,3 +1,27 @@ +diff --git a/Makefile b/Makefile +index 0649a60..d43fa5e 100644 +--- a/Makefile ++++ b/Makefile +@@ -297,8 +297,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ + + HOSTCC = gcc + HOSTCXX = g++ +-HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89 +-HOSTCXXFLAGS = -O2 ++HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O3 -fomit-frame-pointer -std=gnu89 ++HOSTCXXFLAGS = -O3 + + ifeq ($(shell $(HOSTCC) -v 2>&1 | grep -c "clang version"), 1) + HOSTCFLAGS += -Wno-unused-value -Wno-unused-parameter \ +@@ -616,7 +616,7 @@ KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,) + ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE + KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,) + else +-KBUILD_CFLAGS += -O2 ++KBUILD_CFLAGS += -O3 + endif + + # Tell gcc to never replace conditional load with a non-conditional one diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index c7a1690..0f854f0 100644 --- a/arch/mips/Kconfig @@ -2150,19 +2174,20 @@ index 0000000..b296220 + gdium_usb_host_fixup); +#endif diff --git a/arch/mips/power/hibernate.S b/arch/mips/power/hibernate.S -index 32a7c82..3a89502 100644 +index e7567c8..498e42d 100644 --- a/arch/mips/power/hibernate.S +++ b/arch/mips/power/hibernate.S -@@ -43,7 +43,9 @@ LEAF(swsusp_arch_resume) - bne t1, t3, 1b - PTR_L t0, PBE_NEXT(t0) - bnez t0, 0b +@@ -30,8 +30,10 @@ LEAF(swsusp_arch_suspend) + END(swsusp_arch_suspend) + + LEAF(swsusp_arch_resume) +#if !defined(CONFIG_MACH_LOONGSON) || !defined(CONFIG_CPU_LOONGSON2) /* Commit 771004298d broke Loongson2. */ - jal local_flush_tlb_all /* Avoid TLB mismatch after kernel resume */ + /* Avoid TLB mismatch during and after kernel resume */ + jal local_flush_tlb_all +#endif - PTR_LA t0, saved_regs - PTR_L ra, PT_R31(t0) - PTR_L sp, PT_R29(t0) + PTR_L t0, restore_pblist + 0: + PTR_L t1, PBE_ADDRESS(t0) /* source */ diff --git a/drivers/cpufreq/loongson2_cpufreq.c b/drivers/cpufreq/loongson2_cpufreq.c index fc897ba..ac60f6b 100644 --- a/drivers/cpufreq/loongson2_cpufreq.c @@ -2451,10 +2476,10 @@ index 0000000..67cc095 +MODULE_LICENSE("GPL"); + diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h -index 9c47867..a3e1258 100644 +index 7fe5590..3087a7f 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -1021,6 +1021,9 @@ +@@ -1025,6 +1025,9 @@ #define USB_VENDOR_ID_ZYTRONIC 0x14c8 #define USB_DEVICE_ID_ZYTRONIC_ZXY100 0x0005 diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 951f6429a..51c10d7c1 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre # Build stock "" kernel _pkgbasever=4.0-gnu -_pkgver=4.0.1-gnu +_pkgver=4.0.4-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -18,7 +18,7 @@ _replacesoldmodules=('linux-libre%-kmod-alx') # '%' gets replaced with _kernelna _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/_} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -33,24 +33,24 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li # standard config files for mkinitcpio ramdisk 'linux.preset' 'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm} + 'md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch' 'change-default-console-loglevel.patch' - '0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch' # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/ - '4.0-rc7-37af2c8aae-loongson-community.patch') + '4.0.2-ae91f13af5-loongson-community.patch') sha256sums=('0e2dd5be12c1f82ab3d03b89cbe3f1a20e14332ec42c102efb226a6283fdd38a' 'SKIP' - 'b99335ed7c60ba2701d81923de4e3e9efbbfa3ad0782e7d94cd48b92adb1fbd6' + 'e447de9a53c5aefd25f0474f3304ab87076b88353badaae20dcbd85712e85e61' 'SKIP' - '872203c34c5db72a1dc62e8152c89c90469743b39f3e91cbdb1f9bb5c24ab4c1' - '2d76fb20424573559289ab061312971ae1a508a15375513c9f28e5cb84f4515a' - '4e05992849d2db2caaa3cc56f307c82ca4376441d4cad51a5f3611f10866a2a4' + '5fa50ffbe7b6e82c70d1d15947c34caa0b484ecd264f01149f40b910e7c8f394' + '33f68753bc12456e601492f870f7e04cd116f36b81630d9bad954093d72bc57a' + '7b6954ed843d17149129cc04064d00db791767ad8b7dca5a4833a2febafce50a' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a' '13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74' + 'bc83293e64653d60793708a0e277741f57c018f5ea3551a8aff3a220df917ceb' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '66cb2d859b253bc4e793baa3c0b95523d647a773b957dbc79b3eaacccf8692b5' - '6fd223e0e11421f87ff4c913b61636ecbbecf249f431ba87a1288463b847f26c') + '13e141279af2bc17decfc041e015710daac9a6cd1c9b4e871a76cb8f916b9e22') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva ) @@ -80,18 +80,17 @@ prepare() { # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git + # https://bugzilla.kernel.org/show_bug.cgi?id=98501 + patch -Np1 -i "${srcdir}/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch" + # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" - # drm/i915: Stop gathering error states for CS error interrupts - # https://bugzilla.kernel.org/show_bug.cgi?id=93171 - patch -p1 -i "${srcdir}/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch" - # Adding loongson-community patch if [ "${CARCH}" == "mips64el" ]; then - patch -p1 -i ${srcdir}/4.0-rc7-37af2c8aae-loongson-community.patch + patch -p1 -i ${srcdir}/4.0.2-ae91f13af5-loongson-community.patch fi cat "${srcdir}/config.${CARCH}" > ./.config diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 0219f13de..bb9de9662 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.0.0-gnu-1 Kernel Configuration +# Linux/x86 4.0.4-gnu-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -151,8 +151,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -# CONFIG_MEMCG_KMEM is not set +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y @@ -851,7 +851,7 @@ CONFIG_TCP_CONG_DCTCP=m CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set +CONFIG_TCP_MD5SIG=y CONFIG_IPV6=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y @@ -3202,6 +3202,7 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_AD714X_SPI=m +# CONFIG_INPUT_ARIZONA_HAPTICS is not set CONFIG_INPUT_BMA150=m CONFIG_INPUT_E3X0_BUTTON=m CONFIG_INPUT_PCSPKR=m @@ -3660,7 +3661,7 @@ CONFIG_POWER_RESET_GPIO=y # CONFIG_POWER_RESET_RESTART is not set # CONFIG_POWER_RESET_SYSCON is not set CONFIG_POWER_AVS=y -CONFIG_HWMON=m +CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3818,6 +3819,7 @@ CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_OF=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set @@ -4327,6 +4329,7 @@ CONFIG_RADIO_SI4713=m CONFIG_USB_SI4713=m CONFIG_PLATFORM_SI4713=m CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI476X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m @@ -4838,8 +4841,10 @@ CONFIG_SOUND_OSS_CORE=y CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m +CONFIG_SND_DMAENGINE_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_JACK=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m @@ -5050,7 +5055,109 @@ CONFIG_SND_BEBOB=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m -# CONFIG_SND_SOC is not set +CONFIG_SND_SOC=m +CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y +# CONFIG_SND_ATMEL_SOC is not set +CONFIG_SND_DESIGNWARE_I2S=m + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +# CONFIG_SND_SOC_FSL_ASRC is not set +# CONFIG_SND_SOC_FSL_SAI is not set +# CONFIG_SND_SOC_FSL_SSI is not set +# CONFIG_SND_SOC_FSL_SPDIF is not set +# CONFIG_SND_SOC_FSL_ESAI is not set +# CONFIG_SND_SOC_IMX_AUDMUX is not set +CONFIG_SND_SST_MFLD_PLATFORM=m +CONFIG_SND_SST_IPC=m +CONFIG_SND_SST_IPC_ACPI=m +CONFIG_SND_SOC_INTEL_SST=m +CONFIG_SND_SOC_INTEL_SST_ACPI=m +CONFIG_SND_SOC_INTEL_HASWELL=m +CONFIG_SND_SOC_INTEL_BAYTRAIL=m +CONFIG_SND_SOC_INTEL_HASWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m +CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m +# CONFIG_SND_SOC_XTFPGA_I2S is not set +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +# CONFIG_SND_SOC_ADAU1701 is not set +# CONFIG_SND_SOC_AK4104 is not set +# CONFIG_SND_SOC_AK4554 is not set +# CONFIG_SND_SOC_AK4642 is not set +# CONFIG_SND_SOC_AK5386 is not set +# CONFIG_SND_SOC_ALC5623 is not set +# CONFIG_SND_SOC_CS35L32 is not set +# CONFIG_SND_SOC_CS42L51_I2C is not set +# CONFIG_SND_SOC_CS42L52 is not set +# CONFIG_SND_SOC_CS42L56 is not set +# CONFIG_SND_SOC_CS42L73 is not set +# CONFIG_SND_SOC_CS4265 is not set +# CONFIG_SND_SOC_CS4270 is not set +# CONFIG_SND_SOC_CS4271_I2C is not set +# CONFIG_SND_SOC_CS4271_SPI is not set +# CONFIG_SND_SOC_CS42XX8_I2C is not set +CONFIG_SND_SOC_HDMI_CODEC=m +# CONFIG_SND_SOC_ES8328 is not set +CONFIG_SND_SOC_MAX98090=m +# CONFIG_SND_SOC_PCM1681 is not set +# CONFIG_SND_SOC_PCM1792A is not set +# CONFIG_SND_SOC_PCM512x_I2C is not set +# CONFIG_SND_SOC_PCM512x_SPI is not set +CONFIG_SND_SOC_RL6231=m +CONFIG_SND_SOC_RT286=m +# CONFIG_SND_SOC_RT5631 is not set +CONFIG_SND_SOC_RT5640=m +CONFIG_SND_SOC_RT5645=m +CONFIG_SND_SOC_RT5670=m +# CONFIG_SND_SOC_RT5677_SPI is not set +# CONFIG_SND_SOC_SGTL5000 is not set +CONFIG_SND_SOC_SI476X=m +# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set +CONFIG_SND_SOC_SPDIF=m +# CONFIG_SND_SOC_SSM2602_SPI is not set +# CONFIG_SND_SOC_SSM2602_I2C is not set +# CONFIG_SND_SOC_SSM4567 is not set +# CONFIG_SND_SOC_STA32X is not set +# CONFIG_SND_SOC_STA350 is not set +# CONFIG_SND_SOC_TAS2552 is not set +# CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TFA9879 is not set +# CONFIG_SND_SOC_TLV320AIC23_I2C is not set +# CONFIG_SND_SOC_TLV320AIC23_SPI is not set +# CONFIG_SND_SOC_TLV320AIC31XX is not set +# CONFIG_SND_SOC_TLV320AIC3X is not set +# CONFIG_SND_SOC_TS3A227E is not set +# CONFIG_SND_SOC_WM8510 is not set +# CONFIG_SND_SOC_WM8523 is not set +# CONFIG_SND_SOC_WM8580 is not set +# CONFIG_SND_SOC_WM8711 is not set +# CONFIG_SND_SOC_WM8728 is not set +# CONFIG_SND_SOC_WM8731 is not set +# CONFIG_SND_SOC_WM8737 is not set +# CONFIG_SND_SOC_WM8741 is not set +# CONFIG_SND_SOC_WM8750 is not set +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8770 is not set +# CONFIG_SND_SOC_WM8776 is not set +# CONFIG_SND_SOC_WM8804 is not set +# CONFIG_SND_SOC_WM8903 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_TPA6130A2 is not set +CONFIG_SND_SIMPLE_CARD=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m @@ -6247,6 +6354,7 @@ CONFIG_EXTCON=m # Extcon Device Drivers # # CONFIG_EXTCON_ADC_JACK is not set +# CONFIG_EXTCON_ARIZONA is not set CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_RT8973A is not set CONFIG_EXTCON_SM5502=m @@ -7148,7 +7256,7 @@ CONFIG_CRYPTO_CRC32_PCLMUL=m CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m diff --git a/libre/linux-libre/config.mips64el b/libre/linux-libre/config.mips64el index c4a665344..1017c9e65 100644 --- a/libre/linux-libre/config.mips64el +++ b/libre/linux-libre/config.mips64el @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/mips 4.0.0-gnu-1 Kernel Configuration +# Linux/mips 4.0.4-gnu-1 Kernel Configuration # CONFIG_MIPS=y @@ -273,8 +273,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -# CONFIG_MEMCG_KMEM is not set +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -629,7 +629,7 @@ CONFIG_TCP_CONG_ILLINOIS=m CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set +CONFIG_TCP_MD5SIG=y CONFIG_IPV6=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y @@ -2813,6 +2813,7 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_AD714X_SPI=m +# CONFIG_INPUT_ARIZONA_HAPTICS is not set CONFIG_INPUT_BMA150=m # CONFIG_INPUT_E3X0_BUTTON is not set CONFIG_INPUT_MC13783_PWRBUTTON=m @@ -3188,7 +3189,7 @@ CONFIG_POWER_RESET=y # CONFIG_POWER_RESET_BRCMSTB is not set # CONFIG_POWER_RESET_RESTART is not set CONFIG_POWER_AVS=y -CONFIG_HWMON=m +CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3328,6 +3329,7 @@ CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set @@ -3782,6 +3784,7 @@ CONFIG_RADIO_SI4713=m CONFIG_USB_SI4713=m CONFIG_PLATFORM_SI4713=m CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI476X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m @@ -4235,6 +4238,7 @@ CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_JACK=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m @@ -4399,7 +4403,87 @@ CONFIG_SND_BEBOB=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m -# CONFIG_SND_SOC is not set +CONFIG_SND_SOC=m +# CONFIG_SND_ATMEL_SOC is not set + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +# CONFIG_SND_SOC_FSL_ASRC is not set +# CONFIG_SND_SOC_FSL_SAI is not set +# CONFIG_SND_SOC_FSL_SSI is not set +# CONFIG_SND_SOC_FSL_SPDIF is not set +# CONFIG_SND_SOC_FSL_ESAI is not set +# CONFIG_SND_SOC_IMX_AUDMUX is not set +# CONFIG_SND_SOC_XTFPGA_I2S is not set +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +# CONFIG_SND_SOC_ADAU1701 is not set +# CONFIG_SND_SOC_AK4104 is not set +# CONFIG_SND_SOC_AK4554 is not set +# CONFIG_SND_SOC_AK4642 is not set +# CONFIG_SND_SOC_AK5386 is not set +# CONFIG_SND_SOC_ALC5623 is not set +# CONFIG_SND_SOC_CS35L32 is not set +# CONFIG_SND_SOC_CS42L51_I2C is not set +# CONFIG_SND_SOC_CS42L52 is not set +# CONFIG_SND_SOC_CS42L56 is not set +# CONFIG_SND_SOC_CS42L73 is not set +# CONFIG_SND_SOC_CS4265 is not set +# CONFIG_SND_SOC_CS4270 is not set +# CONFIG_SND_SOC_CS4271_I2C is not set +# CONFIG_SND_SOC_CS4271_SPI is not set +# CONFIG_SND_SOC_CS42XX8_I2C is not set +CONFIG_SND_SOC_HDMI_CODEC=m +# CONFIG_SND_SOC_ES8328 is not set +# CONFIG_SND_SOC_PCM1681 is not set +# CONFIG_SND_SOC_PCM1792A is not set +# CONFIG_SND_SOC_PCM512x_I2C is not set +# CONFIG_SND_SOC_PCM512x_SPI is not set +# CONFIG_SND_SOC_RT5631 is not set +# CONFIG_SND_SOC_RT5677_SPI is not set +# CONFIG_SND_SOC_SGTL5000 is not set +CONFIG_SND_SOC_SI476X=m +# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set +CONFIG_SND_SOC_SPDIF=m +# CONFIG_SND_SOC_SSM2602_SPI is not set +# CONFIG_SND_SOC_SSM2602_I2C is not set +# CONFIG_SND_SOC_SSM4567 is not set +# CONFIG_SND_SOC_STA32X is not set +# CONFIG_SND_SOC_STA350 is not set +# CONFIG_SND_SOC_TAS2552 is not set +# CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TFA9879 is not set +# CONFIG_SND_SOC_TLV320AIC23_I2C is not set +# CONFIG_SND_SOC_TLV320AIC23_SPI is not set +# CONFIG_SND_SOC_TLV320AIC31XX is not set +# CONFIG_SND_SOC_TLV320AIC3X is not set +# CONFIG_SND_SOC_TS3A227E is not set +# CONFIG_SND_SOC_WM8510 is not set +# CONFIG_SND_SOC_WM8523 is not set +# CONFIG_SND_SOC_WM8580 is not set +# CONFIG_SND_SOC_WM8711 is not set +# CONFIG_SND_SOC_WM8728 is not set +# CONFIG_SND_SOC_WM8731 is not set +# CONFIG_SND_SOC_WM8737 is not set +# CONFIG_SND_SOC_WM8741 is not set +# CONFIG_SND_SOC_WM8750 is not set +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8770 is not set +# CONFIG_SND_SOC_WM8776 is not set +# CONFIG_SND_SOC_WM8804 is not set +# CONFIG_SND_SOC_WM8903 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_TPA6130A2 is not set +CONFIG_SND_SIMPLE_CARD=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m @@ -5384,6 +5468,7 @@ CONFIG_EXTCON=m # Extcon Device Drivers # # CONFIG_EXTCON_ADC_JACK is not set +# CONFIG_EXTCON_ARIZONA is not set CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_RT8973A is not set # CONFIG_EXTCON_SM5502 is not set @@ -6199,7 +6284,7 @@ CONFIG_CRYPTO_CRC32=m CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index f254e91cf..2a925a8c9 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 4.0.0-gnu-1 Kernel Configuration +# Linux/x86 4.0.4-gnu-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -159,8 +159,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -# CONFIG_MEMCG_KMEM is not set +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y @@ -839,7 +839,7 @@ CONFIG_TCP_CONG_DCTCP=m CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set +CONFIG_TCP_MD5SIG=y CONFIG_IPV6=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y @@ -3100,6 +3100,7 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_AD714X_SPI=m +# CONFIG_INPUT_ARIZONA_HAPTICS is not set CONFIG_INPUT_BMA150=m CONFIG_INPUT_E3X0_BUTTON=m CONFIG_INPUT_PCSPKR=m @@ -3524,7 +3525,7 @@ CONFIG_CHARGER_BQ24735=m CONFIG_POWER_RESET=y # CONFIG_POWER_RESET_RESTART is not set CONFIG_POWER_AVS=y -CONFIG_HWMON=m +CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3681,6 +3682,7 @@ CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set @@ -4171,6 +4173,7 @@ CONFIG_RADIO_SI4713=m CONFIG_USB_SI4713=m CONFIG_PLATFORM_SI4713=m CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI476X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m @@ -4664,6 +4667,7 @@ CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_JACK=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m @@ -4833,7 +4837,108 @@ CONFIG_SND_BEBOB=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m -# CONFIG_SND_SOC is not set +CONFIG_SND_SOC=m +# CONFIG_SND_ATMEL_SOC is not set +CONFIG_SND_DESIGNWARE_I2S=m + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +# CONFIG_SND_SOC_FSL_ASRC is not set +# CONFIG_SND_SOC_FSL_SAI is not set +# CONFIG_SND_SOC_FSL_SSI is not set +# CONFIG_SND_SOC_FSL_SPDIF is not set +# CONFIG_SND_SOC_FSL_ESAI is not set +# CONFIG_SND_SOC_IMX_AUDMUX is not set +CONFIG_SND_SST_MFLD_PLATFORM=m +CONFIG_SND_SST_IPC=m +CONFIG_SND_SST_IPC_ACPI=m +CONFIG_SND_SOC_INTEL_SST=m +CONFIG_SND_SOC_INTEL_SST_ACPI=m +CONFIG_SND_SOC_INTEL_HASWELL=m +CONFIG_SND_SOC_INTEL_BAYTRAIL=m +CONFIG_SND_SOC_INTEL_HASWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m +CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m +# CONFIG_SND_SOC_XTFPGA_I2S is not set +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +# CONFIG_SND_SOC_ADAU1701 is not set +# CONFIG_SND_SOC_AK4104 is not set +# CONFIG_SND_SOC_AK4554 is not set +# CONFIG_SND_SOC_AK4642 is not set +# CONFIG_SND_SOC_AK5386 is not set +# CONFIG_SND_SOC_ALC5623 is not set +# CONFIG_SND_SOC_CS35L32 is not set +# CONFIG_SND_SOC_CS42L51_I2C is not set +# CONFIG_SND_SOC_CS42L52 is not set +# CONFIG_SND_SOC_CS42L56 is not set +# CONFIG_SND_SOC_CS42L73 is not set +# CONFIG_SND_SOC_CS4265 is not set +# CONFIG_SND_SOC_CS4270 is not set +# CONFIG_SND_SOC_CS4271_I2C is not set +# CONFIG_SND_SOC_CS4271_SPI is not set +# CONFIG_SND_SOC_CS42XX8_I2C is not set +CONFIG_SND_SOC_HDMI_CODEC=m +# CONFIG_SND_SOC_ES8328 is not set +CONFIG_SND_SOC_MAX98090=m +# CONFIG_SND_SOC_PCM1681 is not set +# CONFIG_SND_SOC_PCM1792A is not set +# CONFIG_SND_SOC_PCM512x_I2C is not set +# CONFIG_SND_SOC_PCM512x_SPI is not set +CONFIG_SND_SOC_RL6231=m +CONFIG_SND_SOC_RT286=m +# CONFIG_SND_SOC_RT5631 is not set +CONFIG_SND_SOC_RT5640=m +CONFIG_SND_SOC_RT5645=m +CONFIG_SND_SOC_RT5670=m +# CONFIG_SND_SOC_RT5677_SPI is not set +# CONFIG_SND_SOC_SGTL5000 is not set +CONFIG_SND_SOC_SI476X=m +# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set +CONFIG_SND_SOC_SPDIF=m +# CONFIG_SND_SOC_SSM2602_SPI is not set +# CONFIG_SND_SOC_SSM2602_I2C is not set +# CONFIG_SND_SOC_SSM4567 is not set +# CONFIG_SND_SOC_STA32X is not set +# CONFIG_SND_SOC_STA350 is not set +# CONFIG_SND_SOC_TAS2552 is not set +# CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TFA9879 is not set +# CONFIG_SND_SOC_TLV320AIC23_I2C is not set +# CONFIG_SND_SOC_TLV320AIC23_SPI is not set +# CONFIG_SND_SOC_TLV320AIC31XX is not set +# CONFIG_SND_SOC_TLV320AIC3X is not set +# CONFIG_SND_SOC_TS3A227E is not set +# CONFIG_SND_SOC_WM8510 is not set +# CONFIG_SND_SOC_WM8523 is not set +# CONFIG_SND_SOC_WM8580 is not set +# CONFIG_SND_SOC_WM8711 is not set +# CONFIG_SND_SOC_WM8728 is not set +# CONFIG_SND_SOC_WM8731 is not set +# CONFIG_SND_SOC_WM8737 is not set +# CONFIG_SND_SOC_WM8741 is not set +# CONFIG_SND_SOC_WM8750 is not set +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8770 is not set +# CONFIG_SND_SOC_WM8776 is not set +# CONFIG_SND_SOC_WM8804 is not set +# CONFIG_SND_SOC_WM8903 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_TPA6130A2 is not set +CONFIG_SND_SIMPLE_CARD=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m @@ -5986,6 +6091,7 @@ CONFIG_EXTCON=m # Extcon Device Drivers # # CONFIG_EXTCON_ADC_JACK is not set +# CONFIG_EXTCON_ARIZONA is not set CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_RT8973A is not set CONFIG_EXTCON_SM5502=m @@ -6883,7 +6989,7 @@ CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m diff --git a/libre/linux-libre/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch b/libre/linux-libre/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch new file mode 100644 index 000000000..9f09102dc --- /dev/null +++ b/libre/linux-libre/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch @@ -0,0 +1,50 @@ +From a81157768a00e8cf8a7b43b5ea5cac931262374f Mon Sep 17 00:00:00 2001 +From: Eric Work <work.eric@gmail.com> +Date: Mon, 18 May 2015 23:26:23 -0700 +Subject: [PATCH] md/raid0: fix restore to sector variable in + raid0_make_request + +The variable "sector" in "raid0_make_request()" was improperly updated +by a call to "sector_div()" which modifies its first argument in place. +Commit 47d68979cc968535cb87f3e5f2e6a3533ea48fbd restored this variable +after the call for later re-use. Unfortunetly the restore was done after +the referenced variable "bio" was advanced. This lead to the original +value and the restored value being different. Here we move this line to +the proper place. + +One observed side effect of this bug was discarding a file though +unlinking would cause an unrelated file's contents to be discarded. + +Signed-off-by: NeilBrown <neilb@suse.de> +Fixes: 47d68979cc96 ("md/raid0: fix bug with chunksize not a power of 2.") +Cc: stable@vger.kernel.org (any that received above backport) +URL: https://bugzilla.kernel.org/show_bug.cgi?id=98501 +--- + drivers/md/raid0.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c +index 6a68ef5..efb654e 100644 +--- a/drivers/md/raid0.c ++++ b/drivers/md/raid0.c +@@ -524,6 +524,9 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio) + ? (sector & (chunk_sects-1)) + : sector_div(sector, chunk_sects)); + ++ /* Restore due to sector_div */ ++ sector = bio->bi_iter.bi_sector; ++ + if (sectors < bio_sectors(bio)) { + split = bio_split(bio, sectors, GFP_NOIO, fs_bio_set); + bio_chain(split, bio); +@@ -531,7 +534,6 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio) + split = bio; + } + +- sector = bio->bi_iter.bi_sector; + zone = find_zone(mddev->private, §or); + tmp_dev = map_sector(mddev, zone, sector, §or); + split->bi_bdev = tmp_dev->bdev; +-- +2.4.1 + diff --git a/libre/luxrender/PKGBUILD b/libre/luxrender/PKGBUILD index 20ada0647..9a883bb48 100644 --- a/libre/luxrender/PKGBUILD +++ b/libre/luxrender/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 132029 2015-04-23 03:41:06Z fyan $ +# $Id: PKGBUILD 133054 2015-05-09 12:38:26Z stativ $ # Maintainer (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor (Arch): flixie <69one@gmx.net> # Contributor (Arch): Imanol Celaya <ornitorrincos@archlinux-es.org> @@ -6,7 +6,7 @@ pkgname=luxrender pkgver=1.4 _pkgver=dfd211d6faa0 -pkgrel=5.parabola1 +pkgrel=6.parabola1 pkgdesc="Rendering system for physically correct, unbiased image synthesis, with opencl-mesa recommendation" arch=('i686' 'x86_64' 'mips64el') url="http://www.luxrender.net/" diff --git a/libre/mapnik/PKGBUILD b/libre/mapnik/PKGBUILD new file mode 100644 index 000000000..6e6676ecd --- /dev/null +++ b/libre/mapnik/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 132059 2015-04-23 16:30:52Z spupykin $ +# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor (Arch): David Dent <thewinch@gmail.com> +# Contributor (Arch): orbisvicis <orbisvicis@gmail.com> +# Maintainer: André Silva <emulatorman@parabola.nu> + +pkgname=mapnik +pkgver=2.2.0.654.g718a8b3 +pkgrel=5.parabola1 +pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps, without nonfree mod_fastcgi recommendation" +arch=('i686' 'x86_64') +url="http://mapnik.org/" +license=('LGPL') +depends=('boost-libs' 'icu' 'libpng' 'libjpeg' 'libtiff' 'freetype2' + 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'pycairo' + 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libltdl') +optdepends=('libxslt: Web Map Service' + 'python2-lxml: Web Map Service' + 'python2-pillow: Web Map Service' + 'python-nose: Web Map Service' + 'apache: Web Map Service' + 'mod_fcgid: Web Map Service - or:' + 'mod_wsgi2: Web Map Service') +makedepends=('scons' 'boost' 'git') +install="mapnik.install" +#source=("$pkgname-$pkgver.tar.gz::https://github.com/mapnik/mapnik/archive/v$pkgver.tar.gz") +source=("git://github.com/mapnik/mapnik.git#branch=2.3.x") +md5sums=('SKIP') + +pkgver() { + cd "$srcdir/$pkgname" + + git describe --long | cut -c2- | sed 's/-/./g' +} + +build() { + cd "$srcdir/$pkgname" + + sed -i 's|lib64|lib|g' SConstruct + sed -i 's|python|python2|' \ + utils/performance/mapnik-speed-check \ + utils/upgrade_map_xml/*.py + scons configure \ + PREFIX="/usr" \ + INPUT_PLUGINS=all \ + DESTDIR="$pkgdir" + scons $MAKEFLAGS +} + +package(){ + cd "$srcdir/$pkgname" + scons install +} diff --git a/libre/mapnik/mapnik.install b/libre/mapnik/mapnik.install new file mode 100644 index 000000000..46f265d5b --- /dev/null +++ b/libre/mapnik/mapnik.install @@ -0,0 +1,11 @@ +post_install() { + /sbin/ldconfig +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD index 85e5ff969..23697e90a 100644 --- a/libre/mesa-libcl/PKGBUILD +++ b/libre/mesa-libcl/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=mesa _pkgname=libcl pkgname=$pkgbase-$_pkgname -pkgver=10.5.4 +pkgver=10.5.5 pkgrel=1 pkgdesc='Mesa 3-D OpenCL library and ICD loader' arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ provides=("$_pkgname") conflicts=("$_pkgname" "$_pkgname-libre" 'opencl-nvidia' 'opencl-nvidia-304xx') replaces=("$_pkgname" "$_pkgname-libre" 'opencl-nvidia' 'opencl-nvidia-304xx') source=(ftp://ftp.freedesktop.org/pub/$pkgbase/$pkgver/$pkgbase-$pkgver.tar.xz{,.sig}) -sha512sums=('e8268b5a28eeafe03d8d8e4a1b3865e5b4a05501507d5b623f7d4c542ade3d8fa6fef2a2b6c05d6aaefa81de26365ab6bb895a0ba2a1d9c05dd1fd701bdab5f5' +sha512sums=('d339f598bfdbe14388d3213b166bed5f89e67535b0ccc09d47f434e2669ed3c5d4c23a1c86f3e180d90e8ba1175f9de24f62b16364f072ac6bb695b57e519b61' 'SKIP') validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com> diff --git a/libre/openexr/PKGBUILD b/libre/openexr/PKGBUILD index 715bb6a1f..334326e07 100644 --- a/libre/openexr/PKGBUILD +++ b/libre/openexr/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 212797 2014-05-15 10:44:29Z tpowa $ +# $Id: PKGBUILD 238700 2015-05-08 16:56:07Z tpowa $ # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=openexr _pkgname=$pkgname-libre -pkgver=2.1.0 -pkgrel=1.parabola1 +pkgver=2.2.0 +pkgrel=2.parabola1 pkgdesc="An high dynamic-range image file format library, without embedded nonfree fonts in the documentation" url="http://www.$pkgname.com/" arch=('i686' 'x86_64' 'mips64el') license=('BSD') depends=('zlib' 'ilmbase') -makedepends=('jre7-openjdk-headless' 'libcups' 'libreoffice-writer' 'libxinerama') +makedepends=('unoconv') replaces=("$_pkgname") conflicts=("$_pkgname") mksource=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" @@ -33,11 +33,9 @@ mksource() { install -m644 -v "${srcdir}/"{InterpretingDeepPixels.docx,{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt} doc # convert source documentation to pdf format and clean source code - if [ "$CARCH" != "mips64el" ]; then - cd doc - libreoffice --headless --invisible --convert-to pdf {InterpretingDeepPixels.docx,{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt} - rm -rv "${srcdir}/"{_rels,Configurations2,customXml,docProps,META-INF,ObjBFFFDCA{1,3,4,5,7},Object\ 1,ObjectReplacements,Pictures,Thumbnails,word} - fi + cd doc + unoconv -v -f pdf {InterpretingDeepPixels.docx,{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt} + rm -rv "${srcdir}/"{_rels,Configurations2,customXml,docProps,META-INF,ObjBFFFDCA{1,3,4,5,7},Object\ 1,ObjectReplacements,Pictures,Thumbnails,word} } prepare() { @@ -59,10 +57,10 @@ package() { install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" install -m644 "doc/"{InterpretingDeepPixels.docx,{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt} "${pkgdir}/usr/share/doc/OpenEXR-${pkgver}" } -mkmd5sums=('33735d37d2ee01c6d8fbd0df94fb8b43' +mkmd5sums=('b64e931c82aa3790329c21418373db4e' 'a59a8516d9dbb76755cb258d18cf4e72' '0b0b41269d6a3ee1a7090067cc89895f' '6889a150ab9f2f35fbc9835373dd3c34' 'ef6912faf2ab7516678bd0fa56b832f8' '232a6be90fd36ce49e213492a60d335d') -md5sums=('97613563c17dc3a1aa3359e05b7b37da') +md5sums=('0c25d11578b23e9f5b12a3071187b171') diff --git a/libre/openttd/PKGBUILD b/libre/openttd/PKGBUILD new file mode 100644 index 000000000..ed984afa9 --- /dev/null +++ b/libre/openttd/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 130965 2015-04-08 20:31:16Z lcarlier $ +# Maintainer (Arch): Vesa Kaihlavirta <vegai@iki.fi> +# Maintainer: André Silva <emulatorman@parabola.nu> + +pkgname=openttd +pkgver=1.5.0 +pkgrel=1.parabola1 +pkgdesc='An engine for running Transport Tycoon Deluxe, without nonfree openttd-opensfx recommendation' +arch=('i686' 'x86_64') +url='http://www.openttd.org' +license=('GPL') +depends=('libpng' 'sdl' 'icu' 'fontconfig' 'lzo' 'hicolor-icon-theme' 'desktop-file-utils' 'xz') +install=openttd.install +optdepends=('openttd-opengfx: free graphics') +source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz") +sha256sums=('cb2735c3c94709430c58eb4e8820cd5d26b1a17447c34ca8792bb3432a3f7c2d') + +build() { + cd ${pkgname}-${pkgver} + + ./configure \ + --prefix-dir=/usr \ + --binary-name=${pkgname} \ + --binary-dir=bin \ + --data-dir=share/${pkgname} \ + --install-dir=${pkgdir} \ + --doc-dir=share/doc/${pkgname} \ + --menu-name="OpenTTD" \ + --personal-dir=.${pkgname} + + make +} + +package() { + cd ${pkgname}-${pkgver} + + make install +} diff --git a/libre/openttd/openttd.install b/libre/openttd/openttd.install new file mode 100644 index 000000000..85b22a1c5 --- /dev/null +++ b/libre/openttd/openttd.install @@ -0,0 +1,17 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1 + update-desktop-database > /dev/null 2>&1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + update-desktop-database > /dev/null 2>&1 +} + +post_remove() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1 + update-desktop-database > /dev/null 2>&1 +} diff --git a/libre/spacefm/PKGBUILD b/libre/spacefm/PKGBUILD index 31015bd9c..f7bd4207c 100644 --- a/libre/spacefm/PKGBUILD +++ b/libre/spacefm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 120827 2014-10-16 15:48:31Z bpiotrowski $ +# $Id: PKGBUILD 133107 2015-05-09 18:23:35Z arojas $ # Maintainer (Arch): Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor (Arch): IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ # Contributor (Arch): ridikulus_rat <the.ridikulus.rat@gmail.com> @@ -6,38 +6,31 @@ # Contributor: Edison Ibañez <arkhan.xxx@gmail.com> pkgname=spacefm -pkgver=0.9.4 -pkgrel=3.parabola1 +pkgver=1.0.1 +pkgrel=1.parabola1 pkgdesc='Multi-panel tabbed file manager, with unar support' arch=('i686' 'x86_64' 'mips64el') url='http://ignorantguru.github.com/spacefm/' license=('GPL3') install=$pkgname.install -depends=('gtk2' 'shared-mime-info' 'desktop-file-utils' 'startup-notification' - 'systemd' 'bash' 'unar') +depends=('gtk3' 'desktop-file-utils' 'startup-notification' 'ffmpegthumbnailer' 'unar') makedepends=('intltool' 'gettext') optdepends=('lsof: device processes' 'wget: plugin download' 'gksu: perform as root functionality' 'udevil: mount as non-root user and mount networks' - 'udisks: mount as non-root user' 'udisks2: mount as non-root user') replaces=(${pkgname}-libre) conflicts=(${pkgname}-libre) -source=(https://github.com/IgnorantGuru/spacefm/archive/$pkgver.tar.gz - spacefm-0.9.4-glib-2.41.patch +source=($pkgname-$pkgver.tar.gz::https://github.com/IgnorantGuru/spacefm/archive/$pkgver.tar.gz libre.patch) -md5sums=('daeee7dcccea33d6258a0a9d783470c4' - '1ec85afcb4fc881a8e876b3cf60c7028' - '30ba2b4b8f5ae7bf1552689b192eab89') +md5sums=('3665b0cf08dcbebefcc832afc19d613e' + '66cc35023050ff6664bf14b1073700e2') prepare() { cd $pkgname-$pkgver # replace nonfree unrar with unar support - patch -Np1 -i $srcdir/libre.patch src/ptk/ptk-file-archiver.c - - # fix freezes with glib 2.41 - patch -p1 -i ../spacefm-0.9.4-glib-2.41.patch + patch -Np1 -i $srcdir/libre.patch } build() { diff --git a/libre/spacefm/libre.patch b/libre/spacefm/libre.patch index 82d51f705..d27b1b850 100644 --- a/libre/spacefm/libre.patch +++ b/libre/spacefm/libre.patch @@ -1,24 +1,15 @@ -From 4605df33f85e5dbd4cc0238b9d289ff73601d898 Mon Sep 17 00:00:00 2001 -From: Edison Ibañez <arkhan.xxx@gmail.com> -Date: mar, 20 may 2014 10:27:55 -0500 -Subject: [PATCH] replace nonfree unrar with unar support - - -diff --git a/src/ptk/ptk-file-archiver.c b/src/ptk/ptk-file-archiver.c -index ec9fbd7..55648d2 100644 ---- a/src/ptk/ptk-file-archiver.c -+++ b/src/ptk/ptk-file-archiver.c -@@ -80,8 +80,8 @@ const ArchiveHandler handlers[]= - { - "application/x-rar", - "rar a -r %o", -- "unrar -o- x", -- "unrar lt", -+ "unar -D ", -+ "unar -D ", - ".rar", "arc_rar", TRUE - }, - { --- -Gitg - +diff -Nur spacefm-1.0.1.orig/src/ptk/ptk-handler.c spacefm-1.0.1/src/ptk/ptk-handler.c +--- spacefm-1.0.1.orig/src/ptk/ptk-handler.c 2015-05-04 09:33:53.000000000 -0300 ++++ spacefm-1.0.1/src/ptk/ptk-handler.c 2015-05-11 19:11:14.248923712 -0300 +@@ -173,9 +173,9 @@ + "*.rar *.RAR", + "rar a -r %o %N", + TRUE, +- "unrar -o- x %x", ++ "unar -D %x", + TRUE, +- "unrar lt %x", ++ "unar -D %x", + TRUE + }, + { diff --git a/libre/spacefm/spacefm-0.9.4-glib-2.41.patch b/libre/spacefm/spacefm-0.9.4-glib-2.41.patch deleted file mode 100644 index 5795c77a8..000000000 --- a/libre/spacefm/spacefm-0.9.4-glib-2.41.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/src/main.c b/src/main.c -index a7307fb..af5dc5a 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -1349,7 +1349,9 @@ int main ( int argc, char *argv[] ) - vfs_file_monitor_clean(); - return ret == -1 ? 0 : ret; - } -+ GDK_THREADS_ENTER(); - gtk_main(); -+ GDK_THREADS_LEAVE(); - vfs_file_monitor_clean(); - return 0; - } -@@ -1509,8 +1511,10 @@ int main ( int argc, char *argv[] ) - run = handle_parsed_commandline_args(); - app_settings.load_saved_tabs = TRUE; - -+ GDK_THREADS_ENTER(); - if( run ) /* run the main loop */ - gtk_main(); -+ GDK_THREADS_LEAVE(); - - main_window_event( NULL, NULL, "evt_exit", 0, 0, NULL, 0, 0, 0, FALSE ); - diff --git a/libre/spectrwm/PKGBUILD b/libre/spectrwm/PKGBUILD index a5e29caed..930263166 100644 --- a/libre/spectrwm/PKGBUILD +++ b/libre/spectrwm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 126653 2015-01-27 19:06:39Z kkeen $ +# $Id: PKGBUILD 134036 2015-05-24 19:37:57Z kkeen $ # Maintainer (Arch): Kyle Keen <keenerd@gmail.com> # Contributor (Arch): Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=spectrwm -pkgver=2.6.2 +pkgver=2.7.1 pkgrel=1.parabola1 pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way, without nonfree profont support" arch=('i686' 'x86_64' 'mips64el') @@ -19,16 +19,11 @@ optdepends=('scrot: screenshots' 'terminus-font: great font') backup=(etc/spectrwm.conf) -# the +2.6.0 gnu/linux makefile does not build -# so download and use the 2.5.1 makefile until this is fixed - source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz \ - http://opensource.conformal.com/snapshots/$pkgname/$pkgname-2.5.1.tgz \ LICENSE \ baraction.sh \ spectrwm-no-preload) -md5sums=('eba7cba0c85706435657f744bf9086bc' - 'd9aec3342920e31cbe60f1032571043a' +md5sums=('eb7d8c3db709551a90751ecc2157d6d1' 'a67cfe51079481e5b0eab1ad371379e3' '950d663692e1da56e0ac864c6c3ed80e' '974d109ce0af39cc73936d5efd682480') @@ -47,7 +42,6 @@ build() { sed -i 's/setconfspawn("lock".*/setconfspawn("lock", "xlock", SWM_SPAWN_OPTIONAL);/' spectrwm.c cd linux - cp "$srcdir/$pkgname-2.5.1/linux/Makefile" ./ make PREFIX="/usr" } @@ -71,9 +65,4 @@ package() { # fix this for real in the makefile rm "$pkgdir/usr/bin/scrotwm" ln -s "/usr/bin/spectrwm" "$pkgdir/usr/bin/scrotwm" - mkdir -p "$pkgdir"/usr/share/man/{es,it,pt,ru}/man1/ - mv "$pkgdir/usr/share/man/man1/spectrwm_es.1" "$pkgdir/usr/share/man/es/man1/" - mv "$pkgdir/usr/share/man/man1/spectrwm_it.1" "$pkgdir/usr/share/man/it/man1/" - mv "$pkgdir/usr/share/man/man1/spectrwm_pt.1" "$pkgdir/usr/share/man/pt/man1/" - mv "$pkgdir/usr/share/man/man1/spectrwm_ru.1" "$pkgdir/usr/share/man/ru/man1/" } diff --git a/libre/tp_smapi/PKGBUILD b/libre/tp_smapi/PKGBUILD index d8da0c2f8..7aeb2ccf5 100644 --- a/libre/tp_smapi/PKGBUILD +++ b/libre/tp_smapi/PKGBUILD @@ -14,11 +14,11 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=4.0 - _archrel=67 + _archrel=69 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 - _archrel=39 + _archrel=41 _parabolarel=1 elif [[ ${_kernelname} == -grsec ]]; then _basekernel=3.19 diff --git a/libre/unp/PKGBUILD b/libre/unp/PKGBUILD new file mode 100644 index 000000000..fe4b53c47 --- /dev/null +++ b/libre/unp/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 116352 2014-07-25 17:05:00Z anatolik $ +# Maintainer (Arch): Anatol Pomozov <anatol.pomozov@gmail.com> +# Contributor (Arch): Michael Düll <mail@akurei.me> PGP-Key: AAAEE882 +# Contributor (Arch): TDY <tdy@gmx.com> +# Contributor (Arch): Sergio Rubio <rubiojr.ml@gmail.com> +# Contributor (Arch): Hannes Rist <cowider@gmail.com> +# Maintainer: André Silva <emulatorman@parabola.nu> + +pkgname=unp +pkgver=2.0~pre7+nmu1 +pkgrel=2.parabola1 +pkgdesc='A script for unpacking a wide variety of archive formats, without nonfree unace, unarj and unrar recommendation' +arch=(any) +url='http://packages.qa.debian.org/u/unp.html' +license=(GPL) +depends=(perl) +optdepends=( + 'unzip: zip support' + 'bzip2: bzip2 support' + 'p7zip: p7zip support' + 'cpio: cpio support' + 'sharutils: sharutils' + 'cabextract: cab support' + 'rpmextract: rpm support' +) +source=(http://ftp.debian.org/debian/pool/main/u/unp/unp_$pkgver.tar.bz2 + libre.patch) +sha1sums=('b91f4cbc4720b3aace147652ac2043cf74668244' + '202375dd1c013c798d0d61ab5c273be8ebe1c546') + +prepare() { + cd unp-$pkgver + patch -Np1 -i "$srcdir"/libre.patch +} + +build() { + cd unp-$pkgver/po + make +} + +package() { + cd unp-$pkgver + install -Dm755 unp "$pkgdir"/usr/bin/unp + install -Dm755 ucat "$pkgdir"/usr/bin/ucat + install -Dm644 debian/unp.1 "$pkgdir"/usr/share/man/man1/unp.1 + install -Dm755 bash_completion.d/unp "$pkgdir"/etc/bash_completion.d/unp.sh + + cd po + make DESTDIR="$pkgdir" install +} diff --git a/libre/unp/libre.patch b/libre/unp/libre.patch new file mode 100644 index 000000000..e459ce209 --- /dev/null +++ b/libre/unp/libre.patch @@ -0,0 +1,60 @@ +diff -Nur unp-2.0~pre7+nmu1.orig/unp unp-2.0~pre7+nmu1/unp +--- unp-2.0~pre7+nmu1.orig/unp 2011-03-23 17:07:18.000000000 -0300 ++++ unp-2.0~pre7+nmu1/unp 2015-05-19 04:13:37.929971649 -0300 +@@ -214,11 +214,6 @@ + [ 'archmage'] + ], + +- [ gettext("rar or unrar or unrar-free"), "rar", "RAR.*archive", 0, +- [ "rar", "x" ], +- [ "unrar", "x" ] +- ] +- , + [ "binutils", "ar|deb", "(Debian binary package|\ ar.*archive)", 0, + [ "ar", "-x", "-v" ] + ] +@@ -231,11 +226,6 @@ + [ "lha", "x" ] + ] + , +- [ "arj", "arj", "ARJ.*archive", 0, +- [ "arj", "x" ], +- [ "unarj", "x" ], +- ] +- , + [ "ppmd", "pmd", "PPmd.*archive", 0, + [ "PPMd", "x" ] + ] +@@ -264,18 +254,10 @@ + [ "cabextract" ] + ] + , +- [ "unace", "ace", "ACE.*archive", 0, +- [ "unace", "e" ] +- ] +- , + [ "xdms", "dms", "DMS.*archive", 0, + [ "xdms", "x" ] + ] + , +- [ "unlzx", "lzx", "LZX.*archive", 0, +- [ "unace", "e" ] +- ] +- , + [ "macutils", "sea|sea\.bin", "SEA.*archive", 0, + [ "macutils", "-v" ] + ] +@@ -284,12 +266,9 @@ + [ "hexbin", "-v" ] + ] + , +- [ "maybe orange or unzip or unrar or unarj or lha ", "exe", "executable", 3, ++ [ "maybe orange or unzip or lha ", "exe", "executable", 3, + [ "orange" ], + [ "unzip" ], +- [ "unrar", "x" ], +- [ "rar", "x" ], +- [ "arj", "x" ], + [ "lha", "x" ] + ] + diff --git a/libre/vhba-module/PKGBUILD b/libre/vhba-module/PKGBUILD index caf5dbad2..3f2b5f13a 100644 --- a/libre/vhba-module/PKGBUILD +++ b/libre/vhba-module/PKGBUILD @@ -9,7 +9,7 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=4.0 - _archrel=11 + _archrel=13 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 diff --git a/libre/vim/PKGBUILD b/libre/vim/PKGBUILD index 5937dbdcf..58a845b48 100644 --- a/libre/vim/PKGBUILD +++ b/libre/vim/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=vim pkgname=('vim-minimal' 'vim' 'vim-python3' 'gvim' 'gvim-python3' 'vim-runtime') # list of tags can be found at https://code.google.com/p/vim/source/list _topver=7.4 -_patchlevel=712 +_patchlevel=729 _tag=v${_topver/./-}-${_patchlevel} _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} diff --git a/libre/xmlstarlet/PKGBUILD b/libre/xmlstarlet/PKGBUILD deleted file mode 100644 index c8c126715..000000000 --- a/libre/xmlstarlet/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# From https://aur.archlinux.org/packages.php?ID=20101. -# Maintainer (Arch): PyroPeter <abi1789@googlemail.com> -# Contributor (Arch): BlackEagle <ike.devolder@scarlet.be> -# Contributor (Arch): chochem <chochem@gmail.com> - -pkgname=xmlstarlet -pkgver=1.3.1 -pkgrel=1 -pkgdesc="A set of tools to transform, query, validate, and edit XML documents" -arch=('i686' 'x86_64' 'mips64el') -url="http://xmlstar.sourceforge.net/" -license=('custom:MIT') -depends=('libxslt>=1.1.9') -source=("xmlstarlet-$pkgver.tar.gz::http://sourceforge.net/projects/xmlstar/files/xmlstarlet/$pkgver/xmlstarlet-$pkgver.tar.gz/download") -md5sums=('5173ad3f01ec0ba0d54bd1fbfc057abf') - -build() { - cd "$srcdir/$pkgname-$pkgver" - local xsltlibs=$(pkg-config --libs libxslt libexslt) - local xmllibs=$(pkg-config --libs libxml-2.0) - - LIBXSLT_PREFIX=/usr LIBXML_PREFIX=/usr LIBXSLT_LIBS="${xsltlibs}" LIBXML_LIBS="${xmllibs}" ./configure --prefix=/usr - - make - make DESTDIR="${pkgdir}" install - mkdir -p $pkgdir/usr/share/licenses/$pkgname - cp Copyright $pkgdir/usr/share/licenses/$pkgname/COPYING - ln -s /usr/bin/xml ${pkgdir}/usr/bin/xmlstarlet -} diff --git a/libre/xorg-fonts-100dpi/PKGBUILD b/libre/xorg-fonts-100dpi/PKGBUILD index f4a3d5226..cce9f6a75 100644 --- a/libre/xorg-fonts-100dpi/PKGBUILD +++ b/libre/xorg-fonts-100dpi/PKGBUILD @@ -4,7 +4,7 @@ # Maintainer: fauno <fauno@kiwwwi.com.ar> pkgname=xorg-fonts-100dpi pkgver=1.0.3 -pkgrel=2.parabola1 +pkgrel=2.parabola2 pkgdesc="X.org 100dpi fonts" arch=(any) url="http://xorg.freedesktop.org/" @@ -16,24 +16,32 @@ replaces=('xorg-fonts-100dpi-libre') install=xfonts.install source=(${url}/releases/individual/font/font-adobe-100dpi-$pkgver.tar.bz2 ${url}/releases/individual/font/font-bitstream-100dpi-$pkgver.tar.bz2) +md5sums=('1347c3031b74c9e91dc4dfa53b12f143' + '6b223a54b15ecbd5a1bc52312ad790d8') build() { cd "${srcdir}" - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - for dir in font-*-100dpi*; do if [ -d "${dir}" ]; then pushd ${dir} ./configure --prefix=/usr \ --with-fontdir=/usr/share/fonts/100dpi - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-100dpi-*}" || return 1 + make popd fi done - rm -f "${pkgdir}"/usr/share/fonts/100dpi/fonts.* } -md5sums=('1347c3031b74c9e91dc4dfa53b12f143' - '6b223a54b15ecbd5a1bc52312ad790d8') + +package() { + cd "${srcdir}" + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + for dir in font-*-100dpi*; do + if [ -d "${dir}" ]; then + pushd ${dir} + make DESTDIR="${pkgdir}" install + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-100dpi-*}" + popd + fi + done + rm -f "${pkgdir}"/usr/share/fonts/100dpi/fonts.* +}
\ No newline at end of file diff --git a/libre/xorg-fonts-100dpi/xfonts.install b/libre/xorg-fonts-100dpi/xfonts.install index 5c5e8a2b4..d8fac18a8 100644 --- a/libre/xorg-fonts-100dpi/xfonts.install +++ b/libre/xorg-fonts-100dpi/xfonts.install @@ -1,6 +1,6 @@ post_install() { echo -n "Updating font cache... " - fc-cache -f > /dev/null + fc-cache -s mkfontscale /usr/share/fonts/100dpi mkfontdir /usr/share/fonts/100dpi echo "done." diff --git a/libre/xorg-fonts-75dpi/PKGBUILD b/libre/xorg-fonts-75dpi/PKGBUILD index e02711ab5..21798e4a0 100644 --- a/libre/xorg-fonts-75dpi/PKGBUILD +++ b/libre/xorg-fonts-75dpi/PKGBUILD @@ -3,7 +3,7 @@ # Contributor (Arch): Jan de Groot <jgc@archlinux.org> pkgname=xorg-fonts-75dpi pkgver=1.0.3 -pkgrel=2.parabola1 +pkgrel=2.parabola2 pkgdesc="X.org 75dpi fonts" arch=(any) url="http://xorg.freedesktop.org/" @@ -15,22 +15,32 @@ replaces=('xorg-fonts-75dpi-libre') install=xfonts.install source=(${url}/releases/individual/font/font-adobe-75dpi-$pkgver.tar.bz2 ${url}/releases/individual/font/font-bitstream-75dpi-$pkgver.tar.bz2) +md5sums=('6c9f26c92393c0756f3e8d614713495b' + 'd7c0588c26fac055c0dd683fdd65ac34') build() { cd "${srcdir}" - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" for dir in *; do if [ -d "${dir}" ]; then pushd "${dir}" ./configure --prefix=/usr \ - --with-fontdir=/usr/share/fonts/75dpi || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-75dpi-*}" || return 1 + --with-fontdir=/usr/share/fonts/75dpi + make popd fi done - rm -f "${pkgdir}"/usr/share/fonts/75dpi/fonts.* } -md5sums=('6c9f26c92393c0756f3e8d614713495b' - 'd7c0588c26fac055c0dd683fdd65ac34') + +package() { + cd "${srcdir}" + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + for dir in *; do + if [ -d "${dir}" ]; then + pushd "${dir}" + make DESTDIR="${pkgdir}" install + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-75dpi-*}" + popd + fi + done + rm -f "${pkgdir}"/usr/share/fonts/75dpi/fonts.* +}
\ No newline at end of file diff --git a/libre/xorg-fonts-75dpi/xfonts.install b/libre/xorg-fonts-75dpi/xfonts.install index e52603946..14080a0a5 100644 --- a/libre/xorg-fonts-75dpi/xfonts.install +++ b/libre/xorg-fonts-75dpi/xfonts.install @@ -1,6 +1,6 @@ post_install() { echo -n "Updating font cache... " - fc-cache -f > /dev/null + fc-cache -s mkfontscale /usr/share/fonts/75dpi mkfontdir /usr/share/fonts/75dpi echo "done." diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index ba6915ab8..c9e95ae44 100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -5,8 +5,8 @@ pkgdesc="This package conflicts with every nonfree package known to date to ensu license=('GPL3') url="https://projects.parabola.nu/blacklist.git" #url="https://lukeshu.com/git/mirror/parabola/blacklist.git" -pkgver=20150429 -_gitver=148d6b8701309816f80da9a5e9231dad728115eb +pkgver=20150519 +_gitver=e4a9618a4aa1da1421a7dca500081d695a93f114 pkgrel=1 arch=('any') @@ -16,7 +16,7 @@ install=${pkgname}.install makedepends=(librelib) source=(blacklist-${_gitver}.txt::https://projects.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_gitver}) #source=(blacklist-${_gitver}.txt::https://lukeshu.com/git/mirror/parabola/blacklist.git/plain/blacklist.txt?id=${_gitver}) -md5sums=('fc52ca4c19ac5df3c2983bdde6f9e22c') +md5sums=('f41ff6df9922def50127d8cee288f8b9') package() { cd "$srcdir" diff --git a/libre/your-freedom_emu/PKGBUILD b/libre/your-freedom_emu/PKGBUILD index 8b289cd94..379f0b2bc 100644 --- a/libre/your-freedom_emu/PKGBUILD +++ b/libre/your-freedom_emu/PKGBUILD @@ -3,19 +3,19 @@ pkgname=your-freedom_emu pkgdesc="This package removes hardware emulators that emulate technically free games and/or OS (but only there are nonfree games and/or OS)." license=('GPL3') -#url="https://projects.parabolagnulinux.org/blacklist.git" -url="https://lukeshu.com/git/mirror/parabola/blacklist.git" -pkgver=20140827.1 -_gitver=e2410d7936cac105a8af764a2bf771fdcffed4c7 +url="https://projects.parabolagnulinux.org/blacklist.git" +#url="https://lukeshu.com/git/mirror/parabola/blacklist.git" +pkgver=20150519 +_gitver=e4a9618a4aa1da1421a7dca500081d695a93f114 pkgrel=1 arch=('any') install=${pkgname}.install makedepends=(librelib) -#source=(blacklist-${_gitver}.txt::https://projects.parabolagnulinux.org/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver}) -source=(blacklist-${_gitver}.txt::https://lukeshu.com/git/mirror/parabola/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver}) -md5sums=('cf6c392395891ada2fa08970fc5430ef') +source=(blacklist-${_gitver}.txt::https://projects.parabolagnulinux.org/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver}) +#source=(blacklist-${_gitver}.txt::https://lukeshu.com/git/mirror/parabola/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver}) +md5sums=('731850976f34a609ba86ddd4d99e7467') package() { cd "$srcdir" |