diff options
Diffstat (limited to 'community')
216 files changed, 4703 insertions, 4349 deletions
diff --git a/community/aegisub/PKGBUILD b/community/aegisub/PKGBUILD new file mode 100755 index 000000000..3d4671472 --- /dev/null +++ b/community/aegisub/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 85317 2013-03-01 00:32:14Z alucryd $ +# Maintainer: Maxime Gauduin <alucryd@gmail.com> +# Contributor: kozec <kozec@kozec.com> +# Contributor: Limao Luo <luolimao+AUR@gmail.com> + +pkgname=aegisub +pkgver=3.0.2 +pkgrel=6 +pkgdesc="A general-purpose subtitle editor with ASS/SSA support" +arch=('i686' 'x86_64') +url="http://www.aegisub.org" +license=('GPL' 'BSD') +depends=('desktop-file-utils' 'ffmpegsource' 'fftw' 'hicolor-icon-theme' 'hunspell' 'lua51' 'wxgtk2.9' 'hicolor-icon-theme') +makedepends=('mesa') +install=aegisub.install +source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz" 'crash-on-deatach.patch' 'lua51.patch') +sha256sums=('68ec20cf49f513608cec400bd462ebb762d6057109968fb01d842e10e6e7fb39' + '85e2c2a6bf091f5b4ca29a0149df8d8ca6219d98a4095f79809f2e698983bca4' + 'ce67b143cc2949fbbd7d72862c54005030339d1c364753335acec271ca9e179d') + +build() { + cd "${srcdir}"/${pkgname}/${pkgname} + +# Patch + patch -Np1 -i "${srcdir}"/crash-on-deatach.patch + patch -Np1 -i "${srcdir}"/lua51.patch + +# Build + autoreconf -ivf + ./configure --prefix=/usr --without-{portaudio,openal,oss} --with-wxdir=/usr/include/wx-2.9 --with-wx-config=/usr/bin/wx-config-2.9 + make +} + +package() { + cd "${srcdir}"/${pkgname}/${pkgname} + +# Install + make DESTDIR="$pkgdir" install + +# License + install -dm 755 "${pkgdir}"/usr/share/licenses/aegisub + install -m 644 LICENCE "${pkgdir}"/usr/share/licenses/aegisub/LICENSE +} + +# vim: ts=2 sw=2 et: diff --git a/community/aegisub/aegisub.install b/community/aegisub/aegisub.install new file mode 100755 index 000000000..af7ea4171 --- /dev/null +++ b/community/aegisub/aegisub.install @@ -0,0 +1,14 @@ +post_install() { + gtk-update-icon-cache -ftq usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim: ts=2 sw=2 et: diff --git a/community/aegisub/crash-on-deatach.patch b/community/aegisub/crash-on-deatach.patch new file mode 100755 index 000000000..1a1a3d007 --- /dev/null +++ b/community/aegisub/crash-on-deatach.patch @@ -0,0 +1,10 @@ +--- a/src/video_display.cpp ++++ b/src/video_display.cpp +@@ -309,6 +309,7 @@ + } + + void VideoDisplay::UpdateSize() { ++ if (zoomValue<=0) zoomValue = 1; + if (!con->videoController->IsLoaded() || !IsShownOnScreen()) return; + + videoSize.Set(con->videoController->GetWidth(), con->videoController->GetHeight()); diff --git a/community/aegisub/lua51.patch b/community/aegisub/lua51.patch new file mode 100755 index 000000000..f93fb02de --- /dev/null +++ b/community/aegisub/lua51.patch @@ -0,0 +1,24 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -371,9 +371,9 @@ + + AS_IF([test x$with_lua = xno], [$with_auto4_lua="no"; lua_disabled="(disabled)"], [ + # First try pkg-config with several names +- PKG_CHECK_MODULES(LUA, lua >= 5.1, [with_auto4_lua="yes"], [ +- PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1, [with_auto4_lua="yes"], [ +- PKG_CHECK_MODULES(LUA, lua-5.1 >= 5.1, [with_auto4_lua="yes"], [ ++ PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1 lua5.1 < 5.2, [with_auto4_lua="yes"], [ ++ PKG_CHECK_MODULES(LUA, lua-5.1 >= 5.1 lua-5.1 < 5.2, [with_auto4_lua="yes"], [ ++ PKG_CHECK_MODULES(LUA, lua >= 5.1 lua < 5.2, [with_auto4_lua="yes"], [ + # Still not found so try to autodetect + AS_IF([test -z "$LUA_CFLAGS"], + [AGI_FIND_HEADER([LUA], [lua.hpp], +@@ -393,7 +393,7 @@ + return !res; + }]) + AS_IF([test x$agi_cv_with_lua = xno && test x$with_lua = xyes], +- [AC_MSG_FAILURE([--with-lua was specified, but lua could not be found. Try setting LUA_CLFAGS and LUA_LIBS manually])]) ++ [AC_MSG_FAILURE([--with-lua was specified, but lua 5.1 could not be found. Try setting LUA_CLFAGS and LUA_LIBS manually])]) + with_auto4_lua=$agi_cv_with_lua + ])])]) + ]) diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD index 33e806bbc..c235c310a 100644 --- a/community/bitcoin/PKGBUILD +++ b/community/bitcoin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 84601 2013-02-20 12:17:25Z tredaelli $ +# $Id: PKGBUILD 85453 2013-03-01 19:08:27Z andrea $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: shahid <helllamer@gmail.com> pkgbase=bitcoin pkgname=('bitcoin-daemon' 'bitcoin-qt') pkgver=0.8.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.bitcoin.org/" makedepends=('boost' 'automoc4' 'qrencode' 'miniupnpc') @@ -19,7 +19,7 @@ build() { cd "$srcdir/$pkgbase-$pkgver-linux/src" # and make qt gui - qmake USE_QRCODE=1 + qmake-qt4 USE_QRCODE=1 make # make bitcoind @@ -29,7 +29,7 @@ build() { package_bitcoin-qt() { pkgdesc="Bitcoin is a peer-to-peer network based digital currency - QT" - depends=(boost-libs qt miniupnpc qrencode) + depends=(boost-libs qt4 miniupnpc qrencode) install=bitcoin-qt.install cd "$srcdir/$pkgbase-$pkgver-linux/src" diff --git a/community/canorus/PKGBUILD b/community/canorus/PKGBUILD index c2a37de26..4767b9030 100644 --- a/community/canorus/PKGBUILD +++ b/community/canorus/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 59873 2011-12-01 13:49:19Z spupykin $ +# $Id: PKGBUILD 85336 2013-03-01 10:28:57Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Arch Linux Pro Audio <dev@archaudio.org> # Contributor: Coenraad van der Westhuizen <chwesthuizen@gmail.com> @@ -6,12 +6,12 @@ pkgname=canorus pkgver=0.7.R1002 -pkgrel=4 +pkgrel=5 pkgdesc="A free music score editor" arch=('i686' 'x86_64' 'mips64el') url="http://www.canorus.org/" license=('GPL') -depends=('qt' 'alsa-lib' 'python2' 'swig') +depends=('qt4' 'alsa-lib' 'python2' 'swig' 'zlib') makedepends=('cmake') options=('strip') source=(http://download.berlios.de/$pkgname/$pkgname\_$pkgver\_source.tar.bz2 @@ -21,13 +21,16 @@ md5sums=('5575b7c54633056a463177579a390318' build() { cd $srcdir/$pkgname-$pkgver - patch -Np1 -i ${srcdir}/0006-Add-lz-and-lpthread-to-linker-flags.patch - export QTDIR=/usr + source /etc/profile.d/qt4.sh + export LDFLAGS="-lz -lpthread" cmake . -DCMAKE_INSTALL_PREFIX=$pkgdir/usr \ -DDEFAULT_DATA_DIR="/usr/share/canorus" \ -DNO_SWIG=ON - make install +} +package() { + cd $srcdir/$pkgname-$pkgver + make install install -d $pkgdir/usr/share/{applications,pixmaps} cp canorus.desktop $pkgdir/usr/share/applications cp $pkgdir/usr/share/{canorus/images/clogosm.png,pixmaps/canorus.png} diff --git a/community/caph/PKGBUILD b/community/caph/PKGBUILD index 46061a33c..13cb1b7e5 100644 --- a/community/caph/PKGBUILD +++ b/community/caph/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84258 2013-02-14 21:05:08Z arodseth $ +# $Id: PKGBUILD 84880 2013-02-25 19:41:45Z arodseth $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: jose <jose1711 [at] gmail (dot) com> diff --git a/community/celt-0.7/PKGBUILD b/community/celt-0.7/PKGBUILD index f22201bd7..8e7f7a705 100644 --- a/community/celt-0.7/PKGBUILD +++ b/community/celt-0.7/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61638 2012-01-05 08:56:24Z svenstaro $ +# $Id: PKGBUILD 84881 2013-02-25 19:42:06Z arodseth $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lauri Niskanen <ape@ape3000.com> @@ -6,16 +6,16 @@ pkgname=celt-0.7 _realname=celt pkgver=0.7.1 -pkgrel=3 -pkgdesc="Low-latency audio communication codec" +pkgrel=4 +pkgdesc='Low-latency audio communication codec' arch=('i686' 'x86_64' 'mips64el') -url="http://www.celt-codec.org" +url='http://www.celt-codec.org' license=('BSD') depends=('libogg') #provides=('celt=$pkgver') conflicts=('celt') options=('!libtool') -source=(http://downloads.xiph.org/releases/celt/$_realname-$pkgver.tar.gz) +source=("http://downloads.xiph.org/releases/celt/$_realname-$pkgver.tar.gz") md5sums=('c7f6b8346e132b1a48dae0eff77ea9f0') build() { @@ -23,12 +23,12 @@ build() { ./configure --prefix=/usr make - make DESTDIR="$pkgdir/" install } package() { cd "$srcdir/$_realname-$pkgver" + make DESTDIR="$pkgdir/" install install -Dm644 COPYING \ "$pkgdir/usr/share/licenses/$pkgname/BSD" } diff --git a/community/chicken/PKGBUILD b/community/chicken/PKGBUILD index 9a6c0204e..30b176b8c 100644 --- a/community/chicken/PKGBUILD +++ b/community/chicken/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 83421 2013-01-31 20:35:27Z arodseth $ +# $Id: PKGBUILD 85275 2013-02-28 11:49:19Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: <david@pako.st> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=chicken -pkgver=4.8.0.1 +pkgver=4.8.0.2 pkgrel=1 pkgdesc='Compiler for R5RS scheme, featuring handy extensions' arch=('x86_64' 'i686' 'mips64el') url='http://call-cc.org/' license=('BSD') depends=('gcc') -source=("http://code.call-cc.org/releases/${pkgver/.1}/$pkgname-$pkgver.tar.gz") -sha256sums=('a60efa9d2a621ecb9e03b41ebdd03ae27ecb32c1292671fd969506c9baf88d0c') +source=("http://code.call-cc.org/releases/${pkgver%.*}/$pkgname-$pkgver.tar.gz") +sha256sums=('bf933f8cc4586b8b468c9abb8ec079a9f109ea20b5f12a1af2776f694e14791d') build() { cd "$pkgname-$pkgver" diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD new file mode 100644 index 000000000..1aba7553d --- /dev/null +++ b/community/cinnamon-control-center/PKGBUILD @@ -0,0 +1,77 @@ +# $Id: PKGBUILD 85223 2013-02-27 18:49:20Z bgyorgy $ +# Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com +# Based on gnome-control-center: +# Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Jan de Groot <jgc@archlinux.org> + +pkgname=cinnamon-control-center +pkgver=1.7.1 +pkgrel=2 +pkgdesc="The Control Center for Cinnamon" +arch=('i686' 'x86_64') +depends=('cinnamon' 'cheese' 'libgnomekbd' 'libgtop' 'network-manager-applet') +optdepends=('mesa-demos: provides glxinfo for graphics information' + 'gnome-color-manager: for color management tasks') +makedepends=('intltool' 'gnome-common') +url="https://github.com/linuxmint/cinnamon-control-center" +install=cinnamon-control-center.install +license=('GPL') +options=('!libtool' '!emptydirs') +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz" + "pulse3.0.patch" + "sound-nua-rename.patch" + "fix-audio-input-icons.patch" + "fix-faces-location.patch") +sha256sums=('eab36af1accfce7b4d5eaf07a865d7290add07b875ed5e52072c1ad2e8570c1e' + 'ddf7c99a1d45a7be54e69e90f194e33f3e56a7f294aa369bfb2e541d8241156e' + '2f49543e4ccabf5c8ce1cd9e4c37e5b291c23cff494eaa671857b2dcf7af4c5b' + '2cefa2764db206c9c6258e3f374988056907dda0c5bbeedbc249fc7c058a0d6b' + '7360f3e018765e80a7afc5a469c1d54ec3fdeb7e58c867596ef26773fb8e7a8a') + +build() { + cd $pkgname-$pkgver + + patch -Np1 -i ../pulse3.0.patch + + # Upstream patch: Change sound module registered name from sound-nua to 'sound' + patch -Np1 -i ../sound-nua-rename.patch + + # Fix icons on Sound preferences dialog + patch -Np1 -i ../fix-audio-input-icons.patch + + # Fix faces location on User accounts dialog + patch -Np1 -i ../fix-faces-location.patch + + autoreconf -fi + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --enable-systemd \ + --disable-update-mimedb + + #https://bugzilla.gnome.org/show_bug.cgi?id=656229 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + make +} + +package() { + cd $pkgname-$pkgver + + make DESTDIR="$pkgdir" install + + # Remove unused stuff + make -C panels/datetime DESTDIR="$pkgdir" uninstall + make -C panels/printers DESTDIR="$pkgdir" uninstall + make -C panels/sound DESTDIR="$pkgdir" uninstall + make -C panels/sound/data DESTDIR="$pkgdir" install + make -C shell DESTDIR="$pkgdir" uninstall + make -C shell DESTDIR="$pkgdir" install-libLTLIBRARIES + + # Remove broken desktop files + rm -R "$pkgdir/usr/share/applications" + rm -R "$pkgdir/etc" + + # Fix a warning + chown 102:0 "$pkgdir/usr/share/polkit-1/rules.d" + chmod 700 "$pkgdir/usr/share/polkit-1/rules.d" +} diff --git a/community/cinnamon-control-center/cinnamon-control-center.install b/community/cinnamon-control-center/cinnamon-control-center.install new file mode 100644 index 000000000..d1fce39bc --- /dev/null +++ b/community/cinnamon-control-center/cinnamon-control-center.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +}
\ No newline at end of file diff --git a/community/cinnamon-control-center/fix-audio-input-icons.patch b/community/cinnamon-control-center/fix-audio-input-icons.patch new file mode 100644 index 000000000..77c9b3c5b --- /dev/null +++ b/community/cinnamon-control-center/fix-audio-input-icons.patch @@ -0,0 +1,15 @@ +diff -Naur cinnamon-control-center-1.7.1.orig/panels/sound-nua/gvc-mixer-dialog.c cinnamon-control-center-1.7.1/panels/sound-nua/gvc-mixer-dialog.c +--- cinnamon-control-center-1.7.1.orig/panels/sound-nua/gvc-mixer-dialog.c 2013-02-19 17:37:17.000000000 +0100 ++++ cinnamon-control-center-1.7.1/panels/sound-nua/gvc-mixer-dialog.c 2013-02-26 23:12:37.192399508 +0100 +@@ -1929,9 +1929,9 @@ + gvc_channel_bar_set_name (GVC_CHANNEL_BAR (self->priv->input_bar), + _("_Input volume:")); + gvc_channel_bar_set_low_icon_name (GVC_CHANNEL_BAR (self->priv->input_bar), +- "audio-input-microphone-low-symbolic"); ++ "cin-audio-input-microphone-low-symbolic"); + gvc_channel_bar_set_high_icon_name (GVC_CHANNEL_BAR (self->priv->input_bar), +- "audio-input-microphone-high-symbolic"); ++ "cin-audio-input-microphone-high-symbolic"); + gtk_widget_set_sensitive (self->priv->input_bar, FALSE); + + if (self->priv->size_group != NULL) { diff --git a/community/cinnamon-control-center/fix-faces-location.patch b/community/cinnamon-control-center/fix-faces-location.patch new file mode 100644 index 000000000..1af65fa99 --- /dev/null +++ b/community/cinnamon-control-center/fix-faces-location.patch @@ -0,0 +1,12 @@ +diff -Naur cinnamon-control-center-1.7.1.orig/panels/user-accounts/um-photo-dialog.c cinnamon-control-center-1.7.1/panels/user-accounts/um-photo-dialog.c +--- cinnamon-control-center-1.7.1.orig/panels/user-accounts/um-photo-dialog.c 2013-02-19 17:37:17.000000000 +0100 ++++ cinnamon-control-center-1.7.1/panels/user-accounts/um-photo-dialog.c 2013-02-27 19:17:18.249329833 +0100 +@@ -406,7 +406,7 @@ + for (i = 0; dirs[i] != NULL; i++) { + char *path; + +- path = g_build_filename (dirs[i], "pixmaps", "faces", NULL); ++ path = g_build_filename (dirs[i], "pixmaps", "cinnamon", "faces", NULL); + dir = g_dir_open (path, 0, NULL); + if (dir == NULL) { + g_free (path); diff --git a/community/cinnamon-control-center/pulse3.0.patch b/community/cinnamon-control-center/pulse3.0.patch new file mode 100644 index 000000000..9341b788e --- /dev/null +++ b/community/cinnamon-control-center/pulse3.0.patch @@ -0,0 +1,25 @@ +From 10a0c18b8e3058144586880019b68ab4ea40ce78 Mon Sep 17 00:00:00 2001 +From: David Henningsson <david.henningsson@canonical.com> +Date: Fri, 07 Dec 2012 10:52:09 +0000 +Subject: sound: Fix port handling for the unknown availability case + +The current code assumes that port availability transitions will be +between YES and NO, and doesn't account for the fact that it may also be +UNKNOWN. This causes spurious entries if the port availability +transitions between YES and UNKNOWN. +--- +diff --git a/panels/sound/gvc-mixer-control.c b/panels/sound/gvc-mixer-control.c +index 34ddc0c..2f6cf34 100644 +--- a/panels/sound/gvc-mixer-control.c ++++ b/panels/sound/gvc-mixer-control.c +@@ -2138,7 +2138,7 @@ update_card (GvcMixerControl *control, + else { + for (i = 0; i < info->n_ports; i++) { + if (g_strcmp0 (card_port->port, info->ports[i]->name) == 0) { +- if (card_port->available != info->ports[i]->available) { ++ if ((card_port->available == PA_PORT_AVAILABLE_NO) != (info->ports[i]->available == PA_PORT_AVAILABLE_NO)) { + card_port->available = info->ports[i]->available; + g_debug ("sync port availability on card %i, card port name '%s', new available value %i", + gvc_mixer_card_get_index (card), +-- +cgit v0.9.0.2
\ No newline at end of file diff --git a/community/cinnamon-control-center/sound-nua-rename.patch b/community/cinnamon-control-center/sound-nua-rename.patch new file mode 100644 index 000000000..fb25b9f42 --- /dev/null +++ b/community/cinnamon-control-center/sound-nua-rename.patch @@ -0,0 +1,26 @@ +diff --git a/panels/sound-nua/cc-sound-panel.c b/panels/sound-nua/cc-sound-panel.c +index 1c115f0..092f319 100644 +--- a/panels/sound-nua/cc-sound-panel.c ++++ b/panels/sound-nua/cc-sound-panel.c +@@ -120,7 +120,7 @@ enum { + cc_sound_panel_register_type (G_TYPE_MODULE (module)); + g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT, + CC_TYPE_SOUND_PANEL, +- "sound-nua", 0); ++ "sound", 0); + } + + /* GIO extension stuff */ +diff --git a/panels/sound/cc-sound-panel.c b/panels/sound/cc-sound-panel.c +index 2f69c0f..3b78ce2 100644 +--- a/panels/sound/cc-sound-panel.c ++++ b/panels/sound/cc-sound-panel.c +@@ -127,7 +127,7 @@ enum { + cc_sound_panel_register_type (G_TYPE_MODULE (module)); + g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT, + CC_TYPE_SOUND_PANEL, +- "sound", 0); ++ "gnome-sound", 0); + } + + /* GIO extension stuff */ diff --git a/community/cinnamon-screensaver/PKGBUILD b/community/cinnamon-screensaver/PKGBUILD new file mode 100644 index 000000000..5b712d8d1 --- /dev/null +++ b/community/cinnamon-screensaver/PKGBUILD @@ -0,0 +1,65 @@ +# Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> +# Based on gnome-screensaver package: +# Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Jan de Groot <jgc@archlinux.org> + +pkgname=cinnamon-screensaver +pkgver=1.7.1 +pkgrel=4 +pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop." +arch=('i686' 'x86_64') +license=('GPL') +url="https://github.com/linuxmint/cinnamon-screensaver" +backup=(etc/pam.d/cinnamon-screensaver) +depends=('cinnamon' 'gnome-screensaver') +makedepends=('intltool' 'gnome-common') +options=(!emptydirs) +source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensaver/archive/$pkgver.tar.gz + cinnamon-screensaver.desktop + cinnamon2d-screensaver.desktop + cinnamon-screensaver.pam + gnome-autogen.sh + configure.patch + fix-dbus-compatibility.patch) + +sha256sums=('055abbc24305dad5efa609b354e01fdc367792ccac5383df4b28090ab0bf64e1' + '2f29a72991deb5cc2b44da06f49d1115148fee6a0a22b1abfecee1c1661abcaa' + '335df8f2fb270484829d94995622521f0a42a12d6887f7de827db34fc81f583a' + 'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb' + '827276b01e658afb8045fb0dcbebb54f679ef47dac482f4399e1839369277ccc' + 'fed5f1f94404fab13c5369f4106b0b498cff2bb71351cae4f3d9c27f417f5e6a' + '9013004395a401e99ce6685abb8319eb1e9ddd888c4fa6a7e45729fb93d285d1') + +build() { + cd $pkgname-$pkgver + + cp ${srcdir}/gnome-autogen.sh . + sed -i 's/\ --warn-all\ --warn-error//' src/Makefile.am + sed -i 's/gnome-autogen.sh/.\/gnome-autogen.sh/g' autogen.sh + chmod +x gnome-autogen.sh + + patch -uNp2 -r- -i ${srcdir}/configure.patch + + # Fix compatibility with gnome-screensaver's D-Bus interface and various fixes + patch -Np1 -i ${srcdir}/fix-dbus-compatibility.patch + + ./autogen.sh --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/cinnamon-screensaver \ + --localstatedir=/var \ + --with-mit-ext --with-systemd + + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 ../cinnamon-screensaver.pam "$pkgdir/etc/pam.d/cinnamon-screensaver" + + # Remove conflicts with gnome-screensaver + rm "$pkgdir"/usr/bin/gnome-screensaver{,-command} + + # Autostart only in Cinnamon + install -m644 "$srcdir/cinnamon-screensaver.desktop" "$pkgdir/etc/xdg/autostart/cinnamon-screensaver.desktop" + install -m644 "$srcdir/cinnamon2d-screensaver.desktop" "$pkgdir/etc/xdg/autostart/cinnamon2d-screensaver.desktop" +} diff --git a/community/cinnamon/cinnamon-screensaver.desktop b/community/cinnamon-screensaver/cinnamon-screensaver.desktop index ddc968691..75c81ca26 100644 --- a/community/cinnamon/cinnamon-screensaver.desktop +++ b/community/cinnamon-screensaver/cinnamon-screensaver.desktop @@ -3,13 +3,9 @@ Type=Application Name=Cinnamon Screensaver Comment=Launch screensaver and locker program Icon=preferences-desktop-screensaver -Exec=gnome-screensaver +Exec=cinnamon-screensaver OnlyShowIn=GNOME; AutostartCondition=GNOME3 if-session cinnamon NoDisplay=true X-GNOME-Autostart-Phase=Application X-GNOME-Autostart-Notify=true -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=gnome-screensaver -X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=3.6.0 diff --git a/community/cinnamon-screensaver/cinnamon-screensaver.pam b/community/cinnamon-screensaver/cinnamon-screensaver.pam new file mode 100644 index 000000000..453dae646 --- /dev/null +++ b/community/cinnamon-screensaver/cinnamon-screensaver.pam @@ -0,0 +1,3 @@ +#%PAM-1.0 +auth required pam_unix_auth.so nullok +auth optional pam_gnome_keyring.so diff --git a/community/cinnamon/cinnamon2d-screensaver.desktop b/community/cinnamon-screensaver/cinnamon2d-screensaver.desktop index aed9557bf..d9d50012c 100644 --- a/community/cinnamon/cinnamon2d-screensaver.desktop +++ b/community/cinnamon-screensaver/cinnamon2d-screensaver.desktop @@ -1,15 +1,11 @@ [Desktop Entry] Type=Application -Name=Cinnamon2d Screensaver +Name=Cinnamon Screensaver Comment=Launch screensaver and locker program Icon=preferences-desktop-screensaver -Exec=gnome-screensaver +Exec=cinnamon-screensaver OnlyShowIn=GNOME; AutostartCondition=GNOME3 if-session cinnamon2d NoDisplay=true X-GNOME-Autostart-Phase=Application X-GNOME-Autostart-Notify=true -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=gnome-screensaver -X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=3.6.0 diff --git a/community/cinnamon-screensaver/configure.patch b/community/cinnamon-screensaver/configure.patch new file mode 100644 index 000000000..289825536 --- /dev/null +++ b/community/cinnamon-screensaver/configure.patch @@ -0,0 +1,12 @@ +diff -Naur cinnamon-screensaver-1.7.1.orig/configure.ac cinnamon-screensaver-1.7.1/configure.ac +--- ./cinnamon-screensaver-1.7.1.orig/configure.ac 2013-02-19 17:35:35.000000000 +0100 ++++ ./cinnamon-screensaver-1.7.1/configure.ac 2013-02-20 12:40:34.936078052 +0100 +@@ -10,7 +10,7 @@ + AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-xz tar-ustar]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + AM_MAINTAINER_MODE([enable]) + diff --git a/community/cinnamon-screensaver/fix-dbus-compatibility.patch b/community/cinnamon-screensaver/fix-dbus-compatibility.patch new file mode 100644 index 000000000..fa53f6fac --- /dev/null +++ b/community/cinnamon-screensaver/fix-dbus-compatibility.patch @@ -0,0 +1,86 @@ +diff --git a/src/cinnamon-screensaver-command.c b/src/cinnamon-screensaver-command.c +index 4267bd0..5c90916 100644 +--- a/src/cinnamon-screensaver-command.c ++++ b/src/cinnamon-screensaver-command.c +@@ -311,11 +311,11 @@ do_command (GDBusConnection *connection) + + if (do_lock) { + if (g_strcmp0 (away_message, "DEFAULT") == 0) { +- reply = screensaver_send_message_string (connection, "Lock", away_message); ++ reply = screensaver_send_message_string (connection, "LockMessage", away_message); + } + else { + gchar * custom_message = g_strdup_printf("CUSTOM###%s", away_message); +- reply = screensaver_send_message_string (connection, "Lock", custom_message); ++ reply = screensaver_send_message_string (connection, "LockMessage", custom_message); + g_free (custom_message); + } + if (reply == NULL) { +diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c +index 2a98aee..6dbf12d 100644 +--- a/src/gs-listener-dbus.c ++++ b/src/gs-listener-dbus.c +@@ -653,6 +653,8 @@ do_introspect (DBusConnection *connection, + xml = g_string_append (xml, + " <interface name=\""GS_INTERFACE"\">\n" + " <method name=\"Lock\">\n" ++ " </method>\n" ++ " <method name=\"LockMessage\">\n" + " <arg name=\"body\" direction=\"in\" type=\"s\"/>\n" + " </method>\n" + " <method name=\"SimulateUserActivity\">\n" +@@ -744,6 +746,10 @@ listener_dbus_handle_session_message (DBusConnection *connection, + g_return_val_if_fail (message != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED); + + if (dbus_message_is_method_call (message, GS_SERVICE, "Lock")) { ++ g_signal_emit (listener, signals [LOCK], 0); ++ return send_success_reply (connection, message); ++ } ++ if (dbus_message_is_method_call (message, GS_SERVICE, "LockMessage")) { + return listener_lock (listener, connection, message); + } + if (dbus_message_is_method_call (message, GS_SERVICE, "Quit")) { +@@ -906,7 +912,7 @@ listener_dbus_handle_system_message (DBusConnection *connection, + } else if (dbus_message_is_signal (message, SYSTEMD_LOGIND_SESSION_INTERFACE, "Lock")) { + if (_listener_message_path_is_our_session (listener, message)) { + gs_debug ("systemd requested session lock"); +- return listener_lock (listener, connection, message); ++ g_signal_emit (listener, signals [LOCK], 0); + } + + return DBUS_HANDLER_RESULT_HANDLED; +@@ -948,7 +954,7 @@ listener_dbus_handle_system_message (DBusConnection *connection, + } else if (dbus_message_is_signal (message, CK_SESSION_INTERFACE, "Lock")) { + if (_listener_message_path_is_our_session (listener, message)) { + gs_debug ("ConsoleKit requested session lock"); +- return listener_lock (listener, connection, message); ++ g_signal_emit (listener, signals [LOCK], 0); + } + + return DBUS_HANDLER_RESULT_HANDLED; +diff --git a/src/gs-manager.c b/src/gs-manager.c +index 1544921..bc09cb9 100644 +--- a/src/gs-manager.c ++++ b/src/gs-manager.c +@@ -1275,10 +1275,18 @@ void + gs_manager_set_away_message (GSManager *manager, + const char *message) + { +- g_free (manager->priv->logout_command); +- +- manager->priv->away_message = g_strdup(message); + GSList *l; ++ ++ g_return_if_fail (GS_IS_MANAGER (manager)); ++ ++ g_free (manager->priv->away_message); ++ ++ if (message) { ++ manager->priv->away_message = g_strdup (message); ++ } else { ++ manager->priv->away_message = NULL; ++ } ++ + for (l = manager->priv->windows; l; l = l->next) { + gs_window_set_away_message (l->data, manager->priv->away_message); + } diff --git a/community/cinnamon-screensaver/gnome-autogen.sh b/community/cinnamon-screensaver/gnome-autogen.sh new file mode 100644 index 000000000..2467a1de2 --- /dev/null +++ b/community/cinnamon-screensaver/gnome-autogen.sh @@ -0,0 +1,538 @@ +#!/bin/sh +# Run this to generate all the initial makefiles, etc. + +#name of package +test "$PKG_NAME" || PKG_NAME=Package +test "$srcdir" || srcdir=. + +# default version requirements ... +test "$REQUIRED_AUTOCONF_VERSION" || REQUIRED_AUTOCONF_VERSION=2.53 +test "$REQUIRED_AUTOMAKE_VERSION" || REQUIRED_AUTOMAKE_VERSION=1.9 +test "$REQUIRED_LIBTOOL_VERSION" || REQUIRED_LIBTOOL_VERSION=1.4.3 +test "$REQUIRED_GETTEXT_VERSION" || REQUIRED_GETTEXT_VERSION=0.10.40 +test "$REQUIRED_GLIB_GETTEXT_VERSION" || REQUIRED_GLIB_GETTEXT_VERSION=2.2.0 +test "$REQUIRED_INTLTOOL_VERSION" || REQUIRED_INTLTOOL_VERSION=0.25 +test "$REQUIRED_PKG_CONFIG_VERSION" || REQUIRED_PKG_CONFIG_VERSION=0.14.0 +test "$REQUIRED_GTK_DOC_VERSION" || REQUIRED_GTK_DOC_VERSION=1.0 +test "$REQUIRED_DOC_COMMON_VERSION" || REQUIRED_DOC_COMMON_VERSION=2.3.0 +test "$REQUIRED_GNOME_DOC_UTILS_VERSION" || REQUIRED_GNOME_DOC_UTILS_VERSION=0.4.2 + +# a list of required m4 macros. Package can set an initial value +test "$REQUIRED_M4MACROS" || REQUIRED_M4MACROS= +test "$FORBIDDEN_M4MACROS" || FORBIDDEN_M4MACROS= + +# Not all echo versions allow -n, so we check what is possible. This test is +# based on the one in autoconf. +ECHO_C= +ECHO_N= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ;; + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; +esac + +# some terminal codes ... +if tty < /dev/null 1>/dev/null 2>&1; then + boldface="`tput bold 2>/dev/null`" + normal="`tput sgr0 2>/dev/null`" +else + boldface= + normal= +fi +printbold() { + echo $ECHO_N "$boldface" $ECHO_C + echo "$@" + echo $ECHO_N "$normal" $ECHO_C +} +printerr() { + echo "$@" >&2 +} + +# Usage: +# compare_versions MIN_VERSION ACTUAL_VERSION +# returns true if ACTUAL_VERSION >= MIN_VERSION +compare_versions() { + ch_min_version=$1 + ch_actual_version=$2 + ch_status=0 + IFS="${IFS= }"; ch_save_IFS="$IFS"; IFS="." + set $ch_actual_version + for ch_min in $ch_min_version; do + ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes + if [ -z "$ch_min" ]; then break; fi + if [ -z "$ch_cur" ]; then ch_status=1; break; fi + if [ $ch_cur -gt $ch_min ]; then break; fi + if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi + done + IFS="$ch_save_IFS" + return $ch_status +} + +# Usage: +# version_check PACKAGE VARIABLE CHECKPROGS MIN_VERSION SOURCE +# checks to see if the package is available +version_check() { + vc_package=$1 + vc_variable=$2 + vc_checkprogs=$3 + vc_min_version=$4 + vc_source=$5 + vc_status=1 + + vc_checkprog=`eval echo "\\$$vc_variable"` + if [ -n "$vc_checkprog" ]; then + printbold "using $vc_checkprog for $vc_package" + return 0 + fi + + if test "x$vc_package" = "xautomake" -a "x$vc_min_version" = "x1.4"; then + vc_comparator="=" + else + vc_comparator=">=" + fi + printbold "checking for $vc_package $vc_comparator $vc_min_version..." + for vc_checkprog in $vc_checkprogs; do + echo $ECHO_N " testing $vc_checkprog... " $ECHO_C + if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then + vc_actual_version=`$vc_checkprog --version | head -n 1 | \ + sed 's/^.*[ ]\([0-9.]*[a-z]*\).*$/\1/'` + if compare_versions $vc_min_version $vc_actual_version; then + echo "found $vc_actual_version" + # set variables + eval "$vc_variable=$vc_checkprog; \ + ${vc_variable}_VERSION=$vc_actual_version" + vc_status=0 + break + else + echo "too old (found version $vc_actual_version)" + fi + else + echo "not found." + fi + done + if [ "$vc_status" != 0 ]; then + printerr "***Error***: You must have $vc_package $vc_comparator $vc_min_version installed" + printerr " to build $PKG_NAME. Download the appropriate package for" + printerr " from your distribution or get the source tarball at" + printerr " $vc_source" + printerr + exit $vc_status + fi + return $vc_status +} + +# Usage: +# require_m4macro filename.m4 +# adds filename.m4 to the list of required macros +require_m4macro() { + case "$REQUIRED_M4MACROS" in + $1\ * | *\ $1\ * | *\ $1) ;; + *) REQUIRED_M4MACROS="$REQUIRED_M4MACROS $1" ;; + esac +} + +forbid_m4macro() { + case "$FORBIDDEN_M4MACROS" in + $1\ * | *\ $1\ * | *\ $1) ;; + *) FORBIDDEN_M4MACROS="$FORBIDDEN_M4MACROS $1" ;; + esac +} + +# Usage: +# add_to_cm_macrodirs dirname +# Adds the dir to $cm_macrodirs, if it's not there yet. +add_to_cm_macrodirs() { + case $cm_macrodirs in + "$1 "* | *" $1 "* | *" $1") ;; + *) cm_macrodirs="$cm_macrodirs $1";; + esac +} + +# Usage: +# print_m4macros_error +# Prints an error message saying that autoconf macros were misused +print_m4macros_error() { + printerr "***Error***: some autoconf macros required to build $PKG_NAME" + printerr " were not found in your aclocal path, or some forbidden" + printerr " macros were found. Perhaps you need to adjust your" + printerr " ACLOCAL_FLAGS?" + printerr +} + +# Usage: +# check_m4macros +# Checks that all the requested macro files are in the aclocal macro path +# Uses REQUIRED_M4MACROS and ACLOCAL variables. +check_m4macros() { + # construct list of macro directories + cm_macrodirs=`$ACLOCAL --print-ac-dir` + # aclocal also searches a version specific dir, eg. /usr/share/aclocal-1.9 + # but it contains only Automake's own macros, so we can ignore it. + + # Read the dirlist file, supported by Automake >= 1.7. + # If AUTOMAKE was defined, no version was detected. + if [ -z "$AUTOMAKE_VERSION" ] || compare_versions 1.7 $AUTOMAKE_VERSION && [ -s $cm_macrodirs/dirlist ]; then + cm_dirlist=`sed 's/[ ]*#.*//;/^$/d' $cm_macrodirs/dirlist` + if [ -n "$cm_dirlist" ] ; then + for cm_dir in $cm_dirlist; do + if [ -d $cm_dir ]; then + add_to_cm_macrodirs $cm_dir + fi + done + fi + fi + + # Parse $ACLOCAL_FLAGS + set - $ACLOCAL_FLAGS + while [ $# -gt 0 ]; do + if [ "$1" = "-I" ]; then + add_to_cm_macrodirs "$2" + shift + fi + shift + done + + cm_status=0 + if [ -n "$REQUIRED_M4MACROS" ]; then + printbold "Checking for required M4 macros..." + # check that each macro file is in one of the macro dirs + for cm_macro in $REQUIRED_M4MACROS; do + cm_macrofound=false + for cm_dir in $cm_macrodirs; do + if [ -f "$cm_dir/$cm_macro" ]; then + cm_macrofound=true + break + fi + # The macro dir in Cygwin environments may contain a file + # called dirlist containing other directories to look in. + if [ -f "$cm_dir/dirlist" ]; then + for cm_otherdir in `cat $cm_dir/dirlist`; do + if [ -f "$cm_otherdir/$cm_macro" ]; then + cm_macrofound=true + break + fi + done + fi + done + if $cm_macrofound; then + : + else + printerr " $cm_macro not found" + cm_status=1 + fi + done + fi + if [ "$cm_status" != 0 ]; then + print_m4macros_error + exit $cm_status + fi + if [ -n "$FORBIDDEN_M4MACROS" ]; then + printbold "Checking for forbidden M4 macros..." + # check that each macro file is in one of the macro dirs + for cm_macro in $FORBIDDEN_M4MACROS; do + cm_macrofound=false + for cm_dir in $cm_macrodirs; do + if [ -f "$cm_dir/$cm_macro" ]; then + cm_macrofound=true + break + fi + done + if $cm_macrofound; then + printerr " $cm_macro found (should be cleared from macros dir)" + cm_status=1 + fi + done + fi + if [ "$cm_status" != 0 ]; then + print_m4macros_error + exit $cm_status + fi +} + +# try to catch the case where the macros2/ directory hasn't been cleared out. +forbid_m4macro gnome-cxx-check.m4 + +want_libtool=false +want_gettext=false +want_glib_gettext=false +want_intltool=false +want_pkg_config=false +want_gtk_doc=false +want_gnome_doc_utils=false +want_maintainer_mode=false + +find_configure_files() { + configure_ac= + if test -f "$1/configure.ac"; then + configure_ac="$1/configure.ac" + elif test -f "$1/configure.in"; then + configure_ac="$1/configure.in" + fi + if test "x$configure_ac" != x; then + echo "$configure_ac" + # TODO We have not detected the right autoconf yet! + autoconf -t 'AC_CONFIG_SUBDIRS:$1' "$configure_ac" | while read dir; do + find_configure_files "$1/$dir" + done + fi +} + +configure_files="`find_configure_files $srcdir`" + +for configure_ac in $configure_files; do + dirname=`dirname $configure_ac` + if [ -f $dirname/NO-AUTO-GEN ]; then + echo skipping $dirname -- flagged as no auto-gen + continue + fi + if grep "^A[CM]_PROG_LIBTOOL" $configure_ac >/dev/null || + grep "^LT_INIT" $configure_ac >/dev/null; then + want_libtool=true + fi + if grep "^AM_GNU_GETTEXT" $configure_ac >/dev/null; then + want_gettext=true + fi + if grep "^AM_GLIB_GNU_GETTEXT" $configure_ac >/dev/null; then + want_glib_gettext=true + fi + if grep "^AC_PROG_INTLTOOL" $configure_ac >/dev/null || + grep "^IT_PROG_INTLTOOL" $configure_ac >/dev/null; then + want_intltool=true + fi + if grep "^PKG_CHECK_MODULES" $configure_ac >/dev/null; then + want_pkg_config=true + fi + if grep "^GTK_DOC_CHECK" $configure_ac >/dev/null; then + want_gtk_doc=true + fi + if grep "^GNOME_DOC_INIT" $configure_ac >/dev/null; then + want_gnome_doc_utils=true + fi + + # check that AM_MAINTAINER_MODE is used + if grep "^AM_MAINTAINER_MODE" $configure_ac >/dev/null; then + want_maintainer_mode=true + fi + + if grep "^YELP_HELP_INIT" $configure_ac >/dev/null; then + require_m4macro yelp.m4 + fi + + # check to make sure gnome-common macros can be found ... + if grep "^GNOME_COMMON_INIT" $configure_ac >/dev/null || + grep "^GNOME_DEBUG_CHECK" $configure_ac >/dev/null || + grep "^GNOME_MAINTAINER_MODE_DEFINES" $configure_ac >/dev/null; then + require_m4macro gnome-common.m4 + fi + if grep "^GNOME_COMPILE_WARNINGS" $configure_ac >/dev/null || + grep "^GNOME_CXX_WARNINGS" $configure_ac >/dev/null; then + require_m4macro gnome-compiler-flags.m4 + fi + if grep "^GNOME_CODE_COVERAGE" $configure_ac >/dev/null; then + require_m4macro gnome-code-coverage.m4 + fi +done + +#tell Mandrake autoconf wrapper we want autoconf 2.5x, not 2.13 +WANT_AUTOCONF_2_5=1 +export WANT_AUTOCONF_2_5 +version_check autoconf AUTOCONF 'autoconf2.50 autoconf autoconf-2.53' $REQUIRED_AUTOCONF_VERSION \ + "http://ftp.gnu.org/pub/gnu/autoconf/autoconf-$REQUIRED_AUTOCONF_VERSION.tar.gz" +AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/` + +case $REQUIRED_AUTOMAKE_VERSION in + 1.4*) automake_progs="automake-1.4" ;; + 1.5*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;; + 1.6*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;; + 1.7*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;; + 1.8*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;; + 1.9*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;; + 1.10*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;; + 1.11*) automake_progs="automake-1.13 automake-1.12 automake-1.11" ;; + 1.12*) automake_progs="automake-1.13 automake-1.12" ;; + 1.13*) automake_progs="automake-1.13" ;; +esac +version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \ + "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" +ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/` + +if $want_libtool; then + version_check libtool LIBTOOLIZE "libtoolize glibtoolize" $REQUIRED_LIBTOOL_VERSION \ + "http://ftp.gnu.org/pub/gnu/libtool/libtool-$REQUIRED_LIBTOOL_VERSION.tar.gz" + require_m4macro libtool.m4 +fi + +if $want_gettext; then + version_check gettext GETTEXTIZE gettextize $REQUIRED_GETTEXT_VERSION \ + "http://ftp.gnu.org/pub/gnu/gettext/gettext-$REQUIRED_GETTEXT_VERSION.tar.gz" + require_m4macro gettext.m4 +fi + +if $want_glib_gettext; then + version_check glib-gettext GLIB_GETTEXTIZE glib-gettextize $REQUIRED_GLIB_GETTEXT_VERSION \ + "ftp://ftp.gtk.org/pub/gtk/v2.2/glib-$REQUIRED_GLIB_GETTEXT_VERSION.tar.gz" + require_m4macro glib-gettext.m4 +fi + +if $want_intltool; then + version_check intltool INTLTOOLIZE intltoolize $REQUIRED_INTLTOOL_VERSION \ + "http://ftp.gnome.org/pub/GNOME/sources/intltool/" + require_m4macro intltool.m4 +fi + +if $want_pkg_config; then + version_check pkg-config PKG_CONFIG pkg-config $REQUIRED_PKG_CONFIG_VERSION \ + "'http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-$REQUIRED_PKG_CONFIG_VERSION.tar.gz" + require_m4macro pkg.m4 +fi + +if $want_gtk_doc; then + version_check gtk-doc GTKDOCIZE gtkdocize $REQUIRED_GTK_DOC_VERSION \ + "http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/" + require_m4macro gtk-doc.m4 +fi + +if $want_gnome_doc_utils; then + version_check gnome-doc-utils GNOME_DOC_PREPARE gnome-doc-prepare $REQUIRED_GNOME_DOC_UTILS_VERSION \ + "http://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/" +fi + +if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then + version_check gnome-common DOC_COMMON gnome-doc-common \ + $REQUIRED_DOC_COMMON_VERSION " " +fi + +check_m4macros + +if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then + printerr "**Warning**: I am going to run \`configure' with no arguments." + printerr "If you wish to pass any to it, please specify them on the" + printerr \`$0\'" command line." + printerr +fi + +topdir=`pwd` +for configure_ac in $configure_files; do + dirname=`dirname $configure_ac` + basename=`basename $configure_ac` + if [ -f $dirname/NO-AUTO-GEN ]; then + echo skipping $dirname -- flagged as no auto-gen + elif [ ! -w $dirname ]; then + echo skipping $dirname -- directory is read only + else + printbold "Processing $configure_ac" + cd $dirname + + # Note that the order these tools are called should match what + # autoconf's "autoupdate" package does. See bug 138584 for + # details. + + # programs that might install new macros get run before aclocal + if grep "^A[CM]_PROG_LIBTOOL" $basename >/dev/null || + grep "^LT_INIT" $basename >/dev/null; then + printbold "Running $LIBTOOLIZE..." + $LIBTOOLIZE --force --copy || exit 1 + fi + + if grep "^AM_GLIB_GNU_GETTEXT" $basename >/dev/null; then + printbold "Running $GLIB_GETTEXTIZE... Ignore non-fatal messages." + echo "no" | $GLIB_GETTEXTIZE --force --copy || exit 1 + elif grep "^AM_GNU_GETTEXT" $basename >/dev/null; then + if grep "^AM_GNU_GETTEXT_VERSION" $basename > /dev/null; then + printbold "Running autopoint..." + autopoint --force || exit 1 + else + printbold "Running $GETTEXTIZE... Ignore non-fatal messages." + echo "no" | $GETTEXTIZE --force --copy || exit 1 + fi + fi + + if grep "^AC_PROG_INTLTOOL" $basename >/dev/null || + grep "^IT_PROG_INTLTOOL" $basename >/dev/null; then + printbold "Running $INTLTOOLIZE..." + $INTLTOOLIZE --force --copy --automake || exit 1 + fi + if grep "^GTK_DOC_CHECK" $basename >/dev/null; then + printbold "Running $GTKDOCIZE..." + $GTKDOCIZE --copy || exit 1 + fi + + if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then + printbold "Running gnome-doc-common..." + gnome-doc-common --copy || exit 1 + fi + if grep "^GNOME_DOC_INIT" $basename >/dev/null; then + printbold "Running $GNOME_DOC_PREPARE..." + $GNOME_DOC_PREPARE --force --copy || exit 1 + fi + + # Now run aclocal to pull in any additional macros needed + + # if the AC_CONFIG_MACRO_DIR() macro is used, pass that + # directory to aclocal. + m4dir=`cat "$basename" | grep '^AC_CONFIG_MACRO_DIR' | sed -n -e 's/AC_CONFIG_MACRO_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q` + if [ -n "$m4dir" ]; then + m4dir="-I $m4dir" + fi + printbold "Running $ACLOCAL..." + $ACLOCAL $m4dir $ACLOCAL_FLAGS || exit 1 + + if grep "GNOME_AUTOGEN_OBSOLETE" aclocal.m4 >/dev/null; then + printerr "*** obsolete gnome macros were used in $configure_ac" + fi + + # Now that all the macros are sorted, run autoconf and autoheader ... + printbold "Running $AUTOCONF..." + $AUTOCONF || exit 1 + if grep "^A[CM]_CONFIG_HEADER" $basename >/dev/null; then + printbold "Running $AUTOHEADER..." + $AUTOHEADER || exit 1 + # this prevents automake from thinking config.h.in is out of + # date, since autoheader doesn't touch the file if it doesn't + # change. + test -f config.h.in && touch config.h.in + fi + + # Finally, run automake to create the makefiles ... + printbold "Running $AUTOMAKE..." + if [ -f COPYING ]; then + cp -pf COPYING COPYING.autogen_bak + fi + if [ -f INSTALL ]; then + cp -pf INSTALL INSTALL.autogen_bak + fi + if [ $REQUIRED_AUTOMAKE_VERSION != 1.4 ]; then + $AUTOMAKE --gnu --add-missing --copy -Wno-portability || exit 1 + else + $AUTOMAKE --gnu --add-missing --copy || exit 1 + fi + if [ -f COPYING.autogen_bak ]; then + cmp COPYING COPYING.autogen_bak > /dev/null || cp -pf COPYING.autogen_bak COPYING + rm -f COPYING.autogen_bak + fi + if [ -f INSTALL.autogen_bak ]; then + cmp INSTALL INSTALL.autogen_bak > /dev/null || cp -pf INSTALL.autogen_bak INSTALL + rm -f INSTALL.autogen_bak + fi + + cd "$topdir" + fi +done + +conf_flags="" + +if $want_maintainer_mode; then + conf_flags="--enable-maintainer-mode" +fi + +if test x$NOCONFIGURE = x; then + printbold Running $srcdir/configure $conf_flags "$@" ... + $srcdir/configure $conf_flags "$@" \ + && echo Now type \`make\' to compile $PKG_NAME || exit 1 +else + echo Skipping configure process. +fi diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index 20e4f3d2f..5dc9ee675 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,35 +1,33 @@ -# $Id: PKGBUILD 84329 2013-02-16 17:25:27Z bgyorgy $ +# $Id: PKGBUILD 84919 2013-02-26 05:29:14Z bgyorgy $ +# Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: M0Rf30 # Contributor: unifiedlinux # Contributor: CReimer pkgname=cinnamon -pkgver=1.6.7 -pkgrel=7 +pkgver=1.7.1 +pkgrel=3 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') url="http://cinnamon.linuxmint.com/" license=('GPL2') -depends=('accountsservice' 'caribou' 'gjs' 'gnome-bluetooth' 'gnome-icon-theme' - 'gnome-menus' 'gnome-settings-daemon' 'gnome-session' 'gnome-themes-standard' - 'gstreamer0.10' 'networkmanager' 'muffin' 'python2-dbus' - 'python2-gconf' 'python2-imaging' 'python2-lxml') +depends=('accountsservice' 'caribou' 'clutter-gtk' 'gjs' 'gnome-bluetooth' + 'gnome-icon-theme' 'gnome-menus' 'gnome-settings-daemon' 'gnome-session' + 'gnome-themes-standard' 'gstreamer0.10' 'networkmanager' 'muffin' 'python2-dbus' + 'python2-gconf' 'python2-imaging' 'python2-pyinotify' 'python2-lxml') makedepends=('gnome-common' 'intltool') -optdepends=('gnome-control-center: open settings from various applets' - 'gnome-screensaver: lock screen' +optdepends=('cinnamon-control-center: extended configurations for Cinnamon' + 'cinnamon-screensaver: lock screen' 'gucharmap: show character table from Keyboard applet' 'libgnomekbd: show keyboard layout from Keyboard applet' - 'nautilus: the official Gnome file manager') + 'nemo: the official Cinnamon file manager (forked from Nautilus)' + 'webkitgtk3: download applets from Spices website in cinnamon-settings') options=('!libtool' '!emptydirs') install=${pkgname}.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/$pkgver" - "cinnamon-screensaver.desktop" - "cinnamon2d-screensaver.desktop" "gnome-autogen.sh" "keyboard_applet.patch") -md5sums=('ea73c6367d43d82c61f977477bf0c08c' - 'd55c079cdc8bec606f510f87b2a6f776' - '5c6af851ab1cf7e9219f11d86353196a' +md5sums=('13daa8fde1480bbee25eddc2e2630319' 'a925691c9b57a6a884dcf07da057fd1f' '2b1ece84416c3e4de030be15f1774d82') @@ -60,20 +58,13 @@ build() { package() { cd ${srcdir}/linuxmint-Cinnamon* make DESTDIR="${pkgdir}" install - + # Python2 fix - sed -i 's/bin\/python/bin\/python2/g' \ - "${pkgdir}/usr/bin/$pkgname-launcher" \ + sed -i 's|#! /usr/bin/python|#! /usr/bin/python2|' \ "${pkgdir}/usr/bin/$pkgname-menu-editor" \ - "${pkgdir}/usr/bin/$pkgname-settings" \ "${pkgdir}/usr/share/$pkgname/applets/panel-launchers@$pkgname.org/$pkgname-add-panel-launcher.py" - - sed -i 's/env python/env python2/g' \ - "${pkgdir}/usr/lib/$pkgname-settings/$pkgname-settings.py" - # Screensaver gnome 3.6 fix - mkdir -p $pkgdir/etc/xdg/autostart - cp $srcdir/cinnamon*-screensaver.desktop $pkgdir/etc/xdg/autostart + find "${pkgdir}" -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' } diff --git a/community/connman/PKGBUILD b/community/connman/PKGBUILD index 64f0775f6..18fd2b5f4 100644 --- a/community/connman/PKGBUILD +++ b/community/connman/PKGBUILD @@ -1,9 +1,9 @@ -#$Id: PKGBUILD 83726 2013-02-04 18:08:38Z dwallace $ +#$Id: PKGBUILD 85296 2013-02-28 15:31:09Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com> pkgname=connman -pkgver=1.11 +pkgver=1.12 pkgrel=1 pkgdesc="Wireless LAN network manager" url="http://connman.net/" @@ -15,11 +15,9 @@ optdepends=('bluez: Support for Bluetooth devices' 'wpa_supplicant: For WiFi devices') makedepends=('bluez' 'wpa_supplicant' 'openconnect' 'openvpn') options=('!libtool') -source=('connmand-daemon' - "http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.bz2" +source=("http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'allow_group_network.diff') -md5sums=('88ece7cbf1d0d289545ce4f8553fdab8' - '73f1f93ce503ee80dcc8c9bdda2c3426' +md5sums=('41e5bbc603d031459df4ff243b8318f0' 'a8d22ee089fb0ed725130d16ad393047') build() { @@ -40,9 +38,6 @@ build() { } package(){ - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - install -Dm755 "$srcdir"/connmand-daemon "$pkgdir"/etc/rc.d/connmand + make -C "${srcdir}/${pkgname}-${pkgver}" DESTDIR="${pkgdir}" install install -Dm755 "$srcdir/$pkgname-$pkgver/client/${pkgname}ctl" "$pkgdir/usr/sbin/${pkgname}ctl" } diff --git a/community/connman/connmand-daemon b/community/connman/connmand-daemon deleted file mode 100755 index aff1ddeb2..000000000 --- a/community/connman/connmand-daemon +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -DESC="Connection Manager" -NAME="connmand" -ARGS="" -DAEMON="/usr/sbin/$NAME" - -PID=`pidof -o %PPID ${DAEMON}` -case "$1" in - start) - stat_busy "Starting ${DESC}" - if [ -z "$PID" ]; then - ${DAEMON} ${ARGS} - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon ${NAME} - stat_done - fi - ;; - stop) - stat_busy "Stopping ${DESC}" - [ ! -z "$PID" ] && killall ${DAEMON} &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ${NAME} - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD index 075180ad7..20c0e739d 100644 --- a/community/converseen/PKGBUILD +++ b/community/converseen/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 84204 2013-02-13 17:18:42Z giovanni $ +# $Id: PKGBUILD 85338 2013-03-01 10:29:17Z andrea $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: archtux <antonio.arias99999 at gmail.com> pkgname=converseen pkgver=0.5.3 -pkgrel=1 +pkgrel=2 pkgdesc="The batch image converter and resizer" arch=('i686' 'x86_64' 'mips64el') url="http://converseen.sourceforge.net/" license=('GPL3') -depends=('imagemagick' 'qt' 'libwmf' 'openexr') +depends=('imagemagick' 'qt4' 'libwmf' 'openexr') makedepends=('cmake') install=converseen.install source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD index fb91a2a5e..46bba2d05 100644 --- a/community/cppcheck/PKGBUILD +++ b/community/cppcheck/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 82520 2013-01-20 01:50:26Z stephane $ +# $Id: PKGBUILD 85339 2013-03-01 10:29:27Z andrea $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=cppcheck pkgver=1.58 -pkgrel=1 +pkgrel=2 pkgdesc="A tool for static C/C++ code analysis" arch=('i686' 'x86_64' 'mips64el') url="http://cppcheck.wiki.sourceforge.net/" license=('GPL') -depends=('pcre' 'qt') +depends=('pcre' 'qt4') makedepends=('docbook-xsl') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) sha1sums=('c7f597c600c30b1a5e9c6b3228a11e9872d562e5') @@ -16,7 +16,7 @@ sha1sums=('c7f597c600c30b1a5e9c6b3228a11e9872d562e5') build() { cd "${srcdir}/${pkgname}-${pkgver}" make - make DB2MAN=/usr/share/xml/docbook/xsl-stylesheets-1.77.1/manpages/docbook.xsl man + make DB2MAN=/usr/share/xml/docbook/xsl-stylesheets-1.78.0/manpages/docbook.xsl man cd gui export HAVE_RULES=yes diff --git a/community/cuyo/PKGBUILD b/community/cuyo/PKGBUILD index 868d99392..994e167d0 100644 --- a/community/cuyo/PKGBUILD +++ b/community/cuyo/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 60801 2011-12-18 13:21:49Z jlichtblau $ +# $Id: PKGBUILD 84769 2013-02-24 13:12:51Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=cuyo -pkgver=2.1.2 +pkgver=2.0.0 pkgrel=1 +epoch=1 pkgdesc="Tetris-style puzzle game for up to two players with a twist" arch=('i686' 'x86_64' 'mips64el') url="http://www.karimmi.de/cuyo/" @@ -12,13 +13,13 @@ depends=('desktop-file-utils' 'hicolor-icon-theme' 'sdl' 'sdl_mixer' 'sdl_image' makedepends=('patch') install=$pkgname.install changelog=$pkgname.changelog -source=(http://download.savannah.gnu.org/releases/$pkgname/$pkgname-2.~-1.2.tar.gz \ +source=(http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz \ $pkgname.diff) -sha256sums=('3fb44af4e6f8d205d11d44b5a96ffa4a11eab5a4fa86897463c0c6ca0658adb0' - 'dd81909594072f030571f2afc39cc69838eed26304d2d89949ac1c2c850dcafe') +sha256sums=('531cfb989087199f643ac4b18ff9cc50793cc3fa07ee06f394f73d153c09ae34' + 'efceed1489c551f5ae8909df3ad57f302f8105cbb1e735d8ece44269e886ce7c') build() { - cd ${srcdir}/$pkgname-2.~-1.2 + cd ${srcdir}/$pkgname-$pkgver patch -Np0 -i ${srcdir}/$pkgname.diff @@ -27,7 +28,7 @@ build() { } package() { - cd ${srcdir}/$pkgname-2.~-1.2 + cd ${srcdir}/$pkgname-$pkgver make DESTDIR=${pkgdir} install } diff --git a/community/cuyo/cuyo.changelog b/community/cuyo/cuyo.changelog index 2212ac481..f7e64c7af 100644 --- a/community/cuyo/cuyo.changelog +++ b/community/cuyo/cuyo.changelog @@ -1,5 +1,8 @@ +2013-02-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * cuyo 2.0.0-1 + 2011-12-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * cuyo 2.1.2-1 + * cuyo 2.~1.2-1 2009-11-16 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to minor release 2.1.1-4 + * Update to minor release 2.~1.1-4 diff --git a/community/cuyo/cuyo.diff b/community/cuyo/cuyo.diff index 3da3b1c64..e38fedbdf 100644 --- a/community/cuyo/cuyo.diff +++ b/community/cuyo/cuyo.diff @@ -1,11 +1,6 @@ ---- icons/cuyo.desktop 2011-12-18 13:48:54.000000000 +0100 -+++ icons/cuyo.desktop 2011-12-18 13:48:54.000000000 +0100 -@@ -7,4 +7,4 @@ - Categories=Game;BlocksGame; +--- icons/cuyo.desktop~ 2011-03-26 16:20:01.000000000 +0100 ++++ icons/cuyo.desktop 2013-02-24 14:00:34.385662015 +0100 +@@ -7 +6,0 @@ -Encoding=UTF-8 - Comment=Play a tetris like game with many levels +@@ -8,0 +8 @@ +Comment[cs]=Hra podobná tetrisu s mnoha úrovněmi - Comment[de]=Ein Tetris-artiges Spiel mit vielen Leveln spielen -@@ -12,2 +12 @@ - GenericName=Tetris like game -- diff --git a/community/cuyo/cuyo.install b/community/cuyo/cuyo.install index 4c0972beb..3e6bc7c16 100644 --- a/community/cuyo/cuyo.install +++ b/community/cuyo/cuyo.install @@ -1,5 +1,5 @@ post_install() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true + which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate update-desktop-database -q } diff --git a/community/cx_freeze/FreezePython.sh b/community/cx_freeze/FreezePython.sh deleted file mode 100644 index 5bba21cac..000000000 --- a/community/cx_freeze/FreezePython.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd /usr/share/cx-freeze -./FreezePython "$@" diff --git a/community/cx_freeze/PKGBUILD b/community/cx_freeze/PKGBUILD deleted file mode 100644 index 383748df3..000000000 --- a/community/cx_freeze/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 83132 2013-01-27 16:11:45Z pierre $ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: Roberto Alsina <ralsina@kde.org> - -pkgname=cx_freeze -_tarname=cx_Freeze -pkgver=4.2.3 -pkgrel=2 -pkgdesc="A set of utilities for freezing Python scripts into executables" -arch=('i686' 'x86_64') -url="http://www.python.net/crew/atuining/cx_Freeze/" -license=('custom') -depends=('python2') -provides=('cxfreeze') -source=("http://downloads.sourceforge.net/cx-freeze/$_tarname-$pkgver.tar.gz" - 'FreezePython.sh') -md5sums=('a524cfd23de5d37e0ec9400ba1ccd6ad' - '5cc60d1644eba12a57c22cc1348a4afd') - -package() { - cd "$srcdir/$_tarname-$pkgver" - - python2 setup.py install --root "$pkgdir/" --optimize 1 - - install -d "$pkgdir"/usr/share/cx-freeze/{bases,initscripts} - install -m755 source/bases/* "$pkgdir/usr/share/cx-freeze/bases" - install -m644 initscripts/* "$pkgdir/usr/share/cx-freeze/initscripts" - install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/cx_freeze/COPYING" -} diff --git a/community/djview4/PKGBUILD b/community/djview4/PKGBUILD index c6acc6c63..2a9d9c6f1 100644 --- a/community/djview4/PKGBUILD +++ b/community/djview4/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84432 2013-02-19 00:14:18Z bisson $ +# $Id: PKGBUILD 85340 2013-03-01 10:29:36Z andrea $ # Contributor: Paulo Matias <matias.archlinux-br.org> # Contributor: Leslie P. Polzer <polzer.gnu.org> # Contributor: erm67 <erm67.yahoo.it> @@ -7,12 +7,12 @@ pkgname=djview4 pkgver=4.9 -pkgrel=1 +pkgrel=2 pkgdesc='Portable DjVu viewer and browser plugin' url='http://djvu.sourceforge.net/djview4.html' license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('qt' 'djvulibre') +depends=('qt4' 'djvulibre') source=("http://downloads.sourceforge.net/djvu/djview-${pkgver}.tar.gz") sha1sums=('07f97e32919bfb34ff2d59b928c47ffbc96dcfc5') @@ -20,7 +20,8 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - QTDIR=/usr ./configure --prefix=/usr + source /etc/profile.d/qt4.sh + ./configure --prefix=/usr sed 's/netscape/mozilla/g' -i nsdejavu/Makefile make } diff --git a/community/dspam/PKGBUILD b/community/dspam/PKGBUILD index 030116559..e95ec610b 100644 --- a/community/dspam/PKGBUILD +++ b/community/dspam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77118 2012-10-05 10:37:20Z spupykin $ +# $Id: PKGBUILD 85298 2013-02-28 15:36:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=dspam pkgver=3.10.2 -pkgrel=2 +pkgrel=3 pkgdesc="A scalable, open-source statistical anti-spam filter" arch=('i686' 'x86_64' 'mips64el') url="http://dspam.nuclearelephant.com/" @@ -13,29 +13,35 @@ 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') +makedepends=('libmysqlclient' 'postgresql-libs' 'db' 'sqlite' 'libldap') optdepends=('libmysqlclient: MySQL support' 'postgresql-libs: PostgreSQL support' 'db: BerkeleyDB support' - 'sqlite: SQLite support') + 'sqlite: SQLite support' + 'clamav: ClamAV support' + 'libldap: external lookup support') options=('zipman' 'docs' '!libtool') install=$pkgname.install source=(http://downloads.sourceforge.net/project/dspam/dspam/dspam-$pkgver/dspam-$pkgver.tar.gz dspam.logrotated dspam dspam.service - dspam.tmpfiles) + dspam.tmpfiles + dspam_maintenance.cron) md5sums=('0e0e405d3284485b2a43f47eaf6b09bb' - '2163ca41de383f09f4d754e2d35cb158' + 'cec7e3df4cbc6feca387fb516a5b3490' 'bb2300eff5b2a6eb987750c71a2c2169' '1581a94598cec370b66f37b118970676' - '933643f2204ccbd7e451a439f83db1ea') + '933643f2204ccbd7e451a439f83db1ea' + 'ebfb0fec16a56f6e1a3a61ced2d5015d') build() { - OPTS="--with-dspam-owner=dspam --with-dspam-group=dspam --enable-daemon --enable-virtual-users \ + OPTS="--with-dspam-owner=dspam --with-dspam-group=dspam --with-dspam-home-group=dspam --with-dspam-mode=2510 \ + --enable-daemon --enable-virtual-users --enable-large-scale --enable-long-usernames --enable-external-lookup \ + --enable-split-configuration --enable-syslog --enable-clamav \ + --with-dspam-home=/var/lib/dspam --with-logdir=/var/log/dspam --with-logfile=/var/log/dspam/dspam.log \ --with-mysql-includes=/usr/include/mysql --with-mysql-libraries=/usr/lib \ - --with-storage-driver="mysql_drv,libdb4_drv,pgsql_drv,sqlite3_drv,hash_drv" --with-dspam-home=/var/lib/dspam \ - --with-logdir=/var/log/dspam --enable-preferences-extension --enable-large-scale" + --with-storage-driver="mysql_drv,libdb4_drv,pgsql_drv,sqlite3_drv,hash_drv" --enable-preferences-extension" cd $srcdir/$pkgname-$pkgver [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --sysconfdir=/etc/dspam --localstatedir=/var ${OPTS} @@ -52,25 +58,32 @@ package() { find $pkgdir/srv/http/dspam/ -type f -name '*.in' -exec rm -f {} \; install -d $pkgdir/etc/logrotate.d \ - $pkgdir/etc/rc.d $pkgdir/var/lib/dspam/{mysql,pgsql} + $pkgdir/etc/rc.d \ + $pkgdir/usr/share/dspam/{mysql,pgsql} install -m644 ../dspam.logrotated $pkgdir/etc/logrotate.d/dspam install -m755 ../dspam $pkgdir/etc/rc.d sed -i 's|#ServerPID|ServerPID|' $pkgdir/etc/dspam/dspam.conf - sed -e 's:^#*\(ServerDomainSocketPath[\t ]\{1,\}\).*:\1\"/var/run/dspam/dspam.sock\":gI' \ - -e 's:^#*\(ServerPID[\t ]\{1,\}\).*:\1/var/run/dspam/dspam.pid:gI' \ + sed -e 's:^#*\(ServerDomainSocketPath[\t ]\{1,\}\).*:\1\"/run/dspam/dspam.sock\":gI' \ + -e 's:^#*\(ServerPID[\t ]\{1,\}\).*:\1/run/dspam/dspam.pid:gI' \ -i $pkgdir/etc/dspam/dspam.conf sed -i 's|/var/lib/mysql/mysql.sock|/tmp/mysql.sock|' $pkgdir/etc/dspam/dspam.conf - cp -r src/tools.mysql_drv/*.sql $pkgdir/var/lib/dspam/mysql - cp -r src/tools.pgsql_drv/*.sql $pkgdir/var/lib/dspam/pgsql + cp -r src/tools.mysql_drv/*.sql $pkgdir/usr/share/dspam/mysql + cp -r src/tools.pgsql_drv/*.sql $pkgdir/usr/share/dspam/pgsql + + # install dspam_maintenance from contrib/ + install -Dm0755 contrib/dspam_maintenance/dspam_maintenance.sh $pkgdir/usr/bin/dspam_maintenance + install -Dm0644 contrib/dspam_maintenance/dspam_maintenance.1 $pkgdir/usr/share/man/man1/dspam_maintenance.1 + install -Dm0755 $srcdir/dspam_maintenance.cron $pkgdir/etc/cron.daily/dspam_maintenance cd $pkgdir/usr/share/man/man3 find -type l -exec ln -sf libdspam.3 {} \; - chmod 0755 $pkgdir/usr/bin/* + # make logrotate happy + chmod 750 $pkgdir/var/log/dspam install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf diff --git a/community/dspam/dspam.install b/community/dspam/dspam.install index fc74fe55e..4eac46ede 100644 --- a/community/dspam/dspam.install +++ b/community/dspam/dspam.install @@ -3,8 +3,10 @@ post_install() { groupadd -g 115 dspam && echo "done." echo -n "adding dspam system user... " useradd -c "DSPAM Daemon" -u 115 -d /var/lib/dspam -g dspam -s /bin/false dspam \ - && echo "done." + && echo "done." passwd -l dspam &>/dev/null + chown root:dspam usr/bin/dspamc + chmod g+s usr/bin/dspamc cat << EOF >>> To populate the DSPAM database, you need to follow several steps. @@ -27,6 +29,11 @@ cat << EOF EOF } +post_upgrade() { + chown root:dspam usr/bin/dspamc + chmod g+s usr/bin/dspamc +} + post_remove() { echo -n -e "\nremoving dspam system user and group..." userdel dspam && echo "done." diff --git a/community/dspam/dspam.logrotated b/community/dspam/dspam.logrotated index 89db6f565..c73b1dcb3 100644 --- a/community/dspam/dspam.logrotated +++ b/community/dspam/dspam.logrotated @@ -1,5 +1,10 @@ -/var/log/dspam/sql.errors /var/log/dspam/system.log /var/log/dspam/dspam.debug /var/log/dspam/dspam.messages { - weekly - compress - create 0644 dspam dspam +/var/log/dspam/sql.errors +/var/lib/dspam/system.log +/var/log/dspam/dspam.debug +/var/log/dspam/dspam.messages +/var/log/dspam/dspam.log { + weekly + compress + missingok + copytruncate } diff --git a/community/dspam/dspam_maintenance.cron b/community/dspam/dspam_maintenance.cron new file mode 100644 index 000000000..940d8aed1 --- /dev/null +++ b/community/dspam/dspam_maintenance.cron @@ -0,0 +1,6 @@ +#!/bin/sh + +# DSPAM maintenance tasks +# check "man 1 dspam_maintenance" for more options + +/usr/bin/dspam_maintenance --verbose --purgescriptdir=/usr/share/dspam 1> /dev/null diff --git a/community/erlang-cl/PKGBUILD b/community/erlang-cl/PKGBUILD index ec9bcc128..bd40ff483 100644 --- a/community/erlang-cl/PKGBUILD +++ b/community/erlang-cl/PKGBUILD @@ -4,7 +4,7 @@ pkgname=erlang-cl pkgver=1.0 -pkgrel=2 +pkgrel=3 arch=('x86_64' 'i686') pkgdesc='OpenCL binding for Erlang' url="http://github.com/tonyrog/cl" @@ -13,21 +13,21 @@ depends=('erlang' 'libcl' 'bash') replaces=('cl') makedepends=('opencl-headers') source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/tonyrog/cl/tar.gz/master") -sha256sums=('e2cb407489ebe1d8e8f287283eb5c715d559ce95255f6bbcac137cb84c500be6') -_dirname='cl-master' +sha256sums=('76991eba2418ced8e28f4237878e1ec8bb231193c614dab63623ff518b2dc56c') if [ "$CARCH" = "x86_64" ] then _wordsize=64 else _wordsize=32 fi +_dirname='cl-master' build() { cd "$srcdir/$_dirname/c_src" make configure - ./configure --with-wordsize=$_wordsize --prefix=/usr - make all$_wordsize + ./configure --with-wordsize="$_wordsize" --prefix=/usr + make "all$_wordsize" rm config.* } @@ -36,6 +36,7 @@ package() { mkdir -p "$pkgdir/usr/lib/erlang/lib/cl-$pkgver" cp -r * "$pkgdir/usr/lib/erlang/lib/cl-$pkgver" + install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } # vim:set ts=2 sw=2 et: diff --git a/community/erlang-nox/PKGBUILD b/community/erlang-nox/PKGBUILD index 77f83f11c..899e1e02f 100644 --- a/community/erlang-nox/PKGBUILD +++ b/community/erlang-nox/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84208 2013-02-13 18:26:31Z arodseth $ +# $Id: PKGBUILD 85253 2013-02-28 10:04:50Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Lukas Fleischer <archlinux@cryptocrack.de> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> @@ -7,8 +7,8 @@ # Contributor: Ricardo Catalinas Jiménez <jimenezrick@gmail.com> pkgname=erlang-nox -pkgver=R15B03_1 -pkgrel=3 +pkgver=R16B +pkgrel=1 pkgdesc='General-purpose concurrent functional programming language developed by Ericsson (headless version)' arch=('x86_64' 'i686') url='http://www.erlang.org/' @@ -22,8 +22,8 @@ optdepends=('erlang-unixodbc: database support' 'lksctp-tools: for SCTP support') source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz" "http://www.erlang.org/download/otp_doc_man_${pkgver/_/-}.tar.gz") -sha256sums=('4bccac86dd76aec050252e44276a0283a0df9218e6470cf042a9b9f9dfc9476c' - '07980d8014c7cf8194b7078c137353f5083992add4663ced3dcba2ff91f228d8') +sha256sums=('f01c2cfe512d3118fd3398a66bdb82bea6ad0f45b464a46a58e452264b7682cd' + 'f7b1baa088d4ecda4a86944d3a782fcbf80c6b9161756bb50fec9e8d129176b9') build() { cd "$srcdir/otp_src_${pkgver/_1/}" diff --git a/community/erlang-sdl/PKGBUILD b/community/erlang-sdl/PKGBUILD index a82ba0d97..1968dac35 100644 --- a/community/erlang-sdl/PKGBUILD +++ b/community/erlang-sdl/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 80318 2012-11-19 22:01:23Z arodseth $ +# $Id: PKGBUILD 85286 2013-02-28 12:24:52Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: kappa <kappacurve@gmail.com> pkgname=erlang-sdl pkgver=1.2 -pkgrel=2 +pkgrel=6 arch=('x86_64' 'i686' 'mips64el') pkgdesc='SDL and OpenGL bindings for Erlang (r15b-driver-compat branch)' url='http://esdl.sourceforge.net/' license=('custom') -depends=('erlang' 'sdl' 'glu') +depends=('erlang' 'sdl' 'glu' 'libgl' 'erlang') +makedepends=('mesa-libgl') replaces=('esdl') source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/dgud/esdl/tar.gz/dgud/r15b-driver-compat") sha256sums=('a14d695229b93401a304b773874e87c02c5b304d4b5b66f35cba75e140672086') @@ -26,13 +27,6 @@ package() { cd "$srcdir/$_dirname" make INSTALLDIR="$pkgdir/usr/lib/erlang/lib/esdl-$pkgver" install - - ## An attempt to make wings3d compile with esdl 1.2 - #ln -s /usr/lib/erlang/lib/wx-0.99/include/glu.hrl \ - # "$pkgdir/usr/lib/erlang/lib/esdl-$pkgver/include/glu.hrl" - #ln -s /usr/lib/erlang/lib/wx-0.99/include/gl.hrl \ - # "$pkgdir/usr/lib/erlang/lib/esdl-$pkgver/include/gl.hrl" - install -Dm644 license.terms "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD index 044859d74..e967ccf95 100644 --- a/community/erlang/PKGBUILD +++ b/community/erlang/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84206 2013-02-13 17:23:45Z arodseth $ +# $Id: PKGBUILD 85255 2013-02-28 10:10:52Z arodseth $ # Maintainer: Lukas Fleischer <archlinux@cryptocrack.de> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> @@ -8,16 +8,16 @@ pkgbase=erlang pkgname=('erlang' 'erlang-unixodbc') -pkgver=R15B03_1 -pkgrel=3 +pkgver=R16B +pkgrel=1 arch=('x86_64' 'i686' 'mips64el') url='http://www.erlang.org/' license=('custom') makedepends=('perl' 'mesa' 'lksctp-tools' 'unixodbc') source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz" "http://www.erlang.org/download/otp_doc_man_${pkgver/_/-}.tar.gz") -sha256sums=('4bccac86dd76aec050252e44276a0283a0df9218e6470cf042a9b9f9dfc9476c' - '07980d8014c7cf8194b7078c137353f5083992add4663ced3dcba2ff91f228d8') +sha256sums=('f01c2cfe512d3118fd3398a66bdb82bea6ad0f45b464a46a58e452264b7682cd' + 'f7b1baa088d4ecda4a86944d3a782fcbf80c6b9161756bb50fec9e8d129176b9') build() { cd "$srcdir/otp_src_${pkgver/_1/}" diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD index 5335f5678..a4e19c4cc 100644 --- a/community/fatrat/PKGBUILD +++ b/community/fatrat/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 83247 2013-01-28 16:49:32Z stephane $ +# $Id: PKGBUILD 85341 2013-03-01 10:29:45Z andrea $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=fatrat pkgver=1.2.0_beta2 -pkgrel=4 +pkgrel=5 pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more" arch=('i686' 'x86_64' 'mips64el') url="http://fatrat.dolezel.info/" license=('GPL') -depends=('gloox' 'qt' 'libtorrent-rasterbar' 'pion' 'qtwebkit') +depends=('gloox' 'libtorrent-rasterbar' 'pion' 'qtwebkit') optdepends=('geoip: GeoIP support') makedepends=('boost' 'cmake' 'java-environment') source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.xz) @@ -16,9 +16,6 @@ md5sums=('ad823d2a81f0583316ece815b928c71b') build() { cd "$srcdir/$pkgname-$pkgver" - . /etc/profile.d/jre.sh - . /etc/profile.d/jdk.sh - cmake \ -DWITH_EVERYTHING=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/community/fbreader/PKGBUILD b/community/fbreader/PKGBUILD index b6493861c..a555f65ac 100644 --- a/community/fbreader/PKGBUILD +++ b/community/fbreader/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 80756 2012-12-03 10:06:37Z spupykin $ +# $Id: PKGBUILD 85342 2013-03-01 10:29:55Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=fbreader pkgver=0.99.4 -pkgrel=1 +pkgrel=2 pkgdesc="An e-book reader for Linux" arch=('i686' 'x86_64' 'mips64el') url="http://www.fbreader.org/" license=('GPL') -depends=('fribidi' 'bzip2' 'curl' 'qt' 'liblinebreak' 'sqlite') +depends=('fribidi' 'bzip2' 'curl' 'qt4' 'liblinebreak' 'sqlite') makedepends=('ccache') source=(http://www.fbreader.org/files/desktop/fbreader-sources-$pkgver.tgz) md5sums=('ed13a9c3aeb68aaa98a1dd6f7947a31d') @@ -19,8 +19,11 @@ build() { export UI_TYPE=qt4 export TARGET_STATUS=release cd $srcdir/fbreader-$pkgver - sed -i 's|moc-qt4|moc|g' makefiles/arch/desktop.mk sed -i 's|-lunibreak|-llinebreak|g' makefiles/config.mk zlibrary/text/Makefile - make ZLSHARED=no + make ZLSHARED=no MOC=/usr/bin/moc-qt4 +} + +package() { + cd $srcdir/fbreader-$pkgver make ZLSHARED=no DESTDIR=$pkgdir install } diff --git a/community/fceux/PKGBUILD b/community/fceux/PKGBUILD index 08764250c..578d0a67e 100644 --- a/community/fceux/PKGBUILD +++ b/community/fceux/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 83618 2013-02-03 23:24:07Z arodseth $ +# $Id: PKGBUILD 85226 2013-02-27 19:58:28Z andrea $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contriutor: Eric Belanger <eric@archlinux.org> # Contributor: Jo Christian Bergskås <jcberg@gmail.com> pkgname=fceux pkgver=2.2.0 -pkgrel=2 +pkgrel=3 url='http://www.fceux.com/' pkgdesc='Fast and ultra-compatible NES/Famicom emulator' arch=('x86_64' 'i686' 'mips64el') license=('GPL') depends=('sdl' 'gtk2' 'gd' 'desktop-file-utils' 'lua51' 'libgl') -makedepends=('scons' 'mesa' 'glu') +makedepends=('scons' 'mesa-libgl' 'glu') optdepends=('xchm: for viewing the manual') install=$pkgname.install source=("https://sourceforge.net/projects/fceultra/files/Source%20Code/$pkgver%20src/$pkgname-$pkgver.src.tar.gz") diff --git a/community/fcitx-mozc/PKGBUILD b/community/fcitx-mozc/PKGBUILD index fbe38c32c..42350d6c4 100644 --- a/community/fcitx-mozc/PKGBUILD +++ b/community/fcitx-mozc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 84175 2013-02-13 04:50:46Z fyan $ +# $Id: PKGBUILD 85344 2013-03-01 10:30:17Z andrea $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com> ## Mozc compile option _bldtype=Release -_zipcoderel=201211 #201212 is broken, for now +_zipcoderel=201301 _protobuf_ver=2.4.1 _pkgbase=mozc @@ -13,12 +13,12 @@ pkgname=fcitx-mozc pkgdesc="Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)" pkgver=1.6.1187.102 _patchver=${pkgver}.3 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/mozc/" license=('custom') -depends=('qt' 'fcitx' 'zinnia') -makedepends=('pkg-config' 'python2' 'gtest' 'qt' 'curl' 'fcitx' 'gtk2') +depends=('qt4' 'fcitx' 'zinnia') +makedepends=('pkg-config' 'python2' 'gtest' 'curl' 'gtk2' 'mesa') replaces=('mozc-fcitx') conflicts=('mozc' 'mozc-server' 'mozc-utils-gui' 'mozc-fcitx') source=(http://mozc.googlecode.com/files/mozc-${pkgver}.tar.bz2 @@ -33,17 +33,25 @@ build() { ln -sf `which python2` ./python PATH="${srcdir}:${PATH}" + #source /etc/profile.d/qt4.sh + + # Update: Fix qt4 include path too # Fix compatibility with google-glog 0.3.3 (symbol conflict) #CFLAGS="${CFLAGS} -DFLAGS_log_dir=FLAGS_mozc_log_dir" #CXXFLAGS="${CXXFLAGS} -DFLAGS_log_dir=FLAGS_mozc_log_dir" - CFLAGS="${CFLAGS} -fvisibility=hidden" - CXXFLAGS="${CXXFLAGS} -fvisibility=hidden" + CFLAGS="${CFLAGS} -I/usr/include/qt4 -fvisibility=hidden" + CXXFLAGS="${CXXFLAGS} -I/usr/include/qt4 -fvisibility=hidden" cd "${srcdir}/${_pkgbase}-${pkgver}" - + + # Apply fcitx patch rm unix/fcitx -rf patch -Np2 -i ${srcdir}/fcitx-mozc-${_patchver}.patch + # Fix qt4 binary path + sed -i 's$<(qt_dir)/bin$/usr/lib/qt4/bin$' gui/*.gyp gui/*.gypi + sed -i 's$<(qt_dir_env)/bin$/usr/lib/qt4/bin$' gui/*.gyp gui/*.gypi + # Generate zip code seed msg "Generating zip code seed..." python2 dictionary/gen_zip_code_seed.py --zip_code="${srcdir}/KEN_ALL.CSV" --jigyosyo="${srcdir}/JIGYOSYO.CSV" >> data/dictionary_oss/dictionary09.txt @@ -55,7 +63,6 @@ build() { msg "Starting make..." _targets="server/server.gyp:mozc_server gui/gui.gyp:mozc_tool unix/fcitx/fcitx.gyp:fcitx-mozc" - _qmnames="qmake-qt4 qmake4 qmake" QTDIR=/usr python2 build_mozc.py gyp --channel_dev=0 python2 build_mozc.py build_tools -c $_bldtype @@ -98,9 +105,8 @@ package() { install -m 644 data/images/unix/ui-tool.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-tool.png" } - md5sums=('e5246d17a81d2e942e9e8de0c3240c95' - 'e61df4b5754f3869ca504d269dc9641d' - '59c5f7e9c734b40197454318f228859f' + '06bae0169219637b497054fb335017db' + '8121af1e16aea2a3899314db15679e7f' 'ed436802019c9e1f40cc750eaf78f318' '3c947ef02d9bf3341192ba22916f3605') diff --git a/community/fcitx-unikey/PKGBUILD b/community/fcitx-unikey/PKGBUILD index a67d97ea2..015e1b78f 100644 --- a/community/fcitx-unikey/PKGBUILD +++ b/community/fcitx-unikey/PKGBUILD @@ -1,23 +1,22 @@ -# $Id: PKGBUILD 82956 2013-01-26 06:38:02Z fyan $ +# $Id: PKGBUILD 85345 2013-03-01 10:30:29Z andrea $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=fcitx-unikey pkgver=0.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Fcitx Wrapper for unikey" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fcitx" license=('GPL') depends=('fcitx>=4.2.7') -optdepends=('qt: To run the fcitx unikey macro editor') -makedepends=('cmake' 'intltool' 'qt') +optdepends=('qt4: To run the fcitx unikey macro editor') +makedepends=('cmake' 'qt4') source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") install=fcitx-unikey.install build(){ cd "$srcdir/${pkgname}-${pkgver}" - rm -rf build - mkdir build + mkdir -p build cd build cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD index afae00724..8f63ef090 100644 --- a/community/fcitx/PKGBUILD +++ b/community/fcitx/PKGBUILD @@ -1,21 +1,23 @@ -# $Id: PKGBUILD 82948 2013-01-26 02:17:24Z fyan $ +# $Id: PKGBUILD 85343 2013-03-01 10:30:04Z andrea $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: csslayer <wengxt AT gmail com> pkgbase=fcitx -pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt') +pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4') pkgver=4.2.7 -pkgrel=1 +pkgrel=3 groups=('fcitx-im') arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fcitx/" license=('GPL') -makedepends=('cmake' 'doxygen' 'gtk2' 'gtk3' 'qt' 'icu' \ +makedepends=('cmake' 'doxygen' 'gtk2' 'gtk3' 'qt4' 'icu' 'mesa' \ 'iso-codes' 'gobject-introspection' 'libxkbfile') source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}_dict.tar.xz) build() { + #source /etc/profile.d/qt4.sh + cd "${srcdir}" mkdir -p build cd build @@ -56,7 +58,7 @@ package_fcitx() { 'fcitx-libpinyin: Fcitx Wrapper for libpinyin, Library to deal with pinyin' 'fcitx-m17n: Multilingual text processing library' 'fcitx-mozc: Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)' - 'fcitx-qt: QT IM Module for fcitx' + 'fcitx-qt4: QT4 IM Module for fcitx' 'fcitx-rime: Rime input method engine (Traditional Chinese)' 'fcitx-sunpinyin: Statistical Language Model based pinyin IME by Sun' 'fcitx-table-extra: Extra tables for Fcitx, including Boshiamy, Zhengma, Cangjie3, Cangjie5' @@ -70,7 +72,7 @@ package_fcitx() { cd "${srcdir}/build" make DESTDIR="${pkgdir}" install - rm -r "${pkgdir}/usr/lib/"{gtk-2.0,gtk-3.0,qt} + rm -r "${pkgdir}/usr/lib/"{gtk-2.0,gtk-3.0,qt4} rm -r "${pkgdir}/usr/lib/fcitx/qt" rm -r "${pkgdir}/usr/include/fcitx-qt" rm "${pkgdir}/usr/bin/fcitx-qt-gui-wrapper" @@ -96,9 +98,12 @@ package_fcitx-gtk3() { make DESTDIR="${pkgdir}" install } -package_fcitx-qt() { - pkgdesc='QT IM Module for fcitx' - depends=('qt' "fcitx>=$pkgver") +package_fcitx-qt4() { + pkgdesc='QT4 IM Module for fcitx' + depends=('qt4' "fcitx>=$pkgver") + replaces=('fcitx-qt') + provides=('fcitx-qt') + conflicts=('fcitx-qt') cd "${srcdir}/build/src/frontend/qt" make DESTDIR="${pkgdir}" install diff --git a/community/ffmpegsource/PKGBUILD b/community/ffmpegsource/PKGBUILD index e68395e82..eac86386e 100755 --- a/community/ffmpegsource/PKGBUILD +++ b/community/ffmpegsource/PKGBUILD @@ -1,27 +1,46 @@ -# $Id: PKGBUILD 84674 2013-02-21 15:31:17Z alucryd $ +# $Id: PKGBUILD 85215 2013-02-27 18:14:32Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> pkgname=ffmpegsource -pkgver=2.17 -pkgrel=9 +pkgver=743 +pkgrel=2 pkgdesc="A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access" arch=('i686' 'x86_64') url="http://code.google.com/p/ffmpegsource/" license=('MIT') depends=('ffmpeg') +makedepends=('svn') options=('!libtool') -source=("http://ffmpegsource.googlecode.com/files/ffms-${pkgver}-src.tar.bz2" 'autoconf.patch' 'ffmpeg.patch') -sha256sums=('991f7a77982823afdcf0beb8961deddaf7dd0aea949249e51fbf51cb3314643d' - '77e5185f91249b8d032958abb142827a5349b06ff1b4fbd4c5c87ccea811273d' - 'adc08b58dec29b04be9d9eb2f12c2fa836565d363aafcfc3e785ae4692db6845') +source=('autoconf.patch' 'enable-libavresample.patch') +sha256sums=('b09a7e9a08a16bdaf19d43c7ad8d3ec455f6fecec2f4f5ada417345343adda93' + '05f03515cc2405cdf8a8ba835f5adc2057f40054a4a1d9e493f0ad512c5de70d') + +_svntrunk=http://ffmpegsource.googlecode.com/svn/trunk/ +_svnmod=ffmpegsource build() { - cd "${srcdir}"/ffms-${pkgver}-src + cd "${srcdir}" + +# Checkout + msg "Connecting to SVN server...." + + if [[ -d ${_svnmod}/.svn ]]; then + (cd ${_svnmod} && svn up -r ${pkgver}) + else + svn co ${_svntrunk} --config-dir ./ -r ${pkgver} ${_svnmod} + fi + + msg "SVN checkout done or server timeout" + msg "Starting build..." + + rm -rf "${srcdir}"/${_svnmod}-build +# svn export "${srcdir}"/${_svnmod} "${srcdir}"/${_svnmod}-build + cp -R "${srcdir}"/${_svnmod} "${srcdir}"/${_svnmod}-build + cd "${srcdir}"/${_svnmod}-build # Patch patch -Np1 -i "${srcdir}"/autoconf.patch - patch -Np1 -i "${srcdir}"/ffmpeg.patch - mv configure.in configure.ac + patch -Np1 -i "${srcdir}"/enable-libavresample.patch # Build ./autogen.sh --prefix=/usr --enable-shared --disable-static @@ -29,7 +48,7 @@ build() { } package() { - cd "${srcdir}"/ffms-${pkgver}-src + cd "${srcdir}"/${_svnmod}-build # Install make DESTDIR="${pkgdir}" install diff --git a/community/ffmpegsource/autoconf.patch b/community/ffmpegsource/autoconf.patch index 0420ad776..e15e4522c 100755 --- a/community/ffmpegsource/autoconf.patch +++ b/community/ffmpegsource/autoconf.patch @@ -9,8 +9,8 @@ lib_LTLIBRARIES = src/core/libffms2.la src_core_libffms2_la_LIBADD = @LIBAV_LIBS@ @ZLIB_LDFLAGS@ -lz @LTUNDEF@ ---- a/configure.in -+++ b/configure.in +--- a/configure.ac ++++ b/configure.ac @@ -30,7 +30,7 @@ if test -z "$CXXFLAGS"; then CXXFLAGS="$OPT_FLAGS" fi diff --git a/community/ffmpegsource/enable-libavresample.patch b/community/ffmpegsource/enable-libavresample.patch new file mode 100755 index 000000000..56d435782 --- /dev/null +++ b/community/ffmpegsource/enable-libavresample.patch @@ -0,0 +1,970 @@ +# enable-libavresample.patch +# +# Adds libavresample support. Created by diffing Thomas Goyne's GIT repo +# with official ffms SVN. +# + +diff -ru ffmpegsource/configure.ac ffms2/configure.ac +--- ffmpegsource/configure.ac 2013-02-27 16:53:39.230691825 +0100 ++++ ffms2/configure.ac 2013-02-27 16:53:31.737713841 +0100 +@@ -181,6 +181,25 @@ + AC_MSG_RESULT([no]) + ]) + ++AC_ARG_ENABLE(avresample, ++ AS_HELP_STRING([--enable-avresample], ++ [use libavresample for audio resampling])) ++AS_IF([test x$enable_avresample != xno], [ ++ PKG_CHECK_MODULES(AVRESAMPLE, [libavresample >= 1.0.0], [enable_avresample=yes], [ ++ AS_IF([test x$enable_avresample = xyes], ++ [AC_MSG_ERROR([--enable-avresample was specified, but avresample 1.0.0+ could not be found.])]) ++ enable_avresample=no ++ ]) ++]) ++ ++AS_IF([test x$enable_avresample], ++ [libavresample="libavresample" ++ AC_DEFINE([WITH_AVRESAMPLE], [1], [Use avresample])]) ++ ++AC_SUBST([AVRESAMPLE_CFLAGS]) ++AC_SUBST([AVRESAMPLE_LIBS]) ++AC_SUBST([libavresample]) ++ + AC_MSG_CHECKING([whether -Wl,-Bsymbolic is needed]) + if test "$enable_shared" = yes; then + _LDFLAGS="$LDFLAGS" +diff -ru ffmpegsource/ffms2.pc.in ffms2/ffms2.pc.in +--- ffmpegsource/ffms2.pc.in 2013-02-27 16:53:38.924039701 +0100 ++++ ffms2/ffms2.pc.in 2013-02-27 16:53:31.737713841 +0100 +@@ -7,7 +7,7 @@ + + Name: ffms2 + Description: The Fabulous FM Library 2 +-Requires.private: libavformat libavcodec libswscale libavutil ++Requires.private: libavformat libavcodec libswscale libavutil @libavresample@ + Version: @FFMS_VERSION@ + Libs.private: @ZLIB_LDFLAGS@ -lz + Libs: -L${libdir} -lffms2 +diff -ru ffmpegsource/include/ffmscompat.h ffms2/include/ffmscompat.h +--- ffmpegsource/include/ffmscompat.h 2013-02-27 16:53:38.920706525 +0100 ++++ ffms2/include/ffmscompat.h 2013-02-27 16:53:31.737713841 +0100 +@@ -71,6 +71,15 @@ + # define FFMS_CodecID AVCodecID + # undef CodecID + # endif ++# if VERSION_CHECK(LIBAVCODEC_VERSION_INT, <, 54, 28, 0, 54, 59, 100) ++# define avcodec_free_frame av_free ++# endif ++#endif ++ ++#ifdef LIBAVUTIL_VERSION_INT ++# if VERSION_CHECK(LIBAVUTIL_VERSION_INT, <, 51, 27, 0, 51, 46, 100) ++# define av_get_packed_sample_fmt(fmt) (fmt < AV_SAMPLE_FMT_U8P ? fmt : fmt - (AV_SAMPLE_FMT_U8P - AV_SAMPLE_FMT_U8)) ++# endif + #endif + + #endif // FFMSCOMPAT_H +diff -ru ffmpegsource/include/ffms.h ffms2/include/ffms.h +--- ffmpegsource/include/ffms.h 2013-02-27 16:53:38.920706525 +0100 ++++ ffms2/include/ffms.h 2013-02-27 16:53:31.737713841 +0100 +@@ -113,6 +113,7 @@ + FFMS_ERROR_TRACK, // track handling + FFMS_ERROR_WAVE_WRITER, // WAVE64 file writer + FFMS_ERROR_CANCELLED, // operation aborted ++ FFMS_ERROR_RESAMPLING, // audio resampling (libavresample) + + // Subtypes - what caused the error + FFMS_ERROR_UNKNOWN = 20, // unknown error +@@ -237,6 +238,53 @@ + FFMS_CR_JPEG = 2 // 2^n-1, or "fullrange" + } FFMS_ColorRanges; + ++typedef enum FFMS_MixingCoefficientType { ++ FFMS_MIXING_COEFFICIENT_Q8 = 0, ++ FFMS_MIXING_COEFFICIENT_Q15 = 1, ++ FFMS_MIXING_COEFFICIENT_FLT = 2 ++} FFMS_MixingCoefficientType; ++ ++typedef enum FFMS_MatrixEncoding { ++ FFMS_MATRIX_ENCODING_NONE = 0, ++ FFMS_MATRIX_ENCODING_DOBLY = 1, ++ FFMS_MATRIX_ENCODING_PRO_LOGIC_II = 2 ++} FFMS_MatrixEncoding; ++ ++typedef enum FFMS_ResampleFilterType { ++ FFMS_RESAMPLE_FILTER_CUBIC = 0, ++ FFMS_RESAMPLE_FILTER_SINC = 1, ++ FFMS_RESAMPLE_FILTER_KAISER = 2 ++} FFMS_ResampleFilterType; ++ ++typedef enum FFMS_AudioDitherMethod { ++ FFMS_RESAMPLE_DITHER_NONE = 0, ++ FFMS_RESAMPLE_DITHER_RECTANGULAR = 1, ++ FFMS_RESAMPLE_DITHER_TRIANGULAR = 2, ++ FFMS_RESAMPLE_DITHER_TRIANGULAR_HIGHPASS = 3, ++ FFMS_RESAMPLE_DITHER_TRIANGULAR_NOISESHAPING = 4 ++} FFMS_AudioDitherMethod; ++ ++typedef struct FFMS_ResampleOptions { ++ int64_t ChannelLayout; ++ FFMS_SampleFormat SampleFormat; ++ int SampleRate; ++ FFMS_MixingCoefficientType MixingCoefficientType; ++ double CenterMixLevel; ++ double SurroundMixLevel; ++ double LFEMixLevel; ++ int Normalize; ++ int ForceResample; ++ int ResampleFilterSize; ++ int ResamplePhaseShift; ++ int LinearInterpolation; ++ double CutoffFrequencyRatio; ++ FFMS_MatrixEncoding MatrixedStereoEncoding; ++ FFMS_ResampleFilterType FilterType; ++ int KaiserBeta; ++ FFMS_AudioDitherMethod DitherMethod; ++} FFMS_ResampleOptions; ++ ++ + typedef struct FFMS_Frame { + uint8_t *Data[4]; + int Linesize[4]; +@@ -319,6 +367,9 @@ + FFMS_API(void) FFMS_ResetOutputFormatV(FFMS_VideoSource *V); + FFMS_API(int) FFMS_SetInputFormatV(FFMS_VideoSource *V, int ColorSpace, int ColorRange, int Format, FFMS_ErrorInfo *ErrorInfo); /* Introduced in FFMS_VERSION ((2 << 24) | (17 << 16) | (1 << 8) | 0) */ + FFMS_API(void) FFMS_ResetInputFormatV(FFMS_VideoSource *V); ++FFMS_API(FFMS_ResampleOptions *) FFMS_CreateResampleOptions(FFMS_AudioSource *A); /* Introduced in FFMS_VERSION ((2 << 24) | (15 << 16) | (4 << 8) | 0) */ ++FFMS_API(int) FFMS_SetOutputFormatA(FFMS_AudioSource *A, const FFMS_ResampleOptions*options, FFMS_ErrorInfo *ErrorInfo); /* Introduced in FFMS_VERSION ((2 << 24) | (15 << 16) | (4 << 8) | 0) */ ++FFMS_API(void) FFMS_DestroyResampleOptions(FFMS_ResampleOptions *options); /* Introduced in FFMS_VERSION ((2 << 24) | (15 << 16) | (4 << 8) | 0) */ + FFMS_API(void) FFMS_DestroyIndex(FFMS_Index *Index); + FFMS_API(int) FFMS_GetSourceType(FFMS_Index *Index); + FFMS_API(int) FFMS_GetSourceTypeI(FFMS_Indexer *Indexer); +diff -ru ffmpegsource/Makefile.am ffms2/Makefile.am +--- ffmpegsource/Makefile.am 2013-02-27 16:53:39.310688030 +0100 ++++ ffms2/Makefile.am 2013-02-27 16:53:31.724381141 +0100 +@@ -9,7 +9,7 @@ + INCLUDES = -I. -I$(top_srcdir)/include -I$(top_srcdir)/src/config @LIBAV_CFLAGS@ @ZLIB_CPPFLAGS@ -include config.h + + lib_LTLIBRARIES = src/core/libffms2.la +-src_core_libffms2_la_LIBADD = @LIBAV_LIBS@ @ZLIB_LDFLAGS@ -lz @LTUNDEF@ ++src_core_libffms2_la_LIBADD = @LIBAV_LIBS@ @AVRESAMPLE_LIBS@ @ZLIB_LDFLAGS@ -lz @LTUNDEF@ + src_core_libffms2_la_SOURCES = \ + src/core/audiosource.h \ + src/core/audiosource.cpp \ +diff -ru ffmpegsource/src/config/config.h.in ffms2/src/config/config.h.in +--- ffmpegsource/src/config/config.h.in 2013-02-27 16:53:39.017368608 +0100 ++++ ffms2/src/config/config.h.in 2013-02-27 16:53:31.744380192 +0100 +@@ -90,5 +90,8 @@ + /* Version number of package */ + #undef VERSION + ++/* Use avresample */ ++#undef WITH_AVRESAMPLE ++ + /* Define to `unsigned int' if <sys/types.h> does not define. */ + #undef size_t +diff -ru ffmpegsource/src/config/libs.cpp ffms2/src/config/libs.cpp +--- ffmpegsource/src/config/libs.cpp 2013-02-27 16:53:39.017368608 +0100 ++++ ffms2/src/config/libs.cpp 2013-02-27 16:53:31.744380192 +0100 +@@ -45,6 +45,9 @@ + #pragma comment(lib, "libavcodec.a") + #pragma comment(lib, "libavformat.a") + #pragma comment(lib, "libswscale.a") ++#ifdef WITH_AVRESAMPLE ++#pragma comment(lib, "libavresample.a") ++#endif + + #ifdef WITH_OPENCORE_AMR_NB + #ifdef WITH_GCC_LIBAV +diff -ru ffmpegsource/src/core/audiosource.cpp ffms2/src/core/audiosource.cpp +--- ffmpegsource/src/core/audiosource.cpp 2013-02-27 16:53:39.137362917 +0100 ++++ ffms2/src/core/audiosource.cpp 2013-02-27 16:53:31.744380192 +0100 +@@ -23,17 +23,45 @@ + #include <algorithm> + #include <cassert> + ++namespace { ++ ++ int64_t ChannelLayout; ++ FFMS_SampleFormat SampleFormat; ++ int SampleRate; ++#define MAPPER(m, n) OptionMapper<FFMS_ResampleOptions>(n, &FFMS_ResampleOptions::m) ++OptionMapper<FFMS_ResampleOptions> resample_options[] = { ++ MAPPER(ChannelLayout, "out_channel_layout"), ++ MAPPER(SampleFormat, "out_sample_fmt"), ++ MAPPER(SampleRate, "out_sample_rate"), ++ MAPPER(MixingCoefficientType, "mix_coeff_type"), ++ MAPPER(CenterMixLevel, "center_mix_level"), ++ MAPPER(SurroundMixLevel, "surround_mix_level"), ++ MAPPER(LFEMixLevel, "lfe_mix_level"), ++ MAPPER(Normalize, "normalize_mix_level"), ++ MAPPER(ForceResample, "force_resampling"), ++ MAPPER(ResampleFilterSize, "filter_size"), ++ MAPPER(ResamplePhaseShift, "phase_shift"), ++ MAPPER(LinearInterpolation, "linear_interp"), ++ MAPPER(CutoffFrequencyRatio, "cutoff"), ++ MAPPER(MatrixedStereoEncoding, "matrix_encoding"), ++ MAPPER(FilterType, "filter_type"), ++ MAPPER(KaiserBeta, "kaiser_beta"), ++ MAPPER(DitherMethod, "dither_method") ++}; ++#undef MAPPER ++ ++} ++ + FFMS_AudioSource::FFMS_AudioSource(const char *SourceFile, FFMS_Index &Index, int Track) + : Delay(0) + , MaxCacheBlocks(50) + , BytesPerSample(0) +-, Decoded(0) ++, NeedsResample(false) + , CurrentSample(-1) + , PacketNumber(0) + , CurrentFrame(NULL) + , TrackNumber(Track) + , SeekOffset(0) +-, DecodingBuffer(AVCODEC_MAX_AUDIO_FRAME_SIZE * 10) + , Index(Index) + { + if (Track < 0 || Track >= static_cast<int>(Index.size())) +@@ -57,44 +85,14 @@ + Index.AddRef(); + } + +- + #define EXCESSIVE_CACHE_SIZE 400 + + void FFMS_AudioSource::Init(const FFMS_Index &Index, int DelayMode) { +- // The first packet after a seek is often decoded incorrectly, which +- // makes it impossible to ever correctly seek back to the beginning, so +- // store the first block now +- +- // In addition, anything with the same PTS as the first packet can't be +- // distinguished from the first packet and so can't be seeked to, so +- // store those as well +- +- // Some of LAVF's splitters don't like to seek to the beginning of the +- // file (ts and?), so cache a few blocks even if PTSes are unique +- // Packet 7 is the last packet I've had be unseekable to, so cache up to +- // 10 for a bit of an extra buffer +- CacheIterator end = Cache.end(); +- while (PacketNumber < Frames.size() && +- ((Frames[0].PTS != ffms_av_nopts_value && Frames[PacketNumber].PTS == Frames[0].PTS) || +- Cache.size() < 10)) { +- +- // Vorbis in particular seems to like having 60+ packets at the start of the file with a PTS of 0, +- // so we might need to expand the search range to account for that. +- if (Cache.size() >= MaxCacheBlocks - 1) { +- if (MaxCacheBlocks >= EXCESSIVE_CACHE_SIZE) +- throw FFMS_Exception(FFMS_ERROR_DECODING, FFMS_ERROR_ALLOCATION_FAILED, "Exceeded the search range for an initial valid audio PTS"); +- MaxCacheBlocks *= 2; +- } +- ++ // Decode the first packet to ensure all properties are initialized ++ // Don't cache it since it might be in the wrong format ++ // Instead, leave it in DecodeFrame and it'll get cached later ++ while (DecodeFrame->nb_samples == 0) + DecodeNextBlock(); +- if (Decoded) +- CacheBlock(end, CurrentSample, Decoded, &DecodingBuffer[0]); +- } +- // Store the iterator to the last element of the cache which is used for +- // correctness rather than speed, so that when looking for one to delete +- // we know how much to skip +- CacheNoDelete = Cache.end(); +- --CacheNoDelete; + + // Read properties of the audio which may not be available until the first + // frame has been decoded +@@ -104,6 +102,11 @@ + throw FFMS_Exception(FFMS_ERROR_DECODING, FFMS_ERROR_CODEC, + "Codec returned zero size audio"); + ++ if (av_sample_fmt_is_planar(CodecContext->sample_fmt)) { ++ std::auto_ptr<FFMS_ResampleOptions> opt(CreateResampleOptions()); ++ SetOutputFormat(opt.get()); ++ } ++ + if (DelayMode < FFMS_DELAY_NO_SHIFT) + throw FFMS_Exception(FFMS_ERROR_INDEX, FFMS_ERROR_INVALID_ARGUMENT, + "Bad audio delay compensation mode"); +@@ -146,8 +149,133 @@ + AP.NumSamples += Delay; + } + +-void FFMS_AudioSource::CacheBlock(CacheIterator &pos, int64_t Start, size_t Samples, uint8_t *SrcData) { +- Cache.insert(pos, AudioBlock(Start, Samples, SrcData, Samples * BytesPerSample)); ++void FFMS_AudioSource::CacheBeginning() { ++ // Nothing to do if the cache is already populated ++ if (!Cache.empty()) return; ++ ++ // The first frame is already decoded, so add it to the cache ++ CacheBlock(Cache.end()); ++ ++ // The first packet after a seek is often decoded incorrectly, which ++ // makes it impossible to ever correctly seek back to the beginning, so ++ // store the first block now ++ ++ // In addition, anything with the same PTS as the first packet can't be ++ // distinguished from the first packet and so can't be seeked to, so ++ // store those as well ++ ++ // Some of LAVF's splitters don't like to seek to the beginning of the ++ // file (ts and?), so cache a few blocks even if PTSes are unique ++ // Packet 7 is the last packet I've had be unseekable to, so cache up to ++ // 10 for a bit of an extra buffer ++ CacheIterator end = Cache.end(); ++ while (PacketNumber < Frames.size() && ++ ((Frames[0].PTS != ffms_av_nopts_value && Frames[PacketNumber].PTS == Frames[0].PTS) || ++ Cache.size() < 10)) { ++ ++ // Vorbis in particular seems to like having 60+ packets at the start ++ // of the file with a PTS of 0, so we might need to expand the search ++ // range to account for that. ++ // Expanding slightly before it's strictly needed to ensure there's a ++ // bit of space for an actual cache ++ if (Cache.size() >= MaxCacheBlocks - 5) { ++ if (MaxCacheBlocks >= EXCESSIVE_CACHE_SIZE) ++ throw FFMS_Exception(FFMS_ERROR_DECODING, FFMS_ERROR_ALLOCATION_FAILED, ++ "Exceeded the search range for an initial valid audio PTS"); ++ MaxCacheBlocks *= 2; ++ } ++ ++ DecodeNextBlock(&end); ++ } ++ // Store the iterator to the last element of the cache which is used for ++ // correctness rather than speed, so that when looking for one to delete ++ // we know how much to skip ++ CacheNoDelete = Cache.end(); ++ --CacheNoDelete; ++} ++ ++void FFMS_AudioSource::SetOutputFormat(const FFMS_ResampleOptions *opt) { ++ if (!Cache.empty()) ++ throw FFMS_Exception(FFMS_ERROR_RESAMPLING, FFMS_ERROR_USER, ++ "Cannot change the output format after audio decoding has begun"); ++ ++ BytesPerSample = av_get_bytes_per_sample(static_cast<AVSampleFormat>(opt->SampleFormat)) * av_get_channel_layout_nb_channels(opt->ChannelLayout); ++ ++ NeedsResample = ++ opt->SampleFormat != (int)CodecContext->sample_fmt || ++ opt->SampleRate != AP.SampleRate || ++ opt->ChannelLayout != AP.ChannelLayout || ++ opt->ForceResample; ++ if (!NeedsResample) return; ++ ++ if (opt->SampleRate != AP.SampleRate) ++ throw FFMS_Exception(FFMS_ERROR_RESAMPLING, FFMS_ERROR_UNSUPPORTED, ++ "Sample rate changes are currently unsupported."); ++ ++#ifdef WITH_AVRESAMPLE ++ if (opt->SampleRate != AP.SampleRate) ++ throw FFMS_Exception(FFMS_ERROR_RESAMPLING, FFMS_ERROR_UNSUPPORTED, ++ "Changing the audio sample rate is currently not supported"); ++ ++ std::auto_ptr<FFMS_ResampleOptions> oldOptions(ReadOptions(ResampleContext, resample_options)); ++ SetOptions(opt, ResampleContext, resample_options); ++ av_opt_set_int(ResampleContext, "in_sample_rate", AP.SampleRate, 0); ++ av_opt_set_int(ResampleContext, "in_sample_fmt", CodecContext->sample_fmt, 0); ++ av_opt_set_int(ResampleContext, "in_channel_layout", AP.ChannelLayout, 0); ++ ++ if (avresample_open(ResampleContext)) { ++ SetOptions(oldOptions.get(), ResampleContext, resample_options); ++ avresample_open(ResampleContext); ++ throw FFMS_Exception(FFMS_ERROR_RESAMPLING, FFMS_ERROR_UNKNOWN, ++ "Could not open avresample context"); ++ } ++#else ++ if (opt->SampleFormat != AP.SampleFormat || opt->SampleRate != AP.SampleRate || opt->ChannelLayout != AP.ChannelLayout) ++ throw FFMS_Exception(FFMS_ERROR_RESAMPLING, FFMS_ERROR_UNSUPPORTED, ++ "FFMS was not built with resampling enabled. The only supported conversion is interleaving planar audio."); ++#endif ++} ++ ++FFMS_ResampleOptions *FFMS_AudioSource::CreateResampleOptions() const { ++#ifdef WITH_AVRESAMPLE ++ FFMS_ResampleOptions *ret = ReadOptions(ResampleContext, resample_options); ++#else ++ FFMS_ResampleOptions *ret = new FFMS_ResampleOptions; ++ memset(ret, 0, sizeof(FFMS_ResampleOptions)); ++#endif ++ ret->SampleRate = AP.SampleRate; ++ ret->SampleFormat = static_cast<FFMS_SampleFormat>(AP.SampleFormat); ++ ret->ChannelLayout = AP.ChannelLayout; ++ return ret; ++} ++ ++void FFMS_AudioSource::ResampleAndCache(CacheIterator pos) { ++ AudioBlock& block = *Cache.insert(pos, AudioBlock(CurrentSample, DecodeFrame->nb_samples)); ++ block.Data.reserve(DecodeFrame->nb_samples * BytesPerSample); ++ ++#ifdef WITH_AVRESAMPLE ++ block.Data.resize(block.Data.capacity()); ++ ++ uint8_t *OutPlanes[1] = { static_cast<uint8_t *>(&block.Data[0]) }; ++ avresample_convert(ResampleContext, ++ OutPlanes, block.Data.size(), DecodeFrame->nb_samples, ++ DecodeFrame->extended_data, DecodeFrame->nb_samples * av_get_bytes_per_sample(CodecContext->sample_fmt), DecodeFrame->nb_samples); ++#else ++ int width = av_get_bytes_per_sample(CodecContext->sample_fmt); ++ uint8_t **Data = DecodeFrame->extended_data; ++ ++ for (int s = 0; s < DecodeFrame->nb_samples; ++s) { ++ for (int c = 0; c < CodecContext->channels; ++c) ++ block.Data.insert(block.Data.end(), &Data[c][s * width], &Data[c][(s + 1) * width]); ++ } ++#endif ++} ++ ++void FFMS_AudioSource::CacheBlock(CacheIterator pos) { ++ if (NeedsResample) ++ ResampleAndCache(pos); ++ else ++ Cache.insert(pos, AudioBlock(CurrentSample, DecodeFrame->nb_samples, DecodeFrame->extended_data[0], DecodeFrame->nb_samples * BytesPerSample)); + + if (Cache.size() >= MaxCacheBlocks) { + // Kill the oldest one +@@ -162,45 +290,45 @@ + } + } + +-void FFMS_AudioSource::DecodeNextBlock() { +- if (BytesPerSample == 0) BytesPerSample = av_get_bytes_per_sample(CodecContext->sample_fmt) * CodecContext->channels; +- ++void FFMS_AudioSource::DecodeNextBlock(CacheIterator *pos) { + CurrentFrame = &Frames[PacketNumber]; + + AVPacket Packet; + if (!ReadPacket(&Packet)) +- throw FFMS_Exception(FFMS_ERROR_PARSER, FFMS_ERROR_UNKNOWN, "ReadPacket unexpectedly failed to read a packet"); ++ throw FFMS_Exception(FFMS_ERROR_PARSER, FFMS_ERROR_UNKNOWN, ++ "ReadPacket unexpectedly failed to read a packet"); + + // ReadPacket may have changed the packet number + CurrentFrame = &Frames[PacketNumber]; + CurrentSample = CurrentFrame->SampleStart; +- ++PacketNumber; + +- uint8_t *Buf = &DecodingBuffer[0]; ++ bool GotSamples = false; + uint8_t *Data = Packet.data; + while (Packet.size > 0) { +- int TempOutputBufSize = AVCODEC_MAX_AUDIO_FRAME_SIZE * 10 - (Buf - &DecodingBuffer[0]); +- int Ret = avcodec_decode_audio3(CodecContext, (int16_t *)Buf, &TempOutputBufSize, &Packet); ++ DecodeFrame.reset(); ++ int GotFrame = 0; ++ int Ret = avcodec_decode_audio4(CodecContext, DecodeFrame, &GotFrame, &Packet); + + // Should only ever happen if the user chose to ignore decoding errors + // during indexing, so continue to just ignore decoding errors + if (Ret < 0) break; + +- if (Ret > 0) { ++ if (Ret > 0 && GotFrame) { + Packet.size -= Ret; + Packet.data += Ret; +- Buf += TempOutputBufSize; ++ if (DecodeFrame->nb_samples > 0) { ++ GotSamples = true; ++ if (pos) ++ CacheBlock(*pos); ++ } + } + } + Packet.data = Data; + FreePacket(&Packet); + +- Decoded = (Buf - &DecodingBuffer[0]) / BytesPerSample; +- if (Decoded == 0) { +- // zero sample packets aren't included in the index so we didn't +- // actually move to the next packet +- --PacketNumber; +- } ++ // Zero sample packets aren't included in the index ++ if (GotSamples) ++ ++PacketNumber; + } + + static bool SampleStartComp(const TFrameInfo &a, const TFrameInfo &b) { +@@ -216,6 +344,8 @@ + throw FFMS_Exception(FFMS_ERROR_DECODING, FFMS_ERROR_INVALID_ARGUMENT, + "Out of bounds audio samples requested"); + ++ CacheBeginning(); ++ + uint8_t *Dst = static_cast<uint8_t*>(Buf); + + // Apply audio delay (if any) and fill any samples before the start time with zero +@@ -253,10 +383,12 @@ + } + // Decode another block + else { ++ CacheIterator cachePos = it; --cachePos; ++ + if (Start < CurrentSample && SeekOffset == -1) + throw FFMS_Exception(FFMS_ERROR_SEEKING, FFMS_ERROR_CODEC, "Audio stream is not seekable"); + +- if (SeekOffset >= 0 && (Start < CurrentSample || Start > CurrentSample + Decoded * 5)) { ++ if (SeekOffset >= 0 && (Start < CurrentSample || Start > CurrentSample + DecodeFrame->nb_samples * 5)) { + TFrameInfo f; + f.SampleStart = Start; + int NewPacketNumber = std::distance(Frames.begin(), std::lower_bound(Frames.begin(), Frames.end(), f, SampleStartComp)); +@@ -266,32 +398,22 @@ + // Only seek forward if it'll actually result in moving forward + if (Start < CurrentSample || static_cast<size_t>(NewPacketNumber) > PacketNumber) { + PacketNumber = NewPacketNumber; +- Decoded = 0; + CurrentSample = -1; ++ DecodeFrame.reset(); + avcodec_flush_buffers(CodecContext); + Seek(); + } + } + +- // Decode everything between the last keyframe and the block we want ++ // Decode until we hit the block we want + if (PacketNumber >= Frames.size()) + throw FFMS_Exception(FFMS_ERROR_SEEKING, FFMS_ERROR_CODEC, "Seeking is severely broken"); +- while (CurrentSample + Decoded <= Start && PacketNumber < Frames.size()) +- DecodeNextBlock(); ++ while (CurrentSample + DecodeFrame->nb_samples <= Start && PacketNumber < Frames.size()) ++ DecodeNextBlock(&it); + if (CurrentSample > Start) + throw FFMS_Exception(FFMS_ERROR_SEEKING, FFMS_ERROR_CODEC, "Seeking is severely broken"); + +- CacheBlock(it, CurrentSample, Decoded, &DecodingBuffer[0]); +- +- size_t FirstSample = static_cast<size_t>(Start - CurrentSample); +- size_t Samples = static_cast<size_t>(Decoded - FirstSample); +- size_t Bytes = FFMIN(Samples, static_cast<size_t>(Count)) * BytesPerSample; +- +- memcpy(Dst, &DecodingBuffer[FirstSample * BytesPerSample], Bytes); +- +- Start += Samples; +- Count -= Samples; +- Dst += Bytes; ++ it = cachePos; + } + } + } +diff -ru ffmpegsource/src/core/audiosource.h ffms2/src/core/audiosource.h +--- ffmpegsource/src/core/audiosource.h 2013-02-27 16:53:39.130696566 +0100 ++++ ffms2/src/core/audiosource.h 2013-02-27 16:53:31.744380192 +0100 +@@ -46,7 +46,6 @@ + #endif + + struct FFMS_AudioSource { +-private: + struct AudioBlock { + int64_t Age; + int64_t Start; +@@ -54,9 +53,17 @@ + std::vector<uint8_t> Data; + + AudioBlock(int64_t Start, int64_t Samples, uint8_t *SrcData, size_t SrcBytes) +- : Start(Start) +- , Samples(Samples) +- , Data(SrcData, SrcData + SrcBytes) ++ : Start(Start) ++ , Samples(Samples) ++ , Data(SrcData, SrcData + SrcBytes) ++ { ++ static int64_t Now = 0; ++ Age = Now++; ++ } ++ ++ AudioBlock(int64_t Start, int64_t Samples) ++ : Start(Start) ++ , Samples(Samples) + { + static int64_t Now = 0; + Age = Now++; +@@ -74,11 +81,18 @@ + CacheIterator CacheNoDelete; + // bytes per sample * number of channels + size_t BytesPerSample; +- // Number of samples stored in the decoding buffer +- size_t Decoded; + +- // Insert a block into the cache +- void CacheBlock(CacheIterator &pos, int64_t Start, size_t Samples, uint8_t *SrcData); ++ bool NeedsResample; ++ FFResampleContext ResampleContext; ++ ++ // Insert the current audio frame into the cache ++ void CacheBlock(CacheIterator pos); ++ ++ // Interleave the current audio frame and insert it into the cache ++ void ResampleAndCache(CacheIterator pos); ++ ++ // Cache the unseekable beginning of the file once the output format is set ++ void CacheBeginning(); + + // Called after seeking + virtual void Seek() { }; +@@ -99,13 +113,13 @@ + int SeekOffset; + + // Buffer which audio is decoded into +- AlignedBuffer<uint8_t> DecodingBuffer; ++ ScopedFrame DecodeFrame; + FFMS_Index &Index; + FFMS_Track Frames; + FFCodecContext CodecContext; + FFMS_AudioProperties AP; + +- void DecodeNextBlock(); ++ void DecodeNextBlock(CacheIterator *cachePos = 0); + // Initialization which has to be done after the codec is opened + void Init(const FFMS_Index &Index, int DelayMode); + +@@ -116,6 +130,9 @@ + FFMS_Track *GetTrack() { return &Frames; } + const FFMS_AudioProperties& GetAudioProperties() const { return AP; } + void GetAudio(void *Buf, int64_t Start, int64_t Count); ++ ++ FFMS_ResampleOptions *CreateResampleOptions() const; ++ void SetOutputFormat(const FFMS_ResampleOptions *opt); + }; + + class FFLAVFAudio : public FFMS_AudioSource { +diff -ru ffmpegsource/src/core/ffms.cpp ffms2/src/core/ffms.cpp +--- ffmpegsource/src/core/ffms.cpp 2013-02-27 16:53:39.137362917 +0100 ++++ ffms2/src/core/ffms.cpp 2013-02-27 16:53:31.744380192 +0100 +@@ -256,6 +256,24 @@ + V->ResetInputFormat(); + } + ++FFMS_API(FFMS_ResampleOptions *) FFMS_CreateResampleOptions(FFMS_AudioSource *A) { ++ return A->CreateResampleOptions(); ++} ++ ++FFMS_API(void) FFMS_DestroyResampleOptions(FFMS_ResampleOptions *options) { ++ delete options; ++} ++ ++FFMS_API(int) FFMS_SetOutputFormatA(FFMS_AudioSource *A, const FFMS_ResampleOptions *options, FFMS_ErrorInfo *ErrorInfo) { ++ ClearErrorInfo(ErrorInfo); ++ try { ++ A->SetOutputFormat(options); ++ } catch (FFMS_Exception &e) { ++ return e.CopyOut(ErrorInfo); ++ } ++ return FFMS_ERROR_SUCCESS; ++} ++ + FFMS_API(void) FFMS_DestroyIndex(FFMS_Index *Index) { + assert(Index != NULL); + if (Index == NULL) +diff -ru ffmpegsource/src/core/indexing.cpp ffms2/src/core/indexing.cpp +--- ffmpegsource/src/core/indexing.cpp 2013-02-27 16:53:39.134029741 +0100 ++++ ffms2/src/core/indexing.cpp 2013-02-27 16:53:31.744380192 +0100 +@@ -693,7 +693,6 @@ + , ANC(0) + , ANCPrivate(0) + , SourceFile(Filename) +-, DecodingBuffer(AVCODEC_MAX_AUDIO_FRAME_SIZE * 10) + { + FFMS_Index::CalculateFileSignature(Filename, &Filesize, Digest); + } +@@ -702,9 +701,9 @@ + + } + +-void FFMS_Indexer::WriteAudio(SharedAudioContext &AudioContext, FFMS_Index *Index, int Track, int DBSize) { ++void FFMS_Indexer::WriteAudio(SharedAudioContext &AudioContext, FFMS_Index *Index, int Track) { + // Delay writer creation until after an audio frame has been decoded. This ensures that all parameters are known when writing the headers. +- if (DBSize <= 0) return; ++ if (DecodeFrame->nb_samples) return; + + if (!AudioContext.W64Writer) { + FFMS_AudioProperties AP; +@@ -715,6 +714,8 @@ + return; + } + ++ int Format = av_get_packed_sample_fmt(AudioContext.CodecContext->sample_fmt); ++ + std::vector<char> WName(FNSize); + (*ANC)(SourceFile.c_str(), Track, &AP, &WName[0], FNSize, ANCPrivate); + std::string WN(&WName[0]); +@@ -724,14 +725,14 @@ + av_get_bytes_per_sample(AudioContext.CodecContext->sample_fmt), + AudioContext.CodecContext->channels, + AudioContext.CodecContext->sample_rate, +- (AudioContext.CodecContext->sample_fmt == AV_SAMPLE_FMT_FLT) || (AudioContext.CodecContext->sample_fmt == AV_SAMPLE_FMT_DBL)); ++ (Format == AV_SAMPLE_FMT_FLT) || (Format == AV_SAMPLE_FMT_DBL)); + } catch (...) { + throw FFMS_Exception(FFMS_ERROR_WAVE_WRITER, FFMS_ERROR_FILE_WRITE, + "Failed to write wave data"); + } + } + +- AudioContext.W64Writer->WriteData(&DecodingBuffer[0], DBSize); ++ AudioContext.W64Writer->WriteData(*DecodeFrame); + } + + int64_t FFMS_Indexer::IndexAudioPacket(int Track, AVPacket *Packet, SharedAudioContext &Context, FFMS_Index &TrackIndices) { +@@ -739,8 +740,10 @@ + int64_t StartSample = Context.CurrentSample; + int Read = 0; + while (Packet->size > 0) { +- int dbsize = AVCODEC_MAX_AUDIO_FRAME_SIZE*10; +- int Ret = avcodec_decode_audio3(CodecContext, (int16_t *)&DecodingBuffer[0], &dbsize, Packet); ++ DecodeFrame.reset(); ++ ++ int GotFrame = 0; ++ int Ret = avcodec_decode_audio4(CodecContext, DecodeFrame, &GotFrame, Packet); + if (Ret < 0) { + if (ErrorHandling == FFMS_IEH_ABORT) { + throw FFMS_Exception(FFMS_ERROR_CODEC, FFMS_ERROR_DECODING, "Audio decoding error"); +@@ -756,13 +759,14 @@ + Packet->data += Ret; + Read += Ret; + +- CheckAudioProperties(Track, CodecContext); ++ if (GotFrame) { ++ CheckAudioProperties(Track, CodecContext); + +- if (dbsize > 0) +- Context.CurrentSample += dbsize / (av_get_bytes_per_sample(CodecContext->sample_fmt) * CodecContext->channels); ++ Context.CurrentSample += DecodeFrame->nb_samples; + +- if (DumpMask & (1 << Track)) +- WriteAudio(Context, &TrackIndices, Track, dbsize); ++ if (DumpMask & (1 << Track)) ++ WriteAudio(Context, &TrackIndices, Track); ++ } + } + Packet->size += Read; + Packet->data -= Read; +diff -ru ffmpegsource/src/core/indexing.h ffms2/src/core/indexing.h +--- ffmpegsource/src/core/indexing.h 2013-02-27 16:53:39.127363391 +0100 ++++ ffms2/src/core/indexing.h 2013-02-27 16:53:31.744380192 +0100 +@@ -155,7 +155,6 @@ + }; + + struct FFMS_Indexer { +-private: + std::map<int, FFMS_AudioProperties> LastAudioProperties; + protected: + int IndexMask; +@@ -166,12 +165,12 @@ + TAudioNameCallback ANC; + void *ANCPrivate; + std::string SourceFile; +- AlignedBuffer<uint8_t> DecodingBuffer; ++ ScopedFrame DecodeFrame; + + int64_t Filesize; + uint8_t Digest[20]; + +- void WriteAudio(SharedAudioContext &AudioContext, FFMS_Index *Index, int Track, int DBSize); ++ void WriteAudio(SharedAudioContext &AudioContext, FFMS_Index *Index, int Track); + void CheckAudioProperties(int Track, AVCodecContext *Context); + int64_t IndexAudioPacket(int Track, AVPacket *Packet, SharedAudioContext &Context, FFMS_Index &TrackIndices); + void ParseVideoPacket(SharedVideoContext &VideoContext, AVPacket &pkt, int *RepeatPict, int *FrameType, bool *Invisible); +diff -ru ffmpegsource/src/core/utils.cpp ffms2/src/core/utils.cpp +--- ffmpegsource/src/core/utils.cpp 2013-02-27 16:53:39.134029741 +0100 ++++ ffms2/src/core/utils.cpp 2013-02-27 16:53:31.744380192 +0100 +@@ -214,10 +214,32 @@ + pkt.size = 0; + } + ++extern "C" { ++#if VERSION_CHECK(LIBAVUTIL_VERSION_INT, >=, 52, 2, 0, 52, 6, 100) ++#include <libavutil/channel_layout.h> ++#elif VERSION_CHECK(LIBAVUTIL_VERSION_INT, >=, 51, 26, 0, 51, 45, 100) ++#include <libavutil/audioconvert.h> ++#else ++static int64_t av_get_default_channel_layout(int nb_channels) { ++ switch(nb_channels) { ++ case 1: return AV_CH_LAYOUT_MONO; ++ case 2: return AV_CH_LAYOUT_STEREO; ++ case 3: return AV_CH_LAYOUT_SURROUND; ++ case 4: return AV_CH_LAYOUT_QUAD; ++ case 5: return AV_CH_LAYOUT_5POINT0; ++ case 6: return AV_CH_LAYOUT_5POINT1; ++ case 7: return AV_CH_LAYOUT_6POINT1; ++ case 8: return AV_CH_LAYOUT_7POINT1; ++ default: return 0; ++ } ++} ++#endif ++} ++ + void FillAP(FFMS_AudioProperties &AP, AVCodecContext *CTX, FFMS_Track &Frames) { +- AP.SampleFormat = static_cast<FFMS_SampleFormat>(CTX->sample_fmt); ++ AP.SampleFormat = static_cast<FFMS_SampleFormat>(av_get_packed_sample_fmt(CTX->sample_fmt)); + AP.BitsPerSample = av_get_bytes_per_sample(CTX->sample_fmt) * 8; +- AP.Channels = CTX->channels;; ++ AP.Channels = CTX->channels; + AP.ChannelLayout = CTX->channel_layout; + AP.SampleRate = CTX->sample_rate; + if (!Frames.empty()) { +@@ -225,6 +247,9 @@ + AP.FirstTime = ((Frames.front().PTS * Frames.TB.Num) / (double)Frames.TB.Den) / 1000; + AP.LastTime = ((Frames.back().PTS * Frames.TB.Num) / (double)Frames.TB.Den) / 1000; + } ++ ++ if (AP.ChannelLayout == 0) ++ AP.ChannelLayout = av_get_default_channel_layout(AP.Channels); + } + + #ifdef HAALISOURCE +diff -ru ffmpegsource/src/core/utils.h ffms2/src/core/utils.h +--- ffmpegsource/src/core/utils.h 2013-02-27 16:53:39.127363391 +0100 ++++ ffms2/src/core/utils.h 2013-02-27 16:53:31.744380192 +0100 +@@ -31,9 +31,13 @@ + extern "C" { + #include "stdiostream.h" + #include <libavutil/mem.h> ++#include <libavutil/opt.h> + #include <libavformat/avformat.h> + #include <libavcodec/avcodec.h> + #include <libswscale/swscale.h> ++#ifdef WITH_AVRESAMPLE ++#include <libavresample/avresample.h> ++#endif + } + + // must be included after ffmpeg headers +@@ -133,6 +137,34 @@ + } + }; + ++template<typename T, T *(*Alloc)(), void (*Del)(T **)> ++class unknown_size { ++ T *ptr; ++ ++ unknown_size(unknown_size const&); ++ unknown_size& operator=(unknown_size const&); ++public: ++ operator T*() const { return ptr; } ++ operator void*() const { return ptr; } ++ T *operator->() const { return ptr; } ++ ++ unknown_size() : ptr(Alloc()) { } ++ ~unknown_size() { Del(&ptr); } ++}; ++ ++class ScopedFrame : public unknown_size<AVFrame, avcodec_alloc_frame, avcodec_free_frame> { ++public: ++ void reset() { ++ avcodec_get_frame_defaults(*this); ++ } ++}; ++ ++#ifdef WITH_AVRESAMPLE ++typedef unknown_size<AVAudioResampleContext, avresample_alloc_context, avresample_free> FFResampleContext; ++#else ++typedef struct {} FFResampleContext; ++#endif ++ + inline void DeleteHaaliCodecContext(AVCodecContext *CodecContext) { + av_freep(&CodecContext->extradata); + av_freep(&CodecContext); +@@ -228,4 +240,68 @@ + + void FlushBuffers(AVCodecContext *CodecContext); + ++namespace optdetail { ++ template<typename T> ++ T get_av_opt(void *v, const char *name) { ++ return static_cast<T>(av_get_int(v, name, 0)); ++ } ++ ++ template<> ++ inline double get_av_opt<double>(void *v, const char *name) { ++ return av_get_double(v, name, 0); ++ } ++ ++ template<typename T> ++ void set_av_opt(void *v, const char *name, T value) { ++ av_opt_set_int(v, name, value, 0); ++ } ++ ++ template<> ++ inline void set_av_opt<double>(void *v, const char *name, double value) { ++ av_opt_set_double(v, name, value, 0); ++ } ++} ++ ++template<typename FFMS_Struct> ++class OptionMapper { ++ struct OptionMapperBase { ++ virtual void ToOpt(const FFMS_Struct *src, void *dst) const=0; ++ virtual void FromOpt(FFMS_Struct *dst, void *src) const=0; ++ }; ++ ++ template<typename T> ++ class OptionMapperImpl : public OptionMapperBase { ++ T (FFMS_Struct::*ptr); ++ const char *name; ++ ++ public: ++ OptionMapperImpl(T (FFMS_Struct::*ptr), const char *name) : ptr(ptr), name(name) { } ++ void ToOpt(const FFMS_Struct *src, void *dst) const { optdetail::set_av_opt(dst, name, src->*ptr); } ++ void FromOpt(FFMS_Struct *dst, void *src) const { dst->*ptr = optdetail::get_av_opt<T>(src, name); } ++ }; ++ ++ OptionMapperBase *impl; ++ ++public: ++ template<typename T> ++ OptionMapper(const char *opt_name, T (FFMS_Struct::*member)) : impl(new OptionMapperImpl<T>(member, opt_name)) { } ++ ++ void ToOpt(const FFMS_Struct *src, void *dst) const { impl->ToOpt(src, dst); } ++ void FromOpt(FFMS_Struct *dst, void *src) const { impl->FromOpt(dst, src); } ++}; ++ ++template<typename T, int N> ++T *ReadOptions(void *opt, OptionMapper<T> (&options)[N]) { ++ T *ret = new T; ++ for (int i = 0; i < N; ++i) ++ options[i].FromOpt(ret, opt); ++ return ret; ++} ++ ++template<typename T, int N> ++void SetOptions(const T* src, void *opt, OptionMapper<T> (&options)[N]) { ++ for (int i = 0; i < N; ++i) ++ options[i].ToOpt(src, opt); ++} ++ + #endif +diff -ru ffmpegsource/src/core/wave64writer.cpp ffms2/src/core/wave64writer.cpp +--- ffmpegsource/src/core/wave64writer.cpp 2013-02-27 16:53:39.134029741 +0100 ++++ ffms2/src/core/wave64writer.cpp 2013-02-27 16:53:31.744380192 +0100 +@@ -106,7 +106,16 @@ + WavFile.seekp(CPos, std::ios::beg); + } + +-void Wave64Writer::WriteData(void *Data, std::streamsize Length) { +- WavFile.write(reinterpret_cast<char *>(Data), Length); ++void Wave64Writer::WriteData(AVFrame const& Frame) { ++ uint64_t Length = Frame.nb_samples * BytesPerSample * Channels; ++ if (Channels > 1 && av_sample_fmt_is_planar(static_cast<AVSampleFormat>(Frame.format))) { ++ for (int32_t sample = 0; sample < Frame.nb_samples; ++sample) { ++ for (int32_t channel = 0; channel < Channels; ++channel) ++ WavFile.write(reinterpret_cast<char *>(&Frame.extended_data[channel][sample * BytesPerSample]), BytesPerSample); ++ } ++ } ++ else { ++ WavFile.write(reinterpret_cast<char *>(Frame.extended_data[0]), Length); ++ } + BytesWritten += Length; + } +diff -ru /tmp/ffmpegsource/src/ffmpegsource/src/core/wave64writer.h ffms2/src/core/wave64writer.h +--- /tmp/ffmpegsource/src/ffmpegsource/src/core/wave64writer.h 2013-02-27 16:53:39.127363391 +0100 ++++ ffms2/src/core/wave64writer.h 2013-02-27 16:53:31.744380192 +0100 +@@ -28,8 +28,8 @@ + class Wave64Writer { + public: + Wave64Writer(const char *Filename, uint16_t BitsPerSample, uint16_t Channels, uint32_t SamplesPerSec, bool IsFloat); + ~Wave64Writer(); +- void WriteData(void *Data, std::streamsize Length); ++ void WriteData(AVFrame const& Frame); + private: + ffms_fstream WavFile; + int32_t BytesPerSample; diff --git a/community/ffmpegsource/ffmpeg.patch b/community/ffmpegsource/ffmpeg.patch deleted file mode 100755 index 71bf6aa2d..000000000 --- a/community/ffmpegsource/ffmpeg.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- ffms-2.17-src.orig/configure.in -+++ ffms-2.17-src/configure.in -@@ -135,7 +135,7 @@ AC_DEFUN([TEST_LIBAV], - #include <libavcodec/avcodec.h> - #include <libswscale/swscale.h> - ]],[[ -- avcodec_init(); -+ av_register_all(); - swscale_version(); - #ifdef FFMS_USE_FFMPEG_COMPAT - int bogus = CODEC_ID_G2M; ---- ffms-2.17-src.orig/include/ffmscompat.h -+++ ffms-2.17-src/include/ffmscompat.h -@@ -84,6 +84,14 @@ - # else - # define FFMS_CALCULATE_DELAY (CodecContext->has_b_frames + (CodecContext->thread_count - 1)) - # endif -+# if VERSION_CHECK(LIBAVCODEC_VERSION_INT, <, 54, 25, 0, 54, 51, 100) -+# define FFMS_ID(x) (CODEC_ID_##x) -+# define FFMS_CodecID CodecID -+# else -+# define FFMS_ID(x) (AV_CODEC_ID_##x) -+# define FFMS_CodecID AVCodecID -+# undef CodecID -+# endif - #endif - - #ifdef LIBAVUTIL_VERSION_INT ---- ffms-2.17-src.orig/src/core/codectype.cpp -+++ ffms-2.17-src/src/core/codectype.cpp -@@ -25,7 +25,7 @@ - - typedef struct CodecTags { - char str[20]; -- CodecID id; -+ FFMS_CodecID id; - } CodecTags; - - static const CodecTags mkv_codec_tags[] = { -@@ -92,7 +92,7 @@ static const CodecTags mkv_codec_tags[] - }; - - typedef struct AVCodecTag { -- enum CodecID id; -+ enum FFMS_CodecID id; - unsigned int tag; - } AVCodecTag; - -@@ -400,7 +400,7 @@ const char *GetLAVCSampleFormatName(AVSa - } - } - --CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC, unsigned int BitsPerSample) { -+FFMS_CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC, unsigned int BitsPerSample) { - /* Look up native codecs */ - for(int i = 0; mkv_codec_tags[i].id != CODEC_ID_NONE; i++){ - if(!strncmp(mkv_codec_tags[i].str, Codec, -@@ -408,7 +408,7 @@ CodecID MatroskaToFFCodecID(char *Codec, - - // Uncompressed and exotic format fixup - // This list is incomplete -- CodecID CID = mkv_codec_tags[i].id; -+ FFMS_CodecID CID = mkv_codec_tags[i].id; - switch (CID) { - case CODEC_ID_PCM_S16LE: - switch (BitsPerSample) { ---- ffms-2.17-src.orig/src/core/codectype.h -+++ ffms-2.17-src/src/core/codectype.h -@@ -27,5 +27,5 @@ extern "C" { - #include "ffmscompat.h" - - FFMS_TrackType HaaliTrackTypeToFFTrackType(int TT); --CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC = 0, unsigned int BitsPerSample = 0); -+FFMS_CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC = 0, unsigned int BitsPerSample = 0); - const char *GetLAVCSampleFormatName(AVSampleFormat s); ---- ffms-2.17-src.orig/src/core/matroskaparser.h -+++ ffms-2.17-src/src/core/matroskaparser.h -@@ -32,6 +32,11 @@ - #ifndef MATROSKA_PARSER_H - #define MATROSKA_PARSER_H - -+/* Make sure we undefine CodecID, since libavcodec defines it as AVCodec ID */ -+#ifdef CodecID -+#undef CodecID -+#endif -+ - /* Random notes: - * - * The parser does not process frame data in any way and does not read it into diff --git a/community/fpc/PKGBUILD b/community/fpc/PKGBUILD index 2c9b5a6da..cdb0b6857 100644 --- a/community/fpc/PKGBUILD +++ b/community/fpc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 82304 2013-01-14 17:20:39Z spupykin $ +# $Id: PKGBUILD 84832 2013-02-25 10:36:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Valeriy Lyasotskiy <onestep@ukr.net> # Contributor: Jan Willemson <janwil@hot.ee> @@ -8,9 +8,9 @@ # See http://bbs.archlinux.org/viewtopic.php?t=9318&highlight=fpc pkgname=fpc -pkgver=2.6.0 +pkgver=2.6.2 _gdbver=7.5.1 -pkgrel=4 +pkgrel=1 pkgdesc="The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit Pascal Compiler. It comes with fully TP 7.0 compatible run-time library." arch=('i686' 'x86_64' 'mips64el') url="http://www.freepascal.org/" @@ -22,25 +22,25 @@ options=(zipman) source=(ftp://ftp.freepascal.org/pub/fpc/dist/$pkgver/source/fpcbuild-$pkgver.tar.gz http://ftp.gnu.org/gnu/gdb/gdb-${_gdbver}.tar.bz2 fpc-gdb.patch) -md5sums=('17375e665a4e1311f85812fe2754f609' +md5sums=('89c7e60db6280f3d5cc006a4a9ff43a9' '3f48f468b24447cf24820054ff6e85b1' '1e45ece6b5d4ee60b860e75926b4122d') build() { cd ${srcdir}/gdb-${_gdbver} - ./configure --prefix=/usr --disable-nls --without-python --disable-werror --disable-tui - make - make -C gdb libgdb.a - cp libdecnumber/libdecnumber.a gdb/ +# ./configure --prefix=/usr --disable-nls --without-python --disable-werror --disable-tui +# make +# make -C gdb libgdb.a +# cp libdecnumber/libdecnumber.a gdb/ cd ${srcdir}/fpcbuild-$pkgver - patch -p1 <$srcdir/fpc-gdb.patch +# patch -p1 <$srcdir/fpc-gdb.patch export GDBLIBDIR=${srcdir}/gdb-${_gdbver}/gdb export LIBGDBFILE=$GDBLIBDIR/libgdb.a pushd fpcsrc/compiler fpcmake -Tall popd - make build + make build NOGDB=1 } package() { diff --git a/community/freemat/PKGBUILD b/community/freemat/PKGBUILD index 36da22bf8..568c14d97 100644 --- a/community/freemat/PKGBUILD +++ b/community/freemat/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 77872 2012-10-15 10:33:45Z spupykin $ +# $Id: PKGBUILD 85346 2013-03-01 10:30:37Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=freemat pkgver=4.1 -pkgrel=6 +pkgrel=7 pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing" arch=('i686' 'x86_64' 'mips64el') url="http://freemat.sourceforge.net" license=('GPL') -depends=('qt' 'ffcall' 'fftw' 'portaudio' 'libffi' 'glu') +depends=('qt4' 'ffcall' 'fftw' 'portaudio' 'libffi' 'glu') makedepends=('arpack' 'lapack' 'umfpack' 'blas' 'libmatio' 'cmake' 'python2' 'mesa') install=freemat.install source=(http://downloads.sourceforge.net/project/freemat/FreeMat4/FreeMat-$pkgver-Source.tar.gz diff --git a/community/freeorion/PKGBUILD b/community/freeorion/PKGBUILD index 726cd7ec1..c491ff590 100644 --- a/community/freeorion/PKGBUILD +++ b/community/freeorion/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84326 2013-02-16 16:16:27Z arodseth $ +# $Id: PKGBUILD 85311 2013-02-28 21:00:16Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Elmo Todurov <todurov@gmail.com> # Contributor: guini <sidtrun@googlemail.com> @@ -7,8 +7,8 @@ # Contributor: fana-m <geminin@gmx.net> pkgname=freeorion -pkgver=0.4.1 -pkgrel=7 +pkgver=0.4.2 +pkgrel=2 pkgdesc='Turn-based galactic conquest game inspired by Master of Orion' arch=('x86_64' 'i686') url='http://www.freeorion.org/' @@ -19,10 +19,9 @@ then else depends=('nvidia-cg-toolkit') fi -depends=('bullet>=2.81' 'freealut' 'libvorbis' 'python2' 'gigi' 'desktop-file-utils') -makedepends=('boost>=1.49.0' 'ogre' 'sdl' 'gigi>=0.8.0-12' 'graphviz' 'clang' - 'desktop-file-utils' 'setconf' 'cmake' 'gendesk' 'subversion' - 'libogg') +depends=('bullet>=2.81' 'freealut' 'libvorbis' 'python2' 'gigi' 'desktop-file-utils' 'libgl') +makedepends=('boost>=1.49.0' 'ogre' 'sdl' 'gigi>=0.8.0-12' 'graphviz' 'mesa-libgl' + 'desktop-file-utils' 'setconf' 'cmake' 'gendesk' 'subversion' 'libogg') options=('!strip' '!emptydirs') install=$pkgname.install source=("$pkgname.sh" @@ -33,7 +32,7 @@ sha256sums=('111532e460aec847ff455ee67dd64f46e2fa5ceba39a0349d25a84b69c646eaf' '3dbe8df9c3a4a0d6451f42727ebf9bcb21fed41a08d1181d1cf77ef4ab5ee81a') _svnrepo='https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/' _pyversion=2.7 -_revision=5671 #5379 +_revision=5771 build() { cd "$srcdir" @@ -43,10 +42,9 @@ build() { #_releaserevision=`curl --progress-bar -o- ${url}index.php/Compile | grep "$pkgver" | cut -d':' -f2 | cut -d' ' -f10 | tail -1` #msg2 'The revision for the latest official release is $_releaserevision" ## _revision=$_releaserevision + #msg2 "Compiling with revision $_revision" - msg2 'Compiling with revision $_revision' - - msg2 'Checking out svn revision $_revision...' + msg2 "Checking out svn revision $_revision..." if [[ -d "$pkgname/.svn" ]]; then (cd "$pkgname" && svn up -r "$_revision") else diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index f75a1fa80..903e4e156 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77120 2012-10-05 10:52:14Z spupykin $ +# $Id: PKGBUILD 84836 2013-02-25 10:38:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason R Begley (jayray@digitalgoat.com> pkgname=freeradius pkgver=2.2.0 -pkgrel=3 +pkgrel=4 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64' 'mips64el') url="http://www.freeradius.org/" @@ -35,7 +35,8 @@ build() { --prefix=/usr --enable-heimdal-krb5 \ --localstatedir=/var \ --sysconfdir=/etc \ - --libdir=/usr/lib/freeradius + --libdir=/usr/lib/freeradius \ + --with-udpfromto make } diff --git a/community/fwbuilder/PKGBUILD b/community/fwbuilder/PKGBUILD index ae7574fdf..e3377e507 100644 --- a/community/fwbuilder/PKGBUILD +++ b/community/fwbuilder/PKGBUILD @@ -5,12 +5,12 @@ pkgname=fwbuilder pkgver=5.1.0.3599 -pkgrel=2 +pkgrel=3 pkgdesc="Object-oriented GUI and set of compilers for various firewall platforms" url="http://www.fwbuilder.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('libxslt' 'net-snmp' 'qt') +depends=('libxslt' 'net-snmp' 'qt4') conflicts=('libfwbuilder') install=fwbuilder.install source=("http://sourceforge.net/projects/fwbuilder/files/Current_Packages/${pkgver%.*}/fwbuilder-${pkgver}.tar.gz" @@ -21,6 +21,7 @@ sha256sums=('452514a1ec0be1416bfca93603e6c89deb91d1a3a19671c64b5a8868a3743daf' build() { cd "${srcdir}/fwbuilder-${pkgver}" patch -p1 -i "$srcdir/fwbuilder-gcc47.patch" + export CXXFLAGS="$CXXFLAGS -fno-var-tracking-assignments" ./autogen.sh ./configure --prefix=/usr make diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index d3b3e70f7..f0b37e7ff 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 82216 2013-01-12 08:15:30Z andrea $ +# $Id: PKGBUILD 85475 2013-03-01 23:01:35Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor : sebikul <sebikul@gmail.com> pkgbase=gambas3 -pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-cairo' 'gambas3-gb-chart' +pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-complex' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-data' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3' - 'gambas3-gb-desktop' 'gambas3-gb-desktop-gnome' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' - 'gambas3-gb-form-stock' 'gambas3-gb-gsl' 'gambas3-gb-gtk' 'gambas3-gb-gtk-opengl' 'gambas3-gb-image' - 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-jit' 'gambas3-gb-libxml' 'gambas3-gb-media' 'gambas3-gb-mime' - 'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-pop3' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' - 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' - 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' - 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' - 'gambas3-gb-xml-xslt' 'gambas3-gb-web') -pkgver=3.3.4 + 'gambas3-gb-desktop' 'gambas3-gb-desktop-gnome' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' + 'gambas3-gb-form-mdi' 'gambas3-gb-form-stock' 'gambas3-gb-gsl' 'gambas3-gb-gtk' 'gambas3-gb-gtk-opengl' 'gambas3-gb-image' + 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-jit' 'gambas3-gb-libxml' 'gambas3-gb-map' + 'gambas3-gb-media' 'gambas3-gb-memcached' 'gambas3-gb-mime' 'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl' + 'gambas3-gb-net-pop3' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' + 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' + 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' + 'gambas3-gb-xml' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') +pkgver=3.4.0 pkgrel=3 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') @@ -30,20 +30,18 @@ makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils 'gmime' 'glu') options=('!emptydirs') source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" - 'gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch' - 'gambas3-script.install' 'gambas3-runtime.install') -md5sums=('ec3971de80901737dcc614059f441848' - '85b6b02bccd022bf0879fcbf21e83567' - 'b284be39d147ec799f1116a6abc068b4' - '6d9e080b66443e7246387b1716d24e31') + fix-xfce4-terminal.patch + uninstall-with-XDG_UTILS.patch) +md5sums=('e9d63bfaf351fc7e1705d1b80785b6af' + '543ffb3402485e0bcfc67ecf15b7b682' + 'abf7d298d301aef65ecc4d9a775ebd00') build() { cd ${srcdir}/${pkgbase}-${pkgver} - # Fix build with LLVM 3.2 - patch -Np1 -i ${srcdir}/gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch - # replace obsolete AM_CONFIG_HEADER - sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/g' -i acinclude.m4 + # merged upstream + patch -Np1 -i ../uninstall-with-XDG_UTILS.patch + patch -Np0 -i ../fix-xfce4-terminal.patch ./reconf-all ./configure --prefix=/usr -C @@ -95,12 +93,21 @@ package_gambas3-runtime() { make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui.opengl make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/image + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/image + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc make DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/lib/gambas3/gb.{a*,chart.*,eval.highlight.*,form.*,[s-w]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{a*,chart.*,eval.highlight.*,form.*,[s-w]*} + rm -r ${pkgdir}/usr/share/gambas3/control ## } @@ -153,15 +160,15 @@ package_gambas3-script() { } package_gambas3-examples() { - depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-complex' 'gambas3-gb-compress' 'gambas3-gb-complex' 'gambas3-gb-crypt' - 'gambas3-gb-data' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' - 'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' - 'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' - 'gambas3-gb-image-io' 'gambas3-gb-media' 'gambas3-gb-mime' 'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-pop3' + depends=('gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-complex' 'gambas3-gb-compress' + 'gambas3-gb-crypt' 'gambas3-gb-data' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' + 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' + 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' + 'gambas3-gb-image-io' 'gambas3-gb-map' 'gambas3-gb-media' 'gambas3-gb-memcached' 'gambas3-gb-mime' 'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' - 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' + 'gambas3-gb-net-curl' 'gambas3-gb-net-pop3' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' - 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') + 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') pkgdesc="Applications examples" cd ${srcdir}/${pkgbase}-${pkgver} @@ -171,6 +178,26 @@ package_gambas3-examples() { rm -r ${pkgdir}/usr/share/gambas3/{info,control,gb.sdl} } +package_gambas3-gb-args() { + depends=('gambas3-runtime') + pkgdesc="Command-line options analyzer component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/lib/gambas3/gb.[f-w]* + rm -r ${pkgdir}/usr/share/gambas3/info/gb.[f-w]* + ## +} + package_gambas3-gb-cairo() { depends=('gambas3-runtime' 'cairo') pkgdesc="Cairo component" @@ -209,8 +236,8 @@ package_gambas3-gb-chart() { cd ${srcdir}/${pkgbase}-${pkgver}/main make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall rm -r ${pkgdir}/usr/share/gambas3/control - rm -r ${pkgdir}/usr/lib/gambas3/gb.[d-w]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-w]* + rm -r ${pkgdir}/usr/lib/gambas3/gb.[a*,d-w]* + rm -r ${pkgdir}/usr/share/gambas3/info/gb.[a*,d-w]* ## } @@ -296,8 +323,8 @@ package_gambas3-gb-db() { ## Workaround for splitting rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp*,gb.d{a,e,r}*,gb.[e-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.comp*,gb.d{a,e}*,gb.[e-z]*} + rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-c]*,gb.d{a,e,r}*,gb.[e-z]*} + rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-c]*,gb.d{a,e}*,gb.[e-z]*} ## } @@ -321,8 +348,8 @@ package_gambas3-gb-db-form() { cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall rm -r ${pkgdir}/usr/share/gambas3/control - rm -r ${pkgdir}/usr/lib/gambas3/gb.{chart*,[e-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{chart*,[e-z]*} + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[a-c]*,[e-z]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-c]*,[e-z]*} ## } @@ -416,6 +443,24 @@ package_gambas3-gb-db-sqlite3() { ## } +package_gambas3-gb-dbus() { + depends=('gambas3-runtime' 'dbus-core') + pkgdesc="DBUS component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus + make -j1 DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + package_gambas3-gb-desktop() { depends=('gambas3-gb-image' 'libsm' 'libxtst') pkgdesc="Desktop component" @@ -462,24 +507,6 @@ package_gambas3-gb-desktop-gnome() { ## } -package_gambas3-gb-dbus() { - depends=('gambas3-runtime' 'dbus-core') - pkgdesc="DBUS component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus - make -j1 DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - package_gambas3-gb-eval-highlight() { depends=('gambas3-runtime') pkgdesc="Expression evaluator highlight component" @@ -499,8 +526,8 @@ package_gambas3-gb-eval-highlight() { make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall cd ${srcdir}/${pkgbase}-${pkgver}/main make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-d]*,[f-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-d]*,[f-z]*} + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[a-d]*,[f-z]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-d]*,[f-z]*} rm -r ${pkgdir}/usr/share/gambas3/control ## } @@ -529,8 +556,8 @@ package_gambas3-gb-form() { cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form.*,gb.report} - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}} + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[a-e]*,[g-w]*,form.{d*,m*,s*}} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-e]*,[g-w]*,form.{d*,m*,s*}} ## } @@ -558,8 +585,8 @@ package_gambas3-gb-form-dialog() { cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall rm -r ${pkgdir}/usr/share/gambas3/control - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,g*,m*,s*}} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,m*,s*}} + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[a-e]*,[g-w]*,form.{c*,g*,m*,s*}} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-e]*,[g-w]*,form.{i*,l*,m*,s*}} ## } @@ -587,8 +614,8 @@ package_gambas3-gb-form-mdi() { cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form,gb.report} - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,d*,g*,s*}} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,d*,s*}} + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[a-e]*,[g-w]*,form.{c*,d*,g*,s*}} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-e]*,[g-w]*,form.{i*,l*,d*,s*}} ## } @@ -611,27 +638,22 @@ package_gambas3-gb-form-stock() { make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall cd ${srcdir}/${pkgbase}-${pkgver}/main make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - # rm -r ${pkgdir}/usr/lib/gambas3/gb.{eval*,[m-w]*} - # rm -r ${pkgdir}/usr/share/gambas3/info/gb.{eval*,[m-w]*} - rm -r ${pkgdir}/usr/lib/gambas3/gb.[m-w]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[m-w]* + rm -r ${pkgdir}/usr/lib/gambas3/gb.{a*,[m-w]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{a*,[m-w]*} ## } -package_gambas3-gb-gtk() { - depends=('gambas3-gb-image' 'gtk2' 'librsvg') - pkgdesc="GTK+ toolkit component" +package_gambas3-gb-gsl() { + depends=('gambas3-runtime' 'gsl') + pkgdesc="The GNU Scientific Library component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gsl make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -639,17 +661,20 @@ package_gambas3-gb-gtk() { ## } -package_gambas3-gb-gtk-opengl() { - depends=('gambas3-gb-gtk' 'gambas3-gb-opengl' 'gtkglext' 'glu') - pkgdesc="GTK+ toolkit OpenGL component" +package_gambas3-gb-gtk() { + depends=('gambas3-gb-image' 'gtk2' 'librsvg') + pkgdesc="GTK+ toolkit component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -657,16 +682,16 @@ package_gambas3-gb-gtk-opengl() { ## } -package_gambas3-gb-gsl() { - depends=('gambas3-runtime' 'gsl') - pkgdesc="The GNU Scientific Library component" +package_gambas3-gb-gtk-opengl() { + depends=('gambas3-gb-gtk' 'gambas3-gb-opengl' 'gtkglext' 'glu') + pkgdesc="GTK+ toolkit OpenGL component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gsl + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround @@ -779,6 +804,47 @@ package_gambas3-gb-libxml() { ## } +package_gambas3-gb-map() { + depends=('gambas3-gb-image-io' 'gambas3-gb-form') + pkgdesc="Display maps component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make -j1 DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-g]*,gb.mysql.*,gb.memcached.*,gb.[r-w]*} + rm -r ${pkgdir}/usr/share/gambas3/control/gb.{[d-f]*,[q-r]*} + rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-g]*,gb.mysql.*,gb.memcached.*,gb.[r-w]*} + ## +} + package_gambas3-gb-media() { depends=('gambas3-runtime' 'gstreamer0.10' 'gstreamer0.10-base') pkgdesc="Simplified interface to the GStreamer library component" @@ -797,6 +863,39 @@ package_gambas3-gb-media() { ## } +package_gambas3-gb-memcached() { + depends=('gambas3-gb-net') + pkgdesc="Memcached client component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-g]*,gb.mysql.*,gb.[r-w]*} + rm -r ${pkgdir}/usr/share/gambas3/control + rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-g]*,gb.mysql.*,gb.[r-w]*} + ## +} + package_gambas3-gb-mime() { depends=('gambas3-runtime' 'gmime') pkgdesc="MIME message component" @@ -892,8 +991,8 @@ package_gambas3-gb-net-pop3() { make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall cd ${srcdir}/${pkgbase}-${pkgver}/main make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[f-m]*,[s-w]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[f-m]*,[s-w]*} + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[a-m]*,[s-w]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-m]*,[s-w]*} ## } @@ -1026,7 +1125,7 @@ package_gambas3-gb-pdf() { } package_gambas3-gb-qt4() { - depends=('gambas3-gb-image' 'qt') + depends=('gambas3-gb-image' 'qt4') pkgdesc="Qt4 toolkit component" ## workaround for splitting @@ -1123,8 +1222,8 @@ package_gambas3-gb-report() { cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall rm -r ${pkgdir}/usr/share/gambas3/control/gb.[d-f]* - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-m]*,[s-w]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-m]*,[s-w]*} + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[a-m]*,[s-w]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-m]*,[s-w]*} ## } @@ -1179,8 +1278,8 @@ package_gambas3-gb-settings() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-r]*,[t-w]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-r]*,[t-w]*} + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[a-r]*,[t-w]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-r]*,[t-w]*} ## } @@ -1234,6 +1333,26 @@ package_gambas3-gb-vb() { ## } +package_gambas3-gb-web() { + depends=('gambas3-runtime') + pkgdesc="CGI component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make -j1 DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/lib/gambas3/gb.[a-v]* + rm -r ${pkgdir}/usr/share/gambas3/info/gb.[a-v]* + ## +} + package_gambas3-gb-xml() { depends=('gambas3-runtime' 'gcc-libs') pkgdesc="XML component" @@ -1328,22 +1447,3 @@ package_gambas3-gb-xml-xslt() { ## } -package_gambas3-gb-web() { - depends=('gambas3-runtime') - pkgdesc="CGI component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make -j1 DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.[c-v]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]* - ## -} diff --git a/community/gambas3/fix-xfce4-terminal.patch b/community/gambas3/fix-xfce4-terminal.patch new file mode 100644 index 000000000..c8fcc8f4f --- /dev/null +++ b/community/gambas3/fix-xfce4-terminal.patch @@ -0,0 +1,476 @@ +--- gb.desktop/src/gb.desktop/.src/Desktop.class (révision 5536) ++++ gb.desktop/src/gb.desktop/.src/Desktop.class (révision 5537) +@@ -1,6 +1,6 @@ + ' Gambas class file + +-Export ++Export + + Class _Desktop + +@@ -27,64 +27,64 @@ + Static Private $aImgExt As String[] + + Static Public Sub SendMail({To} As String[], Optional Cc As String[], Optional Bcc As String[], Optional Subject As String, Optional Body As String, Optional Attachment As String) +- ++ + Dim aArg As String[] + 'xdg-email [--utf8] [--cc address] [--bcc address] [--subject text] [--body text + ' ] [--attach file] { mailto-uri | address(es) } +- ++ + aArg = ["--utf8"] +- If CC And If CC.Count Then ++ If CC And If CC.Count Then + aArg.Add("--cc") + aArg.Insert(CC) + Endif +- If BCC And If BCC.Count Then ++ If BCC And If BCC.Count Then + aArg.Add("--bcc") + aArg.Insert(BCC) + Endif +- If Subject Then ++ If Subject Then + aArg.Add("--subject") + aArg.Add(Subject) +- Endif +- If Body Then ++ Endif ++ If Body Then + aArg.Add("--body") + aArg.Add(Body) + Endif +- If Attachment Then ++ If Attachment Then + aArg.Add("--attach") + aArg.Add(Attachment) +- Endif +- +- If {To} And If To.Count Then ++ Endif ++ ++ If {To} And If To.Count Then + aArg.Insert({To}) + Endif +- ++ + Main.RunXdgUtil("xdg-email", aArg) +- ++ + End + + Static Public Sub {Open}(URL As String, Optional {Wait} As Boolean) +- ++ + If URL = "~" Then + URL = User.Home + Else If URL Begins "~/" Then + URL = User.Home & Mid$(URL, 2) + Endif +- ++ + Main.RunXdgUtil("xdg-open", [URL], {Wait}) +- ++ + End + + ' Static Private Function Menus_Read() As _DesktopMenus +-' +-' Return _DesktopMenus +-' ++' ++' Return _DesktopMenus ++' + ' End +-' +-' ++' ++' + ' Static Private Function Icons_Read() As _DesktopIcons +-' ++' + ' Return _DesktopIcons +-' ++' + ' End + + Static Private Function ScreenSaver_Read() As _Desktop_ScreenSaver +@@ -96,20 +96,20 @@ + ' GB_STATIC_METHOD("Find", "Integer[]", CDESKTOP_find, "[(Title)s(Application)s(Role)s]"), + + Static Public Sub FindWindow(Optional Title As String, Application As String, Role As String) As Integer[] +- ++ + Return _Desktop.FindWindow(Title, Application, Role) +- ++ + End + + ' STATIC PRIVATE SUB InitKeys() +-' ++' + ' $cKeys = NEW Collection + ' $cKeys["é"] = "eacute" +-' ++' + ' END + + Static Public Sub SendKeys(Keys As String) +- ++ + Dim iInd As Integer + Dim sCar As String + Dim iPos As Integer +@@ -117,15 +117,15 @@ + Dim bHold As Boolean + Dim sErr As String + Dim iLen As Integer = String.Len(Keys) +- ++ + Do +- ++ + Inc iInd + If iInd > iLen Then Break +- ++ + sCar = String.Mid$(Keys, iInd, 1) +- +- If sCar = "[" Then ++ ++ If sCar = "[" Then + iPos = String.InStr(Keys, "]", iInd) + If iPos = 0 Then Break + sCar = String.Mid$(Keys, iInd + 1, iPos - iInd - 1) +@@ -134,7 +134,7 @@ + Else If sCar = "{" And If Not bHold Then + bHold = True + Continue +- Else If sCar = "}" And If bHold Then ++ Else If sCar = "}" And If bHold Then + bHold = False + aRelease.Reverse + For Each sCar In aRelease +@@ -144,11 +144,11 @@ + aRelease.Clear + Continue + Endif +- +- If Len(sCar) >= 2 Then ++ ++ If Len(sCar) >= 2 Then + Try sCar = Conv(sCar, "UTF-8", "LATIN1") + Endif +- ++ + If bHold Then + 'DEBUG sCar;; TRUE + _Desktop.SendKey(sCar, True) +@@ -159,25 +159,25 @@ + 'DEBUG sCar;; FALSE + _Desktop.SendKey(sCar, False) + Endif +- +- Loop +- +-Catch + ++ Loop ++ ++Catch ++ + sErr = Error.Text & ": '" & sCar & "'" +- ++ + For Each sCar In aRelease + _Desktop.SendKey(sCar, False) + Next + + Error.Raise(sErr) +- ++ + End + + Static Private Sub GetDesktop() As String +- ++ + If Not $sDesktop Then +- ++ + If Application.Env["KDE_FULL_SESSION"] Then + If Application.Env["KDE_SESSION_VERSION"] = "4" Then + $sDesktop = "KDE4" +@@ -204,24 +204,23 @@ + $sDesktop = "?" + End Select + Endif +- ++ + Endif +- ++ + '$sDesktop = "GNOME" + Return $sDesktop +- ++ + End + ++Static Public Sub OpenTerminal(Optional {Dir} As String) ', Optional Command As String) + +-Static Public Sub OpenTerminal(Optional {Dir} As String) ', Optional Command As String) +- + Dim sExec As String + Dim sCmd As String + Dim bNoDir As Boolean + Dim Command As String +- ++ + Select Case GetDesktop() +- ++ + Case "KDE" + sExec = "konsole" + Case "KDE4" +@@ -247,7 +246,7 @@ + Endif + If Command Then sExec &= " -x " & Shell$(Command) + Case "XFCE" +- sExec = "Terminal" ++ sExec = "xfce4-terminal" + If Command Then sExec &= " -x " & Shell$(Command) + Case "LXDE" + sExec = "lxterminal" +@@ -255,46 +254,43 @@ + Case Else + sExec = "xterm" + If Command Then sExec &= " -e " & Shell$(Command) +- ++ + End Select +- ++ + If {Dir} And If Not bNoDir Then + sCmd = "(cd " & Shell$({Dir}) & "; " & sExec & ")" + Else + sCmd = sExec + Endif +- ++ + Shell sCmd +- ++ + End + +- + Static Private Function Type_Read() As String + +- Return GetDesktop() ++ Return GetDesktop() + + End + +- + Static Public Sub _get(Index As Integer) As _DesktopVirtual + + Dim hVirtual As _DesktopVirtual +- ++ + If Not $cDesktop Then $cDesktop = New Collection +- ++ + hVirtual = $cDesktop[Index] + If Not hVirtual Then + hVirtual = New _DesktopVirtual(Index) + $cDesktop[Index] = hVirtual + Endif + Return hVirtual +- ++ + End + +- + Static Private Function Current_Read() As Integer + +- Try Return _Desktop.GetWindowProperty(Atom["_NET_CURRENT_DESKTOP"])[0] ++ Try Return _Desktop.GetWindowProperty(Atom["_NET_CURRENT_DESKTOP"])[0] + + End + +@@ -313,7 +309,7 @@ + + Static Private Sub Count_Write(Value As Integer) + +- _Desktop.SendClientMessageToRootWindow(Atom["_NET_NUMBER_OF_DESKTOPS"], [Value]) ++ _Desktop.SendClientMessageToRootWindow(Atom["_NET_NUMBER_OF_DESKTOPS"], [Value]) + + End + +@@ -343,40 +339,40 @@ + + Static Private Sub Showing_Write(Value As Boolean) + +- _Desktop.SendClientMessageToRootWindow(Atom["_NET_SHOWING_DESKTOP"], [If(Value, 1, 0)]) ++ _Desktop.SendClientMessageToRootWindow(Atom["_NET_SHOWING_DESKTOP"], [If(Value, 1, 0)]) + + End + + ' Static Private Function Width_Read() As Integer +-' ++' + ' Dim iWidth As Integer +-' ++' + ' Try iWidth = _Desktop.GetWindowProperty(Atom["_NET_DESKTOP_GEOMETRY"])[0] + ' If iWidth = 0 Then iWidth = Super.Width + ' Return iWidth +-' ++' + ' End +-' ++' + ' Static Private Function Height_Read() As Integer +-' ++' + ' Dim iHeight As Integer +-' ++' + ' Try iHeight = _Desktop.GetWindowProperty(Atom["_NET_DESKTOP_GEOMETRY"])[1] + ' If iHeight = 0 Then iHeight = Super.Height + ' Return iHeight +-' ++' + ' End + + ' Static Private Function W_Read() As Integer +-' ++' + ' Return Width_Read() +-' ++' + ' End +-' ++' + ' Static Private Function H_Read() As Integer +-' ++' + ' Return Height_Read() +-' ++' + ' End + + Static Private Function Passwords_Read() As _Desktop_Passwords +@@ -385,7 +381,6 @@ + + End + +- + Static Private Function Path_Read() As String + + Return Main.GetDesktopPath() +@@ -399,34 +394,33 @@ + End + + Static Public Sub RunAsRoot(Command As String) +- ++ + Main.RunXdgUtil("xdg-su", ["-c", Command]) +- + + End + + Static Public Sub GetFileIcon(Path As String, Size As Integer, Optional Preview As Boolean) As Picture +- ++ + Dim hImage As Image + Dim hIcon As Image + Dim sIcon As String + Dim hPict As Picture +- ++ + If IsDir(Path) Then Return Picture["icon:/" & CStr(Size) & "/directory"] +- ++ + If Preview And If $aImgExt.Exist(File.Ext(Path)) < 0 Then +- If Stat(Path).Size <= 65536 Then +- ++ If Stat(Path).Size <= 65536 Then ++ + Try hImage = Image.Load(Path) + If Not Error Then +- If Not (hImage.Width = Size And hImage.Height = Size) Then +- If hImage.Width > hImage.Height Then ++ If Not (hImage.Width = Size And hImage.Height = Size) Then ++ If hImage.Width > hImage.Height Then + hImage = hImage.Stretch(Size, (Size * hImage.Height) \ hImage.Width) + Else + hImage = hImage.Stretch((Size * hImage.Width) \ hImage.Height, Size) + Endif + Endif +- ++ + hIcon = New Image(hImage.W + 4, hImage.H + 4, Color.Transparent) + Paint.Begin(hIcon) + Paint.AntiAlias = False +@@ -435,38 +429,38 @@ + Paint.Stroke + Paint.End + hIcon.DrawImage(hImage, 2, 2) +- ++ + Return hIcon.Picture + Else +- Return Picture["icon:/" & Size & "/image"] ++ Return Picture["icon:/" & Size & "/image"] + Endif +- ++ + Endif +- ++ + Endif + + Try hPict = DesktopMime.FromFile(Path).GetIcon(Size).Picture + If hPict Then Return hPict +- ++ + If Not $cExt Then InitFileExt +- ++ + Try sIcon = $cExt[File.Ext(Path)] + If sIcon Then Return Picture["icon:/" & CStr(Size) &/ sIcon] +- ++ + With Stat(Path) +- ++ + If InStr(.Perm[System.User.Name], "x") Then Return Picture["icon:/" & CStr(Size) &/ "exec"] +- ++ + End With +- ++ + Catch +- ++ + Error "gb.desktop: unable to get icon for file: "; File.Name(Path) +- ++ + End + + Static Private Sub InitFileExt() +- ++ + $cExt = New Collection + $cExt["html"] = "html" + $cExt["htm"] = "html" +@@ -502,7 +496,7 @@ + $cExt["ico"] = "image" + $cExt["xcf"] = "image" + $cExt["svg"] = "image" +- ++ + $aImgExt = ["png", "jpeg", "jpg", "gif", "xpm", "bmp", "ico"] +- ++ + End diff --git a/community/gambas3/uninstall-with-XDG_UTILS.patch b/community/gambas3/uninstall-with-XDG_UTILS.patch new file mode 100644 index 000000000..0b7b9b8d7 --- /dev/null +++ b/community/gambas3/uninstall-with-XDG_UTILS.patch @@ -0,0 +1,13 @@ +diff -Nur gambas3-3.4.0/main/Makefile.am gambas3-3.4.0b/main/Makefile.am +--- gambas3-3.4.0/main/Makefile.am 2013-02-03 19:20:59.000000000 +0000 ++++ gambas3-3.4.0b/main/Makefile.am 2013-02-21 15:28:16.941250567 +0000 +@@ -27,5 +27,7 @@ + uninstall-local: + @rm -f $(DESTDIR)$(bindir)/gbr$(GAMBAS_VERSION) + @rm -rf $(DESTDIR)$(gblibdir)/info +- @xdg-mime uninstall $(srcdir)/mime/application-x-gambas3.xml; +- @xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3; ++ @if test x"$(XDG_UTILS)" != x; then \ ++ xdg-mime uninstall $(srcdir)/mime/application-x-gambas3.xml; \ ++ xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3; \ ++ fi diff --git a/community/gebabbel/PKGBUILD b/community/gebabbel/PKGBUILD index 322843866..8eb8d9c89 100644 --- a/community/gebabbel/PKGBUILD +++ b/community/gebabbel/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 67652 2012-03-13 15:27:16Z lcarlier $ +# $Id: PKGBUILD 85453 2013-03-01 19:08:27Z andrea $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: pfm <nl081130@yahoo.de> pkgname=gebabbel pkgver=0.4 -pkgrel=5 +pkgrel=6 pkgdesc="GUI for gpsbabel" arch=('i686' 'x86_64' 'mips64el') url="http://gebabbel.sourceforge.net/" license=('GPL2') -depends=('qt' 'gpsbabel') +depends=('qt4' 'gpsbabel') changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/sourceforge/$pkgname/Gebabbel-$pkgver-Src.tar.gz \ http://$pkgname.sourceforge.net/GebabbelLogo.png \ @@ -25,7 +25,7 @@ build() { patch -Np0 -i ${srcdir}/$pkgname-$pkgver.patch - qmake + qmake-qt4 make } diff --git a/community/geos/PKGBUILD b/community/geos/PKGBUILD index 7e8122199..1c531f85c 100644 --- a/community/geos/PKGBUILD +++ b/community/geos/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82441 2013-01-18 06:33:26Z jlichtblau $ +# $Id: PKGBUILD 84760 2013-02-24 12:07:30Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=geos -pkgver=3.3.6 +pkgver=3.3.7 pkgrel=1 pkgdesc="C++ port of the Java Topology Suite" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('gcc-libs' 'bash') options=('!libtool' '!emptydirs') changelog=$pkgname.changelog source=(http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('7ee6c1da9a1b87a3e29209e7cddbf19d36f9689d8e44fec2c9bcf6a1b1be3898') +sha256sums=('fd01c21b54a3c48cac3e7885f26d4ca10ea9944238776b8ce03489e5e45c592b') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/geos/geos.changelog b/community/geos/geos.changelog index ce733ca84..9101abbb8 100644 --- a/community/geos/geos.changelog +++ b/community/geos/geos.changelog @@ -1,3 +1,6 @@ +2013-02-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * geos 3.3.7-1 + 2013-01-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * geos 3.3.6-1 diff --git a/community/gigi/PKGBUILD b/community/gigi/PKGBUILD index be9a68f2b..ed430d7b6 100644 --- a/community/gigi/PKGBUILD +++ b/community/gigi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83897 2013-02-06 12:43:24Z arodseth $ +# $Id: PKGBUILD 85249 2013-02-28 09:21:43Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: fana-m <geminin@gmx.net> @@ -7,15 +7,15 @@ pkgname=gigi pkgver=0.8.0 -pkgrel=17 -_fixedrevision=5407 +pkgrel=18 +_fixedrevision=5780 #5407 pkgdesc='Small, efficient and feature rich GUI for OpenGL and C++ (freeorion fork)' -url='http://freeorion.svn.sourceforge.net/viewvc/freeorion/trunk/FreeOrion/GG/' #url='http://gigi.sourceforge.net/' +url='http://freeorion.svn.sourceforge.net/viewvc/freeorion/trunk/FreeOrion/GG/' arch=('x86_64' 'i686') license=('LGPL') depends=('boost' 'libpng' 'libtiff' 'ogre' 'sdl' 'python') -makedepends=('subversion' 'cmake' 'setconf' 'doxygen' 'mesa') +makedepends=('subversion' 'cmake' 'setconf' 'doxygen' 'mesa-libgl') build() { cd "$srcdir" @@ -39,7 +39,8 @@ build() { setconf cmake/GiGiSDL.pc.in prefix /usr # It would be better if CMAKE_INSTALL_PREFIX or the resulting Makefiles # could be re-configured in the package() function, but this works too. - cmake -D CMAKE_INSTALL_PREFIX="$srcdir/pkg/usr" \ + cmake \ + -D CMAKE_INSTALL_PREFIX="$srcdir/pkg/usr" \ -D BUILD_TUTORIALS=OFF \ -D CPACK_GENERATOR=GiGiDevel \ -D CMAKE_C_FLAGS_RELEASE='-DNDEBUG' \ diff --git a/community/glitz/PKGBUILD b/community/glitz/PKGBUILD index 16945df94..e96fd2b35 100644 --- a/community/glitz/PKGBUILD +++ b/community/glitz/PKGBUILD @@ -1,29 +1,31 @@ -# $Id: PKGBUILD 66602 2012-02-26 14:06:03Z lfleischer $ +# $Id: PKGBUILD 85262 2013-02-28 10:34:33Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> pkgname=glitz pkgver=0.5.6 -pkgrel=3 -pkgdesc="OpenGL image compositing library" -arch=('i686' 'x86_64' 'mips64el') -url="http://cairographics.org/" +pkgrel=4 +pkgdesc='OpenGL image compositing library' +arch=('x86_64' 'i686' 'mips64el') +url='http://cairographics.org/' license=('BSD') -depends=('libgl') -makedepends=('mesa') +depends=('libgl' 'glibc') +makedepends=('mesa-libgl') options=('!libtool') -source=("http://cairographics.org/snapshots/${pkgname}-${pkgver}.tar.gz") -md5sums=('c507f140ecccc06aed8888c958edda4c') +source=("http://cairographics.org/snapshots/$pkgname-$pkgver.tar.gz") +sha256sums=('132adf06e48531f4c01b6ba5843881e2b584a170c5222353d03cbef736d4a471') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } +# vim:set ts=2 sw=2 et: diff --git a/community/glob2/PKGBUILD b/community/glob2/PKGBUILD index 3d9858279..e9ac32d0f 100644 --- a/community/glob2/PKGBUILD +++ b/community/glob2/PKGBUILD @@ -1,41 +1,38 @@ -# $Id: PKGBUILD 83780 2013-02-05 07:28:52Z arodseth $ +# $Id: PKGBUILD 85280 2013-02-28 12:06:25Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> pkgname=glob2 pkgver=0.9.4.4 -pkgrel=15 +pkgrel=16 pkgdesc='RTS game which minimizes micro-management by automatically assigning tasks to units' arch=('x86_64' 'i686' 'mips64el') url='http://www.globulation2.org/' license=('GPL3') depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'glu' - 'fribidi' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('scons' 'boost' 'mesa') -install=glob2.install -source=("http://dl.sv.nongnu.org/releases/$pkgname/0.9.4/$pkgname-$pkgver.tar.gz" - 'glob2-0.9.4.1-gcc44.patch') + 'fribidi' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'libgl') +makedepends=('scons' 'boost' 'mesa-libgl') +install="$pkgname.install" +source=("http://dl.sv.nongnu.org/releases/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.gz" + "$pkgname-${pkgver%.*}.1-gcc44.patch") sha256sums=('0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8' '3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np0 -i "$srcdir/glob2-0.9.4.1-gcc44.patch" - scons \ - LINKFLAGS="-lboost_system" + patch -Np0 -i "$srcdir/$pkgname-${pkgver%.*}.1-gcc44.patch" + scons LINKFLAGS="-lboost_system" } package () { cd "$srcdir/$pkgname-$pkgver" - scons install \ - BINDIR="$pkgdir/usr/bin" \ - INSTALLDIR="$pkgdir/usr/share" + scons install BINDIR="$pkgdir/usr/bin" INSTALLDIR="$pkgdir/usr/share" find "$pkgdir/usr/share" -type f -exec chmod 644 '{}' \; - install -Dm644 data/icons/glob2-icon-48x48.png \ - "$pkgdir/usr/share/pixmaps/glob2-icon-48x48.png" + install -Dm644 "data/icons/$pkgname-icon-48x48.png" \ + "$pkgdir/usr/share/pixmaps/$pkgname-icon-48x48.png" } # vim:set ts=2 sw=2 et: diff --git a/community/gluon/PKGBUILD b/community/gluon/PKGBUILD index 78b666d40..274fd2f6d 100644 --- a/community/gluon/PKGBUILD +++ b/community/gluon/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 72719 2012-06-21 07:09:44Z andrea $ +# $Id: PKGBUILD 85350 2013-03-01 10:31:40Z andrea $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Ivan Sichmann Freitas <ivansichfreitas@gmail.com> pkgname=gluon pkgver=0.71.0 _pkgver=0.71 -pkgrel=4 +pkgrel=5 pkgdesc="A free and open source platform for creating and distributing games" arch=('i686' 'x86_64' 'mips64el') url="http://gluon.gamingfreedom.org/" @@ -27,11 +27,16 @@ build() { cd build cmake ../$pkgname-$pkgver \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON make } package() { cd "$srcdir"/build make DESTDIR="$pkgdir" install + + if [[ "$CARCH" == "x86_64" ]]; then + mv "${pkgdir}"/usr/lib64 "${pkgdir}"/usr/lib + fi } diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD index bc20723c3..add431133 100644 --- a/community/gmerlin/PKGBUILD +++ b/community/gmerlin/PKGBUILD @@ -1,5 +1,5 @@ -# $Id: PKGBUILD 82329 2013-01-15 11:35:00Z allan $ -# Maintainer: Mateusz Herych <heniekk@gmail.com> +# $Id: PKGBUILD 85325 2013-03-01 02:43:05Z cinelli $ +# Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> pkgname=gmerlin pkgver=1.2.0 @@ -19,14 +19,17 @@ optdepends=('alsa-lib: for ALSA support' options=('!libtool') install=gmerlin.install source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz - cdio-api-fixes.patch) + cdio-api-fixes.patch + gmerlin-texi.patch) md5sums=('2f2a0880e738e71486f04c929ba067f4' - 'd0e407f01435394a0cfe04acb3c1a4cc') + 'd0e407f01435394a0cfe04acb3c1a4cc' + '33a4dce06b7560fc839055c5a872435f') build() { cd "$srcdir/$pkgname-$pkgver" patch -Np1 -i "$srcdir/cdio-api-fixes.patch" + patch -Np1 -i "$srcdir/gmerlin-texi.patch" rm -rf cpuinfo.sh diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index 0701b016b..f918caa5a 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84155 2013-02-12 09:34:15Z spupykin $ +# $Id: PKGBUILD 85351 2013-03-01 10:31:49Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: farid <farid at archlinuc-br.org> @@ -7,11 +7,11 @@ pkgbase=gmic pkgname=("gmic" "gimp-plugin-gmic" "zart") pkgver=1.5.4.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://gmic.sourceforge.net" license=("custom:CeCILL") -makedepends=("gimp" "qt" "fftw" "openexr" "opencv") +makedepends=('gimp' 'qt4' 'fftw' 'openexr' 'opencv' 'mesa' 'gtk2') #options=('!emptydirs') source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz" "opencv-buildfix.patch") @@ -39,7 +39,7 @@ package_gmic() { package_zart() { pkgdesc="A GUI for G'MIC real-time manipulations on the output of a webcam" - depends=("opencv" "fftw" "qt") + depends=("opencv" "fftw" "qt4") cd "${srcdir}/gmic-${pkgver}" make -C src install DESTDIR="$pkgdir" USR="/usr" diff --git a/community/goaccess/PKGBUILD b/community/goaccess/PKGBUILD new file mode 100644 index 000000000..f2c1d647b --- /dev/null +++ b/community/goaccess/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 84906 2013-02-26 01:29:13Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Josh VanderLinden <arch@cloudlery.com> +# Contributor: Nicolas Storme <nicolas@atelier-web.com> + +pkgname=goaccess +pkgver=0.5 +pkgrel=2 +pkgdesc="An open source real-time web log analyzer and interactive viewer" +arch=('i686' 'x86_64') +url="http://goaccess.prosoftcorp.com" +license=('GPL') +depends=('ncurses' 'geoip' 'glib2') +source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('f6359a9553a460265f5859cea4d40ec0') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --enable-geoip + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make prefix="$pkgdir/usr" install +} diff --git a/community/golangide/PKGBUILD b/community/golangide/PKGBUILD index 1d716610f..7b8128956 100644 --- a/community/golangide/PKGBUILD +++ b/community/golangide/PKGBUILD @@ -1,16 +1,16 @@ -#$Id: PKGBUILD 83985 2013-02-07 22:46:23Z arodseth $ +#$Id: PKGBUILD 85352 2013-03-01 10:31:59Z andrea $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: spambanane <happy.house@gmx.de> # Contributor: Matteo <matteo.dek@gmail.com> pkgname=golangide pkgver=17 -pkgrel=1 +pkgrel=2 pkgdesc='IDE for editing and building projects written in the Go programming language (now LiteIDE X)' license=('LGPL') arch=('x86_64' 'i686') url='https://github.com/visualfc/liteide' -depends=('go' 'libpng12' 'glib2' 'qt' 'qjson' 'qtwebkit') +depends=('go' 'libpng12' 'glib2' 'qt4' 'qjson') makedepends=('gendesk') options=('!strip') _name=('Golang IDE') @@ -19,7 +19,7 @@ _name=('Golang IDE') source=("$pkgname.tgz::https://nodeload.github.com/visualfc/liteide/tar.gz/master" 'golangide.png' 'golangide.sh') -sha256sums=('abc30259bc5d87d23713479e2e464cadd152e588a95400415f6a1247004cfeff' +sha256sums=('88fae4a43a82ecb12739bfe6612d736fa963d8beaf30dccfb305c335929c3871' '47c52b22326034bd3d6a7b11b05a53c8b3838c08e145171cf5cad2ca00260697' 'aa5ea27f9c3626431a9cb45e5267771a1eeff48b2e3927c0574eaef9302cfd74') diff --git a/community/goldendict/PKGBUILD b/community/goldendict/PKGBUILD index 728d5407c..a615d0664 100644 --- a/community/goldendict/PKGBUILD +++ b/community/goldendict/PKGBUILD @@ -1,33 +1,33 @@ -# $Id: PKGBUILD 61073 2011-12-21 20:50:41Z andrea $ +# $Id: PKGBUILD 85453 2013-03-01 19:08:27Z andrea $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: m0rph <m0rph.mailbox@gmail.com> pkgname=goldendict pkgver=1.0.1 -pkgrel=5 +pkgrel=6 pkgdesc="Feature-rich dictionary lookup program" arch=('i686' 'x86_64' 'mips64el') url="http://goldendict.berlios.de/" license=('GPL3') -depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'qt' 'qtwebkit' 'phonon') -makedepds=('patch') +depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'qtwebkit' 'phonon') +makedepends=('patch') provides=('stardict') changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2 $pkgname-paths.diff - goldendict-1.0.1-gcc-4.7.patch) + gcc47.patch) sha256sums=('b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6' '1dacae7b7a7d7c20a22b4595c07dbd65fdad134a0d4cf283312ea3bdb5f42589' - 'd61d95f464e82ed83493cbb5ded3ecc59a34eb879eb9c7140d801ee6e0c4454e') + '2e13857d047186e781c3bd9de3cfdf794f4d44e8e28f9d18dda8df50cfe13c6e') build(){ cd ${srcdir} patch -Np0 -i ${srcdir}/$pkgname-paths.diff - patch -Np1 -i ${srcdir}/goldendict-1.0.1-gcc-4.7.patch - qmake + patch -p1 -i ${srcdir}/gcc47.patch + + qmake-qt4 make - qmake } package() { diff --git a/community/goldendict/gcc47.patch b/community/goldendict/gcc47.patch new file mode 100644 index 000000000..6496d4292 --- /dev/null +++ b/community/goldendict/gcc47.patch @@ -0,0 +1,23 @@ +diff -urN goldendict-1.0.1-src.orig/processwrapper.cc goldendict-1.0.1-src/processwrapper.cc +--- goldendict-1.0.1-src.orig/processwrapper.cc 2010-12-04 02:42:46.000000000 +0530 ++++ goldendict-1.0.1-src/processwrapper.cc 2012-08-04 20:51:45.835055609 +0530 +@@ -94,6 +94,8 @@ +
+ #else
+
++#include <unistd.h>
++
+ unsigned int ProcessWrapper::currentProcessId()
+ {
+ return getpid();
+diff -urN goldendict-1.0.1-src.orig/qtsingleapplication/src/qtlocalpeer.cpp goldendict-1.0.1-src/qtsingleapplication/src/qtlocalpeer.cpp +--- goldendict-1.0.1-src.orig/qtsingleapplication/src/qtlocalpeer.cpp 2010-12-04 02:42:46.000000000 +0530 ++++ goldendict-1.0.1-src/qtsingleapplication/src/qtlocalpeer.cpp 2012-08-04 20:48:47.761593825 +0530 +@@ -50,6 +50,7 @@ + #endif + #if defined(Q_OS_UNIX) + #include <time.h> ++#include <unistd.h> + #endif + + namespace QtLP_Private { diff --git a/community/google-gadgets/PKGBUILD b/community/google-gadgets/PKGBUILD index 34c643492..000ba0fee 100644 --- a/community/google-gadgets/PKGBUILD +++ b/community/google-gadgets/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61075 2011-12-21 20:50:53Z andrea $ +# $Id: PKGBUILD 85354 2013-03-01 10:32:21Z andrea $ # Maintainer: Ray Rashif <schiv@archlinux.org> pkgbase=google-gadgets @@ -8,25 +8,25 @@ _basedir="$startdir/pkg/base" pkgver=0.11.2 _sover=1.0 _sobump=0.0.0 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/google-gadgets-for-linux/" license=('APACHE') makedepends=('gstreamer0.10-base-plugins' 'libwebkit' 'desktop-file-utils' 'xdg-utils' 'librsvg' 'curl' 'libsoup-gnome' - 'qt' 'qtwebkit' + 'qtwebkit' 'networkmanager' 'zip' 'flex') options=('!libtool') source=("http://google-gadgets-for-linux.googlecode.com/files/$_realname-$pkgver.tar.bz2" "wifi-types.patch" - "google-gadgets-0.11.2-glib-2.31.patch" - "google-gadgets-0.11.2-gcc-4.7.patch") + 'gcc47.patch' + 'glibc231.patch') md5sums=('279305553bcbf74f3e3615f6abc36a5e' 'f0df71c60a174e9d629db87b8bd9e102' - '1b9c7769d6659ea77069e9c22592797a' - 'b62bc8592b5a44cb34cb7a7e4a6cf62e') + 'b62bc8592b5a44cb34cb7a7e4a6cf62e' + '4b96d1da79a375ef2fb58ff01a76f684') build() { cd "$srcdir/$_realname-$pkgver" @@ -39,6 +39,8 @@ build() { patch -Np1 -i ${srcdir}/google-gadgets-0.11.2-glib-2.31.patch patch -Np1 -i ${srcdir}/google-gadgets-0.11.2-gcc-4.7.patch patch -p1 <$srcdir/wifi-types.patch + patch -p1 -i "${srcdir}"/gcc47.patch + patch -p0 -i "${srcdir}"/glibc231.patch ./configure --prefix=/usr \ --disable-werror \ --disable-update-desktop-database \ @@ -129,7 +131,7 @@ package_google-gadgets-qt() { pkgdesc="Desktop widgets from Google (partial Qt front-end)" groups=('google-gadgets') install=$pkgbase.install - depends=('google-gadgets-common' 'qt' 'qtwebkit' + depends=('google-gadgets-common' 'qtwebkit' 'desktop-file-utils' 'xdg-utils' 'gstreamer0.10-base-plugins' 'libwebkit') optdepends=('networkmanager: desktop integration') diff --git a/community/google-gadgets/gcc47.patch b/community/google-gadgets/gcc47.patch new file mode 100644 index 000000000..2e77e10fd --- /dev/null +++ b/community/google-gadgets/gcc47.patch @@ -0,0 +1,325 @@ +Author: Pino Toscano <pino@debian.org> +Description: Fix building with GCC 4.7 + This patch fixes the two kinds of issues that arise with GCC 4.7: + - include <unistd.h> for functions like access(), fork(), readlink(), etc + - fix argument-dependent lookup issues by qualifying the lookup of functions +Forwarded: no +Last-Update: 2012-04-04 + +--- a/ggadget/scriptable_enumerator.h ++++ b/ggadget/scriptable_enumerator.h +@@ -68,22 +68,22 @@ + + protected: + virtual void DoClassRegister() { +- RegisterMethod("atEnd", ++ this->RegisterMethod("atEnd", + NewSlot(&E::AtEnd, + &ScriptableEnumerator<E, Wrapper, Param, ClassId> + ::enumerator_)); +- RegisterMethod("moveFirst", ++ this->RegisterMethod("moveFirst", + NewSlot(&E::MoveFirst, + &ScriptableEnumerator<E, Wrapper, Param, ClassId> + ::enumerator_)); +- RegisterMethod("moveNext", ++ this->RegisterMethod("moveNext", + NewSlot(&E::MoveNext, + &ScriptableEnumerator<E, Wrapper, Param, ClassId> + ::enumerator_)); +- RegisterMethod("item", ++ this->RegisterMethod("item", + NewSlot(&ScriptableEnumerator<E, Wrapper, Param, ClassId> + ::GetItem)); +- RegisterProperty("count", ++ this->RegisterProperty("count", + NewSlot(&E::GetCount, + &ScriptableEnumerator<E, Wrapper, Param, ClassId> + ::enumerator_), +--- a/ggadget/uuid.cc ++++ b/ggadget/uuid.cc +@@ -24,6 +24,7 @@ + #include <cstdlib> + #include <cstring> + #include <ctime> ++#include <unistd.h> + + #include "string_utils.h" + +--- a/ggadget/xml_dom.cc ++++ b/ggadget/xml_dom.cc +@@ -1327,15 +1327,15 @@ + + virtual void DoClassRegister() { + Super::DoClassRegister(); +- RegisterProperty("data", NewSlot(&DOMCharacterData::GetData), ++ this->RegisterProperty("data", NewSlot(&DOMCharacterData::GetData), + NewSlot(&DOMCharacterData::SetData)); +- RegisterProperty("length", NewSlot(&DOMCharacterData::GetLength), NULL); +- RegisterMethod("substringData", ++ this->RegisterProperty("length", NewSlot(&DOMCharacterData::GetLength), NULL); ++ this->RegisterMethod("substringData", + NewSlot(&DOMCharacterData::ScriptSubstringData)); +- RegisterMethod("appendData", NewSlot(&DOMCharacterData::AppendData)); +- RegisterMethod("insertData", NewSlot(&DOMCharacterData::ScriptInsertData)); +- RegisterMethod("deleteData", NewSlot(&DOMCharacterData::ScriptDeleteData)); +- RegisterMethod("replaceData", ++ this->RegisterMethod("appendData", NewSlot(&DOMCharacterData::AppendData)); ++ this->RegisterMethod("insertData", NewSlot(&DOMCharacterData::ScriptInsertData)); ++ this->RegisterMethod("deleteData", NewSlot(&DOMCharacterData::ScriptDeleteData)); ++ this->RegisterMethod("replaceData", + NewSlot(&DOMCharacterData::ScriptReplaceData)); + } + +@@ -1377,20 +1377,20 @@ + private: + UTF16String ScriptSubstringData(size_t offset, size_t count) { + UTF16String result; +- CheckException(SubstringData(offset, count, &result)); ++ this->CheckException(SubstringData(offset, count, &result)); + return result; + } + + void ScriptInsertData(size_t offset, const UTF16String &arg) { +- CheckException(InsertData(offset, arg)); ++ this->CheckException(InsertData(offset, arg)); + } + + void ScriptDeleteData(size_t offset, size_t count) { +- CheckException(DeleteData(offset, count)); ++ this->CheckException(DeleteData(offset, count)); + } + + void ScriptReplaceData(size_t offset, size_t count, const UTF16String &arg) { +- CheckException(ReplaceData(offset, count, arg)); ++ this->CheckException(ReplaceData(offset, count, arg)); + } + + DOMCharacterDataImpl impl_; +@@ -1417,10 +1417,10 @@ + + virtual void DoClassRegister() { + Super::DoClassRegister(); +- RegisterProperty("name", NewSlot(&DOMAttr::GetName), NULL); ++ this->RegisterProperty("name", NewSlot(&DOMAttr::GetName), NULL); + // Our DOMAttrs are always specified, because we don't support DTD for now. +- RegisterConstant("specified", true); +- RegisterProperty("value", NewSlot(&DOMAttr::GetValue), ++ this->RegisterConstant("specified", true); ++ this->RegisterProperty("value", NewSlot(&DOMAttr::GetValue), + NewSlot(&DOMAttr::SetValue)); + // ownerElement is a DOM2 property, so not registered for now. + } +@@ -1516,19 +1516,19 @@ + + virtual void DoClassRegister() { + Super::DoClassRegister(); +- RegisterProperty("tagName", NewSlot(&DOMElement::GetTagName), NULL); +- RegisterMethod("getAttribute", NewSlot(&DOMElement::GetAttribute)); +- RegisterMethod("setAttribute", ++ this->RegisterProperty("tagName", NewSlot(&DOMElement::GetTagName), NULL); ++ this->RegisterMethod("getAttribute", NewSlot(&DOMElement::GetAttribute)); ++ this->RegisterMethod("setAttribute", + NewSlot(&DOMElement::ScriptSetAttribute)); +- RegisterMethod("removeAttribute", ++ this->RegisterMethod("removeAttribute", + NewSlot(&DOMElement::RemoveAttribute)); +- RegisterMethod("getAttributeNode", ++ this->RegisterMethod("getAttributeNode", + NewSlot(&DOMElement::GetAttributeNodeNotConst)); +- RegisterMethod("setAttributeNode", ++ this->RegisterMethod("setAttributeNode", + NewSlot(&DOMElement::ScriptSetAttributeNode)); +- RegisterMethod("removeAttributeNode", ++ this->RegisterMethod("removeAttributeNode", + NewSlot(&DOMElement::ScriptRemoveAttributeNode)); +- RegisterMethod("getElementsByTagName", ++ this->RegisterMethod("getElementsByTagName", + NewSlot(&Super::GetElementsByTagNameNotConst)); + } + +@@ -1696,16 +1696,16 @@ + } + + virtual void DoClassRegister() { +- RegisterProperty("length", NewSlot(&AttrsNamedMap::GetLength), NULL); +- RegisterMethod("getNamedItem", ++ this->RegisterProperty("length", NewSlot(&AttrsNamedMap::GetLength), NULL); ++ this->RegisterMethod("getNamedItem", + NewSlot(&AttrsNamedMap::GetNamedItemNotConst)); +- RegisterMethod("setNamedItem", ++ this->RegisterMethod("setNamedItem", + NewSlot(&AttrsNamedMap::ScriptSetNamedItem)); +- RegisterMethod("removeNamedItem", ++ this->RegisterMethod("removeNamedItem", + NewSlot(&AttrsNamedMap::ScriptRemoveNamedItem)); +- RegisterMethod("item", NewSlot(&AttrsNamedMap::GetItemNotConst)); ++ this->RegisterMethod("item", NewSlot(&AttrsNamedMap::GetItemNotConst)); + // Microsoft compatibility. +- RegisterMethod("", NewSlot(&AttrsNamedMap::GetItemNotConst)); ++ this->RegisterMethod("", NewSlot(&AttrsNamedMap::GetItemNotConst)); + } + + virtual DOMNodeInterface *GetNamedItem(const std::string &name) { +@@ -1875,7 +1875,7 @@ + + virtual void DoClassRegister() { + Super::DoClassRegister(); +- RegisterMethod("splitText", NewSlot(&DOMText::ScriptSplitText)); ++ this->RegisterMethod("splitText", NewSlot(&DOMText::ScriptSplitText)); + } + + virtual NodeType GetNodeType() const { return TEXT_NODE; } +@@ -2060,9 +2060,9 @@ + + virtual void DoClassRegister() { + Super::DoClassRegister(); +- RegisterProperty("target", ++ this->RegisterProperty("target", + NewSlot(&DOMProcessingInstruction::GetTarget), NULL); +- RegisterProperty("data", NewSlot(&DOMProcessingInstruction::GetData), ++ this->RegisterProperty("data", NewSlot(&DOMProcessingInstruction::GetData), + NewSlot(&DOMProcessingInstruction::SetData)); + } + +@@ -2109,7 +2109,7 @@ + DEFINE_CLASS_ID(0xd23149a89cf24e12, DOMImplementationInterface); + + virtual void DoClassRegister() { +- RegisterMethod("hasFeature", NewSlot(&DOMImplementation::HasFeature)); ++ this->RegisterMethod("hasFeature", NewSlot(&DOMImplementation::HasFeature)); + } + + virtual bool HasFeature(const char *feature, const char *version) const { +@@ -2129,13 +2129,13 @@ + void SetCode(int code) { code_ = code; } + + virtual void DoClassRegister() { +- RegisterProperty("errorCode", NewSlot(&ParseError::GetCode), NULL); +- RegisterConstant("filepos", 0); +- RegisterConstant("line", 0); +- RegisterConstant("linepos", 0); +- RegisterConstant("reason", ""); +- RegisterConstant("srcText", ""); +- RegisterConstant("url", ""); ++ this->RegisterProperty("errorCode", NewSlot(&ParseError::GetCode), NULL); ++ this->RegisterConstant("filepos", 0); ++ this->RegisterConstant("line", 0); ++ this->RegisterConstant("linepos", 0); ++ this->RegisterConstant("reason", ""); ++ this->RegisterConstant("srcText", ""); ++ this->RegisterConstant("url", ""); + } + + private: +@@ -2180,45 +2180,45 @@ + + virtual void DoClassRegister() { + Super::DoClassRegister(); +- RegisterConstant("doctype", static_cast<ScriptableInterface *>(NULL)); +- RegisterConstant("implementation", &dom_implementation_); +- RegisterProperty("documentElement", ++ this->RegisterConstant("doctype", static_cast<ScriptableInterface *>(NULL)); ++ this->RegisterConstant("implementation", &dom_implementation_); ++ this->RegisterProperty("documentElement", + NewSlot(&DOMDocument::GetDocumentElementNotConst), NULL); +- RegisterMethod("loadXML", NewSlot(&DOMDocument::LoadXML)); +- RegisterMethod("createElement", ++ this->RegisterMethod("loadXML", NewSlot(&DOMDocument::LoadXML)); ++ this->RegisterMethod("createElement", + NewSlot(&DOMDocument::ScriptCreateElement)); +- RegisterMethod("createDocumentFragment", ++ this->RegisterMethod("createDocumentFragment", + NewSlot(&DOMDocument::CreateDocumentFragment)); +- RegisterMethod("createTextNode", ++ this->RegisterMethod("createTextNode", + NewSlot(&DOMDocument::CreateTextNode)); +- RegisterMethod("createComment", NewSlot(&DOMDocument::CreateComment)); +- RegisterMethod("createCDATASection", ++ this->RegisterMethod("createComment", NewSlot(&DOMDocument::CreateComment)); ++ this->RegisterMethod("createCDATASection", + NewSlot(&DOMDocument::CreateCDATASection)); +- RegisterMethod("createProcessingInstruction", ++ this->RegisterMethod("createProcessingInstruction", + NewSlot(&DOMDocument::ScriptCreateProcessingInstruction)); +- RegisterMethod("createAttribute", ++ this->RegisterMethod("createAttribute", + NewSlot(&DOMDocument::ScriptCreateAttribute)); +- RegisterMethod("createEntityReference", ++ this->RegisterMethod("createEntityReference", + NewSlot(&DOMDocument::ScriptCreateEntityReference)); +- RegisterMethod("getElementsByTagName", ++ this->RegisterMethod("getElementsByTagName", + NewSlot(&Super::GetElementsByTagNameNotConst)); +- RegisterMethod("importNode", NewSlot(&DOMDocument::ScriptImportNode)); ++ this->RegisterMethod("importNode", NewSlot(&DOMDocument::ScriptImportNode)); + // Compatibility with Microsoft DOM. +- RegisterProperty("parsed", NewFixedGetterSlot(true), NULL); +- RegisterProperty("parseError", NewSlot(&DOMDocument::GetParseError), NULL); +- RegisterProperty("resolveExternals", NULL, NewSlot(&DummySetter)); +- RegisterProperty("validateOnParse", NULL, NewSlot(&DummySetter)); +- RegisterProperty("preserveWhiteSpace", ++ this->RegisterProperty("parsed", NewFixedGetterSlot(true), NULL); ++ this->RegisterProperty("parseError", NewSlot(&DOMDocument::GetParseError), NULL); ++ this->RegisterProperty("resolveExternals", NULL, NewSlot(&DummySetter)); ++ this->RegisterProperty("validateOnParse", NULL, NewSlot(&DummySetter)); ++ this->RegisterProperty("preserveWhiteSpace", + NewSlot(&DOMDocument::PreservesWhiteSpace), + NewSlot(&DOMDocument::SetPreserveWhiteSpace)); +- RegisterMethod("getProperty", NewSlot(DummyGetProperty)); +- RegisterMethod("setProperty", NewSlot(DummySetProperty)); ++ this->RegisterMethod("getProperty", NewSlot(DummyGetProperty)); ++ this->RegisterMethod("setProperty", NewSlot(DummySetProperty)); + // Compatibility with Microsoft DOM: XMLHttpRequest functions. +- RegisterProperty("async", NewSlot(&DOMDocument::IsAsync), ++ this->RegisterProperty("async", NewSlot(&DOMDocument::IsAsync), + NewSlot(&DOMDocument::SetAsync)); +- RegisterProperty("readyState", NewSlot(&DOMDocument::GetReadyState), NULL); +- RegisterMethod("load", NewSlot(&DOMDocument::Load)); +- RegisterClassSignal("onreadystatechange", ++ this->RegisterProperty("readyState", NewSlot(&DOMDocument::GetReadyState), NULL); ++ this->RegisterMethod("load", NewSlot(&DOMDocument::Load)); ++ this->RegisterClassSignal("onreadystatechange", + &DOMDocument::onreadystatechange_signal_); + } + +--- a/ggadget/xdg/icon_theme.cc ++++ b/ggadget/xdg/icon_theme.cc +@@ -16,6 +16,7 @@ + #include <sys/time.h> + #include <time.h> + #include <cstdlib> ++#include <unistd.h> + + #include <map> + #include <vector> +--- a/extensions/qt_system_framework/qt_system_framework.cc ++++ b/extensions/qt_system_framework/qt_system_framework.cc +@@ -32,6 +32,7 @@ + #include <ggadget/xdg/desktop_entry.h> + #include <ggadget/xdg/icon_theme.h> + #include <ggadget/xdg/utilities.h> ++#include <unistd.h> + + #define Initialize qt_system_framework_LTX_Initialize + #define Finalize qt_system_framework_LTX_Finalize +--- a/extensions/linux_system_framework/process.cc ++++ b/extensions/linux_system_framework/process.cc +@@ -17,6 +17,7 @@ + #include <sys/types.h> + #include <dirent.h> + #include <cstdlib> ++#include <unistd.h> + + #ifdef HAVE_X11 + #include <X11/Xlib.h> +--- a/gadgets/designer/designer_script_utils.cc ++++ b/gadgets/designer/designer_script_utils.cc +@@ -39,6 +39,7 @@ + #include <ggadget/system_utils.h> + #include <ggadget/uuid.h> + #include <ggadget/view_interface.h> ++#include <unistd.h> + + namespace ggadget { + namespace designer { diff --git a/community/google-gadgets/glibc231.patch b/community/google-gadgets/glibc231.patch new file mode 100644 index 000000000..61de05162 --- /dev/null +++ b/community/google-gadgets/glibc231.patch @@ -0,0 +1,25 @@ +--- ggadget/gtk/main_loop.cc ++++ ggadget/gtk/main_loop.cc +@@ -16,9 +16,8 @@ + + #include <fcntl.h> + #include <stdint.h> +-#include <glib/ghash.h> ++#include <glib.h> + #include <gtk/gtk.h> +-#include <glib/gthread.h> + #include <ggadget/common.h> + #include "main_loop.h" + #include "utilities.h" +--- hosts/gtk/main.cc ++++ hosts/gtk/main.cc +@@ -14,8 +14,8 @@ + limitations under the License. + */ + ++#include <glib.h> + #include <gtk/gtk.h> +-#include <glib/gthread.h> + #include <locale.h> + #include <signal.h> + #include <unistd.h> diff --git a/community/gpsbabel/PKGBUILD b/community/gpsbabel/PKGBUILD index ddff78f8b..2717468ee 100644 --- a/community/gpsbabel/PKGBUILD +++ b/community/gpsbabel/PKGBUILD @@ -1,23 +1,21 @@ -# $Id: PKGBUILD 76414 2012-09-17 13:51:33Z spupykin $ +# $Id: PKGBUILD 85355 2013-03-01 10:32:31Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=gpsbabel pkgver=1.4.4 -pkgrel=1 +pkgrel=2 pkgdesc="Reads, writes, and manipulates GPS waypoints in a variety of formats" arch=('i686' 'x86_64' 'mips64el') url="http://www.gpsbabel.org" license=('GPL') depends=('libusb-compat' 'expat') -makedepends=('fop' 'qt' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit' 'java-environment=6' 'docbook-xsl') -optdepends=('qt' 'qtwebkit') +makedepends=('fop' 'qt4' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit' 'java-environment' 'docbook-xsl') +optdepends=('qt4' 'qtwebkit') options=('docs') -source=("gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz" - "gpsbabel.desktop::http://pkgs.fedoraproject.org/gitweb/?p=gpsbabel.git;a=blob_plain;f=gpsbabel.desktop;hb=HEAD") -md5sums=('6c4c8f0cb9fcf9f8302585148878f174' - '7bdbd243e29a8831842d31c079f04c45') +source=("gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz") +md5sums=('6c4c8f0cb9fcf9f8302585148878f174') build() { cd $srcdir/gpsbabel-$pkgver @@ -34,7 +32,7 @@ package() { # GUI install -Dm755 gui/objects/gpsbabelfe-bin ${pkgdir}/usr/bin/gpsbabelfe-bin install -Dm644 gui/images/appicon.png $pkgdir/usr/share/pixmaps/gpsbabel.png - install -Dm644 $srcdir/gpsbabel.desktop $pkgdir/usr/share/applications/gpsbabel.desktop + install -Dm644 gui/gpsbabel.desktop $pkgdir/usr/share/applications/gpsbabel.desktop # Header install mkdir -p $pkgdir/usr/include/gpsbabel diff --git a/community/gwenhywfar/PKGBUILD b/community/gwenhywfar/PKGBUILD index 24b5f89d8..902455871 100644 --- a/community/gwenhywfar/PKGBUILD +++ b/community/gwenhywfar/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 74856 2012-08-07 14:18:41Z spupykin $ +# $Id: PKGBUILD 85356 2013-03-01 10:32:40Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> pkgname=gwenhywfar pkgver=4.3.3 _dnrel=67 -pkgrel=1 +pkgrel=2 pkgdesc="OS abstraction functions for various projects" arch=(i686 x86_64 'mips64el') url="http://www.aquamaniac.de" options=('!libtool') license=("LGPL") depends=('openssl' 'gnutls' 'libgcrypt') -makedepends=('gtk2' 'qt') -optdepends=('gtk2' 'qt') +makedepends=('gtk2' 'qt4') +optdepends=('gtk2' 'qt4') source=("gwenhywfar-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=01&release=${_dnrel}&file=01&dummy=gwenhywfar-$pkgver.tar.gz") md5sums=('c5b9d52a25960f84f9264a5a5dd484d1') @@ -23,5 +23,9 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc --enable-ssl sed -i 's|gnutls_transport_set_lowat||g' src/sio/syncio_tls.c make +} + +package() { + cd $srcdir/gwenhywfar-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/haskell-regex-base/PKGBUILD b/community/haskell-regex-base/PKGBUILD index ca0e07d8e..92ace4b31 100644 --- a/community/haskell-regex-base/PKGBUILD +++ b/community/haskell-regex-base/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84007 2013-02-08 04:15:39Z td123 $ +# $Id: PKGBUILD 85230 2013-02-27 20:01:23Z andrea $ # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> @@ -6,7 +6,7 @@ _hkgname=regex-base pkgname=haskell-regex-base pkgver=0.93.2 -pkgrel=9 +pkgrel=12 pkgdesc='Interface API for regex-posix,pcre,parsec,tdfa,dfa' url='http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base' license=('custom:BSD3') diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD index 26413b64d..8dd5a0558 100644 --- a/community/hedgewars/PKGBUILD +++ b/community/hedgewars/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 84019 2013-02-08 04:15:49Z td123 $ +# $Id: PKGBUILD 85357 2013-03-01 10:32:49Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hedgewars pkgver=0.9.18 -pkgrel=5 +pkgrel=6 pkgdesc="Free Worms-like turn based strategy game" arch=('i686' 'x86_64' 'mips64el') url="http://hedgewars.org" license=('GPL' 'custom') -depends=('qt' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua51') +depends=('qt4' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua51') makedepends=('fpc' 'cmake' # haskell specific 'ghc=7.6.2-1' @@ -32,8 +32,8 @@ build() { cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DDATA_INSTALL_DIR=/usr/share \ - -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake \ - -DQT_MOC_EXECUTABLE=/usr/bin/moc \ + -DQT_QMAKE_EXECUTABLE=/usr/lib/qt4/bin/qmake \ + -DQT_MOC_EXECUTABLE=/usr/lib/qt4/bin/moc \ -DWITH_SERVER=1 . make } diff --git a/community/herqq/PKGBUILD b/community/herqq/PKGBUILD index e1492c5f2..9728f46c3 100644 --- a/community/herqq/PKGBUILD +++ b/community/herqq/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 83154 2013-01-27 16:18:20Z pierre $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 85358 2013-03-01 10:33:17Z andrea $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=herqq pkgver=1.0.0 -pkgrel=1 -pkgdesc="A software library for building UPnP devices (HUPnP)" -arch=('i686' 'x86_64') -url="http://www.herqq.org/" +pkgrel=2 +pkgdesc='Software library for building UPnP devices (HUPnP)' +arch=('x86_64' 'i686') +url='http://www.herqq.org/' license=('GPL') -depends=('qt') -source=("http://downloads.sourceforge.net/hupnp/${pkgname}-${pkgver}.zip") -md5sums=('45a0632f7c7b64bc0fdab852d36c1e61') +depends=('qt4') +source=("http://downloads.sourceforge.net/hupnp/$pkgname-$pkgver.zip") +sha256sums=('cbcfc76f72d561d822a7ff5374b97e80d1731b610a5c257edbf5c013bfe6748e') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" qmake PREFIX=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make INSTALL_ROOT="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make INSTALL_ROOT="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/higan-qt/PKGBUILD b/community/higan-qt/PKGBUILD index 0ae875d6f..ecaea27c6 100755 --- a/community/higan-qt/PKGBUILD +++ b/community/higan-qt/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 84668 2013-02-21 13:55:51Z alucryd $ +# $Id: PKGBUILD 85359 2013-03-01 10:33:25Z andrea $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> pkgname=higan-qt pkgver=092 -pkgrel=3 +pkgrel=5 pkgdesc="Nintendo multi-system emulator - QT version" arch=('i686' 'x86_64') url="http://code.google.com/p/higan/" license=('GPL3') -depends=('libao' 'libpulse' 'openal' 'qt>=4.7.0' 'sdl' 'xdialog') +depends=('libao' 'libpulse' 'openal' 'qt4' 'sdl' 'xdialog') makedepends=('mesa') optdepends=('beat: Delta patcher') conflicts=('higan-gtk') @@ -24,9 +24,9 @@ _profiles="accuracy balanced performance" build() { # QT 4.8.0 fix cd "${srcdir}" - moc -i -Ipurify_v03-source/ananke/phoenix/qt/ -o purify_v03-source/ananke/phoenix/qt/platform.moc purify_v03-source/ananke/phoenix/qt/platform.moc.hpp - moc -i -Ipurify_v03-source/purify/phoenix/qt/ -o purify_v03-source/purify/phoenix/qt/platform.moc purify_v03-source/purify/phoenix/qt/platform.moc.hpp - moc -i -Ihigan_v${pkgver}-source/higan/phoenix/qt/ -o higan_v${pkgver}-source/higan/phoenix/qt/platform.moc higan_v${pkgver}-source/higan/phoenix/qt/platform.moc.hpp + moc-qt4 -i -Ipurify_v03-source/ananke/phoenix/qt/ -o purify_v03-source/ananke/phoenix/qt/platform.moc purify_v03-source/ananke/phoenix/qt/platform.moc.hpp + moc-qt4 -i -Ipurify_v03-source/purify/phoenix/qt/ -o purify_v03-source/purify/phoenix/qt/platform.moc purify_v03-source/purify/phoenix/qt/platform.moc.hpp + moc-qt4 -i -Ihigan_v${pkgver}-source/higan/phoenix/qt/ -o higan_v${pkgver}-source/higan/phoenix/qt/platform.moc higan_v${pkgver}-source/higan/phoenix/qt/platform.moc.hpp # Compile libananke cd "${srcdir}"/purify_v03-source/ananke diff --git a/community/highlight/PKGBUILD b/community/highlight/PKGBUILD index da325b4b5..e7dc92f58 100644 --- a/community/highlight/PKGBUILD +++ b/community/highlight/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 83937 2013-02-07 08:11:31Z bluewind $ +# $Id: PKGBUILD 85360 2013-03-01 10:33:34Z andrea $ # Maintainer: Florian Pritz <flo@xinu.at> # Contributor: Jan Fader <jan.fader@web.de> pkgbase=highlight pkgname=(highlight highlight-gui) pkgver=3.13 -pkgrel=1 +pkgrel=2 url="http://www.andre-simon.de/doku/highlight/highlight.html" license=('GPL') arch=('i686' 'x86_64' 'mips64el') -makedepends=(qt lua51 boost) +makedepends=(qt4 lua51 boost) source=(http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2{,.asc}) md5sums=('2b5e217c80c441853360926dbb7777e9' 'c68f6dd20af61ca1061d910879d910a8') @@ -30,7 +30,7 @@ package_highlight() { package_highlight-gui() { pkgdesc="Fast and flexible source code highlighter (QT version)" - depends=('qt' 'highlight') + depends=('qt4' 'highlight') cd "$srcdir/$pkgbase-$pkgver" install -dm755 "$pkgdir/usr/bin" diff --git a/community/i3status/PKGBUILD b/community/i3status/PKGBUILD index 91a799014..a2ba5074f 100644 --- a/community/i3status/PKGBUILD +++ b/community/i3status/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 77036 2012-10-03 18:05:35Z ttopper $ +# $Id: PKGBUILD 85172 2013-02-27 14:41:02Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=i3status -pkgver=2.6 +pkgver=2.7 pkgrel=1 pkgdesc="Generates status bar to use with dzen2 or xmobar" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ backup=('etc/i3status.conf') install=i3status.install options=('docs') source=("http://i3.zekjur.net/i3status/$pkgname-$pkgver.tar.bz2") -md5sums=('98f649429d7845682846de36fb38f780') +md5sums=('f0a39e84aebb65496af3dcec9d8cfeb8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/i7z/PKGBUILD b/community/i7z/PKGBUILD index bd3cda36c..b1242f3ab 100644 --- a/community/i7z/PKGBUILD +++ b/community/i7z/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 76391 2012-09-17 08:17:57Z svenstaro $ +# $Id: PKGBUILD 85361 2013-03-01 10:33:44Z andrea $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Nathan O <ndowens.aur at gmail dot com> pkgname=i7z pkgver=0.27.2 -pkgrel=1 +pkgrel=2 pkgdesc="A better i7 (and now i3, i5) reporting tool for Linux" arch=('i686' 'x86_64') license=('GPL2') depends=('ncurses') -makedepends=('qt') -optdepends=('qt: for i7z-gui') +makedepends=('qt4') +optdepends=('qt4: for i7z-gui') url="http://code.google.com/p/i7z/" source=("http://i7z.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") md5sums=('7f2c4928146b722d67ecdd0d905a4353') diff --git a/community/ibus-qt/PKGBUILD b/community/ibus-qt/PKGBUILD index 3a573ba6a..adc8e5346 100644 --- a/community/ibus-qt/PKGBUILD +++ b/community/ibus-qt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 82685 2013-01-23 00:15:54Z eric $ +# $Id: PKGBUILD 85362 2013-03-01 10:33:52Z andrea $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: garion < garion @ mailoo.org > @@ -6,12 +6,12 @@ pkgname=ibus-qt pkgver=1.3.1 -pkgrel=7 +pkgrel=8 pkgdesc='IBus qt library and IBus qt input method plugin' arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url='http://ibus.googlecode.com' -depends=('qt' 'ibus' 'icu>=50') +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) diff --git a/community/instead-launcher/PKGBUILD b/community/instead-launcher/PKGBUILD index 1a2676f90..7ec18e89c 100644 --- a/community/instead-launcher/PKGBUILD +++ b/community/instead-launcher/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 76496 2012-09-19 14:12:35Z spupykin $ +# $Id: PKGBUILD 85363 2013-03-01 10:34:01Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Peter Kosyh <p.kosyhgmail.com> pkgname=instead-launcher pkgver=0.6.1 -pkgrel=2 +pkgrel=3 pkgdesc="launcher and games downloader for INSTEAD quest interpreter" arch=('i686' 'x86_64' 'mips64el') url="http://instead-launcher.googlecode.com/" license=('GPL') -makedepends=('sed' 'qt') +makedepends=('sed' 'qt4') source=(http://instead-launcher.googlecode.com/files/instead-launcher_$pkgver.tar.gz) md5sums=('b2136e535dbb77eacb79e3357dc2a173') @@ -21,7 +21,7 @@ build() { } package() { - depends=('qt' 'instead') + depends=('qt4' 'instead') cd $srcdir/instead-launcher-$pkgver make INSTALL_ROOT=$pkgdir install } diff --git a/community/jack2/PKGBUILD b/community/jack2/PKGBUILD index 26d285379..d46a545ef 100644 --- a/community/jack2/PKGBUILD +++ b/community/jack2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81344 2012-12-18 10:05:59Z schiv $ +# $Id: PKGBUILD 84828 2013-02-25 06:15:43Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Daniele Paolella <danielepaolella@email.it> # Contributor: Philipp Überbacher <hollunder at gmx dot at> @@ -9,13 +9,13 @@ pkgname=('jack2' 'jack2-dbus') #pkgname= # single build (overrides split) _tarname=jack pkgver=1.9.9.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://jackaudio.org/" backup=(etc/security/limits.d/99-audio.conf) license=('GPL') -makedepends=('python2' 'libffado' 'celt' - 'libsamplerate' 'dbus-core') +makedepends=('python2' 'celt' 'libsamplerate') +[ "$CARCH" != "mips64el" ] && makedepends+=('libffado') source=("https://dl.dropbox.com/u/28869550/jack-1.9.9.5.tar.bz2" '99-audio.conf' '40-hpet-permissions.rules') @@ -85,12 +85,8 @@ package_jack2() { pkgdesc="The next-generation JACK with SMP support" depends=('libsamplerate' 'celt') - optdepends=('libffado: FireWire support' - 'dbus-core: jackdbus' - 'python2: jack_control') -[ "$CARCH" = "mips64el" ] && \ - optdepends=('dbus-core: jackdbus' - 'python2: jack_control') + optdepends=('python2: jack_control') + [ "$CARCH" != "mips64el" ] && depends+=('libffado') conflicts=('jack') provides=('jack' 'jackmp' 'jackdmp' 'jackdbus') @@ -114,10 +110,8 @@ package_jack2-dbus() { ! _isbuild jack2-dbus && return 0 pkgdesc="The next-generation JACK with SMP support (for D-BUS interaction only)" - depends=('libsamplerate' 'celt' 'dbus-core') - optdepends=('libffado: FireWire support' - 'python2: jack_control') -[ "$CARCH" = "mips64el" ] && \ + depends=('libsamplerate' 'celt') + [ "$CARCH" != "mips64el" ] && depends+=('libffado') optdepends=('python2: jack_control') conflicts=('jack' 'jack2') provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus') diff --git a/community/jack2/ffado_setbuffsize-jack2.patch b/community/jack2/ffado_setbuffsize-jack2.patch deleted file mode 100644 index 0c74aad24..000000000 --- a/community/jack2/ffado_setbuffsize-jack2.patch +++ /dev/null @@ -1,139 +0,0 @@ -From 96e0251234a29a1360c05d5d7dc98b83436b8183 Mon Sep 17 00:00:00 2001 -From: Adrian Knoth <adi@drcomp.erfurt.thur.de> -Date: Sat, 17 Mar 2012 22:36:30 +0100 -Subject: [PATCH] [firewire] Allow FFADO backend to change the buffer size - -This is a port of Jonathan Woithe's patch from jackd1. -With sufficiently recent versions of FFADO, it allows to change -the buffersize at runtime. ---- - linux/firewire/JackFFADODriver.cpp | 65 ++++++++++++++++++++++++++++++++---- - linux/firewire/JackFFADODriver.h | 6 ++++ - 2 files changed, 65 insertions(+), 6 deletions(-) - -diff --git a/linux/firewire/JackFFADODriver.cpp b/linux/firewire/JackFFADODriver.cpp -index b33e1cd..085b78a 100644 ---- a/linux/firewire/JackFFADODriver.cpp -+++ b/linux/firewire/JackFFADODriver.cpp -@@ -3,6 +3,7 @@ - Copyright (C) 2004 Grame - Copyright (C) 2007 Pieter Palmers - Copyright (C) 2009 Devin Anderson -+Copyright (C) 2012 Jonathan Woithe, Adrian Knoth - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -48,7 +49,10 @@ - namespace Jack - { - -+// Basic functionality requires API version 8. If version 9 or later -+// is present the buffers can be resized at runtime. - #define FIREWIRE_REQUIRED_FFADO_API_VERSION 8 -+#define FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE 9 - - #define jack_get_microseconds GetMicroSeconds - -@@ -281,19 +285,68 @@ - int - JackFFADODriver::SetBufferSize (jack_nframes_t nframes) - { -- printError("Buffer size change requested but not supported!!!"); -+ ffado_driver_t* driver = (ffado_driver_t*)fDriver; -+ signed int chn; -+ -+ // The speed of this function isn't critical; we can afford the -+ // time to check the FFADO API version. -+ if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE || -+ ffado_streaming_set_period_size == NULL) { -+ printError("unsupported on current version of FFADO; please upgrade FFADO"); -+ return -1; -+ } - -- /* - driver->period_size = nframes; - driver->period_usecs = - (jack_time_t) floor ((((float) nframes) / driver->sample_rate) - * 1000000.0f); -- */ -+ -+ -+ // Reallocate the null and scratch buffers. -+ driver->nullbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t)); -+ if(driver->nullbuffer == NULL) { -+ printError("could not allocate memory for null buffer"); -+ return -1; -+ } -+ driver->scratchbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t)); -+ if(driver->scratchbuffer == NULL) { -+ printError("could not allocate memory for scratch buffer"); -+ return -1; -+ } -+ -+ // MIDI buffers need reallocating -+ for (chn = 0; chn < driver->capture_nchannels; chn++) { -+ if(driver->capture_channels[chn].stream_type == ffado_stream_type_midi) { -+ // setup the midi buffer -+ if (driver->capture_channels[chn].midi_buffer != NULL) -+ free(driver->capture_channels[chn].midi_buffer); -+ driver->capture_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t)); -+ } -+ } -+ for (chn = 0; chn < driver->playback_nchannels; chn++) { -+ if(driver->playback_channels[chn].stream_type == ffado_stream_type_midi) { -+ if (driver->playback_channels[chn].midi_buffer != NULL) -+ free(driver->playback_channels[chn].midi_buffer); -+ driver->playback_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t)); -+ } -+ } -+ -+ // Notify FFADO of the period size change -+ if (ffado_streaming_set_period_size(driver->dev, nframes) != 0) { -+ printError("could not alter FFADO device period size"); -+ return -1; -+ } -+ -+ // This is needed to give the shadow variables a chance to -+ // properly update to the changes. -+ sleep(1); - - /* tell the engine to change its buffer size */ -- //driver->engine->set_buffer_size (driver->engine, nframes); -+ JackAudioDriver::SetBufferSize(nframes); // Generic change, never fails - -- return -1; // unsupported -+ UpdateLatencies(); -+ -+ return 0; - } - - typedef void (*JackDriverFinishFunction) (jack_driver_t *); -@@ -306,7 +359,7 @@ - - assert(params); - -- if (ffado_get_api_version() != FIREWIRE_REQUIRED_FFADO_API_VERSION) { -+ if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION) { - printError("Incompatible libffado version! (%s)", ffado_get_version()); - return NULL; - } -diff --git a/linux/firewire/JackFFADODriver.h b/linux/firewire/JackFFADODriver.h -index cb2a45d..790f4dd 100644 ---- a/linux/firewire/JackFFADODriver.h -+++ b/linux/firewire/JackFFADODriver.h -@@ -82,6 +82,12 @@ class JackFFADODriver : public JackAudioDriver - int Read(); - int Write(); - -+ // BufferSize can be changed -+ bool IsFixedBufferSize() -+ { -+ return false; -+ } -+ - int SetBufferSize(jack_nframes_t nframes); - }; - --- -1.7.10 - diff --git a/community/kcheckers/PKGBUILD b/community/kcheckers/PKGBUILD index d0cd583ab..817533abb 100644 --- a/community/kcheckers/PKGBUILD +++ b/community/kcheckers/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 55424 2011-09-12 07:36:46Z ebelanger $ +# $Id: PKGBUILD 85364 2013-03-01 10:34:09Z andrea $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=kcheckers pkgver=0.8.1 -pkgrel=7 +pkgrel=8 pkgdesc="Qt4-based checkers boardgame" arch=('i686' 'x86_64' 'mips64el') url="http://qcheckers.sourceforge.net/" license=('GPL') -depends=('qt') +depends=('qt4') source=(http://downloads.sourceforge.net/qcheckers/${pkgname}-${pkgver}.tar.gz kcheckers.desktop) md5sums=('793736a007cd92122dfd91bcfd14ab69' - '8b8682edd870c2692f9c7d538263e0f5') + '25b2605f4d605615e265150b722f1897') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/kcheckers/kcheckers.desktop b/community/kcheckers/kcheckers.desktop index a1f4e1209..815cfb4a8 100644 --- a/community/kcheckers/kcheckers.desktop +++ b/community/kcheckers/kcheckers.desktop @@ -2,7 +2,7 @@ Name=Kcheckers Comment=Checkers/Daughts game using Qt4 toolkit Exec=kcheckers -Icon=/usr/share/kcheckers/icons/theme/kingwhite.png +Icon=/usr/share/kcheckers/themes/simple_small/kingwhite.png Terminal=false Type=Application Encoding=UTF-8 diff --git a/community/kchmviewer/PKGBUILD b/community/kchmviewer/PKGBUILD index d929dc729..435fb15bb 100644 --- a/community/kchmviewer/PKGBUILD +++ b/community/kchmviewer/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 61052 2011-12-20 23:58:31Z jlichtblau $ +# $Id: PKGBUILD 85365 2013-03-01 10:34:18Z andrea $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alexander Bogdanov <andorn@gmail.com> pkgname=kchmviewer pkgver=6.0 -pkgrel=2 +pkgrel=3 pkgdesc="A .chm files (MS HTML help file format) viewer" arch=('i686' 'x86_64' 'mips64el') url="http://kchmviewer.sourceforge.net/" license=('GPL') -depends=('desktop-file-utils' 'chmlib' 'kdebase-runtime' 'qt' 'xdg-utils') +depends=('desktop-file-utils' 'chmlib' 'kdebase-runtime' 'xdg-utils') makedepends=('automoc4' 'cmake') options=('libtool') install=$pkgname.install @@ -33,8 +33,8 @@ package() { install -D -m644 ${srcdir}/$pkgname-$pkgver/packages/$pkgname.png \ ${pkgdir}/usr/share/pixmaps/$pkgname.png -#msits.protocol file provided by kdegraphics package +#msits.protocol file provided by kdegraphics-okular package rm -rf ${pkgdir}/usr/share/kde4 -#kio_msits.so file provided by kdegraphics package - FS#14376 +#kio_msits.so file provided by kdegraphics-okular package - FS#14376 rm -rf ${pkgdir}/usr/lib } diff --git a/community/keepassx/PKGBUILD b/community/keepassx/PKGBUILD index 6600013ce..73014bc24 100644 --- a/community/keepassx/PKGBUILD +++ b/community/keepassx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80120 2012-11-16 16:43:09Z spupykin $ +# $Id: PKGBUILD 85366 2013-03-01 10:34:27Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Greg Bouzakis <gregbouzakis@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> @@ -6,12 +6,12 @@ pkgname=keepassx pkgver=0.4.3 -pkgrel=3 +pkgrel=4 pkgdesc='Password manager' arch=('i686' 'x86_64' 'mips64el') url='http://www.keepassx.org' license=('GPL2') -depends=('libxtst' 'qt' 'shared-mime-info') +depends=('libxtst' 'qt4' 'shared-mime-info') install=keepassx.install source=(http://downloads.sourceforge.net/keepassx/$pkgname-$pkgver.tar.gz) md5sums=('1df67bb22b2e08df49f09e61d156f508') diff --git a/community/kmscon/PKGBUILD b/community/kmscon/PKGBUILD index 11cb9492d..801f87927 100644 --- a/community/kmscon/PKGBUILD +++ b/community/kmscon/PKGBUILD @@ -1,37 +1,48 @@ +# $Id: PKGBUILD 85313 2013-02-28 21:20:56Z thestinger $ # Maintainer: Daniel Micay <danielmicay@gmail.com> # Contributor: David Herrmann <dh.herrmann@googlemail.com> pkgname=kmscon -pkgver=6 -pkgrel=3 +pkgver=7 +pkgrel=1 pkgdesc='Terminal emulator based on Kernel Mode Setting (KMS)' arch=(i686 x86_64) url='https://github.com/dvdhrm/kmscon' license=('MIT') depends=(systemd libdrm mesa libegl libgbm libgles pango libxkbcommon libpciaccess xkeyboard-config) -makedepends=('libxslt' 'docbook-xsl' 'linux-api-headers') +makedepends=(git libxslt docbook-xsl linux-api-headers) options=(!libtool) -source=(https://github.com/downloads/dvdhrm/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('12f6966cef8e846f31dbcad916a9f347') + +__gitroot=https://github.com/dvdhrm/kmscon.git +__gitname=kmscon build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure \ - --prefix=/usr \ - --enable-kmscon \ - --disable-wlterm \ - --enable-multi-seat \ - --enable-hotplug \ - --enable-pciaccess \ - --with-video=fbdev,dumb,drm \ - --with-fonts=pango,freetype2,8x16 \ - --with-sessions=dummy,terminal + cd "$srcdir" + + msg "Connecting to GIT server...." + + if [[ -d "$__gitname" ]]; then + cd "$__gitname" && git pull origin + msg "The local files are updated." + else + git clone "$__gitroot" "$__gitname" + fi + + msg "GIT checkout done or server timeout" + msg "Starting build..." + + rm -rf "$srcdir/$__gitname-build" + git clone "$srcdir/$__gitname" "$srcdir/$__gitname-build" + cd "$srcdir/$__gitname-build" + + git checkout $pkgname-$pkgver + ./autogen.sh --prefix=/usr --disable-wlterm make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$__gitname-build" make DESTDIR="$pkgdir/" install mkdir -p "$pkgdir/usr/share/licenses/$pkgname" "$pkgdir/usr/lib/systemd/system" cp COPYING "$pkgdir/usr/share/licenses/$pkgname/" - cp docs/kmscon{,@}.service "$pkgdir/usr/lib/systemd/system/" + cp docs/kmscon{,vt@}.service "$pkgdir/usr/lib/systemd/system/" } diff --git a/community/kvirc/PKGBUILD b/community/kvirc/PKGBUILD index f1ce496a5..d5b2fd11f 100644 --- a/community/kvirc/PKGBUILD +++ b/community/kvirc/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 73246 2012-07-04 09:21:45Z spupykin $ +# $Id: PKGBUILD 85367 2013-03-01 10:34:38Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=kvirc pkgver=4.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Qt-based IRC client" url="http://www.kvirc.net" -depends=('python2' 'qt' 'libxss' 'qtwebkit') -arch=(i686 x86_64 'mips64el') +depends=('python2' 'libxss' 'qtwebkit') +arch=(i686 x86_64 mips64el) makedepends=('cmake') license=('GPL') options=("!libtool") diff --git a/community/launchy/PKGBUILD b/community/launchy/PKGBUILD index cb13e6510..731d2e9c5 100644 --- a/community/launchy/PKGBUILD +++ b/community/launchy/PKGBUILD @@ -1,14 +1,15 @@ +# $Id: PKGBUILD 85453 2013-03-01 19:08:27Z andrea $ # Contributor: Andrew Burkett <burkett.andrew@gmail.com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=launchy pkgver=2.5 -pkgrel=2 -pkgdesc="Launchy indexes the programs in your start menu and can launch your documents, project files, folders, and bookmarks with just a few keystrokes!" +pkgrel=3 +pkgdesc="Indexes the programs in your start menu and can launch your documents, project files, folders, and bookmarks with just a few keystrokes!" arch=('i686' 'x86_64' 'mips64el') url="http://www.launchy.net/" license=('GPL') -depends=('qt' 'xdg-utils') +depends=('qt4' 'xdg-utils') makedepends=('gcc' 'boost') source=("http://downloads.sourceforge.net/launchy/launchy-${pkgver}.tar.gz" fix-linking.patch) @@ -21,7 +22,7 @@ build() { # fix linking against libX11 patch -Np1 -i ../fix-linking.patch - qmake -r Launchy.pro + qmake-qt4 -r Launchy.pro make } diff --git a/community/libaccounts-glib/PKGBUILD b/community/libaccounts-glib/PKGBUILD index 76ab28601..3ed87c459 100644 --- a/community/libaccounts-glib/PKGBUILD +++ b/community/libaccounts-glib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 84335 2013-02-16 20:11:59Z bgyorgy $ +# $Id: PKGBUILD 85006 2013-02-26 17:28:47Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=libaccounts-glib -pkgver=1.7 +pkgver=1.8 pkgrel=1 pkgdesc="Glib-based client library for accessing the online accounts database" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('dbus-glib' 'libxml2' 'sqlite3') makedepends=('python2-gobject') options=('!libtool') source=(http://accounts-sso.googlecode.com/files/$pkgname-$pkgver.tar.gz) -sha1sums=('b81a86ee1f66c592dab573334a1a564c8c497858') +sha1sums=('5d827392f6da2ff74e342a6b3a50fbe3486b49b0') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/libaccounts-qt/PKGBUILD b/community/libaccounts-qt/PKGBUILD index eaf192c81..1e372f88d 100644 --- a/community/libaccounts-qt/PKGBUILD +++ b/community/libaccounts-qt/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 83016 2013-01-26 15:16:16Z bgyorgy $ +# $Id: PKGBUILD 85369 2013-03-01 10:34:56Z andrea $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgbase=libaccounts-qt _pkgbase=accounts-qt pkgname=('libaccounts-qt' 'libaccounts-qt-doc') -pkgver=1.4 -pkgrel=1 +pkgver=1.6 +pkgrel=2 pkgdesc="Qt-based client library for accessing the online accounts database" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/accounts-sso/" license=('LGPL') -depends=('qt' 'libaccounts-glib') +depends=('qt4' 'libaccounts-glib') makedepends=('doxygen' 'graphviz' 'ttf-dejavu') options=('!emptydirs') source=(http://accounts-sso.googlecode.com/files/$_pkgbase-$pkgver.tar.bz2) -sha1sums=('135fdaa766da070b2ad41ff4c33c663f4d321c8e') +sha1sums=('bd2c02b747384d53b75767c18b1e026bcf2211c5') build() { cd "$srcdir/$_pkgbase-$pkgver" diff --git a/community/libextractor/PKGBUILD b/community/libextractor/PKGBUILD index 99c911799..11d8ed40e 100644 --- a/community/libextractor/PKGBUILD +++ b/community/libextractor/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 78771 2012-10-24 12:21:52Z spupykin $ +# $Id: PKGBUILD 85370 2013-03-01 10:35:05Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s@gmail.com> # Contributor: damir <damir@archlinux.org> pkgname=libextractor pkgver=1.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="A library used to extract meta-data from files of arbitrary type" arch=("i686" "x86_64" 'mips64el') license=('GPL') url="http://gnunet.org/libextractor/" depends=('libltdl') -makedepends=('flac' 'poppler' 'exiv2' 'qt' 'libvorbis' 'gtk2' 'libgsf' 'libmpeg2') +makedepends=('flac' 'poppler' 'exiv2' 'qt4' 'libvorbis' 'gtk2' 'libgsf' 'libmpeg2') optdepends=('flac: flac support' 'poppler: pdf support' 'exiv2: metadata support' diff --git a/community/libmediainfo/PKGBUILD b/community/libmediainfo/PKGBUILD index 0522a68cb..81d516f9f 100644 --- a/community/libmediainfo/PKGBUILD +++ b/community/libmediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 78757 2012-10-24 10:01:02Z spupykin $ +# $Id: PKGBUILD 84838 2013-02-25 10:38:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=libmediainfo -pkgver=0.7.61 +pkgver=0.7.62 pkgrel=1 pkgdesc="shared library for mediainfo" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('libtool' 'automake' 'autoconf') options=(!libtool) source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2 libmediainfo-0.7.50-libmms.patch) -md5sums=('371519c1c24e4de84448d6624fc41aa8' +md5sums=('df890b982250711055f5cb6d948251bb' '2f4b21cc250f663d52b497dedb963e3b') build() { diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 1c271134f..b89ae0937 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 84161 2013-02-12 12:14:11Z thomas $ +# $Id: PKGBUILD 85292 2013-02-28 15:18:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt -pkgver=1.0.2 -pkgrel=3 +pkgver=1.0.3 +pkgrel=1rc2 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') url="http://libvirt.org/" @@ -29,20 +29,18 @@ backup=('etc/conf.d/libvirtd' 'etc/libvirt/qemu.conf' 'etc/sasl2/libvirt.conf') install="libvirt.install" -source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" +source=("http://libvirt.org/sources/$pkgname-$pkgver-rc2.tar.gz" libvirtd.rc.d libvirtd.conf.d libvirtd-guests.rc.d libvirtd-guests.conf.d - libvirt.tmpfiles.d - python.patch) -md5sums=('7e268ed702c4331d393e5b43449cae13' + libvirt.tmpfiles.d) +md5sums=('d03a65be35c455bc09ee96df66ea2c4d' 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' '0ee5b6c58590ff392a266f20f7928d1f' '0a96ed876ffb1fcb9dff5a9b3a609c1e' - '020971887442ebbf1b6949e031c8dd3f' - '4280310abbdebbb7ad756840e4ff5671') + '020971887442ebbf1b6949e031c8dd3f') build() { cd "$srcdir/$pkgname-$pkgver" @@ -54,8 +52,6 @@ build() { sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file done - patch -p1 <$srcdir/python.patch - export LDFLAGS=-lX11 export RADVD=/usr/sbin/radvd [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \ diff --git a/community/libvirt/python.patch b/community/libvirt/python.patch deleted file mode 100644 index c791a54e9..000000000 --- a/community/libvirt/python.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/python/generator.py b/python/generator.py -index 5d27f66..71ca883 100755 ---- a/python/generator.py -+++ b/python/generator.py -@@ -123,7 +123,7 @@ class docParser(xml.sax.handler.ContentHandler): - self.function_return_field = attrs['field'] - elif tag == 'enum': - if (attrs['file'] == "libvirt" or -- attrs['file'] == "virterror"): -+ attrs['file'] == "virerror"): - enum(attrs['type'],attrs['name'],attrs['value']) - elif attrs['file'] == "libvirt-lxc": - lxc_enum(attrs['type'],attrs['name'],attrs['value']) -@@ -137,7 +137,7 @@ class docParser(xml.sax.handler.ContentHandler): - if self.function != None: - if (self.function_module == "libvirt" or - self.function_module == "virevent" or -- self.function_module == "virterror"): -+ self.function_module == "virerror"): - function(self.function, self.function_descr, - self.function_return, self.function_args, - self.function_file, self.function_module, diff --git a/community/lmms/PKGBUILD b/community/lmms/PKGBUILD index e278ff74d..750c54e85 100644 --- a/community/lmms/PKGBUILD +++ b/community/lmms/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80173 2012-11-17 12:51:55Z lfleischer $ +# $Id: PKGBUILD 85371 2013-03-01 10:35:13Z andrea $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> # Contributor: Mateusz Herych <heniekk@gmail.com> @@ -6,18 +6,19 @@ pkgname=lmms pkgver=0.4.13 -pkgrel=2 +pkgrel=3 pkgdesc='The Linux MultiMedia Studio.' arch=('i686' 'x86_64' 'mips64el') url='http://lmms.sourceforge.net/' license=('GPL') -depends=('sdl' 'glib2' 'fluidsynth' 'libpng' 'libvorbis' 'libxft' 'libxinerama' 'qt' 'sdl_sound' +depends=('sdl' 'glib2' 'fluidsynth' 'libpng' 'libvorbis' 'libxft' 'libxinerama' 'qt4' 'sdl_sound' 'libsamplerate' 'shared-mime-info') optdepends=('wine: VST support (experimental)' 'fftw: SpectrumAnalyzer plugin' 'stk: STK instruments plugins' 'pulseaudio: PulseAudio output') -makedepends=('cmake' 'ladspa' 'libxft' 'freetype2' 'fftw' 'stk' 'wine') +makedepends=('cmake' 'ladspa' 'libxft' 'freetype2' 'fftw' 'stk') +[[ $CARCH = i686 ]] && makedepends+=('wine') provides=('lmms-extras') conflicts=('lmms-extras') options=('!libtool' '!makeflags') diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD index 3ccb9e0fc..f27677947 100644 --- a/community/luminancehdr/PKGBUILD +++ b/community/luminancehdr/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 78933 2012-10-27 23:44:52Z ebelanger $ +# $Id: PKGBUILD 85372 2013-03-01 10:35:25Z andrea $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Dmitry N. Shilov <stormblast@land.ru> pkgname=luminancehdr pkgver=2.3.0 -pkgrel=4 +pkgrel=5 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging' arch=('i686' 'x86_64' 'mips64el') url='http://qtpfsgui.sourceforge.net/' license=('GPL') -depends=('exiv2' 'fftw' 'gsl' 'lcms2' 'libraw' 'openexr' 'qt' 'qtwebkit') +depends=('exiv2' 'fftw' 'gsl' 'lcms2' 'libraw' 'openexr' 'qtwebkit') makedepends=('cmake') optdepends=('hugin: align image stack functionality') install=$pkgname.install diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD index 684fe2a9c..b7821797a 100644 --- a/community/luxrays/PKGBUILD +++ b/community/luxrays/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 83257 2013-01-28 16:49:44Z stephane $ +# $Id: PKGBUILD 85444 2013-03-01 18:09:53Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=luxrays -pkgver=1.1 -_pkgver=589aa5dac899 -pkgrel=4 +pkgver=1.2 +_pkgver=475fbf15f0ca +pkgrel=1 pkgdesc="Accelerate the ray intersection process by using GPUs" arch=('i686' 'x86_64') url="http://www.luxrender.net/" license=('GPL') -depends=('freeimage' 'freeglut' 'glew' 'libcl') -makedepends=('cmake' 'boost' 'mesa' 'opencl-headers') +depends=('freeimage' 'libcl' 'libgl') +optdepends=('glew: slg, slg2, smallppmgpu' 'freeglut: slg, slg2, smallppmgpu') +makedepends=('cmake' 'boost' 'mesa' 'opencl-headers' 'glew' 'freeglut') source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2) -md5sums=('7513d71148fa14bc1779b816816580b9') +md5sums=('e7c24e8407514f2f2211ded105756b2a') build() { cd "$srcdir/luxrender-$pkgname-$_pkgver" diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD index e3c6f12e6..b63912f02 100644 --- a/community/luxrender/PKGBUILD +++ b/community/luxrender/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 83258 2013-01-28 16:49:44Z stephane $ +# $Id: PKGBUILD 85456 2013-03-01 19:15:13Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Initial contributor: flixie <69one@gmx.net> +# Contributor: flixie <69one@gmx.net> # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org> pkgname=luxrender -pkgver=1.1 -_pkgver=4b4289cda943 -pkgrel=4 +pkgver=1.2 +_pkgver=ee0b9ff73d62 +pkgrel=1 pkgdesc="Rendering system for physically correct, unbiased image synthesis" arch=('i686' 'x86_64') url="http://www.luxrender.net/" license=('GPL') -depends=('boost-libs' 'freeimage' 'openexr' 'libcl') -optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \ +depends=('boost-libs' 'freeimage' 'openexr' 'libcl' 'libgl') +optdepends=('luxblend25: Blender exporter' 'qt4: Qt GUI' \ 'python: Python interface (pylux)' 'nvidia-utils: OpenCL support for nVidia GPUs' \ 'amdstream: OpenCL support for AMD GPUs' \ 'intel-opencl-sdk: OpenCL support for Intel CPUs') -makedepends=('cmake' 'boost' 'mesa' 'qt' "luxrays=$pkgver" 'python' 'opencl-headers') +makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers') source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2) -md5sums=('accca65afdc4cc38db49a6e54f20e0f2') +md5sums=('eb1ed9ecfe540896863ad4ee4da5a2f9') build() { cd "$srcdir"/luxrender-lux-$_pkgver diff --git a/community/mariadb/PKGBUILD b/community/mariadb/PKGBUILD index d2a361d9d..ba946890c 100644 --- a/community/mariadb/PKGBUILD +++ b/community/mariadb/PKGBUILD @@ -1,37 +1,35 @@ -# $Id: PKGBUILD 83403 2013-01-31 12:12:11Z bpiotrowski $ +# $Id: PKGBUILD 85328 2013-03-01 06:31:46Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgbase=mariadb pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb') pkgver=5.5.29 -pkgrel=1 +pkgrel=4 arch=('i686' 'x86_64') license=('GPL') -url="http://mariadb.org/" +url='http://mariadb.org/' makedepends=('cmake' 'openssl' 'zlib') options=('!libtool') source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$pkgver.tar.gz - service rc.d tmpfiles.conf) + mariadb.service + mariadb-post.sh + mariadb-tmpfile.conf) sha256sums=('b0e25b5451dbf8e8c8bf243bbd0aeb264db0da2caceafc7e2c9fad77b8d4be74' - 'd9f3d0a897e2e8d5d07c19898ed4c1a4a1c08dfe09f6854f90e79e055e48c02e' - 'a0bfe75c035fa32a10d04238932f5e7ad11829b7fbdb1b8f8997ee645ae1b924' - '08daa863ddd50aff0b608621ed26936919211e286440951dca5866141291004d') + 'a6cf5446159fff16598d0d787dd3a3c30a53a656a5f876ddb608bc60e234d334' + '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd' + '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd') build() { cd $srcdir mkdir build cd build - # CFLAGS/CXXFLAGS as suggested upstream - CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ - CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \ - - cmake ../${pkgbase}-${pkgver} \ + cmake ../$pkgbase-$pkgver \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONFDIR=/etc/mysql \ -DMYSQL_DATADIR=/var/lib/mysql \ - -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ + -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \ -DDEFAULT_CHARSET=utf8 \ -DDEFAULT_COLLATION=utf8_general_ci \ -DENABLED_LOCAL_INFILE=ON \ @@ -49,36 +47,39 @@ build() { -DWITH_ZLIB=system \ -DWITH_SSL=system \ -DWITH_LIBWRAP=OFF \ - -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \ -DWITH_EXTRA_CHARSETS=complex \ -DWITH_EMBEDDED_SERVER=ON \ + -DWITH_ARCHIVE_STORAGE_ENGINE=1 \ + -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \ -DWITH_INNOBASE_STORAGE_ENGINE=1 \ -DWITH_PARTITION_STORAGE_ENGINE=1 \ - -DWITH_PBXT_STORAGE_ENGINE=1 \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ - -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \ - -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \ - -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 + -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \ + -DWITHOUT_PBXT_STORAGE_ENGINE=1 \ + -DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ + -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \ + -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" + make } -package_libmariadbclient(){ +package_libmariadbclient() { pkgdesc="MariaDB client libraries" depends=('openssl') conflicts=('libmysqlclient') - provides=("libmysqlclient=${pkgver}") + provides=("libmysqlclient=$pkgver") - cd "${srcdir}"/build + cd "$srcdir"/build for dir in include libmysql libmysqld libservices; do - make -C ${dir} DESTDIR="${pkgdir}" install + make -C $dir DESTDIR="$pkgdir" install done - install -d "${pkgdir}"/usr/bin - install -m755 scripts/mysql_config "${pkgdir}"/usr/bin/ - install -d "${pkgdir}"/usr/share/man/man1 + install -d "$pkgdir"/usr/bin + install -m755 scripts/mysql_config "$pkgdir"/usr/bin/ + install -d "$pkgdir"/usr/share/man/man1 for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do - install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 + install -m644 "$srcdir"/$pkgbase-$pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1 done } @@ -86,19 +87,19 @@ package_mariadb-clients() { pkgdesc="MariaDB client tools" depends=('libmariadbclient') conflicts=('mysql-clients') - provides=("mysql-clients=${pkgver}") + provides=("mysql-clients=$pkgver") - cd "${srcdir}"/build - make -C client DESTDIR="${pkgdir}" install + cd "$srcdir"/build + make -C client DESTDIR="$pkgdir" install # install man pages - install -d "${pkgdir}"/usr/share/man/man1 + install -d "$pkgdir"/usr/share/man/man1 for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do - install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 + install -m644 "$srcdir"/$pkgbase-$pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1 done # provided by mariadb - rm "${pkgdir}"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest} + rm "$pkgdir"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest} } package_mariadb() { @@ -107,34 +108,29 @@ package_mariadb() { install=mariadb.install depends=('mariadb-clients') conflicts=('mysql') - provides=("mysql=${pkgver}") + provides=("mysql=$pkgver") optdepends=('perl-dbi' 'perl-dbd-mysql') options=('emptydirs') - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install - - install -Dm644 "${pkgdir}"/usr/share/mysql/my-medium.cnf "${pkgdir}"/etc/mysql/my.cnf - install -Dm755 "${srcdir}"/rc.d "${pkgdir}"/etc/rc.d/mysqld + cd "$srcdir"/build + make DESTDIR="$pkgdir" install - install -Dm644 "${srcdir}"/service "${pkgdir}"/usr/lib/systemd/system/mysqld.service - install -Dm644 "${srcdir}"/tmpfiles.conf "${pkgdir}"/usr/lib/tmpfiles.d/mysql.conf + install -Dm644 "$pkgdir"/usr/share/mysql/my-medium.cnf "$pkgdir"/etc/mysql/my.cnf + install -Dm755 "$srcdir"/mariadb-post.sh "$pkgdir"/usr/bin/mysqld-post + install -Dm644 "$srcdir"/mariadb.service "$pkgdir"/usr/lib/systemd/system/mysqld.service + install -Dm644 "$srcdir"/mariadb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysql.conf # provided by libmariadbclient - rm "${pkgdir}"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded} - rm "${pkgdir}"/usr/lib/libmysql* - rm -r "${pkgdir}"/usr/include/ - rm "${pkgdir}"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1 + rm "$pkgdir"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded} + rm "$pkgdir"/usr/lib/libmysql* + rm -r "$pkgdir"/usr/include/ + rm "$pkgdir"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1 # provided by mariadb-clients - rm "${pkgdir}"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap} - rm "${pkgdir}"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1 + rm "$pkgdir"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap} + rm "$pkgdir"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1 # not needed - rm -r "${pkgdir}"/usr/{data,mysql-test,sql-bench} - rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1 - - install -dm700 "${pkgdir}"/var/lib/mysql + rm -r "$pkgdir"/usr/{data,mysql-test,sql-bench} + rm "$pkgdir"/usr/share/man/man1/mysql-test-run.pl.1 } - -# vim:set ts=2 sw=2 et: diff --git a/community/mariadb/mariadb-post.sh b/community/mariadb/mariadb-post.sh new file mode 100755 index 000000000..c4ac18171 --- /dev/null +++ b/community/mariadb/mariadb-post.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +while true; do + response=$(/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1) && break + echo "$response" | grep -q "mysqld is alive" && break + echo "$response" | grep -q "Access denied for user" && break + sleep 1 +done diff --git a/community/mariadb/mariadb-tmpfile.conf b/community/mariadb/mariadb-tmpfile.conf new file mode 100644 index 000000000..6883dc798 --- /dev/null +++ b/community/mariadb/mariadb-tmpfile.conf @@ -0,0 +1 @@ +d /run/mysqld 0755 mysql mysql - diff --git a/community/mariadb/mariadb.install b/community/mariadb/mariadb.install index 4ac50ec94..de619b668 100644 --- a/community/mariadb/mariadb.install +++ b/community/mariadb/mariadb.install @@ -1,30 +1,28 @@ +if [[ $(command -v my_print_defaults >/dev/null 2>&1) ]]; then + datadir=$(my_print_defaults mysqld | sed -n "s/^--datadir=//p") +fi +[[ -z $datadir ]] && datadir=/var/lib/mysql + post_install(){ groupadd -g 89 mysql &>/dev/null - useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null - usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql - chown -R mysql:mysql var/lib/mysql &>/dev/null + useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null - if [[ ! -d run/mysqld ]]; then - usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/mysql.conf + if [[ ! -e $datadir ]]; then + install -dm700 $datadir + usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=$datadir + chown -R mysql:mysql var/lib/mysql &>/dev/null fi + + usr/bin/systemd-tmpfiles --create mysqld.conf } post_upgrade(){ getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null - getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null - - if [[ ! -d run/mysqld ]]; then - usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/mysql.conf - fi - - if [[ "$(vercmp $2 5.5)" -lt 0 ]]; then - echo ">>> Major version update. Consider restart the service, and" - echo " then running mysql_upgrade after it." - fi + getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null if [[ "$(vercmp $2 5.5.25-4)" -lt 0 ]] && [[ -d /data ]]; then for x in data/*; do - cp -r $x var/lib/mysql/ + cp -r $x $datadir/ done rm -rf data fi @@ -38,10 +36,9 @@ post_upgrade(){ post_remove(){ if getent passwd mysql >/dev/null 2>&1; then userdel mysql + fi if getent group mysql >/dev/null 2>&1; then groupdel mysql fi } - -# vim:set ts=2 sw=2 et: diff --git a/community/mariadb/mariadb.service b/community/mariadb/mariadb.service new file mode 100644 index 000000000..dd65511d7 --- /dev/null +++ b/community/mariadb/mariadb.service @@ -0,0 +1,16 @@ +[Unit] +Description=MariaDB database server +After=syslog.target + +[Service] +User=mysql +Group=mysql + +ExecStart=/usr/bin/mysqld --pid-file=/run/mysqld/mysqld.pid +ExecStartPost=/usr/bin/mysqld-post + +Restart=always +PrivateTmp=true + +[Install] +WantedBy=multi-user.target diff --git a/community/mariadb/rc.d b/community/mariadb/rc.d deleted file mode 100755 index e9fe8f5a8..000000000 --- a/community/mariadb/rc.d +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -getPID() { - echo $(pgrep -u mysql mysqld 2>/dev/null); -} - -case "$1" in - start) - stat_busy "Starting MariaDB Server" - [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null - if [ -z "$(getPID)" ]; then - /usr/bin/mysqld_safe --user=mysql &>/dev/null & - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - timeo=30 - while [ $timeo -gt 0 ]; do - response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break - echo "$response" | grep -q "mysqld is alive" && break - sleep 1 - let timeo=${timeo}-1 - done - if [ $timeo -eq 0 ]; then - stat_fail - exit 1 - else - echo $(getPID) > /var/run/mysqld/mysqld.pid - add_daemon mysqld - stat_done - fi - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping MariaDB Server" - if [ ! -z "$(getPID)" ]; then - timeo=30 - kill $(getPID) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do - sleep 1 - let timeo=${timeo}-1 - done - if [ -z "$(getPID)" ]; then - rm -f /var/run/mysqld/mysqld.pid &>/dev/null - rm_daemon mysqld - stat_done - else - stat_fail - exit 1 - fi - else - stat_fail - exit 1 - fi - ;; - - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/mariadb/service b/community/mariadb/service deleted file mode 100644 index 1b3a50082..000000000 --- a/community/mariadb/service +++ /dev/null @@ -1,21 +0,0 @@ -[Unit] -Description=MariaDB database server -After=syslog.target network.target - -[Service] -User=mysql -Group=mysql - -ExecStart=/usr/bin/mysqld --pid-file=/var/run/mysqld/mysqld.pid -ExecStop=/bin/kill -15 $MAINPID -PIDFile=/var/run/mysqld/mysqld.pid -WorkingDirectory=/usr - -# We rely on systemd, not mysqld_safe, to restart mysqld if it dies -Restart=always - -# Place temp files in a secure directory, not /tmp -PrivateTmp=true - -[Install] -WantedBy=multi-user.target diff --git a/community/mariadb/tmpfiles.conf b/community/mariadb/tmpfiles.conf deleted file mode 100644 index 74cd5f836..000000000 --- a/community/mariadb/tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -d /var/run/mysqld 0755 mysql mysql - diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD index e4c12194e..2d3c2de1e 100644 --- a/community/mediainfo-gui/PKGBUILD +++ b/community/mediainfo-gui/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 78761 2012-10-24 10:02:27Z spupykin $ +# $Id: PKGBUILD 84844 2013-02-25 10:39:41Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=mediainfo-gui -pkgver=0.7.61 +pkgver=0.7.62 pkgrel=1 pkgdesc="GUI for mediainfo" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('libmediainfo' 'wxgtk') makedepends=('libtool' 'automake' 'autoconf') install=mediainfo-gui.install source=(http://downloads.sourceforge.net/mediainfo/mediainfo_${pkgver}.tar.bz2) -md5sums=('46fd776968ec1047cd2a5056a906cdf2') +md5sums=('a9a8bc398cc5d2ca8723fae024f6e891') build() { cd $srcdir/MediaInfo/Project/GNU/GUI diff --git a/community/mediainfo/PKGBUILD b/community/mediainfo/PKGBUILD index ed5af89c5..fd9740384 100644 --- a/community/mediainfo/PKGBUILD +++ b/community/mediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 78759 2012-10-24 10:01:48Z spupykin $ +# $Id: PKGBUILD 84842 2013-02-25 10:39:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=mediainfo -pkgver=0.7.61 +pkgver=0.7.62 pkgrel=1 pkgdesc="supplies technical and tag information about a video or audio file" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('libmediainfo') makedepends=('libtool' 'automake' 'autoconf') source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2) -md5sums=('46fd776968ec1047cd2a5056a906cdf2') +md5sums=('a9a8bc398cc5d2ca8723fae024f6e891') build() { cd $srcdir/MediaInfo/Project/GNU/CLI diff --git a/community/mesa-dri1/PKGBUILD b/community/mesa-dri1/PKGBUILD index f63f0d717..3fa2266bf 100644 --- a/community/mesa-dri1/PKGBUILD +++ b/community/mesa-dri1/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=mesa-dri1 pkgname=('unichrome-dri' 'i810-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri') pkgver=7.11.2 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') makedepends=('glproto>=1.4.14' 'dri2proto' 'libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6.1' 'python2' 'libxml2' 'imake' 'llvm' 'udev') @@ -35,21 +35,21 @@ build() { } package_unichrome-dri() { - depends=("libgl") + depends=("mesa-libgl") pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome" make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/unichrome DESTDIR="${pkgdir}" install } package_i810-dri() { - depends=("libgl") + depends=("mesa-libgl") pkgdesc="Mesa DRI drivers for Intel i810" make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i810 DESTDIR="${pkgdir}" install } package_mach64-dri() { - depends=("libgl") + depends=("mesa-libgl") pkgdesc="Mesa DRI drivers for ATI Mach64" conflicts=('xf86-video-mach64<6.8.2') @@ -57,7 +57,7 @@ package_mach64-dri() { } package_mga-dri() { - depends=("libgl") + depends=("mesa-libgl") pkgdesc="Mesa DRI drivers for Matrox" conflicts=('xf86-video-mga<1.4.11') @@ -65,7 +65,7 @@ package_mga-dri() { } package_r128-dri() { - depends=("libgl") + depends=("mesa-libgl") pkgdesc="Mesa DRI drivers for ATI Rage128" conflicts=('xf86-video-r128<6.8.1') @@ -73,7 +73,7 @@ package_r128-dri() { } package_savage-dri() { - depends=("libgl") + depends=("mesa-libgl") pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage" conflicts=('xf86-video-savage<2.3.1') @@ -81,7 +81,7 @@ package_savage-dri() { } package_sis-dri() { - depends=("libgl") + depends=("mesa-libgl") pkgdesc="Mesa DRI drivers for SiS" conflicts=('xf86-video-sis<0.10.2') @@ -89,7 +89,7 @@ package_sis-dri() { } package_tdfx-dri() { - depends=("libgl") + depends=("mesa-libgl") pkgdesc="Mesa DRI drivers for 3dfx" conflicts=('xf86-video-tdfx<1.4.3') diff --git a/community/mixxx/PKGBUILD b/community/mixxx/PKGBUILD index 590db4288..470f56c3a 100644 --- a/community/mixxx/PKGBUILD +++ b/community/mixxx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73315 2012-07-06 08:33:12Z lfleischer $ +# $Id: PKGBUILD 85374 2013-03-01 10:35:42Z andrea $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Ali H. Caliskan <ali.h.caliskan AT gmail DOT com> # Contributor: Ryan Coyner <rcoyner@gmail.com> @@ -6,23 +6,23 @@ pkgname=mixxx pkgver=1.10.1 -pkgrel=1 +pkgrel=2 pkgdesc="Free, open source software for digital DJ'ing." arch=('i686' 'x86_64' 'mips64el') url='http://www.mixxx.org' license=('GPL') depends=('fftw' 'libid3tag' 'libmad' 'libogg' 'libshout' 'libsndfile' 'portaudio' 'portmidi' - 'qt>=4.5' 'taglib' 'qtwebkit') -makedepends=('mesa' 'scons' 'libshout') + 'taglib' 'qtwebkit') +makedepends=('mesa' 'scons' 'libshout' 'glu') source=("http://downloads.mixxx.org/${pkgname}-${pkgver}/${pkgname}-${pkgver}-src.tar.gz") md5sums=('765bc5216ec8102c2186dd3ea80187a9') build() { cd "${srcdir}/${pkgname}-${pkgver}" - scons qtdir=/usr/lib/qt prefix=/usr install_root="${pkgdir}/usr" + scons qtdir=/usr/lib/qt4 prefix=/usr install_root="${pkgdir}/usr" } package() { cd "${srcdir}/${pkgname}-${pkgver}" - scons qtdir=/usr/lib/qt prefix=/usr install_root="${pkgdir}/usr" install + scons qtdir=/usr/lib/qt4 prefix=/usr install_root="${pkgdir}/usr" install } diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD index c126bd68f..9a224af1d 100644 --- a/community/mlt/PKGBUILD +++ b/community/mlt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84355 2013-02-16 22:50:33Z ioni $ +# $Id: PKGBUILD 85375 2013-03-01 10:35:52Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com> # Contributor: funkyou <spamopfer@nickname.berlin.de> @@ -8,12 +8,12 @@ pkgbase=mlt pkgname=('mlt' 'mlt-python-bindings') pkgver=0.8.8 -pkgrel=2 +pkgrel=3 pkgdesc="An open source multimedia framework" arch=('i686' 'x86_64' 'mips64el') url="http://www.mltframework.org" license=('GPL') -makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'gtk2' 'ffmpeg' +makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt4' 'sox' 'libxml2' 'gtk2' 'ffmpeg' 'frei0r-plugins' 'swig' 'python2' "jack" "ladspa") source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz ffmpeg.patch) @@ -31,7 +31,7 @@ build() { msg "SSE2=$SSE2" ./configure --prefix=/usr --enable-gpl --enable-gpl3 \ - --qimage-libdir=/usr/lib/ --qimage-includedir=/usr/include/Qt \ + --qimage-libdir=/usr/lib/ --qimage-includedir=/usr/include/qt4 \ --avformat-vdpau \ --avformat-swscale $SSE2 make @@ -46,7 +46,7 @@ build() { package_mlt() { depends=('sdl_image' 'libsamplerate' 'libdv' 'sox' 'libxml2' 'ffmpeg' 'frei0r-plugins') - optdepends=('jack' 'libexif' 'qt' 'gtk2' "ladspa") + optdepends=('jack' 'libexif' 'qt4' 'gtk2' "ladspa") conflicts=('mlt++<=0.3.8') cd "$srcdir/mlt-$pkgver" diff --git a/community/mosh/PKGBUILD b/community/mosh/PKGBUILD index a15b1229d..1d640b651 100644 --- a/community/mosh/PKGBUILD +++ b/community/mosh/PKGBUILD @@ -5,7 +5,7 @@ pkgname=mosh pkgver=1.2.3 -pkgrel=3 +pkgrel=4 pkgdesc='Mobile shell, surviving disconnects with local echo and line editing' arch=('x86_64' 'i686' 'mips64el') url='http://mosh.mit.edu/' diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD index 45279758e..c18ac4bcf 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84620 2013-02-20 18:43:47Z bpiotrowski $ +# $Id: PKGBUILD 84778 2013-02-24 14:30:27Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Martin Panter <vadmium+aur@gmail.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> @@ -14,13 +14,13 @@ install=$pkgname.install depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg' 'fontconfig' 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' 'libcaca' 'libcdio-paranoia' 'libdca' 'libdvdcss' 'libdvdnav' 'libdvdread' - 'libgl' 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora' + 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora' 'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu') makedepends=('unzip' 'python' 'python-docutils') if [ "$CARCH" != "mips64el" ]; then depends+=('libgl' 'libvdpau' 'lirc-utils') - makedepends+=('mesa' 'yasm') + makedepends+=('mesa' 'mesa-libgl' 'yasm') fi backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') provides=('mplayer') diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD index cd001c143..7a58eb6a8 100644 --- a/community/muffin/PKGBUILD +++ b/community/muffin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83982 2013-02-07 22:09:51Z bgyorgy $ +# $Id: PKGBUILD 84756 2013-02-24 11:50:35Z faidoc $ # Contributor: Adam Hani Schakaki <adam@schakaki.net> # Contributor: Ner0 pkgname=muffin -pkgver=1.1.2 -pkgrel=3 +pkgver=1.7.1 +pkgrel=1 pkgdesc="Cinnamon window manager based on Mutter" arch=('i686' 'x86_64') url="https://github.com/linuxmint/muffin" @@ -18,7 +18,7 @@ replaces=('muffin-wm') options=('!libtool' '!emptydirs') install=$pkgname.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/tarball/$pkgver") -md5sums=('0950fa5c00a165c7fed73b0898d072d5') +md5sums=('688ac16937bcaa286566d47764bf33a7') build() { cd linuxmint-muffin-* diff --git a/community/mumble/PKGBUILD b/community/mumble/PKGBUILD index f5c5f5c4f..5247c9d2c 100644 --- a/community/mumble/PKGBUILD +++ b/community/mumble/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 64801 2012-02-18 06:36:47Z svenstaro $ +# $Id: PKGBUILD 85446 2013-03-01 18:21:21Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lauri Niskanen <ape@ape3000.com> # Contributor: Sebastian.Salich@gmx.de @@ -9,26 +9,24 @@ pkgname=mumble pkgver=1.2.3 -pkgrel=5 +pkgrel=7 arch=('i686' 'x86_64' 'mips64el') pkgdesc="A voice chat application similar to TeamSpeak" -license=('GPL') -depends=('qt' 'speex' 'lsb-release' 'libxi' 'avahi' 'libsndfile' 'protobuf' 'libpulse') +license=('BSD') +depends=('qt4' 'speex' 'lsb-release' 'libxi' 'avahi' 'libsndfile' 'protobuf' 'libpulse') makedepends=('boost' 'mesa' 'avahi') #optdepends=('portaudio: for portaudio back-end' 'g15daemon: G15 Keyboard support') options=('!libtool') install=mumble.install url="http://mumble.sourceforge.net/" -source=("http://downloads.sourceforge.net/mumble/$pkgname-$pkgver.tar.gz" \ - mumble11x.desktop ) -md5sums=('55804e3dfe98b16eeb40abca6c254625' - '70dcaa8ad2ecf68c6ba52ea03d112bcd') +source=("http://downloads.sourceforge.net/mumble/$pkgname-$pkgver.tar.gz") +md5sums=('55804e3dfe98b16eeb40abca6c254625') build() { cd $srcdir/$pkgname-$pkgver # Building mumble - /usr/bin/qmake main.pro \ + qmake main.pro \ CONFIG+="bundled-celt no-bundled-speex no-speechd no-g15 no-xevie no-server \ no-embed-qt-translations no-update packaged" \ DEFINES+="PLUGIN_PATH=/usr/lib/mumble" @@ -40,7 +38,6 @@ package() { # bin stuff install -m755 -D ./release/mumble $pkgdir/usr/bin/mumble - install -m755 -D ./release/mumble11x $pkgdir/usr/bin/mumble11x install -m755 -D ./scripts/mumble-overlay $pkgdir/usr/bin/mumble-overlay # lib stuff @@ -54,7 +51,6 @@ package() { # other stuff install -m644 -D ./scripts/mumble.desktop $pkgdir/usr/share/applications/mumble.desktop - install -m644 -D $srcdir/mumble11x.desktop $pkgdir/usr/share/applications/mumble11x.desktop install -m755 -d $pkgdir/usr/share/man/man1 install -m644 -D ./man/mum* $pkgdir/usr/share/man/man1/ install -m644 -D ./icons/mumble.svg $pkgdir/usr/share/icons/hicolor/scalable/apps/mumble.svg diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD index 4c2b0ee2d..39e3fb58e 100644 --- a/community/mupdf/PKGBUILD +++ b/community/mupdf/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75333 2012-08-20 06:45:01Z bpiotrowski $ +# $Id: PKGBUILD 85309 2013-02-28 20:50:02Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> @@ -6,23 +6,23 @@ # Contributor: xduugu (.desktop and install files) pkgname=mupdf -pkgver=1.1 +pkgver=1.2 pkgrel=1 -pkgdesc="lightweight PDF viewer and toolkit written in portable C" +pkgdesc='Lightweight PDF and XPS viewer' arch=('i686' 'x86_64' 'mips64el') -url="http://mupdf.com" +url='http://mupdf.com' license=('GPL3') depends=('freetype2' 'libjpeg' 'jbig2dec' 'openjpeg' 'libxext' 'desktop-file-utils' 'xdg-utils') install=mupdf.install -source=("http://mupdf.com/download/$pkgname-$pkgver-source.tar.gz") -md5sums=('f7b5fd753f40aca207e9afd70d8f8edf') +source=(https://mupdf.googlecode.com/files/$pkgname-$pkgver-source.zip) +sha256sums=('9bc9e31ec27c091dad37f70940bd799e46ab6da4299bc58e803bff3dbb07dc3b') build() { - CFLAGS+=" -fPIC" - CXXFLAGS+=" -fPIC" + CFLAGS+=' -fPIC' + CXXFLAGS+=' -fPIC' cd "$srcdir"/$pkgname-$pkgver-source - make build=release prefix="$pkgdir"/usr + make build=release prefix=/usr } package() { diff --git a/community/murmur/PKGBUILD b/community/murmur/PKGBUILD index d2e827884..1fb8211cd 100644 --- a/community/murmur/PKGBUILD +++ b/community/murmur/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 81777 2012-12-29 07:18:42Z svenstaro $ +# $Id: PKGBUILD 85450 2013-03-01 18:26:17Z svenstaro $ # 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=9 +pkgrel=11 pkgdesc="The voice chat application server for Mumble" arch=('i686' 'x86_64' 'mips64el') url="http://mumble.sourceforge.net" -license=('GPL') -depends=('avahi' 'lsb-release' 'protobuf' 'qt' 'icu') +license=('BSD') +depends=('avahi' 'lsb-release' 'protobuf' 'qt4' 'icu') makedepends=('boost') -conflicts=('murmur-ice' 'murmur-static' 'murmur-git') backup=("etc/murmur.ini" "etc/logrotate.d/murmur" "etc/conf.d/murmur" ) diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index a5587a7c2..cbf283cb0 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84359 2013-02-16 22:50:37Z ioni $ +# $Id: PKGBUILD 84826 2013-02-24 23:03:43Z jconder $ # 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=6 +pkgrel=7 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ depends=('avahi' 'fftw' 'lame' 'libass' 'libavc1394' 'libcdio' 'libiec61883' 'mysql-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' 'openssl' 'yasm') +makedepends=('glew' 'libcec' 'libxml2' 'mesa' 'mesa-libgl' 'openssl' 'yasm') optdepends=('glew: for GPU commercial flagging' 'libcec: for consumer electronics control capabilities' 'libxml2: to read blu-ray metadata' @@ -30,14 +30,10 @@ backup=('etc/conf.d/mythbackend') install='mythtv.install' source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" 'alsa.patch' - 'mythbackend.rc' - 'mythbackend.conf' 'mythbackend.service' 'http://code.mythtv.org/trac/raw-attachment/ticket/11338/libcec-2-support.patch') md5sums=('f57066bf75e6f14824c494d41639f4f9' 'f64b8219e3d27a2edf96733b851e576b' - 'c8f935d42fb8617e9279bd539811ca5f' - 'ab962d83614cbd0ac11ce3fcc929829d' 'e4d572dcc307d6d8ae26bee5aebf9f3a' '6e156c9fc0b369346d93ccafad46cba3') @@ -67,8 +63,6 @@ package() { cd "$srcdir/$pkgname-$pkgver" make INSTALL_ROOT="$pkgdir" install - install -D -m755 "$srcdir/mythbackend.rc" "$pkgdir/etc/rc.d/mythbackend" - install -D -m644 "$srcdir/mythbackend.conf" "$pkgdir/etc/conf.d/mythbackend" install -D -m644 "$srcdir/mythbackend.service" "$pkgdir/usr/lib/systemd/system/mythbackend.service" install -D -m644 'database/mc.sql' "$pkgdir/usr/share/mythtv/mc.sql" diff --git a/community/mythtv/mythbackend.conf b/community/mythtv/mythbackend.conf deleted file mode 100644 index 49bbca877..000000000 --- a/community/mythtv/mythbackend.conf +++ /dev/null @@ -1,53 +0,0 @@ -# -# Copyright (c) by the MythTV Development Team. -# -# Derived from work by: -# -# Michael Thomson <linux at m-thomson dot net> -# Stu Tomlinson <stu at nosnilmot dot com> -# Axel Thimm <axel.thimm at atrpms dot net> -# Adopted for ArchLinux: -# Jürgen Hoetzel <juergen@archinux.org> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -############################################################################### -# -# User who should start the mythbackend process -# -# Running mythbackend as non-root requires you to ensure that audio/video -# devices used for recording have suitable user permissions. One way -# to achieve this is to modify existing or create new udev rules which -# assign these devices to a non-root group with rw permissions and add -# your mythbackend user to that group. Be aware that console.perms can -# also affect device permissions and may need additional configuration. -# Running as non-root may also introduce increased process latency. -# -# MBE_USER='root' - -# -# Startup options for mythbackend (see 'mythbackend --help' for a list). -# -# MBE_OPTS='' - -# -# Directory holding the mythbackend log file -# -# LOG_PATH='/var/log/mythtv' - -# -# Logging options for mythbackend (see 'mythbackend -v help' for a list) -# -# LOG_OPTS='' diff --git a/community/mythtv/mythbackend.rc b/community/mythtv/mythbackend.rc deleted file mode 100644 index 488b4cb8e..000000000 --- a/community/mythtv/mythbackend.rc +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/profile - -############################################################################### -# Default values to use if none are supplied in the config file. -# -# User who should start the mythbackend process -MBE_USER='mythtv' - -# Startup options for mythbackend -MBE_OPTS='' - -# Directory holding the mythbackend log file -LOG_PATH='/var/log/mythtv' - -# Logging options for mythbackend -LOG_OPTS='' -############################################################################### - -CONFIG_FILE=/etc/conf.d/mythbackend -PIDFILE=/var/run/mythbackend.pid - -if [[ -r "$CONFIG_FILE" ]]; then - . "$CONFIG_FILE" -fi - -PID="$(cat "$PIDFILE" 2> /dev/null || pidof mythbackend)" -export HOME="$(getent passwd "$MBE_USER" | cut -d : -f 6)" - -case "$1" in - start) - stat_busy "Starting MythTV Backend" - - if [[ "$PID" -gt 0 ]] && kill -0 "$PID"; then - stat_fail - exit 0 - fi - - touch "$PIDFILE" - chown "$MBE_USER" "$PIDFILE" "$LOG_PATH" - - MBE_CMD="/usr/bin/mythbackend --daemon \ - --logpath "$LOG_PATH" $LOG_OPTS \ - --pidfile "$PIDFILE" $MBE_OPTS" - if su "$MBE_USER" -c "$MBE_CMD"; then - add_daemon mythbackend - stat_done - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping MythTV Backend" - if [[ "$PID" -gt 0 ]] && kill "$PID" &> /dev/null; then - rm_daemon mythbackend - stat_done - rm -f "$PIDFILE" - else - stat_fail - fi - ;; - restart) - "$0" stop - "$0" start - ;; - *) - echo "usage: $0 (start|stop|restart)" - ;; -esac -exit 0 diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index c901f766e..ff551598d 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84730 2013-02-23 20:47:41Z bpiotrowski $ +# $Id: PKGBUILD 84738 2013-02-24 00:14:35Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -8,7 +8,7 @@ _tmpdir=/var/lib/nginx pkgname=nginx pkgver=1.2.7 -pkgrel=3 +pkgrel=4 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' arch=('i686' 'x86_64' 'mips64el') depends=('pcre' 'zlib' 'openssl' 'geoip') diff --git a/community/nginx/nginx.install b/community/nginx/nginx.install index 242766abd..efc155556 100644 --- a/community/nginx/nginx.install +++ b/community/nginx/nginx.install @@ -1,12 +1,12 @@ post_install() { if [[ -e var/log/nginx ]]; then - chmod 640 var/log/nginx + chmod 750 var/log/nginx chown root:log var/log/nginx fi } post_upgrade() { - [[ $(vercmp $2 1.2.7-2) -le 0 ]] && post_install + [[ $(vercmp $2 1.2.7-3) -le 0 ]] && post_install if [[ $(vercmp $2 1.2.1-2) -le 0 ]]; then echo " >>> Since 1.2.1-2 several changes has been made in package:" echo " - *.conf files have been moved to /etc/nginx" diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index cef23d3fb..26f43133b 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84385 2013-02-17 18:49:54Z bpiotrowski $ +# $Id: PKGBUILD 84970 2013-02-26 15:56:33Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos <james.r.campos@gmail.com> @@ -8,7 +8,7 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.8.20 +pkgver=0.8.21 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ depends=('openssl' 'python2') checkdepends=('curl') # curl used for check() options=('!emptydirs') source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz) -sha256sums=('e4461bfded531f4880839829ab3bce5b824905d6e181876e3d0309a366bf57ee') +sha256sums=('e526f56d22bb2ebee5a607bd1e7a16dcc8530b916e3a372192e6cd5fa97d08e6') build() { cd node-v${pkgver} diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD index edd1ed051..e302a49f9 100644 --- a/community/opendkim/PKGBUILD +++ b/community/opendkim/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 82828 2013-01-24 15:21:21Z spupykin $ +# $Id: PKGBUILD 84932 2013-02-26 10:19:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thomas Jost <schnouki@schnouki.net> pkgname=opendkim -pkgver=2.7.4 +pkgver=2.8.0 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=('310063cabe530eb0b5c16103334b3bb0' +md5sums=('53bd811c6577235bd008f632e7f63dae' '3e2bb1058ac0662f01e675aa6ac7ee8f' '093f5c098a45cc68753f97e45a5b374c' 'bc1b73856bc1941faaa4842e00437cb5') diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD index 79422ba20..c9a74bf78 100644 --- a/community/openimageio/PKGBUILD +++ b/community/openimageio/PKGBUILD @@ -1,34 +1,34 @@ -# $Id: PKGBUILD 83263 2013-01-28 16:49:50Z stephane $ +# $Id: PKGBUILD 85378 2013-03-01 10:36:19Z andrea $ # Contributor: SpepS <dreamspepser at yahoo dot it> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=openimageio -pkgver=1.1.2 +pkgver=1.1.7 pkgrel=2 -pkgdesc="A library for reading and writing images, including classes, utilities, and applications." +pkgdesc="A library for reading and writing images, including classes, utilities, and applications" arch=(i686 x86_64) url="http://www.openimageio.org/" license=('custom') -depends=('openexr' 'boost-libs' 'jasper' 'glew') -makedepends=('cmake' 'qt' 'python2' 'boost' 'mesa') -optdepends=('qt: iv image viewer' +depends=('openexr' 'boost-libs' 'jasper' 'glew' 'libtiff' 'opencolorio' 'intel-tbb') +makedepends=('cmake' 'qt4' 'python2' 'boost' 'mesa') +optdepends=('qt4: iv image viewer' 'python2: bindings support') -source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver - fix32bit-fail.patch) -md5sums=('8a5fd88f87fbf1826a4782041cf9e7d0' - '64403604d0b74bd6c50fe8638207116a') +source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver) +md5sums=('5fafac9b5f9f7edc9bd0507477c12e0d') build() { cd "$srcdir"/$_pkgname* - patch -Np1 < $srcdir/fix32bit-fail.patch - cd src [[ -d build ]] && rm -r build mkdir build && cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr -DPYLIB_INSTALL_DIR=lib/python2.7/site-packages .. + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYLIB_INSTALL_DIR=lib/python2.7/site-packages \ + -DUSE_EXTERNAL_TBB=ON \ + .. make } diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD index a4626f38c..8feb63055 100644 --- a/community/openscenegraph/PKGBUILD +++ b/community/openscenegraph/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84360 2013-02-16 22:50:38Z ioni $ +# $Id: PKGBUILD 85379 2013-03-01 10:36:28Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Hans Janssen <janserv@gmail.com> # Contributor: my64 <packages@obordes.com> @@ -6,14 +6,14 @@ pkgname=openscenegraph pkgver=3.0.1 -pkgrel=8 +pkgrel=9 pkgdesc="An Open Source, high performance real-time graphics toolkit" arch=('i686' 'x86_64') license=('custom:OSGPL') url="http://www.openscenegraph.org" depends=('giflib' 'jasper' 'librsvg' 'xine-lib' 'curl' 'pth') -makedepends=('cmake' 'libvncserver' 'qt' 'ffmpeg-compat' 'mesa') -optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt') +makedepends=('cmake' 'libvncserver' 'qt4' 'ffmpeg-compat' 'mesa') +optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt4') conflicts=('openthreads') provides=('openthreads') source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip diff --git a/community/openshadinglanguage/PKGBUILD b/community/openshadinglanguage/PKGBUILD index 2fcc49be5..853c15ac9 100644 --- a/community/openshadinglanguage/PKGBUILD +++ b/community/openshadinglanguage/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=openshadinglanguage pkgver=1.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Advanced shading language for production GI renderers" arch=(i686 x86_64) url="http://code.google.com/p/openshadinglanguage/" @@ -17,7 +17,12 @@ build() { [[ -d build ]] && rm -r build mkdir build && cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr .. + # TODO: Remove LLVM_STATIC with llvm 3.3 when we'll have shared libs + # Check blender for crash with llvm pipe (run LIBGL_ALWAYS_SOFTWARE=1 blender) + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLLVM_STATIC=ON \ + .. make } diff --git a/community/openssh-askpass/PKGBUILD b/community/openssh-askpass/PKGBUILD index 99851f24f..60a457f29 100644 --- a/community/openssh-askpass/PKGBUILD +++ b/community/openssh-askpass/PKGBUILD @@ -4,12 +4,12 @@ pkgname=openssh-askpass pkgver=1.3.6 -pkgrel=1 +pkgrel=2 pkgdesc='A plasma-like passphrase dialog for ssh' arch=('i686' 'x86_64' 'mips64el') url='http://www.phenix.bnl.gov/WWW/publish/hpereira/software/index.php?page=package&package_list=software_list_qt4&package=openssh-askpass&full=1' license=('GPL') -depends=('openssh' 'qt') +depends=('openssh' 'qt4') makedepends=('cmake') provides=('x11-ssh-askpass') conflicts=('x11-ssh-askpass') @@ -25,6 +25,7 @@ build() { cmake -DCMAKE_INSTALL_PREFIX="/usr" .. make } + package() { cd "$srcdir/$pkgname-$pkgver/build" make DESTDIR="$pkgdir" install diff --git a/community/oprofile/PKGBUILD b/community/oprofile/PKGBUILD index 941c438b1..3491127be 100644 --- a/community/oprofile/PKGBUILD +++ b/community/oprofile/PKGBUILD @@ -1,22 +1,24 @@ -# $Id: PKGBUILD 83066 2013-01-27 09:59:19Z andrea $ +# $Id: PKGBUILD 85381 2013-03-01 10:36:45Z andrea $ # Maintainer : Aaron Griffin <aaron@archlinux.org> pkgname=oprofile pkgver=0.9.8 -pkgrel=1 -pkgdesc="A system-wide profiler for Linux systems, capable of profiling all running code at low overhead" +pkgrel=2 +pkgdesc='System-wide profiler for Linux systems' arch=('i686' 'x86_64') url="http://oprofile.sourceforge.net" license=('GPL') depends=('popt' 'gcc-libs' 'zlib' 'sh') -makedepends=('qt') -optdepends=('qt: for oprof_start gui') +makedepends=('qt4') +optdepends=('qt4: for oprof_start gui') options=('!libtool') install=oprofile.install source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) sha1sums=('28416b853641f913e5f90954f2e3837efd96f6cd') build() { + . /etc/profile.d/qt4.sh + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --with-kernel-support --with-x --enable-gui=qt4 make diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD index e84aada0f..19ea8f2db 100644 --- a/community/packagekit/PKGBUILD +++ b/community/packagekit/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 75406 2012-08-22 08:09:42Z jconder $ +# $Id: PKGBUILD 85382 2013-03-01 10:36:54Z andrea $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> pkgbase='packagekit' pkgname=('packagekit' 'packagekit-qt2' 'packagekit-python') pkgver=0.7.6 -pkgrel=2 +pkgrel=3 pkgdesc="A system designed to make installation and updates of packages easier." arch=('i686' 'x86_64' 'mips64el') url="http://www.packagekit.org" license=('GPL') makedepends=('dbus-glib' 'gobject-introspection' 'gtk-doc' 'intltool' - 'networkmanager' 'pacman' 'pm-utils' 'polkit' 'python2' 'qt' + 'networkmanager' 'pacman' 'pm-utils' 'polkit' 'python2' 'qt4' 'shared-mime-info' 'sqlite' 'udev') options=('!libtool') source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz" @@ -78,7 +78,7 @@ package_packagekit() { } package_packagekit-qt2() { - depends=('packagekit' 'qt') + depends=('packagekit' 'qt4') pkgdesc=('Qt bindings for PackageKit') cd "$srcdir/PackageKit-$pkgver/lib/packagekit-qt2" diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index 4b50cfef1..7983075a7 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82738 2013-01-23 16:27:21Z spupykin $ +# $Id: PKGBUILD 84934 2013-02-26 10:19:55Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: mpie <michael.kyne-phillips1@ntlworld.com> pkgname=parrot -pkgver=5.0.0 -_rel=stable -#_rel=devel +pkgver=5.1.0 +#_rel=stable +_rel=devel pkgrel=2 pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages" arch=('x86_64' 'i686' 'mips64el') @@ -16,13 +16,14 @@ makedepends=('perl-json') optdepends=('freeglut') options=('!makeflags') source=(ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.bz2) -md5sums=('4f16127f539e019a30d21b4d1ea7196f') +md5sums=('cf879f76d56f007107c143a1b63037c9') build() { cd "$srcdir/$pkgname-$pkgver" perl Configure.pl --prefix=/usr \ --parrot_is_shared \ - --disable-rpath + --disable-rpath \ + --optimize export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$(pwd)/blib/lib" make all parrot_utils docs html } diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD index bcb102d29..f4738e599 100644 --- a/community/percona-server/PKGBUILD +++ b/community/percona-server/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 82764 2013-01-24 08:41:17Z mtorromeo $ +# $Id: PKGBUILD 85072 2013-02-27 09:22:49Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=percona-server -pkgver=5.5.29_rel29.4 +pkgver=5.5.29_rel30.0 pkgrel=1 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation" arch=('i686' 'x86_64' 'mips64el') @@ -102,7 +102,7 @@ package() { install -dm700 "${pkgdir}"/var/lib/mysql } -sha256sums=('b29dfa3634450e405c697e145dc63cf939c3c803bdeccecc01289188b40819a9' +sha256sums=('9cbcb2ad2b66a352a154f2b89c779d79cceea4f6f5ff9ef62f8ae1512c0550a7' 'e875fac56f69634b4f1720aec3b952fc63903414e9345af630e5fd74b5373eb4' 'dd5dc155de468d4ab26971109861ae19b53574f28785bac5ff7b717fb65c0760' '4894d39605950d86841ad982e619daa6c8d5d60ca30928d7dbb582e8cb3ade32' diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD index 6ff3c1952..7d212dc01 100644 --- a/community/pidgin-lwqq/PKGBUILD +++ b/community/pidgin-lwqq/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 82530 2013-01-20 07:27:44Z fyan $ +# $Id: PKGBUILD 85068 2013-02-27 02:51:41Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=pidgin-lwqq -pkgver=0.1b -_pkgver=0.1-b +pkgver=0.1c +_pkgver=0.1-c pkgrel=1 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol" arch=('i686' 'x86_64' 'mips64el') url="https://github.com/xiehuc/pidgin-lwqq" license=('GPL3') depends=('libpurple' 'curl' 'libev' 'hicolor-icon-theme' 'gtk-update-icon-cache') -optdepends=('telepathy-haze: Empathy plugin support') +optdepends=('pidgin: Multi-protocol instant messaging client' + 'telepathy-haze: Empathy plugin support') makedepends=('git' 'cmake') install=$pkgname.install source=("https://github.com/xiehuc/$pkgname/archive/${_pkgver}.tar.gz") @@ -32,4 +33,4 @@ package() cd "$srcdir/$pkgname-${_pkgver}/build" make DESTDIR="${pkgdir}" install } -md5sums=('c7dc9de7d951f99e878f3036f79f7d6f') +md5sums=('7ea1ed24870213c07c536d49fd59e292') diff --git a/community/podofo/PKGBUILD b/community/podofo/PKGBUILD index 69e0cc946..0892e0bff 100644 --- a/community/podofo/PKGBUILD +++ b/community/podofo/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 63712 2012-02-05 12:08:41Z ibiru $ +# $Id: PKGBUILD 84752 2013-02-24 05:43:40Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > # Contributor: Preecha Patumchareonpol <yumyai at gmail.com> pkgname=podofo -pkgver=0.9.1 -pkgrel=3 +pkgver=0.9.2 +pkgrel=1 pkgdesc="A C++ library to work with the PDF file format" arch=('i686' 'x86_64' 'mips64el') url="http://podofo.sourceforge.net" license=('GPL') -depends=( 'gcc-libs' 'fontconfig' 'libpng' 'libtiff') +depends=('openssl' 'libidn' 'lua51' 'fontconfig' 'libpng' 'libtiff') makedepends=('cmake') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('cec586ab69f92bc88d38b5d4b8eee5a0') +md5sums=('41966c57fa4266ac5cef80bfade0c8e7') build() { cd ${pkgname}-${pkgver} diff --git a/community/pokerth/PKGBUILD b/community/pokerth/PKGBUILD index 6fed5a7a7..f7b0759ba 100644 --- a/community/pokerth/PKGBUILD +++ b/community/pokerth/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83269 2013-01-28 16:49:59Z stephane $ +# $Id: PKGBUILD 85448 2013-03-01 18:25:07Z svenstaro $ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Vasco Costa <vasco.costa@meiodigital.com> @@ -6,13 +6,13 @@ pkgname=pokerth _realname=PokerTH pkgver=1.0 -pkgrel=2 +pkgrel=4 pkgdesc="Poker game written in C++/QT4" arch=('i686' 'x86_64' 'mips64el') url="http://www.pokerth.net/" license=('GPL' 'custom') depends=('curl' 'boost-libs' 'gsasl' 'gnutls' 'protobuf' - 'qt' 'sdl_mixer' 'libircclient' 'tinyxml') + 'qt4' 'sdl_mixer' 'libircclient' 'tinyxml') makedepends=('boost') source=(http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2) md5sums=('1d8686b8968475cfc76e873a17a53efc') diff --git a/community/processing/PKGBUILD b/community/processing/PKGBUILD index 940517a8a..e4a8509ca 100644 --- a/community/processing/PKGBUILD +++ b/community/processing/PKGBUILD @@ -1,44 +1,46 @@ -# $Id: PKGBUILD 82915 2013-01-25 17:38:23Z arodseth $ +# $Id: PKGBUILD 85228 2013-02-27 19:59:51Z andrea $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> pkgname=processing -pkgver=2.0b7 -pkgrel=3 -pkgdesc='Programming language and environment for creating images, animations and interactions' +pkgver=2.0b8 +pkgrel=1 arch=('x86_64' 'i686') +pkgdesc='Programming language and environment for creating images, animations and interactions' url='http://www.processing.org/' license=('GPL' 'LGPL') depends=('libgl' 'sh' 'libxxf86vm') makedepends=('gendesk') options=(!strip) -_bits=64 -sha256sums=('844b4280b242176107f6c40fef47fa420695111cdb2b80294570297f63b1186f') -if [[ "$CARCH" != "x86_64" ]]; then - _bits=32 - sha256sums=('55db8370672f9e2658443a7fe577e23f06ca1ab2435719c865a059a0e65cdc83') +if [ "$CARCH" == "x86_64" ]; then + source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver-linux64.tgz" + "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") + sha256sums=('5eab47cd67f3160a71ff694b45e74f8a17f0b0ca31cd3ae545104fb70babb58e' + '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') +else + source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver-linux32.tgz" + "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") + sha256sums=('ba113199c5ca3c0d9a274088a62eacd6c3872dea9151e34ed1f312d78bad6f17' + '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') fi -source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver-linux$_bits.tgz") - -source+=("$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") -sha256sums+=('019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') build() { - cd "$srcdir" - gendesk + cd "$srcdir" + + gendesk } package() { - cd "$srcdir/$pkgname-$pkgver" - - install -d "$pkgdir/usr/share/$pkgname/" "$pkgdir/usr/bin/" - cp -r ./* "$pkgdir/usr/share/$pkgname/" - ln -s "/usr/share/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname" - ln -s "/usr/share/$pkgname/$pkgname-java" "$pkgdir/usr/bin/$pkgname-java" - install -Dm644 "$srcdir/$pkgname.png" \ - "$pkgdir/usr/share/pixmaps/$pkgname.png" - install -Dm644 "$srcdir/$pkgname.desktop" \ - "$pkgdir/usr/share/applications/$pkgname.desktop" + cd "$srcdir/$pkgname-$pkgver" + + install -d "$pkgdir/usr/share/$pkgname/" "$pkgdir/usr/bin/" + cp -r * "$pkgdir/usr/share/$pkgname/" + ln -s "/usr/share/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname" + ln -s "/usr/share/$pkgname/$pkgname-java" "$pkgdir/usr/bin/$pkgname-java" + install -Dm644 "$srcdir/$pkgname.png" \ + "$pkgdir/usr/share/pixmaps/$pkgname.png" + install -Dm644 "$srcdir/$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" } # vim:set ts=2 sw=2 et: diff --git a/community/proj/PKGBUILD b/community/proj/PKGBUILD index a64fb6298..3e1a63225 100644 --- a/community/proj/PKGBUILD +++ b/community/proj/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70420 2012-05-05 19:41:43Z jlichtblau $ +# $Id: PKGBUILD 84824 2013-02-24 20:23:27Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org @@ -6,7 +6,7 @@ pkgname=proj pkgver=4.8.0 -pkgrel=1 +pkgrel=2 pkgdesc='Cartographic Projections library.' arch=('i686' 'x86_64' 'mips64el') url="http://trac.osgeo.org/proj/" @@ -15,7 +15,7 @@ options=('!libtool') changelog=$pkgname.changelog source=("http://download.osgeo.org/proj/$pkgname-$pkgver.tar.gz" "http://download.osgeo.org/proj/$pkgname-datumgrid-1.5.zip" - "chenyx06a.zip::http://www.swisstopo.admin.ch/internet/swisstopo/en/home/topics/survey/lv03-lv95/chenyx06/distortion_grids.parsys.65772.downloadList.94632.DownloadFile.tmp/chenyx06antv2.zip") + "chenyx06a.zip::http://www.swisstopo.admin.ch/internet/swisstopo/en/home/products/software/software.parsys.7090.downloadList.55545.DownloadFile.tmp/chenyx06ntv2.zip") sha256sums=('2db2dbf0fece8d9880679154e0d6d1ce7c694dd8e08b4d091028093d87a9d1b5' '723c4017d95d7a8abdf3bda4e18d3c15d79b00f9326d453da5fdf13f96c287db' 'f61290a32815622bfe182af475c76b0b4c282de66121fdddce2f6201e8bca2e0') diff --git a/community/proj/proj.changelog b/community/proj/proj.changelog index 7d3e4bd22..24041ea60 100644 --- a/community/proj/proj.changelog +++ b/community/proj/proj.changelog @@ -1,3 +1,6 @@ +2013-02-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * proj 4.8.0-2 chenyx06a.zip file location fix + 2012-05-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * proj 4.8.0-1 diff --git a/community/projectm/PKGBUILD b/community/projectm/PKGBUILD index 73552a51e..ce17b5a4b 100644 --- a/community/projectm/PKGBUILD +++ b/community/projectm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84566 2013-02-19 22:29:25Z arodseth $ +# $Id: PKGBUILD 85384 2013-03-01 10:37:13Z andrea $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexander Baldeck <alexander@archlinux.org> @@ -7,11 +7,11 @@ pkgbase=projectm pkgname=('projectm' 'projectm-libvisual' 'projectm-pulseaudio' 'projectm-qt' 'projectm-test') pkgver=2.1.0 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') url='http://projectm.sourceforge.net/' license=('LGPL') -makedepends=('mesa' 'qt' 'cmake' 'ftgl' 'glew' 'gtkglext' 'libvisual' 'sdl' 'libxext' 'pulseaudio') +makedepends=('mesa-libgl' 'qt4' 'cmake' 'ftgl' 'glew' 'gtkglext' 'libvisual' 'sdl' 'libxext' 'pulseaudio') source=("http://downloads.sourceforge.net/$pkgname/projectM-complete-$pkgver-Source.tar.gz" 'projectm-test-opengl.patch' 'projectm-install-vera-ttf.patch') @@ -38,7 +38,7 @@ build() { package_projectm() { pkgdesc='Music visualizer which uses 3D accelerated iterative image based rendering' - depends=('ftgl' 'glew') + depends=('ftgl' 'glew' 'libgl') cd "$srcdir/build" @@ -49,7 +49,7 @@ package_projectm() { package_projectm-libvisual() { pkgdesc='ProjectM plugin for XMMS' - depends=('projectm' 'libvisual') + depends=('projectm' 'libvisual' 'gcc-libs') cd "$srcdir/build/src/projectM-libvisual" make DESTDIR="$pkgdir" install @@ -57,7 +57,7 @@ package_projectm-libvisual() { package_projectm-pulseaudio() { pkgdesc='ProjectM support for Pulseaudio' - depends=('projectm' 'projectm-qt' 'pulseaudio') + depends=('projectm-qt' 'pulseaudio') cd "$srcdir/build/src/projectM-pulseaudio" make DESTDIR="$pkgdir" install @@ -65,7 +65,7 @@ package_projectm-pulseaudio() { package_projectm-qt() { pkgdesc='Qt bindings for ProjectM' - depends=('projectm' 'qt') + depends=('projectm' 'qt4' 'libgl') cd "$srcdir/build/src/projectM-qt" make DESTDIR="$pkgdir" install @@ -73,7 +73,7 @@ package_projectm-qt() { package_projectm-test() { pkgdesc='ProjectM test applications' - depends=('projectm' 'sdl') + depends=('projectm' 'sdl' 'libgl') cd "$srcdir/build/src/projectM-test" make DESTDIR="$pkgdir" install diff --git a/community/protobuf/PKGBUILD b/community/protobuf/PKGBUILD index 663cbe885..f44461f1d 100644 --- a/community/protobuf/PKGBUILD +++ b/community/protobuf/PKGBUILD @@ -1,11 +1,12 @@ -# Maintainer: Thomas S Hatch <thatch45@gmail.com> +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Thomas S Hatch <thatch45@gmail.com> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgbase=protobuf pkgname=('protobuf' 'protobuf-python') -pkgver=2.4.1 -pkgrel=2 +pkgver=2.5.0 +pkgrel=1 pkgdesc="A way of encoding structured data in an efficient yet extensible format" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/protobuf/" @@ -14,7 +15,7 @@ depends=('gcc-libs' 'zlib') makedepends=('python2' 'setuptools') options=(!libtool) source=(http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.bz2) -md5sums=('ed436802019c9e1f40cc750eaf78f318') +md5sums=('a72001a9067a4c2c4e0e836d0f92ece4') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/psimedia/PKGBUILD b/community/psimedia/PKGBUILD index 07e567b83..df7698516 100644 --- a/community/psimedia/PKGBUILD +++ b/community/psimedia/PKGBUILD @@ -1,36 +1,36 @@ -# $Id: PKGBUILD 66171 2012-02-23 02:29:02Z spupykin $ +# $Id: PKGBUILD 85385 2013-03-01 10:37:22Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Vladimir Kutyavin <vlkut-at-bk-dot-ru> pkgname=psimedia pkgver=1.0.3 -pkgrel=8 +pkgrel=9 pkgdesc="Voice and video chat plugin for Psi-like IM clients. The implementation is based on GStreamer." arch=('i686' 'x86_64' 'mips64el') license=('GPL2') url="http://delta.affinix.com/psimedia/" -depends=('psi' 'speex' 'gstreamer0.10-base' 'qt' 'gstreamer0.10-good-plugins' +depends=('psi' 'speex' 'gstreamer0.10-base' 'qt4' 'gstreamer0.10-good-plugins' 'liboil') -makedepends=('pkgconfig') -source=(http://delta.affinix.com/download/psimedia/$pkgname-$pkgver.tar.bz2 - videodev.h - psimedia-svn20110621.diff.gz - psimedia-1.0.3-glib.patch) -md5sums=('1be71c37d71c655ffc2c53cf86c77a7a' - '427e5832466726a86e5b55b1329d2e9e' - 'b571639d854c90c758f40a44054c6e06' - 'c9fd9764e470a1cb0a7371bf21f8f437') +makedepends=('pkgconfig' 'gdb') +source=($pkgname-$pkgver.tar.gz::https://github.com/psi-im/psimedia/archive/master.tar.gz) +md5sums=('d12fdf60fd71ffba597dd22f5c8481cf') build() { - cd $srcdir/$pkgname-$pkgver - patch -p1 <$srcdir/psimedia-svn20110621.diff - patch -Np1 -i ${srcdir}/psimedia-1.0.3-glib.patch - sed -i 's|# include <linux/videodev.h>|# include "../../../videodev.h"|' gstprovider/deviceenum/deviceenum_unix.cpp - ./configure + cd $srcdir/$pkgname-master + + cat >>gstprovider/gstconf.pri <<EOF + INCLUDEPATH += \ + /usr/include/gstreamer-0.10 \ + /usr/include/glib-2.0 \ + /usr/lib/glib-2.0/include \ + /usr/include/libxml2 +EOF + + qmake make } package() { - cd $srcdir/$pkgname-$pkgver - install -D -m644 ${srcdir}/$pkgname-$pkgver/gstprovider/libgstprovider.so ${pkgdir}/usr/lib/psi/plugins/libgstprovider.so + cd $srcdir/$pkgname-master + install -D -m644 ${srcdir}/$pkgname-master/gstprovider/libgstprovider.so ${pkgdir}/usr/lib/psi/plugins/libgstprovider.so } diff --git a/community/psimedia/psimedia-svn20110621.diff.gz b/community/psimedia/psimedia-svn20110621.diff.gz Binary files differdeleted file mode 100644 index aeb969794..000000000 --- a/community/psimedia/psimedia-svn20110621.diff.gz +++ /dev/null diff --git a/community/psimedia/videodev.h b/community/psimedia/videodev.h deleted file mode 100644 index c51a5f9cb..000000000 --- a/community/psimedia/videodev.h +++ /dev/null @@ -1,320 +0,0 @@ -/* - * Video for Linux version 1 - OBSOLETE - * - * Header file for v4l1 drivers and applications, for - * Linux kernels 2.2.x or 2.4.x. - * - * Provides header for legacy drivers and applications - * - * See http://linuxtv.org for more info - * - */ -#ifndef __LINUX_VIDEODEV_H -#define __LINUX_VIDEODEV_H - -#include <linux/types.h> -#include <linux/ioctl.h> -#include <linux/videodev2.h> - - -#define VID_TYPE_CAPTURE 1 /* Can capture */ -#define VID_TYPE_TUNER 2 /* Can tune */ -#define VID_TYPE_TELETEXT 4 /* Does teletext */ -#define VID_TYPE_OVERLAY 8 /* Overlay onto frame buffer */ -#define VID_TYPE_CHROMAKEY 16 /* Overlay by chromakey */ -#define VID_TYPE_CLIPPING 32 /* Can clip */ -#define VID_TYPE_FRAMERAM 64 /* Uses the frame buffer memory */ -#define VID_TYPE_SCALES 128 /* Scalable */ -#define VID_TYPE_MONOCHROME 256 /* Monochrome only */ -#define VID_TYPE_SUBCAPTURE 512 /* Can capture subareas of the image */ -#define VID_TYPE_MPEG_DECODER 1024 /* Can decode MPEG streams */ -#define VID_TYPE_MPEG_ENCODER 2048 /* Can encode MPEG streams */ -#define VID_TYPE_MJPEG_DECODER 4096 /* Can decode MJPEG streams */ -#define VID_TYPE_MJPEG_ENCODER 8192 /* Can encode MJPEG streams */ - -struct video_capability -{ - char name[32]; - int type; - int channels; /* Num channels */ - int audios; /* Num audio devices */ - int maxwidth; /* Supported width */ - int maxheight; /* And height */ - int minwidth; /* Supported width */ - int minheight; /* And height */ -}; - - -struct video_channel -{ - int channel; - char name[32]; - int tuners; - __u32 flags; -#define VIDEO_VC_TUNER 1 /* Channel has a tuner */ -#define VIDEO_VC_AUDIO 2 /* Channel has audio */ - __u16 type; -#define VIDEO_TYPE_TV 1 -#define VIDEO_TYPE_CAMERA 2 - __u16 norm; /* Norm set by channel */ -}; - -struct video_tuner -{ - int tuner; - char name[32]; - unsigned long rangelow, rangehigh; /* Tuner range */ - __u32 flags; -#define VIDEO_TUNER_PAL 1 -#define VIDEO_TUNER_NTSC 2 -#define VIDEO_TUNER_SECAM 4 -#define VIDEO_TUNER_LOW 8 /* Uses KHz not MHz */ -#define VIDEO_TUNER_NORM 16 /* Tuner can set norm */ -#define VIDEO_TUNER_STEREO_ON 128 /* Tuner is seeing stereo */ -#define VIDEO_TUNER_RDS_ON 256 /* Tuner is seeing an RDS datastream */ -#define VIDEO_TUNER_MBS_ON 512 /* Tuner is seeing an MBS datastream */ - __u16 mode; /* PAL/NTSC/SECAM/OTHER */ -#define VIDEO_MODE_PAL 0 -#define VIDEO_MODE_NTSC 1 -#define VIDEO_MODE_SECAM 2 -#define VIDEO_MODE_AUTO 3 - __u16 signal; /* Signal strength 16bit scale */ -}; - -struct video_picture -{ - __u16 brightness; - __u16 hue; - __u16 colour; - __u16 contrast; - __u16 whiteness; /* Black and white only */ - __u16 depth; /* Capture depth */ - __u16 palette; /* Palette in use */ -#define VIDEO_PALETTE_GREY 1 /* Linear greyscale */ -#define VIDEO_PALETTE_HI240 2 /* High 240 cube (BT848) */ -#define VIDEO_PALETTE_RGB565 3 /* 565 16 bit RGB */ -#define VIDEO_PALETTE_RGB24 4 /* 24bit RGB */ -#define VIDEO_PALETTE_RGB32 5 /* 32bit RGB */ -#define VIDEO_PALETTE_RGB555 6 /* 555 15bit RGB */ -#define VIDEO_PALETTE_YUV422 7 /* YUV422 capture */ -#define VIDEO_PALETTE_YUYV 8 -#define VIDEO_PALETTE_UYVY 9 /* The great thing about standards is ... */ -#define VIDEO_PALETTE_YUV420 10 -#define VIDEO_PALETTE_YUV411 11 /* YUV411 capture */ -#define VIDEO_PALETTE_RAW 12 /* RAW capture (BT848) */ -#define VIDEO_PALETTE_YUV422P 13 /* YUV 4:2:2 Planar */ -#define VIDEO_PALETTE_YUV411P 14 /* YUV 4:1:1 Planar */ -#define VIDEO_PALETTE_YUV420P 15 /* YUV 4:2:0 Planar */ -#define VIDEO_PALETTE_YUV410P 16 /* YUV 4:1:0 Planar */ -#define VIDEO_PALETTE_PLANAR 13 /* start of planar entries */ -#define VIDEO_PALETTE_COMPONENT 7 /* start of component entries */ -}; - -struct video_audio -{ - int audio; /* Audio channel */ - __u16 volume; /* If settable */ - __u16 bass, treble; - __u32 flags; -#define VIDEO_AUDIO_MUTE 1 -#define VIDEO_AUDIO_MUTABLE 2 -#define VIDEO_AUDIO_VOLUME 4 -#define VIDEO_AUDIO_BASS 8 -#define VIDEO_AUDIO_TREBLE 16 -#define VIDEO_AUDIO_BALANCE 32 - char name[16]; -#define VIDEO_SOUND_MONO 1 -#define VIDEO_SOUND_STEREO 2 -#define VIDEO_SOUND_LANG1 4 -#define VIDEO_SOUND_LANG2 8 - __u16 mode; - __u16 balance; /* Stereo balance */ - __u16 step; /* Step actual volume uses */ -}; - -struct video_clip -{ - __s32 x,y; - __s32 width, height; - struct video_clip *next; /* For user use/driver use only */ -}; - -struct video_window -{ - __u32 x,y; /* Position of window */ - __u32 width,height; /* Its size */ - __u32 chromakey; - __u32 flags; - struct video_clip *clips; /* Set only */ - int clipcount; -#define VIDEO_WINDOW_INTERLACE 1 -#define VIDEO_WINDOW_CHROMAKEY 16 /* Overlay by chromakey */ -#define VIDEO_CLIP_BITMAP -1 -/* bitmap is 1024x625, a '1' bit represents a clipped pixel */ -#define VIDEO_CLIPMAP_SIZE (128 * 625) -}; - -struct video_capture -{ - __u32 x,y; /* Offsets into image */ - __u32 width, height; /* Area to capture */ - __u16 decimation; /* Decimation divider */ - __u16 flags; /* Flags for capture */ -#define VIDEO_CAPTURE_ODD 0 /* Temporal */ -#define VIDEO_CAPTURE_EVEN 1 -}; - -struct video_buffer -{ - void *base; - int height,width; - int depth; - int bytesperline; -}; - -struct video_mmap -{ - unsigned int frame; /* Frame (0 - n) for double buffer */ - int height,width; - unsigned int format; /* should be VIDEO_PALETTE_* */ -}; - -struct video_key -{ - __u8 key[8]; - __u32 flags; -}; - -struct video_mbuf -{ - int size; /* Total memory to map */ - int frames; /* Frames */ - int offsets[VIDEO_MAX_FRAME]; -}; - -#define VIDEO_NO_UNIT (-1) - -struct video_unit -{ - int video; /* Video minor */ - int vbi; /* VBI minor */ - int radio; /* Radio minor */ - int audio; /* Audio minor */ - int teletext; /* Teletext minor */ -}; - -struct vbi_format { - __u32 sampling_rate; /* in Hz */ - __u32 samples_per_line; - __u32 sample_format; /* VIDEO_PALETTE_RAW only (1 byte) */ - __s32 start[2]; /* starting line for each frame */ - __u32 count[2]; /* count of lines for each frame */ - __u32 flags; -#define VBI_UNSYNC 1 /* can distingues between top/bottom field */ -#define VBI_INTERLACED 2 /* lines are interlaced */ -}; - -/* video_info is biased towards hardware mpeg encode/decode */ -/* but it could apply generically to any hardware compressor/decompressor */ -struct video_info -{ - __u32 frame_count; /* frames output since decode/encode began */ - __u32 h_size; /* current unscaled horizontal size */ - __u32 v_size; /* current unscaled veritcal size */ - __u32 smpte_timecode; /* current SMPTE timecode (for current GOP) */ - __u32 picture_type; /* current picture type */ - __u32 temporal_reference; /* current temporal reference */ - __u8 user_data[256]; /* user data last found in compressed stream */ - /* user_data[0] contains user data flags, user_data[1] has count */ -}; - -/* generic structure for setting playback modes */ -struct video_play_mode -{ - int mode; - int p1; - int p2; -}; - -/* for loading microcode / fpga programming */ -struct video_code -{ - char loadwhat[16]; /* name or tag of file being passed */ - int datasize; - __u8 *data; -}; - -#define VIDIOCGCAP _IOR('v',1,struct video_capability) /* Get capabilities */ -#define VIDIOCGCHAN _IOWR('v',2,struct video_channel) /* Get channel info (sources) */ -#define VIDIOCSCHAN _IOW('v',3,struct video_channel) /* Set channel */ -#define VIDIOCGTUNER _IOWR('v',4,struct video_tuner) /* Get tuner abilities */ -#define VIDIOCSTUNER _IOW('v',5,struct video_tuner) /* Tune the tuner for the current channel */ -#define VIDIOCGPICT _IOR('v',6,struct video_picture) /* Get picture properties */ -#define VIDIOCSPICT _IOW('v',7,struct video_picture) /* Set picture properties */ -#define VIDIOCCAPTURE _IOW('v',8,int) /* Start, end capture */ -#define VIDIOCGWIN _IOR('v',9, struct video_window) /* Get the video overlay window */ -#define VIDIOCSWIN _IOW('v',10, struct video_window) /* Set the video overlay window - passes clip list for hardware smarts , chromakey etc */ -#define VIDIOCGFBUF _IOR('v',11, struct video_buffer) /* Get frame buffer */ -#define VIDIOCSFBUF _IOW('v',12, struct video_buffer) /* Set frame buffer - root only */ -#define VIDIOCKEY _IOR('v',13, struct video_key) /* Video key event - to dev 255 is to all - cuts capture on all DMA windows with this key (0xFFFFFFFF == all) */ -#define VIDIOCGFREQ _IOR('v',14, unsigned long) /* Set tuner */ -#define VIDIOCSFREQ _IOW('v',15, unsigned long) /* Set tuner */ -#define VIDIOCGAUDIO _IOR('v',16, struct video_audio) /* Get audio info */ -#define VIDIOCSAUDIO _IOW('v',17, struct video_audio) /* Audio source, mute etc */ -#define VIDIOCSYNC _IOW('v',18, int) /* Sync with mmap grabbing */ -#define VIDIOCMCAPTURE _IOW('v',19, struct video_mmap) /* Grab frames */ -#define VIDIOCGMBUF _IOR('v',20, struct video_mbuf) /* Memory map buffer info */ -#define VIDIOCGUNIT _IOR('v',21, struct video_unit) /* Get attached units */ -#define VIDIOCGCAPTURE _IOR('v',22, struct video_capture) /* Get subcapture */ -#define VIDIOCSCAPTURE _IOW('v',23, struct video_capture) /* Set subcapture */ -#define VIDIOCSPLAYMODE _IOW('v',24, struct video_play_mode) /* Set output video mode/feature */ -#define VIDIOCSWRITEMODE _IOW('v',25, int) /* Set write mode */ -#define VIDIOCGPLAYINFO _IOR('v',26, struct video_info) /* Get current playback info from hardware */ -#define VIDIOCSMICROCODE _IOW('v',27, struct video_code) /* Load microcode into hardware */ -#define VIDIOCGVBIFMT _IOR('v',28, struct vbi_format) /* Get VBI information */ -#define VIDIOCSVBIFMT _IOW('v',29, struct vbi_format) /* Set VBI information */ - - -#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */ - -/* VIDIOCSWRITEMODE */ -#define VID_WRITE_MPEG_AUD 0 -#define VID_WRITE_MPEG_VID 1 -#define VID_WRITE_OSD 2 -#define VID_WRITE_TTX 3 -#define VID_WRITE_CC 4 -#define VID_WRITE_MJPEG 5 - -/* VIDIOCSPLAYMODE */ -#define VID_PLAY_VID_OUT_MODE 0 - /* p1: = VIDEO_MODE_PAL, VIDEO_MODE_NTSC, etc ... */ -#define VID_PLAY_GENLOCK 1 - /* p1: 0 = OFF, 1 = ON */ - /* p2: GENLOCK FINE DELAY value */ -#define VID_PLAY_NORMAL 2 -#define VID_PLAY_PAUSE 3 -#define VID_PLAY_SINGLE_FRAME 4 -#define VID_PLAY_FAST_FORWARD 5 -#define VID_PLAY_SLOW_MOTION 6 -#define VID_PLAY_IMMEDIATE_NORMAL 7 -#define VID_PLAY_SWITCH_CHANNELS 8 -#define VID_PLAY_FREEZE_FRAME 9 -#define VID_PLAY_STILL_MODE 10 -#define VID_PLAY_MASTER_MODE 11 - /* p1: see below */ -#define VID_PLAY_MASTER_NONE 1 -#define VID_PLAY_MASTER_VIDEO 2 -#define VID_PLAY_MASTER_AUDIO 3 -#define VID_PLAY_ACTIVE_SCANLINES 12 - /* p1 = first active; p2 = last active */ -#define VID_PLAY_RESET 13 -#define VID_PLAY_END_MARK 14 - - -#endif /* __LINUX_VIDEODEV_H */ - -/* - * Local variables: - * c-basic-offset: 8 - * End: - */ diff --git a/community/pyqt3/PKGBUILD b/community/pyqt3/PKGBUILD index 7ac1e01d5..6b0e4cd8b 100644 --- a/community/pyqt3/PKGBUILD +++ b/community/pyqt3/PKGBUILD @@ -1,21 +1,19 @@ -# $Id: PKGBUILD 77656 2012-10-13 11:44:31Z allan $ +# $Id: PKGBUILD 85290 2013-02-28 14:49:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> pkgname=pyqt3 pkgver=3.18.1 -pkgrel=11 +pkgrel=12 pkgdesc="A set of Python bindings for the Qt3 toolkit" arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.com/software/pyqt/intro" depends=('python2-sip' 'qscintilla-qt3') makedepends=('glu') license=('GPL') -source=("http://www.riverbankcomputing.com/static/Downloads/PyQt3/PyQt-x11-gpl-${pkgver}.tar.gz" - "PyQt-x11-gpl-3.18.1-configure.patch") -md5sums=('f1d120495d1aaf393819e988c0a7bb7e' - 'd0e3e6b5bd20ace9e567a5ebaeed83e1') +source=("http://downloads.sourceforge.net/project/pyqt/PyQt3/PyQt-x11-gpl-${pkgver}.tar.gz") +md5sums=('f1d120495d1aaf393819e988c0a7bb7e') build() { cd ${srcdir}/PyQt-x11-gpl-${pkgver} @@ -24,7 +22,7 @@ build() { echo yes | python2 configure.py -b /usr/bin \ -d /usr/lib/python2.7/site-packages \ -v /usr/share/sip - make + make CXX="g++ -DANY=void" } package() { diff --git a/community/python-cx_freeze/PKGBUILD b/community/python-cx_freeze/PKGBUILD new file mode 100644 index 000000000..cc563b77a --- /dev/null +++ b/community/python-cx_freeze/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 84904 2013-02-25 23:57:50Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Ray Rashif <schiv@archlinux.org> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> +# Contributor: Eric Belanger <eric@archlinux.org> +# Contributor: Roberto Alsina <ralsina@kde.org> + +pkgbase=python-cx_freeze +pkgname=('python-cx_freeze' 'python2-cx_freeze') +pkgver=4.3.1 +pkgrel=1 +pkgdesc='Set of utilities for freezing Python scripts into executables' +arch=('x86_64' 'i686') +url='http://cx-freeze.sourceforge.net/' +license=('PSF') +makedepends=('python' 'python2') +source=("http://prdownloads.sourceforge.net/cx-freeze/cx_Freeze-$pkgver.tar.gz") +sha256sums=('11f8818ab4e1754c81c1226ce3430f29e6ba231a22a153ce3794a5cc464fa11b') + +package_python-cx_freeze() { + depends=('python') + conflicts=('cx_freeze' 'python2-cx_freeze') + + cd "$srcdir/cx_Freeze-$pkgver" + python setup.py install --root "$pkgdir" --optimize 1 +} + +package_python2-cx_freeze() { + depends=('python2') + conflicts=('cx_freeze' 'python-cx_freeze') + replaces=('cx_freeze') + + cd "$srcdir/cx_Freeze-$pkgver" + python2 setup.py install --root "$pkgdir" --optimize 1 + # Python 2 shebang fix + find "$pkgdir" -name qotd.py -exec sed -i '0,/on/s//on2/' {} \; +} + +# vim:set ts=2 sw=2 et: diff --git a/community/qconf/PKGBUILD b/community/qconf/PKGBUILD index 967c18dd4..27388dbf7 100644 --- a/community/qconf/PKGBUILD +++ b/community/qconf/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 55030 2011-08-31 16:23:53Z spupykin $ +# $Id: PKGBUILD 85387 2013-03-01 10:37:35Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: DsTr <kostindima@gmail.com> pkgname=qconf pkgver=1.4 -pkgrel=2 +pkgrel=3 pkgdesc="QConf allows you to have a nice configure script for your qmake-based project." arch=(i686 x86_64 mips64el) url="http://delta.affinix.com/qconf/" license=('GPL') -depends=('qt') +depends=('qt4') makedepends=() source=(http://delta.affinix.com/download/qconf-$pkgver.tar.bz2) md5sums=(e0080044f88c31e032008d5a5682a112) @@ -18,5 +18,9 @@ build() { cd $srcdir/qconf-$pkgver ./configure --prefix=/usr make +} + +package() { + cd $srcdir/qconf-$pkgver make INSTALL_ROOT="$pkgdir" install } diff --git a/community/qgit/PKGBUILD b/community/qgit/PKGBUILD index 73af75518..84f9a7da4 100644 --- a/community/qgit/PKGBUILD +++ b/community/qgit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 49264 2011-06-13 14:58:16Z schuay $ +# $Id: PKGBUILD 85388 2013-03-01 10:37:43Z andrea $ # Maintainer: schuay <jakob.gruber@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> @@ -6,12 +6,12 @@ pkgname=qgit pkgver=2.3 -pkgrel=3 +pkgrel=4 pkgdesc="A GIT GUI viewer built on Qt/C++" url="http://digilander.libero.it/mcostalba/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('qt' 'git') +depends=('qt4' 'git') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'qgit.desktop' 'qgit.png' '0001-Cause-qgit-to-use-git-config-everywhere.patch') diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index 363ba142d..b1bb7979d 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 80871 2012-12-04 21:32:40Z jlichtblau $ +# $Id: PKGBUILD 85389 2013-03-01 10:37:51Z andrea $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> # Contributor: <boenki@gmx.de> pkgname=qlandkartegt pkgver=1.6.0 -pkgrel=1 +pkgrel=2 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' - 'qt' 'shared-mime-info' 'qtwebkit') + 'shared-mime-info' 'qtwebkit') makedepends=('cmake' 'garmindev' 'mesa') optdepends=('garmindev: to connect garmin devices') install=$pkgname.install diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD index d00add089..182761ffc 100644 --- a/community/qmmp/PKGBUILD +++ b/community/qmmp/PKGBUILD @@ -1,14 +1,14 @@ -#$Id: PKGBUILD 84362 2013-02-16 22:50:40Z ioni $ +#$Id: PKGBUILD 85390 2013-03-01 10:38:00Z andrea $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qmmp pkgver=0.6.6 -pkgrel=5 +pkgrel=6 pkgdesc="Qt4 based audio-player" arch=('i686' 'x86_64' 'mips64el') url="http://qmmp.ylsoftware.com/" license=('GPL') -depends=('alsa-lib' 'curl' 'hicolor-icon-theme' 'libmad' 'libvorbis' 'libogg' 'qt' 'taglib' 'xdg-utils') +depends=('alsa-lib' 'curl' 'hicolor-icon-theme' 'libmad' 'libvorbis' 'libogg' 'qt4' 'taglib' 'xdg-utils') makedepends=('cmake' 'flac' 'jack' 'libmpcdec' 'pulseaudio' 'ffmpeg' 'libcdio-paranoia' 'libcddb' 'libmms' 'libsamplerate' 'libmodplug' 'libsndfile' 'wavpack' 'projectm' 'mesa') optdepends=('flac: native FLAC support' 'jack: JACK sound output' diff --git a/community/qmpdclient/PKGBUILD b/community/qmpdclient/PKGBUILD index b98775d66..4cbf5dfd4 100644 --- a/community/qmpdclient/PKGBUILD +++ b/community/qmpdclient/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 58444 2011-11-12 18:54:25Z andrea $ +# $Id: PKGBUILD 85391 2013-03-01 10:38:10Z andrea $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Vinay S Shastry <vinayshastry@gmail.com> pkgname=qmpdclient pkgver=1.2.2 -pkgrel=2 +pkgrel=3 pkgdesc="A Qt4 client for MPD" arch=('i686' 'x86_64' 'mips64el') url="http://bitcheese.net/wiki/QMPDClient" license=('GPL') -depends=('qt') +depends=('qt4') makedepends=('cmake') install=$pkgname.install changelog=$pkgname.changelog @@ -18,7 +18,7 @@ source=(http://dump.bitcheese.net/files/$pkgname-$pkgver.tar.bz2) sha256sums=('ed65705eaae8fb10fdce34ce20e010757a87423c2874479e1466e4368a866289') build() { - cd ${srcdir} + cd "${srcdir}" mkdir build cd build cmake ../${pkgname} \ @@ -28,6 +28,6 @@ build() { } package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install } diff --git a/community/qps/PKGBUILD b/community/qps/PKGBUILD index d1ec3d9b7..d6da32d5b 100644 --- a/community/qps/PKGBUILD +++ b/community/qps/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 60157 2011-12-06 09:22:03Z spupykin $ +# $Id: PKGBUILD 85392 2013-03-01 10:38:18Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Rosenstrauch <darose@darose.net> pkgname=qps pkgver=1.10.16 _dlpkgver=5963 -pkgrel=1 +pkgrel=2 pkgdesc="a visual process manager, an X11 version of 'top' or 'ps'." url="http://qps.kldp.net/projects/qps" -depends=('qt') +depends=('qt4') arch=('i686' 'x86_64' 'mips64el') license="GPL" source=(http://kldp.net/frs/download.php/${_dlpkgver}/qps-$pkgver.tar.bz2) diff --git a/community/qpxtool/PKGBUILD b/community/qpxtool/PKGBUILD index 00451f775..f48de07f5 100644 --- a/community/qpxtool/PKGBUILD +++ b/community/qpxtool/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 81901 2013-01-03 10:05:25Z spupykin $ +# $Id: PKGBUILD 85393 2013-03-01 10:38:26Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Stasiorowski <krzysiekst@gmail.com> pkgname=qpxtool pkgver=0.7.2 -pkgrel=1 +pkgrel=2 pkgdesc="Allows better controll over optical drives to include QChecks and optimization settings." arch=('i686' 'x86_64' 'mips64el') url="http://qpxtool.sourceforge.net/" license=('GPL') -depends=('qt') +depends=('qt4') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 libpng15.patch) md5sums=('b1235e74b8ef4fe087a6b64f5cfca14a' @@ -23,6 +23,10 @@ build() { patch -p1 <$srcdir/libpng15.patch ./configure --prefix=/usr make +} + +package() { + cd $srcdir/$pkgname-$pkgver mkdir -p $pkgdir/usr/bin make DESTDIR=$pkgdir install } diff --git a/community/qstardict/PKGBUILD b/community/qstardict/PKGBUILD index 462e749c7..c6eaa15a2 100644 --- a/community/qstardict/PKGBUILD +++ b/community/qstardict/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 66440 2012-02-24 22:59:57Z jlichtblau $ +# $Id: PKGBUILD 85395 2013-03-01 10:38:40Z andrea $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alois Nespor <alois.nespor@gmail.com> pkgname=qstardict pkgver=1.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Qt4 clone of StarDict with full support of StarDict dictionaries" arch=('i686' 'x86_64' 'mips64el') url="http://qstardict.ylsoftware.com/index.php" license=('GPL2') -depends=('qt') +depends=('qt4') provides=('stardict') changelog=$pkgname.changelog source=(http://qstardict.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2 @@ -18,14 +18,15 @@ sha256sums=('b778ace65a22e5b9724d687ad90c77ec98feb2671774f73cd51725ec7b59e62f' '30878282698dc90bf615ca383f4c01357ce49dfcdddd12c2e0b113ee51822c57') build() { - cd ${srcdir}/$pkgname-$pkgver - patch -Np1 -i ${srcdir}/qstardict-1.0.1-glib.patch + cd "${srcdir}/$pkgname-$pkgver" + sed -i -e 's|glib/gmem.h|glib.h|' -e 's|glib/gstrfuncs.h|glib.h|' plugins/stardict/stardict.cpp + qmake ENABLED_PLUGINS="stardict web swac" make } package() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}/$pkgname-$pkgver" - make INSTALL_ROOT=${pkgdir} install + make INSTALL_ROOT="${pkgdir}" install } diff --git a/community/qsvn/PKGBUILD b/community/qsvn/PKGBUILD index fdd5b1da9..b9afa3fac 100644 --- a/community/qsvn/PKGBUILD +++ b/community/qsvn/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 67770 2012-03-14 11:19:01Z giovanni $ +# $Id: PKGBUILD 85396 2013-03-01 10:38:47Z andrea $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Jakub Schmidtke <sjakub-at-gmail.com> pkgname=qsvn pkgver=0.8.3 -pkgrel=3 +pkgrel=4 pkgdesc="Qt4 GUI for Subversion." arch=('i686' 'x86_64' 'mips64el') url="http://www.anrichter.net/projects/qsvn/" license=('GPL') -depends=('qt' 'subversion') -makedepends=('cmake') -#options=('!makeflags') -source=("http://www.anrichter.net/projects/qsvn/chrome/site/$pkgname-$pkgver-src.tar.gz" - 'lib64-fix.patch') -md5sums=('cfdc9dab7c5f1cbf20b249901e10c04e' - 'f2833303f01331538d1f6f2150b58e4f') +depends=('qt4' 'subversion') +makedepends=('cmake' 'patch') +changelog=$pkgname.changelog +source=(http://www.anrichter.net/projects/qsvn/chrome/site/$pkgname-$pkgver-src.tar.gz + lib64-fix.patch) +sha256sums=('8396f667dc7f09de2eead056608e90febb089fc26529b7fcebe157797c320f73' + '6a2787b5852825aaccd50ad7b20983af859378d86b86aaf550bf4e1bfcc96c3e') build() { - cd ${srcdir}/$pkgname-$pkgver/src + cd "${srcdir}/$pkgname-$pkgver/src" patch -Np2 -i "${srcdir}/lib64-fix.patch" @@ -27,11 +27,11 @@ build() { } package() { - cd ${srcdir}/$pkgname-$pkgver/src + cd "${srcdir}/$pkgname-$pkgver/src" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install #desktop file - install -D -m644 ${srcdir}/$pkgname-$pkgver/src/$pkgname.desktop \ - ${pkgdir}/usr/share/applications/$pkgname.desktop + install -D -m644 "${srcdir}/$pkgname-$pkgver/src/$pkgname.desktop" \ + "${pkgdir}/usr/share/applications/$pkgname.desktop" } diff --git a/community/qsvn/qsvn.changelog b/community/qsvn/qsvn.changelog new file mode 100644 index 000000000..21fac1c11 --- /dev/null +++ b/community/qsvn/qsvn.changelog @@ -0,0 +1,32 @@ +2009-05-31 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 0.8.2 + * Release info: + http://www.anrichter.net/projects/qsvn/wiki/Releases/ReleaseNotes-0.8.2 + +2008-12-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 0.8.1 + * Release info: + http://www.anrichter.net/projects/qsvn/wiki/ReleaseNotes-0.8.1 + +2008-12-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 0.8.0 + * Release info: + http://www.anrichter.net/projects/qsvn/wiki/ReleaseNotes-0.8.0 + +2008-10-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 0.7.1 + +2008-08-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 0.7.0 + * Release info: + http://www.anrichter.net/projects/qsvn/wiki/ReleaseNotes-0.7.0 + +2008-07-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Fixed bug FS#10914 + +2008-03-27 JJDaNiMoTh <jjdanimoth@gmail.com> + * Replaced qt4 with qt as depend + +2007-12-19 Georg Grabler (STiAT) <ggrabler@gmail.com> + * Updated to major release 0.6.0 + diff --git a/community/qsynergy/PKGBUILD b/community/qsynergy/PKGBUILD index e8a5fb71b..1e6262bb0 100644 --- a/community/qsynergy/PKGBUILD +++ b/community/qsynergy/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 60949 2011-12-19 19:01:11Z tredaelli $ +# $Id: PKGBUILD 85453 2013-03-01 19:08:27Z andrea $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: mutlu_inek <mutlu_inek@yahoo.de> pkgname=qsynergy pkgver=0.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="Qt gui for Synergy which lets you remotely control other computers." url="http://www.volker-lanz.de/en/software/qsynergy/" license=(GPL) arch=('i686' 'x86_64' 'mips64el') -depends=('qt' 'synergy') +depends=('qt4' 'synergy') source=("http://sourceforge.net/projects/$pkgname/files/$pkgver/$pkgname-$pkgver.tar.gz") md5sums=('17d8989668016185b859332aacf9e7df') build() { cd "$srcdir/$pkgname-$pkgver" - qmake + qmake-qt4 make } diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD index 4e24a084b..7a4bf4878 100644 --- a/community/qtcreator/PKGBUILD +++ b/community/qtcreator/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83450 2013-02-01 10:16:55Z svenstaro $ +# $Id: PKGBUILD 85401 2013-03-01 10:39:04Z andrea $ # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> @@ -6,44 +6,48 @@ # Contributor: thotypous <matiasΘarchlinux-br·org> # Contributor: delor <bartekpiech gmail com> -pkgname="qtcreator" +pkgname=qtcreator pkgver=2.6.2 _pkgver=2.6.2 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight, cross-platform integrated development environment' arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org' license=('LGPL') -depends=('qt') -makedepends=('qt-private-headers' 'git') +depends=('qt5-quick1' 'qt5-tools') +makedepends=('git') options=('docs') -optdepends=('qt-doc: for the integrated Qt documentation' +optdepends=('qt5-doc: for the integrated Qt documentation' 'gdb: for the debugger' - 'cmake: for cmake project suppport' + 'cmake: for cmake project support' 'openssh-askpass: for ssh support' 'git: for git support' 'mercurial: for mercurial support' 'bzr: for bazaar support' 'valgrind: for analyze support') install=qtcreator.install -source=("http://origin.releases.qt-project.org/qtcreator/${_pkgver}/qt-creator-${_pkgver}-src.tar.gz" - 'qtcreator.desktop') +source=("http://releases.qt-project.org/qtcreator/${_pkgver}/qt-creator-${_pkgver}-src.tar.gz" + 'qtcreator.desktop' + 'fix-build.patch') md5sums=('4700deb89e8cf92239015d7d70f0dcdd' - '82888d4be900e7833d768050a135cd37') + '82888d4be900e7833d768050a135cd37' + '4087c00d853addf97ca329d304e9a0a5') build() { - cd ${srcdir} + cd qt-creator-${_pkgver}-src + patch -p1 -i "${srcdir}"/fix-build.patch + cd ../ [[ -d build ]] && rm -r build mkdir build && cd build - qmake ${srcdir}/qt-creator-${_pkgver}-src/qtcreator.pro + qmake ../qt-creator-${_pkgver}-src/qtcreator.pro make make docs -j1 } package() { - cd ${srcdir}/build + cd build make INSTALL_ROOT="${pkgdir}/usr/" install make INSTALL_ROOT="${pkgdir}/usr/" install_docs diff --git a/community/qtcreator/fix-build.patch b/community/qtcreator/fix-build.patch new file mode 100644 index 000000000..5cf2a503b --- /dev/null +++ b/community/qtcreator/fix-build.patch @@ -0,0 +1,10 @@ +--- qt-creator-2.6.2-src/qtcreator.pri~ 2013-02-27 13:55:23.818990553 +0000 ++++ qt-creator-2.6.2-src/qtcreator.pri 2013-02-27 13:55:52.335454428 +0000 +@@ -147,6 +147,7 @@ + } + + INCLUDEPATH += \ ++ /usr/include \ + $$IDE_BUILD_TREE/src \ # for <app/app_version.h> + $$IDE_SOURCE_TREE/src/libs \ + $$IDE_SOURCE_TREE/tools \ diff --git a/community/qtcreator/fix-glsl-shit.patch b/community/qtcreator/fix-glsl-shit.patch deleted file mode 100644 index 4b5e504e1..000000000 --- a/community/qtcreator/fix-glsl-shit.patch +++ /dev/null @@ -1,2376 +0,0 @@ -From e91045469d59c35607faa344bcfba2b2c566da51 Mon Sep 17 00:00:00 2001 -From: Christian Kamm <christian.d.kamm@nokia.com> -Date: Mon, 6 Aug 2012 11:29:55 +0200 -Subject: [PATCH] GLSL: Fix recovery token order to avoid infinite loop. - -The case 'a = b ? ;' recovered with T_NUMBER, T_COMMA, T_NUMBER, ... - -Task-number: QTCREATORBUG-7517 -Change-Id: I3546266b21d11ce08e4af1331be94a78d3b24c19 -Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> ---- - src/libs/glsl/glsl.g | 4 +- - src/libs/glsl/glslparser.cpp | 638 +++++++++++++++++++++--------------------- - src/libs/glsl/glslparser.h | 2 +- - 3 files changed, 322 insertions(+), 322 deletions(-) - -diff --git a/src/libs/glsl/glsl.g b/src/libs/glsl/glsl.g -index 67f564c..3c6ae7c 100644 ---- a/src/libs/glsl/glsl.g -+++ b/src/libs/glsl/glsl.g -@@ -456,7 +456,7 @@ private: - #include <iostream> - #include <cstdio> - #include <cassert> --#include <QtCore/QDebug> -+#include <QDebug> - - using namespace GLSL; - -@@ -591,7 +591,7 @@ AST *Parser::parse(int startToken) - - static int tks[] = { - T_RIGHT_BRACE, T_RIGHT_PAREN, T_RIGHT_BRACKET, -- T_SEMICOLON, T_COMMA, T_COLON, -+ T_SEMICOLON, T_COLON, T_COMMA, - T_NUMBER, T_TYPE_NAME, T_IDENTIFIER, - T_LEFT_BRACE, T_LEFT_PAREN, T_LEFT_BRACKET, - T_WHILE, -diff --git a/src/libs/glsl/glslparser.cpp b/src/libs/glsl/glslparser.cpp -index cf4bbe4..d82096b 100644 ---- a/src/libs/glsl/glslparser.cpp -+++ b/src/libs/glsl/glslparser.cpp -@@ -1,5 +1,5 @@ - --#line 427 "./glsl.g" -+#line 423 "./glsl.g" - - /************************************************************************** - ** -@@ -171,7 +171,7 @@ AST *Parser::parse(int startToken) - - static int tks[] = { - T_RIGHT_BRACE, T_RIGHT_PAREN, T_RIGHT_BRACKET, -- T_SEMICOLON, T_COMMA, T_COLON, -+ T_SEMICOLON, T_COLON, T_COMMA, - T_NUMBER, T_TYPE_NAME, T_IDENTIFIER, - T_LEFT_BRACE, T_LEFT_PAREN, T_LEFT_BRACKET, - T_WHILE, -@@ -215,137 +215,137 @@ AST *Parser::parse(int startToken) - return 0; - } - --#line 647 "./glsl.g" -+#line 641 "./glsl.g" - - void Parser::reduce(int ruleno) - { - switch(ruleno) { - --#line 656 "./glsl.g" -+#line 650 "./glsl.g" - - case 0: { - ast(1) = makeAstNode<IdentifierExpressionAST>(string(1)); - } break; - --#line 663 "./glsl.g" -+#line 657 "./glsl.g" - - case 1: { - ast(1) = makeAstNode<LiteralExpressionAST>(string(1)); - } break; - --#line 670 "./glsl.g" -+#line 664 "./glsl.g" - - case 2: { - ast(1) = makeAstNode<LiteralExpressionAST>(_engine->identifier("true", 4)); - } break; - --#line 677 "./glsl.g" -+#line 671 "./glsl.g" - - case 3: { - ast(1) = makeAstNode<LiteralExpressionAST>(_engine->identifier("false", 5)); - } break; - --#line 684 "./glsl.g" -+#line 678 "./glsl.g" - - case 4: { - // nothing to do. - } break; - --#line 691 "./glsl.g" -+#line 685 "./glsl.g" - - case 5: { - ast(1) = ast(2); - } break; - --#line 698 "./glsl.g" -+#line 692 "./glsl.g" - - case 6: { - // nothing to do. - } break; - --#line 705 "./glsl.g" -+#line 699 "./glsl.g" - - case 7: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_ArrayAccess, expression(1), expression(3)); - } break; - --#line 712 "./glsl.g" -+#line 706 "./glsl.g" - - case 8: { - // nothing to do. - } break; - --#line 719 "./glsl.g" -+#line 713 "./glsl.g" - - case 9: { - ast(1) = makeAstNode<MemberAccessExpressionAST>(expression(1), string(3)); - } break; - --#line 726 "./glsl.g" -+#line 720 "./glsl.g" - - case 10: { - ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PostIncrement, expression(1)); - } break; - --#line 733 "./glsl.g" -+#line 727 "./glsl.g" - - case 11: { - ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PostDecrement, expression(1)); - } break; - --#line 740 "./glsl.g" -+#line 734 "./glsl.g" - - case 12: { - // nothing to do. - } break; - --#line 747 "./glsl.g" -+#line 741 "./glsl.g" - - case 13: { - // nothing to do. - } break; - --#line 754 "./glsl.g" -+#line 748 "./glsl.g" - - case 14: { - ast(1) = makeAstNode<FunctionCallExpressionAST> - (sym(1).function.id, sym(1).function.arguments); - } break; - --#line 762 "./glsl.g" -+#line 756 "./glsl.g" - - case 15: { - ast(1) = makeAstNode<FunctionCallExpressionAST> - (expression(1), sym(3).function.id, sym(3).function.arguments); - } break; - --#line 770 "./glsl.g" -+#line 764 "./glsl.g" - - case 16: { - // nothing to do. - } break; - --#line 777 "./glsl.g" -+#line 771 "./glsl.g" - - case 17: { - // nothing to do. - } break; - --#line 784 "./glsl.g" -+#line 778 "./glsl.g" - - case 18: { - sym(1).function.id = sym(1).function_identifier; - sym(1).function.arguments = 0; - } break; - --#line 792 "./glsl.g" -+#line 786 "./glsl.g" - - case 19: { - sym(1).function.id = sym(1).function_identifier; - sym(1).function.arguments = 0; - } break; - --#line 800 "./glsl.g" -+#line 794 "./glsl.g" - - case 20: { - sym(1).function.id = sym(1).function_identifier; -@@ -353,7 +353,7 @@ case 20: { - makeAstNode< List<ExpressionAST *> >(expression(2)); - } break; - --#line 809 "./glsl.g" -+#line 803 "./glsl.g" - - case 21: { - sym(1).function.arguments = -@@ -361,379 +361,379 @@ case 21: { - (sym(1).function.arguments, expression(3)); - } break; - --#line 818 "./glsl.g" -+#line 812 "./glsl.g" - - case 22: { - // nothing to do. - } break; - --#line 825 "./glsl.g" -+#line 819 "./glsl.g" - - case 23: { - ast(1) = makeAstNode<FunctionIdentifierAST>(type(1)); - } break; - --#line 832 "./glsl.g" -+#line 826 "./glsl.g" - - case 24: { - ast(1) = makeAstNode<FunctionIdentifierAST>(string(1)); - } break; - --#line 839 "./glsl.g" -+#line 833 "./glsl.g" - - case 25: { - // nothing to do. - } break; - --#line 846 "./glsl.g" -+#line 840 "./glsl.g" - - case 26: { - ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PreIncrement, expression(2)); - } break; - --#line 853 "./glsl.g" -+#line 847 "./glsl.g" - - case 27: { - ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PreDecrement, expression(2)); - } break; - --#line 860 "./glsl.g" -+#line 854 "./glsl.g" - - case 28: { - ast(1) = makeAstNode<UnaryExpressionAST>(sym(1).kind, expression(2)); - } break; - --#line 867 "./glsl.g" -+#line 861 "./glsl.g" - - case 29: { - sym(1).kind = AST::Kind_UnaryPlus; - } break; - --#line 874 "./glsl.g" -+#line 868 "./glsl.g" - - case 30: { - sym(1).kind = AST::Kind_UnaryMinus; - } break; - --#line 881 "./glsl.g" -+#line 875 "./glsl.g" - - case 31: { - sym(1).kind = AST::Kind_LogicalNot; - } break; - --#line 888 "./glsl.g" -+#line 882 "./glsl.g" - - case 32: { - sym(1).kind = AST::Kind_BitwiseNot; - } break; - --#line 895 "./glsl.g" -+#line 889 "./glsl.g" - - case 33: { - // nothing to do. - } break; - --#line 902 "./glsl.g" -+#line 896 "./glsl.g" - - case 34: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Multiply, expression(1), expression(3)); - } break; - --#line 909 "./glsl.g" -+#line 903 "./glsl.g" - - case 35: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Divide, expression(1), expression(3)); - } break; - --#line 916 "./glsl.g" -+#line 910 "./glsl.g" - - case 36: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Modulus, expression(1), expression(3)); - } break; - --#line 923 "./glsl.g" -+#line 917 "./glsl.g" - - case 37: { - // nothing to do. - } break; - --#line 930 "./glsl.g" -+#line 924 "./glsl.g" - - case 38: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Plus, expression(1), expression(3)); - } break; - --#line 937 "./glsl.g" -+#line 931 "./glsl.g" - - case 39: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Minus, expression(1), expression(3)); - } break; - --#line 944 "./glsl.g" -+#line 938 "./glsl.g" - - case 40: { - // nothing to do. - } break; - --#line 951 "./glsl.g" -+#line 945 "./glsl.g" - - case 41: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_ShiftLeft, expression(1), expression(3)); - } break; - --#line 958 "./glsl.g" -+#line 952 "./glsl.g" - - case 42: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_ShiftRight, expression(1), expression(3)); - } break; - --#line 965 "./glsl.g" -+#line 959 "./glsl.g" - - case 43: { - // nothing to do. - } break; - --#line 972 "./glsl.g" -+#line 966 "./glsl.g" - - case 44: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LessThan, expression(1), expression(3)); - } break; - --#line 979 "./glsl.g" -+#line 973 "./glsl.g" - - case 45: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_GreaterThan, expression(1), expression(3)); - } break; - --#line 986 "./glsl.g" -+#line 980 "./glsl.g" - - case 46: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LessEqual, expression(1), expression(3)); - } break; - --#line 993 "./glsl.g" -+#line 987 "./glsl.g" - - case 47: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_GreaterEqual, expression(1), expression(3)); - } break; - --#line 1000 "./glsl.g" -+#line 994 "./glsl.g" - - case 48: { - // nothing to do. - } break; - --#line 1007 "./glsl.g" -+#line 1001 "./glsl.g" - - case 49: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Equal, expression(1), expression(3)); - } break; - --#line 1014 "./glsl.g" -+#line 1008 "./glsl.g" - - case 50: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_NotEqual, expression(1), expression(3)); - } break; - --#line 1021 "./glsl.g" -+#line 1015 "./glsl.g" - - case 51: { - // nothing to do. - } break; - --#line 1028 "./glsl.g" -+#line 1022 "./glsl.g" - - case 52: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_BitwiseAnd, expression(1), expression(3)); - } break; - --#line 1035 "./glsl.g" -+#line 1029 "./glsl.g" - - case 53: { - // nothing to do. - } break; - --#line 1042 "./glsl.g" -+#line 1036 "./glsl.g" - - case 54: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_BitwiseXor, expression(1), expression(3)); - } break; - --#line 1049 "./glsl.g" -+#line 1043 "./glsl.g" - - case 55: { - // nothing to do. - } break; - --#line 1056 "./glsl.g" -+#line 1050 "./glsl.g" - - case 56: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_BitwiseOr, expression(1), expression(3)); - } break; - --#line 1063 "./glsl.g" -+#line 1057 "./glsl.g" - - case 57: { - // nothing to do. - } break; - --#line 1070 "./glsl.g" -+#line 1064 "./glsl.g" - - case 58: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LogicalAnd, expression(1), expression(3)); - } break; - --#line 1077 "./glsl.g" -+#line 1071 "./glsl.g" - - case 59: { - // nothing to do. - } break; - --#line 1084 "./glsl.g" -+#line 1078 "./glsl.g" - - case 60: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LogicalXor, expression(1), expression(3)); - } break; - --#line 1091 "./glsl.g" -+#line 1085 "./glsl.g" - - case 61: { - // nothing to do. - } break; - --#line 1098 "./glsl.g" -+#line 1092 "./glsl.g" - - case 62: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LogicalOr, expression(1), expression(3)); - } break; - --#line 1105 "./glsl.g" -+#line 1099 "./glsl.g" - - case 63: { - // nothing to do. - } break; - --#line 1112 "./glsl.g" -+#line 1106 "./glsl.g" - - case 64: { - ast(1) = makeAstNode<TernaryExpressionAST>(AST::Kind_Conditional, expression(1), expression(3), expression(5)); - } break; - --#line 1119 "./glsl.g" -+#line 1113 "./glsl.g" - - case 65: { - // nothing to do. - } break; - --#line 1126 "./glsl.g" -+#line 1120 "./glsl.g" - - case 66: { - ast(1) = makeAstNode<AssignmentExpressionAST>(sym(2).kind, expression(1), expression(3)); - } break; - --#line 1133 "./glsl.g" -+#line 1127 "./glsl.g" - - case 67: { - sym(1).kind = AST::Kind_Assign; - } break; - --#line 1140 "./glsl.g" -+#line 1134 "./glsl.g" - - case 68: { - sym(1).kind = AST::Kind_AssignMultiply; - } break; - --#line 1147 "./glsl.g" -+#line 1141 "./glsl.g" - - case 69: { - sym(1).kind = AST::Kind_AssignDivide; - } break; - --#line 1154 "./glsl.g" -+#line 1148 "./glsl.g" - - case 70: { - sym(1).kind = AST::Kind_AssignModulus; - } break; - --#line 1161 "./glsl.g" -+#line 1155 "./glsl.g" - - case 71: { - sym(1).kind = AST::Kind_AssignPlus; - } break; - --#line 1168 "./glsl.g" -+#line 1162 "./glsl.g" - - case 72: { - sym(1).kind = AST::Kind_AssignMinus; - } break; - --#line 1175 "./glsl.g" -+#line 1169 "./glsl.g" - - case 73: { - sym(1).kind = AST::Kind_AssignShiftLeft; - } break; - --#line 1182 "./glsl.g" -+#line 1176 "./glsl.g" - - case 74: { - sym(1).kind = AST::Kind_AssignShiftRight; - } break; - --#line 1189 "./glsl.g" -+#line 1183 "./glsl.g" - - case 75: { - sym(1).kind = AST::Kind_AssignAnd; - } break; - --#line 1196 "./glsl.g" -+#line 1190 "./glsl.g" - - case 76: { - sym(1).kind = AST::Kind_AssignXor; - } break; - --#line 1203 "./glsl.g" -+#line 1197 "./glsl.g" - - case 77: { - sym(1).kind = AST::Kind_AssignOr; - } break; - --#line 1210 "./glsl.g" -+#line 1204 "./glsl.g" - - case 78: { - // nothing to do. - } break; - --#line 1217 "./glsl.g" -+#line 1211 "./glsl.g" - - case 79: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Comma, expression(1), expression(3)); - } break; - --#line 1224 "./glsl.g" -+#line 1218 "./glsl.g" - - case 80: { - // nothing to do. - } break; - --#line 1231 "./glsl.g" -+#line 1225 "./glsl.g" - - case 81: { - // nothing to do. - } break; - --#line 1238 "./glsl.g" -+#line 1232 "./glsl.g" - - case 82: { - ast(1) = makeAstNode<InitDeclarationAST>(sym(1).declaration_list); - } break; - --#line 1245 "./glsl.g" -+#line 1239 "./glsl.g" - - case 83: { - ast(1) = makeAstNode<PrecisionDeclarationAST>(sym(2).precision, type(3)); - } break; - --#line 1252 "./glsl.g" -+#line 1246 "./glsl.g" - - case 84: { - if (sym(1).type_qualifier.qualifier != QualifiedTypeAST::Struct) { -@@ -743,7 +743,7 @@ case 84: { - ast(1) = makeAstNode<TypeDeclarationAST>(type); - } break; - --#line 1263 "./glsl.g" -+#line 1257 "./glsl.g" - - case 85: { - if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) { -@@ -761,7 +761,7 @@ case 85: { - makeAstNode<VariableDeclarationAST>(qualtype, string(6))); - } break; - --#line 1282 "./glsl.g" -+#line 1276 "./glsl.g" - - case 86: { - if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) { -@@ -780,7 +780,7 @@ case 86: { - (makeAstNode<ArrayTypeAST>(qualtype), string(6))); - } break; - --#line 1302 "./glsl.g" -+#line 1296 "./glsl.g" - - case 87: { - if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) { -@@ -799,7 +799,7 @@ case 87: { - (makeAstNode<ArrayTypeAST>(qualtype, expression(8)), string(6))); - } break; - --#line 1322 "./glsl.g" -+#line 1316 "./glsl.g" - - case 88: { - TypeAST *type = makeAstNode<QualifiedTypeAST> -@@ -808,59 +808,59 @@ case 88: { - ast(1) = makeAstNode<TypeDeclarationAST>(type); - } break; - --#line 1332 "./glsl.g" -+#line 1326 "./glsl.g" - - case 89: { - function(1)->finishParams(); - } break; - --#line 1339 "./glsl.g" -+#line 1333 "./glsl.g" - - case 90: { - // nothing to do. - } break; - --#line 1346 "./glsl.g" -+#line 1340 "./glsl.g" - - case 91: { - // nothing to do. - } break; - --#line 1353 "./glsl.g" -+#line 1347 "./glsl.g" - - case 92: { - function(1)->params = makeAstNode< List<ParameterDeclarationAST *> > - (sym(2).param_declaration); - } break; - --#line 1361 "./glsl.g" -+#line 1355 "./glsl.g" - - case 93: { - function(1)->params = makeAstNode< List<ParameterDeclarationAST *> > - (function(1)->params, sym(3).param_declaration); - } break; - --#line 1369 "./glsl.g" -+#line 1363 "./glsl.g" - - case 94: { - function(1) = makeAstNode<FunctionDeclarationAST>(type(1), string(2)); - } break; - --#line 1376 "./glsl.g" -+#line 1370 "./glsl.g" - - case 95: { - sym(1).param_declarator.type = type(1); - sym(1).param_declarator.name = string(2); - } break; - --#line 1384 "./glsl.g" -+#line 1378 "./glsl.g" - - case 96: { - sym(1).param_declarator.type = makeAstNode<ArrayTypeAST>(type(1), expression(4)); - sym(1).param_declarator.name = string(2); - } break; - --#line 1392 "./glsl.g" -+#line 1386 "./glsl.g" - - case 97: { - ast(1) = makeAstNode<ParameterDeclarationAST> -@@ -871,7 +871,7 @@ case 97: { - sym(3).param_declarator.name); - } break; - --#line 1404 "./glsl.g" -+#line 1398 "./glsl.g" - - case 98: { - ast(1) = makeAstNode<ParameterDeclarationAST> -@@ -880,7 +880,7 @@ case 98: { - sym(2).param_declarator.name); - } break; - --#line 1414 "./glsl.g" -+#line 1408 "./glsl.g" - - case 99: { - ast(1) = makeAstNode<ParameterDeclarationAST> -@@ -890,7 +890,7 @@ case 99: { - (const QString *)0); - } break; - --#line 1425 "./glsl.g" -+#line 1419 "./glsl.g" - - case 100: { - ast(1) = makeAstNode<ParameterDeclarationAST> -@@ -898,44 +898,44 @@ case 100: { - (const QString *)0); - } break; - --#line 1434 "./glsl.g" -+#line 1428 "./glsl.g" - - case 101: { - sym(1).qualifier = ParameterDeclarationAST::In; - } break; - --#line 1441 "./glsl.g" -+#line 1435 "./glsl.g" - - case 102: { - sym(1).qualifier = ParameterDeclarationAST::In; - } break; - --#line 1448 "./glsl.g" -+#line 1442 "./glsl.g" - - case 103: { - sym(1).qualifier = ParameterDeclarationAST::Out; - } break; - --#line 1455 "./glsl.g" -+#line 1449 "./glsl.g" - - case 104: { - sym(1).qualifier = ParameterDeclarationAST::InOut; - } break; - --#line 1462 "./glsl.g" -+#line 1456 "./glsl.g" - - case 105: { - // nothing to do. - } break; - --#line 1469 "./glsl.g" -+#line 1463 "./glsl.g" - - case 106: { - sym(1).declaration_list = makeAstNode< List<DeclarationAST *> > - (sym(1).declaration); - } break; - --#line 1477 "./glsl.g" -+#line 1471 "./glsl.g" - - case 107: { - TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); -@@ -944,7 +944,7 @@ case 107: { - (sym(1).declaration_list, decl); - } break; - --#line 1487 "./glsl.g" -+#line 1481 "./glsl.g" - - case 108: { - TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); -@@ -954,7 +954,7 @@ case 108: { - (sym(1).declaration_list, decl); - } break; - --#line 1498 "./glsl.g" -+#line 1492 "./glsl.g" - - case 109: { - TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); -@@ -964,7 +964,7 @@ case 109: { - (sym(1).declaration_list, decl); - } break; - --#line 1509 "./glsl.g" -+#line 1503 "./glsl.g" - - case 110: { - TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); -@@ -975,7 +975,7 @@ case 110: { - (sym(1).declaration_list, decl); - } break; - --#line 1521 "./glsl.g" -+#line 1515 "./glsl.g" - - case 111: { - TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); -@@ -986,7 +986,7 @@ case 111: { - (sym(1).declaration_list, decl); - } break; - --#line 1533 "./glsl.g" -+#line 1527 "./glsl.g" - - case 112: { - TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); -@@ -996,40 +996,40 @@ case 112: { - (sym(1).declaration_list, decl); - } break; - --#line 1544 "./glsl.g" -+#line 1538 "./glsl.g" - - case 113: { - ast(1) = makeAstNode<TypeDeclarationAST>(type(1)); - } break; - --#line 1551 "./glsl.g" -+#line 1545 "./glsl.g" - - case 114: { - ast(1) = makeAstNode<VariableDeclarationAST>(type(1), string(2)); - } break; - --#line 1558 "./glsl.g" -+#line 1552 "./glsl.g" - - case 115: { - ast(1) = makeAstNode<VariableDeclarationAST> - (makeAstNode<ArrayTypeAST>(type(1)), string(2)); - } break; - --#line 1566 "./glsl.g" -+#line 1560 "./glsl.g" - - case 116: { - ast(1) = makeAstNode<VariableDeclarationAST> - (makeAstNode<ArrayTypeAST>(type(1), expression(4)), string(2)); - } break; - --#line 1574 "./glsl.g" -+#line 1568 "./glsl.g" - - case 117: { - ast(1) = makeAstNode<VariableDeclarationAST> - (makeAstNode<ArrayTypeAST>(type(1)), string(2), expression(6)); - } break; - --#line 1582 "./glsl.g" -+#line 1576 "./glsl.g" - - case 118: { - ast(1) = makeAstNode<VariableDeclarationAST> -@@ -1037,26 +1037,26 @@ case 118: { - string(2), expression(7)); - } break; - --#line 1591 "./glsl.g" -+#line 1585 "./glsl.g" - - case 119: { - ast(1) = makeAstNode<VariableDeclarationAST> - (type(1), string(2), expression(4)); - } break; - --#line 1599 "./glsl.g" -+#line 1593 "./glsl.g" - - case 120: { - ast(1) = makeAstNode<InvariantDeclarationAST>(string(2)); - } break; - --#line 1606 "./glsl.g" -+#line 1600 "./glsl.g" - - case 121: { - ast(1) = makeAstNode<QualifiedTypeAST>(0, type(1), (List<LayoutQualifierAST *> *)0); - } break; - --#line 1613 "./glsl.g" -+#line 1607 "./glsl.g" - - case 122: { - ast(1) = makeAstNode<QualifiedTypeAST> -@@ -1064,207 +1064,207 @@ case 122: { - sym(1).type_qualifier.layout_list); - } break; - --#line 1622 "./glsl.g" -+#line 1616 "./glsl.g" - - case 123: { - sym(1).qualifier = QualifiedTypeAST::Invariant; - } break; - --#line 1629 "./glsl.g" -+#line 1623 "./glsl.g" - - case 124: { - sym(1).qualifier = QualifiedTypeAST::Smooth; - } break; - --#line 1636 "./glsl.g" -+#line 1630 "./glsl.g" - - case 125: { - sym(1).qualifier = QualifiedTypeAST::Flat; - } break; - --#line 1643 "./glsl.g" -+#line 1637 "./glsl.g" - - case 126: { - sym(1).qualifier = QualifiedTypeAST::NoPerspective; - } break; - --#line 1650 "./glsl.g" -+#line 1644 "./glsl.g" - - case 127: { - sym(1) = sym(3); - } break; - --#line 1657 "./glsl.g" -+#line 1651 "./glsl.g" - - case 128: { - sym(1).layout_list = makeAstNode< List<LayoutQualifierAST *> >(sym(1).layout); - } break; - --#line 1664 "./glsl.g" -+#line 1658 "./glsl.g" - - case 129: { - sym(1).layout_list = makeAstNode< List<LayoutQualifierAST *> >(sym(1).layout_list, sym(3).layout); - } break; - --#line 1671 "./glsl.g" -+#line 1665 "./glsl.g" - - case 130: { - sym(1).layout = makeAstNode<LayoutQualifierAST>(string(1), (const QString *)0); - } break; - --#line 1678 "./glsl.g" -+#line 1672 "./glsl.g" - - case 131: { - sym(1).layout = makeAstNode<LayoutQualifierAST>(string(1), string(3)); - } break; - --#line 1685 "./glsl.g" -+#line 1679 "./glsl.g" - - case 132: { - sym(1).qualifier = QualifiedTypeAST::Const; - } break; - --#line 1692 "./glsl.g" -+#line 1686 "./glsl.g" - - case 133: { - sym(1).type_qualifier.qualifier = sym(1).qualifier; - sym(1).type_qualifier.layout_list = 0; - } break; - --#line 1700 "./glsl.g" -+#line 1694 "./glsl.g" - - case 134: { - sym(1).type_qualifier.layout_list = sym(1).layout_list; - sym(1).type_qualifier.qualifier = 0; - } break; - --#line 1708 "./glsl.g" -+#line 1702 "./glsl.g" - - case 135: { - sym(1).type_qualifier.layout_list = sym(1).layout_list; - sym(1).type_qualifier.qualifier = sym(2).qualifier; - } break; - --#line 1716 "./glsl.g" -+#line 1710 "./glsl.g" - - case 136: { - sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier; - sym(1).type_qualifier.layout_list = 0; - } break; - --#line 1724 "./glsl.g" -+#line 1718 "./glsl.g" - - case 137: { - sym(1).type_qualifier.qualifier = sym(1).qualifier; - sym(1).type_qualifier.layout_list = 0; - } break; - --#line 1732 "./glsl.g" -+#line 1726 "./glsl.g" - - case 138: { - sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier; - sym(1).type_qualifier.layout_list = 0; - } break; - --#line 1740 "./glsl.g" -+#line 1734 "./glsl.g" - - case 139: { - sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier | sym(3).qualifier; - sym(1).type_qualifier.layout_list = 0; - } break; - --#line 1748 "./glsl.g" -+#line 1742 "./glsl.g" - - case 140: { - sym(1).type_qualifier.qualifier = QualifiedTypeAST::Invariant; - sym(1).type_qualifier.layout_list = 0; - } break; - --#line 1756 "./glsl.g" -+#line 1750 "./glsl.g" - - case 141: { - sym(1).qualifier = QualifiedTypeAST::Const; - } break; - --#line 1763 "./glsl.g" -+#line 1757 "./glsl.g" - - case 142: { - sym(1).qualifier = QualifiedTypeAST::Attribute; - } break; - --#line 1770 "./glsl.g" -+#line 1764 "./glsl.g" - - case 143: { - sym(1).qualifier = QualifiedTypeAST::Varying; - } break; - --#line 1777 "./glsl.g" -+#line 1771 "./glsl.g" - - case 144: { - sym(1).qualifier = QualifiedTypeAST::CentroidVarying; - } break; - --#line 1784 "./glsl.g" -+#line 1778 "./glsl.g" - - case 145: { - sym(1).qualifier = QualifiedTypeAST::In; - } break; - --#line 1791 "./glsl.g" -+#line 1785 "./glsl.g" - - case 146: { - sym(1).qualifier = QualifiedTypeAST::Out; - } break; - --#line 1798 "./glsl.g" -+#line 1792 "./glsl.g" - - case 147: { - sym(1).qualifier = QualifiedTypeAST::CentroidIn; - } break; - --#line 1805 "./glsl.g" -+#line 1799 "./glsl.g" - - case 148: { - sym(1).qualifier = QualifiedTypeAST::CentroidOut; - } break; - --#line 1812 "./glsl.g" -+#line 1806 "./glsl.g" - - case 149: { - sym(1).qualifier = QualifiedTypeAST::PatchIn; - } break; - --#line 1819 "./glsl.g" -+#line 1813 "./glsl.g" - - case 150: { - sym(1).qualifier = QualifiedTypeAST::PatchOut; - } break; - --#line 1826 "./glsl.g" -+#line 1820 "./glsl.g" - - case 151: { - sym(1).qualifier = QualifiedTypeAST::SampleIn; - } break; - --#line 1833 "./glsl.g" -+#line 1827 "./glsl.g" - - case 152: { - sym(1).qualifier = QualifiedTypeAST::SampleOut; - } break; - --#line 1840 "./glsl.g" -+#line 1834 "./glsl.g" - - case 153: { - sym(1).qualifier = QualifiedTypeAST::Uniform; - } break; - --#line 1847 "./glsl.g" -+#line 1841 "./glsl.g" - - case 154: { - // nothing to do. - } break; - --#line 1854 "./glsl.g" -+#line 1848 "./glsl.g" - - case 155: { - if (!type(2)->setPrecision(sym(1).precision)) { -@@ -1273,595 +1273,595 @@ case 155: { - ast(1) = type(2); - } break; - --#line 1864 "./glsl.g" -+#line 1858 "./glsl.g" - - case 156: { - // nothing to do. - } break; - --#line 1871 "./glsl.g" -+#line 1865 "./glsl.g" - - case 157: { - ast(1) = makeAstNode<ArrayTypeAST>(type(1)); - } break; - --#line 1878 "./glsl.g" -+#line 1872 "./glsl.g" - - case 158: { - ast(1) = makeAstNode<ArrayTypeAST>(type(1), expression(3)); - } break; - --#line 1885 "./glsl.g" -+#line 1879 "./glsl.g" - - case 159: { - ast(1) = makeBasicType(T_VOID); - } break; - --#line 1892 "./glsl.g" -+#line 1886 "./glsl.g" - - case 160: { - ast(1) = makeBasicType(T_FLOAT); - } break; - --#line 1899 "./glsl.g" -+#line 1893 "./glsl.g" - - case 161: { - ast(1) = makeBasicType(T_DOUBLE); - } break; - --#line 1906 "./glsl.g" -+#line 1900 "./glsl.g" - - case 162: { - ast(1) = makeBasicType(T_INT); - } break; - --#line 1913 "./glsl.g" -+#line 1907 "./glsl.g" - - case 163: { - ast(1) = makeBasicType(T_UINT); - } break; - --#line 1920 "./glsl.g" -+#line 1914 "./glsl.g" - - case 164: { - ast(1) = makeBasicType(T_BOOL); - } break; - --#line 1927 "./glsl.g" -+#line 1921 "./glsl.g" - - case 165: { - ast(1) = makeBasicType(T_VEC2); - } break; - --#line 1934 "./glsl.g" -+#line 1928 "./glsl.g" - - case 166: { - ast(1) = makeBasicType(T_VEC3); - } break; - --#line 1941 "./glsl.g" -+#line 1935 "./glsl.g" - - case 167: { - ast(1) = makeBasicType(T_VEC4); - } break; - --#line 1948 "./glsl.g" -+#line 1942 "./glsl.g" - - case 168: { - ast(1) = makeBasicType(T_DVEC2); - } break; - --#line 1955 "./glsl.g" -+#line 1949 "./glsl.g" - - case 169: { - ast(1) = makeBasicType(T_DVEC3); - } break; - --#line 1962 "./glsl.g" -+#line 1956 "./glsl.g" - - case 170: { - ast(1) = makeBasicType(T_DVEC4); - } break; - --#line 1969 "./glsl.g" -+#line 1963 "./glsl.g" - - case 171: { - ast(1) = makeBasicType(T_BVEC2); - } break; - --#line 1976 "./glsl.g" -+#line 1970 "./glsl.g" - - case 172: { - ast(1) = makeBasicType(T_BVEC3); - } break; - --#line 1983 "./glsl.g" -+#line 1977 "./glsl.g" - - case 173: { - ast(1) = makeBasicType(T_BVEC4); - } break; - --#line 1990 "./glsl.g" -+#line 1984 "./glsl.g" - - case 174: { - ast(1) = makeBasicType(T_IVEC2); - } break; - --#line 1997 "./glsl.g" -+#line 1991 "./glsl.g" - - case 175: { - ast(1) = makeBasicType(T_IVEC3); - } break; - --#line 2004 "./glsl.g" -+#line 1998 "./glsl.g" - - case 176: { - ast(1) = makeBasicType(T_IVEC4); - } break; - --#line 2011 "./glsl.g" -+#line 2005 "./glsl.g" - - case 177: { - ast(1) = makeBasicType(T_UVEC2); - } break; - --#line 2018 "./glsl.g" -+#line 2012 "./glsl.g" - - case 178: { - ast(1) = makeBasicType(T_UVEC3); - } break; - --#line 2025 "./glsl.g" -+#line 2019 "./glsl.g" - - case 179: { - ast(1) = makeBasicType(T_UVEC4); - } break; - --#line 2032 "./glsl.g" -+#line 2026 "./glsl.g" - - case 180: { - ast(1) = makeBasicType(T_MAT2); - } break; - --#line 2039 "./glsl.g" -+#line 2033 "./glsl.g" - - case 181: { - ast(1) = makeBasicType(T_MAT3); - } break; - --#line 2046 "./glsl.g" -+#line 2040 "./glsl.g" - - case 182: { - ast(1) = makeBasicType(T_MAT4); - } break; - --#line 2053 "./glsl.g" -+#line 2047 "./glsl.g" - - case 183: { - ast(1) = makeBasicType(T_MAT2); - } break; - --#line 2060 "./glsl.g" -+#line 2054 "./glsl.g" - - case 184: { - ast(1) = makeBasicType(T_MAT2X3); - } break; - --#line 2067 "./glsl.g" -+#line 2061 "./glsl.g" - - case 185: { - ast(1) = makeBasicType(T_MAT2X4); - } break; - --#line 2074 "./glsl.g" -+#line 2068 "./glsl.g" - - case 186: { - ast(1) = makeBasicType(T_MAT3X2); - } break; - --#line 2081 "./glsl.g" -+#line 2075 "./glsl.g" - - case 187: { - ast(1) = makeBasicType(T_MAT3); - } break; - --#line 2088 "./glsl.g" -+#line 2082 "./glsl.g" - - case 188: { - ast(1) = makeBasicType(T_MAT3X4); - } break; - --#line 2095 "./glsl.g" -+#line 2089 "./glsl.g" - - case 189: { - ast(1) = makeBasicType(T_MAT4X2); - } break; - --#line 2102 "./glsl.g" -+#line 2096 "./glsl.g" - - case 190: { - ast(1) = makeBasicType(T_MAT4X3); - } break; - --#line 2109 "./glsl.g" -+#line 2103 "./glsl.g" - - case 191: { - ast(1) = makeBasicType(T_MAT4); - } break; - --#line 2116 "./glsl.g" -+#line 2110 "./glsl.g" - - case 192: { - ast(1) = makeBasicType(T_DMAT2); - } break; - --#line 2123 "./glsl.g" -+#line 2117 "./glsl.g" - - case 193: { - ast(1) = makeBasicType(T_DMAT3); - } break; - --#line 2130 "./glsl.g" -+#line 2124 "./glsl.g" - - case 194: { - ast(1) = makeBasicType(T_DMAT4); - } break; - --#line 2137 "./glsl.g" -+#line 2131 "./glsl.g" - - case 195: { - ast(1) = makeBasicType(T_DMAT2); - } break; - --#line 2144 "./glsl.g" -+#line 2138 "./glsl.g" - - case 196: { - ast(1) = makeBasicType(T_DMAT2X3); - } break; - --#line 2151 "./glsl.g" -+#line 2145 "./glsl.g" - - case 197: { - ast(1) = makeBasicType(T_DMAT2X4); - } break; - --#line 2158 "./glsl.g" -+#line 2152 "./glsl.g" - - case 198: { - ast(1) = makeBasicType(T_DMAT3X2); - } break; - --#line 2165 "./glsl.g" -+#line 2159 "./glsl.g" - - case 199: { - ast(1) = makeBasicType(T_DMAT3); - } break; - --#line 2172 "./glsl.g" -+#line 2166 "./glsl.g" - - case 200: { - ast(1) = makeBasicType(T_DMAT3X4); - } break; - --#line 2179 "./glsl.g" -+#line 2173 "./glsl.g" - - case 201: { - ast(1) = makeBasicType(T_DMAT4X2); - } break; - --#line 2186 "./glsl.g" -+#line 2180 "./glsl.g" - - case 202: { - ast(1) = makeBasicType(T_DMAT4X3); - } break; - --#line 2193 "./glsl.g" -+#line 2187 "./glsl.g" - - case 203: { - ast(1) = makeBasicType(T_DMAT4); - } break; - --#line 2200 "./glsl.g" -+#line 2194 "./glsl.g" - - case 204: { - ast(1) = makeBasicType(T_SAMPLER1D); - } break; - --#line 2207 "./glsl.g" -+#line 2201 "./glsl.g" - - case 205: { - ast(1) = makeBasicType(T_SAMPLER2D); - } break; - --#line 2214 "./glsl.g" -+#line 2208 "./glsl.g" - - case 206: { - ast(1) = makeBasicType(T_SAMPLER3D); - } break; - --#line 2221 "./glsl.g" -+#line 2215 "./glsl.g" - - case 207: { - ast(1) = makeBasicType(T_SAMPLERCUBE); - } break; - --#line 2228 "./glsl.g" -+#line 2222 "./glsl.g" - - case 208: { - ast(1) = makeBasicType(T_SAMPLER1DSHADOW); - } break; - --#line 2235 "./glsl.g" -+#line 2229 "./glsl.g" - - case 209: { - ast(1) = makeBasicType(T_SAMPLER2DSHADOW); - } break; - --#line 2242 "./glsl.g" -+#line 2236 "./glsl.g" - - case 210: { - ast(1) = makeBasicType(T_SAMPLERCUBESHADOW); - } break; - --#line 2249 "./glsl.g" -+#line 2243 "./glsl.g" - - case 211: { - ast(1) = makeBasicType(T_SAMPLER1DARRAY); - } break; - --#line 2256 "./glsl.g" -+#line 2250 "./glsl.g" - - case 212: { - ast(1) = makeBasicType(T_SAMPLER2DARRAY); - } break; - --#line 2263 "./glsl.g" -+#line 2257 "./glsl.g" - - case 213: { - ast(1) = makeBasicType(T_SAMPLER1DARRAYSHADOW); - } break; - --#line 2270 "./glsl.g" -+#line 2264 "./glsl.g" - - case 214: { - ast(1) = makeBasicType(T_SAMPLER2DARRAYSHADOW); - } break; - --#line 2277 "./glsl.g" -+#line 2271 "./glsl.g" - - case 215: { - ast(1) = makeBasicType(T_SAMPLERCUBEARRAY); - } break; - --#line 2284 "./glsl.g" -+#line 2278 "./glsl.g" - - case 216: { - ast(1) = makeBasicType(T_SAMPLERCUBEARRAYSHADOW); - } break; - --#line 2291 "./glsl.g" -+#line 2285 "./glsl.g" - - case 217: { - ast(1) = makeBasicType(T_ISAMPLER1D); - } break; - --#line 2298 "./glsl.g" -+#line 2292 "./glsl.g" - - case 218: { - ast(1) = makeBasicType(T_ISAMPLER2D); - } break; - --#line 2305 "./glsl.g" -+#line 2299 "./glsl.g" - - case 219: { - ast(1) = makeBasicType(T_ISAMPLER3D); - } break; - --#line 2312 "./glsl.g" -+#line 2306 "./glsl.g" - - case 220: { - ast(1) = makeBasicType(T_ISAMPLERCUBE); - } break; - --#line 2319 "./glsl.g" -+#line 2313 "./glsl.g" - - case 221: { - ast(1) = makeBasicType(T_ISAMPLER1DARRAY); - } break; - --#line 2326 "./glsl.g" -+#line 2320 "./glsl.g" - - case 222: { - ast(1) = makeBasicType(T_ISAMPLER2DARRAY); - } break; - --#line 2333 "./glsl.g" -+#line 2327 "./glsl.g" - - case 223: { - ast(1) = makeBasicType(T_ISAMPLERCUBEARRAY); - } break; - --#line 2340 "./glsl.g" -+#line 2334 "./glsl.g" - - case 224: { - ast(1) = makeBasicType(T_USAMPLER1D); - } break; - --#line 2347 "./glsl.g" -+#line 2341 "./glsl.g" - - case 225: { - ast(1) = makeBasicType(T_USAMPLER2D); - } break; - --#line 2354 "./glsl.g" -+#line 2348 "./glsl.g" - - case 226: { - ast(1) = makeBasicType(T_USAMPLER3D); - } break; - --#line 2361 "./glsl.g" -+#line 2355 "./glsl.g" - - case 227: { - ast(1) = makeBasicType(T_USAMPLERCUBE); - } break; - --#line 2368 "./glsl.g" -+#line 2362 "./glsl.g" - - case 228: { - ast(1) = makeBasicType(T_USAMPLER1DARRAY); - } break; - --#line 2375 "./glsl.g" -+#line 2369 "./glsl.g" - - case 229: { - ast(1) = makeBasicType(T_USAMPLER2DARRAY); - } break; - --#line 2382 "./glsl.g" -+#line 2376 "./glsl.g" - - case 230: { - ast(1) = makeBasicType(T_USAMPLERCUBEARRAY); - } break; - --#line 2389 "./glsl.g" -+#line 2383 "./glsl.g" - - case 231: { - ast(1) = makeBasicType(T_SAMPLER2DRECT); - } break; - --#line 2396 "./glsl.g" -+#line 2390 "./glsl.g" - - case 232: { - ast(1) = makeBasicType(T_SAMPLER2DRECTSHADOW); - } break; - --#line 2403 "./glsl.g" -+#line 2397 "./glsl.g" - - case 233: { - ast(1) = makeBasicType(T_ISAMPLER2DRECT); - } break; - --#line 2410 "./glsl.g" -+#line 2404 "./glsl.g" - - case 234: { - ast(1) = makeBasicType(T_USAMPLER2DRECT); - } break; - --#line 2417 "./glsl.g" -+#line 2411 "./glsl.g" - - case 235: { - ast(1) = makeBasicType(T_SAMPLERBUFFER); - } break; - --#line 2424 "./glsl.g" -+#line 2418 "./glsl.g" - - case 236: { - ast(1) = makeBasicType(T_ISAMPLERBUFFER); - } break; - --#line 2431 "./glsl.g" -+#line 2425 "./glsl.g" - - case 237: { - ast(1) = makeBasicType(T_USAMPLERBUFFER); - } break; - --#line 2438 "./glsl.g" -+#line 2432 "./glsl.g" - - case 238: { - ast(1) = makeBasicType(T_SAMPLER2DMS); - } break; - --#line 2445 "./glsl.g" -+#line 2439 "./glsl.g" - - case 239: { - ast(1) = makeBasicType(T_ISAMPLER2DMS); - } break; - --#line 2452 "./glsl.g" -+#line 2446 "./glsl.g" - - case 240: { - ast(1) = makeBasicType(T_USAMPLER2DMS); - } break; - --#line 2459 "./glsl.g" -+#line 2453 "./glsl.g" - - case 241: { - ast(1) = makeBasicType(T_SAMPLER2DMSARRAY); - } break; - --#line 2466 "./glsl.g" -+#line 2460 "./glsl.g" - - case 242: { - ast(1) = makeBasicType(T_ISAMPLER2DMSARRAY); - } break; - --#line 2473 "./glsl.g" -+#line 2467 "./glsl.g" - - case 243: { - ast(1) = makeBasicType(T_USAMPLER2DMSARRAY); - } break; - --#line 2480 "./glsl.g" -+#line 2474 "./glsl.g" - - case 244: { - // nothing to do. - } break; - --#line 2487 "./glsl.g" -+#line 2481 "./glsl.g" - - case 245: { - ast(1) = makeAstNode<NamedTypeAST>(string(1)); - } break; - --#line 2494 "./glsl.g" -+#line 2488 "./glsl.g" - - case 246: { - sym(1).precision = TypeAST::Highp; - } break; - --#line 2501 "./glsl.g" -+#line 2495 "./glsl.g" - - case 247: { - sym(1).precision = TypeAST::Mediump; - } break; - --#line 2508 "./glsl.g" -+#line 2502 "./glsl.g" - - case 248: { - sym(1).precision = TypeAST::Lowp; - } break; - --#line 2515 "./glsl.g" -+#line 2509 "./glsl.g" - - case 249: { - ast(1) = makeAstNode<StructTypeAST>(string(2), sym(4).field_list); - } break; - --#line 2522 "./glsl.g" -+#line 2516 "./glsl.g" - - case 250: { - ast(1) = makeAstNode<StructTypeAST>(sym(3).field_list); - } break; - --#line 2529 "./glsl.g" -+#line 2523 "./glsl.g" - - case 251: { - // nothing to do. - } break; - --#line 2536 "./glsl.g" -+#line 2530 "./glsl.g" - - case 252: { - sym(1).field_list = appendLists(sym(1).field_list, sym(2).field_list); - } break; - --#line 2543 "./glsl.g" -+#line 2537 "./glsl.g" - - case 253: { - sym(1).field_list = StructTypeAST::fixInnerTypes(type(1), sym(2).field_list); - } break; - --#line 2550 "./glsl.g" -+#line 2544 "./glsl.g" - - case 254: { - sym(1).field_list = StructTypeAST::fixInnerTypes -@@ -1870,106 +1870,106 @@ case 254: { - sym(1).type_qualifier.layout_list), sym(3).field_list); - } break; - --#line 2560 "./glsl.g" -+#line 2554 "./glsl.g" - - case 255: { - // nothing to do. - sym(1).field_list = makeAstNode< List<StructTypeAST::Field *> >(sym(1).field); - } break; - --#line 2568 "./glsl.g" -+#line 2562 "./glsl.g" - - case 256: { - sym(1).field_list = makeAstNode< List<StructTypeAST::Field *> >(sym(1).field_list, sym(3).field); - } break; - --#line 2575 "./glsl.g" -+#line 2569 "./glsl.g" - - case 257: { - sym(1).field = makeAstNode<StructTypeAST::Field>(string(1)); - } break; - --#line 2582 "./glsl.g" -+#line 2576 "./glsl.g" - - case 258: { - sym(1).field = makeAstNode<StructTypeAST::Field> - (string(1), makeAstNode<ArrayTypeAST>((TypeAST *)0)); - } break; - --#line 2590 "./glsl.g" -+#line 2584 "./glsl.g" - - case 259: { - sym(1).field = makeAstNode<StructTypeAST::Field> - (string(1), makeAstNode<ArrayTypeAST>((TypeAST *)0, expression(3))); - } break; - --#line 2598 "./glsl.g" -+#line 2592 "./glsl.g" - - case 260: { - // nothing to do. - } break; - --#line 2605 "./glsl.g" -+#line 2599 "./glsl.g" - - case 261: { - ast(1) = makeAstNode<DeclarationStatementAST>(sym(1).declaration); - } break; - --#line 2612 "./glsl.g" -+#line 2606 "./glsl.g" - - case 262: { - // nothing to do. - } break; - --#line 2619 "./glsl.g" -+#line 2613 "./glsl.g" - - case 263: { - // nothing to do. - } break; - --#line 2626 "./glsl.g" -+#line 2620 "./glsl.g" - - case 264: { - // nothing to do. - } break; - --#line 2633 "./glsl.g" -+#line 2627 "./glsl.g" - - case 265: { - // nothing to do. - } break; - --#line 2640 "./glsl.g" -+#line 2634 "./glsl.g" - - case 266: { - // nothing to do. - } break; - --#line 2647 "./glsl.g" -+#line 2641 "./glsl.g" - - case 267: { - // nothing to do. - } break; - --#line 2654 "./glsl.g" -+#line 2648 "./glsl.g" - - case 268: { - // nothing to do. - } break; - --#line 2661 "./glsl.g" -+#line 2655 "./glsl.g" - - case 269: { - // nothing to do. - } break; - --#line 2668 "./glsl.g" -+#line 2662 "./glsl.g" - - case 270: { - // nothing to do. - } break; - --#line 2675 "./glsl.g" -+#line 2669 "./glsl.g" - - case 271: { - CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(); -@@ -1978,7 +1978,7 @@ case 271: { - ast(1) = stmt; - } break; - --#line 2685 "./glsl.g" -+#line 2679 "./glsl.g" - - case 272: { - CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(sym(2).statement_list); -@@ -1987,19 +1987,19 @@ case 272: { - ast(1) = stmt; - } break; - --#line 2695 "./glsl.g" -+#line 2689 "./glsl.g" - - case 273: { - // nothing to do. - } break; - --#line 2702 "./glsl.g" -+#line 2696 "./glsl.g" - - case 274: { - // nothing to do. - } break; - --#line 2709 "./glsl.g" -+#line 2703 "./glsl.g" - - case 275: { - CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(); -@@ -2008,7 +2008,7 @@ case 275: { - ast(1) = stmt; - } break; - --#line 2719 "./glsl.g" -+#line 2713 "./glsl.g" - - case 276: { - CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(sym(2).statement_list); -@@ -2017,186 +2017,186 @@ case 276: { - ast(1) = stmt; - } break; - --#line 2729 "./glsl.g" -+#line 2723 "./glsl.g" - - case 277: { - sym(1).statement_list = makeAstNode< List<StatementAST *> >(sym(1).statement); - } break; - --#line 2736 "./glsl.g" -+#line 2730 "./glsl.g" - - case 278: { - sym(1).statement_list = makeAstNode< List<StatementAST *> >(sym(1).statement_list, sym(2).statement); - } break; - --#line 2743 "./glsl.g" -+#line 2737 "./glsl.g" - - case 279: { - ast(1) = makeAstNode<CompoundStatementAST>(); // Empty statement - } break; - --#line 2750 "./glsl.g" -+#line 2744 "./glsl.g" - - case 280: { - ast(1) = makeAstNode<ExpressionStatementAST>(expression(1)); - } break; - --#line 2757 "./glsl.g" -+#line 2751 "./glsl.g" - - case 281: { - ast(1) = makeAstNode<IfStatementAST>(expression(3), sym(5).ifstmt.thenClause, sym(5).ifstmt.elseClause); - } break; - --#line 2764 "./glsl.g" -+#line 2758 "./glsl.g" - - case 282: { - sym(1).ifstmt.thenClause = statement(1); - sym(1).ifstmt.elseClause = statement(3); - } break; - --#line 2772 "./glsl.g" -+#line 2766 "./glsl.g" - - case 283: { - sym(1).ifstmt.thenClause = statement(1); - sym(1).ifstmt.elseClause = 0; - } break; - --#line 2780 "./glsl.g" -+#line 2774 "./glsl.g" - - case 284: { - // nothing to do. - } break; - --#line 2787 "./glsl.g" -+#line 2781 "./glsl.g" - - case 285: { - ast(1) = makeAstNode<DeclarationExpressionAST> - (type(1), string(2), expression(4)); - } break; - --#line 2795 "./glsl.g" -+#line 2789 "./glsl.g" - - case 286: { - ast(1) = makeAstNode<SwitchStatementAST>(expression(3), statement(6)); - } break; - --#line 2802 "./glsl.g" -+#line 2796 "./glsl.g" - - case 287: { - ast(1) = makeAstNode<CompoundStatementAST>(); - } break; - --#line 2809 "./glsl.g" -+#line 2803 "./glsl.g" - - case 288: { - ast(1) = makeAstNode<CompoundStatementAST>(sym(1).statement_list); - } break; - --#line 2816 "./glsl.g" -+#line 2810 "./glsl.g" - - case 289: { - ast(1) = makeAstNode<CaseLabelStatementAST>(expression(2)); - } break; - --#line 2823 "./glsl.g" -+#line 2817 "./glsl.g" - - case 290: { - ast(1) = makeAstNode<CaseLabelStatementAST>(); - } break; - --#line 2830 "./glsl.g" -+#line 2824 "./glsl.g" - - case 291: { - ast(1) = makeAstNode<WhileStatementAST>(expression(3), statement(5)); - } break; - --#line 2837 "./glsl.g" -+#line 2831 "./glsl.g" - - case 292: { - ast(1) = makeAstNode<DoStatementAST>(statement(2), expression(5)); - } break; - --#line 2844 "./glsl.g" -+#line 2838 "./glsl.g" - - case 293: { - ast(1) = makeAstNode<ForStatementAST>(statement(3), sym(4).forstmt.condition, sym(4).forstmt.increment, statement(6)); - } break; - --#line 2851 "./glsl.g" -+#line 2845 "./glsl.g" - - case 294: { - // nothing to do. - } break; - --#line 2858 "./glsl.g" -+#line 2852 "./glsl.g" - - case 295: { - // nothing to do. - } break; - --#line 2865 "./glsl.g" -+#line 2859 "./glsl.g" - - case 296: { - // nothing to do. - } break; - --#line 2872 "./glsl.g" -+#line 2866 "./glsl.g" - - case 297: { - // nothing to do. - } break; - --#line 2879 "./glsl.g" -+#line 2873 "./glsl.g" - - case 298: { - sym(1).forstmt.condition = expression(1); - sym(1).forstmt.increment = 0; - } break; - --#line 2887 "./glsl.g" -+#line 2881 "./glsl.g" - - case 299: { - sym(1).forstmt.condition = expression(1); - sym(1).forstmt.increment = expression(3); - } break; - --#line 2895 "./glsl.g" -+#line 2889 "./glsl.g" - - case 300: { - ast(1) = makeAstNode<JumpStatementAST>(AST::Kind_Continue); - } break; - --#line 2902 "./glsl.g" -+#line 2896 "./glsl.g" - - case 301: { - ast(1) = makeAstNode<JumpStatementAST>(AST::Kind_Break); - } break; - --#line 2909 "./glsl.g" -+#line 2903 "./glsl.g" - - case 302: { - ast(1) = makeAstNode<ReturnStatementAST>(); - } break; - --#line 2916 "./glsl.g" -+#line 2910 "./glsl.g" - - case 303: { - ast(1) = makeAstNode<ReturnStatementAST>(expression(2)); - } break; - --#line 2923 "./glsl.g" -+#line 2917 "./glsl.g" - - case 304: { - ast(1) = makeAstNode<JumpStatementAST>(AST::Kind_Discard); - } break; - --#line 2930 "./glsl.g" -+#line 2924 "./glsl.g" - - case 305: { - ast(1) = makeAstNode<TranslationUnitAST>(sym(1).declaration_list); - } break; - --#line 2937 "./glsl.g" -+#line 2931 "./glsl.g" - - case 306: { - if (sym(1).declaration) { -@@ -2207,7 +2207,7 @@ case 306: { - } - } break; - --#line 2949 "./glsl.g" -+#line 2943 "./glsl.g" - - case 307: { - if (sym(1).declaration_list && sym(2).declaration) { -@@ -2223,49 +2223,49 @@ case 307: { - } - } break; - --#line 2966 "./glsl.g" -+#line 2960 "./glsl.g" - - case 308: { - // nothing to do. - } break; - --#line 2973 "./glsl.g" -+#line 2967 "./glsl.g" - - case 309: { - // nothing to do. - } break; - --#line 2980 "./glsl.g" -+#line 2974 "./glsl.g" - - case 310: { - ast(1) = 0; - } break; - --#line 2987 "./glsl.g" -+#line 2981 "./glsl.g" - - case 311: { - function(1)->body = statement(2); - } break; - --#line 2994 "./glsl.g" -+#line 2988 "./glsl.g" - - case 312: { - ast(1) = 0; - } break; - --#line 3002 "./glsl.g" -+#line 2996 "./glsl.g" - - case 313: { - ast(1) = ast(2); - } break; - --#line 3009 "./glsl.g" -+#line 3003 "./glsl.g" - - case 314: { - ast(1) = ast(2); - } break; - --#line 3015 "./glsl.g" -+#line 3009 "./glsl.g" - - } // end switch - } // end Parser::reduce() -diff --git a/src/libs/glsl/glslparser.h b/src/libs/glsl/glslparser.h -index 7bf70e2..bab2616 100644 ---- a/src/libs/glsl/glslparser.h -+++ b/src/libs/glsl/glslparser.h -@@ -1,5 +1,5 @@ - --#line 217 "./glsl.g" -+#line 215 "./glsl.g" - - /************************************************************************** - ** --- -1.7.10 - diff --git a/community/qtemu/PKGBUILD b/community/qtemu/PKGBUILD index 44c3a0281..4c6d6e44f 100644 --- a/community/qtemu/PKGBUILD +++ b/community/qtemu/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 83889 2013-02-06 11:40:15Z spupykin $ +# $Id: PKGBUILD 85402 2013-03-01 10:39:15Z andrea $ # Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Previous Contributor: Urs Wolfer <uwolfer @ fwo.ch> pkgname=qtemu pkgver=1.0.5 -pkgrel=7 +pkgrel=8 pkgdesc="Graphical user interface for QEMU written in Qt4" url="http://qtemu.org" license=("GPL") arch=('i686' 'x86_64' 'mips64el') makedepends=('cmake') -depends=('qemu' 'qt>=4.1') +depends=('qemu' 'qt4') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 http://qtemu.svn.sourceforge.net/viewvc/qtemu/trunk/qtemu/misc/qtemu.desktop) md5sums=('3b93e209dc62e52a1d94c8eb24d0b149' diff --git a/community/qtfm/PKGBUILD b/community/qtfm/PKGBUILD index 5bb363462..009fa737d 100644 --- a/community/qtfm/PKGBUILD +++ b/community/qtfm/PKGBUILD @@ -1,30 +1,30 @@ -# $Id: PKGBUILD 72625 2012-06-17 19:58:45Z jlichtblau $ +# $Id: PKGBUILD 85404 2013-03-01 10:39:23Z andrea $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Wittfella <wittfella@wittfella.com> pkgname=qtfm pkgver=5.5 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight file manager" arch=('i686' 'x86_64' 'mips64el') url="http://www.qtfm.org/" license=('GPL') -depends=('qt') +depends=('file' 'qt4') install=$pkgname.install changelog=$pkgname.changelog source=(http://www.qtfm.org/$pkgname-$pkgver.tar.gz) sha256sums=('845fc43800d12483fa1993c56a8c965ff8dc917b97f03d9ce2e24318806fb211') build() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}/$pkgname-$pkgver" qmake make } package() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}/$pkgname-$pkgver" - make INSTALL_ROOT=${pkgdir} install + make INSTALL_ROOT="${pkgdir}" install } diff --git a/community/qtractor/PKGBUILD b/community/qtractor/PKGBUILD index 10df6d28e..7af1cd1d1 100644 --- a/community/qtractor/PKGBUILD +++ b/community/qtractor/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 83551 2013-02-02 19:12:45Z schiv $ +# $Id: PKGBUILD 85406 2013-03-01 10:39:31Z andrea $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Philipp Überbacher <hollunder at gmx dot at> pkgname=qtractor pkgver=0.5.7 -pkgrel=1 +pkgrel=2 pkgdesc="Audio/MIDI multitrack sequencer" arch=('i686' 'x86_64' 'mips64el') url="http://qtractor.sourceforge.net/" license=('GPL') -depends=('qt' 'jack' 'suil' 'lilv' 'libmad' - 'libsamplerate' 'rubberband' 'liblo') +depends=('qt4' 'jack' 'suil' 'lilv' 'libmad' + 'libsamplerate' 'rubberband' 'liblo' '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') diff --git a/community/qtractor/qtractor.install b/community/qtractor/qtractor.install new file mode 100644 index 000000000..3b3aff7d9 --- /dev/null +++ b/community/qtractor/qtractor.install @@ -0,0 +1,13 @@ +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 +} diff --git a/community/qtspim/PKGBUILD b/community/qtspim/PKGBUILD index 1769c6e41..1dc5e82a1 100644 --- a/community/qtspim/PKGBUILD +++ b/community/qtspim/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 69610 2012-04-20 10:56:45Z lfleischer $ +# $Id: PKGBUILD 85407 2013-03-01 10:39:40Z andrea $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=qtspim pkgver=9.1.7 -pkgrel=1 +pkgrel=2 pkgdesc="New user interface for spim, a MIPS simulator." arch=('i686' 'x86_64') url="http://spimsimulator.sourceforge.net/" license=('BSD') -depends=('qt') +depends=('qt4') makedepends=('subversion') __svntrunk="https://spimsimulator.svn.sourceforge.net/svnroot/spimsimulator" diff --git a/community/rbutil/PKGBUILD b/community/rbutil/PKGBUILD new file mode 100755 index 000000000..8bccc4a23 --- /dev/null +++ b/community/rbutil/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 85455 2013-03-01 19:10:50Z andrea $ +# Maintainer: Maxime Gauduin <alucryd@gmail.com> +# Contributor: said <atvordhosbn@gmail.com> +# Contributor: clinx <clinx.hacker@googlemail.com> + +pkgname=rbutil +pkgver=1.3.1 +pkgrel=3 +pkgdesc="Rockbox Utility" +arch=('i686' 'x86_64') +url="http://www.rockbox.org/twiki/bin/view/Main/RockboxUtility" +license=("GPL") +depends=('qt4' 'libusb') +optdepends=('speex: voice files support') +source=("http://download.rockbox.org/${pkgname}/source/RockboxUtility-v${pkgver}-src.tar.bz2" "${pkgname}.desktop") +sha256sums=('6c04b5c7eaad1762577908dedb9e40f5b0cee675150ae5ba844ea2c9bea294ca' + '539285237af16fbc60a7501963e8c2f584e58a31f2613481e6b42d21337b7a25') + +build() { + cd "${srcdir}"/RockboxUtility-v${pkgver}/${pkgname}/rbutilqt + +# Build + lrelease-qt4 rbutilqt.pro + qmake-qt4 + make +} + +package(){ + cd "${srcdir}"/RockboxUtility-v${pkgver}/${pkgname}/rbutilqt + +# Install + install -dm 755 "${pkgdir}"/usr/{bin,share/pixmaps} + install -m 644 icons/rockbox-64.png "${pkgdir}"/usr/share/pixmaps/rbutil.png + install -m 755 RockboxUtility "${pkgdir}"/usr/bin/rbutil + +# Desktop file + install -dm 755 "${pkgdir}"/usr/share/applications + install -m 644 "${srcdir}"/rbutil.desktop "${pkgdir}"/usr/share/applications/rbutil.desktop +} + +#vim: ts=2 sw=2 et: diff --git a/community/rbutil/rbutil.desktop b/community/rbutil/rbutil.desktop new file mode 100755 index 000000000..920b6a452 --- /dev/null +++ b/community/rbutil/rbutil.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Rockbox Utility +GenericName=Rockbox Utility +Comment=Configure Rockbox +Encoding=UTF-8 +Exec=rbutil +Icon=rbutil.png +Categories=Application;Qt;AudioVideo;Audio; +StartupNotify=false +Terminal=false +Type=Application diff --git a/community/recoll/PKGBUILD b/community/recoll/PKGBUILD index 36053c16b..ae9ddc776 100644 --- a/community/recoll/PKGBUILD +++ b/community/recoll/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79504 2012-11-06 11:20:41Z spupykin $ +# $Id: PKGBUILD 85408 2013-03-01 10:39:48Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,12 +7,12 @@ pkgname=recoll pkgver=1.18.1 -pkgrel=1 +pkgrel=3 pkgdesc="Full text search tool based on Xapian backend" arch=('i686' 'x86_64' 'mips64el') url="http://www.lesbonscomptes.com/recoll/" license=('GPL') -depends=('xapian-core>=1.0.15-1' 'qt' 'openssl' 'hicolor-icon-theme' 'qtwebkit') +depends=('xapian-core>=1.0.15-1' 'qt4' 'openssl' 'hicolor-icon-theme' 'qtwebkit') makedepends=('python2') optdepends=('libxslt: for XML based formats (fb2,etc)' 'unzip: for the OpenOffice.org documents' diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD index 222f4d4da..5b5e4069b 100644 --- a/community/rekonq/PKGBUILD +++ b/community/rekonq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83068 2013-01-27 10:02:41Z andrea $ +# $Id: PKGBUILD 85307 2013-02-28 20:20:52Z andrea $ # Maintainer: Peter Lewis <plewis@aur.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Panagiotis Papadopoulos <pano_90 AT gmx DOT net> pkgname=rekonq -pkgver=2.1 +pkgver=2.2 pkgrel=1 pkgdesc='A WebKit based web browser for KDE' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4') optdepends=('qca-ossl: to use the sync handler') install=${pkgname}.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -sha256sums=('92640c80b19e88934d5ed618b4a61c767ee7a27e4792e43bd3ccf51a7b5ce664') +sha256sums=('f5050bc7386807f1b91f0f90209397be08f67a95824e77ce78d1c1779015aeda') build(){ mkdir build diff --git a/community/rusxmms/PKGBUILD b/community/rusxmms/PKGBUILD index 96b89ac1c..d1926630c 100644 --- a/community/rusxmms/PKGBUILD +++ b/community/rusxmms/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54066 2011-08-13 05:45:42Z ebelanger $ +# $Id: PKGBUILD 85265 2013-02-28 10:39:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -23,36 +23,29 @@ md5sums=('f3e6dbaf0b3f571a532ab575656be506' build() { cd "${srcdir}"/xmms-${_xmmsver} + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/g' configure.in libxmms/configure.in -if true; then ln -s "$srcdir"/RusXMMS2 "$srcdir"/xmms-${_xmmsver}/RusXMMS2 (cd "$srcdir"/xmms-${_xmmsver}/RusXMMS2 && ./apply.sh) mv "$srcdir"/RusXMMS2/source/* "$srcdir"/xmms-${_xmmsver}/libxmms/ -# sed -i 's#charset.c charset.h#charset.c charset.h rcc.h rcc.c rcc_lang.h#g' "$srcdir"/xmms-${_xmmsver}/libxmms/Makefile.am && \ - -# I already remove esound from repo and it has some autotools errors that I can't seem to figure out. So let's use a hack to get the esound removal rebuild done. -# aclocal -# automake -autoconf + autoconf sed -i 's/unicode.c//g' Input/mpg123/Makefile.in sed -i 's/unicode.lo//g' Input/mpg123/Makefile.in - (cd libxmms && aclocal && automake && autoconf) case $CARCH in x86_64) - ./configure --prefix=/usr --disable-mikmod --disable-simd + ./configure --prefix=/usr --disable-mikmod --disable-simd ;; i686) - ./configure --prefix=/usr --disable-mikmod --enable-simd --disable-vorbis --disable-vorbistest + ./configure --prefix=/usr --disable-mikmod --enable-simd --disable-vorbis --disable-vorbistest ;; *) return 1 ;; esac -fi make } diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD index cdcd4c69c..9a6a8a2c1 100644 --- a/community/rxvt-unicode/PKGBUILD +++ b/community/rxvt-unicode/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81737 2012-12-28 00:16:43Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# $Id: PKGBUILD 85462 2013-03-01 21:26:53Z 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.16 +pkgver=9.17 pkgrel=1 pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)' arch=('i686' 'x86_64' 'mips64el') @@ -19,10 +19,10 @@ source=( 'urxvtc.desktop' 'urxvt-tabbed.desktop' ) -md5sums=('2e2942e8367624affebc0568e3671b66' - '88d8786d74b819450adf722180db09fd' - 'bebf5b6b399b74b557fcedbdb47cc387' - '2604896bb107fbb5511bfd6f46d65894') +md5sums=('1270432bdc7ce17dbb07d41a607081e0' + 'c2b828d37d06cbf4c32937a2959f2fc2' + '10e80aebaef042fb63d2585440dc3637' + '830abe6f31fb926a1bcd2650731be15e') build() { cd $pkgname-$pkgver @@ -73,4 +73,4 @@ package() { done } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/community/rxvt-unicode/urxvt-tabbed.desktop b/community/rxvt-unicode/urxvt-tabbed.desktop index f3efdc9b9..bd48c0a72 100644 --- a/community/rxvt-unicode/urxvt-tabbed.desktop +++ b/community/rxvt-unicode/urxvt-tabbed.desktop @@ -1,10 +1,9 @@ [Desktop Entry] Version=1.0 -Encoding=UTF-8 Name=urxvt (tabbed) Comment=An unicode capable and tabbed rxvt clone Exec=urxvt-tabbed Icon=terminal Terminal=false Type=Application -Categories=Application;System;TerminalEmulator; +Categories=System;TerminalEmulator; diff --git a/community/rxvt-unicode/urxvt.desktop b/community/rxvt-unicode/urxvt.desktop index 0a9baf7df..d90c182e2 100644 --- a/community/rxvt-unicode/urxvt.desktop +++ b/community/rxvt-unicode/urxvt.desktop @@ -1,10 +1,9 @@ [Desktop Entry] Version=1.0 -Encoding=UTF-8 Name=urxvt Comment=An unicode capable rxvt clone Exec=urxvt Icon=terminal Terminal=false Type=Application -Categories=Application;System;TerminalEmulator; +Categories=System;TerminalEmulator; diff --git a/community/rxvt-unicode/urxvtc.desktop b/community/rxvt-unicode/urxvtc.desktop index e39a418f6..67751095b 100644 --- a/community/rxvt-unicode/urxvtc.desktop +++ b/community/rxvt-unicode/urxvtc.desktop @@ -1,10 +1,9 @@ [Desktop Entry] Version=1.0 -Encoding=UTF-8 Name=urxvt (client) Comment=An unicode capable rxvt clone client for urxvtd Exec=urxvtc Icon=terminal Terminal=false Type=Application -Categories=Application;System;TerminalEmulator; +Categories=System;TerminalEmulator; diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD index f48ccb516..6f3e05b99 100644 --- a/community/sage-mathematics/PKGBUILD +++ b/community/sage-mathematics/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83604 2013-02-03 20:48:03Z dwallace $ +# $Id: PKGBUILD 84793 2013-02-24 16:59:02Z 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.6 +pkgver=5.7 pkgrel=1 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.' url='http://www.sagemath.org' @@ -24,7 +24,7 @@ options=('!makeflags') install="${pkgname}.install" source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar" 'SAGE-notebook.desktop') -md5sums=('ce50c9e0c0ed1dca3038891c5c929509' +md5sums=('fc5b401174ee1efa7aea163e804c2b42' 'b82f94383829eee26648feb977e2d89b') build() { diff --git a/community/scantailor/PKGBUILD b/community/scantailor/PKGBUILD index 5c09b8711..dcd7b0bee 100644 --- a/community/scantailor/PKGBUILD +++ b/community/scantailor/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 66775 2012-02-28 14:29:17Z spupykin $ +# $Id: PKGBUILD 85409 2013-03-01 10:39:57Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Denis Terskov aka neurosurgeon <terskov.den@gmail.com> pkgname=scantailor pkgver=0.9.11.1 -pkgrel=1 +pkgrel=2 pkgdesc="Interactive post-processing tool for scanned pages" arch=(i686 x86_64 'mips64el') url="http://scantailor.sourceforge.net" license="GPL" -depends=('qt') +depends=('qt4') makedepends=('cmake' 'boost') options=('!makeflags') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) @@ -17,7 +17,6 @@ md5sums=('6cdca1b6d1dafd022ea94b4800dad340') build() { cd $srcdir/$pkgname-$pkgver - cmake . cmake \ -DCMAKE_CXX_FLAGS="-DBOOST_NO_MEMBER_TEMPLATE_FRIENDS" \ -DCMAKE_CXX_FLAGS_DEBUG="-DBOOST_NO_MEMBER_TEMPLATE_FRIENDS" \ @@ -25,5 +24,9 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release . make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD index 510e514dd..2842ab3c5 100644 --- a/community/sigil/PKGBUILD +++ b/community/sigil/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 83275 2013-01-28 16:50:10Z stephane $ +# $Id: PKGBUILD 85410 2013-03-01 10:40:05Z andrea $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=sigil -pkgver=0.6.2 +pkgver=0.7.0 pkgrel=2 pkgdesc="WYSIWYG ebook editor" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/sigil/" license=('GPL3') -depends=('qtwebkit' 'boost-libs') -makedepends=('cmake' 'gendesk' 'boost') +depends=('qt5-webkit' 'boost-libs') +makedepends=('qt5-addons' 'qt5-declarative' 'qt5-tools' 'cmake' 'gendesk' 'boost') install=sigil.install source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip") -md5sums=('78615dc007c12cc34271243d82783a36') +md5sums=('06ba5ace506e01adf4a37534fa276cec') build() { cd "${srcdir}" @@ -21,6 +21,7 @@ build() { mkdir build cd build + cmake -G "Unix Makefiles" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \ diff --git a/community/signon/PKGBUILD b/community/signon/PKGBUILD index 8c19d96e1..b325cc15a 100644 --- a/community/signon/PKGBUILD +++ b/community/signon/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 83013 2013-01-26 15:03:10Z bgyorgy $ +# $Id: PKGBUILD 85411 2013-03-01 10:40:16Z andrea $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgbase=signon pkgname=('signon' 'signon-doc') pkgver=8.46 -pkgrel=1 +pkgrel=2 pkgdesc="Framework to provide credential storage and authentication service" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/accounts-sso/" license=('LGPL') -depends=('qt' 'libproxy') +depends=('qt4' 'libproxy') makedepends=('doxygen' 'graphviz' 'ttf-dejavu') backup=(etc/signond.conf) install=$pkgname.install diff --git a/community/signon/cryptsetup-optional.patch b/community/signon/cryptsetup-optional.patch deleted file mode 100644 index d6293e598..000000000 --- a/community/signon/cryptsetup-optional.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur signon-8.43.orig/src/extensions/extensions.pro signon-8.43/src/extensions/extensions.pro ---- signon-8.43.orig/src/extensions/extensions.pro 2012-09-18 14:59:58.000000000 +0200 -+++ signon-8.43/src/extensions/extensions.pro 2012-10-17 20:02:52.846790974 +0200 -@@ -1,7 +1,7 @@ - TEMPLATE = subdirs - SUBDIRS = - --system(pkg-config --exists libcryptsetup) { -+CONFIG(cryptsetup) { - SUBDIRS += cryptsetup - } - diff --git a/community/sqlitebrowser/PKGBUILD b/community/sqlitebrowser/PKGBUILD index 8ebbadf1d..aaaa0ba11 100644 --- a/community/sqlitebrowser/PKGBUILD +++ b/community/sqlitebrowser/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 65487 2012-02-21 06:06:09Z spupykin $ +# $Id: PKGBUILD 85413 2013-03-01 10:40:34Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com> # Contributor: Michael Fellinger <m.fellinger@gmail.com> @@ -6,12 +6,12 @@ pkgname=sqlitebrowser pkgver=2.0b1 _pkgrealver=200_b1 -pkgrel=2 +pkgrel=3 pkgdesc="SQLite Database browser is a light GUI editor for SQLite databases, built on top of QT" arch=('i686' 'x86_64' 'mips64el') url="http://sqlitebrowser.sf.net" license=('GPL') -depends=('qt') +depends=('qt4') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/${pkgname}_${_pkgrealver}_src.tar.gz) md5sums=('5ca3d41cca454235b93ce72cd585dfe3') diff --git a/community/stuntrally/PKGBUILD b/community/stuntrally/PKGBUILD new file mode 100644 index 000000000..1cc321145 --- /dev/null +++ b/community/stuntrally/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com> +# Contributor: Jason Melton <jason.melton@gmail.com> + +pkgname=stuntrally +pkgver=1.9 +pkgrel=2 +pkgdesc="Stunt Rally game with track editor, based on VDrift" +arch=('i686' 'x86_64') +license=('GPL3') +url="http://code.google.com/p/vdrift-ogre" +depends=('libvorbis' 'mygui' 'sdl' 'enet' 'hicolor-icon-theme' 'libxcursor' 'stuntrally-data') +makedepends=('cmake' 'boost') +install=stuntrally.install +source=(src_${pkgver}.tar.gz::https://nodeload.github.com/${pkgname}/stuntrally/tar.gz/${pkgver}) +md5sums=('3253c5a64a6d3f4fc4b756ea431286de') + +build() { + cd "${srcdir}/stuntrally-${pkgver}/" + + rm -rf build + mkdir build && cd build + + cmake -DCMAKE_INSTALL_PREFIX="/usr" -DSHARE_INSTALL="share/stuntrally" .. + make +} + +package() { + cd "${srcdir}/stuntrally-${pkgver}/build/" + + make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}/usr/share/stuntrally/" +} diff --git a/community/stuntrally/stuntrally.install b/community/stuntrally/stuntrally.install new file mode 100644 index 000000000..547348418 --- /dev/null +++ b/community/stuntrally/stuntrally.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/synergy/PKGBUILD b/community/synergy/PKGBUILD index 379268477..1c1817a07 100644 --- a/community/synergy/PKGBUILD +++ b/community/synergy/PKGBUILD @@ -1,48 +1,57 @@ -# Maintainer: Jelle van der Waa <jelle vdwaa nl> +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Jelle van der Waa <jelle vdwaa nl> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Dale Blount <dale@archlinux.org> pkgname=synergy pkgver=1.4.10 -pkgrel=1 +pkgrel=2 pkgdesc="Share a single mouse and keyboard between multiple computers" url="http://synergy-foss.org" arch=('i686' 'x86_64' 'mips64el') -depends=('gcc-libs' 'libxtst' 'libxinerama' ) +depends=('gcc-libs' 'libxtst' 'libxinerama') +makedepends=('libxt' 'cmake' 'qt4') +optdepends=('qt4: gui support') license=('GPL2') -makedepends=('libxt' 'cmake') # used by configure to test for libx11... -backup=('etc/synergy.conf') -source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz" "${pkgname}s.rc" "synergys.socket" "synergys.service") - +source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz" + "synergys.socket" + "synergys.service" + "synergy.png" + "synergy.desktop") +md5sums=('18aee04a7e232e4d821f46ff24da3364' + '58f48336836d6faf3d5eecbe4155b77e' + 'b95e4b83d8a19c0bd81a15280078fcd5' + '11fdb13390908e02c6e2f19c4c09eded' + '1e8d574c19994d13e6f342ed08e531bb') build() { cd "${srcdir}/${pkgname}-${pkgver}-Source" - cmake -D CMAKE_INSTALL_PREFIX=/usr . + cmake -D CMAKE_INSTALL_PREFIX=/usr . + make + + cd src/gui + qmake-qt4 make } package() { cd "${srcdir}/${pkgname}-${pkgver}-Source/bin" - #make DESTDIR="$pkgdir" install # doesn't work atm - # install binary - install -d "$pkgdir/usr/bin/" - install -Dm755 synergyc $pkgdir/usr/bin/ - install -Dm755 synergys $pkgdir/usr/bin/ + install -Dm755 synergy "$pkgdir/usr/bin/synergy" + install -Dm755 synergyc "$pkgdir/usr/bin/synergyc" + install -Dm755 synergys "$pkgdir/usr/bin/synergys" - # install rc.d script and config - install -d "${pkgdir}/etc/rc.d" - install -Dm644 $srcdir/$pkgname-$pkgver-Source/doc/${pkgname}.conf.example "${pkgdir}/etc" - install -Dm755 $srcdir/${pkgname}s.rc "${pkgdir}/etc/rc.d/${pkgname}s" + # install config + install -Dm644 "$srcdir/$pkgname-$pkgver-Source/doc/${pkgname}.conf.example" "${pkgdir}/etc/${pkgname}.conf.example" - # Install systemd service and socket + # install systemd service and socket install -d "$pkgdir/usr/lib/systemd/system" install -Dm644 "$srcdir/synergys.service" "$pkgdir/usr/lib/systemd/system/" install -Dm644 "$srcdir/synergys.socket" "$pkgdir/usr/lib/systemd/system/" + + # install desktop/icon stuff + install -Dm644 "$srcdir/synergy.png" "$pkgdir/usr/share/pixmaps/synergy.png" + install -Dm644 "$srcdir/synergy.desktop" "$pkgdir/usr/share/applications/synergy.desktop" } -md5sums=('18aee04a7e232e4d821f46ff24da3364' - '8f8c01add9bf6e3ae9f37a36ca6345b6' - '58f48336836d6faf3d5eecbe4155b77e' - 'b95e4b83d8a19c0bd81a15280078fcd5') diff --git a/community/synergy/synergy.desktop b/community/synergy/synergy.desktop new file mode 100644 index 000000000..e7bf87b9e --- /dev/null +++ b/community/synergy/synergy.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Synergy +Comment=The Synergy GUI is based on QSynergy by Volker Lanz. +Exec=synergy +Icon=synergy +Terminal=false +Type=Application +Categories=Utility;DesktopUtility;Qt diff --git a/community/synergy/synergy.png b/community/synergy/synergy.png Binary files differnew file mode 100644 index 000000000..5534f0fdf --- /dev/null +++ b/community/synergy/synergy.png diff --git a/community/synergy/synergys.rc b/community/synergy/synergys.rc deleted file mode 100644 index 8f19dc5f7..000000000 --- a/community/synergy/synergys.rc +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -daemon_name=synergys - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/synergys` -case "$1" in - start) - stat_busy "Starting Synergy Server" - [ -z "$PID" ] && /usr/bin/synergys --config /etc/synergy.conf &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon $daemon_name - stat_done - fi - ;; - stop) - stat_busy "Stopping Synergy Server" - [ ! -z "$PID" ] && kill -9 $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon $daemon_name - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD index 0dae4570c..5b16794e5 100644 --- a/community/tea/PKGBUILD +++ b/community/tea/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83883 2013-02-06 10:40:30Z spupykin $ +# $Id: PKGBUILD 85415 2013-03-01 10:40:52Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -7,12 +7,12 @@ pkgname=tea pkgver=34.0.1 -pkgrel=1 +pkgrel=2 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/" license=('GPL') -depends=('qt' 'aspell' 'hunspell') +depends=('qt4' 'aspell' 'hunspell') install=tea.install source=(http://downloads.sourceforge.net/project/tea-editor/tea-editor/$pkgver/tea-$pkgver.tar.bz2 tea.desktop) diff --git a/community/teamspeak3/PKGBUILD b/community/teamspeak3/PKGBUILD new file mode 100644 index 000000000..7b3038d0e --- /dev/null +++ b/community/teamspeak3/PKGBUILD @@ -0,0 +1,60 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Slash <demodevil5[at]yahoo[dot]com> +# Contributor: J.W. Birdsong <jwbirdsongATmailDOTcom> + +pkgname=teamspeak3 +pkgver=3.0.9.2 +pkgrel=3 +pkgdesc="TeamSpeak is software for quality voice communication via the Internet" +url="http://www.teamspeak.com/" +license=('custom') +depends=('qt4' 'libpulse') +arch=('i686' 'x86_64') +source=("http://teamspeak.gameserver.gamed.de/ts3/releases/${pkgver}/TeamSpeak3-Client-linux_x86-${pkgver}.run" + 'teamspeak3.desktop' 'icon.xpm' 'teamspeak3.launcher') +md5sums=('b9ca1362f6f79644357c5558ee5ddfd2' + 'be58a8798c5d1b7e95a89f6a6482db3e' + '19f103384e4c1a0aafc8fed44de0c87b' + '170fcbb1b468ce4f3dba7ee3fb2a1c6d') +_TSARCH='x86' + +if [ "$CARCH" == "x86_64" ]; then + source[0]="http://teamspeak.gameserver.gamed.de/ts3/releases/${pkgver}/TeamSpeak3-Client-linux_amd64-${pkgver}.run" + md5sums[0]='a15002b92e3cd4585dc9ce07818bf446' + _TSARCH='amd64' +fi + +build() { + cd ${srcdir} + + # Create Destination Directories + install -d ${pkgdir}/{usr/bin/,opt/} + + # Make Installer Executable + chmod +x TeamSpeak3-Client-linux_${_TSARCH}-${pkgver}.run + + # Run Installer + ./TeamSpeak3-Client-linux_${_TSARCH}-${pkgver}.run --noexec --target teamspeak3 + + # Move Program Data to Package Directory + mv ${srcdir}/teamspeak3/ ${pkgdir}/opt/ + + # Remove Bundled Qt Libraries and Symlink system libraries to TS3 Directory + rm ${pkgdir}/opt/teamspeak3/libQt* + ln -s /usr/lib/libQtCore.so.4 ${pkgdir}/opt/teamspeak3/libQtCore.so.4 + ln -s /usr/lib/libQtGui.so.4 ${pkgdir}/opt/teamspeak3/libQtGui.so.4 + ln -s /usr/lib/libQtNetwork.so.4 ${pkgdir}/opt/teamspeak3/libQtNetwork.so.4 + + # Install Desktop File + install -D -m644 $srcdir/teamspeak3.desktop ${pkgdir}/usr/share/applications/teamspeak3.desktop + + # Install Icon File + install -D -m644 $srcdir/icon.xpm ${pkgdir}/usr/share/pixmaps/teamspeak3.xpm + + # Install Custom License + install -D -m644 ${pkgdir}/opt/teamspeak3/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + + # Install Client Launcher + install -D -m755 $srcdir/teamspeak3.launcher ${pkgdir}/usr/bin/teamspeak3 +} +# vim:set ts=2 sw=2 et: diff --git a/community/teamspeak3/icon.xpm b/community/teamspeak3/icon.xpm new file mode 100644 index 000000000..fe47b3bb9 --- /dev/null +++ b/community/teamspeak3/icon.xpm @@ -0,0 +1,305 @@ +/* XPM */ +static char *dummy[]={ +"48 48 254 2", +"Qt c None", +"ar c #026d04", +"aq c #069309", +"aF c #0c9928", +"ae c #0f6f16", +"ad c #107a03", +"aW c #138d08", +"a7 c #148d1e", +"bg c #165f30", +"bh c #17602f", +"a6 c #1b633e", +"a3 c #1b6a32", +"#0 c #1b8418", +"bi c #1e4c3b", +"aK c #1fb404", +"aE c #1fd04d", +"aJ c #228739", +"aD c #25d939", +"aG c #276253", +"ax c #27a737", +"aO c #27f965", +"bf c #28534e", +"ay c #28da23", +"as c #296255", +"aN c #29fa5d", +"ap c #2bb41e", +"bW c #2c3546", +"aR c #2d9d45", +"br c #303b50", +"aS c #305a5c", +"bk c #323e54", +"aX c #32d03c", +"b5 c #333d50", +"aj c #33bb49", +"aC c #33e131", +"bR c #343d50", +"bb c #344056", +"#1 c #35845e", +"#4 c #36435b", +"ba c #365360", +"aB c #36ee37", +"aM c #36f958", +"aT c #38455d", +"aA c #39f83c", +"bL c #3a4355", +"be c #3a4760", +"af c #3a5e69", +"aL c #3ae333", +"bn c #3b4250", +".R c #3b485e", +".z c #3b4862", +"#n c #3b4b64", +"bj c #3b5166", +"bs c #3c4452", +"#a c #3c4a64", +"ac c #3ca72c", +".E c #3d4962", +"aH c #3d4c66", +"#t c #3e4d68", +"#C c #404e6a", +".t c #414e65", +"b4 c #434e62", +".1 c #43516c", +"#Z c #43a735", +"bC c #444d5e", +".v c #455166", +".y c #455573", +"#i c #475a75", +"#P c #47ae4e", +"am c #47fc4a", +"bt c #485162", +"#z c #485772", +"#Q c #489571", +"az c #49f243", +"aP c #49fa88", +"#b c #4a5975", +".0 c #4c5669", +".2 c #4d5c79", +"bm c #4e5868", +"#8 c #4eae72", +"ao c #4ed03d", +"bS c #505762", +".x c #505e79", +".o c #515b6e", +"#2 c #515d74", +".V c #53627b", +"#I c #537680", +"an c #53ec4b", +".n c #565e6e", +".F c #566580", +"bK c #576276", +"#T c #577983", +".S c #586681", +"ak c #58ee66", +".u c #596171", +".U c #5a6882", +"bX c #5b616b", +"#E c #5b657a", +"aw c #5d687c", +"by c #5d6b85", +"a8 c #5dcf79", +"bV c #5e6a80", +"#K c #5e8b89", +"#o c #5f6d86", +"bT c #60697c", +"#H c #609c89", +"bD c #616e88", +"b# c #61c07a", +".f c #636b7b", +"bY c #636d7f", +".e c #646d7c", +"#G c #64ac8e", +".w c #657187", +".s c #65728b", +"#U c #66e377", +"aZ c #66feaa", +"b6 c #696e77", +".H c #69758e", +"a0 c #69feac", +"bJ c #6a717c", +".d c #6a7282", +"b3 c #6a7488", +"#F c #6a9992", +"#O c #6ad465", +"aY c #6cfda3", +".p c #6d778b", +".I c #6d7a91", +"bZ c #6f788b", +"aQ c #6fed9c", +"aa c #6ffa7a", +".D c #707783", +"aU c #727b8c", +"ab c #72db67", +"#7 c #737d92", +"al c #73fd80", +"b7 c #747a84", +"ag c #767c85", +"#L c #76ea8d", +".g c #77808f", +"b2 c #778194", +".3 c #778298", +"bH c #787d85", +".m c #7a808b", +".c c #7a828f", +"bQ c #7b7f88", +"#3 c #7b8392", +"b0 c #7b8396", +"aV c #7b8494", +"#A c #7b869a", +"bF c #7c7e86", +"bp c #7c818a", +"#9 c #7cec81", +"## c #7d8390", +".4 c #7d889c", +"#d c #7d8aa4", +"bz c #7e8491", +"a# c #7efe93", +"#c c #7f899b", +"bP c #80858e", +"bO c #808b9f", +"a2 c #80d598", +"#S c #818895", +"b1 c #828c9e", +"#p c #828da1", +"ai c #838b9a", +"b. c #83e6a5", +"bB c #848991", +"at c #858e9e", +"#r c #858ea1", +"#w c #8592ac", +"bN c #86898d", +".G c #8690a3", +"#Y c #86e982", +"a9 c #86eaa9", +"#k c #8795b0", +"bq c #888c93", +"a1 c #88fdbb", +"bE c #898b90", +".b c #898f9a", +".h c #8991a0", +"#x c #8a99b5", +"#N c #8af397", +"#M c #8af99b", +"bG c #8b8f96", +"#h c #8c96a8", +"#e c #8e9dba", +"bU c #8f96a6", +".T c #8f98a9", +"bo c #90949d", +".5 c #909fbc", +"#s c #9197a2", +"#u c #939bac", +".q c #939db1", +"#f c #93a2bd", +"#J c #959aa4", +"bd c #97a5c0", +"bw c #99a6c1", +".l c #9a9fa8", +".6 c #9ba9c3", +"bx c #9ca2ac", +".i c #9ca4b3", +".W c #a0a6b3", +"#l c #a0adc5", +"#R c #a3abb8", +".a c #a4a9b3", +"#X c #a4feb9", +"#g c #a5b1c8", +"#j c #a8aeba", +".k c #a8afbd", +"bI c #aaacaf", +"bM c #aaaeb7", +".7 c #aab5cb", +".K c #abb1bc", +"av c #aeb4c0", +"#q c #aeb9cb", +"bv c #afb1b5", +"bc c #b0b5bd", +"aI c #b0b6c2", +"bA c #b1b3b6", +".J c #b1b8c4", +"a. c #b2fec6", +".j c #b3b8c3", +"bl c #b3bdd0", +"bu c #b4bac6", +"#v c #b5bcc7", +"ah c #b6bac3", +"#y c #b7c1d3", +"a5 c #b9bfcb", +"#V c #b9fcc4", +".8 c #bbc4d5", +"#B c #bcc1cc", +".r c #c2c7d1", +".X c #c3c9d5", +".L c #c3cbd9", +".# c #c4c7cd", +"#W c #c4ffd7", +"a4 c #c6c8cd", +"au c #c8cdd5", +".9 c #c8cfdd", +"#6 c #cacdd3", +".Y c #cad1de", +".Z c #ccd3e0", +".A c #d0d3d9", +".M c #d0d6e2", +".N c #d3d9e4", +"#D c #d6d8de", +".O c #d9dde5", +"#. c #dadfe8", +".P c #dde1ea", +"#5 c #dfe2e7", +".B c #e2e6ec", +"#m c #e5e8ef", +".Q c #e6eaf0", +".C c #ebeef2", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQt.#.a.b.c.d.e.f.d.g.h.i.jQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQt.k.lQtQtQtQtQtQtQtQtQtQtQtQt.m.n.o.p.q.rQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQt.q.s.tQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.u.v.w.qQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQt.q.x.y.zQtQtQtQtQt.A.B.C.CQtQtQtQtQtQtQtQtQtQt.D.E.F.GQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQt.H.y.y.zQtQt.I.JQtQt.K.L.M.M.N.O.P.QQtQtQtQtQtQtQt.D.R.S.TQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQt.U.y.y.zQtQt.x.V.GQtQt.W.X.Y.Z.Z.Z.Z.M.O.BQtQtQtQtQtQt.0.1.sQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQt.V.y.y.zQtQt.x.y.2.3QtQt.4.5.6.7.8.9.Y.Z.Z.M#.QtQtQtQtQt###a.F.WQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQt.W.2.y.y.zQtQt.V.y.y#b#cQtQt#d#e.5#e#f#g.8.Y.Y.Z.M#.QtQtQtQtQt.E.x#hQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQt.4#i.y.y.zQtQt.V.y.y.y#b#jQt.a#k#e#e#e#e#e#l.L.Y.Y.Z.N#mQtQtQtQt#n.2.4QtQtQtQtQtQtQt", +"QtQtQtQtQtQt#o.y.y.y.zQtQt.V.y.y.y.y.xQtQt#p#e#e#e#e#e#e.5#q.Y.Y.Z.M.PQtQtQtQt#a.2#rQtQtQtQtQtQt", +"QtQtQtQtQtQt.F.y.y.y.zQtQt.V.y.y.y.y.y#rQtQt#k#e#e#e#e#e#e.5#g.Y.Y.Z.Z.OQtQtQt#s#t.2#uQtQtQtQtQt", +"QtQtQtQtQt#v.x.y.y.y.zQtQt.V.y.y.y.y.y.yQtQt#w#e#e#e#e#e#e#e#e.7.Y.Y.Y.Z.OQtQtQt.d.1.2QtQtQtQtQt", +"QtQtQtQtQt.q#b.y.y.y.zQtQt.V.y.y.y.y.y.y.TQt.J#x#e#e#e#e#e#e#e.5#y.Y.Y.Y.9QtQtQtQt.v.y.VQtQtQtQt", +"QtQtQtQtQt.4#z.y.y.y#aQtQt#z.y.y.y.y.y.y#bQtQt#w#e#e#e#e#e#e#e#e#f.9.Y.Y.Y.XQtQtQtQt#t.y#AQtQtQt", +"QtQtQt#B#A.x.y.y.y.y.y.TQtQt.v.1.y.y.y.y#CQtQt.q#e#e#e#e#e#e#e#e#e.7.Y.Y.Y.L#DQtQtQt#E.y.yQtQtQt", +"QtQt.J#o.F#F#G#H#I.y.y.x#pQtQt.t.y.y.y.y.1#JQt#q#e#e#e#e#e#e#e#e#e#f.Y.Y.Y.Y#BQtQtQtQt.1.y#AQtQt", +"QtQt.s#K#L#M#N#O#P#Q#i.y#b#RQtQt#a.y.y.y.1#SQt.O.7.5#e#e#e#e#e#e#e#e#y.Y.Y.Y.rQtQtQtQt.y.y.1QtQt", +"Qt#h#T#U#V#W#X#Y#Z#0#1.y.y#2QtQt#3.1.y.y#4QtQt#5.Z.8#f#e#e#e#e#e#e#e.7.Y.Y.Y.L#6QtQtQt#7.y.1QtQt", +"Qt#o#8#9a.a#aaabacadaeaf.y#CQtQtQt.1.y.1agQtQt.N.Z.Y.L#f#e#e#e#e#e#e#l.Y.Y.Y.9ahQtQtQt.W.y.1aiQt", +"Qt.Vajakalamanaoapaqaras.y#CQtQtQtat.1.1.gQt#5au.Y.Y.Y.8.5#e#e#e#e#e#l.Y.Y.Y.YavQtQtQtQt#z.yawQt", +"Qt#iaxayazaAaBaCaDaEaFaG.yaHQtQtQtQt#C.y#zQtQt.K.L.Y.Y.Y#g#e#e#e#e#e#g.Y.Y.Y.YaIQtQtQtQt#b.y.1Qt", +"Qt#zaJaKaLaMaNaOaPaQaRaS.yaTQtQtQtQt.V.y.yaUQtQtav.Y.Y.Y.8.5#e#e#e#e#q.Y.Y.Y.YaIQtQtQtQt.2.y.EQt", +"QtaVasaWaXaYaZa0a1a2a3.y.1.uQtQtQtQtat.y.y#bQtQta4a5.Y.Y.Y#f#e#e#e.5.L.Y.Y.Y.Y#jQtQtQtQt.x.y.EQt", +"QtQt.ta6a7a8a9b.b#a3ba.ybbQtQtQtQtQtQt.y.y.y.VQtQtbc.X.Y.Ybd#e#e#e.6.Y.Y.Y.Y.Y.aQtQtQtQt.V.ybeQt", +"QtQtQt.Rbfbga3bhbibj.1bkQtQtQtQtQtQtQt#b.y.y#z#AQtQtav.Y.Y#f#e#e#ebl.Y.Y.Y.Y.L.aQtQtQtQt.V.y.EQt", +"QtQtQtQtbm#4#n#t#abkbnQtQtQtQtQtQtQtQt#b.y.y.y#zQtQt.#.X.9.5#e#e.6.Y.Y.Y.Y.Y#vQtQtQtQtQt.V.y.0Qt", +"QtQtQtQtQtQtbobpbqQtQtQtQtQtQtQtQtQtQt.x.y#CbrbsQtQtQt.9bl#e#e#f.L.Y.Y.Y.Y.9#JQtQtQtQt#v.2.1.dQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.V.1btQtQtQtQt#m.Ybd#e#f.X.Y.Y.Y.Y.YbubvQtQtQtQt#u#b#C#JQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.x.1#SQtQt.B#..M#g#ebw.L.Y.Y.Y.Y.Y.XboQtQtQtQtQt.I.ybeQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtav.2.y#2QtQta5.Y.7.5#g.9.Y.Y.Y.Y.Y.9#JQtQtQtQtQtQt.U.ybtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt#h#b#CbmQtQt.X#lbw.8.Y.Y.Y.Y.Y.Y.9.WQtQtQtQtQtQt.G#baHboQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.H.y#aQtQtQtbl#y.Y.Y.Y.Y.Y.Y.Y.9bxbvQtQtQtQtQtQtby.y#4QtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.S.y#CbzQtQt.Z.Y.Y.Y.Y.Y.Y.Y.L#sbAQtQtQtQtQtQt#p#b#a.bQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt#h#b.yaTQtQt.Q.M.Y.Y.Y.Y.Y.Ya5bBQtQtQtQtQtQtQt#v.S.1bCQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtbD.y.yaHQtQt.M.Z.Y.Y.Y.Y.L.lbEQtQtQtQtQtQtQtQt.H.ybbQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.G#b.y.y#CQtQt.Y.Y.Y.Y.L.abFQtQtQtQtQtQtQtQtQt#A#baTbGQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.K.F.y.y.yaHQtQt.M.9#B.lbHbIQtQtQtQtQtQtQtQtQt.G.2bebJQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQt.jbK#C#C#t#4bLQtQtbMbHbNQtQtQtQtQtQtQtQtQtQtQtbO.2bebJQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtbPagbQQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.r#7#zbbagQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt#RbD#CbRQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt#B.3#bbbbSQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt#BbO.V#4bsQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.Oav#A#2bbbsQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQt.ebTbU#vQtQtQtQtQtQtQtQtQtQtQtQtau.k#rbV.EbWbXQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtag.n.nbYbZb0at#rb1#cb2b3bKb4b5bsb6QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtbBbHb7b7bpbGQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt"}; diff --git a/community/teamspeak3/teamspeak3.desktop b/community/teamspeak3/teamspeak3.desktop new file mode 100644 index 000000000..d3f9fac3f --- /dev/null +++ b/community/teamspeak3/teamspeak3.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=TeamSpeak 3 +GenericName=TeamSpeak +Comment=TeamSpeak is software for quality voice communication via the Internet +Exec=/usr/bin/teamspeak3 +Icon=/usr/share/pixmaps/teamspeak3.xpm +StartupNotify=true +Terminal=false +Type=Application +Categories=Network;Application diff --git a/community/teamspeak3/teamspeak3.launcher b/community/teamspeak3/teamspeak3.launcher new file mode 100644 index 000000000..6fcd46bb7 --- /dev/null +++ b/community/teamspeak3/teamspeak3.launcher @@ -0,0 +1,6 @@ +#!/bin/bash + +cd "/opt/teamspeak3" +./ts3client_runscript.sh $@ +exit $? + diff --git a/community/tiled-qt/PKGBUILD b/community/tiled-qt/PKGBUILD index 44ffe4486..53be80468 100644 --- a/community/tiled-qt/PKGBUILD +++ b/community/tiled-qt/PKGBUILD @@ -2,12 +2,12 @@ # Collaborator: Jonathan Fine (were.Vire AT gmail DOT com) pkgname=tiled-qt pkgver=0.9.0 -pkgrel=1 +pkgrel=4 pkgdesc='A general purpose tile map editor, built to be flexible and easy to use' arch=('i686' 'x86_64') url='http://mapeditor.org' license=('GPL') -depends=('qt' 'libgl' 'gtk-update-icon-cache') +depends=('qt5-base' 'qt5-tools' 'libgl' 'gtk-update-icon-cache') makedepends=('mesa') install=${pkgname}.install source=(http://sourceforge.net/projects/tiled/files/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz) diff --git a/community/tipp10/PKGBUILD b/community/tipp10/PKGBUILD index b8f17a823..827296a07 100644 --- a/community/tipp10/PKGBUILD +++ b/community/tipp10/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 64679 2012-02-17 18:29:36Z bluewind $ +# $Id: PKGBUILD 85418 2013-03-01 10:41:22Z andrea $ # Maintainer: Florian Pritz <flo@xinu.at> # Contributor: toliman <altergan@hs-albsig.de> pkgname=tipp10 pkgver=2.1.0 -pkgrel=4 +pkgrel=5 pkgdesc="intelligent typing tutor" arch=('i686' 'x86_64' 'mips64el') url="http://www.tipp10.com/" license=('GPL2') -depends=('qt>=4.2.2') +depends=('qt4') source=(defines.h.patch gcc-4.5.patch \ "http://www.tipp10.com/de/download/tipp10_source_v"${pkgver//./-}".zip") md5sums=('73a987123ca842026b7bde5e89370b86' diff --git a/community/tuxcards/PKGBUILD b/community/tuxcards/PKGBUILD index cda6b5b17..4c2e4928f 100644 --- a/community/tuxcards/PKGBUILD +++ b/community/tuxcards/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 67712 2012-03-14 07:57:27Z ebelanger $ +# $Id: PKGBUILD 85419 2013-03-01 10:41:30Z andrea $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=tuxcards pkgver=2.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="A hierarchical notebook to enter and manage notes and ideas in a structured manner" arch=('i686' 'x86_64' 'mips64el') url="http://www.tuxcards.de" license=('GPL') -depends=('qt') +depends=('qt4') source=(http://www.tuxcards.de/src/tuxcards-${pkgver}/${pkgname}-${pkgver}.tar.gz tuxcards.desktop) sha1sums=('c0410f28b51d58b4f372ffae0ce0d2a7329f2c45' '565419ac6b24d61fc038462a783cb80d44b4fe7e') diff --git a/community/units/PKGBUILD b/community/units/PKGBUILD index e72e3cb02..3df5af8aa 100644 --- a/community/units/PKGBUILD +++ b/community/units/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 73248 2012-07-04 09:22:47Z spupykin $ +# $Id: PKGBUILD 84848 2013-02-25 10:40:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jeff Mickey <jeff@archlinux.org> # Contributor: Steve Sansom <snsansom@gmail.com> pkgname=units -pkgver=2.00 -pkgrel=2.1 +pkgver=2.01 +pkgrel=1 pkgdesc="converts between different units" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/units/units.html" @@ -15,13 +15,17 @@ options=('!makeflags') install=units.install source=(http://ftp.gnu.org/gnu/units/$pkgname-$pkgver.tar.gz build-fix.patch) -md5sums=('6d0518d493f9bab5aa318a3c7d0801b2' +md5sums=('81bf85937c56fbbd04b16f2f3f9d8526' 'dbb20e628ce0879fe82393f585e9dab6') build() { cd $srcdir/$pkgname-$pkgver - patch -p1 <$srcdir/build-fix.patch +# patch -p1 <$srcdir/build-fix.patch ./configure --prefix=/usr --datadir=/usr/share make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/v8/PKGBUILD b/community/v8/PKGBUILD index fac71067a..c3100085b 100644 --- a/community/v8/PKGBUILD +++ b/community/v8/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 84319 2013-02-16 12:46:17Z bpiotrowski $ +# $Id: PKGBUILD 84803 2013-02-24 19:02:59Z bpiotrowski $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: tocer <tocer.deng@gmail.com> pkgname=v8 pkgver=3.16.4.1 -pkgrel=2 +pkgrel=3 pkgdesc='Fast and modern Javascript engine' arch=('i686' 'x86_64') url='http://code.google.com/p/v8' @@ -42,8 +42,7 @@ build() { package() { cd $srcdir/$pkgname-$pkgver - install -Dm755 out/$ARCH.release/d8 $pkgdir/usr/bin/d8 - install -Dm755 $srcdir/d8-static-$pkgver/out/$ARCH.release/d8 $pkgdir/usr/bin/d8-static + install -Dm755 $srcdir/d8-static-$pkgver/out/$ARCH.release/d8 $pkgdir/usr/bin/d8 install -Dm755 out/$ARCH.release/lib.target/libv8.so $pkgdir/usr/lib/libv8.so install -d $pkgdir/usr/include diff --git a/community/vidalia/PKGBUILD b/community/vidalia/PKGBUILD index 2b0daa4a9..5689cd102 100644 --- a/community/vidalia/PKGBUILD +++ b/community/vidalia/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 80885 2012-12-05 14:14:00Z tredaelli $ +# $Id: PKGBUILD 85421 2013-03-01 10:41:47Z andrea $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Rorschach <r0rschach@lavabit.com> pkgname=vidalia pkgver=0.2.21 -pkgrel=1 +pkgrel=2 pkgdesc="Controller GUI for Tor" url="https://www.torproject.org/vidalia" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('geoip' 'qt' 'tor') +depends=('geoip' 'qt4' 'tor') makedepends=('cmake') install=vidalia.install source=(https://www.torproject.org/vidalia/dist/$pkgname-$pkgver.tar.gz{,.asc}) @@ -17,8 +17,6 @@ md5sums=('8d3079a66d79c79ccfefb929b820f9ac' 'c735521ae9d231e974c753a5206c2c0f') build() { - [[ -f /etc/profile.d/qt4.sh ]] && source /etc/profile.d/qt4.sh - cd "$srcdir" mkdir build cd build diff --git a/community/viking/PKGBUILD b/community/viking/PKGBUILD index e497c2e6b..528d5fcc2 100644 --- a/community/viking/PKGBUILD +++ b/community/viking/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 76965 2012-10-02 17:50:42Z jlichtblau $ +# $Id: PKGBUILD 84763 2013-02-24 12:35:22Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Nick Østergaard <oe.nick@gmail.com> # Contributor: Jonny Gerold <jonny@fsk141.com> pkgname=viking -pkgver=1.3.2.1 +pkgver=1.4 pkgrel=1 pkgdesc="GTK+2 application to manage GPS data" arch=('i686' 'x86_64' 'mips64el') @@ -12,16 +12,16 @@ url="http://viking.sourceforge.net/" license=('GPL2') depends=('curl' 'gpsd' 'gtk2' 'hicolor-icon-theme' 'libexif' 'gpsbabel') makedepends=('intltool' 'gnome-doc-utils') -options=('!emptydirs') +options=('!emptydirs' '!makeflags') install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('ebd6f134a340a1b2ba582ea77bd97ddd9db16b476be7090a12649f6069fa1565') +sha256sums=('80aa4c7bf3be75441a435f6681831b8aeb08f7eb6f7a5a86872eec16cda67799') build() { cd ${srcdir}/$pkgname-$pkgver - ./configure --prefix=/usr --enable-geocaches --enable-expedia + ./configure --prefix=/usr --enable-expedia #--enable-geocaches gives error make } diff --git a/community/viking/viking.changelog b/community/viking/viking.changelog index 3fc494db1..c8005b19e 100644 --- a/community/viking/viking.changelog +++ b/community/viking/viking.changelog @@ -1,3 +1,6 @@ +2013-02-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * viking 1.4-1 + 2012-10-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * viking 1.3.2.1-1 diff --git a/community/vmpk/PKGBUILD b/community/vmpk/PKGBUILD new file mode 100644 index 000000000..5ce3556ad --- /dev/null +++ b/community/vmpk/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer : speps <speps at aur dot archlinux dot org> + +pkgname=vmpk +pkgver=0.5.1 +pkgrel=1 +pkgdesc="Virtual MIDI Piano Keyboard" +arch=('i686' 'x86_64') +url="http://vmpk.sourceforge.net/" +license=('GPL3') +depends=('qt4' 'jack') +makedepends=('cmake') +install="$pkgname.install" +source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2") +md5sums=('07e376936c38c7c244374ff9ddca6a72') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + [ -d bld ] || mkdir bld && cd bld + cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=release + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/bld" + make DESTDIR="$pkgdir/" install +} diff --git a/community/vmpk/vmpk.install b/community/vmpk/vmpk.install new file mode 100644 index 000000000..293ff852a --- /dev/null +++ b/community/vmpk/vmpk.install @@ -0,0 +1,12 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index ae80d0613..bb3906c98 100644 --- a/community/vtk/PKGBUILD +++ b/community/vtk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84363 2013-02-16 22:50:41Z ioni $ +# $Id: PKGBUILD 85423 2013-03-01 10:42:11Z andrea $ # Maintainer: Andrzej Giniewicz <gginiu@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Christofer Bertonha <christoferbertonha at gmail dot com> @@ -8,15 +8,17 @@ # Contributor: Fabian Moser # Contributor: djscholl +# Qt5 support status: http://vtk.org/Bug/view.php?id=12945 + pkgname=vtk pkgver=5.10.1 -pkgrel=4 +pkgrel=5 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' 'qt' 'qtwebkit' 'lesstif' 'mysql' 'hdf5') -makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa' 'python2' 'tk') +depends=('libjpeg-turbo' 'boost' 'ffmpeg' 'qt4' 'lesstif' 'mysql' 'hdf5' 'libgl') +makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa-libgl' 'python2' 'tk') optdepends=('python2: python bindings' 'java-runtime: java bindings' 'tk: tcl bindings' @@ -78,7 +80,7 @@ build() { -DVTK_WRAP_PYTHON:BOOL=ON \ -DVTK_WRAP_TCL:BOOL=ON \ -DVTK_USE_QT:BOOL=ON \ - -DVTK_INSTALL_QT_PLUGIN_DIR:STRING="/usr/lib/qt/plugins" \ + -DVTK_INSTALL_QT_PLUGIN_DIR:STRING="/usr/lib/qt4/plugins" \ -DVTK_USE_GUISUPPORT:BOOL=ON \ -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \ ${cmake_system_flags} \ diff --git a/community/vym/PKGBUILD b/community/vym/PKGBUILD index 69f76eafe..9106ca202 100644 --- a/community/vym/PKGBUILD +++ b/community/vym/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 75733 2012-08-29 20:40:57Z jlichtblau $ +# $Id: PKGBUILD 85424 2013-03-01 10:42:25Z andrea $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: S�ren Holm <sgh@sgh.dk> pkgname=vym pkgver=2.2.4 -pkgrel=1 +pkgrel=2 pkgdesc="A mindmapping tool" arch=('i686' 'x86_64' 'mips64el') url="http://www.insilmaril.de/vym/" license=('GPL') -depends=('qt' 'unzip' 'zip') +depends=('qt4' 'unzip' 'zip') options=('!emptydirs') changelog=$pkgname.changelog install=$pkgname.install @@ -20,26 +20,26 @@ sha256sums=('fa6d088327feae80c4c6760454fba64fe253a7de6e7e46f45a4c7f7db9b998f4' 'e299c69c213e7aac3f5b5d0ab088132b4ec7cb63a391f272e75ed64f049d541b') build() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver qmake PREFIX=/usr make } package() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver # install files - make INSTALL_ROOT=${pkgdir} install + make INSTALL_ROOT="${pkgdir}" install # correct doc location - install -d ${pkgdir}/usr/share/doc/$pkgname - install -m644 doc/* ${pkgdir}/usr/share/doc/$pkgname - rm -rf ${pkgdir}/usr/share/doc/packages + install -d "${pkgdir}"/usr/share/doc/$pkgname + install -m644 doc/* "${pkgdir}"/usr/share/doc/$pkgname + rm -rf "${pkgdir}"/usr/share/doc/packages # .desktop and icon file - install -D -m644 ${srcdir}/$pkgname.desktop \ - ${pkgdir}/usr/share/applications/$pkgname.desktop - install -D -m644 ${pkgdir}/usr/share/vym/icons/$pkgname.png \ - ${pkgdir}/usr/share/pixmaps/$pkgname.png + install -D -m644 "${srcdir}"/$pkgname.desktop \ + "${pkgdir}"/usr/share/applications/$pkgname.desktop + install -D -m644 "${pkgdir}"/usr/share/vym/icons/$pkgname.png \ + "${pkgdir}"/usr/share/pixmaps/$pkgname.png } diff --git a/community/warzone2100/PKGBUILD b/community/warzone2100/PKGBUILD index 100243ad7..0eaddd8e8 100644 --- a/community/warzone2100/PKGBUILD +++ b/community/warzone2100/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 82377 2013-01-16 10:35:35Z lcarlier $ +# $Id: PKGBUILD 85425 2013-03-01 10:42:35Z andrea $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Angelo Theodorou <encelo@users.sourceforge.net> pkgname=warzone2100 pkgver=3.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="3D realtime strategy game on a future Earth" url="http://wz2100.net/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('sdl' 'glew' 'fribidi' 'openal' 'libvorbis' 'libtheora' 'physfs' 'ttf-dejavu' 'qt') +depends=('sdl' 'glew' 'fribidi' 'openal' 'libvorbis' 'libtheora' 'physfs' 'ttf-dejavu' 'qt4') makedepends=('gawk' 'flex' 'zip' 'unzip' 'asciidoc' 'mesa') source=("http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.xz") md5sums=('7f061f3e5a2a6a83c146508ccefabd86') diff --git a/community/wings3d/PKGBUILD b/community/wings3d/PKGBUILD index a03916839..1cc5d5830 100644 --- a/community/wings3d/PKGBUILD +++ b/community/wings3d/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 80322 2012-11-19 22:41:50Z arodseth $ +# $Id: PKGBUILD 85259 2013-02-28 10:18:30Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: kappa <kappacurve@gmail.com> pkgname=wings3d _pkgname=wings pkgver=1.4.1 -pkgrel=10 +pkgrel=12 pkgdesc='3D modeling program' arch=('x86_64' 'i686') url='http://www.wings3d.com/' license=('GPL') -depends=('erlang-sdl' 'erlang-cl' 'bash' 'desktop-file-utils') +depends=('erlang-sdl' 'erlang-cl' 'bash' 'desktop-file-utils' 'erlang=R15B03_1') makedepends=('setconf' 'gendesk') optdepends=('povray: rendering support via POV-Ray') install=$pkgname.install diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD index 55c972c43..5f85af8cb 100644 --- a/community/wt/PKGBUILD +++ b/community/wt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83329 2013-01-29 17:20:18Z spupykin $ +# $Id: PKGBUILD 85427 2013-03-01 10:42:53Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Denis Martinez <deuns.martinez@gmail.com> @@ -6,13 +6,13 @@ pkgname=wt pkgver=3.2.3 _pkgver=3.2.3 -pkgrel=4 +pkgrel=5 pkgdesc="a C++ library and application server for developing and deploying web applications" arch=('i686' 'x86_64' 'mips64el') url="http://www.webtoolkit.eu/" license=('GPL') depends=('boost-libs' 'libharu') -makedepends=('boost' 'cmake>=2.8' 'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'graphicsmagick' 'pango' 'mysql++' 'qt') +makedepends=('boost' 'cmake>=2.8' 'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'graphicsmagick' 'pango' 'mysql++' 'qtbase') optdepends=('openssl: for SSL support in built-in webserver' 'zlib: for compression in HTTP protocol' 'fcgi: for FastCGI support' diff --git a/community/xboard/PKGBUILD b/community/xboard/PKGBUILD index 3331e7cc0..e081f135d 100644 --- a/community/xboard/PKGBUILD +++ b/community/xboard/PKGBUILD @@ -1,30 +1,35 @@ -# $Id: PKGBUILD 72645 2012-06-18 12:05:37Z spupykin $ +# $Id: PKGBUILD 84936 2013-02-26 10:20:29Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason Chu <jason@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=xboard -pkgver=4.6.2 -pkgrel=3 +pkgver=4.7.0 +pkgrel=1 pkgdesc="Graphical user interfaces for chess" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/xboard/" license=('GPL3') -depends=('libxaw' 'gnuchess' 'texinfo' 'xdg-utils' - 'xorg-fonts-75dpi' 'xorg-fonts-100dpi') +depends=('gnuchess' 'texinfo' 'xdg-utils' + 'xorg-fonts-75dpi' 'xorg-fonts-100dpi' + 'gtk2' 'cairo' 'librsvg') makedepends=('gendesk') optdepends=('perl') install=${pkgname}.install source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('6e6d119fac60d68139d7836426212efb') +md5sums=('646e5091f7ee4b5fa9998d2cca9cf795') build() { cd "${srcdir}" gendesk cd "${pkgname}-${pkgver}" - sed -i 's/fairymax/gnuchess/g' xboard.h xboard.conf.in - ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc + sed -i 's/fairymax/gnuchess/g' {xaw,gtk}/xboard.h xboard.conf.in + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --sysconfdir=/etc \ + --with-gtk make } diff --git a/community/yagf/PKGBUILD b/community/yagf/PKGBUILD index 0f2b4ae5d..10844f3a5 100644 --- a/community/yagf/PKGBUILD +++ b/community/yagf/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 76879 2012-10-01 15:20:01Z spupykin $ +# $Id: PKGBUILD 85428 2013-03-01 10:43:02Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: das-ich <das-ich@yandex.ru> pkgname=yagf pkgver=0.9.2 -pkgrel=2.1 +pkgrel=3 pkgdesc="QT4-based GUI for Cuneiform and Tesseract OCRs" arch=(i686 x86_64 'mips64el') url="http://symmetrica.net/cuneiform-linux/yagf-en.html" license=('GPL') -depends=('qt>=4.3' 'aspell') +depends=('qt4' 'aspell') optdepends=('cuneiform: recognition tool' 'tesseract: recognition tool' 'xsane: acquire images from a scanner into YAGF directly') @@ -22,6 +22,10 @@ build() { cd "${srcdir}/${pkgname}-$pkgver" cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release . make +} + +package() { + cd "${srcdir}/${pkgname}-$pkgver" make DESTDIR=${pkgdir} install [ -d $pkgdir/usr/lib64 ] && mv $pkgdir/usr/lib64 $pkgdir/usr/lib || true } diff --git a/community/yaws/PKGBUILD b/community/yaws/PKGBUILD index 402d60541..933c5bec3 100644 --- a/community/yaws/PKGBUILD +++ b/community/yaws/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82428 2013-01-17 13:32:57Z arodseth $ -# Maintainer: Vesa Kaihlavirta +# $Id: PKGBUILD 85282 2013-02-28 12:10:15Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Patrick Smits <mail@patricksmits.net> pkgname=yaws pkgver=1.95 -pkgrel=4 +pkgrel=5 pkgdesc='Yet Another Web Server, pure Erlang HTTP server/framework' arch=('x86_64' 'i686' 'mips64el') url='http://yaws.hyber.org/' @@ -14,7 +14,7 @@ depends=('pam' 'erlang') backup=('etc/yaws/yaws.conf') options=('!emptydirs') install=$pkgname.install -optdepends=('erlang-nox: erlang without X') +optdepends=('erlang-nox: Erlang without X (headless)') source=("http://yaws.hyber.org/download/$pkgname-$pkgver.tar.gz" "$pkgname.service") sha256sums=('e4efae836561f5e8a1324a5c9ab63fb82468e9dc93dc95cb4cb6248ab6b95406' |
