diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-28 16:32:45 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-28 16:32:45 +0100 |
| commit | e4421c38da95569f796d29c83a54f750e5222545 (patch) | |
| tree | 3b7ac69f38e8a83d0dc58b69305011d095c5ceb0 | |
| parent | 3ffe7613c97fecff8c5710dfbd44a984eaae9adc (diff) | |
| parent | 0fbe25a10dce8ec16455854ed6929b688f98cb36 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/erlang/PKGBUILD
community/haskell-x11-xft/PKGBUILD
community/libgdamm/PKGBUILD
community/luasql/PKGBUILD
community/myodbc/PKGBUILD
community/python2-basemap/PKGBUILD
community/ruby-cairo/PKGBUILD
community/ruby-gtk2/PKGBUILD
community/stardict/PKGBUILD
core/diffutils/PKGBUILD
core/libsasl/PKGBUILD
core/systemd/PKGBUILD
extra/anjuta/PKGBUILD
extra/ardour/PKGBUILD
extra/boost/PKGBUILD
extra/calligra/PKGBUILD
extra/gnokii/PKGBUILD
extra/icu/PKGBUILD
extra/libgda/PKGBUILD
extra/libmtp/PKGBUILD
extra/lighttpd/PKGBUILD
extra/mariadb/PKGBUILD
extra/mysql/PKGBUILD
extra/php/PKGBUILD
extra/qt3/PKGBUILD
extra/qt4/PKGBUILD
extra/qt5/PKGBUILD
extra/tracker/PKGBUILD
extra/vlc/PKGBUILD
extra/webkitgtk/PKGBUILD
libre/lilo/PKGBUILD
libre/psi/PKGBUILD
174 files changed, 1845 insertions, 1398 deletions
diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD index d4bffed52..6229fb5b4 100644 --- a/community/collectd/PKGBUILD +++ b/community/collectd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 82585 2013-01-21 05:37:10Z bisson $ +# $Id: PKGBUILD 86998 2013-03-25 19:16:35Z bpiotrowski $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Gerhard Brauer <gerhard.brauer@web.de> pkgname=collectd -pkgver=5.2.0 -pkgrel=2 +pkgver=5.2.1 +pkgrel=1 pkgdesc='Daemon which collects system performance statistics periodically' url='http://collectd.org/' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ optdepends=('curl: apache, ascent, curl, nginx, and write_http plugins' 'libesmtp: notify_email plugin' 'libgcrypt: encryption and authentication for network plugin' 'libmemcached: memcachec plugin' - 'libmysqlclient: mysql plugin' + 'libmariadbclient: mysql plugin' 'iproute2: netlink plugin' 'net-snmp: snmp plugin' 'libnotify: notify_desktop plugin' @@ -32,7 +32,7 @@ optdepends=('curl: apache, ascent, curl, nginx, and write_http plugins' 'yajl: curl_json plugin') makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'libmemcached' - 'libmysqlclient' 'iproute2' 'net-snmp' 'libnotify' 'liboping' + 'libmariadbclient' 'iproute2' 'net-snmp' 'libnotify' 'liboping' 'libpcap' 'postgresql-libs' 'python2' 'rrdtool' 'lm_sensors' 'libvirt' 'libxml2' 'xmms' 'yajl') @@ -42,7 +42,7 @@ source=("${url}files/${pkgname}-${pkgver}.tar.gz" 'libperl.patch' 'service' 'rc.d') -sha1sums=('b56832913cbdc06ee370f89a57ed3c25ed16a88b' +sha1sums=('2c51c21d339c221bd9f94b1ee2b44b1e388d6b39' '245c098d121a4a05594553583310953b3a2f6461' 'b56907f532b9174e1b6995aadb518228d7464d3b' '0f441718d5519cb043b1130e5a1d0379078adbcc') @@ -76,5 +76,5 @@ package() { install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/collectd.service install -Dm644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl - mv "${pkgdir}"/usr/man/man3 "${pkgdir}"/usr/share/man # perl man magick ignores datarootdir + mv "${pkgdir}"/usr/man/man3 "${pkgdir}"/usr/share/man # perl man magic ignores datarootdir } diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index b0ec5863d..12d32e680 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86802 2013-03-22 11:40:46Z spupykin $ +# $Id: PKGBUILD 87043 2013-03-26 11:49:36Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua # Contributor: Michael Fellinger <m.fellinger@gmail.com> pkgname=couchdb pkgver=1.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON" arch=('i686' 'x86_64' 'mips64el') url="http://couchdb.apache.org" diff --git a/community/dee/PKGBUILD b/community/dee/PKGBUILD index c8bd17aca..a78b95e27 100644 --- a/community/dee/PKGBUILD +++ b/community/dee/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 82682 2013-01-23 00:15:51Z eric $ +# $Id: PKGBUILD 87044 2013-03-26 11:49:37Z foutrelis $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=dee pkgver=1.0.14 -pkgrel=4 +pkgrel=5 pkgdesc="Library to provide objects allowing to create Model-View-Controller type programs across DBus" arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/dee" diff --git a/community/dspam/PKGBUILD b/community/dspam/PKGBUILD index e95ec610b..58ef6d167 100644 --- a/community/dspam/PKGBUILD +++ b/community/dspam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 85298 2013-02-28 15:36:02Z spupykin $ +# $Id: PKGBUILD 86999 2013-03-25 19:16:37Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=dspam pkgver=3.10.2 -pkgrel=3 +pkgrel=4 pkgdesc="A scalable, open-source statistical anti-spam filter" arch=('i686' 'x86_64' 'mips64el') url="http://dspam.nuclearelephant.com/" @@ -13,8 +13,8 @@ backup=('etc/dspam/dspam.conf' 'srv/http/dspam/cgi-bin/subadmins') license=("GPL") depends=(readline libcap ncurses zlib openssl) -makedepends=('libmysqlclient' 'postgresql-libs' 'db' 'sqlite' 'libldap') -optdepends=('libmysqlclient: MySQL support' +makedepends=('libmariadbclient' 'postgresql-libs' 'db' 'sqlite' 'libldap') +optdepends=('libmariadbclient: MariaDB support' 'postgresql-libs: PostgreSQL support' 'db: BerkeleyDB support' 'sqlite: SQLite support' diff --git a/community/dwdiff/PKGBUILD b/community/dwdiff/PKGBUILD index 0925ec937..31915b2a4 100644 --- a/community/dwdiff/PKGBUILD +++ b/community/dwdiff/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 82683 2013-01-23 00:15:52Z eric $ +# $Id: PKGBUILD 87045 2013-03-26 11:49:38Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=dwdiff pkgver=2.0.4 -pkgrel=3 +pkgrel=4 pkgdesc="A front-end for the diff program that operates at the word level instead of the line level" arch=('i686' 'x86_64' 'mips64el') url="http://os.ghalkes.nl/dwdiff.html" diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD index 045a66ef1..5888021de 100644 --- a/community/erlang/PKGBUILD +++ b/community/erlang/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86449 2013-03-17 11:12:15Z arodseth $ +# $Id: PKGBUILD 87122 2013-03-27 15:53:26Z arodseth $ # Maintainer: Lukas Fleischer <archlinux@cryptocrack.de> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> @@ -9,11 +9,11 @@ pkgbase=erlang pkgname=('erlang' 'erlang-unixodbc') pkgver=R16B -pkgrel=2 +pkgrel=3 arch=('x86_64' 'i686' 'mips64el') url='http://www.erlang.org/' license=('custom') -makedepends=('perl' 'mesa' 'lksctp-tools' 'unixodbc' 'wxgtk') +makedepends=('perl' 'mesa' 'lksctp-tools' 'unixodbc' 'wxgtk' 'wxgtk2.9') source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz" "http://www.erlang.org/download/otp_doc_man_${pkgver/_/-}.tar.gz") sha256sums=('f01c2cfe512d3118fd3398a66bdb82bea6ad0f45b464a46a58e452264b7682cd' @@ -28,7 +28,7 @@ build() { package_erlang() { pkgdesc='General-purpose concurrent functional programming language developed by Ericsson' - depends=('ncurses' 'glu' 'wxgtk' 'openssl') + depends=('ncurses' 'glu' 'wxgtk' 'wxgtk2.9' 'openssl') optdepends=('erlang-unixodbc: database support' 'java-environment: for Java support' 'lksctp-tools: for SCTP support') diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD index 343b1bd61..625d9a428 100644 --- a/community/fcitx/PKGBUILD +++ b/community/fcitx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86209 2013-03-13 05:41:43Z fyan $ +# $Id: PKGBUILD 87046 2013-03-26 11:49:39Z foutrelis $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: csslayer <wengxt AT gmail com> @@ -6,7 +6,7 @@ pkgbase=fcitx pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4') pkgver=4.2.7 -pkgrel=4 +pkgrel=5 groups=('fcitx-im') arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fcitx/" @@ -122,4 +122,4 @@ package_fcitx-qt4() { } md5sums=('6e291717c24615b9dc9bfaa2949af3a7' - '009e0cd17f078e24c03b3b46b45e41ab') + 'ce299aa5b596cc52dc9e66b47795e627') diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index 903e4e156..d4ac8dcc1 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 84836 2013-02-25 10:38:11Z spupykin $ +# $Id: PKGBUILD 87000 2013-03-25 19:16:38Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason R Begley (jayray@digitalgoat.com> pkgname=freeradius pkgver=2.2.0 -pkgrel=4 +pkgrel=5 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64' 'mips64el') url="http://www.freeradius.org/" license=('GPL') -depends=('krb5' 'pth' 'net-snmp' 'postgresql-libs' 'libmysqlclient') +depends=('krb5' 'pth' 'net-snmp' 'postgresql-libs' 'libmariadbclient') makedepends=('libpcap' 'unixodbc' 'python2') optdepends=('libpcap' 'unixodbc' 'python2') options=('!libtool' '!makeflags') diff --git a/community/fssos-nsvs/PKGBUILD b/community/fssos-nsvs/PKGBUILD index c9b4a13e2..5a8d6fb89 100644 --- a/community/fssos-nsvs/PKGBUILD +++ b/community/fssos-nsvs/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 83140 2013-01-27 16:14:12Z pierre $ +# $Id: PKGBUILD 87001 2013-03-25 19:16:40Z bpiotrowski $ # Maintainer: Dale Blount <dale@archlinux.org> pkgname=fssos-nsvs pkgver=0.5 -pkgrel=9 +pkgrel=10 pkgdesc="NSVS for FSSOS" arch=('i686' 'x86_64') url="http://fssos.sourceforge.net/" license=('GPL') -depends=('bash' 'mysql') +depends=('bash' 'mariadb') backup=('etc/nsvsd.conf') options=('!libtool' '!makeflags') install=$pkgname.install diff --git a/community/gammu/PKGBUILD b/community/gammu/PKGBUILD index cf50f6cf2..3548d92f3 100644 --- a/community/gammu/PKGBUILD +++ b/community/gammu/PKGBUILD @@ -1,35 +1,35 @@ -# $Id: PKGBUILD 73714 2012-07-14 13:31:58Z schiv $ +# $Id: PKGBUILD 87059 2013-03-26 14:42:55Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=gammu pkgver=1.32.0 -pkgrel=1 +pkgrel=3 pkgdesc="GNU All Mobile Management Utilities" arch=('i686' 'x86_64' 'mips64el') url="http://wammu.eu/" license=('GPL') -depends=('bluez' 'curl' 'libmysqlclient' - 'postgresql-libs' 'python2' 'libusb') -makedepends=('cmake' 'doxygen' 'mysql') +depends=('bluez' 'curl' 'libmariadbclient' + 'postgresql-libs' 'libusb') +makedepends=('cmake' 'doxygen' 'mariadb') optdepends=('dialog: support for the gammu-config script') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") md5sums=('8ea16c6b3cc48097a8e62311fe0e25b9') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" # bash completion dir change - sed -e 's,DESTINATION "/etc/bash_completion.d",DESTINATION "/usr/share/bash-completion/completions",' -i contrib/CMakeLists.txt + sed -i 's,DESTINATION "/etc/bash_completion.d",DESTINATION "/usr/share/bash-completion/completions",' contrib/CMakeLists.txt - cmake . -DCMAKE_INSTALL_PREFIX="/usr" + cmake . -DCMAKE_INSTALL_PREFIX="/usr" -DLIB_SUFFIX="" make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/community/gdal/PKGBUILD b/community/gdal/PKGBUILD index a3eb291c0..e28887768 100644 --- a/community/gdal/PKGBUILD +++ b/community/gdal/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 82847 2013-01-25 01:53:13Z svenstaro $ +# $Id: PKGBUILD 87003 2013-03-25 19:16:43Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=gdal -pkgver=1.9.1 +pkgver=1.9.2 pkgrel=1 pkgdesc="A translator library for raster geospatial data formats" arch=('i686' 'x86_64' 'mips64el') url="http://www.gdal.org/" license=('custom') -depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libtiff' 'netcdf' 'python2' 'python2-numpy' 'cfitsio' 'sqlite' 'libmysqlclient' 'postgresql-libs') -makedepends=('perl' 'swig') +depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libtiff' 'netcdf' 'python2' 'python2-numpy' 'cfitsio' 'sqlite' 'libmariadbclient' 'postgresql-libs') +makedepends=('perl' 'swig' 'chrpath') optdepends=('postgresql: postgresql database support' - 'mysql: mysql database support' + 'mariadb: mariab database support' 'perl: perl binding support' 'swig: perl binding support') options=('!libtool') changelog=$pkgname.changelog source=(http://download.osgeo.org/${pkgname}/${pkgname}-${pkgver}.tar.gz gdal-1.5.1-python-install.patch) -md5sums=('c5cf09b92dac1f5775db056e165b34f5' +md5sums=('3f39db89f4710269b3a8bf94178e07aa' '81afc1c26d29cee84aadb6924fe33861') build() { @@ -29,8 +29,8 @@ build() { # bug 23654 export LDFLAGS="$LDFLAGS -Wl,--as-needed" - cd ${srcdir}/$pkgname-$pkgver - patch -Np0 -i ${srcdir}/gdal-1.5.1-python-install.patch + cd "${srcdir}/$pkgname-$pkgver" + patch -Np0 -i "${srcdir}/gdal-1.5.1-python-install.patch" # python2 fixes sed -i 's_python python1.5_python2 python python1.5_' configure @@ -45,19 +45,24 @@ build() { # workaround for bug #13646 sed -i 's/PY_HAVE_SETUPTOOLS=1/PY_HAVE_SETUPTOOLS=/g' ./GDALmake.opt sed -i 's/EXE_DEP_LIBS/KILL_EXE_DEP_LIBS/' apps/GNUmakefile - install -d ${pkgdir}/usr/lib/python2.7/site-packages/ make } package () { - cd ${srcdir}/$pkgname-$pkgver - - make DESTDIR=${pkgdir} install + cd "${srcdir}/$pkgname-$pkgver" + install -d "${pkgdir}/usr/lib/python2.7/site-packages/" + make DESTDIR="${pkgdir}" install # install license - install -D -m644 LICENSE.TXT ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -D -m644 LICENSE.TXT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" #FS15477 clean up junks - rm -f ${pkgdir}/usr/bin/*.dox + rm -f "${pkgdir}"/usr/bin/*.dox + + # Remove RPATH + chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/OSR/OSR.so + chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/OGR/OGR.so + chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/GDAL/GDAL.so + chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/GDAL/Const/Const.so } diff --git a/community/gens-gs/PKGBUILD b/community/gens-gs/PKGBUILD deleted file mode 100755 index 27ebfa3e6..000000000 --- a/community/gens-gs/PKGBUILD +++ /dev/null @@ -1,62 +0,0 @@ -# $Id: PKGBUILD 86824 2013-03-22 13:05:22Z alucryd $ -# Maintainer: Maxime Gauduin <alucryd@gmail.com> -# Contributor: trya <tryagainprod@gmail.com> -# Contributor: Yvan <madridista40@orange.fr> - -pkgname=gens-gs -pkgver=2.16.7 -pkgrel=2 -pkgdesc="An emulator of Sega Genesis, Sega CD and 32X, combining features from various forks of Gens" -arch=('i686' 'x86_64') -url="http://segaretro.org/Gens/GS" -license=('GPL') -if [[ $CARCH == "x86_64" ]]; then - makedepends=('gcc-multilib' 'lib32-gtk2' 'lib32-mesa-libgl' 'lib32-sdl' 'nasm') - optdepends=('lib32-alsa-plugins: Sound support for PulseAudio' - 'lib32-libpulse: Sound support for PulseAudio') -else - depends=('gtk2' 'sdl') - makedepends=('nasm') -fi -conflicts=('gens') -options=('!libtool') -source=('http://segaretro.org/images/6/6d/Gens-gs-r7.tar.gz' - 'gens-gtk.patch') -sha256sums=('6320cd7bee85472891e1e29b21731d2c8180d04db67ee21256491f3f9ad145c1' - '29b1e9755b34e00ef7d19bdc527dc4f841400a0022c81ee71c331be4a76a6c1c') - -build() { - cd "${srcdir}"/${pkgname}-r7 - -# Patch - patch -Np1 -i ../gens-gtk.patch - -# Multilib - if [[ $CARCH == "x86_64" ]]; then - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - fi - -# Build - if [[ $CARCH == "x86_64" ]]; then - ./configure --host=i686-unknown-linux-gnu --prefix=/usr --libdir=/usr/lib32 --with-pic --disable-static - else - LIBS='-ldl -lX11' ./configure --prefix=/usr --with-pic --disable-static - fi - make -} - -package() { - cd "${srcdir}"/${pkgname}-r7 - -# Multilib - if [[ $CARCH == "x86_64" ]]; then - depends=('lib32-gtk2' 'lib32-sdl') - fi - -# Install - make DESTDIR="${pkgdir}" install -} - -# vim: ts=2 sw=2 et: diff --git a/community/gens-gs/gens-gtk.patch b/community/gens-gs/gens-gtk.patch deleted file mode 100755 index 0bc6fd0ee..000000000 --- a/community/gens-gs/gens-gtk.patch +++ /dev/null @@ -1,187 +0,0 @@ -diff -ru gens/src/gens/ui/gtk/about/about_window.cpp gens-build/src/gens/ui/gtk/about/about_window.cpp ---- gens/src/gens/ui/gtk/about/about_window.cpp 2010-10-11 16:32:29.000000000 +0000 -+++ gens-build/src/gens/ui/gtk/about/about_window.cpp 2010-10-11 15:46:25.000000000 +0000 -@@ -84,7 +84,7 @@ - gtk_window_set_position(GTK_WINDOW(about_window), GTK_WIN_POS_CENTER); - gtk_window_set_resizable(GTK_WINDOW(about_window), FALSE); - gtk_window_set_type_hint(GTK_WINDOW(about_window), GDK_WINDOW_TYPE_HINT_DIALOG); -- gtk_dialog_set_has_separator(GTK_DIALOG(about_window), FALSE); -+ g_object_set(GTK_DIALOG(about_window), "has-separator", FALSE, NULL); - - // Callbacks for if the window is closed. - g_signal_connect((gpointer)about_window, "delete_event", -diff -ru gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp ---- gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp 2010-10-11 16:32:29.000000000 +0000 -+++ gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp 2010-10-11 15:33:03.000000000 +0000 -@@ -84,7 +84,7 @@ - gtk_window_set_position(GTK_WINDOW(bmf_window), GTK_WIN_POS_CENTER); - gtk_window_set_resizable(GTK_WINDOW(bmf_window), FALSE); - gtk_window_set_type_hint(GTK_WINDOW(bmf_window), GDK_WINDOW_TYPE_HINT_DIALOG); -- gtk_dialog_set_has_separator(GTK_DIALOG(bmf_window), FALSE); -+ g_object_set(GTK_DIALOG(bmf_window), "has-separator", FALSE, NULL); - - // Callbacks for if the window is closed. - g_signal_connect((gpointer)bmf_window, "delete_event", -diff -ru gens/src/gens/ui/gtk/directory_config/dir_window.cpp gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp ---- gens/src/gens/ui/gtk/directory_config/dir_window.cpp 2010-10-11 16:32:29.000000000 +0000 -+++ gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp 2010-10-11 15:34:21.000000000 +0000 -@@ -109,7 +109,7 @@ - gtk_window_set_position(GTK_WINDOW(dir_window), GTK_WIN_POS_CENTER); - gtk_window_set_resizable(GTK_WINDOW(dir_window), FALSE); - gtk_window_set_type_hint(GTK_WINDOW(dir_window), GDK_WINDOW_TYPE_HINT_DIALOG); -- gtk_dialog_set_has_separator(GTK_DIALOG(dir_window), FALSE); -+ g_object_set(GTK_DIALOG(dir_window), "has-separator", FALSE, NULL); - - // Callbacks for if the window is closed. - g_signal_connect((gpointer)(dir_window), "delete_event", -diff -ru gens/src/gens/ui/gtk/general_options/genopt_window.cpp gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp ---- gens/src/gens/ui/gtk/general_options/genopt_window.cpp 2010-10-11 16:32:29.000000000 +0000 -+++ gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp 2010-10-11 15:36:00.000000000 +0000 -@@ -140,7 +140,7 @@ - gtk_window_set_position(GTK_WINDOW(genopt_window), GTK_WIN_POS_CENTER); - gtk_window_set_resizable(GTK_WINDOW(genopt_window), false); - gtk_window_set_type_hint(GTK_WINDOW(genopt_window), GDK_WINDOW_TYPE_HINT_DIALOG); -- gtk_dialog_set_has_separator(GTK_DIALOG(genopt_window), false); -+ g_object_set(GTK_DIALOG(genopt_window), "has-separator", false, NULL); - - // Callbacks for if the window is closed. - g_signal_connect((gpointer)genopt_window, "delete_event", -@@ -458,11 +458,11 @@ - gtk_box_pack_start(GTK_BOX(vboxIntroEffect), lblIntroEffect, false, false, 0); - - // Dropdown for intro effect. -- cboIntroEffect = gtk_combo_box_new_text(); -- gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "None"); -- gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Gens Logo Effect"); -- gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "\"Crazy\" Effect"); -- //gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Genesis TMSS"); // TODO: Broken. -+ cboIntroEffect = gtk_combo_box_text_new(); -+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "None"); -+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Gens Logo Effect"); -+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "\"Crazy\" Effect"); -+ //gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Genesis TMSS"); // TODO: Broken. - gtk_widget_show(cboIntroEffect); - gtk_box_pack_start(GTK_BOX(vboxIntroEffect), cboIntroEffect, false, false, 0); - g_signal_connect((gpointer)(cboIntroEffect), "changed", -diff -ru gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp ---- gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp 2010-10-11 16:32:29.000000000 +0000 -+++ gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp 2010-10-11 15:21:28.000000000 +0000 -@@ -154,9 +154,9 @@ - GSFT_UNUSED_PARAMETER(y); - GSFT_UNUSED_PARAMETER(user_data); - -- if (context->targets) -+ if (gdk_drag_context_list_targets(context)) - { -- GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(context->targets, 0)); -+ GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(gdk_drag_context_list_targets(context), 0)); - gtk_drag_get_data(widget, context, target_type, time); - return true; - } -diff -ru gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp ---- gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp 2010-10-11 16:32:29.000000000 +0000 -+++ gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp 2010-10-11 15:46:21.000000000 +0000 -@@ -75,7 +75,7 @@ - gtk_window_set_position(GTK_WINDOW(glres_window), GTK_WIN_POS_CENTER); - gtk_window_set_resizable(GTK_WINDOW(glres_window), FALSE); - gtk_window_set_type_hint(GTK_WINDOW(glres_window), GDK_WINDOW_TYPE_HINT_DIALOG); -- gtk_dialog_set_has_separator(GTK_DIALOG(glres_window), FALSE); -+ g_object_set(GTK_DIALOG(glres_window), "has-separator", FALSE, NULL); - - // Callbacks for if the window is closed. - g_signal_connect((gpointer)(glres_window), "delete_event", -diff -ru gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp ---- gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp 2010-10-11 16:32:29.000000000 +0000 -+++ gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp 2010-10-11 15:46:29.000000000 +0000 -@@ -80,8 +80,7 @@ - // Callbacks. - static gboolean pmgr_window_callback_close(GtkWidget *widget, GdkEvent *event, gpointer user_data); - static void pmgr_window_callback_response(GtkDialog *dialog, gint response_id, gpointer user_data); --static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page, -- guint page_num, gpointer user_data); -+static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data); - static void pmgr_window_callback_lstPluginList_cursor_changed(GtkTreeView *tree_view, gpointer user_data); - static void pmgr_window_callback_fraPluginDesc_size_allocate(GtkWidget *widget, GtkAllocation *allocation, gpointer user_data); - -@@ -119,7 +118,7 @@ - gtk_window_set_position(GTK_WINDOW(pmgr_window), GTK_WIN_POS_CENTER); - gtk_window_set_resizable(GTK_WINDOW(pmgr_window), FALSE); - gtk_window_set_type_hint(GTK_WINDOW(pmgr_window), GDK_WINDOW_TYPE_HINT_DIALOG); -- gtk_dialog_set_has_separator(GTK_DIALOG(pmgr_window), FALSE); -+ g_object_set(GTK_DIALOG(pmgr_window), "has-separator", FALSE, NULL); - - // Callbacks for if the window is closed. - g_signal_connect((gpointer)pmgr_window, "delete_event", -@@ -559,11 +558,9 @@ - * @param page_num New notebook page index. - * @param user_data User data. - */ --static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page, -- guint page_num, gpointer user_data) -+static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data) - { - GSFT_UNUSED_PARAMETER(notebook); -- GSFT_UNUSED_PARAMETER(page); - GSFT_UNUSED_PARAMETER(user_data); - - // Activate the "cursor-changed" callback for the page. -diff -ru gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp ---- gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp 2010-10-11 16:32:29.000000000 +0000 -+++ gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp 2010-10-11 15:46:16.000000000 +0000 -@@ -94,7 +94,7 @@ - gtk_window_set_position(GTK_WINDOW(selcd_window), GTK_WIN_POS_CENTER); - gtk_window_set_resizable(GTK_WINDOW(selcd_window), FALSE); - gtk_window_set_type_hint(GTK_WINDOW(selcd_window), GDK_WINDOW_TYPE_HINT_DIALOG); -- gtk_dialog_set_has_separator(GTK_DIALOG(selcd_window), FALSE); -+ g_object_set(GTK_DIALOG(selcd_window), "has-separator", FALSE, NULL); - - // Callbacks for if the window is closed. - g_signal_connect((gpointer)(selcd_window), "delete_event", -@@ -128,7 +128,7 @@ - gtk_box_pack_start(GTK_BOX(hboxDeviceName), lblDeviceName, false, false, 0); - - // Create the dropdown for the CD-ROM device name. -- cboDeviceName = gtk_combo_box_entry_new_text(); -+ cboDeviceName = gtk_combo_box_text_new_with_entry(); - gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(cboDeviceName))), 63); - gtk_label_set_mnemonic_widget(GTK_LABEL(lblDeviceName), cboDeviceName); - gtk_widget_show(cboDeviceName); -@@ -156,7 +156,7 @@ - gtk_box_pack_start(GTK_BOX(hboxDriveSpeed), vboxDriveSpeedDropdown, true, true, 0); - - // Create the dropdown for the CD-ROM drive speed selection. -- cboDriveSpeed = gtk_combo_box_new_text(); -+ cboDriveSpeed = gtk_combo_box_text_new(); - char tmpSpeed[16]; - for (unsigned int i = 0; i < ((sizeof(CD_DriveSpeed) / sizeof(CD_DriveSpeed[0])) - 1); i++) - { -@@ -167,7 +167,7 @@ - else - szprintf(tmpSpeed, sizeof(tmpSpeed), "%dx", CD_DriveSpeed[i]); - -- gtk_combo_box_append_text(GTK_COMBO_BOX(cboDriveSpeed), tmpSpeed); -+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDriveSpeed), tmpSpeed); - } - gtk_widget_show(cboDriveSpeed); - gtk_box_pack_start(GTK_BOX(vboxDriveSpeedDropdown), cboDriveSpeed, true, false, 0); -@@ -252,7 +252,7 @@ - continue; - - // Add the device file. -- gtk_combo_box_append_text(GTK_COMBO_BOX(cboDeviceName), tmpDeviceName); -+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDeviceName), tmpDeviceName); - } - } - -diff -ru gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp ---- gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp 2010-10-11 16:32:29.000000000 +0000 -+++ gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp 2010-10-11 15:52:05.000000000 +0000 -@@ -111,7 +111,7 @@ - gtk_window_set_position(GTK_WINDOW(gg_window), GTK_WIN_POS_CENTER); - gtk_window_set_resizable(GTK_WINDOW(gg_window), TRUE); - gtk_window_set_type_hint(GTK_WINDOW(gg_window), GDK_WINDOW_TYPE_HINT_DIALOG); -- gtk_dialog_set_has_separator(GTK_DIALOG(gg_window), FALSE); -+ g_object_set(GTK_DIALOG(gg_window), "has-separator", FALSE, NULL); - - // Add the window icon. - GList *icon_list = NULL; diff --git a/community/gens/PKGBUILD b/community/gens/PKGBUILD deleted file mode 100755 index 3b54528f0..000000000 --- a/community/gens/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# $Id: PKGBUILD 86823 2013-03-22 12:51:22Z alucryd $ -# Maintainer: Maxime Gauduin <alucryd@gmail.com> -# Contributor: trya <tryagainprod@gmail.com> -# Contributor: robb_force <robb_force@holybuffalo.net> - -pkgname=gens -pkgver=2.15.5 -pkgrel=8 -pkgdesc='A Sega Genesis / Sega CD / Sega 32X emulator' -arch=('i686' 'x86_64') -url='http://gens.sourceforge.net' -license=('GPL') -if [[ $CARCH == "x86_64" ]]; then - makedepends=('gcc-multilib' 'lib32-gtk2' 'lib32-mesa-libgl' 'lib32-sdl' 'nasm') - optdepends=('lib32-alsa-plugins: Sound support for PulseAudio' - 'lib32-libpulse: Sound support for PulseAudio') -else - depends=('gtk2' 'sdl') - makedepends=('nasm') -fi -options=('!buildflags') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'gens.desktop') -sha256sums=('51910d3056da9ffbb2c01cfec064998c9a4cad0cb379d703ec1b93c83dba305a' - '146a0e98780b909877b3937c9132c85f5aba9450ef9f748bd1374ae8c9dfb751') - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - -# Multilib - if [[ $CARCH == "x86_64" ]]; then - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - fi - -# Build - export LDFLAGS=-Wl,-z,noexecstack - ./configure --host=i686-unknown-linux-gnu --prefix=/usr - make -} - -package() { - cd "${srcdir}"/${pkgname}-${pkgver} - -# Multilib - if [[ $CARCH == "x86_64" ]]; then - depends=('lib32-gtk2' 'lib32-sdl') - fi - -# Install - make DESTDIR=${pkgdir} install - install -dm 755 "${pkgdir}"/usr/share/applications - install -m 644 ../gens.desktop "${pkgdir}"/usr/share/applications/gens.desktop -} - -# vim: ts=2 sw=2 et: diff --git a/community/gens/gens.desktop b/community/gens/gens.desktop deleted file mode 100755 index f668f16af..000000000 --- a/community/gens/gens.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Gens -Type=Application -GenericName=A Sega Genesis / Sega CD / Sega 32X emulator -Comment=A Sega Genesis / Sega CD / Sega 32X emulator -Exec=gens -Icon=/usr/share/gens/Gens2.ico -Categories=Application;Game;Emulator; diff --git a/community/glom/PKGBUILD b/community/glom/PKGBUILD index 64b1f3e54..0b897d52d 100644 --- a/community/glom/PKGBUILD +++ b/community/glom/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83252 2013-01-28 16:49:38Z stephane $ +# $Id: PKGBUILD 87025 2013-03-25 19:19:10Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> @@ -6,7 +6,7 @@ pkgname=glom pkgver=1.22.0 -pkgrel=3 +pkgrel=4 pkgdesc="An easy-to-use database designer and user interface" arch=('i686' 'x86_64' 'mips64el') url="http://www.glom.org/" diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index b874f8a2e..ab0dd64e4 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83899 2013-02-06 13:13:38Z arodseth $ +# $Id: PKGBUILD 86967 2013-03-25 13:19:54Z arodseth $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Rémy Oudompheng <remy@archlinux.org> @@ -10,7 +10,7 @@ pkgname=go pkgver=1.0.3 -pkgrel=6 +pkgrel=7 epoch=2 pkgdesc='Google Go compiler and tools' arch=('x86_64' 'i686') @@ -18,8 +18,8 @@ url='http://golang.org/' license=('custom') depends=('perl' 'gawk') makedepends=('inetutils') -options=('!strip' '!emptydirs') -install=go.install +options=('!strip') +install="$pkgname.install" backup=('usr/lib/go/bin') source=("http://go.googlecode.com/files/${pkgname}$pkgver.src.tar.gz" "$pkgname.sh") @@ -34,6 +34,7 @@ build() { elif [ "$CARCH" == 'i686' ]; then export GOARCH=386 else + # A friendly gesture to Arch Linux ARM export GOARCH=arm fi export GOROOT_FINAL=/usr/lib/go @@ -59,6 +60,7 @@ check() { elif [ "$CARCH" == 'i686' ]; then export GOARCH=386 else + # A friendly gesture to Arch Linux ARM export GOARCH=arm fi @@ -90,7 +92,7 @@ package() { install -Dm644 misc/vim/$f $pkgdir/usr/share/vim/vimfiles/$f done - mkdir -p $pkgdir/{etc/profile.d,usr/{share/go,lib/go,lib/go/src}} + mkdir -p $pkgdir/{etc/profile.d,usr/{share/go,lib/go,lib/go/src,lib/go/site}} cp -r doc misc -t $pkgdir/usr/share/go ln -s /usr/share/go/doc $pkgdir/usr/lib/go/doc diff --git a/community/gsql/PKGBUILD b/community/gsql/PKGBUILD index a9127c50a..6a9d647fe 100644 --- a/community/gsql/PKGBUILD +++ b/community/gsql/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 63614 2012-02-05 12:00:35Z ibiru $ +# $Id: PKGBUILD 87004 2013-03-25 19:16:44Z bpiotrowski $ # Contributor: Michael Kanis <mkanis@gmx.de> pkgname=gsql pkgver=0.2.2 -pkgrel=4 +pkgrel=5 pkgdesc="Integrated database development tool for GNOME" url="http://gsql.org/" license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('gtk2>=2.12' 'gtksourceview2' 'vte' 'libgnomeui' 'gconf' 'desktop-file-utils' 'libnotify') -makedepends=('libmysqlclient' 'postgresql-libs' 'libssh') -optdepends=('libmysqlclient' 'postgresql-libs' 'libssh') +makedepends=('libmariadbclient' 'postgresql-libs' 'libssh') +optdepends=('libmariadbclient' 'postgresql-libs' 'libssh') install=gsql.install options=(!libtool) source=(http://gsql.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2) diff --git a/community/gtranslator/PKGBUILD b/community/gtranslator/PKGBUILD index 061476cc2..6b87b706b 100644 --- a/community/gtranslator/PKGBUILD +++ b/community/gtranslator/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82444 2013-01-18 06:43:16Z jlichtblau $ +# $Id: PKGBUILD 87027 2013-03-25 19:19:12Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Contributor: Christer Solskogen (solskogen@carebears.mine.nu) pkgname=gtranslator pkgver=2.91.6 -pkgrel=1 +pkgrel=2 pkgdesc="An enhanced gettext po file editor for the GNOME" arch=('i686' 'x86_64' 'mips64el') url="http://projects.gnome.org/gtranslator/" diff --git a/community/haskell-syb/PKGBUILD b/community/haskell-syb/PKGBUILD index 57fb85526..d1c237978 100644 --- a/community/haskell-syb/PKGBUILD +++ b/community/haskell-syb/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Arch Haskell Team <arch-haskell@haskell.org> _hkgname=syb pkgname=haskell-syb -pkgver=0.3.7 -pkgrel=2 +pkgver=0.4.0 +pkgrel=1 pkgdesc="A library for client-side HTTP" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') @@ -12,7 +12,7 @@ depends=('ghc=7.6.2-1' sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('fa653976a4ee43918cc7546089f94b60') +md5sums=('ec2719d444a6561b2424dcef10b4fe34') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community/haskell-x11-xft/PKGBUILD b/community/haskell-x11-xft/PKGBUILD index c919d0dd7..6ea2a40ca 100644 --- a/community/haskell-x11-xft/PKGBUILD +++ b/community/haskell-x11-xft/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 86595 2013-03-20 11:05:22Z jelle $ +# $Id: PKGBUILD 87100 2013-03-27 07:08:13Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> _hkgname=X11-xft pkgname=haskell-x11-xft pkgver=0.3.1 -pkgrel=7 +pkgrel=8 pkgdesc="Bindings to the Xft, X Free Type interface library, and some Xrender parts" url="http://hackage.haskell.org/package/${_hkgname}" license=('LGPL') arch=('i686' 'x86_64' 'mips64el') -depends=('ghc=7.6.2-1' 'haskell-x11=1.6.0.2-2' 'haskell-utf8-string=0.3.7-4' 'libxft') +depends=('ghc=7.6.2-1' 'haskell-x11=1.6.1.1-2' 'haskell-utf8-string=0.3.7-4' 'libxft') options=('strip') install=haskell-x11-xft.install source=(http://hackage.haskell.org/packages/archive/X11-xft/$pkgver/X11-xft-$pkgver.tar.gz) diff --git a/community/haskell-x11/PKGBUILD b/community/haskell-x11/PKGBUILD index c9224c243..2aae810e9 100644 --- a/community/haskell-x11/PKGBUILD +++ b/community/haskell-x11/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86594 2013-03-20 11:05:21Z jelle $ +# $Id: PKGBUILD 87099 2013-03-27 07:08:12Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: shild <sxp@bk.ru> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> @@ -6,13 +6,13 @@ _hkgname=X11 pkgname=haskell-x11 pkgver=1.6.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="A Haskell binding to the X11 graphics library." arch=(i686 x86_64 'mips64el') url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11" license=('custom:BSD3') options=('strip') -depends=("ghc=7.6.2-1" "haskell-syb=0.3.7-2" 'libx11' 'libxinerama' 'libxrandr' 'haskell-data-default') +depends=("ghc=7.6.2-1" "libx11" "libxinerama" "libxrandr" "haskell-data-default") conflicts=(haskell-x11-extras) install=hsmod.install source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz) diff --git a/community/ibus-qt/PKGBUILD b/community/ibus-qt/PKGBUILD index adc8e5346..e59fc4e32 100644 --- a/community/ibus-qt/PKGBUILD +++ b/community/ibus-qt/PKGBUILD @@ -1,25 +1,22 @@ -# $Id: PKGBUILD 85362 2013-03-01 10:33:52Z andrea $ +# $Id: PKGBUILD 87047 2013-03-26 11:49:40Z foutrelis $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: garion < garion @ mailoo.org > # Contributor: leemars pkgname=ibus-qt -pkgver=1.3.1 -pkgrel=8 +pkgver=1.3.2 +pkgrel=1 pkgdesc='IBus qt library and IBus qt input method plugin' arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url='http://ibus.googlecode.com' depends=('qt4' 'ibus' 'icu') makedepends=('cmake' 'automoc4' 'doxygen') -source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz" - 0001-Do-not-crash-on-missing-invalid-DISPLAY-envvar.patch) +source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz") build() { cd "${srcdir}/${pkgname}-${pkgver}-Source" - patch -p1 -i ../0001-Do-not-crash-on-missing-invalid-DISPLAY-envvar.patch - mkdir build cd build @@ -31,5 +28,4 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}-Source/build" make DESTDIR="${pkgdir}" install } -md5sums=('769e8872ca8a59327b2073ce2f142589' - 'c30f52b1a9018132e5ecd0c14616cb65') +md5sums=('e53cb59f993d0c93ba968330dbc62c22') diff --git a/community/jad/PKGBUILD b/community/jad/PKGBUILD new file mode 100644 index 000000000..30c8ea509 --- /dev/null +++ b/community/jad/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 86961 2013-03-25 11:13:01Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: astaroth <astaroth_@web.de> + +pkgname=jad +pkgver=1.5.8e +pkgrel=4 +pkgdesc='Java decompiler' +license=('custom') +arch=('x86_64' 'i686') +url='http://www.varaneckas.com/jad' +source=("http://www.varaneckas.com/$pkgname/${pkgname}${pkgver//./}.linux.static.zip" + 'jad.html::http://www.varaneckas.com/jad') +sha256sums=('2878e19fc1fdd725b516f538a57b02aaec1b2d1e4b106d550230381ffa9c0c81' + '4acee94ff29fe01ea2a9c4c0b47f22fb5a93fc667ee2dd8b6740f7f36bcbcdf2') + +build() { + cd "$srcdir" + + grep '<code>' jad.html -A18 | sed 's:<code>::' | sed 's:</code>::' > LICENSE +} + +package() { + cd "$srcdir" + + install -Dm755 "$srcdir/$pkgname" "$pkgdir/usr/bin/$pkgname" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 Readme.txt "$pkgdir/usr/share/doc/$pkgname/README" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/kbibtex/PKGBUILD b/community/kbibtex/PKGBUILD new file mode 100644 index 000000000..87024dda3 --- /dev/null +++ b/community/kbibtex/PKGBUILD @@ -0,0 +1,33 @@ +# $Id$ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: Antonio Rojas <nqn1976 @ gmail.com> +# Contributor: cmorlok <christianmorlok@web.de> + +pkgname=kbibtex +pkgver=0.4.1 +_branch=0.4 +pkgrel=1 +pkgdesc="A BibTeX editor for KDE" +arch=('i686' 'x86_64') +url='http://home.gna.org/kbibtex/' +license=('GPL') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=$pkgname.install +source=("http://download.gna.org/$pkgname/$_branch/$pkgname-$pkgver.tar.bz2") +md5sums=('657eda1da48198a3c336ff268ce46d6f') + +build() { + cd "$pkgname-$pkgver" + + cmake -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/kbibtex/kbibtex.install b/community/kbibtex/kbibtex.install new file mode 100644 index 000000000..139cb5694 --- /dev/null +++ b/community/kbibtex/kbibtex.install @@ -0,0 +1,15 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/krecipes/PKGBUILD b/community/krecipes/PKGBUILD index f8301f1a8..25847dcc0 100644 --- a/community/krecipes/PKGBUILD +++ b/community/krecipes/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 87005 2013-03-25 19:16:45Z bpiotrowski $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: shamrok <szamrok@gmail.com> # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> @@ -7,14 +7,14 @@ pkgname=krecipes pkgver=2.0beta2 _pkgver=2.0-beta2 -pkgrel=2 +pkgrel=3 pkgdesc="A tool designed to make organizing your personal recipes collection fast and easy" arch=('i686' 'x86_64' 'mips64el') url="http://extragear.kde.org/apps/krecipes/" license=('GPL') depends=('kdebase-runtime' 'qimageblitz' 'hicolor-icon-theme') makedepends=('cmake' 'automoc4' 'docbook-xsl') -optdepends=('mysql' 'postgresql') +optdepends=('matriadb' 'postgresql') install=${pkgname}.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.gz) md5sums=('4c01ccad7ad1409cb35c824a61250fe2') diff --git a/community/libdbi-drivers/PKGBUILD b/community/libdbi-drivers/PKGBUILD index 142ee9da8..573816667 100644 --- a/community/libdbi-drivers/PKGBUILD +++ b/community/libdbi-drivers/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 64177 2012-02-09 17:50:10Z ttopper $ +# $Id: PKGBUILD 87120 2013-03-27 15:21:01Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Olivier Médoc <o_medoc@yahoo.fr> # Contributor: Ashok `ScriptDevil` Gautham <ScriptDevil.Arch@gmail.com> pkgname=libdbi-drivers -pkgver=0.8.3_1 -_pkgver=0.8.3-1 -pkgrel=3 +pkgver=0.9.0 +pkgrel=1 pkgdesc="Database drivers for libdbi (MySQL, PostgreSQL, and SQLite)" url="http://libdbi-drivers.sourceforge.net/" license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('libdbi') -makedepends=('postgresql-libs' 'libmysqlclient' 'sqlite2' 'sqlite3') +makedepends=('postgresql-libs' 'libmariadbclient' 'sqlite2' 'sqlite') optdepends=("postgresql-libs: To work with postgresql using libdbdpgsql " "sqlite3: To work with sqlite3 using libdbdsqlite3" - "libmysqlclient: To work with mysql using libdbdmysql" + "libmariadbclient: To work with mysql using libdbdmysql" "sqlite2: To work with sqlite2 using libdbdsqlite") options=(!libtool) install=libdbi-drivers.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}/${pkgname}-${_pkgver}/${pkgname}-${_pkgver}.tar.gz") -md5sums=('4de79b323162a5a7652b65b608eca6cd') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('8472875d30c216540d48d591b442e40ba4f7df5d') build() { - cd "${srcdir}/${pkgname}-${_pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --disable-docs \ --with-libdbi \ @@ -35,7 +34,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${_pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR=${pkgdir} install } diff --git a/community/libdbi/PKGBUILD b/community/libdbi/PKGBUILD index 33d422607..0959bad92 100644 --- a/community/libdbi/PKGBUILD +++ b/community/libdbi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59571 2011-11-28 08:58:19Z ttopper $ +# $Id: PKGBUILD 87114 2013-03-27 13:46:18Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Carl Flippin <carlf@photocarl.org> pkgname=libdbi -pkgver=0.8.4 -pkgrel=2 +pkgver=0.9.0 +pkgrel=1 pkgdesc="A database independant abstraction layer for C" url="http://libdbi.sourceforge.net" license=('LGPL') @@ -13,7 +13,7 @@ depends=('glibc') options=(!libtool) install=libdbi.install source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('c5f15407ef7b07ba854cd8c9b15b88ff') +sha1sums=('6c1ecfb78f43a921d5f914299304bd6c82cb0e23') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/libfbclient/PKGBUILD b/community/libfbclient/PKGBUILD index 0d7520599..d5ef393d6 100644 --- a/community/libfbclient/PKGBUILD +++ b/community/libfbclient/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 82686 2013-01-23 00:15:55Z eric $ +# $Id: PKGBUILD 87048 2013-03-26 11:49:42Z foutrelis $ # Maintainer: Carlier Laurent <lordheavym@gmail.com> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgname=libfbclient pkgver=2.5.2.26539 -pkgrel=2 +pkgrel=3 pkgdesc="Client library for Firebird." arch=('i686' 'x86_64') url="http://www.firebirdsql.org/" diff --git a/community/libgdamm/PKGBUILD b/community/libgdamm/PKGBUILD index d9e1dd036..8c8a70e8f 100644 --- a/community/libgdamm/PKGBUILD +++ b/community/libgdamm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 59045 2011-11-20 22:55:36Z heftig $ +# $Id: PKGBUILD 87026 2013-03-25 19:19:10Z bpiotrowski $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Jan de Groot <jan@jgc.homeip.net> pkgbase=libgdamm pkgname=(libgdamm libgdamm-docs) pkgver=4.99.6 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') makedepends=('libgda' 'libsigc++' 'glibmm' 'glibmm-docs') url="http://www.gtkmm.org/" diff --git a/community/libgexiv2/PKGBUILD b/community/libgexiv2/PKGBUILD index d76714053..6b5759978 100644 --- a/community/libgexiv2/PKGBUILD +++ b/community/libgexiv2/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 84188 2013-02-13 13:24:10Z arodseth $ +# $Id: PKGBUILD 87061 2013-03-26 15:12:47Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=libgexiv2 -pkgver=0.5.0 -pkgrel=2 +pkgver=0.6.1 +pkgrel=1 pkgdesc='GObject-based wrapper around the Exiv2 library' arch=('x86_64' 'i686' 'mips64el') url='http://redmine.yorba.org/projects/gexiv2' license=('GPL2') -depends=('exiv2' 'glib2' 'gobject-introspection') +depends=('exiv2' 'gobject-introspection') options=('!libtool') -source=("http://yorba.org/download/gexiv2/0.5/$pkgname-$pkgver.tar.xz") -sha256sums=('3e0d1efbe895912d00b4394f8939b230fa581321f28d5c3c0fbac06b065e3010') +source=("http://yorba.org/download/gexiv2/${pkgver%.1}/${pkgname}_$pkgver.tar.xz") +sha256sums=('72ee2fcc6a98c9e83467adea45b10d1b61c55654c204dcce9c2463615389a9e3') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/libzdb/PKGBUILD b/community/libzdb/PKGBUILD index 5119d2c21..323c93529 100644 --- a/community/libzdb/PKGBUILD +++ b/community/libzdb/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 82597 2013-01-21 11:20:45Z spupykin $ +# $Id: PKGBUILD 87007 2013-03-25 19:16:47Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=libzdb pkgver=2.11.1 -pkgrel=1 +pkgrel=2 pkgdesc="Zild Database Library" arch=('i686' 'x86_64' 'mips64el') url="http://www.tildeslash.com/libzdb/" license=('GPL') -depends=('postgresql-libs' 'sqlite' 'libmysqlclient') +depends=('postgresql-libs' 'sqlite' 'libmariadbclient') options=('!libtool') source=(http://www.tildeslash.com/libzdb/dist/libzdb-$pkgver.tar.gz) md5sums=('155e89d96df4ec22e984442137f75289') diff --git a/community/luasql/PKGBUILD b/community/luasql/PKGBUILD index a52f2da10..cab6c3e84 100644 --- a/community/luasql/PKGBUILD +++ b/community/luasql/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81397 2012-12-19 13:39:14Z seblu $ +# $Id: PKGBUILD 87008 2013-03-25 19:16:48Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sébastien Luttringer <seblu@archlinux.org> # Contributor: Anders Bergh <anders1@gmail.com> @@ -6,11 +6,11 @@ pkgbase=luasql pkgname=('lua-sql-mysql' 'lua-sql-postgres' 'lua-sql-sqlite') pkgver=2.2.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url='http://www.keplerproject.org/luasql/' license=('MIT') -makedepends=('lua' 'libmysqlclient' 'postgresql-libs' 'sqlite') +makedepends=('lua' 'libmariadbclient' 'postgresql-libs' 'sqlite') source=("https://github.com/downloads/keplerproject/luasql/luasql-$pkgver.tar.gz" 'lua52.patch') md5sums=('59d72db444c6369c936d4f03694db6b7' @@ -30,7 +30,7 @@ build() { package_lua-sql-mysql() { pkgdesc='MySQL module for Lua' - depends=('lua' 'libmysqlclient') + depends=('lua' 'libmariadbclient') conflicts=('luasql-mysql') replaces=('luasql-mysql') diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD index 0f39e4a93..f88963df0 100644 --- a/community/mapnik/PKGBUILD +++ b/community/mapnik/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 83819 2013-02-05 10:57:53Z spupykin $ +# $Id: PKGBUILD 87049 2013-03-26 11:49:43Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Dent <thewinch@gmail.com> # Contributor: orbisvicis <orbisvicis@gmail.com> pkgname=mapnik pkgver=2.1.0 -pkgrel=7 +pkgrel=8 pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps" arch=('i686' 'x86_64' 'mips64el') url="http://mapnik.org/" diff --git a/community/murmur/PKGBUILD b/community/murmur/PKGBUILD index 1fb8211cd..8913aceec 100644 --- a/community/murmur/PKGBUILD +++ b/community/murmur/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85450 2013-03-01 18:26:17Z svenstaro $ +# $Id: PKGBUILD 86935 2013-03-25 04:07:12Z foutrelis $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Otto Allmendinger <otto.allmendinger@googlemail.com> # Contributor: Malte Rabenseifner <malte@zearan.de> pkgname=murmur pkgver=1.2.3 -pkgrel=11 +pkgrel=12 pkgdesc="The voice chat application server for Mumble" arch=('i686' 'x86_64' 'mips64el') url="http://mumble.sourceforge.net" diff --git a/community/murmur/murmur.install b/community/murmur/murmur.install index 562ec4171..8d2f96b7c 100644 --- a/community/murmur/murmur.install +++ b/community/murmur/murmur.install @@ -1,10 +1,10 @@ post_install() { - systemd-tmpfiles --create usr/lib/tmpfiles.d/murmur.conf + systemd-tmpfiles --create murmur.conf getent group murmur > /dev/null || groupadd -r -g 86 murmur 1>/dev/null getent passwd murmur > /dev/null || useradd -r -u 86 -d /var/lib/murmur -g murmur -s /bin/false murmur 1>/dev/null - chown -R murmur:murmur /var/lib/murmur + chown -R murmur:murmur /var/lib/murmur chown -R murmur:murmur /var/log/murmur echo "You might have to reload dbus before launching murmur:" diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD index 32826b2c6..a514ea801 100644 --- a/community/myodbc/PKGBUILD +++ b/community/myodbc/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 83893 2013-02-06 12:11:01Z spupykin $ +# $Id: PKGBUILD 87009 2013-03-25 19:16:48Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=myodbc pkgver=5.2.4 -pkgrel=1 -pkgdesc="ODBC driver/connector for MySQL" -arch=(i686 x86_64 'mips64el') +pkgrel=2 +pkgdesc="ODBC driver/connector for mariadb" +arch=(i686 x86_64 mips64el) url="http://dev.mysql.com/downloads/connector/odbc/" -depends=('unixodbc' 'libmysqlclient') +depends=('unixodbc' 'libmariadbclient') makedepends=('cmake') license=('GPL') options=('libtool') diff --git a/community/mysql++/PKGBUILD b/community/mysql++/PKGBUILD index 5ee9f8bf0..70ac6b22b 100644 --- a/community/mysql++/PKGBUILD +++ b/community/mysql++/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 66225 2012-02-23 05:01:23Z spupykin $ +# $Id: PKGBUILD 87010 2013-03-25 19:16:50Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Markus Härer <markus.haerer@gmx.net> pkgname=mysql++ pkgver=3.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="A C++ wraper for MySQLs C API" arch=("i686" "x86_64" 'mips64el') url="http://tangentsoft.net/mysql++/" license=("LGPL" "custom") -depends=("libmysqlclient") +depends=("libmariadbclient") options=('docs') source=("http://tangentsoft.net/mysql++/releases/$pkgname-$pkgver.tar.gz" "mysql++-fix-cstring.patch" diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index cbf283cb0..a9fd7c5cc 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84826 2013-02-24 23:03:43Z jconder $ +# $Id: PKGBUILD 87011 2013-03-25 19:16:52Z bpiotrowski $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -7,7 +7,7 @@ pkgname=mythtv pkgver=0.26.0 -pkgrel=7 +pkgrel=8 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ url="http://www.mythtv.org/" license=('GPL') depends=('avahi' 'fftw' 'lame' 'libass' 'libavc1394' 'libcdio' 'libiec61883' 'libpulse' 'libva' 'libvdpau' 'libxinerama' 'lirc-utils' - 'mysql-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6' + 'mariadb-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6' 'perl-libwww' 'perl-net-upnp' 'python2-lxml' 'qtwebkit' 'urlgrabber' 'x264') makedepends=('glew' 'libcec' 'libxml2' 'mesa' 'mesa-libgl' 'openssl' 'yasm') diff --git a/community/ndisc6/PKGBUILD b/community/ndisc6/PKGBUILD index a84eac204..f7f2b94d5 100644 --- a/community/ndisc6/PKGBUILD +++ b/community/ndisc6/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82792 2013-01-24 13:20:12Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@archlinux.org> +# $Id: PKGBUILD 86933 2013-03-25 01:19:53Z seblu $ +# Maintainer: Sébastien Luttringer # Contributor: Chris Brannon <chris@the-brannons.com> # Contributor: Mark Smith <markzzzsmith@yahoo.com.au> pkgname=ndisc6 pkgver=1.0.2 -pkgrel=5 +pkgrel=6 pkgdesc='Collection of IPv6 networking utilities' arch=('i686' 'x86_64' 'mips64el') url='http://www.remlab.net/ndisc6/' diff --git a/community/ndisc6/ndisc6.install b/community/ndisc6/ndisc6.install index 7d917ca19..fb1d5c926 100644 --- a/community/ndisc6/ndisc6.install +++ b/community/ndisc6/ndisc6.install @@ -2,7 +2,7 @@ # arg 1: the new package version post_install() { - systemd-tmpfiles --create usr/lib/tmpfiles.d/ndisc6.conf + systemd-tmpfiles --create ndisc6.conf } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD index e302a49f9..ee7846e36 100644 --- a/community/opendkim/PKGBUILD +++ b/community/opendkim/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 84932 2013-02-26 10:19:32Z spupykin $ +# $Id: PKGBUILD 86987 2013-03-25 17:04:53Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thomas Jost <schnouki@schnouki.net> pkgname=opendkim -pkgver=2.8.0 +pkgver=2.8.1 pkgrel=1 pkgdesc="An open source implementation of the DKIM sender authentication system. Based on a fork of dkim-milter." arch=(i686 x86_64) @@ -18,7 +18,7 @@ source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.g opendkim.conf opendkim.rc opendkim.service) -md5sums=('53bd811c6577235bd008f632e7f63dae' +md5sums=('6c9810e343414f49ad7fee313f02a0a7' '3e2bb1058ac0662f01e675aa6ac7ee8f' '093f5c098a45cc68753f97e45a5b374c' 'bc1b73856bc1941faaa4842e00437cb5') diff --git a/community/opensips/PKGBUILD b/community/opensips/PKGBUILD index 2f066b791..5ca813cac 100644 --- a/community/opensips/PKGBUILD +++ b/community/opensips/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 78612 2012-10-22 09:08:59Z spupykin $ +# $Id: PKGBUILD 87012 2013-03-25 19:16:53Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=opensips pkgver=1.8.1 -pkgrel=3 +pkgrel=5 pkgdesc="An Open Source SIP Server able to act as a SIP proxy, registrar, location server, redirect server ..." url="http://www.opensips.org" depends=('gcc-libs' 'openssl' 'db' 'attr' 'libxml2') -makedepends=('postgresql-libs>=8.4.1' 'unixodbc' 'libldap>=2.4.18' 'libmysqlclient' +makedepends=('postgresql-libs>=8.4.1' 'unixodbc' 'libldap>=2.4.18' 'libmariadbclient' 'lynx' 'libxslt') optdepends=('postgresql-libs' 'unixodbc' 'libldap' - 'libmysqlclient' + 'libmariadbclient' 'libsasl' 'python2' 'pcre') @@ -28,7 +28,7 @@ source=(http://opensips.org/pub/opensips/$pkgver/src/opensips-${pkgver}_src.tar. opensips.service) md5sums=('4a7cc708a5fba6ab3d1a3aa0aaa85d77' '685fbe00826df1285b410d4610dcbb0c' - '0d80ef75b5c10324e6db790b7741c2eb') + '7b786d758fe3174af34e2ced44b549e7') build() { @@ -42,6 +42,14 @@ build() make \ include_modules="ldap db_mysql db_postgres db_unixodbc presence presence_xml h350" \ + TLS=1 LIBDIR=lib +} + +package() { + cd $srcdir/$pkgname-$pkgver-tls/ + + make \ + include_modules="ldap db_mysql db_postgres db_unixodbc presence presence_xml h350" \ TLS=1 DESTDIR=$pkgdir/usr LIBDIR=lib install # Conforms to the arch packaging standards (http://wiki.archlinux.org/index.php/Arch_Packaging_Standards) diff --git a/community/opensips/opensips.service b/community/opensips/opensips.service index 042ff7c9a..81f6fd93e 100644 --- a/community/opensips/opensips.service +++ b/community/opensips/opensips.service @@ -5,7 +5,7 @@ After=network.target remote-fs.target nss-lookup.target [Service] Type=forking PIDFile=/var/run/opensips.pid -ExecStart=/usr/bin/opensips -f /etc/opensips/opensips.cfg -w /var/tmp -P /var/run/opensips.pid +ExecStart=/usr/sbin/opensips -f /etc/opensips/opensips.cfg -w /var/tmp -P /var/run/opensips.pid [Install] WantedBy=multi-user.target diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD index b1dda7907..f2d260bc9 100644 --- a/community/openttd/PKGBUILD +++ b/community/openttd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 83874 2013-02-05 23:22:09Z lcarlier $ +# $Id: PKGBUILD 87050 2013-03-26 11:49:43Z foutrelis $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> pkgname=openttd pkgver=1.2.3 -pkgrel=4 +pkgrel=5 pkgdesc='An engine for running Transport Tycoon Deluxe.' arch=('i686' 'x86_64' 'mips64el') url='http://www.openttd.org' diff --git a/community/pam_mysql/PKGBUILD b/community/pam_mysql/PKGBUILD index 372b14ca2..10da943ae 100644 --- a/community/pam_mysql/PKGBUILD +++ b/community/pam_mysql/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 70353 2012-05-04 23:55:09Z allan $ +# $Id: PKGBUILD 87013 2013-03-25 19:16:54Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arjan Timmerman<arjan@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=pam_mysql pkgver=0.7RC1 -pkgrel=6 +pkgrel=7 pkgdesc="A PAM module to authenticate users against mysql." arch=(i686 x86_64 'mips64el') license=('GPL') url="http://pam-mysql.sourceforge.net" -depends=('pam' 'mysql' 'openssl') +depends=('pam' 'mariadb' 'openssl') source=(http://sourceforge.net/projects/pam-mysql/files/pam-mysql/${pkgver}/${pkgname}-${pkgver}.tar.gz) md5sums=('6177183d7e98dc12f2e444c9fbd4f13c') options=(!libtool) diff --git a/community/parole/PKGBUILD b/community/parole/PKGBUILD index f6aaeb034..f25e04076 100644 --- a/community/parole/PKGBUILD +++ b/community/parole/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86731 2013-03-21 15:51:02Z spupykin $ +# $Id: PKGBUILD 87041 2013-03-26 11:08:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: TDY <tdy@gmx.com> pkgname=parole pkgver=0.5.0 -pkgrel=2 +pkgrel=3 pkgdesc="A modern media player based on the GStreamer framework" arch=('i686' 'x86_64' 'mips64el') url="http://goodies.xfce.org/projects/applications/parole/" @@ -12,7 +12,12 @@ license=('GPL') depends=('gstreamer' 'gst-plugins-base-libs' 'hicolor-icon-theme' 'libnotify>=0.4.1' 'libxfce4ui>=4.7.0' 'taglib>=1.4' 'desktop-file-utils') makedepends=('pkgconfig>=0.9.0' 'xfce4-dev-tools') -optdepends=('xulrunner>=1.9.1: browser plugin') +optdepends=('xulrunner: browser plugin' + 'gst-libav' + 'gst-plugins-bad' + 'gst-plugins-base' + 'gst-plugins-good' + 'gst-plugins-ugly') conflicts=('parole-media-player-git') options=('!libtool') install=parole.install diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index 893a2fd13..2b3a1468a 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86289 2013-03-14 19:44:14Z dwallace $ +# $Id: PKGBUILD 87052 2013-03-26 11:49:46Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: mpie <michael.kyne-phillips1@ntlworld.com> @@ -6,7 +6,7 @@ pkgname=parrot pkgver=5.1.0 #_rel=stable _rel=devel -pkgrel=3 +pkgrel=4 pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages" arch=('x86_64' 'i686' 'mips64el') url="http://www.parrotcode.org/" diff --git a/community/pdns/PKGBUILD b/community/pdns/PKGBUILD index 7e7519472..813e8d534 100644 --- a/community/pdns/PKGBUILD +++ b/community/pdns/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 83427 2013-01-31 22:12:34Z arodseth $ +# $Id: PKGBUILD 87014 2013-03-25 19:16:55Z bpiotrowski $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Kevin Mihelich <kevin@archlinuxarm.org> pkgname=pdns pkgver=3.2 -pkgrel=3 +pkgrel=4 pkgdesc='Modern, advanced and high performance authoritative-only nameserver' arch=('x86_64' 'i686' 'mips64el') url='http://www.powerdns.com/' license=('GPL') -depends=('gcc-libs' 'zlib' 'postgresql-libs' 'libmysqlclient' 'sqlite' 'libldap' 'lua51' 'boost-libs') +depends=('gcc-libs' 'zlib' 'postgresql-libs' 'libmariadbclient' 'sqlite' 'libldap' 'lua51' 'boost-libs') makedepends=('boost') provides=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql') replaces=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql') diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD index f9dcea252..fbaa2e950 100644 --- a/community/percona-server/PKGBUILD +++ b/community/percona-server/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 85883 2013-03-08 08:57:02Z mtorromeo $ +# $Id: PKGBUILD 87057 2013-03-26 13:09:29Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=percona-server pkgver=5.5.30_rel30.1 -pkgrel=1 +pkgrel=3 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation" arch=('i686' 'x86_64' 'mips64el') -depends=('mysql-clients' 'libaio' 'systemd-tools') +depends=('mariadb-clients' 'libaio' 'systemd-tools') conflicts=('mysql') -provides=('mysql') +provides=("mysql=${pkgver/_rel*}" "mariadb=${pkgver/_rel*}") optdepends=('perl-dbi' 'perl-dbd-mysql') makedepends=('cmake' 'openssl' 'zlib') diff --git a/community/pion/PKGBUILD b/community/pion/PKGBUILD index 0bd721f69..154b35f2a 100644 --- a/community/pion/PKGBUILD +++ b/community/pion/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83268 2013-01-28 16:49:58Z stephane $ +# $Id: PKGBUILD 87053 2013-03-26 11:49:47Z foutrelis $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=pion pkgver=4.0.13.1 # use the git snapshot until a new version is out _pkgver=dddce5e02d8a60f958e466e690d38eee924475b0 -pkgrel=2 +pkgrel=3 pkgdesc="A C++ development library for implementing lightweight HTTP interfaces" url="http://www.cloudmeter.com/pion/support/" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ provides=('pion-net') conflicts=('pion-net') replaces=('pion-net') source=(https://github.com/cloudmeter/pion/archive/${_pkgver}.zip) -md5sums=('87b710deb5e526a2c7f045d25eba2bee') +md5sums=('4b312452058a6f2580b5d88b03321457') build() { cd "$srcdir/$pkgname-$_pkgver" diff --git a/community/proftpd/PKGBUILD b/community/proftpd/PKGBUILD index 9c2e1fcf8..14f3af690 100644 --- a/community/proftpd/PKGBUILD +++ b/community/proftpd/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 85857 2013-03-07 20:00:38Z bpiotrowski $ +# $Id: PKGBUILD 87017 2013-03-25 19:16:59Z bpiotrowski $ # Maintainer: # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=proftpd pkgver=1.3.4c -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="A high-performance, scalable FTP server" arch=('i686' 'x86_64') url="http://www.proftpd.org/" license=('GPL') -depends=('libmysqlclient' 'postgresql-libs') +depends=('libmariadbclient' 'postgresql-libs') backup=('etc/proftpd.conf' 'etc/conf.d/proftpd') install=${pkgname}.install source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.gz{,.asc} diff --git a/community/python-basemap/PKGBUILD b/community/python-basemap/PKGBUILD new file mode 100644 index 000000000..916c44b6e --- /dev/null +++ b/community/python-basemap/PKGBUILD @@ -0,0 +1,83 @@ +# $Id: PKGBUILD 87032 2013-03-26 01:43:08Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Matthias Ellmer <ellmer.matthias@gmail.com> +# Contributor: Julien Morin <jmorin@cp.dias.ie> + +pkgbase=python-basemap +pkgname=('python-basemap' 'python2-basemap' 'python-basemap-common') +pkgver=1.0.6 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://matplotlib.org/basemap/" +license=('custom') +makedepends=('python2-numpy' 'python-numpy' 'geos' 'shapelib') +source=("http://downloads.sourceforge.net/project/matplotlib/matplotlib-toolkits/basemap-${pkgver}/basemap-${pkgver}.tar.gz") +sha1sums=('76191964c580b3af33c169cb050bb171328298f9') + +_py2basever=2.7 +_py3basever=3.3 + +build() { + pushd "${srcdir}"/basemap-${pkgver} + # Remove the bundled libraries and common data + rm -r geos-* + sed -i "s/lib64/lib/g" setup.py + popd + + cp -a "${srcdir}"/basemap-${pkgver}{,-python2} + + # Python3 Version + cd "${srcdir}"/basemap-${pkgver} + python setup.py config + python setup.py build + + # Python2 Version + cd "${srcdir}"/basemap-${pkgver}-python2 + python2 setup.py config + python2 setup.py build +} + +package_python-basemap() { + pkgdesc="Toolkit for plotting data on map projections" + depends=('python-basemap-common' 'python-matplotlib' 'geos' 'shapelib' 'python-numpy' 'python-httplib2') + optdepends=('python-imaging: Python Imaging Library is only needed for bluemarble and warpimage methods.') + + cd "${srcdir}"/basemap-${pkgver} + + python setup.py install -O1 --skip-build --root="${pkgdir}" --prefix=/usr + + # Conflict with files from python-matplotlib + rm "${pkgdir}"/usr/lib/python${_py3basever}/site-packages/mpl_toolkits/__init__.py + rm "${pkgdir}"/usr/lib/python${_py3basever}/site-packages/mpl_toolkits/__pycache__/__init__.cpython-33.{pyc,pyo} + + rm -fr "${pkgdir}"/usr/lib/python${_py3basever}/site-packages/mpl_toolkits/basemap/data + ln -sf /usr/share/basemap/data "${pkgdir}"/usr/lib/python${_py3basever}/site-packages/mpl_toolkits/basemap/data +} + +package_python2-basemap() { + pkgdesc="Toolkit for plotting data on map projections" + depends=('python-basemap-common' 'python2-matplotlib' 'geos' 'shapelib' 'python2-numpy' 'python2-httplib2') + optdepends=('python2-imaging: Python Imaging Library is only needed for bluemarble and warpimage methods.') + + cd "${srcdir}"/basemap-${pkgver}-python2 + + python2 setup.py install -O1 --skip-build --root="${pkgdir}" --prefix=/usr + + # Conflict with files from python2-matplotlib + rm "${pkgdir}"/usr/lib/python${_py2basever}/site-packages/mpl_toolkits/__init__.{py,pyc,pyo} + + rm -fr "${pkgdir}"/usr/lib/python${_py2basever}/site-packages/mpl_toolkits/basemap/data + ln -sf /usr/share/basemap/data "${pkgdir}"/usr/lib/python${_py2basever}/site-packages/mpl_toolkits/basemap/data +} + +package_python-basemap-common() { + pkgdesc="Data files for python-basemap" + + cd "${srcdir}"/basemap-${pkgver} + + install -dm755 "${pkgdir}"/usr/share/basemap + cp -a lib/mpl_toolkits/basemap/data/ "${pkgdir}"/usr/share/basemap/ + + install -dm755 "${pkgdir}"/usr/share/licenses/${pkgbase} + install -m644 LICENSE_{data,pyshp,proj4} README "${pkgdir}"/usr/share/licenses/${pkgbase}/ +} diff --git a/community/python-matplotlib/PKGBUILD b/community/python-matplotlib/PKGBUILD index 4762d80cc..79723cf2c 100644 --- a/community/python-matplotlib/PKGBUILD +++ b/community/python-matplotlib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81606 2012-12-25 00:34:11Z foutrelis $ +# $Id: PKGBUILD 87092 2013-03-27 01:38:02Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> @@ -6,8 +6,8 @@ pkgbase=python-matplotlib pkgname=('python2-matplotlib' 'python-matplotlib') -pkgver=1.2.0 -pkgrel=8 +pkgver=1.2.1 +pkgrel=1 pkgdesc="A python plotting library, making publication quality plots" arch=('i686' 'x86_64' 'mips64el') url='http://matplotlib.org' @@ -20,16 +20,12 @@ optdepends=('pygtk: for use with the GTK or GTKAgg backend' 'tk: used by the TkAgg backend' 'ghostscript: usetex dependencies' 'texlive-bin: usetex dependencies') -source=("https://github.com/downloads/matplotlib/matplotlib/matplotlib-${pkgver}.tar.gz" - python-matplotlib-tk.patch) -sha1sums=('1d0c319b2bc545f1a7002f56768e5730fe573518' - '6f27ff74a7752700758d081d3235a61a89b8ea95') +source=("http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-${pkgver}/matplotlib-${pkgver}.tar.gz") +sha1sums=('82fc44d0047a713c1b0b1b4ea2503e6a41c57f98') build() { cd "${srcdir}"/matplotlib-${pkgver} - patch -Np1 -i ../python-matplotlib-tk.patch - # use system python-six rm lib/six.py @@ -37,10 +33,6 @@ build() { rm -r lib/matplotlib/pyparsing_py{2,3}.py sed -i -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' lib/matplotlib/{mathtext,fontconfig_pattern}.py - # For numpy 1.7 - sed -i '/include/s/numpy\/arrayobject.h/numpy\/oldnumeric.h/g' \ - src/*.{c,cpp,h} lib/matplotlib/delaunay/*.{cpp,h} lib/matplotlib/tri/*.h - cd .. cp -a matplotlib-${pkgver} matplotlib-${pkgver}-py3 diff --git a/community/python-matplotlib/python-matplotlib-tk.patch b/community/python-matplotlib/python-matplotlib-tk.patch deleted file mode 100644 index 10480195a..000000000 --- a/community/python-matplotlib/python-matplotlib-tk.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -up matplotlib-1.2.0/setupext.py.orig matplotlib-1.2.0/setupext.py ---- matplotlib-1.2.0/setupext.py.orig 2012-11-23 14:50:48.954715965 -0200 -+++ matplotlib-1.2.0/setupext.py 2012-11-23 14:55:53.731727636 -0200 -@@ -898,12 +898,12 @@ def parse_tcl_config(tcl_lib_dir, tk_lib - - tcl_poss = [tcl_lib_dir, - os.path.normpath(os.path.join(tcl_lib_dir, '..')), -- "/usr/lib/tcl"+str(Tkinter.TclVersion), -- "/usr/lib"] -+ "@@libdir@@/tcl"+str(Tkinter.TclVersion), -+ "@@lib@@"] - tk_poss = [tk_lib_dir, - os.path.normpath(os.path.join(tk_lib_dir, '..')), -- "/usr/lib/tk"+str(Tkinter.TkVersion), -- "/usr/lib"] -+ "@@libdir@@/tk"+str(Tkinter.TkVersion), -+ "@@libdir@@"] - for ptcl, ptk in zip(tcl_poss, tk_poss): - tcl_config = os.path.join(ptcl, "tclConfig.sh") - tk_config = os.path.join(ptk, "tkConfig.sh") -@@ -974,10 +974,10 @@ def guess_tcl_config(tcl_lib_dir, tk_lib - return tcl_lib, tcl_inc, 'tcl' + tk_ver, tk_lib, tk_inc, 'tk' + tk_ver - - def hardcoded_tcl_config(): -- tcl_inc = "/usr/local/include" -- tk_inc = "/usr/local/include" -- tcl_lib = "/usr/local/lib" -- tk_lib = "/usr/local/lib" -+ tcl_inc = "/usr/include" -+ tk_inc = "/usr/include" -+ tcl_lib = "@@libdir@@" -+ tk_lib = "@@libdir@@" - return tcl_lib, tcl_inc, 'tcl', tk_lib, tk_inc, 'tk' - - def add_tk_flags(module): diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD index 7f62f72e5..3f56285fe 100644 --- a/community/python-pymongo/PKGBUILD +++ b/community/python-pymongo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82839 2013-01-24 23:13:20Z arodseth $ +# $Id: PKGBUILD 86969 2013-03-25 14:30:39Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas S Hatch <thatch45@gmail.com> # Contributor: Jelle van der Waa <jelle@vdwaa.nl> pkgbase=python-pymongo pkgname=('python-pymongo' 'python2-pymongo') -pkgver=2.4.2 +pkgver=2.5 pkgrel=1 pkgdesc='Python driver for MongoDB' arch=('x86_64' 'i686' 'mips64el') @@ -13,23 +13,26 @@ license=('APACHE') url='http://pypi.python.org/pypi/pymongo/' makedepends=('python-distribute' 'python2-distribute') source=("http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz") -sha256sums=('6862c85844f1766c261a39022ec7a6b631988cb5528a31f8d20e78181398aa5f') +sha256sums=('79aff1c77ec6be6158a4d1a11002400ee0eb8f74dc6f4f67527f59bfac78c222') build() { - cd $srcdir - cp -a pymongo-$pkgver pymongo2-$pkgver + cd "$srcdir" + + cp -a "pymongo-$pkgver" "pymongo2-$pkgver" } package_python2-pymongo() { depends=('python2') - cd $srcdir/pymongo2-$pkgver - python2 setup.py install --root=$pkgdir --optimize=1 + + cd "$srcdir/pymongo2-$pkgver" + python2 setup.py install --root="$pkgdir" --optimize=1 } package_python-pymongo() { depends=('python') - cd $srcdir/pymongo-$pkgver - python setup.py install --root=$pkgdir --optimize=1 + + cd "$srcdir/pymongo-$pkgver" + python setup.py install --root="$pkgdir" --optimize=1 } # vim:set ts=2 sw=2 et: diff --git a/community/python-sqlalchemy/PKGBUILD b/community/python-sqlalchemy/PKGBUILD index 5c743bda0..c356a53c3 100644 --- a/community/python-sqlalchemy/PKGBUILD +++ b/community/python-sqlalchemy/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 78255 2012-10-17 10:27:16Z allan $ +# $Id: PKGBUILD 87107 2013-03-27 11:07:21Z jelle $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=python-sqlalchemy pkgname=('python-sqlalchemy' 'python2-sqlalchemy') -pkgver=0.7.9 +pkgver=0.8.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') # python2 package contain .so url="http://www.sqlalchemy.org/" license=('custom: MIT') makedepends=('python' 'python2' 'python-distribute' 'python2-distribute' 'python-nose' 'python2-nose') source=("http://downloads.sourceforge.net/sourceforge/sqlalchemy/SQLAlchemy-$pkgver.tar.gz") -md5sums=('c4852d586d95a59fbc9358f4467875d5') +md5sums=('3fb0b62e5d6ef4a022414f4233519ee2') build() { cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver @@ -21,6 +21,13 @@ build() { python2 setup.py build } +check() { + cd SQLAlchemy-${pkgver} + python setup.py check + python2 setup.py check + +} + package_python-sqlalchemy() { pkgdesc='Python SQL toolkit and Object Relational Mapper' depends=('python') diff --git a/community/python2-basemap/PKGBUILD b/community/python2-basemap/PKGBUILD deleted file mode 100644 index 8e65c2f86..000000000 --- a/community/python2-basemap/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 74860 2012-08-07 15:09:34Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Julien Morin <jmorin@cp.dias.ie> - -pkgname=python2-basemap -pkgver=1.0.5 -pkgrel=1 -pkgdesc="Toolkit for plotting data on map projections" -arch=('i686' 'x86_64' 'mips64el') -url="http://matplotlib.sourceforge.net/basemap/doc/html/" -license=('custom') -depends=('python2-matplotlib' 'geos' 'shapelib' 'python2-numpy' 'python2-httplib2') -optdepends=('python-imaging: Python Imaging Library is only needed for bluemarble and warpimage methods.') -source=("http://downloads.sourceforge.net/project/matplotlib/matplotlib-toolkits/basemap-${pkgver}/basemap-${pkgver}.tar.gz") -sha1sums=('14b6f5f645febbc73b23e8aea8fdb9e4b4b9adb4') - -build() { - cd "${srcdir}/basemap-${pkgver}" - - # Remove the bundled librarie - rm -r geos-* - - sed -i "s/lib64/lib/g" setup.py - - python2 setup.py config - python2 setup.py build -} - -package() { - cd "${srcdir}/basemap-${pkgver}" - - _pybasever=2.7 - - python2 setup.py install -O1 --skip-build --root="${pkgdir}" --prefix=/usr - - # Conflict with files from python2-matplotlib - rm "${pkgdir}"/usr/lib/python${_pybasever}/site-packages/mpl_toolkits/__init__.{py,pyc,pyo} - - # License - install -Dm644 LICENSE_data "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 LICENSE_pyshp "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 LICENSE_proj4 "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 README "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index b1bb7979d..efba9acb6 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 85389 2013-03-01 10:37:51Z andrea $ +# $Id: PKGBUILD 87019 2013-03-25 19:17:01Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> # Contributor: <boenki@gmx.de> pkgname=qlandkartegt pkgver=1.6.0 -pkgrel=2 +pkgrel=3 pkgdesc="Use your GPS with Linux" arch=('i686' 'x86_64' 'mips64el') url="http://www.qlandkarte.org/" license=('GPL') -depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmysqlclient' 'glu' 'postgresql-libs' +depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmariadbclient' 'glu' 'postgresql-libs' 'shared-mime-info' 'qtwebkit') makedepends=('cmake' 'garmindev' 'mesa') optdepends=('garmindev: to connect garmin devices') diff --git a/community/qtractor/PKGBUILD b/community/qtractor/PKGBUILD index 7af1cd1d1..33e9a1539 100644 --- a/community/qtractor/PKGBUILD +++ b/community/qtractor/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 85406 2013-03-01 10:39:31Z andrea $ +# $Id: PKGBUILD 87090 2013-03-26 23:07:30Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Philipp Überbacher <hollunder at gmx dot at> pkgname=qtractor -pkgver=0.5.7 -pkgrel=2 +pkgver=0.5.8 +pkgrel=1 pkgdesc="Audio/MIDI multitrack sequencer" arch=('i686' 'x86_64' 'mips64el') url="http://qtractor.sourceforge.net/" license=('GPL') -depends=('qt4' 'jack' 'suil' 'lilv' 'libmad' - 'libsamplerate' 'rubberband' 'liblo' 'shared-mime-info') +depends=('qt4' 'suil' 'lilv' 'libmad' 'liblo' + 'rubberband' 'shared-mime-info') makedepends=('ladspa' 'dssi') [ "$CARCH" = "i686" ] && optdepends=('dssi-vst: win32 VST support') install=qtractor.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('a3f42dc1125d6ec0bd88286fe7738f04') +md5sums=('22abf4de4d5736f794e174ef06fe3a3c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/qupzilla/PKGBUILD b/community/qupzilla/PKGBUILD index 05563dbe1..e01510a80 100644 --- a/community/qupzilla/PKGBUILD +++ b/community/qupzilla/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86204 2013-03-13 01:33:35Z speps $ +# $Id: PKGBUILD 87097 2013-03-27 02:25:04Z speps $ # Maintainer: speps <speps at aur dot archlinux dot org> _name=QupZilla -_commit=93d22ec # fixes https://github.com/QupZilla/qupzilla/issues/793 +_commit=953ca72 # pkgname=qupzilla -pkgver=1.4.0_git20130312 +pkgver=1.4.1_git20130326 pkgrel=1 pkgdesc="Cross-platform QtWebKit browser" arch=(i686 x86_64 mips64el) @@ -14,7 +14,7 @@ depends=('qtwebkit' 'hunspell') optdepends=('bash-completion: bash completion support') install="$pkgname.install" source=("$pkgname-$pkgver.tar.gz::https://github.com/$_name/$pkgname/tarball/$_commit") -md5sums=('8fa69f60a26b55d68bfac2d7ec812bf8') +md5sums=('1b1b94a53a422436975b19f9ca05f006') build() { cd "$srcdir/$_name-$pkgname-"* @@ -22,9 +22,6 @@ build() { # enable webgl support export USE_WEBGL=true - # manually install bash completion - sed -i '/bashcompletion/d' src/install.pri - qmake-qt4 QUPZILLA_PREFIX=/usr/ make } @@ -33,10 +30,6 @@ package() { cd "$srcdir/$_name-$pkgname-"* make INSTALL_ROOT="$pkgdir/" install - # bash completion - install -Dm644 linux/completion/bash_completion.sh \ - "$pkgdir/usr/share/bash-completion/completions/$pkgname" - # zsh completion install -Dm644 linux/completion/zsh_completion.sh \ "$pkgdir/usr/share/zsh/site-functions/_$pkgname" diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index af15f8193..e98bfa2b8 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 86155 2013-03-12 13:29:27Z spupykin $ +# $Id: PKGBUILD 87020 2013-03-25 19:17:02Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog pkgver=7.2.6 -pkgrel=4 +pkgrel=6 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') depends=('zlib' 'libestr' 'libee' 'json-c') -makedepends=('postgresql-libs>=8.4.1' 'libmysqlclient' 'net-snmp' 'gnutls') +makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls') optdepends=('postgresql-libs: PostgreSQL Database Support' - 'libmysqlclient: MySQL Database Support' + 'libmariadbclient: MySQL Database Support' 'net-snmp' 'gnutls') backup=('etc/rsyslog.conf' @@ -21,11 +21,13 @@ options=('strip' 'zipman' '!libtool') source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog' 'rsyslog.logrotate' - 'rsyslog.conf.d') + 'rsyslog.conf.d' + 'rsyslog.conf') md5sums=('2b2bfbc3f87fe85add651dc07a6f21ea' 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' '8065db4bef3061a4f000ba58779f6829' - '18565f38a4445136446a31a3c95ffc3e') + '18565f38a4445136446a31a3c95ffc3e' + 'd61dd424e660eb16401121eed20d98bc') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -47,6 +49,7 @@ package() { # Install Daemons and Configuration Files install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}d install -D -m644 doc/${pkgname}-example.conf ${pkgdir}/usr/share/doc/$pkgname/${pkgname}.conf.example + install -D -m644 $srcdir/${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf install -D -m644 $srcdir/${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname} install -D -m644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname} diff --git a/community/rsyslog/rsyslog.conf b/community/rsyslog/rsyslog.conf new file mode 100644 index 000000000..4416c26d5 --- /dev/null +++ b/community/rsyslog/rsyslog.conf @@ -0,0 +1,44 @@ +# Minimal config + +$ModLoad imuxsock # provides support for local system logging +$ModLoad imklog # provides kernel logging support +$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat +$FileOwner root +$FileGroup root +$FileCreateMode 0640 +$DirCreateMode 0755 +$Umask 0022 +$WorkDirectory /var/spool/rsyslog +$IncludeConfig /etc/rsyslog.d/*.conf + +auth,authpriv.* /var/log/auth.log +*.*;auth,authpriv.none -/var/log/syslog +#cron.* /var/log/cron.log +daemon.* -/var/log/daemon.log +kern.* -/var/log/kern.log +lpr.* -/var/log/lpr.log +mail.* -/var/log/mail.log +user.* -/var/log/user.log + +mail.info -/var/log/mail.info +mail.warn -/var/log/mail.warn +mail.err /var/log/mail.err + +news.crit /var/log/news/news.crit +news.err /var/log/news/news.err +news.notice -/var/log/news/news.notice + +*.=debug;\ + auth,authpriv.none;\ + news.none;mail.none -/var/log/debug +*.=info;*.=notice;*.=warn;\ + auth,authpriv.none;\ + cron,daemon.none;\ + mail,news.none -/var/log/messages + +*.emerg :omusrmsg:* + +daemon.*;mail.*;\ + news.err;\ + *.=debug;*.=info;\ + *.=notice;*.=warn |/dev/xconsole diff --git a/community/ruby-cairo/PKGBUILD b/community/ruby-cairo/PKGBUILD index 07e867ff4..7889d91b3 100644 --- a/community/ruby-cairo/PKGBUILD +++ b/community/ruby-cairo/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 86879 2013-03-23 23:10:42Z td123 $ +# $Id: PKGBUILD 87111 2013-03-27 11:45:17Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> +# Contributor: Jeremy <reebydobalina@yahoo.ca> pkgname=ruby-cairo pkgver=1.12.2 -pkgrel=4 +pkgrel=6 pkgdesc='Ruby bindings for cairo' arch=('x86_64' 'i686' 'mips64el') -# http://cairographics.org/releases/ url='http://cairographics.org/rcairo/' license=('GPL') depends=('ruby' 'cairo') @@ -26,6 +26,8 @@ package() { cd "$srcdir/rcairo-$pkgver" make DESTDIR="$pkgdir" install + install -Dm644 ext/cairo/cairo.so \ + "$pkgdir/usr/lib/ruby/vendor_ruby/2.0.0/$arch-linux/cairo.so" } # vim:set ts=2 sw=2 et: diff --git a/community/ruby-gtk2/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch b/community/ruby-gtk2/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch deleted file mode 100644 index 6e0088ea4..000000000 --- a/community/ruby-gtk2/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 5b083ff67f69a8ab6fc6732131954482b468a880 Mon Sep 17 00:00:00 2001 -From: Thomas Dziedzic <gostrc@gmail.com> -Date: Sun, 10 Mar 2013 08:51:02 -0700 -Subject: [PATCH] backport - https://github.com/ruby-gnome2/ruby-gnome2/commit/03be2d663730119036c9d70d4fc7b52523ae40df - to fix syntax errors with NIL_P - ---- - gtk2/ext/gtk2/rbgdkevent.c | 2 +- - gtk2/ext/gtk2/rbgdkscreen.c | 2 +- - gtk2/ext/gtk2/rbgtkcalendar.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gtk2/ext/gtk2/rbgdkevent.c b/gtk2/ext/gtk2/rbgdkevent.c -index 783ec72..63b1502 100644 ---- a/gtk2/ext/gtk2/rbgdkevent.c -+++ b/gtk2/ext/gtk2/rbgdkevent.c -@@ -387,7 +387,7 @@ gdkevent_s_setting_get(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self) - VALUE value; - - rb_scan_args(argc, argv, "11", &name, &type); -- if NIL_P(type) -+ if (NIL_P(type)) - gtype = G_TYPE_STRING; - else - gtype = CLASS2GTYPE(type); -diff --git a/gtk2/ext/gtk2/rbgdkscreen.c b/gtk2/ext/gtk2/rbgdkscreen.c -index 243ed92..3095e38 100644 ---- a/gtk2/ext/gtk2/rbgdkscreen.c -+++ b/gtk2/ext/gtk2/rbgdkscreen.c -@@ -210,7 +210,7 @@ rg_get_setting(int argc, VALUE *argv, VALUE self) - VALUE value; - - rb_scan_args(argc, argv, "11", &name, &type); -- if NIL_P(type) -+ if (NIL_P(type)) - gtype = G_TYPE_STRING; - else - gtype = CLASS2GTYPE(type); -diff --git a/gtk2/ext/gtk2/rbgtkcalendar.c b/gtk2/ext/gtk2/rbgtkcalendar.c -index e895f81..f9b0666 100644 ---- a/gtk2/ext/gtk2/rbgtkcalendar.c -+++ b/gtk2/ext/gtk2/rbgtkcalendar.c -@@ -105,7 +105,7 @@ rg_display_options(int argc, VALUE *argv, VALUE self) - VALUE flags; - rb_scan_args(argc, argv, "01", &flags); - -- if NIL_P(flags){ -+ if (NIL_P(flags)){ - #if GTK_CHECK_VERSION(2,4,0) - return GFLAGS2RVAL(gtk_calendar_get_display_options(_SELF(self)), - GTK_TYPE_CALENDAR_DISPLAY_OPTIONS); --- -1.8.1.5 - diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index 928161a0a..2fb54c5b5 100644 --- a/community/ruby-gtk2/PKGBUILD +++ b/community/ruby-gtk2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86880 2013-03-23 23:10:43Z td123 $ +# $Id: PKGBUILD 87134 2013-03-27 19:44:03Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Eric Bélanger <eric@archlinux.org> # Contributor: Brad Fanella <bradfanella@archlinux.us> @@ -8,29 +8,24 @@ pkgbase=ruby-gtk2 pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' 'ruby-pango') -pkgver=1.2.2 -pkgrel=2 +pkgver=1.2.5 +pkgrel=1 arch=('x86_64' 'i686' 'mips64el') url='http://ruby-gnome2.sourceforge.jp/' license=('LGPL') makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2' 'glib2') -source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz" - '0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch') -sha256sums=('f99ff4888fc69317e1dae61c9ca684bf2f38a20534f1f1b4b3b182c66247910c' - '9180b6b8d146b815de63bd2c4f0e215ab7591e3ebaca913120ae962695f3c388') +source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz") +sha256sums=('9b956468446361b930bb5b10a518e1c59b4ce2dd2ea04ccc600d0259f1490429') build() { cd "$srcdir/ruby-gtk2-$pkgver" - #patch -Np1 -i ${srcdir}/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch LANG="en_US.UTF-8" \ ruby extconf.rb atk gdk_pixbuf2 gio2 glib2 gtk2 pango --vendor mkdir -p "$pkgdir/ruby-glib2/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" mkdir -p "$pkgdir/ruby-atk/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" mkdir -p "$pkgdir/ruby-gio2/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" mkdir -p "$pkgdir/ruby-gdkpixbuf2/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" - #export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`" - #export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`" make } @@ -39,8 +34,6 @@ package_ruby-atk() { depends=("ruby-glib2=$pkgver" 'atk') cd "$srcdir/ruby-gtk2-$pkgver/atk" - #export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`" - #export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`" make includedir="/usr/include" DESTDIR="$pkgdir" install } @@ -49,8 +42,6 @@ package_ruby-gdkpixbuf2() { depends=("ruby-glib2=$pkgver" 'gdk-pixbuf2') cd "$srcdir/ruby-gtk2-$pkgver/gdk_pixbuf2" - #export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`" - #export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`" make includedir="/usr/include" DESTDIR="$pkgdir" install } @@ -59,8 +50,6 @@ package_ruby-gio2() { depends=("ruby-glib2=$pkgver") cd "$srcdir/ruby-gtk2-$pkgver/gio2" - #export CXXFLAGS="$CXXFLAGS -lglib-2.0" - #export CFLAGS="$CFLAGS -lglib-2.0" make includedir="/usr/include" DESTDIR="$pkgdir/" install } @@ -69,8 +58,6 @@ package_ruby-glib2() { depends=('glib2' 'ruby') cd "$srcdir/ruby-gtk2-$pkgver/glib2" - #export CXXFLAGS="$CXXFLAGS -lglib-2.0" - #export CFLAGS="$CFLAGS -lglib-2.0" make includedir="/usr/include" DESTDIR="$pkgdir/" install } @@ -80,8 +67,6 @@ package_ruby-gtk2() { "ruby-gdkpixbuf2=$pkgver") cd "$srcdir/ruby-gtk2-$pkgver/gtk2" - #export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`" - #export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`" make includedir="/usr/include" DESTDIR="$pkgdir/" install } @@ -90,8 +75,6 @@ package_ruby-pango() { depends=("ruby-glib2=$pkgver" 'ruby-cairo' 'pango') cd "$srcdir/ruby-gtk2-$pkgver/pango" - #export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`" - #export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`" make includedir="/usr/include" DESTDIR="$pkgdir/" install } diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD index 9a6a8a2c1..ee5c4ff28 100644 --- a/community/rxvt-unicode/PKGBUILD +++ b/community/rxvt-unicode/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85462 2013-03-01 21:26:53Z seblu $ +# $Id: PKGBUILD 86929 2013-03-24 23:26:26Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: tobias <tobias@archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org pkgname=rxvt-unicode -pkgver=9.17 +pkgver=9.18 pkgrel=1 pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)' arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ source=( 'urxvtc.desktop' 'urxvt-tabbed.desktop' ) -md5sums=('1270432bdc7ce17dbb07d41a607081e0' +md5sums=('963ccc748fe5bca925e7b92c0404d68b' 'c2b828d37d06cbf4c32937a2959f2fc2' '10e80aebaef042fb63d2585440dc3637' '830abe6f31fb926a1bcd2650731be15e') diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD index 6f3e05b99..27c573cb0 100644 --- a/community/sage-mathematics/PKGBUILD +++ b/community/sage-mathematics/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84793 2013-02-24 16:59:02Z dwallace $ +# $Id: PKGBUILD 87136 2013-03-27 19:52:53Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Antonio Rojas < nqn1976 @ gmail.com > # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -7,7 +7,7 @@ # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD pkgname=sage-mathematics -pkgver=5.7 +pkgver=5.8 pkgrel=1 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.' url='http://www.sagemath.org' @@ -98,3 +98,5 @@ package() { } # vim :set ts=2 sw=2 et: +md5sums=('b91d6c20798f396a9c875527c78b3587' + 'b82f94383829eee26648feb977e2d89b') diff --git a/community/stardict/PKGBUILD b/community/stardict/PKGBUILD index 18bdc131f..5b58f5a77 100644 --- a/community/stardict/PKGBUILD +++ b/community/stardict/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 82064 2013-01-07 06:51:59Z fyan $ +# $Id: PKGBUILD 87021 2013-03-25 19:17:03Z bpiotrowski $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> @@ -8,11 +8,11 @@ pkgbase=stardict pkgname=(stardict stardict-lite) pkgver=3.0.4 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url='http://www.stardict.org/' license=('GPL') -makedepends=('intltool' 'popt' 'gnome-doc-utils' 'gnome-common' 'libmysqlclient' 'enchant' 'gtk2' 'libsigc++' 'libsm' 'espeak' 'libgnome') +makedepends=('intltool' 'popt' 'gnome-doc-utils' 'gnome-common' 'libmariadbclient' 'enchant' 'gtk2' 'libsigc++' 'libsm' 'espeak' 'libgnome') options=('!libtool' '!emptydirs') source=("http://stardict-3.googlecode.com/files/${pkgbase}-${pkgver}.tar.bz2" 'gcc46.patch' diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD index 5b16794e5..f96428d06 100644 --- a/community/tea/PKGBUILD +++ b/community/tea/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85415 2013-03-01 10:40:52Z andrea $ +# $Id: PKGBUILD 87037 2013-03-26 11:01:18Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,8 +6,8 @@ # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu> pkgname=tea -pkgver=34.0.1 -pkgrel=2 +pkgver=35.0.0 +pkgrel=1 pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions." arch=('i686' 'x86_64' 'mips64el') url="http://tea-editor.sourceforge.net/" @@ -16,13 +16,13 @@ depends=('qt4' 'aspell' 'hunspell') install=tea.install source=(http://downloads.sourceforge.net/project/tea-editor/tea-editor/$pkgver/tea-$pkgver.tar.bz2 tea.desktop) -md5sums=('4fcc661b7898d01f58b8734395f5bdda' +md5sums=('aabbbac2b5251e7c3eeb36d8f188d08a' '377ace3363124f4c086de0babb820761') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i 's|i + j|(int)(i + j)|' textproc.cpp - qmake PREFIX=/usr/bin + qmake-qt4 PREFIX=/usr/bin make } diff --git a/community/tmux/PKGBUILD b/community/tmux/PKGBUILD index 69792e433..bb4f4e368 100644 --- a/community/tmux/PKGBUILD +++ b/community/tmux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77704 2012-10-13 15:48:59Z bpiotrowski $ +# $Id: PKGBUILD 87109 2013-03-27 11:16:29Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: TDY <tdy@gmx.com> # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com> pkgname=tmux -pkgver=1.7 +pkgver=1.8 pkgrel=1 pkgdesc='A terminal multiplexer' url='http://tmux.sourceforge.net/' @@ -13,7 +13,7 @@ license=('BSD') depends=('ncurses' 'libevent') source=(http://downloads.sourceforge.net/tmux/tmux-$pkgver.tar.gz LICENSE) -md5sums=('2c48fb9beb22eedba7a5de3b78dd0c03' +md5sums=('b9477de2fe660244cbc6e6d7e668ea0e' '71601bc37fa44e4395580b321963018e') build() { diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD index 3f7f0fe68..7aaf3345d 100644 --- a/community/ulogd/PKGBUILD +++ b/community/ulogd/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 83573 2013-02-03 13:19:13Z seblu $ +# $Id: PKGBUILD 87022 2013-03-25 19:17:05Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Sébastien Luttringer <seblu@archlinux.org> +# Maintainer: Sébastien Luttringer # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Sergej Pupykin <ps@lx-ltd.ru> pkgname=ulogd -pkgver=2.0.1 -pkgrel=4 +pkgver=2.0.2 +pkgrel=1 pkgdesc='Userspace Packet Logging for netfilter' arch=('i686' 'x86_64' 'mips64el') url='http://www.netfilter.org/projects/ulogd/index.html' license=('GPL2') depends=('libmnl' 'libnfnetlink') backup=('etc/ulogd.conf') -makedepends=('libmysqlclient' +makedepends=('libmariadbclient' 'libnetfilter_acct' 'libnetfilter_conntrack' 'libnetfilter_log' @@ -27,7 +27,7 @@ source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" "$pkgname.logrotate" "$pkgname.conf" "$pkgname.service") -md5sums=('2f4b1a58955fcad4ebf22f0d00885fc9' +md5sums=('660516de4b5b1e110c12dae414619e0f' 'dd32eeee0949adff4188544419acd17e' 'c21531312f95e790ed19aa267a17d35a' '42fc2c0568ff89ec00c2f0797280f296') diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index bb3906c98..607b987e6 100644 --- a/community/vtk/PKGBUILD +++ b/community/vtk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85423 2013-03-01 10:42:11Z andrea $ +# $Id: PKGBUILD 87023 2013-03-25 19:17:06Z bpiotrowski $ # Maintainer: Andrzej Giniewicz <gginiu@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Christofer Bertonha <christoferbertonha at gmail dot com> @@ -12,12 +12,12 @@ pkgname=vtk pkgver=5.10.1 -pkgrel=5 +pkgrel=6 pkgdesc='A software system for 3D computer graphics, image processing, and visualization.' arch=('i686' 'x86_64') url='http://www.vtk.org/' license=('BSD') -depends=('libjpeg-turbo' 'boost' 'ffmpeg' 'qt4' 'lesstif' 'mysql' 'hdf5' 'libgl') +depends=('libjpeg-turbo' 'boost' 'ffmpeg' 'qt4' 'lesstif' 'mariadb' 'hdf5' 'libgl') makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa-libgl' 'python2' 'tk') optdepends=('python2: python bindings' 'java-runtime: java bindings' diff --git a/community/wings3d/PKGBUILD b/community/wings3d/PKGBUILD index 4a3e9d65d..dd72f80de 100644 --- a/community/wings3d/PKGBUILD +++ b/community/wings3d/PKGBUILD @@ -1,52 +1,50 @@ -# $Id: PKGBUILD 86005 2013-03-10 23:35:35Z arodseth $ +# $Id: PKGBUILD 87126 2013-03-27 16:37:11Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: kappa <kappacurve@gmail.com> pkgname=wings3d _pkgname=wings pkgver=1.4.1 -pkgrel=16 +pkgrel=17 pkgdesc='3D modeling program' arch=('x86_64' 'i686') url='http://www.wings3d.com/' license=('GPL') -depends=('erlang' 'erlang-sdl' 'erlang-cl' 'bash' 'desktop-file-utils') -makedepends=('setconf' 'gendesk') +depends=('erlang-sdl' 'erlang-cl' 'bash' 'desktop-file-utils' 'erlang') +makedepends=('gendesk') optdepends=('povray: rendering support via POV-Ray') install=$pkgname.install -options=('!emptydirs') -_genericname=('3D Modeler') -# Using the i686-only binary release -# Would prefer using a source release, if there is one that compiles -source=("http://sourceforge.net/projects/$_pkgname/files/$_pkgname/$pkgver/$_pkgname-$pkgver-linux.bzip2.run.gz" +source=("$pkgname-$pkgver.tar.gz::https://github.com/dgud/wings/archive/master.tar.gz" + "$pkgname.sh" "$pkgname.png::http://img299.imageshack.us/img299/2538/wingsiconblackshiningew5.png") -sha256sums=('760e19fa4973ed0fc75057897135a8efa241e834b078fc05c28786672137b322' +sha256sums=('5fe17aa7bd26c031ca242f17b24eaa8f6fa9fe4c38b37a9669953c03e9e89b83' + '46513cd05f8b6e778120af4a87b239c5250799c17b591592893d98cbf082359e' '6658977cc3bc8db2c9358edf3a2d6cb6bb8084c9a1d96ca573a83dd4e8781f1a') -if [ "$CARCH" == "x86_64" ] -then - depends=('lib32-libgl' 'lib32-glu' 'lib32-sdl' 'lib32-ncurses') -fi +_genericname=('3D Modeler') +_categories=('Graphics;3DGraphics') build() { cd "$srcdir" gendesk - setconf "$pkgname.desktop" Categories "Graphics;3DGraphics;" - chmod +x "$_pkgname-$pkgver-linux.bzip2.run" - "./$_pkgname-$pkgver-linux.bzip2.run" --nox11 --nochown --tar xf > /dev/null - setconf install_wings INSTALL_DIR "$pkgdir/opt/$pkgname-$pkgver" + cd "$_pkgname-master" + export ESDL_PATH=$(echo /usr/lib/erlang/lib/esdl-*) + make + make lang } package() { - cd "$srcdir" - ./install_wings + cd "$srcdir/$_pkgname-master" - cd "$pkgdir" - setconf "opt/$pkgname-$pkgver/$_pkgname" ROOTDIR "/opt/$pkgname-$pkgver" - install -Dm755 "opt/$pkgname-$pkgver/$_pkgname" "$pkgdir/usr/bin/$pkgname" + mkdir -p "$pkgdir/usr/lib/$pkgname" + for subdir in ebin fonts patches plugins shaders textures; do + cp -r "$srcdir/$_pkgname-master/$subdir/" "$pkgdir/usr/lib/$pkgname" + done - cd "$srcdir" install -Dm644 license.terms "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + cd "$srcdir" + install -Dm755 "$pkgname.sh" "$pkgdir/usr/bin/$pkgname" install -Dm644 "$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" install -Dm644 "$pkgname.desktop" \ "$pkgdir/usr/share/applications/$pkgname.desktop" diff --git a/community/wings3d/wings3d.sh b/community/wings3d/wings3d.sh new file mode 100644 index 000000000..c0fd3b2fb --- /dev/null +++ b/community/wings3d/wings3d.sh @@ -0,0 +1,2 @@ +#!/bin/sh +erl -noinput -smp disable -pa /usr/lib/erlang/lib/esdl-*/ebin /usr/lib/wings3d/ebin -run wings_start start_halt ${1+"$@"} diff --git a/community/xbmc/PKGBUILD b/community/xbmc/PKGBUILD index 0d7e662b4..72df48bdf 100644 --- a/community/xbmc/PKGBUILD +++ b/community/xbmc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86733 2013-03-21 16:26:32Z spupykin $ +# $Id: PKGBUILD 87024 2013-03-25 19:17:07Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> @@ -9,13 +9,13 @@ _prefix=/usr pkgname=xbmc pkgver=12.1 -pkgrel=3 +pkgrel=4 pkgdesc="A software media player and entertainment hub for digital media" arch=('i686' 'x86_64') url="http://xbmc.org" license=('GPL' 'custom') depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' - 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate' + 'libpng' 'libcdio' 'yajl' 'libmariadbclient' 'libjpeg-turbo' 'libsamplerate' 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez' 'glu' diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD index d256fece6..9bde22ac1 100644 --- a/community/xmonad-contrib/PKGBUILD +++ b/community/xmonad-contrib/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 86597 2013-03-20 11:05:24Z jelle $ +# $Id: PKGBUILD 87102 2013-03-27 07:08:16Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: orbisvicis <gmail.com> pkgname=xmonad-contrib pkgver=0.11 -pkgrel=5 +pkgrel=6 pkgdesc="Add-ons for xmonad" arch=('i686' 'x86_64' 'mips64el') url="http://xmonad.org/" license=('BSD') -depends=('ghc=7.6.2-1' 'xmonad=0.11-4' 'sh' 'haskell-x11=1.6.1.1-1' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7-4' 'haskell-random=1.0.1.1-4') +depends=('ghc=7.6.2-1' 'xmonad=0.11-5' 'sh' 'haskell-x11=1.6.1.1-2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7-4' 'haskell-random=1.0.1.1-4') install='xmonad-contrib.install' source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz xmonad-contrib-remove-getatomname.patch) diff --git a/community/xmonad/PKGBUILD b/community/xmonad/PKGBUILD index 26f8a1898..a11fb645b 100644 --- a/community/xmonad/PKGBUILD +++ b/community/xmonad/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 86596 2013-03-20 11:05:23Z jelle $ +# $Id: PKGBUILD 87101 2013-03-27 07:08:15Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: shild <shildv@gmail.com> pkgname=xmonad pkgver=0.11 -pkgrel=4 +pkgrel=5 pkgdesc="Lightweight X11 tiled window manager written in Haskell" arch=('i686' 'x86_64' 'mips64el') url="http://xmonad.org/" license=('BSD') -depends=('ghc=7.6.2-1' 'gmp' 'haskell-x11=1.6.1.1-1' 'sh' 'haskell-mtl=2.1.2-2' 'haskell-utf8-string=0.3.7-4' 'haskell-extensible-exceptions=0.1.1.4-4') +depends=('ghc=7.6.2-1' 'gmp' 'haskell-x11=1.6.1.1-2' 'sh' 'haskell-mtl=2.1.2-2' 'haskell-utf8-string=0.3.7-4' 'haskell-extensible-exceptions=0.1.1.4-4') makedepends=('gendesk') optdepends=('xorg-xmessage: for displaying visual error messages') install='xmonad.install' diff --git a/community/yaz/PKGBUILD b/community/yaz/PKGBUILD index 3eb6ba72a..505d5dad5 100644 --- a/community/yaz/PKGBUILD +++ b/community/yaz/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 82691 2013-01-23 00:16:01Z eric $ +# $Id: PKGBUILD 87054 2013-03-26 11:49:48Z foutrelis $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -8,7 +8,7 @@ pkgname=yaz pkgver=4.2.49 -pkgrel=1 +pkgrel=2 pkgdesc="A toolkit supporting the development of Z39.50/SRW/SRU clients and servers" arch=('i686' 'x86_64' 'mips64el') url="http://www.indexdata.dk/yaz" diff --git a/core/diffutils/PKGBUILD b/core/diffutils/PKGBUILD index 5d1dbc730..4e860468c 100644 --- a/core/diffutils/PKGBUILD +++ b/core/diffutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137084 2011-09-06 04:35:05Z allan $ +# $Id: PKGBUILD 180850 2013-03-27 01:10:49Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=diffutils -pkgver=3.2 -pkgrel=1.1 +pkgver=3.3 +pkgrel=1 pkgdesc="Utility programs used for creating patch files" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/diffutils" @@ -12,15 +12,12 @@ license=('GPL3') groups=('base') depends=('glibc' 'sh') install=diffutils.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz - gnulib-no-gets.patch) -md5sums=('26ff64c332429c830c154be46b393382' - '97b8845dad2ca6017fc4ef54f0a4562b') +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) +md5sums=('99180208ec2a82ce71f55b0d7389f1b3' + '203a2f2101dfcc09cdac655be353fd78') build() { cd ${srcdir}/${pkgname}-${pkgver} - # Based on commit 66712c23388e93e5c518ebc8515140fa0c807348 from gnulib. - patch -p1 -i "$srcdir/gnulib-no-gets.patch" ./configure --prefix=/usr make } diff --git a/core/file/PKGBUILD b/core/file/PKGBUILD index 4234ce023..95acdcdb3 100644 --- a/core/file/PKGBUILD +++ b/core/file/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179540 2013-03-06 10:50:29Z allan $ +# $Id: PKGBUILD 180851 2013-03-27 01:10:50Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=file -pkgver=5.13 +pkgver=5.14 pkgrel=1 pkgdesc="File type identification utility" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ url="http://www.darwinsys.com/file/" depends=('glibc' 'zlib') options=('!libtool') source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('d60c1364ba956eff7d21f8250808fc6d') +md5sums=('c26625f1d6773ad4bc5a87c0e315632c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/libffi/PKGBUILD b/core/libffi/PKGBUILD index 50059763b..58f04dbf3 100644 --- a/core/libffi/PKGBUILD +++ b/core/libffi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180006 2013-03-14 11:52:23Z stephane $ +# $Id: PKGBUILD 180905 2013-03-27 21:58:17Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=libffi -pkgver=3.0.12 +pkgver=3.0.13 pkgrel=1 pkgdesc="A portable, high level programming interface to various calling conventions" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ checkdepends=('dejagnu') options=('!libtool') install=libffi.install source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz) -sha1sums=('463dcb4ae9aea4c52bba12b67fbe4d91ed1e21fd') +sha1sums=('f5230890dc0be42fb5c58fbf793da253155de106') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD index ef9ffacd7..e54faf432 100644 --- a/core/libsasl/PKGBUILD +++ b/core/libsasl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 146449 2012-01-11 15:21:04Z stephane $ +# $Id: PKGBUILD 180675 2013-03-25 19:13:43Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> # This package spans multiple repositories. @@ -8,13 +8,13 @@ #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') pkgname=libsasl pkgver=2.1.23 -pkgrel=9.1 +pkgrel=10 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64' 'mips64el') url="http://cyrusimap.web.cmu.edu/" license=('custom') options=('!makeflags' '!libtool') -makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl') +makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl') source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz cyrus-sasl-2.1.19-checkpw.c.patch cyrus-sasl-2.1.22-crypt.patch @@ -192,7 +192,7 @@ package_cyrus-sasl-ldap() { package_cyrus-sasl-sql() { pkgdesc="SQL auxprop module for Cyrus SASL" - depends=("libsasl=${pkgver}-${pkgrel}" 'postgresql-libs' 'libmysqlclient') + depends=("libsasl=${pkgver}-${pkgrel}" 'postgresql-libs' 'libmariadbclient') replaces=('cyrus-sasl-plugins') cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD index caf9e56f7..43f9709e1 100644 --- a/core/openssh/PKGBUILD +++ b/core/openssh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 178148 2013-02-17 00:23:24Z bisson $ +# $Id: PKGBUILD 180812 2013-03-26 12:05:13Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=openssh -pkgver=6.1p1 -pkgrel=6 +pkgver=6.2p1 +pkgrel=1 pkgdesc='Free version of the SSH connectivity tools' url='http://www.openssh.org/portable.html' license=('custom:BSD') @@ -23,7 +23,7 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver} 'sshd.confd' 'sshd.pam' 'sshd') -sha1sums=('751c92c912310c3aa9cadc113e14458f843fc7b3' +sha1sums=('8824708c617cc781b2bb29fa20bd905fd3d2a43d' '954bf1660aa32620c37034320877f4511b767ccb' '6df5be396f8c593bb511a249a1453294d18a01a6' 'bd6eae36c7ef9efb7147778baad7858b81f2d660' diff --git a/core/systemd/0001-Fix-vacuum-logic-error.patch b/core/systemd/0001-Fix-vacuum-logic-error.patch new file mode 100644 index 000000000..a0a6e85ee --- /dev/null +++ b/core/systemd/0001-Fix-vacuum-logic-error.patch @@ -0,0 +1,40 @@ +From 6c142648aaced56ab681fcc97a71b06d588122a9 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Wed, 20 Mar 2013 21:32:05 +0100 +Subject: [PATCH] Fix vacuum logic error + +The vacuum code used to stop vacuuming after one deletion, even +when max_use was still exceeded. + +Also make usage a uint64_t, as the code already pretends it is one. + +Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +--- + src/journal/journal-vacuum.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/journal/journal-vacuum.c b/src/journal/journal-vacuum.c +index 731f6c7..4a3a5a9 100644 +--- a/src/journal/journal-vacuum.c ++++ b/src/journal/journal-vacuum.c +@@ -36,7 +36,7 @@ + #include "util.h" + + struct vacuum_info { +- off_t usage; ++ uint64_t usage; + char *filename; + + uint64_t realtime; +@@ -293,7 +293,7 @@ int journal_directory_vacuum( + if (unlinkat(dirfd(d), list[i].filename, 0) >= 0) { + log_debug("Deleted archived journal %s/%s.", directory, list[i].filename); + +- if ((uint64_t) list[i].usage > sum) ++ if (list[i].usage < sum) + sum -= list[i].usage; + else + sum = 0; +-- +1.8.2 + diff --git a/core/systemd/0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch b/core/systemd/0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch new file mode 100644 index 000000000..cd2d70756 --- /dev/null +++ b/core/systemd/0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch @@ -0,0 +1,25 @@ +From 83d7d83bcc6c462ecbb4c8003e3a8b41f3b88d46 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sat, 16 Mar 2013 16:10:22 +0100 +Subject: [PATCH] journal: pass the *pid* to sd_pid_get_owner_uid() + +--- + src/journal/journald-server.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c +index ac565c7..364ab0f 100644 +--- a/src/journal/journald-server.c ++++ b/src/journal/journald-server.c +@@ -593,7 +593,7 @@ static void dispatch_message_real( + IOVEC_SET_STRING(iovec[n++], session); + } + +- if (sd_pid_get_owner_uid(ucred->uid, &owner) >= 0) { ++ if (sd_pid_get_owner_uid(ucred->pid, &owner) >= 0) { + owner_valid = true; + if (asprintf(&owner_uid, "_SYSTEMD_OWNER_UID=%lu", (unsigned long) owner) >= 0) + IOVEC_SET_STRING(iovec[n++], owner_uid); +-- +1.8.2 + diff --git a/core/systemd/0001-rules-move-builtin-calls-before-the-permissions-sect.patch b/core/systemd/0001-rules-move-builtin-calls-before-the-permissions-sect.patch new file mode 100644 index 000000000..88dabe9d3 --- /dev/null +++ b/core/systemd/0001-rules-move-builtin-calls-before-the-permissions-sect.patch @@ -0,0 +1,57 @@ +From 34b99a8bf7b769b31ad59ff0d60f8572bd0adab5 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Wed, 20 Mar 2013 01:26:17 +0100 +Subject: [PATCH] rules: move builtin calls before the permissions section + +<heftig> kay: systemd commit 22582bb broke cups usb printing for me +<heftig> because the "lp" group isn't applied anymore +<heftig> SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp" +<heftig> moving this line to the end of 50-udev-default.rules restores correct behavior, as it's after usb_id + +Conflicts: + rules/50-udev-default.rules +--- + rules/50-udev-default.rules | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) + +diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules +index 5d8bde5..ce0a4ef 100644 +--- a/rules/50-udev-default.rules ++++ b/rules/50-udev-default.rules +@@ -1,5 +1,13 @@ + # do not edit this file, it will be overwritten on update + ++SUBSYSTEM=="rtc", ATTR{hctosys}=="1", SYMLINK+="rtc" ++SUBSYSTEM=="virtio-ports", KERNEL=="vport*", ATTR{name}=="?*", SYMLINK+="virtio-ports/$attr{name}" ++ ++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb" ++SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id" ++SUBSYSTEM=="firmware", ACTION=="add", IMPORT{builtin}="firmware" ++ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}" ++ + ACTION!="add", GOTO="default_permissions_end" + + SUBSYSTEM=="tty", KERNEL=="ptmx", GROUP="tty", MODE="0666" +@@ -8,6 +16,8 @@ SUBSYSTEM=="tty", KERNEL=="tty[0-9]*", GROUP="tty", MODE="0620" + SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty" + KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout" + ++SUBSYSTEM=="rtc", ATTR{hctosys}=="1", MODE="0644" ++ + SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640" + + SUBSYSTEM=="input", KERNEL=="mouse*|mice|event*", MODE="0640" +@@ -59,10 +69,3 @@ KERNEL=="tun", MODE="0666", OPTIONS+="static_node=net/tun" + KERNEL=="fuse", MODE="0666", OPTIONS+="static_node=fuse" + + LABEL="default_permissions_end" +-SUBSYSTEM=="rtc", ATTR{hctosys}=="1", MODE="0644", SYMLINK+="rtc" +-SUBSYSTEM=="virtio-ports", KERNEL=="vport*", ATTR{name}=="?*", SYMLINK+="virtio-ports/$attr{name}" +- +-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb" +-SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id" +-SUBSYSTEM=="firmware", ACTION=="add", IMPORT{builtin}="firmware" +-ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}" +-- +1.8.2 + diff --git a/core/systemd/0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch b/core/systemd/0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch new file mode 100644 index 000000000..6d8d9aad4 --- /dev/null +++ b/core/systemd/0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch @@ -0,0 +1,25 @@ +From 961e4526925b7b1e1d3582f2fc9fb38035e2b5fb Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Fri, 15 Mar 2013 16:41:13 +0100 +Subject: [PATCH] strv: fix STRV_FOREACH_PAIR macro definition + +--- + src/shared/strv.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/shared/strv.h b/src/shared/strv.h +index da9fae6..49058f8 100644 +--- a/src/shared/strv.h ++++ b/src/shared/strv.h +@@ -77,7 +77,7 @@ bool strv_overlap(char **a, char **b); + for (; (l) && ((s) >= (l)); (s)--) + + #define STRV_FOREACH_PAIR(x, y, l) \ +- for ((x) = (l), (y) = (x+1); (x) && *(x) && *(y); (x) += 2) ++ for ((x) = (l), (y) = (x+1); (x) && *(x) && *(y); (x) += 2, (y) = (x + 1)) + + + char **strv_sort(char **l); +-- +1.8.2 + diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index e402ed0ba..78ee7fd0c 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') pkgver=198 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -16,11 +16,19 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-hook-udev' 'initcpio-install-udev' 'initcpio-install-timestamp' + '0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch' + '0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch' + '0001-rules-move-builtin-calls-before-the-permissions-sect.patch' + '0001-Fix-vacuum-logic-error.patch' 'use-split-usr-path.patch') md5sums=('26a75e2a310f8c1c1ea9ec26ddb171c5' 'e99e9189aa2f6084ac28b8ddf605aeb8' 'fb37e34ea006c79be1c54cbb0f803414' 'df69615503ad293c9ddf9d8b7755282d' + 'c93785560cd33e25013224ac84689aa3' + '80db2672a49667a3add02fb07dee9dca' + 'a0d3aca35ff7f71d1a5a79022b715ae0' + '7ae8e22cef30e57de02ca623b0673f76' '76bf83fe34c5b40533abc5dc940576a6') build() { @@ -31,6 +39,19 @@ build() { [ "$CARCH" = "mips64el" ] && CFLAGS+=" -mno-plt" + # upstream commit 83d7d83bcc6c462ecbb4c8003e3a8b41f3b88d46 + patch -Np1 <"$srcdir"/0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch + + # upstream commit 961e4526925b7b1e1d3582f2fc9fb38035e2b5fb + patch -Np1 <"$srcdir"/0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch + + # upstream commit bbb7f2ae5035105575365750592caa87213d7072 + # - modified to avoid pulling in disabling of firmware loading + patch -Np1 <"$srcdir"/0001-rules-move-builtin-calls-before-the-permissions-sect.patch + + # upstream commit 6c142648aaced56ab681fcc97a71b06d588122a9 + patch -Np1 <"$srcdir"/0001-Fix-vacuum-logic-error.patch + ./configure \ --enable-static \ --libexecdir=/usr/lib \ @@ -114,9 +135,6 @@ package_systemd() { install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/ mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ "$srcdir"/_sysvcompat/usr/share/man/man8 - - # create /var/log/journal. users can control the actual log destination via journald.conf - install -dm755 "$pkgdir/var/log/journal" } package_systemd-sysvcompat() { diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD index 5f9eddecd..a96d56400 100644 --- a/extra/akonadi/PKGBUILD +++ b/extra/akonadi/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 179115 2013-03-03 18:48:13Z andrea $ +# $Id: PKGBUILD 180678 2013-03-25 19:15:27Z bpiotrowski $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=akonadi pkgver=1.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" arch=('i686' 'x86_64' 'mips64el') url='http://community.kde.org/KDE_PIM/Akonadi' license=('LGPL') -depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano') +depends=('shared-mime-info' 'boost-libs' 'mariadb' 'soprano') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2") diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index 4e6d9d1c4..72551800a 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178124 2013-02-16 22:48:44Z ioni $ +# $Id: PKGBUILD 180679 2013-03-25 19:15:28Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> @@ -6,12 +6,12 @@ pkgname=amarok replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') pkgver=2.7.0 -pkgrel=3 +pkgrel=4 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64" 'mips64el') url="http://amarok.kde.org/" license=('GPL2' 'LGPL2.1' 'FDL') -depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras' +depends=('kdebase-runtime' 'mariadb' 'qtscriptgenerator' 'taglib-extras' 'liblastfm' 'ffmpeg' 'libofa' 'qjson') makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth' 'libmygpo-qt' 'mesa' 'clamz') diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD index f721622c8..d7978a075 100644 --- a/extra/anjuta/PKGBUILD +++ b/extra/anjuta/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 170895 2012-11-12 22:30:17Z heftig $ +# $Id: PKGBUILD 180677 2013-03-25 19:13:50Z bpiotrowski $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Harley Laue <losinggeneration@yahoo.com> pkgbase=anjuta pkgname=('libanjuta' 'anjuta') pkgver=3.6.2 -pkgrel=1.1 +pkgrel=2 pkgdesc="GNOME Integrated Development Environment (IDE)" arch=('i686' 'x86_64' 'mips64el') license=('GPL') diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD index 56afc4251..9bbca5549 100644 --- a/extra/ardour/PKGBUILD +++ b/extra/ardour/PKGBUILD @@ -1,70 +1,48 @@ -# $Id: PKGBUILD 176990 2013-02-03 14:59:10Z schiv $ +# $Id: PKGBUILD 180842 2013-03-26 21:39:25Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> -# Contributor: tobias <tobias@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> - -# ardour, liblrdf and raptor are heavily dependent on each other. Updating of -# one package mostly will require an update of all the other packages. I vote -# for fixed dependencies speaking in terms of versions -- tobias - -# SYSLIBS enabled, support still valid; see ardour 2.8.13 rel notes -# http://ardour.org/node/5263 +# Contributor: SpepS <dreamspepser at yahoo dot it> +# Contributor: see .contrib pkgname=ardour -pkgver=2.8.16 -pkgrel=1.1 -pkgdesc="A multichannel hard disk recorder and digital audio workstation" +pkgver=3.0 +pkgrel=1 +pkgdesc="Professional-grade digital audio workstation" arch=('i686' 'x86_64' 'mips64el') url="http://ardour.org/" license=('GPL') -depends=('liblrdf' 'libusb-compat' 'liblo' 'soundtouch' - 'aubio' 'lilv' 'suil' 'libgnomecanvasmm') - # -libgnomecanvas(+libgnomecanvasmm) - # +soundtouch (these +/- changes are for SYSLIBS=1) - # cwiid removed for https://bugs.archlinux.org/task/28344 -makedepends=('scons' 'boost') -changelog=$pkgname.changelog -source=("ftp://ftp.archlinux.org/other/ardour/$pkgname-$pkgver.tar.bz2" +depends=('liblrdf' 'liblo' 'libsmf' 'lilv>=0.16.0' + 'aubio' 'libgnomecanvasmm' 'suil>=0.6.12') +makedepends=('python2' 'boost' 'cppunit' 'doxygen' 'graphviz') +install=$pkgname.install +source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.bz2" "$pkgname.desktop") -md5sums=('5bafe41df00d25e7a357baaa1038f16d' - '8aeaf433ebf781733db48e5a16b0c4da') +md5sums=('2759df2ac29e6075e006cc5b262bfee0' + '316bd21ece5e2208a104fd09cac521af') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" - # ardour defaults to -O3; use this in CFLAGS below - sed -i '/-O3/d' SConstruct + # python2 fix + sed -i 's/python ${SRC}/python2 ${SRC}/' libs/pbd/wscript - # work around boost linking error (see ardour3 svn r13081) - # thanks to Harry Harren for the heads-up - CFLAGS+=" -DBOOST_SYSTEM_NO_DEPRECATED" - CXXFLAGS+=" -DBOOST_SYSTEM_NO_DEPRECATED" - export CFLAGS CXXFLAGS + python2 waf configure --prefix=/usr \ + --configdir=/etc \ + --docs # All unknown arches are considered i686 with SSE. [ "$CARCH" == "mips64el" ] && extra="DIST_TARGET=none" - scons $MAKEFLAGS ARCH="${CFLAGS/-O[0-9]/-O3}" \ - PREFIX="/usr" \ - DIST_LIBDIR="lib" \ - FREEDESKTOP=0 \ - FREESOUND=1 \ - SYSLIBS=1 \ - $extra + python2 waf build $MAKEFLAGS } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" - scons DESTDIR="$pkgdir" install + python2 waf install --destdir="$pkgdir" # install some freedesktop.org compatibility install -Dm644 "$srcdir/$pkgname.desktop" \ "$pkgdir/usr/share/applications/$pkgname.desktop" - - # upstream will not do this - # install templates - cp -r templates "$pkgdir/usr/share/ardour2/" } # vim:set ts=2 sw=2 et: diff --git a/extra/ardour/ardour.changelog b/extra/ardour/ardour.changelog deleted file mode 100644 index 242d5a78a..000000000 --- a/extra/ardour/ardour.changelog +++ /dev/null @@ -1,55 +0,0 @@ -11 Aug 2012 (GMT+8) Ray Rashif <schiv@archlinux.org> - * 2.8.14: - Upstream release - Dep on new (s)lv2 stack (lilv, suil et al replaces slv2) - SYSLIBS turned on by upstream decree; see 2.8.13 release notes - -15 Jul 2011 (GMT+8) Ray Rashif <schiv@archlinux.org> - - * 2.8.11-5: - Resolve previous issues with slv2 & redland/rasqal/raptor - - just needed rebuild of slv2 against latest redland suite [1] - - also needed ardour buildsystem patch for raptor2 [1][2] - - bring back support for slv2 - - [1] https://bugs.archlinux.org/task/25060 - [2] http://tracker.ardour.org/view.php?id=4179 - -9 Jul 2011 (GMT+8) Ray Rashif <schiv@archlinux.org> - - * 2.8.11-4: - Fix build failures and runtime segfaults - - gcc 4.6 patch - - enable SYSLIBS due to ardour sigc++ issues - - remove slv2 dep due to ardour rasqal incompatibility [1][2] - - [1] https://bugs.archlinux.org/task/25060 - [2] https://ardour.org/node/4301 - -22 Feb 2011 (GMT+8) Ray Rashif <schiv@archlinux.org> - - * 2.8.11-2 : - raptor rebuild - -9 Aug 2010 (GMT+8) Ray Rashif <schiv@archlinux.org> - - * 2.8.11-1 : - Testing build. - Removed libgnomecanvasmm depend (ardour internal). - Removed soundtouch makedepend (ardour internal, unneded). - Added new depends - - slv2 ("LV2" plug-ins support) - - rubberband (can "do more" than soundtouch) - - libgnomecanvas - Not using SYSLIBS because upstream does not support it. - Namcap warnings can be ignored; they're ardour internals. - - * PKGBUILD : - Minor cosmetic ammendments. - - * ardour.changelog : - Added this changelog. - Only important changes will be logged. - - * ardour.install : - Removed install scriptlet; old and deprecated information. diff --git a/extra/ardour/ardour.desktop b/extra/ardour/ardour.desktop index b50f6c952..de68483e1 100644 --- a/extra/ardour/ardour.desktop +++ b/extra/ardour/ardour.desktop @@ -1,8 +1,8 @@ [Desktop Entry] -Name=Ardour +Name=Ardour 3 Comment=Multitrack hard disk recorder -Exec=ardour2 -Icon=/usr/share/ardour2/icons/ardour_icon_48px.png +Exec=ardour3 +Icon=/usr/share/ardour3/icons/ardour_icon_48px.png Terminal=false Type=Application X-MultipleArgs=false diff --git a/extra/ardour/ardour.install b/extra/ardour/ardour.install new file mode 100644 index 000000000..555d7377d --- /dev/null +++ b/extra/ardour/ardour.install @@ -0,0 +1,21 @@ +post_install() { + cat << MSG + > Ardour 3 has support for native "Linux" VSTs. You may want to export + > LXVST_PATH to include any custom directories of *.so VST plug-ins. + + > Please consider supporting Paul Davis, lead developer of Ardour, by + > either subscribing or at least donating to the project's cause: + + https://community.ardour.org/s/subscribe + https://community.ardour.org/donate + + > With your continued support, Ardour will continue to improve and will + > one day no longer be dependent on unstable funding. +MSG +} + +post_upgrade() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD index 05000c1f0..9fb33d90f 100644 --- a/extra/boost/PKGBUILD +++ b/extra/boost/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 176283 2013-01-28 16:48:15Z stephane $ +# $Id: PKGBUILD 180862 2013-03-27 13:30:16Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: kevin <kevin@archlinux.org> @@ -10,107 +10,99 @@ pkgbase=boost pkgname=('boost-libs' 'boost') pkgver=1.52.0 _boostver=${pkgver//./_} -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') +pkgrel=3 url="http://www.boost.org/" -makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') -source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz) +arch=('i686' 'x86_64' 'mips64el') license=('custom') -sha1sums=('1120430030315b0a94b6d63fc04662960db2444c') +makedepends=('icu>=51.1' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') +source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz + boost-1.52.0-python3.patch) +sha1sums=('1120430030315b0a94b6d63fc04662960db2444c' + '34026072a7cb2534164f20e77bb71a5c75093307') _stagedir="${srcdir}/stagedir" build() { - # set python path for bjam - cd "${srcdir}/${pkgbase}_${_boostver}/tools" - echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam - echo "using python : 3.3 : /usr/bin/python3 : /usr/include/python3.3m : /usr/lib ;" >> build/v2/user-config.jam - echo "using mpi ;" >> build/v2/user-config.jam - - cd "${srcdir}"/${pkgbase}_${_boostver} - - # build bjam - cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine" - ./build.sh cc - - _bindir="bin.linuxx86" - [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64" - [ "${CARCH}" = "mips64el" ] && _bindir="bin.linuxmips" - - install -d "${_stagedir}"/usr/bin - install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam - - # build tools - cd "${srcdir}/${pkgbase}_${_boostver}/tools/" - "${_stagedir}"/usr/bin/bjam --toolset=gcc - - # copy the tools - cd "${srcdir}/${pkgbase}_${_boostver}/dist/bin" - for i in *;do - install -m755 "${i}" "${_stagedir}/usr/bin/${i}" - done - - #boostbook needed by quickbook - cd "${srcdir}/${pkgbase}_${_boostver}/dist/" - cp -r share "${_stagedir}" - - # build libs - cd "${srcdir}/${pkgbase}_${_boostver}" - - # default "minimal" install: "release link=shared,static - # runtime-link=shared threading=single,multi" - # --layout=tagged will add the "-mt" suffix for multithreaded libraries - # and installs includes in /usr/include/boost. - # --layout=system no longer adds the -mt suffix for multi-threaded libs. - # install to ${_stagedir} in preparation for split packaging - - "${_stagedir}"/usr/bin/bjam \ - release debug-symbols=off threading=multi \ - runtime-link=shared link=shared,static \ - cflags=-fno-strict-aliasing \ + local JOBS="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})" + + cd "${srcdir}/${pkgbase}_${_boostver}" + + # Fix build errors with python 3 + sed -i "/PYTHON_ROOT/s/print sys.prefix/print(sys.prefix)/g" bootstrap.sh + patch -Np1 -i ../boost-1.52.0-python3.patch + + # Shut up strict aliasing warnings + echo "using gcc : : : <compileflags>-fno-strict-aliasing ;" >> ./tools/build/v2/user-config.jam + # Add an extra python version. This does not replace anything and python 2.x need to be the default. + echo "using python : 3.3 : /usr/bin/python3 : /usr/include/python3.3m : /usr/lib ;" >> ./tools/build/v2/user-config.jam + # Support for OpenMPI + echo "using mpi ;" >> ./tools/build/v2/user-config.jam + + ./bootstrap.sh --with-toolset=gcc --with-icu --with-python=/usr/bin/python2 + + _bindir="bin.linuxx86" + [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64" + [ "${CARCH}" = "mips64el" ] && _bindir="bin.linuxmips" + + install -d -m 755 "${_stagedir}"/bin + install "${srcdir}"/${pkgbase}_${_boostver}/tools/build/v2/engine/${_bindir}/bjam "${_stagedir}"/bin/bjam + + pushd tools + for _tool in bcp inspect quickbook compiler_status process_jam_log wave; do + "${_stagedir}"/bin/bjam --toolset=gcc $_tool + done + "${_stagedir}"/bin/bjam --toolset=gcc cflags="-std=gnu++11" library_status + popd + cp -a dist/bin/* "${_stagedir}"/bin + + #boostbook is needed by quickbook + install -d -m 755 "${_stagedir}"/share/boostbook + cp -a tools/boostbook/{xsl,dtd} "${_stagedir}"/share/boostbook/ + + # default "minimal" install: "release link=shared,static + # runtime-link=shared threading=single,multi" + # --layout=tagged will add the "-mt" suffix for multithreaded libraries + # and installs includes in /usr/include/boost. + # --layout=system no longer adds the -mt suffix for multi-threaded libs. + # install to ${_stagedir} in preparation for split packaging + "${_stagedir}"/bin/bjam \ + variant=release \ + debug-symbols=off \ + threading=multi \ + runtime-link=shared \ + link=shared \ toolset=gcc \ - --prefix="${_stagedir}" \ - -sTOOLS=gcc \ + python=2.7 \ --layout=system \ - ${MAKEFLAGS} \ + --prefix="${_stagedir}" \ + ${JOBS} \ install + + find ${_stagedir} -name \*.a -exec rm -f {} \; } package_boost() { - pkgdesc="Free peer-reviewed portable C++ source libraries - Development" - depends=("boost-libs=${pkgver}") - optdepends=('python: for python3 bindings' - 'python2: for python2 bindings' - 'boost-build: to use boost jam for building your project.') - - install -d "${pkgdir}"/usr/{include,lib,share} - # headers/source files - cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/ - - # static libs - cp -r "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/ - - # utilities (bjam, bcp, pyste) - cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/ + pkgdesc="Free peer-reviewed portable C++ source libraries - Development" + depends=("boost-libs=${pkgver}") + optdepends=('python: for python bindings' + 'python2: for python2 bindings' + 'boost-build: to use boost jam for building your project.') - #boostbook - cp -r "${_stagedir}"/share/* "${pkgdir}"/usr/share + install -d -m 755 "${pkgdir}"/usr + cp -a "${_stagedir}"/{bin,include,share} "${pkgdir}"/usr - # license - install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \ - "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt + install -D -m 644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \ + "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt } package_boost-libs() { - pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime" - depends=('gcc-libs' 'bzip2' 'zlib' 'icu') - optdepends=('openmpi: for mpi support') + pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime" + depends=('bzip2' 'zlib' 'icu') + optdepends=('openmpi: for mpi support') - install -d "${pkgdir}/usr/lib" - #shared libs - cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib/" + install -d -m 755 "${pkgdir}"/usr + cp -a "${_stagedir}"/lib "${pkgdir}"/usr - # license - install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \ - "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt + install -D -m 644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \ + "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt } diff --git a/extra/boost/boost-1.52.0-python3.patch b/extra/boost/boost-1.52.0-python3.patch new file mode 100644 index 000000000..8d2f59269 --- /dev/null +++ b/extra/boost/boost-1.52.0-python3.patch @@ -0,0 +1,96 @@ +diff -Naur boost_1_53_0.ori/libs/mpi/src/python/datatypes.cpp boost_1_53_0/libs/mpi/src/python/datatypes.cpp +--- boost_1_53_0.ori/libs/mpi/src/python/datatypes.cpp 2007-11-25 13:38:02.000000000 -0500 ++++ boost_1_53_0/libs/mpi/src/python/datatypes.cpp 2013-03-11 20:59:57.171732691 -0400 +@@ -13,6 +13,10 @@ + #include <boost/mpi/python/serialize.hpp> + #include <boost/mpi.hpp> + ++#if PY_MAJOR_VERSION >= 3 ++#define PyInt_Type PyLong_Type ++#endif ++ + namespace boost { namespace mpi { namespace python { + + void export_datatypes() +diff -Naur boost_1_53_0.ori/libs/mpi/src/python/py_environment.cpp boost_1_53_0/libs/mpi/src/python/py_environment.cpp +--- boost_1_53_0.ori/libs/mpi/src/python/py_environment.cpp 2007-11-25 13:38:02.000000000 -0500 ++++ boost_1_53_0/libs/mpi/src/python/py_environment.cpp 2013-03-11 21:02:12.961737401 -0400 +@@ -11,6 +11,9 @@ + * This file reflects the Boost.MPI "environment" class into Python + * methods at module level. + */ ++ ++#include <locale> ++#include <string> + #include <boost/python.hpp> + #include <boost/mpi.hpp> + +@@ -50,11 +53,65 @@ + + // If anything changed, convert C-style argc/argv into Python argv + if (mpi_argv != my_argv) ++ { ++#if PY_MAJOR_VERSION >= 3 ++ // Code stolen from py3k/Modules/python.c. ++ ++ wchar_t **argv_copy = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc); ++ /* We need a second copies, as Python might modify the first one. */ ++ wchar_t **argv_copy2 = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc); ++ ++ if (!argv_copy || !argv_copy2) { ++ fprintf(stderr, "out of memory\n"); ++ return false; ++ } ++ ++ std::locale mylocale; ++ mbstate_t mystate; ++ ++ const std::codecvt<char, wchar_t, mbstate_t>& myfacet = ++ std::use_facet<std::codecvt<char, wchar_t, mbstate_t> >(mylocale); ++ ++ for (int i = 0; i < mpi_argc; i++) ++ { ++ size_t length = strlen(mpi_argv[i]); ++ ++ wchar_t *dest = (wchar_t *) PyMem_Malloc(sizeof(wchar_t) * (length + 1)); ++ ++ const char *from_next; ++ wchar_t *to_next; ++ ++ std::codecvt<wchar_t,char,mbstate_t>::result myresult = ++ myfacet.out(mystate, ++ mpi_argv[i], mpi_argv[i] + length + 1, from_next, ++ dest, dest+length+1, to_next); ++ ++ if (myresult != std::codecvt<wchar_t,char,mbstate_t>::ok ) ++ { ++ fprintf(stderr, "failure translating argv\n"); ++ return 1; ++ } ++ ++ argv_copy2[i] = argv_copy[i] = dest; ++ if (!argv_copy[i]) ++ return false; ++ } ++ ++ PySys_SetArgv(mpi_argc, argv_copy); ++ ++ for (int i = 0; i < mpi_argc; i++) { ++ PyMem_Free(argv_copy2[i]); ++ } ++ PyMem_Free(argv_copy); ++ PyMem_Free(argv_copy2); ++#else + PySys_SetArgv(mpi_argc, mpi_argv); ++#endif ++ } + +- for (int arg = 0; arg < my_argc; ++arg) +- free(my_argv[arg]); +- delete [] my_argv; ++ for (int arg = 0; arg < mpi_argc; ++arg) ++ free(mpi_argv[arg]); ++ delete [] mpi_argv; + + return true; + } diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD index b810534a3..50c7abbb8 100644 --- a/extra/brltty/PKGBUILD +++ b/extra/brltty/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 175866 2013-01-23 00:12:57Z eric $ +# $Id: PKGBUILD 180801 2013-03-26 11:49:28Z foutrelis $ # Maintainer: # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=brltty pkgver=4.4 -pkgrel=3 +pkgrel=4 pkgdesc="Braille display driver for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') url="http://mielke.cc/brltty" license=('GPL' 'LGPL') -depends=('libxaw' 'at-spi2-core' 'gpm' 'icu>=50.1.2' 'tcl' 'atk' 'pyrex') +depends=('libxaw' 'at-spi2-core' 'gpm' 'icu>=51.1' 'tcl' 'atk' 'pyrex') makedepends=('bluez') optdepends=('bluez: bluetooth support') backup=(etc/brltty.conf etc/conf.d/brltty.conf) diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 4ed0f8643..a57765acf 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180550 2013-03-23 07:23:55Z bpiotrowski $ +# $Id: PKGBUILD 180802 2013-03-26 11:49:30Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -18,7 +18,7 @@ pkgname=('calligra-filters' 'calligra-braindump' 'calligra-flow') pkgver=2.6.2 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') @@ -216,6 +216,7 @@ package_calligra-flow() { 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 make DESTDIR="${pkgdir}" install diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD index 5cd531c36..e35c47f05 100644 --- a/extra/cyrus-sasl/PKGBUILD +++ b/extra/cyrus-sasl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 168631 2012-10-13 16:37:23Z thomas $ +# $Id: PKGBUILD 180680 2013-03-25 19:15:31Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> # This package spans multiple repositories. @@ -8,13 +8,13 @@ pkgbase=('cyrus-sasl') pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') #pkgname=libsasl pkgver=2.1.23 -pkgrel=11 +pkgrel=12 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64' 'mips64el') url="http://cyrusimap.web.cmu.edu/" license=('custom') options=('!makeflags' '!libtool') -makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl') +makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl') source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz cyrus-sasl-2.1.19-checkpw.c.patch cyrus-sasl-2.1.22-crypt.patch @@ -196,7 +196,7 @@ package_cyrus-sasl-ldap() { package_cyrus-sasl-sql() { pkgdesc="SQL auxprop module for Cyrus SASL" - depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmysqlclient') + depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient') replaces=('cyrus-sasl-plugins') cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index 94831bda8..003b1ad33 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 177806 2013-02-09 09:15:39Z andyrtr $ +# $Id: PKGBUILD 180681 2013-03-25 19:15:32Z bpiotrowski $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> @@ -9,12 +9,12 @@ pkgname=dovecot pkgver=2.1.15 -pkgrel=1 +pkgrel=2 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64' 'mips64el') url="http://dovecot.org/" license=("LGPL") -depends=('krb5' 'openssl' 'sqlite>=3.7.5' 'libmysqlclient>=5.5.10' +depends=('krb5' 'openssl' 'sqlite>=3.7.5' 'libmariadbclient' 'postgresql-libs>=9.0.3' 'bzip2' 'expat' 'curl') makedepends=('pam>=1.1.1' 'libcap>=2.19' 'libldap>=2.4.22' 'clucene') optdepends=('libldap: ldap plugin' diff --git a/extra/gnokii/PKGBUILD b/extra/gnokii/PKGBUILD index e04f5a0b1..e79e980f7 100644 --- a/extra/gnokii/PKGBUILD +++ b/extra/gnokii/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 150512 2012-02-18 11:55:01Z pierre $ +# $Id: PKGBUILD 180682 2013-03-25 19:15:33Z bpiotrowski $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,15 +6,15 @@ pkgname=gnokii pkgver=0.6.31 -pkgrel=1.1 +pkgrel=3 pkgdesc="Tools and user space driver for use with mobile phones" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnokii.org/" license=('GPL') depends=('libusb-compat' 'libxpm' 'bluez' 'libical') -makedepends=('gtk2' 'libmysqlclient' 'postgresql-libs' 'intltool') +makedepends=('gtk2' 'libmariadbclient' 'postgresql-libs' 'intltool' 'mariadb') optdepends=('gtk2: xgnokii GUI' - 'libmysqlclient: smsd mysql backend' + 'libmariadbclient: smsd mysql backend' 'postgresql-libs: smsd postgresql backend') backup=('etc/gnokiirc') options=('!libtool' '!makeflags') diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD index 2375268c3..43d0c6294 100644 --- a/extra/gptfdisk/PKGBUILD +++ b/extra/gptfdisk/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 177797 2013-02-09 01:45:32Z foutrelis $ +# $Id: PKGBUILD 180803 2013-03-26 11:49:32Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Hokum <hokum_at_mail_dot_ru> pkgname=gptfdisk pkgver=0.8.6 -pkgrel=1 +pkgrel=2 pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks" arch=('i686' 'x86_64' 'mips64el') url="http://www.rodsbooks.com/gdisk/" diff --git a/extra/gummiboot/PKGBUILD b/extra/gummiboot/PKGBUILD deleted file mode 100644 index 99ca11299..000000000 --- a/extra/gummiboot/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 180605 2013-03-24 16:16:26Z tomegun $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> -# Contributor: Mantas Mikulėnas <grawity@gmail.com> - -pkgname="gummiboot" -pkgver="29" -pkgrel="1" -pkgdesc="Simple text-mode UEFI Boot Manager" -url="http://freedesktop.org/wiki/Software/gummiboot" -arch=('x86_64' 'i686') -license=('LGPL2.1') -makedepends=('gnu-efi-libs' 'docbook-xsl') -depends=('util-linux') -conflicts=('gummiboot-efi') -provides=('gummiboot-efi') -replaces=('gummiboot-efi') -options=('!strip') -source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.xz" - 'loader.conf' - 'arch.conf') -install="gummiboot.install" - -build() { - cd "${srcdir}/${pkgname}-${pkgver}/" - - ./autogen.sh - ./configure --sysconfdir=/etc --libexecdir=/usr/lib --libdir=/usr/lib - - make -} - -package() { - ## Install gummiboot example configuration files (can go away with systemd's kernel-install) - install -D -m0644 "${srcdir}/loader.conf" "${pkgdir}/usr/lib/gummiboot/loader/loader.conf" - install -D -m0644 "${srcdir}/arch.conf" "${pkgdir}/usr/lib/gummiboot/loader/entries/arch.conf" - - cd "${srcdir}/${pkgname}-${pkgver}/" - make DESTDIR="${pkgdir}" install -} -md5sums=('7e133411b805ce6fb5dd3e3bd08b88a2' - '6ea803e5179d623716e3be0b636de658' - '82bda9612e3a361a74cf8de2a0134b15') diff --git a/extra/gummiboot/arch.conf b/extra/gummiboot/arch.conf deleted file mode 100644 index 6cf347026..000000000 --- a/extra/gummiboot/arch.conf +++ /dev/null @@ -1,7 +0,0 @@ -## This is just an exmaple config file. -## Please edit the paths and kernel parameters according to your system. - -title Arch Linux -linux /vmlinuz-linux -initrd /initramfs-linux.img -options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap diff --git a/extra/gummiboot/gummiboot.install b/extra/gummiboot/gummiboot.install deleted file mode 100644 index 770087361..000000000 --- a/extra/gummiboot/gummiboot.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - echo ":: Run '/usr/bin/gummiboot install' to enable gummiboot" -} - -post_upgrade() { - /usr/bin/gummiboot update -} - -pre_remove() { - /usr/bin/gummiboot remove -} diff --git a/extra/gummiboot/loader.conf b/extra/gummiboot/loader.conf deleted file mode 100644 index 75b67e0d5..000000000 --- a/extra/gummiboot/loader.conf +++ /dev/null @@ -1,2 +0,0 @@ -timeout 10 -default arch diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD index 9edf2f2db..ed9a3ecd6 100644 --- a/extra/harfbuzz/PKGBUILD +++ b/extra/harfbuzz/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 175869 2013-01-23 00:13:03Z eric $ +# $Id: PKGBUILD 180804 2013-03-26 11:49:33Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=harfbuzz -pkgver=0.9.9 -pkgrel=3 +pkgver=0.9.14 +pkgrel=1 pkgdesc="OpenType text shaping engine." arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/HarfBuzz" @@ -13,7 +13,7 @@ makedepends=('icu' 'cairo' 'glib2' 'freetype2') optdepends=('cairo: hb-view program') options=(!libtool) source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('3d8dd4ebbc38da011485ef181f8ff072b4b0d7e305bbda19b355f217d25169cf') +sha256sums=('d07c0ffdbbbfdfbb6c65e73fe9c76466e87dbf04b094cbd0abf5fd7d571a4004') build() { cd ${pkgname}-${pkgver} diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD index 5388d6b25..6145832a7 100644 --- a/extra/hwloc/PKGBUILD +++ b/extra/hwloc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 175783 2013-01-21 17:03:37Z stephane $ +# $Id: PKGBUILD 180744 2013-03-26 01:47:54Z stephane $ # Maintainer : Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Sylvain HENRY <hsyl20@yahoo.fr> # Contributor: Hervé YVIQUEL <elldekaa@gmail.com> pkgname=hwloc -pkgver=1.6.1 +pkgver=1.6.2 pkgrel=1 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('sh' 'pciutils' 'cairo' 'libxml2') makedepends=('pkg-config') options=('!libtool' '!docs') source=(http://www.open-mpi.org/software/hwloc/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('9d02234d6abd5332675957506e4d8144c515e986') +sha1sums=('f9d9938d427e65257d1745ffc1d10634251cdc09') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD index 3a25afb43..e0765fd80 100644 --- a/extra/icu/PKGBUILD +++ b/extra/icu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 175870 2013-01-23 00:13:04Z eric $ +# $Id: PKGBUILD 180805 2013-03-26 11:49:34Z foutrelis $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Art Gramlich <art@gramlich-net.com> pkgname=icu -pkgver=50.1.2 -pkgrel=1.1 +pkgver=51.1 +pkgrel=1 pkgdesc="International Components for Unicode library" arch=(i686 x86_64 'mips64el') url="http://www.icu-project.org/" @@ -14,7 +14,7 @@ depends=('gcc-libs>=4.7.1-5' 'sh') source=(#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz icu.8198.revert.icu5431.patch) -md5sums=('beb98aa972219c9fcd9c8a71314943c9' +md5sums=('6eef33b229d0239d654983028c9c7053' 'ebd5470fc969c75e52baf4af94a9ee82') build() { diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 2d71171e1..5c700be9d 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180320 2013-03-20 04:16:52Z eric $ +# $Id: PKGBUILD 180839 2013-03-26 18:36:41Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.3.10 +pkgver=6.8.4.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" @@ -13,7 +13,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('2a80effb525ea87e6eef96d30def680175ff3222' +sha1sums=('e79b197cc17f1053ed5ff22f2eea73e01f94aeb5' 'e143cf9d530fabf3b58023899b5cc544ba93daec') build() { @@ -63,7 +63,7 @@ package_imagemagick() { options=('!docs' 'libtool' '!emptydirs') cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE" install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE" diff --git a/community/libbsd/LICENSE b/extra/libbsd/LICENSE index 7dcbfc2ba..7dcbfc2ba 100644 --- a/community/libbsd/LICENSE +++ b/extra/libbsd/LICENSE diff --git a/community/libbsd/PKGBUILD b/extra/libbsd/PKGBUILD index 60a62913c..e22966655 100644 --- a/community/libbsd/PKGBUILD +++ b/extra/libbsd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75426 2012-08-23 01:07:04Z svenstaro $ +# $Id: PKGBUILD 180872 2013-03-27 14:45:32Z tpowa $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> diff --git a/extra/libgda/PKGBUILD b/extra/libgda/PKGBUILD index 0ade6a283..b37602f5f 100644 --- a/extra/libgda/PKGBUILD +++ b/extra/libgda/PKGBUILD @@ -1,24 +1,23 @@ -# $Id: PKGBUILD 156892 2012-04-23 09:08:29Z ibiru $ +# $Id: PKGBUILD 180676 2013-03-25 19:13:49Z bpiotrowski $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=libgda -pkgver=5.0.3 -pkgrel=1.1 +pkgver=5.1.1 +pkgrel=1 pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers" arch=(i686 x86_64 'mips64el') license=('GPL') depends=('gtksourceview3' 'libxslt' 'json-glib' 'db' 'ncurses' 'libsoup' - 'libmysqlclient' 'postgresql-libs' 'python2' 'libgnome-keyring' + 'libmariadbclient' 'postgresql-libs' 'python2' 'libgnome-keyring' 'hicolor-icon-theme' 'desktop-file-utils' 'graphviz' 'gdk-pixbuf2' 'iso-codes' 'openssl' 'libgcrypt' 'libldap') makedepends=('intltool' 'gobject-introspection' 'gtk-doc' 'vala') -[ "$CARCH" != "mips64el" ] && makedepends+=('openjdk6') options=('!libtool') url="http://www.gnome-db.org" install=libgda.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('82d204361b794103c366bb690484d25814bfc653cb97da0dfcf7c0a13409d1cc') +sha256sums=('41a54e60d91758d1d239e5127c856ff0412a5709e92440e9107178af928ed5e1') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD index edf3f2521..27ab1f9f9 100644 --- a/extra/libmtp/PKGBUILD +++ b/extra/libmtp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 166960 2012-09-23 11:44:00Z tomegun $ +# $Id: PKGBUILD 180848 2013-03-26 23:07:40Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: damir <damir@archlinux.org> # Contributor: Kevin Edmonds <edmondskevin@hotmail.com> pkgname=libmtp -pkgver=1.1.5 -pkgrel=1.1 +pkgver=1.1.6 +pkgrel=1 pkgdesc="Library implementation of the Media Transfer Protocol" arch=("i686" "x86_64" "mips64el") url="http://libmtp.sourceforge.net" @@ -24,4 +24,4 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } -md5sums=('f80e45c0e6e5798c434bb1c26a7b602d') +md5sums=('87835626dbcf39e62bfcdd4ae6da2063') diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index ac49b5778..95cc63dfe 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180591 2013-03-24 07:51:29Z andyrtr $ +# $Id: PKGBUILD 180806 2013-03-26 11:49:36Z foutrelis $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -21,7 +21,7 @@ pkgname=('libreoffice-common' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) _LOver=4.0.1.2 pkgver=4.0.1 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -32,7 +32,7 @@ makedepends=( # makedepends 'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' 'bluez' # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" - 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=50.1-2" + 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=51.1" 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.22.2' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu') # to satisfy regression tests @@ -282,7 +282,7 @@ package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=libreoffice-common.install depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' - 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=50.1" 'clucene' 'lcms2' "poppler>=0.22.2" + 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.22.2" 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') # 'orbit2') optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' diff --git a/extra/libwacom/PKGBUILD b/extra/libwacom/PKGBUILD index 332c26613..c271d60cf 100644 --- a/extra/libwacom/PKGBUILD +++ b/extra/libwacom/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 164253 2012-07-28 20:26:26Z eric $ +# $Id: PKGBUILD 180845 2013-03-26 22:37:55Z eric $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=libwacom -pkgver=0.6 +pkgver=0.7 pkgrel=1 pkgdesc="Library to identify Wacom tablets and their features" arch=('x86_64' 'i686' 'mips64el') url="http://sourceforge.net/apps/mediawiki/linuxwacom/index.php?title=Libwacom" license=('MIT') -depends=('glib2' 'systemd-tools') +depends=('glib2' 'systemd') options=('!libtool') source=(http://sourceforge.net/projects/linuxwacom/files/libwacom/$pkgname-$pkgver.tar.bz2) -sha256sums=('7115690698edc87deec482f0b2526567b858475d2135b5f8ccc946e5e76ec01d') +sha256sums=('210c48b595461ebee63b1a846a6eb1d8f029b49d02ccbde34eadf551a5a68a78') build() { cd $pkgname-$pkgver diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD index d732bbb01..acfdcb4cb 100644 --- a/extra/lighttpd/PKGBUILD +++ b/extra/lighttpd/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 173176 2012-12-12 00:31:57Z eric $ +# $Id: PKGBUILD 180683 2013-03-25 19:15:34Z bpiotrowski $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=lighttpd pkgver=1.4.32 -pkgrel=2.1 +pkgrel=4 pkgdesc='A secure, fast, compliant and very flexible web-server' license=('custom') arch=('i686' 'x86_64' 'mips64el') url="http://www.lighttpd.net/" -depends=('pcre' 'bzip2' 'libldap' 'util-linux') -makedepends=('fcgi' 'libmysqlclient' 'lua51' 'libxml2' 'e2fsprogs' 'sqlite' 'gdbm' 'pkgconfig') +depends=('pcre' 'bzip2' 'libldap' 'util-linux' 'systemd') +makedepends=('fcgi' 'libmariadbclient' 'lua51' 'libxml2' 'e2fsprogs' 'sqlite' 'gdbm' 'pkgconfig') optdepends=('libxml2: mod_webdav' 'lua51: mod_cml/mod_magnet' - 'libmysqlclient: mod_mysql_vhost' + 'libmariadbclient: mod_mysql_vhost' 'sqlite: mod_webdav') backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd') options=('!libtool' 'emptydirs') install='lighttpd.install' source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz" "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc" - 'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service') + 'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service') sha256sums=('1368f80069ce71f5928cad59c8e60c0b95876942ca9e02c53853e54ae24aedc1' '5456a90967df6774386010baa3fa67dba1c80c3b7058c70c80931d8dea5093e7' - '186f4bb2364f82d4076a2ba7d3e088ffb356550493d92dd9d5eb57cac2839c17' - '6df18675691384c48b9137c8f18ca238055001f1077baf05cb8322247b475a77' + '41f6c0042bb61021553779f861910e335834f6c15e4411756cdc6233b31076fe' 'ee56422fe48f2683ccb5ca2e3dc6bad79ea8e1cbd043b21d2ea73b87018e35aa' 'd8a185145a7c08b4fd8c8e6c12dae3e176389dd9b1c66e239757b2ba5108c871' '708cefe97541edba73f572ed3836bd056462b1467e45e1912c9d960139929696') @@ -57,7 +56,6 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install - install -D -m755 $srcdir/lighttpd.rc.d $pkgdir/etc/rc.d/lighttpd install -D -m644 $srcdir/lighttpd.logrotate.d $pkgdir/etc/logrotate.d/lighttpd install -D -m644 $srcdir/lighttpd.conf $pkgdir/etc/lighttpd/lighttpd.conf install -d -m755 -o http -g http $pkgdir/var/{log,cache}/lighttpd/ diff --git a/extra/lighttpd/lighttpd.install b/extra/lighttpd/lighttpd.install index 6b471f633..817bd5746 100644 --- a/extra/lighttpd/lighttpd.install +++ b/extra/lighttpd/lighttpd.install @@ -1,6 +1,6 @@ post_install() { if [[ ! -d run/lighttpd ]]; then - usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/lighttpd.conf + usr/bin/systemd-tmpfiles --create lighttpd.conf fi } diff --git a/extra/lighttpd/lighttpd.logrotate.d b/extra/lighttpd/lighttpd.logrotate.d index 76f98785c..b424c692d 100644 --- a/extra/lighttpd/lighttpd.logrotate.d +++ b/extra/lighttpd/lighttpd.logrotate.d @@ -4,6 +4,6 @@ notifempty sharedscripts postrotate - /usr/bin/killall -HUP lighttpd-angel &>/dev/null || true + systemctl reload lighttpd.service || true endscript } diff --git a/extra/lighttpd/lighttpd.rc.d b/extra/lighttpd/lighttpd.rc.d deleted file mode 100644 index c2c41b818..000000000 --- a/extra/lighttpd/lighttpd.rc.d +++ /dev/null @@ -1,127 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - - -pid_file='/run/lighttpd/lighttpd-angel.pid' - -get_pid() { - if [ -r "${pid_file}" ]; then - cat "${pid_file}" - else - pgrep -f /usr/sbin/lighttpd-angel - fi -} - -test_config() { - stat_busy 'Checking configuration' - if [ $(id -u) -ne 0 ]; then - stat_append '(This script must be run as root)' - stat_die - fi - - if [ ! -r /etc/lighttpd/lighttpd.conf ]; then - stat_append '(/etc/lighttpd/lighttpd.conf not found)' - stat_die - fi - - /usr/sbin/lighttpd -t -f /etc/lighttpd/lighttpd.conf >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_append '(error in /etc/lighttpd/lighttpd.conf)' - stat_die - fi - - stat_done -} - -start() { - stat_busy 'Starting lighttpd' - - local PID=$(get_pid) - if [ -z "$PID" ]; then - nohup /usr/sbin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf >>/var/log/lighttpd/lighttpd-angel.log 2>&1 & - if [ $? -gt 0 ]; then - stat_die - else - echo $! > "${pid_file}" - add_daemon lighttpd - stat_done - fi - else - stat_die - fi -} - -stop() { - stat_busy 'Stopping lighttpd' - local PID=$(get_pid) - [ -n "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - [ -f "${pid_file}" ] && rm -f "${pid_file}" - rm_daemon lighttpd - stat_done - fi -} - -gracefull-stop() { - stat_busy 'Stopping lighttpd gracefully' - local PID=$(get_pid) - [ -n "$PID" ] && kill -INT $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - [ -f "${pid_file}" ] && rm -f "${pid_file}" - rm_daemon lighttpd - stat_done - fi -} - -reload() { - stat_busy 'Reloading lighttpd' - local PID=$(get_pid) - [ -n "$PID" ] && kill -HUP $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_die - else - stat_done - fi -} - - -case "$1" in - start) - test_config - start - ;; - stop) - test_config - stop - ;; - gracefull-stop) - test_config - stop - ;; - reload) - test_config - reload - ;; - restart) - test_config - stop - while [ -n "$(get_pid)" ]; do - sleep 1 - done - start - ;; - status) - stat_busy 'Checking lighttpd status' - ck_status lighttpd - ;; - *) - echo "usage: $0 {start|stop|gracefull-stop|reload|restart|status}" -esac - -exit 0 diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 5e20911af..793c7a359 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179613 2013-03-08 14:04:07Z giovanni $ +# $Id: PKGBUILD 180835 2013-03-26 16:00:15Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2013.03.07 +pkgver=2013.03.23 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('1cdef2dbc7d790f48051194125faf64b') +md5sums=('e9a75e0cfbf4f25aedd4ee4a10a7c26f') build() { cd ${srcdir}/live diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD index 87254eccb..2a10ef5b1 100644 --- a/extra/mariadb/PKGBUILD +++ b/extra/mariadb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180012 2013-03-14 18:21:32Z bpiotrowski $ +# $Id: PKGBUILD 180833 2013-03-26 15:59:12Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgbase=mariadb pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb') pkgver=5.5.30 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url='http://mariadb.org/' diff --git a/extra/mariadb/mariadb.install b/extra/mariadb/mariadb.install index c99114c07..7d3c2ce5c 100644 --- a/extra/mariadb/mariadb.install +++ b/extra/mariadb/mariadb.install @@ -13,7 +13,7 @@ post_install(){ chown -R mysql:mysql var/lib/mysql &>/dev/null fi - usr/bin/systemd-tmpfiles --create mysqld.conf + usr/bin/systemd-tmpfiles --create mysql.conf echo ">> If you are migrating from MySQL, don't forget to run 'mysql_upgrade'" echo " after mysqld.service restart." diff --git a/extra/mysql-python/PKGBUILD b/extra/mysql-python/PKGBUILD index 374784820..0824d5c9a 100644 --- a/extra/mysql-python/PKGBUILD +++ b/extra/mysql-python/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 177920 2013-02-10 18:57:08Z angvp $ +# $Id: PKGBUILD 180685 2013-03-25 19:15:36Z bpiotrowski $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=mysql-python pkgver=1.2.4 -pkgrel=1 +pkgrel=2 pkgdesc="MySQL support for Python" arch=("i686" "x86_64" 'mips64el') url="http://mysql-python.sourceforge.net/" license=('GPL2') -depends=('python2' 'libmysqlclient') -makedepends=('mysql' 'python2-distribute') +depends=('python2' 'libmariadbclient') +makedepends=('mariadb' 'python2-distribute') source=("http://pypi.python.org/packages/source/M/MySQL-python/MySQL-python-${pkgver}.zip") md5sums=('ddf2386daf10a97af115ffad2ed4a9a0') diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD index 45a9762f4..c936868cb 100644 --- a/extra/mysql/PKGBUILD +++ b/extra/mysql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 178940 2013-03-01 05:59:24Z bpiotrowski $ +# $Id: PKGBUILD 180684 2013-03-25 19:15:35Z bpiotrowski $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') pkgver=5.5.30 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="https://www.mysql.com/products/community/" @@ -66,6 +66,8 @@ build() { package_libmysqlclient(){ pkgdesc="MySQL client libraries" depends=('openssl') + conflicts=('libmariadbclient') + provides=("libmariadbclient=$pkgver") cd build for dir in include libmysql libmysqld libservices; do @@ -83,6 +85,8 @@ package_libmysqlclient(){ package_mysql-clients(){ pkgdesc="MySQL client tools" depends=('libmysqlclient') + conflicts=('mariadb-clients') + provides=("mariadb-clients=$pkgver") cd build make -C client DESTDIR="${pkgdir}" install @@ -102,6 +106,8 @@ package_mysql(){ backup=('etc/mysql/my.cnf') install=mysql.install depends=('mysql-clients' 'systemd-tools') + conflicts=('mariadb') + provides=("mariadb=$pkgver") options=('emptydirs') cd build diff --git a/extra/perl-dbd-mysql/PKGBUILD b/extra/perl-dbd-mysql/PKGBUILD index fe3af375d..825ab0b59 100644 --- a/extra/perl-dbd-mysql/PKGBUILD +++ b/extra/perl-dbd-mysql/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 175923 2013-01-25 03:51:01Z eric $ +# $Id: PKGBUILD 180686 2013-03-25 19:15:37Z bpiotrowski $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Eric Johnson <eric@coding-zone.com> pkgname=perl-dbd-mysql _realname=DBD-mysql pkgver=4.022 -pkgrel=1 +pkgrel=3 pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" -depends=('libmysqlclient' 'perl-dbi') -makedepends=('mysql') +depends=('libmariadbclient' 'perl-dbi') +makedepends=('mariadb') options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/${_realname}-${pkgver}.tar.gz) md5sums=('20fb571245e3b9ac275b8329025c4bf6') diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 271265d54..922368288 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180290 2013-03-19 19:00:59Z pierre $ +# $Id: PKGBUILD 180807 2013-03-26 11:49:38Z foutrelis $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -22,7 +22,7 @@ pkgname=('php' 'php-tidy' 'php-xsl') pkgver=5.4.13 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') license=('PHP') url='http://www.php.net' diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index cee1d1651..e99b5b627 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 178407 2013-02-21 10:10:12Z bisson $ +# $Id: PKGBUILD 180687 2013-03-25 19:15:38Z bpiotrowski $ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> # Contributor: Paul Mattal <paul@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=postfix pkgver=2.10.0 -pkgrel=3 +pkgrel=4 pkgdesc='Fast, easy to administer, secure mail server' url='http://www.postfix.org/' license=('custom') arch=('i686' 'x86_64' 'mips64el') depends=('pcre' 'libsasl' 'libldap' 'db' - 'libmysqlclient' 'postgresql-libs' 'sqlite' 'tinycdb') + 'libmariadbclient' 'postgresql-libs' 'sqlite' 'tinycdb') backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" 'aliases.patch' diff --git a/extra/psi/archlinux.patch b/extra/psi/archlinux.patch deleted file mode 100644 index d9cbb454b..000000000 --- a/extra/psi/archlinux.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/systeminfo.cpp 2012-10-04 02:53:03.000000000 +0200 -+++ src/systeminfo.cpp 2012-10-04 07:18:45.111088591 +0200 -@@ -114,7 +114,7 @@ - { LinuxSlackware, OsAppendFile, "/etc/slackware-version", "Slackware Linux" }, - { LinuxPLD, OsUseFile, "/etc/pld-release", "PLD Linux" }, - { LinuxAurox, OsUseName, "/etc/aurox-release", "Aurox Linux" }, -- { LinuxArch, OsUseFile, "/etc/arch-release", "Arch Linux" }, -+ { LinuxArch, OsUseName, "/etc/arch-release", "Arch Linux" }, - { LinuxLFS, OsAppendFile, "/etc/lfs-release", "LFS Linux" }, - - // untested diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD index 4d8432880..5adeb9906 100644 --- a/extra/qt3/PKGBUILD +++ b/extra/qt3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168609 2012-10-13 11:48:48Z andyrtr $ +# $Id: PKGBUILD 180688 2013-03-25 19:15:40Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=qt3 pkgver=3.3.8b -pkgrel=2.1 +pkgrel=3 epoch=1 pkgdesc="The QT3 gui toolkit" arch=('i686' 'x86_64' 'mips64el') @@ -11,11 +11,11 @@ url="http://www.trolltech.com/products/qt/index.html" license=('GPL') depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'glu' 'libxft' 'libxrandr' 'libmng') -makedepends=('mysql' 'postgresql' 'unixodbc' 'sqlite' 'mesa') -optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc') +makedepends=('mariadb' 'postgresql' 'unixodbc' 'sqlite' 'mesa') +optdepends=('libmariadbclient' 'postgresql-libs' 'unixodbc') options=('!libtool') install=qt.install -source=(ftp://ftp.trolltech.com/qt/source/qt-x11-free-${pkgver}.tar.gz +source=(ftp://ftp.qt-project.org/qt/source/qt-x11-free-${pkgver}.tar.gz qt.profile qt3-png15.patch qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2 eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch) sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854' diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD index 43c056c6b..62851cbea 100644 --- a/extra/qt4/PKGBUILD +++ b/extra/qt4/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 179054 2013-03-02 09:03:00Z andrea $ +# $Id: PKGBUILD 180689 2013-03-25 19:15:41Z bpiotrowski $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qt4 pkgver=4.8.4 -pkgrel=13 +pkgrel=16 arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -12,10 +12,10 @@ pkgdesc='A cross-platform application and UI framework' depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'dbus' 'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils') -makedepends=('postgresql-libs' 'mysql' 'unixodbc' 'cups' 'gtk2' +makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'mesa-libgl') optdepends=('postgresql-libs: PostgreSQL driver' - 'libmysqlclient: MySQL driver' + 'libmariadbclient: MariaDB driver' 'unixodbc: ODBC driver' 'libxinerama: Xinerama support' 'libxcursor: Xcursor support' @@ -31,12 +31,14 @@ replaces=('qt<=4.8.4') conflicts=('qt') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz" - 'qtconfig.desktop' 'qt4.profile' + 'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop' 'linguist-qt4.desktop' 'improve-cups-support.patch' 'declarative-fix-sigbus.patch') md5sums=('89c5ecba180cae74c66260ac732dc5cb' - '20ca06ef59775d749b9451ce7437fa9a' - '4ed0bd79a310e2b5d34fc71760b99139' + 'a16638f4781e56e7887ff8212a322ecc' + '4f0152ba6d645e81218b23ba8beeb42d' + '283a00ff7f662dca481b70d6daa826e0' + '027683880235708d4bc270a7ef961183' 'c439c7731c25387352d8453ca7574971' 'aac963d05a9d5733e2bfce9e26607f51') @@ -99,11 +101,9 @@ package() { # install missing icons and desktop files install -D -m644 src/gui/dialogs/images/qtlogo-64.png \ "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qt4logo.png" - install -Dm644 "${srcdir}"/qtconfig.desktop \ - "${pkgdir}/usr/share/applications/qtconfig4.desktop" - - # install the profile - install -D -m755 "${srcdir}"/qt4.profile "${pkgdir}"/etc/profile.d/qt4.sh + install -d "${pkgdir}"/usr/share/applications + install -m644 "${srcdir}"/{assistant,designer,linguist,qtconfig}-qt4.desktop \ + "${pkgdir}/usr/share/applications/" # Useful symlinks for cmake and configure scripts install -d "${pkgdir}"/usr/bin diff --git a/extra/qt4/assistant-qt4.desktop b/extra/qt4/assistant-qt4.desktop new file mode 100644 index 000000000..d2904beb2 --- /dev/null +++ b/extra/qt4/assistant-qt4.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Qt4 Assistant +Comment=Shows Qt4 documentation and examples +Exec=assistant-qt4 +Icon=assistant +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development;Documentation; diff --git a/extra/qt4/designer-qt4.desktop b/extra/qt4/designer-qt4.desktop new file mode 100644 index 000000000..514146e78 --- /dev/null +++ b/extra/qt4/designer-qt4.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Qt4 Designer +GenericName=Interface Designer +Comment=Design GUIs for Qt4 applications +Exec=designer-qt4 +Icon=designer +MimeType=application/x-designer; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/extra/qt4/linguist-qt4.desktop b/extra/qt4/linguist-qt4.desktop new file mode 100644 index 000000000..61036b307 --- /dev/null +++ b/extra/qt4/linguist-qt4.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qt4 Linguist +Comment=Add translations to Qt4 applications +Exec=linguist-qt4 +Icon=linguist +MimeType=text/vnd.trolltech.linguist;application/x-linguist; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/extra/qt4/qt4.profile b/extra/qt4/qt4.profile deleted file mode 100644 index 3129ddce5..000000000 --- a/extra/qt4/qt4.profile +++ /dev/null @@ -1 +0,0 @@ -export PATH=$PATH:/usr/lib/qt4/bin diff --git a/extra/qt4/qtconfig.desktop b/extra/qt4/qtconfig-qt4.desktop index 1573ef461..578963124 100644 --- a/extra/qt4/qtconfig.desktop +++ b/extra/qt4/qtconfig-qt4.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=Qt4 Config Comment=Configure Qt4 behavior, styles, fonts -Exec=/usr/lib/qt4/bin/qtconfig +Exec=qtconfig-qt4 Icon=qt4logo Terminal=false Type=Application diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD index 1a8a9f92f..bfd5a59b9 100644 --- a/extra/qt5/PKGBUILD +++ b/extra/qt5/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179117 2013-03-03 18:53:03Z andrea $ +# $Id: PKGBUILD 180690 2013-03-25 19:15:43Z bpiotrowski $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=qt5 @@ -18,14 +18,14 @@ pkgname=('qt5-base' 'qt5-translations' 'qt5-webkit') pkgver=5.0.1 -pkgrel=6 +pkgrel=10 arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org/' license=('GPL3' 'LGPL') makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms' 'mesa-libgl' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins' 'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme' 'desktop-file-utils' - 'postgresql-libs' 'libmysqlclient' 'sqlite' 'unixodbc' + 'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc' 'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig' 'libmng' 'openal' 'gtk2') [ "$CARCH" != "mips64el" ] && makedepends+=('libfbclient') @@ -93,9 +93,9 @@ package_qt5-base() { pkgdesc='A cross-platform application and UI framework' depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig' 'systemd' 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'libpng' 'xcb-util-image' - 'hicolor-icon-theme' 'xdg-utils') + 'hicolor-icon-theme' 'xdg-utils' 'icu') optdepends=('postgresql-libs: PostgreSQL driver' - 'libmysqlclient: MySQL driver' + 'libmariadbclient: MariaDB driver' 'unixodbc: ODBC driver') [ "$CARCH" != "mips64el" ] && optdepends+=('libfbclient: Firebird/iBase driver') install='qt5-base.install' @@ -267,7 +267,7 @@ package_qt5-tools() { package_qt5-webkit() { pkgdesc='A cross-platform application and UI framework (QtWebKit)' - depends=('qt5-declarative' 'gstreamer0.10-base' 'icu' 'libxslt' 'libxcomposite') + depends=('qt5-declarative' 'gstreamer0.10-base' 'libxslt' 'libxcomposite') cd ${_pkgfqn}/qtwebkit make INSTALL_ROOT="${pkgdir}" install diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD index 4f8843606..68c6465d0 100644 --- a/extra/r/PKGBUILD +++ b/extra/r/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 177618 2013-02-08 07:48:31Z ronald $ +# $Id: PKGBUILD 180808 2013-03-26 11:49:39Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: K. Piche <kpiche@rogers.com> pkgname=r -pkgver=2.15.2 -pkgrel=3 +pkgver=2.15.3 +pkgrel=1 pkgdesc="Language and environment for statistical computing and graphics" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -13,21 +13,19 @@ url=('http://www.r-project.org/') depends=('blas' 'lapack' 'bzip2' 'libpng' 'libjpeg' 'libtiff' 'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs' 'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils') -makedepends=('openjdk6' 'gcc-fortran' 'tk>=8.6.0') +makedepends=('jdk7-openjdk' 'gcc-fortran' 'tk') optdepends=('tk: tcl/tk interface' 'texlive-bin: latex sty files') backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories') options=('!makeflags' '!emptydirs') +install=r.install source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz" 'r.desktop' 'r.png' - 'R.conf' - 'x11.patch') -install=r.install -sha1sums=('c80da687d66ee88d1e34fc1ae5c1bd525f9513dd' + 'R.conf') +sha1sums=('a05b68f31b00d8038d9f0a8562cfc0c8e32d9621' '13aa29219bcaa102e575de8c1c8e0833d233e836' 'a69a07ec363440efc18ce0a7f2af103375dea978' - '43668da6cfd1b4455a99f23e79e2059294dddac9' - 'a11b91d53645bd545fddc382c991096502e8ac67') + '43668da6cfd1b4455a99f23e79e2059294dddac9') build() { cd "${srcdir}/R-${pkgver}" @@ -36,8 +34,8 @@ build() { # set texmf dir correctly in makefile sed -i 's|$(rsharedir)/texmf|${datarootdir}/texmf|' share/Makefile.in - # upstream patch fixing empty plots FS#32597 - patch -Np0 -i ${srcdir}/x11.patch +# fix for texinfo 5.X + sed -i 's|test ${makeinfo_version_min} -lt 7|test ${makeinfo_version_min} -lt 0|' configure ./configure --prefix=/usr \ --libdir=/usr/lib \ @@ -53,11 +51,19 @@ build() { F77=gfortran \ LIBnn=lib make + +# make libRmath.so + cd src/nmath/standalone + make shared } package() { cd "${srcdir}/R-${pkgver}" - make -j1 DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" install + +# install libRmath.so + cd src/nmath/standalone + make DESTDIR="${pkgdir}" install # Fixup R wrapper scripts. sed -i "s|${pkgdir} ||" "${pkgdir}/usr/bin/R" @@ -80,5 +86,5 @@ package() { done # Install ld.so.conf.d file to ensure other applications access the shared lib - install -Dm644 ${srcdir}/R.conf ${pkgdir}/etc/ld.so.conf.d/R.conf + install -Dm644 "${srcdir}/R.conf" "${pkgdir}/etc/ld.so.conf.d/R.conf" } diff --git a/extra/r/x11.patch b/extra/r/x11.patch deleted file mode 100644 index 3a02b28ea..000000000 --- a/extra/r/x11.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- src/modules/X11/devX11.c (révision 61681) -+++ src/modules/X11/devX11.c (révision 61682) -@@ -244,6 +244,7 @@ - { - if(inclose || !xd || !xd->buffered || xd->holdlevel > 0) return; - cairo_paint(xd->xcc); -+ cairo_surface_flush(xd->xcs); - if (xd->type == WINDOW) XDefineCursor(display, xd->window, arrow_cursor); - XSync(display, 0); - xd->last = currentTime(); -@@ -753,8 +754,10 @@ - #ifdef HAVE_WORKING_CAIRO - pX11Desc xd = (pX11Desc) dd->deviceSpecific; - /* We can use the buffered copy where we have it */ -- if(xd->buffered == 1) cairo_paint(xd->xcc); -- else if (xd->buffered > 1) -+ if(xd->buffered == 1) { -+ cairo_paint(xd->xcc); -+ cairo_surface_flush(xd->xcs); -+ } else if (xd->buffered > 1) - /* rely on timer to repaint eventually */ - xd->last_activity = currentTime(); - else -@@ -2691,7 +2694,11 @@ - Cairo_update(xd); - return; - } -- if(xd->buffered) cairo_paint(xd->xcc); -+ if(xd->buffered) { -+ cairo_paint(xd->xcc); -+ cairo_surface_flush(xd->xcs); -+ } -+ - #endif - if(xd->type==WINDOW) XDefineCursor(display, xd->window, arrow_cursor); - XSync(display, 0); diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD index 07b0dfab2..b88c703ae 100644 --- a/extra/raptor/PKGBUILD +++ b/extra/raptor/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179134 2013-03-04 08:06:34Z tomegun $ +# $Id: PKGBUILD 180809 2013-03-26 11:49:40Z foutrelis $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: eric <eric@archlinux.org> @@ -6,11 +6,11 @@ pkgname=raptor pkgver=2.0.9 -pkgrel=1 +pkgrel=2 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples" arch=('i686' 'x86_64' 'mips64el') url="http://librdf.org/raptor" -depends=('curl' 'libxslt' 'icu>=50.1.2') +depends=('curl' 'libxslt' 'icu') license=('LGPL') options=('!libtool') source=("http://librdf.org/dist/source/raptor2-$pkgver.tar.gz") diff --git a/extra/smartmontools/PKGBUILD b/extra/smartmontools/PKGBUILD index 1a0648f78..17f9789e0 100644 --- a/extra/smartmontools/PKGBUILD +++ b/extra/smartmontools/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 177000 2013-02-03 16:40:55Z giovanni $ +# $Id: PKGBUILD 180692 2013-03-25 19:47:01Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Jani Talikka <jani.talikka@gmail.com> # Contributor: Ralf Barth <archlinux.org@haggy.org> pkgname=smartmontools -pkgver=6.0 -pkgrel=2 +pkgver=6.1 +pkgrel=1 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives" url="http://smartmontools.sourceforge.net" license=('GPL') @@ -16,7 +16,7 @@ backup=('etc/smartd.conf' 'etc/conf.d/smartd') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'smartd.conf') -md5sums=('5646a07f5f4bee8e2e649de8c6b7ae87' +md5sums=('83a3a681f8183ed858392d550ae1cca6' '28c1b80c41dac52d433961dcfb4f70e0') build() { diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD index 7d71e1bd1..352a2e45e 100644 --- a/extra/tracker/PKGBUILD +++ b/extra/tracker/PKGBUILD @@ -1,30 +1,33 @@ -# $Id: PKGBUILD 175872 2013-01-23 00:13:08Z eric $ +# $Id: PKGBUILD 180810 2013-03-26 11:49:41Z foutrelis $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgbase=tracker pkgname=(tracker libtracker-sparql) -pkgver=0.14.4 +pkgver=0.14.5 _tver=${pkgver%.*} -pkgrel=3 +pkgrel=1 pkgdesc="All-in-one indexer, search tool and metadata database" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi' - 'poppler-glib' 'libgsf' 'icu' 'enca' 'networkmanager' 'gtk3' - 'desktop-file-utils' 'hicolor-icon-theme' 'gobject-introspection' - 'intltool' 'giflib' 'gstreamer0.10-base' 'totem-plparser' - 'taglib' 'nautilus' 'gnome-panel' 'libvorbis' 'flac' 'vala' - 'libgxps') +arch=(i686 x86_64 mips64el) +license=(GPL) +makedepends=(libgnome-keyring upower libexif exempi rest + poppler-glib libgsf icu enca networkmanager gtk3 + desktop-file-utils hicolor-icon-theme gobject-introspection + intltool giflib gstreamer0.10-base totem-plparser + taglib nautilus libvorbis flac vala libgxps) url="http://www.gnome.org" options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) -sha256sums=('b818ee42b9007a94b2f8046edc4706bb2036187d5fd304e7ae23e5d2fcf85918') +sha256sums=('cabef75eb18ad35208000dc472bdc20a74269799414527ee6e1c1c1cfb28eec8') build() { cd $pkgbase-$pkgver + # HACK: uninstall libtracker-sparql to ensure a clean build, + # as the build system will wrongly link against it + #if pacman -Qq libtracker-sparql; then sudo pacman -Rdd --noconfirm libtracker-sparql; fi + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -40,9 +43,9 @@ build() { } package_tracker() { - depends=("libtracker-sparql=$pkgver-$pkgrel" 'libgee' 'libgnome-keyring' - 'upower' 'libexif' 'exempi' 'poppler-glib' 'libgsf' 'enca' - 'networkmanager' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme') + depends=("libtracker-sparql=$pkgver-$pkgrel" libgnome-keyring + upower libexif exempi rest poppler-glib libgsf enca + networkmanager gtk3 desktop-file-utils hicolor-icon-theme) optdepends=('giflib: extractor for GIF data' 'gstreamer0.10-base: video extractor' 'totem-plparser: playlist support' @@ -50,7 +53,6 @@ package_tracker() { 'libvorbis: Vorbis metadata extractor' 'flac: FLAC metadata extractor' 'taglib: writeback for audio files' - 'gnome-panel: tracker-search-bar' 'libgxps: XPS extractor') groups=('gnome-extra') install=tracker.install @@ -80,7 +82,7 @@ package_tracker() { package_libtracker-sparql() { pkgdesc="$pkgdesc (SPARQL library)" - depends=('sqlite' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux') + depends=(sqlite icu glib2 libffi pcre util-linux) mv "$srcdir"/sparql/* "$pkgdir" } diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index b6f4f6e21..623378fce 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -6,8 +6,8 @@ pkgbase=vim pkgname=('vim' 'gvim' 'vim-runtime') _topver=7.3 -_patchlevel=834 -__hgrev=ad7bbe9ea65b +_patchlevel=875 +__hgrev=acf7368a2acc _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} pkgrel=1 @@ -21,8 +21,8 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" 'vimrc' 'archlinux.vim' 'gvim.desktop') -md5sums=('f50a7f4e07ae991db324f0c4b3dcad3d' - '57e197f51fbbd22944bfc51041ab89d1' +md5sums=('4d71e8b9ef6a214b3651d69be19fadec' + 'ac2bfed9586c987f0b8435c91be3f18a' '6e7adfbd5d26c1d161030ec203a7f243' '20fceda56badf201695c57999b0bc609' '10353a61aadc3f276692d0e17db1478e' diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 12ec22f4a..a06a7b34e 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 179005 2013-03-01 10:26:55Z andrea $ +# $Id: PKGBUILD 180898 2013-03-27 20:10:16Z guillaume $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=2.0.5 -pkgrel=4 +pkgrel=5 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" @@ -87,7 +87,9 @@ build() { --enable-opus \ --enable-sftp \ $extraconf \ - LUAC=luac5.1 + LUAC=luac5.1 \ + RCC=/usr/bin/rcc-qt4 + make } diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD index ea93ba2b0..c6a7a8246 100644 --- a/extra/webkitgtk/PKGBUILD +++ b/extra/webkitgtk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 175876 2013-01-23 00:13:13Z eric $ +# $Id: PKGBUILD 180811 2013-03-26 11:49:42Z foutrelis $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=webkitgtk pkgname=('webkitgtk2' 'webkitgtk3') pkgver=1.10.2 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url="http://webkitgtk.org/" license=('custom') diff --git a/extra/xdg-user-dirs-gtk/PKGBUILD b/extra/xdg-user-dirs-gtk/PKGBUILD index df275e4b3..8abfcff63 100644 --- a/extra/xdg-user-dirs-gtk/PKGBUILD +++ b/extra/xdg-user-dirs-gtk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 170124 2012-11-03 07:24:35Z eric $ +# $Id: PKGBUILD 180620 2013-03-25 01:38:50Z eric $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=xdg-user-dirs-gtk -pkgver=0.9 +pkgver=0.10 pkgrel=1 pkgdesc="Creates user dirs and asks to relocalize them" arch=(i686 x86_64 mips64el) @@ -12,8 +12,8 @@ makedepends=('intltool') options=('!libtool' '!emptydirs') url="http://www.gnome.org" groups=('gnome') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('4b908252515eb95b27427ef7c6b0e096febde716c0c89e8f03a79d23882b79c8') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e') build() { cd $pkgname-$pkgver diff --git a/extra/xf86-input-evdev/PKGBUILD b/extra/xf86-input-evdev/PKGBUILD index 75ee57bec..8f02364c1 100644 --- a/extra/xf86-input-evdev/PKGBUILD +++ b/extra/xf86-input-evdev/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180182 2013-03-18 16:08:53Z andyrtr $ +# $Id: PKGBUILD 180837 2013-03-26 16:14:16Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <Alexander@archlinux.org pkgname=xf86-input-evdev -pkgver=2.7.3 -pkgrel=3 +pkgver=2.8.0 +pkgrel=1 pkgdesc="X.org evdev input driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -15,7 +15,7 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION> options=('!libtool' '!makeflags') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('eb389413602c3d28c44bbfab0477c98582f0e2f5be5f41986e58e93a033fa504') +sha256sums=('2f5b4403955f8e82603acff7f8f21a67e89a7c0230e1506c6924c4b9dd8f0e57') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD index 5dc6bfa81..8d58da41c 100644 --- a/libre/icecat-noscript/PKGBUILD +++ b/libre/icecat-noscript/PKGBUILD @@ -4,8 +4,8 @@ _pkgname=firefox-noscript pkgname=icecat-noscript -pkgver=2.6.5.8 -pkgrel=1.1 +pkgver=2.6.5.9 +pkgrel=1 pkgdesc="plugin for icecat which disables script" arch=('any') url="http://noscript.net/" @@ -14,7 +14,7 @@ depends=() provides=$_pkgname=$pkgver makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('f97258a706d87a28fa7bd8bd4ee05627') +md5sums=('ea50b76dd18c1f714359a095b2f00d6a') package() { # _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-` diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD index 3b9bd0ce1..330402ed2 100644 --- a/libre/iceweasel-noscript/PKGBUILD +++ b/libre/iceweasel-noscript/PKGBUILD @@ -4,8 +4,8 @@ _pkgname=firefox-noscript pkgname=iceweasel-noscript -pkgver=2.6.5.8 -pkgrel=1.1 +pkgver=2.6.5.9 +pkgrel=1 pkgdesc="plugin for iceweasel which disables script" arch=('any') url="http://noscript.net/" @@ -14,7 +14,7 @@ depends=() provides=$_pkgname=$pkgver makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('f97258a706d87a28fa7bd8bd4ee05627') +md5sums=('ea50b76dd18c1f714359a095b2f00d6a') package() { # _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-` diff --git a/libre/lilo/PKGBUILD b/libre/lilo/PKGBUILD index 2cf109efe..a896613ee 100644 --- a/libre/lilo/PKGBUILD +++ b/libre/lilo/PKGBUILD @@ -5,9 +5,9 @@ pkgname=lilo pkgver=23.2 -pkgrel=3.1 -pkgdesc="A bootloader for Linux (Parabola rebranded)" -arch=('i686' 'x86_64' 'mips64el') +pkgrel=3.2 +pkgdesc="A bootloader for GNU/Linux, Parabola rebranded" +arch=('i686' 'x86_64') url="https://alioth.debian.org/projects/lilo/" license=('BSD') # While lilo should stay in the base category, @@ -24,7 +24,7 @@ options=('!makeflags') source=("http://lilo.alioth.debian.org/ftp/sources/${pkgname}-${pkgver}.tar.gz" 'lilo.conf') md5sums=('51b9b9db665d3b8724919e3d46054d12' - 'bab0a13b749690ce5e4f61bb1c10c065') + 'd06b3c4655577ed01fea79ec5743b4b0') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/libre/lilo/lilo.conf b/libre/lilo/lilo.conf index dea0dbe58..479390df5 100644 --- a/libre/lilo/lilo.conf +++ b/libre/lilo/lilo.conf @@ -6,19 +6,19 @@ boot=/dev/sda # This line often fixes L40 errors on bootup # disk=/dev/sda bios=0x80 -default=libre +default=parabola timeout=50 lba32 prompt image=/boot/vmlinuz-linux-libre - label=libre + label=parabola root=/dev/sda3 initrd=/boot/initramfs-linux-libre.img read-only image=/boot/vmlinuz-linux-libre - label=libre-fallback + label=parabola-fallback root=/dev/sda3 initrd=/boot/initramfs-linux-libre-fallback.img read-only diff --git a/libre/mime-types/PKGBUILD b/libre/mime-types/PKGBUILD new file mode 100644 index 000000000..2ac7928c1 --- /dev/null +++ b/libre/mime-types/PKGBUILD @@ -0,0 +1,23 @@ +# $Id$ +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=mime-types +pkgver=8 +pkgrel=1.2 +pkgdesc='Provides /etc/mime.types, Parabola rebranded' +url='https://parabolagnulinux.org/' +license=('GPL2') +arch=('any') +backup=('etc/mime.types') +source=("http://mirrors.kernel.org/gentoo/distfiles/${pkgname}-${pkgver}.tar.bz2" + 'parabola.patch') +sha1sums=('01682b0ad3111a6cf65e6c9db0c18ddd7523c593' + '0d3b34c7b4a384be674192ecbfd8f22271906ae8') + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../parabola.patch + install -Dm644 mime.types "${pkgdir}"/etc/mime.types +} diff --git a/libre/mime-types/parabola.patch b/libre/mime-types/parabola.patch new file mode 100644 index 000000000..bbf8406ca --- /dev/null +++ b/libre/mime-types/parabola.patch @@ -0,0 +1,7 @@ +diff -au0r old/mime.types new/mime.types +--- old/mime.types 2009-10-15 07:51:24.000000000 -0700 ++++ new/mime.types 2011-08-02 22:49:14.962241561 -0700 +@@ -2 +2,2 @@ +-# distributed as the app-misc/mime-types package. ++# distributed in Parabola as the mime-types package, which is based on ++# Gentoo's app-misc/mime-types package. diff --git a/libre/mkbootcd/PKGBUILD b/libre/mkbootcd/PKGBUILD new file mode 100644 index 000000000..1eb7bd8a7 --- /dev/null +++ b/libre/mkbootcd/PKGBUILD @@ -0,0 +1,25 @@ +# $Id$ +# Maintainer : Tobias Powalowski <tpowa@archlinux.org> + +pkgname=mkbootcd +pkgver=2008.09 +pkgrel=2.1 +pkgdesc="Advanced, modular isolinux bootcd image creation utility, Parabola rebranded" +arch=('any') +license=('GPL') +url="https://parabolagnulinux.org/" +depends=('mkinitcpio' 'cdrkit' 'syslinux') +source=('boot.msg' 'mkbootcd' 'mkbootcd.conf' 'options.msg') +backup=('etc/mkbootcd.conf') +md5sums=('2b55189d64e5263c5a3925a7b949c1f8' + '521107289007f0c3f11ddbb6fdfcbd22' + '4794673fa413eb5459b40172be7ae541' + '75b69407f88f2838c66f4dda4d8455e3') + +package() { + cd $srcdir + install -D -m755 mkbootcd $pkgdir/usr/sbin/mkbootcd + install -D -m644 mkbootcd.conf $pkgdir/etc/mkbootcd.conf + install -D -m644 boot.msg $pkgdir/usr/share/mkbootcd/boot.msg + install -D -m644 options.msg $pkgdir/usr/share/mkbootcd/options.msg +} diff --git a/libre/mkbootcd/boot.msg b/libre/mkbootcd/boot.msg new file mode 100644 index 000000000..5e441e746 --- /dev/null +++ b/libre/mkbootcd/boot.msg @@ -0,0 +1,15 @@ + + +------------------------------------------------------------------------------ +Parabola GNU/Linux-libre +ISOLINUX BOOT +created with 'mkbootcd' written by Tobias Powalowski <tpowa@archlinux.org> +rebranded for Parabola by André Silva <emulatorman@lavabit.com> + +Press ENTER or type 'parabola' to boot the CD. + +If you wish to change your defaults to boot into your existing system, +type 'vmlinuz initrd=initrd.img <any_other_boot_option>' +Use the F2 key for troubleshooting and options. +------------------------------------------------------------------------------ + diff --git a/libre/mkbootcd/mkbootcd b/libre/mkbootcd/mkbootcd new file mode 100755 index 000000000..012267be9 --- /dev/null +++ b/libre/mkbootcd/mkbootcd @@ -0,0 +1,144 @@ +#! /bin/sh +# Created by Tobias Powalowski <tpowa@archlinux.org> +# Rebranded for Parabola by André Silva <emulatorman@lavabit.com> +# Settings +APPNAME=$(basename "${0}") +CONFIG="/etc/mkbootcd.conf" +GENIMG="" +BURN="0" +BLANK="0" +GRUB="0" +TARNAME="" +export TEMPDIR=$(mktemp /tmp/mkbootcd.XXXX) +usage () +{ + echo "${APPNAME}: usage" + echo " -g=IMAGE Generate a ISO image as IMAGE" + echo " -c=CONFIG Use CONFIG file. default: /etc/mkbootcd.conf" + echo " -B Burn the ISO image after creation" + echo " -b Blanking media first" + echo " -grub Use grub instead of isolinux" + echo " -t=TARNAME Generate a tar image instead of an iso image" + echo " -h This message." + exit 1 +} + +[ "$1" == "" ] && usage + +while [ $# -gt 0 ]; do + case $1 in + -c=*|--c=*) CONFIG="$(echo $1 | awk -F= '{print $2;}')" ;; + -g=*|--g=*) GENIMG="$(echo $1 | awk -F= '{print $2;}')" ;; + -B|--B) BURN="1" ;; + -b|--b) BLANK="1" ;; + -grub|--grub) GRUB="1" ;; + -t=*|--t=*) TARNAME="$(echo $1 | awk -F= '{print $2;}')" ;; + -h|--h|?) usage ;; + *) usage ;; + esac + shift +done + +if [ "${TARNAME}" = "" -a "${GENIMG}" = "" ]; then + echo "ERROR: No image name specified, please use the -g option" + exit 1 +fi + +if [ ! -f "${CONFIG}" ]; then + echo "config file '${CONFIG}' cannot be found, aborting..." + exit 1 +fi + +. "${CONFIG}" +# export for mkinitcpio +[ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE +[ -n "${APPENDBOOTMESSAGE_SYSLINUX}" ] && export APPENDBOOTMESSAGE_SYSLINUX +[ -n "${APPENDBOOTMESSAGE_SYSLINUX_LOWMEM}" ] && export APPENDBOOTMESSAGE_SYSLINUX_LOWMEM +[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE + +if [ "$GRUB" = "1" ]; then + export RUNPROGRAM="${APPNAME}-grub" + export BOOTDIRNAME="boot" +else + export RUNPROGRAM="${APPNAME}" + export BOOTDIRNAME="isolinux" +fi +[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX) +[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX) +[ "${ISONAME}" = "" ] && export ISONAME=$(mktemp /tmp/isoname.XXXX) +export USEKERNEL=${VERSION} +# begin script +[ -e ${TEMPDIR} ] && rm -r ${TEMPDIR} +mkdir -p ${TEMPDIR}/${BOOTDIRNAME} +if [ "$GRUB" = "1" ]; then + mkdir ${TEMPDIR}/${BOOTDIRNAME}/grub + install -m755 /usr/share/grub/i386-pc/stage2_eltorito ${TEMPDIR}/${BOOTDIRNAME}/grub/stage2_eltorito +else + install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin +fi +# create isolinux.cfg +if [ "$GRUB" = "1" ]; then + echo ":: Creating menu.lst ..." + [ ! -e "${MENULST}" ] && echo "No menu.lst found" && exit 1 + sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \ + ${MENULST} \ + > ${TEMPDIR}/${BOOTDIRNAME}/grub/menu.lst +else + echo ":: Creating isolinux.cfg ..." + if [ "${ISOLINUXCFG}" = "" ]; then + [ -e ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg ] && rm ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg + echo "prompt ${PROMPT}" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg + echo "timeout ${TIMEOUT}" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg + echo "display boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg + echo "F1 boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg + echo "F2 options.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg + echo "default parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg + echo "label parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg + echo "kernel vmlinuz" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg + echo "append initrd=initrd.img ${KERNEL_BOOT_OPTIONS}" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg + else + sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \ + ${ISOLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg + fi + [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg ] && echo "No isolinux.cfg found" && exit 1 +fi +echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..." +# generate initramdisk +echo ":: Creating initramdisk ..." + mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${TEMPDIR}/${BOOTDIRNAME}/initrd.img +echo ":: Using ${KERNEL} as image kernel ..." + install -m644 ${KERNEL} ${TEMPDIR}/${BOOTDIRNAME}/vmlinuz + install -m644 ${BOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/boot.msg + install -m644 ${OPTIONSBOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/options.msg + [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1 + [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1 +# create image +if ! [ "${TARNAME}" = "" ]; then + echo ":: Creating tar image ..." + [ -e ${TARNAME} ] && rm ${TARNAME} + rm ${TEMPDIR}/parabola/pkg/*.pkg.tar.gz > /dev/null 2>&1 + tar cfv ${TARNAME} ${TEMPDIR} > /dev/null 2>&1 && echo ":: tar Image succesfull created at ${TARNAME}" +else + echo ":: Creating ISO image ..." + [ -e ${GENIMG} ] && rm ${GENIMG} + [ -s "${ISONAME}" ] && ISONAME=$(cat $ISONAME) || ISONAME="Parabola GNU/Linux-libre" + if [ "$GRUB" = "1" ]; then + mkisofs -RlDJLV "${ISONAME}" -b boot/grub/stage2_eltorito -c boot/boot.cat \ + -no-emul-boot -boot-load-size 4 -boot-info-table -o ${GENIMG} ${TEMPDIR}/ > /dev/null 2>&1 + else + mkisofs -RlDJLV "${ISONAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat \ + -no-emul-boot -boot-load-size 4 -boot-info-table -o ${GENIMG} ${TEMPDIR}/ > /dev/null 2>&1 + fi + [ $? -ne 0 ] && echo ":: ISO Image succesfull created at ${GENIMG}" + # burning/blanking image + if [ "$BLANK" = "1" ]; then + echo ":: Blanking media DEVICE=${DEVICE}, BLANKMODE=${BLANKMODE}, SPEED=${SPEED} ..." + cdrecord dev=${DEVICE} speed=${SPEED} blank=${BLANKMODE} > /dev/null 2>&1 && echo ":: Successfull." + fi + if [ "$BURN" = "1" ]; then + echo ":: Burning ISO image DEVICE=${DEVICE}, SPEED=${SPEED} ..." + cdrecord dev=${DEVICE} speed=${SPEED} -eject ${GENIMG} > /dev/null 2>&1 && echo ":: Successfull." + fi +fi +# clean /tmp +rm -r ${TEMPDIR} diff --git a/libre/mkbootcd/mkbootcd.conf b/libre/mkbootcd/mkbootcd.conf new file mode 100644 index 000000000..5b287a6ea --- /dev/null +++ b/libre/mkbootcd/mkbootcd.conf @@ -0,0 +1,39 @@ +# Created by Tobias Powalowski <tpowa@archlinux.org> +# Rebranded for Parabola by André Silva <emulatorman@lavabit.com> +# config file of mkbootcd + +# DEFAULT kernel boot options like root=/dev/hda3 etc. +# add your root= option, if you boot from a disk device +# and don't want to add it by hand on each boot +KERNEL_BOOT_OPTIONS="" + +# mkinitcpio config file, defaulted to stock config file +MKINITCPIO_CONFIG="/etc/mkinitcpio.conf" + +# kernel version, defaulted to build for runtime kernel +VERSION="$(uname -r)" + +# kernel image, defaulted to stock libre kernel +KERNEL="/boot/vmlinuz-linux-libre" + +# boot message files +BOOTMESSAGE="/usr/share/mkbootcd/boot.msg" +OPTIONSBOOTMESSAGE="/usr/share/mkbootcd/options.msg" + +# menu.lst or isolinux.cfg file to use +ISOLINUXCFG="" +MENULST="" + +# Prompt on CD boot, defaulted to yes, 1=yes 0=no +PROMPT="1" + +# Name of the ISO, if empty Parabola GNU/Linux-libre is used if not set by a HOOK later +ISONAME="" + +# Timeout in seconds on CD boot, defaulted to 0, because we prompt by default +TIMEOUT="0" + +# Setting cdrecord options +DEVICE="" +SPEED="" +BLANKMODE="" diff --git a/libre/mkbootcd/options.msg b/libre/mkbootcd/options.msg new file mode 100644 index 000000000..63f56e755 --- /dev/null +++ b/libre/mkbootcd/options.msg @@ -0,0 +1,6 @@ +------------------------------------------------------------------------------ +Parabola GNU/Linux-libre options and troubleshooting: + +- If your system hangs during the boot process, any combinations of the + boot options noapic acpi=off pci=routeirq nosmp may be useful. +------------------------------------------------------------------------------ diff --git a/libre/mkisolinux/PKGBUILD b/libre/mkisolinux/PKGBUILD new file mode 100644 index 000000000..123300201 --- /dev/null +++ b/libre/mkisolinux/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 12670 2008-09-17 21:19:05Z tpowa $ +# Maintainer : Tobias Powalowski <tpowa@archlinux.org> + +pkgname=mkisolinux +pkgver=2013.03 +pkgrel=1.1 +pkgdesc="Advanced, modular isolinux bootcd image creation utility, Parabola rebranded" +arch=(any) +license=('GPL') +url="https://parabolagnulinux.org/" +depends=('mkinitcpio' 'cdrkit' 'syslinux' 'pciutils') +replaces=('mkbootcd') +backup=(etc/mkisolinux.conf) +source=('boot.msg' 'mkisolinux' 'mkisolinux.conf' 'options.msg') +md5sums=('945d5f5d74f37718c8c9d518bfd5698d' + 'e28b82502ae44087852ea6bfac398d5c' + '456eba83dfba319f8132c89e7ba42ce5' + 'ae0007d6679b5a575b2a9e5ac3664baf') + +package() +{ + cd "$srcdir/" + install -D -m755 mkisolinux "$pkgdir/usr/sbin/mkisolinux" + install -D -m644 mkisolinux.conf "$pkgdir/etc/mkisolinux.conf" + install -D -m644 boot.msg "$pkgdir/usr/share/mkisolinux/boot.msg" + install -D -m644 options.msg "$pkgdir/usr/share/mkisolinux/options.msg" +} diff --git a/libre/mkisolinux/boot.msg b/libre/mkisolinux/boot.msg new file mode 100644 index 000000000..e4109ea39 --- /dev/null +++ b/libre/mkisolinux/boot.msg @@ -0,0 +1,15 @@ + + +------------------------------------------------------------------------------ +Parabola GNU/Linux-libre +ISOLINUX BOOT +created with 'mkisolinux' written by Tobias Powalowski <tpowa@archlinux.org> +rebranded for Parabola by André Silva <emulatorman@lavabit.com> + +Press ENTER or type 'parabola' to boot the CD. + +If you wish to change your defaults to boot into your existing system, +type 'vmlinuz initrd=initrd.img <any_other_boot_option>' +Use the F2 key for troubleshooting and options. +------------------------------------------------------------------------------ + diff --git a/libre/mkisolinux/mkisolinux b/libre/mkisolinux/mkisolinux new file mode 100755 index 000000000..0cb53e81e --- /dev/null +++ b/libre/mkisolinux/mkisolinux @@ -0,0 +1,117 @@ +#! /bin/sh +# Created by Tobias Powalowski <tpowa@archlinux.org> +# Rebranded for Parabola by André Silva <emulatorman@lavabit.com> +# Settings +APPNAME=$(basename "${0}") +CONFIG="/etc/mkisolinux.conf" +GENIMG="" +BURN="0" +BLANK="0" +TARNAME="" +export TEMPDIR=$(mktemp -d /tmp/mkisolinux.XXXX) +usage () +{ + echo "${APPNAME}: usage" + echo " -g=IMAGE Generate a ISO image as IMAGE" + echo " -c=CONFIG Use CONFIG file. default: /etc/mkisolinux.conf" + echo " -B Burn the ISO image after creation" + echo " -b Blanking media first" + echo " -h This message." + exit 1 +} + +[ "$1" == "" ] && usage + +while [ $# -gt 0 ]; do + case $1 in + -c=*|--c=*) CONFIG="$(echo $1 | awk -F= '{print $2;}')" ;; + -g=*|--g=*) GENIMG="$(echo $1 | awk -F= '{print $2;}')" ;; + -B|--B) BURN="1" ;; + -b|--b) BLANK="1" ;; + -t=*|--t=*) TARNAME="$(echo $1 | awk -F= '{print $2;}')" ;; + -h|--h|?) usage ;; + *) usage ;; + esac + shift +done + +if [ "${TARNAME}" = "" -a "${GENIMG}" = "" ]; then + echo "ERROR: No image name specified, please use the -g option" + exit 1 +fi + +if [ ! -f "${CONFIG}" ]; then + echo "config file '${CONFIG}' cannot be found, aborting..." + exit 1 +fi + +. "${CONFIG}" +# export for mkinitcpio +[ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE +[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE + +export RUNPROGRAM="${APPNAME}" +export BOOTDIRNAME="boot/syslinux" + +[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX) +[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX) +[ "${ISONAME}" = "" ] && export ISONAME=$(mktemp /tmp/isoname.XXXX) +export USEKERNEL=${VERSION} + +# begin script +mkdir -p ${TEMPDIR}/${BOOTDIRNAME}/ +# prepare syslinux +install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin +for i in /usr/lib/syslinux/*.c32; do + install -m644 $i ${TEMPDIR}/${BOOTDIRNAME}/$(basename $i) +done +install -m644 /lib/modules/$(uname -r)/modules.pcimap ${TEMPDIR}/${BOOTDIRNAME}/modules.pcimap +install -m644 /usr/share/hwdata/pci.ids ${TEMPDIR}/${BOOTDIRNAME}/pci.ids +# create syslinux.cfg +echo ":: Creating syslinux.cfg ..." +if [ "${ISOLINUXCFG}" = "" ]; then + [ -e ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && rm ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "prompt ${PROMPT}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "timeout ${TIMEOUT}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "display boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "F1 boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "F2 options.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "default parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "label parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "kernel /boot/vmlinuz" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "append initrd=/boot/initrd.img ${KERNEL_BOOT_OPTIONS}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg +else + sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \ + ${ISOLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg +fi +[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && echo "No syslinux.cfg found" && exit 1 + +echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..." +# generate initramdisk +echo ":: Creating initramdisk ..." + mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${TEMPDIR}/boot/initrd.img +echo ":: Using ${KERNEL} as image kernel ..." + install -m644 ${KERNEL} ${TEMPDIR}/boot/vmlinuz + install -m644 ${BOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/boot.msg + install -m644 ${OPTIONSBOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/options.msg + [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1 + [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1 +# create image +echo ":: Creating ISO image ..." + [ -e ${GENIMG} ] && rm ${GENIMG} + [ -s "${ISONAME}" ] && ISONAME=$(cat $ISONAME) || ISONAME="Parabola GNU/Linux-libre" + mkisofs -RlDJLV "${ISONAME}" -b boot/syslinux/isolinux.bin -c boot/syslinux/boot.cat \ + -no-emul-boot -boot-load-size 4 -boot-info-table -o ${GENIMG} ${TEMPDIR}/ > /dev/null 2>&1 \ + && echo ":: ISO Image succesfull created at ${GENIMG}" + # burning/blanking image + if [ "$BLANK" = "1" ]; then + echo ":: Blanking media DEVICE=${DEVICE}, BLANKMODE=${BLANKMODE}, SPEED=${SPEED} ..." + cdrecord dev=${DEVICE} speed=${SPEED} blank=${BLANKMODE} > /dev/null 2>&1 && echo ":: Successfull." + fi + if [ "$BURN" = "1" ]; then + echo ":: Burning ISO image DEVICE=${DEVICE}, SPEED=${SPEED} ..." + cdrecord dev=${DEVICE} speed=${SPEED} -eject ${GENIMG} > /dev/null 2>&1 && echo ":: Successfull." + fi + +# clean /tmp +rm -r ${TEMPDIR} diff --git a/libre/mkisolinux/mkisolinux.conf b/libre/mkisolinux/mkisolinux.conf new file mode 100644 index 000000000..83d36219d --- /dev/null +++ b/libre/mkisolinux/mkisolinux.conf @@ -0,0 +1,39 @@ +# Created by Tobias Powalowski <tpowa@archlinux.org> +# Rebranded for Parabola by André Silva <emulatorman@lavabit.com> +# config file of mkisolinux + +# DEFAULT kernel boot options like root=/dev/hda3 etc. +# add your root= option, if you boot from a disk device +# and don't want to add it by hand on each boot +KERNEL_BOOT_OPTIONS="" + +# mkinitcpio config file, defaulted to stock config file +MKINITCPIO_CONFIG="/etc/mkinitcpio.conf" + +# kernel version, defaulted to build for runtime kernel +VERSION="$(uname -r)" + +# kernel image, defaulted to stock libre kernel +KERNEL="/boot/vmlinuz-linux-libre" + +# boot message files +BOOTMESSAGE="/usr/share/mkisolinux/boot.msg" +OPTIONSBOOTMESSAGE="/usr/share/mkisolinux/options.msg" + +# syslinux.cfg file to use +SYSLINUXCFG="" + +# Prompt on boot, 1=yes 0=no +PROMPT="1" + +# Name of the ISO, if empty Parabola GNU/Linux-libre is used if not set by a HOOK later +ISONAME="" + +# Timeout, 30 seconds to fix usb keyboard issues +# 0 means wait for prompt +TIMEOUT="300" + +# Setting cdrecord options +DEVICE="" +SPEED="" +BLANKMODE="" diff --git a/libre/mkisolinux/options.msg b/libre/mkisolinux/options.msg new file mode 100644 index 000000000..16c6b2eda --- /dev/null +++ b/libre/mkisolinux/options.msg @@ -0,0 +1,6 @@ +------------------------------------------------------------------------------ +Parabola GNU/Linux-libre options and troubleshooting: + +- If your system hangs during the boot process, any combinations of the + boot options noapic acpi=off pci=routeirq nosmp nomsi may be useful. +------------------------------------------------------------------------------ diff --git a/libre/mkpxelinux/PKGBUILD b/libre/mkpxelinux/PKGBUILD new file mode 100644 index 000000000..cbdca0960 --- /dev/null +++ b/libre/mkpxelinux/PKGBUILD @@ -0,0 +1,27 @@ +# $Id$ +# Maintainer : Tobias Powalowski <tpowa@archlinux.org> + +pkgname=mkpxelinux +pkgver=2013.03 +pkgrel=1.1 +pkgdesc="Advanced, modular network pxe boot image creation utility, Parabola rebranded" +arch=(any) +license=('GPL') +url="https://parabolagnulinux.org/" +depends=('mkinitcpio' 'tftp-hpa' 'syslinux') +backup=(etc/mkpxelinux.conf) +optdepends=('dhcp: for dhcp server usage') +source=('boot.msg' 'mkpxelinux' 'mkpxelinux.conf' 'options.msg') +md5sums=('7225e73bfe717f97bd7ab52f5ab157f6' + '58dfd6b96e7faeb75b7e5753e1751f31' + 'aad6a91bae077461c33c2db3844814f0' + 'ae0007d6679b5a575b2a9e5ac3664baf') + +package() +{ + cd "$srcdir/" + install -D -m755 mkpxelinux "$pkgdir/usr/sbin/mkpxelinux" + install -D -m644 mkpxelinux.conf "$pkgdir/etc/mkpxelinux.conf" + install -D -m644 boot.msg "$pkgdir/usr/share/mkpxelinux/boot.msg" + install -D -m644 options.msg "$pkgdir/usr/share/mkpxelinux/options.msg" +} diff --git a/libre/mkpxelinux/boot.msg b/libre/mkpxelinux/boot.msg new file mode 100644 index 000000000..6c1fcd476 --- /dev/null +++ b/libre/mkpxelinux/boot.msg @@ -0,0 +1,14 @@ + + +------------------------------------------------------------------------------ +Parabola GNU/Linux-libre +PXELINUX BOOT +created with 'mkpxelinux' written by Tobias Powalowski <tpowa@archlinux.org> + +Press ENTER or type 'parabola' to boot image. + +If you wish to change your defaults to boot into your existing system, +type 'vmlinuz initrd=initrd.img <any_other_boot_option>' +Use the F2 key for troubleshooting and options. +------------------------------------------------------------------------------ + diff --git a/libre/mkpxelinux/mkpxelinux b/libre/mkpxelinux/mkpxelinux new file mode 100755 index 000000000..bd173376c --- /dev/null +++ b/libre/mkpxelinux/mkpxelinux @@ -0,0 +1,91 @@ +#! /bin/sh +# Created by Tobias Powalowski <tpowa@archlinux.org> +# Rebranded for Parabola by André Silva <emulatorman@lavabit.com> +# Settings +APPNAME=$(basename "${0}") +CONFIG="/etc/mkpxelinux.conf" + +usage () +{ + echo "${APPNAME}: usage" + echo"" + echo " -d=INSTALLDIR Your INSTALLDIR overwrites config default" + echo " -c=CONFIG Use CONFIG file. default: /etc/mkpxelinux.conf" + echo " -h This message." + exit 1 +} + +[ "$1" == "" ] && usage && exit 1 + +while [ $# -gt 0 ]; do + case $1 in + -c=*|--c=*) CONFIG="$(echo $1 | awk -F= '{print $2;}')" ;; + -d=*|--d=*) CUSTOMINSTALLDIR="$(echo $1 | awk -F= '{print $2;}')" ;; + -h|--h|?) usage ;; + *) usage ;; + esac + shift +done + +if [ ! -f "${CONFIG}" ]; then + echo "config file '${CONFIG}' cannot be found, aborting..." + exit 1 +fi + +. "${CONFIG}" +# export for mkinitcpio +[ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE +[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE + +! [ "${CUSTOMINSTALLDIR}" = "" ] && INSTALLDIR=${CUSTOMINSTALLDIR} + +if [ "${INSTALLDIR}" = "" ]; then + echo "ERROR: No INSTALLDIR name specified, please use the -d option" + exit 1 +fi + +if ! [ $UID -eq 0 ]; then + echo "ERROR: only works when run as root!" + exit 1 +fi + +! [ -e ${INSTALLDIR} ] && echo "No ${INSTALLDIR} found!" && exit 1 +export TEMPDIR=${NFSROOTDIR} +export INSTALLDIR=${INSTALLDIR} +export RUNPROGRAM="${APPNAME}" +[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX) +[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX) +export USEKERNEL=${VERSION} +# begin script +# create default +echo ":: Creating pxelinux default config file ..." +mkdir -p ${INSTALLDIR}/pxelinux.cfg +if [ "${PXELINUX_DEFAULT}" = "" ]; then + [ -e ${INSTALLDIR}/pxelinux.cfg/default ] && rm ${INSTALLDIR}/pxelinux.cfg/default + echo "prompt ${PROMPT}" >> ${INSTALLDIR}/pxelinux.cfg/default + echo "timeout ${TIMEOUT}" >> ${INSTALLDIR}/pxelinux.cfg/default + echo "display boot.msg" >> ${INSTALLDIR}/pxelinux.cfg/default + echo "F1 boot.msg" >> ${INSTALLDIR}/pxelinux.cfg/default + echo "F2 options.msg" >> ${INSTALLDIR}/pxelinux.cfg/default + echo "default parabola" >> ${INSTALLDIR}/pxelinux.cfg/default + echo "label parabola" >> ${INSTALLDIR}/pxelinux.cfg/default + echo "kernel vmlinuz" >> ${INSTALLDIR}/pxelinux.cfg/default + echo "append initrd=initrd.img ${KERNEL_BOOT_OPTIONS}" >> ${INSTALLDIR}/pxelinux.cfg/default +else + sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \ + ${PXELINUX_DEFAULT} > ${INSTALLDIR}/pxelinux.cfg/default +fi +[ ! -s ${INSTALLDIR}/pxelinux.cfg/default ] && echo "No pxelinux default config found" && exit 1 +echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..." +# generate initramdisk +echo ":: Creating initramdisk ..." + mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${INSTALLDIR}/initrd.img +echo ":: Using ${KERNEL} as image kernel ..." + install -m644 ${KERNEL} ${INSTALLDIR}/vmlinuz +echo ":: Installing message files to ${INSTALLDIR} ..." + install -m644 ${BOOTMESSAGE} ${INSTALLDIR}/boot.msg + install -m644 ${OPTIONSBOOTMESSAGE} ${INSTALLDIR}/options.msg + [ ! -s ${INSTALLDIR}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1 + [ ! -s ${INSTALLDIR}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1 +echo ":: Installing PXELINUX to ${INSTALLDIR} ..." + install -m644 /usr/lib/syslinux/pxelinux.0 ${INSTALLDIR}/pxelinux.0 && echo "Installation completed." diff --git a/libre/mkpxelinux/mkpxelinux.conf b/libre/mkpxelinux/mkpxelinux.conf new file mode 100644 index 000000000..4b8e7b0a8 --- /dev/null +++ b/libre/mkpxelinux/mkpxelinux.conf @@ -0,0 +1,37 @@ +# Created by Tobias Powalowski <tpowa@archlinux.org> +# Rebranded for Parabola by André Silva <emulatorman@lavabit.com> +# config file of mkpxelinux + +# DEFAULT kernel boot options like ip=:::::eth0:dhcp etc. +# add your root= option, if you boot from a disk device +# and don't want to add it by hand on each boot +KERNEL_BOOT_OPTIONS="" + +# mkinitcpio config file, defaulted to stock config file +MKINITCPIO_CONFIG="/etc/mkinitcpio.conf" + +# kernel version, defaulted to build for runtime kernel +VERSION="$(uname -r)" + +# kernel image, defaulted to stock libre kernel +KERNEL="/boot/vmlinuz-linux-libre" + +# boot message files +BOOTMESSAGE="/usr/share/mkpxelinux/boot.msg" +OPTIONSBOOTMESSAGE="/usr/share/mkpxelinux/options.msg" + +#pxelinux default config file to use +PXELINUX_DEFAULT="" + +# Prompt on boot, 1=yes 0=no +PROMPT="1" + +# Timeout, 30 seconds to fix usb keyboard issues +# 0 means wait for prompt +TIMEOUT="300" + +# Installdir of tftp, default location +INSTALLDIR="/var/tftpboot" + +# Nfsrootdir, for hooks that might need it +NFSROOTDIR="" diff --git a/libre/mkpxelinux/options.msg b/libre/mkpxelinux/options.msg new file mode 100644 index 000000000..16c6b2eda --- /dev/null +++ b/libre/mkpxelinux/options.msg @@ -0,0 +1,6 @@ +------------------------------------------------------------------------------ +Parabola GNU/Linux-libre options and troubleshooting: + +- If your system hangs during the boot process, any combinations of the + boot options noapic acpi=off pci=routeirq nosmp nomsi may be useful. +------------------------------------------------------------------------------ diff --git a/extra/psi/PKGBUILD b/libre/psi/PKGBUILD index 84dc2d15c..16c9e2b78 100644 --- a/extra/psi/PKGBUILD +++ b/libre/psi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 167954 2012-10-04 05:36:54Z pierre $ +# $Id$ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=psi pkgver=0.15 pkgrel=1.1 -pkgdesc='Instant messaging application designed for the Jabber IM' +pkgdesc='Instant messaging application designed for the Jabber IM, Parabola rebranded' url='http://psi-im.org/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') @@ -12,13 +12,13 @@ depends=('qca-ossl' 'qca-gnupg' 'enchant' 'libxss' 'xdg-utils') makedepends=('icu') install='psi.install' source=("http://downloads.sourceforge.net/psi/psi-${pkgver}.tar.bz2" - 'archlinux.patch') + 'parabola.patch') md5sums=('aea15f17cf93e7cea52f305523f761be' - '2ed44ef84007b5b7f9a3f0a4f5f6a86d') + 'a641b77517c82c6e1f254d5595a25113') build() { cd ${srcdir}/psi-${pkgver} - patch -p0 -i ${srcdir}/archlinux.patch + patch -p0 -i ${srcdir}/parabola.patch ./configure --prefix=/usr --release --no-separate-debug-info make } diff --git a/libre/psi/parabola.patch b/libre/psi/parabola.patch new file mode 100644 index 000000000..cafe67fa1 --- /dev/null +++ b/libre/psi/parabola.patch @@ -0,0 +1,53 @@ +--- src/systeminfo.cpp 2012-10-03 21:53:03.000000000 -0300 ++++ src/systeminfo.cpp 2013-03-25 21:27:28.691880863 -0300 +@@ -75,23 +75,7 @@ + enum LinuxName { + LinuxNone = 0, + +- LinuxMandrake, +- LinuxDebian, +- LinuxRedHat, +- LinuxGentoo, +- LinuxExherbo, +- LinuxSlackware, +- LinuxSuSE, +- LinuxConectiva, +- LinuxCaldera, +- LinuxLFS, +- +- LinuxASP, // Russian Linux distros +- LinuxALT, +- +- LinuxPLD, // Polish Linux distros +- LinuxAurox, +- LinuxArch ++ LinuxParabola + }; + + enum OsFlags { +@@ -106,24 +90,7 @@ + QString file; + QString name; + } osInfo[] = { +- { LinuxMandrake, OsUseFile, "/etc/mandrake-release", "Mandrake Linux" }, +- { LinuxDebian, OsAppendFile, "/etc/debian_version", "Debian GNU/Linux" }, +- { LinuxGentoo, OsUseFile, "/etc/gentoo-release", "Gentoo Linux" }, +- { LinuxExherbo, OsUseName, "/etc/exherbo-release", "Exherbo Linux" }, +- { LinuxArch, OsUseName, "/etc/arch-release", "Arch Linux" }, +- { LinuxSlackware, OsAppendFile, "/etc/slackware-version", "Slackware Linux" }, +- { LinuxPLD, OsUseFile, "/etc/pld-release", "PLD Linux" }, +- { LinuxAurox, OsUseName, "/etc/aurox-release", "Aurox Linux" }, +- { LinuxArch, OsUseFile, "/etc/arch-release", "Arch Linux" }, +- { LinuxLFS, OsAppendFile, "/etc/lfs-release", "LFS Linux" }, +- +- // untested +- { LinuxSuSE, OsUseFile, "/etc/SuSE-release", "SuSE Linux" }, +- { LinuxConectiva, OsUseFile, "/etc/conectiva-release", "Conectiva Linux" }, +- { LinuxCaldera, OsUseFile, "/etc/.installed", "Caldera Linux" }, +- +- // many distros use the /etc/redhat-release for compatibility, so RedHat will be the last :) +- { LinuxRedHat, OsUseFile, "/etc/redhat-release", "RedHat Linux" }, ++ { LinuxParabola, OsUseName, "/etc/arch-release", "Parabola GNU/Linux-libre" }, + + { LinuxNone, OsUseName, "", "" } + }; diff --git a/extra/psi/psi.install b/libre/psi/psi.install index 464d2e625..464d2e625 100644 --- a/extra/psi/psi.install +++ b/libre/psi/psi.install |