From 6e4a9ce4b0809e1eeb57f514f5ea71e2e77355bb Mon Sep 17 00:00:00 2001 From: root Date: Wed, 24 Apr 2013 00:49:38 -0700 Subject: Wed Apr 24 00:49:37 PDT 2013 --- community/avr-gcc/PKGBUILD | 8 ++-- community/fcitx/PKGBUILD | 15 ++++--- community/gnome-panel/PKGBUILD | 9 +--- community/gnome-panel/logout-hang-workaround.patch | 15 ------- community/libmatio/PKGBUILD | 19 +++++--- community/metacity/PKGBUILD | 13 ++++-- community/metacity/application-switcher.patch | 26 +++++++++++ community/mplayer2/PKGBUILD | 5 ++- community/puzzles/PKGBUILD | 4 +- community/tinc/PKGBUILD | 8 ++-- extra/brltty/PKGBUILD | 21 +++++---- extra/brltty/brltty.service | 2 +- extra/dconf/PKGBUILD | 4 +- extra/msmtp/PKGBUILD | 15 ++++--- extra/opengtl/PKGBUILD | 17 +++---- .../opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch | 38 ---------------- extra/pyqt/PKGBUILD | 12 ++--- libre/blender-libre/PKGBUILD | 47 ++++++++++--------- libre/opencollada/PKGBUILD | 52 ++++++++++++++++++++++ 19 files changed, 181 insertions(+), 149 deletions(-) delete mode 100644 community/gnome-panel/logout-hang-workaround.patch create mode 100644 community/metacity/application-switcher.patch delete mode 100644 extra/opengtl/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch create mode 100644 libre/opencollada/PKGBUILD diff --git a/community/avr-gcc/PKGBUILD b/community/avr-gcc/PKGBUILD index d7bca6f70..3bcecdca4 100644 --- a/community/avr-gcc/PKGBUILD +++ b/community/avr-gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88221 2013-04-14 18:17:00Z schuay $ +# $Id: PKGBUILD 88836 2013-04-23 14:57:29Z schuay $ # Maintainer: schuay # Contributor: Brad Fanella # Contributor: Corrado Primier @@ -9,7 +9,7 @@ pkgname=avr-gcc _pkgname=gcc pkgver=4.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="The GNU AVR Compiler Collection" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -43,12 +43,15 @@ build() { cd ${srcdir} mkdir gcc-build && cd gcc-build + # --disable-linker-build-id: https://bugs.archlinux.org/task/34902 + ${srcdir}/${_basedir}/configure \ --disable-cloog-version-check \ --disable-install-libiberty \ --disable-libssp \ --disable-libstdcxx-pch \ --disable-libunwind-exceptions \ + --disable-linker-build-id \ --disable-nls \ --disable-werror \ --enable-__cxa_atexit \ @@ -59,7 +62,6 @@ build() { --enable-gold \ --enable-languages=c,c++ \ --enable-ld=default \ - --enable-linker-build-id \ --enable-lto \ --enable-plugin \ --enable-shared \ diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD index 24f81dac5..ffe35ec54 100644 --- a/community/fcitx/PKGBUILD +++ b/community/fcitx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88243 2013-04-15 01:48:05Z fyan $ +# $Id: PKGBUILD 88842 2013-04-23 18:22:53Z fyan $ # Maintainer: Felix Yan # Contributor: Andrea Scarpino # Contributor: csslayer @@ -6,7 +6,7 @@ pkgbase=fcitx pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4') pkgver=4.2.7 -pkgrel=6 +pkgrel=7 groups=('fcitx-im') arch=('i686' 'x86_64') url="http://code.google.com/p/fcitx/" @@ -22,6 +22,8 @@ source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}_dict.tar.xz build() { #source /etc/profile.d/qt4.sh + export CFLAGS+=" -Wall" + cd "$srcdir/$pkgbase-$pkgver" patch -Np1 -i "$srcdir/9937b68bad3a7e9465e17b711ce9c0a072d3071f.patch" patch -Np1 -i "$srcdir/10ff96ca1215187444951cdbebe9e0beacacdf5e.patch" @@ -54,9 +56,8 @@ package_fcitx() { pkgdesc="Flexible Context-aware Input Tool with eXtension" depends=('pango' 'libxinerama' 'gtk-update-icon-cache' 'shared-mime-info' \ 'hicolor-icon-theme' 'desktop-file-utils' 'libxkbfile' \ - 'libxfixes' 'dbus-core' 'icu') - optdepends=('enchant: for word predication support' - 'opencc: optional engine to do chinese convert' + 'libxfixes' 'dbus-core' 'icu' 'enchant') + optdepends=('opencc: optional engine to do chinese convert' 'fcitx-anthy: Hiragana text to Kana Kanji mixed text Japanese input method' 'fcitx-chewing: Intelligent Zhuyin input method library for traditional Chinese' 'fcitx-cloudpinyin: Standalone module for fcitx that uses pinyin API on the internet to provide additional input candidates' @@ -127,6 +128,6 @@ package_fcitx-qt4() { } md5sums=('6e291717c24615b9dc9bfaa2949af3a7' - 'ce299aa5b596cc52dc9e66b47795e627' + '246e36c2232f107ed1692a52ebc43c39' '6f420547bc8af9627db2e5290f758433' - '51e53377e1b83661f2896e25d1a46242') + '51e53377e1b83661f2896e25d1a46242') diff --git a/community/gnome-panel/PKGBUILD b/community/gnome-panel/PKGBUILD index e490594e4..a287972a4 100644 --- a/community/gnome-panel/PKGBUILD +++ b/community/gnome-panel/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 88684 2013-04-21 22:16:57Z heftig $ +# $Id: PKGBUILD 88822 2013-04-23 02:28:34Z bgyorgy $ # Maintainer: Balló György # Contributor: Jan de Groot pkgbase=gnome-panel pkgname=('gnome-panel' 'gnome-flashback-session') pkgver=3.6.2 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') license=('GPL') pkgdesc="Legacy GNOME panel" @@ -19,14 +19,12 @@ source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:3}/$pkgbase-$ gnome-desktop-3.8.patch drop-gweather-xml-include.patch 18_fix_force_quit_applet.patch - logout-hang-workaround.patch 0001-Add-the-GNOME-Flashback-session.patch fix-autoconf.patch) sha256sums=('a41c45c5512e796b8602ce50bf0d205993eab364c860aae31afa582d77b77079' '3a67f4b07a7dd356fad6b40a43983f3945123ed40080eb153396a481b34efc0c' 'e3298c62bc577969817c5d6752be83a5129004fd344e4f7998a0d8aa61874305' '9d742f675d9e09a032bfe00e0523a4ef7e234589a74a6086243bf335ce212775' - 'e98391114fe618d3c9530cd5ad88e5d0d0e3b62890e4494f7db6a76ec3613a47' 'f313791d246749f18764ad4af13c4efe54483bc327fab371c47f9fbfc25b20a9' '6828c097505d2dbbf465ed7ff694adbd646a0af2105c8dd864d1061bf0afea71') @@ -42,9 +40,6 @@ build() { # Fix force quit applet to avoid freeze patch -Np1 -i "$srcdir/18_fix_force_quit_applet.patch" - # Apply a workaround to avoid hang on logout for 15-20 sec - patch -Np1 -i "$srcdir/logout-hang-workaround.patch" - # Add GNOME Flashback session # https://bugzilla.gnome.org/show_bug.cgi?id=694625 patch -Np1 -i "$srcdir/0001-Add-the-GNOME-Flashback-session.patch" diff --git a/community/gnome-panel/logout-hang-workaround.patch b/community/gnome-panel/logout-hang-workaround.patch deleted file mode 100644 index 0b13e35b6..000000000 --- a/community/gnome-panel/logout-hang-workaround.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur gnome-panel-3.6.2.orig/gnome-panel/panel-session.c gnome-panel-3.6.2/gnome-panel/panel-session.c ---- gnome-panel-3.6.2.orig/gnome-panel/panel-session.c 2012-09-03 17:41:42.000000000 +0200 -+++ gnome-panel-3.6.2/gnome-panel/panel-session.c 2013-04-11 00:59:42.125864185 +0200 -@@ -69,11 +69,6 @@ - - egg_sm_client_set_mode (mode); - -- client = egg_sm_client_get (); -- -- g_signal_connect (client, "quit", -- G_CALLBACK (panel_session_handle_quit), NULL); -- - /* We don't want the WM to try and save/restore our - * window position */ - gdk_x11_set_sm_client_id (NULL); diff --git a/community/libmatio/PKGBUILD b/community/libmatio/PKGBUILD index 7bc220d2c..da7660150 100644 --- a/community/libmatio/PKGBUILD +++ b/community/libmatio/PKGBUILD @@ -1,28 +1,33 @@ -# $Id: PKGBUILD 84665 2013-02-21 12:00:20Z arodseth $ +# $Id: PKGBUILD 88815 2013-04-23 01:03:57Z eric $ # Maintainer: Alexander Rødseth # Contributor: Stefan Husmann # Contributor: William Rea pkgname=libmatio -pkgver=1.5.0 -pkgrel=2 +pkgver=1.5.1 +pkgrel=1 pkgdesc='C library with a fortran 90/95 module interface for reading/writing MATLAB MAT-files' arch=('x86_64' 'i686') license=('LGPL') url='http://sourceforge.net/projects/matio' depends=('zlib') options=('!libtool' '!emptydirs') -source=("http://downloads.sourceforge.net/matio/matio-$pkgver.tar.gz") -sha256sums=('550dfa642c4ca7ad5ce5a0249264436ced14c72c116aee9fd14e99c7bd8cc72e') +source=("http://downloads.sourceforge.net/matio/matio-$pkgver.tar.bz2") +sha1sums=('12b8ed59688b2f41903ddc3e7975f21f10fe42bb') build() { - cd "$srcdir/matio-$pkgver" + cd matio-$pkgver ./configure --prefix=/usr --enable-shared make } + +check() { + cd matio-$pkgver + make check +} package() { - cd "$srcdir/matio-$pkgver" + cd matio-$pkgver make DESTDIR="$pkgdir" install } diff --git a/community/metacity/PKGBUILD b/community/metacity/PKGBUILD index 5955d5b88..1eef10aa0 100644 --- a/community/metacity/PKGBUILD +++ b/community/metacity/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88686 2013-04-21 22:17:01Z heftig $ +# $Id: PKGBUILD 88820 2013-04-23 01:21:30Z bgyorgy $ # Maintainer: Balló György # Contributor: Jan de Groot pkgname=metacity pkgver=2.34.13 -pkgrel=4 +pkgrel=5 pkgdesc="Legacy GNOME window manager" arch=('i686' 'x86_64') license=('GPL') @@ -17,12 +17,14 @@ source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$p fix_compositing_startup.patch fix_force_quit.patch fix_shadows.patch - enable_compositing.patch) + enable_compositing.patch + application-switcher.patch) sha256sums=('8cf4dbf0da0a6f36357ce7db7f829ec685908a7792453c662fb8184572b91075' '5094a0ffe3eb8289ed752829877c2e1b743eddf938ad3fc92fb4574b42765ae2' '917760ac3375894ebb4052dfc7c8dff1ac556fb81033d7a7caf02123ceede50d' 'a0981477e9b3fd108fd03b7637bfd1f17a1f6cb13ec703d86b424b55076096f3' - 'e53c1c20e19cd3d94d05d08045c7a9a373ce52051928ccc69bf3068081f30f9a') + 'e53c1c20e19cd3d94d05d08045c7a9a373ce52051928ccc69bf3068081f30f9a' + '177ded8203c3ff25f59a24445145cb54da9aba4216a0014c34979b7c12f3c099') build() { cd "$pkgname-$pkgver" @@ -39,6 +41,9 @@ build() { # Enable compositing by default (required for the desktop rendering feature of nautilus) patch -Np1 -i "$srcdir/enable_compositing.patch" + # Rename switch-windows to switch-applications (required for GNOME 3.8 compatibility) + patch -Np1 -i "$srcdir/application-switcher.patch" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ --disable-static --disable-schemas-compile make diff --git a/community/metacity/application-switcher.patch b/community/metacity/application-switcher.patch new file mode 100644 index 000000000..2832d262c --- /dev/null +++ b/community/metacity/application-switcher.patch @@ -0,0 +1,26 @@ +diff -Naur metacity-2.34.13.orig/src/50-metacity-navigation.xml.in metacity-2.34.13/src/50-metacity-navigation.xml.in +--- metacity-2.34.13.orig/src/50-metacity-navigation.xml.in 2012-10-15 20:06:27.000000000 +0200 ++++ metacity-2.34.13/src/50-metacity-navigation.xml.in 2013-04-23 02:35:18.000734619 +0200 +@@ -29,7 +29,7 @@ + + +- + + # Contributor: Martin Panter # Contributor: Stéphane Gaudreault @@ -23,7 +23,8 @@ provides=('mplayer') conflicts=('mplayer') options=(!emptydirs) source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) -sha256sums=('03aeccbd82b3598e0656b54ae6ab60c79afdb78eabe1b2915e7912db7efbd343') +sha256sums=('03aeccbd82b3598e0656b54ae6ab60c79afdb78eabe1b2915e7912db7efbd343' + 'SKIP') build() { cd $pkgname-$pkgver diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD index 7d33b4d16..404bfa286 100644 --- a/community/puzzles/PKGBUILD +++ b/community/puzzles/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: schuay pkgname=puzzles -pkgver=9694 +pkgver=9835 pkgrel=1 pkgdesc="Simon Tatham's Portable Puzzle Collection" arch=('i686' 'x86_64') @@ -38,4 +38,4 @@ package() { mv ${pkgdir}/usr/bin/blackbox ${pkgdir}/usr/bin/puzzles-blackbox } -md5sums=('f5e7b7b2a1bab3c939bb03e4ff8201c1') +md5sums=('0db6e36f2ac04490f38ace15aabab555') diff --git a/community/tinc/PKGBUILD b/community/tinc/PKGBUILD index 227efcbec..d16e10cd1 100644 --- a/community/tinc/PKGBUILD +++ b/community/tinc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85671 2013-03-04 16:46:31Z tredaelli $ +# $Id: PKGBUILD 88838 2013-04-23 16:26:01Z tredaelli $ # Maintainer: Timothy Redaelli # Contributor: helios # Contributor: Lothar Gesslein # Contributor: Dominik George pkgname=tinc -pkgver=1.0.20 +pkgver=1.0.21 pkgrel=1 pkgdesc="VPN (Virtual Private Network) daemon" arch=('i686' 'x86_64') @@ -16,8 +16,8 @@ backup=(etc/conf.d/tincd.conf) install=tinc.install source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz{,.sig} tincd.rc tincd.conf tincd@.service) -md5sums=('001277e0ccd7ca29f7fa4039774ad611' - '8ad9e8784712bdc1496223c6dbd99ab9' +md5sums=('d7bc9ca38672c9da08d74ff2a3e8e36d' + 'SKIP' '64bb53748d9051255f243003f0d511f5' '7c0276d4812cc5d3cc18142562a3aa82' '035b0e549b08da55d19a8df5b8306e4d') diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD index c86f5b324..b374331bd 100644 --- a/extra/brltty/PKGBUILD +++ b/extra/brltty/PKGBUILD @@ -1,31 +1,32 @@ -# $Id: PKGBUILD 183336 2013-04-21 22:08:36Z heftig $ -# Maintainer: +# $Id: PKGBUILD 183561 2013-04-23 13:10:19Z tomegun $ +# Maintainer: Tom Gundersen # Contributor: Jan de Groot # Contributor: Giovanni Scafora pkgname=brltty pkgver=4.5 -pkgrel=1 +pkgrel=3 pkgdesc="Braille display driver for Linux/Unix" arch=(i686 x86_64) url="http://mielke.cc/brltty" license=(GPL LGPL) -depends=(libxaw at-spi2-core gpm 'icu>=51.1' tcl atk cython) -makedepends=(bluez) -optdepends=('bluez: bluetooth support') +depends=(libxaw gpm icu tcl cython) +makedepends=(bluez at-spi2-core) +optdepends=('bluez: bluetooth support' + 'at-spi2-core: X11/GNOME Apps accessibility' + 'atk: ATK bridge for X11/GNOME accessibility') backup=(etc/brltty.conf) options=('!emptydirs') install=brltty.install source=(http://mielke.cc/$pkgname/releases/$pkgname-$pkgver.tar.gz brltty.service) -md5sums=('7b52fa7746fed41ed344a1f75ce55951' - '7acecd700b9f94d76fe4a6ad56cb0448') + build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --mandir=/usr/share/man \ --with-tables-directory=/usr/share/brltty \ - --with-screen-driver=a2 \ + --with-screen-driver=lx \ --enable-gpm \ --disable-java-bindings \ --disable-static @@ -39,3 +40,5 @@ package() { install -Dm644 Documents/brltty.conf "$pkgdir/etc/brltty.conf" install -Dm644 ../brltty.service "$pkgdir/usr/lib/systemd/system/brltty.service" } +md5sums=('7b52fa7746fed41ed344a1f75ce55951' + '0cad54bb5470122535f5e3a11d5ca123') diff --git a/extra/brltty/brltty.service b/extra/brltty/brltty.service index 1b9d55e32..4ef39c3fc 100644 --- a/extra/brltty/brltty.service +++ b/extra/brltty/brltty.service @@ -9,4 +9,4 @@ Type=forking PIDFile=/run/brltty.pid [Install] -WantedBy=multi-user.target +WantedBy=sysinit.target diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD index d7557337a..a12c0d2ec 100644 --- a/extra/dconf/PKGBUILD +++ b/extra/dconf/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183343 2013-04-21 22:08:45Z heftig $ +# $Id: PKGBUILD 183552 2013-04-23 04:49:12Z eric $ # Maintainer: Ionut Biru pkgname=dconf @@ -9,7 +9,7 @@ arch=(i686 x86_64) url="http://live.gnome.org/dconf" license=('LGPL2.1') depends=('glib2' 'gtk-update-icon-cache') -makedepends=('vala' 'gtk3' 'intltool' 'docbook-xsl' 'python') +makedepends=('vala' 'gtk3' 'intltool' 'docbook-xsl' 'python' 'python2') optdepends=('gtk3: for dconf-editor') install=dconf.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD index 83e5fa89a..8b0964afa 100644 --- a/extra/msmtp/PKGBUILD +++ b/extra/msmtp/PKGBUILD @@ -1,19 +1,24 @@ -# $Id: PKGBUILD 169483 2012-10-22 00:13:27Z eric $ +# $Id: PKGBUILD 183544 2013-04-22 22:24:46Z eric $ # Maintainer: Eric Bélanger pkgbase=msmtp pkgname=('msmtp' 'msmtp-mta') -pkgver=1.4.30 +pkgver=1.4.31 pkgrel=1 arch=('i686' 'x86_64') license=('GPL3') url="http://msmtp.sourceforge.net" makedepends=('texlive-core' 'gsasl' 'libgnome-keyring') source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgbase}-${pkgver}.tar.bz2) -sha1sums=('fd469bae0c3394b30b771780e62bbd41c4d5d175') +sha1sums=('c0edce1e1951968853f15209c8509699ff9e9ab5') + +prepare() { + cd ${pkgbase}-${pkgver} + sed -i 's|/usr/bin/python|/usr/bin/python2|' scripts/msmtp-gnome-tool/msmtp-gnome-tool.py +} build() { - cd "${srcdir}/${pkgbase}-${pkgver}" + cd ${pkgbase}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc --with-ssl=gnutls make make -C doc html pdf @@ -24,7 +29,7 @@ package_msmtp() { depends=('gsasl' 'libgnome-keyring') install=msmtp.install - cd "${srcdir}/${pkgbase}-${pkgver}" + cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" install make DESTDIR="${pkgdir}" -C doc install-html install-pdf diff --git a/extra/opengtl/PKGBUILD b/extra/opengtl/PKGBUILD index 227a66368..67d61514a 100644 --- a/extra/opengtl/PKGBUILD +++ b/extra/opengtl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 173974 2012-12-30 15:30:38Z foutrelis $ +# $Id: PKGBUILD 183549 2013-04-23 00:30:16Z eric $ # Maintainer: # Contributor: Ronald van Haren # Contributor: Andries Radu pkgname=opengtl -pkgver=0.9.17 -pkgrel=2 +pkgver=0.9.18 +pkgrel=1 pkgdesc="A set of libraries for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications" url="http://www.opengtl.org" arch=('i686' 'x86_64') @@ -13,18 +13,11 @@ license=('GPL') depends=('gcc-libs' 'llvm') makedepends=('cmake' 'libpng') optdepends=('libpng: for using the png extension') -source=(http://download.opengtl.org/OpenGTL-$pkgver.tar.bz2 - opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch) -sha256sums=('89a37394fe71f2e771d7230333c86b93706f0083f86a58a86a670bca7e4f905e' - 'd3e12d964c927e6f659df00e6210815c803c9126b34e9e92d4ccfebd6d30c8d7') +source=(http://download.opengtl.org/OpenGTL-$pkgver.tar.bz2) +sha256sums=('f094b3d2a1a60519975bb3badc05e704f2b93c7a3d2cb753041f2ff27cfcd9f8') build() { cd "$srcdir" - - # Fix build with LLVM 3.2 - patch -d OpenGTL-$pkgver -Np1 -i \ - "$srcdir/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch" - mkdir build cd build cmake ../OpenGTL-$pkgver \ diff --git a/extra/opengtl/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch b/extra/opengtl/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch deleted file mode 100644 index c148c88bb..000000000 --- a/extra/opengtl/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -upr OpenGTL-0.9.17.orig/CMakeLists.txt OpenGTL-0.9.17/CMakeLists.txt ---- OpenGTL-0.9.17.orig/CMakeLists.txt 2012-06-04 17:51:43.000000000 +0300 -+++ OpenGTL-0.9.17/CMakeLists.txt 2012-12-25 03:00:30.000000000 +0200 -@@ -47,8 +47,8 @@ configure_file(config-endian.h.cmake ${C - - find_package(LLVM REQUIRED) - --if( NOT MSVC AND NOT (LLVM_VERSION STREQUAL "3.1" OR LLVM_VERSION STREQUAL "3.0" ) ) # There is no way with MSVC to know the llvm version -- message(FATAL_ERROR "LLVM 3.0 or 3.1 is required.") -+if( NOT MSVC AND NOT LLVM_VERSION STREQUAL "3.2" ) # There is no way with MSVC to know the llvm version -+ message(FATAL_ERROR "LLVM 3.2 is required.") - endif() - - if(MSVC) -diff -upr OpenGTL-0.9.17.orig/OpenCTL/OpenCTL/Program.cpp OpenGTL-0.9.17/OpenCTL/OpenCTL/Program.cpp ---- OpenGTL-0.9.17.orig/OpenCTL/OpenCTL/Program.cpp 2012-06-04 17:51:43.000000000 +0300 -+++ OpenGTL-0.9.17/OpenCTL/OpenCTL/Program.cpp 2012-12-25 02:59:17.000000000 +0200 -@@ -29,7 +29,7 @@ - #include - #include - #include --#include -+#include - #include - - // GTLCore -diff -upr OpenGTL-0.9.17.orig/OpenGTL/GTLCore/ModuleData_p.cpp OpenGTL-0.9.17/OpenGTL/GTLCore/ModuleData_p.cpp ---- OpenGTL-0.9.17.orig/OpenGTL/GTLCore/ModuleData_p.cpp 2012-06-04 17:51:43.000000000 +0300 -+++ OpenGTL-0.9.17/OpenGTL/GTLCore/ModuleData_p.cpp 2012-12-25 02:59:34.000000000 +0200 -@@ -23,7 +23,7 @@ - - #include - #include --#include -+#include - #include - #include - #include diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD index 2e2064da0..6ed0b16ad 100644 --- a/extra/pyqt/PKGBUILD +++ b/extra/pyqt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 179560 2013-03-07 08:19:05Z andrea $ +# $Id: PKGBUILD 183563 2013-04-23 13:10:46Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Douglas Soares de Andrade # Contributor: riai Ben pkgbase=pyqt pkgname=('pyqt-common' 'pyqt' 'python2-pyqt') -pkgver=4.10 +pkgver=4.10.1 pkgrel=1 arch=('i686' 'x86_64') url="http://riverbankcomputing.co.uk/software/pyqt/intro" @@ -13,7 +13,7 @@ license=('GPL') makedepends=('python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa' 'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus') source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz") -md5sums=('b5953e96d0f82d322d0cba008163321e') +md5sums=('e5973c4ec0b0469f329bc00209d2ad9c') build() { cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver} @@ -27,9 +27,6 @@ build() { # Thanks Gerardo for the rpath fix find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g' - # Ugly workaround to fix build - sed -i 's|/usr/include/qt4/phonon|/usr/include/phonon|' phonon/Makefile - make ### Python2 version ### @@ -43,9 +40,6 @@ build() { # Thanks Gerardo for the rpath fix find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g' - # Ugly workaround to fix build - sed -i 's|/usr/include/qt4/phonon|/usr/include/phonon|' phonon/Makefile - make } diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD index 441e658a9..e303d8d2b 100644 --- a/libre/blender-libre/PKGBUILD +++ b/libre/blender-libre/PKGBUILD @@ -1,4 +1,3 @@ -# $Id$ # Maintainer: Márcio Silva _spacenav=false @@ -14,7 +13,7 @@ fi epoch=7 pkgver=2.66a _pyver=3.3 -pkgrel=3 +pkgrel=4 pkgdesc="Fully integrated 3D graphics creation suite, without nonfree povray and cuda support$_spndesc" arch=( i686 @@ -22,21 +21,23 @@ arch=( mips64el ) license=GPL -url="http://www.${_pkgname%-$_pkgflag}.org" +url=http://www.${_pkgname%-$_pkgflag}.org depends=( desktop-file-utils - ffmpeg - fftw - freetype2 + 'ffmpeg=1:1.2' + fftw #3.3.3 + freetype2 #2.4.11 hicolor-icon-theme + 'ilmbase=2.0.0' jack - libpng - libtiff - openal - openimageio - opencollada - opencolorio - openshadinglanguage + libpng #1.5.15 + libtiff #4.0.3 + openal #1.15.1 + 'openexr=2.0.0' + openimageio #1.1.9 + 'opencollada=20130305' + opencolorio #1.0.8 + openshadinglanguage #1.3.0 shared-mime-info xdg-utils ) @@ -45,27 +46,29 @@ if [ $_spacenav == true ]; then libspnav ) fi -optdepends='bullet: for Rigid Bodies and Physics Simulation' +optdepends=( + 'bullet: for Rigid Bodies and Physics Simulation' + 'xcftools: for import GIMP images to scene (pcr repo)' +) makedepends=( boost cmake mesa subversion ) -provides=( - ${_pkgname%-$_pkgflag}=$epoch:$pkgver -) +provides=(${_pkgname%-$_pkgflag}=$epoch:$pkgver) conflicts=${_pkgname%-$_pkgflag} replaces=${_pkgname%-$_pkgflag} install=$_pkgname.install -source="http://download.${_pkgname%-$_pkgflag}.org/source/${_pkgname%-$_pkgflag}-$pkgver.tar.gz" +source=http://download.${_pkgname%-$_pkgflag}.org/source/${_pkgname%-$_pkgflag}-$pkgver.tar.gz sha512sums=ea5def031daa220991f6165950234b311e8ae3baa6785d6226efefa90b64e1b83e8635f71f9a7fc7ae23923ce313d5ae48ffa0c54cf7ff794a4fb2dacbe8714f -build() { - cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver +prepare() { + mkdir cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build +} - mkdir build - cd build +build() { + cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build [[ $CARCH == i686 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF' diff --git a/libre/opencollada/PKGBUILD b/libre/opencollada/PKGBUILD new file mode 100644 index 000000000..2cf700e1f --- /dev/null +++ b/libre/opencollada/PKGBUILD @@ -0,0 +1,52 @@ +# Maintainer: Márcio Silva + +pkgname=opencollada +pkgver=20130305 +pkgrel=1 +pkgdesc="Stream based reader and writer library for COLLADA files (built for the blender-libre package)" +arch=( + i686 + x86_64 + mips64el +) +url=https://github.com/KhronosGroup/OpenCOLLADA +license=GPL +depends=( + libxml2 + pcre +) +makedepends=( + git + cmake +) +source=git://github.com/KhronosGroup/OpenCOLLADA.git +sha512sums=SKIP + +prepare() { + cd $srcdir/OpenCOLLADA + + # adapt source to last blender release + git reset --hard da9f1c3d5da28d475f35ff1175d60cb74fa0f661 # Tue Mar 5 11:30:27 2013 +0100 + + [[ -d build ]] && rm -r build + mkdir build +} + +build() { + cd $srcdir/OpenCOLLADA/build + + setarch $CARCH cmake .. -DCMAKE_INSTALL_PREFIX=/usr + setarch $CARCH make +} + +package() { + cd $srcdir/OpenCOLLADA/build + + setarch $CARCH make DESTDIR=$pkgdir install + + install -d $pkgdir/etc/ld.so.conf.d + echo /usr/lib/$pkgname > $pkgdir/etc/ld.so.conf.d/$pkgname.conf +} + +# vim:set ts=2 sw=2 et: + -- cgit v1.2.3-54-g00ecf