diff options
52 files changed, 671 insertions, 581 deletions
diff --git a/kernels/linux-libre-grsec/PKGBUILD b/kernels/linux-libre-grsec/PKGBUILD index b55ac3cc2..f7858d380 100644 --- a/kernels/linux-libre-grsec/PKGBUILD +++ b/kernels/linux-libre-grsec/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 207134 2014-03-07 14:06:45Z thomas $ +# $Id: PKGBUILD 208677 2014-03-24 21:47:07Z thomas $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -10,9 +10,9 @@ pkgbase=linux-libre-grsec # Build stock -LIBRE-GRSEC kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.13 -_sublevel=6 +_sublevel=7 _grsecver=3.0 -_timestamp=201403072241 +_timestamp=201403252047 pkgver=${_basekernel}.${_sublevel} pkgrel=1 _lxopkgver=${_basekernel}.6 # nearly always the same as pkgver @@ -47,8 +47,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'known-exploit-detection.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz") md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1' - 'bd937981937fd3c7a553fc770236e640' - 'dfb03774a36dc625b96a53feaa6efb3e' + '49c182728e5b977daefa5e8b0ca028e0' + '00dbb1fb5bfc08842d97c02ece67e441' '21da34d98cc007a78a11660863537c0d' 'd4b95575b9cc32b7ba4ad8624972ddf9' '5f66bed97a5c37e48eb2f71b2d354b9a' diff --git a/kernels/linux-libre-knock/PKGBUILD b/kernels/linux-libre-knock/PKGBUILD index efe66b2df..42d72bba7 100644 --- a/kernels/linux-libre-knock/PKGBUILD +++ b/kernels/linux-libre-knock/PKGBUILD @@ -10,11 +10,11 @@ pkgbase=linux-libre-knock # Build stock -LIBRE-KNOCK kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.12 -_sublevel=14 +_sublevel=15 _knockpatchver=${_basekernel}.4 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.14 # 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') @@ -40,7 +40,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz") md5sums=('254f59707b6676b59ce5ca5c3c698319' - '93624626751140852d82d83aecfd377d' + '9ce025cf690e10ce505e266bd04694c6' '387673a6510de1e1bce8188fc7a72bd1' '6eac169d20fd27b55815b0b2db4a473b' 'f341bc4685a40dc409b144b0f44bb137' @@ -56,7 +56,7 @@ md5sums=('254f59707b6676b59ce5ca5c3c698319' 'cec0bb8981936eab2943b2009b7a6fff' '88d9cddf9e0050a76ec4674f264fb2a1' 'cb9016630212ef07b168892fbcfd4e5d' - '1e2d95b87a7ab398527b3aac78ea29c5') + '953d206788a2ad0ee43b30be83c192e2') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index e1625893a..6490637b6 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 207134 2014-03-07 14:06:45Z thomas $ +# $Id: PKGBUILD 208677 2014-03-24 21:47:07Z thomas $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -6,7 +6,7 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.13 -pkgver=${_basekernel}.6 +pkgver=${_basekernel}.7 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '0001-Bluetooth-allocate-static-minor-for-vhci.patch' 'i8042-fix-aliases.patch') md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1' - 'bd937981937fd3c7a553fc770236e640' + '49c182728e5b977daefa5e8b0ca028e0' '904835a7af0bc5e88007a94cad7c1d9c' 'f302c931bd85309da9d9792b4cc96467' '44260d2cb1a8b51c119d2ce1f83e457a' diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index b5cf9c753..2322d0c4a 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -1,3 +1,4 @@ +# $Id: PKGBUILD 204911 2014-01-31 09:59:51Z bluewind $ # Maintainer: Joakim Hernberg <jbh@alchemy.lu> # Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: timbosa <tinny_tim@dodo.com.au> @@ -9,12 +10,12 @@ pkgbase=linux-libre-rt # Build stock -LIBRE-RT kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.12 -_releasever=13 -_rtpatchver=rt21 +_releasever=14 +_rtpatchver=rt23 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} pkgrel=1 -_lxopkgver=${_basekernel}.13 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.14 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -40,8 +41,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('254f59707b6676b59ce5ca5c3c698319' - 'e2ec796847356b785cb06d0563f3f7d5' - '60f4b7018bf88ad0ba887b3a492f6b1a' + '93624626751140852d82d83aecfd377d' + 'f6533223cdae66d91fa3667779419ab1' 'e40789b1e59136235827a3b3bf40c121' 'bf542c4038d3e7d0da4c92bac0466198' '82496e68851d1960543a07ba51cdb44a' @@ -56,7 +57,7 @@ md5sums=('254f59707b6676b59ce5ca5c3c698319' 'cec0bb8981936eab2943b2009b7a6fff' '88d9cddf9e0050a76ec4674f264fb2a1' 'cb9016630212ef07b168892fbcfd4e5d' - '3ce39522f0d8d1422dc095d2a17a77d6') + '1e2d95b87a7ab398527b3aac78ea29c5') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 719c9aa05..ddb9041df 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 207134 2014-03-07 14:06:45Z thomas $ +# $Id: PKGBUILD 208677 2014-03-24 21:47:07Z thomas $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -6,7 +6,7 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.13 -pkgver=${_basekernel}.6 +pkgver=${_basekernel}.7 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '0001-Bluetooth-allocate-static-minor-for-vhci.patch' 'i8042-fix-aliases.patch') md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1' - 'bd937981937fd3c7a553fc770236e640' + '49c182728e5b977daefa5e8b0ca028e0' 'be059d4c29dfd9ac55183133938e9242' 'b7c2805bb287a644c0a303bf7721e534' '44260d2cb1a8b51c119d2ce1f83e457a' diff --git a/kernels/pax-flags-libre/PKGBUILD b/kernels/pax-flags-libre/PKGBUILD index 6cb10454e..36ab838a7 100644 --- a/kernels/pax-flags-libre/PKGBUILD +++ b/kernels/pax-flags-libre/PKGBUILD @@ -8,7 +8,7 @@ pkgname=pax-flags-libre pkgdesc='Deactivates PaX flags for several binaries to work with PaX enabled kernels (a libre fork of linux-pax-flags)' -pkgver=2.0.16 +pkgver=2.0.17 pkgrel=1 arch=(any) url='https://github.com/g4jc/pax-flags-libre' @@ -20,8 +20,8 @@ conflicts=linux-pax-flags provides=linux-pax-flags source=( $pkgname.sh $pkgname.rb $pkgname.8 - replicant.conf clamav.conf games.conf java.conf kde.conf polkit.conf qemu.conf - ruby.conf simple.conf valgrind.conf + replicant.conf browsers.conf clamav.conf games.conf imagemagick.conf java.conf + kde.conf polkit.conf qemu.conf ruby.conf simple.conf valgrind.conf wine.conf ) package() { @@ -40,12 +40,15 @@ sha256sums=('06295e9d2afea0ea01c42620f0cd5e3ae785bc42c2749d4bef52f7d5b8a043ce' '79367f1b72eb836557e24df20fc4ad142af55669c0fee1e3e7a0d34d35bfc9dc' '9d62896dd51be4979cd85bfcd09de219f6068ec312f27e2a66f7a2f2c78d1f38' '7bbbad18a19150893916995723cd7e256a7b4e2baa5c2ff57bc27886c40f51fc' + 'aedce25acf41fffa7a5c15c2ad7e5034eb56bfedcde65612ae4bc3f86ef4841a' 'bb87f4dce8e20f2ce601bdcb888dd688d8f0e9d0ab367e09c8081daffa15b03a' - '4185bc6401ff3b21958fd24c49fc56d590435e5bc9f1ccb69798bb0c2acdd4c1' + '95471682765c3c5ca31b29e3de7f8a07de6b2857e999dcdd714d062fe3da04ea' + '7dc92a303004c9d74a1fe4d40d75105a703366ade8b2b459b0aae8d6f8b62ed0' '71afe786955d149fe216ff1a60348562914a6820d3b7f9dc42aa44913062b04e' '01ddeec77c605e1d3aa00a1fdc4c3537989468ab78da5f37b893cdbcfe34176c' '1f205fddfb427a696fb00221a3007453e25fbbf180ea026c264d23eeac9e1870' '2736d0ef20d0127c34e132db38d8993dee3062ba0ac0cdf8d444a8d3665698b8' - '6171eefd363f2c70bed9ac41fae3458d9e03460fdaf079c99445482e9649555a' - '5ea06a1680cf3bd7e57db904829aae5ef0649d6a0f065b35e5dc2e64dd7ed18f' - 'ea003c4201745cd0c4bcf5cec5ca2d0a79cc6b1b04ceaa276ace0ad0287b8c50') + 'e5562d68df885c5ceeb51709fc57c86d7b2c7849b9d99f828a77228878e25d71' + '7d9f510e649e4ead08be3bb5f6fe1b6371b47a9fbb2f9b829cf329caa16bad94' + 'ea003c4201745cd0c4bcf5cec5ca2d0a79cc6b1b04ceaa276ace0ad0287b8c50' + 'd78fe0a02b5801c70e3d64045b12c3cbee358689da9082d71003b1cffda73ee3') diff --git a/kernels/pax-flags-libre/browsers.conf b/kernels/pax-flags-libre/browsers.conf new file mode 100644 index 000000000..a37590b80 --- /dev/null +++ b/kernels/pax-flags-libre/browsers.conf @@ -0,0 +1,10 @@ +# MPROTECT and RANDMMAP off +PSmXEr: + - /usr/bin/elinks + - /usr/bin/qupzilla + - /usr/lib/iceweasel/iceweasel + - /usr/lib/iceweasel/plugin-container + +# MPROTECT off +PSmXER: + - /usr/bin/midori diff --git a/kernels/pax-flags-libre/games.conf b/kernels/pax-flags-libre/games.conf index 8b74b0108..59d5c7296 100644 --- a/kernels/pax-flags-libre/games.conf +++ b/kernels/pax-flags-libre/games.conf @@ -13,6 +13,7 @@ PSmXER: - /opt/enemy-territory/et.x86 - /opt/quake3/ioquake3.i386 - /opt/quake3/ioquake3.x86_64 + - /opt/ryzom/ryzom_client - /usr/bin/bzflag - /usr/bin/minetest - /usr/bin/opencity diff --git a/kernels/pax-flags-libre/imagemagick.conf b/kernels/pax-flags-libre/imagemagick.conf new file mode 100644 index 000000000..a2201a754 --- /dev/null +++ b/kernels/pax-flags-libre/imagemagick.conf @@ -0,0 +1,13 @@ +# MPROTECT off +PSmXER: + - /usr/bin/animate + - /usr/bin/compare + - /usr/bin/composite + - /usr/bin/conjure + - /usr/bin/convert + - /usr/bin/display + - /usr/bin/identify + - /usr/bin/import + - /usr/bin/mogrify + - /usr/bin/montage + - /usr/bin/stream diff --git a/kernels/pax-flags-libre/ruby.conf b/kernels/pax-flags-libre/ruby.conf index ec595d462..c6d976649 100644 --- a/kernels/pax-flags-libre/ruby.conf +++ b/kernels/pax-flags-libre/ruby.conf @@ -4,4 +4,5 @@ PSmXER: - ~/.rbenv/versions/?.?.?{,-p*}/lib/ruby/gems/*/gems/capybara-webkit-*/bin/webkit_server - ~/.rvm/rubies/ruby-?.?.?{,-p*}/bin/ruby - ~/.rvm/gems/ruby-?.?.?{,-p*}/gems/capybara-webkit-*/bin/webkit_server + - /usr/bin/rbx - /usr/bin/ruby diff --git a/kernels/pax-flags-libre/simple.conf b/kernels/pax-flags-libre/simple.conf index 180b3e18c..3039f1215 100644 --- a/kernels/pax-flags-libre/simple.conf +++ b/kernels/pax-flags-libre/simple.conf @@ -4,20 +4,17 @@ PSMXEr: # MPROTECT and RANDMMAP off PSmXEr: - - /usr/bin/elinks - /usr/bin/gnome-shell - /usr/bin/grub-bios-setup - - /usr/lib/iceweasel/iceweasel - - /usr/lib/iceweasel/plugin-container - /usr/lib/gcc/x86_64-unknown-linux-gnu/*/cc1plus - /usr/lib/icedove/icedove - - /usr/bin/qupzilla # MPROTECT off PSmXER: - /usr/bin/blender - /usr/bin/btsync - /usr/bin/cabal + - /usr/bin/cheese - /usr/bin/dolphin-emu - /usr/bin/dosbox - /usr/bin/epiphany @@ -29,12 +26,15 @@ PSmXER: - /usr/bin/goldendict - /usr/bin/gtk-query-immodules-* - /usr/bin/inkscape + - /usr/bin/konstruktor - /usr/bin/liferea + - /usr/bin/minitube - /usr/bin/mono - /usr/bin/mplayer - /usr/bin/mumble - /usr/bin/obex-data-server - /usr/bin/python2 + - /usr/bin/rhythmbox - /usr/bin/scheme - /usr/bin/seahorse - /usr/bin/spicec @@ -49,15 +49,8 @@ PSmXER: - /usr/lib/xbmc/xbmc.bin - /usr/sbin/grub-probe - /usr/sbin/vbetool - - /usr/bin/midori - - /usr/bin/cheese - - /use/bin/minitube + - /usr/bin/xiphos # PAGEEXEC, MPROTECT, EMUTRAMP and RANDMMAP off pSmXer: - /usr/bin/sbcl - -# All off :( -psmxer: - - /usr/bin/wine - - /usr/bin/wine-preloader diff --git a/kernels/pax-flags-libre/wine.conf b/kernels/pax-flags-libre/wine.conf new file mode 100644 index 000000000..77b33053d --- /dev/null +++ b/kernels/pax-flags-libre/wine.conf @@ -0,0 +1,4 @@ +# All off :( +psmxer: + - /usr/bin/wine-preloader + - /usr/bin/wine64-preloader diff --git a/libre/avidemux-libre/PKGBUILD b/libre/avidemux-libre/PKGBUILD index 81585ce70..797135fd3 100644 --- a/libre/avidemux-libre/PKGBUILD +++ b/libre/avidemux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198769 2013-11-03 19:15:23Z eric $ +# $Id: PKGBUILD 208659 2014-03-24 20:18:17Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -6,12 +6,12 @@ _pkgbase=avidemux pkgbase=avidemux-libre pkgname=('avidemux-libre-cli' 'avidemux-libre-gtk' 'avidemux-libre-qt') pkgver=2.5.6 -pkgrel=8 +pkgrel=9 arch=('i686' 'x86_64') license=('GPL') url="http://fixounet.free.fr/avidemux/" -makedepends=('cmake' 'libxslt' 'gtk2' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \ - 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'x264' 'libsamplerate' \ +makedepends=('cmake' 'libxslt' 'gtk2' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' + 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'x264' 'libsamplerate' 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva') options=('!makeflags' '!emptydirs') source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz) diff --git a/libre/avidemux-libre/PKGBUILD.WIP b/libre/avidemux-libre/PKGBUILD.WIP index 5496ecffb..e08bbc795 100644 --- a/libre/avidemux-libre/PKGBUILD.WIP +++ b/libre/avidemux-libre/PKGBUILD.WIP @@ -5,7 +5,7 @@ _pkgbase=avidemux pkgbase=avidemux-libre pkgname=('avidemux-libre-cli' 'avidemux-libre-gtk' 'avidemux-libre-qt') -pkgver=2.6.6 +pkgver=2.6.8 pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') @@ -16,7 +16,7 @@ makedepends=('cmake' 'libxslt' 'gtk3' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \ 'libvdpau' 'libdca' 'fribidi' 'glu') options=('!makeflags' '!emptydirs') source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz) -sha1sums=('83ebf551746aac251d6e69feac5858cd0a307743') +sha1sums=('50f3dfe270e6272fce46d725b198b9d0dd95664b') #source=(http://www.avidemux.org/nightly/snapshot/source_r8810.tar.gz) #sha1sums=('8c27d54e2b0655a8b8a3adfde1c0308ffedfec0c') diff --git a/libre/bitlbee-libre/PKGBUILD b/libre/bitlbee-libre/PKGBUILD index 66883426b..575fc6979 100644 --- a/libre/bitlbee-libre/PKGBUILD +++ b/libre/bitlbee-libre/PKGBUILD @@ -11,8 +11,8 @@ _pkgname=bitlbee pkgname=bitlbee-libre pkgver=3.2.1 -pkgrel=2 -pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC, without Skype support' +pkgrel=2.2 +pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC, without nonfree Skype support' url='http://www.bitlbee.org/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/ca-certificates/PKGBUILD b/libre/ca-certificates/PKGBUILD new file mode 100644 index 000000000..8704cf896 --- /dev/null +++ b/libre/ca-certificates/PKGBUILD @@ -0,0 +1,43 @@ +# $Id$ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgname=ca-certificates +pkgver=20130906 +pkgrel=1.1 +pkgdesc='Common CA certificates' +arch=('any') +url='http://packages.qa.debian.org/c/ca-certificates.html' +license=('MPL' 'GPL') +source=("http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.tar.gz") +depends=('bash' 'run-parts' 'openssl' 'findutils' 'coreutils' 'sed') +makedepends=('python2') +install='ca-certificates.install' +backup=('etc/ca-certificates.conf') +sha256sums=('dd10520091d469e95e11e5fafb7422d3be0a66071984d09009ed3e0232cb277d') + +prepare() { + cd ${srcdir}/${pkgname} + sed 's|/usr/bin/python|/usr/bin/python2|g' -i mozilla/certdata2pem.py + sed 's|python|python2|g' -i mozilla/Makefile +} + +build() { + cd ${srcdir}/${pkgname} + make +} + +package() { + cd ${srcdir}/${pkgname} + install -d -m755 ${pkgdir}/{etc/ca-certificates/update.d,usr/{sbin,share/ca-certificates},etc/ssl/certs} + make install DESTDIR=${pkgdir} + mv ${pkgdir}/usr/sbin ${pkgdir}/usr/bin + install -D -m644 sbin/update-ca-certificates.8 ${pkgdir}/usr/share/man/man8/update-ca-certificates.8 + + ( + echo "# Automatically generated by ${pkgname}-${pkgver}-${pkgrel}" + echo "# see update-ca-certificates man page" + echo "# " + cd ${pkgdir}/usr/share/ca-certificates + find . -name '*.crt' | sort | cut -b3- + ) > ${pkgdir}/etc/ca-certificates.conf +} diff --git a/libre/ca-certificates/ca-certificates.install b/libre/ca-certificates/ca-certificates.install new file mode 100644 index 000000000..4e90c2ef6 --- /dev/null +++ b/libre/ca-certificates/ca-certificates.install @@ -0,0 +1,26 @@ +export LC_ALL=C + +post_install() { + usr/bin/update-ca-certificates --fresh >/dev/null 2>&1 +} + +post_upgrade() { + if [ $(vercmp $2 20110421-1) -lt 0 ]; then + echo 'Updating certificates. This might take a while...' + fi + usr/bin/update-ca-certificates --fresh >/dev/null 2>&1 +} + +pre_remove() { + # clean up certificates + local _backup=$(mktemp) + mv etc/ca-certificates.conf ${_backup} + echo > etc/ca-certificates.conf + usr/bin/update-ca-certificates --fresh >/dev/null 2>&1 + mv ${_backup} etc/ca-certificates.conf +} + +post_remove() { + # remove the cert file if it is empty + [[ -s etc/ssl/certs/ca-certificates.crt ]] || rm -f etc/ssl/certs/ca-certificates.crt +} diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index fc37c552e..817019c8c 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 108021 2014-03-21 08:59:30Z jelle $ +# $Id: PKGBUILD 108545 2014-03-28 10:05:28Z jelle $ # Maintainer: jelle van der Waa <jelle@vdwaa.nl> # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -9,9 +9,9 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=1.29.0 +pkgver=1.30.0 pkgrel=1 -pkgdesc="Ebook management application, with unar support" +pkgdesc="Ebook management application, without nonfree libunrar support" arch=('i686' 'x86_64' 'mips64el') url="http://calibre-ebook.com/" license=('GPL3') @@ -19,7 +19,7 @@ depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 'python2-mechanize' 'podofo' 'libwmf' 'python2-beautifulsoup3' 'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx' 'python2-pillow' 'shared-mime-info' 'python2-dnspython' - 'unar' 'python2-pyqt4' 'python2-psutil' 'icu' 'libmtp' + 'python2-pyqt4' 'python2-psutil' 'icu' 'libmtp' 'python2-netifaces' 'python2-cssselect' 'python2-apsw') makedepends=('python2-pycountry' 'qt4-private-headers') optdepends=('ipython2: to use calibre-debug') @@ -30,7 +30,7 @@ install=calibre.install source=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('1df9ee27a9bff5072184d5e9629f1209' +md5sums=('2dadae4d9293ee33e99afae2e223686e' 'ece36dfd737fa4a346f0a0e59395e949' '675cd87d41342119827ef706055491e7') diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 60ec4cd57..2d5b0887b 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 208587 2014-03-24 15:30:08Z andyrtr $ +# $Id: PKGBUILD 208919 2014-03-28 18:09:56Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=cups-filters-libre _pkgname=cups-filters -pkgver=1.0.49 +pkgver=1.0.50 pkgrel=1 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar. provides=("${_pkgname}=${pkgver}" 'foomatic-filters') replaces=("${_pkgname}" 'foomatic-filters') conflicts=("${_pkgname}" 'foomatic-filters') -md5sums=('7edf215f1e56d1a2470af5940e1ffe61') +md5sums=('b5f15a12bf2f55382be29bb2c99d1b9f') build() { cd $_pkgname-$pkgver diff --git a/libre/doublecmd-libre/PKGBUILD b/libre/doublecmd-libre/PKGBUILD index 10f8bc81f..1e14d5588 100644 --- a/libre/doublecmd-libre/PKGBUILD +++ b/libre/doublecmd-libre/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=doublecmd-libre pkgname=('doublecmd-libre-gtk2' 'doublecmd-libre-qt') pkgver=0.5.9 _helpver=0.5.5 -pkgrel=1 +pkgrel=1.1 url="http://doublecmd.sourceforge.net/" arch=('i686' 'x86_64') license=('GPL') @@ -48,7 +48,7 @@ build() { } package_doublecmd-libre-gtk2() { - pkgdesc="twin-panel (commander-style) file manager (GTK), without libunrar recommendation" + pkgdesc="twin-panel (commander-style) file manager (GTK), without nonfree libunrar recommendation" depends=('gtk2') conflicts=('doublecmd-libre-qt' 'doublecmd-gtk2' 'doublecmd-gtk2-libre') replaces=('doublecmd-gtk2' 'doublecmd-gtk2-libre') @@ -62,7 +62,7 @@ package_doublecmd-libre-gtk2() { } package_doublecmd-libre-qt() { - pkgdesc="twin-panel (commander-style) file manager (QT), without libunrar recommendation" + pkgdesc="twin-panel (commander-style) file manager (QT), without nonfree libunrar recommendation" depends=('qt4pas') conflicts=('doublecmd-libre-gtk2' 'doublecmd-qt' 'doublecmd-qt-libre') replaces=('doublecmd-qt' 'doublecmd-qt-libre') diff --git a/libre/dvdrip-libre/PKGBUILD b/libre/dvdrip-libre/PKGBUILD index 71a938c66..06dee1752 100644 --- a/libre/dvdrip-libre/PKGBUILD +++ b/libre/dvdrip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 102182 2013-12-06 12:17:23Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Fredrik Hammar <Horney_C86@Hotmail.com> # Maintainer (Parabola): Márcio Silva <coadde@parabola.nu> @@ -6,8 +6,8 @@ _pkgname=dvdrip pkgname=dvdrip-libre pkgver=0.98.11 -pkgrel=10.2 -pkgdesc="A Gtk frontend for transcode writen in Perl, without opcional hal and unfree rar dependencies" +pkgrel=10.3 +pkgdesc="A Gtk frontend for transcode writen in Perl, without opcional hal and nonfree rar vobsub compression support" arch=('i686' 'x86_64') license=('custom') url="http://www.exit1.org/${_pkgname}/" @@ -32,10 +32,14 @@ md5sums=('6dfa4199d451757a37eea233a07da4c0' 'e91cf411928fd0500d07a0022b4ef546' 'bc006d3b3447f8b62ae6ba29773a064b') -build() { +prepare() { cd "${srcdir}/${_pkgname}-${pkgver}" patch -Np1 -i "$srcdir/libre.patch" +} + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" # install module in vendor directories. PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor diff --git a/libre/hexchat-libre/PKGBUILD b/libre/hexchat-libre/PKGBUILD index b1c9228a6..3c430015a 100644 --- a/libre/hexchat-libre/PKGBUILD +++ b/libre/hexchat-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97268 2013-09-15 22:44:23Z alucryd $ +# $Id: PKGBUILD 107420 2014-03-17 10:06:48Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: TingPing <tingping@tingping.se> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -6,17 +6,16 @@ _pkgname=hexchat pkgname=hexchat-libre pkgver=2.9.6.1 -pkgrel=1 -pkgdesc="A popular and easy to use graphical IRC (chat) client, without nonfree browser reference (Parabola rebranded)" +pkgrel=2 +pkgdesc='A popular and easy to use graphical IRC (chat) client, without nonfree browser reference (Parabola rebranded)' arch=('i686' 'x86_64' 'mips64el') -url="http://hexchat.github.io/" +url='http://hexchat.github.io/' license=('GPL') depends=('dbus-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'libcanberra' 'libnotify' 'libproxy' 'libsexy' 'pciutils') makedepends=('perl' 'python') optdepends=('enchant: Spell check' 'perl: Perl plugin' 'python: Python plugin') -options=('!libtool') install="${_pkgname}.install" replaces=$_pkgname conflicts=$_pkgname @@ -34,14 +33,14 @@ build() { sed -i '\|NAME Open Link| s|Firefox|Iceweasel|' src/common/hexchat.c sed -i '\|NAME Open Link| s|firefox -private %s\\n\\n";|iceweasel -private %s\\n\\n"\\\n "NAME Open Link in Private Icecat Window\\n" "CMD !icecat -private %s\\n\\n";|' src/common/hexchat.c - ./configure --prefix='/usr' --enable-{python='python3',shm,spell='libsexy',textfe} + ./configure --prefix='/usr' --enable-{python='python3.4',shm,spell='libsexy',textfe} make } package() { cd ${_pkgname}-${pkgver} - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install } # vim: ts=2 sw=2 et: diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD index 732537aa8..67865faeb 100644 --- a/libre/icecat-noscript/PKGBUILD +++ b/libre/icecat-noscript/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 106974 2014-03-11 09:44:54Z spupykin $ +# $Id: PKGBUILD 108368 2014-03-27 09:25:40Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> _pkgname=firefox-noscript pkgname=icecat-noscript -pkgver=2.6.8.17 +pkgver=2.6.8.19 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=('11a37854aeda9eae8de3a822633a369d') +md5sums=('9d1e6ff5f01b4758e84465f5d3ca976d') package() { # _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-` diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD index 87a1964d3..f39297529 100644 --- a/libre/iceweasel-noscript/PKGBUILD +++ b/libre/iceweasel-noscript/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 106974 2014-03-11 09:44:54Z spupykin $ +# $Id: PKGBUILD 108368 2014-03-27 09:25:40Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> _pkgname=firefox-noscript pkgname=iceweasel-noscript -pkgver=2.6.8.17 +pkgver=2.6.8.19 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=('11a37854aeda9eae8de3a822633a369d') +md5sums=('9d1e6ff5f01b4758e84465f5d3ca976d') package() { # _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-` diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index a33841bb2..ec7b621f5 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -5,8 +5,8 @@ _pkgname=kdenetwork-kopete pkgname=kdenetwork-kopete-libre pkgver=4.12.3 -pkgrel=1 -pkgdesc='Instant Messenger, without Skype support' +pkgrel=1.1 +pkgdesc='Instant Messenger, without nonfree Skype support' url='http://kde.org/applications/internet/kopete/' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD index 4da010a38..5f44d0c5d 100644 --- a/libre/libquicktime-libre/PKGBUILD +++ b/libre/libquicktime-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 100489 2013-11-05 09:06:26Z bpiotrowski $ +# $Id: PKGBUILD 108180 2014-03-24 09:50:56Z bpiotrowski $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor (Parabola): Jorge Lopez <jorginho@lavabit.com> @@ -6,7 +6,7 @@ pkgname=libquicktime-libre _pkgname=libquicktime pkgver=1.2.4 -pkgrel=8 +pkgrel=9 pkgdesc="A library for reading and writing quicktime files, without nonfree faac support" arch=('i686' 'x86_64') license=('GPL') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index ef8344dce..0c533759a 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 207134 2014-03-07 14:06:45Z thomas $ +# $Id: PKGBUILD 208677 2014-03-24 21:47:07Z thomas $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -10,7 +10,7 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.13 -_sublevel=6 +_sublevel=7 pkgver=${_basekernel}.${_sublevel} pkgrel=1 _lxopkgver=${_basekernel}.6 # nearly always the same as pkgver @@ -41,7 +41,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'i8042-fix-aliases.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz") md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1' - 'bd937981937fd3c7a553fc770236e640' + '49c182728e5b977daefa5e8b0ca028e0' 'b6a3a3f9cac1be38384241ad58d45d46' '3740951ae165b89a2139d45ae7d82173' 'e49ac236dfeef709f91a3d993ea7b62c' diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD index c4e845d08..a6e0a2fc1 100644 --- a/libre/luxrender-libre/PKGBUILD +++ b/libre/luxrender-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 108358 2014-03-27 01:56:32Z svenstaro $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: flixie <69one@gmx.net> # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org> @@ -7,16 +7,15 @@ _pkgname=luxrender pkgname=$_pkgname-libre pkgver=1.3.1 _pkgver=d0b0e20c47cc -pkgrel=3 -pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendation" +pkgrel=6 +pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree nvidia-utils, amdstream and intel-opencl-sdk recommendation" arch=('i686' 'x86_64' 'mips64el') url="http://www.$_pkgname.net/" license=('GPL') -depends=('boost-libs' 'freeimage' 'openexr' 'mesa-libcl' 'mesa-libgl' 'fftw') -optdepends=('blender-addon-luxrender: Blender for renderer and exporter' 'qt4: Qt GUI' \ +depends=('boost-libs' 'freeimage' 'openexr' 'libcl' 'libgl' 'fftw') +optdepends=('blender-addon-luxrender: Blender exporter' 'qt4: Qt GUI' \ 'python: Python interface (pylux)') -makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers' \ - 'clang') +makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers') provides=($_pkgname=$pkgver) conflicts=$_pkgname replaces=$_pkgname @@ -34,14 +33,12 @@ prepare() { build() { cd "$srcdir"/$_pkgname-lux-$_pkgver - export CC=clang - export CXX=clang++ - export CXXFLAGS="$CXXFLAGS -lpthread" - cmake . -DCMAKE_INSTALL_PREFIX=/usr \ + cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DLUXRAYS_DISABLE_OPENCL=OFF \ -DPYTHON_CUSTOM=ON \ - -DPYTHON_LIBRARIES=/usr/lib/libpython3.3m.so \ - -DPYTHON_INCLUDE_PATH=/usr/include/python3.3m + -DPYTHON_LIBRARIES=/usr/lib/libpython3.4m.so \ + -DPYTHON_INCLUDE_PATH=/usr/include/python3.4m/ \ + . make } @@ -53,7 +50,7 @@ package() { [[ $CARCH == x86_64 ]] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib #install pylux - install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.3/pylux.so + install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.4/pylux.so } # vim:set ts=2 sw=2 et: diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-libre-vaapi/PKGBUILD index 7b7870e69..68873d749 100644 --- a/libre/mplayer-vaapi-libre/PKGBUILD +++ b/libre/mplayer-libre-vaapi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 104019 2014-01-14 16:12:02Z bpiotrowski $ +# $Id: PKGBUILD 108189 2014-03-24 13:39:00Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> @@ -7,9 +7,9 @@ # Contributor (Parabola): Márcio Silva <coadde@parabola.nu> _pkgname=mplayer-vaapi -pkgname=mplayer-vaapi-libre +pkgname=mplayer-libre-vaapi pkgver=36265 -pkgrel=8 +pkgrel=9 pkgdesc="A movie player, compiled with vaapi support, without nonfree faac support" arch=('i686' 'x86_64') url="http://gitorious.org/vaapi/mplayer" @@ -21,9 +21,9 @@ depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio-paranoia' 'libxinerama' 'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi' 'libbluray' 'libva' 'libass' 'desktop-file-utils') makedepends=('unzip' 'live-media' 'yasm' 'ladspa' 'git' 'mesa') -provides=("mplayer=$pkgver" "mplayer-vaapi=$pkgver") -conflicts=('mplayer' 'mplayer-vaapi') -replaces=('mplayer-vaapi') +provides=("mplayer=$pkgver" "mplayer-vaapi=$pkgver" 'mplayer-vaapi-libre') +conflicts=('mplayer' 'mplayer-vaapi' 'mplayer-vaapi-libre') +replaces=('mplayer-vaapi' 'mplayer-vaapi-libre') backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') source=(http://pkgbuild.com/~foutrelis/sources/$_pkgname/$_pkgname-$pkgver.tar.xz{,.sig} cdio-includes.patch diff --git a/libre/mplayer-vaapi-libre/cdio-includes.patch b/libre/mplayer-libre-vaapi/cdio-includes.patch index 894650717..894650717 100644 --- a/libre/mplayer-vaapi-libre/cdio-includes.patch +++ b/libre/mplayer-libre-vaapi/cdio-includes.patch diff --git a/libre/mplayer-vaapi-libre/mplayer-vaapi.install b/libre/mplayer-libre-vaapi/mplayer-vaapi.install index a44f19aef..a44f19aef 100644 --- a/libre/mplayer-vaapi-libre/mplayer-vaapi.install +++ b/libre/mplayer-libre-vaapi/mplayer-vaapi.install diff --git a/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch b/libre/mplayer-libre-vaapi/subreader-fix-srt-parsing.patch index f1c087377..f1c087377 100644 --- a/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch +++ b/libre/mplayer-libre-vaapi/subreader-fix-srt-parsing.patch diff --git a/libre/mplayer-vaapi-libre/tweak-desktop-file.patch b/libre/mplayer-libre-vaapi/tweak-desktop-file.patch index 606e356b0..606e356b0 100644 --- a/libre/mplayer-vaapi-libre/tweak-desktop-file.patch +++ b/libre/mplayer-libre-vaapi/tweak-desktop-file.patch diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 35054754d..9c4dd49ab 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -1,5 +1,6 @@ -# $Id: PKGBUILD 204039 2014-01-14 12:09:50Z jgc $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> +# $Id: PKGBUILD 208941 2014-03-28 21:27:08Z bpiotrowski $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> # Contributor (Parabola): Márcio Silva <coadde@parabola.nu> @@ -7,109 +8,115 @@ _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') -pkgver=36498 -pkgrel=5 +pkgver=37051 +pkgrel=2.1 arch=('i686' 'x86_64') makedepends=( - 'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' - 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' - 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' - 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip' 'mesa' - 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' - 'libcdio-paranoia' 'opus' - ) + 'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' + 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' + 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' + 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip' 'mesa' + 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' + 'libcdio-paranoia' 'opus' 'subversion' +) license=('GPL') url='http://www.mplayerhq.hu/' options=('!buildflags' '!emptydirs') -source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz - http://ffmpeg.org/releases/ffmpeg-2.1.tar.bz2 +source=($_pkgbase-$pkgver::svn://svn.mplayerhq.hu/mplayer/trunk#revision=$pkgver + http://ffmpeg.org/releases/ffmpeg-2.2.tar.bz2 mplayer.desktop cdio-includes.patch include-samba-4.0.patch) -md5sums=('8b856e8833d910b6e38b04bb8453d0dc' - '4ec1cedd4c7753512462f70b347c338a' +md5sums=('SKIP' + '744febca199548c9393b1f1ed05ccdd8' '62f44a58f072b2b1a3c3d3e4976d64b3' '7b5be7191aafbea64218dc4916343bbc' '868a92bdef148df7f38bfa992b26ce9d') +pkgver() { + cd $_pkgbase-$pkgver + svnversion +} + prepare() { - cd $_pkgbase-$pkgver - patch -p0 -i ../cdio-includes.patch - patch -p1 -i ../include-samba-4.0.patch + cd $_pkgbase-$pkgver + mv ../ffmpeg-2.2 ./ffmpeg + + patch -p0 -i ../cdio-includes.patch + patch -p1 -i ../include-samba-4.0.patch - mv ../ffmpeg-2.1 ./ffmpeg + ./version.sh } build() { - cd $_pkgbase-$pkgver + cd $_pkgbase-$pkgver - ./configure --prefix=/usr \ - --enable-runtime-cpudetection \ - --disable-gui \ - --disable-arts \ - --disable-liblzo \ - --disable-speex \ - --disable-openal \ - --disable-libdv \ - --disable-musepack \ - --disable-esd \ - --disable-mga \ - --disable-ass-internal \ - --disable-cdparanoia \ - --enable-xvmc \ - --enable-radio \ - --enable-radio-capture \ - --enable-smb \ - --language=all \ - --confdir=/etc/mplayer - [[ "$CARCH" = "i686" ]] && sed 's|-march=i486|-march=i686|g' -i config.mak + ./configure --prefix=/usr \ + --enable-runtime-cpudetection \ + --disable-gui \ + --disable-arts \ + --disable-liblzo \ + --disable-speex \ + --disable-openal \ + --disable-libdv \ + --disable-musepack \ + --disable-esd \ + --disable-mga \ + --disable-ass-internal \ + --disable-cdparanoia \ + --enable-xvmc \ + --enable-radio \ + --enable-radio-capture \ + --enable-smb \ + --language=all \ + --confdir=/etc/mplayer + [[ "$CARCH" = "i686" ]] && sed 's|-march=i486|-march=i686|g' -i config.mak - make + make } package_mplayer-libre() { - pkgdesc="A movie player for GNU/Linux, without nonfree faac support" - install=mplayer.install - backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') - depends=( - 'desktop-file-utils' 'ttf-font' 'enca' 'libxss' 'a52dec' 'libvpx' - 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' - 'libgl' 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' - 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' - 'fribidi' 'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' - 'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia' 'opus' - ) - provides=("mplayer=$pkgver") - replaces=('mplayer') - conflicts=('mplayer') + pkgdesc='Media player for GNU/Linux, without nonfree faac support' + install=mplayer.install + backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') + depends=( + 'desktop-file-utils' 'ttf-font' 'enca' 'libxss' 'a52dec' 'libvpx' + 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' + 'libgl' 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' + 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' + 'fribidi' 'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' + 'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia' 'opus' + ) + provides=("mplayer=$pkgver") + replaces=('mplayer') + conflicts=('mplayer') - cd $_pkgbase-$pkgver - make DESTDIR="$pkgdir" install-mplayer install-mplayer-man + cd $_pkgbase-$pkgver + make DESTDIR="$pkgdir" install-mplayer install-mplayer-man - install -Dm644 etc/{codecs.conf,input.conf,example.conf} \ - "$pkgdir/etc/mplayer/" + install -Dm644 etc/{codecs.conf,input.conf,example.conf} \ + "$pkgdir/etc/mplayer/" - # desktop file FS#14770 - install -Dm644 "$srcdir/mplayer.desktop" \ - "$pkgdir/usr/share/applications/mplayer.desktop" - install -Dm644 etc/mplayer256x256.png \ - "$pkgdir/usr/share/pixmaps/mplayer.png" + # desktop file (FS#14770) + install -Dm644 ../mplayer.desktop \ + "$pkgdir"/usr/share/applications/mplayer.desktop + install -Dm644 etc/mplayer256x256.png \ + "$pkgdir"/usr/share/pixmaps/mplayer.png } package_mencoder-libre() { - pkgdesc="Free command line video decoding, encoding and filtering tool, without nonfree faac support" - depends=( - 'enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' - 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' - 'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' - 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia' - 'libvorbis' 'opus' - ) - provides=("mencoder=$pkgver") - replaces=('mencoder') - conflicts=('mencoder') + pkgdesc='Free command line video decoding, encoding and filtering tool, without nonfree faac support' + depends=( + 'enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' + 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' + 'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' + 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia' + 'libvorbis' 'opus' + ) + provides=("mencoder=$pkgver") + replaces=('mencoder') + conflicts=('mencoder') - cd $_pkgbase-$pkgver - make DESTDIR="$pkgdir" install-mencoder install-mencoder-man - find "$pkgdir/usr/share/man" -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} + + make -C $_pkgbase-$pkgver DESTDIR="$pkgdir" install-mencoder install-mencoder-man + find "$pkgdir"/usr/share/man -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} + } diff --git a/libre/ogre-libre/PKGBUILD b/libre/ogre-libre/PKGBUILD index c7760d9da..e7bf84fcf 100644 --- a/libre/ogre-libre/PKGBUILD +++ b/libre/ogre-libre/PKGBUILD @@ -14,7 +14,7 @@ pkgname=( #$_bldname-addon-$pkgbase # package unstable ) pkgver=1.9.0 -pkgrel=4 +pkgrel=5 pkgdesc='Scene-oriented, flexible 3D engine written in C++, without nonfree software support and files' arch=( mips64el @@ -45,17 +45,17 @@ makedepends=( ) mksource=( ogre::hg+https://bitbucket.org/sinbad/ogre/src#tag=v${pkgver//./-} - libre.patch ) source=( - https://repo.parabolagnulinux.org/other/$pkgbase/$pkgbase-libre-$pkgver.tar.xz + https://repo.parabolagnulinux.org/other/$pkgbase-libre/$pkgbase-libre-$pkgver.tar.xz + libre.patch ) mksha512sums=( SKIP - e668b39e4784e4b1b17ec6e21b5cef45f29a8d8e73288817ce7832d1fe24527d5e0d4fd67b8f756db301e4211ceac2d5c387c1599e799ca41de0593457204767 ) sha512sums=( - 9be9dbd78e09c8c50cf833004bfa3fbb7b3cd2a0f52a4e8c4beb1eb30357625455d65906bd007be6c2be9cf90a0e335d5ad7c5011e038c3d0754d5b3b18c4a2a + 13e743d65affd6813f6e3c6064d543bfe2d013a8d44bec203dc819859618114f0e5c7f5e67a98250d0174497dd58a9238956e04ac9f7925695ab6ebda555c412 + 5480c08c6faf48c1aabde1efd9508165c2fbea78f19d58c6360ea310c223d1979a7d7eaa15c9a70c8c3b3e7f89877c6f47e7fe16638ae77c463d55e87a5a3316 ) mksource() { @@ -67,12 +67,14 @@ mksource() { rm -rv Samples/Media/materials/textures/nvidia rm -v Samples/Media/packs/chiropteraDM.{pk3,txt} rm -v CMake/Templates/quakemap{,_d}.cfg.in - patch -Np1 -i $srcdir/libre.patch } -build() { +prepare() { cd ${pkgbase} + # remove nonfree references + patch -Np1 -i $srcdir/libre.patch + # add symlinks to point to mesa header files cd RenderSystems/GL/include/GL ln -sv /usr/include/GL/gl.h gl.h @@ -80,6 +82,10 @@ build() { ln -sv /usr/include/GL/wglext.h wglext.h ln -sv /usr/include/GL/glxtokens.h glxtokens.h ln -sv /usr/include/GL/glxext.h glxext.h +} + +build() { + cd ${pkgbase} # get a clean build dir [[ -d build ]] && rm -vrf build @@ -122,7 +128,8 @@ build() { -D${pkgbase^^}_LIB_DIRECTORY=lib\ -D${pkgbase^^}_PROFILING=TRUE\ -D${pkgbase^^}_USE_BOOST=TRUE - make V=0 +# make V=0 + make } package_ogre-libre() { @@ -141,7 +148,7 @@ package_ogre-libre() { # install license install -vDm644 ../Docs/License.html $pkgdir/usr/share/licenses/$pkgbase/license.html - # remove nonfree files + # remove files only useful for nonfree software rm -vr $pkgdir/usr/lib/OGRE/cmake rm -v $pkgdir/usr/include/OGRE/Example*.h } diff --git a/libre/ogre-libre/libre.patch b/libre/ogre-libre/libre.patch index 77c32c8d4..e9a1846b1 100644 --- a/libre/ogre-libre/libre.patch +++ b/libre/ogre-libre/libre.patch @@ -1,6 +1,6 @@ diff -Nur ogre.orig/CMake/InstallResources.cmake ogre/CMake/InstallResources.cmake ---- ogre.orig/CMake/InstallResources.cmake 2014-01-15 01:56:25.549401653 -0200 -+++ ogre/CMake/InstallResources.cmake 2014-01-21 21:24:52.510763877 -0200 +--- ogre.orig/CMake/InstallResources.cmake 2014-03-31 16:44:40.544894640 -0300 ++++ ogre/CMake/InstallResources.cmake 2014-03-31 16:59:12.012359302 -0300 @@ -116,9 +116,6 @@ # create plugins.cfg configure_file(${OGRE_TEMPLATES_DIR}/plugins_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/plugins_d.cfg) @@ -11,7 +11,47 @@ diff -Nur ogre.orig/CMake/InstallResources.cmake ogre/CMake/InstallResources.cma # create samples.cfg configure_file(${OGRE_TEMPLATES_DIR}/samples_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/samples_d.cfg) configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg) -@@ -219,11 +216,6 @@ +@@ -133,7 +130,6 @@ + ${OGRE_BINARY_DIR}/inst/bin/debug/plugins_d.cfg + ${OGRE_BINARY_DIR}/inst/bin/debug/samples_d.cfg + ${OGRE_BINARY_DIR}/inst/bin/debug/tests_d.cfg +- ${OGRE_BINARY_DIR}/inst/bin/debug/quakemap_d.cfg + DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_DEBUG_PATH}" CONFIGURATIONS Debug + ) + install(FILES +@@ -141,7 +137,6 @@ + ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg + ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg + ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg +- ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg + DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_RELEASE_PATH}" CONFIGURATIONS Release None "" + ) + install(FILES +@@ -149,7 +144,6 @@ + ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg + ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg + ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg +- ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg + DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo + ) + install(FILES +@@ -157,7 +151,6 @@ + ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg + ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg + ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg +- ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg + DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel + ) + +@@ -168,7 +161,6 @@ + ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg + ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg + ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg +- ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg + DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_RELEASE_PATH}" + ) + endif() +@@ -219,11 +211,6 @@ configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/release/plugins.cfg) configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/plugins.cfg) configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/plugins.cfg) @@ -23,9 +63,40 @@ diff -Nur ogre.orig/CMake/InstallResources.cmake ogre/CMake/InstallResources.cma # create samples.cfg configure_file(${OGRE_TEMPLATES_DIR}/samples_d.cfg.in ${OGRE_BINARY_DIR}/bin/debug/samples_d.cfg) configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/bin/release/samples.cfg) +@@ -243,8 +230,6 @@ + configure_file(${OGRE_TEMPLATES_DIR}/resources${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/resources${OGRE_CFG_SUFFIX}.cfg) + # create plugins.cfg + configure_file(${OGRE_TEMPLATES_DIR}/plugins${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/plugins${OGRE_CFG_SUFFIX}.cfg) +- # create quakemap.cfg +- configure_file(${OGRE_TEMPLATES_DIR}/quakemap${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/quakemap${OGRE_CFG_SUFFIX}.cfg) + # create samples.cfg + configure_file(${OGRE_TEMPLATES_DIR}/samples${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/samples${OGRE_CFG_SUFFIX}.cfg) + # create tests.cfg +diff -Nur ogre.orig/CMake/Templates/Android_resources.cfg.in ogre/CMake/Templates/Android_resources.cfg.in +--- ogre.orig/CMake/Templates/Android_resources.cfg.in 2014-03-31 16:44:40.591560636 -0300 ++++ ogre/CMake/Templates/Android_resources.cfg.in 2014-03-31 17:02:01.633252779 -0300 +@@ -12,7 +12,6 @@ + APKFileSystem=/materials/programs/GLSLES + APKFileSystem=/materials/scripts + APKFileSystem=/materials/textures +-APKFileSystem=/materials/textures/nvidia + APKFileSystem=/models + APKFileSystem=/particle + APKFileSystem=/RTShaderLib +diff -Nur ogre.orig/CMake/Templates/SDK_CMakeLists.txt.in ogre/CMake/Templates/SDK_CMakeLists.txt.in +--- ogre.orig/CMake/Templates/SDK_CMakeLists.txt.in 2014-03-31 16:44:40.618226919 -0300 ++++ ogre/CMake/Templates/SDK_CMakeLists.txt.in 2014-03-31 16:59:35.715351689 -0300 +@@ -245,7 +245,6 @@ + configure_file(${OGRE_SOURCE_DIR}/plugins.cfg ${OGRE_BINARY_DIR}/bin/plugins.cfg COPYONLY) + configure_file(${OGRE_SOURCE_DIR}/resources.cfg ${OGRE_BINARY_DIR}/bin/resources.cfg COPYONLY) + configure_file(${OGRE_SOURCE_DIR}/samples.cfg ${OGRE_BINARY_DIR}/bin/samples.cfg COPYONLY) +- configure_file(${OGRE_SOURCE_DIR}/quakemap.cfg ${OGRE_BINARY_DIR}/bin/quakemap.cfg COPYONLY) + endif () + + if (MINGW) diff -Nur ogre.orig/CMake/Templates/demomedia.wxi.in ogre/CMake/Templates/demomedia.wxi.in ---- ogre.orig/CMake/Templates/demomedia.wxi.in 2014-01-15 01:56:25.652728172 -0200 -+++ ogre/CMake/Templates/demomedia.wxi.in 2014-01-21 21:49:24.962291640 -0200 +--- ogre.orig/CMake/Templates/demomedia.wxi.in 2014-03-31 16:44:40.628226774 -0300 ++++ ogre/CMake/Templates/demomedia.wxi.in 2014-03-31 16:51:57.408610715 -0300 @@ -295,13 +295,6 @@ <ComponentRef Id="cmpA1FEB51B0386689568AAFC22E0D71B6B" /> <ComponentRef Id="cmpA3F7363F0553143ABF1CA52A2FD433D6" /> @@ -99,9 +170,113 @@ diff -Nur ogre.orig/CMake/Templates/demomedia.wxi.in ogre/CMake/Templates/demome -</Include> \ No newline at end of file +</Include> +diff -Nur ogre.orig/CMake/Templates/demos.wxs.in ogre/CMake/Templates/demos.wxs.in +--- ogre.orig/CMake/Templates/demos.wxs.in 2014-03-31 16:44:40.631560060 -0300 ++++ ogre/CMake/Templates/demos.wxs.in 2014-03-31 16:59:50.921799622 -0300 +@@ -39,7 +39,6 @@ + <File Source='..\bin\release\samples.cfg' Vital='yes' /> + <!-- Following config files are tweaked locally --> + <File Source='.\resources.cfg' Vital='yes' /> +- <File Source='.\quakemap.cfg' Vital='yes' /> + + <File Source="..\bin\release\SampleBrowser.exe" /> + <File Source='..\bin\release\Sample_BezierPatch.dll' Vital='yes' /> +diff -Nur ogre.orig/CMake/Templates/resources.cfg.in ogre/CMake/Templates/resources.cfg.in +--- ogre.orig/CMake/Templates/resources.cfg.in 2014-03-31 16:44:40.641559915 -0300 ++++ ogre/CMake/Templates/resources.cfg.in 2014-03-31 17:02:35.802761281 -0300 +@@ -12,7 +12,6 @@ + FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs + FileSystem=@OGRE_MEDIA_DIR_REL@/materials/scripts + FileSystem=@OGRE_MEDIA_DIR_REL@/materials/textures +-FileSystem=@OGRE_MEDIA_DIR_REL@/materials/textures/nvidia + FileSystem=@OGRE_MEDIA_DIR_REL@/models + FileSystem=@OGRE_MEDIA_DIR_REL@/particle + FileSystem=@OGRE_MEDIA_DIR_REL@/DeferredShadingMedia +diff -Nur ogre.orig/CMake/Templates/resources_d.cfg.in ogre/CMake/Templates/resources_d.cfg.in +--- ogre.orig/CMake/Templates/resources_d.cfg.in 2014-03-31 16:44:40.644893200 -0300 ++++ ogre/CMake/Templates/resources_d.cfg.in 2014-03-31 17:02:14.183072260 -0300 +@@ -12,7 +12,6 @@ + FileSystem=@OGRE_MEDIA_DIR_DBG@/materials/programs + FileSystem=@OGRE_MEDIA_DIR_DBG@/materials/scripts + FileSystem=@OGRE_MEDIA_DIR_DBG@/materials/textures +-FileSystem=@OGRE_MEDIA_DIR_DBG@/materials/textures/nvidia + FileSystem=@OGRE_MEDIA_DIR_DBG@/models + FileSystem=@OGRE_MEDIA_DIR_DBG@/particle + FileSystem=@OGRE_MEDIA_DIR_DBG@/DeferredShadingMedia +diff -Nur ogre.orig/Samples/BSP/include/BSP.h ogre/Samples/BSP/include/BSP.h +--- ogre.orig/Samples/BSP/include/BSP.h 2014-03-31 16:44:40.718225480 -0300 ++++ ogre/Samples/BSP/include/BSP.h 2014-03-31 16:58:16.993150707 -0300 +@@ -19,7 +19,6 @@ + { + mInfo["Title"] = "BSP"; + mInfo["Description"] = "A demo of the indoor, or BSP (Binary Space Partition) scene manager. " +- "Also demonstrates how to load BSP maps from Quake 3."; + mInfo["Thumbnail"] = "thumb_bsp.png"; + mInfo["Category"] = "Geometry"; + } +@@ -43,27 +42,6 @@ + + protected: + +- void locateResources() +- { +- // load the Quake archive location and map name from a config file +- ConfigFile cf; +- cf.load(mFSLayer->getConfigFilePath("quakemap.cfg")); +- mArchive = cf.getSetting("Archive"); +- mMap = cf.getSetting("Map"); +- +-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE || OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS +- // OS X does not set the working directory relative to the app, +- // In order to make things portable on OS X we need to provide +- // the loading with it's own bundle path location +- if (!Ogre::StringUtil::startsWith(mArchive, "/", false)) // only adjust relative dirs +- mArchive = Ogre::String(Ogre::macBundlePath() + "/" + mArchive); +-#endif +- +- // add the Quake archive to the world resource group +- ResourceGroupManager::getSingleton().addResourceLocation(mArchive, "Zip", +- ResourceGroupManager::getSingleton().getWorldResourceGroupName(), true); +- } +- + void createSceneManager() + { + mSceneMgr = mRoot->createSceneManager("BspSceneManager"); // the BSP scene manager is required for this sample +@@ -108,10 +86,6 @@ + // set a random player starting point + ViewPoint vp = mSceneMgr->getSuggestedViewpoint(true); + +- // Quake uses the Z axis as the up axis, so make necessary adjustments +- mCamera->setFixedYawAxis(true, Vector3::UNIT_Z); +- mCamera->pitch(Degree(90)); +- + mCamera->setPosition(vp.position); + mCamera->rotate(vp.orientation); + +diff -Nur ogre.orig/Samples/Browser/CMakeLists.txt ogre/Samples/Browser/CMakeLists.txt +--- ogre.orig/Samples/Browser/CMakeLists.txt 2014-03-31 16:44:40.734891905 -0300 ++++ ogre/Samples/Browser/CMakeLists.txt 2014-03-31 16:54:51.716103447 -0300 +@@ -307,8 +307,6 @@ + ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ + COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/macosx/samples.cfg + ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ +- COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/macosx/quakemap.cfg +- ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ + COMMAND ln ARGS -s -f ${OGRE_SOURCE_DIR}/Media + ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ + COMMAND ditto +@@ -323,8 +321,6 @@ + ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ + COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/samples.cfg + ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ +- COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/quakemap.cfg +- ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ + COMMAND ln ARGS -s -f ${OGRE_SOURCE_DIR}/Samples/Media + ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ + COMMAND ditto diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj ---- ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj 2014-01-15 01:56:25.872713663 -0200 -+++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj 2014-01-21 22:20:00.343185180 -0200 +--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj 2014-03-31 16:44:40.791557758 -0300 ++++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj 2014-03-31 16:51:57.408610715 -0300 @@ -555,48 +555,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild> @@ -196,8 +371,8 @@ diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj ogre/Samples/ \ No newline at end of file +</Project> diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters ---- ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters 2014-01-15 01:56:25.872713663 -0200 -+++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters 2014-01-21 22:20:41.517291770 -0200 +--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters 2014-03-31 16:44:40.808224186 -0300 ++++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters 2014-03-31 16:51:57.411944001 -0300 @@ -628,9 +628,6 @@ <None Include="..\..\Media\models\Barrel.mesh"> <Filter>Assets\media</Filter> @@ -274,8 +449,8 @@ diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters ogre/ \ No newline at end of file +</Project> diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj ---- ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj 2014-01-15 01:56:25.896045457 -0200 -+++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj 2014-01-21 21:53:56.997551091 -0200 +--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj 2014-03-31 16:44:40.821557325 -0300 ++++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj 2014-03-31 16:51:57.415277288 -0300 @@ -4356,21 +4356,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild> @@ -440,8 +615,8 @@ diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj ogre/Sample \ No newline at end of file +</Project> diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters ---- ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters 2014-01-15 01:56:25.899378571 -0200 -+++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters 2014-01-21 21:54:56.166945128 -0200 +--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters 2014-03-31 16:44:40.918222604 -0300 ++++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters 2014-03-31 16:51:57.415277288 -0300 @@ -731,9 +731,6 @@ <None Include="..\..\Media\models\Barrel.mesh"> <Filter>Assets\media</Filter> @@ -517,9 +692,31 @@ diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters ogr -</Project> \ No newline at end of file +</Project> +diff -Nur ogre.orig/Samples/Browser/WinRT.Xaml/resources.cfg ogre/Samples/Browser/WinRT.Xaml/resources.cfg +--- ogre.orig/Samples/Browser/WinRT.Xaml/resources.cfg 2014-03-31 16:44:40.771558046 -0300 ++++ ogre/Samples/Browser/WinRT.Xaml/resources.cfg 2014-03-31 17:00:55.510870562 -0300 +@@ -11,7 +11,6 @@ + FileSystem=media/materials/programs + FileSystem=media/materials/scripts + FileSystem=media/materials/textures +-FileSystem=media/materials/textures/nvidia + FileSystem=media/models + FileSystem=media/particle + FileSystem=media/DeferredShadingMedia +diff -Nur ogre.orig/Samples/Browser/WinRT.Xaml/resources_d.cfg ogre/Samples/Browser/WinRT.Xaml/resources_d.cfg +--- ogre.orig/Samples/Browser/WinRT.Xaml/resources_d.cfg 2014-03-31 16:44:40.771558046 -0300 ++++ ogre/Samples/Browser/WinRT.Xaml/resources_d.cfg 2014-03-31 17:01:16.207239528 -0300 +@@ -11,7 +11,6 @@ + FileSystem=media/materials/programs + FileSystem=media/materials/scripts + FileSystem=media/materials/textures +-FileSystem=media/materials/textures/nvidia + FileSystem=media/models + FileSystem=media/particle + FileSystem=media/DeferredShadingMedia diff -Nur ogre.orig/Samples/CMakeLists.txt ogre/Samples/CMakeLists.txt ---- ogre.orig/Samples/CMakeLists.txt 2014-01-15 01:56:25.932709706 -0200 -+++ ogre/Samples/CMakeLists.txt 2014-01-21 21:23:53.145016405 -0200 +--- ogre.orig/Samples/CMakeLists.txt 2014-03-31 16:44:40.941555601 -0300 ++++ ogre/Samples/CMakeLists.txt 2014-03-31 16:51:57.415277288 -0300 @@ -238,7 +238,6 @@ set(OGRE_MEDIA_DIR_TMP ${OGRE_MEDIA_DIR_REL}) set(OGRE_MEDIA_DIR_REL "Media") @@ -529,9 +726,9 @@ diff -Nur ogre.orig/Samples/CMakeLists.txt ogre/Samples/CMakeLists.txt set(OGRE_MEDIA_DIR_REL ${OGRE_MEDIA_DIR_TMP}) add_custom_target(demo_installer diff -Nur ogre.orig/Samples/EndlessWorld/include/EndlessWorld.h ogre/Samples/EndlessWorld/include/EndlessWorld.h ---- ogre.orig/Samples/EndlessWorld/include/EndlessWorld.h 2014-01-15 01:56:26.186026332 -0200 -+++ ogre/Samples/EndlessWorld/include/EndlessWorld.h 2014-01-21 21:51:44.043058960 -0200 -@@ -304,17 +304,6 @@ +--- ogre.orig/Samples/EndlessWorld/include/EndlessWorld.h 2014-03-31 16:44:41.174885577 -0300 ++++ ogre/Samples/EndlessWorld/include/EndlessWorld.h 2014-03-31 16:51:57.415277288 -0300 +@@ -307,17 +307,6 @@ defaultimp.inputScale = 600; defaultimp.minBatchSize = 33; defaultimp.maxBatchSize = 65; @@ -550,8 +747,8 @@ diff -Nur ogre.orig/Samples/EndlessWorld/include/EndlessWorld.h ogre/Samples/End /*----------------------------------------------------------------------------- diff -Nur ogre.orig/Samples/Media/volumeTerrain/triplanarReference.material ogre/Samples/Media/volumeTerrain/triplanarReference.material ---- ogre.orig/Samples/Media/volumeTerrain/triplanarReference.material 2014-01-15 01:56:27.849249967 -0200 -+++ ogre/Samples/Media/volumeTerrain/triplanarReference.material 2014-01-21 22:24:19.433708607 -0200 +--- ogre.orig/Samples/Media/volumeTerrain/triplanarReference.material 2014-03-31 16:44:41.678211671 -0300 ++++ ogre/Samples/Media/volumeTerrain/triplanarReference.material 2014-03-31 16:51:57.415277288 -0300 @@ -11,36 +11,6 @@ fragment_program_ref TriplanarReferenceHigh_PS { @@ -634,9 +831,9 @@ diff -Nur ogre.orig/Samples/Media/volumeTerrain/triplanarReference.material ogre \ No newline at end of file +} diff -Nur ogre.orig/Samples/Terrain/include/Terrain.h ogre/Samples/Terrain/include/Terrain.h ---- ogre.orig/Samples/Terrain/include/Terrain.h 2014-01-15 01:56:28.209226225 -0200 -+++ ogre/Samples/Terrain/include/Terrain.h 2014-01-21 21:55:51.099952029 -0200 -@@ -533,17 +533,6 @@ +--- ogre.orig/Samples/Terrain/include/Terrain.h 2014-03-31 16:44:42.381534889 -0300 ++++ ogre/Samples/Terrain/include/Terrain.h 2014-03-31 16:51:57.415277288 -0300 +@@ -534,17 +534,6 @@ defaultimp.inputScale = 600; defaultimp.minBatchSize = 33; defaultimp.maxBatchSize = 65; @@ -654,9 +851,21 @@ diff -Nur ogre.orig/Samples/Terrain/include/Terrain.h ogre/Samples/Terrain/inclu } +diff -Nur ogre.orig/Tests/CMakeLists.txt ogre/Tests/CMakeLists.txt +--- ogre.orig/Tests/CMakeLists.txt 2014-03-31 16:44:42.431534168 -0300 ++++ ogre/Tests/CMakeLists.txt 2014-03-31 16:55:11.432486511 -0300 +@@ -78,8 +78,6 @@ + ${OGRE_TEST_CONTENTS_PATH}/Resources/ + COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/samples.cfg + ${OGRE_TEST_CONTENTS_PATH}/Resources/ +- COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/quakemap.cfg +- ${OGRE_TEST_CONTENTS_PATH}/Resources/ + COMMAND ditto + ${OGRE_SOURCE_DIR}/Samples/Media/ ${OGRE_TEST_CONTENTS_PATH}/Resources/Media/ + COMMAND ditto diff -Nur ogre.orig/Tests/PlayPen/src/PlayPen.cpp ogre/Tests/PlayPen/src/PlayPen.cpp ---- ogre.orig/Tests/PlayPen/src/PlayPen.cpp 2014-01-15 01:56:28.309219629 -0200 -+++ ogre/Tests/PlayPen/src/PlayPen.cpp 2014-01-21 22:31:02.415114645 -0200 +--- ogre.orig/Tests/PlayPen/src/PlayPen.cpp 2014-03-31 16:44:42.661530860 -0300 ++++ ogre/Tests/PlayPen/src/PlayPen.cpp 2014-03-31 16:51:57.418610574 -0300 @@ -411,16 +411,6 @@ // mTerrain->update(); // updateDelay = 0.3; @@ -692,3 +901,66 @@ diff -Nur ogre.orig/Tests/PlayPen/src/PlayPen.cpp ogre/Tests/PlayPen/src/PlayPen // terrain->prepare(imp); // terrain->load(); // +diff -Nur ogre.orig/Tests/VisualTests/Context/CMakeLists.txt ogre/Tests/VisualTests/Context/CMakeLists.txt +--- ogre.orig/Tests/VisualTests/Context/CMakeLists.txt 2014-03-31 16:44:42.681530572 -0300 ++++ ogre/Tests/VisualTests/Context/CMakeLists.txt 2014-03-31 16:55:35.265477026 -0300 +@@ -137,8 +137,6 @@ + ${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/ + COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/resources.cfg + ${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/ +- COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/quakemap.cfg +- ${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/ + COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/tests.cfg + ${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/ + COMMAND ln ARGS -s -f ${OGRE_SOURCE_DIR}/Samples/Media +diff -Nur ogre.orig/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp ogre/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp +--- ogre.orig/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp 2014-03-31 16:44:42.711530141 -0300 ++++ ogre/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp 2014-03-31 16:56:35.361279265 -0300 +@@ -2018,47 +2018,6 @@ + addScreenshotFrame(10); + } + //---------------------------------------------------------------------------- +- +-void PlayPen_Bsp::setupContent() +-{ +- // Load Quake3 locations from a file +- ConfigFile cf; +- +- cf.load(mFSLayer->getConfigFilePath("quakemap.cfg")); +- +- String quakePk3 = cf.getSetting("Archive"); +- String quakeLevel = cf.getSetting("Map"); +- +- //ResourceGroupManager::getSingleton().addResourceLocation(quakePk3, "Zip"); +- +- ResourceGroupManager::getSingleton().addResourceLocation( +- quakePk3, "Zip", +- ResourceGroupManager::getSingleton().getWorldResourceGroupName(), true); +- +- // Load world geometry +- //mSceneMgr->setWorldGeometry(quakeLevel); +- +- ResourceGroupManager& rgm = ResourceGroupManager::getSingleton(); +- rgm.linkWorldGeometryToResourceGroup(rgm.getWorldResourceGroupName(), quakeLevel, mSceneMgr); +- rgm.initialiseResourceGroup(rgm.getWorldResourceGroupName()); +- rgm.loadResourceGroup(rgm.getWorldResourceGroupName(), false); +- +- // modify camera for close work +- mCamera->setNearClipDistance(4); +- mCamera->setFarClipDistance(4000); +- +- // Also change position, and set Quake-type orientation +- // Get random player start point +- ViewPoint vp = mSceneMgr->getSuggestedViewpoint(true); +- mCamera->setPosition(vp.position); +- mCamera->pitch(Degree(90)); // Quake uses X/Y horizon, Z up +- mCamera->rotate(vp.orientation); +- // Don't yaw along variable axis, causes leaning +- mCamera->setFixedYawAxis(true, Vector3::UNIT_Z); +- +- mCamera->yaw(Ogre::Degree(-90.f)); +-} +-//---------------------------------------------------------------------------- + //---------------------------------------------------------------------------- + + PlayPen_BuildTangentOnAnimatedMesh::PlayPen_BuildTangentOnAnimatedMesh() diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD index 12b1d4bc1..f53c3a28d 100644 --- a/libre/p7zip-libre/PKGBUILD +++ b/libre/p7zip-libre/PKGBUILD @@ -8,8 +8,8 @@ pkgname=p7zip-libre _pkgname=${pkgname%-libre} pkgver=9.20.1 -pkgrel=9 -pkgdesc='Command-line version of the 7zip compressed file archiver, without unrar support' +pkgrel=9.1 +pkgdesc='Command-line version of the 7zip compressed file archiver, without nonfree unrar support' url='http://p7zip.sourceforge.net/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/python-reportlab-libre/PKGBUILD b/libre/python-reportlab-libre/PKGBUILD index 401d61c9f..c211f1567 100644 --- a/libre/python-reportlab-libre/PKGBUILD +++ b/libre/python-reportlab-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 106308 2014-02-27 10:52:25Z jelle $ +# $Id: PKGBUILD 107615 2014-03-18 10:32:13Z jelle $ # Maintainer: # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: William Rea <sillywilly@gmail.com> @@ -10,12 +10,12 @@ pkgbase=python-reportlab-libre pkgname=(python2-reportlab-libre python-reportlab-libre) _origname=reportlab pkgver=3.0 -pkgrel=1 +pkgrel=2 pkgdesc="A proven industry-strength PDF generating solution, without nonfree Adobe T1 fonts support" arch=('i686' 'x86_64') url="http://www.reportlab.org/rl_toolkit.html" depends=('freetype2') -checkdepends=('python' 'python2') +checkdepends=('python' 'python2' 'python2-pillow' 'python-pillow') license=('custom') source=(http://www.reportlab.com/ftp/reportlab-$pkgver.tar.gz free-fonts.patch) diff --git a/libre/reflector/PKGBUILD b/libre/reflector/PKGBUILD index c8bc6bd5e..002607a7e 100644 --- a/libre/reflector/PKGBUILD +++ b/libre/reflector/PKGBUILD @@ -2,7 +2,7 @@ #Maintainer (Parabola): André Silva <emulatorman@parabola.nu> pkgname=reflector pkgver=2014 -pkgrel=2.1 +pkgrel=4 pkgdesc='A Python 3 module and script to retrieve and filter the latest Pacman mirror list (Parabola rebranded)' arch=(any) license=(GPL) diff --git a/libre/vim-runtime/PKGBUILD b/libre/vim-runtime/PKGBUILD index 189d67c6b..797c5c838 100644 --- a/libre/vim-runtime/PKGBUILD +++ b/libre/vim-runtime/PKGBUILD @@ -8,11 +8,11 @@ pkgbase=vim pkgname=vim-runtime _topver=7.4 -_patchlevel=135 -__hgrev=de28b1568fc2 +_patchlevel=214 +__hgrev=d2ef98a43b5d _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('custom:vim') url="http://www.vim.org" @@ -21,7 +21,7 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" "ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz.sig" 'vimrc' 'parabola.vim') -md5sums=('be672ce2a929503412378c998fc3dc27' +md5sums=('5ec7d7f84955dacfef88e52ebc79b267' 'SKIP' '27820c2bdc34624674c561ae6476bc6a' 'a8c21928eefd766e211f987879a9199c') diff --git a/libre/vim/PKGBUILD b/libre/vim/PKGBUILD deleted file mode 100644 index ed2252afd..000000000 --- a/libre/vim/PKGBUILD +++ /dev/null @@ -1,227 +0,0 @@ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: tobias [ tobias at archlinux org ] -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgbase=vim -pkgname=('vim' 'gvim' 'vim-runtime') -_topver=7.4 -_patchlevel=135 -__hgrev=de28b1568fc2 -_versiondir="vim${_topver//./}" -pkgver=${_topver}.${_patchlevel} -pkgrel=2.1 -arch=('i686' 'x86_64') -license=('custom:vim') -url="http://www.vim.org" -makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua') -source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" - "ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz.sig" - 'vimrc' - 'parabola.vim' - 'gvim.desktop') -md5sums=('be672ce2a929503412378c998fc3dc27' - 'SKIP' - '27820c2bdc34624674c561ae6476bc6a' - 'a8c21928eefd766e211f987879a9199c' - 'd90413bd21f400313a785bb4010120cd') - -# source PKGBUILD && mksource -mksource() { - [[ -x /usr/bin/hg ]] || (echo "hg not found. Install mercurial." && return 1) - - __hgroot='http://vim.googlecode.com/hg/' - __hgrepo='vim' - __hgbranch='default' - - hg clone -b ${__hgbranch} -u ${__hgrev} "${__hgroot}${__hgrepo}" ${__hgrepo} - - pushd ${__hgrepo} - if (( $(hg id -n) < $(hg id -nr ${__hgbranch}) )); then - printf 'You are not building the latest revision!\n' - printf "Consider updating __hgrev to $(hg id -r ${__hgbranch}).\n" - fi - popd - - mv vim ${pkgname}-${pkgver} - find ${pkgname}-${pkgver} -depth -type d -name .hg -exec rm -rf {} \; - rm ${pkgname}-${pkgver}/{.hgignore,.hgtags} - tar -cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/* - rm -r ${pkgname}-${pkgver} - - gpg --detach-sign ${pkgname}-${pkgver}.tar.xz - - scp ${pkgname}-${pkgver}.tar.xz nym:/srv/ftp/other/vim/ - scp ${pkgname}-${pkgver}.tar.xz.sig nym:/srv/ftp/other/vim/ -} - -build() { - cp -a ${pkgname}-${pkgver} vim-build - - # define the place for the global (g)vimrc file (set to /etc/vimrc) - sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \ - vim-build/src/feature.h - sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' \ - vim-build/src/feature.h - - (cd vim-build/src && autoconf) - - cp -a vim-build gvim-build - - cd "${srcdir}"/vim-build - - ./configure \ - --prefix=/usr \ - --localstatedir=/var/lib/vim \ - --with-features=huge \ - --with-compiledby='Parabola GNU/Linux-libre' \ - --enable-gpm \ - --enable-acl \ - --with-x=no \ - --disable-gui \ - --enable-multibyte \ - --enable-cscope \ - --disable-netbeans \ - --enable-perlinterp \ - --disable-pythoninterp \ - --disable-python3interp \ - --disable-rubyinterp \ - --disable-luainterp - - make - - cd "${srcdir}"/gvim-build - - ./configure \ - --prefix=/usr \ - --localstatedir=/var/lib/vim \ - --with-features=huge \ - --with-compiledby='Parabola GNU/Linux-libre' \ - --enable-gpm \ - --enable-acl \ - --with-x=yes \ - --enable-gui=gtk2 \ - --enable-multibyte \ - --enable-cscope \ - --enable-netbeans \ - --enable-perlinterp \ - --enable-pythoninterp \ - --disable-python3interp \ - --enable-rubyinterp \ - --enable-luainterp - - make -} - -check() { - # disable tests because they seem to freeze - - cd "${srcdir}"/vim-build - - #make test - - cd "${srcdir}"/gvim-build - - #make test -} - -package_vim() { - pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor' - depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm') - conflicts=('gvim') - - cd "${srcdir}"/vim-build - make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install - - # provided by (n)vi in core - rm "${pkgdir}"/usr/bin/{ex,view} - - # delete some manpages - find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \ - while read _mandir; do - cd ${_mandir} - rm -f ex.1 view.1 # provided by (n)vi - rm -f evim.1 # this does not make sense if we have no GUI - done - - # Runtime provided by runtime package - rm -r "${pkgdir}"/usr/share/vim - - # license - install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \ - "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt -} - -package_gvim() { - pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI)' - depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'libxt' - 'desktop-file-utils' 'gtk2' 'lua' 'python2') - provides=("vim=${pkgver}-${pkgrel}") - conflicts=('vim') - install=gvim.install - - cd "${srcdir}"/gvim-build - make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install - - # provided by (n)vi in core - rm "${pkgdir}"/usr/bin/{ex,view} - - # delete some manpages - find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \ - while read _mandir; do - cd ${_mandir} - rm -f ex.1 view.1 # provided by (n)vi - done - - # Move the runtime for later packaging - mv "${pkgdir}"/usr/share/vim "${srcdir}"/runtime-install - - # freedesktop links - install -Dm644 "${srcdir}"/gvim.desktop \ - "${pkgdir}"/usr/share/applications/gvim.desktop - install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png - - # license - install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \ - "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt -} - -package_vim-runtime() { - pkgdesc='Runtime for vim and gvim (Parabola rebranded)' - depends=('perl' 'gawk') - backup=('etc/vimrc') - - # Install the runtime split from gvim - install -dm755 "${pkgdir}"/usr/share - mv "${srcdir}"/runtime-install "${pkgdir}"/usr/share/vim - - # Don't forget logtalk.dict - install -Dm644 "${srcdir}"/gvim-build/runtime/ftplugin/logtalk.dict \ - "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict - - # fix FS#17216 - sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \ - "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim - - # patch filetype.vim for better handling of pacman related files - sed -i "s/rpmsave/pacsave/;s/rpmnew/pacnew/;s/,\*\.ebuild/\0,PKGBUILD*,*.install/" \ - "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim - sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \ - "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/changelog.vim - - # rc files - install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc - install -Dm644 "${srcdir}"/parabola.vim \ - "${pkgdir}"/usr/share/vim/vimfiles/parabola.vim - - # rgb.txt file - install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/rgb.txt \ - "${pkgdir}"/usr/share/vim/${_versiondir}/rgb.txt - - # license - install -dm755 "${pkgdir}"/usr/share/licenses/vim-runtime - ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \ - "${pkgdir}"/usr/share/licenses/vim-runtime/license.txt -} - -# vim:set sw=2 sts=2 et: diff --git a/libre/vim/gvim.desktop b/libre/vim/gvim.desktop deleted file mode 100644 index 675357da5..000000000 --- a/libre/vim/gvim.desktop +++ /dev/null @@ -1,63 +0,0 @@ -[Desktop Entry] -Name=Vi IMproved -Name[bg]=Vi Ðåäàêòîð -Name[ca]=Vi Millorat -Name[da]=Vi forbedret -Name[eo]=VIM -Name[et]=Täiustatud Vi (vim) -Name[fr]=Vi étendu (VIM) -Name[he]=רפושמ Vi -Name[hu]=Vi -Name[is]=Vi IMproved ritillinn -Name[it]=Vi iMproved -Name[no]=Vi IMproved (forbedret VI) -Name[pl]=Poprawiony VI (vim) -Name[ro]=VIM -Name[ru]=Улучшенный VI -Name[sk]=Vi IMpreved -Name[sl]=Izboljšani vi (vim) -Name[sv]=Förbättrad Vi -Name[zh_CN.GB2312]=改进的 Vi -Comment=Powerful text editor with scripting functions and macro recorder -Comment[bg]=Ðåäàêòîð ñ ìíîãî âúçìîæíîñòè -Comment[ca]=Editor vi potent -Comment[cs]=Mocný textový editor vi -Comment[da]=En kraftig vi tekstbehandler -Comment[de]=Ein leistungsfähiger vi-Editor -Comment[el]=Πανίσχυρος διορθωτής vi -Comment[eo]=VIM similas al redaktilo "vi", sed havas aldonajn ecojn -Comment[es]=Una versión mejorada del editor vi -Comment[et]=Võimas tekstiredaktor vi -Comment[fi]=Tehokas vi-tekstieditori -Comment[fr]=Éditeur vi puissant -Comment[gl]=Potente editor vi -Comment[he]=Vi המצועה בר ךרועה -Comment[hr]=Napredni vi uređivač -Comment[hu]=Vi szövegszerkesztő -Comment[is]=Öflug útgáfa vi ritilsins -Comment[it]=Un editor vi potenziato -Comment[ja]=強力なViエディタ -Comment[lt]=Galingas vi redaktorius -Comment[mk]=Моќен VI уредувач -Comment[nl]=Krachtige vi-editor -Comment[no]=En kraftig vi-redigerer -Comment[no_NY]=Kraftig vi-tekstredigeringsprogram -Comment[pl]=Edytor vi -Comment[pt]=Um poderoso editor de texto -Comment[ro]=Un editor de texte VI, puternic -Comment[ru]=Мощный текстовый редактор vi -Comment[sk]=Silný textový procesor vi -Comment[sl]=Zmogljivi urejevalnik vi -Comment[sr]=Moćni vi editor -Comment[sv]=En kraftfull texteditor -Comment[ta]=ºì¾¢Å¡öó¾ vi ¦¾¡ÌôÀ¡Ç÷ -Comment[tr]=Güçlü vi düzenleyicisi -Comment[uk]=Потужний редактор vi -Comment[zh_CN.GB2312]=功能强大的 vi 编辑器 -MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; -Exec=gvim -f %F -Icon=gvim -Type=Application -Terminal=false -X-XClassHintResName=VIM -Categories=Utility;TextEditor; diff --git a/libre/vim/gvim.install b/libre/vim/gvim.install deleted file mode 100644 index 2eaa60550..000000000 --- a/libre/vim/gvim.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/libre/vim/parabola.vim b/libre/vim/parabola.vim deleted file mode 100644 index bc3c1f82e..000000000 --- a/libre/vim/parabola.vim +++ /dev/null @@ -1,27 +0,0 @@ -" The Parabola GNU/Linux-libre global vimrc - setting only a few sane defaults -" -" Maintainer: Tobias Kieslich [tobias funnychar archlinux dot org] -" Maintainer for Parabola rebranding: André Silva [emulatorman funnychar parabola dot nu] -" -" NEVER EDIT THIS FILE, IT'S OVERWRITTEN UPON UPGRADES, GLOBAL CONFIGURATION -" SHALL BE DONE IN /etc/vimrc, USER SPECIFIC CONFIGURATION IN ~/.vimrc - -" Normally we use vim-extensions. If you want true vi-compatibility -" remove change the following statements -set nocompatible " Use Vim defaults instead of 100% vi compatibility -set backspace=indent,eol,start " more powerful backspacing - -" Now we set some defaults for the editor -set history=50 " keep 50 lines of command line history -set ruler " show the cursor position all the time - -" Suffixes that get lower priority when doing tab completion for filenames. -" These are files we are not likely to want to edit or read. -set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc - - -if has('gui_running') - " Make shift-insert work like in Xterm - map <S-Insert> <MiddleMouse> - map! <S-Insert> <MiddleMouse> -endif diff --git a/libre/vim/vimrc b/libre/vim/vimrc deleted file mode 100644 index fc67e7eb0..000000000 --- a/libre/vim/vimrc +++ /dev/null @@ -1,16 +0,0 @@ -" All system-wide defaults are set in $VIMRUNTIME/parabola.vim (usually just -" /usr/share/vim/vimfiles/parabola.vim) and sourced by the call to :runtime -" you can find below. If you wish to change any of those settings, you should -" do it in this file (/etc/vimrc), since parabola.vim will be overwritten -" everytime an upgrade of the vim packages is performed. It is recommended to -" make changes after sourcing parabola.vim since it alters the value of the -" 'compatible' option. - -" This line should not be removed as it ensures that various options are -" properly set to work with the Vim-related packages. -runtime! parabola.vim - -" If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim' -" Or better yet, read /usr/share/vim/vim74/vimrc_example.vim or the vim manual -" and configure vim to your own liking! - diff --git a/nonprism/bitlbee-libre-nonprism/PKGBUILD b/nonprism/bitlbee-libre-nonprism/PKGBUILD index 8ed31d8b9..9d29dce35 100644 --- a/nonprism/bitlbee-libre-nonprism/PKGBUILD +++ b/nonprism/bitlbee-libre-nonprism/PKGBUILD @@ -11,8 +11,8 @@ _pkgname=bitlbee pkgname=bitlbee-libre-nonprism pkgver=3.2.1 -pkgrel=2 -pkgdesc='Brings XMPP to IRC, without support for unsafe and dangerous for privacy protocols' +pkgrel=2.1 +pkgdesc='Brings XMPP to IRC, without nonfree Skype support and support for unsafe and dangerous for privacy protocols' url='http://www.bitlbee.org/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD index c5ad0543c..b60446276 100644 --- a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD +++ b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD @@ -5,8 +5,8 @@ _pkgname=kdenetwork-kopete pkgname=kdenetwork-kopete-libre-nonprism pkgver=4.12.3 -pkgrel=1 -pkgdesc='Instant Messenger, without Skype and support for unsafe and dangerous for privacy protocols' +pkgrel=1.1 +pkgdesc='Instant Messenger, without nonfree Skype support and support for unsafe and dangerous for privacy protocols' url='http://kde.org/applications/internet/kopete/' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') diff --git a/pcr/ocrodjvu/PKGBUILD b/pcr/ocrodjvu/PKGBUILD new file mode 100644 index 000000000..296b9d433 --- /dev/null +++ b/pcr/ocrodjvu/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Francois Garillot <francois[@]garillot.net> +# Contributor: Malkov Fyodor aka krox: iksut@yandex.ru +pkgname=ocrodjvu +pkgver=0.7.13 +pkgrel=1 +pkgdesc="ocrodjvu is a wrapper for OCR systems, that allows you to perform OCR on DjVu files." +arch=('i686' 'x86_64') +url='http://jwilk.net/software/ocrodjvu' +license=('GPL2') +depends=('python2' 'python2-lxml' 'python2-djvulibre') +optdepends=('cuneiform' 'hocr') +source=(http://pypi.python.org/packages/source/o/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('9b96520497e12ebcf68e61a056aad5a5') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ + -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + $(find ./ -name '*.py') + + python2 setup.py build + python2 setup.py install --root=$pkgdir +} diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD index 4802e5d46..7aa3bfca9 100644 --- a/pcr/pandoc/PKGBUILD +++ b/pcr/pandoc/PKGBUILD @@ -5,7 +5,7 @@ pkgname=pandoc-static _pkgname=pandoc -pkgver=1.12.3.1 +pkgver=1.12.3.3 pkgrel=1 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' @@ -15,11 +15,8 @@ arch=('i686' 'x86_64') depends=('icu>=52' 'icu<=53') makedepends=('ghc' 'sh' 'cabal-install' 'alex' 'happy') options=(strip !makeflags !distcc !emptydirs) -source=(https://repo.parabolagnulinux.org/other/$pkgname/${_pkgname}-${pkgver}-1-any.src.tar.xz{,.sig} +source=(https://repo.parabolagnulinux.org/other/pandoc-static/${_pkgname}-${pkgver}-1-any.src.tar.xz{,.sig} SRCBUILD) -sha256sums=('0fae0b3aaddd04219b882a421a6b977163ed9de8649c7023738e815661a77406' - 'SKIP' - '37af943126e85c2c6679d66f343d90b55e38429c9dec2f024afe9e191aa596f5') replaces=('pandoc') provides=('pandoc') optdepends=('texlive-most: for pdf creation') @@ -100,3 +97,9 @@ package() { install -d ${pkgdir}/usr/share/licenses cp -rv ${srcdir}/build/usr/share/doc/* ${pkgdir}/usr/share/licenses/ } +sha1sums=('4984149bad15e5b07594d130b4f9d2dad4286e67' + 'SKIP' + '734e0b61b5a1f1ebf42b77c0b52ef18cd899f461') +sha256sums=('7d469701d3bc033dce2e12fca8460f0d17fdb980a65dd25f266ee8f6071f5830' + 'SKIP' + 'a4370706e79992e570334584f647121096ed9b439f4531bfd11da247acff782e') diff --git a/pcr/pandoc/SRCBUILD b/pcr/pandoc/SRCBUILD index b18bad17b..618e4e220 100644 --- a/pcr/pandoc/SRCBUILD +++ b/pcr/pandoc/SRCBUILD @@ -2,7 +2,7 @@ # Based on haskell-pandoc pkgname=pandoc -pkgver=1.12.3.1 +pkgver=1.12.3.3 pkgrel=1 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' diff --git a/pcr/python2-djvulibre/PKGBUILD b/pcr/python2-djvulibre/PKGBUILD new file mode 100644 index 000000000..0d648272a --- /dev/null +++ b/pcr/python2-djvulibre/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: Francois Garillot <francois[@]garillot.net> +# Contributor: Anton Bazhenov <anton.bazhenov at gmail> +# Contributor: Malkov Fyodor aka krox <iksut@yandex.ru> + +pkgname=python2-djvulibre +pkgver=0.3.9 +pkgrel=2 +pkgdesc="A set of Python bindings for the DjVuLibre library" +arch=('i686' 'x86_64') +url="http://jwilk.net/software/python-djvulibre" +license=('GPL2') +depends=('djvulibre' 'python2') +makedepends=('cython2') +source=("http://pypi.python.org/packages/source/p/${pkgname/2}/${pkgname/2}-${pkgver}.tar.gz") +md5sums=('07d187300ac590c45c4030ce3cd28117') + +build() { + cd "${srcdir}/${pkgname/2}-${pkgver}" + sed -i "s/'cython'/'cython2'/" setup.py + python2 setup.py build +} + +package() { + cd "${srcdir}/${pkgname/2}-${pkgver}" + python2 setup.py install --root="${pkgdir}" +} diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index 407abd19b..9269d1de2 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=2014.03.07.1 +pkgver=2014.03.29 pkgrel=1 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" arch=('any') @@ -28,5 +28,5 @@ package() { "${pkgdir}/usr/share/bash-completion/completions/youtube-dl" install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" } -md5sums=('9b6630462d2619b8e95a25e473826f34' +md5sums=('190670e8160788712d9b0685ca6e132c' 'SKIP') |