diff options
34 files changed, 359 insertions, 235 deletions
diff --git a/community/chrpath/PKGBUILD b/community/chrpath/PKGBUILD index c978d17a9..515c67e16 100644 --- a/community/chrpath/PKGBUILD +++ b/community/chrpath/PKGBUILD @@ -1,17 +1,26 @@ -# $Id: PKGBUILD 55552 2011-09-14 09:27:16Z andrea $ +# $Id: PKGBUILD 106515 2014-03-05 11:39:42Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> pkgname=chrpath -pkgver=0.13 -pkgrel=3 +pkgver=0.16 +pkgrel=1 pkgdesc="Change or delete the rpath or runpath in ELF files" arch=('i686' 'x86_64') url="http://directory.fsf.org/project/chrpath/" license=('GPL2') depends=('glibc') -source=("http://ftp.tux.org/pub/X-Windows/ftp.hungry.com/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('b73072a8fbba277558c50364b65bb407') +source=("https://alioth.debian.org/frs/download.php/latestfile/813/chrpath-$pkgver.tar.gz") +md5sums=('2bf8d1d1ee345fc8a7915576f5649982') + +prepare() { + cd "${srcdir}"/$pkgname-$pkgver +# rm -f config.guess +# aclocal +# libtoolize +# automake --add-missing +# autoconf +} build() { cd "${srcdir}"/$pkgname-$pkgver diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index bae1280f5..25989d34b 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 106291 2014-02-26 16:22:54Z spupykin $ +# $Id: PKGBUILD 106511 2014-03-05 09:58:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com> pkgname=dbmail -pkgver=3.1.11 +pkgver=3.1.12 pkgrel=1 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64') @@ -27,7 +27,7 @@ source=("http://www.dbmail.org/download/3.1/dbmail-${pkgver}.tar.gz" "dbmail-pop3d.xinetd" "dbmail-timsieved.xinetd" "dbmail-7-systemd.diff") -md5sums=('e32b167106a2b34483070cbb08839567' +md5sums=('a17f22e113e26dda8fc1461690054163' '890de13361afbdf4fed12d6d7eb53e66' '961593658cd596297d03d25eb9c9e98f' '4cb764894abd3914802e90602bf90a0c' diff --git a/community/guayadeque/PKGBUILD b/community/guayadeque/PKGBUILD index cb9cad2a9..2c6466091 100755 --- a/community/guayadeque/PKGBUILD +++ b/community/guayadeque/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 103795 2014-01-11 20:08:28Z eric $ +# $Id: PKGBUILD 106500 2014-03-05 09:12:58Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Sial <sial@cpan.org> # Contributor: Martin Herndl <martin.herndl@gmail.com> pkgname=guayadeque -pkgver=0.3.5 -pkgrel=6 -pkgdesc="Lightweight music player" +pkgver=0.3.7 +pkgrel=1 +pkgdesc='Lightweight music player' arch=('i686' 'x86_64') -url="http://guayadeque.org/" +url='http://guayadeque.org/' license=('GPL3') -depends=('curl' 'desktop-file-utils' 'flac' 'libgpod' 'taglib' 'wxgtk2.8') +depends=('curl' 'desktop-file-utils' 'libgpod' 'taglib' 'wxgtk2.8') makedepends=('cmake') optdepends=('gstreamer0.10-good-plugins: Support for additional file formats' 'gvfs: Support for external devices') install=$pkgname.install source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -sha256sums=('8281286a715731b567097238e1c0aaf962e052fbc7e2761b10f36407eb6ec4d5') +sha256sums=('d23eb1247add0bef8d5fef834294d7cb3d7c5fc20db9022b86f618a13d359938') prepare() { cd ${pkgname}-${pkgver}/src diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD index df2f9eaf1..a664c40c2 100644 --- a/community/lazarus/PKGBUILD +++ b/community/lazarus/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 101243 2013-11-20 11:52:08Z spupykin $ +# $Id: PKGBUILD 106507 2014-03-05 09:48:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Adam (byte/jra) <j_adam@web.de> # Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com> pkgbase=lazarus pkgname=('lazarus' 'lazarus-gtk2' 'lazarus-qt') -pkgver=1.0.14 +pkgver=1.2 _pkgsubver=0 pkgrel=1 url='http://www.lazarus.freepascal.org/' @@ -15,7 +15,7 @@ makedepends=('fpc' 'fpc-src' 'gtk2' 'qt4pas' 'rsync') options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-${_pkgsubver}.tar.gz" 'lazcontrols2.diff') -md5sums=('11de0f79cf44eb25ee1c460561cc103b' +md5sums=('f36e7182cf5a5d75a7157104d1370e0b' '288bca6ad5ade79deec34c3602daaaa9') build() { diff --git a/community/libgit2-glib/PKGBUILD b/community/libgit2-glib/PKGBUILD index 9cc31aa13..8d74f325c 100644 --- a/community/libgit2-glib/PKGBUILD +++ b/community/libgit2-glib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 104880 2014-01-28 00:44:20Z eric $ +# $Id: PKGBUILD 106513 2014-03-05 10:10:15Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=libgit2-glib -pkgver=0.0.10 +pkgver=0.0.12 pkgrel=1 pkgdesc="GLib wrapper for libgit2" url="http://wiki.gnome.org/Projects/Libgit2-glib" @@ -11,7 +11,7 @@ arch=(i686 x86_64) depends=(glib2 libgit2) makedepends=(gobject-introspection) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('3d9dc3c2ca7fab21aa005100b102e085f4d864e507c424d46de451e9d40bfeff') +sha256sums=('193125b314f588894b769058be28101fb0b2bec345520ca6398ee4e8b7319762') build() { cd $pkgname-$pkgver diff --git a/community/liteide/PKGBUILD b/community/liteide/PKGBUILD index 9069d0264..e6808bb8d 100644 --- a/community/liteide/PKGBUILD +++ b/community/liteide/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103220 2013-12-30 14:57:33Z arodseth $ +# $Id: PKGBUILD 106526 2014-03-05 18:06:03Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: spambanane <happy.house@gmx.de> # Contributor: Matteo <matteo.dek@gmail.com> @@ -6,7 +6,7 @@ pkgname=liteide pkgver=20.1 -pkgrel=1 +pkgrel=2 pkgdesc='IDE for editing and building projects written in the Go programming language ("golangide")' license=('LGPL') arch=('x86_64' 'i686') @@ -22,9 +22,8 @@ sha256sums=('3a3e664e9a76745308fd14eb89b4376f1fb1ac1195b8e2cefcef922e8e93dde2' '47c52b22326034bd3d6a7b11b05a53c8b3838c08e145171cf5cad2ca00260697') prepare() { - gendesk -f -n --name 'Golang IDE' --pkgname "$pkgname" --pkgdesc "$pkgdesc" - cd "liteide-x$pkgver/build" - chmod +x *_*.sh + gendesk -f -n --name 'LiteIDE' --pkgname "$pkgname" --pkgdesc "$pkgdesc" + chmod +x "liteide-x$pkgver/build/"*_*.sh } build() { @@ -45,7 +44,7 @@ build() { } package() { - cd "liteide-x$pkgver/build/liteide" + cd "liteide-x$pkgver/build/liteide" msg2 'Creating directories...' mkdir -p \ @@ -85,6 +84,10 @@ package() { msg2 'Cleaning up...' rm -rf "$pkgdir/usr/share/$pkgname/doc" + + # Fix for FS#38781 + mkdir -p "$pkgdir/usr/share/$pkgname/linux" + ln -s "/usr/share/$pkgname/liteenv" "$pkgdir/usr/share/$pkgname/linux/liteenv" } # vim:set ts=2 sw=2 et: diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD index bb0c1f8fe..99e88a334 100644 --- a/community/pidgin-lwqq/PKGBUILD +++ b/community/pidgin-lwqq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 106078 2014-02-22 02:44:18Z fyan $ +# $Id: PKGBUILD 106498 2014-03-05 07:19:42Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=pidgin-lwqq -pkgver=0.2c.20140221 +pkgver=0.2d.20140304 #_gitver="tag=$pkgver" -_gitver='commit=c8482238c5d484c33c1444ad4ef9d967ce970596' +_gitver='commit=c1850142a1cf8ce88fc30cec68d3f568613d923d' pkgrel=1 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol" arch=('i686' 'x86_64') diff --git a/community/python2-systemd/PKGBUILD b/community/python2-systemd/PKGBUILD index b43674568..8b420df5e 100644 --- a/community/python2-systemd/PKGBUILD +++ b/community/python2-systemd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 106488 2014-03-04 15:41:22Z dwallace $ +# $Id: PKGBUILD 106496 2014-03-05 02:09:28Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com pkgname=python2-systemd _pkgname=systemd pkgver=210 -pkgrel=1 +pkgrel=2 pkgdesc="Python2 bindings for systemd" arch=('x86_64' 'i686') url="http://www.freedesktop.org/wiki/Software/systemd/" @@ -28,6 +28,6 @@ build() { package(){ cd "$_pkgname-$pkgver" make DESTDIR=$srcdir/root install - install -dm755 $pkgdir/usr/lib/python2.7 + install -dm755 $pkgdir/usr/lib/ cp -dpr --no-preserve=ownership $srcdir/root/usr/lib/python2.7/ $pkgdir/usr/lib/python2.7/ } diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 91b4112fc..9dc84721d 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 105686 2014-02-13 16:52:52Z spupykin $ +# $Id: PKGBUILD 106524 2014-03-05 17:09:27Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis -pkgver=2.8.6 +pkgver=2.8.7 pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ source=("http://download.redis.io/releases/redis-$pkgver.tar.gz" "redis.service" "redis.logrotate" "redis.tmpfiles.d") -md5sums=('f0dbfcdea98ed237e7990d1eaff82241' +md5sums=('3fc0bcdf6aef491ca2f08e62e4de7bc2' '5320aa6d0f31aadc1d6202ca40425aea' '9e2d75b7a9dc421122d673fe520ef17f' 'dd9ab8022b4d963b2e5899170dfff490') diff --git a/community/wireshark/PKGBUILD b/community/wireshark/PKGBUILD index 38b3e09cf..88ba96f65 100644 --- a/community/wireshark/PKGBUILD +++ b/community/wireshark/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 103931 2014-01-13 17:17:08Z andyrtr $ +# $Id: PKGBUILD 106522 2014-03-05 15:19:49Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> pkgname=('wireshark-cli' 'wireshark-gtk') pkgbase=wireshark pkgver=1.10.5 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') license=('GPL2') makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio' 'lua' 'python' 'desktop-file-utils' 'hicolor-icon-theme') url='http://www.wireshark.org/' source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2 - wireshark-1.10.3-gtk3.10-compile.patch) + wireshark-1.10.3-gtk3.10-compile.patch + wireshark-1.10.5-fix-flow-crash.patch) sha256sums=('a02190da9573dd381e7598277a31d0c63b05b2af9fe05ab6b7fc058bbea141f5' - '45274cca58f0abdd3a560beb79a6f0bc8f35736426a1855ed048c9ad8e94f3c0') + '45274cca58f0abdd3a560beb79a6f0bc8f35736426a1855ed048c9ad8e94f3c0' + 'de630c5dd1aa87749fd33c0f3f94a30215e122b1a7ffffeb9bed213fad0fe3ea') prepare() { cd ${pkgbase}-${pkgver} - patch -p1 -i ${srcdir}/wireshark-1.10.3-gtk3.10-compile.patch + patch -p1 -i "${srcdir}"/wireshark-1.10.3-gtk3.10-compile.patch + patch -p1 -i "${srcdir}"/wireshark-1.10.5-fix-flow-crash.patch } build() { @@ -39,7 +42,7 @@ build() { package_wireshark-cli() { pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version' - depends=('krb5' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua' 'portaudio') + depends=('krb5' 'libgcrypt' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua' 'portaudio') install=wireshark.install conflicts=(wireshark) diff --git a/community/wireshark/wireshark-1.10.5-fix-flow-crash.patch b/community/wireshark/wireshark-1.10.5-fix-flow-crash.patch new file mode 100644 index 000000000..447309c79 --- /dev/null +++ b/community/wireshark/wireshark-1.10.5-fix-flow-crash.patch @@ -0,0 +1,55 @@ +--- a/ui/gtk/graph_analysis.c ++++ b/ui/gtk/graph_analysis.c +@@ -504,28 +504,34 @@ static void dialog_graph_draw(graph_analysis_data_t *user_data) + + #if GTK_CHECK_VERSION(2,22,0) + /* Paint time title background */ +- cr = cairo_create (user_data->dlg.surface_time); +- gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0); +- cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); +- cairo_rectangle (cr, 0, 0, draw_area_time_alloc.width, top_y_border); +- cairo_fill (cr); +- cairo_destroy (cr); ++ if ( user_data->dlg.surface_time ) { ++ cr = cairo_create (user_data->dlg.surface_time); ++ gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0); ++ cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); ++ cairo_rectangle (cr, 0, 0, draw_area_time_alloc.width, top_y_border); ++ cairo_fill (cr); ++ cairo_destroy (cr); ++ } + + /* Paint main title background */ +- cr = cairo_create (user_data->dlg.surface_main); +- gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0); +- cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); +- cairo_rectangle (cr, 0, 0, draw_area_alloc.width, top_y_border); +- cairo_fill (cr); +- cairo_destroy (cr); ++ if ( user_data->dlg.surface_main ) { ++ cr = cairo_create (user_data->dlg.surface_main); ++ gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0); ++ cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); ++ cairo_rectangle (cr, 0, 0, draw_area_alloc.width, top_y_border); ++ cairo_fill (cr); ++ cairo_destroy (cr); ++ } + + /* Paint main comment background */ +- cr = cairo_create (user_data->dlg.surface_comments); +- gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0); +- cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); +- cairo_rectangle (cr, 0, 0, draw_area_comments_alloc.width, top_y_border); +- cairo_fill (cr); +- cairo_destroy (cr); ++ if ( user_data->dlg.surface_comments ) { ++ cr = cairo_create (user_data->dlg.surface_comments); ++ gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0); ++ cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); ++ cairo_rectangle (cr, 0, 0, draw_area_comments_alloc.width, top_y_border); ++ cairo_fill (cr); ++ cairo_destroy (cr); ++ } + #else + /* Paint time title background */ + if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_time) ) { diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index e134a8c38..dada4afac 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 204752 2014-01-26 12:15:56Z andyrtr $ +# $Id: PKGBUILD 206904 2014-03-05 18:05:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgbase=calligra pkgname=('calligra-braindump' + 'calligra-devtools' 'calligra-extras' 'calligra-filters' 'calligra-flow' @@ -17,25 +18,26 @@ pkgname=('calligra-braindump' 'calligra-sheets' 'calligra-stage' 'calligra-words') -pkgver=2.7.5 -pkgrel=5 +pkgver=2.8.0 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen2' 'kdeedu-marble' 'lcms2' 'libmariadbclient' 'freetds' 'xbase' 'libwpg' 'opencolorio' - 'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt' 'libkdcraw' - 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'vc' 'libvisio') - # libpqxx is in community, move it to extra? + 'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt' 'libkdcraw' 'libodfgen' + 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'vc' 'libvisio' + 'libetonyek' 'libpqxx' 'libspnav') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz") -md5sums=('05d1d0bac970d6dc68ffabc12fca2eb7') +md5sums=('59abfc331220f5282ea2d6df5e80e899') prepare() { mkdir build - # fix openjpeg detection + + # fix openjpeg detection sed -i "s:/usr/include/openjpeg:/usr/include/openjpeg-1.5:" \ - ${srcdir}/${pkgbase}-${pkgver}/cmake/modules/FindOpenJPEG.cmake + ${pkgbase}-${pkgver}/cmake/modules/FindOpenJPEG.cmake } build() { @@ -43,34 +45,37 @@ build() { cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_active=OFF make } package_calligra-filters() { pkgdesc="Filters for the Calligra office suite" + depends=('libodfgen') optdepends=('libwpg: Corel WordPerfect Graphics image importer' 'libwps: Microsoft Works file word processor format import' - 'libvisio: Microsoft Visio import filter') + 'libvisio: Microsoft Visio import filter' + 'libetonyek: Apple Keynote import filter') conflicts=('koffice-filters') replaces=('koffice-filters') install=calligra-filters.install - cd "${srcdir}"/build/filters + cd build/filters make DESTDIR="${pkgdir}" install } package_calligra-libs() { pkgdesc="Libraries for the Calligra office suite" - depends=('kdepimlibs' 'lcms2' 'kactivities') + depends=('kdepimlibs' 'kactivities') conflicts=('koffice-interfaces' 'koffice-libs' 'koffice-pics' - 'koffice-servicetypes' 'koffice-templates' 'calligra-interfaces' - 'calligra-pics' 'calligra-servicetypes' 'calligra-templates') + 'koffice-servicetypes' 'calligra-interfaces' + 'calligra-pics' 'calligra-servicetypes') replaces=('koffice-interfaces' 'koffice-libs' 'koffice-pics' - 'koffice-servicetypes' 'koffice-templates' 'calligra-interfaces' - 'calligra-pics' 'calligra-servicetypes' 'calligra-templates') + 'koffice-servicetypes' 'calligra-interfaces' + 'calligra-pics' 'calligra-servicetypes') - for d in interfaces libs pics servicetypes templates; do + for d in interfaces libs pics servicetypes; do cd "${srcdir}"/build/${d} make DESTDIR="${pkgdir}" install done @@ -78,16 +83,16 @@ package_calligra-libs() { package_calligra-plugins() { pkgdesc="Plugins for the Calligra office suite" - depends=('calligra-libs' 'calligra-filters') + depends=('calligra-libs' 'calligra-filters' 'libspnav') optdepends=('kdeedu-marble: map shape for Calligra') conflicts=('koffice-plugins' 'koffice-kchart') replaces=('koffice-plugins' 'koffice-kchart' 'koffice-kformula') install=calligra-plugins.install - cd "${srcdir}"/build/plugins + cd build/plugins make DESTDIR="${pkgdir}" install - - cd "${srcdir}"/build/3rdparty/kdchart + + cd ../3rdparty/kdchart make DESTDIR="${pkgdir}" install } @@ -100,7 +105,7 @@ package_calligra-karbon() { replaces=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc') install=calligra-karbon.install - cd "${srcdir}"/build/karbon + cd build/karbon make DESTDIR="${pkgdir}" install } @@ -108,6 +113,7 @@ package_calligra-kexi() { pkgdesc="Develop desktop database applications" depends=('calligra-libs' 'glew' 'fftw') optdepends=('libmariadbclient: MariaDB driver' + 'libpqxx: PostgreSQL driver' 'freetds: Sybase & MS SQL driver' 'xbase: XBase driver' 'calligra-sheets: Spreadsheet-to-Kexi-table import plugin' @@ -117,9 +123,9 @@ package_calligra-kexi() { replaces=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc') install=calligra-kexi.install - cd "${srcdir}"/build/kexi + cd build/kexi make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/kexi + cd ../doc/kexi make DESTDIR="${pkgdir}" install } @@ -130,10 +136,10 @@ package_calligra-plan() { replaces=('koffice-kplato' 'calligra-kplato') install=calligra-plan.install - cd "${srcdir}"/build/plan + cd build/plan make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/3rdparty/kdgantt + cd ../3rdparty/kdgantt make DESTDIR="${pkgdir}" install } @@ -144,9 +150,9 @@ package_calligra-stage() { replaces=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc') install=calligra-stage.install - cd "${srcdir}"/build/stage + cd build/stage make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/stage + cd ../doc/stage make DESTDIR="${pkgdir}" install } @@ -158,7 +164,7 @@ package_calligra-krita() { replaces=('koffice-krita' 'calligra-krita-doc') install=calligra-krita.install - cd "${srcdir}"/build/krita + cd build/krita make DESTDIR="${pkgdir}" install } @@ -172,9 +178,9 @@ package_calligra-sheets() { replaces=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables') install=calligra-sheets.install - cd "${srcdir}"/build/sheets + cd build/sheets make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/sheets + cd ../doc/sheets make DESTDIR="${pkgdir}" install } @@ -186,7 +192,7 @@ package_calligra-words() { replaces=('koffice-kword') install=calligra-words.install - cd "${srcdir}"/build/words + cd build/words make DESTDIR="${pkgdir}" install } @@ -196,7 +202,7 @@ package_calligra-handbook() { replaces=('koffice-handbook') options=('docs') - cd "${srcdir}"/build/doc/calligra + cd build/doc/calligra make DESTDIR="${pkgdir}" install } @@ -205,19 +211,19 @@ package_calligra-braindump() { depends=('calligra-libs' 'kdebase-runtime') install=calligra-braindump.install - cd "${srcdir}"/build/braindump + cd build/braindump make DESTDIR="${pkgdir}" install } package_calligra-flow() { pkgdesc="Flowchart & Diagram Editing" depends=('calligra-words') + optdepends=('calligra-karbon: to export the charts in various formats') conflicts=('calligra-flow-doc') replaces=('calligra-flow-doc') install=calligra-flow.install - optdepends=('calligra-karbon: to export the charts in various formats') - cd "${srcdir}"/build/flow + cd build/flow make DESTDIR="${pkgdir}" install } @@ -225,10 +231,22 @@ package_calligra-extras() { pkgdesc="Calligra suite extras" depends=('calligra-libs') optdepends=('kdegraphics-okular') - conflicts=('calligra-tools') - replaces=('calligra-tools') + conflicts=('calligra-tools' 'koffice-templates' 'calligra-templats') + replaces=('calligra-tools' 'koffice-templates' 'calligra-templats') install=calligra-extras.install - cd "${srcdir}"/build/extras + cd build/extras + make DESTDIR="${pkgdir}" install + + cd ../data make DESTDIR="${pkgdir}" install } + +package_calligra-devtools() { + pkgdesc="Calligra developer tools" + depends=('calligra-libs') + + cd build/devtools + make DESTDIR="${pkgdir}" install +} + diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD index 8d83fc457..197b5b034 100644 --- a/extra/clamav/PKGBUILD +++ b/extra/clamav/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 204255 2014-01-15 16:47:46Z bisson $ +# $Id: PKGBUILD 206695 2014-03-05 06:13:07Z bisson $ # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Gregor Ibic <gregor.ibic@intelicom.si> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=clamav pkgver=0.98.1 -pkgrel=1 +pkgrel=2 pkgdesc='Anti-virus toolkit for Unix' url='http://www.clamav.net/' license=('GPL') @@ -55,7 +55,6 @@ package() { install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/clamav.conf install -Dm644 ../logrotate "${pkgdir}"/etc/logrotate.d/clamav - install -d -o 64 -g 64 "${pkgdir}"/run/clamav install -d -o 64 -g 64 "${pkgdir}"/var/log/clamav install -d -o 64 -g 64 "${pkgdir}"/var/lib/clamav } diff --git a/extra/clamav/install b/extra/clamav/install index 896e187c7..1a0653e2a 100644 --- a/extra/clamav/install +++ b/extra/clamav/install @@ -1,6 +1,11 @@ +post_upgrade() { + systemd-tmpfiles --create clamav.conf +} + post_install() { getent group clamav &>/dev/null || groupadd -r -g 64 clamav >/dev/null getent passwd clamav &>/dev/null || useradd -r -u 64 -g clamav -d /dev/null -s /bin/false -c "Clam AntiVirus" clamav >/dev/null + post_upgrade } post_remove() { diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 23e9b14af..43c7bcc6a 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 206618 2014-03-03 15:16:27Z andyrtr $ +# $Id: PKGBUILD 206894 2014-03-05 17:41:18Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=gnutls -pkgver=3.2.12 +pkgver=3.2.12.1 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') @@ -13,11 +13,11 @@ install=gnutls.install options=('!zipman') depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit') source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('f507365940de8f095e1d867c6f0842f6' +md5sums=('a795db68253d1336f1e3c2ee48c1fee4' 'SKIP') build() { - cd ${pkgname}-${pkgver} + cd ${pkgname}-* #${pkgver} ./configure --prefix=/usr \ --with-zlib \ --disable-static \ @@ -26,12 +26,12 @@ build() { } check() { - cd ${pkgname}-${pkgver} + cd ${pkgname}-* #${pkgver} make check } package() { - cd ${pkgname}-${pkgver} + cd ${pkgname}-* #${pkgver} make DESTDIR="${pkgdir}" install # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman diff --git a/extra/kdeutils-kwallet/PKGBUILD b/extra/kdeutils-kwallet/PKGBUILD deleted file mode 100644 index 2304d0c4d..000000000 --- a/extra/kdeutils-kwallet/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 205793 2014-02-10 11:00:09Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeutils-kwallet -pkgver=4.12.2 -pkgrel=1 -pkgdesc='Wallet Management Tool' -url='http://kde.org/applications/system/kwalletmanager/' -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -groups=('kde' 'kdeutils') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kwallet-${pkgver}.tar.xz") -sha1sums=('5575f52d0188b60be9e9f9e42fd78701f56cbb68') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kwallet-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install -} diff --git a/extra/kdeutils-kwallet/kdeutils-kwallet.install b/extra/kdeutils-kwallet/kdeutils-kwallet.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/extra/kdeutils-kwallet/kdeutils-kwallet.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/libburn/PKGBUILD b/extra/libburn/PKGBUILD index ff94cfee9..37a3709c7 100644 --- a/extra/libburn/PKGBUILD +++ b/extra/libburn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 201539 2013-12-14 08:38:34Z andyrtr $ +# $Id: PKGBUILD 206898 2014-03-05 17:54:13Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=libburn -pkgver=1.3.4 # .pl01 +pkgver=1.3.6 pkgrel=1 pkgdesc="Library for reading, mastering and writing optical discs" arch=('i686' 'x86_64') @@ -12,17 +12,17 @@ license=('GPL') depends=('glibc') source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) options=('!emptydirs') -md5sums=('6aaaf2cfb09584e69991250e619789b4' +md5sums=('ed7b9bbf873fc754b1a75df1b2cc1023' 'SKIP') build() { - cd ${pkgname}-${pkgver} # /.pl01/} + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --disable-static make } package() { - cd ${pkgname}-${pkgver} # /.pl01/} + cd ${pkgname}-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD index dfa45a63f..4ed6c4cea 100644 --- a/extra/libisoburn/PKGBUILD +++ b/extra/libisoburn/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 201543 2013-12-14 08:42:49Z andyrtr $ +# $Id: PKGBUILD 206903 2014-03-05 18:01:14Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Gour <Gour <gour@mail.inet.hr> pkgname=libisoburn -pkgver=1.3.4 +pkgver=1.3.6 pkgrel=1 pkgdesc="frontend for libraries libburn and libisofs" url="http://libburnia-project.org" arch=('i686' 'x86_64') license=('GPL2') -depends=('libburn>=1.3.4' 'libisofs>=1.3.4' 'readline') +depends=('libburn>=1.3.6' 'libisofs>=1.3.6' 'readline') optdepends=('tk: for xorriso-tcltk frontend' 'bwidget: for xorriso-tcltk frontend') provides=('xorriso' 'xorriso-tcltk') install=${pkgname}.install source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('d8ebfe9407aca0d6b799706647703692' +md5sums=('1f7bea50c44ba69acb5710f14f561f5d' 'SKIP') build() { diff --git a/extra/libisofs/PKGBUILD b/extra/libisofs/PKGBUILD index da5ace494..56d9afef6 100644 --- a/extra/libisofs/PKGBUILD +++ b/extra/libisofs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 201541 2013-12-14 08:40:10Z andyrtr $ +# $Id: PKGBUILD 206901 2014-03-05 17:56:57Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Hugo Doria <hugodoria@gmail.com> # Contributor: Bjorn Martensen pkgname=libisofs -pkgver=1.3.4 +pkgver=1.3.6 pkgrel=1 pkgdesc="Library to pack up hard disk files and directories into a ISO 9660 disk image" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url="http://libburnia-project.org" license=('GPL') depends=('acl' 'zlib') source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('dcd2cb0485579b4973e4ce7291fda647' +md5sums=('11c2df00bf02015c28606a37ee839367' 'SKIP') build() { diff --git a/community/libpqxx/ChangeLog b/extra/libpqxx/ChangeLog index bf9624d43..bf9624d43 100644 --- a/community/libpqxx/ChangeLog +++ b/extra/libpqxx/ChangeLog diff --git a/community/libpqxx/PKGBUILD b/extra/libpqxx/PKGBUILD index c855098e1..34cf1d809 100644 --- a/community/libpqxx/PKGBUILD +++ b/extra/libpqxx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 100215 2013-11-01 21:20:51Z spupykin $ +# $Id: PKGBUILD 206883 2014-03-05 14:38:19Z andrea $ # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=libpqxx diff --git a/extra/libspnav/Makefile.patch b/extra/libspnav/Makefile.patch new file mode 100644 index 000000000..295c5403a --- /dev/null +++ b/extra/libspnav/Makefile.patch @@ -0,0 +1,51 @@ +--- libspnav-0.2.2/Makefile.in 2010-03-28 00:24:27.000000000 +0100 ++++ a/trunk/libspnav/Makefile.in 2014-03-05 15:33:07.590597866 +0100 +@@ -4,10 +4,12 @@ + lib_a = libspnav.a + soname = libspnav.so.0 + lib_so = $(soname).1 ++devlink = libspnav.so + + CC = gcc + AR = ar +-CFLAGS = $(opt) $(dbg) -std=c89 -fpic -pedantic -Wall -fno-strict-aliasing -I. ++CFLAGS = $(opt) $(dbg) -std=c89 -fpic -pedantic -Wall -fno-strict-aliasing -I. -I/usr/local/include $(user_cflags) ++LDFLAGS = $(user_ldflags) + + .PHONY: all + all: $(lib_a) $(lib_so) +@@ -16,7 +18,7 @@ + $(AR) rcs $@ $(obj) + + $(lib_so): $(obj) +- $(CC) -shared -Wl,-soname,$(soname) -o $@ $(obj) ++ $(CC) -shared -Wl,-soname,$(soname) -o $@ $(obj) $(LDFLAGS) + + %.o: $(srcdir)/%.c + $(CC) $(CFLAGS) -c $< -o $@ +@@ -31,13 +33,19 @@ + + .PHONY: install + install: $(lib_a) $(lib_so) +- cp $(lib_a) $(PREFIX)/$(libdir)/$(lib_a) +- cp $(lib_so) $(PREFIX)/$(libdir)/$(lib_so) +- for h in $(hdr); do cp -p $(srcdir)/$$h $(PREFIX)/include/; done ++ mkdir -p $(DESTDIR)$(PREFIX)/$(libdir) $(DESTDIR)$(PREFIX)/include ++ cp $(lib_a) $(DESTDIR)$(PREFIX)/$(libdir)/$(lib_a) ++ cp $(lib_so) $(DESTDIR)$(PREFIX)/$(libdir)/$(lib_so) ++ rm -f $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) $(DESTDIR)$(PREFIX)/$(libdir)/$(devlink) ++ ln -s $(PREFIX)/$(libdir)/$(lib_so) $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) ++ ln -s $(PREFIX)/$(libdir)/$(soname) $(DESTDIR)$(PREFIX)/$(libdir)/$(devlink) ++ for h in $(hdr); do cp -p $(srcdir)/$$h $(DESTDIR)$(PREFIX)/include/; done + + .PHONY: uninstall + uninstall: +- rm -f $(PREFIX)/$(libdir)/$(lib_a) +- rm -f $(PREFIX)/$(libdir)/$(lib_so) +- for i in $(hdr); do rm -f $(PREFIX)/include/$$i; done ++ rm -f $(DESTDIR)$(PREFIX)/$(libdir)/$(lib_a) ++ rm -f $(DESTDIR)$(PREFIX)/$(libdir)/$(lib_so) ++ rm -f $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) ++ rm -f $(DESTDIR)$(PREFIX)/$(libdir)/$(devlink) ++ for i in $(hdr); do rm -f $(DESTDIR)$(PREFIX)/include/$$i; done + diff --git a/extra/libspnav/PKGBUILD b/extra/libspnav/PKGBUILD new file mode 100644 index 000000000..4cae4c768 --- /dev/null +++ b/extra/libspnav/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 206885 2014-03-05 14:38:41Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Jan Hambrecht <jaham at gmx dot net> + +pkgname=libspnav +pkgver=0.2.2 +pkgrel=5 +pkgdesc="Alternative to the proprietary 3Dconnexion device driver and SDK for their 3D input devices" +arch=('i686' 'x86_64') +url="http://spacenav.sourceforge.net/" +license=('GPL') +depends=('glibc') +makedepends=('libx11') +source=("http://downloads.sourceforge.net/spacenav/$pkgname-$pkgver.tar.gz" + 'Makefile.patch') +md5sums=('b85a0f4ab711e2d4f73a40e2e371f5ae' + 'cc008ea9f5e1abb870c0e2dbc86c3b86') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/Makefile.patch +} + +build() { + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --disable-debug + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install +} diff --git a/extra/parted/PKGBUILD b/extra/parted/PKGBUILD index 20b127d33..6198f580c 100644 --- a/extra/parted/PKGBUILD +++ b/extra/parted/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 199967 2013-11-20 11:26:39Z allan $ +# $Id: PKGBUILD 206906 2014-03-05 18:41:12Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=parted pkgver=3.1 -pkgrel=3 +pkgrel=4 pkgdesc="A program for creating, destroying, resizing, checking and copying partitions" arch=('i686' 'x86_64') license=('GPL3') @@ -12,8 +12,16 @@ url="http://www.gnu.org/software/parted/parted.html" depends=('device-mapper' 'e2fsprogs') makedepends=('pkg-config') install=parted.install -source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz") -md5sums=('5d89d64d94bcfefa9ce8f59f4b81bdcb') +source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz" + 'parted-3.1-readline.patch') +md5sums=('5d89d64d94bcfefa9ce8f59f4b81bdcb' + '7f3c0f9d2fa2569054734149c1bf9d0c') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i "${srcdir}/parted-3.1-readline.patch" +} build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/parted/parted-3.1-readline.patch b/extra/parted/parted-3.1-readline.patch new file mode 100644 index 000000000..936ec00cb --- /dev/null +++ b/extra/parted/parted-3.1-readline.patch @@ -0,0 +1,11 @@ +--- a/parted/ui.c ++++ b/parted/ui.c +@@ -1474,7 +1474,7 @@ + #ifdef HAVE_LIBREADLINE + if (!opt_script_mode) { + rl_initialize (); +- rl_attempted_completion_function = (CPPFunction*) complete_function; ++ rl_attempted_completion_function = (rl_completion_func_t*) complete_function; + readline_state.in_readline = 0; + } + #endif diff --git a/extra/seed/PKGBUILD b/extra/seed/PKGBUILD index cd35b0df8..3a330cb55 100644 --- a/extra/seed/PKGBUILD +++ b/extra/seed/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198427 2013-10-30 14:48:37Z allan $ +# $Id: PKGBUILD 206705 2014-03-05 09:42:01Z heftig $ #Maintainer : Ionut Biru <ibiru@archlinux.org> #Contributor: Jan de Groot <jgc@archlinux.org> pkgname=seed pkgver=3.8.1 -pkgrel=2 +pkgrel=3 pkgdesc="Library and interpreter for JavaScript with GObject type system bindings." arch=('i686' 'x86_64') url="http://live.gnome.org/Seed/" @@ -12,13 +12,19 @@ license=('LGPL') depends=('webkitgtk3' 'gobject-introspection' 'gnome-js-common' 'mpfr') makedepends=('intltool') source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.8/${pkgname}-${pkgver}.tar.xz - GLib.js) + GLib.js rl63.patch) sha256sums=('80cb4db7fa6f6cf8d3e255fc45a81657388d458bc8bf23e4089e35f69eeaac32' - '2a8185df661056e12830d0a29155dc539016fc349a823f5aec09dd15bbb9239b') + '2a8185df661056e12830d0a29155dc539016fc349a823f5aec09dd15bbb9239b' + '8d91b5c46438350b139609e63f6f863fcd9949d631f87c3c4e267ad4987181a1') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../rl63.patch # Readline 6.3 compat (deprecated typedefs gone) + cp ../GLib.js extensions/ +} build() { cd "${srcdir}/${pkgname}-${pkgver}" - install -m644 ../GLib.js extensions/ ./configure --prefix=/usr --disable-static make } diff --git a/extra/seed/rl63.patch b/extra/seed/rl63.patch new file mode 100644 index 000000000..dbab0d559 --- /dev/null +++ b/extra/seed/rl63.patch @@ -0,0 +1,12 @@ +diff -u -r seed-3.8.1/modules/readline/seed-readline.c seed-3.8.1-rl63/modules/readline/seed-readline.c +--- seed-3.8.1/modules/readline/seed-readline.c 2013-04-16 09:58:20.000000000 +0200 ++++ seed-3.8.1-rl63/modules/readline/seed-readline.c 2014-03-05 10:29:53.393385674 +0100 +@@ -77,7 +77,7 @@ + key = seed_value_to_string(ctx, arguments[0], exception); + c = seed_make_rl_closure((SeedObject) arguments[1]); + +- rl_bind_key(*key, (Function *) c); ++ rl_bind_key(*key, (rl_command_func_t *) c); + + g_free(key); + diff --git a/extra/smpeg/PKGBUILD b/extra/smpeg/PKGBUILD index b1ee4d558..4571df08a 100644 --- a/extra/smpeg/PKGBUILD +++ b/extra/smpeg/PKGBUILD @@ -1,36 +1,29 @@ -# $Id: PKGBUILD 198431 2013-10-30 14:50:00Z allan $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 206703 2014-03-05 09:33:16Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=smpeg -pkgver=0.4.4 -pkgrel=7 +pkgver=0.4.5 +pkgrel=1 pkgdesc="SDL MPEG Player Library" arch=('i686' 'x86_64') url="http://icculus.org/smpeg/" license=('LGPL') depends=('sdl') -makedepends=('gtk' 'mesa' 'glu') -optdepends=('gtk: to use gtv ' 'glu: to use glmovie') -options=('!makeflags') -source=(http://mirrors.dotsrc.org/lokigames/open-source/smpeg/${pkgname}-${pkgver}.tar.gz - smpeg-0.4.4-gcc41.patch) -md5sums=('59c76ac704088ef5539210190c4e1fe3' - '8b979a58307d7196655758bd3d2466c4') -sha1sums=('6d7f4449472e6270ab435b2224f3fad951c35259' - '7d9a2ad7f6b702dfe3adcb87601d9b55022bbd1e') +makedepends=('mesa' 'glu') +optdepends=('glu: to use glmovie') +source=("$pkgname-$pkgver::svn://svn.icculus.org/smpeg/tags/release_${pkgver//./_}") +md5sums=('SKIP') build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 -i $srcdir/smpeg-0.4.4-gcc41.patch + cd $pkgname-$pkgver + ./autogen.sh ./configure --prefix=/usr --mandir=/usr/share/man --disable-static - make LDFLAGS+=-lstdc++ + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - # fix aclocal warnings - sed -i "s#(AM_PATH_SMPEG#([AM_PATH_SMPEG]#" ${pkgdir}/usr/share/aclocal/smpeg.m4 + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/smpeg/smpeg-0.4.4-gcc41.patch b/extra/smpeg/smpeg-0.4.4-gcc41.patch deleted file mode 100644 index 4a0eeb453..000000000 --- a/extra/smpeg/smpeg-0.4.4-gcc41.patch +++ /dev/null @@ -1,41 +0,0 @@ -Index: MPEGaudio.h -=================================================================== -RCS file: /cvs/cvsroot/smpeg/MPEGaudio.h,v -retrieving revision 1.23 -diff -u -p -r1.23 MPEGaudio.h ---- smpeg/MPEGaudio.h 17 Jul 2001 19:52:24 -0000 1.23 -+++ smpeg/MPEGaudio.h 6 Dec 2005 06:10:43 -0000 -@@ -151,12 +151,6 @@ private: - /* The actual MPEG audio class */ - class MPEGaudio : public MPEGerror, public MPEGaudioaction { - -- friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len); -- friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len); --#ifdef THREADED_AUDIO -- friend int Decode_MPEGaudio(void *udata); --#endif -- - public: - MPEGaudio(MPEGstream *stream, bool initSDL = true); - virtual ~MPEGaudio(); -@@ -367,6 +361,20 @@ public: - #define N_TIMESTAMPS 5 - - double timestamp[N_TIMESTAMPS]; -+ -+ /* Functions which access MPEGaudio internals */ -+ friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len); -+ friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len); -+#ifdef THREADED_AUDIO -+ friend int Decode_MPEGaudio(void *udata); -+#endif - }; - -+/* Need to duplicate the prototypes, this is not a typo :) */ -+void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len); -+int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len); -+#ifdef THREADED_AUDIO -+int Decode_MPEGaudio(void *udata); -+#endif -+ - #endif /* _MPEGAUDIO_H_ */ diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD index 63d050690..389f9be40 100644 --- a/extra/telepathy-mission-control/PKGBUILD +++ b/extra/telepathy-mission-control/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 198697 2013-11-02 08:05:33Z ioni $ +# $Id: PKGBUILD 206880 2014-03-05 11:14:59Z bpiotrowski $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Ju Liu <liuju86 at gmail dot com> # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> # Contributor: Andreas Zwinkau <beza1e1@web.de> pkgname=telepathy-mission-control -pkgver=5.16.0 +pkgver=5.16.1 pkgrel=1 pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers." arch=('i686' 'x86_64') @@ -15,13 +15,13 @@ depends=('telepathy-glib' 'libgnome-keyring' 'dconf' 'upower' 'networkmanager') makedepends=('libxslt' 'python2') install=telepathy-mission-control.install source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('736ae9d71028d8e6d95017433c07fa06') +md5sums=('421115a35b9e427807326877f86e7f43') build() { cd "$pkgname-$pkgver" PYTHON=python2 ./configure --prefix=/usr \ - --libexecdir=/usr/lib/telepathy \ - --enable-gnome-keyring \ + --libexecdir=/usr/lib/telepathy \ + --enable-gnome-keyring \ --disable-schemas-compile make } diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 53e9afb22..e3416f8ea 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -9,10 +9,10 @@ pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/packages/libretools.git/" license=('GPL3' 'GPL2') -pkgver=20140210 -_libretools_commit=696c05516039b7b93381811451d393b16a8653d1 +pkgver=20140305 +_libretools_commit=5656c9706cf6f96e0646e9594750d8239e5fcbea _devtools_commit=534d2015b45e013b37e1edbb997bd4df27d7b8fd -md5sums=('e5e6e2a939850c4ce6695e3ee10e71f4' +md5sums=('43fc28718dbcc595c674cbd6a5909685' 'ec69dffa68829f063224de19bbd55fa9') _packages_url=https://projects.parabolagnulinux.org/packages diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD index cccfb7941..5a2df28db 100644 --- a/libre/xbmc-libre/PKGBUILD +++ b/libre/xbmc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 106277 2014-02-26 11:07:14Z spupykin $ +# $Id: PKGBUILD 106505 2014-03-05 09:28:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> @@ -12,11 +12,14 @@ _pkgname=xbmc pkgname=xbmc-libre pkgver=12.3 _codename=Frodo -pkgrel=10 +pkgrel=11 pkgdesc="A software media player and entertainment hub for digital media, without unrar support" arch=('i686' 'x86_64') url="http://xbmc.org" license=('GPL' 'custom') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' 'libpng' 'libcdio' 'yajl' 'libmariadbclient' 'libjpeg-turbo' 'libsamplerate' 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' @@ -31,9 +34,6 @@ optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' 'upower: used to trigger power management functionality' 'xorg-xinit: autostart xbmc') install="${_pkgname}.install" -replaces=$_pkgname -conflicts=$_pkgname -provides=$_pkgname=$pkgver mksource=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz") source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz" "xbmc.service" @@ -41,7 +41,7 @@ source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver} "libass.patch::https://bugs.archlinux.org/index.php?getfile=11285") mkmd5sums=('7ae385ebf8e5cfcb917393235e6efbdb') md5sums=('7c71af50af55b097e4365a58b70754e8' - 'a32b879d010a0060a8057bb8cb2f4c9e' + 'b643ab67e4675c6aa88af1857f35baf2' '02f7951824ee13103344f36009c0ef2a' '7fd6399d2ffbdf06b724f0cc2efa0784') @@ -131,7 +131,7 @@ package() { done install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service - install -Dm0644 $srcdir/polkit.rules $pkgdir/usr/share/polkit-1/rules.d/10-xbmc.rules - chmod 0700 $pkgdir/usr/share/polkit-1/rules.d/ +# install -Dm0644 $srcdir/polkit.rules $pkgdir/usr/share/polkit-1/rules.d/10-xbmc.rules +# chmod 0700 $pkgdir/usr/share/polkit-1/rules.d/ } # vim:set ts=2 sw=2 et: diff --git a/libre/xbmc-libre/xbmc.service b/libre/xbmc-libre/xbmc.service index 4353defa2..d161a21a8 100644 --- a/libre/xbmc-libre/xbmc.service +++ b/libre/xbmc-libre/xbmc.service @@ -1,13 +1,15 @@ [Unit] Description = Starts instance of XBMC using xinit After = remote-fs.target +Conflicts=getty@tty7.service [Service] User = xbmc Group = xbmc PAMName=login Type = simple -ExecStart = /usr/bin/xinit /usr/bin/dbus-launch /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp +TTYPath=/dev/tty7 +ExecStart = /usr/bin/xinit /usr/bin/dbus-launch /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp vt7 Restart = on-abort [Install] |