diff options
69 files changed, 586 insertions, 1159 deletions
diff --git a/kernels/linux-libre-grsec-knock/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch b/kernels/linux-libre-grsec-knock/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch deleted file mode 100644 index f9aa99342..000000000 --- a/kernels/linux-libre-grsec-knock/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch +++ /dev/null @@ -1,79 +0,0 @@ -From d472fcc8379c062bd56a3876fc6ef22258f14a91 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Mon, 24 Nov 2014 11:12:42 +0100 -Subject: [PATCH] drm/i915: Disallow pin ioctl completely for kms drivers - -The problem here is that SNA pins batchbuffers to etch out a bit more -performance. Iirc it started out as a w/a for i830M (which we've -implemented in the kernel since a long time already). The problem is -that the pin ioctl wasn't added in - -commit d23db88c3ab233daed18709e3a24d6c95344117f -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Fri May 23 08:48:08 2014 +0200 - - drm/i915: Prevent negative relocation deltas from wrapping - -Fix this by simply disallowing pinning from userspace so that the -kernel is in full control of batch placement again. Especially since -distros are moving towards running X as non-root, so most users won't -even be able to see any benefits. - -UMS support is dead now, but we need this minimal patch for -backporting. Follow-up patch will remove the pin ioctl code -completely. - -Note to backporters: You must have both - -commit b45305fce5bb1abec263fcff9d81ebecd6306ede -Author: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Mon Dec 17 16:21:27 2012 +0100 - - drm/i915: Implement workaround for broken CS tlb on i830/845 - -which laned in 3.8 and - -commit c4d69da167fa967749aeb70bc0e94a457e5d00c1 -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Mon Sep 8 14:25:41 2014 +0100 - - drm/i915: Evict CS TLBs between batches - -which is also marked cc: stable. Otherwise this could introduce a -regression by disabling the userspace w/a without the kernel w/a being -fully functional on i830/45. - -References: https://bugs.freedesktop.org/show_bug.cgi?id=76554#c116 -Cc: stable@vger.kernel.org # requires c4d69da167fa967749a and v3.8 -Cc: Chris Wilson <chris@chris-wilson.co.uk> -Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> ---- - drivers/gpu/drm/i915/i915_gem.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c -index fd17cca..97b86a5 100644 ---- a/drivers/gpu/drm/i915/i915_gem.c -+++ b/drivers/gpu/drm/i915/i915_gem.c -@@ -4263,7 +4263,7 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data, - struct drm_i915_gem_object *obj; - int ret; - -- if (INTEL_INFO(dev)->gen >= 6) -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) - return -ENODEV; - - ret = i915_mutex_lock_interruptible(dev); -@@ -4319,6 +4319,9 @@ i915_gem_unpin_ioctl(struct drm_device *dev, void *data, - struct drm_i915_gem_object *obj; - int ret; - -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) -+ return -ENODEV; -+ - ret = i915_mutex_lock_interruptible(dev); - if (ret) - return ret; --- -2.2.0 - diff --git a/kernels/linux-libre-grsec-knock/PKGBUILD b/kernels/linux-libre-grsec-knock/PKGBUILD index a17715738..fa193d040 100644 --- a/kernels/linux-libre-grsec-knock/PKGBUILD +++ b/kernels/linux-libre-grsec-knock/PKGBUILD @@ -12,9 +12,9 @@ pkgbase=linux-libre-grsec-knock # Build kernel with -grsec-knock localname _pkgbasever=3.18-gnu -_pkgver=3.18.3-gnu +_pkgver=3.18.5-gnu _grsecver=3.0 -_timestamp=201501182219 +_timestamp=201501310706 _knockpatchver=3.18_1 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -44,27 +44,25 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li 'linux.preset' 'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm} 'change-default-console-loglevel.patch' - '0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.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 '3.18-rc6-48c0ad793f-loongson-community.patch') sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' 'SKIP' - '28e6de2c7325d7b0c3856381678028969b97abb9224f9609a3d6563f560f24b8' + '65a9e66cf15eb523fe6759c3eb983d93a105ea13637bc40419b7ea2143af3daf' 'SKIP' - 'ba8d2a97211522e8fb1797e06f77e5a83c0f331d763e4bb5ce2931ddf714461b' + '56fbe38b2700d85c84c535c77921e77d35d389fb5eaa4c4f025327d8dd8c1225' 'SKIP' '93a1610c203ea4c187ac5b50dce105fac86df914b1406e1d85df5857d36201c9' 'SKIP' - '98c976f19423a9aa917f8401e87478ed851535af990b7be1cc1ded938e21fd44' - '929c59c941c30d96b750d08ffc2a82fba8ba6bc04cbd03bb8e46ea8ccd2e70dd' + 'd081c0ec2514ee3dec06d2fe10980e2958746f9e78d0a5cda54c8df8cf4c4a0a' + 'fce9e649924e852519437f98dfaf6c59c54f7ece71210d4405420d673ff877df' '8b79e94a734b994aa788edfea58ab540de3f1db80adab88f73c6d11f4bb92dc1' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264' '2e87a8ec1cc0c91938cac24992d8a3d4362b3e9d939767e4c9d2ec8e6d969d53' 'f67f60a30bcf2e9a2ba88ad97cace308da7a7f94919bb95c3dc030f5885a8015' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '0bda45a3ef0f2780bbe588f2e53ab2b79814d29e9c6fc7bfff3b0dbdaa9e710d' '438ce44e3409d644f0a99b05c3208ae3f1d46b8efe0edfc7d52ce3625e381ae9') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva @@ -104,9 +102,6 @@ prepare() { # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git - # fix #43143 - patch -p1 -i "${srcdir}/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.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) diff --git a/kernels/linux-libre-grsec-knock/config.i686 b/kernels/linux-libre-grsec-knock/config.i686 index 2baad6b4b..52d05bd76 100644 --- a/kernels/linux-libre-grsec-knock/config.i686 +++ b/kernels/linux-libre-grsec-knock/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.18.1-gnu-201412281149-1-grsec-knock Kernel Configuration +# Linux/x86 3.18.4-gnu-201501272307-1-grsec-knock Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -7002,6 +7002,7 @@ CONFIG_GRKERNSEC_CHROOT_UNIX=y CONFIG_GRKERNSEC_CHROOT_FINDTASK=y CONFIG_GRKERNSEC_CHROOT_NICE=y CONFIG_GRKERNSEC_CHROOT_SYSCTL=y +CONFIG_GRKERNSEC_CHROOT_RENAME=y CONFIG_GRKERNSEC_CHROOT_CAPS=y CONFIG_GRKERNSEC_CHROOT_INITRD=y diff --git a/kernels/linux-libre-grsec-knock/config.x86_64 b/kernels/linux-libre-grsec-knock/config.x86_64 index ae1197f5d..ce230aa76 100644 --- a/kernels/linux-libre-grsec-knock/config.x86_64 +++ b/kernels/linux-libre-grsec-knock/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.18.1-gnu-201412281149-1-grsec-knock Kernel Configuration +# Linux/x86 3.18.4-gnu-201501272307-1-grsec-knock Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -6699,6 +6699,7 @@ CONFIG_GRKERNSEC_CHROOT_UNIX=y CONFIG_GRKERNSEC_CHROOT_FINDTASK=y CONFIG_GRKERNSEC_CHROOT_NICE=y CONFIG_GRKERNSEC_CHROOT_SYSCTL=y +CONFIG_GRKERNSEC_CHROOT_RENAME=y CONFIG_GRKERNSEC_CHROOT_CAPS=y CONFIG_GRKERNSEC_CHROOT_INITRD=y diff --git a/kernels/linux-libre-knock/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch b/kernels/linux-libre-knock/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch deleted file mode 100644 index f9aa99342..000000000 --- a/kernels/linux-libre-knock/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch +++ /dev/null @@ -1,79 +0,0 @@ -From d472fcc8379c062bd56a3876fc6ef22258f14a91 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Mon, 24 Nov 2014 11:12:42 +0100 -Subject: [PATCH] drm/i915: Disallow pin ioctl completely for kms drivers - -The problem here is that SNA pins batchbuffers to etch out a bit more -performance. Iirc it started out as a w/a for i830M (which we've -implemented in the kernel since a long time already). The problem is -that the pin ioctl wasn't added in - -commit d23db88c3ab233daed18709e3a24d6c95344117f -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Fri May 23 08:48:08 2014 +0200 - - drm/i915: Prevent negative relocation deltas from wrapping - -Fix this by simply disallowing pinning from userspace so that the -kernel is in full control of batch placement again. Especially since -distros are moving towards running X as non-root, so most users won't -even be able to see any benefits. - -UMS support is dead now, but we need this minimal patch for -backporting. Follow-up patch will remove the pin ioctl code -completely. - -Note to backporters: You must have both - -commit b45305fce5bb1abec263fcff9d81ebecd6306ede -Author: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Mon Dec 17 16:21:27 2012 +0100 - - drm/i915: Implement workaround for broken CS tlb on i830/845 - -which laned in 3.8 and - -commit c4d69da167fa967749aeb70bc0e94a457e5d00c1 -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Mon Sep 8 14:25:41 2014 +0100 - - drm/i915: Evict CS TLBs between batches - -which is also marked cc: stable. Otherwise this could introduce a -regression by disabling the userspace w/a without the kernel w/a being -fully functional on i830/45. - -References: https://bugs.freedesktop.org/show_bug.cgi?id=76554#c116 -Cc: stable@vger.kernel.org # requires c4d69da167fa967749a and v3.8 -Cc: Chris Wilson <chris@chris-wilson.co.uk> -Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> ---- - drivers/gpu/drm/i915/i915_gem.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c -index fd17cca..97b86a5 100644 ---- a/drivers/gpu/drm/i915/i915_gem.c -+++ b/drivers/gpu/drm/i915/i915_gem.c -@@ -4263,7 +4263,7 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data, - struct drm_i915_gem_object *obj; - int ret; - -- if (INTEL_INFO(dev)->gen >= 6) -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) - return -ENODEV; - - ret = i915_mutex_lock_interruptible(dev); -@@ -4319,6 +4319,9 @@ i915_gem_unpin_ioctl(struct drm_device *dev, void *data, - struct drm_i915_gem_object *obj; - int ret; - -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) -+ return -ENODEV; -+ - ret = i915_mutex_lock_interruptible(dev); - if (ret) - return ret; --- -2.2.0 - diff --git a/kernels/linux-libre-knock/PKGBUILD b/kernels/linux-libre-knock/PKGBUILD index feb55814c..e1635203c 100644 --- a/kernels/linux-libre-knock/PKGBUILD +++ b/kernels/linux-libre-knock/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-knock # Build stock knock kernel _pkgbasever=3.18-gnu -_pkgver=3.18.3-gnu +_pkgver=3.18.5-gnu _knockpatchver=3.18_1 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -37,12 +37,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li 'linux.preset' 'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm} 'change-default-console-loglevel.patch' - '0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch' # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/ '3.18-rc6-48c0ad793f-loongson-community.patch') sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' 'SKIP' - '28e6de2c7325d7b0c3856381678028969b97abb9224f9609a3d6563f560f24b8' + '65a9e66cf15eb523fe6759c3eb983d93a105ea13637bc40419b7ea2143af3daf' 'SKIP' '93a1610c203ea4c187ac5b50dce105fac86df914b1406e1d85df5857d36201c9' 'SKIP' @@ -54,7 +53,6 @@ sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' '2e87a8ec1cc0c91938cac24992d8a3d4362b3e9d939767e4c9d2ec8e6d969d53' 'f67f60a30bcf2e9a2ba88ad97cace308da7a7f94919bb95c3dc030f5885a8015' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '0bda45a3ef0f2780bbe588f2e53ab2b79814d29e9c6fc7bfff3b0dbdaa9e710d' '81adca8b3f58156f4a245cb7f20750041a9e6848b282942d7d9e213a04c96c9f') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva @@ -89,9 +87,6 @@ prepare() { # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git - # fix #43143 - patch -p1 -i "${srcdir}/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.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) diff --git a/kernels/linux-libre-lts-grsec-knock/PKGBUILD b/kernels/linux-libre-lts-grsec-knock/PKGBUILD index 586b4a56d..b910745e9 100644 --- a/kernels/linux-libre-lts-grsec-knock/PKGBUILD +++ b/kernels/linux-libre-lts-grsec-knock/PKGBUILD @@ -12,9 +12,9 @@ pkgbase=linux-libre-lts-grsec-knock # Build kernel with lts-grsec-knock localname _pkgbasever=3.14-gnu -_pkgver=3.14.29-gnu +_pkgver=3.14.31-gnu _grsecver=3.0 -_timestamp=201501182217 +_timestamp=201501310705 _knockpatchver=3.16_1 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -53,9 +53,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '3.14.14-a410a5e2b7-loongson-community.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'SKIP' - '24fcfa602cef359cd9f6f319cbbe3efea9a0c2c38b7f934f434887c254b57bef' + '84411639f46024e04b00f69348f619f1aebe9058125d5695afed8df8f07adb9c' 'SKIP' - '3f22ab2bdba95d82bf186670fd6b2dfa77d6d9863eb9b13b149132ca329771bc' + '4851704b1ee045776d0683b1d45b21b5bb118606669f122ec3014c2bad07f5a7' 'SKIP' '70cbe962aa01989ffa83490bb0765d6e4c781f6133dc8d768d84bd6716ac0209' 'SKIP' diff --git a/kernels/linux-libre-lts-grsec/PKGBUILD b/kernels/linux-libre-lts-grsec/PKGBUILD index 7a2adb551..29cd7d1b3 100644 --- a/kernels/linux-libre-lts-grsec/PKGBUILD +++ b/kernels/linux-libre-lts-grsec/PKGBUILD @@ -12,9 +12,9 @@ pkgbase=linux-libre-lts-grsec # Build kernel with lts-grsec localname _pkgbasever=3.14-gnu -_pkgver=3.14.29-gnu +_pkgver=3.14.31-gnu _grsecver=3.0 -_timestamp=201501182217 +_timestamp=201501310705 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -50,9 +50,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '3.14.14-a410a5e2b7-loongson-community.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'SKIP' - '24fcfa602cef359cd9f6f319cbbe3efea9a0c2c38b7f934f434887c254b57bef' + '84411639f46024e04b00f69348f619f1aebe9058125d5695afed8df8f07adb9c' 'SKIP' - '3f22ab2bdba95d82bf186670fd6b2dfa77d6d9863eb9b13b149132ca329771bc' + '4851704b1ee045776d0683b1d45b21b5bb118606669f122ec3014c2bad07f5a7' 'SKIP' '064ba6595f578bb09175508df8f8d824d6db9afc828f59b8e50f3f17063a134b' 'd7c0c0431e7b81d95b5239ae285b48a58fa3c9ae1fd87d990cdeb44fb27e0b3d' diff --git a/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD index 9610f872b..0aa54d850 100644 --- a/kernels/linux-libre-lts-knock/PKGBUILD +++ b/kernels/linux-libre-lts-knock/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-lts-knock # Build stock -lts-knock kernel _pkgbasever=3.14-gnu -_pkgver=3.14.29-gnu +_pkgver=3.14.31-gnu _knockpatchver=3.16_1 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -45,7 +45,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '3.14.14-a410a5e2b7-loongson-community.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'SKIP' - '24fcfa602cef359cd9f6f319cbbe3efea9a0c2c38b7f934f434887c254b57bef' + '84411639f46024e04b00f69348f619f1aebe9058125d5695afed8df8f07adb9c' 'SKIP' '70cbe962aa01989ffa83490bb0765d6e4c781f6133dc8d768d84bd6716ac0209' 'SKIP' diff --git a/kernels/linux-libre-pae/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch b/kernels/linux-libre-pae/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch deleted file mode 100644 index f9aa99342..000000000 --- a/kernels/linux-libre-pae/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch +++ /dev/null @@ -1,79 +0,0 @@ -From d472fcc8379c062bd56a3876fc6ef22258f14a91 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Mon, 24 Nov 2014 11:12:42 +0100 -Subject: [PATCH] drm/i915: Disallow pin ioctl completely for kms drivers - -The problem here is that SNA pins batchbuffers to etch out a bit more -performance. Iirc it started out as a w/a for i830M (which we've -implemented in the kernel since a long time already). The problem is -that the pin ioctl wasn't added in - -commit d23db88c3ab233daed18709e3a24d6c95344117f -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Fri May 23 08:48:08 2014 +0200 - - drm/i915: Prevent negative relocation deltas from wrapping - -Fix this by simply disallowing pinning from userspace so that the -kernel is in full control of batch placement again. Especially since -distros are moving towards running X as non-root, so most users won't -even be able to see any benefits. - -UMS support is dead now, but we need this minimal patch for -backporting. Follow-up patch will remove the pin ioctl code -completely. - -Note to backporters: You must have both - -commit b45305fce5bb1abec263fcff9d81ebecd6306ede -Author: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Mon Dec 17 16:21:27 2012 +0100 - - drm/i915: Implement workaround for broken CS tlb on i830/845 - -which laned in 3.8 and - -commit c4d69da167fa967749aeb70bc0e94a457e5d00c1 -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Mon Sep 8 14:25:41 2014 +0100 - - drm/i915: Evict CS TLBs between batches - -which is also marked cc: stable. Otherwise this could introduce a -regression by disabling the userspace w/a without the kernel w/a being -fully functional on i830/45. - -References: https://bugs.freedesktop.org/show_bug.cgi?id=76554#c116 -Cc: stable@vger.kernel.org # requires c4d69da167fa967749a and v3.8 -Cc: Chris Wilson <chris@chris-wilson.co.uk> -Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> ---- - drivers/gpu/drm/i915/i915_gem.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c -index fd17cca..97b86a5 100644 ---- a/drivers/gpu/drm/i915/i915_gem.c -+++ b/drivers/gpu/drm/i915/i915_gem.c -@@ -4263,7 +4263,7 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data, - struct drm_i915_gem_object *obj; - int ret; - -- if (INTEL_INFO(dev)->gen >= 6) -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) - return -ENODEV; - - ret = i915_mutex_lock_interruptible(dev); -@@ -4319,6 +4319,9 @@ i915_gem_unpin_ioctl(struct drm_device *dev, void *data, - struct drm_i915_gem_object *obj; - int ret; - -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) -+ return -ENODEV; -+ - ret = i915_mutex_lock_interruptible(dev); - if (ret) - return ret; --- -2.2.0 - diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 48a19b973..6c2337dd6 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-pae # Build stock -pae kernel _pkgbasever=3.18-gnu -_pkgver=3.18.3-gnu +_pkgver=3.18.5-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -33,19 +33,17 @@ 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} - 'change-default-console-loglevel.patch' - '0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch') + 'change-default-console-loglevel.patch') sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' 'SKIP' - '28e6de2c7325d7b0c3856381678028969b97abb9224f9609a3d6563f560f24b8' + '65a9e66cf15eb523fe6759c3eb983d93a105ea13637bc40419b7ea2143af3daf' 'SKIP' '8d255e4551bb88252ede8cc0f5046794372076da6bd97582229172537f0cc922' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264' '2e87a8ec1cc0c91938cac24992d8a3d4362b3e9d939767e4c9d2ec8e6d969d53' 'f67f60a30bcf2e9a2ba88ad97cace308da7a7f94919bb95c3dc030f5885a8015' - '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '0bda45a3ef0f2780bbe588f2e53ab2b79814d29e9c6fc7bfff3b0dbdaa9e710d') + '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva ) @@ -70,9 +68,6 @@ prepare() { # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git - # fix #43143 - patch -p1 -i "${srcdir}/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.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) diff --git a/kernels/linux-libre-xen/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch b/kernels/linux-libre-xen/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch deleted file mode 100644 index f9aa99342..000000000 --- a/kernels/linux-libre-xen/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch +++ /dev/null @@ -1,79 +0,0 @@ -From d472fcc8379c062bd56a3876fc6ef22258f14a91 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Mon, 24 Nov 2014 11:12:42 +0100 -Subject: [PATCH] drm/i915: Disallow pin ioctl completely for kms drivers - -The problem here is that SNA pins batchbuffers to etch out a bit more -performance. Iirc it started out as a w/a for i830M (which we've -implemented in the kernel since a long time already). The problem is -that the pin ioctl wasn't added in - -commit d23db88c3ab233daed18709e3a24d6c95344117f -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Fri May 23 08:48:08 2014 +0200 - - drm/i915: Prevent negative relocation deltas from wrapping - -Fix this by simply disallowing pinning from userspace so that the -kernel is in full control of batch placement again. Especially since -distros are moving towards running X as non-root, so most users won't -even be able to see any benefits. - -UMS support is dead now, but we need this minimal patch for -backporting. Follow-up patch will remove the pin ioctl code -completely. - -Note to backporters: You must have both - -commit b45305fce5bb1abec263fcff9d81ebecd6306ede -Author: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Mon Dec 17 16:21:27 2012 +0100 - - drm/i915: Implement workaround for broken CS tlb on i830/845 - -which laned in 3.8 and - -commit c4d69da167fa967749aeb70bc0e94a457e5d00c1 -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Mon Sep 8 14:25:41 2014 +0100 - - drm/i915: Evict CS TLBs between batches - -which is also marked cc: stable. Otherwise this could introduce a -regression by disabling the userspace w/a without the kernel w/a being -fully functional on i830/45. - -References: https://bugs.freedesktop.org/show_bug.cgi?id=76554#c116 -Cc: stable@vger.kernel.org # requires c4d69da167fa967749a and v3.8 -Cc: Chris Wilson <chris@chris-wilson.co.uk> -Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> ---- - drivers/gpu/drm/i915/i915_gem.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c -index fd17cca..97b86a5 100644 ---- a/drivers/gpu/drm/i915/i915_gem.c -+++ b/drivers/gpu/drm/i915/i915_gem.c -@@ -4263,7 +4263,7 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data, - struct drm_i915_gem_object *obj; - int ret; - -- if (INTEL_INFO(dev)->gen >= 6) -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) - return -ENODEV; - - ret = i915_mutex_lock_interruptible(dev); -@@ -4319,6 +4319,9 @@ i915_gem_unpin_ioctl(struct drm_device *dev, void *data, - struct drm_i915_gem_object *obj; - int ret; - -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) -+ return -ENODEV; -+ - ret = i915_mutex_lock_interruptible(dev); - if (ret) - return ret; --- -2.2.0 - diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 390feab1b..90301484d 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-xen # Build stock -xen kernel _pkgbasever=3.18-gnu -_pkgver=3.18.3-gnu +_pkgver=3.18.5-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -33,19 +33,17 @@ 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} - 'change-default-console-loglevel.patch' - '0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch') + 'change-default-console-loglevel.patch') sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' 'SKIP' - '28e6de2c7325d7b0c3856381678028969b97abb9224f9609a3d6563f560f24b8' + '65a9e66cf15eb523fe6759c3eb983d93a105ea13637bc40419b7ea2143af3daf' 'SKIP' '345716983e32033e17967cb0b3a2a13bbe3aa2ccdc39ab165cb0ee7c01310e47' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264' '2e87a8ec1cc0c91938cac24992d8a3d4362b3e9d939767e4c9d2ec8e6d969d53' 'f67f60a30bcf2e9a2ba88ad97cace308da7a7f94919bb95c3dc030f5885a8015' - '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '0bda45a3ef0f2780bbe588f2e53ab2b79814d29e9c6fc7bfff3b0dbdaa9e710d') + '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva ) @@ -70,9 +68,6 @@ prepare() { # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git - # fix #43143 - patch -p1 -i "${srcdir}/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.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) diff --git a/libre-multilib/pcsx2/PKGBUILD b/libre-multilib/pcsx2/PKGBUILD index 462310975..3c661d70f 100644 --- a/libre-multilib/pcsx2/PKGBUILD +++ b/libre-multilib/pcsx2/PKGBUILD @@ -4,23 +4,27 @@ # Contributor (Arch): vEX <vex@niechift.com> pkgname=pcsx2 -pkgver=1.2.2 -pkgrel=3.parabola1 +pkgver=1.3.1 +pkgrel=1.parabola1 pkgdesc='A Sony PlayStation 2 emulator, without nonfree nvidia-cg-toolkit support' -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url='http://www.pcsx2.net' license=('GPL2' 'GPL3' 'LGPL2.1' 'LGPL3') -makedepends=('cmake' 'sparsehash') -if [[ $CARCH == "i686" ]]; then - depends=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'portaudio' 'soundtouch' 'wxgtk2.8') -elif [[ $CARCH == "x86_64" ]]; then - makedepends+=('gcc-multilib' 'lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-libgl' 'lib32-portaudio' 'lib32-soundtouch' 'lib32-wxgtk2.8') -fi +depends_i686=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' + 'portaudio' 'sdl' 'soundtouch' 'wxgtk') +depends_x86_64=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' + 'lib32-libjpeg-turbo' + 'lib32-portaudio' 'lib32-sdl' 'lib32-soundtouch' 'lib32-wxgtk') +makedepends=('cmake') +makedepends_x86_64=('gcc-multilib') +optdepends_x86_64=('lib32-gtk-engines: GTK2 engines support' + 'lib32-gtk-engine-murrine: Murrine GTK3 engine support' + 'lib32-gtk-engine-unico: Unico GTK2 engine support') conflicts=("${pkgname}-libre") replaces=("${pkgname}-libre") options=('!emptydirs') source=("https://github.com/PCSX2/pcsx2/archive/v${pkgver}.tar.gz") -sha256sums=('4fccef58098d099ffe955fadd5ceee78ed063ab585b8772f4242fd6dc5fd2d23') +sha256sums=('60ba9f7f85bf4337ca6962f9b437d549f16fc04ea0b6b261d7521e0416c2b8c9') prepare() { cd ${pkgname}-${pkgver} @@ -36,13 +40,31 @@ build() { fi mkdir build && cd build - if [[ $CARCH == "i686" ]]; then - cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -D{GLSL_API,PACKAGE_MODE,REBUILD_SHADER,XDG_STD}='ON' -DPLUGIN_DIR='/usr/lib/pcsx2' -DGAMEINDEX_DIR='/usr/share/pcsx2' -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8' - elif [[ $CARCH == "x86_64" ]]; then - export CC='gcc -m32' - export CXX='g++ -m32' - export PKG_CONFIG_PATH='/usr/lib32/pkgconfig' - cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -D{GLSL_API,PACKAGE_MODE,REBUILD_SHADER,XDG_STD}='ON' -DPLUGIN_DIR='/usr/lib32/pcsx2' -DGAMEINDEX_DIR='/usr/share/pcsx2' -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config32-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc32-2.8' -DCMAKE_LIBRARY_PATH='/usr/lib32' + if [[ $CARCH == i686 ]]; then + cmake .. \ + -DCMAKE_BUILD_TYPE='Release' \ + -DCMAKE_INSTALL_PREFIX='/usr' \ + -DCMAKE_LIBRARY_PATH='/usr/lib' \ + -DPLUGIN_DIR='/usr/lib/pcsx2' \ + -DGAMEINDEX_DIR='/usr/share/pcsx2' \ + -DEXTRA_PLUGINS='TRUE' \ + -DREBUILD_SHADER='TRUE' \ + -DGLSL_API='TRUE' \ + -DPACKAGE_MODE='TRUE' \ + -DXDG_STD='TRUE' + elif [[ $CARCH == x86_64 ]]; then + cmake .. \ + -DCMAKE_BUILD_TYPE='Release' \ + -DCMAKE_TOOLCHAIN_FILE='cmake/linux-compiler-i386-multilib.cmake' \ + -DCMAKE_INSTALL_PREFIX='/usr' \ + -DCMAKE_LIBRARY_PATH='/usr/lib32' \ + -DPLUGIN_DIR='/usr/lib32/pcsx2' \ + -DGAMEINDEX_DIR='/usr/share/pcsx2' \ + -DEXTRA_PLUGINS='TRUE' \ + -DREBUILD_SHADER='TRUE' \ + -DGLSL_API='TRUE' \ + -DPACKAGE_MODE='TRUE' \ + -DXDG_STD='TRUE' fi make @@ -51,10 +73,6 @@ build() { package() { cd ${pkgname}-${pkgver}/build - if [[ $CARCH == "x86_64" ]]; then - depends=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-portaudio' 'lib32-soundtouch' 'lib32-wxgtk2.8') - fi - make DESTDIR="${pkgdir}" install } diff --git a/libre/acpi_call/PKGBUILD b/libre/acpi_call/PKGBUILD index ec53f0858..a3654a9dd 100644 --- a/libre/acpi_call/PKGBUILD +++ b/libre/acpi_call/PKGBUILD @@ -9,7 +9,7 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=3.18 - _archrel=18 + _archrel=20 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 diff --git a/libre/bbswitch/PKGBUILD b/libre/bbswitch/PKGBUILD index bcd226a29..b82d2f212 100644 --- a/libre/bbswitch/PKGBUILD +++ b/libre/bbswitch/PKGBUILD @@ -9,7 +9,7 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=3.18 - _archrel=22 + _archrel=24 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD index 0d040f508..940a34f3b 100644 --- a/libre/blender/PKGBUILD +++ b/libre/blender/PKGBUILD @@ -13,11 +13,11 @@ _git=no _gittagver=v2.73 -_gittagrev= -# blender: Tue, 20 Jan 2015 12:16:03 +0000 (23:16 +1100) -_gitcommit=58e5509d -# blender-addons: Mon, 19 Jan 2015 15:38:39 +0000 (16:38 +0100) -_gitaddonscommit=659fec7c +_gittagrev=a +# blender: Tue, 20 Jan 2015 18:16:03 +0000 (23:16 +0500) +_gitcommit=bbf09c9e +# blender-addons: Tue, 20 Jan 2015 18:15:16 +0000 (23:15 +0500) +_gitaddonscommit=ed9bd050 # blender-addons-contrib: Sat, 17 Jan 2015 09:41:03 +0000 (10:41 +0100) _gitaddonscontribcommit=a8fe7f10 # blender-translations: Tue, 13 Jan 2015 20:27:35 +0000 (21:27 +0100) @@ -25,12 +25,12 @@ _gittranslationscommit=47771dc8 pkgbase=blender pkgname=("$pkgbase" "$pkgbase-addon-gimp" "$pkgbase-addon-povray") -_pkgver=2.73 +_pkgver=2.73a _depver=${_pkgver%[a-z]} [[ $_git == no ]] && pkgver=$_pkgver [[ $_git == yes ]] && pkgver=$_pkgver.git1.$_gitcommit -pkgrel=1.parabola1 -epoch=15 +pkgrel=2.parabola1 +epoch=16 _jpgver=1.5 _llvmver=3.5 _povver=3.7 diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD index aaa8a9aae..bf98fc7f3 100644 --- a/libre/calibre/PKGBUILD +++ b/libre/calibre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 126443 2015-01-23 08:52:33Z jelle $ +# $Id: PKGBUILD 126848 2015-01-31 11:23:47Z 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.17.0 +pkgver=2.18.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=('8ba11e69e241c744111a72fd172ac335') -md5sums=('507ddc1424b34d16b988a6509676932e' +mkmd5sums=('8d53dbd1d53a8a1150d85c4fb16a66da') +md5sums=('6b33827bfe30a6a59f49130d5a7fd532' '7e964e5c88affc299b69e8c2744a4393') mksource(){ diff --git a/libre/clementine/PKGBUILD b/libre/clementine/PKGBUILD index 3609ec141..feebd4690 100644 --- a/libre/clementine/PKGBUILD +++ b/libre/clementine/PKGBUILD @@ -10,14 +10,15 @@ pkgname=clementine _pkgname=$pkgname-libre pkgver=1.2.3 -pkgrel=4.parabola1 +pkgrel=5.parabola1 pkgdesc='A modern music player and library organizer, without nonfree artwork and Spotify support' url="http://www.$pkgname-player.org/" license=('GPL') arch=('i686' 'x86_64' 'mips64el') replaces=("$_pkgname") conflicts=("$_pkgname") -depends=('chromaprint' 'glew' 'gstreamer0.10-base' 'libcdio' 'libgpod' 'liblastfm' 'libmtp' 'libmygpo-qt' 'protobuf' 'qca-ossl' 'taglib') +depends=('chromaprint' 'glew' 'gstreamer0.10-base' 'libcdio' 'libgpod' + 'liblastfm' 'libmtp' 'libmygpo-qt' 'protobuf' 'qca-ossl' 'taglib') makedepends=('cmake' 'boost' 'mesa' 'sparsehash') optdepends=('gstreamer0.10-base-plugins: "Base" plugin libraries' 'gstreamer0.10-good-plugins: "Good" plugin libraries' @@ -76,7 +77,9 @@ build() { fi mkdir build && cd build - cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' + cmake .. \ + -DCMAKE_BUILD_TYPE='Release' \ + -DCMAKE_INSTALL_PREFIX='/usr' make } diff --git a/libre/cups-filters/PKGBUILD b/libre/cups-filters/PKGBUILD index bf082e481..be53a6116 100644 --- a/libre/cups-filters/PKGBUILD +++ b/libre/cups-filters/PKGBUILD @@ -3,7 +3,7 @@ pkgname=cups-filters pkgver=1.0.62 -pkgrel=1.parabola1 +pkgrel=2.parabola1 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation" arch=('i686' 'x86_64' 'mips64el') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" diff --git a/libre/gummiboot/PKGBUILD b/libre/gummiboot/PKGBUILD index 018326c57..935ca32da 100644 --- a/libre/gummiboot/PKGBUILD +++ b/libre/gummiboot/PKGBUILD @@ -6,17 +6,17 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=gummiboot -pkgver=45 +pkgver=48 pkgrel=1.parabola1 pkgdesc="Simple UEFI Boot Manager (Parabola rebranded)" url="http://freedesktop.org/wiki/Software/gummiboot" -arch=('x86_64' 'i686' 'mips64el') +arch=('x86_64' 'i686') license=('LGPL2.1') makedepends=('gnu-efi-libs' 'docbook-xsl' 'git') depends=('util-linux') -replaces=('gummiboot-efi' "${pkgname}-parabola") conflicts=('gummiboot-efi' "${pkgname}-parabola") provides=('gummiboot-efi') +replaces=('gummiboot-efi' "${pkgname}-parabola") options=('!strip' '!makeflags') source=("git://anongit.freedesktop.org/$pkgname#tag=$pkgver" 'loader.conf' diff --git a/libre/hplip/PKGBUILD b/libre/hplip/PKGBUILD index 9d861ee89..d4774789b 100644 --- a/libre/hplip/PKGBUILD +++ b/libre/hplip/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 224640 2014-10-16 19:13:24Z andyrtr $ +# $Id: PKGBUILD 230306 2015-01-31 09:21:51Z andyrtr $ # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org> # Maintainer (Arch): Tom Gundersen <teg@jklm.no> # Contributor (Arch): Rémy Oudompheng <remy@archlinux.org> @@ -7,13 +7,12 @@ pkgname=hplip pkgver=3.14.10 -pkgrel=1.parabola1 +pkgrel=2.parabola1 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without printers with nonfree drivers support and hplip-plugin binary blobs recommendation (Parabola rebranded)" arch=('i686' 'x86_64' 'mips64el') url="http://hplipopensource.com" license=('GPL') -depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine' - 'net-snmp>=5.7.1' 'wget') +depends=('python2' 'ghostscript>=8.64-6' 'net-snmp>=5.7.1' 'wget' 'foomatic-db-engine') makedepends=('python2-pyqt4' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusb') optdepends=('cups: for printing support' 'python2-dbus: for dbus support' @@ -33,6 +32,7 @@ source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.as md5sums=('7af44ee1c4312b00d2269c1b25008f73' 'SKIP' 'a853ba0eb0883f4bcee00b4277128b29') +validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP <hplip@hp.com> prepare() { cd $pkgname-$pkgver diff --git a/libre/icecat-l10n/PKGBUILD b/libre/icecat-l10n/PKGBUILD index eef28bd92..11346e6b7 100644 --- a/libre/icecat-l10n/PKGBUILD +++ b/libre/icecat-l10n/PKGBUILD @@ -6,7 +6,7 @@ _pkgbase=icecat pkgbase=$_pkgbase-l10n -pkgver=31.2.0 +pkgver=31.4.0 pkgrel=1 pkgdesc="Language pack for GNU IceCat." arch=('any') @@ -155,93 +155,93 @@ _package() { fi } -sha512sums=('d772c5b73adaf7dfc7d7304ee94d8e68ff8643fdcabe51fde2a62a2091a81e950728ebb004fd23e715f2f55020b6bfe4008434b4b16f1869e1384de68c69c6e6' - 'ca9e7daa3df7d29d50cf6ec2b96c3bc641e1bd70f87e209d12fab0a0a7e257f9fc78317dba7abfc1bc632ec922cff50a63b6111ad419cde35335f46a7a76a299' - '90bf95d3a395f0b93893f8b73cf5463c4263938db83fd415702bb53eec60597619967ca15a2bc47ebef0acfa964125d25580938280b5889e0f7a02d33da45a15' - '6fd2810608ce12fe46901f6d271447cafa96370e45ca08b1c8db92c6d61d46894a83197aad16eebefb988cf314e3e867a304629b5d2d602fa8c4ce4e6f1ecef3' - 'ef1bb8a20b500bab11ee92128635677bb480b1e1d7769bd50d40557e0bab1b3c81577ce8450288f0c7383f4b4d307fb01c9e0c63138d4006c8340258eefb110c' - '976fe98bc9ad96fdd45542dc5d4e7eb7dd3d7989c86cea726902f621775f4e87ec8b27b863133a942ab767d1cbdc25944893d6e7d8d2f01f7d7042c730057fa8' - '88386a0bc6e13714b8459c63ddaf8f9936dff4105ea954ca5a6eef44124e5b53a51f0343004cd305e1270ce7db1d3f29b6a9f3e63a0ac53636db919463a598cb' - '50aac5bb75647248c7d2c82cf4ae51d5289b336d10a2ad3feb4b5c1acc15e640546f74e6f9bb9a4c8b1bc002283c26402502a984cd7fde49c92febf3aa153fa4' - '88b3e90ab52d15d37979842b4171751c164ef4b700ad2ea5535c61ebdd74cdd67aa965bdd129730030d6635af50adc1085fab97b6308ac00e18d51f7ca247111' - '7c8a60dac0e79261bb68c139d9a369a8c22428ca3ae6f45c244cb64145690be46c5f8756ed29ce46d4837c745d848943b96e31d0eaf2e7e3cd0e9f7bc512340e' - 'ca06037ca7e2c7d8ed80d24bb7b8c593e79505260ec886c795e07010ee6e75431e2bc7986a936a5c9ca98e457c9d9b3ef346eaa06127cdd654b485d2e54b9ed5' - '45ab9d5722ce1b9839098c2743041d2c345e5f5c07fa7fb6ba9f838ed3cb6d2b2832156e8fefea57f54ef001063ca9b28a8f16c13e6f8d88aaf57bc450c08f9b' - '3304863fbc4f49a65ed8e1e6375f90fa008df9a8492159b2cf6d8050f4d29ab89ef6b01e8507eb442d8b77d77af0b081e1d5b7f867aa410e049f857aa6bc44e9' - 'fb3c680f0e23705762660ca687d4e850368fe110e2742f92302b59d96ca295be6d10a792d3bb76aad36a3531c64ba722b3376acdc976734b17c31d1851e100ca' - '86070c9dfc7d84377538597473606cb5ca627af4f56124b380e6de5aefe13ecad29bdebedb300626296e573fea5ca6cc7f8394e7787606329738403d6ef7961f' - '4f0a09ed2b2294e0e3564c9a522e3de1ac047b87c9e909c2e5ef66a1877617a5f0d59087d8c703603657e44eb205f9fb8e0826530541865b2ca99a1890bdc686' - 'b9bab563dc7f8ef18291e3bd4ad617324731217e9d55e2b1ecadc75b6b1827473c3cbdc104c7a5f8d9640c8352104648d67eeac176ea0b2658643370cb51f0f2' - '45d04aa6c501df2c92adca0ee5bc19bba366e5895962f6b36d5dc52914a2a5307578388a2814185c73f320565322f6db74b02fc7671f05c821a6c69f40cec6c8' - '680fca9e356f3849749b9da79003380c9655274389866e5acfb38eb18bc4fb283a92d395dd8e3e82e3070e0b6576be40db62cb642703ead5fe220ce0d4a75642' - '4dbd95650087a4354287203c7be456e8775c9a9279c85c49a5654916f84c4652a7053296b9ac63ad3275afd4db08b1629db1f7682fbf322875d4d72dfafb9977' - '9b823a3695eb9fe5c6217341205dcc345d484181d9c8d642f5d560bcb0a8454d0ec8de4f10fa07b47be61485b3e8ffe4554fb87807bb8a91ddf50d09a87d298b' - 'ccca76cd08b5598d5426765f0096b3d766d02f6f14e4cef93a05c148069cdb121bc9fde5964bbc1931aea0bf77da2839e4aafedc28929ad747e9b1ee97f1afef' - '97a5d34278a448437977a7c73bc7804447d870cf0bc7f7a6dec6410c35654584eb352e6b7f6279f4192f4beed0fdfb46ba34e6f32e67d3f604fa855986bbe2ba' - '352b243950071d1285edf3a4041090afde39b2629d9475097ad0de333a92665ccd61b7b92704f06e6573f0305f4b04fd80a74dca4f82f05c848449e441e96625' - 'b83a611c491beddbedc7673b603d2e1c470340e2a8a7f6911c29ed9ddca32e710ce4989f474219c8cdd7fe34278caa205618e05750932d7538c78b10196058ff' - '4057a646b4ffe0571702f4485203bc631cc481d3af5d9116d6df757e5a9f0fcf52fa965aaffb7c4d1997c45cfd080b79df06b0a4470c02b0770190d82031102c' - '491de247e8b2aa7632ad845cc2045988a3e37ef453e51a3ef823206d3a47d42c3ac3253bb557389b9b6cab1a7cc32babde2187c672db55365ad203a3fe278020' - '29979a754cc945472bcf208a5772d11cb8abb873bd1adf65986436b81b16f41b2aff093caaa7a3343cc5462cd6e076bee81f99914d2dfb34dc91033f5c8be151' - 'eef74b375b4180a772b01621351b4f41246e371d987a448fd677ce44be281461dec7535ebb4aaed5748999ef75ae338ed58a8a9b83f61f680f5d813a636abbcc' - 'e99764fdef32814d372b5df17087c95f57aa73924c2bd67eaf6eb493a81c22eeb0f423995ca6f0e29430cbef78c9edcf4b6de8992f5965d6a94fc787e666e204' - '5dad9cc436258f6b074232ff1d14e71599efac30c31feefdae7271f18ee6947b0c7f7bb2d791fe008ba0211504ded99b0406f1ce7bd78ab1f35b483a93c881eb' - '2645fdefc71cde29d5ba6e10b74982c284cd6391b7901d527776c0fc15b4567b4d2b50e2e7cd26e0857bb0e14a9c39a63cd2587c455e4e2bd92f4aedac5115e4' - '0a3db2b3155b48def8ee6857e42ccb8fede0d59adb037b0be2422af73213781aed0abc01ae432bbf4502433c5a0c3c742280944a398c709d21cc7bf217c6542f' - 'dd70360a993d28410903e6dd091f47ab9e029bc8b7e1f4ad7af599076ebf78665c53b1341e8695cb0ca99f130cb900fb3166b56cd4f9ff02a8090d2b6d83ec51' - 'e81b749495a4b89400f7b696ad8706d986cf1f73745c58734e4d42ed823e57e4a152d6f08f4a392c4f0d7e9abd40c29bb0432ffe2d846c8358e78353e2395c68' - 'bc0625794cb444bbf9038a4d4aa7a96f6a0592dc93273cfd6ae2011910e6136b423da45f30d07be8578b46f097d733dc3b62b9bb88987090708ea9baa531d594' - 'a315e0bda0b2fef69d538c10ce28db674f960a68e525ba585156fdc6d176fc641d6cabcc65fd9095b54be62bb33cb9e4e73ca467cbd224d221b8cafd9f1551e4' - '1f239bd73b3acc1a836286954c3d3ea44394acdc2659f0bfad3fe2922727569b9ca4667ff9243fa35a4b92be5018ff243ccd0c8f5c32d014ea42fcdac652ca4f' - '498040ae24805fd2b16bb34965f113eae6cc9d6bc630a3983d69421120491a1d16fc5ec8e836ad31f09fb4c4003a0b79e06d7372c0ad8030d821112508019faf' - 'd9135e598d4a2648a772c0364658fc0da39e420e113f61ea202c07f9aacb3ff1990376f45bf0b860dd33274c613ad33770cab191187cc9714a66d845c717c4bb' - 'e5ed53c900b7af771397bd354f9a770aa8f8235858a8fb318a02fef440566158468d1efb4220ee353bb1e37205fe16bdd320d272409aa3692c6dc0e17b0a74fe' - '6f20922e8b88dba320ba3ee7b83f9f74f4074eae0e34a474f7a763f22723e3549bd84eab7d54142f11ef0fa9193f91c5f4696e8c859af109433ab5f33566a867' - 'f70b7ff0e6b410e987caa4c5ab165818b75194202cb564a15640294bbe51c58cdcd40bc6f292b480493c59145712573f517142f6dd1252c3d5fec52cc41ab594' - '30cddbc69150647046c2a259ad8404c03b0a589796d2ccc8db0ccb82a18182791e261aefc72551be0a4f517bccd391da4cbf8fec8f2c2b325f563d7662959b53' - '1e37cdab4b079cee3bfa5c6bfe8efc276b033de854d9b7143d7e71f72d39e5dd13137a900c7ef49c8545a8b321200c497c64327981a89b92abee84a6cf5f37e9' - '9f90627d8502c9b3eef41f4635438dac8996fe134f3f76192d1ddcbb6cc5499fb1fb3d69103b55080afb738997ca1b369cf4891c2ace70fbd3f08fb557040957' - '129ea54a9f3cb1f6a77d2dbcb80de94fcb08b485f83618fc914f8f1aa4c4247b5ff38912517dd54e36f0de7da565f680ce8721be1e7044a7908fb95aa48782b6' - 'f2ddff39e765f393a23f00c9833b8b5c712d10664b8580429fcb2fcbb0c0bce3e79c6cfa95ccbd3e43b1bad5e5f99749625e299979b0527a84c6a950c0c77ba6' - '9835149ca753fdf122e3fa43429ed653ca8a8159bebbd198b9dc03be3cfca5949daf0511081aa806b34c56ec906c13ac81118bf45531b0ab623a999b269bb701' - 'f07dba37f390e639a07645f8a262c9f20e339292770aac0156f02714f34fbbf067407f20a7caa9a0ec83d072d28a6ca66c3fe9083298b82684a27190ec796879' - '25f2c88688d2e795702db710317e1a3a24e369e0ac706a54abcea9aaa58ee385e39b0d08ff68fde5e54e66b1893414e81e3ecdb3a1d0c39c42209ca22aee3b0d' - '012d41f51f7c086bffc5a39859408a449b7fb6ffbbfdd109901fa589b7af431f3d04cf91cf5f6eb973be9f52ec92e0ea26c096a5a57fbe7f3c5b2af545d5b91c' - '6fb6ab8e05b0d7c24e7b31046af355444211a628fa5d13fc7b65c77ed6a9c31b547580be340ac88ba6750b48ab63b4137b26e03f2fbd61dd47fd73aa80cc4107' - '0cfe26a0e69d5e71f58b69a137ffcfc4b809822a8bb6bab3d469348231fb1a3789c4ab189ba56eb6100f8bd3b0dbba120c2bb389dc68c013509ed47fefe50479' - '3fd5e8319f811a3c1139b088cf82690b6db5e4e39e5ad1689bdc168a0bb6e234ae4e37b92917909b03a4019a09b3dbea6e1644c039ac222356a99815f4624e91' - 'f13b06ebb879034365c1133db91bcb2bb78ff224bebfa901180ae828cfc9a78cabd955134e703805d89f3f04b8da8bc625755ae06b76f6cd7d1e386928f9cf98' - '6d936faebd9e7d3afab8ab4d05990f11a50f0dfdf17b631d73fb872f1432f3fc67a46cc2df4af172f56350c78132caea00093cfcc44632eab3ae3ba882edb3ee' - '37f6bccc1f08f0f3c251f8e14e4b1259b67e442dff2d63a04cb745f78e71c9c21f9269f9831a676bf42f6857fac1c8817ef7ebe6a014676ba8e8135961f9021d' - '00adb2073c9bb2e9cf603e1871a551d518d99b4af65c7254113c6f8c96c8263a310f3e7b4650872e32964ce31207a277f4d9e18465762341b465c707f787b448' - 'eff038c627b8021623211da5be08585d86c9f443b4d53e81196699c0a72e81609aeb9be1495eaa400a9ba98a227d938e1850c9d7c12e4f9da415f0d8b453c681' - '974838ea89ce8a85265ad3b53cd29b4cc70fce06536adbe56dd03c7eb1554706e0abed4d3ff41d345f27b0cd78a62c9981a6e80baa9759c9832376b69fc7afd2' - '112f05cd0c5b35c4affb5f15a4ff7933f6fa5ecffc358685b8292fab04bf1a1533cf4971b0a4af6beae8658374623298c9c6cab154151b741eba8d69cea2316e' - 'f9157181fb5f3c4f5a9e095119957f9d1c8677dc9b365ffa772a6c3a12872720af5027b347699fd9881c909bb4766d00a9e3aa595cb4838d39976a55ad0a1b63' - '39b841def0a21dc898ee6a6620d83dc3bcfdf2e2bc822254d5f80dca8b322de3bd4d379b7a3ad621fd82b30a02285c7fc8916dc7788f6689019003e4b5387cba' - '61a20288eb2a1f60be5c28ed3cb0f0272827707fc249f39fe3570bd85cc5375fc758083c20a43aab0f648f544f382975286dec32b1639638ef4394ddfee6701a' - 'd3116badd0da77ae467452d2a98632e3eb9d77ae166ff5c43edd48c77621c141799addc629da890563f3ebc1404b0ffe1e8ea8a32d0d8fd1d2942352fbde3e04' - 'e474135b2458e8ddc1b080d4672e4f5c5c43b07d265acecdfd35462d046948c214a36a91af0ec822204c444a017f07199bf7f7af5a2fcebae0ad43cc27bde301' - '5167a59bb358897a7a6c8c61053a51375a5bd9ab8445302ef9b050b27173efe9db191312dca57d2f18f19b88d8c38ca800805d84e139d905d8f8dd2363d50eee' - '83fb2d098ca82ce5fb96c62935b7c4dd2b939080ea7063fa224dfd444174ba38fb24d178f78119fa0fcdeb4a5cb0ef8af392c7eacaae29a32ce37087decacff1' - 'f61c6763d740ef118c3b758ff44a0f0dad358be0b8736ffd9b0eda56253728da1a9abc6cdbab5fa91caf2022f212ad0cbf4245506bda5698ad91a880d74a05bd' - '794e9ce6ee11903be7e3aaa5331a52a310c00f9540478073d784ece803899ae51c0e5bf3d1f325ed0526160fa3269123197ae95b021db47878ed8fc8e6bd5074' - '980cd0f93ab74d67c404ef38afff703b0f78cbb28dcaabb5f69522dcb7c05e549103bebfb1c6bbb2b003870fbb66b8d3e6c2f2dfa6393d9181181c514e8e7645' - '219184fa58f2a8eacfd12cf250e65d2f543767dbca3ac1d30b387d3ed1c06f7791c359647c967693313ce7f1e16969b4fdbae108deffb70cbdd7516f0005a94a' - '538332ccb0a65774bf73a660639a417b48fa0b4d76d0d9971fa458708f0e38cd3166fdee98f443fdafa4928d1d3af82c1dc9c60506ba028fec3c1bf5cfa02db3' - 'a4717bba1e9c702430d0a19f170f23624dd1ecc76606d3981cb06d2a0077a94cab78d8524af443b8667750b966b2a09289a69b26f218797be5cf2ef2449052dd' - '5321dc72af13802fea031c53fdce584cb2e2060b4a0be58c3efc51087e65e5b005aea32ee5e1727943b89d8639f9f54166c67696eca7d9052483ad1d16038414' - '7970086b57256a1182c28480b67836ad29dc4b3a7fa1b859b826af41e95a4c0ba300fb91d25e13865f8ff479dfce9dbda7146b5ec8e2f8d1801d74e012725958' - 'da993e50600559e96d4f09a3b2c0c786cc3d44dcd62f202f3d93503533f11d01b1ec117e4ee69de92982edf5d39b1bf5591452f54dea80468291da1a4d75641f' - 'ea9d960b41effdd3970428d428e6f95acf9e23b51fd86353f4978df7b710ac2eb64c6447583b271c149389b38632b4924e141e72283ff755b7d88c8ddc950101' - '71bbbbb684e9308a862a675a206ee61454dade90dabb5c3df199a1277ff46a2ebe9d1693375bd6bacbde7e4cd2fa5db8d66a09b743e164eb91e9b252eb042ad8' - 'f0a9e601bf6162e603bbc4e538d71d6cf77f0b2cc46e3fce5dcacd293bc57bc1ec04aeedc88030ee3341bfbf318f7a7b15bab6898539a0137ec2430b5d1e46af' - '402443177ed90a41cf793f00ae82e73e76c142a009393a4dd0489c45c89632a527fb7557912db1b9f1e171b53bfb65b0ec0b117941e04c44aa93ddcc7da7ad6b' - '1f3ad929e214da997e4585d854458f12f6fbe9b4b73a6469e048664600a77d1225bfcc4935e0a9647a4495393e19f3c6f4480c37abeb276a849982ca8779bbbc' - '3c242e62c3818dd4e64d535c06ec2d3dfa74835eb19b51d73c16ebfcde7e5776d90f32297e9ac98f2722d05ebe6b658280ef096df69f2157b84b68ff1d338b4f' - '6f0fc0971bbcb5f0068b132d68a72ed53313e940521edf4fce9beb66562a8e889356c640455e637b9a130b79f88bda9d1670a420de39a24a67d8a5cd35b855b0' - '95fb69f75f79bea35c382feeacfa22c30b110697f36b9da2759e9cc384fbb98e1028c44aa5fad2be7e9089b5a1ff9ebe9bfa6c6ab6c9f67d0235e334ed6ca2fa' - '2903a54ff5ceeb40314822c3a940b9b0cb4123d84ea0b2eceeb7aea3ee21f7d632185e397f11037a56f89cfa61f008ac4ab09f087cc6bd0aabd68dd23cda2096' - '0e041a55903585f755e9e436276d5b65b26256a202402b167526727209057d6859adab4c503cd38e326b9b0f563edd80d3e68f4b0747fe046aafc737a1f66e6f' - 'd4439e065dcfb70149a1df3d8bf04f3e875cfb8d054028ff21663e45b731c58b7035c540f8fed293d2a138f1a5df0468c04bae9bac5ee274732988a4b3567ea7' - '7fb680dedef0b3fa01817b92f366adef24ccbb13637aeee7381a6aff7c3e0567858270db4eefc38896de43bc332e8a24082ecb055909048cf2616daf4ab53a28') +sha256sums=('0e638fc7d47c3931a3e676a690c50f5e9f6c889e06f12a8e0b19aff0c987631c' + 'f16c6218486e531675f5f91abbb264a179c9c12274eca8efdcdb69e3a3fcd100' + '79dfda66e7e9b0fc4b6069eea4f1f9c7d6c1f9ab5b95797728a121da480cc8e7' + 'e628786aa12310c46d11b1f71877a977b37cf35ccbba20f72bcf43deba32014e' + '033ca17a63687200104be2d9a2ce62d59ea7c828f24687ffdfefc66b01b553e5' + 'ffb62f1f180d6f6e9b86423688e1c0372bc4aa186ae5da8e2f6f812b813150b4' + '1e973777013b99477465a1227f42e37d8ac0d235c02f84ec69aaa26d847fa249' + 'cad3a753d5186539f42782394348305170a570a5a98e0c33949cd966032604c2' + '42578688e1d7116ed696bf3e181d24600a2060e431986756fbf7f00d6e8a9724' + '8979674c91c1e35b70fe70942eb6fa24369a6a679af3e3f006433d05f045b96e' + '343f54a1c158390ec1a2b5403971b8b66f19636e2943a3e83263fd71f43ee7d8' + 'e32886c82030cd4c6a433659be33e2933165bca268782f73a40629a5e250f20f' + '0cab052e3dc5b9a02d609cb713da1ada2584f9e757167daa1cb75999db7e8d4b' + 'ec01e7b6d3a34c27ff445ddf4d24415e30cd07e77633204adcc4fb0025526f9e' + 'a8385cdeac58153aff3d205fb2697d6a87879baf8a91e13a89fc486ed3de3e10' + 'a8815688647f5ceca3bc4891910cea77b6201698db3c9505b4b833f89a939274' + 'bd33a5b744d6e0bb1bbff44031659ca33425e15d2dfd246fae1984ebb321ed2a' + '4ae0e6cac7248f81165d6789bcb779d468fb0615069d1ffd9063496e3db453b7' + 'd21193066bbec6445fb78a351ec292b35ad8885bc52c07ee85e002f202afbbd3' + 'd1ef945f7d54811500377f4cfc596f7a54e57a7aca4ae581ed25f6802b1e00ed' + '56039ef0d41761143a0b6ef00f9d487f4b818d75d749bf6274859afa7851f542' + 'ced2c9307286c610b0fcff00256e7a3b13d06203f280feb2dbc371f9959342c2' + 'f5898f7df2549db0c4e96377cced53d86e8ab5f72b748fbc1da2b8b5ed9ffb07' + 'a705fab5da5777c145b7b288ddacf229597efa6c7dfd1fa01b73b82149134bb2' + '2cc59b439aad1b10a496eb099a4bdb3c10bb095243ea73199ea4b04ca97174c5' + '60eddc30eddff57d7f478825d200134977b4369e38965c2aafe779410906894e' + '4041644cfd9e8eceeb0fd4350381f879f15b5fd329639fb033f6418978c3214f' + '7ec7a9a83f6998430e636e2c483d4fe726f0d7e4e463c6e564b9a24a91d5298a' + 'afbbfeeec9fb4662daf3fcb2483e57fd7b3c5c084e6e8eb717f94905d9ff5da5' + 'aa38c7771524baebe861577506f8b7b89fe81ece9cbe9e08e16a34989cd03146' + 'b94b116ef16c91b21983b9e68b4c1f5cf63ce17a44566ff3e95a350d269e0ff5' + 'df13119cc8edb181abb270390f2f09b3f1cb6017895d9ec762ec71ed58e77ead' + '2537225b157bc26ab5766cad529c31d942c5bef3e3109d0511a4738a30e39e2d' + '94d5098ea924fe763a567fe5efbfb68de474498d510357b549100f68bef51193' + '4af710ee7aa36682e76860aa0c2d2803f125040e83a69986b8897b139c772176' + 'd945a2a4ae9c20da41a3505b941b18477e560d17f5befcdced56121cbbb617a2' + '6c92c057dd9f3180617c015985dfd6818bbb131ac076a7fb91dc657dd8fdb6ef' + '6fff4cc8493fa683c55dec3a0e20afcdf5af62ae35d52dcc9970f82d238284b8' + 'b66c9d9380fa8fd691c26e13b33a5c2917de9882701ae91deb7db3621ad50587' + '3efd3249949bcc007532c197580913bdf73b803f44276714d1a1e5e216352504' + 'b47c491a79dba0c54f8322f2aa79c478f051cc58020289df5cbb941b1580f24e' + 'b612518b19317c39cee09b23fbf5ba0948a54e95a43706e3c4eeff33ce36484f' + 'efa3aa667cfa0b70ec7afbbe25e0b8ed6ad1156b04dacd7c250560b0553ebbb1' + 'e5a9b31002b90d0d2ec32e809be13f179b990c7a0caea7501559397b1c18089c' + '7840f00764213b35f7c3689ac4d9cedc560c2a7d64491e2a8a4908c6348ee64b' + '806df25b6f83f66fff97b25b5fcb466ba301354c5cf4b5889d748b2bdbaddcf9' + '537dca2cd79bd9bc2d299ef69fb7bae6991a2b81c530a91ddcb87b255d9051ed' + '91c3492db220467b772ee2f18bba745098f9ef16de728f7b3c12b4c3ad9d63a5' + '0094cc051bad72342f1da26583564df20ad65bbe9efee2bd571e21adfc90f6af' + '900495810324de5b9f330db06363438e83d10e57e6a3a20045d5685f7bf7ba36' + '6226fd3aa56a8284386ca50d2a9ad790b7133f622e8f3815f0cfd4b6c236532d' + '1ae9fb004977ebb676ae9fc485a464861524566263d10d6c0353e0ce2debe861' + '0d814b2375f23f997300f981d360055051d30f19188bda029428d67ced277304' + 'f4156f048e6f914cd878a78b45c564816d0c1fa788cd39a151bfdff8e4ac5d55' + '1ac373ceb3a5e8dadc76b81bea37cfa0aff45aeae76b2c98a27e5caac1759d11' + '0900603947b55627065979d5fc911bcc3ea859115b9061b242326679ddf20f73' + '5383ee89cd9f3ec711acf7d8b4fdda3ee4212956f955652471b273d4177fcf9c' + 'f69e238f6a9803f0d313d47e87e689a54c5e83361c8ab00da88433667337aff4' + 'ee6074fd5101f5bdf8046a3cdc7929981e1f6e6854a20c89cf070c6a0cb95422' + '3c6b66fdd7206fc821caaccbf8b067857b2e5c9c1d536d4e47a326ec78e27920' + 'eb615a0cda57ed3387a832e89cb034484eefe67672d0cd75079f3cd44ee56511' + '87e26105380d5344399aacd0daf5f834e7ceebc139cc6ba9029c33639995652c' + '1af6742c896ad489d8cd5e82af8c4e3f4fa53a604a0df60b7149df9d7864d3c1' + '14eccc3276257d1dbece635b96ae57b2ee0f4a0512f64840cf724367442137cc' + '5bfb9303b3ddb34577888c1039e284bf4e62a1dd9f453556b0ad08877f121abe' + '788b43eb9f0a513610fc68e55f1611bdfcda2accf88c55852fed75e7bfb16d2a' + '5105c8402436018a24bd2d113c662768c285cc88ffb64b9acf4261550487d0fb' + '4f81e82b5a3597221898287e48a0c196a569c82a14d7824050978ce81d5c1723' + 'dd374a60033f9c8cd5f88e80d88696ef6aaa16845850cb35031aaa5070a7da51' + 'd6682c7aadd28c03797d977ebf5625e77c2496376f4c0ccece47951d863715cd' + 'ae11ec89879388b347f6f4d28162cdec2cfed753a4fb6687626aea301d9792b4' + 'd2a5032289cb207d884d4a0c8a4763549ef0d3392339a4c8607e24ad2848f5dc' + '387429bb8b139ccd13b4b3a8656f2f35b8d3606c1373d9fe2ccf85e9ef9321f3' + 'c8f992484ab7984e2d3c6b791133ec5df7dacca7b2f66feddc0bc3f1100e3543' + '08a8110d96a9a1a505cd6856582bae9d9bda66dd02690acf2598883292a828c4' + '330aaa9a1e7b99418a586d23d9a71c6803fb3321a68d1d6fe603662b1161dbf9' + '08f264cd2f984ed2b34fb3a162b1cdbcc9fe44cbab73aa2461e11f12771adc85' + '1cac68b02f1059fc4e8134626f55d085aab452d2dd13e603a2962c40fd5f4716' + '1e45010b5f39ed2e1da3f9729067f4d5d9711d620977ddc3ba22e13c6d9840a1' + 'f5e3291406996368bc96bd99e0e49a41df01f54b34034d2632a858bf0d218705' + '4cc8af0e5ac6a56283985b790bd494bdb72dfa50a3464d45e306535e97925f04' + 'c19255a732eec9ac0071becf1153fb7c74c85558ef5971036da6d60611a89678' + 'b8768e4dad22e4770b52f304f2da44d40266d63aaa2dde01157d0c281cd59508' + '2f0e89c993e2f845eb0bdb4b909c527190419ff8fd39adceb12c4f52bf239a90' + 'a2f1d4c9944d3b4e1bd4ca64081fd91040e0acf5d1f130538ff8d18fe9018dbe' + '668448d5d39687c89d03ae4e62abc38d978a61fb94ad00e871a0144793174648' + '35a48ea550d93f5f3b18930430300b35969cd00fe7125e40deaf08e38c1dad89' + '1dd53edfe74f81f23ba87b55a09e1bb613ec20031c9eba1357e0d604bd02a17e' + '9083ec3b54d594e85d5f69a3572b0685f0445681cab7d9aa73611d8c5cae7a64' + '4d362983eef432b43d8f29eb4162ad50668d5a33ce162e0f3663d3ba0f54f4ef') diff --git a/libre/icecat-l10n/region.properties b/libre/icecat-l10n/region.properties index 5654eb9ee..dba40e1ff 100644 --- a/libre/icecat-l10n/region.properties +++ b/libre/icecat-l10n/region.properties @@ -11,7 +11,7 @@ browser.search.order.2=DuckDuckGo Lite browser.search.order.3=Seeks Search # increment this number when anything gets changed in the list below. This will -# cause Firefox to re-read these prefs and inject any new handlers into the +# cause IceCat to re-read these prefs and inject any new handlers into the # profile database. Note that "new" is defined as "has a different URL"; this # means that it's not possible to update the name of existing handler, so # don't make any spelling errors here. diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD index b7486ba2b..ea64ffdd5 100644 --- a/libre/icecat-noscript/PKGBUILD +++ b/libre/icecat-noscript/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=icecat-noscript -pkgver=2.6.9.10 +pkgver=2.6.9.11 pkgrel=1 pkgdesc="Extension for icecat which disables script" arch=('any') @@ -12,7 +12,7 @@ license=('GPL2') depends=() makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('00c000b25f89d14c84ce18819c4f5280') +md5sums=('9b810e4d908cf64f008c902feda01b11') package() { depends=("icecat") diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index ecc2b688c..a04318b7a 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -13,8 +13,8 @@ _pgo=true pkgname=icecat -pkgver=31.2.0 -pkgrel=4 +pkgver=31.4.0 +pkgrel=1 pkgdesc="GNU IceCat, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) @@ -31,7 +31,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks' 'gst-libav: h.264 video') url="http://www.gnu.org/software/gnuzilla/" install=$pkgname.install -source=("http://ftp.gnu.org/gnu/gnuzilla/$pkgver/$pkgname-$pkgver.tar.xz" +source=("http://ftp.gnu.org/gnu/gnuzilla/$pkgver/$pkgname-$pkgver.tar.bz2"{,.sig} mozconfig mozconfig.pgo libre.patch @@ -41,16 +41,18 @@ source=("http://ftp.gnu.org/gnu/gnuzilla/$pkgver/$pkgname-$pkgver.tar.xz" vendor.js rhbz-966424.patch $pkgname-fixed-loading-icon.png) -sha256sums=('b0c532e7b768230b66e5fb43bebfe300c344842806db088ee0467cc01c9d290b' +sha256sums=('82cd59faa3e8e5cc72cfad4a6b5bbb01436a2f0bec270c93e32bb3e5dda3b160' + 'SKIP' 'e0779596c2aafa0f77f09094a218940b1dc5120cd6425d4ea1e8c96be44711ff' '92d7ea9feb8d2814d1abaf5cf4012983a2fb9cc56b26a5d7c7c3898aedf06fb4' - 'b993969d075bce1a8021719347dbbad79f0adc0dc9c549efe4948806253c1882' + '168516e130019250a8bd91e4a61f5c437b0dccd224165ff3e85d2bce69e91a84' '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' 'c2c636fc65e7f6506a7305b930ad403100bc0b51401bd7d6567b48df3654f82e' '5bdab2de5520fb4d3dbc453d9f73d20e0e077bf652bc780fc17184ba6c718a47' '536e82133ba06faccd31620c742dd2b95f1c2e0331934bb8ff17843436dc2142' 'd25c6e95d20ec622a51346897d986fdd97074023d6a02bee0533773a195f8233' '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213') +validpgpkeys=('A57369A8BABC2542B5A0368C3C76EED7D7E04784') # Ruben Rodriguez prepare() { export GNU_BUILD="gnuzilla-release" diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch index f69c535b9..b20ddba8d 100644 --- a/libre/icecat/libre.patch +++ b/libre/icecat/libre.patch @@ -655,8 +655,8 @@ diff -Nur a/browser/base/jar.mn b/browser/base/jar.mn content/browser/abouthome/snippet2@2x.png (content/abouthome/snippet2@2x.png) content/browser/abouthome/downloads@2x.png (content/abouthome/downloads@2x.png) diff -Nur a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd ---- a/browser/locales/en-US/chrome/browser/aboutHome.dtd 2014-10-09 12:53:30.000000000 -0200 -+++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd 2014-10-21 14:25:19.071641759 -0200 +--- a/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-01-27 16:19:19.000000000 -0200 ++++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-01-29 12:19:21.741429014 -0200 @@ -13,17 +13,6 @@ <!ENTITY abouthome.searchEngineButton.label "Search"> @@ -670,14 +670,14 @@ diff -Nur a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales ---> -<!ENTITY abouthome.defaultSnippet2.v1 "It's easy to customize your IceCat exactly the way you want it. <a>Choose from thousands of add-ons</a>."> -<!-- LOCALIZATION NOTE (abouthome.rightsSnippet): text in <a/> will be linked to about:rights --> --<!ENTITY abouthome.rightsSnippet "&brandFullName; is free and open source software from the non-profit Mozilla Foundation. <a>Know your rights…</a>"> +-<!ENTITY abouthome.rightsSnippet "&brandFullName; is Free Software from the non-profit Mozilla Foundation. <a>Know your rights…</a>"> - <!ENTITY abouthome.bookmarksButton.label "Bookmarks"> <!ENTITY abouthome.historyButton.label "History"> <!ENTITY abouthome.settingsButton.label "Settings"> diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties ---- a/browser/locales/en-US/chrome/browser-region/region.properties 2014-10-09 12:53:30.000000000 -0200 -+++ b/browser/locales/en-US/chrome/browser-region/region.properties 2014-10-21 18:02:51.771216707 -0200 +--- a/browser/locales/en-US/chrome/browser-region/region.properties 2015-01-27 16:20:32.000000000 -0200 ++++ b/browser/locales/en-US/chrome/browser-region/region.properties 2015-01-29 12:21:13.202346944 -0200 @@ -3,17 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -716,15 +716,15 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow - # The default set of protocol handlers for irc: -gecko.handlerService.schemes.irc.0.name=Mibbit --gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s +-gecko.handlerService.schemes.irc.0.uriTemplate= +gecko.handlerService.schemes.irc.0.name=Freenode Web IRC +gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net # The default set of protocol handlers for ircs: -gecko.handlerService.schemes.ircs.0.name=Mibbit --gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s -+gecko.handlerService.schemes.irc.0.name=Freenode Web IRC -+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net +-gecko.handlerService.schemes.ircs.0.uriTemplate= ++gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC ++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net diff -Nur a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in --- a/browser/locales/generic/profile/bookmarks.html.in 2014-10-09 12:53:30.000000000 -0200 +++ b/browser/locales/generic/profile/bookmarks.html.in 2014-10-21 18:02:15.103296484 -0200 diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD index 1b95a473d..808d37ff7 100644 --- a/libre/icedove-l10n/PKGBUILD +++ b/libre/icedove-l10n/PKGBUILD @@ -5,7 +5,7 @@ epoch=1 _pkgbase=icedove pkgbase=$_pkgbase-l10n _pkgver=31.4.0 -pkgver=31.4.0.deb1 +pkgver=31.4.0.deb2 pkgrel=1 pkgdesc="Language pack for Debian ${_pkgbase^}." arch=('any') diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD index d9a518c18..f4bf1c39e 100644 --- a/libre/icedove/PKGBUILD +++ b/libre/icedove/PKGBUILD @@ -4,7 +4,7 @@ # We're getting this from Debian Sid _debname=icedove _debver=31.4.0 -_debrel=deb1 +_debrel=deb2 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -31,7 +31,7 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz" ${pkgname}.desktop) options=(!emptydirs) sha256sums=('7b47a053fe1f10097350d4a599a80b91eed1dc21dfcda1618b229f97493cb93c' - '6217e7ef89d6c9c9caa616280051345e6ef09645d1ffe4006e13c940bb8b5a1b' + 'ff0db7a63f3e0648131ca59e4e3c6ff911e795030a49bcf1edb8585a01b33437' '09a0041f7f12498d933284b3d3a44e19002515accaff767d145a8f404b79e86a' 'b44f0eb82dce8a02aa71f0eab4b0d820e5383f613becc62cc995aac8638b54ec' '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a' diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index 87f0e4d29..8e64decdd 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=35.0 +_debver=35.0.1 _debrel=deb1 epoch=1 _pkgbase=iceweasel @@ -142,6 +142,11 @@ _package() { unzip langpack-$1@iceweasel.mozilla.org.xpi -d $1 rm -v langpack-$1@iceweasel.mozilla.org.xpi install -vDm644 $srcdir/region.properties $1/browser/chrome/$1/locale/browser-region + sed -i 's|Firefox|Iceweasel| + ' $1/browser/chrome/$1/locale/browser/devtools/sourceeditor.properties \ + $1/browser/chrome/$1/locale/browser/devtools/toolbox.dtd \ + $1/browser/chrome/$1/locale/browser/devtools/webide.dtd \ + $1/browser/chrome/$1/locale/browser/devtools/webide.properties rm -rv $1/{browser/{chrome/.mkdir.done,searchplugins},chrome/{.mkdir.done,$1/locale/$1/global-platform/{mac,win}}} cd $1 zip -r langpack-$1@iceweasel.mozilla.org.xpi . @@ -165,90 +170,90 @@ _package() { } sha256sums=('652dddf407ab9b0e00ab8cba7c1ea9b3aff2a8f7519966010fd682ae182281c2' - '3ce40daabd4ce7f7faadaaf6ee6e4eb0217ab4dd9dc10f573ce46387fe0cb60a' - '8d0dff7d1edb9358e647bd530ebe418455972a24b870d5164369b6b3382f6e66' - 'e8794feb3cb76893e3a4c5489330282452f990e079be3802e66acccd5a90c6ed' - '5e2d68e9ed07acf1bc33dac6a03258e3652273b660834617aa67c55665841a2b' - '3b1145fc95731f1d3a7b4557f332d42a30e8d3b42c5874da46d86bc18aa64ed1' - '61a415227122b8accc856380ec4f1deda0d524c8bc4dbd939228fd8de1801752' - '67cdb8253146c627c67abfa4db61104634824d5f1811cd23281469764651e414' - '95f7a0d862b91c46f3f2d4e807461ff2fd8b379e82c75d430c3c9899313970d0' - '57a30ffbd9fe1fda01436415e69c88aab0ffc1e1f7f4ed3816e3052a4d7b655a' - '3be3bf9dd85aaa4b4d5a3a350511285537a5063f1cd0254fbaef81a5a3fcdc3f' - '4febee23d04e8ba3af5f6b433abc07e77d427caae5edc85fffe5682fb93e95e5' - '5ee7fdb3fa351a306bb2255a93c843a411a64c53b0d53cb16c3b387f08d62dc8' - '36f7df9c5468c7e0029d06aaffac80f4424bf8be10d9bc390b034224622ac397' - '563b031fd1db57bdd3ed9efa5d17291595f3542ff444185d87ea14b55ab7ac1c' - '39dbf82d999bb512c4d0d557617900659599d54ead020c7cc6229f30ae2d10bd' - '65702c2f85907b4edd8b203d097883e11ff69d8038b403e5185e1ec498808d51' - '0f4da81df3b34fbbbbae74f0e6a289b11ee2322685c6e063b33e524bcb6c640e' - 'd0e64384eda7c11b28e128a323653209548ad9ce5e326ae7c821fc039f13a519' - 'cd70fb88002419eef3da112769dc9fff4df4bc2834d4f5d31eabcbfc7b5ab720' - 'd02370eebe2e01c95feed722b8dbd8f4dbe46969007d9d0e0daba235e8c4ccb2' - '1de09a77a26c0fcab9e5e98b1ff664b5810b190b0a1ad600f1643e4066e73bf2' - '903e73f5599d7b8eaf31e259b146aa00dee9f71e97827a7cdb7bef219440c979' - '19a35ede9b4ae539f6f27a2205c59286d63fec3c81829b17c4681d5106362650' - '91156011bf081f153120292026a1eb818726de7be6706c82456d5e6b9c529367' - '9f09a9dc597b4cb7c343d6d40cd4f045c50eea646ef4e3ae57efec791a114855' - '7b4de0d4dfe7e3540ebffc424607d83df8eca2a6e44a60096841360a1aa6d894' - 'ac377d2f43743c9dcb8be310ffa431b0baf39396ce8d020e8c822c0832d5a887' - '1e202db134d87ded77d49bdd7a6c5d57f7bfcb5b07738e94d515b5ec1cd62d23' - 'c9d0b6e9f50170b6d1f7107abbcfcfd9bb3063a5ade43abb5b6a5a27c6c2100b' - '3e506a1845b16c79e208b8a785e1bf6d637a9956683c926bdf4656fa0a2ace41' - '1485f5c7acf2192a404944c706b2a69bc85bf72ff3eb7ce96fbae8892a24b67e' - 'f0122983121e1a76ff6c7264e894807f2e8ed771ab6e10fecc188ff1df00c860' - '1f8a43043b55cf1916c3b09138f0598351aa1b964aa5f500b8d41e8af99fb69f' - '95b89ca90f5a5fbd4a19e0fb844d3bc777fa12449ad2cf602787dd44fb86462c' - 'e1bab83d683dff719bc9fad92c046c6a9b4be2f5c92fccd09ed1dc27daf8af6f' - 'afb787c19c20ecf6a61b89058cfb8c207407316efe71116f485d78a8b0e214c6' - '8d33c8990a9f875a3177dbc0ed43b43fbae136abd546ce60946c96d803735dfd' - '437faf4b42e488fe89e713a91c796afb33ab1588fe756a1643e9f923498214f8' - 'a1dda51b4fdca9e34e86b1fac0f48069c1e20af978e5cf1cd8d2808e222b0e7f' - '54fd4e7eaba89d8be91b031ce1ae329b07b48d8247f23a5f7b818c02dfee87c8' - '929413fd291f1d98ddc41be084947fe1843e3d789175c88bf15567a3a384627f' - 'f60abccf4e6b884af83ae1bb5be885de579deea1ec92eebc71b37d6c301499c5' - 'ae65e8c70cf369b89311509bb192d35241b8b5fc23cd11a9ff1e4bdde3a6b2ff' - 'de067635977b9bfb6a71050931f1e0f239d8a1a5f0f46bb36d27710a03573da2' - 'dd20204098d39b0d7c8a3c6153794c75883128f77af865a5f6d67f7880c62585' - 'd7d5b5e493fa3c4dd413507aa395ee79a7fa9ae993955d341541ef3b5af2c24a' - '851e0a421fa68d6369647fe0519ce54e477702f38d03e94663ec2ccf005a4157' - '30c53d625d4d962b80dd0504b50bb334769cbb9d24e0342be0f6ec03f60d904c' - '5551dc12139b7e6cf5aa7fda4df5a215812ea21df84ddf6d13ac3aa653bb4898' - '4160122fa50ae9b1366a7a43e49d7558c80370615850c6397251dace3307756b' - 'eafe467d330e57d41dd970a588e45d71bba9e5b0843b3532f772b5dc5f690f8a' - 'c3e87dfc9b546532227bfa3365b73181a7e1eb913843570fa7478fd1ac9f04c4' - '3e832236cf01c94cf456af3d114c357aed62dba968385c25a6005b47a787254b' - 'bf76cba9772cb5bcdfdceade9708f2fa522145daa78580a13500d4827579801b' - 'df9518186a7ce74e69f15f8a6fc28d46bdde6613929beb864f5f7ffb84d51890' - '10fef94856178f987ed176b571124438b093ab0493fb6cb50367f161af305a70' - '502690f088e20ab70ea4e5612574cb14045da24a2ff011f64520fd4ea77043dd' - 'cac5d1dcc3ca88f79475c068ce6e2294e8b78b4500ddad35986492fba08a0aab' - 'bc625a8d4fdd4f41dbd196956e0e8ce0dd4b197300b10621f0005fa4afba4871' - '715dba51789587996ac57f4f62e3cf864d4a9f836a387d6e5d21f9835aca86c0' - '974f5aec06bbd8c7bf9fdafa58ec6262dd46c4dbc343ec570e4108955871fd2b' - '16bb5efccabf09fe65001a20c5050662605056397ad8e2e48faeebf92a4a864c' - 'e56358e17c23b2db12fb539a564c077822d393addbc1ba086f9d07417c802980' - '35c70bc0b3abe01900120c28e898b712e86afc976ef3a49b2864ef8d1968745a' - '813ffb64c0bf130085ab08b456fbc343edf5393d0ea836c21e87324178de6467' - 'cf3df54ef8c5acb31572f18ed674338c91f3ac46cb046e944465e1931c6d7892' - '5a6ca80102e977029dd8d7de2e1113f0be7b049b239440d88c65c155ae033b69' - 'c59044ef9600adc3f8ad51e818fbd312f1687c79f7d89c133dcea17fa1ad1343' - 'ce7ccf52f57473f702f5a14f61dcaf4b78064c0b67b58d9126fbd701ee0ab907' - '6535c0f496fd95df5a2f3b2d1a09c85f02fadff9f38e9fd49f5ad948d1514870' - '829072d62ed0825861a593b4bab342656a810ca0634084f63b5e85c869039212' - '33f59be065aacb4df72a1cc71398a4036f5648b7c2bda1160d1f1988c3ac5062' - 'cfb09672f05b74c48155eb5bd09bbe6091530df13f749f8a971ea75f5e416d7d' - '734a33d5bf1f50e046c38c0a58a84f7625baab3f9a8e9a929085d966865a2d44' - '79eb12b75c1ceb2143a2d0c9289b7d52ce061998084fe5f07441328af975ff22' - '407d59fb8424bd96b25e632ea269bfaafa6bf5bf9ee00b790689fad39ddebae2' - '2ef57100d9c500b93c6a5a87df2248f0ea59f4249d051e8b3af8268c47b1e9ef' - '3b867f1a10c1e05d6315a7c0d196c454832a497d6dc276ee6a23fe1c065a05dc' - '4ac85124c4db954b31d114cb7ecefa817234d3fd458e9bac3f65b518ff23ebf8' - '6803ec95765541862dad5faf8387e92f9201860dda33240b1aa939eb2294a236' - '4af8aaf8a443e2dbc515486dfa9d6a844912dafa58a38f534dc5cafe2121aa48' - 'a556470c3583937249448d8d46e7cacef57cdc402e9f68f28fd6c0e1ee1aca9a' - 'f0aac24f4bf6397ce5ce7d41a9fe1e76f086da3c282bae00985f2a15ed8b0b11' - '6282a9b5d520cbea6d02a95d8e4d73e3e59675cba459c7567d94846f67d054e2' - '99408bd38e511227854d28b19af94771f41d1b78e86142e07b2b0d206052b77b' - '4a0c312b8b4013f6a3e7a6c6c6a7fa07186ff9e4347a023a2d21ae7f3c64b5c2' - '5690083d3480da9b5b1ec9f0478a989f32cf2d1742cad94c5c3c4c2ae62afd9b') + '264d52669f8930ba74997e6fb7d63de95fe93d058518806aff210647e4a502be' + '9b24d64e37164f1e65f64d55e9c96bc451121883a3ea487e7abb064b8d8e9972' + 'af4e35e2369a3eca973455d997e094bd5d548da9308cd29ea1ccfbb2d75044ce' + 'fd94acf77ef8ed1da3209535574769e246b50e617bb1f0f4aaa278efa964f9e2' + 'a0d79d5f360ba7b249e56a9ae265dc145ffce3e702d61a9329d4f23272754c1d' + 'bb97f8d3488559e2679b39d5f1d02d13f99a9fc3b095096097c560cc7b2fe670' + '7d8224ba66aa3fcee6138bbf58b214a95630ea9d6b1b5ae1d216b15414f1f411' + '3985900142ab4e1845ec58d838d413e7a387892e4bd073d5c79250921ae1f576' + 'a2a61676a52e65994fe5d22866f07557e5bad680f796a12b58d2f21c088a2477' + '4b121f1c2c0214e5615474ff8f449292c44294f3be4861abcd6addc590c3a077' + 'de8444ffc486084dd7e7f268a9a73d3c4c43c6255c7be267c8ac6d626b0175ad' + '55d08a4133610dc6f7bec0be62645275c896e9bd8ac4f165579c2c95cb174284' + 'b280bda9964ebcc788c2186bacb681e05d0adc13e8b2bce129939b33efeb6f76' + '1c633b9052da07a3a233d4d66a6f18ee382d495455d2456b9212f6c5ed7a703c' + 'a587cc5927944bc9b96bdad71173d97e1fb96211405586a6e364022a950e5264' + '7410ec9d698a27b0a8d20d461152c248eba019ebd47cf5c8969ad3c6ed062ad7' + '6a84afcd7a29ed872d866faf90ce39c0945a85585537cb35f5cf71d9a2cd96a3' + '79f163e0f5daeeb707c0a083570fce2b643536be4448736087718d2bed5425c9' + '8d47243a3386430dd78e55f917c3488923d51fa6ecdae26bc6f908005cdbe0e2' + 'ecccbfa90833691b02c7e434d64c4bd361a679f7d24d22fa1207e47b76bc7148' + '55ff4d61d94ca9fad2fc6e032503b577ff35ac99e02a3f14e31affd0f5e7d06e' + 'c60876091de37bf36ded53cfab410e09587f1167e9359e5c52d64665541718d3' + '09d040f2e337edefb27a5c6608c4a7e3de46a4cafedc68ec6c1e44195596c86f' + '1a461536f83f2cf011005a8822479a7ab5598d885d779d03b2c613d583f5b9cb' + '9e3973cd3acbcc6d3ecb4135f8b9e09ce633dea39bfbbc8d6ffc78132696e056' + '12fe11d4e2c066191860b6632bc2e2953c9ffc9fc846a7f624cf692116f274ad' + '494d6e8e1805c426266bcc206fcd013f3835aa13b3e429d98771987202f89a6e' + '60f65fc9984f7b1695d4cabe1b833cbed99cb04911793c2032c490c90dc3a447' + 'ab21b77c1e4f52052c928ef0b846067dd568eaa183e81b76897ffd8864dd5484' + '5ebace36caa3f049aedd8cb3bc283db89899e8967f886969ad3f0fcc2f98bc10' + 'b354a64505c92da0e4d82d44b45a0a2ec9ed8660077733187f2b089b3ee8763d' + 'a1bbe8919ddfe3ac8813146ac5c2551b95cb15ff9a3c4fdbbcbcd867cd77488c' + 'e933fd3e62e2176855a3e259f8b2e2f12f394aff9c7f2ddb4117cfdd05d2e588' + '3a4cfaa063bfbdee457bd6896be62b34f813c06ed7a66fad229194f2a9b151be' + 'cc041cc1426d5370b912caa6b0d3576043624cc165c98594916f3b3aad0199d1' + '7aca3f1e5e2f9a7083f60add6f012db7c5d0fcfb8bc309ea39d957dcf30b8573' + 'cbe180595dc3bad1ad189e79057fecfff5ae69c68611d343b16ad330e8b05f7c' + '30801cd4f00b9e3ca558d0e4a90f75386f60030cda35b7ae1e9f66dcbf211bfd' + 'ac823291196c574e5c9840a001bc5ef8f951d3df619d7c689a97cf9e3a7a7d0a' + '2d588e9f25e27d8ceb8725cf068f7892359c240df3020a5750be57af96468af1' + '0f979cb6dc7988a37d6c4c91be9417366d9892c72b72ed21a4133d53adb0459f' + '2555c8ed455f89ff08da01fc1f2f8569536e6afa74cecb8a438337904ae7fa9d' + 'ec5f755388c767a5a037dab5376d3bbc350ed20edd1859ccc481cad71bb38ac1' + '7db4e75c034e2b43e3d4a5af8610fd3ac8111edea24bdcca8036e5dcbb686153' + '1ba2e3ba94969f2a24dbb09d5cdc38f210cc039ec1303d8c020fae04e633b32d' + 'e8a20ebb3c55de73689cf4bb356de42b3a65acb2e166505d56781b72cebde484' + 'bd071126f609c72bce78ae3df57cd811c43e0b30dd7e1a3b7d2dcefaa93fc3ba' + '5abb9d28373d86b2f4f54a1e069a30c2cf02cce401608e0ef4a0c239db4dcd2d' + '0c5ccb0fe96dcd3898b51d8aeeadef55eacaf1ea6f638711918e38411733ac55' + '0a5d11b0d729876f90631f58651f54070d863d0e5d5f516c5b3ce5b9e1d27626' + 'a0e5a11016dfd2570cfcc5b57ea7744a63db785b58a90a7fb18e9d8297a5f868' + '44f533591d7f45fa90153e99b7ae9839b55a5981bd011cf2462529aa1a956528' + 'f78ec012c659df4f786134185bbd078d267a90bbf1b8003c52be7fc4007dc613' + '4942d288bf54bb5d2ca171f549bc4c52da6a6ad77d56f16ab32d1869165b200f' + 'fb623363c01031940dc8cfe2960c393d684a169c819c7d549e46b4597a914123' + '2ca8e09c39758f9db426c87144e8406ba5ccea9e86e21128ad34d5b5919ec2f6' + 'e6f7b6780e01427d5dee226aca3321475360ef4fb683ba2588173b21a15a8bb1' + '32fad9a18c6eb9c3f47e7245f7bfdd318413947be16a961db167b84b5037d7e7' + 'a617e2064288ee598c60ce719e9755a78f829591a2a3b7a5086e2a72c7d50856' + '7ff56071ee5eb3173aaf4be05351d4613dedf64bd9b7f732be49e5677016a54d' + '09856a8127b58e0892f5b1f44922dafbbeda12820b80a675bc4fa9f0b08eff79' + 'df7e26edd78f2df53630620f6c4babc76f05ce6b58e1cd31fc041e23b5cf4d75' + 'a2d537419e3a04437234bd2aa7b76697a0a884b9a7cf729d700f05081f75db7b' + 'f9388ac736ebcf935bfe9ca8196323996de9e7aad7cb77533dad6a03b89f0391' + 'ce71e5ca682c9a0d74db84f420a046a58637b3607377b4ffa6bf80a76e8f839a' + '96020217c1c77465e2b6c551877a75f5a44ab121cd19023a814e3fd25eeceba2' + '41a1b4071aa40b4c6566a18abc466db2ff7d12c1e5050b31238bdd74d3aebf29' + '4e032a046bf0ba5e01c90e162dd4e0e7731db6b3f2ba28ef68bdba078e936d73' + 'ea264d5c435ad01767d829e0dbd40679937b18288a5bbd2ff79f9f274651511b' + '4329604a0f5fb47d54136aeb3f96e4c12e41529195c5eaa4ca2504e4396db051' + '3064b4a90539c3f8d60fa9421c0fb1595dec8b89e0020e81218cee02dd6ce863' + '1e04eab33f9515ac7ffafb61611013f9b230c3528f8661c1c24c8751e99b0e36' + '44006da79564048be22adbaead337e58ad2625b97d88ac36a3669528aff47bf2' + '3f2cbe2667b77af9e662de43810eb60ebb5f5551d28694f03b170952cb86df87' + 'db94344eb14bcbb35ad7fba899de519bfb680d30410e5f13d1008faf79ed8c2a' + '274d8d7f117e32c5fd29fe182125089b3f9c0266dc95f1895f8ba648fad6c520' + '0a46cdcf8b18a6e036798282caefc0e5faef8546764bb3aae1076d608396bcf0' + '2eecdd9250b41917e6307d0f8a58d32520973a7fbbe3fb0923d018dee9c9c42f' + '692b3a1e98e6eb3bcf865015eeba2ff73bb051e4ca94c286a24d11805b652c90' + '71e6c3f858936c72d61f4068f2d857bb80b521ae99dbdac9a8aebb08732632ee' + '8512f5286899f54550114149eaab207afef0db0900a00cf7f5f96b182405248a' + '0f592ddc51fabb085db64c00df8b340782316b1f8a07dd4d50f17c4426e9db76' + 'a88669b4e2054d995d4561f83703c0a3695805c9dc700ea573e087106f7668d4' + '845aade113b6de2ac96dd22b709cf77b7e18672fe58fb26028243a0a24a62e05' + 'd59612023a0092e80ca4d3c8cc19b832471e1ae8381aa696194ff8833fe3bc69' + 'aa888db76daa1398ca8a7dc4386a69ffa7d250d4a05c8d8c29fc234f6042976f' + 'bef52f43db6f9125870698ba63ef7d4102c49889283b840cb2364396870e7de7') diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD index 74bbfc087..646f900df 100644 --- a/libre/iceweasel-noscript/PKGBUILD +++ b/libre/iceweasel-noscript/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=iceweasel-noscript -pkgver=2.6.9.10 +pkgver=2.6.9.11 pkgrel=1 pkgdesc="Extension for iceweasel which disables script" arch=('any') @@ -12,7 +12,7 @@ license=('GPL2') depends=() makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('00c000b25f89d14c84ce18819c4f5280') +md5sums=('9b810e4d908cf64f008c902feda01b11') package() { depends=("iceweasel") diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 3b46f4742..3402dbec8 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=35.0 +_debver=35.0.1 _debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -24,7 +24,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } pkgname=iceweasel epoch=1 pkgver=$_debver.$_debrel -pkgrel=3 +pkgrel=1 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) @@ -53,10 +53,10 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" vendor.js rhbz-966424.patch $pkgname-fixed-loading-icon.png) -sha256sums=('7702b1873757c8ec2f911680ff63ded124ab7b3610ef5c1456581146451a641e' - '0b59e3f72ac50475832fbd64055411bb81264526f06492f2a5801e4d859da7de' +sha256sums=('44646270b68b7ec5ee73516ea5bada0f32d1c2c01d4afdb7102ba7f98c93a7a8' + '8ca7c37f040f0f3ebe7aeb3d57e13c4aa1d4e53ce8f3622d600b6e9f61f832a1' '831720c1efd6e67d54e70cf4e2b02f9554aa6c914315be6dd2ca837adbbdcabd' - 'e3aa10890a54c312d7a8aa36e4371f78799a8bd7a1b887612fcd7223d2fe30bf' + '1fd1383f87473671370e89f33c4d8ffdc89dbe6ae4b7d8ad23e15d83bb17740f' '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' '84895ff873a89770c62c4568fd111ac92d540b4499b2b77258c6c88a929ef049' '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d' diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch index 089be5913..7025151ad 100644 --- a/libre/iceweasel/libre.patch +++ b/libre/iceweasel/libre.patch @@ -668,40 +668,6 @@ diff -Nur mozilla-release.orig/browser/base/jar.mn mozilla-release/browser/base/ content/browser/aboutNetError.xhtml (content/aboutNetError.xhtml) -diff -Nur mozilla-release.orig/browser/devtools/webide/webide-prefs.js mozilla-release/browser/devtools/webide/webide-prefs.js ---- mozilla-release.orig/browser/devtools/webide/webide-prefs.js 2015-01-09 02:38:16.000000000 -0200 -+++ mozilla-release/browser/devtools/webide/webide-prefs.js 2015-01-22 15:54:09.172617578 -0200 -@@ -4,21 +4,21 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - pref("devtools.webide.showProjectEditor", true); --pref("devtools.webide.templatesURL", "https://code.cdn.mozilla.net/templates/list.json"); --pref("devtools.webide.autoinstallADBHelper", true); -+pref("devtools.webide.templatesURL", ""); -+pref("devtools.webide.autoinstallADBHelper", false); - #ifdef MOZ_DEV_EDITION - pref("devtools.webide.autoinstallFxdtAdapters", true); - #else - pref("devtools.webide.autoinstallFxdtAdapters", false); - #endif - pref("devtools.webide.restoreLastProject", true); --pref("devtools.webide.addonsURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxos-simulator/index.json"); --pref("devtools.webide.simulatorAddonsURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxos-simulator/#VERSION#/#OS#/fxos_#SLASHED_VERSION#_simulator-#OS#-latest.xpi"); --pref("devtools.webide.simulatorAddonID", "fxos_#SLASHED_VERSION#_simulator@mozilla.org"); --pref("devtools.webide.adbAddonURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxos-simulator/adb-helper/#OS#/adbhelper-#OS#-latest.xpi"); --pref("devtools.webide.adbAddonID", "adbhelper@mozilla.org"); --pref("devtools.webide.adaptersAddonURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxdt-adapters/#OS#/fxdt-adapters-#OS#-latest.xpi"); --pref("devtools.webide.adaptersAddonID", "fxdevtools-adapters@mozilla.org"); -+pref("devtools.webide.addonsURL", ""); -+pref("devtools.webide.simulatorAddonsURL", ""); -+pref("devtools.webide.simulatorAddonID", ""); -+pref("devtools.webide.adbAddonURL", ""); -+pref("devtools.webide.adbAddonID", ""); -+pref("devtools.webide.adaptersAddonURL", ""); -+pref("devtools.webide.adaptersAddonID", ""); - pref("devtools.webide.monitorWebSocketURL", "ws://localhost:9000"); - pref("devtools.webide.lastConnectedRuntime", ""); - pref("devtools.webide.lastSelectedProject", ""); diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dtd mozilla-release/browser/locales/en-US/chrome/browser/aboutHome.dtd --- mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-01-09 02:38:16.000000000 -0200 +++ mozilla-release/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-01-16 15:03:01.408257268 -0200 @@ -723,6 +689,99 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dt <!ENTITY abouthome.bookmarksButton.label "Bookmarks"> <!ENTITY abouthome.historyButton.label "History"> <!-- LOCALIZATION NOTE (abouthome.preferencesButtonWin.label): The label for the +diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd mozilla-release/browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd +--- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd 2015-01-09 02:38:16.000000000 -0200 ++++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd 2015-01-31 12:32:11.570408623 -0200 +@@ -24,7 +24,7 @@ + <!-- LOCALIZATION NOTE (remoteHelp, remoteDocumentation, remoteHelpSuffix): + these strings will be concatenated in a single label, remoteDocumentation will + be used as text for a link to MDN. --> +-<!ENTITY remoteHelp "Firefox Developer Tools can debug remote devices (Firefox for Android and Firefox OS, for example). Make sure that you have turned on the 'Remote debugging' option in the remote device. For more, see the "> ++<!ENTITY remoteHelp "Iceweasel Developer Tools can debug remote devices. Make sure that you have turned on the 'Remote debugging' option in the remote device. For more, see the "> + <!ENTITY remoteDocumentation "documentation"> + <!ENTITY remoteHelpSuffix "."> + +diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/sourceeditor.properties mozilla-release/browser/locales/en-US/chrome/browser/devtools/sourceeditor.properties +--- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/sourceeditor.properties 2015-01-09 02:38:16.000000000 -0200 ++++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/sourceeditor.properties 2015-01-31 12:33:10.797565416 -0200 +@@ -4,7 +4,7 @@ + + # LOCALIZATION NOTE These strings are used inside the Source Editor component. + # This component is used whenever source code is displayed for the purpose of +-# being edited, inside the Firefox developer tools - current examples are the ++# being edited, inside the Iceweasel developer tools - current examples are the + # Scratchpad and the Style Editor tools. + + # LOCALIZATION NOTE The correct localization of this file might be to keep it +diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd mozilla-release/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd +--- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd 2015-01-09 02:38:16.000000000 -0200 ++++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd 2015-01-31 12:34:06.301357174 -0200 +@@ -79,7 +79,7 @@ + - checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled + - boolean preference in about:config, in the options panel. --> + <!ENTITY options.enableRemote.label3 "Enable remote debugging"> +-<!ENTITY options.enableRemote.tooltip "Turning this option on will allow the developer tools to debug remote Firefox instance like Firefox OS"> ++<!ENTITY options.enableRemote.tooltip "Turning this option on will allow the developer tools to debug remote Iceweasel instance like Iceweasel OS"> + + <!-- LOCALIZATION NOTE (options.disableJavaScript.label, + - options.disableJavaScript.tooltip): This is the options panel label and +@@ -96,7 +96,7 @@ + <!-- LOCALIZATION NOTE (options.selectDefaultTools.label): This is the label for + - the heading of group of checkboxes corresponding to the default developer + - tools. --> +-<!ENTITY options.selectDefaultTools.label "Default Firefox Developer Tools"> ++<!ENTITY options.selectDefaultTools.label "Default Iceweasel Developer Tools"> + + <!-- 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-01-09 02:38:16.000000000 -0200 ++++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/webide.dtd 2015-01-31 12:34:39.361629855 -0200 +@@ -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/. --> + +-<!ENTITY windowTitle "Firefox WebIDE"> ++<!ENTITY windowTitle "Iceweasel WebIDE"> + + <!ENTITY projectMenu_label "Project"> + <!ENTITY projectMenu_accesskey "P"> +@@ -48,7 +48,7 @@ + <!ENTITY projectButton_label "Open App"> + <!ENTITY runtimeButton_label "Select Runtime"> + +-<!-- We try to repicate Firefox' bindings: --> ++<!-- We try to repicate Iceweasel' bindings: --> + <!-- quit app --> + <!ENTITY key_quit "W"> + <!-- open menu --> +diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/webide.properties mozilla-release/browser/locales/en-US/chrome/browser/devtools/webide.properties +--- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/webide.properties 2015-01-09 02:38:16.000000000 -0200 ++++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/webide.properties 2015-01-31 12:35:03.848498325 -0200 +@@ -2,8 +2,8 @@ + # 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/. + +-title_noApp=Firefox WebIDE +-title_app=Firefox WebIDE: %S ++title_noApp=Iceweasel WebIDE ++title_app=Iceweasel WebIDE: %S + + runtimeButton_label=Select Runtime + projectButton_label=Open App +@@ -45,10 +45,10 @@ + addons_stable=stable + addons_unstable=unstable + # LOCALIZATION NOTE (addons_simulator_label): This label is shown as the name of +-# a given simulator version in the "Manage Simulators" pane. %1$S: Firefox OS ++# a given simulator version in the "Manage Simulators" pane. %1$S: Iceweasel OS + # version in the simulator, ex. 1.3. %2$S: Simulator stability label, ex. + # "stable" or "unstable". +-addons_simulator_label=Firefox OS %1$S Simulator (%2$S) ++addons_simulator_label=Iceweasel OS %1$S Simulator (%2$S) + addons_install_button=install + addons_uninstall_button=uninstall + addons_adb_label=ADB Helper Add-on 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 2015-01-09 02:38:16.000000000 -0200 +++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2015-01-16 15:03:01.408257268 -0200 diff --git a/libre/kdebase-konqueror/PKGBUILD b/libre/kdebase-konqueror/PKGBUILD index f99a736c1..5c40e1c4a 100644 --- a/libre/kdebase-konqueror/PKGBUILD +++ b/libre/kdebase-konqueror/PKGBUILD @@ -5,8 +5,8 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname='kdebase-konqueror' -pkgver=14.12.1 -pkgrel=2.parabola1 +pkgver=14.12.2 +pkgrel=1.parabola1 arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/internet/konqueror/" license=('GPL' 'LGPL' 'FDL') @@ -16,7 +16,7 @@ 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') -sha1sums=('fefc86d7fb176689012f4ee8710f715a68c899f9' +sha1sums=('62e1d92623d13e97eed086c79b9765627fbefd8b' 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a') pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') diff --git a/libre/kdebase-runtime/PKGBUILD b/libre/kdebase-runtime/PKGBUILD index 62941891f..ceb186485 100644 --- a/libre/kdebase-runtime/PKGBUILD +++ b/libre/kdebase-runtime/PKGBUILD @@ -4,7 +4,7 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=kdebase-runtime -pkgver=14.12.1 +pkgver=14.12.2 pkgrel=1.parabola1 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers" arch=('i686' 'x86_64' 'mips64el') @@ -25,7 +25,7 @@ install="${pkgname}.install" source=("http://download.kde.org/stable/applications/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" 'duckduckgo_html.desktop' 'duckduckgo_lite.desktop') -sha1sums=('5f6e1e5ac3dcb7a42a945d003881ab47756a940b' +sha1sums=('96811840cb04a879109739f3df4f8075fb876ea7' 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd' 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b') diff --git a/libre/kdelibs/PKGBUILD b/libre/kdelibs/PKGBUILD index bff7e114b..8cf7eb24e 100644 --- a/libre/kdelibs/PKGBUILD +++ b/libre/kdelibs/PKGBUILD @@ -5,8 +5,8 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=kdelibs -pkgver=4.14.4 -_kdeappver=14.12.1 +pkgver=4.14.5 +_kdeappver=14.12.2 pkgrel=1.parabola1 pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,7 @@ 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') -sha1sums=('8e5b35ac26a3ee65331ead30d0d9f192534a02d3' +sha1sums=('92e4b13e41f946de0d647331f31ad83f4921c99a' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'a1502a964081ad583a00cf90c56e74bf60121830' 'ed1f57ee661e5c7440efcaba7e51d2554709701c') diff --git a/libre/kdenetwork-kopete/PKGBUILD b/libre/kdenetwork-kopete/PKGBUILD index 575bbb4cf..5ca76e9ff 100644 --- a/libre/kdenetwork-kopete/PKGBUILD +++ b/libre/kdenetwork-kopete/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=kdenetwork-kopete -pkgver=14.12.1 +pkgver=14.12.2 pkgrel=1.parabola1 pkgdesc='Instant Messenger, without nonfree Skype support' url='http://kde.org/applications/internet/kopete/' @@ -17,7 +17,7 @@ depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libidn' makedepends=('cmake' 'automoc4' 'boost' 'kdepim-libkdepim') install=${pkgname}.install source=("http://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz") -sha1sums=('bf5c8b45c6706ed26e5257817e838fd538033aa2') +sha1sums=('c8cfff62cfda2575f0dfeb1bc7248ebcece7092a') prepare() { cd kopete-${pkgver} diff --git a/libre/kdeutils-ark/PKGBUILD b/libre/kdeutils-ark/PKGBUILD index 6f906883e..8db8ca179 100644 --- a/libre/kdeutils-ark/PKGBUILD +++ b/libre/kdeutils-ark/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=kdeutils-ark -pkgver=14.12.1 +pkgver=14.12.2 pkgrel=1.parabola1 pkgdesc='Archiving Tool, with unar support' url='http://kde.org/applications/utilities/ark/' @@ -18,7 +18,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=('df0764ce3c32358c4b1c7515d57431f4707f9da4' +sha1sums=('a027bb9ce7eaa513a8349f9eced8b9f43d38c4a3' 'a0a836950f185d9b2245204579f969203036fdec') prepare() { diff --git a/libre/kipi-plugins/PKGBUILD b/libre/kipi-plugins/PKGBUILD index 1c5203899..f9c316ede 100644 --- a/libre/kipi-plugins/PKGBUILD +++ b/libre/kipi-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 229642 2015-01-22 14:42:12Z ronald $ +# $Id: PKGBUILD 230374 2015-02-02 10:16:00Z ronald $ # Maintainer (Arch): Ronald van Haren <ronald@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org> @@ -7,8 +7,8 @@ pkgbase=digikam pkgname=kipi-plugins -pkgver=4.5.0 -pkgrel=5.parabola1 +pkgver=4.6.0 +pkgrel=1.parabola1 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') license=('GPL') @@ -29,14 +29,11 @@ optdepends=('libkgeomap: Geolocalize tool' 'qt-gstreamer: Video SlideShow plugin') options=('staticlibs') install=kipi-plugins.install -source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2" - "libkexiv2.patch") -sha1sums=('ba735f4b7bb0437c1676141ab78ea958e46f135e' - '1bcef459bd400a04526aac9adf39d4d0a1c3549c') +source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('ee4241f02e997c7b122166bc845feb885b633f0e') prepare() { cd ${srcdir}/${pkgbase}-${pkgver} - patch -Np0 -i "${srcdir}/libkexiv2.patch" sed -i '\|flashexport|d \|jalbumexport|d ' extra/kipi-plugins/CMakeLists.txt @@ -51,7 +48,10 @@ build() { -DCMAKE_SKIP_RPATH=ON \ -DBUILD_tests=OFF \ -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF \ - -DDIGIKAMSC_USE_PRIVATE_SHAREDLIBS=ON + -DDIGIKAMSC_USE_PRIVATE_SHAREDLIBS=ON \ + -DDIGIKAMSC_COMPILE_LIBKGEOMAP=ON \ + -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=ON \ + -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=ON make } diff --git a/libre/kipi-plugins/libkexiv2.patch b/libre/kipi-plugins/libkexiv2.patch deleted file mode 100644 index f75b08bf7..000000000 --- a/libre/kipi-plugins/libkexiv2.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- extra/CMakeLists.txt.bak 2014-11-14 20:46:49.265601687 +0100 -+++ extra/CMakeLists.txt 2014-11-14 20:46:55.555823691 +0100 -@@ -11,7 +11,6 @@ - - # from kdegraphics/libs - add_subdirectory(libkipi) -- add_subdirectory(libkexiv2) - add_subdirectory(libkdcraw) - add_subdirectory(libkface) - MACRO_OPTIONAL_ADD_SUBDIRECTORY(libksane) diff --git a/libre/linux-libre-grsec/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch b/libre/linux-libre-grsec/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch deleted file mode 100644 index f9aa99342..000000000 --- a/libre/linux-libre-grsec/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch +++ /dev/null @@ -1,79 +0,0 @@ -From d472fcc8379c062bd56a3876fc6ef22258f14a91 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Mon, 24 Nov 2014 11:12:42 +0100 -Subject: [PATCH] drm/i915: Disallow pin ioctl completely for kms drivers - -The problem here is that SNA pins batchbuffers to etch out a bit more -performance. Iirc it started out as a w/a for i830M (which we've -implemented in the kernel since a long time already). The problem is -that the pin ioctl wasn't added in - -commit d23db88c3ab233daed18709e3a24d6c95344117f -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Fri May 23 08:48:08 2014 +0200 - - drm/i915: Prevent negative relocation deltas from wrapping - -Fix this by simply disallowing pinning from userspace so that the -kernel is in full control of batch placement again. Especially since -distros are moving towards running X as non-root, so most users won't -even be able to see any benefits. - -UMS support is dead now, but we need this minimal patch for -backporting. Follow-up patch will remove the pin ioctl code -completely. - -Note to backporters: You must have both - -commit b45305fce5bb1abec263fcff9d81ebecd6306ede -Author: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Mon Dec 17 16:21:27 2012 +0100 - - drm/i915: Implement workaround for broken CS tlb on i830/845 - -which laned in 3.8 and - -commit c4d69da167fa967749aeb70bc0e94a457e5d00c1 -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Mon Sep 8 14:25:41 2014 +0100 - - drm/i915: Evict CS TLBs between batches - -which is also marked cc: stable. Otherwise this could introduce a -regression by disabling the userspace w/a without the kernel w/a being -fully functional on i830/45. - -References: https://bugs.freedesktop.org/show_bug.cgi?id=76554#c116 -Cc: stable@vger.kernel.org # requires c4d69da167fa967749a and v3.8 -Cc: Chris Wilson <chris@chris-wilson.co.uk> -Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> ---- - drivers/gpu/drm/i915/i915_gem.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c -index fd17cca..97b86a5 100644 ---- a/drivers/gpu/drm/i915/i915_gem.c -+++ b/drivers/gpu/drm/i915/i915_gem.c -@@ -4263,7 +4263,7 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data, - struct drm_i915_gem_object *obj; - int ret; - -- if (INTEL_INFO(dev)->gen >= 6) -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) - return -ENODEV; - - ret = i915_mutex_lock_interruptible(dev); -@@ -4319,6 +4319,9 @@ i915_gem_unpin_ioctl(struct drm_device *dev, void *data, - struct drm_i915_gem_object *obj; - int ret; - -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) -+ return -ENODEV; -+ - ret = i915_mutex_lock_interruptible(dev); - if (ret) - return ret; --- -2.2.0 - diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD index 5efdc74a9..1f2b7c79f 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=3.18-gnu -_pkgver=3.18.3-gnu +_pkgver=3.18.5-gnu _grsecver=3.0 -_timestamp=201501182219 +_timestamp=201502021854 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -41,25 +41,23 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li 'linux.preset' 'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm} 'change-default-console-loglevel.patch' - '0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.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 '3.18-rc6-48c0ad793f-loongson-community.patch') sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' 'SKIP' - '28e6de2c7325d7b0c3856381678028969b97abb9224f9609a3d6563f560f24b8' + '65a9e66cf15eb523fe6759c3eb983d93a105ea13637bc40419b7ea2143af3daf' 'SKIP' - 'ba8d2a97211522e8fb1797e06f77e5a83c0f331d763e4bb5ce2931ddf714461b' + '278ac180071745f8bb418537e13bba5d791bd6e346602c5c240bee8cdfadc778' 'SKIP' - '1c9235ee7f1daadc6b710db787a36b2bf143610eed44071d9ed99b98f7199b04' - '4d733a9eec545743872b5baceaac19273ef1e3f76cc3a43928ddd0ceef107689' + '45486e39850926a4695bd21258d0a73333c014ff38fbfcdc78cf19298a4b1feb' + '5b4f43875196306cf81f864172dc6ceaf09c2d08b44809fdf11111d217e18e17' 'a2f86e2f2b0924d493cd4b655aba5df776c6e8057fdb15551f31c8692ec071a8' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264' '2e87a8ec1cc0c91938cac24992d8a3d4362b3e9d939767e4c9d2ec8e6d969d53' 'f67f60a30bcf2e9a2ba88ad97cace308da7a7f94919bb95c3dc030f5885a8015' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '0bda45a3ef0f2780bbe588f2e53ab2b79814d29e9c6fc7bfff3b0dbdaa9e710d' '438ce44e3409d644f0a99b05c3208ae3f1d46b8efe0edfc7d52ce3625e381ae9') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva @@ -95,9 +93,6 @@ prepare() { # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git - # fix #43143 - patch -p1 -i "${srcdir}/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.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) diff --git a/libre/linux-libre-grsec/config.i686 b/libre/linux-libre-grsec/config.i686 index 2b5e6d128..f8281538c 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.18.1-gnu-201412281149-1-grsec Kernel Configuration +# Linux/x86 3.18.4-gnu-201501272307-1-grsec Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -7001,6 +7001,7 @@ CONFIG_GRKERNSEC_CHROOT_UNIX=y CONFIG_GRKERNSEC_CHROOT_FINDTASK=y CONFIG_GRKERNSEC_CHROOT_NICE=y CONFIG_GRKERNSEC_CHROOT_SYSCTL=y +CONFIG_GRKERNSEC_CHROOT_RENAME=y CONFIG_GRKERNSEC_CHROOT_CAPS=y CONFIG_GRKERNSEC_CHROOT_INITRD=y diff --git a/libre/linux-libre-grsec/config.x86_64 b/libre/linux-libre-grsec/config.x86_64 index 5b4e533ca..bd0acb45e 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.18.1-gnu-201412281149-1-grsec Kernel Configuration +# Linux/x86 3.18.4-gnu-201501272307-1-grsec Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -6698,6 +6698,7 @@ CONFIG_GRKERNSEC_CHROOT_UNIX=y CONFIG_GRKERNSEC_CHROOT_FINDTASK=y CONFIG_GRKERNSEC_CHROOT_NICE=y CONFIG_GRKERNSEC_CHROOT_SYSCTL=y +CONFIG_GRKERNSEC_CHROOT_RENAME=y CONFIG_GRKERNSEC_CHROOT_CAPS=y CONFIG_GRKERNSEC_CHROOT_INITRD=y diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index c7bf0c074..f4d25f732 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.29-gnu +_pkgver=3.14.31-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -42,7 +42,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '3.14.14-a410a5e2b7-loongson-community.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'SKIP' - '24fcfa602cef359cd9f6f319cbbe3efea9a0c2c38b7f934f434887c254b57bef' + '84411639f46024e04b00f69348f619f1aebe9058125d5695afed8df8f07adb9c' 'SKIP' '7c771ed094882d9df69271f19eab456c0266db6d5f8e680f18f4b1f4b89da066' '42e5795bd25dfba1d1275bd28fc53209e18d4cf824cf7ae6c45b5ce5701800fc' diff --git a/libre/linux-libre/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch b/libre/linux-libre/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch deleted file mode 100644 index f9aa99342..000000000 --- a/libre/linux-libre/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch +++ /dev/null @@ -1,79 +0,0 @@ -From d472fcc8379c062bd56a3876fc6ef22258f14a91 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Mon, 24 Nov 2014 11:12:42 +0100 -Subject: [PATCH] drm/i915: Disallow pin ioctl completely for kms drivers - -The problem here is that SNA pins batchbuffers to etch out a bit more -performance. Iirc it started out as a w/a for i830M (which we've -implemented in the kernel since a long time already). The problem is -that the pin ioctl wasn't added in - -commit d23db88c3ab233daed18709e3a24d6c95344117f -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Fri May 23 08:48:08 2014 +0200 - - drm/i915: Prevent negative relocation deltas from wrapping - -Fix this by simply disallowing pinning from userspace so that the -kernel is in full control of batch placement again. Especially since -distros are moving towards running X as non-root, so most users won't -even be able to see any benefits. - -UMS support is dead now, but we need this minimal patch for -backporting. Follow-up patch will remove the pin ioctl code -completely. - -Note to backporters: You must have both - -commit b45305fce5bb1abec263fcff9d81ebecd6306ede -Author: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Mon Dec 17 16:21:27 2012 +0100 - - drm/i915: Implement workaround for broken CS tlb on i830/845 - -which laned in 3.8 and - -commit c4d69da167fa967749aeb70bc0e94a457e5d00c1 -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Mon Sep 8 14:25:41 2014 +0100 - - drm/i915: Evict CS TLBs between batches - -which is also marked cc: stable. Otherwise this could introduce a -regression by disabling the userspace w/a without the kernel w/a being -fully functional on i830/45. - -References: https://bugs.freedesktop.org/show_bug.cgi?id=76554#c116 -Cc: stable@vger.kernel.org # requires c4d69da167fa967749a and v3.8 -Cc: Chris Wilson <chris@chris-wilson.co.uk> -Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> ---- - drivers/gpu/drm/i915/i915_gem.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c -index fd17cca..97b86a5 100644 ---- a/drivers/gpu/drm/i915/i915_gem.c -+++ b/drivers/gpu/drm/i915/i915_gem.c -@@ -4263,7 +4263,7 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data, - struct drm_i915_gem_object *obj; - int ret; - -- if (INTEL_INFO(dev)->gen >= 6) -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) - return -ENODEV; - - ret = i915_mutex_lock_interruptible(dev); -@@ -4319,6 +4319,9 @@ i915_gem_unpin_ioctl(struct drm_device *dev, void *data, - struct drm_i915_gem_object *obj; - int ret; - -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) -+ return -ENODEV; -+ - ret = i915_mutex_lock_interruptible(dev); - if (ret) - return ret; --- -2.2.0 - diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 8075c2f64..506e2e2cc 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre # Build stock "" kernel _pkgbasever=3.18-gnu -_pkgver=3.18.3-gnu +_pkgver=3.18.5-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -34,12 +34,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li 'linux.preset' 'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm} 'change-default-console-loglevel.patch' - '0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch' # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/ '3.18-rc6-48c0ad793f-loongson-community.patch') sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' 'SKIP' - '28e6de2c7325d7b0c3856381678028969b97abb9224f9609a3d6563f560f24b8' + '65a9e66cf15eb523fe6759c3eb983d93a105ea13637bc40419b7ea2143af3daf' 'SKIP' '2f03d1b7c6a198c3f5c1ff15583d468b93dd50d1c37d41a71075935eebb786e7' '81f1a730420c689da73554e323ca9cb4453aa20b8aeeed3864d3034b5470cc0b' @@ -49,7 +48,6 @@ sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' '2e87a8ec1cc0c91938cac24992d8a3d4362b3e9d939767e4c9d2ec8e6d969d53' 'f67f60a30bcf2e9a2ba88ad97cace308da7a7f94919bb95c3dc030f5885a8015' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '0bda45a3ef0f2780bbe588f2e53ab2b79814d29e9c6fc7bfff3b0dbdaa9e710d' '81adca8b3f58156f4a245cb7f20750041a9e6848b282942d7d9e213a04c96c9f') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva @@ -80,9 +78,6 @@ prepare() { # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git - # fix #43143 - patch -p1 -i "${srcdir}/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.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) diff --git a/libre/mcomix/PKGBUILD b/libre/mcomix/PKGBUILD index b6dd55def..27ce9f419 100644 --- a/libre/mcomix/PKGBUILD +++ b/libre/mcomix/PKGBUILD @@ -4,8 +4,8 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=mcomix -pkgver=1.00 -pkgrel=6.parabola2 +pkgver=1.01 +pkgrel=1.parabola1 pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books, without nonfree unrar support" arch=('any') url="http://sourceforge.net/projects/mcomix/" @@ -17,7 +17,6 @@ conflicts=('comix' 'mcomix-libre') replaces=('comix' 'mcomix-libre') install='mcomix.install' source=("http://downloads.sourceforge.net/project/mcomix/MComix-${pkgver}/mcomix-${pkgver}.tar.bz2" - 'zoom.patch' 'libre.patch') prepare() { @@ -40,10 +39,6 @@ build() { do sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file done - - # Fix zoom in, zoom out keyboard shortcuts: - # https://sourceforge.net/p/mcomix/bugs/62/ - patch -Np1 < ${srcdir}/zoom.patch } package() { @@ -60,6 +55,5 @@ package() { install -Dm644 mime/comicbook.schemas ${pkgdir}/usr/share/gconf/schemas/mcomix.schemas } -md5sums=('3a916dd9da17043ab59ccd17e26eb932' - 'c80705bf6f132bfba20dcb84b79c9cb7' - 'cbb3730d3bed153b88208163e83d60e2') +md5sums=('c2837c3baf226798246db834d22d1de8' + '6ba9f4c88c18440a48bb84a03940d4a7') diff --git a/libre/mcomix/libre.patch b/libre/mcomix/libre.patch index e3f12f703..916f46e6c 100644 --- a/libre/mcomix/libre.patch +++ b/libre/mcomix/libre.patch @@ -1,8 +1,7 @@ -diff --git a/mcomix/about_dialog.py b/mcomix/about_dialog.py -index 9f956d5..10ff0be 100644 ---- a/mcomix/about_dialog.py -+++ b/mcomix/about_dialog.py -@@ -27,7 +27,7 @@ class _AboutDialog(gtk.AboutDialog): +diff -Nur a/mcomix/about_dialog.py b/mcomix/about_dialog.py +--- a/mcomix/about_dialog.py 2014-07-20 14:41:41.000000000 -0300 ++++ b/mcomix/about_dialog.py 2015-02-03 20:06:18.707598152 -0200 +@@ -27,7 +27,7 @@ comment = \ _('%s is an image viewer specifically designed to handle comic books.') % \ constants.APPNAME + u' ' + \ @@ -11,34 +10,18 @@ index 9f956d5..10ff0be 100644 self.set_comments(comment) license = \ -diff --git a/mcomix/archive_extractor.py b/mcomix/archive_extractor.py -index afed5c7..bc969bf 100644 ---- a/mcomix/archive_extractor.py -+++ b/mcomix/archive_extractor.py -@@ -12,8 +12,8 @@ class Extractor: - - """Extractor is a threaded class for extracting different archive formats. - -- The Extractor can be loaded with paths to archives (currently ZIP, tar, -- or RAR archives) and a path to a destination directory. Once an archive -+ The Extractor can be loaded with paths to archives (currently ZIP or tar -+ archives) and a path to a destination directory. Once an archive - has been set it is possible to filter out the files to be extracted and - set the order in which they should be extracted. The extraction can - then be started in a new thread in which files are extracted one by one, -diff --git a/mcomix/archive_tools.py b/mcomix/archive_tools.py -index 66c3f14..151a904 100644 ---- a/mcomix/archive_tools.py -+++ b/mcomix/archive_tools.py -@@ -8,7 +8,6 @@ import tarfile - from mcomix import constants +diff -Nur a/mcomix/archive_tools.py b/mcomix/archive_tools.py +--- a/mcomix/archive_tools.py 2014-07-28 11:32:51.000000000 -0300 ++++ b/mcomix/archive_tools.py 2015-02-03 20:10:46.137856205 -0200 +@@ -11,7 +11,6 @@ from mcomix import log from mcomix.archive import zip + from mcomix.archive import zip_external -from mcomix.archive import rar from mcomix.archive import tar from mcomix.archive import sevenzip from mcomix.archive import lha -@@ -16,9 +15,6 @@ from mcomix.archive import lha +@@ -20,9 +19,6 @@ def szip_available(): return sevenzip.SevenZipArchive.is_available() @@ -48,7 +31,7 @@ index 66c3f14..151a904 100644 def lha_available(): return lha.LhaArchive.is_available() or szip_available() -@@ -31,9 +27,6 @@ def get_supported_archive_regex(): +@@ -35,9 +31,6 @@ if szip_available(): formats.extend(constants.SZIP_FORMATS[1]) @@ -58,44 +41,43 @@ index 66c3f14..151a904 100644 if lha_available(): formats.extend(constants.LHA_FORMATS[1]) -@@ -71,10 +64,7 @@ def archive_mime_type(path): +@@ -81,10 +74,7 @@ else: return constants.TAR -- if magic == 'Rar!': +- if magic[0:4] == 'Rar!': - return constants.RAR - -- elif magic == '7z\xBC\xAF': -+ if magic == '7z\xBC\xAF': +- elif magic[0:4] == '7z\xBC\xAF': ++ if magic[0:4] == '7z\xBC\xAF': return constants.SEVENZIP - elif magic[2:] == '-l': -@@ -124,11 +114,6 @@ def get_archive_handler(path): - return zip.ZipArchive(path) - elif mime in (constants.TAR, constants.GZIP, constants.BZIP2): + # Headers for TAR-XZ and TAR-LZMA that aren't supported by tarfile +@@ -143,11 +133,6 @@ + return sevenzip.SevenZipArchive(path) + elif type in (constants.TAR, constants.GZIP, constants.BZIP2): return tar.TarArchive(path) -- elif mime == constants.RAR and rar.RarArchive.is_available(): +- elif type == constants.RAR and rar.RarArchive.is_available(): - return rar.RarArchive(path) -- elif mime == constants.RAR and sevenzip.SevenZipArchive.is_available(): +- elif type == constants.RAR and sevenzip.SevenZipArchive.is_available(): - log.info('Using Sevenzip for RAR archives.') - return sevenzip.SevenZipArchive(path) - elif mime == constants.SEVENZIP and sevenzip.SevenZipArchive.is_available(): + elif type == constants.SEVENZIP and sevenzip.SevenZipArchive.is_available(): return sevenzip.SevenZipArchive(path) - elif mime == constants.LHA and lha.LhaArchive.is_available(): -diff --git a/mcomix/constants.py b/mcomix/constants.py -index fad3b78..3c225c5 100644 ---- a/mcomix/constants.py -+++ b/mcomix/constants.py -@@ -28,7 +28,7 @@ FILEINFO_PICKLE_PATH = os.path.join(DATA_DIR, 'file.pickle') - PREFERENCE_PICKLE_PATH = os.path.join(CONFIG_DIR, 'preferences.pickle') + elif type == constants.LHA and lha.LhaArchive.is_available(): +diff -Nur a/mcomix/constants.py b/mcomix/constants.py +--- a/mcomix/constants.py 2015-01-31 06:06:26.000000000 -0200 ++++ b/mcomix/constants.py 2015-02-03 20:11:54.983850230 -0200 +@@ -41,7 +41,7 @@ + LAST_INDEX = -1 + UNION_INDEX = -2 - ZOOM_MODE_BEST, ZOOM_MODE_WIDTH, ZOOM_MODE_HEIGHT, ZOOM_MODE_MANUAL, ZOOM_MODE_SIZE = range(5) --ZIP, RAR, TAR, GZIP, BZIP2, PDF, SEVENZIP, LHA = range(8) -+ZIP, TAR, GZIP, BZIP2, PDF, SEVENZIP, LHA = range(7) +-ZIP, RAR, TAR, GZIP, BZIP2, PDF, SEVENZIP, LHA, ZIP_EXTERNAL = range(9) ++ZIP, TAR, GZIP, BZIP2, PDF, SEVENZIP, LHA, ZIP_EXTERNAL = range(8) NORMAL_CURSOR, GRAB_CURSOR, WAIT_CURSOR, NO_CURSOR = range(4) LIBRARY_DRAG_EXTERNAL_ID, LIBRARY_DRAG_BOOK_ID, LIBRARY_DRAG_COLLECTION_ID = range(3) AUTOROTATE_NEVER, AUTOROTATE_WIDTH_90, AUTOROTATE_WIDTH_270, \ -@@ -57,9 +57,6 @@ SUPPORTED_IMAGE_REGEX = re.compile(r'\.(jpg|jpeg|png|gif|tif|tiff|bmp|ppm|pgm|pb +@@ -70,9 +70,6 @@ ZIP_FORMATS = ( ('application/x-zip', 'application/zip', 'application/x-zip-compressed', 'application/x-cbz'), ('*.zip', '*.cbz')) @@ -105,11 +87,10 @@ index fad3b78..3c225c5 100644 TAR_FORMATS = ( ('application/x-tar', 'application/x-gzip', 'application/x-bzip2', 'application/x-cbt'), ('*.tar', '*.gz', '*.bz2', '*.bzip2', '*.cbt')) -diff --git a/mcomix/file_chooser_base_dialog.py b/mcomix/file_chooser_base_dialog.py -index 4d2a34e..c518842 100644 ---- a/mcomix/file_chooser_base_dialog.py -+++ b/mcomix/file_chooser_base_dialog.py -@@ -88,9 +88,6 @@ class _BaseFileChooserDialog(gtk.Dialog): +diff -Nur a/mcomix/file_chooser_base_dialog.py b/mcomix/file_chooser_base_dialog.py +--- a/mcomix/file_chooser_base_dialog.py 2014-01-18 06:01:42.000000000 -0200 ++++ b/mcomix/file_chooser_base_dialog.py 2015-02-03 20:13:45.971467307 -0200 +@@ -88,9 +88,6 @@ # extractor availability. mimetypes = constants.ZIP_FORMATS[0] + constants.TAR_FORMATS[0] patterns = constants.ZIP_FORMATS[1] + constants.TAR_FORMATS[1] @@ -119,7 +100,7 @@ index 4d2a34e..c518842 100644 if archive_tools.szip_available(): mimetypes += constants.SZIP_FORMATS[0] patterns += constants.SZIP_FORMATS[1] -@@ -107,10 +104,6 @@ class _BaseFileChooserDialog(gtk.Dialog): +@@ -107,10 +104,6 @@ self.add_filter(_('Tar archives'), *constants.TAR_FORMATS) @@ -130,11 +111,10 @@ index 4d2a34e..c518842 100644 if archive_tools.szip_available(): self.add_filter(_('7z archives'), *constants.SZIP_FORMATS) -diff --git a/mcomix/messages/mcomix.pot b/mcomix/messages/mcomix.pot -index 54ece85..482c051 100644 ---- a/mcomix/messages/mcomix.pot -+++ b/mcomix/messages/mcomix.pot -@@ -24,7 +24,7 @@ msgid "%s is an image viewer specifically designed to handle comic books." +diff -Nur a/mcomix/messages/mcomix.pot b/mcomix/messages/mcomix.pot +--- a/mcomix/messages/mcomix.pot 2015-01-31 05:55:44.000000000 -0200 ++++ b/mcomix/messages/mcomix.pot 2015-02-03 20:32:26.271598749 -0200 +@@ -24,7 +24,7 @@ msgstr "" #: mcomix/about_dialog.py:30 @@ -143,7 +123,7 @@ index 54ece85..482c051 100644 msgstr "" #: mcomix/about_dialog.py:34 -@@ -241,10 +241,6 @@ msgstr "" +@@ -242,10 +242,6 @@ msgid "Tar archives" msgstr "" @@ -154,7 +134,7 @@ index 54ece85..482c051 100644 #: mcomix/file_chooser_base_dialog.py:115 msgid "7z archives" msgstr "" -@@ -1345,10 +1341,6 @@ msgstr "" +@@ -1568,10 +1564,6 @@ msgid "Bzip2 compressed tar archive" msgstr "" @@ -165,11 +145,10 @@ index 54ece85..482c051 100644 #: mcomix/strings.py:14 msgid "7z archive" msgstr "" -diff --git a/mcomix/process.py b/mcomix/process.py -index 4ba60c6..c37699d 100644 ---- a/mcomix/process.py -+++ b/mcomix/process.py -@@ -10,10 +10,7 @@ from mcomix import i18n +diff -Nur a/mcomix/process.py b/mcomix/process.py +--- a/mcomix/process.py 2014-07-25 13:37:00.000000000 -0300 ++++ b/mcomix/process.py 2015-02-03 20:16:10.747046736 -0200 +@@ -20,10 +20,7 @@ class Process: """The subprocess and popen2 modules in Python are broken (see issue @@ -181,11 +160,10 @@ index 4ba60c6..c37699d 100644 """ # TODO: I can no longer reproduce the issue. Check if this version of # process.py still solves it. -diff --git a/mcomix/recent.py b/mcomix/recent.py -index 3d4613d..3f5c511 100644 ---- a/mcomix/recent.py -+++ b/mcomix/recent.py -@@ -30,8 +30,7 @@ class RecentFilesMenu(gtk.RecentChooserMenu): +diff -Nur a/mcomix/recent.py b/mcomix/recent.py +--- a/mcomix/recent.py 2014-06-09 03:08:26.000000000 -0300 ++++ b/mcomix/recent.py 2015-02-03 20:17:14.779514387 -0200 +@@ -31,8 +31,7 @@ rfilter.add_pixbuf_formats() mimetypes, patterns = itertools.izip(constants.ZIP_FORMATS, @@ -195,10 +173,9 @@ index 3d4613d..3f5c511 100644 for mimetype in itertools.chain.from_iterable(mimetypes): rfilter.add_mime_type(mimetype) -diff --git a/mcomix/strings.py b/mcomix/strings.py -index c5ca21f..cc69236 100644 ---- a/mcomix/strings.py -+++ b/mcomix/strings.py +diff -Nur a/mcomix/strings.py b/mcomix/strings.py +--- a/mcomix/strings.py 2014-01-18 06:01:42.000000000 -0200 ++++ b/mcomix/strings.py 2015-02-03 20:18:10.421674128 -0200 @@ -3,14 +3,13 @@ This file should only be imported after gettext has been correctly initialized and installed in the global namespace. """ @@ -215,20 +192,19 @@ index c5ca21f..cc69236 100644 SEVENZIP: _('7z archive'), LHA: _('LHA archive') } -diff --git a/mcomix.egg-info/SOURCES.txt b/mcomix.egg-info/SOURCES.txt -index 62de3ad..85a65df 100644 ---- a/mcomix.egg-info/SOURCES.txt -+++ b/mcomix.egg-info/SOURCES.txt -@@ -77,8 +77,6 @@ mcomix.egg-info/top_level.txt - mcomix/archive/__init__.py - mcomix/archive/archive_base.py +diff -Nur a/mcomix.egg-info/SOURCES.txt b/mcomix.egg-info/SOURCES.txt +--- a/mcomix.egg-info/SOURCES.txt 2015-01-31 06:08:19.000000000 -0200 ++++ b/mcomix.egg-info/SOURCES.txt 2015-02-03 20:19:25.537920559 -0200 +@@ -84,8 +84,6 @@ + mcomix/archive/archive_recursive.py mcomix/archive/lha.py + mcomix/archive/pdf.py -mcomix/archive/rar.py -mcomix/archive/rarfile.py mcomix/archive/sevenzip.py mcomix/archive/tar.py mcomix/archive/zip.py -@@ -183,18 +181,13 @@ mime/comicthumb.1.gz +@@ -184,18 +182,13 @@ mime/mcomix.desktop mime/mcomix.thumbnailer mime/mcomix.xml @@ -249,10 +225,9 @@ index 62de3ad..85a65df 100644 -mime/icons/48x48/application-x-cbz.png \ No newline at end of file +mime/icons/48x48/application-x-cbz.png -diff --git a/mime/comicbook.schemas b/mime/comicbook.schemas -index cdc4a4a..21b6214 100644 ---- a/mime/comicbook.schemas -+++ b/mime/comicbook.schemas +diff -Nur a/mime/comicbook.schemas b/mime/comicbook.schemas +--- a/mime/comicbook.schemas 2013-01-08 14:26:46.000000000 -0200 ++++ b/mime/comicbook.schemas 2015-02-03 20:20:10.809688373 -0200 @@ -1,28 +1,6 @@ <gconfschemafile> <schemalist> @@ -282,11 +257,10 @@ index cdc4a4a..21b6214 100644 <key>/schemas/desktop/gnome/thumbnailers/application@x-cbz/enable</key> <applyto>/desktop/gnome/thumbnailers/application@x-cbz/enable</applyto> <owner>comicthumb</owner> -diff --git a/mime/comicthumb b/mime/comicthumb -index 5728e2a..d77a4a1 100755 ---- a/mime/comicthumb -+++ b/mime/comicthumb -@@ -7,7 +7,7 @@ comicthumb is dependent on the Python Imaging Library (PIL). +diff -Nur a/mime/comicthumb b/mime/comicthumb +--- a/mime/comicthumb 2013-01-13 14:35:00.000000000 -0200 ++++ b/mime/comicthumb 2015-02-03 20:22:30.481808283 -0200 +@@ -7,7 +7,7 @@ comicthumb was originally written by Christoph Wolk, this version was re-written from scratch for Comix 4 by Pontus Ekberg. @@ -295,7 +269,7 @@ index 5728e2a..d77a4a1 100755 Usage: comicthumb INFILE OUTFILE [SIZE] """ -@@ -28,16 +28,13 @@ except ImportError: +@@ -28,16 +28,13 @@ print __doc__ sys.exit(1) @@ -314,7 +288,7 @@ index 5728e2a..d77a4a1 100755 """ # TODO: I can no longer reproduce the issue. Check if this version of # process.py still solves it. -@@ -94,19 +91,6 @@ class Extractor: +@@ -94,19 +91,6 @@ elif self._type in [TAR, GZIP, BZIP2]: self._tfile = tarfile.open(src, 'r') self._files = self._tfile.getnames() @@ -334,7 +308,7 @@ index 5728e2a..d77a4a1 100755 def get_files(self): """Return a list of the files in the archive.""" -@@ -121,11 +105,6 @@ class Extractor: +@@ -121,11 +105,6 @@ return cStringIO.StringIO(self._zfile.read(chosen)) elif self._type in [TAR, GZIP, BZIP2]: return cStringIO.StringIO(self._tfile.extractfile(chosen).read()) @@ -346,7 +320,7 @@ index 5728e2a..d77a4a1 100755 def archive_mime_type(path): -@@ -145,8 +124,6 @@ def archive_mime_type(path): +@@ -145,8 +124,6 @@ if magic.startswith('\037\213'): return GZIP return TAR @@ -355,30 +329,27 @@ index 5728e2a..d77a4a1 100755 except Exception: print '! Error while reading', path return None -diff --git a/mime/mcomix.desktop b/mime/mcomix.desktop -index ee6d8b9..19ec7cd 100644 ---- a/mime/mcomix.desktop -+++ b/mime/mcomix.desktop -@@ -19,4 +19,4 @@ Terminal=false +diff -Nur a/mime/mcomix.desktop b/mime/mcomix.desktop +--- a/mime/mcomix.desktop 2013-01-08 14:26:46.000000000 -0200 ++++ b/mime/mcomix.desktop 2015-02-03 20:24:12.805803236 -0200 +@@ -19,4 +19,4 @@ Type=Application StartupNotify=true Categories=Graphics;Viewer; -MimeType=application/x-cbz;application/x-cbr;application/x-cbt;image/jpeg;image/png;image/gif;image/tiff;image/bmp;image/x-icon;image/x-xpixmap;image/x-xbitmap;application/x-zip;application/zip;application/x-rar;application/x-tar;application/x-gzip;application/x-bzip2;image/svg+xml;image/svg;image/svg-xml;image/vnd.adobe.svg+xml;text/xml-svg;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-pcx;image/x-cmu-raster;image/x-sun-raster;image/x-tga;application/x-7z-compressed;application/x-cb7;application/x-lzh;application/x-lha;application/x-lzh-compressed; +MimeType=application/x-cbz;application/x-cbt;image/jpeg;image/png;image/gif;image/tiff;image/bmp;image/x-icon;image/x-xpixmap;image/x-xbitmap;application/x-zip;application/zip;application/x-tar;application/x-gzip;application/x-bzip2;image/svg+xml;image/svg;image/svg-xml;image/vnd.adobe.svg+xml;text/xml-svg;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-pcx;image/x-cmu-raster;image/x-sun-raster;image/x-tga;application/x-7z-compressed;application/x-cb7;application/x-lzh;application/x-lha;application/x-lzh-compressed; -diff --git a/mime/mcomix.thumbnailer b/mime/mcomix.thumbnailer -index 4dcfc67..667dc8b 100644 ---- a/mime/mcomix.thumbnailer -+++ b/mime/mcomix.thumbnailer +diff -Nur a/mime/mcomix.thumbnailer b/mime/mcomix.thumbnailer +--- a/mime/mcomix.thumbnailer 2014-01-18 06:01:42.000000000 -0200 ++++ b/mime/mcomix.thumbnailer 2015-02-03 20:27:12.596127651 -0200 @@ -1,4 +1,4 @@ [Thumbnailer Entry] TryExec=comicthumb Exec=comicthumb %u %o %s -MimeType=application/x-cbr;application/x-cbz;application/x-cbt; +MimeType=application/x-cbz;application/x-cbt; -diff --git a/mime/mcomix.xml b/mime/mcomix.xml -index 765c254..b13e2da 100644 ---- a/mime/mcomix.xml -+++ b/mime/mcomix.xml +diff -Nur a/mime/mcomix.xml b/mime/mcomix.xml +--- a/mime/mcomix.xml 2013-01-08 14:26:46.000000000 -0200 ++++ b/mime/mcomix.xml 2015-02-03 20:27:36.940405337 -0200 @@ -5,11 +5,6 @@ <comment xml:lang="en">Comic Book Archive (Zip compressed)</comment> <glob pattern="*.cbz"/> @@ -391,11 +362,10 @@ index 765c254..b13e2da 100644 <mime-type type="application/x-cbt"> <sub-class-of type="application/x-compressed-tar"/> <sub-class-of type="application/x-bzip-compressed-tar"/> -diff --git a/setup.py b/setup.py -index 9eb7782..9979111 100755 ---- a/setup.py -+++ b/setup.py -@@ -78,23 +78,18 @@ setuptools.setup( +diff -Nur a/setup.py b/setup.py +--- a/setup.py 2014-06-09 03:08:26.000000000 -0300 ++++ b/setup.py 2015-02-03 20:28:30.005795579 -0200 +@@ -79,23 +79,18 @@ ('share/icons/hicolor/48x48/apps', ['mcomix/images/48x48/mcomix.png']), ('share/icons/hicolor/16x16/mimetypes', ['mime/icons/16x16/application-x-cbz.png', diff --git a/libre/mcomix/zoom.patch b/libre/mcomix/zoom.patch deleted file mode 100644 index 26dc3ba6f..000000000 --- a/libre/mcomix/zoom.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/mcomix-1.00/mcomix/event.py b/mcomix-1.00-mod/mcomix/event.py -index bc8cf79..bf80ec2 100644 ---- a/mcomix/event.py -+++ b/mcomix/event.py -@@ -117,8 +117,11 @@ class EventHandler: - - # Zooming commands for manual zoom mode - manager.register('zoom in', -- ['equal'], -+ ['plus', 'KP_Add', 'equal'], - self._window.actiongroup.get_action('zoom_in').activate) -+ manager.register('zoom out', -+ ['minus', 'KP_Subtract'], -+ self._window.actiongroup.get_action('zoom_out').activate) - # Zoom out is already defined as GTK menu hotkey - manager.register('zoom original', - ['KP_0'], diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index b69778d07..8e4bc6740 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -9,7 +9,7 @@ pkgname=pacman pkgver=4.2.0 -pkgrel=6.parabola1 +pkgrel=6.parabola5 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" @@ -29,10 +29,8 @@ source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} "$pkgname.conf."{i686,x86_64,mips64el} "makepkg.conf" "pacman-4.2.0-roundup.patch" - "gpg.conf" - "sks-keyservers.netCA.pem" - "makepkg-pkgrel-4.patch" - "refresh-$pkgname-keys") + "refresh-$pkgname-keys" + "makepkg-pkgrel-4.patch") md5sums=('184ce14f1f326fede72012cca51bba51' 'SKIP' '9c1454e48b2216b23f931e04d6dab1ee' @@ -40,10 +38,8 @@ md5sums=('184ce14f1f326fede72012cca51bba51' 'a12b1a4533c170aecc8b9b8561048248' 'ce525a9af50f1d9b824806d2e5a4f0c8' 'abe3baaf610d9cc42b4e3748c936bbce' - '8c339b2bf027979d1edcfc6ac0e7e81d' - '3cfc5d2867a6672f4f629220632948f4' - '0ee98dc38ff80ba127772f5104e18e46' - '093f0779ac55ae781ba028ad74b95f84') + '093f0779ac55ae781ba028ad74b95f84' + '0ee98dc38ff80ba127772f5104e18e46') validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD') # Allan McRae <allan@archlinux.org> prepare() { @@ -122,12 +118,5 @@ package() { install -Dm644 contrib/PKGBUILD.vim "$pkgdir/usr/share/vim/vimfiles/syntax/PKGBUILD.vim" - install -Dm755 "${srcdir}/refresh-pacman-keys" \ - "${pkgdir}/etc/cron.weekly/refresh-pacman-keys" - - install -Dm644 "${srcdir}/sks-keyservers.netCA.pem" \ - "${pkgdir}/etc/pacman.d/sks-keyservers.netCA.pem" - - install -Dm644 "${srcdir}/gpg.conf" \ - "${pkgdir}/etc/pacman.d/gnupg/gpg.conf" + install -Dm755 "$srcdir/refresh-pacman-keys" "$pkgdir/etc/cron.weekly/refresh-pacman-keys" } diff --git a/libre/pacman/gpg.conf b/libre/pacman/gpg.conf deleted file mode 100644 index 7fc6fc661..000000000 --- a/libre/pacman/gpg.conf +++ /dev/null @@ -1,50 +0,0 @@ -# pacman-key default options -no-greeting -no-permission-warning -lock-never -keyserver-options timeout=20 - -# From duraconf -# personal digest preferences -personal-digest-preferences SHA512 - -# message digest algorithm used when signing a key -cert-digest-algo SHA512 - -# Set the list of default preferences to string. -# used for new keys and default for "setpref" -default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed - -# From -# https://crabgrass.riseup.net/riseuplabs+paow/openpgp-best-practices -# Only use secure keyservers -keyserver hkps://hkps.pool.sks-keyservers.net -keyserver-options ca-cert-file=~/.gnupg/sks-keyservers.netCA.pem -keyserver-options no-honor-keyserver-url - -# when outputting certificates, view user IDs distinctly from keys: -fixed-list-mode - -# short-keyids are trivially spoofed; it's easy to create a long-keyid -# collision; if you care about strong key identifiers, you always want -# to see the fingerprint: -keyid-format 0xlong -fingerprint - -# when multiple digests are supported by all recipients, choose the -# strongest one: -personal-digest-preferences SHA512 SHA384 SHA256 SHA224 - -# If you use a graphical environment (and even if you don't) -# you should be using an agent: (similar arguments as -# https://www.debian-administration.org/users/dkg/weblog/64) -use-agent - -# You should always know at a glance which User IDs gpg thinks are -# legitimately bound to the keys in your keyring: -verify-options show-uid-validity -list-options show-uid-validity - -# include an unambiguous indicator of which key made a signature: (see -# http://thread.gmane.org/gmane.mail.notmuch.general/3721/focus=7234) -sig-notation issuer-fpr@notations.openpgp.fifthhorseman.net=%g diff --git a/libre/pacman/sks-keyservers.netCA.pem b/libre/pacman/sks-keyservers.netCA.pem deleted file mode 100644 index 24a2ad2e8..000000000 --- a/libre/pacman/sks-keyservers.netCA.pem +++ /dev/null @@ -1,32 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFizCCA3OgAwIBAgIJAK9zyLTPn4CPMA0GCSqGSIb3DQEBBQUAMFwxCzAJBgNV -BAYTAk5PMQ0wCwYDVQQIDARPc2xvMR4wHAYDVQQKDBVza3Mta2V5c2VydmVycy5u -ZXQgQ0ExHjAcBgNVBAMMFXNrcy1rZXlzZXJ2ZXJzLm5ldCBDQTAeFw0xMjEwMDkw -MDMzMzdaFw0yMjEwMDcwMDMzMzdaMFwxCzAJBgNVBAYTAk5PMQ0wCwYDVQQIDARP -c2xvMR4wHAYDVQQKDBVza3Mta2V5c2VydmVycy5uZXQgQ0ExHjAcBgNVBAMMFXNr -cy1rZXlzZXJ2ZXJzLm5ldCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC -ggIBANdsWy4PXWNUCkS3L//nrd0GqN3dVwoBGZ6w94Tw2jPDPifegwxQozFXkG6I -6A4TK1CJLXPvfz0UP0aBYyPmTNadDinaB9T4jIwd4rnxl+59GiEmqkN3IfPsv5Jj -MkKUmJnvOT0DEVlEaO1UZIwx5WpfprB3mR81/qm4XkAgmYrmgnLXd/pJDAMk7y1F -45b5zWofiD5l677lplcIPRbFhpJ6kDTODXh/XEdtF71EAeaOdEGOvyGDmCO0GWqS -FDkMMPTlieLA/0rgFTcz4xwUYj/cD5e0ZBuSkYsYFAU3hd1cGfBue0cPZaQH2HYx -Qk4zXD8S3F4690fRhr+tki5gyG6JDR67aKp3BIGLqm7f45WkX1hYp+YXywmEziM4 -aSbGYhx8hoFGfq9UcfPEvp2aoc8u5sdqjDslhyUzM1v3m3ZGbhwEOnVjljY6JJLx -MxagxnZZSAY424ZZ3t71E/Mn27dm2w+xFRuoy8JEjv1d+BT3eChM5KaNwrj0IO/y -u8kFIgWYA1vZ/15qMT+tyJTfyrNVV/7Df7TNeWyNqjJ5rBmt0M6NpHG7CrUSkBy9 -p8JhimgjP5r0FlEkgg+lyD+V79H98gQfVgP3pbJICz0SpBQf2F/2tyS4rLm+49rP -fcOajiXEuyhpcmzgusAj/1FjrtlynH1r9mnNaX4e+rLWzvU5AgMBAAGjUDBOMB0G -A1UdDgQWBBTkwyoJFGfYTVISTpM8E+igjdq28zAfBgNVHSMEGDAWgBTkwyoJFGfY -TVISTpM8E+igjdq28zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQAR -OXnYwu3g1ZjHyley3fZI5aLPsaE17cOImVTehC8DcIphm2HOMR/hYTTL+V0G4P+u -gH+6xeRLKSHMHZTtSBIa6GDL03434y9CBuwGvAFCMU2GV8w92/Z7apkAhdLToZA/ -X/iWP2jeaVJhxgEcH8uPrnSlqoPBcKC9PrgUzQYfSZJkLmB+3jEa3HKruy1abJP5 -gAdQvwvcPpvYRnIzUc9fZODsVmlHVFBCl2dlu/iHh2h4GmL4Da2rRkUMlbVTdioB -UYIvMycdOkpH5wJftzw7cpjsudGas0PARDXCFfGyKhwBRFY7Xp7lbjtU5Rz0Gc04 -lPrhDf0pFE98Aw4jJRpFeWMjpXUEaG1cq7D641RpgcMfPFvOHY47rvDTS7XJOaUT -BwRjmDt896s6vMDcaG/uXJbQjuzmmx3W2Idyh3s5SI0GTHb0IwMKYb4eBUIpQOnB -cE77VnCYqKvN1NVYAqhWjXbY7XasZvszCRcOG+W3FqNaHOK/n/0ueb0uijdLan+U -f4p1bjbAox8eAOQS/8a3bzkJzdyBNUKGx1BIK2IBL9bn/HravSDOiNRSnZ/R3l9G -ZauX0tu7IIDlRCILXSyeazu0aj/vdT3YFQXPcvt5Fkf5wiNTo53f72/jYEJd6qph -WrpoKqrwGwTpRUCMhYIUt65hsTxCiJJ5nKe39h46sg== ------END CERTIFICATE----- diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD index 98a9a79b6..416978f0a 100644 --- a/libre/parabola-keyring/PKGBUILD +++ b/libre/parabola-keyring/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=parabola-keyring -pkgver=20140920 +pkgver=20150202 pkgrel=1 pkgdesc='Parabola GNU/Linux-libre PGP keyring' arch=('any') @@ -11,8 +11,9 @@ install=$pkgname.install source=("http://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz" "http://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz.sig") -md5sums=('a7b68a5ac179fbdb3276375514c69b11' +md5sums=('36d8d3550bcc52d2a4d98e47474a4e1f' 'SKIP') +validpgpkeys=('C92BAA713B8D53D3CAE63FC9E6974752F9704456') # André Silva <emulatorman@parabola.nu> package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/libre/qupzilla/PKGBUILD b/libre/qupzilla/PKGBUILD index fca6413f7..9565202e7 100644 --- a/libre/qupzilla/PKGBUILD +++ b/libre/qupzilla/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 123979 2014-12-16 14:47:34Z speps $ +# $Id: PKGBUILD 126621 2015-01-27 01:41:35Z speps $ # Maintainer (Arch): speps <speps at aur dot archlinux dot org> # Maintainer: André Silva <emulatorman@parabola.nu> pkgbase=qupzilla pkgname=(qupzilla qupzilla-qt4) -pkgver=1.8.5 +pkgver=1.8.6 pkgrel=1.parabola1 arch=(i686 x86_64 mips64el) url="http://www.qupzilla.com/" @@ -17,7 +17,7 @@ source=("$pkgbase-$pkgver.tar.gz::https://github.com/QupZilla/qupzilla/archive/v 'speeddial.cpp.sed' 'start.html.sed') noextract=("$pkgbase-$pkgver.tar.gz") -md5sums=('0d163296f2514512be944ba3b29bf920' +md5sums=('24c4033cbf20223eb73a33af9c037862' '1d926e97a5b287d40fb695f6516f2a06' '0f166fa102af975b3b8ac030d477e9b8' '77120a0c39ba8254e5b2c273910f029a') diff --git a/libre/spectrwm/PKGBUILD b/libre/spectrwm/PKGBUILD index 54df148ae..a5e29caed 100644 --- a/libre/spectrwm/PKGBUILD +++ b/libre/spectrwm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 121464 2014-10-27 10:28:15Z kkeen $ +# $Id: PKGBUILD 126653 2015-01-27 19:06:39Z kkeen $ # Maintainer (Arch): Kyle Keen <keenerd@gmail.com> # Contributor (Arch): Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=spectrwm -pkgver=2.6.1 +pkgver=2.6.2 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') @@ -27,7 +27,7 @@ source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz LICENSE \ baraction.sh \ spectrwm-no-preload) -md5sums=('df479348cb17cc69eff2582e9b81d9ff' +md5sums=('eba7cba0c85706435657f744bf9086bc' 'd9aec3342920e31cbe60f1032571043a' 'a67cfe51079481e5b0eab1ad371379e3' '950d663692e1da56e0ac864c6c3ed80e' diff --git a/libre/tp_smapi/PKGBUILD b/libre/tp_smapi/PKGBUILD index b3e7c0f38..86afab88d 100644 --- a/libre/tp_smapi/PKGBUILD +++ b/libre/tp_smapi/PKGBUILD @@ -14,7 +14,7 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=3.18 - _archrel=59 + _archrel=61 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 diff --git a/libre/vhba-module/PKGBUILD b/libre/vhba-module/PKGBUILD index 5c2aeac2b..cbbb74361 100644 --- a/libre/vhba-module/PKGBUILD +++ b/libre/vhba-module/PKGBUILD @@ -9,7 +9,7 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=3.18 - _archrel=2 + _archrel=4 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index 1ff52f2c4..f34dfa8b0 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=20150122 -_gitver=fbb3a45d5799704a3011aa7d73a791a9f7d7f3f3 +pkgver=20150202.1 +_gitver=3b13525d6056c11fa6890b3ba35c13b0e98d0aa1 pkgrel=1 arch=('any') diff --git a/nonprism/choqok/PKGBUILD b/nonprism/choqok/PKGBUILD index fe43c768b..d4403c3c4 100644 --- a/nonprism/choqok/PKGBUILD +++ b/nonprism/choqok/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 119696 2014-09-28 15:42:16Z fyan $ +# $Id: PKGBUILD 126479 2015-01-24 09:42:46Z andrea $ # Maintainer (Arch): Peter Richard Lewis <plewis@aur.archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Emanuele Rossi <newdna1510@yahoo.it> @@ -6,8 +6,8 @@ # Maintainer: Márcio Silva <coadde@parabola.nu> pkgname=choqok -pkgver=1.4 -pkgrel=2.nonprism1 +pkgver=1.5 +pkgrel=1.nonprism1 pkgdesc="A status.net client for KDE, without Twitter support" url='http://choqok.gnufolks.org/' license=('GPL') @@ -15,23 +15,24 @@ arch=('i686' 'x86_64' 'mips64el') conflicts=(${pkgname}-nonprism) replaces=(${pkgname}-nonprism) depends=('kdebase-runtime' 'qjson' 'qoauth' 'qca-ossl') -makedepends=('cmake' 'automoc4') -optdepends=('kdebase-konqueror: proxy support') +makedepends=('cmake' 'automoc4' 'telepathy-qt') +optdepends=('kdebase-konqueror: proxy support' + 'telepathy-qt: IMstatus plugin') install="${pkgname}.install" source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz") -md5sums=('2efe34ed903b448a21d9233d8033dbdb') +md5sums=('f2efdd76199f8276e8ac2f76dc600596') prepare() { mkdir build cd "${srcdir}/${pkgname}-${pkgver}" - # remove twitter service and keep only twitterapi (choqok software) for status.net and open collaboration services + # remove twitter service and keep only twitterapi (choqok software) for status.net and libre collaboration services sed -i '\|add_subdirectory(twitter)|d' microblogs/CMakeLists.txt sed -i 's|twitter[.]com|status.net|' microblogs/laconica/laconicamicroblog.cpp sed -i 's|twitter[.]com|status.net|' microblogs/laconica/laconicasearch.cpp - # remove uploaders plugin (with only nonprivacy services) + # remove uploaders plugin (with nonprivacy services only) sed -i '\|add_subdirectory(uploaders)|d' plugins/CMakeLists.txt sed -i 's|Comment||' plugins/searchaction/choqok_searchaction.desktop diff --git a/nonprism/darktable/PKGBUILD b/nonprism/darktable/PKGBUILD index 80df511cb..c06c25538 100644 --- a/nonprism/darktable/PKGBUILD +++ b/nonprism/darktable/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 125731 2015-01-11 11:54:58Z spupykin $ +# $Id: PKGBUILD 126981 2015-02-02 11:26:38Z spupykin $ # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer (Arch): Christian Himpel <chressie at gmail dot com> # Contributor (Arch): Johannes Hanika <hanatos at gmail dot com> pkgname=darktable -pkgver=1.6.1 -pkgrel=4.nonprism1 +pkgver=1.6.2 +pkgrel=1.nonprism1 pkgdesc="Utility to organize and develop raw images, without flickcurl support" arch=('i686' 'x86_64' 'mips64el') url=http://darktable.sf.net/ @@ -19,7 +19,7 @@ makedepends=('intltool>=0.40' 'cmake' 'librsvg') optdepends=('librsvg') install=darktable.install source=("$pkgname-$pkgver.tar.gz::https://github.com/darktable-org/darktable/archive/release-$pkgver.tar.gz") -md5sums=('86c2d90302ab1e57136d2728437db718') +md5sums=('71f786a0bfce1b72e0a28ea560684205') prepare() { cd "$srcdir/$pkgname-release-$pkgver/cmake" diff --git a/nonprism/duplicity/PKGBUILD b/nonprism/duplicity/PKGBUILD index 31220cb30..5da804b78 100644 --- a/nonprism/duplicity/PKGBUILD +++ b/nonprism/duplicity/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 125883 2015-01-13 21:43:27Z lfleischer $ +# $Id: PKGBUILD 126742 2015-01-29 10:04:01Z lfleischer $ # Maintainer (Arch): Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor (Arch): Kaiting Chen <kaitocracy@gmail.com> # Contributor (Arch): Aaron Schaefer <aaron@elasticdog.com> @@ -6,7 +6,7 @@ pkgname=duplicity pkgver=0.7.01 -pkgrel=1.nonprism1 +pkgrel=2.nonprism1 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm, without python2-boto, python2-dropbox and python2-gdata recommendation' arch=('i686' 'x86_64' 'mips64el') url='http://www.nongnu.org/duplicity/' diff --git a/nonprism/icedove/PKGBUILD b/nonprism/icedove/PKGBUILD index 4a921ecd4..c69a94769 100644 --- a/nonprism/icedove/PKGBUILD +++ b/nonprism/icedove/PKGBUILD @@ -4,7 +4,7 @@ # We're getting this from Debian Sid _debname=icedove _debver=31.4.0 -_debrel=deb1 +_debrel=deb2 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -31,7 +31,7 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz" ${pkgname}.desktop) options=(!emptydirs) sha256sums=('7b47a053fe1f10097350d4a599a80b91eed1dc21dfcda1618b229f97493cb93c' - '6217e7ef89d6c9c9caa616280051345e6ef09645d1ffe4006e13c940bb8b5a1b' + 'ff0db7a63f3e0648131ca59e4e3c6ff911e795030a49bcf1edb8585a01b33437' '09a0041f7f12498d933284b3d3a44e19002515accaff767d145a8f404b79e86a' 'b44f0eb82dce8a02aa71f0eab4b0d820e5383f613becc62cc995aac8638b54ec' '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a' diff --git a/nonprism/kdenetwork-kopete/PKGBUILD b/nonprism/kdenetwork-kopete/PKGBUILD index b89ef6d39..ea1193b42 100644 --- a/nonprism/kdenetwork-kopete/PKGBUILD +++ b/nonprism/kdenetwork-kopete/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=kdenetwork-kopete -pkgver=14.12.1 +pkgver=14.12.2 pkgrel=1.parabola1.nonprism1 pkgdesc='Instant Messenger, without nonfree Skype support and support for unsafe and dangerous for privacy protocols' url='http://kde.org/applications/internet/kopete/' @@ -18,7 +18,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepim-libkdepim') install=${pkgname}.install source=("http://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz" 'libre-nonprism.patch') -sha1sums=('bf5c8b45c6706ed26e5257817e838fd538033aa2' +sha1sums=('c8cfff62cfda2575f0dfeb1bc7248ebcece7092a' 'f0d7b727da1b5160f05952eec4df1bfbefab99cf') prepare() { diff --git a/nonprism/kdepim-runtime/PKGBUILD b/nonprism/kdepim-runtime/PKGBUILD index aff2c8f94..ac35b064f 100644 --- a/nonprism/kdepim-runtime/PKGBUILD +++ b/nonprism/kdepim-runtime/PKGBUILD @@ -4,8 +4,8 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=kdepim-runtime -pkgver=4.14.4 -_kdeappver=14.12.1 +pkgver=4.14.5 +_kdeappver=14.12.2 pkgrel=1.nonprism1 pkgdesc='Extends the functionality of kdepim, without libkgapi and libkfbapi support' arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install="${pkgname}.install" replaces=('kdepim-runtime-coherence' 'kdepim-runtime-nonprism') conflicts=('kdepim-runtime-coherence' 'kdepim-runtime-nonprism') source=("http://download.kde.org/stable/applications/${_kdeappver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('36bf4f5c652538410bb33d2f938942e5f224bf5f') +sha1sums=('1a99ed02330e45950249debfed599416cbd49c0a') prepare() { mkdir build diff --git a/nonprism/kdepim/PKGBUILD b/nonprism/kdepim/PKGBUILD index e2cdaeb2c..9c6f8e085 100644 --- a/nonprism/kdepim/PKGBUILD +++ b/nonprism/kdepim/PKGBUILD @@ -12,8 +12,8 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-knotes' 'kdepim-korganizer' 'kdepim-libkdepim') -pkgver=4.14.4 -_kdeappver=14.12.1 +pkgver=4.14.5 +_kdeappver=14.12.2 pkgrel=1.nonprism1 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' @@ -22,7 +22,7 @@ groups=('kde' 'kdepim') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' 'baloo4' 'grantlee-qt4') source=("http://download.kde.org/stable/applications/${_kdeappver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('9301b2acf2fc73f23008905450ad0eb231fed1bf') +sha1sums=('36a48f9483982bde79ade85f150983a44002866d') build() { mkdir build @@ -79,7 +79,8 @@ package_kdepim-kjots() { package_kdepim-kmail() { pkgdesc='Mail Client, without Google Drive support' - depends=('kdepim-libkdepim' 'kde-agent') + depends=('kdepim-libkdepim') + optdepends=('kde-agent: For starting and shutting down gpg-agent with KDE session manager') url="http://kde.org/applications/internet/kmail/" install='kdepim-kmail.install' conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' diff --git a/nonprism/kipi-plugins/PKGBUILD b/nonprism/kipi-plugins/PKGBUILD index 87aed3f52..f3766eef9 100644 --- a/nonprism/kipi-plugins/PKGBUILD +++ b/nonprism/kipi-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 229642 2015-01-22 14:42:12Z ronald $ +# $Id: PKGBUILD 230374 2015-02-02 10:16:00Z ronald $ # Maintainer (Arch): Ronald van Haren <ronald@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org> @@ -7,8 +7,8 @@ pkgbase=digikam pkgname=kipi-plugins -pkgver=4.5.0 -pkgrel=5.parabola1.nonprism1 +pkgver=4.6.0 +pkgrel=1.parabola1.nonprism1 pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam, without nonfree jAlbum and SimpleViewer support and support for unsafe and dangerous for privacy protocols" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -28,14 +28,11 @@ optdepends=('libkgeomap: Geolocalize tool' 'qt-gstreamer: Video SlideShow plugin') options=('staticlibs') install=kipi-plugins.install -source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2" - "libkexiv2.patch") -sha1sums=('ba735f4b7bb0437c1676141ab78ea958e46f135e' - '1bcef459bd400a04526aac9adf39d4d0a1c3549c') +source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('ee4241f02e997c7b122166bc845feb885b633f0e') prepare() { cd ${srcdir}/${pkgbase}-${pkgver} - patch -Np0 -i "${srcdir}/libkexiv2.patch" sed -i '\|flashexport|d \|jalbumexport|d \|imageshackexport|d @@ -71,7 +68,10 @@ build() { -DCMAKE_SKIP_RPATH=ON \ -DBUILD_tests=OFF \ -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF \ - -DDIGIKAMSC_USE_PRIVATE_SHAREDLIBS=ON + -DDIGIKAMSC_USE_PRIVATE_SHAREDLIBS=ON \ + -DDIGIKAMSC_COMPILE_LIBKGEOMAP=ON \ + -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=OFF \ + -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=ON make } diff --git a/nonprism/kipi-plugins/libkexiv2.patch b/nonprism/kipi-plugins/libkexiv2.patch deleted file mode 100644 index f75b08bf7..000000000 --- a/nonprism/kipi-plugins/libkexiv2.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- extra/CMakeLists.txt.bak 2014-11-14 20:46:49.265601687 +0100 -+++ extra/CMakeLists.txt 2014-11-14 20:46:55.555823691 +0100 -@@ -11,7 +11,6 @@ - - # from kdegraphics/libs - add_subdirectory(libkipi) -- add_subdirectory(libkexiv2) - add_subdirectory(libkdcraw) - add_subdirectory(libkface) - MACRO_OPTIONAL_ADD_SUBDIRECTORY(libksane) diff --git a/pcr/gnuhealth/PKGBUILD b/pcr/gnuhealth/PKGBUILD index a85e7dff5..db22de64c 100644 --- a/pcr/gnuhealth/PKGBUILD +++ b/pcr/gnuhealth/PKGBUILD @@ -35,6 +35,9 @@ sha512sums=( f76060d334a85a7d726dbe6f2f9bc7206cf4ad7bf5abcdf143bc432411e89701320047c672bebefaeea9f92d5c31a298553f90ad35c9b2e17ae4058482cd067c SKIP ) +validpgpkeys=( + 14C7FD1362749706D602FBE2EADA01E3E44B8011 # Luis Falcon (meanmicio at GNU) <falcon@gnu.org> +) prepare() { # fix python2 problem |