summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/acpi_call-libre/PKGBUILD4
-rw-r--r--libre/audacious-plugins-libre/PKGBUILD8
-rw-r--r--libre/bbswitch-libre/PKGBUILD4
-rw-r--r--libre/bfgminer-libre/PKGBUILD6
-rw-r--r--libre/icecat-firebug/PKGBUILD10
-rw-r--r--libre/iceweasel-firebug/PKGBUILD10
-rw-r--r--libre/iceweasel-l10n/PKGBUILD168
-rw-r--r--libre/iceweasel-libre/PKGBUILD71
-rw-r--r--libre/iceweasel-libre/libre.patch291
-rw-r--r--libre/kdebase-konqueror-libre/PKGBUILD6
-rw-r--r--libre/kdebase-runtime-libre/PKGBUILD6
-rw-r--r--libre/kdelibs-libre/CVE-2014-3494.patch55
-rw-r--r--libre/kdelibs-libre/PKGBUILD18
-rw-r--r--libre/kdelibs-libre/fix-cifs-mount.patch49
-rw-r--r--libre/kdelibs-libre/pyqt.patch161
-rw-r--r--libre/kdenetwork-kopete-libre/PKGBUILD6
-rw-r--r--libre/kdeutils-ark-libre/PKGBUILD6
-rw-r--r--libre/kipi-plugins-libre/PKGBUILD6
-rw-r--r--libre/linux-libre-grsec/PKGBUILD16
-rw-r--r--libre/linux-libre-grsec/config.i6866
-rw-r--r--libre/linux-libre-grsec/config.x86_646
-rw-r--r--libre/lirc-libre/PKGBUILD4
-rw-r--r--libre/mesa-libcl/PKGBUILD6
-rw-r--r--libre/nss/PKGBUILD8
-rw-r--r--libre/tp_smapi-libre/PKGBUILD4
-rw-r--r--libre/vhba-module-libre/PKGBUILD4
-rw-r--r--libre/vim-runtime/PKGBUILD8
27 files changed, 503 insertions, 444 deletions
diff --git a/libre/acpi_call-libre/PKGBUILD b/libre/acpi_call-libre/PKGBUILD
index f8155ab6f..69a5a26a4 100644
--- a/libre/acpi_call-libre/PKGBUILD
+++ b/libre/acpi_call-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 113834 2014-07-01 06:38:18Z tpowa $
+# $Id: PKGBUILD 115905 2014-07-18 11:31:00Z tpowa $
# Maintainer (Arch): Maxime Gauduin <alucryd@gmail.com>
# Contributor (Arch): mortzu <me@mortzu.de>
# Contributor (Arch): fnord0 <fnord0@riseup.net>
@@ -7,7 +7,7 @@
_pkgname=acpi_call
pkgname=acpi_call-libre
pkgver=1.1.0
-pkgrel=8.1
+pkgrel=9
_extramodules=extramodules-3.15-libre
pkgdesc='A linux kernel module that enables calls to ACPI methods through /proc/acpi/call (built for the linux-libre kernel package)'
arch=('i686' 'x86_64')
diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD
index 0760361a1..323eee1c4 100644
--- a/libre/audacious-plugins-libre/PKGBUILD
+++ b/libre/audacious-plugins-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 211911 2014-04-29 17:16:51Z bisson $
+# $Id: PKGBUILD 217506 2014-07-20 21:57:27Z bisson $
# Maintainer (Arch): Gaetan Bisson <bisson@archlinux.org>
# Contributor (Arch): Alexander Fehr <pizzapunk gmail com>
# Contributor (Arch): William Rea <sillywilly@gmail.com>
@@ -8,8 +8,8 @@
_pkgname=audacious-plugins
pkgname=audacious-plugins-libre
-pkgver=3.5
-pkgrel=2
+pkgver=3.5.1
+pkgrel=1
pkgdesc='Plugins for Audacious, without nonfree plugins'
url='http://audacious-media-player.org/'
license=('GPL' 'GPL3' 'LGPL' 'custom:BSD')
@@ -62,7 +62,7 @@ optdepends=('alsa-lib: Advanced Linux Sound Arch. output'
'libcue: CUE playlist format')
source=("http://distfiles.audacious-media-player.org/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('b4fe19010eecb0a62c24fe31a2d84e2954c40c8a')
+sha1sums=('c066f79ca1f213c998b651250d02a84982556946')
prepare() {
cd "${srcdir}/${_pkgname}-${pkgver}"
diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD
index f6018eb73..a8d021a68 100644
--- a/libre/bbswitch-libre/PKGBUILD
+++ b/libre/bbswitch-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 113837 2014-07-01 06:40:14Z tpowa $
+# $Id: PKGBUILD 115907 2014-07-18 11:31:12Z tpowa $
# Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor (Arch): M0Rf30
# Contributor (Arch): Samsagax <samsagax@gmail.com>
@@ -8,7 +8,7 @@ _pkgname=bbswitch
pkgname=bbswitch-libre
pkgver=0.8
_extramodules=extramodules-3.15-libre # Don't forget to update bbswitch.install
-pkgrel=12.1
+pkgrel=13
pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)"
arch=('i686' 'x86_64' 'mips64el')
url=("http://github.com/Bumblebee-Project/bbswitch")
diff --git a/libre/bfgminer-libre/PKGBUILD b/libre/bfgminer-libre/PKGBUILD
index 4b51ec6ed..d8844e597 100644
--- a/libre/bfgminer-libre/PKGBUILD
+++ b/libre/bfgminer-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 115078 2014-07-05 08:21:06Z fyan $
+# $Id: PKGBUILD 116292 2014-07-24 07:03:54Z fyan $
# Maintainer (Arch): Timothy Redaelli <timothy.redaelli@gmail.com>
# Contributor (Arch): Andy Weidenbaum <archbaum@gmail.com>
_pkgname=bfgminer
pkgname=bfgminer-libre
-pkgver=4.3.0
+pkgver=4.4.0
pkgrel=1
pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, without nonfree OpenCL recommendation"
arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ url='http://bfgminer.org/'
license=('GPL3')
source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.txz
remove-dangerous-rpath.patch)
-sha256sums=('81d8dfa5d2bbe906f8414aa30426ea2df3ee2cb7d86aed59f3ab36eab2ca1f72'
+sha256sums=('8dd39e389b97ee2dea1e03b2ba457588edb25d1ba6458980c3bf5e608412c065'
'd26d07ca23ae25798c4db37cfda1a6a76f22d06e73efab1ddf62b3e1a7eef04c')
prepare() {
diff --git a/libre/icecat-firebug/PKGBUILD b/libre/icecat-firebug/PKGBUILD
index 2a3de297f..01218ba6c 100644
--- a/libre/icecat-firebug/PKGBUILD
+++ b/libre/icecat-firebug/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 113091 2014-06-13 13:27:58Z speps $
+# $Id: PKGBUILD 115960 2014-07-19 15:24:46Z speps $
# Maintainer (Arch): speps <speps at aur dot archlinux dot org>
pkgname=icecat-firebug
-pkgver=2.0
+pkgver=2.0.2
pkgrel=1
-pkgdesc="IceCat plugin with tools for web development."
+pkgdesc="IceCat extension with tools for web development."
arch=(any)
url="http://getfirebug.com/"
license=('custom:BSD')
groups=('icecat-addons')
depends=('icecat')
provides=('firebug' firefox-firebug=$pkgver)
-source=("${url}releases/firebug/$pkgver/firebug-$pkgver.xpi")
-md5sums=('d628079b2bd28970be02be48608753b3')
+source=("${url}releases/firebug/${pkgver%.*}/firebug-$pkgver.xpi")
+md5sums=('ecd878a910e38262fa70d58b5a989201')
package() {
# extension
diff --git a/libre/iceweasel-firebug/PKGBUILD b/libre/iceweasel-firebug/PKGBUILD
index dad19082f..0bf966010 100644
--- a/libre/iceweasel-firebug/PKGBUILD
+++ b/libre/iceweasel-firebug/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 113091 2014-06-13 13:27:58Z speps $
+# $Id: PKGBUILD 115960 2014-07-19 15:24:46Z speps $
# Maintainer (Arch): speps <speps at aur dot archlinux dot org>
pkgname=iceweasel-firebug
-pkgver=2.0
+pkgver=2.0.2
pkgrel=1
-pkgdesc="Iceweasel plugin with tools for web development."
+pkgdesc="Iceweasel extension with tools for web development."
arch=(any)
url="http://getfirebug.com/"
license=('custom:BSD')
groups=('iceweasel-addons')
depends=('iceweasel-libre')
provides=('firebug' firefox-firebug=$pkgver)
-source=("${url}releases/firebug/$pkgver/firebug-$pkgver.xpi")
-md5sums=('d628079b2bd28970be02be48608753b3')
+source=("${url}releases/firebug/${pkgver%.*}/firebug-$pkgver.xpi")
+md5sums=('ecd878a910e38262fa70d58b5a989201')
package() {
# extension
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index a3e7887a5..87d52e290 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -6,8 +6,8 @@
# Based on icecat-l10n package, which is in turn based on firefox-i18n
_debname=iceweasel
-_debver=30.0
-_debrel=deb2
+_debver=31.0
+_debrel=deb1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -71,85 +71,85 @@ for lang in ${_langpacks[@]}; do
done
md5sums=('a4593936bf1c7a9ec9368ff249f9cc56'
- '965517a22a33d3dd776bb9269760bf29'
- '2de2c307a6b97abfd2c640d0ae86af69'
- 'f0717b835779da2f23e02f809da9a402'
- 'fde3d27aef7eef499e72fbdd4efd4f21'
- '1090d3363b922fb18a66d6c5b2765cda'
- '8dacb1a977444356b2257efa8d95fb57'
- '0c50988938b4baed3c70db15772f54cb'
- '5d57ace62b675fc5e00d965757636d54'
- '96acc3aa961ed063e736f420ffe3ace5'
- '3abd8d53cbf600a55151f61ba29023eb'
- 'f1b8990585cc38424179029200f90e6f'
- '20c08eb3bb556aeb57646a56e2c18edc'
- '6e339c71e0a1cbe251909fda58b9eecd'
- '0a961c33c8735f2626d442bc339c63fe'
- '42f0772a437b505dc5f08cebadf91ed3'
- 'e0388aadb712046bc813d81fd0fb6f23'
- 'ffa75eac4eb444679e0d72b8795ec25b'
- 'bb94cc114d10464a537b8a6c0da3d60c'
- '6d72d505cbb42f7bccf8bcd235954678'
- 'bb036da744d6d52265c9d2ff07b103b0'
- 'fbb2dfa21bee4903ab6d545c9264fd47'
- '6b9e11d83c454b50aa5f553ce7931cc1'
- '03925a4739923fd780ba90154ab01286'
- 'bc0fad2d33d95873726ef7ad8f9ec950'
- 'e3877e5ebce800185b805ba54b25fe8f'
- 'a17cb2a49e9c79ca0a39fd35479bffc3'
- '541391df4bc318ccfe1d3ec53495156a'
- 'dcc2ac605ff105f183fa9af7881bfe09'
- 'b1c91b3ec5e3e3fb34c3afee241008d7'
- 'e41667013be9c1391b85dc3b827e1cf7'
- '4125c70075ddcda52d23bd8a5f4bcee9'
- '08747c160024e193966e9657057bf4b0'
- '08cbe0da8e910c3604f4890a901a96b6'
- '64ba23641d821ce7f6091bd436261db5'
- '770b25b3bd27d258d225735a62dafdb5'
- '0edd07d71d2d50654e79dae9f74bbef7'
- '52c44a14ad34a18a0663bce7eb61ccb3'
- '6ebe7d948cedfc02927546b2ca977cc5'
- '43d14d9203034d7a5863bf6d018c2a0d'
- '2c177ed97ccce6e053d3893d857d2a43'
- '88da0bb2d3cbf394228dc2d6e6d5cc4a'
- 'e5ffd37edaa6c9e49e8253bab3e6697a'
- '3e399c07b8244b2512c26bd5d5ff5b3f'
- '6e0827a2f200b296de847dad8a79b84c'
- '739371fb8c7b87d1eeb8acb8a47a3072'
- '19aab2a3149001fc712e87e3d17fd0bb'
- '5de6c26d4cabdae5af1eef61e2d5dbf3'
- '904eb446d53dae81c365cd926f15e8f7'
- 'bac5b743c8a74fd03a3bea54c0c39c79'
- 'dc068a59d132cec02d5da4453bb24f25'
- 'e50eeb38628864c847c23a1cec48c69c'
- '1620d6efb0282850123563c9300da701'
- '3c98c7884409052c3183076755bbc128'
- '51b7ebf980ac22ff59b30b80e2405e7a'
- 'fced1c2d22766eef7d8b273e074b57ca'
- '7a9f95c70a470305315f7fcc3c7f8d5c'
- 'de30611e5adbacb6b50839d536ebdbae'
- 'de0acdcb55f1b323ea53eb793c6bd22e'
- '752925be6bfdea1219aa2ce2ceef1f81'
- 'bf1dcc0ebf8c10496dab621d44dbf30b'
- 'bcd8b7e226bbf7d4a711054eb62fbb4d'
- '12038d77e2b2f7f862e3bc0fb2aea920'
- 'a6f046879f21e5450147c79eeafa8bba'
- '17fc76ddef536181a6476e781e39ecc1'
- 'e6270250d2e60cbcd01272d5edce3c9a'
- 'fc957096d6d6c94a644d9d29432ec89c'
- '31e90c898f024f646985652332fbff01'
- '229b0182a9f0d37ac7afe1e4ad6ce4fa'
- 'd3ad21e240b1a598b817d44e91f0f847'
- 'f444d1bdf23288c7af5e1d5229924345'
- 'e24238099f61353a9e199763adb88b0e'
- '67b04085ce9e26848484e2267bf3af4e'
- '614aa27dfff48669440544b6880a5624'
- '217506f972f355a33d4bd81958f81cdd'
- '771a6b03f97250bfe1d5e15555b7b048'
- '22e6c03c178516c1c6987cc769362c01'
- '0cf860d0b3f9b6932ebf17cd9a9d9702'
- '0905bf728cced438a4897af2999ec3dc'
- '197f4f3683a5d47ff4b850953a71883e'
- 'b3c3daf487c11e7d4a80024cb58ae951'
- 'dade69a6bb4075fb36e757a2acc44615'
- 'af1b12ef7847d4297388f4ffbcf66783')
+ '670a33d2d57d9d8e4f2efe4c88167cec'
+ '82f6b635bbc269cdb60b499d99279c19'
+ '6df5ce8bd32000d067918ea15743f783'
+ '83351ce58878929d867b3c4ac370ca79'
+ '7bf764acfa99f9e94a13862ecf6a2a28'
+ '61013a3bd466f32896815546fe7c3517'
+ 'eb9c7966039bc8b3b3668b573eaedec5'
+ '207a528c6839352d0642d2d910586bb6'
+ '5400e5edeb8544731c585bb5f6a51e52'
+ 'ea4b1d4135c4e8725e3c0d325905f065'
+ '9f18af672e2f458e1fbf445506f4ccc9'
+ '0ea9756786e075f676e92676bbb15d58'
+ 'fda7a142fbd764146b886a490b36299b'
+ '3df965435942eacf9111ea20dd945318'
+ '8ccf5b35d2590f03de2ccba6a39a9c32'
+ '9ea44a0a230ec4fc863ea4ff9274b332'
+ 'f8824a94e4b689d5e2d592f765383f71'
+ '5f30821528677888f616657e0791bdab'
+ 'a8153431d6e4f5c9735fd7d29c5d03d5'
+ '222a7f00dc7dfa5924bdb743b3e649de'
+ '9230788caf93e7d70b741be26bd4c82d'
+ '341f1720ee8dd48b88ee365ef61369c8'
+ 'f0ec92597de5ccaa9055f6ede1b173f5'
+ 'cb0c7931faf7d533ccc0f555e4308662'
+ '7d9b4e0a36fa0ea2e56ed8032db712c9'
+ '40fc95433db0533a2c6d720189a235d2'
+ 'a033c51e62a872045c7f317a6ce70d7f'
+ 'efdcb06e3cb35d17b879f86c96808a6e'
+ '171dc141f17788a2a39b4912db444b5d'
+ 'ccad3b28e23c139b6bf8d9c70cdcb117'
+ '383b9ced555f91b4eeec2c71c5ae7396'
+ '94f6dd2994ec183d5c1ad71e02d9c01b'
+ '900107db95b96f9e6a1022824a0efba7'
+ '2ba6fb1d9efd3939840168cbaac1b1f3'
+ 'c5045733c94b33330192b25e3867d7ea'
+ '97de7f35fbfc3b51a0d1b649f8514dfa'
+ '8dc2aba168358544d7c1a8346ac1ac2a'
+ '8b7da63100878ea159210801af11a36d'
+ 'd88fa951b283c84a0934f31691dad9e8'
+ 'c7a9a590f2bfdbb3ca3add9e87681249'
+ '7a0b82b54408d287f12bf8a1d4f3433f'
+ '4567526ed67ac1aafb85b04464471c1d'
+ '938184c713cb2eb441045454f0842239'
+ 'b222127a40f9dfb12134c24cbab31f76'
+ '61bafd85cb6ebd38325c81988c9fc9b9'
+ '5fec9742a9fd32ddd417229d732f1cd5'
+ '96497bc08f88b6481682f0cb1483175f'
+ 'b58b3f5b1f16fe7f641c01a7b7ab6bfd'
+ 'd5ab0490bc326e41f225e959ec80b65e'
+ 'b00858fd5b2ad8d1a9bb63364b5dc57f'
+ '280855a7a10daf07bb24fddab2252e66'
+ '7d5c372476aaeb4bc02d2ad141380f9d'
+ 'cdd5b89cff8eec160149441ba1e052ef'
+ '8f73f238208c514e7cd14155805d580d'
+ '6bd845be9290853d4b33ac5b6181847d'
+ 'b5329351acd26bd6a0790012311f87e3'
+ '705446f3f84d5034e10d9b5c454f6bfd'
+ 'b39e34c3d9b528be1c2ec4c05a9f1d86'
+ '38a066e5c70b17346d64da79501e75a5'
+ 'a2d617caed9109755ab0690cb47c7a13'
+ '3bd2016566dfc5e21bc121940ef3a5ca'
+ 'c5c891b38574974ce3f204b2515c721d'
+ '61deab2c9363c0ba5f42b0d251c19575'
+ 'eddbc4ca151a41fecb8cd3674ba54e3d'
+ 'fb04d4a4e6b2ef9717edb3e9227a1ac6'
+ 'f076615189975d70887559edd93139b2'
+ 'f5cd2b65a0f2dd8e24af664aec116fdd'
+ '7e65506186ab92e413586132b7d25ef1'
+ '791a2e048270e7eff3d75eee941cda96'
+ '6c1b6e4b5628af365c10bf10fb37d7a5'
+ '5bfe98f063c135e96fa87f92f184d1cc'
+ '219b0b5450fb3f81c9a982c3cdda58f9'
+ 'b824c66ca1677e83ca09eb958db7ca02'
+ '7f37b595bed67cc3abba0fa9e2baf7a9'
+ '62c6691a2e6cc41c1fcd4bd38baa5cc5'
+ '85f382847cb981db64345379a47c7fa9'
+ '5b2bc5b8d84d4d48f25d9c76e27d1590'
+ '3c23ce73c263783ce0e7f7c881ff1629'
+ 'bc7425f00afdbb837a3dfa31cd938a43'
+ '67ba2152e1a9867b8e980903d4eb859b'
+ 'bddc1d3a69321a158696ab18a31fd68d'
+ '08ca29ee1ac42478001041c0b8515b84')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 30449be72..6b36c19ce 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -14,8 +14,8 @@ _pgo=true
# We're getting this from Debian Sid
_debname=iceweasel
-_debver=30.0
-_debrel=deb2
+_debver=31.0
+_debrel=deb1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -38,8 +38,7 @@ if $_pgo; then
fi
optdepends=('networkmanager: Location detection via available WiFi networks'
'gst-plugins-good: h.264 video'
- 'gst-libav: h.264 video'
- 'libpulse: PulseAudio audio driver')
+ 'gst-libav: h.264 video')
url="http://packages.debian.org/sid/${_pkgname}"
install=iceweasel.install
replaces=('firefox')
@@ -55,11 +54,11 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
iceweasel-install-dir.patch
vendor.js
iceweasel-20.0.1-fixed-loading-icon.png)
-md5sums=('3a603dbbfc9c7e56a8e58cede90a9b0b'
- 'a459c3970169f1f68269cf8c5b4af513'
+md5sums=('52fc839ddc92223023d98c600075cd9e'
+ '9d2b0386dcdf8e9e70deca149bc26ed8'
'2f5cb3df42b09fbfeaee5e72e5433ab9'
'df08eaa1ac3bc6c2356be4fbf8ec8932'
- '21d3ffb77ea84ce897016bc713b52ef4'
+ '96aec3a725ad9f438ae9d54c0f8b37d0'
'b03a979a78484503ba8dddad4f2c96d1'
'7b9e5996dd9fe0b186a43a297db1c6b5'
'1c42509891cf6843660a5f3c69896e80'
@@ -80,10 +79,13 @@ prepare() {
rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true
quilt push -av
+
+ # Put gnu_headshadow.png on the source code
+ install -m644 "$srcdir/gnu_headshadow.png" \
+ browser/base/content/abouthome
- install -m644 "$srcdir/gnu_headshadow.png" browser/base/content/abouthome # Put gnu_headshadow.png on the source code
-
- patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
+ # Install to /usr/lib/iceweasel
+ patch -Np1 -i "$srcdir/iceweasel-install-dir.patch"
# Patch and remove anything that's left
patch -Np1 -i "$srcdir/libre.patch"
@@ -100,7 +102,8 @@ prepare() {
' browser/app/profile/firefox.js \
browser/metro/profile/metro.js
rm -v browser/base/content/abouthome/snippet*.png || true
- sed -i "\|abouthome/snippet|d" browser/base/jar.mn
+ sed -i '\|abouthome/snippet|d
+ ' browser/base/jar.mn
# Replace common URLs
sed -i '\|extensions[.]getAddons[.]get[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g;
@@ -111,7 +114,8 @@ prepare() {
\|plugins[.]update[.]url| s|https://www[.]mozilla[.]org/[%]LOCALE[%]/plugincheck/["][)][;]|https://trisquel.info/en/browser");|g;
' browser/app/profile/firefox.js
- cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
+ # Load our build config, disable SafeSearch
+ cp "$srcdir/mozconfig" .mozconfig
if $_pgo; then
cat "$srcdir/mozconfig.pgo" >> .mozconfig
@@ -156,6 +160,8 @@ prepare() {
# Fix tab loading icon (flickers with libpng 1.6)
# https://bugzilla.mozilla.org/show_bug.cgi?id=841734
+ # TODO: Remove this; Iceweasel 32 will use CSS animations for the loading icon
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=759252
cp "$srcdir/iceweasel-20.0.1-fixed-loading-icon.png" \
browser/themes/linux/tabbrowser/loading.png
@@ -172,22 +178,10 @@ build() {
export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
export PYTHON="/usr/bin/python2"
- if [[ $CARCH == i686 ]]; then
- # Work around memory address space exhaustion during linking on i686
- LDFLAGS+=' -Wl,--no-keep-memory'
- fi
-
if $_pgo; then
- # Set up PGO
- export DISPLAY=:99
- Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
-
- if ! make -f client.mk build MOZ_PGO=1; then
- kill $!
- return 1
- fi
-
- kill $! || true
+ # Do PGO
+ xvfb-run -a -s "-extension GLX -screen 0 1280x1024x24" \
+ make -f client.mk build MOZ_PGO=1
else
make -f client.mk build
fi
@@ -208,20 +202,25 @@ package() {
for i in 16x16 32x32 48x48 64x64; do
install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png"
done
- install -Dm644 "$brandingdir/mozicon128.png" "$icondir/128x128/apps/$_pkgname.png"
- install -Dm644 "$_brandingdir/iceweasel_icon.svg" "$icondir/scalable/apps/$_pkgname.svg"
-
- install -d "$pkgdir/usr/share/applications"
- install -m644 "$srcdir/iceweasel.desktop" "$pkgdir/usr/share/applications"
-
+ install -Dm644 "$brandingdir/mozicon128.png" \
+ "$icondir/128x128/apps/$_pkgname.png"
+ install -Dm644 "$_brandingdir/iceweasel_icon.svg" \
+ "$icondir/scalable/apps/$_pkgname.svg"
+
+ install -d "$pkgdir/usr/share/applications"
+ install -m644 "$srcdir/iceweasel.desktop" \
+ "$pkgdir/usr/share/applications"
+
+ # Use system-provided dictionaries
rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation}
- ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries"
- ln -sf /usr/share/hyphen "$pkgdir/usr/lib/$_pkgname/hyphenation"
+ ln -s /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries"
+ ln -s /usr/share/hyphen "$pkgdir/usr/lib/$_pkgname/hyphenation"
rm -rf "$pkgdir/usr/lib/$_pkgname/browser/"{searchplugins,plugins}
ln -sf /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$_pkgname/browser/plugins"
ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/browser/searchplugins"
- # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
+ # Workaround for now:
+ #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin"
}
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 71f401e05..608dc5819 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -1,8 +1,8 @@
diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js
---- mozilla-release.orig/browser/app/profile/firefox.js 2014-06-11 23:44:43.729632510 -0300
-+++ mozilla-release/browser/app/profile/firefox.js 2014-06-11 23:54:32.231213278 -0300
+--- mozilla-release.orig/browser/app/profile/firefox.js 2014-07-23 13:16:30.287622288 -0300
++++ mozilla-release/browser/app/profile/firefox.js 2014-07-23 13:19:13.362141893 -0300
@@ -281,11 +281,6 @@
- pref("browser.slowStartup.timeThreshold", 60000);
+ pref("browser.slowStartup.timeThreshold", 50000);
pref("browser.slowStartup.maxSamples", 5);
-// This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
@@ -13,7 +13,7 @@ diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br
pref("browser.enable_automatic_image_resizing", true);
pref("browser.chrome.site_icons", true);
pref("browser.chrome.favicons", true);
-@@ -1486,12 +1481,7 @@
+@@ -1489,12 +1484,7 @@
// (This is intentionally on the high side; see bug 746055.)
pref("image.mem.max_decoded_image_kb", 256000);
@@ -28,8 +28,8 @@ diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br
// Turn on the CSP 1.0 parser for Content Security Policy headers
pref("security.csp.speccompliant", true);
diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozilla-release/browser/base/content/abouthome/aboutHome.css
---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css 2014-06-05 22:15:17.000000000 -0300
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.css 2014-06-11 23:51:17.732797819 -0300
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css 2014-07-16 22:45:05.000000000 -0300
++++ mozilla-release/browser/base/content/abouthome/aboutHome.css 2014-07-23 13:21:52.223313722 -0300
@@ -49,11 +49,6 @@
background-repeat: no-repeat;
}
@@ -158,12 +158,12 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi
- transform-origin: 0 0;
- }
-
- #downloads::before {
- content: url("chrome://browser/content/abouthome/downloads@2x.png");
- }
-@@ -421,9 +352,5 @@
- body[narrow] #restorePreviousSession::before {
- content: url("chrome://browser/content/abouthome/restore@2x.png");
+ .launchButton:-moz-dir(rtl)::before,
+ #aboutMozilla:-moz-dir(rtl)::before {
+ transform: scale(.5) translateX(32px);
+@@ -431,9 +362,5 @@
+ transform: scale(-0.5, 0.5) translateX(24px);
+ transform-origin: top center;
}
-
- #aboutMozilla::before {
@@ -172,139 +172,142 @@ 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 2014-06-05 22:15:17.000000000 -0300
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2014-06-11 23:51:17.769464803 -0300
-@@ -3,152 +3,44 @@
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2014-07-16 22:45:05.000000000 -0300
++++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2014-07-23 13:28:38.816155432 -0300
+@@ -3,154 +3,44 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const SEARCH_ENGINES = {
- "Google": {
- // This is the "2x" image designed for OS X retina resolution, Windows at 192dpi, etc.;
- // it will be scaled down as necessary on lower-dpi displays.
+- // This needs to be defined in a single line to keep the JS parser from creating many
+- // intermediate strings in memory. See bug 986672.
+- image: "data:image/png;base64,\
+-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"
+ "DuckDuckGo HTML": {
- image: "data:image/png;base64," +
-- "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"
++ image: "data:image/png;base64," +
+ "iVBORw0KGgoAAAANSUhEUgAAAC8AAAAcCAYAAADxyeavAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI" +
+ "WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH3AwBERgxGkWttAAABtVJREFUWMPtmGtwVdUVx397n3Pu" +
+ "K8m9uXlASCHQIBqeEooEDAymUEAKEaGlUoeOtbYdnSmdYjud6fjBdhytLS0zdRzbWkAGsCBtSktr" +
@@ -361,7 +364,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
// This global tracks if the page has been set up before, to prevent double inits
let gInitialized = false;
let gObserver = new MutationObserver(function (mutations) {
-@@ -156,7 +48,6 @@
+@@ -158,7 +48,6 @@
if (mutation.attributeName == "searchEngineName") {
setupSearchEngine();
if (!gInitialized) {
@@ -369,7 +372,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
gInitialized = true;
}
return;
-@@ -181,117 +72,6 @@
+@@ -183,117 +72,6 @@
window.removeEventListener("resize", fitToWidth);
});
@@ -487,7 +490,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
function onSearchSubmit(aEvent)
{
let searchTerms = document.getElementById("searchText").value;
-@@ -350,147 +130,6 @@
+@@ -352,147 +130,6 @@
document.dispatchEvent(event);
}
@@ -704,8 +707,8 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dt
<!ENTITY abouthome.historyButton.label "History">
<!ENTITY abouthome.settingsButton.label "Settings">
diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties
---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2014-06-05 22:15:18.000000000 -0300
-+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2014-06-11 23:51:17.842798771 -0300
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2014-07-16 22:45:07.000000000 -0300
++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2014-07-23 13:32:03.204266405 -0300
@@ -3,17 +3,12 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -721,7 +724,7 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio
-# This is the default set of web based feed handlers shown in the reader
-# selection UI
-browser.contentHandlers.types.0.title=My Yahoo!
--browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s
+-browser.contentHandlers.types.0.uri=https://add.my.yahoo.com/rss?url=%s
+browser.search.order.1=DuckDuckGo HTML
+browser.search.order.2=DuckDuckGo Lite
+browser.search.order.3=Seeks Search
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index 6f2ce3b32..10fcccbb0 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 214443 2014-06-09 03:04:24Z svenstaro $
+# $Id: PKGBUILD 217088 2014-07-18 11:28:37Z svenstaro $
# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
# Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
# Maintainer: Michał Masłowski <mtjm@mtjm.eu>
@@ -6,7 +6,7 @@
_pkgname='kdebase-konqueror'
pkgname='kdebase-konqueror-libre'
-pkgver=4.13.2
+pkgver=4.13.3
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://kde.org/applications/internet/konqueror/"
@@ -18,7 +18,7 @@ provides=("kdebase-konqueror=$pkgver")
makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'baloo-widgets')
source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
'konq-about-fsdg.diff')
-sha1sums=('90b4fefcd307df8da6f6eab4da97d9e7be9f2f78'
+sha1sums=('ddf8d738fe0975619c997a59a58e1dc82fd43a17'
'd6cbb53c04179b8180f9439eca156b7ff2e76b3a')
pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation'
depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD
index 468f35da4..14aeb7f4d 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 214415 2014-06-09 03:02:38Z svenstaro $
+# $Id: PKGBUILD 217060 2014-07-18 11:26:24Z svenstaro $
# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
# Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=kdebase-runtime
pkgname=kdebase-runtime-libre
-pkgver=4.13.2
+pkgver=4.13.3
pkgrel=1
pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers"
arch=('i686' 'x86_64' 'mips64el')
@@ -26,7 +26,7 @@ install="${_pkgname}.install"
source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"
'duckduckgo_html.desktop'
'duckduckgo_lite.desktop')
-sha1sums=('3ee6b1d263b7c87a63951a0ebc4d77a93c92214a'
+sha1sums=('9e28e4477856428a5c3c7f051704d2197728ac2b'
'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd'
'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b')
diff --git a/libre/kdelibs-libre/CVE-2014-3494.patch b/libre/kdelibs-libre/CVE-2014-3494.patch
deleted file mode 100644
index 648d4fd7d..000000000
--- a/libre/kdelibs-libre/CVE-2014-3494.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: David Faure <faure@kde.org>
-Date: Wed, 18 Jun 2014 18:29:04 +0000
-Subject: Don't require a job to handle messageboxes.
-X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=bbae87dc1be3ae063796a582774bd5642cacdd5d
----
-Don't require a job to handle messageboxes.
-
-The POP3 ioslave doesn't have a job when it gets here.
----
-
-
---- a/kio/kio/usernotificationhandler.cpp
-+++ b/kio/kio/usernotificationhandler.cpp
-@@ -19,7 +19,7 @@
- #include "usernotificationhandler_p.h"
-
- #include "slave.h"
--#include "job_p.h"
-+#include "jobuidelegate.h"
-
- #include <kdebug.h>
-
-@@ -76,19 +76,18 @@
-
- if (m_cachedResults.contains(key)) {
- result = *(m_cachedResults[key]);
-- } else if (r->slave->job()) {
-- SimpleJobPrivate* jobPrivate = SimpleJobPrivate::get(r->slave->job());
-- if (jobPrivate) {
-- result = jobPrivate->requestMessageBox(r->type,
-- r->data.value(MSG_TEXT).toString(),
-- r->data.value(MSG_CAPTION).toString(),
-- r->data.value(MSG_YES_BUTTON_TEXT).toString(),
-- r->data.value(MSG_NO_BUTTON_TEXT).toString(),
-- r->data.value(MSG_YES_BUTTON_ICON).toString(),
-- r->data.value(MSG_NO_BUTTON_ICON).toString(),
-- r->data.value(MSG_DONT_ASK_AGAIN).toString(),
-- r->data.value(MSG_META_DATA).toMap());
-- }
-+ } else {
-+ JobUiDelegate ui;
-+ const JobUiDelegate::MessageBoxType type = static_cast<JobUiDelegate::MessageBoxType>(r->type);
-+ result = ui.requestMessageBox(type,
-+ r->data.value(MSG_TEXT).toString(),
-+ r->data.value(MSG_CAPTION).toString(),
-+ r->data.value(MSG_YES_BUTTON_TEXT).toString(),
-+ r->data.value(MSG_NO_BUTTON_TEXT).toString(),
-+ r->data.value(MSG_YES_BUTTON_ICON).toString(),
-+ r->data.value(MSG_NO_BUTTON_ICON).toString(),
-+ r->data.value(MSG_DONT_ASK_AGAIN).toString(),
-+ r->data.value(MSG_META_DATA).toMap());
- m_cachedResults.insert(key, new int(result));
- }
- } else {
-
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index c1031943c..498a341bb 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 215302 2014-06-18 21:22:58Z andrea $
+# $Id: PKGBUILD 217476 2014-07-18 18:34:16Z andrea $
# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org
# Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=kdelibs
pkgname=kdelibs-libre
-pkgver=4.13.2
-pkgrel=3
+pkgver=4.13.3
+pkgrel=1
pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support"
arch=('i686' 'x86_64' 'mips64el')
url='https://projects.kde.org/projects/kde/kdelibs'
@@ -22,12 +22,12 @@ makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
install=${_pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
'kde-applications-menu.patch' 'khtml-fsdg.diff' 'qt4.patch'
- 'CVE-2014-3494.patch')
-sha1sums=('c540edeb7da23f5a8feacb4d775bce43f2060a96'
+ 'pyqt.patch')
+sha1sums=('9c0e963fa2db119ac37e15f31c05d18d3043a58e'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
'a1502a964081ad583a00cf90c56e74bf60121830'
'ed1f57ee661e5c7440efcaba7e51d2554709701c'
- 'c8b4010c68cee6352a68d97da3d5316f52207e83')
+ 'd32534d7d6dc287c80951d24caf0259ab18c9abc')
prepare() {
mkdir build
@@ -38,9 +38,9 @@ prepare() {
patch -p1 -i "${srcdir}"/khtml-fsdg.diff
# qmake refers to Qt5
patch -p1 -i "${srcdir}"/qt4.patch
- # fix build with giflib 5.1.0
- sed -i "/DGifCloseFile/s:file:&, NULL:g" khtml/imload/decoders/gifloader.cpp
- patch -p1 -i "${srcdir}"/CVE-2014-3494.patch
+
+ # support newer PyQt build system
+ patch -p1 -i "${srcdir}"/pyqt.patch
}
build() {
diff --git a/libre/kdelibs-libre/fix-cifs-mount.patch b/libre/kdelibs-libre/fix-cifs-mount.patch
deleted file mode 100644
index 98bae4594..000000000
--- a/libre/kdelibs-libre/fix-cifs-mount.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-commit 9a8426ae2ed35ac900b89a623618fc158d24ee6a
-Author: Tomáš Trnka <tomastrnka@gmx.com>
-Date: Sun May 25 16:12:36 2014 +0200
-
- Revert "Avoid unnecessary automounting in KDiskFreeSpaceInfo::freeSpaceInfo"
-
- This reverts commit 6246e99b43f3d1a9e15d563fbb5e173ed50ba5e5.
-
- It breaks KIO on CIFS mounts as the check for automounts copied over
- from frameworks/kfileitem.cpp isDirectoryMounted() apparently matches
- CIFS as well (and for some weird reason KIO checks for available space
- before trying to copy files).
-
- We'll probably have to return to v1 of the abovementioned commit, i.e.
- checking for "autofs" explicitly. However, more testing is apparently
- necessary to avoid further nasty surprises.
-
- REVIEW: 117044
- BUG: 334776
- FIXED-IN: 4.13.2
-
-diff --git a/kio/kfile/kdiskfreespaceinfo.cpp b/kio/kfile/kdiskfreespaceinfo.cpp
-index 5c1fa72..f11eb09 100644
---- a/kio/kfile/kdiskfreespaceinfo.cpp
-+++ b/kio/kfile/kdiskfreespaceinfo.cpp
-@@ -33,7 +33,6 @@
- #include <QtCore/QDir>
- #include <windows.h>
- #else
--#include <QtCore/QFileInfo>
- #include <sys/statvfs.h>
- #endif
-
-@@ -131,15 +130,6 @@ KDiskFreeSpaceInfo KDiskFreeSpaceInfo::freeSpaceInfo( const QString& path )
- #else
- struct statvfs statvfs_buf;
-
-- // Ignore autofs mountpoints as statvfs would trigger (expensive) automounting
-- // This also matches "special" filesystems like /proc where free space has no meaning
-- if (mp) {
-- QFileInfo fi(info.d->mountPoint);
-- if (fi.isDir() && fi.size() == 0) {
-- return info;
-- }
-- }
--
- // Prefer mountPoint if available, so that it even works with non-existing files.
- const QString pathArg = info.d->mountPoint.isEmpty() ? path : info.d->mountPoint;
- if (!statvfs(QFile::encodeName(pathArg).constData(), &statvfs_buf)) {
diff --git a/libre/kdelibs-libre/pyqt.patch b/libre/kdelibs-libre/pyqt.patch
new file mode 100644
index 000000000..e4c95b6bd
--- /dev/null
+++ b/libre/kdelibs-libre/pyqt.patch
@@ -0,0 +1,161 @@
+From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+Date: Wed, 16 Jul 2014 19:29:40 +0000
+Subject: Make FindPyQt4 work with PyQt's new build system.
+X-Git-Tag: v4.13.90
+X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=a7e47438d4e3469dc9df70d613826cb360fc8d19
+---
+Make FindPyQt4 work with PyQt's new build system.
+
+Since PyQt 4.10, PyQt.pyqtconfig is deprecated and not available unless
+PyQt is built using the old configure script.
+
+There is no direct replacement for it, as PyQt's new build system does
+not provide as much information as before by design. Luckily, most of
+the variables we are interested in can be obtained from PyQt's QtCore
+module itself even if its old build system is used.
+
+The only exception is pyqt_sip_dir, which cannot be determined at all if
+pyqtconfig is not available. In this case, the most we can do is guess
+the default path like QScintilla2 does, and fail if it does not exist.
+The user then needs to specify it manually via CMake with something like
+-DPYQT4_SIP_DIR=/usr/share/sip/PyQt4. To this effect, all variables set
+by FindPyQt4.cmake have been made cache variables, which means their
+values can be overriden by the user, thus ignoring the contents read via
+FindPyQt.py.
+
+BUG: 337462
+FIXED-IN: 4.14.0
+REVIEW: 119302
+---
+
+
+--- a/cmake/modules/FindPyQt4.cmake
++++ b/cmake/modules/FindPyQt4.cmake
+@@ -9,16 +9,20 @@
+ # Find the installed version of PyQt4. FindPyQt4 should only be called after
+ # Python has been found.
+ #
+-# This file defines the following variables:
++# This file defines the following variables, which can also be overriden by
++# users:
+ #
+ # PYQT4_VERSION - The version of PyQt4 found expressed as a 6 digit hex number
+ # suitable for comparison as a string
+ #
+ # PYQT4_VERSION_STR - The version of PyQt4 as a human readable string.
+ #
+-# PYQT4_VERSION_TAG - The PyQt version tag using by PyQt's sip files.
++# PYQT4_VERSION_TAG - The Qt4 version tag used by PyQt's sip files.
+ #
+-# PYQT4_SIP_DIR - The directory holding the PyQt4 .sip files.
++# PYQT4_SIP_DIR - The directory holding the PyQt4 .sip files. This can be unset
++# if PyQt4 was built using its new build system and pyqtconfig.py is not
++# present on the system, as in this case its value cannot be determined
++# automatically.
+ #
+ # PYQT4_SIP_FLAGS - The SIP flags used to build PyQt.
+
+@@ -31,13 +35,27 @@
+
+ EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_pyqt_py} OUTPUT_VARIABLE pyqt_config)
+ IF(pyqt_config)
+- STRING(REGEX REPLACE "^pyqt_version:([^\n]+).*$" "\\1" PYQT4_VERSION ${pyqt_config})
+- STRING(REGEX REPLACE ".*\npyqt_version_str:([^\n]+).*$" "\\1" PYQT4_VERSION_STR ${pyqt_config})
+- STRING(REGEX REPLACE ".*\npyqt_version_tag:([^\n]+).*$" "\\1" PYQT4_VERSION_TAG ${pyqt_config})
+- STRING(REGEX REPLACE ".*\npyqt_sip_dir:([^\n]+).*$" "\\1" PYQT4_SIP_DIR ${pyqt_config})
+- STRING(REGEX REPLACE ".*\npyqt_sip_flags:([^\n]+).*$" "\\1" PYQT4_SIP_FLAGS ${pyqt_config})
++ STRING(REGEX MATCH "^pyqt_version:([^\n]+).*$" _dummy ${pyqt_config})
++ SET(PYQT4_VERSION "${CMAKE_MATCH_1}" CACHE STRING "PyQt4's version as a 6-digit hexadecimal number")
+
+- SET(PYQT4_FOUND TRUE)
++ STRING(REGEX MATCH ".*\npyqt_version_str:([^\n]+).*$" _dummy ${pyqt_config})
++ SET(PYQT4_VERSION_STR "${CMAKE_MATCH_1}" CACHE STRING "PyQt4's version as a human-readable string")
++
++ STRING(REGEX MATCH ".*\npyqt_version_tag:([^\n]+).*$" _dummy ${pyqt_config})
++ SET(PYQT4_VERSION_TAG "${CMAKE_MATCH_1}" CACHE STRING "The Qt4 version tag used by PyQt4's .sip files")
++
++ STRING(REGEX MATCH ".*\npyqt_sip_dir:([^\n]+).*$" _dummy ${pyqt_config})
++ SET(PYQT4_SIP_DIR "${CMAKE_MATCH_1}" CACHE FILEPATH "The base directory where PyQt4's .sip files are installed")
++
++ STRING(REGEX MATCH ".*\npyqt_sip_flags:([^\n]+).*$" _dummy ${pyqt_config})
++ SET(PYQT4_SIP_FLAGS "${CMAKE_MATCH_1}" CACHE STRING "The SIP flags used to build PyQt4")
++
++ IF(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}")
++ MESSAGE(WARNING "The base directory where PyQt4's SIP files are installed could not be determined. This usually means PyQt4 was built with its new build system and pyqtconfig.py is not present.\n"
++ "Please set the PYQT4_SIP_DIR variable manually.")
++ ELSE(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}")
++ SET(PYQT4_FOUND TRUE)
++ ENDIF(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}")
+ ENDIF(pyqt_config)
+
+ IF(PYQT4_FOUND)
+
+--- kdelibs-4.13.3/cmake/modules/FindPyQt.py~ 2014-07-11 06:42:13.000000000 +0000
++++ kdelibs-4.13.3/cmake/modules/FindPyQt.py 2014-07-18 13:04:32.070296111 +0000
+@@ -1,24 +1,49 @@
+ # Copyright (c) 2007, Simon Edwards <simon@simonzone.com>
++# Copyright (c) 2014, Raphael Kubo da Costa <rakuco@FreeBSD.org>
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+-import PyQt4.pyqtconfig
++import PyQt4.QtCore
++import os
++import sys
+
+-pyqtcfg = PyQt4.pyqtconfig.Configuration()
+-print("pyqt_version:%06.0x" % pyqtcfg.pyqt_version)
+-print("pyqt_version_str:%s" % pyqtcfg.pyqt_version_str)
+-
+-pyqt_version_tag = ""
+-in_t = False
+-for item in pyqtcfg.pyqt_sip_flags.split(' '):
+- if item=="-t":
+- in_t = True
+- elif in_t:
+- if item.startswith("Qt_4"):
+- pyqt_version_tag = item
++def get_default_sip_dir():
++ # This is based on QScintilla's configure.py, and only works for the
++ # default case where installation paths have not been changed in PyQt's
++ # configuration process.
++ if sys.platform == 'win32':
++ pyqt_sip_dir = os.path.join(sys.platform, 'sip', 'PyQt4')
+ else:
+- in_t = False
+-print("pyqt_version_tag:%s" % pyqt_version_tag)
++ pyqt_sip_dir = os.path.join(sys.platform, 'share', 'sip', 'PyQt4')
++ return pyqt_sip_dir
++
++def get_qt4_tag(sip_flags):
++ in_t = False
++ for item in sip_flags.split(' '):
++ if item == '-t':
++ in_t = True
++ elif in_t:
++ if item.startswith('Qt_4'):
++ return item
++ else:
++ in_t = False
++ raise ValueError('Cannot find Qt\'s tag in PyQt4\'s SIP flags.')
++
++if __name__ == '__main__':
++ try:
++ import PyQt4.pyqtconfig
++ pyqtcfg = PyQt4.pyqtconfig.Configuration()
++ sip_dir = pyqtcfg.pyqt_sip_dir
++ sip_flags = pyqtcfg.pyqt_sip_flags
++ except ImportError:
++ # PyQt4 >= 4.10.0 was built with configure-ng.py instead of
++ # configure.py, so pyqtconfig.py is not installed.
++ sip_dir = get_default_sip_dir()
++ sip_flags = PyQt4.QtCore.PYQT_CONFIGURATION['sip_flags']
++
++ print('pyqt_version:%06.x' % PyQt4.QtCore.PYQT_VERSION)
++ print('pyqt_version_str:%s' % PyQt4.QtCore.PYQT_VERSION_STR)
++ print('pyqt_version_tag:%s' % get_qt4_tag(sip_flags))
++ print('pyqt_sip_dir:%s' % sip_dir)
++ print('pyqt_sip_flags:%s' % sip_flags)
+
+-print("pyqt_sip_dir:%s" % pyqtcfg.pyqt_sip_dir)
+-print("pyqt_sip_flags:%s" % pyqtcfg.pyqt_sip_flags)
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index 1a468243e..ee34d1e77 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 214656 2014-06-09 03:17:39Z svenstaro $
+# $Id: PKGBUILD 217314 2014-07-18 11:45:55Z svenstaro $
# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=kdenetwork-kopete
pkgname=kdenetwork-kopete-libre
-pkgver=4.13.2
+pkgver=4.13.3
pkgrel=1
pkgdesc='Instant Messenger, without nonfree Skype support'
url='http://kde.org/applications/internet/kopete/'
@@ -19,7 +19,7 @@ depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libidn'
makedepends=('cmake' 'automoc4' 'boost' 'kdepim-libkdepim')
install=${_pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz")
-sha1sums=('bf520ce1fd08eb0464753675405b0f362fef2606')
+sha1sums=('a713f7394e0c61d776545998f88556b601616e17')
prepare() {
cd kopete-${pkgver}
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index d97c67589..e1c1127d4 100644
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 214706 2014-06-09 03:21:25Z svenstaro $
+# $Id: PKGBUILD 217366 2014-07-18 11:50:35Z svenstaro $
# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=kdeutils-ark
pkgname=kdeutils-ark-libre
-pkgver=4.13.2
+pkgver=4.13.3
pkgrel=1
pkgdesc='Archiving Tool, with unar support'
url='http://kde.org/applications/utilities/ark/'
@@ -20,7 +20,7 @@ optdepends=('p7zip' 'zip' 'unzip' 'unar')
install=${_pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz"
'ark-unar-06.patch')
-sha1sums=('450aead29450fa1d17016e4bf8b8e5fdca30de05'
+sha1sums=('432afb91b79e95b10a0d15ed13697e8c4ecf99d3'
'a0a836950f185d9b2245204579f969203036fdec')
prepare() {
diff --git a/libre/kipi-plugins-libre/PKGBUILD b/libre/kipi-plugins-libre/PKGBUILD
index 83db25a64..a78c038b8 100644
--- a/libre/kipi-plugins-libre/PKGBUILD
+++ b/libre/kipi-plugins-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 213016 2014-05-17 10:20:26Z ronald $
+# $Id: PKGBUILD 217736 2014-07-22 19:45:05Z ronald $
# Maintainer (Arch): Ronald van Haren <ronald@archlinux.org>
# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
# Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
@@ -8,7 +8,7 @@
pkgbase=digikam
_pkgname=kipi-plugins
pkgname=kipi-plugins-libre
-pkgver=4.0.0
+pkgver=4.1.0
pkgrel=1
pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam, without nonfree jAlbum and SimpleViewer support"
arch=('i686' 'x86_64' 'mips64el')
@@ -31,7 +31,7 @@ optdepends=('libkgeomap: Geolocalize tool'
options=('staticlibs')
install=kipi-plugins.install
source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('23fd1e31e1f0518265c3165e620beb15cef4d41e')
+sha1sums=('b2cd7acca4e9b4d7924a5c5f76009846b8b3b6e0')
prepare() {
cd ${srcdir}/${pkgbase}-${pkgver}
diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD
index 259472272..f957c8981 100644
--- a/libre/linux-libre-grsec/PKGBUILD
+++ b/libre/linux-libre-grsec/PKGBUILD
@@ -13,13 +13,13 @@
pkgbase=linux-libre-grsec # Build stock -libre-grsec kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.15
-_sublevel=5
+_sublevel=6
_grsecver=3.0
-_timestamp=201407170639
+_timestamp=201407232200
_pkgver=${_basekernel}.${_sublevel}
pkgver=${_basekernel}.${_sublevel}.${_timestamp}
pkgrel=1
-_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="https://grsecurity.net/"
license=('GPL2')
@@ -41,11 +41,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'sysctl.conf'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz")
sha256sums=('93450dc189131b6a4de862f35c5087a58cc7bae1c24caa535d2357cc3301b688'
- '17ee14d488733298eef21d4a82986376199d92150ed9de00c25f5d9997eb02ae'
- '5c895b9b328b8df59a83eb62d3afdbb42a7dfaa790751cfbce595768fc50db22'
+ '1966964395bd9331843c8d6dacbf661c9061e90c81bf8609d995ed458d57e358'
+ '90c7a7d4666ae4807eb45b766f73e649e4fcf9fdcb983b710fe33e3f80f7b546'
'SKIP'
- '63e0b77252fb881ec0d1ee97ec78fd243a56bf79bf35e7e650d59631dfe9096d'
- '434816aaaa635115b7f44b06dcd6f4037431378b4b0e9282803263c9288ab663'
+ 'd6254dfca781a732d277ea22d67843dbe7ff1c8da5f77705a7783cd8ccdddc05'
+ '4c24d148ac4c21271b33b14013ba234a7dd8af417f505ef226b9da04fa91a6e7'
'9d2f34f1a8c514a7117b9b017a1f7312fb351f4d0b079eed102f89361534d486'
'c5451d5e1eafc4f8d28b1a2958ec3102c124433a414a86450fc32058e004156b'
'55bf07738a3286168a7929ae16dbca29defd14e77b9d24c487ae4c3d12bb9eb9'
@@ -53,7 +53,7 @@ sha256sums=('93450dc189131b6a4de862f35c5087a58cc7bae1c24caa535d2357cc3301b688'
'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182'
'937dc895b4f5948381775a75bd198ed2f157a9f356da0ab5a5006f9f1dacde5c'
'd4d4ae0b9c510547f47d94582e4ca08a7f12e9baf324181cb54d328027305e31'
- 'ca0399ad601efd926a3d6e328d6457a7e945fe982e4f13ed39fff31982082f28')
+ '38beb22b3d9f548fff897c0690dad330443ef24e48d414cf8dbc682f40501fab')
if [ "$CARCH" != "mips64el" ]; then
# don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
diff --git a/libre/linux-libre-grsec/config.i686 b/libre/linux-libre-grsec/config.i686
index 462fb89d7..7fb6a2cd4 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 3.15.3.201407012153-2 Kernel Configuration
+# Linux/x86 3.15.5.201407170639-2 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -453,7 +453,7 @@ CONFIG_BOUNCE=y
CONFIG_VIRT_TO_BUS=y
CONFIG_MMU_NOTIFIER=y
CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
CONFIG_MEMORY_FAILURE=y
CONFIG_TRANSPARENT_HUGEPAGE=y
@@ -6511,7 +6511,7 @@ CONFIG_PAX_RANDMMAP=y
#
# Miscellaneous hardening features
#
-# CONFIG_PAX_MEMORY_SANITIZE is not set
+CONFIG_PAX_MEMORY_SANITIZE=y
CONFIG_PAX_MEMORY_STACKLEAK=y
CONFIG_PAX_MEMORY_STRUCTLEAK=y
CONFIG_PAX_MEMORY_UDEREF=y
diff --git a/libre/linux-libre-grsec/config.x86_64 b/libre/linux-libre-grsec/config.x86_64
index 6d2def186..ba786a3fe 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 3.15.3.201407012153-2 Kernel Configuration
+# Linux/x86 3.15.5.201407170639-2 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -463,7 +463,7 @@ CONFIG_BOUNCE=y
CONFIG_VIRT_TO_BUS=y
CONFIG_MMU_NOTIFIER=y
CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
CONFIG_MEMORY_FAILURE=y
CONFIG_TRANSPARENT_HUGEPAGE=y
@@ -6280,7 +6280,7 @@ CONFIG_PAX_RANDMMAP=y
#
# Miscellaneous hardening features
#
-# CONFIG_PAX_MEMORY_SANITIZE is not set
+CONFIG_PAX_MEMORY_SANITIZE=y
CONFIG_PAX_MEMORY_STACKLEAK=y
CONFIG_PAX_MEMORY_STRUCTLEAK=y
CONFIG_PAX_REFCOUNT=y
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 53b102a85..947e4a2c2 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 215941 2014-07-01 05:54:34Z tpowa $
+# $Id: PKGBUILD 217013 2014-07-18 09:27:57Z tpowa $
# Maintainer (Arch): Paul Mattal <paul@archlinux.org>
# Maintainer: André Silva <emulatorman@parabola.nu>
@@ -6,7 +6,7 @@ _pkgbase=lirc
pkgbase=lirc-libre
pkgname=('lirc-libre' 'lirc-libre-utils')
pkgver=0.9.0
-pkgrel=74.1
+pkgrel=75
epoch=1
_extramodules=extramodules-3.15-libre
arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD
index 01e1c75f6..9de861ebd 100644
--- a/libre/mesa-libcl/PKGBUILD
+++ b/libre/mesa-libcl/PKGBUILD
@@ -5,8 +5,8 @@ pkgbase=mesa
_pkgname=libcl
pkgname=$pkgbase-$_pkgname
_pkgflag=libre
-pkgver=10.2.3
-pkgrel=2
+pkgver=10.2.4
+pkgrel=1
pkgdesc='Mesa 3-D OpenCL library'
url=http://${pkgbase}3d.sourceforge.net
license=(
@@ -59,7 +59,7 @@ source=(
ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2
)
sha512sums=(
- 418c452abb2911e0c3105b23ea4baff98dae8bb612eb88011970f34cad319063a7dd2bd18a95729ce116a06f675dfa1c620226be8582d6f06ca34def3bafcf6a
+ b74e9dd8e013b3f1f5bf4d51116e4ed2cb053a91135c57eed10cc87398169665b8e5f83076742da9ea4612f7340e9defd6d2ca2a49d456068cbe81ee3695d24d
)
build() {
diff --git a/libre/nss/PKGBUILD b/libre/nss/PKGBUILD
index 1676dc44d..b8534b886 100644
--- a/libre/nss/PKGBUILD
+++ b/libre/nss/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 212171 2014-05-09 18:25:02Z jgc $
+# $Id: PKGBUILD 217709 2014-07-22 06:09:33Z foutrelis $
# Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
# Maintainer: André Silva <emulatorman@parabola.nu>
# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
pkgname=nss
-pkgver=3.16.1
+pkgver=3.16.3
pkgrel=1
pkgdesc="Mozilla Network Security Services, with CAcert CA certificates support"
arch=(i686 x86_64)
url="http://www.mozilla.org/projects/security/pki/nss/"
license=('MPL' 'GPL')
-_nsprver=4.10.5
+_nsprver=4.10.6
depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh')
makedepends=('perl')
options=('!strip' '!makeflags' 'staticlibs')
@@ -19,7 +19,7 @@ source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/s
nss-config.in
ssl-renegotiate-transitional.patch
add_cacert_ca_certs.patch)
-sha1sums=('450a88dde8c7e4533507ac8340dbf94be28a759b'
+sha1sums=('a1937de60e03a24526591d883bcfe31a3acc8ef4'
'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
'8a964a744ba098711b80c0d279a2993524e8eb92'
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index cb45d2226..00241f9c7 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 113851 2014-07-01 06:51:44Z tpowa $
+# $Id: PKGBUILD 115913 2014-07-18 11:31:47Z tpowa $
# Maintainer (Arch): Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor (Arch): xduugu
# Contributor (Arch): nh2
@@ -12,7 +12,7 @@
_pkgname=tp_smapi
pkgname=tp_smapi-libre
pkgver=0.41
-pkgrel=50.1
+pkgrel=51
pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)"
arch=('i686' 'x86_64' 'mips64el')
url='https://github.com/evgeni/tp_smapi'
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index 2081637d2..6ab8b4362 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 115569 2014-07-12 13:12:36Z heftig $
+# $Id: PKGBUILD 115915 2014-07-18 11:31:59Z tpowa $
# Maintainer (Arch): Ray Rashif <schiv@archlinux.org>
# Contributor (Arch): Mateusz Herych <heniekk@gmail.com>
# Contributor (Arch): Charles Lindsay <charles@chaoslizard.org>
@@ -8,7 +8,7 @@ _pkgname=vhba-module
pkgname=vhba-module-libre
pkgver=20140629
_extramodules=extramodules-3.15-libre
-pkgrel=3
+pkgrel=4
pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)"
arch=('i686' 'x86_64' 'mips64el')
url="http://cdemu.sourceforge.net/"
diff --git a/libre/vim-runtime/PKGBUILD b/libre/vim-runtime/PKGBUILD
index 0ddb25fb7..d0c6602d9 100644
--- a/libre/vim-runtime/PKGBUILD
+++ b/libre/vim-runtime/PKGBUILD
@@ -8,11 +8,11 @@
pkgbase=vim
pkgname=vim-runtime
_topver=7.4
-_patchlevel=335
-__hgrev=4aa63564dd3f
+_patchlevel=373
+__hgrev=32a77cc160d9
_versiondir="vim${_topver//./}"
pkgver=${_topver}.${_patchlevel}
-pkgrel=4
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
license=('custom:vim')
url="http://www.vim.org"
@@ -21,7 +21,7 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz"
"ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz.sig"
'vimrc'
'parabola.vim')
-md5sums=('e6b40c71599d69acc8f2bbf768242896'
+md5sums=('74493914d81495f3cc6423d33a3de50d'
'SKIP'
'27820c2bdc34624674c561ae6476bc6a'
'a8c21928eefd766e211f987879a9199c')