diff options
45 files changed, 617 insertions, 353 deletions
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 3a392b94f..5950a071b 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 101792 2013-12-01 09:52:05Z andyrtr $ +# $Id: PKGBUILD 103861 2014-01-12 20:24:22Z foutrelis $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor : sebikul <sebikul@gmail.com> @@ -16,7 +16,7 @@ _components=('gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-xml' 'gambas3-gb-web') pkgname=(${_components[@]} 'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples') pkgver=3.5.1 -pkgrel=2 +pkgrel=3 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net/" diff --git a/community/gtkimageview/PKGBUILD b/community/gtkimageview/PKGBUILD index 13d410b6d..fe6627033 100644 --- a/community/gtkimageview/PKGBUILD +++ b/community/gtkimageview/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 102159 2013-12-06 11:35:48Z giovanni $ +# $Id: PKGBUILD 103868 2014-01-12 20:31:29Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jan Blazek <appolito@gmail.com> # Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com> pkgname=gtkimageview pkgver=1.6.4 -pkgrel=3 +pkgrel=4 pkgdesc="Simple image viewer widget for GTK2" arch=('i686' 'x86_64') -url="http://trac.bjourne.webfactional.com/" +url="https://github.com/GNOME/gtkimageview" license=('LGPL2.1') depends=('gtk2') -makedepends=('pkgconfig') -source=("http://trac.bjourne.webfactional.com/attachment/wiki/WikiStart/${pkgname}-${pkgver}.tar.gz?format=raw") +makedepends=('pkg-config') +source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('501367b3f50e69a12208dc9c6ad00b18') build() { @@ -20,6 +20,7 @@ build() { ./configure --prefix=/usr \ --disable-static + make } @@ -27,5 +28,6 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}/usr/share" } diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD index 09c8ce3ec..ae1e1e043 100644 --- a/community/mediainfo-gui/PKGBUILD +++ b/community/mediainfo-gui/PKGBUILD @@ -1,34 +1,33 @@ -# $Id: PKGBUILD 103797 2014-01-11 20:08:30Z eric $ +# $Id: PKGBUILD 103859 2014-01-12 19:04:40Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=mediainfo-gui pkgver=0.7.65 -pkgrel=5 +pkgrel=6 pkgdesc="GUI for mediainfo" arch=('i686' 'x86_64') url="http://mediainfo.sourceforge.net" license=('GPL') -depends=('libmediainfo' 'wxgtk' 'libsm') -makedepends=('libtool' 'automake' 'autoconf') +depends=('libmediainfo' 'wxgtk' 'libsm' 'desktop-file-utils') install=mediainfo-gui.install source=(http://downloads.sourceforge.net/mediainfo/mediainfo_${pkgver}.tar.bz2) md5sums=('19d7992a7d0cba0f5f731f993e8c537c') build() { - cd $srcdir/MediaInfo/Project/GNU/GUI + cd MediaInfo/Project/GNU/GUI sh ./autogen ./configure --prefix=/usr make } package() { - cd $srcdir/MediaInfo/Project/GNU/GUI - make DESTDIR=$pkgdir install - install -D -m 644 $srcdir/MediaInfo/Source/Resource/Image/MediaInfo.png \ - $pkgdir/usr/share/icons/hicolor/128x128/apps/mediainfo.png - install -D -m 644 $srcdir/MediaInfo/Source/Resource/Image/MediaInfo.png \ - $pkgdir/usr/share/pixmaps/mediainfo-gui.png - install -D -m 644 $srcdir/MediaInfo/Project/GNU/GUI/mediainfo-gui.desktop \ - $pkgdir/usr/share/applications/mediainfo-gui.desktop + cd MediaInfo/Project/GNU/GUI + make DESTDIR="$pkgdir" install + install -D -m 644 "$srcdir/MediaInfo/Source/Resource/Image/MediaInfo.png" \ + "$pkgdir/usr/share/icons/hicolor/128x128/apps/mediainfo.png" + install -D -m 644 "$srcdir/MediaInfo/Source/Resource/Image/MediaInfo.png" \ + "$pkgdir/usr/share/pixmaps/mediainfo-gui.png" + install -D -m 644 "$srcdir/MediaInfo/Project/GNU/GUI/mediainfo-gui.desktop" \ + "$pkgdir/usr/share/applications/mediainfo-gui.desktop" } diff --git a/community/mediainfo-gui/mediainfo-gui.install b/community/mediainfo-gui/mediainfo-gui.install index 28d8f7815..678df2aef 100644 --- a/community/mediainfo-gui/mediainfo-gui.install +++ b/community/mediainfo-gui/mediainfo-gui.install @@ -1,5 +1,6 @@ post_install() { which gtk-update-icon-cache >/dev/null && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q } post_upgrade() { diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD index 8f47b1d4d..1e99fca3f 100644 --- a/community/openimageio/PKGBUILD +++ b/community/openimageio/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 102264 2013-12-07 10:36:49Z bpiotrowski $ +# $Id: PKGBUILD 103862 2014-01-12 20:24:23Z foutrelis $ # Contributor: SpepS <dreamspepser at yahoo dot it> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=openimageio -pkgver=1.2.3 +pkgver=1.3.10 pkgrel=1 pkgdesc="A library for reading and writing images, including classes, utilities, and applications" arch=(i686 x86_64) @@ -13,13 +13,11 @@ depends=('openexr' 'boost-libs' 'jasper' 'glew' 'libtiff' 'opencolorio' 'intel-t makedepends=('cmake' 'qt4' 'python2' 'boost' 'mesa') optdepends=('qt4: iv image viewer' 'python2: bindings support') -source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver) -md5sums=('20066ae0e9026717242f64f107f7ee8e') +source=(https://github.com/OpenImageIO/oiio/archive/Release-${pkgver}.tar.gz) +md5sums=('e1cd34e1926b7c15626f8618e9e4fc70') build() { - cd "$srcdir"/$_pkgname* - - cd src + cd oiio-Release-$pkgver [[ -d build ]] && rm -r build mkdir build && cd build @@ -34,11 +32,11 @@ build() { } package() { - cd "$srcdir"/$_pkgname*/src/build + cd oiio-Release-$pkgver/build make DESTDIR="$pkgdir" install # license - cd ../.. + cd .. install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/openshadinglanguage/PKGBUILD b/community/openshadinglanguage/PKGBUILD index f663d9ac9..7029bfc7e 100644 --- a/community/openshadinglanguage/PKGBUILD +++ b/community/openshadinglanguage/PKGBUILD @@ -1,20 +1,25 @@ -# $Id: PKGBUILD 102265 2013-12-07 10:36:50Z bpiotrowski $ +# $Id: PKGBUILD 103863 2014-01-12 20:24:24Z foutrelis $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=openshadinglanguage -pkgver=1.4.0 -pkgrel=2 +pkgver=1.5.4dev +pkgrel=1 pkgdesc="Advanced shading language for production GI renderers" arch=(i686 x86_64) url="https://github.com/imageworks/OpenShadingLanguage" license=('custom') depends=('boost-libs' 'openimageio' 'openexr' 'intel-tbb' 'freetype2' 'libpng' 'libtiff' 'llvm') makedepends=('boost' 'cmake' 'clang') -source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz) -md5sums=('dcc7b6dfbc68d7af0d5cfa2940ff205b') +source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz + https://github.com/imageworks/OpenShadingLanguage/pull/320.patch) +md5sums=('4dda1fb2919d3440344d36ecbdf13d47' + '590137809ea344b41b1ad1e0fc81738c') build() { cd OpenShadingLanguage-Release-$pkgver + # LLVM 3.4 build fix + patch -Np1 < $srcdir/320.patch + cd src [[ -d build ]] && rm -r build diff --git a/community/pidgin-talkfilters/PKGBUILD b/community/pidgin-talkfilters/PKGBUILD new file mode 100644 index 000000000..f094aa050 --- /dev/null +++ b/community/pidgin-talkfilters/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Connor Behan <connor.behan@gmail.com> + +pkgname=pidgin-talkfilters +pkgver=2.7.0 +pkgrel=2 +pkgdesc="Implements GNU talkfilters in pidgin chats" +arch=('i686' 'x86_64') +url="https://bitbucket.org/rekkanoryo/purple-plugin-pack" +license=('GPL') +depends=('libpurple' 'talkfilters') +makedepends=('intltool' 'gettext' 'python2' 'pidgin') +source=(https://bitbucket.org/rekkanoryo/purple-plugin-pack/downloads/purple-plugin-pack-$pkgver.tar.bz2) +sha256sums=('2bbcf5e778a33968ba7f2864d2a6cb526a8984be3e4151642a583eee8eafb03c') + +build() { + cd "$srcdir"/purple-plugin-pack-$pkgver + + PYTHON=/usr/bin/python2 \ + ./configure --prefix=/usr --with-plugins=talkfilters +} + +package() { + cd "$srcdir"/purple-plugin-pack-$pkgver + + make + make DESTDIR="$pkgdir" install +} diff --git a/community/python-biopython/PKGBUILD b/community/python-biopython/PKGBUILD new file mode 100644 index 000000000..75d169a4e --- /dev/null +++ b/community/python-biopython/PKGBUILD @@ -0,0 +1,27 @@ +# $id$ +# Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com> +# Contributor: Stunts <f.pinamartins at gmail dot com> +# Contributor: damir <damir at archlinux dot org> + +pkgname=python-biopython +_upstream_pkgname=biopython +pkgver=1.63 +pkgrel=2 +pkgdesc="Freely available Python tools for computational molecular biology" +arch=('i686' 'x86_64') +url="http://www.biopython.org" +license=('custom') +depends=('python-numpy') +source=(http://www.biopython.org/DIST/${_upstream_pkgname}-${pkgver}.tar.gz) +md5sums=('09c58433150849b131d2d9bbfdf342d3') + +build() { + cd "${srcdir}/${_upstream_pkgname}-${pkgver}/" + python setup.py build +} + +package() { + cd "${srcdir}/${_upstream_pkgname}-${pkgver}/" + python setup.py install --root="${pkgdir}" + install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/community/python2-biopython/PKGBUILD b/community/python2-biopython/PKGBUILD new file mode 100644 index 000000000..c22385574 --- /dev/null +++ b/community/python2-biopython/PKGBUILD @@ -0,0 +1,48 @@ +# $id$ +# Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com> +# Contributor: Stunts <f.pinamartins at gmail dot com> +# Contributor: damir <damir at archlinux dot org> + +pkgname=python2-biopython +_upstream_pkgname=biopython +pkgver=1.63 +pkgrel=2 +pkgdesc="Freely available Python tools for computational molecular biology" +arch=('i686' 'x86_64') +url="http://www.biopython.org" +license=('custom') +depends=('python2-numpy') +optdepends=('python2-reportlab: for pdf graphics code' + 'mysql-python: for BioSQL module') +source=(http://www.biopython.org/DIST/${_upstream_pkgname}-${pkgver}.tar.gz) +md5sums=('09c58433150849b131d2d9bbfdf342d3') + +prepare() { + cd "${srcdir}/${_upstream_pkgname}-${pkgver}/" + # change python to python2 + sed -i "s|python|python2|g" "Bio/bgzf.py" + sed -i "s|python|python2|g" "Bio/DocSQL.py" + sed -i "s|python|python2|g" "Bio/kNN.py" + sed -i "s|python|python2|g" "Bio/LogisticRegression.py" + sed -i "s|python|python2|g" "Bio/PDB/parse_pdb_header.py" + sed -i "s|python|python2|g" "Bio/PDB/PDBList.py" + sed -i "s|python|python2|g" "Bio/Restriction/__init__.py" + sed -i "s|python|python2|g" "Bio/Restriction/PrintFormat.py" + sed -i "s|python|python2|g" "Bio/Restriction/Restriction.py" + sed -i "s|python|python2|g" "Bio/SeqUtils/__init__.py" + sed -i "s|python|python2|g" "Bio/UniProt/GOA.py" + sed -i "s|python|python2|g" "Bio/Wise/__init__.py" + sed -i "s|python|python2|g" "Bio/Wise/dnal.py" + sed -i "s|python|python2|g" "Bio/Wise/psw.py" +} + +build() { + cd "${srcdir}/${_upstream_pkgname}-${pkgver}/" + python2 setup.py build +} + +package() { + cd "${srcdir}/${_upstream_pkgname}-${pkgver}/" + python2 setup.py install --root="${pkgdir}" + install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/community/rubinius/PKGBUILD b/community/rubinius/PKGBUILD index 1d4d24942..3d1c47fa8 100644 --- a/community/rubinius/PKGBUILD +++ b/community/rubinius/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 103201 2013-12-29 21:58:18Z heftig $ +# $Id: PKGBUILD 103864 2014-01-12 20:24:24Z foutrelis $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgbase=rubinius pkgname=(rubinius rubinius-ruby) pkgver=2.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="Ruby runtime written in Ruby, designed for concurrency" arch=(i686 x86_64) url="http://rubini.us" @@ -13,16 +13,18 @@ depends=(llvm-libs libffi openssl libyaml) makedepends=(llvm rubinius-ruby) options=(!emptydirs) source=(http://releases.rubini.us/${pkgbase}-${pkgver}.tar.bz2 - gemrc dirs.patch) + gemrc dirs.patch llvm34.patch) sha256sums=('b3426aa6996420f1d9d8a7926a94160b84d8bdf725793c64462b27b74f2f2acf' '4bb7eb2fe66e396ed16b589cdb656831407b39ad4e138d88536754c0448ac614' - '93f3918dc2a5679e281e724f9b3cb712ffa784c1e52e6fa7ce75f74ce6655a66') + '93f3918dc2a5679e281e724f9b3cb712ffa784c1e52e6fa7ce75f74ce6655a66' + 'a24850f34a8a308ce4a4e1da12d75a669095a38b6b5da5082eb4d3bd41770095') prepare() { export GEM_HOME="$srcdir/gemdir" LANG="en_US.UTF-8" cd $pkgbase-$pkgver patch -Np1 -i ../dirs.patch + patch -Np1 -i ../llvm34.patch mkdir -p "$GEM_HOME" gem install --no-user-install -N vendor/cache/bundler-*.gem diff --git a/community/rubinius/llvm34.patch b/community/rubinius/llvm34.patch new file mode 100644 index 000000000..ca8f2d289 --- /dev/null +++ b/community/rubinius/llvm34.patch @@ -0,0 +1,182 @@ +diff --git i/vm/llvm/disassembler.cpp w/vm/llvm/disassembler.cpp +index 79c74ff..b3ea424 100644 +--- i/vm/llvm/disassembler.cpp ++++ w/vm/llvm/disassembler.cpp +@@ -46,20 +46,27 @@ namespace rubinius { + #if RBX_LLVM_API_VER > 300 + llvm::TargetOptions options; + options.NoFramePointerElim = true; ++#if RBX_LLVM_API_VER < 304 + options.NoFramePointerElimNonLeaf = true; ++#endif + target_machine = target->createTargetMachine(host, llvm::sys::getHostCPUName(), "", options); + #else + target_machine = target->createTargetMachine(host, llvm::sys::getHostCPUName(), ""); + #endif + + sub_target = target->createMCSubtargetInfo(host, llvm::sys::getHostCPUName(), ""); +- asm_info = target->createMCAsmInfo(host); + + #if RBX_LLVM_API_VER > 300 + instr_info = target->createMCInstrInfo(); + reg_info = target->createMCRegInfo(host); + #endif + ++#if RBX_LLVM_API_VER > 303 ++ asm_info = target->createMCAsmInfo(*reg_info, host); ++#else ++ asm_info = target->createMCAsmInfo(host); ++#endif ++ + if(asm_info) { + disassembler = target->createMCDisassembler(*sub_target); + memory_object = new JITMemoryObject((const uint8_t*)buffer, (uint64_t) size); +diff --git i/vm/llvm/jit_builder.cpp w/vm/llvm/jit_builder.cpp +index 652350f..c479aab 100644 +--- i/vm/llvm/jit_builder.cpp ++++ w/vm/llvm/jit_builder.cpp +@@ -56,12 +56,21 @@ namespace jit { + "", "rubinius", true, "", 0); + DIFile file = debug_builder().createFile(file_str, ""); + ++#if RBX_LLVM_API_VER > 303 ++ DIType dummy_return_type = debug_builder().createNullPtrType(); ++ Value* dummy_signature[] = { ++ &*dummy_return_type, ++ }; ++ DICompositeType dummy_subroutine_type = debug_builder().createSubroutineType(file, ++ debug_builder().getOrCreateArray(dummy_signature)); ++#else + DIType dummy_return_type = debug_builder().createNullPtrType("dummy type"); + Value* dummy_signature[] = { + &*dummy_return_type, + }; + DIType dummy_subroutine_type = debug_builder().createSubroutineType(file, + debug_builder().getOrCreateArray(dummy_signature)); ++#endif + + #if RBX_LLVM_API_VER > 300 + DISubprogram subprogram = debug_builder().createFunction(file, "", "", +diff --git i/vm/llvm/jit_context.cpp w/vm/llvm/jit_context.cpp +index e555adb..594a63a 100644 +--- i/vm/llvm/jit_context.cpp ++++ w/vm/llvm/jit_context.cpp +@@ -84,7 +84,9 @@ namespace rubinius { + #if RBX_LLVM_API_VER > 300 + llvm::TargetOptions opts; + opts.NoFramePointerElim = true; ++#if RBX_LLVM_API_VER < 304 + opts.NoFramePointerElimNonLeaf = true; ++#endif + opts.JITEmitDebugInfo = true; + + factory.setTargetOptions(opts); +diff --git i/vm/llvm/jit_memory_manager.hpp w/vm/llvm/jit_memory_manager.hpp +index 8a58a09..7205f89 100644 +--- i/vm/llvm/jit_memory_manager.hpp ++++ w/vm/llvm/jit_memory_manager.hpp +@@ -202,7 +202,7 @@ namespace jit { + + public: + RubiniusJITMemoryManager(); +- ~RubiniusJITMemoryManager(); ++ virtual ~RubiniusJITMemoryManager(); + + /// allocateNewSlab - Allocates a new MemoryBlock and remembers it as the + /// last slab it allocated, so that subsequent allocations follow it. +@@ -356,8 +356,13 @@ namespace jit { + } + + /// allocateCodeSection - Allocate memory for a code section. ++#if RBX_LLVM_API_VER > 303 ++ virtual uint8_t *allocateCodeSection(uintptr_t Size, unsigned Alignment, ++ unsigned SectionID, StringRef SectionName) { ++#else + uint8_t *allocateCodeSection(uintptr_t Size, unsigned Alignment, + unsigned SectionID) { ++#endif + utilities::thread::SpinLock::LockGuard guard(lock_); + // Grow the required block size to account for the block header + Size += sizeof(*CurBlock); +@@ -397,11 +402,21 @@ namespace jit { + } + + /// allocateDataSection - Allocate memory for a data section. +- uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment, +- unsigned SectionID) { ++ /// TODO: currently IsReadOnly is ignored. ++#if RBX_LLVM_API_VER > 303 ++ virtual uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment, ++ unsigned SectionID, StringRef SectionName, ++ bool IsReadOnly) { + utilities::thread::SpinLock::LockGuard guard(lock_); + return (uint8_t*)DataAllocator.Allocate(Size, Alignment); + } ++#else ++ uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment, ++ unsigned SectionID, bool IsReadOnly) { ++ utilities::thread::SpinLock::LockGuard guard(lock_); ++ return (uint8_t*)DataAllocator.Allocate(Size, Alignment); ++ } ++#endif + + /// startExceptionTable - Use startFunctionBody to allocate memory for the + /// function's exception table. +@@ -495,7 +510,7 @@ namespace jit { + , GOTBase(NULL) + {} + +- ~RubiniusRequestJITMemoryManager() { ++ virtual ~RubiniusRequestJITMemoryManager() { + if(GOTBase) delete[] GOTBase; + } + +@@ -504,17 +519,32 @@ namespace jit { + return mgr_->getPointerToNamedFunction(Name, AbortOnFailure); + } + ++#if RBX_LLVM_API_VER >= 304 ++ virtual uint8_t *allocateCodeSection(uintptr_t Size, unsigned Alignment, ++ unsigned SectionID, StringRef SectionName) { ++ return mgr_->allocateCodeSection(Size, Alignment, SectionID, ++ SectionName); ++ } ++#else + uint8_t *allocateCodeSection(uintptr_t Size, unsigned Alignment, + unsigned SectionID) { + return mgr_->allocateCodeSection(Size, Alignment, SectionID); + } ++#endif + + /// allocateDataSection - Allocate memory for a data section. +-#if RBX_LLVM_API_VER >= 303 ++#if RBX_LLVM_API_VER >= 304 ++ virtual uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment, ++ unsigned SectionID, StringRef SectionName, ++ bool IsReadOnly) { ++ return mgr_->allocateDataSection(Size, Alignment, SectionID, ++ SectionName, IsReadOnly); ++ } ++#elif RBX_LLVM_API_VER >= 303 + uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment, + unsigned SectionID, bool IsReadOnly) { +- // TODO: currently IsReadOnly is ignored. +- return mgr_->allocateDataSection(Size, Alignment, SectionID); ++ return mgr_->allocateDataSection(Size, Alignment, SectionID, ++ IsReadOnly); + } + #else + uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment, +@@ -601,6 +631,12 @@ namespace jit { + void resetGeneratedFunction() { + GeneratedFunction = NULL; + } ++ ++#if RBX_LLVM_API_VER > 303 ++ virtual bool finalizeMemory(std::string* ErrMsg = 0) { ++ return false; ++ } ++#endif + }; + + diff --git a/community/wxcam/PKGBUILD b/community/wxcam/PKGBUILD index 0ee0b0a8d..5e2877ed8 100644 --- a/community/wxcam/PKGBUILD +++ b/community/wxcam/PKGBUILD @@ -1,7 +1,8 @@ +# $Id: PKGBUILD 103835 2014-01-12 02:47:26Z eric $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=wxcam pkgver=1.1 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=(GPL) pkgdesc="Webcam application for linux" @@ -9,24 +10,24 @@ pkgdesc="Webcam application for linux" # http://cimg.sourceforge.net/ _CImg_ver=1.4.9 url="http://wxcam.sourceforge.net" -makedepends=('intltool>=0.35.0') +makedepends=('intltool>=0.35.0' 'libsm') depends=('libglade' 'mjpegtools' 'perlxml' 'wxgtk' 'xvidcore' 'v4l-utils' 'alsa-lib') source=(http://downloads.sourceforge.net/wxcam/${pkgname}-${pkgver}.tar.bz2 http://downloads.sourceforge.net/cimg/CImg-${_CImg_ver}.zip) md5sums=('c9ea8991b6375c1709a7ce4e61fcc263' 'a07cba03f6d66a9970e0b3fcc230bddc') -build() { - cp $srcdir/CImg-${_CImg_ver}/CImg.h $srcdir/$pkgname-$pkgver +prepare() { + cp "$srcdir"/CImg-${_CImg_ver}/CImg.h "$srcdir"/$pkgname-$pkgver +} - cd $srcdir/$pkgname-$pkgver +build() { + cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - - mv $pkgdir/usr/doc $pkgdir/usr/share/ + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" wxcamdocdir=/usr/share/doc/wxcam install } diff --git a/community/xl2tpd/PKGBUILD b/community/xl2tpd/PKGBUILD index 2c513c4fb..fa63b182d 100644 --- a/community/xl2tpd/PKGBUILD +++ b/community/xl2tpd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91508 2013-05-23 10:16:34Z spupykin $ +# $Id: PKGBUILD 103870 2014-01-12 22:03:07Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Hengfu <rhfcaesar@gmail.com> pkgname=xl2tpd -pkgver=1.3.1 -pkgrel=3 +pkgver=1.3.4rc1 +pkgrel=1 pkgdesc="an open source implementation of the L2TP maintained by Xelerance Corporation" arch=('i686' 'x86_64') url="http://www.xelerance.com/services/software/xl2tpd/" @@ -19,7 +19,7 @@ source=($pkgname-$pkgver.tar.gz::https://github.com/xelerance/xl2tpd/archive/v$p xl2tpd.service xl2tpd.tmpfiles ipparam.patch) -md5sums=('38c2461d3562f98b08454ca403706886' +md5sums=('5d26c43791a8347a252c9307794d6179' '5f0ae07026e61a3dd15a76fd4144a6d5' '16ed0886115d4dcc21072cfb847250bb' 'ed57eb67335cdf246251285dad502cc7' @@ -30,7 +30,7 @@ md5sums=('38c2461d3562f98b08454ca403706886' build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 <$srcdir/ipparam.patch +# patch -p1 <$srcdir/ipparam.patch make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr SBINDIR=/usr/bin } diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD index c51b0b185..29ff4a14e 100644 --- a/extra/gparted/PKGBUILD +++ b/extra/gparted/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 201370 2013-12-09 18:57:47Z giovanni $ +# $Id: PKGBUILD 203515 2014-01-12 11:15:34Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Andrew Simmons <andrew.simmons@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=gparted pkgver=0.17.0 -pkgrel=1 +pkgrel=2 pkgdesc="A Partition Magic clone, frontend to GNU Parted" arch=('i686' 'x86_64') url="http://gparted.sourceforge.net" @@ -21,7 +21,7 @@ optdepends=('dosfstools: for FAT16 and FAT32 partitions' 'reiserfsprogs: for reiser partitions' 'xfsprogs: for xfs partitions' 'nilfs-utils: for nilfs2 support' - 'polkit-gnome: to run gparted directly from menu' + 'polkit: to run gparted directly from menu' 'gpart: for recovering corrupt partition tables' 'mtools: utilities to access MS-DOS disks') install=gparted.install @@ -32,10 +32,15 @@ md5sums=('ecd66491bb2061c6aa6077cc24823b9e' '122ed3120c846376bead22b25f6a3b19' '0b68a4e2bc6bc15440730ebe2d7bf9f6') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i "s:@gksuprog@ @installdir@/gparted %f:@installdir@/gparted_polkit %f:g" gparted.desktop.in.in +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ --sbindir=/usr/bin make diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD index 1cc75c60f..23d8b5d75 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 203492 2014-01-11 20:07:08Z eric $ +# $Id: PKGBUILD 203508 2014-01-12 01:30:04Z eric $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Kieslich <tobias@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -6,7 +6,7 @@ pkgname=hugin pkgver=2013.0.0 -pkgrel=4 +pkgrel=5 pkgdesc='Panorama photo stitcher' url='http://hugin.sourceforge.net/' license=('GPL') @@ -15,11 +15,17 @@ optdepends=('python2: bindings and plugins') makedepends=('cmake' 'boost' 'tclap' 'mesa' 'python2' 'swig') depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'libpano13' 'lensfun' 'lapack' 'make' 'perl-image-exiftool' 'desktop-file-utils') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('0e0689cf2ca0c4a2730cffe06380eda976b6772d') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2" hugin-build.patch) +sha1sums=('0e0689cf2ca0c4a2730cffe06380eda976b6772d' + '45a8d8f5ee9b3c013cbc1ae3cfad14a2705c0dd4') install=install +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../hugin-build.patch +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" cmake . \ diff --git a/extra/hugin/hugin-build.patch b/extra/hugin/hugin-build.patch new file mode 100644 index 000000000..42d765927 --- /dev/null +++ b/extra/hugin/hugin-build.patch @@ -0,0 +1,11 @@ +--- a/src/hugin1/ptbatcher/PTBatcherGUI.cpp ++++ b/src/hugin1/ptbatcher/PTBatcherGUI.cpp +@@ -150,7 +150,7 @@ + { wxCMD_LINE_SWITCH, "v", "verbose", "show verbose output when processing projects" }, + { wxCMD_LINE_SWITCH, "a", "assistant", "run the assistant on the given projects" }, + { +- wxCMD_LINE_PARAM, NULL, NULL, _("stitch_project.pto [output prefix]|assistant_project.pto"), ++ wxCMD_LINE_PARAM, NULL, NULL, "stitch_project.pto [output prefix]|assistant_project.pto", + wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL + wxCMD_LINE_PARAM_MULTIPLE + }, + { wxCMD_LINE_NONE } diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD index 899d29785..b28c023cd 100644 --- a/extra/llvm/PKGBUILD +++ b/extra/llvm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 197048 2013-10-21 14:52:40Z foutrelis $ +# $Id: PKGBUILD 203529 2014-01-12 20:24:07Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Sebastian Nowicki <sebnow@gmail.com> @@ -9,8 +9,9 @@ # Contributor: Roberto Alsina <ralsina@kde.org> # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> -pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'clang' 'clang-analyzer') -pkgver=3.3 +pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'clang' 'clang-analyzer' + 'clang-tools-extra') +pkgver=3.4 pkgrel=1 arch=('i686' 'x86_64') url="http://llvm.org/" @@ -18,40 +19,41 @@ license=('custom:University of Illinois/NCSA Open Source License') makedepends=('libffi' 'python2' 'ocaml' 'python-sphinx') options=('staticlibs') source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.gz - http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.gz + http://llvm.org/releases/$pkgver/clang-$pkgver.src.tar.gz + http://llvm.org/releases/$pkgver/clang-tools-extra-$pkgver.src.tar.gz http://llvm.org/releases/$pkgver/compiler-rt-$pkgver.src.tar.gz clang-3.3-use-gold-linker.patch llvm-Config-config.h llvm-Config-llvm-config.h) -sha256sums=('68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578' - 'b1b55de4ab3a57d3e0331a83e0284610191c77d924e3446498d9113d08dfb996' - '0e2f3180d6316e6c43f064fdd406c5c6515e682c5f31c57c28335b68c7525423' +sha256sums=('25a5612d692c48481b9b397e2b55f4870e447966d66c96d655241702d44a2628' + '22a9780db3b85a7f2eb9ea1f7f6e00da0249e3d12851e8dea0f62f1783242b1b' + 'ba85187551ae97fe1c8ab569903beae5ff0900e21233e5eb5389f6ceab1028b4' + 'f37c89b1383ce462d47537a0245ac798600887a9be9f63073e16b79ed536ab5c' '8240adda155d7961eeb5d07ed50ead10cb7125f70283dff7f1c9fee9df3cea09' '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3' '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48') prepare() { - cd "$srcdir/llvm-$pkgver.src" + cd "$srcdir/llvm-$pkgver" # At the present, clang must reside inside the LLVM source code tree to build # See http://llvm.org/bugs/show_bug.cgi?id=4840 - mv "$srcdir/cfe-$pkgver.src" tools/clang + mv "$srcdir/clang-$pkgver" tools/clang - mv "$srcdir/compiler-rt-$pkgver.src" projects/compiler-rt + mv "$srcdir/clang-tools-extra-$pkgver" tools/clang/tools/extra + + mv "$srcdir/compiler-rt-$pkgver" projects/compiler-rt # Fix docs installation directory sed -i 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \ Makefile.config.in - # Fix insecure rpath (http://bugs.archlinux.org/task/14017) - sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules - # Make -flto work; use ld.gold instead of the default linker patch -d tools/clang -Np1 -i "$srcdir/clang-3.3-use-gold-linker.patch" } build() { - cd "$srcdir/llvm-$pkgver.src" + cd "$srcdir/llvm-$pkgver" # Apply strip option to configure _optimized_switch="enable" @@ -68,7 +70,6 @@ build() { --enable-shared \ --enable-libffi \ --enable-targets=all \ - --enable-experimental-targets=R600 \ --disable-expensive-checks \ --disable-debug-runtime \ --disable-assertions \ @@ -86,7 +87,7 @@ package_llvm() { pkgdesc="Low Level Virtual Machine" depends=("llvm-libs=$pkgver-$pkgrel" 'perl') - cd "$srcdir/llvm-$pkgver.src" + cd "$srcdir/llvm-$pkgver" # We move the clang directory out of the tree so it won't get installed and # then we bring it back in for the clang package @@ -140,11 +141,11 @@ package_llvm() { package_llvm-libs() { pkgdesc="Low Level Virtual Machine (runtime library)" - depends=('gcc-libs' 'zlib' 'libffi') + depends=('gcc-libs' 'zlib' 'libffi' 'ncurses') install -D "$srcdir/libLLVM-$pkgver.so" "$pkgdir/usr/lib/libLLVM-$pkgver.so" - install -Dm644 "$srcdir/llvm-$pkgver.src/LICENSE.TXT" \ + install -Dm644 "$srcdir/llvm-$pkgver/LICENSE.TXT" \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } @@ -152,7 +153,7 @@ package_llvm-ocaml() { pkgdesc="OCaml bindings for LLVM" depends=("llvm=$pkgver-$pkgrel" 'ocaml') - cd "$srcdir/llvm-$pkgver.src" + cd "$srcdir/llvm-$pkgver" install -d "$pkgdir"/{usr/lib,usr/share/doc/llvm} cp -r "$srcdir/ocaml" "$pkgdir/usr/lib" @@ -161,7 +162,7 @@ package_llvm-ocaml() { # Remove execute bit from static libraries chmod -x "$pkgdir"/usr/lib/ocaml/libllvm*.a - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/llvm-ocaml/LICENSE" + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } package_clang() { @@ -171,23 +172,35 @@ package_clang() { # Fix installation path for clang docs sed -i 's:$(PROJ_prefix)/share/doc/llvm:$(PROJ_prefix)/share/doc/clang:' \ - "$srcdir/llvm-$pkgver.src/Makefile.config" + "$srcdir/llvm-$pkgver/Makefile.config" + + cd "$srcdir/llvm-$pkgver/tools/clang" + + # We move the extra tools directory out of the tree so it won't get + # installed and then we bring it back in for the clang-tools-extra package + mv tools/extra "$srcdir" - cd "$srcdir/llvm-$pkgver.src/tools/clang" make DESTDIR="$pkgdir" install + mv "$srcdir/extra" tools/ # Fix permissions of static libs chmod -x "$pkgdir"/usr/lib/*.a # Revert the path change in case we want to do a repackage later sed -i 's:$(PROJ_prefix)/share/doc/clang:$(PROJ_prefix)/share/doc/llvm:' \ - "$srcdir/llvm-$pkgver.src/Makefile.config" + "$srcdir/llvm-$pkgver/Makefile.config" # Install html docs cp -r docs/_build/html/* "$pkgdir/usr/share/doc/$pkgname/html/" rm -r "$pkgdir/usr/share/doc/$pkgname/html/_sources" - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang/LICENSE" + # Install Python bindings + install -d "$pkgdir/usr/lib/python2.7/site-packages" + cp -r bindings/python/clang "$pkgdir/usr/lib/python2.7/site-packages/" + python2 -m compileall "$pkgdir/usr/lib/python2.7/site-packages/clang" + python2 -O -m compileall "$pkgdir/usr/lib/python2.7/site-packages/clang" + + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } package_clang-analyzer() { @@ -195,7 +208,7 @@ package_clang-analyzer() { url="http://clang-analyzer.llvm.org/" depends=("clang=$pkgver-$pkgrel" 'python2') - cd "$srcdir/llvm-$pkgver.src/tools/clang" + cd "$srcdir/llvm-$pkgver/tools/clang" install -d "$pkgdir"/usr/{bin,lib/clang-analyzer} for _tool in scan-{build,view}; do @@ -222,7 +235,22 @@ package_clang-analyzer() { python2 -m compileall "$pkgdir/usr/lib/clang-analyzer" python2 -O -m compileall "$pkgdir/usr/lib/clang-analyzer" - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang-analyzer/LICENSE" + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_clang-tools-extra() { + pkgdesc="Extra tools built using Clang's tooling APIs" + url="http://clang.llvm.org/" + depends=("clang=$pkgver-$pkgrel") + + cd "$srcdir/llvm-$pkgver/tools/clang/tools/extra" + + make DESTDIR="$pkgdir" install + + # Fix permissions of static libs + chmod -x "$pkgdir"/usr/lib/*.a + + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } # vim:set ts=2 sw=2 et: diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 12b858267..5c6f44a14 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,29 +1,20 @@ -# $Id: PKGBUILD 203236 2014-01-06 07:56:25Z lcarlier $ +# $Id: PKGBUILD 203530 2014-01-12 20:24:08Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl') -pkgver=10.0.1 -pkgrel=2 +pkgver=10.0.2 +pkgrel=1 arch=('i686' 'x86_64') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd') url="http://mesa3d.sourceforge.net" license=('custom') source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2 - LICENSE - revert.remove.GLXContextID.typedef.patch) -md5sums=('0a72ca5b36046a658bf6038326ff32ed' - '5c65a0fe315dd347e09b1f2826a1df5a' - '6e49b4dd4ceb7873610f608f74efbaaf') - -prepare() { - cd ${srcdir}/?esa-* - - # Cherry picked from mesa branch 10.0, this fix wxgtk rebuild (FS#38392) - patch -Np1 -i ../revert.remove.GLXContextID.typedef.patch -} + LICENSE) +md5sums=('8544c0ab3e438a08b5103421ea15b6d2' + '5c65a0fe315dd347e09b1f2826a1df5a') build() { cd ${srcdir}/?esa-* diff --git a/extra/mesa/revert.remove.GLXContextID.typedef.patch b/extra/mesa/revert.remove.GLXContextID.typedef.patch deleted file mode 100644 index 92232dd2d..000000000 --- a/extra/mesa/revert.remove.GLXContextID.typedef.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 347f1493320e1bc2194c70d4d66bfe2b5883bf1e Mon Sep 17 00:00:00 2001 -From: Kenneth Graunke <kenneth@whitecape.org> -Date: Mon, 30 Dec 2013 07:19:36 +0000 -Subject: Revert "mesa: Remove GLXContextID typedef from glx.h." - -This reverts commit 136a12ac98868d82c2ae9fcc80d11044a7ec56d1. - -According to belak51 on IRC, this commit broke Allegro, which would no -longer compile. Applications apparently expect the GLXContextID typedef -to exist in glx.h; removing it breaks them. A bit of searching around -the internet revealed other complaints since upgrading to Mesa 10. - -Cc: "10.0" <mesa-stable@lists.freedesktop.org> -(cherry picked from commit f425d56ba41382be04366d011536ee78a03a2f33) ---- -diff --git a/include/GL/glx.h b/include/GL/glx.h -index 62d0ede..234abc0 100644 ---- a/include/GL/glx.h -+++ b/include/GL/glx.h -@@ -168,6 +168,7 @@ typedef XID GLXDrawable; - /* GLX 1.3 and later */ - typedef struct __GLXFBConfigRec *GLXFBConfig; - typedef XID GLXFBConfigID; -+typedef XID GLXContextID; - typedef XID GLXWindow; - typedef XID GLXPbuffer; - --- -cgit v0.9.0.2-2-gbebe - diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index 60851eb7b..e7338e4e0 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 203493 2014-01-11 20:07:09Z eric $ +# $Id: PKGBUILD 203527 2014-01-12 13:16:58Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: xduugu <xduugu@gmx.com> pkgbase=mkvtoolnix pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk') pkgver=6.7.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('GPL') url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" @@ -14,7 +14,7 @@ makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk' source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.xz") md5sums=('27bb6b0a10b3bb2fcf1c3e520c300207') -build() { +prepare() { cd "${srcdir}/${pkgbase}-${pkgver}" # Disable automagic curl dep used for online update checking @@ -24,18 +24,25 @@ build() { export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=3" export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=3" - autoreconf + # Sets number of threads for a parallel build + export DRAKETHREADS=4 + + autoreconf -vfi +} + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" ./configure --prefix=/usr \ --with-boost-libdir=/usr/lib \ --disable-gui - rake + ./drake mv src/mkvinfo{,-cli} ./configure --prefix=/usr \ --with-boost-libdir=/usr/lib - rake + ./drake } package_mkvtoolnix-cli() { @@ -47,7 +54,7 @@ package_mkvtoolnix-cli() { cd "${srcdir}/${pkgbase}-${pkgver}" - rake DESTDIR="${pkgdir}" install + ./drake DESTDIR="${pkgdir}" install rm -rf "${pkgdir}"/usr/bin/mkvinfo install -Dm755 src/mkvinfo-cli "${pkgdir}"/usr/bin/mkvinfo @@ -70,7 +77,7 @@ package_mkvtoolnix-gtk() { cd "${srcdir}/${pkgbase}-${pkgver}" - rake DESTDIR="${pkgdir}" install + ./drake DESTDIR="${pkgdir}" install rm -rf "${pkgdir}"/usr/bin/mkv* install -Dm755 src/mkvinfo "${pkgdir}"/usr/bin/mkvinfo-gtk sed -ri 's/^(Exec=mkvinfo)/\1-gtk/' "${pkgdir}"/usr/share/applications/mkvinfo.desktop diff --git a/extra/wxpython/PKGBUILD b/extra/wxpython/PKGBUILD index c15f815e1..941a4feab 100644 --- a/extra/wxpython/PKGBUILD +++ b/extra/wxpython/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 203500 2014-01-11 20:07:15Z eric $ +# $Id: PKGBUILD 203510 2014-01-12 02:18:23Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=wxpython pkgver=3.0.0.0 _editraver=0.7.20 -pkgrel=1 +pkgrel=2 pkgdesc="A wxWidgets GUI toolkit for Python" arch=('i686' 'x86_64') license=('custom:wxWindows') diff --git a/kernels/linux-libre-grsec/PKGBUILD b/kernels/linux-libre-grsec/PKGBUILD index 1d7499fc2..f0d01f56b 100644 --- a/kernels/linux-libre-grsec/PKGBUILD +++ b/kernels/linux-libre-grsec/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 202239 2013-12-20 19:15:03Z tpowa $ +# $Id: PKGBUILD 203405 2014-01-10 08:45:42Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -10,12 +10,12 @@ pkgbase=linux-libre-grsec # Build stock -LIBRE-GRSEC kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.12 -_sublevel=6 +_sublevel=7 _grsecver=3.0 -_timestamp=201401021726 +_timestamp=201401091837 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -38,10 +38,10 @@ 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.bz2") md5sums=('254f59707b6676b59ce5ca5c3c698319' - '4b18ce60daff87504e6740670edf6b50' - 'c07003578d875828e730c5d3a903616b' - 'fbd34f6cbd091eff2701d84ab1c7d433' - '8fc653f7adbfcc6de676cbd5ba659517' + 'c42ff446236915fe1a6e2b6f9724d267' + 'e4a7b8f1543e9c2c3ab0ed77ff93b04a' + 'ce2f5067862192ce2dcb897e362b24f6' + '93ff5264c547d894cc68e0c30a0dbdd8' '5f66bed97a5c37e48eb2f71b2d354b9a' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' @@ -51,7 +51,7 @@ md5sums=('254f59707b6676b59ce5ca5c3c698319' 'f93ef6157fbb23820bd5ae08fd3f451e' '0db7629711f4ed76bd1f9da9f97bc4ea' '34f7e421a25ebc3c1406e04db56accfa' - '71bbddd5f9799aa045660d92baa05845') + '7554da820df91c282656972976d9e0b5') 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-grsec/config.i686 b/kernels/linux-libre-grsec/config.i686 index 009fad256..c3c5d2d9c 100644 --- a/kernels/linux-libre-grsec/config.i686 +++ b/kernels/linux-libre-grsec/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.12.0-1 Kernel Configuration +# Linux/x86 3.12.7-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -3142,7 +3142,15 @@ CONFIG_I2C=m CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y CONFIG_I2C_CHARDEV=m -# CONFIG_I2C_MUX is not set +CONFIG_I2C_MUX=m + +# +# Multiplexer I2C Chip support +# +# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set +# CONFIG_I2C_MUX_GPIO is not set +CONFIG_I2C_MUX_PCA9541=m +CONFIG_I2C_MUX_PCA954x=m CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_SMBUS=m CONFIG_I2C_ALGOBIT=m @@ -4868,18 +4876,6 @@ CONFIG_USB_SERIAL_IPW=m CONFIG_USB_SERIAL_IUU=m CONFIG_USB_SERIAL_KEYSPAN_PDA=m CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KEYSPAN_MPR=y -CONFIG_USB_SERIAL_KEYSPAN_USA28=y -CONFIG_USB_SERIAL_KEYSPAN_USA28X=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y -CONFIG_USB_SERIAL_KEYSPAN_USA19=y -CONFIG_USB_SERIAL_KEYSPAN_USA18X=y -CONFIG_USB_SERIAL_KEYSPAN_USA19W=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y -CONFIG_USB_SERIAL_KEYSPAN_USA49W=y -CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m @@ -5250,7 +5246,6 @@ CONFIG_DMA_OF=y # # DMA Clients # -CONFIG_NET_DMA=y CONFIG_ASYNC_TX_DMA=y # CONFIG_DMATEST is not set CONFIG_DCA=m diff --git a/kernels/linux-libre-grsec/config.x86_64 b/kernels/linux-libre-grsec/config.x86_64 index 4debcba82..31b5c76ac 100644 --- a/kernels/linux-libre-grsec/config.x86_64 +++ b/kernels/linux-libre-grsec/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.12.1-3 Kernel Configuration +# Linux/x86 3.12.7-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -3024,7 +3024,14 @@ CONFIG_I2C=m CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y CONFIG_I2C_CHARDEV=m -# CONFIG_I2C_MUX is not set +CONFIG_I2C_MUX=m + +# +# Multiplexer I2C Chip support +# +# CONFIG_I2C_MUX_GPIO is not set +CONFIG_I2C_MUX_PCA9541=m +CONFIG_I2C_MUX_PCA954x=m CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_SMBUS=m CONFIG_I2C_ALGOBIT=m @@ -4681,18 +4688,6 @@ CONFIG_USB_SERIAL_IPW=m CONFIG_USB_SERIAL_IUU=m CONFIG_USB_SERIAL_KEYSPAN_PDA=m CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KEYSPAN_MPR=y -CONFIG_USB_SERIAL_KEYSPAN_USA28=y -CONFIG_USB_SERIAL_KEYSPAN_USA28X=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y -CONFIG_USB_SERIAL_KEYSPAN_USA19=y -CONFIG_USB_SERIAL_KEYSPAN_USA18X=y -CONFIG_USB_SERIAL_KEYSPAN_USA19W=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y -CONFIG_USB_SERIAL_KEYSPAN_USA49W=y -CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m @@ -5058,7 +5053,6 @@ CONFIG_DMA_ACPI=y # # DMA Clients # -CONFIG_NET_DMA=y CONFIG_ASYNC_TX_DMA=y # CONFIG_DMATEST is not set CONFIG_DCA=m diff --git a/kernels/linux-libre-knock/PKGBUILD b/kernels/linux-libre-knock/PKGBUILD index a59d29bdc..0b451888b 100644 --- a/kernels/linux-libre-knock/PKGBUILD +++ b/kernels/linux-libre-knock/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 202239 2013-12-20 19:15:03Z tpowa $ +# $Id: PKGBUILD 203405 2014-01-10 08:45:42Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -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=6 +_sublevel=7 _knockpatchver=${_basekernel}.4 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -34,17 +34,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'criu-no-expert.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('254f59707b6676b59ce5ca5c3c698319' - '4b18ce60daff87504e6740670edf6b50' + 'c42ff446236915fe1a6e2b6f9724d267' '387673a6510de1e1bce8188fc7a72bd1' - 'a903586ecfeaca65fe2abfa9e74f0816' - '58ab468b3f407f1471725f939638c8bd' + '6eac169d20fd27b55815b0b2db4a473b' + 'f341bc4685a40dc409b144b0f44bb137' '18d660832d681a27084774222fc74c1d' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '44260d2cb1a8b51c119d2ce1f83e457a' '98beb36f9b8cf16e58de2483ea9985e3' 'd50c1ac47394e9aec637002ef3392bd1' - '71bbddd5f9799aa045660d92baa05845') + '7554da820df91c282656972976d9e0b5') 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-knock/config.i686 b/kernels/linux-libre-knock/config.i686 index f3ec493fa..746c13fa7 100644 --- a/kernels/linux-libre-knock/config.i686 +++ b/kernels/linux-libre-knock/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.12.0-1 Kernel Configuration +# Linux/x86 3.12.7-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -3158,7 +3158,15 @@ CONFIG_I2C=m CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y CONFIG_I2C_CHARDEV=m -# CONFIG_I2C_MUX is not set +CONFIG_I2C_MUX=m + +# +# Multiplexer I2C Chip support +# +# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set +# CONFIG_I2C_MUX_GPIO is not set +CONFIG_I2C_MUX_PCA9541=m +CONFIG_I2C_MUX_PCA954x=m CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_SMBUS=m CONFIG_I2C_ALGOBIT=m @@ -4884,18 +4892,6 @@ CONFIG_USB_SERIAL_IPW=m CONFIG_USB_SERIAL_IUU=m CONFIG_USB_SERIAL_KEYSPAN_PDA=m CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KEYSPAN_MPR=y -CONFIG_USB_SERIAL_KEYSPAN_USA28=y -CONFIG_USB_SERIAL_KEYSPAN_USA28X=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y -CONFIG_USB_SERIAL_KEYSPAN_USA19=y -CONFIG_USB_SERIAL_KEYSPAN_USA18X=y -CONFIG_USB_SERIAL_KEYSPAN_USA19W=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y -CONFIG_USB_SERIAL_KEYSPAN_USA49W=y -CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m @@ -5266,7 +5262,6 @@ CONFIG_DMA_OF=y # # DMA Clients # -CONFIG_NET_DMA=y CONFIG_ASYNC_TX_DMA=y # CONFIG_DMATEST is not set CONFIG_DCA=m diff --git a/kernels/linux-libre-knock/config.x86_64 b/kernels/linux-libre-knock/config.x86_64 index 666c9005a..0d06a2842 100644 --- a/kernels/linux-libre-knock/config.x86_64 +++ b/kernels/linux-libre-knock/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.12.1-3 Kernel Configuration +# Linux/x86 3.12.7-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -3049,7 +3049,14 @@ CONFIG_I2C=m CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y CONFIG_I2C_CHARDEV=m -# CONFIG_I2C_MUX is not set +CONFIG_I2C_MUX=m + +# +# Multiplexer I2C Chip support +# +# CONFIG_I2C_MUX_GPIO is not set +CONFIG_I2C_MUX_PCA9541=m +CONFIG_I2C_MUX_PCA954x=m CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_SMBUS=m CONFIG_I2C_ALGOBIT=m @@ -4706,18 +4713,6 @@ CONFIG_USB_SERIAL_IPW=m CONFIG_USB_SERIAL_IUU=m CONFIG_USB_SERIAL_KEYSPAN_PDA=m CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KEYSPAN_MPR=y -CONFIG_USB_SERIAL_KEYSPAN_USA28=y -CONFIG_USB_SERIAL_KEYSPAN_USA28X=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y -CONFIG_USB_SERIAL_KEYSPAN_USA19=y -CONFIG_USB_SERIAL_KEYSPAN_USA18X=y -CONFIG_USB_SERIAL_KEYSPAN_USA19W=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y -CONFIG_USB_SERIAL_KEYSPAN_USA49W=y -CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m @@ -5083,7 +5078,6 @@ CONFIG_DMA_ACPI=y # # DMA Clients # -CONFIG_NET_DMA=y CONFIG_ASYNC_TX_DMA=y # CONFIG_DMATEST is not set CONFIG_DCA=m diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 530f6d6dd..c4ada0dd8 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 202239 2013-12-20 19:15:03Z tpowa $ +# $Id: PKGBUILD 203405 2014-01-10 08:45:42Z tpowa $ # 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.12 -pkgver=${_basekernel}.6 +pkgver=${_basekernel}.7 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -23,8 +23,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' 'criu-no-expert.patch') md5sums=('254f59707b6676b59ce5ca5c3c698319' - '4b18ce60daff87504e6740670edf6b50' - '0a663d07acafb493399e8a5706a4cb84' + 'c42ff446236915fe1a6e2b6f9724d267' + '2c07956936879d8729ad68d997a79bbf' 'f302c931bd85309da9d9792b4cc96467' '44260d2cb1a8b51c119d2ce1f83e457a' '98beb36f9b8cf16e58de2483ea9985e3' diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config index 3f24889c6..9c681bd68 100644 --- a/kernels/linux-libre-pae/config +++ b/kernels/linux-libre-pae/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.12.0-1 Kernel Configuration +# Linux/x86 3.12.7-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -3159,7 +3159,15 @@ CONFIG_I2C=m CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y CONFIG_I2C_CHARDEV=m -# CONFIG_I2C_MUX is not set +CONFIG_I2C_MUX=m + +# +# Multiplexer I2C Chip support +# +# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set +# CONFIG_I2C_MUX_GPIO is not set +CONFIG_I2C_MUX_PCA9541=m +CONFIG_I2C_MUX_PCA954x=m CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_SMBUS=m CONFIG_I2C_ALGOBIT=m @@ -4886,18 +4894,6 @@ CONFIG_USB_SERIAL_IPW=m CONFIG_USB_SERIAL_IUU=m CONFIG_USB_SERIAL_KEYSPAN_PDA=m CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KEYSPAN_MPR=y -CONFIG_USB_SERIAL_KEYSPAN_USA28=y -CONFIG_USB_SERIAL_KEYSPAN_USA28X=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y -CONFIG_USB_SERIAL_KEYSPAN_USA19=y -CONFIG_USB_SERIAL_KEYSPAN_USA18X=y -CONFIG_USB_SERIAL_KEYSPAN_USA19W=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y -CONFIG_USB_SERIAL_KEYSPAN_USA49W=y -CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m @@ -5268,7 +5264,6 @@ CONFIG_DMA_OF=y # # DMA Clients # -CONFIG_NET_DMA=y CONFIG_ASYNC_TX_DMA=y # CONFIG_DMATEST is not set CONFIG_DCA=m diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index e97f554c3..b6c1eaa0c 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 202239 2013-12-20 19:15:03Z tpowa $ +# $Id: PKGBUILD 203405 2014-01-10 08:45:42Z tpowa $ # 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.12 -pkgver=${_basekernel}.6 +pkgver=${_basekernel}.7 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -23,8 +23,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' 'criu-no-expert.patch') md5sums=('254f59707b6676b59ce5ca5c3c698319' - '4b18ce60daff87504e6740670edf6b50' - '7fce4cb7fd646d3efe0fc151ae6aca21' + 'c42ff446236915fe1a6e2b6f9724d267' + '670682e633d1b785c73581307da7eb9c' 'b7c2805bb287a644c0a303bf7721e534' '44260d2cb1a8b51c119d2ce1f83e457a' '98beb36f9b8cf16e58de2483ea9985e3' diff --git a/kernels/linux-libre-xen/config b/kernels/linux-libre-xen/config index 56e58eb2d..4700422f4 100644 --- a/kernels/linux-libre-xen/config +++ b/kernels/linux-libre-xen/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.12.0-1 Kernel Configuration +# Linux/x86 3.12.7-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -3172,7 +3172,15 @@ CONFIG_I2C=m CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y CONFIG_I2C_CHARDEV=m -# CONFIG_I2C_MUX is not set +CONFIG_I2C_MUX=m + +# +# Multiplexer I2C Chip support +# +# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set +# CONFIG_I2C_MUX_GPIO is not set +CONFIG_I2C_MUX_PCA9541=m +CONFIG_I2C_MUX_PCA954x=m CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_SMBUS=m CONFIG_I2C_ALGOBIT=m @@ -4900,18 +4908,6 @@ CONFIG_USB_SERIAL_IPW=m CONFIG_USB_SERIAL_IUU=m CONFIG_USB_SERIAL_KEYSPAN_PDA=m CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KEYSPAN_MPR=y -CONFIG_USB_SERIAL_KEYSPAN_USA28=y -CONFIG_USB_SERIAL_KEYSPAN_USA28X=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y -CONFIG_USB_SERIAL_KEYSPAN_USA19=y -CONFIG_USB_SERIAL_KEYSPAN_USA18X=y -CONFIG_USB_SERIAL_KEYSPAN_USA19W=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y -CONFIG_USB_SERIAL_KEYSPAN_USA49W=y -CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m @@ -5282,7 +5278,6 @@ CONFIG_DMA_OF=y # # DMA Clients # -CONFIG_NET_DMA=y CONFIG_ASYNC_TX_DMA=y # CONFIG_DMATEST is not set CONFIG_DCA=m diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD index e8f1e00d8..246511888 100644 --- a/libre/abiword-libre/PKGBUILD +++ b/libre/abiword-libre/PKGBUILD @@ -60,7 +60,7 @@ build() { } package_abiword-libre() { - pkgdesc="A fully-featured word processor that doesn't recommend nonfree fonts" + pkgdesc="A fully-featured word processor, without nonfree fonts recommendation" depends=('fribidi' 'wv' 'goffice0.8' 'librsvg' 'enchant' 'desktop-file-utils') install=$pkgname.install optdepends=('abiword-libre-plugins') diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD index d024c42d0..5f3c0e327 100644 --- a/libre/audacious-plugins-libre/PKGBUILD +++ b/libre/audacious-plugins-libre/PKGBUILD @@ -19,8 +19,8 @@ arch=('i686' 'x86_64' 'mips64el') # The plugins 'scrobbler', stereoplugin', 'wavepack' and 'plugin_echo' have no license notice # but I've been informed by an upstream dev, nenolod, that they are all GPL. I don't know what version # -# The plugin 'psf' is currently (Nov 2011) BSD+noncommercial, but is apparently being changed to GPL. -# However, 'psf' is apparently an emulator for running non-free code, so I'm not rushing to fix it. +# The plugin 'psf' is under BSD license, mostly, but it uses code from PeOPS, so it's probably GPL. +# However, 'psf' is apparently an emulator for running nonfree code, so I'm not rushing to fix it. # # All the other custom licensed plugins I think are mostly modified BSD or ISC. @@ -64,11 +64,12 @@ source=("http://distfiles.audacious-media-player.org/${_pkgname}-${pkgver}.tar.b sha1sums=('bcccd4304692a62d1b7963322f64059a0fb9532a') prepare() { - # Retrieve upstream & remove plugin 'psf' due to issues mentioned above. - sed -i s/enable_psf=yes/enable_psf=no/ ${_pkgname}-$pkgver/configure - cd "${srcdir}/${_pkgname}-${pkgver}" + # Retrieve upstream & remove plugin 'psf' due to issues mentioned above. + rm -rv src/psf + sed -i s/enable_psf=yes/enable_psf=no/ configure + # Get license notices out of custom-licensed packages cd src tmpdir=$(mktemp -d /tmp/${_pkgname}-${pkgver}-XXXX) diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index f4342a06d..3c6f1ba33 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102833 2013-12-21 18:31:51Z tpowa $ +# $Id: PKGBUILD 103710 2014-01-10 12:51:56Z tpowa $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: M0Rf30 # Contributor: Samsagax <samsagax@gmail.com> @@ -8,7 +8,7 @@ _pkgname=bbswitch pkgname=bbswitch-libre pkgver=0.8 _extramodules=extramodules-3.12-LIBRE # Don't forget to update bbswitch.install -pkgrel=3 +pkgrel=4 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/lib32-sdl-libre/PKGBUILD b/libre/lib32-sdl-libre/PKGBUILD index 141fff692..e3f2da354 100644 --- a/libre/lib32-sdl-libre/PKGBUILD +++ b/libre/lib32-sdl-libre/PKGBUILD @@ -8,7 +8,7 @@ _pkgbasename=sdl-libre pkgname=lib32-$_pkgbasename pkgver=1.2.15 pkgrel=3 -pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (32-bit)" +pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (32-bit), without nonfree riva_mmio.h file" arch=('x86_64') url="http://www.libsdl.org" license=('LGPL') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index b0efd46cb..b21767cfb 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 202239 2013-12-20 19:15:03Z tpowa $ +# $Id: PKGBUILD 203405 2014-01-10 08:45:42Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.12 -_sublevel=6 +_sublevel=7 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,16 +32,16 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'criu-no-expert.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('254f59707b6676b59ce5ca5c3c698319' - '4b18ce60daff87504e6740670edf6b50' - 'aa6614d1dbf46ab7d317bcde1e58f80c' - '3ecb40ee3bdd78e4d310c2afc1ccf209' + 'c42ff446236915fe1a6e2b6f9724d267' + '568ce15a9df133072489cbac8c4fefb3' + '772873c548059c57c8ec7898f35c0e2b' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '44260d2cb1a8b51c119d2ce1f83e457a' '98beb36f9b8cf16e58de2483ea9985e3' 'd50c1ac47394e9aec637002ef3392bd1' - '71bbddd5f9799aa045660d92baa05845') + '7554da820df91c282656972976d9e0b5') 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/config.i686 b/libre/linux-libre/config.i686 index db2b3fdb7..94cc0e63b 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.12.0-1 Kernel Configuration +# Linux/x86 3.12.7-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -3157,7 +3157,15 @@ CONFIG_I2C=m CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y CONFIG_I2C_CHARDEV=m -# CONFIG_I2C_MUX is not set +CONFIG_I2C_MUX=m + +# +# Multiplexer I2C Chip support +# +# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set +# CONFIG_I2C_MUX_GPIO is not set +CONFIG_I2C_MUX_PCA9541=m +CONFIG_I2C_MUX_PCA954x=m CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_SMBUS=m CONFIG_I2C_ALGOBIT=m @@ -4883,18 +4891,6 @@ CONFIG_USB_SERIAL_IPW=m CONFIG_USB_SERIAL_IUU=m CONFIG_USB_SERIAL_KEYSPAN_PDA=m CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KEYSPAN_MPR=y -CONFIG_USB_SERIAL_KEYSPAN_USA28=y -CONFIG_USB_SERIAL_KEYSPAN_USA28X=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y -CONFIG_USB_SERIAL_KEYSPAN_USA19=y -CONFIG_USB_SERIAL_KEYSPAN_USA18X=y -CONFIG_USB_SERIAL_KEYSPAN_USA19W=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y -CONFIG_USB_SERIAL_KEYSPAN_USA49W=y -CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m @@ -5265,7 +5261,6 @@ CONFIG_DMA_OF=y # # DMA Clients # -CONFIG_NET_DMA=y CONFIG_ASYNC_TX_DMA=y # CONFIG_DMATEST is not set CONFIG_DCA=m diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index e092582a4..4cd9f61a0 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.12.1-3 Kernel Configuration +# Linux/x86 3.12.7-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -3048,7 +3048,14 @@ CONFIG_I2C=m CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y CONFIG_I2C_CHARDEV=m -# CONFIG_I2C_MUX is not set +CONFIG_I2C_MUX=m + +# +# Multiplexer I2C Chip support +# +# CONFIG_I2C_MUX_GPIO is not set +CONFIG_I2C_MUX_PCA9541=m +CONFIG_I2C_MUX_PCA954x=m CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_SMBUS=m CONFIG_I2C_ALGOBIT=m @@ -4705,18 +4712,6 @@ CONFIG_USB_SERIAL_IPW=m CONFIG_USB_SERIAL_IUU=m CONFIG_USB_SERIAL_KEYSPAN_PDA=m CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KEYSPAN_MPR=y -CONFIG_USB_SERIAL_KEYSPAN_USA28=y -CONFIG_USB_SERIAL_KEYSPAN_USA28X=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y -CONFIG_USB_SERIAL_KEYSPAN_USA19=y -CONFIG_USB_SERIAL_KEYSPAN_USA18X=y -CONFIG_USB_SERIAL_KEYSPAN_USA19W=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y -CONFIG_USB_SERIAL_KEYSPAN_USA49W=y -CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m @@ -5082,7 +5077,6 @@ CONFIG_DMA_ACPI=y # # DMA Clients # -CONFIG_NET_DMA=y CONFIG_ASYNC_TX_DMA=y # CONFIG_DMATEST is not set CONFIG_DCA=m diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index aaeebc1c1..8d2f988bc 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 202421 2013-12-21 18:29:42Z tpowa $ +# $Id: PKGBUILD 203411 2014-01-10 12:51:03Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-libre-utils') pkgver=0.9.0 -pkgrel=67 +pkgrel=68 epoch=1 _extramodules=extramodules-3.12-LIBRE arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD index 7f8c3b789..f1bce25ec 100644 --- a/libre/p7zip-libre/PKGBUILD +++ b/libre/p7zip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 195474 2013-09-30 18:46:35Z bisson $ +# $Id: PKGBUILD 203246 2014-01-06 19:32:24Z bpiotrowski $ # 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,8 +8,8 @@ pkgname=p7zip-libre _pkgname=${pkgname%-libre} pkgver=9.20.1 -pkgrel=8 -pkgdesc='Command-line version of the 7zip compressed file archiver without Rar' +pkgrel=9 +pkgdesc='Command-line version of the 7zip compressed file archiver, without unrar support' url='http://p7zip.sourceforge.net/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') @@ -17,36 +17,44 @@ provides=("p7zip=$pkgver") conflicts=('p7zip') replaces=('p7zip') depends=('gcc-libs' 'bash') -optdepends=('wxgtk: GUI' +optdepends=('wxgtk2.8: GUI' 'desktop-file-utils: desktop entries') -makedepends=('yasm' 'nasm' 'wxgtk') -source=("http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}/${pkgver}/${_pkgname}_${pkgver}_src_all.tar.bz2" - 'p7zip-libre.patch' +makedepends=('yasm' 'nasm' 'wxgtk2.8') +mksource=("http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}/${pkgver}/${_pkgname}_${pkgver}_src_all.tar.bz2" + 'p7zip-libre.patch') +source=("https://repo.parabolagnulinux.org/sources/${pkgname}_${pkgver}_src_all.tar.bz2" '7zFM.desktop') -sha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7' - '8fc0e6e80aeec371a8c80e7a6082594ac6d08aed' +mksha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7' + '8fc0e6e80aeec371a8c80e7a6082594ac6d08aed') +sha1sums=('82a54887878e3fd90bfbd3c66d2ce3b6a3532a95' 'f2c370d6f1b286b7ce9a2804e22541b755616a40') options=('!makeflags') install=install +mksource() { + cd "${srcdir}/${_pkgname}_${pkgver}" + msg "Removing unRar" +# Generate patch +# sed -e '/Rar/d' -i makefile* +# find -name '*Rar*' -print0 | xargs -0 rm -rvf +# Remove Rar mentions in CPP/7zip/Bundles/Format7zFree/makefile + patch -Np1 -i ../p7zip-libre.patch +} + 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 + + sed -i 's/wx-config/wx-config-2.8/g' CPP/7zip/TEST/TestUI/makefile \ + CPP/7zip/UI/{FileManager,GUI,P7ZIP}/makefile } build() { cd "${srcdir}/${_pkgname}_${pkgver}" - msg "Removing unRar" -# Generate patch -# sed -e '/Rar/d' -i makefile* -# find -name '*Rar*' -print0 | xargs -0 rm -rvf -# Remove Rar mentions in CPP/7zip/Bundles/Format7zFree/makefile - patch -Np1 -i ../p7zip-libre.patch - make all4 OPTFLAGS="${CXXFLAGS}" } diff --git a/libre/python2-reportlab-libre/PKGBUILD b/libre/python2-reportlab-libre/PKGBUILD index 7db8fbc81..0f608f7a0 100755 --- a/libre/python2-reportlab-libre/PKGBUILD +++ b/libre/python2-reportlab-libre/PKGBUILD @@ -11,7 +11,7 @@ pkgname=python2-reportlab-libre _origname=reportlab pkgver=2.7 pkgrel=1 -pkgdesc="A proven industry-strength PDF generating solution, without nonfree Adobe T1 fonts" +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=('python2' 'freetype2') @@ -27,7 +27,7 @@ md5sums=('78300e6fe8a0d020fc16734a3de80cc4' build() { cd $srcdir/${_origname}-$pkgver - # remove nonfree Adobe T1 fonts + # remove nonfree Adobe T1 fonts support patch -p1 -i $srcdir/free-fonts.patch # Parabola contains those fonts from the ttf-bitstream-vera package diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD index a8db7241f..79dadf954 100644 --- a/libre/sdl-libre/PKGBUILD +++ b/libre/sdl-libre/PKGBUILD @@ -9,7 +9,7 @@ pkgname=sdl-libre pkgver=1.2.15 pkgrel=5 -pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard" +pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard, without nonfree riva_mmio.h file" arch=('i686' 'x86_64') url="http://www.libsdl.org" license=('LGPL') diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD index af4881e7e..246af9a3e 100644 --- a/libre/texlive-core-libre/PKGBUILD +++ b/libre/texlive-core-libre/PKGBUILD @@ -46,7 +46,7 @@ backup=(etc/texmf/web2c/texmf.cnf \ etc/texmf/xdvi/XDvi) mkmd5sums=('80c7fa3db1b468f9043c6acdd941a526') -md5sums=('a005881089830e47c8502849055e866e' +md5sums=('ce7c019db21ce546d6d7f1df4bc247fe' '306ab28bb9b070fc3e40d86d28ea7e8e' 'd5a3f442ec3b7aa1518170f64f9d006b' '393a4bf67adc7ca5df2b386759d1a637') @@ -66,31 +66,6 @@ mksource() { # Remove their references from package list. sed -ri '/^(cc-pl|cs|ec|mex|pl|context-(account|algorithmic|fixme|games|letter|ruby)|euro-ce) /d' CONTENTS - # remove nonfree packages references from updmap.cfg - tar xvpf tetex.tar.xz - rm -v tetex.tar.xz - - 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 - - tar cvJf tetex.tar.xz texmf-dist tlpkg - rm -rv texmf-dist tlpkg - - # remove nonfree packages references from fmtutil.cnf - tar xvpf kpathsea.tar.xz - rm -v kpathsea.tar.xz - - 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 - - tar cvJf kpathsea.tar.xz texmf-dist tlpkg - rm -rv texmf-dist tlpkg - popd } @@ -103,12 +78,25 @@ build() { echo "done" rm -rf {tlpkg,doc,source,omega} || true - # remove nonfree packages from texlive-core.maps + # remove nonfree packages references 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 references from texlive-core.maps sed -i '/ccpl.map/d' $srcdir/$_pkgname.maps sed -i '/cs-charter.map/d' $srcdir/$_pkgname.maps sed -i '/csfonts.map/d' $srcdir/$_pkgname.maps sed -i '/plother.map/d' $srcdir/$_pkgname.maps sed -i '/pltext.map/d' $srcdir/$_pkgname.maps + + # remove nonfree packages references 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/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index ba5a3747f..e4d5a6879 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102837 2013-12-21 18:35:00Z tpowa $ +# $Id: PKGBUILD 103716 2014-01-10 12:53:25Z 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=41 +pkgrel=42 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index 31ec4c26e..0b1ae56c2 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102839 2013-12-21 18:35:50Z tpowa $ +# $Id: PKGBUILD 103718 2014-01-10 12:54:19Z 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.12-LIBRE -pkgrel=21 +pkgrel=22 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" |