From f7cd2a0a073da2373cd3f3c8e31515dd0b83b645 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 2 Aug 2013 01:31:32 -0700 Subject: Fri Aug 2 01:30:56 PDT 2013 --- libre/blender-addon-luxrender/PKGBUILD | 8 +- libre/blender-libre/PKGBUILD | 18 +++- libre/clementine-libre/PKGBUILD | 102 ++++++++++++--------- libre/clementine-libre/clementine.install | 8 +- .../remove-nonfree-artwork-and-spotify.patch | 11 ++- libre/kdenetwork-kopete-libre/PKGBUILD | 4 +- libre/libquicktime-libre/PKGBUILD | 2 +- libre/syslinux/PKGBUILD | 4 +- libre/syslinux/syslinux.cfg | 2 +- 9 files changed, 96 insertions(+), 63 deletions(-) (limited to 'libre') diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD index 6ec5ec2f5..d3c891067 100644 --- a/libre/blender-addon-luxrender/PKGBUILD +++ b/libre/blender-addon-luxrender/PKGBUILD @@ -4,21 +4,21 @@ _srcname=luxrender _pkgver=1.2.1 _bldname=blender _bldver=2.68 -_bldep=10 +_bldep=9 _pkgname=${_srcname::3}${_bldname::5}25 _srcver=c9deae0646d0 pkgname=$_bldname-addon-$_srcname pkgver=$_pkgver.v$_bldver -pkgrel=2 +pkgrel=3 pkgdesc="$_pkgname: A addon for the ${_bldname^} which allows render and export with LuxRender (built for the $_bldname-libre package)" arch=any url=http://www.$_srcname.net/ license=GPL depends=( $_srcname=$_pkgver - "$_bldname>=$(($_bldep-1)):$_bldver" - "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))" + "$_bldname-libre>=$_bldep:$_bldver" + "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))" ) provides=($_pkgname=$_pkgver) conflicts=$_pkgname diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD index f386e5e6c..90df03528 100644 --- a/libre/blender-libre/PKGBUILD +++ b/libre/blender-libre/PKGBUILD @@ -3,7 +3,7 @@ _pkgname=blender epoch=10 _pkgver=2.68a -pkgrel=2 +pkgrel=3 _jpgver=1.5 _pyver=3.3 @@ -34,7 +34,7 @@ depends=( libpng libtiff openal - openexr + openexr-libre openimageio 'opencollada=20130413' opencolorio @@ -53,7 +53,7 @@ makedepends=( mesa ) provides=($_pkgname) -[[ $_spn == true ]] && provides+=($_pkgname-libre) +[[ $_spn == true ]] && provides+=("$_pkgname-libre=$epoch:$pkgver") conflicts=($_pkgname) [[ $_spn == true ]] && conflicts+=($_pkgname-libre) replaces=$_pkgname @@ -70,10 +70,20 @@ prepare() { [[ $_OS == GNU/Linux ]] && sed -i 's|BUILD_PLATFORM;|"GNU/Linux-libre";|' source/creator/buildinfo.c sed -i 's|Linux, Mac OS X, Windows and FreeBSD|GNU and GNU/Linux-libre| s|Linux, FreeBSD|GNU, GNU/Linux-libre| + s|Unpack the archive, Then run the Blender executable.|Intall from Parabola repo (pacman -S '"$pkgname"'), Then run blender.| + \|Windows|d;\|Mac OS X|d + s|The downloaded Blender package includes|The '"${pkgname^}"' package includes| ' release/text/readme.html + sed -i 's|Linux|GNU/Linux-libre| + ' release/scripts/{addons/game_engine_save_as_runtime,modules/bl_i18n_utils/utils_rtl}.py + sed -i 's| (.so under Linux, .dll under windows...)|| + ' release/scripts/{addons/ui_translate,modules/bl_i18n_utils}/settings.py msg 'removing Open Source term' - sed -i 's|free, open source|free|' release/text/readme.html + sed -i 's|free, open source|free| + s|free and open-source|free| + s|open-source and free|free| + ' release/text/readme.html mkdir -v build diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD index f52891d3d..4cc986be1 100644 --- a/libre/clementine-libre/PKGBUILD +++ b/libre/clementine-libre/PKGBUILD @@ -1,72 +1,84 @@ -# $Id: PKGBUILD 90335 2013-05-11 16:04:01Z tomegun $ -#Maintainer: Stéphane Gaudreault -#Contributor: BlackEagle -#Contributor: Dany Martineau -#Maintainer (Parabola): André Silva -#Contributor (Parabola): Kete -#Contributor (Parabola): Márcio Silva +# $Id: PKGBUILD 94971 2013-08-01 22:31:55Z alucryd $ +# Maintainer: Maxime Gauduin +# Contributor: Stéphane Gaudreault +# Contributor: BlackEagle +# Contributor: Dany Martineau +# Maintainer (Parabola): André Silva +# Contributor (Parabola): Kete +# Contributor (Parabola): Márcio Silva _pkgname=clementine pkgname=clementine-libre pkgver=1.1.1 -pkgrel=8 +pkgrel=9 pkgdesc="A music player and library organizer, without nonfree artwork and spotify support" url="http://www.clementine-player.org/" license=('GPL') arch=('i686' 'x86_64') -depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod' 'projectm' - 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt4' 'libimobiledevice' 'chromaprint' - 'sparsehash' 'qjson' 'libcdio-paranoia' 'protobuf' 'qca' 'qca-ossl' 'gvfs') -makedepends=('cmake' 'boost' 'mesa') -optdepends=('gstreamer0.10-base-plugins: for more open formats' - 'gstreamer0.10-good-plugins: for use with "Good" plugin libraries' - 'gstreamer0.10-bad-libre-plugins: for use with "Bad" plugin libraries' - 'gstreamer0.10-ugly-plugins: for use with "Ugly" plugin libraries') +depends=('chromaprint' 'gstreamer0.10-base' 'libcdio' 'libgpod' 'liblastfm' 'libmtp' 'projectm' 'protobuf' 'qca-ossl' 'qjson' 'taglib') +makedepends=('cmake' 'boost' 'mesa' 'sparsehash') +optdepends=('gstreamer0.10-base-plugins: "Base" plugin libraries' + 'gstreamer0.10-good-plugins: "Good" plugin libraries' + 'gstreamer0.10-bad-libre-plugins: "Bad" plugin libraries' + 'gstreamer0.10-ugly-plugins: "Ugly" plugin libraries' + 'gvfs: Various devices support') replaces=('clementine') conflicts=('clementine') provides=("clementine=$pkgver") -source=(http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz +install=clementine.install +source=("http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz" 'clementine-1.1.1-libimobiledevice-fix.patch' 'remove-nonfree-artwork-and-spotify.patch' 'moognu.png') -install=clementine.install +md5sums=('28e4afb822388bd337a761db8f86febf' + '736df6cd828a3172701f63c8dc978cb9' + '9ccfe62f8784a1ccbe8c96f8cacad9d0' + '59a8c0d7659898c457b95f877718cf1c') -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" +prepare() { + cd ${_pkgname}-${pkgver} - patch -Np1 < "$srcdir"/clementine-1.1.1-libimobiledevice-fix.patch + patch -Np1 -i ../clementine-1.1.1-libimobiledevice-fix.patch - # Remove nonfree nonfree artwork and spotify references on files - patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch + # remove nonfree nonfree artwork and spotify references on files + patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch - # Remove nonfree spotifyblob folders - rm -rv ext/{clementine-spotifyblob,libclementine-spotifyblob} + # remove nonfree spotifyblob folders + rm -rv ext/{clementine-spotifyblob,libclementine-spotifyblob} - # Remove nonfree spotify files - rm -v cmake/SpotifyVersion.cmake - rm -v data/spotify-core-logo-128x128.png - rm -v data/icons/svg/spotify.svg - rm -v data/schema/schema-30.sql - rm -v src/{globalsearch/spotifysearchprovider.{cpp,h},internet/spotify{blobdownloader.{cpp,h},server.{cpp,h},service.{cpp,h},settingspage.{cpp,h,ui}}} + # remove nonfree spotify files + rm -v cmake/SpotifyVersion.cmake + rm -v data/spotify-core-logo-128x128.png + rm -v data/icons/svg/spotify.svg + rm -v data/schema/schema-30.sql + rm -v src/{globalsearch/spotifysearchprovider.{cpp,h},internet/spotify{blobdownloader.{cpp,h},server.{cpp,h},service.{cpp,h},settingspage.{cpp,h,ui}}} - ## Remove nonfree nyancat.png - rm -v data/nyancat.png + ## remove nonfree nyancat.png + rm -v data/nyancat.png - ## Put moognu.png to the source code - cp -v ../moognu.png data + ## rut moognu.png to the source code + install -m644 -v ../moognu.png data - # Create a blank file due that is a dependency for clementine - touch data/schema/schema-30.sql + # create a blank file due which is a dependency for clementine + touch data/schema/schema-30.sql +} - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_PROJECTM=1 -DBUILD_WERROR=0 - make +build() { + cd ${_pkgname}-${pkgver} + + if [[ -d build ]]; then + rm -rf build + fi + mkdir build && cd build + + cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_PROJECTM=1 -DBUILD_WERROR=0 + make } package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd ${_pkgname}-${pkgver}/build + + make DESTDIR="${pkgdir}" install } -md5sums=('28e4afb822388bd337a761db8f86febf' - '736df6cd828a3172701f63c8dc978cb9' - '5cc8f800dd4df7bd5548196009ab68e0' - '59a8c0d7659898c457b95f877718cf1c') + +# vim: ts=2 sw=2 et: diff --git a/libre/clementine-libre/clementine.install b/libre/clementine-libre/clementine.install index 2f0338d8a..927a10258 100644 --- a/libre/clementine-libre/clementine.install +++ b/libre/clementine-libre/clementine.install @@ -1,13 +1,15 @@ post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -ftq usr/share/icons/hicolor update-desktop-database -q } post_upgrade() { - post_install $1 + post_install } post_remove() { - post_install $1 + post_install } + +# vim: ts=2 sw=2 et: diff --git a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch index 6008b2d28..3a948bf96 100644 --- a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch +++ b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch @@ -658,8 +658,15 @@ diff -rauN clementine-1.1.1/src/core/backgroundstreams.cpp clementine-libre-1.1. if (version < kVersion) { diff -rauN clementine-1.1.1/src/analyzers/nyancatanalyzer.cpp clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp --- clementine-1.1.1/src/analyzers/nyancatanalyzer.cpp 2012-10-16 08:17:37.000000000 -0200 -+++ clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp 2013-05-13 03:56:04.732771832 -0300 -@@ -29,7 +29,7 @@ ++++ clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp 2013-08-02 00:16:25.974215711 -0300 +@@ -23,13 +23,13 @@ + #include + #include + +-const char* NyanCatAnalyzer::kName = "Nyanalyzer cat"; ++const char* NyanCatAnalyzer::kName = "MooGNU"; + const float NyanCatAnalyzer::kPixelScale = 0.02f; + NyanCatAnalyzer::NyanCatAnalyzer(QWidget* parent) : Analyzer::Base(parent, 9), diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 2fa9f0f11..4f4f0edf9 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -25,7 +25,9 @@ sha1sums=('3ee86a1a227593e9f37881da3c1db1a3c384b2e4' prepare() { cd ${pkgbase}-${pkgver} patch -p1 -i "${srcdir}"/use-libotr3.patch - cd ../ + cd kopete + patch -p1 -i "${srcdir}"/giflib5.patch + cd ../../ # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34. sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' "${pkgbase}-${pkgver}/kopete/protocols/CMakeLists.txt" rm -rf "${pkgbase}-${pkgver}/kopete/protocols/skype" diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD index 60eb23171..c78321b25 100644 --- a/libre/libquicktime-libre/PKGBUILD +++ b/libre/libquicktime-libre/PKGBUILD @@ -23,7 +23,7 @@ conflicts=($_pkgname) replaces=($_pkgname) prepare() { - cd $pkgname-$pkgver + cd $_pkgname-$pkgver patch -Np1 -i ../ffmpeg2.0.patch } diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD index 4967097b1..01505c5d2 100644 --- a/libre/syslinux/PKGBUILD +++ b/libre/syslinux/PKGBUILD @@ -4,7 +4,7 @@ pkgname=syslinux pkgver=4.07 -pkgrel=1 +pkgrel=1.1 arch=('i686' 'x86_64') pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)" url="http://syslinux.zytor.com/" @@ -26,7 +26,7 @@ source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.t splash.png) md5sums=('9ff6e1b94efab931fb4717b600d88779' '1528c376e43f0eaccaa80d8ad1bc13b4' - '83649111686c4c58ec05eac324ae711a' + 'a43bd903face611bcc148522265dfe6c' '8559fb3daf3afa8688600d8a38118918' 'cb46ca47c6b6323127d908440057d98f') diff --git a/libre/syslinux/syslinux.cfg b/libre/syslinux/syslinux.cfg index 4a0644956..e7199438f 100644 --- a/libre/syslinux/syslinux.cfg +++ b/libre/syslinux/syslinux.cfg @@ -37,7 +37,7 @@ MENU COLOR border 35;40 #ff777caa #a0000000 std MENU COLOR title 1;35;40 #ff777caa #a0000000 std MENU COLOR sel 7;35;47 #e0ffffff #20777caa all MENU COLOR unsel 35;40 #ff777caa #a0000000 std -MENU COLOR help 35;40 #ff777caa #a0000000 std +MENU COLOR help 35;40 #c0b2b2b2 #a0000000 std MENU COLOR timeout_msg 35;40 #ff777caa #00000000 std MENU COLOR timeout 1;35;40 #ff777caa #00000000 std MENU COLOR msg07 35;40 #ff777caa #a0000000 std -- cgit v1.2.3-54-g00ecf