diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-10-08 14:26:28 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-10-08 14:26:28 -0300 |
commit | 7e5c6fc7663105368591ea9dcaa4b871dbc9956d (patch) | |
tree | 35815894b5ec33fc09c2cdc90632e33c379deffe | |
parent | 5f492d499f0ae08a1d45d1ddacab283370ff7e2f (diff) | |
parent | ee8370a2a30d6aa032ef0be3f35c32d7fd1c33e8 (diff) |
Merge branch 'master' of vparabola:abslibre
47 files changed, 462 insertions, 340 deletions
diff --git a/kernels/linux-libre-pae/3.11.1-fix-skge.patch b/kernels/linux-libre-pae/3.11.1-fix-skge.patch deleted file mode 100644 index 26d90e080..000000000 --- a/kernels/linux-libre-pae/3.11.1-fix-skge.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/drivers/net/ethernet/marvell/skge.c 2013-09-02 16:46:10.000000000 -0400 -+++ b/drivers/net/ethernet/marvell/skge.c 2013-09-22 11:14:10.232067541 -0400 -@@ -3086,23 +3086,27 @@ - PCI_DMA_FROMDEVICE); - skge_rx_reuse(e, skge->rx_buf_size); - } else { -+ struct skge_element ee; - struct sk_buff *nskb; - - nskb = netdev_alloc_skb_ip_align(dev, skge->rx_buf_size); - if (!nskb) - goto resubmit; - -+ ee = *e; -+ -+ skb = ee.skb; -+ prefetch(skb->data); -+ - if (skge_rx_setup(skge, e, nskb, skge->rx_buf_size) < 0) { - dev_kfree_skb(nskb); - goto resubmit; - } - - pci_unmap_single(skge->hw->pdev, -- dma_unmap_addr(e, mapaddr), -- dma_unmap_len(e, maplen), -+ dma_unmap_addr(&ee, mapaddr), -+ dma_unmap_len(&ee, maplen), - PCI_DMA_FROMDEVICE); -- skb = e->skb; -- prefetch(skb->data); - } - - skb_put(skb, len); diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 73b12e493..d65ba80f7 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 195142 2013-09-25 15:58:07Z tpowa $ +# $Id: PKGBUILD 195930 2013-10-05 19:44:24Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,8 +6,8 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.11 -pkgver=${_basekernel}.1 -pkgrel=3 +pkgver=${_basekernel}.4 +pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -22,16 +22,14 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' 'criu-no-expert.patch' - '3.11.1-fix-skge.patch' '3.11-haswell-intel_pstate.patch') md5sums=('7ec84223c7adcf01a5287eb7af96b7e7' - '7b051faf375c76d4763a24048c52600b' + 'd09e8017d22370b873628942f3ece3b0' 'bef7b3ced683c4dc9361f8739ec9f566' 'f302c931bd85309da9d9792b4cc96467' '36e90334b12b2e9d53fd92129ee98f5b' '98beb36f9b8cf16e58de2483ea9985e3' 'd50c1ac47394e9aec637002ef3392bd1' - '4fcee2b4485492dcfdead632275198eb' '1040ae6c10d4a68f89899f94a2318a17') _kernelname=${pkgbase#linux-libre} @@ -52,9 +50,6 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" - # #36865 fix broken skge network module - patch -Np1 -i "${srcdir}/3.11.1-fix-skge.patch" - # add intel haswell support to intel_pstate # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=6cdcdb793791f776ea9408581b1242b636d43b37 # will be in 3.12 diff --git a/kernels/linux-libre-xen/3.11.1-fix-skge.patch b/kernels/linux-libre-xen/3.11.1-fix-skge.patch deleted file mode 100644 index 26d90e080..000000000 --- a/kernels/linux-libre-xen/3.11.1-fix-skge.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/drivers/net/ethernet/marvell/skge.c 2013-09-02 16:46:10.000000000 -0400 -+++ b/drivers/net/ethernet/marvell/skge.c 2013-09-22 11:14:10.232067541 -0400 -@@ -3086,23 +3086,27 @@ - PCI_DMA_FROMDEVICE); - skge_rx_reuse(e, skge->rx_buf_size); - } else { -+ struct skge_element ee; - struct sk_buff *nskb; - - nskb = netdev_alloc_skb_ip_align(dev, skge->rx_buf_size); - if (!nskb) - goto resubmit; - -+ ee = *e; -+ -+ skb = ee.skb; -+ prefetch(skb->data); -+ - if (skge_rx_setup(skge, e, nskb, skge->rx_buf_size) < 0) { - dev_kfree_skb(nskb); - goto resubmit; - } - - pci_unmap_single(skge->hw->pdev, -- dma_unmap_addr(e, mapaddr), -- dma_unmap_len(e, maplen), -+ dma_unmap_addr(&ee, mapaddr), -+ dma_unmap_len(&ee, maplen), - PCI_DMA_FROMDEVICE); -- skb = e->skb; -- prefetch(skb->data); - } - - skb_put(skb, len); diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 437c48670..1c0ae88de 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 195142 2013-09-25 15:58:07Z tpowa $ +# $Id: PKGBUILD 195930 2013-10-05 19:44:24Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,8 +6,8 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.11 -pkgver=${_basekernel}.1 -pkgrel=3 +pkgver=${_basekernel}.4 +pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -22,16 +22,14 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' 'criu-no-expert.patch' - '3.11.1-fix-skge.patch' '3.11-haswell-intel_pstate.patch') md5sums=('7ec84223c7adcf01a5287eb7af96b7e7' - '7b051faf375c76d4763a24048c52600b' + 'd09e8017d22370b873628942f3ece3b0' '212338fa662436f9590026c9a71d82f7' 'b7c2805bb287a644c0a303bf7721e534' '36e90334b12b2e9d53fd92129ee98f5b' '98beb36f9b8cf16e58de2483ea9985e3' 'd50c1ac47394e9aec637002ef3392bd1' - '4fcee2b4485492dcfdead632275198eb' '1040ae6c10d4a68f89899f94a2318a17') _kernelname=${pkgbase#linux-libre} @@ -52,9 +50,6 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" - # #36865 fix broken skge network module - patch -Np1 -i "${srcdir}/3.11.1-fix-skge.patch" - # add intel haswell support to intel_pstate # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=6cdcdb793791f776ea9408581b1242b636d43b37 # will be in 3.12 diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD index e473bc64b..8caf1d90e 100644 --- a/libre/audacious-plugins-libre/PKGBUILD +++ b/libre/audacious-plugins-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193871 2013-09-03 05:58:51Z bisson $ +# $Id: PKGBUILD 195219 2013-09-28 02:25:20Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: William Rea <sillywilly@gmail.com> @@ -9,7 +9,7 @@ _pkgname=audacious-plugins pkgname=audacious-plugins-libre pkgver=3.4.1 -pkgrel=1 +pkgrel=2 pkgdesc='Plugins for Audacious, without nonfree plugins' url='http://audacious-media-player.org/' license=('GPL' 'GPL3' 'LGPL' 'custom:BSD') @@ -30,13 +30,12 @@ provides=$_pkgname=$pkgver makedepends=("audacious>=${pkgver}" 'glib2' 'python2' # for gdbus-codegen - 'oss-libre' 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac' + 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac' 'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia' 'libsidplayfp' 'wavpack' 'libnotify' 'lirc-utils-libre' 'curl' 'libmtp' 'neon' 'libmms' 'libcue') -optdepends=('oss-libre: Open Sound System v4 output' - 'alsa-lib: Advanced Linux Sound Arch. output' +optdepends=('alsa-lib: Advanced Linux Sound Arch. output' 'pulseaudio: PulseAudio output' 'jack2: Jack Audio Connection Kit output' 'lame: FileWriter MP3 output' diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index 8083926a9..6e88bce94 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=bbswitch pkgname=bbswitch-libre pkgver=0.7 _extramodules=extramodules-3.11-LIBRE # Don't forget to update bbswitch.install -pkgrel=14 +pkgrel=16 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url=("http://github.com/Bumblebee-Project/bbswitch") diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 9e25e1f35..f1eab5401 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97123 2013-09-13 09:43:25Z jelle $ +# $Id: PKGBUILD 98047 2013-10-04 15:29:48Z jelle $ # Maintainer: jelle van der Waa <jelle@vdwaa.nl> # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -9,16 +9,16 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=1.3.0 -pkgrel=1 -pkgdesc="Ebook management application, with unar support included and nonfree fonts removed" +pkgver=1.5 +pkgrel=2 +pkgdesc="Ebook management application, with unar support" arch=('i686' 'x86_64' 'mips64el') url="http://calibre-ebook.com/" license=('GPL3') depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 'python2-mechanize' 'podofo' 'libwmf' 'python2-beautifulsoup3' 'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx' - 'python2-imaging' 'shared-mime-info' 'python2-dnspython' + 'python2-pillow' 'shared-mime-info' 'python2-dnspython' 'unar' 'python2-pyqt4' 'python2-psutil' 'icu' 'libmtp' 'python2-netifaces' 'python2-cssselect' 'python2-apsw') makedepends=('python2-pycountry' 'qt4-private-headers') @@ -27,10 +27,10 @@ replaces=$_pkgname conflicts=$_pkgname provides=$_pkgname=$pkgver install=calibre.install -source=("http://sourceforge.net/projects/calibre/files/${pkgver}/calibre-${pkgver}.tar.xz" +source=('http://download.calibre-ebook.com/1.5.0/calibre-1.5.0.tar.xz' 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('38597e9ddb7b24a162f8e3bb6df18fc4' +md5sums=('adb8543044f81f93d6faef372710bcb5' '8353d1878c5a498b3e49eddef473605f' '675cd87d41342119827ef706055491e7') @@ -50,12 +50,6 @@ prepare(){ build() { cd "${srcdir}/${_pkgname}" - # Remove nonfree fonts - cd resources/fonts; \ - rm prs500/tt0003m_.ttf; ln -s ../liberation/LiberationSans-Regular.ttf prs500/tt0003m_.ttf; \ - rm prs500/tt0011m_.ttf; ln -s ../liberation/LiberationSerif-Regular.ttf prs500/tt0011m_.ttf; \ - rm prs500/tt0419m_.ttf; ln -s ../liberation/LiberationMono-Regular.ttf prs500/tt0419m_.ttf; \ - cd ../.. LANG='en_US.UTF-8' python2 setup.py build # LANG='en_US.UTF-8' python2 setup.py resources diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD index 0885c8f9d..2d081f8e3 100644 --- a/libre/cgminer-libre/PKGBUILD +++ b/libre/cgminer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97140 2013-09-14 03:08:03Z fyan $ +# $Id: PKGBUILD 97769 2013-09-29 14:35:16Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: monson <holymonson@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -7,7 +7,7 @@ _pkgname=cgminer pkgname=cgminer-libre -pkgver=3.4.3 +pkgver=3.5.0 pkgrel=1 pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation" url='http://forum.bitcoin.org/index.php?topic=28402.0' @@ -73,6 +73,6 @@ package() { install -Dm644 $_pkgname.conf "$pkgdir"/etc/$_pkgname.conf } -sha512sums=('e7871af17ecd17b1f7ddc21e68ed114ec71223e1c2ec0dc57066e9434c9f6955c34fb8d8986e34dc3fd50c48fccac1d36ab7695f62dea2c987bab44c90feb6ff' +sha512sums=('21dbf036012e331676e6dfd85501f04f10e1f0ae7f4fce3bffd3ffe4ccd8c9544b0166f0024cba00177edbe6b70c4d02803ca05af33a2612a5be7bb5a8ec11fc' '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41' '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f') diff --git a/libre/epiphany-libre/PKGBUILD b/libre/epiphany-libre/PKGBUILD index d6a1c77b2..0fcc1a491 100644 --- a/libre/epiphany-libre/PKGBUILD +++ b/libre/epiphany-libre/PKGBUILD @@ -1,36 +1,32 @@ -# $Id: PKGBUILD 186904 2013-05-31 18:08:27Z heftig $ +# $Id: PKGBUILD 195129 2013-09-25 11:58:35Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> # Contributor (Parabola): Márcio Silva <coadde@lavabit.com> _pkgname=epiphany pkgname=epiphany-libre -pkgver=3.8.2 -pkgrel=1 +pkgver=3.10.0 +pkgrel=2 install=epiphany.install pkgdesc="A GNOME web browser based on the WebKit rendering engine, with DuckDuckGo HTML support" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('libsoup' 'libnotify' 'gsettings-desktop-schemas' 'webkitgtk3' 'nss' 'iso-codes' 'dconf' 'desktop-file-utils' - 'hicolor-icon-theme' 'gcr' 'gnome-desktop' 'libwnck3') -makedepends=('intltool' 'gnome-doc-utils' 'startup-notification' 'gobject-introspection') +depends=('libsoup' 'libnotify' 'gsettings-desktop-schemas' 'webkitgtk' 'nss' 'iso-codes' 'dconf' 'desktop-file-utils' 'gnome-icon-theme-symbolic' 'gcr' 'gnome-desktop' 'libwnck3' 'gnome-themes-standard') +makedepends=('intltool' 'itstool' 'docbook-xml' 'startup-notification' 'gobject-introspection') replaces=$_pkgname conflicts=$_pkgname provides=$_pkgname=$pkgver options=('!libtool' '!emptydirs') groups=('gnome') url="http://www.gnome.org/projects/epiphany/" -source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz) -sha256sums=('ae89d6902ed243304d2cbf2fa361f6dd0cb3401fdaf726e6fdd4acc09197d50a') +source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz) +sha256sums=('7bd2c3b21464a83909d75befe2f9501c1ab2f00e2371f26023f79818faec351e') prepare() { cd $_pkgname-$pkgver # Replace Google support to DuckDuckGo HTML - sed -i 's|http://www[.]google[.]com/search?q=search[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=search|g' $(grep -rlI 'http://www[.]google[.]com/search?q=search&ie=UTF-8&oe=UTF-8') - sed -i 's|http://www[.]google[.]com/search?q=lala%2Elala[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=lala.lala|g' $(grep -rlI 'http://www[.]google[.]com/search?q=lala%2Elala&ie=UTF-8&oe=UTF-8') - sed -i 's|http://www[.]google[.]com/search?q=totalgarbage0xdeadbeef[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=totalgarbage0xdeadbeef|g' $(grep -rlI 'http://www[.]google[.]com/search?q=totalgarbage0xdeadbeef&ie=UTF-8&oe=UTF-8') - sed -i 's|http://www[.]google[.]com/search?q=search+separated+words+please[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=search+separated+words+please|g' $(grep -rlI 'http://www[.]google[.]com/search?q=search+separated+words+please&ie=UTF-8&oe=UTF-8') + sed -i 's|http://www[.]google[.]com/search?q=%s[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=search|g' $(grep -rlI 'http://www[.]google[.]com/search?q=%s&ie=UTF-8&oe=UTF-8') sed -i '\|a quoted string should be searched|d' $(grep -rlI 'a quoted string should be searched') sed -i 's|http://www[.]google[.]com/search?q=%s[&]amp;ie=UTF-8[&]amp;oe=UTF-8|https://duckduckgo.com/html/?q=%s|g' $(grep -rlI 'http://www[.]google[.]com/search') sed -i 's|http://www[.]google[.]com|https://duckduckgo.com/html|g' $(grep -rlI 'google[.]com') diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD index 5c6865833..8289eb471 100644 --- a/libre/file-roller-libre/PKGBUILD +++ b/libre/file-roller-libre/PKGBUILD @@ -1,20 +1,17 @@ -# $Id: PKGBUILD 193443 2013-08-20 09:36:30Z jgc $ +# $Id: PKGBUILD 195293 2013-09-30 08:01:47Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> _pkgname=file-roller pkgname=file-roller-libre -pkgver=3.8.4 -pkgrel=1 -pkgdesc="Create and modify archives, with unar recommendation included and nonfree unace recommendation removed" +pkgver=3.10.0 +pkgrel=2 +pkgdesc="Create and modify archives, with unar support included and nonfree unace recommendation removed" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'libarchive' 'file' 'json-glib' 'libnotify') +depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'libarchive' 'file' 'json-glib' 'libnotify' 'p7zip' 'unar') makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'libnautilus-extension' 'itstool' 'docbook-xsl') -optdepends=('unar: the free RAR uncompression utility' - 'zip: creates PKZIP-compatible .zip files' - 'p7zip: 7zip compression utility' - 'arj: ARJ archiver') +optdepends=('lrzip: lrzip archive support') groups=('gnome-extra') provides=("$_pkgname=$pkgver") replaces=("$_pkgname") @@ -22,8 +19,18 @@ conflicts=("$_pkgname") options=('!libtool' '!emptydirs') install=file-roller.install url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver::3}/$_pkgname-$pkgver.tar.xz) -sha256sums=('3615bc41bbe28030d16ee414a8f5f9a3e37f745733c39032ef1559a06be3eea8') +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz + bug708854.patch + bug709035.patch) +sha256sums=('d889bb9904146e5715c082aa9a6d96b0606a066ba2bf05fbfb7030f2bf274f13' + 'a8f4e856924b6b78e47cc134c723d1d93119f90ec9ab69dd0b59ec8a934688ba' + '59f07968b720ccd9c70e6232b2bfcaa3cf9298d6ce48be4882154d69cbe7a909') + +prepare() { + cd $_pkgname-$pkgver + patch -Np1 -i ../bug708854.patch + patch -Np1 -i ../bug709035.patch +} build() { cd $_pkgname-$pkgver diff --git a/libre/file-roller-libre/bug708854.patch b/libre/file-roller-libre/bug708854.patch new file mode 100644 index 000000000..6a5591a59 --- /dev/null +++ b/libre/file-roller-libre/bug708854.patch @@ -0,0 +1,92 @@ +From d3ce6fe6964857c89212ab1a5a7aaa052d93c584 Mon Sep 17 00:00:00 2001 +From: Aleksander Morgado <aleksander@lanedo.com> +Date: Thu, 26 Sep 2013 16:06:21 +0000 +Subject: 7z: allow extracting/opening/adding files prefixed with '@' + +7z uses '@' to specify a listfile; i.e. a file with a list of files to add or +extract. Therefore, if working with single files (e.g. open, add or extract a +single file from the archive), the filenames need to be escaped with '!' and +specified with '-i'. It is ok to mix files specified with '-i' and the ones +given after the archive filename. + +E.g. instead of: + 7z x -bd -y -o/tmp/.fr-2z9FXz -- HS04603.ZIP @HS04603.PDF + +it should be: + 7z x -bd -y -o/tmp/.fr-2z9FXz -i!@HS04603.PDF -- HS04603.ZIP + +https://bugzilla.gnome.org/show_bug.cgi?id=708854 +--- +diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c +index f2e70a6..a9d15fd 100644 +--- a/src/fr-command-7z.c ++++ b/src/fr-command-7z.c +@@ -375,11 +375,20 @@ fr_command_7z_add (FrCommand *command, + if (from_file != NULL) + fr_process_add_arg_concat (command->process, "-i@", from_file, NULL); + ++ if (from_file == NULL) ++ for (scan = file_list; scan; scan = scan->next) ++ /* Files prefixed with '@' need to be handled specially */ ++ if (g_str_has_prefix (scan->data, "@")) ++ fr_process_add_arg_concat (command->process, "-i!", scan->data, NULL); ++ + fr_process_add_arg (command->process, "--"); + fr_process_add_arg (command->process, command->filename); ++ + if (from_file == NULL) + for (scan = file_list; scan; scan = scan->next) +- fr_process_add_arg (command->process, scan->data); ++ /* Skip files prefixed with '@', already added */ ++ if (!g_str_has_prefix (scan->data, "@")) ++ fr_process_add_arg (command->process, scan->data); + + fr_process_end_command (command->process); + } +@@ -409,11 +418,20 @@ fr_command_7z_delete (FrCommand *command, + if (from_file != NULL) + fr_process_add_arg_concat (command->process, "-i@", from_file, NULL); + ++ if (from_file == NULL) ++ for (scan = file_list; scan; scan = scan->next) ++ /* Files prefixed with '@' need to be handled specially */ ++ if (g_str_has_prefix (scan->data, "@")) ++ fr_process_add_arg_concat (command->process, "-i!", scan->data, NULL); ++ + fr_process_add_arg (command->process, "--"); + fr_process_add_arg (command->process, command->filename); ++ + if (from_file == NULL) + for (scan = file_list; scan; scan = scan->next) +- fr_process_add_arg (command->process, scan->data); ++ /* Skip files prefixed with '@', already added */ ++ if (!g_str_has_prefix (scan->data, "@")) ++ fr_process_add_arg (command->process, scan->data); + + fr_process_end_command (command->process); + } +@@ -463,11 +481,21 @@ fr_command_7z_extract (FrCommand *command, + if (from_file != NULL) + fr_process_add_arg_concat (command->process, "-i@", from_file, NULL); + ++ if (from_file == NULL) ++ for (scan = file_list; scan; scan = scan->next) ++ /* Files prefixed with '@' need to be handled specially */ ++ if (g_str_has_prefix (scan->data, "@")) ++ fr_process_add_arg_concat (command->process, "-i!", scan->data, NULL); ++ ++ + fr_process_add_arg (command->process, "--"); + fr_process_add_arg (command->process, command->filename); ++ + if (from_file == NULL) + for (scan = file_list; scan; scan = scan->next) +- fr_process_add_arg (command->process, scan->data); ++ /* Skip files prefixed with '@', already added */ ++ if (!g_str_has_prefix (scan->data, "@")) ++ fr_process_add_arg (command->process, scan->data); + + fr_process_end_command (command->process); + } +-- +cgit v0.9.2 diff --git a/libre/file-roller-libre/bug709035.patch b/libre/file-roller-libre/bug709035.patch new file mode 100644 index 000000000..f82e33f30 --- /dev/null +++ b/libre/file-roller-libre/bug709035.patch @@ -0,0 +1,43 @@ +From d05bdc3b60d928f1f40338208419f0ffa41195f6 Mon Sep 17 00:00:00 2001 +From: Paolo Bacchilega <paobac@src.gnome.org> +Date: Sun, 29 Sep 2013 16:30:29 +0000 +Subject: libarchive: fixed failure when extracting some tar archives + +do not try to restore the creation time; +do not set the G_FILE_ATTRIBUTE_TIME_CREATED_USEC attribute + +[bug #709035] +--- +diff --git a/src/fr-archive-libarchive.c b/src/fr-archive-libarchive.c +index 42673df..44aaad2 100644 +--- a/src/fr-archive-libarchive.c ++++ b/src/fr-archive-libarchive.c +@@ -428,15 +428,8 @@ _g_file_info_create_from_entry (struct archive_entry *entry, + + /* times */ + +- if (archive_entry_ctime_is_set (entry)) { +- g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_CREATED, archive_entry_ctime (entry)); +- g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_CREATED_USEC, archive_entry_ctime_nsec (entry)); +- } +- +- if (archive_entry_mtime_is_set (entry)) { ++ if (archive_entry_mtime_is_set (entry)) + g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED, archive_entry_mtime (entry)); +- g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, archive_entry_mtime_nsec (entry)); +- } + + /* username */ + +@@ -529,7 +522,8 @@ restore_modification_time (GHashTable *created_folders, + + info = g_file_info_new (); + g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED, g_file_info_get_attribute_uint64 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED)); +- g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, g_file_info_get_attribute_uint32 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC)); ++ if (g_file_info_get_attribute_status (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC) == G_FILE_ATTRIBUTE_STATUS_SET) ++ g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, g_file_info_get_attribute_uint32 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC)); + result = _g_file_set_attributes_from_info (file, info, cancellable, error); + + g_object_unref (info); +-- +cgit v0.9.2 diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD index 0eef753de..17d1105e3 100644 --- a/libre/gst-plugins-bad-libre/PKGBUILD +++ b/libre/gst-plugins-bad-libre/PKGBUILD @@ -1,35 +1,36 @@ -# $Id: PKGBUILD 193745 2013-08-30 07:49:47Z heftig $ +# $Id: PKGBUILD 195012 2013-09-24 14:12:15Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> _pkgname=gst-plugins-bad pkgname=$_pkgname-libre -pkgver=1.0.10 +pkgver=1.2.0 pkgrel=1 -pkgdesc='GStreamer Multimedia Framework Bad Plugins, without nonfree faac support' +pkgdesc="GStreamer Multimedia Framework Bad Plugins, without nonfree faac support" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="http://gstreamer.freedesktop.org/" -depends=('mjpegtools' 'gst-plugins-base-libs' 'curl' 'chromaprint' 'libmms' 'faad2' 'mpg123' 'celt' 'libdca' 'soundtouch' 'spandsp' 'libdvdnav' 'libmodplug' 'libgme' 'opus' 'wayland' 'neon' 'libofa' 'fluidsynth' 'openjpeg') -makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2') +depends=('mjpegtools' 'gst-plugins-base-libs' 'curl' 'chromaprint' 'libmms' 'faad2' 'mpg123' 'celt' 'libdca' 'soundtouch' 'spandsp' 'libdvdnav' 'libmodplug' 'libgme' 'opus' 'wayland' 'neon' 'libofa' 'fluidsynth' 'openjpeg' 'libwebp' 'libsrtp' 'gnutls') +makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2' 'python' 'valgrind' 'wildmidi') provides=($_pkgname=$pkgver) conflicts=$_pkgname replaces=$_pkgname options=(!libtool !emptydirs) source=(${url}/src/$_pkgname/$_pkgname-$pkgver.tar.xz) -sha256sums=('91da60ba2ee5c681f11188a4a456894e7f989435c2102c15eff97bbd4fc4c726') +sha256sums=('a12fac6c106a7e4ae8bb2c7da508688d7db532b818319df2202f497cbd930afa') build() { cd $_pkgname-$pkgver - sed -i '/AC_PATH_XTRA/d' configure.ac - aclocal -I m4 -I common/m4 - autoconf - automake --add-missing + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental \ - --with-package-name='GStreamer Bad Plugins (Parabola GNU/Linux-libre)' \ - --with-package-origin='https://parabolagnulinux.org/' \ + --with-package-name="GStreamer Bad Plugins (Parabola GNU/Linux-libre)" \ + --with-package-origin="https://parabolagnulinux.org/" \ --with-gtk=3.0 + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/libre/gummiboot/PKGBUILD b/libre/gummiboot/PKGBUILD index d5cd50f28..eebb9744c 100644 --- a/libre/gummiboot/PKGBUILD +++ b/libre/gummiboot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 194204 2013-09-10 14:24:09Z tpowa $ +# $Id: PKGBUILD 194708 2013-09-23 00:31:07Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> @@ -6,7 +6,7 @@ # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname="gummiboot" -pkgver="37" +pkgver="38" pkgrel="1" pkgdesc="Simple text-mode UEFI Boot Manager (Parabola rebranded)" url="http://freedesktop.org/wiki/Software/gummiboot" @@ -27,7 +27,7 @@ build() { cd ${srcdir}/${pkgname} ./autogen.sh - ./configure --sysconfdir=/etc --libexecdir=/usr/lib --libdir=/usr/lib + ./configure --sysconfdir=/etc --with-efi-ldsdir=/usr/lib --libexecdir=/usr/lib --libdir=/usr/lib make } diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index d2c020a75..bd2820343 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=hplip pkgname=hplip-libre pkgver=3.13.9 -pkgrel=1 +pkgrel=2 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation" arch=('i686' 'x86_64') url="http://hplipopensource.com" @@ -18,7 +18,7 @@ makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusbx' optdepends=('cups: for printing support' 'python2-dbus: for dbus support' 'sane: for scanner support' - 'python2-imaging: for commandline scanning support' + 'python2-pillow: for commandline scanning support' 'python2-notify: for Desktop notification support' 'rpcbind: for network support' 'python2-pyqt: for running hp-toolbox' diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD index 35e6d73c1..60c4d2d5d 100644 --- a/libre/icecat-noscript/PKGBUILD +++ b/libre/icecat-noscript/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 97515 2013-09-23 16:13:35Z spupykin $ +# $Id: PKGBUILD 97930 2013-10-01 15:58:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=firefox-noscript pkgname=icecat-noscript -pkgver=2.6.7.1 +pkgver=2.6.8.1 pkgrel=1 pkgdesc="plugin for icecat which disables script" arch=('any') @@ -14,7 +14,7 @@ depends=() provides=$_pkgname=$pkgver makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('fcc2cbd8792d215604e3fe89847bc936') +md5sums=('955e4c5706a73977c09d7b4d0bc6dd9f') package() { # _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-` diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD index bbd3e1213..8ebc5657f 100644 --- a/libre/icedove-l10n/PKGBUILD +++ b/libre/icedove-l10n/PKGBUILD @@ -3,8 +3,8 @@ pkgbase=icedove-l10n epoch=1 -_pkgver=17.0.8 -pkgver=17.0.8.deb1 +_pkgver=17.0.9esr +pkgver=17.0.9.deb2 _langpacks=(ar ast be bg bn-BD br ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW) @@ -65,58 +65,58 @@ done md5sums=('d5b2567a8cc8f64591f313a6efdaaffc' 'f3719964e893c1002b7a923e8f95f923' - 'ad61f2a7632c8ce1251d5952181398df' - '3fd84e4b803bca0fedb737440a040e45' - '4586a2dabddfcc16855edf6b8d69962a' - 'c584f31ae8b2c24da15666fc4fa3563b' - '702f3257cf019843d74fbaadb99e2886' - '6551ad7767aa87ee42e6d31ff9590648' - 'd1b275d962f96166e2a459f58b1709d6' - 'ca7a944cd07ee0c0d04a454a2516d49d' - '76d452fada4e133f6dc3b3584c6fac08' - '3b4b2cee9016abd15da1bcd6286dbc6c' - '028c90f0c31ab3a7b071a718d08258bb' - '12355d30501f1ac7a10831763bc1f354' - '23b28003c65f5df1be2e8008c97edc15' - 'afc8052118c343e867718ef8561e831e' - '65db2679e3a8c1868739da2e27783484' - '1334e12708bf352a2be09d5795c95213' - 'f73ac3d0baedb8f525676118f51426f9' - '4c31cb388ccaff76c95d5b46f49c4ecc' - '2bd1d5f69bee27da325f8298f0d1e134' - '6bdd8f7a3beee272d7cdfc24882d254b' - 'e6d1dc109c9a934277aaab7e696d389b' - '70408d96a8bbd4aceccf1c56d05f15ce' - 'd8fbf504de160554a9bc1e4fe13492ce' - '094d2815ab1668f1ebf8fcb3a764a4ec' - 'e6b14831bdc3ce639b390175ac04113b' - 'cf7743c55272ba14d6804a1121f9ab6b' - '44be8dbc2d025afa4730bfa025fa7a42' - 'c4e95ec094792b880a1ddb8b9aff48aa' - 'b91510b33bc07ae10f97c223f652517f' - '2f6364f530d8f57d104cb4f4e7b28409' - '5375575fd2e6721505a9fc06b0247c49' - '18ee8f5eaa26ec1f60e81541d5ebc6ca' - 'ba23f860392aefa18ff50bcdc450af52' - '36573ca497ecd8ab8df6b1155546e698' - '239622a8ed51b43791d34f4c09b3f6ec' - '850cc70db0785d88afe03a4d9964ccd3' - 'ed3293f4b84e4984d67f44977fccccd5' - '9604a4e8c42e605c04e77d204bad5664' - '9d5a4a6f6a6b905bb509502972682a04' - 'ad9c38941f4a8ce055406c1bb5e7ef35' - '25e04c4c5a1c0c0eff21e94f75a51f5b' - 'a369031e02f05a10b68d8ef032cb4105' - '4657f4f697459aa51a09915dbc3270bb' - '09817688b547c5a20bc8422ce1f7eab1' - 'd194d43d1dbf60c94028a5a718ba7e36' - '0ebbfcf410b53596fc8fb99df51ed030' - 'cfa588e76644846f31fbc5360cfa89a1' - '06141e939e5c53251c7af6d23935024d' - 'd07936ae70c5baa32ac5f4ecdb691c8e' - 'e5c0f2ebac114fdc2a0db275ea385858' - 'dac675a37e160aafb0e052ae561fe189' - '5e112c628766e03cdae62f64d42020ca' - '85d89ffd10bba250f4ce8acd39b3d6f8' - 'f068603a927801bc0c5386e61bcc8b4e' - '2e6f3b969a175bbe2f88b266482f4c2e') + 'cc32b8aa30e0e54fcea11b76a9a030f4' + 'a18431241d61f6f517c1b8c3d8ce884f' + '28b6143d9dea47b9bd89453fea455457' + 'e1139e6b943a02af2be130f66db99390' + '6c446ab3cfc39b1b177f0b7c4558ffd6' + 'f6a88413d68fff4451fb675586539705' + '8e77e2d1236ee08c690edd6617bc61ec' + '7a5748c07c863745540e4dc48773bdfe' + 'fabe0a051dfedeee5b7301ae1f886aa2' + '171068c63cb0819a5c8769d92a713c6e' + '64d5d905bba39a9c857e16e2deed8d92' + '41a11fedd4f0721c7dfa7b4f294c4578' + '8a23d4d6616428292c9edf432e747543' + '41aa0520d62b7f257938bae83a3fc72b' + '2b1f30b215838a256a15eb87f93825a8' + '1c125ec400fa3d9de88cf6a775f5deae' + 'd85151b34d12e265f3df28dfbc78dd1b' + '0ab58f3f0ee604e1af3dc5c16b0c2ea0' + 'e7a3d71e609efcefe71c57b7890fb37c' + '166efd822691c91a722d53e8e9c6d7a8' + 'f7837a358208e6720f18e9858478915a' + '58b38fd78be414cf4d10c2ac6dfd128c' + 'aceb524b1e843668405b762ee7258756' + '2dfc7c8760aa197efe662a389614e284' + '5886ef068a1b73bfd7d8c3c2628d8674' + 'ab535a80c409fd0b4b732fdb79f525ad' + '12dd37921eedcd2c9e5a4484315bed6d' + '0766135b41053a1b168b8a5d2b865025' + 'fb61057edad48f619a4943d7033ea4ac' + 'e7eb605e77a7dcf2093c78fee22432a8' + 'ac3455b559e3be6bba9b801e54fba4a6' + '1ab817dd1e0b2a20c7b95b3821626e4b' + '239a2ce9ada5bee297a3abc5d382fbc0' + '5159ca357d344d48e4a1ed7f5d0c6148' + 'b260be89e9ae689a2285995541055f06' + 'fe3a462afcb4a9e0a4228f0f5a894790' + 'e775993988b93497c062c0e0b5cf8c5e' + '67fec92b3bdaa8267467e96cde7145e1' + '36d0044c7e1808bc80fb7aa27c37f540' + 'fcea0c7480719cf77b7d38a23114ac25' + '205bd5873fcb142b3c3828a8a6bbe4f9' + 'e82f9a3ef19ec74d235c71d4162bef28' + 'e38119f6bfc43aec4016120c970fa1eb' + '9e89b3c89bc8f6e4dd1c80e25591b634' + 'af4688e2617a18410165da9474de7fdc' + '09f10be4a94a6eb9f91aa9be6fd65a65' + '864fe0fae10e437dd764454f87ad0cc1' + 'b2e7cbfa68bcb2e7eac21e18d87a3d93' + '171a1064054f4fd185ce896738d50cbc' + '2f34b234825e28993eb244862cef607b' + 'ad7814da5ccddfbba70fc9389b7b1368' + '41513e2cef7b5a311e8f3de988f2594b' + 'a929204d41eba4631b97892f4a915591' + '6a36f76040d930fa8a448c1d7b6c7c22' + 'be9c55a9994069fa8ebac022201cdaf3') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index 246f228bc..8728e2e87 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -3,8 +3,8 @@ # We're getting this from Debian Sid _debname=icedove -_debver=17.0.8 -_debrel=deb1 +_debver=17.0.9 +_debrel=deb2 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -31,8 +31,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" vendor.js ${_pkgname}.desktop) options=(!emptydirs) -md5sums=('37a706e6b2c17049ab70739600ef47b0' - '0524d248bd0e83fa62c261700640ac0d' +md5sums=('4c2aacece253be8f177a74d90d782f45' + 'dd8ccad23583cc0d8c3b77066711f077' '5cf95ea94f69cdd36604890cfbf7b954' 'a8fc4658d45b6bf9350023e5c3f34e56' '4eecc4fc5aafaf0da651a09eadc90bee' diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD index f6e6a2d43..ba04053d1 100644 --- a/libre/iceweasel-noscript/PKGBUILD +++ b/libre/iceweasel-noscript/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 97515 2013-09-23 16:13:35Z spupykin $ +# $Id: PKGBUILD 97930 2013-10-01 15:58:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=firefox-noscript pkgname=iceweasel-noscript -pkgver=2.6.7.1 +pkgver=2.6.8.1 pkgrel=1 pkgdesc="plugin for iceweasel which disables script" arch=('any') @@ -14,7 +14,7 @@ depends=() provides=$_pkgname=$pkgver makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('fcc2cbd8792d215604e3fe89847bc936') +md5sums=('955e4c5706a73977c09d7b4d0bc6dd9f') package() { # _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-` diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index 368ee981c..077e6aee3 100644 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 194222 2013-09-10 22:37:57Z andrea $ +# $Id: PKGBUILD 195531 2013-10-01 15:16:11Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> @@ -6,18 +6,16 @@ _pkgname='kdebase-konqueror' pkgname='kdebase-konqueror-libre' -pkgver=4.11.1 -pkgrel=2 +pkgver=4.11.2 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/internet/konqueror/" license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" - 'kdebug-324511.patch' 'konq-about-fsdg.diff') -sha1sums=('a8781b2d7d431024cd5355a1e57d387d5945e12f' - 'ff32bee8ef0ee154f1885fa4cd91a6754d980343' +sha1sums=('6a988adf54e9f499365dce0ce1691d020411bd0d' 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a') pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') @@ -31,7 +29,6 @@ prepare() { mkdir build cd kde-baseapps-${pkgver} - patch -p1 -i "${srcdir}"/kdebug-324511.patch # Don't recommend nonfree software or Google. patch -Np1 -i "${srcdir}/konq-about-fsdg.diff" } diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index a27f22dcf..fe99bd935 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 194219 2013-09-10 22:35:14Z andrea $ +# $Id: PKGBUILD 195503 2013-10-01 15:14:05Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre -pkgver=4.11.1 -pkgrel=2 +pkgver=4.11.2 +pkgrel=1 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kde-runtime' @@ -24,11 +24,9 @@ optdepends=('kdepimlibs: needed by DrKonqi to send crash reports to KDE.org' 'rarian: needed by KHelpCenter') install="${_pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" - 'kdebug-324470.patch' 'duckduckgo_html.desktop' 'duckduckgo_lite.desktop') -sha1sums=('3457ffdbd1921bc6bc78cd8a9a463822d515b079' - '80db2d34f9e62dbea5d7e94b7bef93d2cf46f6d7' +sha1sums=('b896ef9d8fe770720dc16ae3eae33538e4e699da' 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd' 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b') @@ -36,7 +34,6 @@ prepare() { mkdir build cd kde-runtime-${pkgver} - patch -p1 -i "${srcdir}"/kdebug-324470.patch } build() { @@ -70,7 +67,7 @@ package() { ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/" - # https://bugs.archlinux.org/task/36668 + # FS#36668 chown :nobody "${pkgdir}"/usr/lib/kde4/libexec/kdesud chmod g+s "${pkgdir}"/usr/lib/kde4/libexec/kdesud } diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 368b7062f..bb657d4f3 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 194033 2013-09-10 12:51:41Z andrea $ +# $Id: PKGBUILD 195493 2013-10-01 15:12:48Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdelibs pkgname=kdelibs-libre -pkgver=4.11.1 +pkgver=4.11.2 pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') @@ -24,7 +24,7 @@ install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde-applications-menu.patch' 'qt4.patch' 'khtml-fsdg.diff') -sha1sums=('db938479fe1599f9f1ac497de48ad8de692ac6c9' +sha1sums=('f9aec4ec00389067e6d2ea37f5042c926c07fd6a' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'ed1f57ee661e5c7440efcaba7e51d2554709701c' 'a1502a964081ad583a00cf90c56e74bf60121830') diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index c4343e402..ef67d28c9 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 194033 2013-09-10 12:51:41Z andrea $ +# $Id: PKGBUILD 195745 2013-10-01 15:33:32Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdenetwork-kopete pkgname=kdenetwork-kopete-libre -pkgver=4.11.1 +pkgver=4.11.2 pkgrel=1 pkgdesc='Instant Messenger, without skype support' url='http://kde.org/applications/internet/kopete/' @@ -21,7 +21,7 @@ provides=$_pkgname=$pkgver source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz" 'libotr3.patch' 'mediastreamer29.patch') -sha1sums=('1dd677e6fd4335e6d0bb906f4c981395ca204e12' +sha1sums=('d7616376d7488050ce2c6ec6b7a1f4010fe91084' '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384' '317683a5c2acd0a0058c5ab42f6006e9db511ef3') diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD index fc172a0e9..7725d7c2c 100644 --- a/libre/kdepim-libre/PKGBUILD +++ b/libre/kdepim-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 194033 2013-09-10 12:51:41Z andrea $ +# $Id: PKGBUILD 195755 2013-10-01 15:34:16Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -22,7 +22,7 @@ pkgname=('kdepim-akonadiconsole-libre' 'kdepim-ktimetracker-libre' 'kdepim-ktnef-libre' 'kdepim-libkdepim-libre') -pkgver=4.11.1 +pkgver=4.11.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' @@ -31,7 +31,7 @@ groups=('kde' 'kdepim-libre') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'kde-agent' 'nepomuk-widgets' 'link-grammar') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz") -sha1sums=('d0f240520b4f79a56a2d8421b59654f108180bcd') +sha1sums=('027a6560bcd8f55659f642f2041f1265453a02ad') build() { mkdir build diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index bf4664b12..8dc8d1828 100644 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ b/libre/kdeutils-ark-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 194033 2013-09-10 12:51:41Z andrea $ +# $Id: PKGBUILD 195793 2013-10-01 15:36:58Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdeutils-ark pkgname=kdeutils-ark-libre -pkgver=4.11.1 +pkgver=4.11.2 pkgrel=1 pkgdesc='Archiving Tool, with unar support' url='http://kde.org/applications/utilities/ark/' @@ -20,7 +20,7 @@ replaces=('kdeutils-ark') conflicts=('kdeutils-ark') source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz" 'ark-unar-06.patch') -sha1sums=('591ab1b3825f3646b26bd55484fc7f4291086a63' +sha1sums=('4314876715804f52ca09f6555173b1542a406f0e' 'a0a836950f185d9b2245204579f969203036fdec') build() { diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 953cd18b1..1c9d0251c 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -9,9 +9,9 @@ pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/packages/libretools.git/" license=('GPL3' 'GPL2') -pkgver=20130914 -_libretools_commit=ab8dc8d4204d198f01e1fc7f59498a2794df829f -_devtools_commit=6fbdc4eb481302541cf8fa282fb3453e4c5d0d16 +pkgver=20131007 +_libretools_commit=75bef554ce82c3c086cc04a4c12ccd2e9644290f +_devtools_commit=f566ebf8345cf39f1d50eaa6a679b3ca7088f4eb _packages_url=https://projects.parabolagnulinux.org/packages source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2 @@ -83,5 +83,5 @@ package_libretools-mips64el() { make install-libretools-mips64el DESTDIR="$pkgdir" } -md5sums=('91b1d56254bd61f1266ee2cb20e671a3' - 'f44ca55997ab9598b7f1a8aeb2379b52') +md5sums=('938d9909ed3ed3af9f31f82bbc54e788' + 'a3cc8d8fc2daa370799249a4ea5caafc') diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 060527012..29e2366e1 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 194492 2013-09-16 20:12:13Z andyrtr $ +# $Id: PKGBUILD 195951 2013-10-06 10:39:36Z bpiotrowski $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -10,10 +10,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -_sublevel=12 +_sublevel=15 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.12 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.15 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -33,7 +33,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '3.10.6-logitech-dj.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - 'd2cfd95d71d64950b77d534793272486' + '9d85508aaa75442ec6e480a248102c5a' '678afb6322e0b0caad6b08bdb2b23dc8' '13e5a0aa3faf60f791403d0b367dca86' 'c072b17032e80debc6a8626299245d46' @@ -43,7 +43,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' 'f3def2cefdcbb954c21d8505d23cc83c' 'd50c1ac47394e9aec637002ef3392bd1' '3ff40ca684cfe719723e627e2cef7cea' - '59e1e27d0f3548226694abcbec79af0b') + '8aab6ab727f49dffcae5fd1c3c7c5bdb') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/3.11.1-fix-skge.patch b/libre/linux-libre/3.11.1-fix-skge.patch deleted file mode 100644 index 26d90e080..000000000 --- a/libre/linux-libre/3.11.1-fix-skge.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/drivers/net/ethernet/marvell/skge.c 2013-09-02 16:46:10.000000000 -0400 -+++ b/drivers/net/ethernet/marvell/skge.c 2013-09-22 11:14:10.232067541 -0400 -@@ -3086,23 +3086,27 @@ - PCI_DMA_FROMDEVICE); - skge_rx_reuse(e, skge->rx_buf_size); - } else { -+ struct skge_element ee; - struct sk_buff *nskb; - - nskb = netdev_alloc_skb_ip_align(dev, skge->rx_buf_size); - if (!nskb) - goto resubmit; - -+ ee = *e; -+ -+ skb = ee.skb; -+ prefetch(skb->data); -+ - if (skge_rx_setup(skge, e, nskb, skge->rx_buf_size) < 0) { - dev_kfree_skb(nskb); - goto resubmit; - } - - pci_unmap_single(skge->hw->pdev, -- dma_unmap_addr(e, mapaddr), -- dma_unmap_len(e, maplen), -+ dma_unmap_addr(&ee, mapaddr), -+ dma_unmap_len(&ee, maplen), - PCI_DMA_FROMDEVICE); -- skb = e->skb; -- prefetch(skb->data); - } - - skb_put(skb, len); diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 1f0e471eb..8a493e182 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 195142 2013-09-25 15:58:07Z tpowa $ +# $Id: PKGBUILD 195930 2013-10-05 19:44:24Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.11 -_sublevel=1 +_sublevel=4 pkgver=${_basekernel}.${_sublevel} -pkgrel=3 -_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver +pkgrel=1 +_lxopkgver=${_basekernel}.3 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -30,11 +30,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' 'criu-no-expert.patch' - '3.11.1-fix-skge.patch' '3.11-haswell-intel_pstate.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('7ec84223c7adcf01a5287eb7af96b7e7' - '7b051faf375c76d4763a24048c52600b' + 'd09e8017d22370b873628942f3ece3b0' 'b7718a81faf845ab53234336122ad631' 'f7ee88ffc93b665345b6ee89ff192e1f' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -43,9 +42,8 @@ md5sums=('7ec84223c7adcf01a5287eb7af96b7e7' '36e90334b12b2e9d53fd92129ee98f5b' '98beb36f9b8cf16e58de2483ea9985e3' 'd50c1ac47394e9aec637002ef3392bd1' - '4fcee2b4485492dcfdead632275198eb' '1040ae6c10d4a68f89899f94a2318a17' - '135ff203ec680a91e87eed4df72f453d') + 'e6db810c0d41180acca55f545b1681fb') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -70,9 +68,6 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" - # #36865 fix broken skge network module - patch -Np1 -i "${srcdir}/3.11.1-fix-skge.patch" - # add intel haswell support to intel_pstate # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=6cdcdb793791f776ea9408581b1242b636d43b37 # will be in 3.12 diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index 9afdc4e4f..374a7662b 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 194386 2013-09-15 11:30:54Z tpowa $ +# $Id: PKGBUILD 195936 2013-10-05 19:51:37Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=60 +pkgrel=62 epoch=1 _extramodules=extramodules-3.11-LIBRE arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/mc-libre/PKGBUILD b/libre/mc-libre/PKGBUILD index e270f8d3d..ea1a990f6 100644 --- a/libre/mc-libre/PKGBUILD +++ b/libre/mc-libre/PKGBUILD @@ -1,12 +1,14 @@ # $Id: PKGBUILD 97329 2013-09-18 07:33:03Z schuay $ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Maintainer: schuay <jakob.gruber@gmail.com> +# Maintainer (Parabola): André Silva <emulatorman@parabola.nu> +# Contributor (Parabola): Márcio Silva <coadde@parabola.nu> _pkgname=mc pkgname=mc-libre pkgver=4.8.10 -pkgrel=2 -pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander, with unar and arj recommendation included and nonfree unace recommendation removed" +pkgrel=2.1 +pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander, with unar support and arj recommendation included and nonfree unace recommendation removed" arch=('i686' 'x86_64') url="http://www.ibiblio.org/mc/" license=('GPL') @@ -45,7 +47,23 @@ backup=('etc/mc/edit.indent.rc' 'etc/mc/mc.menu' 'etc/mc/sfs.ini') source=("http://www.midnight-commander.org/downloads/${_pkgname}-${pkgver}.tar.bz2" - "fs36962.diff") + "fs36962.diff" + "unar.in") + +prepare() { + cd "${srcdir}/${_pkgname}-${pkgver}" + + ## add unar support removing nonfree urar on the source + rm -v src/vfs/extfs/helpers/urar.in + install -m644 $srcdir/unar.in src/vfs/extfs/helpers + sed -i '\|rar v -c- "${MC_EXT_FILENAME}" 2>/dev/null|d + s| unrar v -c-|unar| + ' misc/ext.d/archive.sh + sed -i 's|urar.in|unar.in|g' $(grep -rlI 'urar.in') + sed -i '\|src/vfs/extfs/helpers/urar| s|urar|unar|g + ' configure{,.ac} + sed -i 's|urar|unar|g' src/vfs/extfs/helpers/Makefile.{am,in} +} build() { cd "${srcdir}/${_pkgname}-${pkgver}" @@ -72,4 +90,5 @@ package() { } md5sums=('eb4bdc23abd4fdfa14911d53d65c8186' - '7f7cf5388a5390c2ed49965492f490aa') + '7f7cf5388a5390c2ed49965492f490aa' + 'f549a6c13ac0c3052986fcdc945648a9') diff --git a/libre/mc-libre/unar.in b/libre/mc-libre/unar.in new file mode 100644 index 000000000..3ba37b019 --- /dev/null +++ b/libre/mc-libre/unar.in @@ -0,0 +1,64 @@ +#! /bin/sh + +UNAR=`which unar 2>/dev/null` + +# Define $UNAR version +UNAR_VERSION=`$UNAR -v` + +mcunar4fs_list () +{ + $UNAR -q "$1" | @AWK@ -v uid=`id -u` -v gid=`id -g` ' +BEGIN { flag=0 } +/^-------/ { flag++; if (flag > 1) exit 0; next } +flag==1 { + str = substr($0, 2) + getline + split($4, a, "-") + if (index($6, "D") != 0) + $6="drwxr-xr-x" + else + if (index($6, ".") != 0) + $6="-rw-r--r--" + printf "%s 1 %s %s %d %02d/%02d/%02d %s ./%s\n", $6, uid, gid, $1, a[2], a[1], a[3], $5, str +}' +} + +mcunarfs_list () +{ + $UNAR -q "$1" | @AWK@ -v uid=`id -u` -v gid=`id -g` ' +BEGIN { flag=0 } +/^-----------/ { flag++; if (flag > 1) exit 0; next } +flag==1 { + split($5, a, "-") + if (index($1, "D") != 0) + $1="drwxr-xr-x" + else + if (index($1, ".") != 0) + $1="-rw-r--r--" + printf "%s 1 %s %s %d %02d/%02d/%02d %s ./%s\n", $1, uid, gid, $2, a[2], a[1], a[3], $6, $8 +}' +} + +mcunarfs_list () +{ + mcunarfs_list "$@" +} + +mcunarfs_copyout () +{ + $UNAR -q "$1" "$2" > "$3" +} + +umask 077 + +cmd="$1" +shift + +case "$cmd" in + # Workaround for a bug in mc - directories must precede files to + # avoid duplicate entries, so we sort output by filenames + list) mcunarfs_list "$@" | sort -k 8 ;; + copyout) mcunarfs_copyout "$@" ;; + *) exit 1 ;; +esac +exit 0 diff --git a/libre/mcomix-libre/PKGBUILD b/libre/mcomix-libre/PKGBUILD index 97e796231..77baf60bc 100644 --- a/libre/mcomix-libre/PKGBUILD +++ b/libre/mcomix-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95818 2013-08-17 10:12:09Z schuay $ +# $Id: PKGBUILD 97188 2013-09-15 08:42:21Z schuay $ # Maintainer: schuay <jakob.gruber@gmail.com> # Contributor: Ray Powell <ray_al@xphoniexx.net> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,12 +6,12 @@ _pkgname=mcomix pkgname=mcomix-libre pkgver=1.00 -pkgrel=4 +pkgrel=5 pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books, with unar recommendation" arch=('any') url="http://sourceforge.net/projects/mcomix/" license=('GPL') -depends=('pygtk' 'python-imaging' 'xdg-utils' 'python2' \ +depends=('pygtk' 'python2-pillow' 'xdg-utils' 'python2' \ 'desktop-file-utils' 'hicolor-icon-theme' 'python2-setuptools') makedepends=('gettext' 'intltool') optdepends=('unar: for rar compressed comics') @@ -24,6 +24,9 @@ source=("http://downloads.sourceforge.net/project/mcomix/MComix-${pkgver}/mcomix build() { cd ${srcdir}/${_pkgname}-${pkgver} + # https://www.archlinux.org/todo/replace-pil-with-pillow/ + sed -i 's/import Image/from PIL import Image/' mime/comicthumb + # python2 fix for file in $(grep -Rl "/usr/bin/env python" .); do diff --git a/libre/openshot-libre/PKGBUILD b/libre/openshot-libre/PKGBUILD index 4c5c97a12..f5762f3e7 100644 --- a/libre/openshot-libre/PKGBUILD +++ b/libre/openshot-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92333 2013-06-04 05:05:15Z svenstaro $ +# $Id: PKGBUILD 97284 2013-09-16 08:04:43Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Asa Marco <marcoasa90[at]gmail[.]com> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,13 +6,13 @@ _pkgname=openshot pkgname=openshot-libre pkgver=1.4.3 -pkgrel=2 +pkgrel=3 pkgdesc="a free, non-linear video editor for GNU/Linux based on MLT framework, without nonfree faac recommendation" arch=('any') url="http://www.openshotvideo.com/" license=('GPL') depends=('mlt-python-bindings' 'pygoocanvas' 'sdl' 'librsvg' 'mplayer' - 'pyxdg' 'pygtk' 'python2-httplib2' 'python-imaging') + 'pyxdg' 'pygtk' 'python2-httplib2' 'python2-pillow') optdepends=('dvgrab: for IEEE digital sources' 'libquicktime' 'libavc1394' 'jack' 'jack-rack' 'ladspa') replaces=$_pkgname diff --git a/libre/openshot-libre/openshot.install b/libre/openshot-libre/openshot.install index aab69abed..046df0051 100644 --- a/libre/openshot-libre/openshot.install +++ b/libre/openshot-libre/openshot.install @@ -1,5 +1,6 @@ post_install() { update-mime-database usr/share/mime &>/dev/null + update-desktop-database -q } post_upgrade() { diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD index fbd189a81..7f8c3b789 100644 --- a/libre/p7zip-libre/PKGBUILD +++ b/libre/p7zip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188504 2013-06-15 04:51:48Z bisson $ +# $Id: PKGBUILD 195474 2013-09-30 18:46:35Z bisson $ # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Contributor: TuxSpirit<tuxspirit@archlinux.fr> 2007/11/17 21:22:36 UTC @@ -8,7 +8,7 @@ pkgname=p7zip-libre _pkgname=${pkgname%-libre} pkgver=9.20.1 -pkgrel=7 +pkgrel=8 pkgdesc='Command-line version of the 7zip compressed file archiver without Rar' url='http://p7zip.sourceforge.net/' license=('GPL') @@ -30,13 +30,16 @@ sha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7' options=('!makeflags') install=install -build() { +prepare() { cd "${srcdir}/${_pkgname}_${pkgver}" - + rm GUI/kde4/p7zip_compress.desktop [[ $CARCH = x86_64 ]] \ && cp makefile.linux_amd64_asm makefile.machine \ || cp makefile.linux_x86_asm_gcc_4.X makefile.machine +} +build() { + cd "${srcdir}/${_pkgname}_${pkgver}" msg "Removing unRar" # Generate patch # sed -e '/Rar/d' -i makefile* @@ -49,12 +52,16 @@ build() { package() { cd "${srcdir}/${_pkgname}_${pkgver}" - make install \ DEST_DIR="${pkgdir}" \ DEST_HOME="/usr" \ DEST_MAN="/usr/share/man" + # Licenses + install -d "${pkgdir}"/usr/share/licenses/p7zip + ln -s -t "${pkgdir}"/usr/share/licenses/p7zip \ + /usr/share/doc/p7zip/DOCS/License.txt + # Integration with stuff... install -Dm644 GUI/p7zip_32.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/p7zip.png install -d "${pkgdir}"/usr/share/{applications,kde4/services/ServiceMenus} diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD index 03a2f994e..3c51d57cd 100644 --- a/libre/texlive-core-libre/PKGBUILD +++ b/libre/texlive-core-libre/PKGBUILD @@ -6,7 +6,7 @@ pkgname=texlive-core-libre _pkgname=texlive-core pkgver=2013.31589 _revnr=${pkgver#2013.} -pkgrel=1 +pkgrel=1.1 pkgdesc="TeX Live core distribution, without nonfree add-on packages (Parabola rebranded)" license=('GPL') arch=(any) @@ -67,6 +67,26 @@ build() { done echo "done" rm -rf {tlpkg,doc,source,omega} || true + + # remove nonfree packages from updmap.cfg + sed -i '/ccpl.map/d' texmf-dist/web2c/updmap.cfg + sed -i '/cs-charter.map/d' texmf-dist/web2c/updmap.cfg + sed -i '/csfonts.map/d' texmf-dist/web2c/updmap.cfg + sed -i '/plother.map/d' texmf-dist/web2c/updmap.cfg + sed -i '/pltext.map/d' texmf-dist/web2c/updmap.cfg + + # remove nonfree packages from texlive-core.maps + sed -i '/ccpl.map/d' texlive-core.maps + sed -i '/cs-charter.map/d' texlive-core.maps + sed -i '/csfonts.map/d' texlive-core.maps + sed -i '/plother.map/d' texlive-core.maps + sed -i '/pltext.map/d' texlive-core.maps + + # remove nonfree packages from fmtutil.cnf + sed -i '/cslatex/d' texmf-dist/web2c/fmtutil.cnf + sed -i '/csplain/d' texmf-dist/web2c/fmtutil.cnf + sed -i '/from mex/d' texmf-dist/web2c/fmtutil.cnf + sed -i '/mexconf.tex/d' texmf-dist/web2c/fmtutil.cnf } package() { diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD index c915f1b4c..8283b6b66 100644 --- a/libre/tp_smapi-libre-lts/PKGBUILD +++ b/libre/tp_smapi-libre-lts/PKGBUILD @@ -12,7 +12,7 @@ pkgname=tp_smapi-libre-lts _pkgname=tp_smapi _extramodules=/usr/lib/modules/extramodules-3.10-LIBRE-LTS pkgver=0.41 -pkgrel=13 +pkgrel=16 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre-lts kernel package)" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index 7988d6860..9d226780d 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97210 2013-09-15 11:33:59Z tpowa $ +# $Id: PKGBUILD 98084 2013-10-05 19:51:13Z tpowa $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: xduugu # Contributor: nh2 @@ -12,7 +12,7 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=35 +pkgrel=37 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/unar/PKGBUILD b/libre/unar/PKGBUILD index 1ca533b9b..3479ffefe 100644 --- a/libre/unar/PKGBUILD +++ b/libre/unar/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=unar -pkgver=1.7 +pkgver=1.8 pkgrel=1 pkgdesc="An Objective-C application for uncompressing archive files" arch=('x86_64' 'i686' 'mips64el') @@ -39,5 +39,5 @@ package() { } # vim:set ts=2 sw=2 et: -md5sums=('c714bbd0b51f5c1d27044c229528c286' +md5sums=('1b1d769855605a1687f13d0241e02821' '4fa4ecc6e4ba14d3b6952d064e728511') diff --git a/libre/usermin/PKGBUILD b/libre/usermin/PKGBUILD index 6f7eab297..5344a65c2 100644 --- a/libre/usermin/PKGBUILD +++ b/libre/usermin/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 193449 2013-08-20 10:13:15Z tpowa $ +# $Id: PKGBUILD 195999 2013-10-07 10:42:06Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=usermin -pkgver=1.560 +pkgver=1.570 pkgrel=1 pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding (Parabola rebranded)" arch=(i686 x86_64 mips64el) @@ -124,6 +124,6 @@ package() { #install license install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/usermin/LICENCE } -md5sums=('155af20dc957aca8a05bfd69d7ccf23a' +md5sums=('4cfb713bb2fa2582cfe9a62802d588ab' 'a5bd5e5ee779f8a3cf3d776ca77ee36e' 'ec37a79f948f778224550930d2a7ca07') diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index c743ac53e..209b5e773 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97212 2013-09-15 11:34:24Z tpowa $ +# $Id: PKGBUILD 98086 2013-10-05 19:51:42Z tpowa $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> @@ -8,7 +8,7 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20130607 _extramodules=extramodules-3.11-LIBRE -pkgrel=14 +pkgrel=16 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" diff --git a/libre/webmin/PKGBUILD b/libre/webmin/PKGBUILD index cd16179bc..17d02e437 100644 --- a/libre/webmin/PKGBUILD +++ b/libre/webmin/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 193451 2013-08-20 10:13:52Z tpowa $ +# $Id: PKGBUILD 195997 2013-10-07 10:38:56Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=webmin -pkgver=1.650 +pkgver=1.660 pkgrel=1 pkgdesc="a web-based interface for system administration (Parabola rebranded)" arch=(i686 x86_64 mips64el) @@ -210,7 +210,7 @@ package() { # install license install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE } -md5sums=('b4d6370698fdd5e9ba930583ba0d10a3' +md5sums=('56a685a665b864470eeb7ce6b97961d8' 'b0b3e3fb231a12e60165b6b4d604dcfa' 'c86518037449e0fc0c60fc24537ea038' 'fc29ecb6a5cd8c278abe054e60381095') diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD index bd4532a4f..f54f3b92c 100644 --- a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD +++ b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 194033 2013-09-10 12:51:41Z andrea $ +# $Id: PKGBUILD 195745 2013-10-01 15:33:32Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdenetwork-kopete pkgname=kdenetwork-kopete-libre-nonprism -pkgver=4.11.1 +pkgver=4.11.2 pkgrel=1 pkgdesc='Instant Messenger, without skype and support for unsafe and dangerous for privacy protocols' url='http://kde.org/applications/internet/kopete/' @@ -22,7 +22,7 @@ source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz" 'libotr3.patch' 'mediastreamer29.patch' 'libre-nonprism.patch') -sha1sums=('1dd677e6fd4335e6d0bb906f4c981395ca204e12' +sha1sums=('d7616376d7488050ce2c6ec6b7a1f4010fe91084' '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384' '317683a5c2acd0a0058c5ab42f6006e9db511ef3' '3c46e5c80ef0cd3f6fe9fb6d5cb8c252c6792208') diff --git a/nonprism/kdepim-runtime-nonprism/PKGBUILD b/nonprism/kdepim-runtime-nonprism/PKGBUILD index 79f9b9221..9e42ee3ca 100644 --- a/nonprism/kdepim-runtime-nonprism/PKGBUILD +++ b/nonprism/kdepim-runtime-nonprism/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 194033 2013-09-10 12:51:41Z andrea $ +# $Id: PKGBUILD 195505 2013-10-01 15:14:14Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> _pkgname=kdepim-runtime pkgname=kdepim-runtime-nonprism -pkgver=4.11.1 +pkgver=4.11.2 pkgrel=1 pkgdesc='Extends the functionality of kdepim, without libkgapi and libkfbapi support' arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ replaces=('kdepim-runtime' 'kdepim-runtime-coherence') conflicts=kdepim-runtime provides=kdepim-runtime=$pkgver source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz") -sha1sums=('a61c1b4cafe16b88213c8cf2f4f64b38a20ed74d') +sha1sums=('acc133c3c9d5cff0cdc9901b5ff7bd8b31a15825') prepare() { mkdir build diff --git a/pcr/libquvi-scripts-current/PKGBUILD b/pcr/libquvi-scripts-current/PKGBUILD index bce42b0e4..6a466b314 100644 --- a/pcr/libquvi-scripts-current/PKGBUILD +++ b/pcr/libquvi-scripts-current/PKGBUILD @@ -4,7 +4,7 @@ pkgname=libquvi-scripts-current _pkgname=libquvi-scripts provides=(libquvi-scripts) -pkgver=0.4.18 +pkgver=0.4.19 pkgrel=1 pkgdesc='Library for parsing video download links.' arch=('any') @@ -24,5 +24,6 @@ package() { cd "${_pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } -md5sums=('d36f966974c851d36136c75d462fb319' + +md5sums=('a37221697367a700cc1cb3b1f4b681ec' 'SKIP') diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index 011a91bdc..3d2d5c90f 100644 --- a/pcr/youtube-dl-current/PKGBUILD +++ b/pcr/youtube-dl-current/PKGBUILD @@ -5,7 +5,7 @@ pkgname=youtube-dl-current _pkgname=youtube-dl provides=(youtube-dl) -pkgver=2013.09.24.2 +pkgver=2013.10.07 pkgrel=1 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" arch=('any') @@ -27,7 +27,5 @@ package() { "${pkgdir}/usr/share/bash-completion/completions/youtube-dl" install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" } - - -md5sums=('f62dcb15581a3ce35cfc323bf9aed905' +md5sums=('8fcf8c27dc2444f78c0413f9ddee383a' 'SKIP') |