diff options
427 files changed, 7687 insertions, 9788 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' diff --git a/core/pinentry/PKGBUILD b/core/pinentry/PKGBUILD index 280ef63fc..76eeae271 100644 --- a/core/pinentry/PKGBUILD +++ b/core/pinentry/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 166720 2012-09-17 05:06:14Z tpowa $ +# $Id: PKGBUILD 179010 2013-03-01 10:28:10Z andrea $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=pinentry pkgver=0.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.gnupg.org/aegypten2" depends=('ncurses' 'libcap>=2.16') -makedepends=('gtk2' 'qt') +makedepends=('gtk2' 'qt4') optdepends=('gtk2: for gtk2 backend' - 'qt: for qt4 backend') + 'qt4: for qt4 backend') source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2 qt4-pinentry-window.patch) install=pinentry.install @@ -20,7 +20,7 @@ build() { #fix: https://bugs.archlinux.org/task/29998 patch -Np1 -i ../qt4-pinentry-window.patch for file in qt4/*.moc; do - /usr/bin/moc ${file/.moc/.h} > ${file} + moc-qt4 ${file/.moc/.h} > ${file} done ./configure --prefix=/usr \ --enable-pinentry-curses \ diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD index d5f9976a7..9bde610c1 100644 --- a/extra/akonadi/PKGBUILD +++ b/extra/akonadi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 177767 2013-02-08 09:03:20Z andrea $ +# $Id: PKGBUILD 178946 2013-03-01 10:19:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=akonadi pkgver=1.9.0 -pkgrel=2 +pkgrel=3 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" arch=('i686' 'x86_64' 'mips64el') url='http://community.kde.org/KDE_PIM/Akonadi' @@ -16,6 +16,8 @@ source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar. md5sums=('51ef4c9455f97ce4346c5934174b9da8') build() { + . /etc/profile.d/qt4.sh + mkdir build cd build CXX="g++" \ diff --git a/extra/appmenu-qt/PKGBUILD b/extra/appmenu-qt/PKGBUILD index a501eb811..bd09f5d3f 100644 --- a/extra/appmenu-qt/PKGBUILD +++ b/extra/appmenu-qt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 175130 2013-01-14 17:12:42Z andrea $ +# $Id: PKGBUILD 178947 2013-03-01 10:19:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=appmenu-qt pkgver=0.2.6 -pkgrel=3 +pkgrel=4 pkgdesc="Allows Qt applications to export menus over DBus to a menu applet" arch=('i686' 'x86_64' 'mips64el') url='https://launchpad.net/appmenu-qt' @@ -17,6 +17,8 @@ md5sums=('90cce750e5412d43ce075b0a9bdb6782' '5db00ca92274c8b1797c204321961189') build() { + . /etc/profile.d/qt4.sh + # FS#33286 cd ${pkgname}-${pkgver} patch -p0 -i "${srcdir}"/appmenu-async.diff @@ -26,7 +28,7 @@ build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE="Release" + -DCMAKE_BUILD_TYPE=Release make } diff --git a/extra/attica/PKGBUILD b/extra/attica/PKGBUILD index 4ed745406..fdf102f79 100644 --- a/extra/attica/PKGBUILD +++ b/extra/attica/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 165443 2012-08-19 15:34:57Z andrea $ +# $Id: PKGBUILD 178948 2013-03-01 10:19:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=attica pkgver=0.4.1 -pkgrel=1 +pkgrel=2 pkgdesc='A Qt library that implements the Open Collaboration Services API' arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kdesupport/attica' license=('LGPL') -depends=('qt') +depends=('qt4') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('b90983ec5d79e5ddcbc9146fa23cab72') build() { - cd "${srcdir}" + . /etc/profile.d/qt4.sh + mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -24,6 +25,6 @@ build() { } package() { - cd "${srcdir}/build" + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/automoc4/PKGBUILD b/extra/automoc4/PKGBUILD index ab169d0f1..fbb047771 100644 --- a/extra/automoc4/PKGBUILD +++ b/extra/automoc4/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 149006 2012-02-05 13:49:43Z andrea $ +# $Id: PKGBUILD 178949 2013-03-01 10:19:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=automoc4 pkgver=0.9.88 -pkgrel=3.1 +pkgrel=4 pkgdesc="Automatic moc for Qt4" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org/' license=('custom') -depends=('qt') +depends=('qt4') makedepends=('pkgconfig' 'cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2" 'license.txt') @@ -17,7 +17,8 @@ md5sums=('91bf517cb940109180ecd07bc90c69ec' '9014edbb7e2f02fe90b2db8707487bce') build() { - cd "${srcdir}" + . /etc/profile.d/qt4.sh + mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -27,7 +28,9 @@ build() { } package() { - cd "${srcdir}/build" + cd build make DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}/license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + install -Dm644 "${srcdir}/license.txt" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index 3f8891030..93140516c 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 172143 2012-11-30 03:01:06Z bisson $ +# $Id: PKGBUILD 178950 2013-03-01 10:19:30Z andrea $ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=avahi pkgver=0.6.31 -pkgrel=5 +pkgrel=6 pkgdesc='Multicast/unicast DNS-SD framework' url='http://www.avahi.org/' license=('LGPL') @@ -13,21 +13,23 @@ options=('!libtool' '!emptydirs') depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm') optdepends=('dbus: communicating with client applications' 'gtk3: avahi-discover-standalone, bshell, bssh, bvnc' - 'gtk2: gtk2 bindings') -[ "$CARCH" != "mips64el" ] && optdepends+=('qt3: qt3 bindings') -optdepends+=('qt: qt bindings' + 'gtk2: gtk2 bindings' + 'qt3: qt3 bindings' + 'qt4: qt4 bindings' 'pygtk: avahi-bookmarks, avahi-discover' 'twisted: avahi-bookmarks') [ "$CARCH" != "mips64el" ] && optdepends+=('mono: mono bindings') optdepends+=('dbus-python: avahi-discover' 'nss-mdns: NSS support for mDNS') -makedepends=('qt' 'pygtk' 'intltool' 'python2-dbus' +makedepends=('qt3' 'qt4' 'pygtk' 'intltool' 'python2-dbus' 'gobject-introspection' 'gtk3' 'xmltoman') -[ "$CARCH" != "mips64el" ] && makedepends+=('qt3' 'mono' 'gtk-sharp-2') +[ "$CARCH" != "mips64el" ] && makedepends+=('mono' 'gtk-sharp-2') backup=('etc/avahi/hosts' 'etc/avahi/avahi-daemon.conf' 'etc/avahi/services/ssh.service' - 'etc/avahi/services/sftp-ssh.service') + 'etc/avahi/services/sftp-ssh.service' + 'usr/lib/avahi/service-types.db' + 'usr/share/avahi/service-types') source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz" 'rc.d.patch') sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684' @@ -45,11 +47,15 @@ build() { patch -p1 -i ../rc.d.patch [ "$CARCH" = "mips64el" ] && \ - extra="--disable-qt3 --disable-mono" + extra="--disable-mono" + + export MOC_QT3=/opt/qt/bin/moc + export MOC_QT4=/usr/lib/qt4/bin/moc + source /etc/profile.d/qt3.sh + source /etc/profile.d/qt4.sh # pygtk requires python2; make it explicit in case other python are installed: FS#21865 PYTHON=python2 \ - PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \ ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -74,6 +80,7 @@ package() { cd "${pkgdir}" sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover} + sed -i 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' etc/avahi/avahi-dnsconfd.action # howl and mdnsresponder compatability (cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl) diff --git a/extra/avahi/install b/extra/avahi/install index 7c75c3dd4..d333389ee 100644 --- a/extra/avahi/install +++ b/extra/avahi/install @@ -1,8 +1,8 @@ post_install() { - getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null - getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null + getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null + getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null - cat <<EOF + cat <<EOF ==> The following daemons may be added to DAEMONS in /etc/rc.conf: ==> avahi-daemon: the mdns responder, you probably want this. ==> dbus needs to be running when you start it. @@ -16,6 +16,7 @@ EOF } post_remove() { - getent passwd avahi &>/dev/null && userdel avahi >/dev/null - getent group avahi &>/dev/null && groupdel avahi >/dev/null + getent passwd avahi &>/dev/null && userdel avahi >/dev/null + getent group avahi &>/dev/null && groupdel avahi >/dev/null + true } diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD index b89a7d49e..2334186b3 100644 --- a/extra/avidemux/PKGBUILD +++ b/extra/avidemux/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 178126 2013-02-16 22:48:45Z ioni $ +# $Id: PKGBUILD 178951 2013-03-01 10:19:37Z andrea $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=avidemux pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') pkgver=2.5.6 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://fixounet.free.fr/avidemux/" -makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \ +makedepends=('cmake' 'libxslt' 'gtk2' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \ 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \ 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse') [ "$CARCH" != "mips64el" ] && makedepends+=('libva') @@ -96,7 +96,7 @@ package_avidemux-gtk() { package_avidemux-qt() { pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI" - depends=("avidemux-cli=${pkgver}" 'qt') + depends=("avidemux-cli=${pkgver}" 'qt4') install=avidemux.install cd "${srcdir}/${pkgbase}_${pkgver}" diff --git a/extra/bzflag/PKGBUILD b/extra/bzflag/PKGBUILD index eb020ec90..6deb7002c 100644 --- a/extra/bzflag/PKGBUILD +++ b/extra/bzflag/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 169739 2012-10-27 23:41:24Z eric $ +# $Id: PKGBUILD 178623 2013-02-25 23:15:25Z bisson $ # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: Kevin Piche <kevin@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=bzflag pkgver=2.4.2 -pkgrel=2.1 +pkgrel=3 pkgdesc='Multiplayer 3D tank battle game' url='http://bzflag.org/' license=('LGPL') options=('!libtool') arch=('i686' 'x86_64' 'mips64el') depends=('curl' 'glew' 'glu' 'sdl') -makedepends=('mesa') # glu requires <GL/gl.h> source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2") sha1sums=('36c67c0734a1318b34b39ed0da49606e05ebd291') diff --git a/extra/cagibi/PKGBUILD b/extra/cagibi/PKGBUILD index 660fc48d7..ec5b4b969 100644 --- a/extra/cagibi/PKGBUILD +++ b/extra/cagibi/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 149009 2012-02-05 13:59:12Z andrea $ +# $Id: PKGBUILD 178952 2013-03-01 10:19:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=cagibi pkgver=0.2.0 -pkgrel=2 +pkgrel=3 pkgdesc='A cache/proxy daemon for SSDP (the discovery part of UPnP)' arch=('i686' 'x86_64' 'mips64el') -url='http://www.kde.org/' +url='https://projects.kde.org/projects/kdesupport/cagibi/' license=('LGPL') -depends=('qt') +depends=('qt4') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('af66d89337ef80e8a868d3bb9dd92328') build() { - cd ${srcdir} + . /etc/profile.d/qt4.sh + mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -24,6 +25,6 @@ build() { } package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install + cd build + make DESTDIR="${pkgdir}" install } diff --git a/extra/cairo/PKGBUILD b/extra/cairo/PKGBUILD index 657e7e20f..13c45840d 100644 --- a/extra/cairo/PKGBUILD +++ b/extra/cairo/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: PKGBUILD 176849 2013-02-01 14:30:42Z andyrtr $ +# $Id: PKGBUILD 178617 2013-02-25 20:45:00Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Brice Carpentier <brice@daknet.org> pkgname=cairo -pkgver=1.12.12 -pkgrel=1 +pkgver=1.12.14 +pkgrel=3 pkgdesc="Cairo vector graphics library" arch=(i686 x86_64 'mips64el') license=('LGPL' 'MPL') url="http://cairographics.org/" -depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'sh') -makedepends=('librsvg' 'poppler-glib' 'libspectre' 'gtk-doc') # 'libdrm') +# depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'mesa>=9.1' 'libgl' 'sh') +makedepends=('mesa>=9.1' 'mesa-libgl>=9.1' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' + # for the test suite: + 'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm') +#optdepends=('xcb-util: for XCB backend') # really needed? [ "$CARCH" != "mips64el" ] && makedepends+=('valgrind') -optdepends=('xcb-util: for XCB backend') # really needed? provides=('cairo-xcb') replaces=('cairo-xcb') options=('!libtool') source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz) -sha1sums=('8e597874da5b861287893d87dd4ab32471e99c82') +sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15') build() { cd "$srcdir/$pkgname-$pkgver" @@ -26,18 +28,30 @@ build() { --localstatedir=/var \ --disable-static \ --enable-tee \ - --disable-xlib-xcb \ + --enable-gl \ + --enable-egl \ + --enable-svg \ + --enable-ps \ + --enable-pdf \ + --enable-gobject #\ + # --enable-test-surfaces + + #--disable-xlib-xcb \ # --enable-test-surfaces \ takes ages #--enable-drm # breaks build + make } #check() { # cd "$srcdir/$pkgname-$pkgver" -# make -k check || /bin/true # 162 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped + #make -k check || /bin/true # 162 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped +# make test || /bin/true # 29 Passed, 464 Failed [460 crashed, 2 expected], 26 Skipped #} package() { + depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'mesa>=9.1' 'libgl' 'sh') + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 4f78b653d..f3f650d7d 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178338 2013-02-20 11:50:07Z andrea $ +# $Id: PKGBUILD 178833 2013-02-27 14:34:41Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -18,14 +18,14 @@ pkgname=('calligra-filters' 'calligra-braindump' 'calligra-flow') pkgver=2.6.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble' 'lcms2' 'libmysqlclient' 'freetds' 'xbase' 'libwpg' 'opencolorio' 'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw' - 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'mesa') + 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'mesa' 'vc') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") md5sums=('8ba98f3ccb3c5097eb059d86b51f6139') diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD index 200686e98..19565d902 100644 --- a/extra/clutter-gst/PKGBUILD +++ b/extra/clutter-gst/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 176007 2013-01-25 17:41:45Z ioni $ +# $Id: PKGBUILD 178920 2013-02-28 18:58:26Z ioni $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=clutter-gst -pkgver=2.0.0 +pkgver=2.0.2 pkgrel=1 pkgdesc="GStreamer bindings for clutter" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('clutter' 'gst-plugins-base-libs' 'libxdamage') makedepends=('gobject-introspection') options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('c612926f1e0bbd3c1ad748192cfccf0f15fdff0113db3b983d9f58989431f99a') +sha256sums=('577957598d6ee407348dc5d78879da2b212ae54fb3071f86f8409e393dde34c4') build() { cd $pkgname-$pkgver diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index eaf952de6..9f1a905c4 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,24 +1,33 @@ -# $Id: PKGBUILD 172096 2012-11-28 07:27:35Z andrea $ +# $Id: PKGBUILD 178953 2013-03-01 10:19:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=cmake pkgver=2.8.10.2 -pkgrel=1.1 +pkgrel=3 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64' 'mips64el') url="http://www.cmake.org/" license=('custom') depends=('curl' 'libarchive' 'shared-mime-info') -makedepends=('qt' 'emacs') -optdepends=('qt: cmake-gui') +makedepends=('qt5-base' 'emacs') +optdepends=('qt5-base: cmake-gui') install="${pkgname}.install" -source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz") -md5sums=('097278785da7182ec0aea8769d06860c') +source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz" + 'use-qmake4-for-qt4.patch') +md5sums=('097278785da7182ec0aea8769d06860c' + '3136ec7953f2e01cc099f38dbd2655e2') build() { cd ${pkgname}-${pkgver} + # Qt is built with reduce-relocations + export CFLAGS="${CFLAGS} -fPIC" + export CXXFLAGS="${CXXFLAGS} -fPIC" + + # Do not look for 'qmake' as this could referer to the qt5 version + patch -p1 -i "${srcdir}"/use-qmake4-for-qt4.patch + ./bootstrap --prefix=/usr \ --mandir=/share/man \ --docdir=/share/doc/cmake \ diff --git a/extra/cmake/use-qmake4-for-qt4.patch b/extra/cmake/use-qmake4-for-qt4.patch new file mode 100644 index 000000000..6e1e6ead1 --- /dev/null +++ b/extra/cmake/use-qmake4-for-qt4.patch @@ -0,0 +1,11 @@ +--- cmake-2.8.10.2/Modules/FindQt4.cmake~ 2013-02-24 12:13:41.172266220 +0000 ++++ cmake-2.8.10.2/Modules/FindQt4.cmake 2013-02-24 12:20:11.229349625 +0000 +@@ -497,7 +497,7 @@ + # check for qmake + # Debian uses qmake-qt4 + # macports' Qt uses qmake-mac +-find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac ++find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac + PATHS + ENV QTDIR + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]" diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD index 8fa7fdeae..9bc61e707 100644 --- a/extra/doxygen/PKGBUILD +++ b/extra/doxygen/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 175737 2013-01-20 22:18:44Z dan $ +# $Id: PKGBUILD 178954 2013-03-01 10:20:02Z andrea $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=doxygen pkgname=('doxygen' 'doxygen-docs') pkgver=1.8.3.1 -pkgrel=1 +pkgrel=2 license=('GPL') arch=(i686 x86_64 'mips64el') url="http://www.doxygen.org/" -makedepends=('gcc-libs' 'flex' 'qt' 'texlive-core' 'ghostscript' +makedepends=('gcc-libs' 'flex' 'qt4' 'texlive-core' 'ghostscript' 'texlive-latexextra' 'graphviz') source=(http://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz) md5sums=('31b0aaab51c5cab7db9f0ebbe9f85530') sha1sums=('289fc809f44b8025d45279deefbaee7680efd88f') build() { + . /etc/profile.d/qt4.sh cd "${srcdir}/${pkgbase}-${pkgver}" QTDIR=/usr ./configure --prefix /usr --with-doxywizard make @@ -24,7 +25,7 @@ package_doxygen() { pkgdesc="A documentation system for C++, C, Java, IDL and PHP" depends=('gcc-libs') optdepends=('graphviz: for caller/callee graph generation' - 'qt: for doxywizard') + 'qt4: for doxywizard') cd "${srcdir}/${pkgbase}-${pkgver}" make INSTALL="${pkgdir}"/usr MAN1DIR=share/man/man1 install diff --git a/extra/dssi/PKGBUILD b/extra/dssi/PKGBUILD index dceead5b4..840977910 100644 --- a/extra/dssi/PKGBUILD +++ b/extra/dssi/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 151210 2012-02-25 08:01:57Z pierre $ +# $Id: PKGBUILD 178955 2013-03-01 10:20:10Z andrea $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Pajaro pkgname=dssi pkgver=1.1.1 -pkgrel=2.2 +pkgrel=3 pkgdesc="An API for audio processing plugins & softsynths with UIs" arch=(i686 x86_64 'mips64el') url="http://dssi.sourceforge.net/" license=('LGPL' 'BSD' 'custom') depends=('liblo' 'jack') -makedepends=('ladspa' 'qt') -optdepends=('qt: example plugins') +makedepends=('ladspa' 'qt4') +optdepends=('qt4: example plugins') options=('!libtool') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" 'license.txt') @@ -20,6 +20,7 @@ md5sums=('619ab73c883b02dc37ddb37001591f8b' '258ca4d0ca28c5c4d4675147621fac18') build() { + . /etc/profile.d/qt4.sh cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 7eed96c2c..209ced37e 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 178409 2013-02-21 12:49:48Z ioni $ +# $Id: PKGBUILD 178756 2013-02-26 18:03:18Z ioni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=1.1.2 -pkgrel=3 +pkgver=1.1.3 +pkgrel=1 epoch=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') @@ -21,17 +21,13 @@ if [ "${CARCH}" != "mips64el" ]; then depends+=('libva') makedepends=('yasm' 'libvdpau') fi -source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2 - h264-vdpau.patch) -sha256sums=('dc91e4a2499b05740cfddc2b679694e5c0f2ca20c94191de82d7eb200e8c48ce' - 'f55f31a40627ac375fa903c958f34af0f4c72dd9f64dd5f4f64320bb6f126f42') +source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) +sha256sums=('a70057eba6256fab7342f863e7bb556d14cbed207b5b5b884a0879d3f16ca0a8') build() { cd $pkgname-$pkgver if [ "$CARCH" = "mips64el" ] ; then -# Make video decoding faster and turn all pixels green. -# patch -Np1 -i $srcdir/ffmpeg-loongson.patch # Disable runtime CPU detection, video acceleration APIs our hardware doesn't support and ISAs our CPUs don't support. extraconf="--disable-runtime-cpudetect --disable-vdpau --disable-vaapi --disable-mips32r2 --disable-mipsdspr1 --disable-mipsdspr2" else diff --git a/extra/ffmpeg/h264-vdpau.patch b/extra/ffmpeg/h264-vdpau.patch deleted file mode 100644 index 75ebe306f..000000000 --- a/extra/ffmpeg/h264-vdpau.patch +++ /dev/null @@ -1,26 +0,0 @@ -X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavcodec%2Fh264.c;h=da749a241d5647751cb5a961429abb6657a79a00;hp=56ef1092bd4509697f11b76ae97757bbc03aef14;hb=c6f59b95c529baf2ea6729ab9089fddce3ddd86a;hpb=6407800521d26b103db4c22d9de709e957381e4b - -diff --git a/libavcodec/h264.c b/libavcodec/h264.c -index 56ef109..da749a2 100644 ---- a/libavcodec/h264.c -+++ b/libavcodec/h264.c -@@ -2537,11 +2537,17 @@ static enum PixelFormat get_pixel_format(H264Context *h) - return s->avctx->color_range == AVCOL_RANGE_JPEG ? AV_PIX_FMT_YUVJ422P - : AV_PIX_FMT_YUV422P; - } else { -- return s->avctx->get_format(s->avctx, s->avctx->codec->pix_fmts ? -+ int i; -+ const enum AVPixelFormat * fmt = s->avctx->codec->pix_fmts ? - s->avctx->codec->pix_fmts : - s->avctx->color_range == AVCOL_RANGE_JPEG ? - hwaccel_pixfmt_list_h264_jpeg_420 : -- ff_hwaccel_pixfmt_list_420); -+ ff_hwaccel_pixfmt_list_420; -+ -+ for (i=0; fmt[i] != AV_PIX_FMT_NONE; i++) -+ if (fmt[i] == s->avctx->pix_fmt) -+ return fmt[i]; -+ return s->avctx->get_format(s->avctx, fmt); - } - break; - default: diff --git a/extra/fsarchiver/PKGBUILD b/extra/fsarchiver/PKGBUILD index 58e29e0bf..7caea4f57 100644 --- a/extra/fsarchiver/PKGBUILD +++ b/extra/fsarchiver/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 177799 2013-02-09 02:58:49Z eric $ +# $Id: PKGBUILD 178753 2013-02-26 16:58:17Z eric $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=fsarchiver -pkgver=0.6.16 +pkgver=0.6.17 pkgrel=1 pkgdesc="A safe and flexible file-system backup and deployment tool" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ url="http://www.fsarchiver.org/" license=('GPL2') depends=('bzip2' 'e2fsprogs' 'lzo2' 'xz' 'libgcrypt') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('2844a2c8c08181148ee5e05d03b781030b2b67f4') +sha1sums=('3b1049b674f3be45ecda5a91a584c7ddc3781e6b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index 698104c87..1bf0cec55 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 178091 2013-02-16 00:28:11Z bisson $ +# $Id: PKGBUILD 178956 2013-03-01 10:20:17Z andrea $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=gcin pkgver=2.8.0 -pkgrel=1 +pkgrel=2 pkgdesc='Input method server supporting various input methods' url='http://hyperrate.com/dir.php?eid=67' license=('LGPL') arch=('i686' 'x86_64' 'mips64el') depends=('gtk2' 'libxtst') -makedepends=('qt' 'gtk3' 'anthy' 'libchewing') -optdepends=('qt: support for qt4 input method' +makedepends=('qt4' 'gtk3' 'anthy' 'libchewing') +optdepends=('qt4: support for qt4 input method' 'gtk3: support for gtk3 input method' 'anthy: support for anthy input method' 'libchewing: support for chewing input method') @@ -24,7 +24,7 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed 's/QT=qt4/QT=qt/' -i qt4-im/Makefile + source /etc/profile.d/qt4.sh sed 's/lib64/lib/g' -i configure sed '/include suffixes-rule/a \ CFLAGS+='"${CFLAGS}"' \ diff --git a/extra/gcin/qt4.patch b/extra/gcin/qt4.patch deleted file mode 100644 index 0f3e7876f..000000000 --- a/extra/gcin/qt4.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -Naur old/qt4-im/Makefile new/qt4-im/Makefile ---- old/qt4-im/Makefile 2011-12-19 14:52:46.000000000 +1100 -+++ new/qt4-im/Makefile 2012-03-05 09:22:46.732614803 +1100 -@@ -1,5 +1,5 @@ - include ../config.mak --QT=qt4 -+QT=qt - QTIM=$(QT)/plugins/inputmethods - IMMODULES=$(libdir)/$(QTIM) - diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index daebfa058..d093fd088 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 178348 2013-02-20 15:17:58Z dan $ +# $Id: PKGBUILD 179046 2013-03-01 22:51:09Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.1.4 +pkgver=1.8.1.5 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -103,7 +103,7 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('60f32ef4a6b3fa2143b81a28704333ed' - '61d19a9d386c686ee06b493a9df6e61c' +md5sums=('ce168861c23a700b40ffe94475bb1d9e' + '3ea0d73b2fa09558454279aad9039a3b' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/glu/PKGBUILD b/extra/glu/PKGBUILD index 5a4dbfd9f..40424b8b8 100644 --- a/extra/glu/PKGBUILD +++ b/extra/glu/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 168550 2012-10-13 11:42:49Z andyrtr $ +# $Id: PKGBUILD 178743 2013-02-26 16:19:48Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=glu pkgver=9.0.0 -pkgrel=1.1 +pkgrel=2 pkgdesc="Mesa OpenGL Utility library" arch=('i686' 'x86_64' 'mips64el') url="http://cgit.freedesktop.org/mesa/glu/" license=('LGPL') depends=('libgl') -makedepends=('mesa') options=('!libtool') source=(ftp://ftp.freedesktop.org/pub/mesa/$pkgname/$pkgname-$pkgver.tar.bz2) sha256sums=('1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12') diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD index 2ba03df74..246240e89 100644 --- a/extra/gmime/PKGBUILD +++ b/extra/gmime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173089 2012-12-10 21:30:33Z jgc $ +# $Id: PKGBUILD 178917 2013-02-28 18:49:48Z ioni $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Ben <ben@benmazer.net> pkgname=gmime -pkgver=2.6.13 +pkgver=2.6.15 pkgrel=1 pkgdesc="Core mime parsing library" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('glib2' 'gpgme' 'zlib') [ "$CARCH" != "mips64el" ] && makedepends=('gtk-sharp-2') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('42a47a7f9508db3e1cfbb374a23260e75d7fc7696f488a26aa59f5e2d8dac154') +sha256sums=('b4c2a0b99b82063387cd750a38421ebaa0636f339e67984a84371bcb697dc99a') build() { # get rid of that .wapi errors in fakeroot diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD index c66c73b07..4a1b50418 100644 --- a/extra/gnome-keyring/PKGBUILD +++ b/extra/gnome-keyring/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 170820 2012-11-12 08:37:05Z heftig $ +#$Id: PKGBUILD 178926 2013-02-28 19:25:14Z ioni $ # Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=gnome-keyring -pkgver=3.6.2 +pkgver=3.6.3 pkgrel=1 pkgdesc="GNOME Password Management daemon" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gnome-keyring.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('ae60558d60171325ddd90603328393d35d7b560a70b7ab45c4d2718d01130cd6') +sha256sums=('e0153a3f16a25e943237e6242054870802815e0f694c5a4cd808ee72f6014151') build() { cd "$pkgname-$pkgver" diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index d4b200d4a..65b738e44 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 177918 2013-02-10 18:54:41Z andyrtr $ +# $Id: PKGBUILD 178865 2013-02-27 20:55:22Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=gnutls -pkgver=3.1.8 +pkgver=3.1.9 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64' 'mips64el') @@ -15,8 +15,8 @@ depends=('gcc-libs>=4.7.1-5' 'libtasn1>=3.0' 'readline' 'zlib' 'nettle>=2.4' 'p1 makedepends=('strace' 'datefudge') [ "$CARCH" = "mips64el" ] || makedepends+=('valgrind') source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('ffac9e22aba66057d5155ad0e3b62485' - 'f3f0f2b81fa62bbe878a181d87a9cabd') +md5sums=('0674032fe6de0d90d08eed81fcac2e1d' + '503f49f55459ef4229fa4f35841fde2f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnutls/gnutls.install b/extra/gnutls/gnutls.install index 691f3c69d..48052cc02 100644 --- a/extra/gnutls/gnutls.install +++ b/extra/gnutls/gnutls.install @@ -1,5 +1,5 @@ infodir=usr/share/info -filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info-4.gz gnutls.info.gz gnutls-guile.info.gz) +filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info-4.gz gnutls.info-5.gz gnutls.info.gz gnutls-guile.info.gz) post_install() { [ -x usr/bin/install-info ] || return 0 diff --git a/extra/grantlee/PKGBUILD b/extra/grantlee/PKGBUILD index fd5284709..3e5bdf542 100644 --- a/extra/grantlee/PKGBUILD +++ b/extra/grantlee/PKGBUILD @@ -1,19 +1,21 @@ -# $Id: PKGBUILD 170108 2012-11-02 08:45:56Z andrea $ +# $Id: PKGBUILD 178957 2013-03-01 10:20:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=grantlee pkgver=0.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="A string template engine based on the Django template system and written in Qt" arch=('i686' 'x86_64' 'mips64el') url="http://www.gitorious.org/grantlee/pages/Home" license=('LGPL3') -depends=('qt') +depends=('qt4') makedepends=('cmake' 'doxygen') source=("http://downloads.grantlee.org/${pkgname}-${pkgver}.tar.gz") md5sums=('195763a3238f51f8885881fc8012cd83') build() { + . /etc/profile.d/qt4.sh + mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index 1fa7bf596..d50151cb6 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,44 +1,31 @@ -# $Id: PKGBUILD 178429 2013-02-22 00:30:19Z bisson $ +# $Id: PKGBUILD 178958 2013-03-01 10:20:33Z andrea $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=graphviz pkgver=2.30.0 -pkgrel=5 +pkgrel=6 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('custom:EPL') arch=('i686' 'x86_64' 'mips64el') depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts') -case $CARCH in - mips64el) -# r and ocaml aren't ported yet -# no one's interested on mono -makedepends=('swig' 'guile' 'lua51' 'perl' 'php' 'python2' 'ruby' 'tk' 'qt') +makedepends=('swig' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'ruby' 'tk' 'qt4') optdepends=('guile: guile bindings' 'lua51: lua bindings' - 'perl: perl bindings' - 'php: php bindings' - 'python2: python bindings' - 'ruby: ruby bindings' - 'tcl: tcl bindings' - 'qt: gvedit') - ;; - *) -makedepends=('swig' 'mono' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'r' 'ruby' 'tk' 'qt') -optdepends=('mono: sharp bindings' - 'guile: guile bindings' - 'lua51: lua bindings' 'ocaml: ocaml bindings' 'perl: perl bindings' 'php: php bindings' 'python2: python bindings' - 'r: r bindings' 'ruby: ruby bindings' 'tcl: tcl bindings' - 'qt: gvedit') -esac + 'qt4: gvedit') +if [ "$CARCH" != "mips64el" ]; then + makedepends+=('mono' 'r') + optdepends+=('mono: sharp bindings' + 'r: r bindings') +fi source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz" 'LICENSE') sha1sums=('596c1ddf60c5428c5c4700d10f3ea86534195311' @@ -50,6 +37,8 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" + . /etc/profile.d/qt4.sh + sed \ -e '/"archdir"/s:$:+" '"$(echo -I/usr/include/ruby-1.9.1/{$CARCH-linux,ruby/backward,})"'":' \ -e '/CONFIG/s:site:vendor:' \ diff --git a/extra/gtk-vnc/PKGBUILD b/extra/gtk-vnc/PKGBUILD index 2539dc075..b8ac8aa87 100644 --- a/extra/gtk-vnc/PKGBUILD +++ b/extra/gtk-vnc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 168733 2012-10-15 02:01:46Z eric $ +# $Id: PKGBUILD 178918 2013-02-28 18:50:22Z ioni $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: lp76 <l.peduto@gmail.com> pkgname=gtk-vnc -pkgver=0.5.1 +pkgver=0.5.2 pkgrel=1 pkgdesc="A VNC viewer widget for GTK" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ optdepends=('gtk2: GTK2 widget') makedepends=('intltool' 'pygtk' 'pygobject2-devel' 'gtk-doc' 'gtk2' 'vala' 'gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('1ad1847a23f8ea8fbf2396de46c51ec0900ee3698cde4e205760518cd1e01a40') +sha256sums=('b51bda7edebb82ab142c292bd1b1493406bc8225a5c834d854bbafef9e9a471f') build() { rm -rf gtk2-build gtk3-build diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index ba4c2afeb..36916e7bb 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 177873 2013-02-10 13:29:01Z heftig $ +# $Id: PKGBUILD 178912 2013-02-28 18:37:56Z ioni $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.15 +pkgver=2.24.16 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" @@ -13,7 +13,7 @@ options=('!libtool') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz xid-collision-debug.patch) -sha256sums=('d7e1c6d6ae6baa48c88441fe52b73b0fb6008763644867d59b049bafb0cf771b' +sha256sums=('93cd69cc2cecf9a3aa31a50caf4a24752a6928a48c527ae967b109df6f9302d3' 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') build() { diff --git a/extra/hefur/PKGBUILD b/extra/hefur/PKGBUILD index ca4262d18..78f33fc80 100644 --- a/extra/hefur/PKGBUILD +++ b/extra/hefur/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 172896 2012-12-06 11:02:02Z pierre $ +# $Id: PKGBUILD 179041 2013-03-01 20:41:07Z andrea $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> # Contributor: Alexandre Bique <bique.alexandre@gmail.com> pkgname=hefur pkgver=0.4 -pkgrel=1 +pkgrel=2 pkgdesc='A standalone and lightweight BitTorrent tracker' arch=('i686' 'x86_64' 'mips64el') url='http://github.com/abique/hefur' diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD index 0502b75a8..c6c9576f6 100644 --- a/extra/hylafax/PKGBUILD +++ b/extra/hylafax/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166869 2012-09-20 09:33:33Z tpowa $ +# $Id: PKGBUILD 178774 2013-02-27 13:50:36Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=hylafax pkgver=6.0.6 -pkgrel=1.1 +pkgrel=2 pkgdesc="Fax Server" arch=('i686' 'x86_64' 'mips64el') install='hylafax.install' @@ -18,7 +18,8 @@ source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz hylafax.cron.daily config.local faxq.service - hfaxd.service) + hfaxd.service + faxgetty@.service) build () { cd "$srcdir/${pkgname}-${pkgver}" @@ -42,7 +43,7 @@ package () { # add systemd files install -D -m644 $srcdir/hfaxd.service $pkgdir/usr/lib/systemd/system/hfaxd.service install -D -m644 $srcdir/faxq.service $pkgdir/usr/lib/systemd/system/faxq.service - + install -D -m644 $srcdir/faxgetty@.service $pkgdir/usr/lib/systemd/system/faxgetty@.service install -D -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT } md5sums=('d063d45049c8fcbabefe09d662313067' @@ -51,3 +52,10 @@ md5sums=('d063d45049c8fcbabefe09d662313067' '60f2a7e62c256ead4e9238cb31b35b90' '832c8e8098e2dfa56040c975b554590c' '38a00db6d9d765d130b2d8d3a98e5c24') +md5sums=('d063d45049c8fcbabefe09d662313067' + '6602288a405324d8c8e3c5eac2bf19fd' + '52beffe7dc296b4f9ce9fd0387f7804e' + '60f2a7e62c256ead4e9238cb31b35b90' + '832c8e8098e2dfa56040c975b554590c' + '38a00db6d9d765d130b2d8d3a98e5c24' + 'fe10ea597e786fe8c09e4104fbdf16de') diff --git a/extra/hylafax/faxgetty@.service b/extra/hylafax/faxgetty@.service new file mode 100644 index 000000000..476715c19 --- /dev/null +++ b/extra/hylafax/faxgetty@.service @@ -0,0 +1,24 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=faxgetty on %I +Documentation=man:faxgetty(8) +After=faxq.service hfaxd.service + +[Service] +ExecStart=/usr/lib/fax/faxgetty %I +Type=simple +Restart=always +RestartSec=0 +KillMode=process + +KillSignal=SIGTERM + +[Install] +WantedBy=multi-user.target + diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD index 756c16915..d304aa9e8 100644 --- a/extra/icedtea-web-java7/PKGBUILD +++ b/extra/icedtea-web-java7/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=icedtea-web-java7 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc') pkgver=1.3.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') @@ -46,6 +46,7 @@ package_icedtea-web-java7() { pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project" depends=('jre7-openjdk' 'gtk2' 'desktop-file-utils') provides=('java-web-start=7') + replaces=('icedtea-web') install=${pkgname}.install cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}" @@ -77,6 +78,7 @@ package_icedtea-web-java7() { package_icedtea-web-java7-doc() { pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files" + replaces=('icedtea-web-doc') cd "${srcdir}"/icedtea-web* make DESTDIR="${pkgdir}" install-data-local diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 348991cd9..b395e03a3 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178359 2013-02-20 19:02:07Z andyrtr $ +# $Id: PKGBUILD 178897 2013-02-28 13:12:14Z guillaume $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -23,7 +23,7 @@ _HOTSPOT_CHANGESET=104e2c65892d # see "${srcdir}/icedtea7"/hotspot.map _bootstrap=0 # 0/1 for quick build or full bootstrap pkgver=${_java_ver}.${_updatever}_${_icedtea_ver} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') @@ -62,10 +62,10 @@ sha256sums=('378f67f6f84bfb6c705f600b47b68a61b18d67648dd7eaf8498b152587695940' '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479' 'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea' 'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4' - '2ec2c6d3a8b62c5743bf8c50c358d98f6a86219d1d8b70645bcc0e1707670410' + 'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea' '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd' - 'faf5fbaf24c33c101d58bacf8b93c1dbe08a0cbde4c596d5b4a6e28dd4b18f0a' - '84d3b91cc57c67b2cf2ddb7fe5abcf1e88b5a151565aaecf4b595c7ce8f3fee9') + 'b7c045b08ad55a9f79390c104fa846d0e7dbb49fccffb2fab2a3824b6b19c9c8' + '89d99d8ac269ca66e2e279aff652d5aac938a35faec93cd8cff8f048052bd3ce') noextract=("${_OPENJDK_CHANGESET}.tar.gz" "${_CORBA_CHANGESET}.tar.gz" @@ -248,7 +248,7 @@ package_jre7-openjdk-headless() { } package_jre7-openjdk() { - pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs -Full Java runtime environment - needed for executing Java GUI and Webstart programs" + pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - Full Java runtime environment - needed for executing Java GUI and Webstart programs" depends=('jre7-openjdk-headless' 'xdg-utils' 'hicolor-icon-theme') optdepends=('icedtea-web-java7: web browser plugin + Java Web Start' 'alsa-lib: for basic sound support' diff --git a/extra/java7-openjdk/jdk7-openjdk.profile b/extra/java7-openjdk/jdk7-openjdk.profile index 91265cc86..89a6a82a0 100644 --- a/extra/java7-openjdk/jdk7-openjdk.profile +++ b/extra/java7-openjdk/jdk7-openjdk.profile @@ -1,6 +1 @@ -export J2SDKDIR=/usr/lib/jvm/java-7-openjdk -export J2REDIR=$J2SDKDIR/jre export JAVA_HOME=/usr/lib/jvm/java-7-openjdk - -# For non-reparenting window managers, enable '_JAVA_AWT_WM_NONREPARENTING' -# in /etc/profile.d/jre7.sh diff --git a/extra/java7-openjdk/jre7-openjdk.profile b/extra/java7-openjdk/jre7-openjdk.profile index c86ce857a..b267392e5 100644 --- a/extra/java7-openjdk/jre7-openjdk.profile +++ b/extra/java7-openjdk/jre7-openjdk.profile @@ -1,5 +1,4 @@ -export J2REDIR=/usr/lib/jvm/java-7-openjdk/jre export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-openjdk/jre} -# enable this for non-reparenting window managers +# Enable this for non-reparenting window managers #export _JAVA_AWT_WM_NONREPARENTING=1 diff --git a/extra/java7-openjdk/jre7-openjdk.profile.csh b/extra/java7-openjdk/jre7-openjdk.profile.csh index a9aed27d1..c4009af2e 100644 --- a/extra/java7-openjdk/jre7-openjdk.profile.csh +++ b/extra/java7-openjdk/jre7-openjdk.profile.csh @@ -1,5 +1,4 @@ -setenv J2REDIR "/usr/lib/jvm/java-7-openjdk/jre" setenv JAVA_HOME "/usr/lib/jvm/java-7-openjdk/jre" -# enable this for non-reparenting window managers +# Enable this for non-reparenting window managers #setenv _JAVA_AWT_WM_NONREPARENTING 1 diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD index f6954a72b..1ba0bc80c 100644 --- a/extra/kdeedu-marble/PKGBUILD +++ b/extra/kdeedu-marble/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 177645 2013-02-08 08:56:05Z andrea $ +# $Id: PKGBUILD 178961 2013-03-01 10:20:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-marble pkgver=4.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="Desktop Globe" url="http://kde.org/applications/education/marble/" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,8 @@ source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz") sha1sums=('c1db6b1785ca1ad230de6da0e67ee84bf7e3a2cd') build() { - cd "${srcdir}" + . /etc/profile.d/qt4.sh + mkdir build cd build cmake ../marble-${pkgver} \ @@ -28,6 +29,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/kdelibs3/PKGBUILD b/extra/kdelibs3/PKGBUILD index b8e4ebbe7..ff6cd1239 100644 --- a/extra/kdelibs3/PKGBUILD +++ b/extra/kdelibs3/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 169753 2012-10-27 23:42:09Z eric $ +# $Id: PKGBUILD 178619 2013-02-25 20:45:02Z andyrtr $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=kdelibs3 pkgver=3.5.10 -pkgrel=15 +pkgrel=16 pkgdesc='KDE3 Core Libraries' arch=('i686' 'x86_64') url='http://www.kde.org' @@ -28,7 +28,7 @@ source=("ftp://ftp.kde.org/pub/kde/stable/${pkgver}/src/kdelibs-${pkgver}.tar.bz sha1sums=('c930a25f4419134def55b8466c3a6f737227fb82' 'c8ca21e4848a627760746d0a8a64bf4f90684c3e' '50c9de71b102507fb78b192ecc22a5fc3e031bc3' - 'fbd6e773edf3e8bb8e1272629984025e041da2ca' + 'd63d51c8fef5e521b4a9a8efa050a0c8ce6f94bf' '5fbbf7a5e2032878815fa055bfb5020f478d2b25' '35e56fe4c5f71685e64b13f448dcacc620166e06' '50e92950498463defb9149ffcf8cbc2e8cd1063b' @@ -48,9 +48,6 @@ build() { patch -p0 -i "$srcdir"/kdelibs3-missing-include.patch patch -p1 -i "${srcdir}"/kdelibs3-cups16.patch - sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh - make -f admin/Makefile.common cvs - ./configure --prefix=/opt/kde \ --with-distribution='Arch Linux' \ --with-alsa \ diff --git a/extra/kdelibs3/kde3.profile b/extra/kdelibs3/kde3.profile index ef09631ff..61e7c43ca 100755 --- a/extra/kdelibs3/kde3.profile +++ b/extra/kdelibs3/kde3.profile @@ -1,6 +1 @@ export PATH=$PATH:/opt/kde/bin -if [ ! -z $XDG_DATA_DIRS ]; then - export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/kde/share -else - export XDG_DATA_DIRS=/opt/kde/share -fi diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD index 414b37c3a..5aee53f71 100644 --- a/extra/kdesdk/PKGBUILD +++ b/extra/kdesdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 177748 2013-02-08 08:58:30Z andrea $ +# $Id: PKGBUILD 178963 2013-03-01 10:21:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -21,7 +21,7 @@ pkgname=('kdesdk-cervisia' 'kdesdk-strigi-analyzer' 'kdesdk-umbrello') pkgver=4.10.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -197,7 +197,7 @@ package_kdesdk-okteta() { package_kdesdk-poxml() { pkgdesc='Translates DocBook XML files using gettext po files' - depends=('qt' 'antlr2') + depends=('qt4' 'antlr2') cd $srcdir/build/poxml make DESTDIR=$pkgdir install cd $srcdir/build/doc/poxml diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD index acc4451d5..3e6e4c452 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 177982 2013-02-12 19:24:37Z andyrtr $ +# $Id: PKGBUILD 178842 2013-02-27 16:20:48Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=lftp -pkgver=4.4.3 -pkgrel=2 +pkgver=4.4.4 +pkgrel=1 pkgdesc="Sophisticated command line based FTP client" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') @@ -13,7 +13,7 @@ optdepends=('perl: needed for convert-netscape-cookies and verify-file') url="http://lftp.yar.ru/" backup=('etc/lftp.conf') source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2) -md5sums=('b877c1f82b2d4dc503f40dcce4978ff4') +md5sums=('f1fa7aec113219952d18e4dd87d531ca') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libbluedevil/PKGBUILD b/extra/libbluedevil/PKGBUILD index ca13cfce1..bb8de6cb0 100644 --- a/extra/libbluedevil/PKGBUILD +++ b/extra/libbluedevil/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 157802 2012-04-29 17:04:04Z andrea $ +# $Id: PKGBUILD 178964 2013-03-01 10:21:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libbluedevil pkgver=1.9.2 -pkgrel=1.1 -pkgdesc='A Qt wrapper for bluez used in the new KDE bluetooth stack' +pkgrel=2 +pkgdesc='A Qt4 wrapper for bluez used in the new KDE bluetooth stack' arch=('i686' 'x86_64' 'mips64el') url="https://projects.kde.org/projects/playground/libs/libbluedevil" license=('GPL') -depends=('qt' 'bluez') +depends=('qt4' 'bluez') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") md5sums=('b492db1825b239e5185c543badb21c26') -build(){ - cd "${srcdir}" +build() { + . /etc/profile.d/qt4.sh + mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -24,6 +25,6 @@ build(){ } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/libdbusmenu-qt/PKGBUILD b/extra/libdbusmenu-qt/PKGBUILD index d2279c606..3192cf128 100644 --- a/extra/libdbusmenu-qt/PKGBUILD +++ b/extra/libdbusmenu-qt/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 156245 2012-04-16 13:16:43Z andrea $ +# $Id: PKGBUILD 178965 2013-03-01 10:21:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libdbusmenu-qt pkgver=0.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="A library that provides a Qt implementation of the DBusMenu spec" arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/libdbusmenu-qt" license=('GPL') -depends=('qt') +depends=('qt4') makedepends=('cmake' 'doxygen' 'qjson') source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2") md5sums=('9a49484927669cd2ec91b3bf9ba8b79e') build() { - cd "${srcdir}" + . /etc/profile.d/qt4.sh + mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -24,6 +25,6 @@ build() { } package() { - cd "${srcdir}/build" + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/libgsf/PKGBUILD b/extra/libgsf/PKGBUILD index c79366337..cc70210f6 100644 --- a/extra/libgsf/PKGBUILD +++ b/extra/libgsf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 170960 2012-11-14 03:19:40Z heftig $ +# $Id: PKGBUILD 178924 2013-02-28 19:13:21Z ioni $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=libgsf -pkgver=1.14.25 +pkgver=1.14.26 pkgrel=1 arch=(i686 x86_64 mips64el) pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats" @@ -13,7 +13,7 @@ options=('!libtool') depends=('libxml2' 'gdk-pixbuf2' 'bzip2') makedepends=('intltool' 'gobject-introspection') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz) -sha256sums=('127548f07e07951984fb139c3f89d65b9e471aefe6555387de03e1113944d1a2') +sha256sums=('8919e725aadd785380350c8dec7427d82cf33164bc9a9a549df9440a0c3da6d5') build() { cd "$pkgname-$pkgver" diff --git a/extra/liblastfm/PKGBUILD b/extra/liblastfm/PKGBUILD index aeadccd9f..8d95c6f1e 100644 --- a/extra/liblastfm/PKGBUILD +++ b/extra/liblastfm/PKGBUILD @@ -1,21 +1,23 @@ -# $Id: PKGBUILD 175971 2013-01-25 14:23:37Z andrea $ +# $Id: PKGBUILD 178966 2013-03-01 10:21:42Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: XazZ <xazz.xazz [AT] googlemail.com> pkgname=liblastfm pkgver=1.0.6 -pkgrel=1 -pkgdesc="A Qt C++ library for the Last.fm webservices" +pkgrel=2 +pkgdesc="A Qt4 C++ library for the Last.fm webservices" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/lastfm/liblastfm/' license=('GPL') -depends=('qt' 'fftw' 'libsamplerate') +depends=('qt4' 'fftw' 'libsamplerate') makedepends=('cmake') source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/lastfm/${pkgname}/tarball/${pkgver}") sha1sums=('cd84cf61d315c9739b3b65e31c2854a6b1a38630') build() { + . /etc/profile.d/qt4.sh + mkdir build cd build cmake ../lastfm-${pkgname}-5826fe6 \ diff --git a/extra/liborigin2/PKGBUILD b/extra/liborigin2/PKGBUILD index 3af418eac..bbb3bd0b8 100644 --- a/extra/liborigin2/PKGBUILD +++ b/extra/liborigin2/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 152212 2012-03-05 08:56:10Z ibiru $ +# $Id: PKGBUILD 178967 2013-03-01 10:21:49Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> pkgbase=liborigin2 pkgname=('liborigin2' 'liborigin2-docs') pkgver=20110829 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://soft.proindependent.com/liborigin2/" license=('GPL3') -makedepends=('doxygen' 'qt' 'boost') +makedepends=('doxygen' 'qt4' 'boost') replaces=('liborigin') provides=('liborigin') source=(http://download.berlios.de/qtiplot/${pkgbase}-20110829.zip @@ -22,6 +22,8 @@ sha1sums=('13851b17b21ec49375e4f5dfbd3ab4b9bf72f5be' build() { cd "${srcdir}/${pkgbase}" + . /etc/profile.d/qt4.sh + install -Dm644 "${srcdir}/liborigin.pro.archlinux" ./liborigin2.pro install -Dm644 "${srcdir}/tree.hh" ./tree.hh # get the header back like it was in previous releases qmake liborigin2.pro QMAKESPEC=linux-g++ diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD index ade47bb39..ac0fdfbca 100644 --- a/extra/libpng/PKGBUILD +++ b/extra/libpng/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 169446 2012-10-21 10:49:41Z ibiru $ +# $Id: PKGBUILD 178758 2013-02-26 18:11:18Z ioni $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Travis Willard <travis@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=libpng -pkgver=1.5.13 -_apngver=1.5.13 -pkgrel=1.1 +pkgver=1.5.14 +_apngver=1.5.14 +pkgrel=1 pkgdesc="A collection of routines used to create PNG format graphics files" arch=('i686' 'x86_64' 'mips64el') url="http://www.libpng.org/pub/png/libpng.html" @@ -16,8 +16,8 @@ depends=('zlib' 'sh') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz" "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz") -md5sums=('0b607a685da977f1bfc96e1c47055183' - '23c8765aa6ca188c0575386d5ea8fe70') +md5sums=('94284b01d62ca43c5eb3f6702db08ed8' + '89fbc11f19ec1f181587bdde1dd9402f') build() { cd $pkgname-$pkgver diff --git a/extra/libqzeitgeist/PKGBUILD b/extra/libqzeitgeist/PKGBUILD index 74d91942e..b8defc8e1 100644 --- a/extra/libqzeitgeist/PKGBUILD +++ b/extra/libqzeitgeist/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 147936 2012-01-28 11:01:16Z andrea $ +# $Id: PKGBUILD 178968 2013-03-01 10:21:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libqzeitgeist pkgver=0.8.0 -pkgrel=2.1 +pkgrel=3 pkgdesc="A Qt interface to the Zeitgeist event tracking system" -url="https://projects.kde.org/projects/kdesupport/libqzeitgeist" +url='https://projects.kde.org/projects/kdesupport/libqzeitgeist' arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('qt') +depends=('qt4') makedepends=('cmake' 'automoc4' 'python2' 'zeitgeist') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" 'set-declarative-installation-dir.patch') @@ -16,10 +16,12 @@ md5sums=('97bdea6a1865db7d5f29c93e3a492f24' '712013e582acb73296e41ad842d0da01') build() { - cd "${srcdir}"/${pkgname}-${pkgver} + . /etc/profile.d/qt4.sh + + cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}"/set-declarative-installation-dir.patch + cd ../ - cd "${srcdir}" # Fix python2 path sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ ${pkgname}-${pkgver}/scripts/onto2cpp.py @@ -29,11 +31,11 @@ build() { cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DDECLARATIVE_IMPORT_PREFIX=/usr/lib/qt/imports/ + -DDECLARATIVE_IMPORT_PREFIX=/usr/lib/qt4/imports/ make } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD index 3a9cbcd30..065d4180d 100644 --- a/extra/libtorrent-rasterbar/PKGBUILD +++ b/extra/libtorrent-rasterbar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 176291 2013-01-28 16:48:24Z stephane $ +# $Id: PKGBUILD 178762 2013-02-26 18:22:51Z ioni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=libtorrent-rasterbar -pkgver=0.16.7 -pkgrel=2 +pkgver=0.16.8 +pkgrel=1 epoch=1 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" url="http://www.rasterbar.com/products/libtorrent/" @@ -14,7 +14,7 @@ depends=('boost-libs' 'geoip' 'python2') makedepends=('boost') options=('!libtool' '!emptydirs') source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz) -sha1sums=('94b132a17d8f6a5345937731343398be8d31f170') +sha1sums=('483689787cb64e7cf4abefda4058b912ec406709') build() { cd $pkgname-$pkgver diff --git a/extra/libx11/PKGBUILD b/extra/libx11/PKGBUILD index fae61245a..867f03f25 100644 --- a/extra/libx11/PKGBUILD +++ b/extra/libx11/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160633 2012-06-02 21:43:25Z andyrtr $ +# $Id: PKGBUILD 178618 2013-02-25 20:45:01Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libx11 pkgver=1.5.0 -pkgrel=1.1 +pkgrel=2 pkgdesc="X11 client-side library" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -11,12 +11,8 @@ depends=('libxcb' 'xproto' 'kbproto') makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto') options=('!libtool') license=('custom') -source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2 - xorg.sh - xorg.csh) -sha256sums=('c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86' - '1a1b5db0320579958fba24774bae7984a1b1b8c647ac6fbd4d8937178c48ed46' - '96c85ccbdcb056540f2e2b6cf48dea067f80260c16957ee401c49cf94cea5894') +source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2) +sha256sums=('c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86') build() { cd "${srcdir}/libX11-${pkgver}" @@ -24,7 +20,7 @@ build() { make } -package() { +check() { cd "${srcdir}/libX11-${pkgver}" make check } @@ -33,9 +29,6 @@ package() { cd "${srcdir}/libX11-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/etc/profile.d" - install -m755 "${srcdir}/"xorg.{sh,csh} "${pkgdir}/etc/profile.d/" - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD index df923eee9..0b6da790e 100644 --- a/extra/licq/PKGBUILD +++ b/extra/licq/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 176292 2013-01-28 16:48:25Z stephane $ +# $Id: PKGBUILD 178969 2013-03-01 10:22:04Z andrea $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> pkgname=licq pkgver=1.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="Advanced graphical ICQ clone and more for Unix" arch=('i686' 'x86_64' 'mips64el') url="http://www.licq.org" license=('GPL') -depends=('boost-libs' 'gpgme' 'libxss' 'qt') +depends=('boost-libs' 'gpgme' 'libxss' 'qt4') makedepends=('cmake' 'boost') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2) @@ -17,6 +17,8 @@ md5sums=('701e57efedc2b7ece64c3d2d2e9f9e16') build() { cd "${srcdir}/${pkgname}-${pkgver}" + . /etc/profile.d/qt4.sh + # licq mkdir build cd build diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD index 36dba8905..b2fb5240b 100644 --- a/extra/lyx/PKGBUILD +++ b/extra/lyx/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 176293 2013-01-28 16:48:26Z stephane $ +# $Id: PKGBUILD 178970 2013-03-01 10:22:14Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=lyx pkgver=2.0.5.1 -pkgrel=1 +pkgrel=2 pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end" arch=('i686' 'x86_64' 'mips64el') url="http://www.lyx.org" -depends=('qt' 'texlive-core' 'python2' 'imagemagick' 'enchant' 'boost-libs' 'libmythes') +depends=('qt4' 'texlive-core' 'python2' 'imagemagick' 'enchant' 'boost-libs' 'libmythes') makedepends=('boost') optdepends=('rcs: built-in version control system' 'texlive-latexextra: float wrap support') @@ -23,6 +23,8 @@ sha1sums=('a822e99484c1652c4df5df717819dd7048fcff75' '56416642cc3da2a13b87b84e6b87c1a239f3d09a') build() { + . /etc/profile.d/qt4.sh + cd "${srcdir}/${pkgname}-${pkgver}" find . -type f -exec sed -i 's|#!.*python|#!/usr/bin/env python2|' {} + sed -i 's|"python|"python2|' lib/configure.py src/support/os.cpp diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD index 5f5ea87a8..60d52af2a 100644 --- a/extra/mediastreamer/PKGBUILD +++ b/extra/mediastreamer/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178134 2013-02-16 22:48:53Z ioni $ +# $Id: PKGBUILD 178928 2013-02-28 19:31:23Z eric $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -6,7 +6,7 @@ pkgname=mediastreamer pkgver=2.8.2 -pkgrel=3 +pkgrel=4 pkgdesc="A library written in C that allows you to create and run audio and video streams" arch=('i686' 'x86_64' 'mips64el') url="http://www.linphone.org/" @@ -18,7 +18,7 @@ source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${ mediastreamer-ffmpeg.patch) md5sums=('e51ea9d5fce1396b374d10473dfbadec' '805da7def98f367e621363fa0c951fe8' - 'f147546489a973f148ce3dd2dba36834') + '553d5d47ea4a8c8dfeabdc0281849d5f') build() { cd "${srcdir}"/$pkgname-$pkgver diff --git a/extra/mediastreamer/mediastreamer-ffmpeg.patch b/extra/mediastreamer/mediastreamer-ffmpeg.patch index 944d4b833..3304e9f56 100644 --- a/extra/mediastreamer/mediastreamer-ffmpeg.patch +++ b/extra/mediastreamer/mediastreamer-ffmpeg.patch @@ -1,205 +1,57 @@ -diff --git a/include/mediastreamer2/msvideo.h b/include/mediastreamer2/msvideo.h -index 5ae8a63..86edf86 100644 ---- mediastreamer2/include/mediastreamer2/msvideo.h -+++ mediastreamer2/include/mediastreamer2/msvideo.h -@@ -21,6 +21,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - #define msvideo_h - - #include <mediastreamer2/msfilter.h> -+#ifndef INT64_C -+#define INT64_C(c) (c ## LL) -+#define UINT64_C(c) (c ## ULL) -+#endif -+#include <libavutil/avutil.h> -+#include <libavcodec/version.h> - - /* some global constants for video MSFilter(s) */ - #define MS_VIDEO_SIZE_SQCIF_W 128 -@@ -206,7 +212,9 @@ extern "C"{ - MS2_PUBLIC int ms_pix_fmt_to_ffmpeg(MSPixFmt fmt); - MS2_PUBLIC MSPixFmt ffmpeg_pix_fmt_to_ms(int fmt); - MS2_PUBLIC MSPixFmt ms_fourcc_to_pix_fmt(uint32_t fourcc); -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - MS2_PUBLIC void ms_ffmpeg_check_init(void); -+#endif - MS2_PUBLIC int ms_yuv_buf_init_from_mblk(MSPicture *buf, mblk_t *m); - MS2_PUBLIC int ms_yuv_buf_init_from_mblk_with_size(MSPicture *buf, mblk_t *m, int w, int h); - MS2_PUBLIC int ms_picture_init_from_mblk_with_size(MSPicture *buf, mblk_t *m, MSPixFmt fmt, int w, int h); +commit f586917ea4d66f9ba8910f0967a8830e54d50784 +Author: Yann Diorcet <yann.diorcet@belledonne-communications.com> +Date: Tue Jun 5 11:07:48 2012 +0200 + + Fixes for new versions of ffmpeg + diff --git a/src/h264dec.c b/src/h264dec.c -index 223de3d..8c40a7c 100644 ---- mediastreamer2/src/h264dec.c -+++ mediastreamer2/src/h264dec.c -@@ -44,7 +44,9 @@ typedef struct _DecData{ +index c4a84ee..5229b5e 100644 +--- a/src/h264dec.c ++++ b/src/h264dec.c +@@ -45,7 +45,9 @@ typedef struct _DecData{ static void ffmpeg_init(){ static bool_t done=FALSE; if (!done){ -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) ++#ifdef FF_API_AVCODEC_INIT avcodec_init(); +#endif avcodec_register_all(); done=TRUE; } -diff --git a/src/mscommon.c b/src/mscommon.c -index 2cab005..bebb946 100644 ---- mediastreamer2/src/mscommon.c -+++ mediastreamer2/src/mscommon.c -@@ -33,9 +33,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - #include "mediastreamer2/mscodecutils.h" - #include "mediastreamer2/msfilter.h" - #include <ortp/ortp_srtp.h> -+#ifndef INT64_C -+#define INT64_C(c) (c ## LL) -+#define UINT64_C(c) (c ## ULL) -+#endif -+#include <libavutil/avutil.h> -+#include <libavcodec/version.h> - - extern void __register_ffmpeg_encoders_if_possible(void); -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - extern void ms_ffmpeg_check_init(); -+#endif - extern bool_t libmsandroiddisplay_init(void); - extern void libmsandroiddisplaybad_init(void); - extern void libmsandroidopengldisplay_init(void); -@@ -645,7 +653,9 @@ void ms_init(){ - } - } - #if !defined(NO_FFMPEG) -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - ms_ffmpeg_check_init(); -+#endif - __register_ffmpeg_encoders_if_possible(); - #endif - #endif -diff --git a/src/videodec.c b/src/videodec.c -index c04e1e9..a455075 100644 ---- mediastreamer2/src/videodec.c -+++ mediastreamer2/src/videodec.c -@@ -27,9 +27,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - #include "mediastreamer2/msvideo.h" - #include "mediastreamer2/msticker.h" - #include "rfc2429.h" -+#ifndef INT64_C -+#define INT64_C(c) (c ## LL) -+#define UINT64_C(c) (c ## ULL) -+#endif -+#include <libavutil/avutil.h> -+#include <libavcodec/version.h> - -- -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - extern void ms_ffmpeg_check_init(); -+#endif - - - typedef struct DecState{ -@@ -50,7 +57,9 @@ typedef struct DecState{ - - static void dec_init(MSFilter *f, enum CodecID cid){ - DecState *s=(DecState *)ms_new0(DecState,1); -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - ms_ffmpeg_check_init(); -+#endif - - avcodec_get_context_defaults(&s->av_context); - s->av_codec=NULL; diff --git a/src/videoenc.c b/src/videoenc.c -index 21d016f..520f06a 100644 ---- mediastreamer2/src/videoenc.c -+++ mediastreamer2/src/videoenc.c -@@ -37,7 +37,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - #define RATE_CONTROL_MARGIN 15000 /*bits/second*/ +index 21d016f..fb35760 100644 +--- a/src/videoenc.c ++++ b/src/videoenc.c +@@ -39,6 +39,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) static bool_t avcodec_initialized=FALSE; -+#endif ++#ifndef FF_I_TYPE ++#define FF_I_TYPE AV_PICTURE_TYPE_I ++#endif ++ #ifdef ENABLE_LOG_FFMPEG -@@ -51,6 +53,7 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) - - #endif + void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) +@@ -53,7 +57,9 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) void ms_ffmpeg_check_init(){ if(!avcodec_initialized){ ++#ifdef FF_API_AVCODEC_INIT avcodec_init(); -@@ -62,6 +65,7 @@ void ms_ffmpeg_check_init(){ - #endif - } - } +#endif - - /* the goal of this small object is to tell when to send I frames at startup: - at 2 and 4 seconds*/ -@@ -201,7 +205,9 @@ static void enc_init(MSFilter *f, enum CodecID codec) - { - EncState *s=(EncState *)ms_new(EncState,1); - f->data=s; -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - ms_ffmpeg_check_init(); -+#endif - s->profile=0;/*always default to profile 0*/ - s->comp_buf=NULL; - s->fps=15; -@@ -300,9 +306,13 @@ static void prepare_h263(EncState *s){ + avcodec_register_all(); + avcodec_initialized=TRUE; + #ifdef ENABLE_LOG_FFMPEG +@@ -300,10 +306,10 @@ static void prepare_h263(EncState *s){ if (s->profile==0){ s->codec=CODEC_ID_H263; }else{ -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) ++ /* c->flags|=CODEC_FLAG_H263P_UMV; -+#endif c->flags|=CODEC_FLAG_AC_PRED; -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT; -+#endif - /* +- /* c->flags|=CODEC_FLAG_OBMC; c->flags|=CODEC_FLAG_AC_PRED; -@@ -372,7 +382,11 @@ static void add_rfc2190_header(mblk_t **packet, AVCodecContext *context){ - // assume video size is CIF or QCIF - if (context->width == 352 && context->height == 288) header->b_wptr[1] = 0x60; - else header->b_wptr[1] = 0x40; -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - if (context->coded_frame->pict_type != FF_I_TYPE) header->b_wptr[1] |= 0x10; -+#else -+ if (context->coded_frame->pict_type != AV_PICTURE_TYPE_I) header->b_wptr[1] |= 0x10; -+#endif - header->b_wptr += 4; - header->b_cont = *packet; - *packet = header; -@@ -779,7 +793,11 @@ static void process_frame(MSFilter *f, mblk_t *inm){ - s->req_vfu=TRUE; - } - if (s->req_vfu){ -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - pict.pict_type=FF_I_TYPE; -+#else -+ pict.pict_type=AV_PICTURE_TYPE_I; -+#endif - s->req_vfu=FALSE; - } - comp_buf->b_rptr=comp_buf->b_wptr=comp_buf->b_datap->db_base; -@@ -799,7 +817,11 @@ static void process_frame(MSFilter *f, mblk_t *inm){ - if (s->framenum==1){ - video_starter_first_frame (&s->starter,f->ticker->time); - } -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - if (c->coded_frame->pict_type==FF_I_TYPE){ -+#else -+ if (c->coded_frame->pict_type==AV_PICTURE_TYPE_I){ -+#endif - ms_message("Emitting I-frame"); - } - comp_buf->b_wptr+=error; -@@ -1067,7 +1089,9 @@ MSFilterDesc ms_mjpeg_enc_desc={ - #endif - - void __register_ffmpeg_encoders_if_possible(void){ -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - ms_ffmpeg_check_init(); -+#endif - if (avcodec_find_encoder(CODEC_ID_MPEG4)) - ms_filter_register(&ms_mpeg4_enc_desc); - if (avcodec_find_encoder(CODEC_ID_H263)){ + */ diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 94e4336a6..d437814f7 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,44 +1,29 @@ -# $Id: PKGBUILD 175899 2013-01-23 16:58:37Z andyrtr $ +# $Id: PKGBUILD 178616 2013-02-25 20:44:59Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa -pkgname=('libglapi' 'libgl' 'mesa' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') -[[ "$CARCH" != "mips64el" ]] && pkgname+=('ati-dri' 'intel-dri' 'svga-dri' 'nouveau-dri') - -#_git=true -#_gitdate=20121006 -_git=false - -if [ "${_git}" = "true" ]; then - pkgver=8.99.git_$_gitdate - else - pkgver=9.0.2 -fi -pkgrel=1 +pkgname=('mesa' 'mesa-libgl') +pkgver=9.1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') -makedepends=('glproto>=1.4.16' 'libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>=1.1.3' 'expat>=2.1.0' 'libx11>=1.5.0' 'libxt>=1.1.3' - 'gcc-libs>=4.7.1-6' 'dri2proto>=2.8' 'python2' 'libxml2' 'imake' 'systemd') -[[ "$CARCH" != "mips64el" ]] && makedepends+=('llvm-amdgpu-snapshot' 'libvdpau>=0.5') +makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage' + 'wayland') +if [ "$CARCH" != "mips64el" ]; then + pkgname+=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri') + makedepends+=('libvdpau' 'llvm-amdgpu-snapshot') +fi url="http://mesa3d.sourceforge.net" license=('custom') options=('!libtool') -source=(LICENSE llvm32.patch) -if [ "${_git}" = "true" ]; then - # mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0 - #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz') - source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-7851d398def2df3f6836a500d67123eed50f3943.tar.gz") - else - source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" - #source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/8.0/MesaLib-8.0-rc2.tar.bz2" -) -fi -source+=(mesa-loongson.patch) +source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2 + #ftp://ftp.freedesktop.org/pub/mesa/9.1/MesaLib-9.1-rc2.tar.bz2 # for RC testing + LICENSE) +md5sums=('d3891e02215422e120271d976ff1947e' + '5c65a0fe315dd347e09b1f2826a1df5a') build() { cd ${srcdir}/?esa-* - - patch -Np1 -i ${srcdir}/llvm32.patch if [ "$CARCH" = "mips64el" ]; then extraconf="--with-gallium-drivers=swrast --with-dri-drivers=swrast --disable-gallium-llvm --disable-vdpau" @@ -49,7 +34,9 @@ build() { patch -Np1 -i $srcdir/mesa-loongson.patch # patch -Np1 -i ${srcdir}/git_fixes.diff - COMMONOPTS="--prefix=/usr \ + autoreconf -vfi # our automake is far too new for their build system :) + + ./configure --prefix=/usr \ --sysconfdir=/etc \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \ @@ -57,7 +44,7 @@ build() { --enable-gallium-llvm \ --enable-egl \ --enable-gallium-egl \ - --with-egl-platforms=x11,drm \ + --with-egl-platforms=x11,drm,wayland \ --enable-shared-glapi \ --enable-gbm \ --enable-glx-tls \ @@ -69,244 +56,108 @@ build() { --enable-texture-float \ --enable-xa \ --enable-vdpau \ - $extraconf " - -# not default: -# --enable-gallium-egl enable optional EGL state tracker (not required for -# EGL support in Gallium with OpenGL and OpenGL ES) -# [default=disable] -# --enable-xa enable build of the XA X Acceleration API [default=no] - - -if [ "${_git}" = "true" ]; then - ./autogen.sh \ - $COMMONOPTS - else - autoreconf -vfi - ./configure \ - $COMMONOPTS -fi - - # fix a build break with new llvm - sed -i "s:-Werror=implicit-function-declaration::" src/gallium/drivers/r600/Makefile + $extraconf + # --help + # --with-llvm-shared-libs \ # enabling this would force us to move llvm-amdgpu-snapshot from community to extra, delay it until llvm 3.3 / Mesa 9.2/10.0 make -} - -package_libglapi() { - depends=('glibc') - pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions" - - make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/libglapi" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libglapi/" -} - -package_libgl() { - depends=('libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>=1.1.3' 'expat>=2.1.0' 'libglapi' 'gcc-libs') - pkgdesc="Mesa 3-D graphics library and DRI software rasterizer" - - # fix linking because of splitted package - make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install - - # libGL & libdricore - make -C ${srcdir}/?esa-*/src/glx DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install - - # fix linking because of splitted package - cleanup - make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall - - - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install - - # See FS#26284 - install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions" - ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" - - install -m755 -d "${pkgdir}/usr/share/licenses/libgl" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/" -} - -package_mesa() { - # check also gl.pc - depends=('libgl' 'libx11>=1.5.0' 'libxext>=1.3.1' 'libxdamage' 'libxfixes' 'libxcb' 'libxxf86vm') - optdepends=('opengl-man-pages: for the OpenGL API man pages') - pkgdesc="Mesa 3-D graphics libraries and include files" - - make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-glHEADERS - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri DESTDIR="${pkgdir}" install-driincludeHEADERS - make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-pkgconfigDATA - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri DESTDIR="${pkgdir}" install-pkgconfigDATA - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/common DESTDIR="${pkgdir}" install-sysconfDATA - - [ "$CARCH" != "mips64el" ] && make -C ${srcdir}/?esa-*/src/gallium/targets/xa-vmwgfx DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/mesa" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/" -} - -package_osmesa() { - depends=('libglapi' 'gcc-libs') - optdepends=('opengl-man-pages: for the OpenGL API man pages') - pkgdesc="Mesa 3D off-screen rendering library" - - # fix linking because of splitted package - make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install - - make -C ${srcdir}/?esa-*/src/mesa/drivers/osmesa DESTDIR="${pkgdir}" install - - # fix linking because of splitted package - cleanup - make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall - - install -m755 -d "${pkgdir}/usr/share/licenses/osmesa" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/osmesa/" -} - -package_libgbm() { - depends=('systemd' 'libglapi' 'libdrm') - pkgdesc="Mesa gbm library" - - # fix linking because of splitted package - make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install - - make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" install - - # fix linking because of splitted package - cleanup - make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall - - install -m755 -d "${pkgdir}/usr/share/licenses/libgbm" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgbm/" -} - -package_libgles() { - depends=('libglapi' 'libdrm' 'khrplatform-devel') - pkgdesc="Mesa GLES libraries and headers" - - # fix linking because of splitted package - make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install - - make -C ${srcdir}/?esa-*/src/mapi/es1api DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/mapi/es2api DESTDIR="${pkgdir}" install - - # fix linking because of splitted package - cleanup - make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall - - install -m755 -d "${pkgdir}/usr/share/licenses/libgles" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgles/" -} - -package_libegl() { - # check also egl.pc - depends=('libx11' 'libxext' 'libxdamage' 'libxfixes' 'libxxf86vm' 'libxcb' 'libgbm' 'khrplatform-devel') - pkgdesc="Mesa EGL libraries and headers" - - make -C ${srcdir}/?esa-*/src/gallium/targets/egl-static DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/doc/libegl" - install -m644 ${srcdir}/?esa-*/docs/egl.html "${pkgdir}/usr/share/doc/libegl/" - - # fix linking because of splitted package - make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" install - - make -C ${srcdir}/?esa-*/src/egl DESTDIR="${pkgdir}" install - - # fix linking because of splitted package - cleanup - make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" uninstall - make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall - - install -m755 -d "${pkgdir}/usr/share/licenses/libegl" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/" - - # fix file conflicts - rm -rf ${pkgdir}/usr/include/KHR -} - -package_khrplatform-devel() { - pkgdesc="Khronos platform development package" - - install -m755 -d "${pkgdir}/usr/include/KHR" - install -m644 ${srcdir}/?esa-*/include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/" - - install -m755 -d "${pkgdir}/usr/share/licenses/khrplatform-devel" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/khrplatform-devel/" + # fake installation + mkdir $srcdir/fakeinstall + make DESTDIR=${srcdir}/fakeinstall install } package_ati-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI Radeon" + pkgdesc="Mesa drivers for AMD/ATI Radeon" + depends=("mesa-libgl=${pkgver}") conflicts=('xf86-video-ati<6.9.0-6') - # fix linking because of splitted package - make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install - - # classic mesa drivers for radeon,r200 - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install - # gallium3D driver for r300,r600,radeonsi - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-radeonsi DESTDIR="${pkgdir}" install - # vdpau driver - make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-r300 DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-r600 DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-radeonsi DESTDIR="${pkgdir}" install - - # fix linking because of splitted package - cleanup - make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall + install -m755 -d ${pkgdir}/usr/lib/vdpau/ + mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_{r300,r600,radeonsi}.* ${pkgdir}/usr/lib/vdpau/ + install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri + mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{r200,r300,r600,radeon,radeonsi}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/ + + install -m755 -d ${pkgdir}/usr/lib/gallium-pipe + mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_{r300,r600,radeonsi}* ${pkgdir}/usr/lib/gallium-pipe/ + install -m755 -d "${pkgdir}/usr/share/licenses/ati-dri" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/ati-dri/" } package_intel-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for Intel" - - # fix linking because of splitted package - make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install + pkgdesc="Mesa drivers for Intel" + depends=("mesa-libgl=${pkgver}") - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install + install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri + mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{i915,i965}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/ - # fix linking because of splitted package - cleanup - make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall - install -m755 -d "${pkgdir}/usr/share/licenses/intel-dri" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/intel-dri/" } package_nouveau-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau" + pkgdesc="Mesa drivers for Nouveau" + depends=("mesa-libgl=${pkgver}") - # fix linking because of splitted package - make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install + install -m755 -d ${pkgdir}/usr/lib/vdpau/ + mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib/vdpau/ - # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install - # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install - # vdpau driver - make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-nouveau DESTDIR="${pkgdir}" install + install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri + mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/nouveau_{dri,vieux_dri}.so ${pkgdir}/usr/lib/xorg/modules/dri/ - # fix linking because of splitted package - cleanup - make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall + install -m755 -d ${pkgdir}/usr/lib/gallium-pipe + mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_nouveau* ${pkgdir}/usr/lib/gallium-pipe/ install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/nouveau-dri/" } package_svga-dri() { - depends=('gcc-libs' 'libdrm' 'expat') pkgdesc="Gallium3D VMware guest GL driver" + depends=('gcc-libs' 'libdrm' 'expat' 'libffi') - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install + install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri + mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/vmwgfx_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/ + + install -m755 -d ${pkgdir}/usr/lib/gallium-pipe + mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_vmwgfx* ${pkgdir}/usr/lib/gallium-pipe/ install -m755 -d "${pkgdir}/usr/share/licenses/svga-dri" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/svga-dri/" } -md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' - '5fe9ad0c5beed19bc98d8c34aaad4ade' - 'dc45d1192203e418163e0017640e1cfc' - '598c24dccfcdcc99c07d883f7c09f36a') + +package_mesa() { + pkgdesc="an open-source implementation of the OpenGL specification" + depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'systemd') + optdepends=('opengl-man-pages: for the OpenGL API man pages') + provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') + conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') + replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') + [ "$CARCH" != "mips64el" ] && depends+=('libvdpau') + + mv -v ${srcdir}/fakeinstall/* ${pkgdir} + # rename libgl.so to not conflict with blobs - may break gl.pc ? + mv ${pkgdir}/usr/lib/libGL.so.1.2.0 ${pkgdir}/usr/lib/mesa-libGL.so.1.2.0 + rm ${pkgdir}/usr/lib/libGL.so{,.1} + + install -m755 -d "${pkgdir}/usr/share/licenses/mesa" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/" +} + +package_mesa-libgl() { + pkgdesc="Mesa 3-D graphics library" + depends=("mesa=${pkgver}") + provides=("libgl=${pkgver}") + replaces=('libgl') + + # See FS#26284 + install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions" + ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" + + ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so + ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1 + ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1.2.0 + + install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/" +} diff --git a/extra/mesa/llvm32.patch b/extra/mesa/llvm32.patch deleted file mode 100644 index 946c07849..000000000 --- a/extra/mesa/llvm32.patch +++ /dev/null @@ -1,284 +0,0 @@ -From 8d9778589f4b3a174e884338adb0fe1bdeca5eb7 Mon Sep 17 00:00:00 2001 -From: Tom Stellard <thomas.stellard@amd.com> -Date: Thu, 10 May 2012 14:21:54 +0000 -Subject: radeon: Support LLVM 3.2 - -LLVM 3.2 and newer requires that the R600/SI backend be part of the -LLVM tree. ---- -diff --git a/configure.ac b/configure.ac -index 896f98a..32f412b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1661,6 +1661,7 @@ if test "x$enable_gallium_llvm" = xyes; then - if $LLVM_CONFIG --components | grep -q '\<mcjit\>'; then - LLVM_COMPONENTS="${LLVM_COMPONENTS} mcjit" - fi -+ LLVM_COMPONENTS="${LLVM_COMPONENTS} all-targets" - if test "x$enable_opencl" = xyes; then - LLVM_COMPONENTS="${LLVM_COMPONENTS} ipo linker instrumentation" - fi -@@ -1782,6 +1783,23 @@ gallium_require_drm_loader() { - fi - } - -+radeon_llvm_check() { -+ LLVM_VERSION_MAJOR=`echo $LLVM_VERSION | cut -d. -f1` -+ if test "$LLVM_VERSION_MAJOR" -lt "3" -o "x$LLVM_VERSION" = "x3.0"; then -+ AC_MSG_ERROR([LLVM 3.1 or newer is required for the r600/radeonsi llvm compiler.]) -+ fi -+ if test "$LLVM_VERSION_MAJOR" -ge "3" -a "x$LLVM_VERSION" != "x3.1" && $LLVM_CONFIG --targets-built | grep -qv '\<AMDGPU\>' ; then -+ AC_MSG_ERROR([To use the r600/radeonsi LLVM backend with LLVM 3.2 and newer, you need to fetch the LLVM source from: -+ git://people.freedesktop.org/~tstellar/llvm master -+ and build with --enable-experimental-targets==AMDGPU]) -+ fi -+ if test "$LLVM_VERSION" = "3.2"; then -+ dnl LLVM 3.2 does not add experimental libraries to llvm-config's -+ dnl library list. -+ LLVM_LIBS="$LLVM_LIBS -lLLVMAMDGPUCodeGen -lLLVMAMDGPUDesc -lLLVMAMDGPUAsmPrinter -lLLVMAMDGPUInfo `$LLVM_CONFIG --libs mc`" -+ fi -+} -+ - dnl Gallium drivers - dnl Duplicates in GALLIUM_DRIVERS_DIRS are removed by sorting it after this block - if test "x$with_gallium_drivers" != x; then -@@ -1812,9 +1830,7 @@ if test "x$with_gallium_drivers" != x; then - gallium_require_drm_loader - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600" - if test "x$enable_r600_llvm" = xyes -o "x$enable_opencl" = xyes; then -- if test "x$LLVM_VERSION" != "x3.1"; then -- AC_MSG_ERROR([LLVM 3.1 is required for the r600 llvm compiler.]) -- fi -+ radeon_llvm_check - NEED_RADEON_GALLIUM=yes; - fi - if test "x$enable_r600_llvm" = xyes; then -@@ -1829,9 +1845,7 @@ if test "x$with_gallium_drivers" != x; then - PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED]) - gallium_require_drm_loader - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS radeonsi" -- if test "x$LLVM_VERSION" != "x3.1"; then -- AC_MSG_ERROR([LLVM 3.1 is required to build the radeonsi driver.]) -- fi -+ radeon_llvm_check - NEED_RADEON_GALLIUM=yes; - gallium_check_st "radeon/drm" "dri-radeonsi" "xorg-radeonsi" "" "" "vdpau-radeonsi" "" - ;; -diff --git a/src/gallium/drivers/radeon/Makefile b/src/gallium/drivers/radeon/Makefile -index 7f1c613..bcc2646 100644 ---- a/src/gallium/drivers/radeon/Makefile -+++ b/src/gallium/drivers/radeon/Makefile -@@ -12,6 +12,12 @@ TBLGEN = $(LLVM_BINDIR)/llvm-tblgen - - CXXFLAGS+= $(LLVM_CXXFLAGS) - -+ifeq ($(LLVM_VERSION),3.1) -+ CPP_SOURCES += $(LLVM_CPP_SOURCES) -+else -+ CXXFLAGS+= -DEXTERNAL_LLVM -+endif -+ - include ../../Makefile.template - - CXXFLAGS := $(filter-out -DDEBUG, $(CXXFLAGS)) -diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources -index c5d1207..5e79342 100644 ---- a/src/gallium/drivers/radeon/Makefile.sources -+++ b/src/gallium/drivers/radeon/Makefile.sources -@@ -23,8 +23,7 @@ TD_FILES := \ - SIRegisterInfo.td \ - SISchedule.td - -- --GENERATED_SOURCES := \ -+LLVM_GENERATED_SOURCES := \ - R600Intrinsics.td \ - R600RegisterInfo.td \ - SIRegisterInfo.td \ -@@ -41,7 +40,7 @@ GENERATED_SOURCES := \ - AMDGPUGenMCCodeEmitter.inc \ - AMDGPUGenDFAPacketizer.inc - --CPP_SOURCES := \ -+LLVM_CPP_SOURCES := \ - AMDIL7XXDevice.cpp \ - AMDILCFGStructurizer.cpp \ - AMDILDevice.cpp \ -@@ -81,6 +80,8 @@ CPP_SOURCES := \ - MCTargetDesc/SIMCCodeEmitter.cpp \ - MCTargetDesc/R600MCCodeEmitter.cpp \ - TargetInfo/AMDGPUTargetInfo.cpp \ -+ -+CPP_SOURCES := \ - radeon_llvm_emit.cpp - - C_SOURCES := \ -diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp -index 1b67bfe..625b0b4 100644 ---- a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp -+++ b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp -@@ -90,6 +90,7 @@ radeon_llvm_compile(LLVMModuleRef M, unsigned char ** bytes, - /* XXX: Can we just initialize the AMDGPU target here? */ - InitializeAllTargets(); - InitializeAllTargetMCs(); -+ InitializeAllAsmPrinters(); - #else - LLVMInitializeAMDGPUTargetInfo(); - LLVMInitializeAMDGPUTarget(); --- -cgit v0.9.0.2-2-gbebe -From 67fcb3c2b4ecbd87e465b6c6b316be44811ea116 Mon Sep 17 00:00:00 2001 -From: Tom Stellard <thomas.stellard@amd.com> -Date: Mon, 01 Oct 2012 21:00:00 +0000 -Subject: configure.ac: Use amdgpu component for LLVM 3.2 - -The amdgpu component actually does exist. I must have been using an -older version of llvm-config by accident when I first made this change. ---- -diff --git a/configure.ac b/configure.ac -index 32f412b..0de506d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1793,10 +1793,8 @@ radeon_llvm_check() { - git://people.freedesktop.org/~tstellar/llvm master - and build with --enable-experimental-targets==AMDGPU]) - fi -- if test "$LLVM_VERSION" = "3.2"; then -- dnl LLVM 3.2 does not add experimental libraries to llvm-config's -- dnl library list. -- LLVM_LIBS="$LLVM_LIBS -lLLVMAMDGPUCodeGen -lLLVMAMDGPUDesc -lLLVMAMDGPUAsmPrinter -lLLVMAMDGPUInfo `$LLVM_CONFIG --libs mc`" -+ if test "x$LLVM_VERSION" = "x3.2"; then -+ LLVM_LIBS="$LLVM_LIBS `$LLVM_CONFIG --libs amdgpu`" - fi - } - --- -cgit v0.9.0.2-2-gbebe -From 4cc530f452436a5304a628d1428ed7f07247a175 Mon Sep 17 00:00:00 2001 -From: Tom Stellard <thomas.stellard@amd.com> -Date: Wed, 10 Oct 2012 21:00:13 +0000 -Subject: radeon/llvm: Fix build with LLVM 3.2 - ---- -diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp -index 2f2eb4c..21661a0 100644 ---- a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp -+++ b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp -@@ -36,13 +36,16 @@ - #include <llvm/Support/TargetRegistry.h> - #include <llvm/Support/TargetSelect.h> - #include <llvm/Support/Threading.h> --#include <llvm/Target/TargetData.h> - #include <llvm/Target/TargetMachine.h> -- - #include <llvm/Transforms/Scalar.h> -- - #include <llvm-c/Target.h> - -+#if HAVE_LLVM < 0x0302 -+#include <llvm/Target/TargetData.h> -+#else -+#include <llvm/DataLayout.h> -+#endif -+ - #include <iostream> - #include <stdlib.h> - #include <stdio.h> -@@ -120,7 +123,11 @@ radeon_llvm_compile(LLVMModuleRef M, unsigned char ** bytes, - )); - TargetMachine &AMDGPUTargetMachine = *tm.get(); - PassManager PM; -+#if HAVE_LLVM < 0x0302 - PM.add(new TargetData(*AMDGPUTargetMachine.getTargetData())); -+#else -+ PM.add(new DataLayout(*AMDGPUTargetMachine.getDataLayout())); -+#endif - PM.add(createPromoteMemoryToRegisterPass()); - AMDGPUTargetMachine.setAsmVerbosityDefault(true); - --- -cgit v0.9.0.2-2-gbebe -From b21455f27db6e55e708f8e264f4a15412ee8fa52 Mon Sep 17 00:00:00 2001 -From: Dmitry Cherkasov <dcherkassov@gmail.com> -Date: Wed, 17 Oct 2012 18:03:13 +0000 -Subject: configure.ac: Fix LLVM 3.2 r600/radeonsi error message - -Reviewed-by: Tom Stellard <thomas.stellard@amd.com> -Signed-off-by: Dmitry Cherkasov <Dmitrii.Cherkasov@amd.com> ---- -diff --git a/configure.ac b/configure.ac -index aefa142..ca24856 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1757,7 +1757,7 @@ radeon_llvm_check() { - if test "$LLVM_VERSION_MAJOR" -ge "3" -a "x$LLVM_VERSION" != "x3.1" && $LLVM_CONFIG --targets-built | grep -qv '\<AMDGPU\>' ; then - AC_MSG_ERROR([To use the r600/radeonsi LLVM backend with LLVM 3.2 and newer, you need to fetch the LLVM source from: - git://people.freedesktop.org/~tstellar/llvm master -- and build with --enable-experimental-targets==AMDGPU]) -+ and build with --enable-experimental-targets=AMDGPU]) - fi - if test "x$LLVM_VERSION" = "x3.2"; then - LLVM_LIBS="$LLVM_LIBS `$LLVM_CONFIG --libs amdgpu`" --- -cgit v0.9.0.2-2-gbebe -From d2b0338e3354fadc90a3751520f4aa44ba01954f Mon Sep 17 00:00:00 2001 -From: Tom Stellard <thomas.stellard@amd.com> -Date: Wed, 17 Oct 2012 19:21:48 +0000 -Subject: r600g: Remove special handling of PRED_SET* insructions for LLVM 3.2 - -The 3.2 version of the backend now sets all the correct fields for -PRED_SET* instructions. ---- -diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c -index 053a988..58b7fb2 100644 ---- a/src/gallium/drivers/r600/r600_shader.c -+++ b/src/gallium/drivers/r600/r600_shader.c -@@ -330,6 +330,7 @@ static unsigned r600_alu_from_byte_stream(struct r600_shader_ctx *ctx, - alu.src[src_idx].sel += 512; - } - -+#if HAVE_LLVM < 0x0302 - if (alu.inst == CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETNE) || - alu.inst == CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETE) || - alu.inst == CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETE_INT) || -@@ -340,6 +341,7 @@ static unsigned r600_alu_from_byte_stream(struct r600_shader_ctx *ctx, - alu.src[1].chan = 0; - alu.last = 1; - } -+#endif - - if (alu.execute_mask) { - alu.pred_sel = 0; --- -cgit v0.9.0.2-2-gbebe -From f2f17fc348c847bbf5c54bb75b76e1661e8ced60 Mon Sep 17 00:00:00 2001 -From: Tom Stellard <thomas.stellard@amd.com> -Date: Mon, 01 Oct 2012 21:01:06 +0000 -Subject: radeon/llvm: Only initialize the AMDGPU target - ---- -diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp -index 625b0b4..2f2eb4c 100644 ---- a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp -+++ b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp -@@ -86,17 +86,11 @@ radeon_llvm_compile(LLVMModuleRef M, unsigned char ** bytes, - - Triple AMDGPUTriple(sys::getDefaultTargetTriple()); - --#ifdef EXTERNAL_LLVM -- /* XXX: Can we just initialize the AMDGPU target here? */ -- InitializeAllTargets(); -- InitializeAllTargetMCs(); -- InitializeAllAsmPrinters(); --#else - LLVMInitializeAMDGPUTargetInfo(); - LLVMInitializeAMDGPUTarget(); - LLVMInitializeAMDGPUTargetMC(); - LLVMInitializeAMDGPUAsmPrinter(); --#endif -+ - std::string err; - const Target * AMDGPUTarget = TargetRegistry::lookupTarget("r600", err); - if(!AMDGPUTarget) { --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/monodevelop-debugger-gdb/PKGBUILD b/extra/monodevelop-debugger-gdb/PKGBUILD index 1dc7e8fae..2c527a93e 100644 --- a/extra/monodevelop-debugger-gdb/PKGBUILD +++ b/extra/monodevelop-debugger-gdb/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 175074 2013-01-12 15:33:07Z daniel $ +# $Id: PKGBUILD 178507 2013-02-24 19:41:09Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=monodevelop-debugger-gdb -pkgver=3.0.6 +pkgver=4.0 pkgrel=1 pkgdesc="Mono Debugger support" arch=('i686' 'x86_64') # also "any" pkg? @@ -12,7 +12,7 @@ depends=('monodevelop>=3.0.6' 'gdb') makedepends=('mono') options=('!makeflags') source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('9f3d08104d01e536342ffe15bdd5727c') +md5sums=('35424c9cb2218840c015f49821219c5b') build() { export MONO_SHARED_DIR="${srcdir}/.wabi" diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD index 85c19338a..7aaeb4c1f 100644 --- a/extra/monodevelop/PKGBUILD +++ b/extra/monodevelop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 175072 2013-01-12 15:31:21Z daniel $ +# $Id: PKGBUILD 178505 2013-02-24 19:40:36Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Timm Preetz <timm@preetz.us> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=monodevelop -pkgver=3.0.6 +pkgver=4.0 pkgrel=1 pkgdesc="An IDE primarily designed for C# and other .NET languages" @@ -19,7 +19,7 @@ options=(!makeflags) install=monodevelop.install source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 monodevelop-core-addins.pc.in.patch) -md5sums=('748d0fb89c40c2cb5a9267c8635eb55d' +md5sums=('811e09cbddc262d138fed1e119a52df7' '8466d032735130e37d4091a793a7966c') build() { diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD index 47e41a0ca..9bcd457bb 100644 --- a/extra/mpg123/PKGBUILD +++ b/extra/mpg123/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164185 2012-07-27 04:44:49Z eric $ +# $Id: PKGBUILD 178521 2013-02-25 01:06:11Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=mpg123 -pkgver=1.14.4 -pkgrel=1.1 +pkgver=1.15.1 +pkgrel=1 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/mpg123" @@ -17,8 +17,8 @@ conflicts=('mpg321') provides=('mpg321') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) -sha1sums=('9f53e27bb40b8df3d3b6df25f5f9a8a83b1fccfe' - '28ab232dd9bcec8bbb00026cc60960b719d14fed') +sha1sums=('824003a25f22dde5a03031cb658b6d6a160e8740' + 'ae0a4dfa3ca194641df2a6f5d165883f5a2a7093') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/mtr/PKGBUILD b/extra/mtr/PKGBUILD index aed9ba88e..64352bd03 100644 --- a/extra/mtr/PKGBUILD +++ b/extra/mtr/PKGBUILD @@ -1,33 +1,38 @@ -# $Id: PKGBUILD 144089 2011-12-03 12:24:56Z ibiru $ +# $Id: PKGBUILD 178764 2013-02-26 18:56:25Z ioni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgbase=mtr pkgname=(mtr mtr-gtk) -pkgver=0.82 -pkgrel=1.2 +pkgver=0.83 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') makedepends=('ncurses' 'gtk2') -source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz) +source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz + mtr-glib2.patch) url="http://www.bitwizard.nl/mtr/" -md5sums=('10601ea543fda3e51545c4bce195b64c') +md5sums=('2e3a40f2da47748ad0053a5d678b9b4a' + '6bce08e1de7c6835bdda893847981bc8') build() { - install -d "$srcdir/"{mtr-cli,mtr-gtk} - cd "$srcdir/mtr-cli" - ../$pkgbase-$pkgver/configure --prefix=/usr --disable-gtktest --without-gtk + patch -Np0 -i mtr-glib2.patch + cp -r $pkgbase-$pkgver $pkgbase-cli + cd mtr-cli + ./bootstrap.sh + ./configure --prefix=/usr --without-gtk make - cd "$srcdir/mtr-gtk" - ../$pkgbase-$pkgver/configure --prefix=/usr + cd "$srcdir/$pkgbase-$pkgver" + ./bootstrap.sh + ./configure --prefix=/usr make } package_mtr() { pkgdesc="Combines the functionality of traceroute and ping into one tool (CLI version)" - depends=('ncurses') - cd "$srcdir/mtr-cli" + depends=('ncurses' 'glib2') + cd mtr-cli make DESTDIR="$pkgdir" install } @@ -37,6 +42,6 @@ package_mtr-gtk() { conflicts=("mtr") provides=("mtr=$pkgver") - cd "$srcdir/mtr-gtk" + cd $pkgbase-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/mtr/mtr-glib2.patch b/extra/mtr/mtr-glib2.patch new file mode 100644 index 000000000..76a53fa6f --- /dev/null +++ b/extra/mtr/mtr-glib2.patch @@ -0,0 +1,26 @@ +diff -up mtr-0.83/configure.in.glib2 mtr-0.83/configure.in +--- mtr-0.83/configure.in.glib2 2013-02-18 20:10:00.767417356 +0100 ++++ mtr-0.83/configure.in 2013-02-18 20:10:53.549513018 +0100 +@@ -59,6 +59,8 @@ else + GTK_OBJ="" + fi + ++PKG_CHECK_MODULES([GLIB2], [glib-2.0]) ++ + AC_CHECK_FUNC(socket, , + AC_CHECK_LIB(socket, socket, , AC_MSG_ERROR(No socket library found))) + +diff -up mtr-0.83/Makefile.am.glib2 mtr-0.83/Makefile.am +--- mtr-0.83/Makefile.am.glib2 2013-02-18 20:13:54.635841512 +0100 ++++ mtr-0.83/Makefile.am 2013-02-18 20:16:17.877101679 +0100 +@@ -19,8 +19,9 @@ mtr_SOURCES = mtr.c \ + mtr-gtk.h + EXTRA_mtr_SOURCES = curses.c \ + gtk.c ++AM_CFLAGS = $(GLIB2_CFLAGS) + mtr_DEPENDENCIES = $(GTK_OBJ) $(CURSES_OBJ) +-mtr_LDFLAGS = $(GTK_OBJ) $(CURSES_OBJ) ++mtr_LDFLAGS = $(GTK_OBJ) $(GLIB2_LIBS) $(CURSES_OBJ) + + EXTRA_DIST = SECURITY mtr.8 Makefile Makefile.dist + distclean-local: diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD index 622484fb6..45a9762f4 100644 --- a/extra/mysql/PKGBUILD +++ b/extra/mysql/PKGBUILD @@ -1,30 +1,30 @@ -# $Id: PKGBUILD 176798 2013-01-31 15:46:51Z andrea $ +# $Id: PKGBUILD 178940 2013-03-01 05:59:24Z bpiotrowski $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') pkgver=5.5.30 -pkgrel=1 +pkgrel=6 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="https://www.mysql.com/products/community/" makedepends=('cmake' 'openssl' 'zlib') options=('!libtool') -source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz" - 'my.cnf' 'mysqld-post.sh' 'mysqld-tmpfile.conf' 'mysqld.service') -md5sums=('f0cdd56f89e781e800cf223bd9edd00c' - '1351485633baf9894cfdf7c5bbffd7b5' - '6ea6ceb360d09a774e87335ee098ddd5' - '2fa6e456964d4ff5e6d4f9ff0126aed6' - 'a0e1460c276a50a9666c331de83271f2') +source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz{,.asc} + mysqld-post.sh + mysqld-tmpfile.conf + mysqld.service) +sha256sums=('909fe596e0044082a02d2757b742a33b8a3ff399b589603940494d3d3d975053' + '27d3bba7b7f54f9f77cddba81a3fe124aeef918cc09eb28860338e9a4359e6f7' + '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd' + '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd' + '50212165bdb09855b97b15a917464ba34f82edf30a0c43f9a0c93a27071df556') build() { mkdir build cd build - # CFLAGS/CXXFLAGS as suggested upstream - cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -53,9 +53,9 @@ build() { -DWITH_EMBEDDED_SERVER=ON \ -DWITH_INNOBASE_STORAGE_ENGINE=1 \ -DWITH_PARTITION_STORAGE_ENGINE=1 \ + -DWITH_ARCHIVE_STORAGE_ENGINE=1 \ + -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ - -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \ - -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \ -DWITHOUT_FEDERATED_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" @@ -107,7 +107,7 @@ package_mysql(){ cd build make DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/mysql/my.cnf + install -Dm644 "${pkgdir}"/usr/share/mysql/my-medium.cnf "${pkgdir}"/etc/mysql/my.cnf install -Dm755 "${srcdir}"/mysqld-post.sh "${pkgdir}"/usr/bin/mysqld-post install -Dm644 "${srcdir}"/mysqld-tmpfile.conf "${pkgdir}"/usr/lib/tmpfiles.d/mysqld.conf install -d "${pkgdir}"/usr/lib/systemd/system @@ -127,5 +127,5 @@ package_mysql(){ 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 + #install -dm700 "${pkgdir}"/var/lib/mysql } diff --git a/extra/mysql/my.cnf b/extra/mysql/my.cnf deleted file mode 100644 index 387020858..000000000 --- a/extra/mysql/my.cnf +++ /dev/null @@ -1,145 +0,0 @@ -# MySQL config file for medium systems. -# -# This is for a system with little memory (32M - 64M) where MySQL plays -# an important part, or systems up to 128M where MySQL is used together with -# other programs (such as a web server) -# -# MySQL programs look for option files in a set of -# locations which depend on the deployment platform. -# You can copy this option file to one of those -# locations. For information about these locations, see: -# http://dev.mysql.com/doc/mysql/en/option-files.html -# -# In this file, you can use all long options that a program supports. -# If you want to know which options a program supports, run the program -# with the "--help" option. - -# The following options will be passed to all MySQL clients -[client] -#password = your_password -port = 3306 -socket = /run/mysqld/mysqld.sock - -# Here follows entries for some specific programs - -# The MySQL server -[mysqld] -port = 3306 -socket = /run/mysqld/mysqld.sock -datadir = /var/lib/mysql -skip-external-locking -key_buffer_size = 16M -max_allowed_packet = 1M -table_open_cache = 64 -sort_buffer_size = 512K -net_buffer_length = 8K -read_buffer_size = 256K -read_rnd_buffer_size = 512K -myisam_sort_buffer_size = 8M - -# Don't listen on a TCP/IP port at all. This can be a security enhancement, -# if all processes that need to connect to mysqld run on the same host. -# All interaction with mysqld must be made via Unix sockets or named pipes. -# Note that using this option without enabling named pipes on Windows -# (via the "enable-named-pipe" option) will render mysqld useless! -# -skip-networking - -# Replication Master Server (default) -# binary logging is required for replication -log-bin=mysql-bin - -# binary logging format - mixed recommended -binlog_format=mixed - -# required unique id between 1 and 2^32 - 1 -# defaults to 1 if master-host is not set -# but will not function as a master if omitted -server-id = 1 - -# Replication Slave (comment out master section to use this) -# -# To configure this host as a replication slave, you can choose between -# two methods : -# -# 1) Use the CHANGE MASTER TO command (fully described in our manual) - -# the syntax is: -# -# CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>, -# MASTER_USER=<user>, MASTER_PASSWORD=<password> ; -# -# where you replace <host>, <user>, <password> by quoted strings and -# <port> by the master's port number (3306 by default). -# -# Example: -# -# CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306, -# MASTER_USER='joe', MASTER_PASSWORD='secret'; -# -# OR -# -# 2) Set the variables below. However, in case you choose this method, then -# start replication for the first time (even unsuccessfully, for example -# if you mistyped the password in master-password and the slave fails to -# connect), the slave will create a master.info file, and any later -# change in this file to the variables' values below will be ignored and -# overridden by the content of the master.info file, unless you shutdown -# the slave server, delete master.info and restart the slaver server. -# For that reason, you may want to leave the lines below untouched -# (commented) and instead use CHANGE MASTER TO (see above) -# -# required unique id between 2 and 2^32 - 1 -# (and different from the master) -# defaults to 2 if master-host is set -# but will not function as a slave if omitted -#server-id = 2 -# -# The replication master for this slave - required -#master-host = <hostname> -# -# The username the slave will use for authentication when connecting -# to the master - required -#master-user = <username> -# -# The password the slave will authenticate with when connecting to -# the master - required -#master-password = <password> -# -# The port the master is listening on. -# optional - defaults to 3306 -#master-port = <port> -# -# binary logging - not required for slaves, but recommended -#log-bin=mysql-bin - -# Uncomment the following if you are using InnoDB tables -#innodb_data_home_dir = /var/lib/mysql -#innodb_data_file_path = ibdata1:10M:autoextend -#innodb_log_group_home_dir = /var/lib/mysql -# You can set .._buffer_pool_size up to 50 - 80 % -# of RAM but beware of setting memory usage too high -#innodb_buffer_pool_size = 16M -#innodb_additional_mem_pool_size = 2M -# Set .._log_file_size to 25 % of buffer pool size -#innodb_log_file_size = 5M -#innodb_log_buffer_size = 8M -#innodb_flush_log_at_trx_commit = 1 -#innodb_lock_wait_timeout = 50 - -[mysqldump] -quick -max_allowed_packet = 16M - -[mysql] -no-auto-rehash -# Remove the next comment character if you are not familiar with SQL -#safe-updates - -[myisamchk] -key_buffer_size = 20M -sort_buffer_size = 20M -read_buffer = 2M -write_buffer = 2M - -[mysqlhotcopy] -interactive-timeout diff --git a/extra/mysql/mysql.install b/extra/mysql/mysql.install index a98f1a877..907e98656 100644 --- a/extra/mysql/mysql.install +++ b/extra/mysql/mysql.install @@ -1,15 +1,24 @@ +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 - chown -R mysql:mysql var/lib/mysql &>/dev/null + useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null + + 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 + 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)" -lt 0 ]; then echo " >> " diff --git a/extra/mysql/mysqld-post.sh b/extra/mysql/mysqld-post.sh index 8dc9c4eea..c4ac18171 100755 --- a/extra/mysql/mysqld-post.sh +++ b/extra/mysql/mysqld-post.sh @@ -1,7 +1,8 @@ #!/bin/sh while true; do - response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break + 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/extra/mysql/mysqld.service b/extra/mysql/mysqld.service index 0175c685b..a6fc8cf88 100644 --- a/extra/mysql/mysqld.service +++ b/extra/mysql/mysqld.service @@ -1,11 +1,16 @@ [Unit] -Description=MySQL Server +Description=MySQL database server +After=syslog.target [Service] User=mysql -ExecStart=/usr/bin/mysqld --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/extra/nautilus-open-terminal/PKGBUILD b/extra/nautilus-open-terminal/PKGBUILD index f596fdfc8..06a0bee40 100644 --- a/extra/nautilus-open-terminal/PKGBUILD +++ b/extra/nautilus-open-terminal/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 169998 2012-10-30 23:01:23Z heftig $ +# $Id: PKGBUILD 178922 2013-02-28 19:09:50Z ioni $ # Maintainer : Biru Ionut <ionut@archlinux.ro> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=nautilus-open-terminal -pkgver=0.19 -pkgrel=3 +pkgver=0.20 +pkgrel=1 pkgdesc="A nautilus plugin for opening terminals in arbitrary local paths" arch=('i686' 'x86_64' 'mips64el') url="http://ftp.gnome.org/pub/GNOME/sources/nautilus-open-terminal" @@ -12,9 +12,9 @@ license=('GPL') depends=('nautilus' 'gconf') makedepends=('pkgconfig' 'gettext' 'intltool') install=nautilus-open-terminal.install -source=(ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2) +source=(ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz) options=('!libtool' '!emptydirs') -sha256sums=('4760f3a5a862ba9239ea92690a42ecee2c68fad413b023dd06505bdb3ee1f6af') +sha256sums=('84905e98a13990ef73ce698144bdf0ad9adb1346c22a7d7381a3d65f17a364f0') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD index 984aa32cc..fe79ed3a3 100644 --- a/extra/nepomuk-core/PKGBUILD +++ b/extra/nepomuk-core/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 177801 2013-02-09 06:06:12Z andrea $ +# $Id: PKGBUILD 178526 2013-02-25 10:11:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-core pkgver=4.10.0 -pkgrel=2 +pkgrel=4 pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries" url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core" arch=('i686' 'x86_64' 'mips64el') @@ -11,13 +11,16 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg') makedepends=('cmake' 'automoc4' 'doxygen') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" - 'fix-recursive-indexing.patch') + 'fix-recursive-indexing.patch' + 'fix-crash-on-new-install.patch') sha1sums=('affc4d3063db773e5b05ff746a4c64adbec29264' - 'faa0f661fe642af01ac72eda7347dfc659e091e1') + 'faa0f661fe642af01ac72eda7347dfc659e091e1' + '5e3b84f0d0f8a868d4aafedf0f3c7ab631ee4263') build() { cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}"/fix-recursive-indexing.patch + patch -p1 -i "${srcdir}"/fix-crash-on-new-install.patch cd ../ mkdir build @@ -30,7 +33,7 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install # Fix the python shebang diff --git a/extra/nepomuk-core/fix-crash-on-new-install.patch b/extra/nepomuk-core/fix-crash-on-new-install.patch new file mode 100644 index 000000000..4e921fb52 --- /dev/null +++ b/extra/nepomuk-core/fix-crash-on-new-install.patch @@ -0,0 +1,37 @@ +commit b94e9f73bd86593928988e5626511acea805b7be +Author: Edward Toroshchin <kde@hades.name> +Date: Sun Feb 3 17:57:23 2013 +0100 + + fileindexer: initialize objects in correct order + + The IndexCleaner job created in IndexScheduler could complete before + m_eventMonitor is initialized, which leads to crash in slotCleaningDone. + + REVIEW: 108754 + +diff --git a/services/fileindexer/indexscheduler.cpp b/services/fileindexer/indexscheduler.cpp +index a13de1b..3ad7819 100644 +--- a/services/fileindexer/indexscheduler.cpp ++++ b/services/fileindexer/indexscheduler.cpp +@@ -51,10 +51,6 @@ Nepomuk2::IndexScheduler::IndexScheduler( QObject* parent ) + QFile::remove(KStandardDirs::locateLocal("data", QLatin1String("nepomuk/file-indexer-error-log"))); + } + +- m_cleaner = new IndexCleaner(this); +- connect( m_cleaner, SIGNAL(finished(KJob*)), this, SLOT(slotCleaningDone()) ); +- m_cleaner->start(); +- + FileIndexerConfig* indexConfig = FileIndexerConfig::self(); + connect( indexConfig, SIGNAL(includeFolderListChanged(QStringList,QStringList)), + this, SLOT(slotIncludeFolderListChanged(QStringList,QStringList)) ); +@@ -106,6 +102,10 @@ Nepomuk2::IndexScheduler::IndexScheduler( QObject* parent ) + connect( m_eventMonitor, SIGNAL(powerManagementStatusChanged(bool)), + this, SLOT(slotScheduleIndexing()) ); + ++ m_cleaner = new IndexCleaner(this); ++ connect( m_cleaner, SIGNAL(finished(KJob*)), this, SLOT(slotCleaningDone()) ); ++ m_cleaner->start(); ++ + // Special settings for the queues + KConfig config( "nepomukstrigirc" ); + KConfigGroup cfg = config.group( "Indexing" ); diff --git a/extra/netpbm/PKGBUILD b/extra/netpbm/PKGBUILD index c5c192b26..8eca87d59 100644 --- a/extra/netpbm/PKGBUILD +++ b/extra/netpbm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148858 2012-02-05 11:53:06Z ibiru $ +# $Id: PKGBUILD 178515 2013-02-24 21:47:43Z eric $ # Maintainer: Kevin Piche <kevin@archlinux.org> pkgname=netpbm -pkgver=10.57.1 -pkgrel=1.2 +pkgver=10.61.02 +pkgrel=1 pkgdesc="A toolkit for manipulation of graphic images" arch=('i686' 'x86_64' 'mips64el') license=('custom' 'BSD' 'GPL' 'LGPL') @@ -11,18 +11,27 @@ url="http://netpbm.sourceforge.net/" depends=('perl' 'libpng' 'libtiff' 'libxml2') makedepends=('python2') options=('!makeflags') -# Releases after 10.34 are available via SVN only. -# Get Advanced tarball here: http://netpbm.sourceforge.net/release.html#tarball -# Get version number from version.mk -# Get docs with: wget --recursive --relative -nH http://netpbm.sourceforge.net/doc/ -source=(ftp://ftp.archlinux.org/other/netpbm/${pkgname}-${pkgver}.tar.gz \ - ftp://ftp.archlinux.org/other/netpbm/netpbm-doc-22Feb2009.tar.xz \ +source=(ftp://ftp.archlinux.org/other/packages/netpbm/${pkgname}-${pkgver}.tar.gz{,.sig} \ + ftp://ftp.archlinux.org/other/packages/netpbm/netpbm-doc-22Feb2009.tar.xz{,.sig} \ netpbm-CAN-2005-2471.patch netpbm-security-code.patch netpbm-security-scripts.patch) -sha1sums=('cd0b99333faf994a680d77c5d217034df35ebd4e' +sha1sums=('dc2354716996c8fe4c4836386e6c403ec2f15589' + '253df0e79f9344e68ee907a43347d630ff6b1b95' 'dfeba9f9a5fe987d64db0aadb5ca8c1b20fcead2' + 'e9513608a661beb05a63270931f6191029e935f8' 'b79cf9d42488fea065ba16262ed97694c47af08d' - '4cd5b94a24886ecae3973c5ae104d8298fe5a1f5' - '2ac31f714121e08e47af9337c6bbaab3cbfc5c75') + 'cde27f75fa5ca8010a3b1f08d8e247d42243d0f5' + '300a2386d3207005f4cb4120bbb2f3788a9b7716') + +# source PKGBUILD && mksource +mksource() { +# Get docs with: wget --recursive --relative -nH http://netpbm.sourceforge.net/doc/ + curl -o advanced.tar.gz 'http://netpbm.svn.sourceforge.net/viewvc/netpbm/advanced.tar.gz?view=tar' + tar -xf advanced.tar.gz advanced/version.mk + _pkgver=$(grep MAJOR advanced/version.mk |cut -d ' ' -f 3).$(grep MINOR advanced/version.mk |cut -d ' ' -f 3).0$(grep POINT advanced/version.mk |cut -d ' ' -f 3) + mv advanced.tar.gz ${pkgname}-${_pkgver}.tar.gz + gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${_pkgver}.tar.gz + rm -r advanced +} build() { cd "${srcdir}/advanced" diff --git a/extra/netpbm/netpbm-security-code.patch b/extra/netpbm/netpbm-security-code.patch index da67a8f92..27b49fbae 100644 --- a/extra/netpbm/netpbm-security-code.patch +++ b/extra/netpbm/netpbm-security-code.patch @@ -1,39 +1,35 @@ -diff -up netpbm-10.47.04/analyzer/pgmtexture.c.security netpbm-10.47.04/analyzer/pgmtexture.c ---- netpbm-10.47.04/analyzer/pgmtexture.c.security 2009-10-21 13:38:55.000000000 +0200 -+++ netpbm-10.47.04/analyzer/pgmtexture.c 2009-10-21 15:09:33.000000000 +0200 -@@ -79,6 +79,9 @@ vector (int nl, int nh) - { - float *v; - -+ if(nh < nl) -+ pm_error("assert: h < l"); +diff -up netpbm-10.58.01/analyzer/pgmtexture.c.security-code netpbm-10.58.01/analyzer/pgmtexture.c +--- netpbm-10.58.01/analyzer/pgmtexture.c.security-code 2012-04-09 15:31:32.000000000 +0200 ++++ netpbm-10.58.01/analyzer/pgmtexture.c 2012-04-09 15:40:03.183620040 +0200 +@@ -97,7 +97,7 @@ vector(unsigned int const nl, + float * v; + + assert(nh >= nl); +- + overflow_add(nh - nl, 1); MALLOCARRAY(v, (unsigned) (nh - nl + 1)); + if (v == NULL) - pm_error("Unable to allocate memory for a vector."); -@@ -95,6 +98,9 @@ matrix (int nrl, int nrh, int ncl, int n - float **m; +@@ -129,6 +129,7 @@ matrix (unsigned int const nrl, + assert(nrh >= nrl); /* allocate pointers to rows */ -+ if(nrh < nrl) -+ pm_error("assert: h < l"); + overflow_add(nrh - nrl, 1); MALLOCARRAY(m, (unsigned) (nrh - nrl + 1)); if (m == NULL) pm_error("Unable to allocate memory for a matrix."); -@@ -102,6 +108,9 @@ matrix (int nrl, int nrh, int ncl, int n - assert (nch >= ncl); +@@ -136,7 +137,7 @@ matrix (unsigned int const nrl, + m -= ncl; - /* allocate rows and set pointers to them */ -+ if(nch < ncl) -+ pm_error("assert: h < l"); + assert (nch >= ncl); +- + overflow_add(nch - ncl, 1); + /* allocate rows and set pointers to them */ for (i = nrl; i <= nrh; ++i) { MALLOCARRAY(m[i], (unsigned) (nch - ncl + 1)); - if (m[i] == NULL) -diff -up netpbm-10.47.04/converter/other/gemtopnm.c.security netpbm-10.47.04/converter/other/gemtopnm.c ---- netpbm-10.47.04/converter/other/gemtopnm.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/other/gemtopnm.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/converter/other/gemtopnm.c.security-code netpbm-10.58.01/converter/other/gemtopnm.c +--- netpbm-10.58.01/converter/other/gemtopnm.c.security-code 2012-04-09 15:31:42.000000000 +0200 ++++ netpbm-10.58.01/converter/other/gemtopnm.c 2012-04-09 15:40:03.183620040 +0200 @@ -106,6 +106,7 @@ main(argc, argv) pnm_writepnminit( stdout, cols, rows, MAXVAL, type, 0 ); @@ -42,10 +38,10 @@ diff -up netpbm-10.47.04/converter/other/gemtopnm.c.security netpbm-10.47.04/con { /* allocate input row data structure */ int plane; -diff -up netpbm-10.47.04/converter/other/jpegtopnm.c.security netpbm-10.47.04/converter/other/jpegtopnm.c ---- netpbm-10.47.04/converter/other/jpegtopnm.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/other/jpegtopnm.c 2009-10-21 15:54:30.000000000 +0200 -@@ -861,6 +861,8 @@ convertImage(FILE * +diff -up netpbm-10.58.01/converter/other/jpegtopnm.c.security-code netpbm-10.58.01/converter/other/jpegtopnm.c +--- netpbm-10.58.01/converter/other/jpegtopnm.c.security-code 2012-04-09 15:31:40.000000000 +0200 ++++ netpbm-10.58.01/converter/other/jpegtopnm.c 2012-04-09 15:40:03.184620028 +0200 +@@ -861,6 +861,8 @@ convertImage(FILE * /* Calculate output image dimensions so we can allocate space */ jpeg_calc_output_dimensions(cinfoP); @@ -54,9 +50,9 @@ diff -up netpbm-10.47.04/converter/other/jpegtopnm.c.security netpbm-10.47.04/co /* Start decompressor */ jpeg_start_decompress(cinfoP); -diff -up netpbm-10.47.04/converter/other/pbmtopgm.c.security netpbm-10.47.04/converter/other/pbmtopgm.c ---- netpbm-10.47.04/converter/other/pbmtopgm.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/other/pbmtopgm.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/converter/other/pbmtopgm.c.security-code netpbm-10.58.01/converter/other/pbmtopgm.c +--- netpbm-10.58.01/converter/other/pbmtopgm.c.security-code 2012-04-09 15:31:42.000000000 +0200 ++++ netpbm-10.58.01/converter/other/pbmtopgm.c 2012-04-09 15:40:03.184620028 +0200 @@ -47,6 +47,7 @@ main(int argc, char *argv[]) { "than the image height (%u rows)", height, rows); @@ -65,10 +61,9 @@ diff -up netpbm-10.47.04/converter/other/pbmtopgm.c.security netpbm-10.47.04/con maxval = MIN(PGM_OVERALLMAXVAL, width*height); pgm_writepgminit(stdout, cols, rows, maxval, 0) ; -diff -up netpbm-10.47.04/converter/other/pngtopnm.c.security netpbm-10.47.04/converter/other/pngtopnm.c -diff -up netpbm-10.47.04/converter/other/pnmtoddif.c.security netpbm-10.47.04/converter/other/pnmtoddif.c ---- netpbm-10.47.04/converter/other/pnmtoddif.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/other/pnmtoddif.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/converter/other/pnmtoddif.c.security-code netpbm-10.58.01/converter/other/pnmtoddif.c +--- netpbm-10.58.01/converter/other/pnmtoddif.c.security-code 2012-04-09 15:31:42.000000000 +0200 ++++ netpbm-10.58.01/converter/other/pnmtoddif.c 2012-04-09 15:40:03.185620015 +0200 @@ -632,6 +632,7 @@ main(int argc, char *argv[]) { switch (PNM_FORMAT_TYPE(format)) { case PBM_TYPE: @@ -85,9 +80,9 @@ diff -up netpbm-10.47.04/converter/other/pnmtoddif.c.security netpbm-10.47.04/co ip.bytes_per_line = 3 * cols; ip.bits_per_pixel = 24; ip.spectral = 5; -diff -up netpbm-10.47.04/converter/other/pnmtojpeg.c.security netpbm-10.47.04/converter/other/pnmtojpeg.c ---- netpbm-10.47.04/converter/other/pnmtojpeg.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/other/pnmtojpeg.c 2009-10-21 15:56:32.000000000 +0200 +diff -up netpbm-10.58.01/converter/other/pnmtojpeg.c.security-code netpbm-10.58.01/converter/other/pnmtojpeg.c +--- netpbm-10.58.01/converter/other/pnmtojpeg.c.security-code 2012-04-09 15:31:39.000000000 +0200 ++++ netpbm-10.58.01/converter/other/pnmtojpeg.c 2012-04-09 15:40:03.186620002 +0200 @@ -605,7 +605,11 @@ read_scan_script(j_compress_ptr const ci want JPOOL_PERMANENT. */ @@ -101,7 +96,7 @@ diff -up netpbm-10.47.04/converter/other/pnmtojpeg.c.security netpbm-10.47.04/co (jpeg_scan_info *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, scan_info_size); -@@ -936,6 +940,8 @@ compute_rescaling_array(JSAMPLE ** const +@@ -937,6 +941,8 @@ compute_rescaling_array(JSAMPLE ** const const long half_maxval = maxval / 2; long val; @@ -110,7 +105,7 @@ diff -up netpbm-10.47.04/converter/other/pnmtojpeg.c.security netpbm-10.47.04/co *rescale_p = (JSAMPLE *) (cinfo.mem->alloc_small) ((j_common_ptr) &cinfo, JPOOL_IMAGE, (size_t) (((long) maxval + 1L) * -@@ -1014,6 +1020,7 @@ convert_scanlines(struct jpeg_compress_s +@@ -1015,6 +1021,7 @@ convert_scanlines(struct jpeg_compress_s */ /* Allocate the libpnm output and compressor input buffers */ @@ -118,33 +113,48 @@ diff -up netpbm-10.47.04/converter/other/pnmtojpeg.c.security netpbm-10.47.04/co buffer = (*cinfo_p->mem->alloc_sarray) ((j_common_ptr) cinfo_p, JPOOL_IMAGE, (unsigned int) cinfo_p->image_width * cinfo_p->input_components, -diff -up netpbm-10.47.04/converter/other/pnmtosgi.c.security netpbm-10.47.04/converter/other/pnmtosgi.c ---- netpbm-10.47.04/converter/other/pnmtosgi.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/other/pnmtosgi.c 2009-10-21 15:09:33.000000000 +0200 -@@ -213,6 +213,22 @@ write_channels(cols, rows, channels, put +diff -up netpbm-10.58.01/converter/other/pnmtops.c.security-code netpbm-10.58.01/converter/other/pnmtops.c +--- netpbm-10.58.01/converter/other/pnmtops.c.security-code 2012-04-09 15:31:40.000000000 +0200 ++++ netpbm-10.58.01/converter/other/pnmtops.c 2012-04-09 15:40:03.187619989 +0200 +@@ -256,17 +256,21 @@ parseCommandLine(int argc, const char ** + validateCompDimension(width, 72, "-width value"); + validateCompDimension(height, 72, "-height value"); + ++ overflow2(width, 72); + cmdlineP->width = width * 72; ++ overflow2(height, 72); + cmdlineP->height = height * 72; + + if (imagewidthSpec) { + validateCompDimension(imagewidth, 72, "-imagewidth value"); ++ overflow2(imagewidth, 72); + cmdlineP->imagewidth = imagewidth * 72; } - } - -+static void * -+xmalloc2(int x, int y) -+{ -+ void *mem; -+ -+ overflow2(x,y); -+ if( x * y == 0 ) -+ return NULL; -+ -+ mem = malloc2(x, y); -+ if( mem == NULL ) -+ pm_error("out of memory allocating %d bytes", x * y); -+ return mem; -+} -+ -+ - static void - put_big_short(short s) - { -@@ -250,6 +266,7 @@ build_channels(FILE *ifp, int cols, int + else + cmdlineP->imagewidth = 0; + if (imageheightSpec) { +- validateCompDimension(imagewidth, 72, "-imageheight value"); ++ validateCompDimension(imageheight, 72, "-imageheight value"); ++ overflow2(imageheight, 72); + cmdlineP->imageheight = imageheight * 72; + } + else +diff -up netpbm-10.58.01/converter/other/pnmtorle.c.security-code netpbm-10.58.01/converter/other/pnmtorle.c +--- netpbm-10.58.01/converter/other/pnmtorle.c.security-code 2012-04-09 15:31:42.000000000 +0200 ++++ netpbm-10.58.01/converter/other/pnmtorle.c 2012-04-09 15:40:03.188619976 +0200 +@@ -19,6 +19,8 @@ + * If you modify this software, you should include a notice giving the + * name of the person performing the modification, the date of modification, + * and the reason for such modification. ++ * ++ * 2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com> + */ + /* + * pnmtorle - A program which will convert pbmplus (ppm or pgm) images +diff -up netpbm-10.58.01/converter/other/pnmtosgi.c.security-code netpbm-10.58.01/converter/other/pnmtosgi.c +--- netpbm-10.58.01/converter/other/pnmtosgi.c.security-code 2012-04-09 15:31:42.000000000 +0200 ++++ netpbm-10.58.01/converter/other/pnmtosgi.c 2012-04-09 15:40:03.188619976 +0200 +@@ -254,6 +254,7 @@ build_channels(FILE * const ifp, int con #endif if( storage != STORAGE_VERBATIM ) { @@ -152,7 +162,7 @@ diff -up netpbm-10.47.04/converter/other/pnmtosgi.c.security netpbm-10.47.04/con MALLOCARRAY_NOFAIL(table, channels * rows); MALLOCARRAY_NOFAIL(rletemp, WORSTCOMPR(cols)); } -@@ -303,6 +320,8 @@ compress(temp, row, rows, cols, chan_no, +@@ -306,6 +307,8 @@ compress(ScanElem * temp, break; case STORAGE_RLE: tabrow = chan_no * rows + row; @@ -161,9 +171,9 @@ diff -up netpbm-10.47.04/converter/other/pnmtosgi.c.security netpbm-10.47.04/con len = rle_compress(temp, cols); /* writes result into rletemp */ channel[chan_no][row].length = len; MALLOCARRAY(p, len); -diff -up netpbm-10.47.04/converter/other/rletopnm.c.security netpbm-10.47.04/converter/other/rletopnm.c ---- netpbm-10.47.04/converter/other/rletopnm.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/other/rletopnm.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/converter/other/rletopnm.c.security-code netpbm-10.58.01/converter/other/rletopnm.c +--- netpbm-10.58.01/converter/other/rletopnm.c.security-code 2012-04-09 15:31:42.000000000 +0200 ++++ netpbm-10.58.01/converter/other/rletopnm.c 2012-04-09 15:40:03.189619963 +0200 @@ -19,6 +19,8 @@ * If you modify this software, you should include a notice giving the * name of the person performing the modification, the date of modification, @@ -173,10 +183,10 @@ diff -up netpbm-10.47.04/converter/other/rletopnm.c.security netpbm-10.47.04/con */ /* * rletopnm - A conversion program to convert from Utah's "rle" image format -diff -up netpbm-10.47.04/converter/other/sgitopnm.c.security netpbm-10.47.04/converter/other/sgitopnm.c ---- netpbm-10.47.04/converter/other/sgitopnm.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/other/sgitopnm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -252,10 +252,14 @@ read_channels(ifp, head, table, func, oc +diff -up netpbm-10.58.01/converter/other/sgitopnm.c.security-code netpbm-10.58.01/converter/other/sgitopnm.c +--- netpbm-10.58.01/converter/other/sgitopnm.c.security-code 2012-04-09 15:31:42.000000000 +0200 ++++ netpbm-10.58.01/converter/other/sgitopnm.c 2012-04-09 15:40:03.189619963 +0200 +@@ -359,10 +359,14 @@ readChannels(FILE * const ifP, MALLOCARRAY_NOFAIL(image, head->ysize); } else { maxchannel = MIN(3, head->zsize); @@ -190,11 +200,11 @@ diff -up netpbm-10.47.04/converter/other/sgitopnm.c.security netpbm-10.47.04/con MALLOCARRAY_NOFAIL(temp, WORSTCOMPR(head->xsize)); + } - for(channel = 0; channel < maxchannel; ++channel) { + for (channel = 0; channel < maxchannel; ++channel) { unsigned int row; -diff -up netpbm-10.47.04/converter/other/sirtopnm.c.security netpbm-10.47.04/converter/other/sirtopnm.c ---- netpbm-10.47.04/converter/other/sirtopnm.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/other/sirtopnm.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/converter/other/sirtopnm.c.security-code netpbm-10.58.01/converter/other/sirtopnm.c +--- netpbm-10.58.01/converter/other/sirtopnm.c.security-code 2012-04-09 15:31:42.000000000 +0200 ++++ netpbm-10.58.01/converter/other/sirtopnm.c 2012-04-09 15:40:03.190619951 +0200 @@ -69,6 +69,7 @@ char* argv[]; } break; @@ -203,10 +213,10 @@ diff -up netpbm-10.47.04/converter/other/sirtopnm.c.security netpbm-10.47.04/con picsize = cols * rows * 3; planesize = cols * rows; if ( !( sirarray = (unsigned char*) malloc( picsize ) ) ) -diff -up netpbm-10.47.04/converter/other/tifftopnm.c.security netpbm-10.47.04/converter/other/tifftopnm.c ---- netpbm-10.47.04/converter/other/tifftopnm.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/other/tifftopnm.c 2009-10-21 15:49:29.000000000 +0200 -@@ -1291,7 +1291,9 @@ convertRasterByRows(pnmOut * const +diff -up netpbm-10.58.01/converter/other/tifftopnm.c.security-code netpbm-10.58.01/converter/other/tifftopnm.c +--- netpbm-10.58.01/converter/other/tifftopnm.c.security-code 2012-04-09 15:31:42.000000000 +0200 ++++ netpbm-10.58.01/converter/other/tifftopnm.c 2012-04-09 15:40:03.191619939 +0200 +@@ -1279,7 +1279,9 @@ convertRasterByRows(pnmOut * const if (scanbuf == NULL) pm_error("can't allocate memory for scanline buffer"); @@ -217,9 +227,9 @@ diff -up netpbm-10.47.04/converter/other/tifftopnm.c.security netpbm-10.47.04/co if (samplebuf == NULL) pm_error("can't allocate memory for row buffer"); -diff -up netpbm-10.47.04/converter/other/xwdtopnm.c.security netpbm-10.47.04/converter/other/xwdtopnm.c ---- netpbm-10.47.04/converter/other/xwdtopnm.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/other/xwdtopnm.c 2009-10-21 15:53:27.000000000 +0200 +diff -up netpbm-10.58.01/converter/other/xwdtopnm.c.security-code netpbm-10.58.01/converter/other/xwdtopnm.c +--- netpbm-10.58.01/converter/other/xwdtopnm.c.security-code 2012-04-09 15:31:40.000000000 +0200 ++++ netpbm-10.58.01/converter/other/xwdtopnm.c 2012-04-09 15:40:03.192619927 +0200 @@ -209,6 +209,10 @@ processX10Header(X10WDFileHeader * cons *colorsP = pnm_allocrow(2); PNM_ASSIGN1((*colorsP)[0], 0); @@ -239,32 +249,9 @@ diff -up netpbm-10.47.04/converter/other/xwdtopnm.c.security netpbm-10.47.04/con *padrightP = h11FixedP->bytes_per_line * 8 - h11FixedP->pixmap_width * h11FixedP->bits_per_pixel; -diff -up netpbm-10.47.04/converter/other/sunicontopnm.c.security netpbm-10.47.04/converter/other/sunicontopnm.c ---- netpbm-10.47.04/converter/other/sunicontopnm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/other/sunicontopnm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -11,6 +11,7 @@ - */ - - #include <string.h> -+#include <limits.h> - - #include "nstring.h" - #include "pbm.h" -@@ -87,6 +88,11 @@ ReadIconFile(FILE * const - if (*heightP <= 0) - pm_error("invalid height (must be positive): %d", *heightP); - -+ if ( *widthP > INT_MAX - 16 || *widthP < 0) -+ pm_error( "invalid width: %d", *widthP); -+ -+ overflow2(*widthP + 16, *heightP); -+ - } - - -diff -up netpbm-10.47.04/converter/pbm/mdatopbm.c.security netpbm-10.47.04/converter/pbm/mdatopbm.c ---- netpbm-10.47.04/converter/pbm/mdatopbm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/mdatopbm.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/converter/pbm/mdatopbm.c.security-code netpbm-10.58.01/converter/pbm/mdatopbm.c +--- netpbm-10.58.01/converter/pbm/mdatopbm.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/mdatopbm.c 2012-04-09 15:40:03.192619927 +0200 @@ -245,10 +245,13 @@ main(int argc, char **argv) { pm_readlittleshort(infile, &yy); nInCols = yy; } @@ -280,9 +267,9 @@ diff -up netpbm-10.47.04/converter/pbm/mdatopbm.c.security netpbm-10.47.04/conve data = pbm_allocarray(nOutCols, nOutRows); -diff -up netpbm-10.47.04/converter/pbm/mgrtopbm.c.security netpbm-10.47.04/converter/pbm/mgrtopbm.c ---- netpbm-10.47.04/converter/pbm/mgrtopbm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/mgrtopbm.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/converter/pbm/mgrtopbm.c.security-code netpbm-10.58.01/converter/pbm/mgrtopbm.c +--- netpbm-10.58.01/converter/pbm/mgrtopbm.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/mgrtopbm.c 2012-04-09 15:40:03.193619915 +0200 @@ -65,6 +65,8 @@ readMgrHeader(FILE * const ifP, if (head.h_high < ' ' || head.l_high < ' ') pm_error("Invalid width field in MGR header"); @@ -292,42 +279,10 @@ diff -up netpbm-10.47.04/converter/pbm/mgrtopbm.c.security netpbm-10.47.04/conve *colsP = (((int)head.h_wide - ' ') << 6) + ((int)head.l_wide - ' '); *rowsP = (((int)head.h_high - ' ') << 6) + ((int) head.l_high - ' '); *padrightP = ( ( *colsP + pad - 1 ) / pad ) * pad - *colsP; -diff -up netpbm-10.47.04/converter/pbm/pbmto10x.c.security netpbm-10.47.04/converter/pbm/pbmto10x.c ---- netpbm-10.47.04/converter/pbm/pbmto10x.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pbmto10x.c 2009-10-21 15:09:33.000000000 +0200 -@@ -162,7 +162,7 @@ main(int argc, char * argv[]) { - res_60x72(); - - pm_close(ifp); -- exit(0); -+ return 0; - } - - -diff -up netpbm-10.47.04/converter/pbm/pbmto4425.c.security netpbm-10.47.04/converter/pbm/pbmto4425.c ---- netpbm-10.47.04/converter/pbm/pbmto4425.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pbmto4425.c 2009-10-21 15:09:33.000000000 +0200 -@@ -2,6 +2,7 @@ - - #include "nstring.h" - #include "pbm.h" -+#include <string.h> - - static char bit_table[2][3] = { - {1, 4, 0x10}, -@@ -160,7 +161,7 @@ main(int argc, char * argv[]) { - xres = vmap_width * 2; - yres = vmap_height * 3; - -- vmap = malloc(vmap_width * vmap_height * sizeof(char)); -+ vmap = malloc3(vmap_width, vmap_height, sizeof(char)); - if(vmap == NULL) - { - pm_error( "Cannot allocate memory" ); -diff -up netpbm-10.47.04/converter/pbm/pbmtogem.c.security netpbm-10.47.04/converter/pbm/pbmtogem.c ---- netpbm-10.47.04/converter/pbm/pbmtogem.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pbmtogem.c 2009-10-21 15:09:33.000000000 +0200 -@@ -123,6 +123,7 @@ putinit (rows, cols) +diff -up netpbm-10.58.01/converter/pbm/pbmtogem.c.security-code netpbm-10.58.01/converter/pbm/pbmtogem.c +--- netpbm-10.58.01/converter/pbm/pbmtogem.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/pbmtogem.c 2012-04-09 15:40:03.193619915 +0200 +@@ -79,6 +79,7 @@ putinit (int const rows, int const cols) bitsperitem = 0; bitshift = 7; outcol = 0; @@ -335,9 +290,9 @@ diff -up netpbm-10.47.04/converter/pbm/pbmtogem.c.security netpbm-10.47.04/conve outmax = (cols + 7) / 8; outrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char)); lastrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char)); -diff -up netpbm-10.47.04/converter/pbm/pbmtogo.c.security netpbm-10.47.04/converter/pbm/pbmtogo.c ---- netpbm-10.47.04/converter/pbm/pbmtogo.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pbmtogo.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/converter/pbm/pbmtogo.c.security-code netpbm-10.58.01/converter/pbm/pbmtogo.c +--- netpbm-10.58.01/converter/pbm/pbmtogo.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/pbmtogo.c 2012-04-09 15:40:03.193619915 +0200 @@ -158,6 +158,7 @@ main(int argc, bitrow = pbm_allocrow(cols); @@ -346,9 +301,9 @@ diff -up netpbm-10.47.04/converter/pbm/pbmtogo.c.security netpbm-10.47.04/conver rucols = ( cols + 7 ) / 8; bytesperrow = rucols; /* GraphOn uses bytes */ rucols = rucols * 8; -diff -up netpbm-10.47.04/converter/pbm/pbmtolj.c.security netpbm-10.47.04/converter/pbm/pbmtolj.c ---- netpbm-10.47.04/converter/pbm/pbmtolj.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pbmtolj.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/converter/pbm/pbmtolj.c.security-code netpbm-10.58.01/converter/pbm/pbmtolj.c +--- netpbm-10.58.01/converter/pbm/pbmtolj.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/pbmtolj.c 2012-04-09 15:40:03.194619902 +0200 @@ -120,7 +120,11 @@ parseCommandLine(int argc, char ** argv, static void allocateBuffers(unsigned int const cols) { @@ -361,9 +316,9 @@ diff -up netpbm-10.47.04/converter/pbm/pbmtolj.c.security netpbm-10.47.04/conver packBufferSize = rowBufferSize + (rowBufferSize + 127) / 128 + 1; deltaBufferSize = rowBufferSize + rowBufferSize / 8 + 10; -diff -up netpbm-10.47.04/converter/pbm/pbmtomacp.c.security netpbm-10.47.04/converter/pbm/pbmtomacp.c ---- netpbm-10.47.04/converter/pbm/pbmtomacp.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pbmtomacp.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/converter/pbm/pbmtomacp.c.security-code netpbm-10.58.01/converter/pbm/pbmtomacp.c +--- netpbm-10.58.01/converter/pbm/pbmtomacp.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/pbmtomacp.c 2012-04-09 15:40:03.195619889 +0200 @@ -101,6 +101,7 @@ char *argv[]; if( !lflg ) left = 0; @@ -381,9 +336,9 @@ diff -up netpbm-10.47.04/converter/pbm/pbmtomacp.c.security netpbm-10.47.04/conv if( bflg ) { if( bottom - top >= MAX_LINES ) bottom = top + MAX_LINES - 1; -diff -up netpbm-10.47.04/converter/pbm/pbmtomda.c.security netpbm-10.47.04/converter/pbm/pbmtomda.c ---- netpbm-10.47.04/converter/pbm/pbmtomda.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pbmtomda.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/converter/pbm/pbmtomda.c.security-code netpbm-10.58.01/converter/pbm/pbmtomda.c +--- netpbm-10.58.01/converter/pbm/pbmtomda.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/pbmtomda.c 2012-04-09 15:40:03.195619889 +0200 @@ -179,6 +179,7 @@ int main(int argc, char **argv) nOutRowsUnrounded = bScale ? nInRows/2 : nInRows; @@ -392,11 +347,10 @@ diff -up netpbm-10.47.04/converter/pbm/pbmtomda.c.security netpbm-10.47.04/conve nOutRows = ((nOutRowsUnrounded + 3) / 4) * 4; /* MDA wants rows a multiple of 4 */ nOutCols = nInCols / 8; -diff -up netpbm-10.47.04/converter/pbm/pbmtomgr.c.security netpbm-10.47.04/converter/pbm/pbmtomgr.c -diff -up netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c.security netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c ---- netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -105,6 +105,7 @@ int pbm_readline(pbm_stat* pbm,unsigned +diff -up netpbm-10.58.01/converter/pbm/pbmtoppa/pbm.c.security-code netpbm-10.58.01/converter/pbm/pbmtoppa/pbm.c +--- netpbm-10.58.01/converter/pbm/pbmtoppa/pbm.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/pbmtoppa/pbm.c 2012-04-09 15:40:03.195619889 +0200 +@@ -105,6 +105,7 @@ int pbm_readline(pbm_stat* pbm,unsigned return 0; case P4: @@ -414,9 +368,9 @@ diff -up netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c.security netpbm-10.47.04/c memcpy (pbm->revdata, data, (pbm->width+7)/8); pbm->current_line--; } -diff -up netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c.security netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c ---- netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/converter/pbm/pbmtoppa/pbmtoppa.c.security-code netpbm-10.58.01/converter/pbm/pbmtoppa/pbmtoppa.c +--- netpbm-10.58.01/converter/pbm/pbmtoppa/pbmtoppa.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/pbmtoppa/pbmtoppa.c 2012-04-09 15:40:03.196619876 +0200 @@ -441,6 +441,7 @@ main(int argc, char *argv[]) { pm_error("main(): unrecognized parameter '%s'", argv[argn]); } @@ -425,9 +379,9 @@ diff -up netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c.security netpbm-10.47 Pwidth=(Width+7)/8; printer.fptr=out; -diff -up netpbm-10.47.04/converter/pbm/pbmtoxbm.c.security netpbm-10.47.04/converter/pbm/pbmtoxbm.c ---- netpbm-10.47.04/converter/pbm/pbmtoxbm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pbmtoxbm.c 2009-10-21 15:36:54.000000000 +0200 +diff -up netpbm-10.58.01/converter/pbm/pbmtoxbm.c.security-code netpbm-10.58.01/converter/pbm/pbmtoxbm.c +--- netpbm-10.58.01/converter/pbm/pbmtoxbm.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/pbmtoxbm.c 2012-04-09 15:40:03.196619876 +0200 @@ -335,6 +335,8 @@ convertRaster(FILE * const ifP, unsigned char * bitrow; @@ -437,10 +391,10 @@ diff -up netpbm-10.47.04/converter/pbm/pbmtoxbm.c.security netpbm-10.47.04/conve putinit(xbmVersion); -diff -up netpbm-10.47.04/converter/pbm/pbmtoybm.c.security netpbm-10.47.04/converter/pbm/pbmtoybm.c ---- netpbm-10.47.04/converter/pbm/pbmtoybm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pbmtoybm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -45,6 +45,7 @@ main( argc, argv ) +diff -up netpbm-10.58.01/converter/pbm/pbmtoybm.c.security-code netpbm-10.58.01/converter/pbm/pbmtoybm.c +--- netpbm-10.58.01/converter/pbm/pbmtoybm.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/pbmtoybm.c 2012-04-09 15:40:03.197619863 +0200 +@@ -113,6 +113,7 @@ main(int argc, const char *argv[]) { bitrow = pbm_allocrow(cols); /* Compute padding to round cols up to the nearest multiple of 16. */ @@ -448,9 +402,9 @@ diff -up netpbm-10.47.04/converter/pbm/pbmtoybm.c.security netpbm-10.47.04/conve padright = ((cols + 15) / 16) * 16 - cols; putinit(cols, rows); -diff -up netpbm-10.47.04/converter/pbm/pbmtozinc.c.security netpbm-10.47.04/converter/pbm/pbmtozinc.c ---- netpbm-10.47.04/converter/pbm/pbmtozinc.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pbmtozinc.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/converter/pbm/pbmtozinc.c.security-code netpbm-10.58.01/converter/pbm/pbmtozinc.c +--- netpbm-10.58.01/converter/pbm/pbmtozinc.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/pbmtozinc.c 2012-04-09 15:40:03.197619863 +0200 @@ -65,6 +65,7 @@ main(int argc, char * argv[]) { bitrow = pbm_allocrow( cols ); @@ -459,9 +413,41 @@ diff -up netpbm-10.47.04/converter/pbm/pbmtozinc.c.security netpbm-10.47.04/conv padright = ( ( cols + 15 ) / 16 ) * 16 - cols; printf( "USHORT %s[] = {\n",name); -diff -up netpbm-10.47.04/converter/pbm/pktopbm.c.security netpbm-10.47.04/converter/pbm/pktopbm.c ---- netpbm-10.47.04/converter/pbm/pktopbm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pktopbm.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/converter/pbm/pbmto10x.c.security-code netpbm-10.58.01/converter/pbm/pbmto10x.c +--- netpbm-10.58.01/converter/pbm/pbmto10x.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/pbmto10x.c 2012-04-09 15:40:03.197619863 +0200 +@@ -162,7 +162,7 @@ main(int argc, char * argv[]) { + res_60x72(); + + pm_close(ifp); +- exit(0); ++ return 0; + } + + +diff -up netpbm-10.58.01/converter/pbm/pbmto4425.c.security-code netpbm-10.58.01/converter/pbm/pbmto4425.c +--- netpbm-10.58.01/converter/pbm/pbmto4425.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/pbmto4425.c 2012-04-09 15:40:03.198619851 +0200 +@@ -2,6 +2,7 @@ + + #include "nstring.h" + #include "pbm.h" ++#include <string.h> + + static char bit_table[2][3] = { + {1, 4, 0x10}, +@@ -160,7 +161,7 @@ main(int argc, char * argv[]) { + xres = vmap_width * 2; + yres = vmap_height * 3; + +- vmap = malloc(vmap_width * vmap_height * sizeof(char)); ++ vmap = malloc3(vmap_width, vmap_height, sizeof(char)); + if(vmap == NULL) + { + pm_error( "Cannot allocate memory" ); +diff -up netpbm-10.58.01/converter/pbm/pktopbm.c.security-code netpbm-10.58.01/converter/pbm/pktopbm.c +--- netpbm-10.58.01/converter/pbm/pktopbm.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/pktopbm.c 2012-04-09 15:40:03.198619851 +0200 @@ -277,6 +277,7 @@ main(int argc, char *argv[]) { if (flagbyte == 7) { /* long form preamble */ integer packetlength = get32() ; /* character packet length */ @@ -470,10 +456,10 @@ diff -up netpbm-10.47.04/converter/pbm/pktopbm.c.security netpbm-10.47.04/conver endofpacket = packetlength + pktopbm_pkloc; /* calculate end of packet */ if ((car >= MAXPKCHAR) || !filename[car]) { -diff -up netpbm-10.47.04/converter/pbm/thinkjettopbm.l.security netpbm-10.47.04/converter/pbm/thinkjettopbm.l ---- netpbm-10.47.04/converter/pbm/thinkjettopbm.l.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/thinkjettopbm.l 2009-10-21 15:09:33.000000000 +0200 -@@ -107,7 +107,9 @@ DIG [0-9] +diff -up netpbm-10.58.01/converter/pbm/thinkjettopbm.l.security-code netpbm-10.58.01/converter/pbm/thinkjettopbm.l +--- netpbm-10.58.01/converter/pbm/thinkjettopbm.l.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/thinkjettopbm.l 2012-04-09 15:40:03.199619839 +0200 +@@ -114,7 +114,9 @@ DIG [0-9] <RASTERMODE>\033\*b{DIG}+W { int l; if (rowCount >= rowCapacity) { @@ -483,7 +469,7 @@ diff -up netpbm-10.47.04/converter/pbm/thinkjettopbm.l.security netpbm-10.47.04/ rows = realloc (rows, rowCapacity * sizeof *rows); if (rows == NULL) pm_error ("Out of memory."); -@@ -217,6 +219,8 @@ yywrap (void) +@@ -226,6 +228,8 @@ yywrap (void) /* * Quite simple since ThinkJet bit arrangement matches PBM */ @@ -492,20 +478,20 @@ diff -up netpbm-10.47.04/converter/pbm/thinkjettopbm.l.security netpbm-10.47.04/ pbm_writepbminit(stdout, maxRowLength*8, rowCount, 0); packed_bitrow = malloc(maxRowLength); -diff -up netpbm-10.47.04/converter/pbm/ybmtopbm.c.security netpbm-10.47.04/converter/pbm/ybmtopbm.c ---- netpbm-10.47.04/converter/pbm/ybmtopbm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/ybmtopbm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -88,4 +88,5 @@ getinit( file, colsP, rowsP, depthP, pad - pm_error("EOF / read error"); +diff -up netpbm-10.58.01/converter/pbm/ybmtopbm.c.security-code netpbm-10.58.01/converter/pbm/ybmtopbm.c +--- netpbm-10.58.01/converter/pbm/ybmtopbm.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/ybmtopbm.c 2012-04-09 15:40:03.199619839 +0200 +@@ -49,6 +49,7 @@ getinit(FILE * const ifP, + pm_error("EOF / read error"); *depthP = 1; + overflow_add(*colsP, 15); *padrightP = ((*colsP + 15) / 16) * 16 - *colsP; -} - -diff -up netpbm-10.47.04/converter/pgm/lispmtopgm.c.security netpbm-10.47.04/converter/pgm/lispmtopgm.c ---- netpbm-10.47.04/converter/pgm/lispmtopgm.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/pgm/lispmtopgm.c 2009-10-21 15:09:33.000000000 +0200 + } + +diff -up netpbm-10.58.01/converter/pgm/lispmtopgm.c.security-code netpbm-10.58.01/converter/pgm/lispmtopgm.c +--- netpbm-10.58.01/converter/pgm/lispmtopgm.c.security-code 2012-04-09 15:31:42.000000000 +0200 ++++ netpbm-10.58.01/converter/pgm/lispmtopgm.c 2012-04-09 15:40:03.199619839 +0200 @@ -58,6 +58,7 @@ main( argc, argv ) pm_error( "depth (%d bits) is too large", depth); @@ -525,9 +511,9 @@ diff -up netpbm-10.47.04/converter/pgm/lispmtopgm.c.security netpbm-10.47.04/con *padrightP = ( ( *colsP + 31 ) / 32 ) * 32 - *colsP; if ( *colsP != (cols_32 - *padrightP) ) { -diff -up netpbm-10.47.04/converter/pgm/psidtopgm.c.security netpbm-10.47.04/converter/pgm/psidtopgm.c ---- netpbm-10.47.04/converter/pgm/psidtopgm.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/pgm/psidtopgm.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/converter/pgm/psidtopgm.c.security-code netpbm-10.58.01/converter/pgm/psidtopgm.c +--- netpbm-10.58.01/converter/pgm/psidtopgm.c.security-code 2012-04-09 15:31:42.000000000 +0200 ++++ netpbm-10.58.01/converter/pgm/psidtopgm.c 2012-04-09 15:40:03.200619827 +0200 @@ -78,6 +78,7 @@ main(int argc, pm_error("bits/sample (%d) is too large.", bitspersample); @@ -536,10 +522,10 @@ diff -up netpbm-10.47.04/converter/pgm/psidtopgm.c.security netpbm-10.47.04/conv grayrow = pgm_allocrow((cols + 7) / 8 * 8); for (row = 0; row < rows; ++row) { unsigned int col; -diff -up netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security netpbm-10.47.04/converter/ppm/ilbmtoppm.c ---- netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/ilbmtoppm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -594,6 +594,7 @@ decode_row(FILE * const ifP, +diff -up netpbm-10.58.01/converter/ppm/ilbmtoppm.c.security-code netpbm-10.58.01/converter/ppm/ilbmtoppm.c +--- netpbm-10.58.01/converter/ppm/ilbmtoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/ilbmtoppm.c 2012-04-09 15:40:03.201619815 +0200 +@@ -592,6 +592,7 @@ decode_row(FILE * const ifP, rawtype *chp; cols = bmhdP->w; @@ -547,7 +533,7 @@ diff -up netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security netpbm-10.47.04/conv bytes = RowBytes(cols); for( plane = 0; plane < nPlanes; plane++ ) { int mask; -@@ -681,6 +682,23 @@ decode_mask(FILE * const ifP, +@@ -679,6 +680,23 @@ decode_mask(FILE * const ifP, Multipalette handling ****************************************************************************/ @@ -571,7 +557,7 @@ diff -up netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security netpbm-10.47.04/conv static void multi_adjust(cmap, row, palchange) -@@ -1300,6 +1318,9 @@ dcol_to_ppm(FILE * const ifP, +@@ -1341,6 +1359,9 @@ dcol_to_ppm(FILE * const ifP, if( redmaxval != maxval || greenmaxval != maxval || bluemaxval != maxval ) pm_message("scaling colors to %d bits", pm_maxvaltobits(maxval)); @@ -581,7 +567,7 @@ diff -up netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security netpbm-10.47.04/conv MALLOCARRAY_NOFAIL(redtable, redmaxval +1); MALLOCARRAY_NOFAIL(greentable, greenmaxval +1); MALLOCARRAY_NOFAIL(bluetable, bluemaxval +1); -@@ -1729,7 +1750,9 @@ PCHG_ConvertSmall(PCHG, cmap, mask, data +@@ -1763,7 +1784,9 @@ PCHG_ConvertSmall(PCHG, cmap, mask, data ChangeCount32 = *data++; datasize -= 2; @@ -591,7 +577,7 @@ diff -up netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security netpbm-10.47.04/conv for( i = 0; i < changes; i++ ) { if( totalchanges >= PCHG->TotalChanges ) goto fail; if( datasize < 2 ) goto fail; -@@ -1994,6 +2017,9 @@ read_pchg(FILE * const ifp, +@@ -2028,6 +2051,9 @@ read_pchg(FILE * const ifp, cmap->mp_change[i] = NULL; if( PCHG.StartLine < 0 ) { int nch; @@ -601,7 +587,7 @@ diff -up netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security netpbm-10.47.04/conv nch = PCHG.MaxReg - PCHG.MinReg +1; MALLOCARRAY_NOFAIL(cmap->mp_init, nch + 1); for( i = 0; i < nch; i++ ) -@@ -2070,6 +2096,7 @@ process_body( FILE * const ifp, +@@ -2104,6 +2130,7 @@ process_body( FILE * const ifp, if( typeid == ID_ILBM ) { int isdeep; @@ -609,9 +595,9 @@ diff -up netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security netpbm-10.47.04/conv MALLOCARRAY_NOFAIL(ilbmrow, RowBytes(bmhdP->w)); *viewportmodesP |= fakeviewport; /* -isham/-isehb */ -diff -up netpbm-10.47.04/converter/ppm/imgtoppm.c.security netpbm-10.47.04/converter/ppm/imgtoppm.c ---- netpbm-10.47.04/converter/ppm/imgtoppm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/imgtoppm.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/converter/ppm/imgtoppm.c.security-code netpbm-10.58.01/converter/ppm/imgtoppm.c +--- netpbm-10.58.01/converter/ppm/imgtoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/imgtoppm.c 2012-04-09 15:40:03.202619802 +0200 @@ -84,6 +84,7 @@ main(int argc, char ** argv) { len = atoi((char*) buf ); if ( fread( buf, len, 1, ifp ) != 1 ) @@ -628,9 +614,9 @@ diff -up netpbm-10.47.04/converter/ppm/imgtoppm.c.security netpbm-10.47.04/conve if ( len != cols * rows ) pm_message( "pixel data length (%d) does not match image size (%d)", -diff -up netpbm-10.47.04/converter/ppm/Makefile.security netpbm-10.47.04/converter/ppm/Makefile ---- netpbm-10.47.04/converter/ppm/Makefile.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/Makefile 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/converter/ppm/Makefile.security-code netpbm-10.58.01/converter/ppm/Makefile +--- netpbm-10.58.01/converter/ppm/Makefile.security-code 2012-04-09 15:31:44.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/Makefile 2012-04-09 15:40:03.202619802 +0200 @@ -11,7 +11,7 @@ SUBDIRS = hpcdtoppm ppmtompeg PORTBINARIES = 411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \ @@ -640,10 +626,10 @@ diff -up netpbm-10.47.04/converter/ppm/Makefile.security netpbm-10.47.04/convert ppmtoacad ppmtoapplevol ppmtoarbtxt ppmtoascii \ ppmtobmp ppmtoeyuv ppmtogif ppmtoicr ppmtoilbm \ ppmtoleaf ppmtolj ppmtomitsu ppmtoneo \ -diff -up netpbm-10.47.04/converter/ppm/pcxtoppm.c.security netpbm-10.47.04/converter/ppm/pcxtoppm.c ---- netpbm-10.47.04/converter/ppm/pcxtoppm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/pcxtoppm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -409,6 +409,7 @@ pcx_planes_to_pixels(pixels, bitplanes, +diff -up netpbm-10.58.01/converter/ppm/pcxtoppm.c.security-code netpbm-10.58.01/converter/ppm/pcxtoppm.c +--- netpbm-10.58.01/converter/ppm/pcxtoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/pcxtoppm.c 2012-04-09 15:40:03.203619789 +0200 +@@ -409,6 +409,7 @@ pcx_planes_to_pixels(pixels, bitplanes, /* * clear the pixel buffer */ @@ -659,18 +645,18 @@ diff -up netpbm-10.47.04/converter/ppm/pcxtoppm.c.security netpbm-10.47.04/conve rawcols = BytesPerLine * 8 / BitsPerPixel; if (headerCols > rawcols) { pm_message("warning - BytesPerLine = %d, " -diff -up netpbm-10.47.04/converter/ppm/picttoppm.c.security netpbm-10.47.04/converter/ppm/picttoppm.c ---- netpbm-10.47.04/converter/ppm/picttoppm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/picttoppm.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/converter/ppm/picttoppm.c.security-code netpbm-10.58.01/converter/ppm/picttoppm.c +--- netpbm-10.58.01/converter/ppm/picttoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/picttoppm.c 2012-04-09 15:40:03.205619763 +0200 @@ -1,3 +1,5 @@ +#error "Unfixable. Don't ship me" + /* * picttoppm.c -- convert a MacIntosh PICT file to PPM format. * -diff -up netpbm-10.47.04/converter/ppm/pjtoppm.c.security netpbm-10.47.04/converter/ppm/pjtoppm.c ---- netpbm-10.47.04/converter/ppm/pjtoppm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/pjtoppm.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/converter/ppm/pjtoppm.c.security-code netpbm-10.58.01/converter/ppm/pjtoppm.c +--- netpbm-10.58.01/converter/ppm/pjtoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/pjtoppm.c 2012-04-09 15:40:03.206619751 +0200 @@ -127,19 +127,21 @@ main(argc, argv) case 'V': /* send plane */ case 'W': /* send last plane */ @@ -720,9 +706,9 @@ diff -up netpbm-10.47.04/converter/ppm/pjtoppm.c.security netpbm-10.47.04/conver cols *= 8; } -diff -up netpbm-10.47.04/converter/ppm/ppmtoeyuv.c.security netpbm-10.47.04/converter/ppm/ppmtoeyuv.c ---- netpbm-10.47.04/converter/ppm/ppmtoeyuv.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/ppmtoeyuv.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/converter/ppm/ppmtoeyuv.c.security-code netpbm-10.58.01/converter/ppm/ppmtoeyuv.c +--- netpbm-10.58.01/converter/ppm/ppmtoeyuv.c.security-code 2012-04-09 15:31:42.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/ppmtoeyuv.c 2012-04-09 15:40:03.206619751 +0200 @@ -114,6 +114,7 @@ create_multiplication_tables(const pixva int index; @@ -731,9 +717,9 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtoeyuv.c.security netpbm-10.47.04/conv MALLOCARRAY_NOFAIL(mult299 , maxval+1); MALLOCARRAY_NOFAIL(mult587 , maxval+1); MALLOCARRAY_NOFAIL(mult114 , maxval+1); -diff -up netpbm-10.47.04/converter/ppm/ppmtoicr.c.security netpbm-10.47.04/converter/ppm/ppmtoicr.c ---- netpbm-10.47.04/converter/ppm/ppmtoicr.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/ppmtoicr.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/converter/ppm/ppmtoicr.c.security-code netpbm-10.58.01/converter/ppm/ppmtoicr.c +--- netpbm-10.58.01/converter/ppm/ppmtoicr.c.security-code 2012-04-09 15:31:44.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/ppmtoicr.c 2012-04-09 15:40:03.207619739 +0200 @@ -169,7 +169,7 @@ char* argv[]; if (rleflag) { @@ -743,10 +729,10 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtoicr.c.security netpbm-10.47.04/conve p = testimage; for (i=0; i<rows; i++) for (j=0; j<cols; j++) -diff -up netpbm-10.47.04/converter/ppm/ppmtoilbm.c.security netpbm-10.47.04/converter/ppm/ppmtoilbm.c ---- netpbm-10.47.04/converter/ppm/ppmtoilbm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/ppmtoilbm.c 2009-10-21 15:47:50.000000000 +0200 -@@ -1214,6 +1214,7 @@ ppm_to_rgb8(ifP, cols, rows, maxval) +diff -up netpbm-10.58.01/converter/ppm/ppmtoilbm.c.security-code netpbm-10.58.01/converter/ppm/ppmtoilbm.c +--- netpbm-10.58.01/converter/ppm/ppmtoilbm.c.security-code 2012-04-09 15:31:42.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/ppmtoilbm.c 2012-04-09 15:40:03.208619727 +0200 +@@ -1220,6 +1220,7 @@ ppm_to_rgb8(ifP, cols, rows, maxval) maskmethod = 0; /* no masking - RGB8 uses genlock bits */ compmethod = 4; /* RGB8 files are always compressed */ @@ -754,7 +740,7 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtoilbm.c.security netpbm-10.47.04/conv MALLOCARRAY_NOFAIL(compr_row, cols * 4); if( maxval != 255 ) { -@@ -1302,6 +1303,7 @@ ppm_to_rgbn(ifP, cols, rows, maxval) +@@ -1308,6 +1309,7 @@ ppm_to_rgbn(ifP, cols, rows, maxval) maskmethod = 0; /* no masking - RGBN uses genlock bits */ compmethod = 4; /* RGBN files are always compressed */ @@ -762,7 +748,7 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtoilbm.c.security netpbm-10.47.04/conv MALLOCARRAY_NOFAIL(compr_row, cols * 2); if( maxval != 15 ) { -@@ -1779,6 +1781,7 @@ make_val_table(oldmaxval, newmaxval) +@@ -1785,6 +1787,7 @@ make_val_table(oldmaxval, newmaxval) unsigned int i; int * table; @@ -770,7 +756,7 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtoilbm.c.security netpbm-10.47.04/conv MALLOCARRAY_NOFAIL(table, oldmaxval + 1); for (i = 0; i <= oldmaxval; ++i) table[i] = ROUNDDIV(i * newmaxval, oldmaxval); -@@ -2283,8 +2286,11 @@ main(int argc, char ** argv) { +@@ -2293,8 +2296,11 @@ main(int argc, char ** argv) { MALLOCARRAY_NOFAIL(coded_rowbuf, RowBytes(cols)); for (i = 0; i < RowBytes(cols); ++i) coded_rowbuf[i] = 0; @@ -783,9 +769,9 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtoilbm.c.security netpbm-10.47.04/conv } switch (mode) { -diff -up netpbm-10.47.04/converter/ppm/ppmtolj.c.security netpbm-10.47.04/converter/ppm/ppmtolj.c ---- netpbm-10.47.04/converter/ppm/ppmtolj.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/ppmtolj.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/converter/ppm/ppmtolj.c.security-code netpbm-10.58.01/converter/ppm/ppmtolj.c +--- netpbm-10.58.01/converter/ppm/ppmtolj.c.security-code 2012-04-09 15:31:42.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/ppmtolj.c 2012-04-09 15:40:03.210619701 +0200 @@ -181,7 +181,8 @@ int main(int argc, char *argv[]) { ppm_readppminit( ifp, &cols, &rows, &maxval, &format ); @@ -796,9 +782,9 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtolj.c.security netpbm-10.47.04/conver obuf = (unsigned char *) pm_allocrow(cols * 3, sizeof(unsigned char)); cbuf = (unsigned char *) pm_allocrow(cols * 6, sizeof(unsigned char)); if (mode == C_TRANS_MODE_DELTA) -diff -up netpbm-10.47.04/converter/ppm/ppmtomitsu.c.security netpbm-10.47.04/converter/ppm/ppmtomitsu.c ---- netpbm-10.47.04/converter/ppm/ppmtomitsu.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/ppmtomitsu.c 2009-10-21 15:48:30.000000000 +0200 +diff -up netpbm-10.58.01/converter/ppm/ppmtomitsu.c.security-code netpbm-10.58.01/converter/ppm/ppmtomitsu.c +--- netpbm-10.58.01/converter/ppm/ppmtomitsu.c.security-code 2012-04-09 15:31:44.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/ppmtomitsu.c 2012-04-09 15:40:03.210619702 +0200 @@ -685,6 +685,8 @@ main(int argc, char * argv[]) { medias = MSize_User; @@ -808,9 +794,9 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtomitsu.c.security netpbm-10.47.04/con medias.maxcols *= 2; medias.maxrows *= 2; } -diff -up netpbm-10.47.04/converter/ppm/ppmtopcx.c.security netpbm-10.47.04/converter/ppm/ppmtopcx.c ---- netpbm-10.47.04/converter/ppm/ppmtopcx.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/ppmtopcx.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/converter/ppm/ppmtopcx.c.security-code netpbm-10.58.01/converter/ppm/ppmtopcx.c +--- netpbm-10.58.01/converter/ppm/ppmtopcx.c.security-code 2012-04-09 15:31:44.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/ppmtopcx.c 2012-04-09 15:40:03.210619702 +0200 @@ -419,6 +419,8 @@ ppmTo16ColorPcx(pixel ** cons else Planes = 1; } @@ -820,21 +806,21 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtopcx.c.security netpbm-10.47.04/conve BytesPerLine = ((cols * BitsPerPixel) + 7) / 8; MALLOCARRAY_NOFAIL(indexRow, cols); MALLOCARRAY_NOFAIL(planesrow, BytesPerLine); -diff -up netpbm-10.47.04/converter/ppm/ppmtopict.c.security netpbm-10.47.04/converter/ppm/ppmtopict.c ---- netpbm-10.47.04/converter/ppm/ppmtopict.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/ppmtopict.c 2009-10-21 15:09:33.000000000 +0200 -@@ -245,6 +245,8 @@ char *argv[]; - putShort(stdout, 0); /* mode */ +diff -up netpbm-10.58.01/converter/ppm/ppmtopict.c.security-code netpbm-10.58.01/converter/ppm/ppmtopict.c +--- netpbm-10.58.01/converter/ppm/ppmtopict.c.security-code 2012-04-09 15:31:42.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/ppmtopict.c 2012-04-09 15:40:03.211619690 +0200 +@@ -441,6 +441,8 @@ main(int argc, const char ** argv) { + putShort(stdout, 0); /* mode */ /* Finally, write out the data. */ -+ overflow_add(cols/MAX_COUNT, 1); -+ overflow_add(cols, cols/MAX_COUNT+1); ++ overflow_add(cols/MAX_COUNT, 1); ++ overflow_add(cols, cols/MAX_COUNT+1); packed = malloc((unsigned)(cols+cols/MAX_COUNT+1)); for (row = 0, oc = 0; row < rows; row++) oc += putRow(stdout, row, cols, pixels[row], packed); -diff -up netpbm-10.47.04/converter/ppm/ppmtopj.c.security netpbm-10.47.04/converter/ppm/ppmtopj.c ---- netpbm-10.47.04/converter/ppm/ppmtopj.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/ppmtopj.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/converter/ppm/ppmtopj.c.security-code netpbm-10.58.01/converter/ppm/ppmtopj.c +--- netpbm-10.58.01/converter/ppm/ppmtopj.c.security-code 2012-04-09 15:31:44.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/ppmtopj.c 2012-04-09 15:40:03.212619677 +0200 @@ -179,6 +179,7 @@ char *argv[]; pixels = ppm_readppm( ifp, &cols, &rows, &maxval ); @@ -843,9 +829,9 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtopj.c.security netpbm-10.47.04/conver obuf = (unsigned char *) pm_allocrow(cols, sizeof(unsigned char)); cbuf = (unsigned char *) pm_allocrow(cols * 2, sizeof(unsigned char)); -diff -up netpbm-10.47.04/converter/ppm/ppmtopjxl.c.security netpbm-10.47.04/converter/ppm/ppmtopjxl.c ---- netpbm-10.47.04/converter/ppm/ppmtopjxl.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/ppmtopjxl.c 2009-10-21 15:43:31.000000000 +0200 +diff -up netpbm-10.58.01/converter/ppm/ppmtopjxl.c.security-code netpbm-10.58.01/converter/ppm/ppmtopjxl.c +--- netpbm-10.58.01/converter/ppm/ppmtopjxl.c.security-code 2012-04-09 15:31:44.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/ppmtopjxl.c 2012-04-09 15:40:03.212619677 +0200 @@ -276,6 +276,8 @@ main(int argc, const char * argv[]) { pm_error("image too large; reduce with ppmscale"); if (maxval > PCL_MAXVAL) @@ -878,9 +864,9 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtopjxl.c.security netpbm-10.47.04/conv inrow = (char *)malloc((unsigned)bpp); outrow = (char *)malloc((unsigned)bpp*2); runcnt = (signed char *)malloc((unsigned)bpp); -diff -up netpbm-10.47.04/converter/ppm/ppmtowinicon.c.security netpbm-10.47.04/converter/ppm/ppmtowinicon.c ---- netpbm-10.47.04/converter/ppm/ppmtowinicon.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/ppmtowinicon.c 2009-10-21 15:44:54.000000000 +0200 +diff -up netpbm-10.58.01/converter/ppm/ppmtowinicon.c.security-code netpbm-10.58.01/converter/ppm/ppmtowinicon.c +--- netpbm-10.58.01/converter/ppm/ppmtowinicon.c.security-code 2012-04-09 15:31:44.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/ppmtowinicon.c 2012-04-09 15:40:03.213619664 +0200 @@ -12,6 +12,7 @@ #include <math.h> @@ -924,10 +910,10 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtowinicon.c.security netpbm-10.47.04/c entry->size_in_bytes = xorBitmap->size + andBitmap->size + 40 + (4 * entry->color_count); if (verbose) -diff -up netpbm-10.47.04/converter/ppm/ppmtoxpm.c.security netpbm-10.47.04/converter/ppm/ppmtoxpm.c ---- netpbm-10.47.04/converter/ppm/ppmtoxpm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/ppmtoxpm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -197,6 +197,7 @@ genNumstr(unsigned int const input, int +diff -up netpbm-10.58.01/converter/ppm/ppmtoxpm.c.security-code netpbm-10.58.01/converter/ppm/ppmtoxpm.c +--- netpbm-10.58.01/converter/ppm/ppmtoxpm.c.security-code 2012-04-09 15:31:44.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/ppmtoxpm.c 2012-04-09 15:40:03.214619651 +0200 +@@ -197,6 +197,7 @@ genNumstr(unsigned int const input, int unsigned int i; /* Allocate memory for printed number. Abort if error. */ @@ -935,7 +921,7 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtoxpm.c.security netpbm-10.47.04/conve if (!(str = (char *) malloc(digits + 1))) pm_error("out of memory"); -@@ -314,6 +315,7 @@ genCmap(colorhist_vector const chv, +@@ -314,6 +315,7 @@ genCmap(colorhist_vector const chv, unsigned int charsPerPixel; unsigned int xpmMaxval; @@ -943,9 +929,9 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtoxpm.c.security netpbm-10.47.04/conve MALLOCARRAY(cmap, cmapSize); if (cmapP == NULL) pm_error("Out of memory allocating %u bytes for a color map.", -diff -up netpbm-10.47.04/converter/ppm/qrttoppm.c.security netpbm-10.47.04/converter/ppm/qrttoppm.c ---- netpbm-10.47.04/converter/ppm/qrttoppm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/qrttoppm.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/converter/ppm/qrttoppm.c.security-code netpbm-10.58.01/converter/ppm/qrttoppm.c +--- netpbm-10.58.01/converter/ppm/qrttoppm.c.security-code 2012-04-09 15:31:42.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/qrttoppm.c 2012-04-09 15:40:03.215619638 +0200 @@ -46,7 +46,7 @@ main( argc, argv ) ppm_writeppminit( stdout, cols, rows, maxval, 0 ); @@ -955,9 +941,9 @@ diff -up netpbm-10.47.04/converter/ppm/qrttoppm.c.security netpbm-10.47.04/conve if ( buf == (unsigned char *) 0 ) pm_error( "out of memory" ); -diff -up netpbm-10.47.04/converter/ppm/sldtoppm.c.security netpbm-10.47.04/converter/ppm/sldtoppm.c ---- netpbm-10.47.04/converter/ppm/sldtoppm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/sldtoppm.c 2009-10-21 15:44:11.000000000 +0200 +diff -up netpbm-10.58.01/converter/ppm/sldtoppm.c.security-code netpbm-10.58.01/converter/ppm/sldtoppm.c +--- netpbm-10.58.01/converter/ppm/sldtoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/sldtoppm.c 2012-04-09 15:40:03.216619626 +0200 @@ -455,6 +455,8 @@ slider(slvecfn slvec, /* Allocate image buffer and clear it to black. */ @@ -967,9 +953,9 @@ diff -up netpbm-10.47.04/converter/ppm/sldtoppm.c.security netpbm-10.47.04/conve pixels = ppm_allocarray(pixcols = ixdots + 1, pixrows = iydots + 1); PPM_ASSIGN(rgbcolor, 0, 0, 0); ppmd_filledrectangle(pixels, pixcols, pixrows, pixmaxval, 0, 0, -diff -up netpbm-10.47.04/converter/ppm/ximtoppm.c.security netpbm-10.47.04/converter/ppm/ximtoppm.c ---- netpbm-10.47.04/converter/ppm/ximtoppm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/ximtoppm.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/converter/ppm/ximtoppm.c.security-code netpbm-10.58.01/converter/ppm/ximtoppm.c +--- netpbm-10.58.01/converter/ppm/ximtoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/ximtoppm.c 2012-04-09 15:40:03.216619626 +0200 @@ -117,6 +117,7 @@ ReadXimHeader(FILE * const in_fp, header->bits_channel = atoi(a_head.bits_per_channel); header->alpha_flag = atoi(a_head.alpha_channel); @@ -1002,20 +988,9 @@ diff -up netpbm-10.47.04/converter/ppm/ximtoppm.c.security netpbm-10.47.04/conve header->colors = (Color *)calloc((unsigned int)header->ncolors, sizeof(Color)); if (header->colors == NULL) { -diff -up netpbm-10.47.04/converter/ppm/xpmtoppm.c.security netpbm-10.47.04/converter/ppm/xpmtoppm.c ---- netpbm-10.47.04/converter/ppm/xpmtoppm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/xpmtoppm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -701,6 +701,7 @@ ReadXPMFile(FILE * const stream, int * c - &ncolors, colorsP, &ptab); - *transparentP = -1; /* No transparency in version 1 */ - } -+ overflow2(*widthP, *heightP); - totalpixels = *widthP * *heightP; - MALLOCARRAY(*dataP, totalpixels); - if (*dataP == NULL) -diff -up netpbm-10.47.04/converter/ppm/yuvtoppm.c.security netpbm-10.47.04/converter/ppm/yuvtoppm.c ---- netpbm-10.47.04/converter/ppm/yuvtoppm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/yuvtoppm.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/converter/ppm/yuvtoppm.c.security-code netpbm-10.58.01/converter/ppm/yuvtoppm.c +--- netpbm-10.58.01/converter/ppm/yuvtoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/yuvtoppm.c 2012-04-09 15:40:03.218619602 +0200 @@ -72,6 +72,7 @@ main(argc, argv) ppm_writeppminit(stdout, cols, rows, (pixval) 255, 0); @@ -1024,9 +999,9 @@ diff -up netpbm-10.47.04/converter/ppm/yuvtoppm.c.security netpbm-10.47.04/conve MALLOCARRAY(yuvbuf, (cols+1)/2); if (yuvbuf == NULL) pm_error("Unable to allocate YUV buffer for %d columns.", cols); -diff -up netpbm-10.47.04/editor/pamcut.c.security netpbm-10.47.04/editor/pamcut.c ---- netpbm-10.47.04/editor/pamcut.c.security 2009-10-21 13:38:57.000000000 +0200 -+++ netpbm-10.47.04/editor/pamcut.c 2009-10-21 15:29:36.000000000 +0200 +diff -up netpbm-10.58.01/editor/pamcut.c.security-code netpbm-10.58.01/editor/pamcut.c +--- netpbm-10.58.01/editor/pamcut.c.security-code 2012-04-09 15:31:33.000000000 +0200 ++++ netpbm-10.58.01/editor/pamcut.c 2012-04-09 15:40:03.218619602 +0200 @@ -655,6 +655,8 @@ cutOneImage(FILE * const ifP outpam = inpam; /* Initial value -- most fields should be same */ @@ -1036,9 +1011,9 @@ diff -up netpbm-10.47.04/editor/pamcut.c.security netpbm-10.47.04/editor/pamcut. outpam.width = rightcol - leftcol + 1; outpam.height = bottomrow - toprow + 1; -diff -up netpbm-10.47.04/editor/pbmreduce.c.security netpbm-10.47.04/editor/pbmreduce.c ---- netpbm-10.47.04/editor/pbmreduce.c.security 2009-10-21 13:38:57.000000000 +0200 -+++ netpbm-10.47.04/editor/pbmreduce.c 2009-10-21 15:26:13.000000000 +0200 +diff -up netpbm-10.58.01/editor/pbmreduce.c.security-code netpbm-10.58.01/editor/pbmreduce.c +--- netpbm-10.58.01/editor/pbmreduce.c.security-code 2012-04-09 15:31:33.000000000 +0200 ++++ netpbm-10.58.01/editor/pbmreduce.c 2012-04-09 15:40:03.219619590 +0200 @@ -94,6 +94,7 @@ main( argc, argv ) if (halftone == QT_FS) { unsigned int col; @@ -1047,10 +1022,10 @@ diff -up netpbm-10.47.04/editor/pbmreduce.c.security netpbm-10.47.04/editor/pbmr MALLOCARRAY(thiserr, newcols + 2); MALLOCARRAY(nexterr, newcols + 2); if (thiserr == NULL || nexterr == NULL) -diff -up netpbm-10.47.04/editor/pnmgamma.c.security netpbm-10.47.04/editor/pnmgamma.c ---- netpbm-10.47.04/editor/pnmgamma.c.security 2009-10-21 13:38:57.000000000 +0200 -+++ netpbm-10.47.04/editor/pnmgamma.c 2009-10-21 15:09:34.000000000 +0200 -@@ -586,6 +586,7 @@ createGammaTables(enum transferFunction +diff -up netpbm-10.58.01/editor/pnmgamma.c.security-code netpbm-10.58.01/editor/pnmgamma.c +--- netpbm-10.58.01/editor/pnmgamma.c.security-code 2012-04-09 15:31:34.000000000 +0200 ++++ netpbm-10.58.01/editor/pnmgamma.c 2012-04-09 15:40:03.220619577 +0200 +@@ -586,6 +586,7 @@ createGammaTables(enum transferFunction xelval ** const btableP) { /* Allocate space for the tables. */ @@ -1058,9 +1033,9 @@ diff -up netpbm-10.47.04/editor/pnmgamma.c.security netpbm-10.47.04/editor/pnmga MALLOCARRAY(*rtableP, maxval+1); MALLOCARRAY(*gtableP, maxval+1); MALLOCARRAY(*btableP, maxval+1); -diff -up netpbm-10.47.04/editor/pnmhisteq.c.security netpbm-10.47.04/editor/pnmhisteq.c ---- netpbm-10.47.04/editor/pnmhisteq.c.security 2009-10-21 13:38:57.000000000 +0200 -+++ netpbm-10.47.04/editor/pnmhisteq.c 2009-10-21 15:09:34.000000000 +0200 +diff -up netpbm-10.58.01/editor/pnmhisteq.c.security-code netpbm-10.58.01/editor/pnmhisteq.c +--- netpbm-10.58.01/editor/pnmhisteq.c.security-code 2012-04-09 15:31:33.000000000 +0200 ++++ netpbm-10.58.01/editor/pnmhisteq.c 2012-04-09 15:40:03.220619577 +0200 @@ -103,6 +103,7 @@ computeLuminosityHistogram(xel * const * unsigned int pixelCount; unsigned int * lumahist; @@ -1069,9 +1044,9 @@ diff -up netpbm-10.47.04/editor/pnmhisteq.c.security netpbm-10.47.04/editor/pnmh MALLOCARRAY(lumahist, maxval + 1); if (lumahist == NULL) pm_error("Out of storage allocating array for %u histogram elements", -diff -up netpbm-10.47.04/editor/pnmindex.csh.security netpbm-10.47.04/editor/pnmindex.csh ---- netpbm-10.47.04/editor/pnmindex.csh.security 2009-10-21 13:38:57.000000000 +0200 -+++ netpbm-10.47.04/editor/pnmindex.csh 2009-10-21 15:09:34.000000000 +0200 +diff -up netpbm-10.58.01/editor/pnmindex.csh.security-code netpbm-10.58.01/editor/pnmindex.csh +--- netpbm-10.58.01/editor/pnmindex.csh.security-code 2012-04-09 15:31:33.000000000 +0200 ++++ netpbm-10.58.01/editor/pnmindex.csh 2012-04-09 15:40:03.221619564 +0200 @@ -1,5 +1,8 @@ #!/bin/csh -f # @@ -1081,9 +1056,9 @@ diff -up netpbm-10.47.04/editor/pnmindex.csh.security netpbm-10.47.04/editor/pnm # pnmindex - build a visual index of a bunch of anymaps # # Copyright (C) 1991 by Jef Poskanzer. -diff -up netpbm-10.47.04/editor/pnmpad.c.security netpbm-10.47.04/editor/pnmpad.c ---- netpbm-10.47.04/editor/pnmpad.c.security 2009-10-21 13:38:57.000000000 +0200 -+++ netpbm-10.47.04/editor/pnmpad.c 2009-10-21 15:33:51.000000000 +0200 +diff -up netpbm-10.58.01/editor/pnmpad.c.security-code netpbm-10.58.01/editor/pnmpad.c +--- netpbm-10.58.01/editor/pnmpad.c.security-code 2012-04-09 15:31:34.000000000 +0200 ++++ netpbm-10.58.01/editor/pnmpad.c 2012-04-09 15:40:03.221619564 +0200 @@ -527,6 +527,8 @@ main(int argc, const char ** argv) { computePadSizes(cmdline, cols, rows, &lpad, &rpad, &tpad, &bpad); @@ -1093,11 +1068,10 @@ diff -up netpbm-10.47.04/editor/pnmpad.c.security netpbm-10.47.04/editor/pnmpad. newcols = cols + lpad + rpad; if (PNM_FORMAT_TYPE(format) == PBM_TYPE) -diff -up netpbm-10.47.04/editor/pnmpaste.c.security netpbm-10.47.04/editor/pnmpaste.c -diff -up netpbm-10.47.04/editor/pnmremap.c.security netpbm-10.47.04/editor/pnmremap.c ---- netpbm-10.47.04/editor/pnmremap.c.security 2009-10-21 13:38:57.000000000 +0200 -+++ netpbm-10.47.04/editor/pnmremap.c 2009-10-21 15:28:20.000000000 +0200 -@@ -408,7 +408,7 @@ initFserr(struct pam * const pamP, +diff -up netpbm-10.58.01/editor/pnmremap.c.security-code netpbm-10.58.01/editor/pnmremap.c +--- netpbm-10.58.01/editor/pnmremap.c.security-code 2012-04-09 15:31:33.000000000 +0200 ++++ netpbm-10.58.01/editor/pnmremap.c 2012-04-09 15:40:03.222619551 +0200 +@@ -409,7 +409,7 @@ initFserr(struct pam * const pamP, unsigned int plane; unsigned int const fserrSize = pamP->width + 2; @@ -1106,7 +1080,7 @@ diff -up netpbm-10.47.04/editor/pnmremap.c.security netpbm-10.47.04/editor/pnmre fserrP->width = pamP->width; MALLOCARRAY(fserrP->thiserr, pamP->depth); -@@ -444,6 +444,7 @@ floydInitRow(struct pam * const pamP, st +@@ -445,6 +445,7 @@ floydInitRow(struct pam * const pamP, st int col; @@ -1114,10 +1088,10 @@ diff -up netpbm-10.47.04/editor/pnmremap.c.security netpbm-10.47.04/editor/pnmre for (col = 0; col < pamP->width + 2; ++col) { unsigned int plane; for (plane = 0; plane < pamP->depth; ++plane) -diff -up netpbm-10.47.04/editor/pnmscalefixed.c.security netpbm-10.47.04/editor/pnmscalefixed.c ---- netpbm-10.47.04/editor/pnmscalefixed.c.security 2009-10-21 13:38:57.000000000 +0200 -+++ netpbm-10.47.04/editor/pnmscalefixed.c 2009-10-21 15:09:34.000000000 +0200 -@@ -211,6 +211,8 @@ compute_output_dimensions(const struct c +diff -up netpbm-10.58.01/editor/pnmscalefixed.c.security-code netpbm-10.58.01/editor/pnmscalefixed.c +--- netpbm-10.58.01/editor/pnmscalefixed.c.security-code 2012-04-09 15:31:34.000000000 +0200 ++++ netpbm-10.58.01/editor/pnmscalefixed.c 2012-04-09 15:40:03.223619538 +0200 +@@ -214,6 +214,8 @@ compute_output_dimensions(const struct c const int rows, const int cols, int * newrowsP, int * newcolsP) { @@ -1126,7 +1100,7 @@ diff -up netpbm-10.47.04/editor/pnmscalefixed.c.security netpbm-10.47.04/editor/ if (cmdline.pixels) { if (rows * cols <= cmdline.pixels) { *newrowsP = rows; -@@ -262,6 +264,8 @@ compute_output_dimensions(const struct c +@@ -265,6 +267,8 @@ compute_output_dimensions(const struct c if (*newcolsP < 1) *newcolsP = 1; if (*newrowsP < 1) *newrowsP = 1; @@ -1135,7 +1109,7 @@ diff -up netpbm-10.47.04/editor/pnmscalefixed.c.security netpbm-10.47.04/editor/ } -@@ -443,6 +447,9 @@ main(int argc, char **argv ) { +@@ -446,6 +450,9 @@ main(int argc, char **argv ) { unfilled. We can address that by stretching, whereas the other case would require throwing away some of the input. */ @@ -1145,9 +1119,9 @@ diff -up netpbm-10.47.04/editor/pnmscalefixed.c.security netpbm-10.47.04/editor/ sxscale = SCALE * newcols / cols; syscale = SCALE * newrows / rows; -diff -up netpbm-10.47.04/editor/pnmshear.c.security netpbm-10.47.04/editor/pnmshear.c ---- netpbm-10.47.04/editor/pnmshear.c.security 2009-10-21 13:38:57.000000000 +0200 -+++ netpbm-10.47.04/editor/pnmshear.c 2009-10-21 15:31:26.000000000 +0200 +diff -up netpbm-10.58.01/editor/pnmshear.c.security-code netpbm-10.58.01/editor/pnmshear.c +--- netpbm-10.58.01/editor/pnmshear.c.security-code 2012-04-09 15:31:33.000000000 +0200 ++++ netpbm-10.58.01/editor/pnmshear.c 2012-04-09 15:40:03.224619526 +0200 @@ -15,6 +15,7 @@ #include <assert.h> #include <math.h> @@ -1168,9 +1142,25 @@ diff -up netpbm-10.47.04/editor/pnmshear.c.security netpbm-10.47.04/editor/pnmsh newcols = rows * shearfac + cols + 0.999999; pnm_writepnminit(stdout, newcols, rows, newmaxval, newformat, 0); -diff -up netpbm-10.47.04/editor/specialty/pamoil.c.security netpbm-10.47.04/editor/specialty/pamoil.c ---- netpbm-10.47.04/editor/specialty/pamoil.c.security 2009-10-21 13:38:56.000000000 +0200 -+++ netpbm-10.47.04/editor/specialty/pamoil.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.58.01/editor/ppmdither.c.security-code netpbm-10.58.01/editor/ppmdither.c +--- netpbm-10.58.01/editor/ppmdither.c.security-code 2012-04-09 15:31:33.000000000 +0200 ++++ netpbm-10.58.01/editor/ppmdither.c 2012-04-09 15:40:03.224619526 +0200 +@@ -355,7 +355,11 @@ dithMatrix(unsigned int const dithPower) + unsigned int const dithMatSize = + (dithDim * sizeof(*dithMat)) + /* pointers */ + (dithDim * dithDim * sizeof(**dithMat)); /* data */ +- ++ ++ overflow2(dithDim, sizeof(*dithMat)); ++ overflow3(dithDim, dithDim, sizeof(**dithMat)); ++ overflow_add(dithDim * sizeof(*dithMat), dithDim * dithDim * sizeof(**dithMat)); ++ + dithMat = malloc(dithMatSize); + + if (dithMat == NULL) +diff -up netpbm-10.58.01/editor/specialty/pamoil.c.security-code netpbm-10.58.01/editor/specialty/pamoil.c +--- netpbm-10.58.01/editor/specialty/pamoil.c.security-code 2012-04-09 15:31:33.000000000 +0200 ++++ netpbm-10.58.01/editor/specialty/pamoil.c 2012-04-09 15:40:03.224619526 +0200 @@ -112,6 +112,7 @@ main(int argc, char *argv[] ) { tuples = pnm_readpam(ifp, &inpam, PAM_STRUCT_SIZE(tuple_type)); pm_close(ifp); @@ -1179,9 +1169,9 @@ diff -up netpbm-10.47.04/editor/specialty/pamoil.c.security netpbm-10.47.04/edit MALLOCARRAY(hist, inpam.maxval + 1); if (hist == NULL) pm_error("Unable to allocate memory for histogram."); -diff -up netpbm-10.47.04/generator/pbmtext.c.security netpbm-10.47.04/generator/pbmtext.c ---- netpbm-10.47.04/generator/pbmtext.c.security 2009-10-21 13:38:57.000000000 +0200 -+++ netpbm-10.47.04/generator/pbmtext.c 2009-10-21 15:23:15.000000000 +0200 +diff -up netpbm-10.58.01/generator/pbmtext.c.security-code netpbm-10.58.01/generator/pbmtext.c +--- netpbm-10.58.01/generator/pbmtext.c.security-code 2012-04-09 15:31:34.000000000 +0200 ++++ netpbm-10.58.01/generator/pbmtext.c 2012-04-09 15:40:03.225619514 +0200 @@ -96,12 +96,14 @@ parseCommandLine(int argc, const char ** for (i = 1; i < argc; ++i) { @@ -1197,15 +1187,15 @@ diff -up netpbm-10.47.04/generator/pbmtext.c.security netpbm-10.47.04/generator/ totaltextsize += strlen(argv[i]); text = realloc(text, totaltextsize); if (text == NULL) -@@ -711,6 +713,7 @@ getText(const char cmdline_text +@@ -712,6 +714,7 @@ getText(const char cmdline_text pm_error("A line of input text is longer than %u characters." - "Cannot process.", sizeof(buf)-1); + "Cannot process.", (unsigned)sizeof(buf)-1); if (lineCount >= maxlines) { -+ overflow2(maxlines, 2); ++ overflow2(maxlines, 2); maxlines *= 2; REALLOCARRAY(text_array, maxlines); if (text_array == NULL) -@@ -831,6 +834,7 @@ main(int argc, const char *argv[]) { +@@ -832,6 +835,7 @@ main(int argc, const char *argv[]) { hmargin = fontP->maxwidth; } else { vmargin = fontP->maxheight; @@ -1213,9 +1203,9 @@ diff -up netpbm-10.47.04/generator/pbmtext.c.security netpbm-10.47.04/generator/ hmargin = 2 * fontP->maxwidth; } } -diff -up netpbm-10.47.04/generator/pgmcrater.c.security netpbm-10.47.04/generator/pgmcrater.c ---- netpbm-10.47.04/generator/pgmcrater.c.security 2009-10-21 13:38:57.000000000 +0200 -+++ netpbm-10.47.04/generator/pgmcrater.c 2009-10-21 15:09:34.000000000 +0200 +diff -up netpbm-10.58.01/generator/pgmcrater.c.security-code netpbm-10.58.01/generator/pgmcrater.c +--- netpbm-10.58.01/generator/pgmcrater.c.security-code 2012-04-09 15:31:34.000000000 +0200 ++++ netpbm-10.58.01/generator/pgmcrater.c 2012-04-09 15:40:03.226619502 +0200 @@ -130,7 +130,7 @@ static void gencraters() /* Acquire the elevation array and initialize it to mean surface elevation. */ @@ -1225,9 +1215,9 @@ diff -up netpbm-10.47.04/generator/pgmcrater.c.security netpbm-10.47.04/generato if (aux == NULL) pm_error("out of memory allocating elevation array"); -diff -up netpbm-10.47.04/generator/pgmkernel.c.security netpbm-10.47.04/generator/pgmkernel.c ---- netpbm-10.47.04/generator/pgmkernel.c.security 2009-10-21 13:38:57.000000000 +0200 -+++ netpbm-10.47.04/generator/pgmkernel.c 2009-10-21 15:09:34.000000000 +0200 +diff -up netpbm-10.58.01/generator/pgmkernel.c.security-code netpbm-10.58.01/generator/pgmkernel.c +--- netpbm-10.58.01/generator/pgmkernel.c.security-code 2012-04-09 15:31:34.000000000 +0200 ++++ netpbm-10.58.01/generator/pgmkernel.c 2012-04-09 15:40:03.226619502 +0200 @@ -68,7 +68,7 @@ main ( argc, argv ) kycenter = (fysize - 1) / 2.0; ixsize = fxsize + 0.999; @@ -1237,22 +1227,22 @@ diff -up netpbm-10.47.04/generator/pgmkernel.c.security netpbm-10.47.04/generato for (i = 0; i < iysize; i++) for (j = 0; j < ixsize; j++) { fkernel[i*ixsize+j] = 1.0 / (1.0 + w * sqrt((double) -diff -up netpbm-10.47.04/lib/libpam.c.security netpbm-10.47.04/lib/libpam.c ---- netpbm-10.47.04/lib/libpam.c.security 2009-10-21 13:39:00.000000000 +0200 -+++ netpbm-10.47.04/lib/libpam.c 2009-10-21 15:09:34.000000000 +0200 -@@ -235,7 +235,8 @@ allocPamRow(const struct pam * const pam - int const bytesPerTuple = allocationDepth(pamP) * sizeof(sample); +diff -up netpbm-10.58.01/lib/libpam.c.security-code netpbm-10.58.01/lib/libpam.c +--- netpbm-10.58.01/lib/libpam.c.security-code 2012-04-09 15:31:38.000000000 +0200 ++++ netpbm-10.58.01/lib/libpam.c 2012-04-09 15:40:03.227619490 +0200 +@@ -220,7 +220,8 @@ allocPamRow(const struct pam * const pam + unsigned int const bytesPerTuple = allocationDepth(pamP) * sizeof(sample); tuple * tuplerow; - tuplerow = malloc(pamP->width * (sizeof(tuple *) + bytesPerTuple)); + overflow_add(sizeof(tuple *), bytesPerTuple); -+ tuplerow = malloc2(pamP->width, sizeof(tuple *) + bytesPerTuple); ++ tuplerow = malloc2(pamP->width, (sizeof(tuple *) + bytesPerTuple)); if (tuplerow != NULL) { /* Now we initialize the pointers to the individual tuples -diff -up netpbm-10.47.04/lib/libpammap.c.security netpbm-10.47.04/lib/libpammap.c ---- netpbm-10.47.04/lib/libpammap.c.security 2009-10-21 13:39:00.000000000 +0200 -+++ netpbm-10.47.04/lib/libpammap.c 2009-10-21 15:09:34.000000000 +0200 +diff -up netpbm-10.58.01/lib/libpammap.c.security-code netpbm-10.58.01/lib/libpammap.c +--- netpbm-10.58.01/lib/libpammap.c.security-code 2012-04-09 15:31:38.000000000 +0200 ++++ netpbm-10.58.01/lib/libpammap.c 2012-04-09 15:40:03.228619477 +0200 @@ -104,6 +104,8 @@ allocTupleIntListItem(struct pam * const */ struct tupleint_list_item * retval; @@ -1262,9 +1252,9 @@ diff -up netpbm-10.47.04/lib/libpammap.c.security netpbm-10.47.04/lib/libpammap. unsigned int const size = sizeof(*retval) - sizeof(retval->tupleint.tuple) + pamP->depth * sizeof(sample); -diff -up netpbm-10.47.04/lib/libpbm1.c.security netpbm-10.47.04/lib/libpbm1.c ---- netpbm-10.47.04/lib/libpbm1.c.security 2009-10-21 13:39:00.000000000 +0200 -+++ netpbm-10.47.04/lib/libpbm1.c 2009-10-21 15:09:34.000000000 +0200 +diff -up netpbm-10.58.01/lib/libpbm1.c.security-code netpbm-10.58.01/lib/libpbm1.c +--- netpbm-10.58.01/lib/libpbm1.c.security-code 2012-04-09 15:31:38.000000000 +0200 ++++ netpbm-10.58.01/lib/libpbm1.c 2012-04-09 15:40:03.228619477 +0200 @@ -77,6 +77,7 @@ pbm_check(FILE * file, const enum pm_che pm_message("pm_filepos passed to pm_check() is %u bytes", sizeof(pm_filepos)); @@ -1273,9 +1263,10 @@ diff -up netpbm-10.47.04/lib/libpbm1.c.security netpbm-10.47.04/lib/libpbm1.c pm_check(file, check_type, need_raster_size, retval_p); } } ---- netpbm-10.47.04/lib/libpm.c.security 2009-10-21 13:39:00.000000000 +0200 -+++ netpbm-10.47.04/lib/libpm.c 2009-10-21 15:09:34.000000000 +0200 -@@ -827,4 +827,53 @@ pm_parse_height(const char * const arg) +diff -up netpbm-10.58.01/lib/libpm.c.security-code netpbm-10.58.01/lib/libpm.c +--- netpbm-10.58.01/lib/libpm.c.security-code 2012-04-09 15:31:38.000000000 +0200 ++++ netpbm-10.58.01/lib/libpm.c 2012-04-09 15:40:03.229619464 +0200 +@@ -808,4 +808,53 @@ pm_parse_height(const char * const arg) } @@ -1329,10 +1320,10 @@ diff -up netpbm-10.47.04/lib/libpbm1.c.security netpbm-10.47.04/lib/libpbm1.c + return realloc(a, b*c); +} -diff -up netpbm-10.47.04/lib/pm.h.security netpbm-10.47.04/lib/pm.h ---- netpbm-10.47.04/lib/pm.h.security 2009-10-21 13:39:00.000000000 +0200 -+++ netpbm-10.47.04/lib/pm.h 2009-10-21 15:09:34.000000000 +0200 -@@ -377,4 +377,11 @@ pm_parse_height(const char * const arg); +diff -up netpbm-10.58.01/lib/pm.h.security-code netpbm-10.58.01/lib/pm.h +--- netpbm-10.58.01/lib/pm.h.security-code 2012-04-09 15:31:38.000000000 +0200 ++++ netpbm-10.58.01/lib/pm.h 2012-04-09 15:40:03.229619464 +0200 +@@ -432,4 +432,11 @@ pm_parse_height(const char * const arg); #endif @@ -1344,9 +1335,9 @@ diff -up netpbm-10.47.04/lib/pm.h.security netpbm-10.47.04/lib/pm.h +void overflow_add(int, int); + #endif -diff -up netpbm-10.47.04/other/pnmcolormap.c.security netpbm-10.47.04/other/pnmcolormap.c ---- netpbm-10.47.04/other/pnmcolormap.c.security 2009-10-21 13:38:54.000000000 +0200 -+++ netpbm-10.47.04/other/pnmcolormap.c 2009-10-21 15:09:34.000000000 +0200 +diff -up netpbm-10.58.01/other/pnmcolormap.c.security-code netpbm-10.58.01/other/pnmcolormap.c +--- netpbm-10.58.01/other/pnmcolormap.c.security-code 2012-04-09 15:31:32.000000000 +0200 ++++ netpbm-10.58.01/other/pnmcolormap.c 2012-04-09 15:40:03.230619451 +0200 @@ -840,6 +840,7 @@ colormapToSquare(struct pam * const pamP pamP->width = intsqrt; else @@ -1355,9 +1346,21 @@ diff -up netpbm-10.47.04/other/pnmcolormap.c.security netpbm-10.47.04/other/pnmc } { unsigned int const intQuotient = colormap.size / pamP->width; -diff -up netpbm-10.47.04/urt/rle_addhist.c.security netpbm-10.47.04/urt/rle_addhist.c ---- netpbm-10.47.04/urt/rle_addhist.c.security 2009-10-21 13:39:11.000000000 +0200 -+++ netpbm-10.47.04/urt/rle_addhist.c 2009-10-21 15:09:34.000000000 +0200 +diff -up netpbm-10.58.01/urt/README.security-code netpbm-10.58.01/urt/README +--- netpbm-10.58.01/urt/README.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/urt/README 2012-04-09 15:40:03.231619438 +0200 +@@ -18,3 +18,8 @@ in its initializer in the original. But + defines stdout as a variable, so that wouldn't compile. So I changed + it to NULL and added a line to rle_hdr_init to set that field to + 'stdout' dynamically. 2000.06.02 BJH. ++ ++Redid the code to check for maths overflows and other crawly horrors. ++Removed pipe through and compress support (unsafe) ++ ++Alan Cox <alan@redhat.com> +diff -up netpbm-10.58.01/urt/rle_addhist.c.security-code netpbm-10.58.01/urt/rle_addhist.c +--- netpbm-10.58.01/urt/rle_addhist.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/urt/rle_addhist.c 2012-04-09 15:40:03.231619438 +0200 @@ -14,6 +14,8 @@ * If you modify this software, you should include a notice giving the * name of the person performing the modification, the date of modification, @@ -1367,7 +1370,7 @@ diff -up netpbm-10.47.04/urt/rle_addhist.c.security netpbm-10.47.04/urt/rle_addh */ /* * rle_addhist.c - Add to the HISTORY comment in header -@@ -76,13 +78,19 @@ rle_addhist(char * argv[], +@@ -71,13 +73,19 @@ rle_addhist(char * argv[], return; length = 0; @@ -1388,7 +1391,7 @@ diff -up netpbm-10.47.04/urt/rle_addhist.c.security netpbm-10.47.04/urt/rle_addh length += strlen(padding) + 3 + strlen(histoire) + 1; /* length of padding, "on " and length of history name plus "="*/ if (in_hdr) /* if we are interested in the old comments... */ -@@ -90,9 +98,12 @@ rle_addhist(char * argv[], +@@ -85,9 +93,12 @@ rle_addhist(char * argv[], else old = NULL; @@ -1402,9 +1405,9 @@ diff -up netpbm-10.47.04/urt/rle_addhist.c.security netpbm-10.47.04/urt/rle_addh ++length; /*Cater for the null. */ MALLOCARRAY(newc, length); -diff -up netpbm-10.47.04/urt/rle_getrow.c.security netpbm-10.47.04/urt/rle_getrow.c ---- netpbm-10.47.04/urt/rle_getrow.c.security 2009-10-21 13:39:11.000000000 +0200 -+++ netpbm-10.47.04/urt/rle_getrow.c 2009-10-21 15:09:34.000000000 +0200 +diff -up netpbm-10.58.01/urt/rle_getrow.c.security-code netpbm-10.58.01/urt/rle_getrow.c +--- netpbm-10.58.01/urt/rle_getrow.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/urt/rle_getrow.c 2012-04-09 15:40:03.232619426 +0200 @@ -17,6 +17,8 @@ * * Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire @@ -1422,9 +1425,9 @@ diff -up netpbm-10.47.04/urt/rle_getrow.c.security netpbm-10.47.04/urt/rle_getro evenlen = (comlen + 1) & ~1; /* make it even */ if ( evenlen ) { -diff -up netpbm-10.47.04/urt/rle_hdr.c.security netpbm-10.47.04/urt/rle_hdr.c ---- netpbm-10.47.04/urt/rle_hdr.c.security 2009-10-21 13:39:11.000000000 +0200 -+++ netpbm-10.47.04/urt/rle_hdr.c 2009-10-21 15:09:34.000000000 +0200 +diff -up netpbm-10.58.01/urt/rle_hdr.c.security-code netpbm-10.58.01/urt/rle_hdr.c +--- netpbm-10.58.01/urt/rle_hdr.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/urt/rle_hdr.c 2012-04-09 15:40:03.233619414 +0200 @@ -14,6 +14,8 @@ * If you modify this software, you should include a notice giving the * name of the person performing the modification, the date of modification, @@ -1434,7 +1437,7 @@ diff -up netpbm-10.47.04/urt/rle_hdr.c.security netpbm-10.47.04/urt/rle_hdr.c */ /* * rle_hdr.c - Functions to manipulate rle_hdr structures. -@@ -79,7 +81,10 @@ int img_num; +@@ -80,7 +82,10 @@ int img_num; /* Fill in with copies of the strings. */ if ( the_hdr->cmd != pgmname ) { @@ -1446,7 +1449,7 @@ diff -up netpbm-10.47.04/urt/rle_hdr.c.security netpbm-10.47.04/urt/rle_hdr.c RLE_CHECK_ALLOC( pgmname, tmp, 0 ); strcpy( tmp, pgmname ); the_hdr->cmd = tmp; -@@ -87,7 +92,9 @@ int img_num; +@@ -88,7 +93,9 @@ int img_num; if ( the_hdr->file_name != fname ) { @@ -1457,7 +1460,7 @@ diff -up netpbm-10.47.04/urt/rle_hdr.c.security netpbm-10.47.04/urt/rle_hdr.c RLE_CHECK_ALLOC( pgmname, tmp, 0 ); strcpy( tmp, fname ); the_hdr->file_name = tmp; -@@ -152,6 +159,7 @@ rle_hdr *from_hdr, *to_hdr; +@@ -153,6 +160,7 @@ rle_hdr *from_hdr, *to_hdr; if ( to_hdr->bg_color ) { int size = to_hdr->ncolors * sizeof(int); @@ -1465,7 +1468,7 @@ diff -up netpbm-10.47.04/urt/rle_hdr.c.security netpbm-10.47.04/urt/rle_hdr.c to_hdr->bg_color = (int *)malloc( size ); RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->bg_color, "background color" ); memcpy( to_hdr->bg_color, from_hdr->bg_color, size ); -@@ -160,7 +168,7 @@ rle_hdr *from_hdr, *to_hdr; +@@ -161,7 +169,7 @@ rle_hdr *from_hdr, *to_hdr; if ( to_hdr->cmap ) { int size = to_hdr->ncmap * (1 << to_hdr->cmaplen) * sizeof(rle_map); @@ -1474,7 +1477,7 @@ diff -up netpbm-10.47.04/urt/rle_hdr.c.security netpbm-10.47.04/urt/rle_hdr.c RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->cmap, "color map" ); memcpy( to_hdr->cmap, from_hdr->cmap, size ); } -@@ -173,11 +181,16 @@ rle_hdr *from_hdr, *to_hdr; +@@ -174,11 +182,16 @@ rle_hdr *from_hdr, *to_hdr; int size = 0; CONST_DECL char **cp; for ( cp=to_hdr->comments; *cp; cp++ ) @@ -1491,13 +1494,45 @@ diff -up netpbm-10.47.04/urt/rle_hdr.c.security netpbm-10.47.04/urt/rle_hdr.c size *= sizeof(char *); to_hdr->comments = (CONST_DECL char **)malloc( size ); RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" ); -diff -up netpbm-10.47.04/urt/rle_open_f.c.security netpbm-10.47.04/urt/rle_open_f.c ---- netpbm-10.47.04/urt/rle_open_f.c.security 2009-10-21 13:39:11.000000000 +0200 -+++ netpbm-10.47.04/urt/rle_open_f.c 2009-10-21 15:15:38.000000000 +0200 -@@ -163,64 +163,7 @@ dealWithSubprocess(const char * const f +diff -up netpbm-10.58.01/urt/rle.h.security-code netpbm-10.58.01/urt/rle.h +--- netpbm-10.58.01/urt/rle.h.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/urt/rle.h 2012-04-09 15:40:03.233619414 +0200 +@@ -14,6 +14,9 @@ + * If you modify this software, you should include a notice giving the + * name of the person performing the modification, the date of modification, + * and the reason for such modification. ++ * ++ * 2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com> ++ * Header declarations needed + */ + /* + * rle.h - Global declarations for Utah Raster Toolkit RLE programs. +@@ -160,6 +163,17 @@ rle_hdr /* End of typedef. * + */ + extern rle_hdr rle_dflt_hdr; + ++/* ++ * Provided by pm library ++ */ ++ ++extern void overflow_add(int, int); ++#define overflow2(a,b) __overflow2(a,b) ++extern void __overflow2(int, int); ++extern void overflow3(int, int, int); ++extern void *malloc2(int, int); ++extern void *malloc3(int, int, int); ++extern void *realloc2(void *, int, int); + + /* Declare RLE library routines. */ + +diff -up netpbm-10.58.01/urt/rle_open_f.c.security-code netpbm-10.58.01/urt/rle_open_f.c +--- netpbm-10.58.01/urt/rle_open_f.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/urt/rle_open_f.c 2012-04-09 15:40:03.234619402 +0200 +@@ -163,65 +163,7 @@ dealWithSubprocess(const char * const f + FILE ** const fpP, bool * const noSubprocessP, const char ** const errorP) { - +- -#ifdef NO_OPEN_PIPES *noSubprocessP = TRUE; -#else @@ -1559,9 +1594,9 @@ diff -up netpbm-10.47.04/urt/rle_open_f.c.security netpbm-10.47.04/urt/rle_open_ } -diff -up netpbm-10.47.04/urt/rle_putcom.c.security netpbm-10.47.04/urt/rle_putcom.c ---- netpbm-10.47.04/urt/rle_putcom.c.security 2009-10-21 13:39:11.000000000 +0200 -+++ netpbm-10.47.04/urt/rle_putcom.c 2009-10-21 15:09:34.000000000 +0200 +diff -up netpbm-10.58.01/urt/rle_putcom.c.security-code netpbm-10.58.01/urt/rle_putcom.c +--- netpbm-10.58.01/urt/rle_putcom.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/urt/rle_putcom.c 2012-04-09 15:40:03.234619402 +0200 @@ -14,6 +14,8 @@ * If you modify this software, you should include a notice giving the * name of the person performing the modification, the date of modification, @@ -1587,9 +1622,9 @@ diff -up netpbm-10.47.04/urt/rle_putcom.c.security netpbm-10.47.04/urt/rle_putco /* Not found */ /* Can't realloc because somebody else might be pointing to this * comments block. Of course, if this were true, then the -diff -up netpbm-10.47.04/urt/Runput.c.security netpbm-10.47.04/urt/Runput.c ---- netpbm-10.47.04/urt/Runput.c.security 2009-10-21 13:39:11.000000000 +0200 -+++ netpbm-10.47.04/urt/Runput.c 2009-10-21 15:09:34.000000000 +0200 +diff -up netpbm-10.58.01/urt/Runput.c.security-code netpbm-10.58.01/urt/Runput.c +--- netpbm-10.58.01/urt/Runput.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/urt/Runput.c 2012-04-09 15:40:03.235619390 +0200 @@ -17,6 +17,8 @@ * * Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire @@ -1622,9 +1657,9 @@ diff -up netpbm-10.47.04/urt/Runput.c.security netpbm-10.47.04/urt/Runput.c if ( h_cmap == NULL ) { fprintf( stderr, -diff -up netpbm-10.47.04/urt/scanargs.c.security netpbm-10.47.04/urt/scanargs.c ---- netpbm-10.47.04/urt/scanargs.c.security 2009-10-21 13:39:11.000000000 +0200 -+++ netpbm-10.47.04/urt/scanargs.c 2009-10-21 15:09:34.000000000 +0200 +diff -up netpbm-10.58.01/urt/scanargs.c.security-code netpbm-10.58.01/urt/scanargs.c +--- netpbm-10.58.01/urt/scanargs.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/urt/scanargs.c 2012-04-09 15:40:03.235619390 +0200 @@ -38,6 +38,8 @@ * * Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire @@ -1633,8 +1668,8 @@ diff -up netpbm-10.47.04/urt/scanargs.c.security netpbm-10.47.04/urt/scanargs.c + * 2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com> */ - #include "rle.h" -@@ -65,8 +67,8 @@ typedef int *ptr; + #include <stdio.h> +@@ -63,8 +65,8 @@ typedef int *ptr; /* * Storage allocation macros */ @@ -1643,26 +1678,5 @@ diff -up netpbm-10.47.04/urt/scanargs.c.security netpbm-10.47.04/urt/scanargs.c +#define NEW( type, cnt ) (type *) malloc2( (cnt) , sizeof( type ) ) +#define RENEW( type, ptr, cnt ) (type *) realloc2( ptr, (cnt), sizeof( type ) ) - #if defined(c_plusplus) && !defined(USE_PROTOTYPES) - #define USE_PROTOTYPES ---- advanced/urt/rle_hdr.c.old 2012-01-21 05:57:25.000000000 -0500 -+++ advanced/urt/rle_hdr.c 2012-01-21 05:57:50.000000000 -0500 -@@ -29,6 +29,18 @@ - - #include <string.h> - -+/* -+ * Provided by pm library -+ */ -+ -+extern void overflow_add(int, int); -+#define overflow2(a,b) __overflow2(a,b) -+extern void __overflow2(int, int); -+extern void overflow3(int, int, int); -+extern void *malloc2(int, int); -+/*extern void *malloc3(int, int, int);*/ -+extern void *realloc2(void *, int, int); -+ - /***************************************************************** - * TAG( rle_names ) - * + static CONST_DECL char * prformat( CONST_DECL char *, int ); + static int isnum( CONST_DECL char *, int, int ); diff --git a/extra/netpbm/netpbm-security-scripts.patch b/extra/netpbm/netpbm-security-scripts.patch index 557914b66..831be8295 100644 --- a/extra/netpbm/netpbm-security-scripts.patch +++ b/extra/netpbm/netpbm-security-scripts.patch @@ -356,24 +356,6 @@ diff -up netpbm-10.47.05/editor/ppmfade.security-scripts netpbm-10.47.05/editor/ +system("rm $tmpdir/junk*$$.ppm"); exit(0); -diff -up netpbm-10.47.05/editor/ppmquantall.security-scripts netpbm-10.47.05/editor/ppmquantall ---- netpbm-10.47.05/editor/ppmquantall.security-scripts 2009-12-10 08:34:32.000000000 +0100 -+++ netpbm-10.47.05/editor/ppmquantall 2010-03-16 21:28:09.000000000 +0100 -@@ -70,12 +70,8 @@ for i in ${files[@]}; do - heights=(${heights[*]} `grep -v '^#' $i | sed '1d; s/.* //; 2q'`) - done - --tempdir="${TMPDIR-/tmp}/ppmquantall.$$" --mkdir -m 0700 $tempdir || \ -- { echo "Could not create temporary file. Exiting."; exit 1;} --trap 'rm -rf $tempdir' 0 1 3 15 -- --all=$tempdir/pqa.all.$$ -+all=$(mktemp -t pqa.all.XXXXXXXXXX) || exit 1 -+rm -f $all - - pnmcat -topbottom -jleft -white ${files[@]} | pnmquant $newcolors > $all - if [ $? != 0 ]; then diff -up netpbm-10.47.05/editor/ppmshadow.security-scripts netpbm-10.47.05/editor/ppmshadow --- netpbm-10.47.05/editor/ppmshadow.security-scripts 2009-12-10 08:34:32.000000000 +0100 +++ netpbm-10.47.05/editor/ppmshadow 2010-03-16 21:28:09.000000000 +0100 diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD index dce072400..9965977de 100644 --- a/extra/nspr/PKGBUILD +++ b/extra/nspr/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173931 2012-12-28 07:40:52Z andyrtr $ +# $Id: PKGBUILD 178768 2013-02-26 20:04:47Z ioni $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=nspr -pkgver=4.9.4 -pkgrel=1.1 +pkgver=4.9.5 +pkgrel=1 pkgdesc="Netscape Portable Runtime" arch=(i686 x86_64 'mips64el') url="http://www.mozilla.org/projects/nspr/" @@ -13,7 +13,7 @@ makedepends=('zip') options=(!emptydirs) source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz nspr.pc.in) -md5sums=('cf58772702b3abbdcff14e22014eeeaf' +md5sums=('b6ccfa8fcbbeb17ebeb19a3edff612bd' 'bce1611f3117b53fc904cab549c09967') build() { diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD index a2f9c41e6..0dd9b420b 100644 --- a/extra/nss/PKGBUILD +++ b/extra/nss/PKGBUILD @@ -1,32 +1,30 @@ -# $Id: PKGBUILD 174760 2013-01-06 20:10:23Z jgc $ +# $Id: PKGBUILD 178844 2013-02-27 16:21:24Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nss -pkgver=3.14.1.1.93 -_pkgver=3.14.1 -pkgrel=1 +pkgver=3.14.3 +pkgrel=2 pkgdesc="Mozilla Network Security Services" arch=(i686 x86_64 'mips64el') url="http://www.mozilla.org/projects/security/pki/nss/" license=('MPL' 'GPL') -_nsprver=4.9.4 +_nsprver=4.9.5 depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh') makedepends=('perl') options=('!strip') -#source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz -source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_3_14_1_WITH_CKBI_1_93_RTM/src/${pkgname}-3.14.1.with.ckbi.1.93.tar.gz +source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz nss.pc.in nss-config.in ssl-renegotiate-transitional.patch add_spi+cacert_ca_certs.patch) -sha1sums=('28b4a2316dc5e5d4605ac375449691c05b6f1c29' +sha1sums=('94d8781d1fa29cfbd37453dda3e9488709b82c4c' 'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd' 'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c' '8a964a744ba098711b80c0d279a2993524e8eb92' 'be6ef0f124f188ebb76f4d83e13466bdcfb27dd3') build() { - cd "${srcdir}/${pkgname}-${_pkgver}/mozilla" + cd "${srcdir}/${pkgname}-${pkgver}/mozilla" # Add CAcert and spi-inc.org CA certificates. # See http://wiki.cacert.org/NSSLib for how to generate patch -Np0 -i "${srcdir}/add_spi+cacert_ca_certs.patch" @@ -47,7 +45,7 @@ build() { # cd security/nss/lib/ckfw/builtins # make generate - cd "${srcdir}/${pkgname}-${_pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" export BUILD_OPT=1 export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 @@ -65,7 +63,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${_pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" install -m755 -d "${pkgdir}/usr/lib/pkgconfig" install -m755 -d "${pkgdir}/usr/bin" install -m755 -d "${pkgdir}/usr/include/nss" @@ -78,8 +76,8 @@ package() { -e "s,%prefix%,/usr,g" \ -e "s,%exec_prefix%,/usr/bin,g" \ -e "s,%includedir%,/usr/include/nss,g" \ - -e "s,%NSPR_VERSION%,${_pkgver},g" \ - -e "s,%NSS_VERSION%,${_pkgver},g" > \ + -e "s,%NSPR_VERSION%,${_nsprver},g" \ + -e "s,%NSS_VERSION%,${pkgver},g" > \ "${pkgdir}/usr/lib/pkgconfig/nss.pc" ln -sf nss.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nss.pc" chmod 644 ${pkgdir}/usr/lib/pkgconfig/*.pc diff --git a/extra/orage/PKGBUILD b/extra/orage/PKGBUILD index 98baf99e3..5b2adb494 100644 --- a/extra/orage/PKGBUILD +++ b/extra/orage/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 157825 2012-04-30 04:19:42Z foutrelis $ +# $Id: PKGBUILD 178517 2013-02-24 22:19:59Z eric $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=orage -pkgver=4.8.3 -pkgrel=2 +pkgver=4.8.4 +pkgrel=1 pkgdesc="A simple calendar application with reminders for Xfce" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -16,7 +16,7 @@ options=('!libtool') replaces=('xfcalendar') install=${pkgname}.install source=(http://archive.xfce.org/src/apps/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('f4f89ea1f301514c419e7643661b510132ebb012') +sha1sums=('8b9facb0393385e4d639dd6a886c216729672958') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD index 0535acd73..4f521c5a6 100644 --- a/extra/phonon/PKGBUILD +++ b/extra/phonon/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 169725 2012-10-27 10:50:17Z andrea $ +# $Id: PKGBUILD 179044 2013-03-01 21:25:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=phonon pkgver=4.6.0 -pkgrel=3 +pkgrel=7 epoch=1 arch=('i686' 'x86_64' 'mips64el') url='http://phonon.kde.org/' license=('LGPL') pkgdesc="The multimedia framework for KDE" -depends=('qt' 'phonon-backend' 'libpulse' 'libqzeitgeist') +depends=('phonon-backend' 'libpulse' 'libqzeitgeist') optdepends=('pulseaudio: PulseAudio support') -makedepends=('cmake' 'automoc4' 'pulseaudio' 'qtwebkit') +makedepends=('cmake' 'automoc4' 'pulseaudio') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" 'fix-plugindir-for-qt-app.patch' 'fix-qmake.patch') @@ -21,6 +21,7 @@ md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173' build() { cd ${pkgname}-${pkgver} + # Upstream fixes patch -p1 -i "${srcdir}"/fix-plugindir-for-qt-app.patch patch -p1 -i "${srcdir}"/fix-qmake.patch cd ../ @@ -31,8 +32,8 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DPHONON_QT_MKSPECS_INSTALL_DIR=/usr/share/qt/mkspecs/modules \ - -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib/qt/plugins/designer + -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \ + -DPHONON_BUILD_DESIGNER_PLUGIN=OFF make } diff --git a/extra/polkit-qt/PKGBUILD b/extra/polkit-qt/PKGBUILD index 327764938..938c360ee 100644 --- a/extra/polkit-qt/PKGBUILD +++ b/extra/polkit-qt/PKGBUILD @@ -4,18 +4,19 @@ pkgname=polkit-qt pkgver=0.103.0 -pkgrel=1.1 +pkgrel=2 pkgdesc='A library that allows developers to access PolicyKit API with a nice Qt-style API' arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kdesupport/polkit-qt-1' license=('LGPL') -depends=('polkit' 'qt') +depends=('polkit' 'qt4') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/apps/KDE4.x/admin/${pkgname}-1-${pkgver}.tar.bz2") md5sums=('a105e233e6733fb072c9080cd7ae1af2') build() { - cd "${srcdir}" + . /etc/profile.d/qt4.sh + mkdir build cd build cmake ../${pkgname}-1-${pkgver} \ @@ -25,6 +26,6 @@ build() { } package() { - cd "${srcdir}/build" + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 102a86acd..71f807945 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 178227 2013-02-18 14:46:39Z jgc $ +# $Id: PKGBUILD 178974 2013-03-01 10:22:47Z andrea $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') pkgver=0.22.1 -pkgrel=2 +pkgrel=3 arch=(i686 x86_64 mips64el) license=('GPL') -makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection' 'icu') +makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms' 'gobject-introspection' 'icu') options=('!libtool' '!emptydirs') url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a @@ -17,6 +17,8 @@ md5sums=('50c259fdda538c1ba94b62aa25f7ec87' '9dc64c254a31e570507bdd4ad4ba629a') build() { + . /etc/profile.d/qt4.sh + cd "${srcdir}/${pkgbase}-${pkgver}" sed -i -e '/AC_PATH_XTRA/d' configure.ac sed -i "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:" configure.ac @@ -70,7 +72,7 @@ package_poppler-glib() { package_poppler-qt() { pkgdesc="Poppler Qt bindings" - depends=("poppler=${pkgver}" 'qt') + depends=("poppler=${pkgver}" 'qt4') cd "${srcdir}/${pkgbase}-${pkgver}/poppler" make DESTDIR="${pkgdir}" install-libLTLIBRARIES diff --git a/extra/prison/PKGBUILD b/extra/prison/PKGBUILD index 5f8aac4d4..b1f1c3d5c 100644 --- a/extra/prison/PKGBUILD +++ b/extra/prison/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 133482 2011-07-28 15:01:26Z andrea $ +# $Id: PKGBUILD 178975 2013-03-01 10:22:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=prison pkgver=1.0 -pkgrel=1.2 +pkgrel=2 pkgdesc="A barcode API to produce QRCode barcodes and DataMatrix barcodes" arch=('i686' 'x86_64' 'mips64el') -url="http://www.kde.org" +url='https://projects.kde.org/projects/kdesupport/prison' license=('GPL') -depends=('qt' 'libdmtx' 'qrencode') +depends=('qt4' 'libdmtx' 'qrencode') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.gz") md5sums=('8baac61506e37a31482a0df4a5d02cd2') build() { - cd "${srcdir}" + . /etc/profile.d/qt4.sh + mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -24,6 +25,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD index 01425712b..90ef1e5be 100644 --- a/extra/pyqt/PKGBUILD +++ b/extra/pyqt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 173040 2012-12-09 15:29:07Z andrea $ +# $Id: PKGBUILD 178976 2013-03-01 10:23:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> @@ -6,16 +6,18 @@ pkgbase=pyqt pkgname=('pyqt-common' 'pyqt' 'python2-pyqt') pkgver=4.9.6 -pkgrel=1.1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://riverbankcomputing.co.uk/software/pyqt/intro" license=('GPL') -makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa' +makedepends=('qt4' 'python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa' 'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus') source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz") md5sums=('514e1f9597771dc732ba75ba9fa5c6b6') build() { + . /etc/profile.d/qt4.sh + cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver} cd PyQt-x11-gpl-${pkgver} @@ -48,7 +50,7 @@ package_pyqt-common(){ make -C pyrcc DESTDIR="${pkgdir}" install make -C pylupdate DESTDIR="${pkgdir}" install - install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api + install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api } package_pyqt(){ @@ -64,7 +66,7 @@ package_pyqt(){ # Provided by pyqt-common rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4} - rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api + rm "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api } package_python2-pyqt(){ @@ -85,6 +87,6 @@ package_python2-pyqt(){ # Provided by pyqt rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4} - rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so - rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api + rm "${pkgdir}"/usr/lib/qt4/plugins/designer/libpythonplugin.so + rm "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api } diff --git a/extra/qca-gnupg/PKGBUILD b/extra/qca-gnupg/PKGBUILD index 3449f8ec9..385f5f934 100644 --- a/extra/qca-gnupg/PKGBUILD +++ b/extra/qca-gnupg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 178075 2013-02-15 12:03:06Z pierre $ +# $Id: PKGBUILD 178978 2013-03-01 10:23:20Z andrea $ # Maintainer: # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qca-gnupg pkgver=2.0.0 _pkgver=2.0.0-beta3 -pkgrel=4 +pkgrel=5 pkgdesc="Qt Cryptographic Architecture" arch=('i686' 'x86_64' 'mips64el') url="http://delta.affinix.com/qca/" diff --git a/extra/qca-ossl/PKGBUILD b/extra/qca-ossl/PKGBUILD index f0c54cd1e..a804ec832 100644 --- a/extra/qca-ossl/PKGBUILD +++ b/extra/qca-ossl/PKGBUILD @@ -4,7 +4,7 @@ pkgname=qca-ossl pkgver=2.0.0 _pkgver=2.0.0-beta3 -pkgrel=5 +pkgrel=6 pkgdesc="Qt Cryptographic Architecture" arch=('i686' 'x86_64' 'mips64el') url="http://delta.affinix.com/qca/" diff --git a/extra/qca/PKGBUILD b/extra/qca/PKGBUILD index 0b24efb85..e3682b678 100644 --- a/extra/qca/PKGBUILD +++ b/extra/qca/PKGBUILD @@ -1,21 +1,23 @@ -# $Id: PKGBUILD 178073 2013-02-15 11:56:00Z pierre $ +# $Id: PKGBUILD 178977 2013-03-01 10:23:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qca pkgver=2.0.3 -pkgrel=3 +pkgrel=4 pkgdesc="Qt Cryptographic Architecture" arch=('i686' 'x86_64' 'mips64el') url="http://delta.affinix.com/qca/" license=('LGPL') -depends=('qt' 'ca-certificates') +depends=('qt4' 'ca-certificates') source=("http://delta.affinix.com/download/qca/2.0/${pkgname}-${pkgver}.tar.bz2" 'gcc47.patch') md5sums=('fc15bd4da22b8096c51fcfe52d2fa309' 'dffc7367152d8888c1447253a0387a2a') build() { + . /etc/profile.d/qt4.sh + cd $srcdir/${pkgname}-${pkgver} patch -p0 -i ${srcdir}/gcc47.patch ./configure \ diff --git a/extra/qimageblitz/PKGBUILD b/extra/qimageblitz/PKGBUILD index 00e3abcf6..6a8e88eef 100644 --- a/extra/qimageblitz/PKGBUILD +++ b/extra/qimageblitz/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 145862 2012-01-03 12:41:58Z andrea $ +# $Id: PKGBUILD 178980 2013-03-01 10:23:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=qimageblitz pkgver=0.0.6 -pkgrel=2.2 +pkgrel=3 pkgdesc="A graphical effect and filter library for KDE" arch=('i686' 'x86_64' 'mips64el') url="http://www.kde.org/" license=('GPL2') -depends=('qt') +depends=('qt4') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('0ae2f7d4e0876764a97ca73799f61df4') build() { - cd "${srcdir}" + . /etc/profile.d/qt4.sh + mkdir build cd build CXX="g++" \ @@ -26,6 +27,6 @@ build() { } package() { - cd "${srcdir}/build" + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/qjackctl/PKGBUILD b/extra/qjackctl/PKGBUILD index 7692ca6e7..926e145ba 100644 --- a/extra/qjackctl/PKGBUILD +++ b/extra/qjackctl/PKGBUILD @@ -1,20 +1,22 @@ -# $Id: PKGBUILD 164008 2012-07-23 18:45:37Z schiv $ +# $Id: PKGBUILD 178981 2013-03-01 10:23:43Z andrea $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Kieslich <tobias@archlinux.org> pkgname=qjackctl pkgver=0.3.9 -pkgrel=2 +pkgrel=3 pkgdesc="A Qt front-end for the JACK low-latency audio server" url="http://qjackctl.sourceforge.net/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('jack' 'qt') +depends=('jack' 'qt4') options=('!makeflags') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") md5sums=('f932c916f43ba3251d3a9ed62a448e43') build() { + . /etc/profile.d/qt4.sh + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr diff --git a/extra/qjson/PKGBUILD b/extra/qjson/PKGBUILD index 9c5c987cc..94f52affe 100644 --- a/extra/qjson/PKGBUILD +++ b/extra/qjson/PKGBUILD @@ -1,19 +1,21 @@ -# $Id: PKGBUILD 172063 2012-11-27 13:49:24Z andrea $ +# $Id: PKGBUILD 178982 2013-03-01 10:23:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=qjson pkgver=0.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="A qt-based library that maps JSON data to QVariant objects" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://qjson.sourceforge.net" -depends=('qt') +depends=('qt4') makedepends=('cmake') source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/flavio/${pkgname}/archive/${pkgver}.tar.gz") md5sums=('4eef13da988edf8f91c260a3e1baeea9') build() { + . /etc/profile.d/qt4.sh + mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/extra/qrencode/PKGBUILD b/extra/qrencode/PKGBUILD index 4c73ea48f..1b003445a 100644 --- a/extra/qrencode/PKGBUILD +++ b/extra/qrencode/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169087 2012-10-17 20:07:22Z bluewind $ +# $Id: PKGBUILD 178990 2013-03-01 10:24:41Z bluewind $ # Maintainer: Florian Pritz< flo@xinu.at> # Contributor: Dany Martineau <dany.luc.martineau@gmail.com> pkgname=qrencode -pkgver=3.4.1 +pkgver=3.4.2 pkgrel=1 pkgdesc="C library for encoding data in a QR Code symbol." arch=(i686 x86_64 mips64el) @@ -13,13 +13,13 @@ url="http://megaui.net/fukuchi/works/qrencode/index.en.html" license=('GPL') options=(!libtool) source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('219b146d3b365a56a0f4ef58a718f295') +md5sums=('2c1693a29fe2f26089ccdff9051c0a3f') build() { cd "${srcdir}/$pkgname-$pkgver" -# autoreconf - ./autogen.sh + ./configure --prefix=/usr + make } diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD index 00eb07250..ae6938469 100644 --- a/extra/qscintilla/PKGBUILD +++ b/extra/qscintilla/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 173042 2012-12-09 15:31:45Z andrea $ +# $Id: PKGBUILD 178983 2013-03-01 10:23:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> @@ -6,7 +6,7 @@ pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') pkgver=2.7 -pkgrel=1.1 +pkgrel=2 license=('GPL') arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" @@ -17,7 +17,9 @@ md5sums=('a3857d75a2b332e0460131e0aa4cc4b5' '8cf9c06252e2f11ab00e62848e322fd3') build() { - cd "${srcdir}/QScintilla-gpl-${pkgver}" + . /etc/profile.d/qt4.sh + + cd "${srcdir}/QScintilla-gpl-${pkgver}" patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff" cd Qt4Qt5 @@ -41,7 +43,7 @@ build() { package_qscintilla() { pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class" - depends=('qt') + depends=('qt4') cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5" make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install diff --git a/extra/qsynth/PKGBUILD b/extra/qsynth/PKGBUILD index 0a158a9de..0193e9812 100644 --- a/extra/qsynth/PKGBUILD +++ b/extra/qsynth/PKGBUILD @@ -1,20 +1,22 @@ -# $Id: PKGBUILD 151340 2012-02-25 14:47:42Z pierre $ +# $Id: PKGBUILD 178984 2013-03-01 10:24:07Z andrea $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=qsynth pkgver=0.3.6 -pkgrel=2.1 +pkgrel=3 pkgdesc="Qt GUI for FluidSynth" arch=('i686' 'x86_64' 'mips64el') url="http://qsynth.sourceforge.net/" license=('GPL') -depends=('fluidsynth' 'qt') +depends=('fluidsynth' 'qt4') options=('!makeflags') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") md5sums=('3cba3c87463be75ac188ebc3c3023d12') build() { + . /etc/profile.d/qt4.sh + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr diff --git a/extra/qt-assistant-compat/PKGBUILD b/extra/qt-assistant-compat/PKGBUILD index e8e3b147e..0b13c729a 100644 --- a/extra/qt-assistant-compat/PKGBUILD +++ b/extra/qt-assistant-compat/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 149629 2012-02-08 20:53:42Z pierre $ +# $Id: PKGBUILD 178985 2013-03-01 10:24:14Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=qt-assistant-compat pkgver=4.6.3 -pkgrel=2.1 +pkgrel=3 pkgdesc="compat version of Qt Assistant" -url="http://qt.nokia.com/" +url="http://qt-project.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL3' 'LGPL') -depends=('qt') +depends=('qt4') source=('ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz' 'debian_patches_01_build_system.diff') md5sums=('a20148e0488d5c12ab35ccc107dcc64d' @@ -16,6 +16,8 @@ md5sums=('a20148e0488d5c12ab35ccc107dcc64d' # separate package function does not really work here due to broken build files build() { + . /etc/profile.d/qt4.sh + cd ${srcdir}/qt-assistant-qassistantclient-library-compat-version-${pkgver} patch -Np1 -i ${srcdir}/debian_patches_01_build_system.diff diff --git a/extra/qt-gstreamer/PKGBUILD b/extra/qt-gstreamer/PKGBUILD index 23ae34c9a..213ddc4c7 100644 --- a/extra/qt-gstreamer/PKGBUILD +++ b/extra/qt-gstreamer/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 163964 2012-07-23 03:00:17Z allan $ +# $Id: PKGBUILD 178986 2013-03-01 10:24:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: laloch <laloch@atlas.cz> pkgname=qt-gstreamer pkgver=0.10.2 -pkgrel=2.1 -pkgdesc="Qt bindings for GStreamer" +pkgrel=3 +pkgdesc="Qt4 bindings for GStreamer" arch=('i686' 'x86_64' 'mips64el') url='http://gstreamer.freedesktop.org/modules/qt-gstreamer.html' license=('LGPL2.1') -depends=('qt' 'gstreamer0.10-base' 'libgles') +depends=('qt4' 'gstreamer0.10-base' 'libgles') makedepends=('cmake' 'automoc4' 'boost' 'mesa' 'doxygen') source=("http://gstreamer.freedesktop.org/src/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('0428aedf2874fd0884ad4c41db9da20e') build() { - cd "${srcdir}" + . /etc/profile.d/qt4.sh + mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -26,6 +27,6 @@ build() { } package() { - cd "$srcdir/build" + cd build make DESTDIR="$pkgdir" install } diff --git a/extra/qt/Drop-read-write-perms-for-users.patch b/extra/qt/Drop-read-write-perms-for-users.patch deleted file mode 100644 index c3f56e65e..000000000 --- a/extra/qt/Drop-read-write-perms-for-users.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 20b26bdb3dd5e46b01b9a7e1ce8342074df3c89c Mon Sep 17 00:00:00 2001 -From: Thiago Macieira <thiago.macieira@intel.com> -Date: Sat, 22 Dec 2012 08:32:12 -0800 -Subject: [PATCH] Change all shmget calls to user-only memory - -Drop the read and write permissions for group and other users in the -system. - -Change-Id: I8fc753f09126651af3fb82df3049050f0b14e876 -(cherry-picked from Qt 5 commit 856f209fb63ae336bfb389a12d2a75fa886dc1c5) -Reviewed-by: Richard J. Moore <rich@kde.org> ---- - src/corelib/kernel/qsharedmemory_unix.cpp | 6 +++--- - src/corelib/kernel/qsystemsemaphore_unix.cpp | 4 ++-- - src/gui/image/qnativeimage.cpp | 2 +- - src/gui/image/qpixmap_x11.cpp | 2 +- - src/plugins/platforms/xcb/qxcbwindowsurface.cpp | 2 +- - src/plugins/platforms/xlib/qxlibwindowsurface.cpp | 2 +- - .../auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp | 2 +- - tools/qvfb/qvfbshmem.cpp | 4 ++-- - 8 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp -index 20d76e3..4cf3acf 100644 ---- a/src/corelib/kernel/qsharedmemory_unix.cpp -+++ b/src/corelib/kernel/qsharedmemory_unix.cpp -@@ -238,7 +238,7 @@ bool QSharedMemoryPrivate::create(int size) - } - - // create -- if (-1 == shmget(unix_key, size, 0666 | IPC_CREAT | IPC_EXCL)) { -+ if (-1 == shmget(unix_key, size, 0600 | IPC_CREAT | IPC_EXCL)) { - QString function = QLatin1String("QSharedMemory::create"); - switch (errno) { - case EINVAL: -@@ -293,7 +293,7 @@ bool QSharedMemoryPrivate::attach(QSharedMemory::AccessMode mode) - { - #ifndef QT_POSIX_IPC - // grab the shared memory segment id -- int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0444 : 0660)); -+ int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0400 : 0600)); - if (-1 == id) { - setErrorString(QLatin1String("QSharedMemory::attach (shmget)")); - return false; -@@ -381,7 +381,7 @@ bool QSharedMemoryPrivate::detach() - size = 0; - - // Get the number of current attachments -- int id = shmget(unix_key, 0, 0444); -+ int id = shmget(unix_key, 0, 0400); - cleanHandle(); - - struct shmid_ds shmid_ds; -diff --git a/src/corelib/kernel/qsystemsemaphore_unix.cpp b/src/corelib/kernel/qsystemsemaphore_unix.cpp -index fad9acc..e77456b 100644 ---- a/src/corelib/kernel/qsystemsemaphore_unix.cpp -+++ b/src/corelib/kernel/qsystemsemaphore_unix.cpp -@@ -153,10 +153,10 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode) - } - - // Get semaphore -- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT | IPC_EXCL); -+ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT | IPC_EXCL); - if (-1 == semaphore) { - if (errno == EEXIST) -- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT); -+ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT); - if (-1 == semaphore) { - setErrorString(QLatin1String("QSystemSemaphore::handle")); - cleanHandle(); -diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp -index 9654afe..fef38c5 100644 ---- a/src/gui/image/qnativeimage.cpp -+++ b/src/gui/image/qnativeimage.cpp -@@ -176,7 +176,7 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /* - - bool ok; - xshminfo.shmid = shmget(IPC_PRIVATE, xshmimg->bytes_per_line * xshmimg->height, -- IPC_CREAT | 0777); -+ IPC_CREAT | 0700); - ok = xshminfo.shmid != -1; - if (ok) { - xshmimg->data = (char*)shmat(xshminfo.shmid, 0, 0); -diff --git a/src/gui/image/qpixmap_x11.cpp b/src/gui/image/qpixmap_x11.cpp -index 280d8bd..88c9b7b 100644 ---- a/src/gui/image/qpixmap_x11.cpp -+++ b/src/gui/image/qpixmap_x11.cpp -@@ -193,7 +193,7 @@ static bool qt_create_mitshm_buffer(const QPaintDevice* dev, int w, int h) - bool ok; - xshminfo.shmid = shmget(IPC_PRIVATE, - xshmimg->bytes_per_line * xshmimg->height, -- IPC_CREAT | 0777); -+ IPC_CREAT | 0700); - ok = xshminfo.shmid != -1; - if (ok) { - xshmimg->data = (char*)shmat(xshminfo.shmid, 0, 0); -diff --git a/src/plugins/platforms/xcb/qxcbwindowsurface.cpp b/src/plugins/platforms/xcb/qxcbwindowsurface.cpp -index b6a42d8..0d56821 100644 ---- a/src/plugins/platforms/xcb/qxcbwindowsurface.cpp -+++ b/src/plugins/platforms/xcb/qxcbwindowsurface.cpp -@@ -98,7 +98,7 @@ QXcbShmImage::QXcbShmImage(QXcbScreen *screen, const QSize &size, uint depth, QI - 0); - - m_shm_info.shmid = shmget (IPC_PRIVATE, -- m_xcb_image->stride * m_xcb_image->height, IPC_CREAT|0777); -+ m_xcb_image->stride * m_xcb_image->height, IPC_CREAT|0600); - - m_shm_info.shmaddr = m_xcb_image->data = (quint8 *)shmat (m_shm_info.shmid, 0, 0); - m_shm_info.shmseg = xcb_generate_id(xcb_connection()); -diff --git a/src/plugins/platforms/xlib/qxlibwindowsurface.cpp b/src/plugins/platforms/xlib/qxlibwindowsurface.cpp -index bf003eb..46a2f97 100644 ---- a/src/plugins/platforms/xlib/qxlibwindowsurface.cpp -+++ b/src/plugins/platforms/xlib/qxlibwindowsurface.cpp -@@ -99,7 +99,7 @@ void QXlibWindowSurface::resizeShmImage(int width, int height) - - - image_info->shminfo.shmid = shmget (IPC_PRIVATE, -- image->bytes_per_line * image->height, IPC_CREAT|0777); -+ image->bytes_per_line * image->height, IPC_CREAT|0700); - - image_info->shminfo.shmaddr = image->data = (char*)shmat (image_info->shminfo.shmid, 0, 0); - image_info->shminfo.readOnly = False; -diff --git a/tools/qvfb/qvfbshmem.cpp b/tools/qvfb/qvfbshmem.cpp -index 7f9671f..84b6ebe 100644 ---- a/tools/qvfb/qvfbshmem.cpp -+++ b/tools/qvfb/qvfbshmem.cpp -@@ -176,13 +176,13 @@ QShMemViewProtocol::QShMemViewProtocol(int displayid, const QSize &s, - uint data_offset_value = sizeof(QVFbHeader); - - int dataSize = bpl * h + data_offset_value; -- shmId = shmget(key, dataSize, IPC_CREAT | 0666); -+ shmId = shmget(key, dataSize, IPC_CREAT | 0600); - if (shmId != -1) - data = (unsigned char *)shmat(shmId, 0, 0); - else { - struct shmid_ds shm; - shmctl(shmId, IPC_RMID, &shm); -- shmId = shmget(key, dataSize, IPC_CREAT | 0666); -+ shmId = shmget(key, dataSize, IPC_CREAT | 0600); - if (shmId == -1) { - perror("QShMemViewProtocol::QShMemViewProtocol"); - qFatal("Cannot get shared memory 0x%08x", key); --- -1.7.1 - diff --git a/extra/qt/Fix-binary-incompatibility-between-openssl-versions.patch b/extra/qt/Fix-binary-incompatibility-between-openssl-versions.patch deleted file mode 100644 index 5f56edd8d..000000000 --- a/extra/qt/Fix-binary-incompatibility-between-openssl-versions.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 691e78e5061d4cbc0de212d23b06c5dffddf2098 Mon Sep 17 00:00:00 2001 -From: Shane Kearns <dbgshane@gmail.com> -Date: Thu, 6 Dec 2012 17:03:18 +0000 -Subject: [PATCH 54/79] Fix binary incompatibility between openssl versions - -OpenSSL changed the layout of X509_STORE_CTX between 0.9 and 1.0 -So we have to consider this struct as private implementation, and use -the access functions instead. - -This bug would cause certificate verification problems if a different -version of openssl is loaded at runtime to the headers Qt was compiled -against. - -Task-number: QTBUG-28343 -Change-Id: I47fc24336f7d9c80f08f9c8ba6debc51a5591258 -Reviewed-by: Richard J. Moore <rich@kde.org> -(cherry picked from commit eb2688c4c4f257d0a4d978ba4bf57d6347b15252) ---- - src/network/ssl/qsslsocket_openssl.cpp | 2 +- - src/network/ssl/qsslsocket_openssl_symbols.cpp | 8 ++++++++ - src/network/ssl/qsslsocket_openssl_symbols_p.h | 4 ++++ - 3 files changed, 13 insertions(+), 1 deletion(-) - -diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp -index b7ca290..e912abac 100644 ---- a/src/network/ssl/qsslsocket_openssl.cpp -+++ b/src/network/ssl/qsslsocket_openssl.cpp -@@ -236,7 +236,7 @@ static int q_X509Callback(int ok, X509_STORE_CTX *ctx) - { - if (!ok) { - // Store the error and at which depth the error was detected. -- _q_sslErrorList()->errors << qMakePair<int, int>(ctx->error, ctx->error_depth); -+ _q_sslErrorList()->errors << qMakePair<int, int>(q_X509_STORE_CTX_get_error(ctx), q_X509_STORE_CTX_get_error_depth(ctx)); - } - // Always return OK to allow verification to continue. We're handle the - // errors gracefully after collecting all errors, after verification has -diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp -index 2d6a25b..2e6ccd0 100644 ---- a/src/network/ssl/qsslsocket_openssl_symbols.cpp -+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp -@@ -267,6 +267,10 @@ DEFINEFUNC2(int, X509_STORE_add_cert, X509_STORE *a, a, X509 *b, b, return 0, re - DEFINEFUNC(void, X509_STORE_CTX_free, X509_STORE_CTX *a, a, return, DUMMYARG) - DEFINEFUNC4(int, X509_STORE_CTX_init, X509_STORE_CTX *a, a, X509_STORE *b, b, X509 *c, c, STACK_OF(X509) *d, d, return -1, return) - DEFINEFUNC2(int, X509_STORE_CTX_set_purpose, X509_STORE_CTX *a, a, int b, b, return -1, return) -+DEFINEFUNC(int, X509_STORE_CTX_get_error, X509_STORE_CTX *a, a, return -1, return) -+DEFINEFUNC(int, X509_STORE_CTX_get_error_depth, X509_STORE_CTX *a, a, return -1, return) -+DEFINEFUNC(X509 *, X509_STORE_CTX_get_current_cert, X509_STORE_CTX *a, a, return 0, return) -+DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get_chain, X509_STORE_CTX *a, a, return 0, return) - DEFINEFUNC(X509_STORE_CTX *, X509_STORE_CTX_new, DUMMYARG, DUMMYARG, return 0, return) - #ifdef SSLEAY_MACROS - DEFINEFUNC2(int, i2d_DSAPrivateKey, const DSA *a, a, unsigned char **b, b, return -1, return) -@@ -832,6 +836,10 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(X509_STORE_CTX_init) - RESOLVEFUNC(X509_STORE_CTX_new) - RESOLVEFUNC(X509_STORE_CTX_set_purpose) -+ RESOLVEFUNC(X509_STORE_CTX_get_error) -+ RESOLVEFUNC(X509_STORE_CTX_get_error_depth) -+ RESOLVEFUNC(X509_STORE_CTX_get_current_cert) -+ RESOLVEFUNC(X509_STORE_CTX_get_chain) - RESOLVEFUNC(X509_cmp) - #ifndef SSLEAY_MACROS - RESOLVEFUNC(X509_dup) -diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h -index fa9a157..87f3697 100644 ---- a/src/network/ssl/qsslsocket_openssl_symbols_p.h -+++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h -@@ -374,6 +374,10 @@ int q_X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, - X509 *x509, STACK_OF(X509) *chain); - X509_STORE_CTX *q_X509_STORE_CTX_new(); - int q_X509_STORE_CTX_set_purpose(X509_STORE_CTX *ctx, int purpose); -+int q_X509_STORE_CTX_get_error(X509_STORE_CTX *ctx); -+int q_X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx); -+X509 *q_X509_STORE_CTX_get_current_cert(X509_STORE_CTX *ctx); -+STACK_OF(X509) *q_X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx); - - #define q_BIO_get_mem_data(b, pp) (int)q_BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)pp) - #define q_BIO_pending(b) (int)q_BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL) --- -1.8.0.2 - diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD deleted file mode 100644 index 80c9f2acc..000000000 --- a/extra/qt/PKGBUILD +++ /dev/null @@ -1,159 +0,0 @@ -# $Id: PKGBUILD 177062 2013-02-05 13:17:20Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=qt -pkgname=('qt' 'qt-private-headers') -pkgver=4.8.4 -pkgrel=3 -arch=('i686' 'x86_64' 'mips64el') -url='http://qt-project.org/' -license=('GPL3' 'LGPL') -makedepends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2' 'dbus' - 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' - 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs' - 'mysql' 'unixodbc' 'cups' 'gtk2') -[ "$CARCH" != "mips64el" ] && makedepends+=('libfbclient') -options=('!libtool') -_pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}" -source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz" - 'assistant.desktop' 'designer.desktop' 'linguist.desktop' - 'qtconfig.desktop' - 'improve-cups-support.patch' - 'declarative-fix-sigbus.patch' - 'fix-crash-in-assistant.patch' - 'Fix-binary-incompatibility-between-openssl-versions.patch' - 'Drop-read-write-perms-for-users.patch') -md5sums=('89c5ecba180cae74c66260ac732dc5cb' - 'f1837a03fd0ebbd2da58975845f278e3' - '480fea1ed076992b688373c8db274be0' - '5595c24d5bb942c21e3a4d299e6d0bf1' - '824a3b77a25e98567f640e0441ccdebc' - 'c439c7731c25387352d8453ca7574971' - 'aac963d05a9d5733e2bfce9e26607f51' - '57590084078b6379f0501f7728b02ae2' - 'abd18c8a71e08167270b8ec6de61254a' - 'db29b7dd44c56f6026b53b57bbfd9ea3') - -build() { - cd ${_pkgfqn} - - # MIPS N32-specific fix, shouldn't affect correctness on other platforms. - patch -Np1 -i "${srcdir}/declarative-fix-sigbus.patch" - - # (FS#28381) (KDEBUG#180051) - patch -p1 -i "${srcdir}"/improve-cups-support.patch - - # (FS#29469) - patch -p1 -i "${srcdir}"/fix-crash-in-assistant.patch - - # Security fixes - patch -p1 -i "${srcdir}"/Fix-binary-incompatibility-between-openssl-versions.patch - patch -p1 -i "${srcdir}"/Drop-read-write-perms-for-users.patch - - export QT4DIR="${srcdir}"/${_pkgfqn} - export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} - - [ "${CARCH}" = "mips64el" ] && export CXXFLAGS="${CXXFLAGS} -fpermissive" - - sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf - sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf - sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf - - [ "$CARCH" != "mips64el" ] && extra="-plugin-sql-ibase" - - ./configure -confirm-license -opensource \ - -prefix /usr \ - -docdir /usr/share/doc/qt \ - -plugindir /usr/lib/qt/plugins \ - -importdir /usr/lib/qt/imports \ - -datadir /usr/share/qt \ - -translationdir /usr/share/qt/translations \ - -sysconfdir /etc/xdg \ - -examplesdir /usr/share/doc/qt/examples \ - -demosdir /usr/share/doc/qt/demos \ - -plugin-sql-{psql,mysql,sqlite,odbc} \ - -system-sqlite \ - -no-phonon \ - -no-phonon-backend \ - -no-webkit \ - -graphicssystem raster \ - -openssl-linked \ - -nomake demos \ - -nomake examples \ - -nomake docs \ - -silent \ - -no-rpath \ - -optimized-qmake \ - -reduce-relocations \ - -dbus-linked \ - -no-openvg \ - $extra - make -j1 # parallel make fails with too long argument list -} - -package_qt() { - pkgdesc='A cross-platform application and UI framework' - depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2' 'dbus' - 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' - 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils') - optdepends=('postgresql-libs: PostgreSQL driver' - 'libmysqlclient: MySQL driver' - 'unixodbc: ODBC driver') - [ "$CARCH" != "mips64el" ] && optdepends+=('libfbclient: Firebird/iBase driver') - optdepends+=('libxinerama: Xinerama support' - 'libxcursor: Xcursor support' - 'libxfixes: Xfixes support' - 'icu: Unicode support') - install='qt.install' - - cd ${_pkgfqn} - make INSTALL_ROOT="${pkgdir}" install - - # install missing icons and desktop files - for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do - size=$(echo $(basename ${icon}) | cut -d- -f2) - install -D -m644 ${icon} \ - "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png" - done - install -D -m644 src/gui/dialogs/images/qtlogo-64.png \ - "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png" - install -D -m644 tools/assistant/tools/assistant/images/assistant.png \ - "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png" - install -D -m644 tools/assistant/tools/assistant/images/assistant-128.png \ - "${pkgdir}/usr/share/icons/hicolor/128x128/apps/assistant.png" - install -D -m644 tools/designer/src/designer/images/designer.png \ - "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png" - install -d "${pkgdir}/usr/share/applications" - install -m644 "${srcdir}"/{linguist,designer,assistant,qtconfig}.desktop \ - "${pkgdir}/usr/share/applications/" - - # install license addition - install -D -m644 LGPL_EXCEPTION.txt \ - ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt - - # Fix wrong path in pkgconfig files - find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \ - -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \; - - # Fix wrong path in prl files - find "${pkgdir}/usr/lib" -type f -name '*.prl' \ - -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; -} - -package_qt-private-headers(){ - pkgdesc="Qt private headers for development" - depends=("qt=${pkgver}") - - install -d "${pkgdir}"/usr/include/{QtCore,QtDeclarative,QtGui,QtScript} - install -d "${pkgdir}"/usr/src/{corelib,declarative,gui,script} - - for i in QtCore QtDeclarative QtGui QtScript; do - cp -r ${_pkgfqn}/include/${i}/private/ \ - "${pkgdir}"/usr/include/${i}/ - done - - for i in corelib declarative gui script; do - cp -r ${_pkgfqn}/src/${i} "${pkgdir}"/usr/src/ - done -} diff --git a/extra/qt/fix-crash-in-assistant.patch b/extra/qt/fix-crash-in-assistant.patch deleted file mode 100644 index 4246e0532..000000000 --- a/extra/qt/fix-crash-in-assistant.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp 2012-06-26 17:37:47.334536023 +0000 -+++ qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp~ 2012-06-26 17:37:08.531487286 +0000 -@@ -944,8 +944,7 @@ - if (helpEngine.usesAppFont()) - font = helpEngine.appFont(); - -- const QWidgetList &widgets = qApp->allWidgets(); -- foreach (QWidget* widget, widgets) -+ foreach (QWidget* widget, QApplication::allWidgets()) - widget->setFont(font); - } diff --git a/extra/qt/qtconfig.desktop b/extra/qt/qtconfig.desktop deleted file mode 100644 index 95770ff6a..000000000 --- a/extra/qt/qtconfig.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Qt Config -Comment=Configure Qt behavior, styles, fonts -Exec=/usr/bin/qtconfig -Icon=qtlogo -Terminal=false -Type=Application -Categories=Qt;Settings; -NoDisplay=true diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD new file mode 100644 index 000000000..00043864e --- /dev/null +++ b/extra/qt4/PKGBUILD @@ -0,0 +1,134 @@ +# $Id: PKGBUILD 179026 2013-03-01 17:55:20Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=qt4 +pkgver=4.8.4 +pkgrel=12 +arch=('i686' 'x86_64' 'mips64el') +url='http://qt-project.org/' +license=('GPL3' 'LGPL') +pkgdesc='A cross-platform application and UI framework' +depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'dbus' + 'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' + 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils') +makedepends=('postgresql-libs' 'mysql' 'unixodbc' 'cups' 'gtk2' + 'mesa-libgl') +optdepends=('postgresql-libs: PostgreSQL driver' + 'libmysqlclient: MySQL driver' + 'unixodbc: ODBC driver' + 'libxinerama: Xinerama support' + 'libxcursor: Xcursor support' + 'libxfixes: Xfixes support' + 'icu: Unicode support') +if [ "$CARCH" != "mips64el" ]; then + makedepends+=('libfbclient') + optdepends+=('libfbclient: Firebird/iBase driver') +fi +install="${pkgname}.install" +options=('!libtool') +replaces=('qt<=4.8.4') +conflicts=('qt') +_pkgfqn="qt-everywhere-opensource-src-${pkgver}" +source=("http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz" + 'qtconfig.desktop' 'qt4.profile' + 'improve-cups-support.patch' + 'declarative-fix-sigbus.patch') +md5sums=('89c5ecba180cae74c66260ac732dc5cb' + '20ca06ef59775d749b9451ce7437fa9a' + '4ed0bd79a310e2b5d34fc71760b99139' + 'c439c7731c25387352d8453ca7574971' + 'aac963d05a9d5733e2bfce9e26607f51') + +build() { + cd ${_pkgfqn} + + # (FS#28381) (KDEBUG#180051) + patch -p1 -i "${srcdir}"/improve-cups-support.patch + + # MIPS N32-specific fix, shouldn't affect correctness on other platforms. + patch -Np1 -i "${srcdir}/declarative-fix-sigbus.patch" + + export QT4DIR="${srcdir}"/${_pkgfqn} + export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} + + [ "${CARCH}" = "mips64el" ] && export CXXFLAGS="${CXXFLAGS} -fpermissive" + + sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf + sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf + sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf + + [ "$CARCH" != "mips64el" ] && extra="-plugin-sql-ibase" + + ./configure -confirm-license -opensource \ + -prefix /usr \ + -bindir /usr/lib/qt4/bin \ + -headerdir /usr/include/qt4 \ + -docdir /usr/share/doc/qt4 \ + -plugindir /usr/lib/qt4/plugins \ + -importdir /usr/lib/qt4/imports \ + -datadir /usr/share/qt4 \ + -translationdir /usr/share/qt4/translations \ + -sysconfdir /etc/xdg \ + -examplesdir /usr/share/doc/qt4/examples \ + -demosdir /usr/share/doc/qt4/demos \ + -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \ + -system-sqlite \ + -no-phonon \ + -no-phonon-backend \ + -no-webkit \ + -graphicssystem raster \ + -openssl-linked \ + -nomake demos \ + -nomake examples \ + -nomake docs \ + -silent \ + -no-rpath \ + -optimized-qmake \ + -reduce-relocations \ + -dbus-linked \ + -no-openvg \ + $extra + make +} + +package() { + cd ${_pkgfqn} + make INSTALL_ROOT="${pkgdir}" install + + # install missing icons and desktop files + install -D -m644 src/gui/dialogs/images/qtlogo-64.png \ + "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qt4logo.png" + install -Dm644 "${srcdir}"/qtconfig.desktop \ + "${pkgdir}/usr/share/applications/qtconfig4.desktop" + + # install the profile + install -D -m755 "${srcdir}"/qt4.profile "${pkgdir}"/etc/profile.d/qt4.sh + + # Useful symlinks for cmake and configure scripts + install -d "${pkgdir}"/usr/bin + for b in "${pkgdir}"/usr/lib/qt4/bin/*; do + ln -s /usr/lib/qt4/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt4 + done + + # install license addition + install -D -m644 LGPL_EXCEPTION.txt \ + ${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt + + # Fix wrong libs path in pkgconfig files + find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \ + -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \; + + # Fix wrong bins path in pkgconfig files + find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \ + -exec sed -i 's|/usr/bin/|/usr/lib/qt4/bin/|g' {} \; + + # Fix wrong path in prl files + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; + + # Do not install the qttools + rm "${pkgdir}"/usr/lib/qt4/bin/{assistant,designer,linguist} + rm -r "${pkgdir}"/usr/lib/qt4/plugins/designer + rm "${pkgdir}"/usr/share/qt4/translations/{assistant,designer,linguist}_*.qm +} diff --git a/extra/qt/declarative-fix-sigbus.patch b/extra/qt4/declarative-fix-sigbus.patch index 0d446fce5..0d446fce5 100644 --- a/extra/qt/declarative-fix-sigbus.patch +++ b/extra/qt4/declarative-fix-sigbus.patch diff --git a/extra/qt/improve-cups-support.patch b/extra/qt4/improve-cups-support.patch index e0305e11b..e0305e11b 100644 --- a/extra/qt/improve-cups-support.patch +++ b/extra/qt4/improve-cups-support.patch diff --git a/extra/qt/qt.install b/extra/qt4/qt4.install index 5495fb1b5..5495fb1b5 100644 --- a/extra/qt/qt.install +++ b/extra/qt4/qt4.install diff --git a/extra/qt4/qt4.profile b/extra/qt4/qt4.profile new file mode 100644 index 000000000..3129ddce5 --- /dev/null +++ b/extra/qt4/qt4.profile @@ -0,0 +1 @@ +export PATH=$PATH:/usr/lib/qt4/bin diff --git a/extra/qt4/qtconfig.desktop b/extra/qt4/qtconfig.desktop new file mode 100644 index 000000000..1573ef461 --- /dev/null +++ b/extra/qt4/qtconfig.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Qt4 Config +Comment=Configure Qt4 behavior, styles, fonts +Exec=/usr/lib/qt4/bin/qtconfig +Icon=qt4logo +Terminal=false +Type=Application +Categories=Qt;Settings; +NoDisplay=true diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD new file mode 100644 index 000000000..fc04378db --- /dev/null +++ b/extra/qt5/PKGBUILD @@ -0,0 +1,285 @@ +# $Id: PKGBUILD 179039 2013-03-01 20:22:01Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgbase=qt5 +pkgname=('qt5-base' + 'qt5-declarative' + 'qt5-doc' + 'qt5-graphicaleffects' + 'qt5-imageformats' + 'qt5-jsbackend' + 'qt5-multimedia' + 'qt5-quick1' + 'qt5-script' + 'qt5-svg' + 'qt5-tools' + 'qt5-translations' + 'qt5-webkit' + 'qt5-xmlpatterns') +pkgver=5.0.1 +pkgrel=5 +arch=('i686' 'x86_64') +url='http://qt-project.org/' +license=('GPL3' 'LGPL') +makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms' + 'mesa-libgl' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins' + 'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme' 'desktop-file-utils' + 'postgresql-libs' 'libmysqlclient' 'sqlite' 'unixodbc' 'libfbclient' + 'python2' 'ruby' 'gperf') +groups=('qt' 'qt5') +options=('!libtool') +_pkgfqn="qt-everywhere-opensource-src-${pkgver}" +source=("http://releases.qt-project.org/${pkgbase}/${pkgver}/single/${_pkgfqn}.tar.xz" + 'assistant.desktop' 'designer.desktop' 'linguist.desktop' + 'use-python2.patch') +md5sums=('00a577bd88e682d1b4d01d41d1d699cf' + 'f1837a03fd0ebbd2da58975845f278e3' + '480fea1ed076992b688373c8db274be0' + '5595c24d5bb942c21e3a4d299e6d0bf1' + 'ec3133b093550f16a21bb91e5f0f2943') + +build() { + cd ${_pkgfqn} + + export QTDIR="${srcdir}"/${_pkgfqn} + export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} + + sed -i "s|-O2|${CXXFLAGS}|" qtbase/mkspecs/common/{g++,gcc}-base.conf + sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" qtbase/mkspecs/common/gcc-base-unix.conf + sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" qtbase/mkspecs/common/gcc-base.conf + + # Use python2 for Python 2.x + patch -p1 -i "${srcdir}"/use-python2.patch + sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ + -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + $(find . -name '*.py') + + ./configure -confirm-license -opensource \ + -prefix /usr \ + -docdir /usr/share/doc/qt \ + -headerdir /usr/include/qt5 \ + -archdatadir /usr/lib/qt \ + -datadir /usr/share/qt \ + -sysconfdir /etc/xdg \ + -examplesdir /usr/share/doc/qt/examples \ + -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \ + -system-sqlite \ + -openssl-linked \ + -nomake docs \ + -nomake examples \ + -nomake tests \ + -no-rpath \ + -optimized-qmake \ + -dbus-linked \ + -reduce-relocations + + make + + # Build docs + make qmake_all + make docs +} + +package_qt5-base() { + pkgdesc=('A cross-platform application and UI framework') + depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig' 'systemd' + 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'libpng' 'xcb-util-image' + 'hicolor-icon-theme' 'xdg-utils') + optdepends=('postgresql-libs: PostgreSQL driver' + 'libmysqlclient: MySQL driver' + 'unixodbc: ODBC driver' + 'libfbclient: Firebird/iBase driver') + install='qt5-base.install' + conflicts=('qt') + + cd ${_pkgfqn}/qtbase + make INSTALL_ROOT="${pkgdir}" install + + cd "${srcdir}" + install -D -m644 ${_pkgfqn}/qtbase/LGPL_EXCEPTION.txt \ + ${pkgdir}/usr/share/licenses/${pkgbase}/LGPL_EXCEPTION.txt + + # Fix wrong path in prl files + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; + + # Fix wrong qmake path in pri file + sed -i "s|${srcdir}/${_pkgfqn}/qtbase|/usr|" \ + "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap.pri +} + +package_qt5-declarative() { + pkgdesc=('A cross-platform application and UI framework (QtQml, QtQuick)') + depends=('qt5-jsbackend' 'qt5-xmlpatterns') + conflicts=('qt') + + cd ${_pkgfqn}/qtdeclarative + make INSTALL_ROOT="${pkgdir}" install + + # Fix wrong path in prl files + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; +} + +package_qt5-doc() { + pkgdesc=('A cross-platform application and UI framework (Documentation)') + depends=('qt5-base') + conflicts=('qt-doc') + replaces=('qt-doc') + provides=('qt-doc') + options=('docs') + groups=() + + cd ${_pkgfqn} + make INSTALL_ROOT="${pkgdir}" install_docs +} + +package_qt5-jsbackend() { + pkgdesc=('A cross-platform application and UI framework (QtV8)') + depends=('qt5-base') + + cd ${_pkgfqn}/qtjsbackend + make INSTALL_ROOT="${pkgdir}" install + + # Fix wrong path in prl files + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; +} + +package_qt5-xmlpatterns() { + pkgdesc=('A cross-platform application and UI framework (QtXmlPatterns)') + depends=('qt5-base') + conflicts=('qt') + + cd ${_pkgfqn}/qtxmlpatterns + make INSTALL_ROOT="${pkgdir}" install + + # Fix wrong path in prl files + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; +} + +package_qt5-translations() { + pkgdesc=('A cross-platform application and UI framework (Translations)') + depends=('qt5-base') + conflicts=('qt') + + cd ${_pkgfqn}/qttranslations + make INSTALL_ROOT="${pkgdir}" install +} + +package_qt5-multimedia() { + pkgdesc=('A cross-platform application and UI framework (QtMultimedia)') + depends=('qt5-declarative' 'libpulse' 'gstreamer0.10-base') + conflicts=('qt') + + cd ${_pkgfqn}/qtmultimedia + make INSTALL_ROOT="${pkgdir}" install + + # Fix wrong path in prl files + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; +} + +package_qt5-graphicaleffects() { + pkgdesc=('A cross-platform application and UI framework (QtGraphicalEffects)') + depends=('qt5-declarative') + + cd ${_pkgfqn}/qtgraphicaleffects + make INSTALL_ROOT="${pkgdir}" install +} + +package_qt5-imageformats() { + pkgdesc=('A cross-platform application and UI framework (Images plugins)') + depends=('qt5-base' 'libtiff') + conflicts=('qt') + + cd ${_pkgfqn}/qtimageformats + make INSTALL_ROOT="${pkgdir}" install +} + +package_qt5-quick1() { + pkgdesc=('A cross-platform application and UI framework (QtDeclarative)') + depends=('qt5-webkit' 'qt5-script') + conflicts=('qt') + + cd ${_pkgfqn}/qtquick1 + make INSTALL_ROOT="${pkgdir}" install + + # Fix wrong path in prl files + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; +} + +package_qt5-script() { + pkgdesc=('A cross-platform application and UI framework (QtScript)') + depends=('qt5-base') + conflicts=('qt') + + cd ${_pkgfqn}/qtscript + make INSTALL_ROOT="${pkgdir}" install + + # Fix wrong path in prl files + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; +} + +package_qt5-svg() { + pkgdesc=('A cross-platform application and UI framework (QtSvg)') + depends=('qt5-base') + conflicts=('qt') + + cd ${_pkgfqn}/qtsvg + make INSTALL_ROOT="${pkgdir}" install + + # Fix wrong path in prl files + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; +} + +package_qt5-tools() { + pkgdesc=('A cross-platform application and UI framework (Development Tools, QtHelp)') + depends=('qt5-webkit' 'desktop-file-utils' 'qt5-translations') + optdepends=('qt5-doc: documentation') + install='qt5-tools.install' + conflicts=('qt') + + cd ${_pkgfqn}/qttools + make INSTALL_ROOT="${pkgdir}" install + + # install missing icons and desktop files + for icon in src/linguist/linguist/images/icons/linguist-*-32.png ; do + size=$(echo $(basename ${icon}) | cut -d- -f2) + install -p -D -m644 ${icon} \ + "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png" + done + + install -p -D -m644 src/assistant/assistant/images/assistant.png \ + "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png" + install -p -D -m644 src/assistant/assistant/images/assistant-128.png \ + "${pkgdir}/usr/share/icons/hicolor/128x128/apps/assistant.png" + install -p -D -m644 src/designer/src/designer/images/designer.png \ + "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png" + install -d "${pkgdir}/usr/share/applications" + install -m644 "${srcdir}"/{linguist,designer,assistant}.desktop \ + "${pkgdir}/usr/share/applications/" + + # Fix wrong path in prl files + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; +} + +package_qt5-webkit() { + pkgdesc=('A cross-platform application and UI framework (QtWebKit)') + depends=('qt5-declarative' 'gstreamer0.10-base' 'icu') + + cd ${_pkgfqn}/qtwebkit + make INSTALL_ROOT="${pkgdir}" install + + # Fix wrong path in prl files + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; + + # Fix wrong path in pc file + perl -pi -e "s, -L${srcdir}/?\S+,,g" "${pkgdir}"/usr/lib/pkgconfig/Qt5WebKit.pc +} diff --git a/extra/qt/assistant.desktop b/extra/qt5/assistant.desktop index 37ff84b44..37ff84b44 100644 --- a/extra/qt/assistant.desktop +++ b/extra/qt5/assistant.desktop diff --git a/extra/qt/designer.desktop b/extra/qt5/designer.desktop index f0b381d02..f0b381d02 100644 --- a/extra/qt/designer.desktop +++ b/extra/qt5/designer.desktop diff --git a/extra/qt/linguist.desktop b/extra/qt5/linguist.desktop index 3b203e0bd..3b203e0bd 100644 --- a/extra/qt/linguist.desktop +++ b/extra/qt5/linguist.desktop diff --git a/extra/qt5/qt5-base.install b/extra/qt5/qt5-base.install new file mode 100644 index 000000000..c0797237a --- /dev/null +++ b/extra/qt5/qt5-base.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/qt5/qt5-tools.install b/extra/qt5/qt5-tools.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/extra/qt5/qt5-tools.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/qt5/use-python2.patch b/extra/qt5/use-python2.patch new file mode 100644 index 000000000..8a7075a97 --- /dev/null +++ b/extra/qt5/use-python2.patch @@ -0,0 +1,96 @@ +--- qt-everywhere-opensource-src-5.0.0/qtjsbackend/src/v8/v8.pri~ 2013-01-11 06:50:55.241495644 +0000 ++++ qt-everywhere-opensource-src-5.0.0/qtjsbackend/src/v8/v8.pri 2013-01-11 06:51:29.987894356 +0000 +@@ -303,7 +303,7 @@ + V8_EXPERIMENTAL_LIBRARY_FILES = \ + $$V8SRC/proxy.js \ + +-v8_js2c.commands = python $$V8DIR/tools/js2c.py $$V8_GENERATED_SOURCES_DIR/libraries.cpp CORE off ++v8_js2c.commands = python2 $$V8DIR/tools/js2c.py $$V8_GENERATED_SOURCES_DIR/libraries.cpp CORE off + v8_js2c.commands += $$V8SRC/macros.py ${QMAKE_FILE_IN} + v8_js2c.output = $$V8_GENERATED_SOURCES_DIR/libraries.cpp + v8_js2c.input = V8_LIBRARY_FILES +@@ -314,7 +314,7 @@ + v8_js2c.name = generating[v8] ${QMAKE_FILE_IN} + silent:v8_js2c.commands = @echo generating[v8] ${QMAKE_FILE_IN} && $$v8_js2c.commands + +-v8_js2c_experimental.commands = python $$V8DIR/tools/js2c.py $$V8_GENERATED_SOURCES_DIR/experimental-libraries.cpp EXPERIMENTAL off ++v8_js2c_experimental.commands = python2 $$V8DIR/tools/js2c.py $$V8_GENERATED_SOURCES_DIR/experimental-libraries.cpp EXPERIMENTAL off + v8_js2c_experimental.commands += $$V8SRC/macros.py ${QMAKE_FILE_IN} + v8_js2c_experimental.output = $$V8_GENERATED_SOURCES_DIR/experimental-libraries.cpp + v8_js2c_experimental.input = V8_EXPERIMENTAL_LIBRARY_FILES +--- qt-everywhere-opensource-src-5.0.0/qtwebkit/Source/JavaScriptCore/DerivedSources.pri~ 2013-01-09 11:29:16.452266719 +0000 ++++ qt-everywhere-opensource-src-5.0.0/qtwebkit/Source/JavaScriptCore/DerivedSources.pri 2013-01-09 11:30:18.188538725 +0000 +@@ -85,14 +85,14 @@ + retgen.output = RegExpJitTables.h + retgen.script = $$PWD/create_regex_tables + retgen.input = retgen.script +-retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT} ++retgen.commands = python2 $$retgen.script > ${QMAKE_FILE_OUT} + GENERATORS += retgen + + #GENERATOR: "KeywordLookup.h": decision tree used by the lexer + klgen.output = KeywordLookup.h + klgen.script = $$PWD/KeywordLookupGenerator.py + klgen.input = KEYWORDLUT_FILES +-klgen.commands = python $$klgen.script ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT} ++klgen.commands = python2 $$klgen.script ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT} + GENERATORS += klgen + + EXTRACTOR_BINARY = LLIntOffsetsExtractor$$BIN_EXTENSION +@@ -117,7 +117,7 @@ + disassembler.input = DISASSEMBLER_FILES + disassembler.script = $$PWD/disassembler/udis86/itab.py + disassembler.depends = $$DISASSEMBLER_DEPENDENCY +- disassembler.commands = python $$disassembler.script ${QMAKE_FILE_NAME} --outputDir ${QMAKE_FUNC_FILE_OUT_PATH} ++ disassembler.commands = python2 $$disassembler.script ${QMAKE_FILE_NAME} --outputDir ${QMAKE_FUNC_FILE_OUT_PATH} + disassembler.CONFIG += no_link + GENERATORS += disassembler + } +--- qt-everywhere-opensource-src-5.0.0/qtwebkit/Source/WebCore/DerivedSources.pri~ 2013-01-09 11:46:01.165612894 +0000 ++++ qt-everywhere-opensource-src-5.0.0/qtwebkit/Source/WebCore/DerivedSources.pri 2013-01-09 11:46:27.465404725 +0000 +@@ -779,7 +779,7 @@ + inspectorValidate.output = InspectorProtocolVersion.h + inspectorValidate.input = INSPECTOR_JSON + inspectorValidate.script = $$PWD/inspector/generate-inspector-protocol-version +-inspectorValidate.commands = python $$inspectorValidate.script -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN} ++inspectorValidate.commands = python2 $$inspectorValidate.script -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN} + inspectorValidate.depends = $$PWD/inspector/generate-inspector-protocol-version + inspectorValidate.add_output_to_sources = false + GENERATORS += inspectorValidate +@@ -787,7 +787,7 @@ + inspectorJSON.output = InspectorFrontend.cpp InspectorBackendDispatcher.cpp InspectorTypeBuilder.cpp + inspectorJSON.input = INSPECTOR_JSON + inspectorJSON.script = $$PWD/inspector/CodeGeneratorInspector.py +-inspectorJSON.commands = python $$inspectorJSON.script $$PWD/inspector/Inspector.json --output_h_dir ${QMAKE_FUNC_FILE_OUT_PATH} --output_cpp_dir ${QMAKE_FUNC_FILE_OUT_PATH} ++inspectorJSON.commands = python2 $$inspectorJSON.script $$PWD/inspector/Inspector.json --output_h_dir ${QMAKE_FUNC_FILE_OUT_PATH} --output_cpp_dir ${QMAKE_FUNC_FILE_OUT_PATH} + inspectorJSON.depends = $$inspectorJSON.script + GENERATORS += inspectorJSON + +@@ -908,7 +908,7 @@ + entities.output = HTMLEntityTable.cpp + entities.input = HTML_ENTITIES + entities.script = $$PWD/html/parser/create-html-entity-table +-entities.commands = python $$entities.script -o ${QMAKE_FILE_OUT} $$HTML_ENTITIES ++entities.commands = python2 $$entities.script -o ${QMAKE_FILE_OUT} $$HTML_ENTITIES + entities.clean = ${QMAKE_FILE_OUT} + entities.depends = $$PWD/html/parser/create-html-entity-table + GENERATORS += entities +--- qt-everywhere-opensource-src-5.0.1/qtwebkit/Source/WebKit2/DerivedSources.pri~ 2013-02-10 13:48:49.800319915 +0000 ++++ qt-everywhere-opensource-src-5.0.1/qtwebkit/Source/WebKit2/DerivedSources.pri 2013-02-10 13:49:09.966867900 +0000 +@@ -120,14 +120,14 @@ + $$PWD/Scripts/webkit2/model.py \ + $$PWD/Scripts/webkit2/parser.py + +-message_header_generator.commands = $${PYTHON} $${SOURCE_DIR}/WebKit2/Scripts/generate-messages-header.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} ++message_header_generator.commands = python2 $${SOURCE_DIR}/WebKit2/Scripts/generate-messages-header.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} + message_header_generator.input = MESSAGE_RECEIVERS + message_header_generator.depends = $$SCRIPTS + message_header_generator.output_function = message_header_generator_output + message_header_generator.add_output_to_sources = false + GENERATORS += message_header_generator + +-message_receiver_generator.commands = $${PYTHON} $${SOURCE_DIR}/WebKit2/Scripts/generate-message-receiver.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} ++message_receiver_generator.commands = python2 $${SOURCE_DIR}/WebKit2/Scripts/generate-message-receiver.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} + message_receiver_generator.input = MESSAGE_RECEIVERS + message_receiver_generator.depends = $$SCRIPTS + message_receiver_generator.output_function = message_receiver_generator_output diff --git a/extra/qtscriptgenerator/PKGBUILD b/extra/qtscriptgenerator/PKGBUILD index fd570d20d..32c57bb16 100644 --- a/extra/qtscriptgenerator/PKGBUILD +++ b/extra/qtscriptgenerator/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 158023 2012-05-01 07:24:53Z andrea $ +# $Id: PKGBUILD 179036 2013-03-01 19:03:29Z andrea $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qtscriptgenerator pkgver=0.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="A tool that generates Qt bindings for Qt Script" arch=("i686" "x86_64" 'mips64el') url="https://code.google.com/p/qtscriptgenerator/" @@ -18,27 +18,27 @@ sha1sums=('4c1078f26b196156e857c17c9d11a66cfea66f00' 'c50b26e6504f5c981a916860d9c3929e436e1067') build() { - cd "${srcdir}"/$pkgname-src-$pkgver + cd $pkgname-src-$pkgver patch -p1 -i "${srcdir}"/phonon.patch patch -p1 -i "${srcdir}"/no-phonon.patch # prepare plugins cd generator - qmake + qmake-qt4 make - ./generator --include-paths=/usr/include + QTDIR=/usr ./generator --include-paths=/usr/include/qt4 # build plugins - cd "${srcdir}"/$pkgname-src-$pkgver/qtbindings - qmake + cd ../qtbindings + qmake-qt4 make } package() { - cd "${srcdir}"/$pkgname-src-$pkgver/qtbindings + cd $pkgname-src-$pkgver/qtbindings # move plugins to correct directory - install -d "${pkgdir}"/usr/lib/qt/plugins/script + install -d "${pkgdir}"/usr/lib/qt4/plugins/script cp -a "${srcdir}"/$pkgname-src-$pkgver/plugins/script/* \ - "${pkgdir}"/usr/lib/qt/plugins/script/ + "${pkgdir}"/usr/lib/qt4/plugins/script/ } diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD index d41018102..1f91d23f8 100644 --- a/extra/qtwebkit/PKGBUILD +++ b/extra/qtwebkit/PKGBUILD @@ -1,27 +1,22 @@ -# $Id: PKGBUILD 178044 2013-02-14 09:17:43Z andrea $ +# $Id: PKGBUILD 178989 2013-03-01 10:24:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=qtwebkit pkgver=2.3.beta2 _pkgver=2.3-beta2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://trac.webkit.org/wiki/QtWebKit' pkgdesc='An open source web browser engine (Qt port)' license=('LGPL2.1' 'GPL3') -depends=('qt' 'systemd' 'gstreamer0.10-base') +depends=('qt4' 'systemd' 'gstreamer0.10-base') makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa') conflicts=('qt<4.8') -_qtver=4.8.4 source=("${pkgname}-${pkgver}.tar.gz"::"http://gitorious.org/webkit/qtwebkit-23/archive-tarball/${pkgname}-${_pkgver}" - "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz" 'use-python2.patch' - 'qwebview.patch' 'LLIntCLoop32BigEndian.patch') sha1sums=('b1bfa9e3303ce9c95eec0a1e66b2b812b844bf08' - 'f5880f11c139d7d8d01ecb8d874535f7d9553198' '315b6ff603f35e5492a036f7082f6aa075dfb607' - 'fed0c1a90e3997b5575dbc83d6ea23bc46097a6f' 'af830ae24e2ae5113754c9ae524d27ec0a28a9d6') build() { @@ -52,23 +47,9 @@ build() { --makeargs="${MAKEFLAGS}" \ --prefix=/usr \ ${OPTS} - - cd ../ - - # Build the QWebView plugin (FS#27914) - cd qt-everywhere-opensource-src-${_qtver} - patch -p1 -i "${srcdir}"/qwebview.patch - cd tools/designer/src/plugins/qwebview - qmake - make } package() { cd webkit-qtwebkit-23 make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install - - cd ../ - - cd qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview - make INSTALL_ROOT="${pkgdir}" install } diff --git a/extra/qtwebkit/qwebview.patch b/extra/qtwebkit/qwebview.patch deleted file mode 100644 index 73d5d5032..000000000 --- a/extra/qtwebkit/qwebview.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri~ 2013-01-09 12:56:08.915412090 +0000 -+++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri 2013-01-09 12:58:06.911391299 +0000 -@@ -1,3 +1,6 @@ -+INCLUDEPATH += ../../../../../../webkit-qtwebkit-23/WebKitBuild/Release/include -+LIBS += -L../../../../../../webkit-qtwebkit-23/WebKitBuild/Release/lib -+ - CONFIG += designer - win32|mac: CONFIG+= debug_and_release - QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer ---- qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pro~ 2013-01-09 12:55:43.598892405 +0000 -+++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pro 2013-01-09 12:55:53.352169136 +0000 -@@ -2,9 +2,4 @@ - CONFIG += ordered - - REQUIRES = !CONFIG(static,shared|static) --contains(QT_CONFIG, qt3support): SUBDIRS += widgets --win32: SUBDIRS += activeqt --# contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d - contains(QT_CONFIG, webkit): SUBDIRS += qwebview --contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets --contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativeview diff --git a/extra/qwt/PKGBUILD b/extra/qwt/PKGBUILD index ab4689025..a6c9c05c5 100644 --- a/extra/qwt/PKGBUILD +++ b/extra/qwt/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 171291 2012-11-17 00:59:56Z allan $ +# $Id: PKGBUILD 178991 2013-03-01 10:24:47Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=qwt pkgver=6.0.1 -pkgrel=3.1 +pkgrel=4 pkgdesc="Qt Widgets for Technical Applications" arch=('i686' 'x86_64' 'mips64el') url="http://qwt.sourceforge.net/" -depends=('qt') +depends=('qt4') options=('!makeflags') license=("custom:$pkgname") source=("http://downloads.sourceforge.net/sourceforge/qwt/$pkgname-$pkgver.tar.bz2" \ @@ -16,6 +16,8 @@ sha1sums=('301cca0c49c7efc14363b42e082b09056178973e' 'aba0fc75f6d450237028b7b143bdcf05a79cabb3') build() { + . /etc/profile.d/qt4.sh + cd ${srcdir}/${pkgname}-${pkgver} # copy our config file to the right place @@ -33,9 +35,9 @@ package() { make INSTALL_ROOT=${pkgdir} QTDIR=/usr install # install web designer plugin - install -d ${pkgdir}/usr/lib/qt/plugins/designer/ + install -d ${pkgdir}/usr/lib/qt4/plugins/designer/ install -Dm755 designer/plugins/designer/libqwt_designer_plugin.so \ - ${pkgdir}/usr/lib/qt/plugins/designer/ + ${pkgdir}/usr/lib/qt4/plugins/designer/ # Move man files to proper directory. # install -d ${pkgdir}/usr/share/man/man3 diff --git a/extra/qwtplot3d/PKGBUILD b/extra/qwtplot3d/PKGBUILD index b51d260b8..2d261f9c0 100644 --- a/extra/qwtplot3d/PKGBUILD +++ b/extra/qwtplot3d/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 171261 2012-11-16 23:35:36Z allan $ +# $Id: PKGBUILD 178992 2013-03-01 10:24:54Z andrea $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=qwtplot3d pkgver=0.2.7 -pkgrel=5 +pkgrel=6 pkgdesc="Qt/OpenGL-based C++ programming library containing 3d-widgets" arch=("i686" "x86_64" 'mips64el') license=('custom:zlib') url="http://qwtplot3d.sourceforge.net/" -depends=('qt' 'qwt') +depends=('qt4' 'qwt') makedepends=('mesa' 'glu') source=("http://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$pkgver.tgz" qwtplot3d-gcc44.patch qwtplot3d-qt-4.8.0.patch) @@ -18,6 +18,8 @@ sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea' '8dcafdc9753b0f2eeea2f1e96efa6e8d3d956005') build() { + . /etc/profile.d/qt4.sh + cd ${srcdir}/${pkgname} patch -p1 < ../qwtplot3d-gcc44.patch patch -p1 < ../qwtplot3d-qt-4.8.0.patch diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD index ebc4007af..9f4e85cd6 100644 --- a/extra/rosegarden/PKGBUILD +++ b/extra/rosegarden/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 173870 2012-12-26 20:57:07Z schiv $ +# $Id: PKGBUILD 178993 2013-03-01 10:25:02Z andrea $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Robert Emil Berge <robert@rebi.no> pkgname=rosegarden -pkgver=12.12.25 +pkgver=13.02 pkgrel=1 pkgdesc="MIDI/audio sequencer and notation editor" arch=('i686' 'x86_64' 'mips64el') url="http://www.rosegardenmusic.com/" license=('GPL') depends=('liblrdf' 'dssi' 'fftw' 'lirc-utils' - 'perl' 'qt' 'shared-mime-info') + 'perl' 'qt4' 'shared-mime-info') makedepends=('imake') optdepends=('lilypond: notation display' 'cups: printing support' @@ -23,14 +23,14 @@ optdepends=('lilypond: notation display' [ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support') install=$pkgname.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('8c98e7d3d448b07d9dc079b28bd37eba') +md5sums=('c1e2f80b599a942896e9ebd63896032f') build() { cd "$srcdir/$pkgname-$pkgver" # lrdf + raptor2 compatibility export lrdf_CFLAGS="$(pkg-config --cflags raptor2)" - ./configure --prefix=/usr + LRELEASE=/usr/lib/qt4/bin/lrelease LUPDATE=/usr/lib/qt4/bin/lupdate ./configure --prefix=/usr make } diff --git a/extra/rosegarden/rosegarden.install b/extra/rosegarden/rosegarden.install index 5119faec2..3f22aadfb 100644 --- a/extra/rosegarden/rosegarden.install +++ b/extra/rosegarden/rosegarden.install @@ -1,6 +1,7 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q } post_upgrade() { diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index e8c50d100..7eb130548 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 176366 2013-01-31 08:04:09Z tpowa $ +# $Id: PKGBUILD 178542 2013-02-25 16:00:30Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgbase=samba @@ -8,7 +8,7 @@ pkgver=3.6.12 # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! _realver=3.6.12 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64 mips64el) url="http://www.samba.org" license=('GPL3') @@ -81,6 +81,9 @@ depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprog mkdir -p ${pkgdir}/usr/include install -m644 include/libsmbclient.h ${pkgdir}/usr/include/ install -m644 lib/netapi/netapi.h ${pkgdir}/usr/include/ + mkdir -p ${pkgdir}/usr/lib/pkgconfig + install -m644 pkgconfig/smbclient.pc ${pkgdir}/usr/lib/pkgconfig/ + install -m644 pkgconfig/netapi.pc ${pkgdir}/usr/lib/pkgconfig/ mkdir -p ${pkgdir}/usr/share/man/man{1,7} for man in rpcclient smbcacls smbclient smbcquotas smbget \ smbtree smbtar nmblookup; do @@ -162,6 +165,9 @@ install='samba.install' # create ephemeral dirs via tmpfiles rather than shipping them in package install -D -m644 ${srcdir}/samba.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf rm -rf ${pkgdir}/var/run + + mkdir -p ${pkgdir}/usr/lib/pkgconfig + install -m644 pkgconfig/smbsharemodes.pc ${pkgdir}/usr/lib/pkgconfig/ } md5sums=('430fd21a1acd26964d3ccf366df8709a' '5697da77590ec092cc8a883bae06093c' diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index fca52cdb1..eabd02224 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 173127 2012-12-11 14:42:10Z jgc $ +# $Id: PKGBUILD 178746 2013-02-26 16:27:02Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Simo L. <neotuli@yahoo.com> @@ -6,7 +6,7 @@ pkgname=sane pkgver=1.0.23 -pkgrel=2.1 +pkgrel=3 pkgdesc="Scanner Access Now Easy" url="http://www.sane-project.org/" arch=('i686' 'x86_64' 'mips64el') @@ -18,12 +18,19 @@ backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz 'sane.xinetd' 'saned.socket' - 'saned.service') + 'saned.service' + 'kodakaio.c.patch' + 'network.patch') options=(!libtool) build() { cd "${srcdir}/${pkgname}-backends-${pkgver}" + # fix FS#33657 + patch -Np0 -i ${srcdir}/kodakaio.c.patch + # fix http://vasks.debian.org/tracker/?func=detail&atid=410366&aid=313760&group_id=30186 + patch -Np1 -i ${srcdir}/network.patch + ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -59,6 +66,8 @@ package () { "${pkgdir}/usr/lib/systemd/system/saned@.service" } md5sums=('e226a89c54173efea80e91e9a5eb6573' - 'da946cc36fb83612162cf9505986d4b2' + '5f519030392d599e2ad348159ec4c96f' 'e57e9e15528f47f5f1b3f1411135ed5d' - 'e44bd4c994a52d6f472463d1eb0a03be') + 'e44bd4c994a52d6f472463d1eb0a03be' + 'e65dbefb7c3d69955fb6eb3ace14aa12' + '44e77692c52db15b0f530a1d9a8e1296') diff --git a/extra/sane/kodakaio.c.patch b/extra/sane/kodakaio.c.patch new file mode 100644 index 000000000..95cb1ee9a --- /dev/null +++ b/extra/sane/kodakaio.c.patch @@ -0,0 +1,11 @@ +--- backend/kodakaio.c.bad 2013-01-31 20:42:10.627296894 +0100 ++++ backend/kodakaio.c 2013-01-31 20:42:46.040397213 +0100 +@@ -2197,7 +2197,7 @@ + + reply = cupsGetDevices(CUPS_HTTP_DEFAULT, CUPS_TIMEOUT_DEFAULT, + "dnssd", CUPS_EXCLUDE_NONE, ProcessDevice, Dummy); +- if(reply != IPP_OK) printf("Failed cupsGetDevices\n"); ++ if(reply != IPP_OK) DBG(1, "Failed cupsGetDevices\n"); + + return 0; + } diff --git a/extra/sane/libv4l-0.8.3.patch b/extra/sane/libv4l-0.8.3.patch deleted file mode 100644 index 4e240e0cf..000000000 --- a/extra/sane/libv4l-0.8.3.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001 -From: Nils Philippsen <nils@redhat.com> -Date: Mon, 14 Mar 2011 13:35:05 +0100 -Subject: [PATCH] patch: v4l - -Squashed commit of the following: - -commit 23381932c76846191b42a48e505b37cd74711265 -Author: Julien BLACHE <jb@jblache.org> -Date: Wed Feb 16 19:37:43 2011 +0100 - - Fix v4l build with libv4l 0.8.3+ - - (cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953) - - Conflicts: - - ChangeLog - - Signed-off-by: Nils Philippsen <nils@redhat.com> ---- - backend/v4l.c | 3 +-- - backend/v4l.h | 3 ++- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/backend/v4l.c b/backend/v4l.c -index 6510ef0..38595ed 100644 ---- a/backend/v4l.c -+++ b/backend/v4l.c -@@ -84,9 +84,8 @@ - #include "../include/sane/sanei_config.h" - #define V4L_CONFIG_FILE "v4l.conf" - --#include "v4l.h" -- - #include <libv4l1.h> -+#include "v4l.h" - - static const SANE_Device **devlist = NULL; - static int num_devices; -diff --git a/backend/v4l.h b/backend/v4l.h -index 588b96e..6aee586 100644 ---- a/backend/v4l.h -+++ b/backend/v4l.h -@@ -29,6 +29,7 @@ - #ifndef v4l_h - #define v4l_h - -+#ifndef __LINUX_VIDEODEV_H - /* Kernel interface */ - /* Only the stuff we need. For more features, more defines are needed */ - -@@ -165,7 +166,7 @@ struct video_channel - - - /* end of kernel interface */ -- -+#endif /* !__LINUX_VIDEODEV_H */ - - #include <../include/sane/sane.h> - --- -1.7.4 - diff --git a/extra/sane/network.patch b/extra/sane/network.patch new file mode 100644 index 000000000..2605ea835 --- /dev/null +++ b/extra/sane/network.patch @@ -0,0 +1,42 @@ +diff --git a/sanei/sanei_tcp.c b/sanei/sanei_tcp.c +index a57d7c7..d0a1e92 100644 +--- a/sanei/sanei_tcp.c ++++ b/sanei/sanei_tcp.c +@@ -45,6 +45,7 @@ + #include <unistd.h> + #include <stdlib.h> + #include <string.h> ++#include <time.h> + + #ifdef HAVE_WINSOCK2_H + #include <winsock2.h> +@@ -123,14 +124,27 @@ sanei_tcp_write(int fd, const u_char * buf, int count) + ssize_t + sanei_tcp_read(int fd, u_char * buf, int count) + { +- ssize_t bytes_recv = 0, rc = 1; ++ ssize_t bytes_recv = 0, rc = 1; ++ int retry = 5; + + while (bytes_recv < count && rc > 0) + { + rc = recv(fd, buf+bytes_recv, count-bytes_recv, 0); ++ DBG(1, "%s: bytes received %d\n", __FUNCTION__, rc); + if (rc > 0) + bytes_recv += rc; +- ++ else { ++ if ( errno == EAGAIN && retry-- ) { ++ DBG(1, "%s: waiting %d\n", __FUNCTION__, retry); ++ /* wait for max 1s */ ++ struct timespec req; ++ struct timespec rem; ++ req.tv_sec = 0; ++ req.tv_nsec= 100000000; ++ nanosleep(&req, &rem); ++ rc = 1; ++ } ++ } + } + return bytes_recv; + } diff --git a/extra/sane/sane.xinetd b/extra/sane/sane.xinetd index b035664b4..67f08a656 100644 --- a/extra/sane/sane.xinetd +++ b/extra/sane/sane.xinetd @@ -3,7 +3,7 @@ service sane-port port = 6566 socket_type = stream wait = no - user = root + user = nobody group = scanner server = /usr/sbin/saned # disabled by default! diff --git a/extra/sane/xerox_mfp_fix_usb_devices.patch b/extra/sane/xerox_mfp_fix_usb_devices.patch deleted file mode 100644 index 5ed29b974..000000000 --- a/extra/sane/xerox_mfp_fix_usb_devices.patch +++ /dev/null @@ -1,67 +0,0 @@ -commit 5ea227caeacd504b64eef301e83fa63e0a25b3f7 -Author: Alex Belkin <abc@telekom.ru> -Date: Tue Mar 8 17:57:19 2011 +0300 - - keep usb device by default (correct for bug introduced by tcp sub-backend - -diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c -index e08b50f..d4672a7 100644 ---- a/backend/xerox_mfp.c -+++ b/backend/xerox_mfp.c -@@ -37,10 +37,10 @@ - static const SANE_Device **devlist = NULL; /* sane_get_devices array */ - static struct device *devices_head = NULL; /* sane_get_devices list */ - --transport available_transports[] = { -+enum { TRANSPORT_USB, TRANSPORT_TCP, TRANSPORTS_MAX }; -+transport available_transports[TRANSPORTS_MAX] = { - { "usb", usb_dev_request, usb_dev_open, usb_dev_close, usb_configure_device }, - { "tcp", tcp_dev_request, tcp_dev_open, tcp_dev_close, tcp_configure_device }, -- { 0 } - }; - - static int resolv_state(int state) -@@ -824,7 +824,13 @@ free_devices (void) - devices_head = NULL; - } - --/* SANE API ignores return code of this callback */ -+static transport *tr_from_devname(SANE_String_Const devname) -+{ -+ if (strncmp("tcp", devname, 3) == 0) -+ return &available_transports[TRANSPORT_TCP]; -+ return &available_transports[TRANSPORT_USB]; -+} -+ - static SANE_Status - list_one_device (SANE_String_Const devname) - { -@@ -839,12 +845,7 @@ list_one_device (SANE_String_Const devname) - return SANE_STATUS_GOOD; - } - -- for (tr = available_transports; tr->ttype; tr++) { -- if (!strncmp (devname, tr->ttype, strlen(tr->ttype))) -- break; -- } -- if (!tr->ttype) -- return SANE_STATUS_INVAL; -+ tr = tr_from_devname(devname); - - dev = calloc (1, sizeof (struct device)); - if (dev == NULL) -@@ -878,13 +879,7 @@ list_one_device (SANE_String_Const devname) - static SANE_Status - list_conf_devices (UNUSED (SANEI_Config * config), const char *devname) - { -- transport *tr; -- -- for (tr = available_transports; tr->ttype; tr++) { -- if (!strncmp (devname, tr->ttype, strlen(tr->ttype))) -- return tr->configure_device(devname, list_one_device); -- } -- return SANE_STATUS_INVAL; -+ return tr_from_devname(devname)->configure_device(devname, list_one_device); - } - - SANE_Status diff --git a/extra/scribus/PKGBUILD b/extra/scribus/PKGBUILD index 195391d4f..51f2f93a6 100644 --- a/extra/scribus/PKGBUILD +++ b/extra/scribus/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 175912 2013-01-24 08:14:06Z remy $ +# $Id: PKGBUILD 178994 2013-03-01 10:25:10Z andrea $ # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: tobias <tobias@archlinux.org> # Contributor: Ben <ben@benmazer.net> @@ -6,20 +6,19 @@ pkgname=scribus pkgver=1.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="A desktop publishing program" arch=('i686' 'x86_64' 'mips64el') url="http://www.scribus.net" license=('GPL') install=scribus.install -depends=('libcups>=1.3.11' 'lcms>=1.18' 'qt' 'ghostscript>=8.70' \ +depends=('libcups>=1.3.11' 'lcms2' 'qt4' 'ghostscript>=8.70' \ 'libart-lgpl>=2.3.20' 'python2' 'libxml2>=2.7.3' 'cairo' \ 'desktop-file-utils' 'shared-mime-info' \ 'hyphen' 'aspell' 'boost-libs') -makedepends=('cmake' 'boost') +makedepends=('cmake' 'boost' 'mesa') options=(!libtool) source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz) -md5sums=('5c2a6bb7107e67a0083e32275bdb1a13') sha1sums=('6e67e98fa315a2890d9cbb12eed49ecebb7f11cb') build() { diff --git a/extra/scribus/scribus.install b/extra/scribus/scribus.install index 0598e46ed..52a6286ac 100644 --- a/extra/scribus/scribus.install +++ b/extra/scribus/scribus.install @@ -1,8 +1,6 @@ - post_install() { - echo "update desktop mime database..." - update-mime-database usr/share/mime > /dev/null 2>&1 - update-desktop-database -q > /dev/null 2>&1 + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q } post_upgrade() { post_install $1 diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD index 498956596..3cd0bd5e0 100644 --- a/extra/sip/PKGBUILD +++ b/extra/sip/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 173037 2012-12-09 15:06:30Z andrea $ +# $Id: PKGBUILD 178483 2013-02-24 11:42:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net> pkgbase=sip pkgname=('sip' 'python-sip' 'python2-sip') -pkgver=4.14.2 +pkgver=4.14.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.com/software/sip/" license=('custom:"sip"') makedepends=('python' 'python2') source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz") -md5sums=('b93442e745b3be2fad89de0686a76ce9') +md5sums=('d5f037800bfd727e40ed818260943772') build() { cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver} diff --git a/extra/smplayer/PKGBUILD b/extra/smplayer/PKGBUILD index 9043e7684..44b19cf12 100644 --- a/extra/smplayer/PKGBUILD +++ b/extra/smplayer/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 173913 2012-12-28 02:38:34Z foutrelis $ +# $Id: PKGBUILD 178995 2013-03-01 10:25:28Z andrea $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> @@ -6,12 +6,12 @@ pkgname=smplayer pkgver=0.8.3 -pkgrel=1.1 +pkgrel=2 pkgdesc="A complete front-end for MPlayer" arch=('i686' 'x86_64' 'mips64el') url="http://smplayer.sourceforge.net/" license=('GPL') -depends=('qt' 'mplayer') +depends=('qt4' 'mplayer') install=smplayer.install source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) md5sums=('48755bffdff3878df32d8c047d7a3d52') diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD index d3ca43c94..c21b8a2fc 100644 --- a/extra/soprano/PKGBUILD +++ b/extra/soprano/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 177766 2013-02-08 09:03:19Z andrea $ +# $Id: PKGBUILD 178996 2013-03-01 10:25:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=soprano pkgver=2.9.0 -pkgrel=1 +pkgrel=2 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data' arch=('i686' 'x86_64' 'mips64el') url='http://soprano.sourceforge.net/' license=('GPL' 'LGPL') -depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso-base') -makedepends=('cmake' 'openjdk6' 'doxygen') -[ "$CARCH" = "mips64el" ] && makedepends=('cmake' 'doxygen') +depends=('qt4' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso-base') +makedepends=('cmake' 'doxygen') +[ "$CARCH" != "mips64el" ] && makedepends+=('java-environment') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('90134eaaf40b6663dd01cfaefdaba7fb') @@ -20,7 +20,8 @@ build() { cd build [ "$CARCH" = "mips64el" ] || \ - . /etc/profile.d/openjdk6.sh + . /etc/profile.d/jdk.sh + . /etc/profile.d/qt4.sh # we need the rpath cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/stellarium/PKGBUILD b/extra/stellarium/PKGBUILD index 1a549e958..3cd2faeb2 100644 --- a/extra/stellarium/PKGBUILD +++ b/extra/stellarium/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 178102 2013-02-16 09:07:23Z ronald $ +# $Id: PKGBUILD 178997 2013-03-01 10:25:43Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=stellarium pkgver=0.12.0 -pkgrel=1 +pkgrel=2 pkgdesc="A stellarium with great graphics and a nice database of sky-objects" arch=("i686" "x86_64" 'mips64el') url="http://stellarium.free.fr/" license=('GPL2') -depends=('libpng' 'glu' 'libgl' 'freetype2' 'qt' 'openssl' 'desktop-file-utils' +depends=('libpng' 'glu' 'libgl' 'freetype2' 'qt4' 'openssl' 'desktop-file-utils' 'xdg-utils') install=stellarium.install -makedepends=('cmake' 'boost' 'mesa') +makedepends=('cmake' 'boost' 'mesa' 'mesa-libgl') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz stellarium.desktop stellarium.png) diff --git a/extra/strigi/PKGBUILD b/extra/strigi/PKGBUILD index db9d618e5..6bf0c5f97 100644 --- a/extra/strigi/PKGBUILD +++ b/extra/strigi/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 177081 2013-02-05 23:18:31Z andrea $ +# $Id: PKGBUILD 178998 2013-03-01 10:25:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=strigi pkgver=0.7.8 -pkgrel=1 +pkgrel=2 pkgdesc="Fast crawling desktop search engine with Qt GUI" arch=('i686' 'x86_64' 'mips64el') url='http://strigi.sourceforge.net/' license=('GPL2') -depends=('exiv2' 'libxml2' 'boost-libs' 'qt') +depends=('exiv2' 'libxml2' 'boost-libs' 'qt4') makedepends=('cmake' 'pkg-config' 'boost') optdepends=('kdegraphics-strigi-analyzer: strigi analyzers for various graphics file' 'kdesdk-strigi-analyzer: strigi analyzer for KDE SDK') @@ -17,6 +17,8 @@ source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.ta md5sums=('d69443234f4286d71997db9de543331a') build() { + . /etc/profile.d/qt4.sh + mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/extra/suil/PKGBUILD b/extra/suil/PKGBUILD index f03085cba..392987b38 100644 --- a/extra/suil/PKGBUILD +++ b/extra/suil/PKGBUILD @@ -4,14 +4,14 @@ pkgname=suil pkgver=0.6.10 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight C library for loading and wrapping LV2 plugin UIs" arch=(i686 x86_64 mips64el) url="http://drobilla.net/software/$pkgname/" license=('custom:ISC') depends=('lv2') -makedepends=('python2' 'qt' 'gtk2') -optdepends=('qt: Qt UIs wrapping support' +makedepends=('python2' 'qt4' 'gtk2') +optdepends=('qt4: Qt UIs wrapping support' 'gtk2: Gtk2 UIs wrapping support') source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") md5sums=('735e3cc4d539059cf3948d3dba75807e') diff --git a/extra/swt/PKGBUILD b/extra/swt/PKGBUILD index 94c7bc9ec..117266eec 100644 --- a/extra/swt/PKGBUILD +++ b/extra/swt/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 173193 2012-12-12 16:57:29Z guillaume $ +# $Id: PKGBUILD 178694 2013-02-26 10:20:09Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> pkgname=swt pkgver=4.2.1 -pkgrel=1 +pkgrel=2 _date=201209141800 -pkgdesc="An open source widget toolkit for Java" +pkgdesc='An open source widget toolkit for Java' arch=('i686' 'x86_64') -url="http://www.eclipse.org/swt/" +url='http://www.eclipse.org/swt/' license=('EPL') depends=('java-runtime>=6' 'gtk2>=2.20.1' 'libxtst') optdepends=('libgnomeui' 'mesa' 'glu' 'libwebkit') @@ -25,6 +25,7 @@ source=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date build-swt.xml) # To test this pkg: # http://www.eclipse.org/swt/examples.php#standaloneOutsideEclipse +# http://download.eclipse.org/eclipse/downloads/ build() { cd ${srcdir} diff --git a/extra/telepathy-qt/PKGBUILD b/extra/telepathy-qt/PKGBUILD index ff490b8a4..3b44e9c4f 100644 --- a/extra/telepathy-qt/PKGBUILD +++ b/extra/telepathy-qt/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 178069 2013-02-15 10:07:33Z andrea $ +# $Id: PKGBUILD 179000 2013-03-01 10:26:12Z andrea $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-qt pkgver=0.9.3 -pkgrel=4 +pkgrel=5 pkgdesc="A library for Qt-based Telepathy clients" arch=('i686' 'x86_64' 'mips64el') url="http://telepathy.freedesktop.org/wiki/" license=('LGPL') options=('!libtool') -depends=('qt' 'telepathy-farstream' 'gstreamer0.10-base') +depends=('qt4' 'telepathy-farstream' 'gstreamer0.10-base') makedepends=('libxslt' 'python2' 'cmake' 'doxygen') conflicts=('telepathy-qt4') replaces=('telepathy-qt4') @@ -20,6 +20,8 @@ md5sums=('94ac93aedf5f6fff49837bc8368e5a37' 'e1b851b08b159fca39596ff8395ca53a') build() { + . /etc/profile.d/qt4.sh + mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/extra/texmacs/PKGBUILD b/extra/texmacs/PKGBUILD index 9b1261ac8..c81afb68e 100644 --- a/extra/texmacs/PKGBUILD +++ b/extra/texmacs/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 171430 2012-11-17 14:28:35Z ronald $ +# $Id: PKGBUILD 179001 2013-03-01 10:26:20Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: Christopher Reimer <c.reimer1993@gmail.com> pkgname=texmacs pkgver=1.0.7.16 -pkgrel=1.1 +pkgrel=2 pkgdesc="Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor TeX-fonts and CAS-interface (Giac, GTybalt, Macaulay 2, Maxima, Octave, Pari, Qcl, R and Yacas) in one." arch=('i686' 'x86_64' 'mips64el') url="http://www.texmacs.org/" license=('GPL') depends=('perl' 'guile' 'texlive-core' 'python2' 'libxext' 'freetype2' 'shared-mime-info' - 'desktop-file-utils' 'qt') + 'desktop-file-utils' 'qt4') # do not remove texlive-core dependency, as it is needed! optdepends=('transfig: convert images using fig2ps' 'gawk: conversion of some files') diff --git a/extra/tomcat-native/PKGBUILD b/extra/tomcat-native/PKGBUILD index 1eb9ed819..22e7cd0bc 100644 --- a/extra/tomcat-native/PKGBUILD +++ b/extra/tomcat-native/PKGBUILD @@ -2,16 +2,17 @@ # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua pkgname=tomcat-native -pkgver=1.1.24 +pkgver=1.1.27 pkgrel=1 -pkgdesc="The Apache Tomcat Native Library" -arch=('i686' 'x86_64' 'mips64el') -url="http://tomcat.apache.org/" -license=("Apache") +pkgdesc='The Apache Tomcat Native Library' +arch=('i686' 'x86_64') +url='http://tomcat.apache.org/' +license=('APACHE') depends=('apr' 'openssl') makedepends=('java-environment') +options=(!emptydirs) source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz) -md5sums=('cfd4762f2da19ba79d1b6a2a948c9d21') +sha256sums=('7f78e71060dc029f9005490080babc45a2b702ea54263c440c52a9a7c02609e4') build() { cd "${srcdir}/tomcat-native-${pkgver}-src/jni/native" @@ -28,5 +29,4 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}-src/jni/native" make DESTDIR=${pkgdir} install - rm -rf ${pkgdir}/usr/{bin,include} } diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index 375de313c..a95b9c42d 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 178335 2013-02-20 10:00:55Z ioni $ +# $Id: PKGBUILD 179032 2013-03-01 18:56:31Z andrea $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') pkgver=2.77 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.transmissionbt.com/" license=('MIT') -makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent') +makedepends=('gtk3' 'intltool' 'curl' 'qt4' 'libevent') source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz transmissiond transmissiond.conf transmission.systemd transmission.tmpfiles) @@ -24,7 +24,7 @@ build() { ./configure --prefix=/usr make pushd qt - qmake qtr.pro + qmake-qt4 qtr.pro make } package_transmission-cli() { @@ -63,7 +63,7 @@ package_transmission-gtk() { package_transmission-qt() { pkgdesc="Fast, easy, and free BitTorrent client (Qt GUI)" - depends=('curl' 'qt' 'libevent') + depends=('curl' 'qt4' 'libevent') optdepends=('transmission-cli: daemon and web support') install=transmission-qt.install diff --git a/extra/uim/PKGBUILD b/extra/uim/PKGBUILD index a08102520..19c2b0caf 100644 --- a/extra/uim/PKGBUILD +++ b/extra/uim/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 176237 2013-01-27 23:33:03Z bisson $ +# $Id: PKGBUILD 179003 2013-03-01 10:26:38Z andrea $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=uim pkgver=1.8.4 -pkgrel=2 +pkgrel=3 pkgdesc='Multilingual input method library' url='http://code.google.com/p/uim/' license=('custom:BSD') arch=('i686' 'x86_64' 'mips64el') depends=('libxft' 'libedit' 'anthy' 'm17n-lib') -makedepends=('intltool' 'gettext' 'qt' 'gtk2' 'gtk3' 'gnome-panel') -optdepends=('qt: immodule and helper applications' +makedepends=('intltool' 'gettext' 'qt4' 'gtk2' 'gtk3' 'gnome-panel') +optdepends=('qt4: immodule and helper applications' 'gtk2: immodule and helper applications' 'gtk3: immodules and helper applications' 'gnome-panel: gnome applet indicator') @@ -24,6 +24,8 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" + source /etc/profile.d/qt4.sh + ./configure \ --prefix=/usr \ --libexecdir=/usr/lib/uim \ diff --git a/extra/uim/install b/extra/uim/install index 83a9cf391..1dffeec76 100644 --- a/extra/uim/install +++ b/extra/uim/install @@ -1,6 +1,7 @@ post_install() { [[ -x usr/bin/gtk-query-immodules-2.0 ]] && usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules [[ -x usr/bin/gtk-query-immodules-3.0 ]] && usr/bin/gtk-query-immodules-3.0 > usr/lib/gtk-3.0/3.0.0/immodules.cache + true } post_upgrade() { diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD index afea07d9b..7d47e44bb 100644 --- a/extra/v4l-utils/PKGBUILD +++ b/extra/v4l-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 177815 2013-02-09 14:53:43Z thomas $ +# $Id: PKGBUILD 179004 2013-03-01 10:26:47Z andrea $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=v4l-utils pkgver=0.9.3 -pkgrel=1 +pkgrel=2 pkgdesc="Userspace tools and conversion library for Video 4 Linux" arch=('i686' 'x86_64' 'mips64el') url="http://freshmeat.net/projects/libv4l" @@ -11,8 +11,8 @@ replaces=('libv4l') conflicts=('libv4l') backup=(etc/rc_maps.cfg) license=('LGPL') -makedepends=('qt') -optdepends=('qt') +makedepends=('qt4') +optdepends=('qt4') depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo') source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2 http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2.asc) @@ -21,6 +21,8 @@ sha256sums=('502db0d865a392d87bff22c4f3bcfb3d0755937b1c18496edd941fd2d1784a3d' options=(!libtool) build() { + . /etc/profile.d/qt4.sh + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc diff --git a/extra/vc/PKGBUILD b/extra/vc/PKGBUILD index 8e7d1ee1d..8c783d83b 100644 --- a/extra/vc/PKGBUILD +++ b/extra/vc/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 177033 2013-02-04 15:56:42Z andrea $ +# $Id: PKGBUILD 178472 2013-02-24 10:30:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: PedsXing <pedsxing at gmx dot net> pkgname=vc -pkgver=0.6.1 +pkgver=0.7.0 pkgrel=1 pkgdesc="A library to ease explicit vectorization of C++ code" url='http://code.compeng.uni-frankfurt.de/projects/vc/' arch=('x86_64' 'i686' 'mips64el') license=('LGPL3') makedepends=('cmake') -source=("http://code.compeng.uni-frankfurt.de/attachments/download/147/Vc-${pkgver}.tar.gz") -md5sums=('8b9885b58872a11131d2818ec54f838a') +source=("http://code.compeng.uni-frankfurt.de/attachments/download/158/Vc-${pkgver}.tar.gz") +md5sums=('8b92e140e0a8c474f5b7c7c98c175a8c') build() { mkdir build diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 03f7b5bb2..12ec22f4a 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 178142 2013-02-16 22:48:59Z ioni $ +# $Id: PKGBUILD 179005 2013-03-01 10:26:55Z andrea $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=2.0.5 -pkgrel=3 +pkgrel=4 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" license=('LGPL2.1' 'GPL2') -depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt' 'libproxy' +depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy' 'sdl_image' 'libdvdnav' 'libtiger' 'lua51' 'libmatroska' 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 'libshout' 'libmad' 'libmpeg2' 'libmodplug' 'libass' diff --git a/extra/watchdog/PKGBUILD b/extra/watchdog/PKGBUILD index c48bbde13..cd262f582 100644 --- a/extra/watchdog/PKGBUILD +++ b/extra/watchdog/PKGBUILD @@ -1,25 +1,19 @@ -# $Id: PKGBUILD 165803 2012-08-30 17:35:28Z thomas $ +# $Id: PKGBUILD 178840 2013-02-27 15:05:46Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=watchdog -pkgver=5.12 -pkgrel=2 +pkgver=5.13 +pkgrel=1 pkgdesc="Watchdog daemon" arch=(i686 x86_64 'mips64el') url="http://sourceforge.net/projects/watchdog" license=('GPL') depends=('glibc') -backup=(etc/watchdog.conf - etc/conf.d/watchdog - etc/conf.d/wd_keepalive) +backup=(etc/watchdog.conf) source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz - watchdog.sh - watchdog.cf watchdog-5.12-fix-oom-in-wd_keepalive.patch watchdog.systemd) -md5sums=('cea28bea70e54f3625062bc808aef9af' - 'f57d33967eb9404dd52e3c4e73795a20' - '01c1e2e13f515131180b4ebe9b8b7cc3' +md5sums=('153455f008f1cf8f65f6ad9586a21ff1' 'c90c2686975b5254f82b3de683f1f442' 'a835ae5cbdbb21c19a468dedb5d734e4') @@ -41,13 +35,5 @@ build() { package() { cd "${srcdir}"/${pkgname}-${pkgver} make install DESTDIR="${pkgdir}" - for fil in watchdog wd_keepalive ; do - install -D -m755 "${srcdir}"/watchdog.sh "${pkgdir}"/etc/rc.d/${fil} - install -D -m644 "${srcdir}"/watchdog.cf "${pkgdir}"/etc/conf.d/${fil} - done install -D -m644 "${srcdir}"/watchdog.systemd "${pkgdir}"/usr/lib/systemd/system/watchdog.service - - sed -i 's/watchdog/wd_keepalive/g' "${pkgdir}"/etc/rc.d/wd_keepalive - sed -i 's/watchdog/wd_keepalive/g' "${pkgdir}"/etc/conf.d/wd_keepalive - sed -i 's/Watchdog/Simple Watchdog/' "${pkgdir}"/etc/rc.d/wd_keepalive } diff --git a/extra/watchdog/watchdog.cf b/extra/watchdog/watchdog.cf deleted file mode 100644 index a33e1ea91..000000000 --- a/extra/watchdog/watchdog.cf +++ /dev/null @@ -1,2 +0,0 @@ -# watchdog configuration -WATCHDOG_OPTIONS="" diff --git a/extra/watchdog/watchdog.sh b/extra/watchdog/watchdog.sh deleted file mode 100644 index 54f78454f..000000000 --- a/extra/watchdog/watchdog.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID="$( cat /run/watchdog.pid 2>/dev/null )" -[ -r /etc/conf.d/watchdog ] && source /etc/conf.d/watchdog - -case "$1" in - start) - stat_busy "Starting Watchdog Daemon" - - [ -z "$PID" ] && /usr/sbin/watchdog ${WATCHDOG_OPTIONS} - - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon watchdog - stat_done - fi - ;; - stop) - stat_busy "Stopping Watchdog Daemon" - - [ -n "$PID" ] && kill $PID &> /dev/null - - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon watchdog - stat_done - fi - - rm -f /run/watchdog.pid - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/wpa_supplicant_gui/PKGBUILD b/extra/wpa_supplicant_gui/PKGBUILD index 9f679c671..a14ed2300 100644 --- a/extra/wpa_supplicant_gui/PKGBUILD +++ b/extra/wpa_supplicant_gui/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 177075 2013-02-05 19:47:31Z eric $ +# $Id: PKGBUILD 179006 2013-03-01 10:27:04Z andrea $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=wpa_supplicant_gui pkgver=2.0 -pkgrel=1 +pkgrel=2 pkgdesc="A Qt frontend to wpa_supplicant" url="http://hostap.epitest.fi/wpa_supplicant" arch=('i686' 'x86_64' 'mips64el') -depends=('qt' "wpa_supplicant") +depends=('qt4' "wpa_supplicant") license=('GPL') source=("http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz") sha256sums=('2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09') build() { + . /etc/profile.d/qt4.sh cd wpa_supplicant-${pkgver} cd wpa_supplicant/wpa_gui-qt4 qmake QMAKE_CFLAGS_RELEASE="$CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" diff --git a/extra/x2goclient/PKGBUILD b/extra/x2goclient/PKGBUILD index f26172fc4..c0e7d5051 100644 --- a/extra/x2goclient/PKGBUILD +++ b/extra/x2goclient/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 178166 2013-02-17 17:17:51Z andyrtr $ +# $Id: PKGBUILD 179029 2013-03-01 18:54:32Z andrea $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Gerhard Brauer <gerbra@archlinux.de> # Contributor: Richard Murri <admin@richardmurri.com> pkgname=x2goclient pkgver=4.0.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="x2go qt4 client" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.x2go.org" -depends=('qt' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-theme' 'xdg-utils') +depends=('qt4' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-theme' 'xdg-utils') makedepends=('man2html') install=x2goclient.install source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz) @@ -18,7 +18,6 @@ md5sums=('e08fa2248f0882ee7ed6c5310d47fcfc') build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i "s:qmake-qt4:qmake:g" Makefile sed -i "s:-o root -g root ::" Makefile make PREFIX=/usr } diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD index 206fc78a5..c82bf4734 100644 --- a/extra/x2goserver/PKGBUILD +++ b/extra/x2goserver/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 175694 2013-01-19 17:56:40Z andyrtr $ +# $Id: PKGBUILD 179012 2013-03-01 14:04:57Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Gerhard Brauer <gerbra@archlinux.de> @@ -8,12 +8,12 @@ pkgname=x2goserver pkgver=4.0.0.0 -pkgrel=4 +pkgrel=5 pkgdesc="Open source terminal server" arch=('i686' 'x86_64' 'mips64el') url="http://www.x2go.org/" license=('GPL') -depends=('openssh' 'perl-config-simple' 'perl-dbd-sqlite' 'python' 'x2go-agent' 'xorg-xauth') +depends=('openssh' 'perl-config-simple' 'perl-dbd-sqlite' 'perl-file-basedir' 'python' 'x2go-agent' 'xorg-xauth') makedepends=('man2html') #optdepends=('cups-x2go: printing support') options=('emptydirs') diff --git a/extra/xf86-video-openchrome/PKGBUILD b/extra/xf86-video-openchrome/PKGBUILD index 8ffda0a95..4451a8cca 100644 --- a/extra/xf86-video-openchrome/PKGBUILD +++ b/extra/xf86-video-openchrome/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 168581 2012-10-13 11:45:24Z andyrtr $ +# $Id: PKGBUILD 178621 2013-02-25 21:00:20Z andyrtr $ # Contributor: Paul Mattal <paul@mattal.com> # Maintainer: Juergen Hoetzel <juergen@hoetzel.info> pkgname=xf86-video-openchrome pkgver=0.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="X.Org Openchrome drivers" arch=(i686 x86_64) license=('custom') @@ -15,11 +15,15 @@ conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERS replaces=('openchrome' 'xf86-video-via') groups=('xorg-drivers' 'xorg') options=('!libtool' '!emptydirs' '!makeflags') -source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('89e56dcfe851345f72c61a95b4fa5ab6ad7e0d83') +source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2 + fix_system_lock.diff) +sha1sums=('89e56dcfe851345f72c61a95b4fa5ab6ad7e0d83' + '539ba65df1755af97799f49410e4091b8d222eca') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # https://bugs.freedesktop.org/show_bug.cgi?id=53307 + patch -Np1 -i ${srcdir}/fix_system_lock.diff ./configure --prefix=/usr make } diff --git a/extra/xf86-video-openchrome/fix_system_lock.diff b/extra/xf86-video-openchrome/fix_system_lock.diff new file mode 100644 index 000000000..a72369340 --- /dev/null +++ b/extra/xf86-video-openchrome/fix_system_lock.diff @@ -0,0 +1,59 @@ +From 76515c8a369346d76864e55610a6a747d9b152d8 Mon Sep 17 00:00:00 2001 +From: James Simmons <jsimmons@infradead.org> +Date: Sat, 12 Jan 2013 21:02:12 +0000 +Subject: As the comment suggested in via_outputs.c probing the 3rd i2c bug locks up the P4M900. So we re-enable the via_card_id handling of what outputs to test for to get around this problem. + +--- +diff --git a/src/via_display.c b/src/via_display.c +index 97473f0..aaf4267 100644 +--- a/src/via_display.c ++++ b/src/via_display.c +@@ -395,7 +395,7 @@ ViaFirstCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode) + hwp->writeCrtc(hwp, 0x18, 0xFF); + ViaCrtcMask(hwp, 0x07, 0x10, 0x10); + ViaCrtcMask(hwp, 0x09, 0x40, 0x40); +- ViaCrtcMask(hwp, 0x33, 0x07, 0x06); ++ ViaCrtcMask(hwp, 0x33, 0x06, 0x07); + ViaCrtcMask(hwp, 0x35, 0x10, 0x10); + + /* zero Maximum scan line */ +diff --git a/src/via_id.c b/src/via_id.c +index 7764782..7321b26 100644 +--- a/src/via_id.c ++++ b/src/via_id.c +@@ -297,6 +297,7 @@ ViaCheckCardId(ScrnInfoPtr pScrn) + (Id->Vendor == SUBVENDOR_ID(pVia->PciInfo)) && + (Id->Device == SUBSYS_ID(pVia->PciInfo))) { + xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Detected %s. Card-Ids (%4X|%4X)\n", Id->String, SUBVENDOR_ID(pVia->PciInfo), SUBSYS_ID(pVia->PciInfo)); ++ pVia->ActiveDevice = Id->Outputs; + pVia->Id = Id; + return; + } +diff --git a/src/via_outputs.c b/src/via_outputs.c +index 808e570..c07b1d2 100644 +--- a/src/via_outputs.c ++++ b/src/via_outputs.c +@@ -873,10 +873,10 @@ ViaOutputsDetect(ScrnInfoPtr pScrn) + /* + * FIXME: xf86I2CProbeAddress(pVia->pI2CBus3, 0x40) + * disables the panel on P4M900 +- * See via_tv_detect. + */ + /* TV encoder */ +- via_tv_init(pScrn); ++ if (pVia->ActiveDevice & VIA_DEVICE_TV) ++ via_tv_init(pScrn); + + if (pVia->ActiveDevice & VIA_DEVICE_DFP) { + switch (pVia->Chipset) { +@@ -1195,7 +1195,7 @@ ViaModePrimaryLegacy(xf86CrtcPtr crtc, DisplayModePtr mode) + /* Enable MMIO & PCI burst (1 wait state) */ + ViaSeqMask(hwp, 0x1A, 0x06, 0x06); + +- if (pBIOSInfo->analog->status == XF86OutputStatusConnected) ++ if (pBIOSInfo->analog->status == XF86OutputStatusConnected) + ViaCrtcMask(hwp, 0x36, 0x30, 0x30); + else + ViaSeqMask(hwp, 0x16, 0x00, 0x40); +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/xfce4-timer-plugin/PKGBUILD b/extra/xfce4-timer-plugin/PKGBUILD index e6b09e8bf..5bb0eb654 100644 --- a/extra/xfce4-timer-plugin/PKGBUILD +++ b/extra/xfce4-timer-plugin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 157895 2012-04-30 04:21:31Z foutrelis $ +# $Id: PKGBUILD 178519 2013-02-24 22:42:03Z eric $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=xfce4-timer-plugin -pkgver=0.6.4 -pkgrel=2 +pkgver=1.0.0 +pkgrel=1 pkgdesc="plugin to track time for the Xfce4 panel" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -15,7 +15,7 @@ makedepends=('intltool') options=('!libtool') install=xfce4-timer-plugin.install source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('c2f9e113dcda742cd1559129b79f609b') +sha1sums=('5bd0e450b4c9b3f37a289fc1723b1a3d984ffd5d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD index d399d44d0..b68516157 100644 --- a/extra/xterm/PKGBUILD +++ b/extra/xterm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178168 2013-02-17 17:21:11Z andyrtr $ +# $Id: PKGBUILD 178846 2013-02-27 16:25:21Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xterm -pkgver=290 +pkgver=291 pkgrel=1 pkgdesc="X Terminal Emulator" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('custom') depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz LICENSE) -md5sums=('92ce4a161dc4a16daa987e5a6511da61' +md5sums=('9925cd564c84746442e640f0e32f0493' '10ecc3f8ee91e3189863a172f68282d2') build() { diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index ab5c5ea24..c67e29310 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 178202 2013-02-18 00:58:40Z foutrelis $ +# $Id: PKGBUILD 178913 2013-02-28 18:41:03Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name -_basekernel=3.7 -pkgver=${_basekernel}.9 +_basekernel=3.8 +pkgver=${_basekernel}.1 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -20,15 +20,12 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn # standard config files for mkinitcpio ramdisk "${pkgbase}.preset" 'boot-logo.patch' - 'change-default-console-loglevel.patch' - 'fat-3.6.x.patch') -md5sums=('06bf9601d859531e7378eb43d4ca7dd3' - 'bcffd9fa99c4db6905dc6b22d71cb17a' - '48a1026f5d36a915b8ef68f8138a7c18' + 'change-default-console-loglevel.patch') +md5sums=('84c2a77910932ffc7d958744ac9cf2f5' + '208b90a9f3ccbaf2064f05163985bd46' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' - '9d3c56a4b999c8bfbd4018089a62f662' - '88d501404f172dac6fcb248978251560') + '9d3c56a4b999c8bfbd4018089a62f662') _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE-PAE @@ -48,10 +45,6 @@ build() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" - # fix cosmetic fat issue - # https://bugs.archlinux.org/task/32916 - patch -Np1 -i "${srcdir}/fat-3.6.x.patch" - cat "${srcdir}/config" > ./.config # simpler if [ "${_kernelname}" != "" ]; then @@ -174,7 +167,7 @@ _package-headers() { mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include" - for i in acpi asm-generic config crypto drm generated linux math-emu \ + for i in acpi asm-generic config crypto drm generated keys linux math-emu \ media net pcmcia scsi sound trace uapi video xen; do cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/" done diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config index fff8a9465..5c13c2571 100644 --- a/kernels/linux-libre-pae/config +++ b/kernels/linux-libre-pae/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.7.6-1 Kernel Configuration +# Linux/i386 3.8.0-2 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -74,7 +74,7 @@ CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y CONFIG_AUDIT_WATCH=y CONFIG_AUDIT_TREE=y -# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set +CONFIG_AUDIT_LOGINUID_IMMUTABLE=y CONFIG_HAVE_GENERIC_HARDIRQS=y # @@ -126,10 +126,13 @@ CONFIG_RCU_FANOUT_LEAF=16 CONFIG_RCU_FAST_NO_HZ=y # CONFIG_TREE_RCU_TRACE is not set # CONFIG_RCU_BOOST is not set +CONFIG_RCU_NOCB_CPU=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=19 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y +CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y +CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y CONFIG_CGROUPS=y # CONFIG_CGROUP_DEBUG is not set CONFIG_CGROUP_FREEZER=y @@ -240,13 +243,13 @@ CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y CONFIG_HAVE_CMPXCHG_DOUBLE=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_GENERIC_KERNEL_THREAD=y -CONFIG_GENERIC_KERNEL_EXECVE=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_MODULES_USE_ELF_REL=y +CONFIG_GENERIC_SIGALTSTACK=y +CONFIG_CLONE_BACKWARDS=y # # GCOV-based kernel profiling @@ -334,7 +337,6 @@ CONFIG_PARAVIRT_CLOCK=y # CONFIG_PARAVIRT_DEBUG is not set CONFIG_NO_BOOTMEM=y # CONFIG_MEMTEST is not set -# CONFIG_M386 is not set # CONFIG_M486 is not set # CONFIG_M586 is not set # CONFIG_M586TSC is not set @@ -361,14 +363,8 @@ CONFIG_M686=y # CONFIG_MATOM is not set CONFIG_X86_GENERIC=y CONFIG_X86_INTERNODE_CACHE_SHIFT=6 -CONFIG_X86_CMPXCHG=y CONFIG_X86_L1_CACHE_SHIFT=6 -CONFIG_X86_XADD=y # CONFIG_X86_PPRO_FENCE is not set -CONFIG_X86_WP_WORKS_OK=y -CONFIG_X86_INVLPG=y -CONFIG_X86_BSWAP=y -CONFIG_X86_POPAD_OK=y CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_USE_PPRO_CHECKSUM=y CONFIG_X86_TSC=y @@ -431,6 +427,7 @@ CONFIG_ARCH_DISCARD_MEMBLOCK=y CONFIG_MEMORY_ISOLATION=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_BALLOON_COMPACTION=y CONFIG_COMPACTION=y CONFIG_MIGRATION=y # CONFIG_PHYS_ADDR_T_64BIT is not set @@ -480,6 +477,8 @@ CONFIG_RELOCATABLE=y CONFIG_X86_NEED_RELOCS=y CONFIG_PHYSICAL_ALIGN=0x100000 CONFIG_HOTPLUG_CPU=y +# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set +# CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_COMPAT_VDSO is not set # CONFIG_CMDLINE_BOOL is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y @@ -518,12 +517,14 @@ CONFIG_ACPI_BUTTON=m CONFIG_ACPI_VIDEO=m CONFIG_ACPI_FAN=m CONFIG_ACPI_DOCK=y +CONFIG_ACPI_I2C=m CONFIG_ACPI_PROCESSOR=m CONFIG_ACPI_IPMI=m CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_PROCESSOR_AGGREGATOR=m CONFIG_ACPI_THERMAL=m # CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_PCI_SLOT=m @@ -553,6 +554,7 @@ CONFIG_APM_DO_ENABLE=y # CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_GOV_COMMON=y CONFIG_CPU_FREQ_STAT=m CONFIG_CPU_FREQ_STAT_DETAILS=y # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set @@ -591,6 +593,7 @@ CONFIG_X86_E_POWERSAVER=m CONFIG_X86_SPEEDSTEP_LIB=m CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y CONFIG_CPU_IDLE=y +# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_IDLE_GOV_MENU=y # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set @@ -1078,9 +1081,11 @@ CONFIG_IP_SCTP=m CONFIG_NET_SCTPPROBE=m # CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set -# CONFIG_SCTP_HMAC_NONE is not set -CONFIG_SCTP_HMAC_SHA1=y -# CONFIG_SCTP_HMAC_MD5 is not set +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set +CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set +CONFIG_SCTP_COOKIE_HMAC_MD5=y +CONFIG_SCTP_COOKIE_HMAC_SHA1=y # CONFIG_RDS is not set # CONFIG_TIPC is not set CONFIG_ATM=m @@ -1098,7 +1103,11 @@ CONFIG_L2TP_ETH=m CONFIG_STP=m CONFIG_BRIDGE=m CONFIG_BRIDGE_IGMP_SNOOPING=y -# CONFIG_NET_DSA is not set +CONFIG_HAVE_NET_DSA=y +CONFIG_NET_DSA=m +CONFIG_NET_DSA_TAG_DSA=y +CONFIG_NET_DSA_TAG_EDSA=y +CONFIG_NET_DSA_TAG_TRAILER=y CONFIG_VLAN_8021Q=m # CONFIG_VLAN_8021Q_GVRP is not set # CONFIG_DECNET is not set @@ -1183,6 +1192,7 @@ CONFIG_NET_SCH_FIFO=y CONFIG_DNS_RESOLVER=y CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV_BLA=y +CONFIG_BATMAN_ADV_DAT=y # CONFIG_BATMAN_ADV_DEBUG is not set CONFIG_OPENVSWITCH=m CONFIG_RPS=y @@ -1393,6 +1403,7 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_GENERIC_CPU_DEVICES is not set CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m +CONFIG_REGMAP_MMIO=m CONFIG_REGMAP_IRQ=y CONFIG_DMA_SHARED_BUFFER=y # CONFIG_CMA is not set @@ -1400,7 +1411,6 @@ CONFIG_DMA_SHARED_BUFFER=y # # Bus devices # -CONFIG_OMAP_OCP2SCP=m CONFIG_CONNECTOR=y CONFIG_PROC_EVENTS=y CONFIG_MTD=m @@ -1484,6 +1494,9 @@ CONFIG_MTD_PLATRAM=m CONFIG_MTD_PMC551=m # CONFIG_MTD_PMC551_BUGFIX is not set # CONFIG_MTD_PMC551_DEBUG is not set +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# CONFIG_MTD_SST25L is not set # CONFIG_MTD_SLRAM is not set CONFIG_MTD_PHRAM=m CONFIG_MTD_MTDRAM=m @@ -1605,6 +1618,7 @@ CONFIG_BLK_DEV_RBD=m CONFIG_SENSORS_LIS3LV02D=m CONFIG_AD525X_DPOT=m CONFIG_AD525X_DPOT_I2C=m +# CONFIG_AD525X_DPOT_SPI is not set # CONFIG_IBM_ASM is not set CONFIG_PHANTOM=m CONFIG_INTEL_MID_PTI=m @@ -1626,9 +1640,11 @@ CONFIG_SENSORS_BH1770=m CONFIG_SENSORS_APDS990X=m CONFIG_HMC6352=m CONFIG_DS1682=m +# CONFIG_TI_DAC7512 is not set CONFIG_VMWARE_BALLOON=m CONFIG_BMP085=y CONFIG_BMP085_I2C=m +# CONFIG_BMP085_SPI is not set # CONFIG_PCH_PHUB is not set CONFIG_USB_SWITCH_FSA9480=m CONFIG_C2PORT=m @@ -1638,9 +1654,11 @@ CONFIG_C2PORT_DURAMAR_2150=m # EEPROM support # CONFIG_EEPROM_AT24=m +# CONFIG_EEPROM_AT25 is not set CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m CONFIG_EEPROM_93CX6=m +# CONFIG_EEPROM_93XX46 is not set CONFIG_CB710_CORE=m # CONFIG_CB710_DEBUG is not set CONFIG_CB710_DEBUG_ASSUMPTIONS=y @@ -1747,6 +1765,9 @@ CONFIG_MEGARAID_SAS=m CONFIG_SCSI_MPT2SAS=m CONFIG_SCSI_MPT2SAS_MAX_SGE=128 # CONFIG_SCSI_MPT2SAS_LOGGING is not set +CONFIG_SCSI_MPT3SAS=m +CONFIG_SCSI_MPT3SAS_MAX_SGE=128 +CONFIG_SCSI_MPT3SAS_LOGGING=y CONFIG_SCSI_UFSHCD=m CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_BUSLOGIC=m @@ -1810,6 +1831,7 @@ CONFIG_SCSI_PM8001=m CONFIG_SCSI_SRP=m CONFIG_SCSI_BFA_FC=m CONFIG_SCSI_VIRTIO=m +CONFIG_SCSI_CHELSIO_FCOE=m CONFIG_SCSI_LOWLEVEL_PCMCIA=y CONFIG_PCMCIA_AHA152X=m CONFIG_PCMCIA_FDOMAIN=m @@ -1984,7 +2006,7 @@ CONFIG_FIREWIRE_NOSY=m CONFIG_I2O=m CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y CONFIG_I2O_EXT_ADAPTEC=y -# CONFIG_I2O_EXT_ADAPTEC_DMA64 is not set +CONFIG_I2O_EXT_ADAPTEC_DMA64=y CONFIG_I2O_CONFIG=m CONFIG_I2O_CONFIG_OLD_IOCTL=y CONFIG_I2O_BUS=m @@ -2060,6 +2082,15 @@ CONFIG_CAIF_TTY=m CONFIG_CAIF_SPI_SLAVE=m CONFIG_CAIF_SPI_SYNC=y CONFIG_CAIF_HSI=m + +# +# Distributed Switch Architecture drivers +# +CONFIG_NET_DSA_MV88E6XXX=m +CONFIG_NET_DSA_MV88E6060=m +CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y +CONFIG_NET_DSA_MV88E6131=m +CONFIG_NET_DSA_MV88E6123_61_65=m CONFIG_ETHERNET=y CONFIG_MDIO=m CONFIG_NET_VENDOR_3COM=y @@ -2087,6 +2118,9 @@ CONFIG_ATL2=m CONFIG_ATL1=m CONFIG_ATL1E=m CONFIG_ATL1C=m +CONFIG_NET_CADENCE=y +CONFIG_ARM_AT91_ETHER=m +CONFIG_MACB=m CONFIG_NET_VENDOR_BROADCOM=y CONFIG_B44=m CONFIG_B44_PCI_AUTOSELECT=y @@ -2149,13 +2183,11 @@ CONFIG_E1000=m CONFIG_E1000E=m CONFIG_IGB=m CONFIG_IGB_DCA=y -CONFIG_IGB_PTP=y CONFIG_IGBVF=m CONFIG_IXGB=m CONFIG_IXGBE=m CONFIG_IXGBE_HWMON=y CONFIG_IXGBE_DCA=y -CONFIG_IXGBE_PTP=y CONFIG_IXGBEVF=m CONFIG_NET_VENDOR_I825XX=y CONFIG_ELPLUS=m @@ -2169,6 +2201,7 @@ CONFIG_ZNET=m CONFIG_IP1000=m CONFIG_JME=m CONFIG_NET_VENDOR_MARVELL=y +CONFIG_MVMDIO=m CONFIG_SKGE=m # CONFIG_SKGE_DEBUG is not set CONFIG_SKGE_GENESIS=y @@ -2180,8 +2213,11 @@ CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y CONFIG_NET_VENDOR_MICREL=y CONFIG_KS8842=m +# CONFIG_KS8851 is not set CONFIG_KS8851_MLL=m CONFIG_KSZ884X_PCI=m +CONFIG_NET_VENDOR_MICROCHIP=y +# CONFIG_ENC28J60 is not set CONFIG_NET_VENDOR_MYRI=y CONFIG_MYRI10GE=m CONFIG_MYRI10GE_DCA=y @@ -2205,7 +2241,6 @@ CONFIG_NET_VENDOR_NVIDIA=y CONFIG_FORCEDETH=m CONFIG_NET_VENDOR_OKI=y CONFIG_PCH_GBE=m -CONFIG_PCH_PTP=y CONFIG_ETHOC=m CONFIG_NET_PACKET_ENGINE=y CONFIG_HAMACHI=m @@ -2238,7 +2273,6 @@ CONFIG_SFC=m CONFIG_SFC_MTD=y CONFIG_SFC_MCDI_MON=y CONFIG_SFC_SRIOV=y -CONFIG_SFC_PTP=y CONFIG_NET_VENDOR_SMSC=y CONFIG_SMC9194=m CONFIG_PCMCIA_SMC91C92=m @@ -2302,6 +2336,7 @@ CONFIG_MICREL_PHY=m CONFIG_MDIO_BUS_MUX=m CONFIG_MDIO_BUS_MUX_GPIO=m CONFIG_MDIO_BUS_MUX_MMIOREG=m +# CONFIG_MICREL_KS8995MA is not set CONFIG_PLIP=m CONFIG_PPP=m CONFIG_PPP_BSDCOMP=m @@ -2333,6 +2368,7 @@ CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_CDC_NCM=m +CONFIG_USB_NET_CDC_MBIM=m CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_SMSC75XX=m CONFIG_USB_NET_SMSC95XX=m @@ -2380,6 +2416,7 @@ CONFIG_ADM8211=m # CONFIG_MAC80211_HWSIM is not set CONFIG_MWL8K=m CONFIG_ATH_COMMON=m +CONFIG_ATH_CARDS=m # CONFIG_ATH_DEBUG is not set CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set @@ -2403,6 +2440,9 @@ CONFIG_ATH6KL=m CONFIG_ATH6KL_SDIO=m CONFIG_ATH6KL_USB=m # CONFIG_ATH6KL_DEBUG is not set +CONFIG_AR5523=m +CONFIG_WIL6210=m +CONFIG_WIL6210_ISR_COR=y CONFIG_B43=m CONFIG_B43_BCMA=y # CONFIG_B43_BCMA_EXTRA is not set @@ -2436,7 +2476,7 @@ CONFIG_BRCMFMAC=m CONFIG_BRCMFMAC_SDIO=y # CONFIG_BRCMFMAC_SDIO_OOB is not set CONFIG_BRCMFMAC_USB=y -# CONFIG_BRCMISCAN is not set +# CONFIG_BRCM_TRACING is not set # CONFIG_BRCMDBG is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y @@ -2464,7 +2504,6 @@ CONFIG_IWLDVM=m # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLWIFI_DEVICE_TRACING=y # CONFIG_IWLWIFI_P2P is not set -# CONFIG_IWLWIFI_EXPERIMENTAL_MFP is not set CONFIG_IWLEGACY=m CONFIG_IWL4965=m CONFIG_IWL3945=m @@ -2477,6 +2516,7 @@ CONFIG_LIBERTAS=m CONFIG_LIBERTAS_USB=m CONFIG_LIBERTAS_CS=m CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_SPI is not set # CONFIG_LIBERTAS_DEBUG is not set CONFIG_LIBERTAS_MESH=y CONFIG_HERMES=m @@ -2492,6 +2532,7 @@ CONFIG_ORINOCO_USB=m CONFIG_P54_COMMON=m CONFIG_P54_USB=m CONFIG_P54_PCI=m +# CONFIG_P54_SPI is not set CONFIG_P54_LEDS=y CONFIG_RT2X00=m CONFIG_RT2400PCI=m @@ -2520,16 +2561,19 @@ CONFIG_RT2X00_LIB_LEDS=y CONFIG_RTL8192CE=m CONFIG_RTL8192SE=m CONFIG_RTL8192DE=m +CONFIG_RTL8723AE=m CONFIG_RTL8192CU=m CONFIG_RTLWIFI=m # CONFIG_RTLWIFI_DEBUG is not set CONFIG_RTL8192C_COMMON=m CONFIG_WL_TI=y CONFIG_WL1251=m +# CONFIG_WL1251_SPI is not set CONFIG_WL1251_SDIO=m CONFIG_WL12XX=m CONFIG_WL18XX=m CONFIG_WLCORE=m +# CONFIG_WLCORE_SPI is not set CONFIG_WLCORE_SDIO=m CONFIG_WL12XX_PLATFORM_DATA=y CONFIG_ZD1211RW=m @@ -2549,6 +2593,8 @@ CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 CONFIG_IEEE802154_DRIVERS=m CONFIG_IEEE802154_FAKEHARD=m CONFIG_IEEE802154_FAKELB=m +CONFIG_IEEE802154_AT86RF230=m +# CONFIG_IEEE802154_MRF24J40 is not set CONFIG_VMXNET3=m CONFIG_HYPERV_NET=m CONFIG_ISDN=y @@ -2742,7 +2788,6 @@ CONFIG_KEYBOARD_MPR121=m # CONFIG_KEYBOARD_OPENCORES is not set # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUNKBD is not set -# CONFIG_KEYBOARD_OMAP4 is not set # CONFIG_KEYBOARD_XTKBD is not set CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=m @@ -2805,14 +2850,18 @@ CONFIG_TABLET_USB_HANWANG=m CONFIG_TABLET_USB_KBTAB=m CONFIG_TABLET_USB_WACOM=m CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_AD7877 is not set CONFIG_TOUCHSCREEN_AD7879=m CONFIG_TOUCHSCREEN_AD7879_I2C=m +# CONFIG_TOUCHSCREEN_AD7879_SPI is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m CONFIG_TOUCHSCREEN_AUO_PIXCIR=m CONFIG_TOUCHSCREEN_BU21013=m CONFIG_TOUCHSCREEN_CY8CTMG110=m CONFIG_TOUCHSCREEN_CYTTSP_CORE=m CONFIG_TOUCHSCREEN_CYTTSP_I2C=m +# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set CONFIG_TOUCHSCREEN_DYNAPRO=m CONFIG_TOUCHSCREEN_HAMPSHIRE=m CONFIG_TOUCHSCREEN_EETI=m @@ -2834,6 +2883,7 @@ CONFIG_TOUCHSCREEN_PENMOUNT=m CONFIG_TOUCHSCREEN_EDT_FT5X06=m CONFIG_TOUCHSCREEN_TOUCHRIGHT=m CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m CONFIG_TOUCHSCREEN_UCB1400=m CONFIG_TOUCHSCREEN_PIXCIR=m CONFIG_TOUCHSCREEN_WM97XX=m @@ -2862,12 +2912,14 @@ CONFIG_TOUCHSCREEN_USB_NEXIO=y CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y CONFIG_TOUCHSCREEN_TOUCHIT213=m CONFIG_TOUCHSCREEN_TSC_SERIO=m +# CONFIG_TOUCHSCREEN_TSC2005 is not set CONFIG_TOUCHSCREEN_TSC2007=m CONFIG_TOUCHSCREEN_ST1232=m CONFIG_TOUCHSCREEN_TPS6507X=m CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m +CONFIG_INPUT_AD714X_SPI=m CONFIG_INPUT_BMA150=m CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_MC13783_PWRBUTTON=m @@ -2885,12 +2937,15 @@ CONFIG_INPUT_KXTJ9=m CONFIG_INPUT_POWERMATE=m CONFIG_INPUT_YEALINK=m CONFIG_INPUT_CM109=m +CONFIG_INPUT_RETU_PWRBUTTON=m CONFIG_INPUT_UINPUT=m CONFIG_INPUT_PCF50633_PMU=m CONFIG_INPUT_PCF8574=m +CONFIG_INPUT_PWM_BEEPER=m CONFIG_INPUT_GPIO_ROTARY_ENCODER=m CONFIG_INPUT_ADXL34X=m CONFIG_INPUT_ADXL34X_I2C=m +CONFIG_INPUT_ADXL34X_SPI=m CONFIG_INPUT_CMA3000=m CONFIG_INPUT_CMA3000_I2C=m @@ -2907,6 +2962,7 @@ CONFIG_SERIO_LIBPS2=y CONFIG_SERIO_RAW=m CONFIG_SERIO_ALTERA_PS2=m CONFIG_SERIO_PS2MULT=m +CONFIG_SERIO_ARC_PS2=m CONFIG_GAMEPORT=m CONFIG_GAMEPORT_NS558=m CONFIG_GAMEPORT_L4=m @@ -2960,6 +3016,8 @@ CONFIG_SERIAL_8250_DW=m # # Non-8250 serial port support # +# CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_MAX310X is not set CONFIG_SERIAL_MFD_HSU=m CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y @@ -2971,8 +3029,11 @@ CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 +# CONFIG_SERIAL_IFX6X60 is not set CONFIG_SERIAL_PCH_UART=m CONFIG_SERIAL_XILINX_PS_UART=m +CONFIG_SERIAL_ARC=m +CONFIG_SERIAL_ARC_NR_PORTS=1 CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set CONFIG_PPDEV=m @@ -3062,6 +3123,7 @@ CONFIG_I2C_SCMI=m # # I2C system bus drivers (mostly embedded / system-on-chip) # +# CONFIG_I2C_CBUS_GPIO is not set CONFIG_I2C_DESIGNWARE_CORE=m CONFIG_I2C_DESIGNWARE_PCI=m CONFIG_I2C_EG20T=m @@ -3082,6 +3144,7 @@ CONFIG_I2C_PARPORT=m CONFIG_I2C_PARPORT_LIGHT=m CONFIG_I2C_TAOS_EVM=m CONFIG_I2C_TINY_USB=m +CONFIG_I2C_VIPERBOARD=m # # Other I2C/SMBus bus drivers @@ -3092,7 +3155,32 @@ CONFIG_SCx200_ACB=m # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_SPI is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_ALTERA is not set +# CONFIG_SPI_BITBANG is not set +# CONFIG_SPI_BUTTERFLY is not set +# CONFIG_SPI_GPIO is not set +# CONFIG_SPI_LM70_LLP is not set +# CONFIG_SPI_OC_TINY is not set +# CONFIG_SPI_PXA2XX is not set +# CONFIG_SPI_PXA2XX_PCI is not set +# CONFIG_SPI_SC18IS602 is not set +# CONFIG_SPI_TOPCLIFF_PCH is not set +# CONFIG_SPI_XCOMM is not set +# CONFIG_SPI_XILINX is not set +# CONFIG_SPI_DESIGNWARE is not set + +# +# SPI Protocol Masters +# +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_TLE62X0 is not set # CONFIG_HSI is not set # @@ -3122,6 +3210,7 @@ CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_GPIOLIB=y CONFIG_OF_GPIO=y +CONFIG_GPIO_ACPI=y # CONFIG_DEBUG_GPIO is not set CONFIG_GPIO_SYSFS=y @@ -3130,6 +3219,7 @@ CONFIG_GPIO_SYSFS=y # # CONFIG_GPIO_GENERIC_PLATFORM is not set # CONFIG_GPIO_IT8761E is not set +# CONFIG_GPIO_TS5500 is not set CONFIG_GPIO_SCH=m CONFIG_GPIO_ICH=m # CONFIG_GPIO_VX855 is not set @@ -3159,7 +3249,10 @@ CONFIG_GPIO_AMD8111=m # # SPI GPIO expanders: # +# CONFIG_GPIO_MAX7301 is not set # CONFIG_GPIO_MCP23S08 is not set +# CONFIG_GPIO_MC33880 is not set +# CONFIG_GPIO_74X164 is not set # # AC97 GPIO expanders: @@ -3169,6 +3262,11 @@ CONFIG_GPIO_UCB1400=y # # MODULbus GPIO expanders: # + +# +# USB GPIO expanders: +# +CONFIG_GPIO_VIPERBOARD=m # CONFIG_W1 is not set CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set @@ -3187,7 +3285,10 @@ CONFIG_BATTERY_OLPC=m # CONFIG_CHARGER_MAX8903 is not set # CONFIG_CHARGER_LP8727 is not set # CONFIG_CHARGER_GPIO is not set +# CONFIG_CHARGER_BQ2415X is not set # CONFIG_CHARGER_SMB347 is not set +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_GPIO=y CONFIG_POWER_AVS=y CONFIG_HWMON=y CONFIG_HWMON_VID=m @@ -3198,8 +3299,10 @@ CONFIG_HWMON_VID=m # CONFIG_SENSORS_ABITUGURU=m CONFIG_SENSORS_ABITUGURU3=m +# CONFIG_SENSORS_AD7314 is not set CONFIG_SENSORS_AD7414=m CONFIG_SENSORS_AD7418=m +# CONFIG_SENSORS_ADCXX is not set CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m @@ -3236,6 +3339,7 @@ CONFIG_SENSORS_IT87=m CONFIG_SENSORS_JC42=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LM63=m +# CONFIG_SENSORS_LM70 is not set CONFIG_SENSORS_LM73=m CONFIG_SENSORS_LM75=m CONFIG_SENSORS_LM77=m @@ -3253,6 +3357,7 @@ CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_LTC4261=m CONFIG_SENSORS_LM95241=m CONFIG_SENSORS_LM95245=m +# CONFIG_SENSORS_MAX1111 is not set CONFIG_SENSORS_MAX16065=m CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_MAX1668=m @@ -3292,6 +3397,7 @@ CONFIG_SENSORS_SCH5627=m CONFIG_SENSORS_SCH5636=m CONFIG_SENSORS_ADS1015=m CONFIG_SENSORS_ADS7828=m +# CONFIG_SENSORS_ADS7871 is not set CONFIG_SENSORS_AMC6821=m CONFIG_SENSORS_INA2XX=m CONFIG_SENSORS_THMC50=m @@ -3322,6 +3428,12 @@ CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y +CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y +# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set +# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_FAIR_SHARE=y +CONFIG_STEP_WISE=y +# CONFIG_USER_SPACE is not set # CONFIG_CPU_THERMAL is not set CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y @@ -3405,6 +3517,7 @@ CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_DEBUG is not set CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y CONFIG_SSB_DRIVER_PCICORE=y +CONFIG_SSB_DRIVER_GPIO=y CONFIG_BCMA_POSSIBLE=y # @@ -3415,6 +3528,7 @@ CONFIG_BCMA_BLOCKIO=y CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y CONFIG_BCMA_DRIVER_GMAC_CMN=y +CONFIG_BCMA_DRIVER_GPIO=y # CONFIG_BCMA_DEBUG is not set # @@ -3423,6 +3537,8 @@ CONFIG_BCMA_DRIVER_GMAC_CMN=y CONFIG_MFD_CORE=y CONFIG_MFD_SM501=m CONFIG_MFD_SM501_GPIO=y +CONFIG_MFD_RTSX_PCI=m +CONFIG_MFD_TI_AM335X_TSCADC=m CONFIG_HTC_PASIC3=m CONFIG_UCB1400_CORE=m CONFIG_MFD_LM3533=m @@ -3430,18 +3546,25 @@ CONFIG_MFD_LM3533=m CONFIG_TPS65010=m CONFIG_TPS6507X=m CONFIG_MFD_TPS65217=m +# CONFIG_MFD_TPS65912_SPI is not set +# CONFIG_MFD_STMPE is not set # CONFIG_MFD_TMIO is not set +# CONFIG_MFD_DA9052_SPI is not set CONFIG_MFD_ARIZONA=y CONFIG_MFD_ARIZONA_I2C=m +# CONFIG_MFD_ARIZONA_SPI is not set CONFIG_MFD_WM5102=y CONFIG_MFD_WM5110=y +# CONFIG_MFD_WM831X_SPI is not set CONFIG_MFD_PCF50633=m CONFIG_PCF50633_ADC=m CONFIG_PCF50633_GPIO=m CONFIG_MFD_MC13783=m CONFIG_MFD_MC13XXX=m +# CONFIG_MFD_MC13XXX_SPI is not set CONFIG_MFD_MC13XXX_I2C=m CONFIG_ABX500_CORE=y +# CONFIG_EZX_PCAP is not set CONFIG_MFD_CS5535=m # CONFIG_MFD_TIMBERDALE is not set CONFIG_LPC_SCH=m @@ -3451,6 +3574,8 @@ CONFIG_MFD_RDC321X=m CONFIG_MFD_VX855=m CONFIG_MFD_WL1273_CORE=m # CONFIG_MFD_SYSCON is not set +CONFIG_MFD_VIPERBOARD=m +CONFIG_MFD_RETU=m # CONFIG_REGULATOR is not set CONFIG_MEDIA_SUPPORT=m @@ -3770,10 +3895,16 @@ CONFIG_RADIO_WL128X=m # CONFIG_DVB_FIREDTV=m CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_MEDIA_COMMON_OPTIONS=y + +# +# common driver options +# CONFIG_DVB_B2C2_FLEXCOP=m CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m +CONFIG_SMS_SIANO_RC=y CONFIG_MEDIA_SUBDRV_AUTOSELECT=y # @@ -4145,10 +4276,20 @@ CONFIG_FB_VIRTUAL=m # CONFIG_EXYNOS_VIDEO is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m +# CONFIG_LCD_L4F00242T03 is not set +# CONFIG_LCD_LMS283GF05 is not set +# CONFIG_LCD_LTV350QV is not set +# CONFIG_LCD_ILI9320 is not set +# CONFIG_LCD_TDO24M is not set +# CONFIG_LCD_VGG2432A4 is not set CONFIG_LCD_PLATFORM=m +# CONFIG_LCD_S6E63M0 is not set +# CONFIG_LCD_LD9040 is not set +# CONFIG_LCD_AMS369FG06 is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_LM3533=m +CONFIG_BACKLIGHT_PWM=m CONFIG_BACKLIGHT_APPLE=m # CONFIG_BACKLIGHT_SAHARA is not set # CONFIG_BACKLIGHT_ADP8860 is not set @@ -4183,6 +4324,7 @@ CONFIG_FONT_8x16=y # CONFIG_FONT_10x18 is not set CONFIG_FONT_AUTOSELECT=y # CONFIG_LOGO is not set +CONFIG_FB_SSD1307=m CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE=y # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set @@ -4366,6 +4508,7 @@ CONFIG_SND_VIA82XX_MODEM=m CONFIG_SND_VIRTUOSO=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m +CONFIG_SND_SPI=y CONFIG_SND_USB=y CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_UA101=m @@ -4378,6 +4521,7 @@ CONFIG_SND_FIREWIRE=y CONFIG_SND_FIREWIRE_LIB=m CONFIG_SND_FIREWIRE_SPEAKERS=m CONFIG_SND_ISIGHT=m +CONFIG_SND_SCS1X=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m @@ -4418,6 +4562,7 @@ CONFIG_HID_KYE=m CONFIG_HID_UCLOGIC=m CONFIG_HID_WALTOP=m CONFIG_HID_GYRATION=m +CONFIG_HID_ICADE=m CONFIG_HID_TWINHAN=m CONFIG_HID_KENSINGTON=m CONFIG_HID_LCPOWER=m @@ -4474,6 +4619,11 @@ CONFIG_HID_SENSOR_HUB=m CONFIG_USB_HID=m CONFIG_HID_PID=y CONFIG_USB_HIDDEV=y + +# +# I2C HID support +# +CONFIG_I2C_HID=m CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB_ARCH_HAS_XHCI=y @@ -4505,6 +4655,7 @@ CONFIG_USB_XHCI_HCD=m CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y +CONFIG_USB_EHCI_PCI=m CONFIG_USB_OXU210HP_HCD=m CONFIG_USB_ISP116X_HCD=m CONFIG_USB_ISP1760_HCD=m @@ -4677,8 +4828,8 @@ CONFIG_USB_EZUSB_FX2=m # # USB Physical Layer drivers # -CONFIG_OMAP_USB2=m CONFIG_USB_ISP1301=m +CONFIG_USB_RCAR_PHY=m CONFIG_USB_ATM=m CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_CXACRU=m @@ -4720,8 +4871,6 @@ CONFIG_USB_FUNCTIONFS=m CONFIG_USB_FUNCTIONFS_ETH=y CONFIG_USB_FUNCTIONFS_RNDIS=y CONFIG_USB_FUNCTIONFS_GENERIC=y -CONFIG_USB_FILE_STORAGE=m -# CONFIG_USB_FILE_STORAGE_TEST is not set # CONFIG_USB_MASS_STORAGE is not set CONFIG_USB_GADGET_TARGET=m CONFIG_USB_G_SERIAL=m @@ -4767,6 +4916,7 @@ CONFIG_SDIO_UART=m CONFIG_MMC_SDHCI=m CONFIG_MMC_SDHCI_PCI=m CONFIG_MMC_RICOH_MMC=y +CONFIG_MMC_SDHCI_ACPI=m CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_WBSD=m CONFIG_MMC_TIFM_SD=m @@ -4775,6 +4925,7 @@ CONFIG_MMC_CB710=m CONFIG_MMC_VIA_SDMMC=m CONFIG_MMC_VUB300=m CONFIG_MMC_USHC=m +CONFIG_MMC_REALTEK_PCI=m CONFIG_MEMSTICK=m # CONFIG_MEMSTICK_DEBUG is not set @@ -4790,6 +4941,7 @@ CONFIG_MSPRO_BLOCK=m CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK_R592=m +CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y @@ -4808,6 +4960,7 @@ CONFIG_LEDS_LP5523=m CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m CONFIG_LEDS_PCA9633=m +# CONFIG_LEDS_DAC124S085 is not set CONFIG_LEDS_BD2802=m CONFIG_LEDS_INTEL_SS4200=m CONFIG_LEDS_LT3593=m @@ -4838,10 +4991,6 @@ CONFIG_ACCESSIBILITY=y CONFIG_A11Y_BRAILLE_CONSOLE=y # CONFIG_INFINIBAND is not set CONFIG_EDAC=y - -# -# Reporting subsystems -# CONFIG_EDAC_LEGACY_SYSFS=y # CONFIG_EDAC_DEBUG is not set CONFIG_EDAC_DECODE_MCE=m @@ -4889,6 +5038,7 @@ CONFIG_RTC_DRV_RS5C372=m CONFIG_RTC_DRV_ISL1208=m CONFIG_RTC_DRV_ISL12022=m CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_PCF8523=m CONFIG_RTC_DRV_PCF8563=m CONFIG_RTC_DRV_PCF8583=m CONFIG_RTC_DRV_M41T80=m @@ -4904,6 +5054,15 @@ CONFIG_RTC_DRV_RV3029C2=m # # SPI RTC drivers # +# CONFIG_RTC_DRV_M41T93 is not set +# CONFIG_RTC_DRV_M41T94 is not set +# CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1390 is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_DS3234 is not set +# CONFIG_RTC_DRV_PCF2123 is not set # # Platform RTC drivers @@ -4958,6 +5117,7 @@ CONFIG_UIO=m CONFIG_UIO_CIF=m CONFIG_UIO_PDRV=m CONFIG_UIO_PDRV_GENIRQ=m +# CONFIG_UIO_DMEM_GENIRQ is not set CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m @@ -4978,6 +5138,7 @@ CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y # CONFIG_HYPERV=m CONFIG_HYPERV_UTILS=m +CONFIG_HYPERV_BALLOON=m CONFIG_STAGING=y CONFIG_ET131X=m CONFIG_SLICOSS=m @@ -5053,10 +5214,8 @@ CONFIG_COMEDI_ADDI_APCI_1500=m CONFIG_COMEDI_ADDI_APCI_1516=m CONFIG_COMEDI_ADDI_APCI_1564=m CONFIG_COMEDI_ADDI_APCI_16XX=m -CONFIG_COMEDI_ADDI_APCI_2016=m CONFIG_COMEDI_ADDI_APCI_2032=m CONFIG_COMEDI_ADDI_APCI_2200=m -CONFIG_COMEDI_ADDI_APCI_3001=m CONFIG_COMEDI_ADDI_APCI_3120=m CONFIG_COMEDI_ADDI_APCI_3501=m CONFIG_COMEDI_ADDI_APCI_3XXX=m @@ -5136,18 +5295,12 @@ CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m CONFIG_RTL8192E=m CONFIG_R8712U=m -CONFIG_RTS_PSTOR=m -# CONFIG_RTS_PSTOR_DEBUG is not set CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set # CONFIG_TRANZPORT is not set CONFIG_IDE_PHISON=m CONFIG_LINE6_USB=m -# CONFIG_LINE6_USB_DEBUG is not set -# CONFIG_LINE6_USB_DUMP_CTRL is not set -# CONFIG_LINE6_USB_DUMP_MIDI is not set # CONFIG_LINE6_USB_DUMP_PCM is not set -# CONFIG_LINE6_USB_RAW is not set # CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m @@ -5222,11 +5375,7 @@ CONFIG_LIRC_ZILOG=m # Android # # CONFIG_ANDROID is not set -# CONFIG_PHONE is not set CONFIG_USB_WPAN_HCD=m -CONFIG_IPACK_BUS=m -CONFIG_BOARD_TPCI200=m -CONFIG_SERIAL_IPOCTAL=m CONFIG_WIMAX_GDM72XX=m CONFIG_WIMAX_GDM72XX_QOS=y CONFIG_WIMAX_GDM72XX_K_MODE=y @@ -5241,6 +5390,8 @@ CONFIG_SBYPASS=m CONFIG_BPCTL=m CONFIG_CED1401=m CONFIG_DGRP=m +CONFIG_SB105X=m +CONFIG_FIREWIRE_SERIAL=m CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m @@ -5326,7 +5477,10 @@ CONFIG_EXTCON_ARIZONA=m CONFIG_MEMORY=y # CONFIG_IIO is not set # CONFIG_VME_BUS is not set -# CONFIG_PWM is not set +CONFIG_PWM=y +CONFIG_IPACK_BUS=m +CONFIG_BOARD_TPCI200=m +CONFIG_SERIAL_IPOCTAL=m # # Firmware Drivers @@ -5351,7 +5505,6 @@ CONFIG_DCACHE_WORD_ACCESS=y # CONFIG_EXT3_FS is not set CONFIG_EXT4_FS=m CONFIG_EXT4_USE_FOR_EXT23=y -CONFIG_EXT4_FS_XATTR=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y # CONFIG_EXT4_DEBUG is not set @@ -5506,6 +5659,10 @@ CONFIG_UFS_FS=m # CONFIG_UFS_DEBUG is not set CONFIG_EXOFS_FS=m # CONFIG_EXOFS_DEBUG is not set +CONFIG_F2FS_FS=m +CONFIG_F2FS_STAT_FS=y +CONFIG_F2FS_FS_XATTR=y +CONFIG_F2FS_FS_POSIX_ACL=y CONFIG_ORE=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m @@ -5546,7 +5703,7 @@ CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_CIFS_ACL=y -# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_DEBUG is not set CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_SMB2=y CONFIG_CIFS_FSCACHE=y @@ -5769,7 +5926,6 @@ CONFIG_DEBUG_RODATA=y # CONFIG_DEBUG_SET_MODULE_RONX is not set # CONFIG_DEBUG_NX_TEST is not set CONFIG_DOUBLEFAULT=y -# CONFIG_DEBUG_TLBFLUSH is not set # CONFIG_IOMMU_STRESS is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y # CONFIG_X86_DECODER_SELFTEST is not set @@ -5809,7 +5965,7 @@ CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" -CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" +CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd" CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 # CONFIG_SECURITY_YAMA is not set @@ -5912,6 +6068,7 @@ CONFIG_CRYPTO_ARC4=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_BLOWFISH_COMMON=m CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST_COMMON=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_DES=m @@ -5981,6 +6138,7 @@ CONFIG_GENERIC_FIND_FIRST_BIT=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_IO=y +CONFIG_PERCPU_RWSEM=y CONFIG_CRC_CCITT=m CONFIG_CRC16=m CONFIG_CRC_T10DIF=m diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index 406a31d5c..946736248 100644 --- a/kernels/linux-libre-pae/linux-libre-pae.install +++ b/kernels/linux-libre-pae/linux-libre-pae.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-pae -KERNEL_VERSION=3.7.9-1-LIBRE-PAE +KERNEL_VERSION=3.8.1-1-LIBRE-PAE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 122862dbd..64608f70a 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 178202 2013-02-18 00:58:40Z foutrelis $ +# $Id: PKGBUILD 178913 2013-02-28 18:41:03Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name -_basekernel=3.7 -pkgver=${_basekernel}.9 +_basekernel=3.8 +pkgver=${_basekernel}.1 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -20,15 +20,12 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn # standard config files for mkinitcpio ramdisk "${pkgbase}.preset" 'boot-logo.patch' - 'change-default-console-loglevel.patch' - 'fat-3.6.x.patch') -md5sums=('06bf9601d859531e7378eb43d4ca7dd3' - 'bcffd9fa99c4db6905dc6b22d71cb17a' - '36aadecfb87577e90931025f46cd9d53' - 'b7c2805bb287a644c0a303bf7721e534' + 'change-default-console-loglevel.patch') +md5sums=('84c2a77910932ffc7d958744ac9cf2f5' + '208b90a9f3ccbaf2064f05163985bd46' + 'c13961a22d8c742fb31b59a1e27a0e7b' '04b21c79df0a952c22d681dd4f4562df' - '9d3c56a4b999c8bfbd4018089a62f662' - '88d501404f172dac6fcb248978251560') + '9d3c56a4b999c8bfbd4018089a62f662') _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE-XEN @@ -48,10 +45,6 @@ build() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" - # fix cosmetic fat issue - # https://bugs.archlinux.org/task/32916 - patch -Np1 -i "${srcdir}/fat-3.6.x.patch" - cat "${srcdir}/config" > ./.config # simpler if [ "${_kernelname}" != "" ]; then @@ -174,7 +167,7 @@ _package-headers() { mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include" - for i in acpi asm-generic config crypto drm generated linux math-emu \ + for i in acpi asm-generic config crypto drm generated keys linux math-emu \ media net pcmcia scsi sound trace uapi video xen; do cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/" done diff --git a/kernels/linux-libre-xen/config b/kernels/linux-libre-xen/config index 4c255c68c..1b83ef084 100644 --- a/kernels/linux-libre-xen/config +++ b/kernels/linux-libre-xen/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.7.6-1 Kernel Configuration +# Linux/i386 3.8.0-2 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -74,7 +74,7 @@ CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y CONFIG_AUDIT_WATCH=y CONFIG_AUDIT_TREE=y -# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set +CONFIG_AUDIT_LOGINUID_IMMUTABLE=y CONFIG_HAVE_GENERIC_HARDIRQS=y # @@ -126,10 +126,13 @@ CONFIG_RCU_FANOUT_LEAF=16 CONFIG_RCU_FAST_NO_HZ=y # CONFIG_TREE_RCU_TRACE is not set # CONFIG_RCU_BOOST is not set +CONFIG_RCU_NOCB_CPU=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=19 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y +CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y +CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y CONFIG_CGROUPS=y # CONFIG_CGROUP_DEBUG is not set CONFIG_CGROUP_FREEZER=y @@ -240,13 +243,13 @@ CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y CONFIG_HAVE_CMPXCHG_DOUBLE=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_GENERIC_KERNEL_THREAD=y -CONFIG_GENERIC_KERNEL_EXECVE=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_MODULES_USE_ELF_REL=y +CONFIG_GENERIC_SIGALTSTACK=y +CONFIG_CLONE_BACKWARDS=y # # GCOV-based kernel profiling @@ -339,7 +342,6 @@ CONFIG_PARAVIRT_CLOCK=y # CONFIG_PARAVIRT_DEBUG is not set CONFIG_NO_BOOTMEM=y # CONFIG_MEMTEST is not set -# CONFIG_M386 is not set # CONFIG_M486 is not set # CONFIG_M586 is not set # CONFIG_M586TSC is not set @@ -366,14 +368,8 @@ CONFIG_M686=y # CONFIG_MATOM is not set CONFIG_X86_GENERIC=y CONFIG_X86_INTERNODE_CACHE_SHIFT=6 -CONFIG_X86_CMPXCHG=y CONFIG_X86_L1_CACHE_SHIFT=6 -CONFIG_X86_XADD=y # CONFIG_X86_PPRO_FENCE is not set -CONFIG_X86_WP_WORKS_OK=y -CONFIG_X86_INVLPG=y -CONFIG_X86_BSWAP=y -CONFIG_X86_POPAD_OK=y CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_USE_PPRO_CHECKSUM=y CONFIG_X86_TSC=y @@ -436,6 +432,7 @@ CONFIG_ARCH_DISCARD_MEMBLOCK=y CONFIG_MEMORY_ISOLATION=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_BALLOON_COMPACTION=y CONFIG_COMPACTION=y CONFIG_MIGRATION=y # CONFIG_PHYS_ADDR_T_64BIT is not set @@ -485,6 +482,8 @@ CONFIG_RELOCATABLE=y CONFIG_X86_NEED_RELOCS=y CONFIG_PHYSICAL_ALIGN=0x100000 CONFIG_HOTPLUG_CPU=y +# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set +# CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_COMPAT_VDSO is not set # CONFIG_CMDLINE_BOOL is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y @@ -523,12 +522,14 @@ CONFIG_ACPI_BUTTON=m CONFIG_ACPI_VIDEO=m CONFIG_ACPI_FAN=m CONFIG_ACPI_DOCK=y +CONFIG_ACPI_I2C=m CONFIG_ACPI_PROCESSOR=m CONFIG_ACPI_IPMI=m CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_PROCESSOR_AGGREGATOR=m CONFIG_ACPI_THERMAL=m # CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_PCI_SLOT=m @@ -558,6 +559,7 @@ CONFIG_APM_DO_ENABLE=y # CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_GOV_COMMON=y CONFIG_CPU_FREQ_STAT=m CONFIG_CPU_FREQ_STAT_DETAILS=y # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set @@ -596,6 +598,7 @@ CONFIG_X86_E_POWERSAVER=m CONFIG_X86_SPEEDSTEP_LIB=m CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y CONFIG_CPU_IDLE=y +# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_IDLE_GOV_MENU=y # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set @@ -1085,9 +1088,11 @@ CONFIG_IP_SCTP=m CONFIG_NET_SCTPPROBE=m # CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set -# CONFIG_SCTP_HMAC_NONE is not set -CONFIG_SCTP_HMAC_SHA1=y -# CONFIG_SCTP_HMAC_MD5 is not set +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set +CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set +CONFIG_SCTP_COOKIE_HMAC_MD5=y +CONFIG_SCTP_COOKIE_HMAC_SHA1=y # CONFIG_RDS is not set # CONFIG_TIPC is not set CONFIG_ATM=m @@ -1105,7 +1110,11 @@ CONFIG_L2TP_ETH=m CONFIG_STP=m CONFIG_BRIDGE=m CONFIG_BRIDGE_IGMP_SNOOPING=y -# CONFIG_NET_DSA is not set +CONFIG_HAVE_NET_DSA=y +CONFIG_NET_DSA=m +CONFIG_NET_DSA_TAG_DSA=y +CONFIG_NET_DSA_TAG_EDSA=y +CONFIG_NET_DSA_TAG_TRAILER=y CONFIG_VLAN_8021Q=m # CONFIG_VLAN_8021Q_GVRP is not set # CONFIG_DECNET is not set @@ -1190,6 +1199,7 @@ CONFIG_NET_SCH_FIFO=y CONFIG_DNS_RESOLVER=y CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV_BLA=y +CONFIG_BATMAN_ADV_DAT=y # CONFIG_BATMAN_ADV_DEBUG is not set CONFIG_OPENVSWITCH=m CONFIG_RPS=y @@ -1400,6 +1410,7 @@ CONFIG_SYS_HYPERVISOR=y # CONFIG_GENERIC_CPU_DEVICES is not set CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m +CONFIG_REGMAP_MMIO=m CONFIG_REGMAP_IRQ=y CONFIG_DMA_SHARED_BUFFER=y # CONFIG_CMA is not set @@ -1407,7 +1418,6 @@ CONFIG_DMA_SHARED_BUFFER=y # # Bus devices # -CONFIG_OMAP_OCP2SCP=m CONFIG_CONNECTOR=y CONFIG_PROC_EVENTS=y CONFIG_MTD=m @@ -1491,6 +1501,9 @@ CONFIG_MTD_PLATRAM=m CONFIG_MTD_PMC551=m # CONFIG_MTD_PMC551_BUGFIX is not set # CONFIG_MTD_PMC551_DEBUG is not set +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# CONFIG_MTD_SST25L is not set # CONFIG_MTD_SLRAM is not set CONFIG_MTD_PHRAM=m CONFIG_MTD_MTDRAM=m @@ -1614,6 +1627,7 @@ CONFIG_BLK_DEV_RBD=m CONFIG_SENSORS_LIS3LV02D=m CONFIG_AD525X_DPOT=m CONFIG_AD525X_DPOT_I2C=m +# CONFIG_AD525X_DPOT_SPI is not set # CONFIG_IBM_ASM is not set CONFIG_PHANTOM=m CONFIG_INTEL_MID_PTI=m @@ -1635,9 +1649,11 @@ CONFIG_SENSORS_BH1770=m CONFIG_SENSORS_APDS990X=m CONFIG_HMC6352=m CONFIG_DS1682=m +# CONFIG_TI_DAC7512 is not set CONFIG_VMWARE_BALLOON=m CONFIG_BMP085=y CONFIG_BMP085_I2C=m +# CONFIG_BMP085_SPI is not set # CONFIG_PCH_PHUB is not set CONFIG_USB_SWITCH_FSA9480=m CONFIG_C2PORT=m @@ -1647,9 +1663,11 @@ CONFIG_C2PORT_DURAMAR_2150=m # EEPROM support # CONFIG_EEPROM_AT24=m +# CONFIG_EEPROM_AT25 is not set CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m CONFIG_EEPROM_93CX6=m +# CONFIG_EEPROM_93XX46 is not set CONFIG_CB710_CORE=m # CONFIG_CB710_DEBUG is not set CONFIG_CB710_DEBUG_ASSUMPTIONS=y @@ -1756,6 +1774,9 @@ CONFIG_MEGARAID_SAS=m CONFIG_SCSI_MPT2SAS=m CONFIG_SCSI_MPT2SAS_MAX_SGE=128 # CONFIG_SCSI_MPT2SAS_LOGGING is not set +CONFIG_SCSI_MPT3SAS=m +CONFIG_SCSI_MPT3SAS_MAX_SGE=128 +CONFIG_SCSI_MPT3SAS_LOGGING=y CONFIG_SCSI_UFSHCD=m CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_BUSLOGIC=m @@ -1819,6 +1840,7 @@ CONFIG_SCSI_PM8001=m CONFIG_SCSI_SRP=m CONFIG_SCSI_BFA_FC=m CONFIG_SCSI_VIRTIO=m +CONFIG_SCSI_CHELSIO_FCOE=m CONFIG_SCSI_LOWLEVEL_PCMCIA=y CONFIG_PCMCIA_AHA152X=m CONFIG_PCMCIA_FDOMAIN=m @@ -2068,6 +2090,15 @@ CONFIG_CAIF_TTY=m CONFIG_CAIF_SPI_SLAVE=m CONFIG_CAIF_SPI_SYNC=y CONFIG_CAIF_HSI=m + +# +# Distributed Switch Architecture drivers +# +CONFIG_NET_DSA_MV88E6XXX=m +CONFIG_NET_DSA_MV88E6060=m +CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y +CONFIG_NET_DSA_MV88E6131=m +CONFIG_NET_DSA_MV88E6123_61_65=m CONFIG_ETHERNET=y CONFIG_MDIO=m CONFIG_NET_VENDOR_3COM=y @@ -2095,6 +2126,9 @@ CONFIG_ATL2=m CONFIG_ATL1=m CONFIG_ATL1E=m CONFIG_ATL1C=m +CONFIG_NET_CADENCE=y +CONFIG_ARM_AT91_ETHER=m +CONFIG_MACB=m CONFIG_NET_VENDOR_BROADCOM=y CONFIG_B44=m CONFIG_B44_PCI_AUTOSELECT=y @@ -2157,13 +2191,11 @@ CONFIG_E1000=m CONFIG_E1000E=m CONFIG_IGB=m CONFIG_IGB_DCA=y -CONFIG_IGB_PTP=y CONFIG_IGBVF=m CONFIG_IXGB=m CONFIG_IXGBE=m CONFIG_IXGBE_HWMON=y CONFIG_IXGBE_DCA=y -CONFIG_IXGBE_PTP=y CONFIG_IXGBEVF=m CONFIG_NET_VENDOR_I825XX=y CONFIG_ELPLUS=m @@ -2177,6 +2209,7 @@ CONFIG_ZNET=m CONFIG_IP1000=m CONFIG_JME=m CONFIG_NET_VENDOR_MARVELL=y +CONFIG_MVMDIO=m CONFIG_SKGE=m # CONFIG_SKGE_DEBUG is not set CONFIG_SKGE_GENESIS=y @@ -2188,8 +2221,11 @@ CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y CONFIG_NET_VENDOR_MICREL=y CONFIG_KS8842=m +# CONFIG_KS8851 is not set CONFIG_KS8851_MLL=m CONFIG_KSZ884X_PCI=m +CONFIG_NET_VENDOR_MICROCHIP=y +# CONFIG_ENC28J60 is not set CONFIG_NET_VENDOR_MYRI=y CONFIG_MYRI10GE=m CONFIG_MYRI10GE_DCA=y @@ -2213,7 +2249,6 @@ CONFIG_NET_VENDOR_NVIDIA=y CONFIG_FORCEDETH=m CONFIG_NET_VENDOR_OKI=y CONFIG_PCH_GBE=m -CONFIG_PCH_PTP=y CONFIG_ETHOC=m CONFIG_NET_PACKET_ENGINE=y CONFIG_HAMACHI=m @@ -2246,7 +2281,6 @@ CONFIG_SFC=m CONFIG_SFC_MTD=y CONFIG_SFC_MCDI_MON=y CONFIG_SFC_SRIOV=y -CONFIG_SFC_PTP=y CONFIG_NET_VENDOR_SMSC=y CONFIG_SMC9194=m CONFIG_PCMCIA_SMC91C92=m @@ -2310,6 +2344,7 @@ CONFIG_MICREL_PHY=m CONFIG_MDIO_BUS_MUX=m CONFIG_MDIO_BUS_MUX_GPIO=m CONFIG_MDIO_BUS_MUX_MMIOREG=m +# CONFIG_MICREL_KS8995MA is not set CONFIG_PLIP=m CONFIG_PPP=m CONFIG_PPP_BSDCOMP=m @@ -2341,6 +2376,7 @@ CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_CDC_NCM=m +CONFIG_USB_NET_CDC_MBIM=m CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_SMSC75XX=m CONFIG_USB_NET_SMSC95XX=m @@ -2388,6 +2424,7 @@ CONFIG_ADM8211=m # CONFIG_MAC80211_HWSIM is not set CONFIG_MWL8K=m CONFIG_ATH_COMMON=m +CONFIG_ATH_CARDS=m # CONFIG_ATH_DEBUG is not set CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set @@ -2411,6 +2448,9 @@ CONFIG_ATH6KL=m CONFIG_ATH6KL_SDIO=m CONFIG_ATH6KL_USB=m # CONFIG_ATH6KL_DEBUG is not set +CONFIG_AR5523=m +CONFIG_WIL6210=m +CONFIG_WIL6210_ISR_COR=y CONFIG_B43=m CONFIG_B43_BCMA=y # CONFIG_B43_BCMA_EXTRA is not set @@ -2444,7 +2484,7 @@ CONFIG_BRCMFMAC=m CONFIG_BRCMFMAC_SDIO=y # CONFIG_BRCMFMAC_SDIO_OOB is not set CONFIG_BRCMFMAC_USB=y -# CONFIG_BRCMISCAN is not set +# CONFIG_BRCM_TRACING is not set # CONFIG_BRCMDBG is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y @@ -2472,7 +2512,6 @@ CONFIG_IWLDVM=m # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLWIFI_DEVICE_TRACING=y # CONFIG_IWLWIFI_P2P is not set -# CONFIG_IWLWIFI_EXPERIMENTAL_MFP is not set CONFIG_IWLEGACY=m CONFIG_IWL4965=m CONFIG_IWL3945=m @@ -2485,6 +2524,7 @@ CONFIG_LIBERTAS=m CONFIG_LIBERTAS_USB=m CONFIG_LIBERTAS_CS=m CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_SPI is not set # CONFIG_LIBERTAS_DEBUG is not set CONFIG_LIBERTAS_MESH=y CONFIG_HERMES=m @@ -2500,6 +2540,7 @@ CONFIG_ORINOCO_USB=m CONFIG_P54_COMMON=m CONFIG_P54_USB=m CONFIG_P54_PCI=m +# CONFIG_P54_SPI is not set CONFIG_P54_LEDS=y CONFIG_RT2X00=m CONFIG_RT2400PCI=m @@ -2528,16 +2569,19 @@ CONFIG_RT2X00_LIB_LEDS=y CONFIG_RTL8192CE=m CONFIG_RTL8192SE=m CONFIG_RTL8192DE=m +CONFIG_RTL8723AE=m CONFIG_RTL8192CU=m CONFIG_RTLWIFI=m # CONFIG_RTLWIFI_DEBUG is not set CONFIG_RTL8192C_COMMON=m CONFIG_WL_TI=y CONFIG_WL1251=m +# CONFIG_WL1251_SPI is not set CONFIG_WL1251_SDIO=m CONFIG_WL12XX=m CONFIG_WL18XX=m CONFIG_WLCORE=m +# CONFIG_WLCORE_SPI is not set CONFIG_WLCORE_SDIO=m CONFIG_WL12XX_PLATFORM_DATA=y CONFIG_ZD1211RW=m @@ -2557,6 +2601,8 @@ CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 CONFIG_IEEE802154_DRIVERS=m CONFIG_IEEE802154_FAKEHARD=m CONFIG_IEEE802154_FAKELB=m +CONFIG_IEEE802154_AT86RF230=m +# CONFIG_IEEE802154_MRF24J40 is not set CONFIG_XEN_NETDEV_FRONTEND=m CONFIG_XEN_NETDEV_BACKEND=m CONFIG_VMXNET3=m @@ -2752,7 +2798,6 @@ CONFIG_KEYBOARD_MPR121=m # CONFIG_KEYBOARD_OPENCORES is not set # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUNKBD is not set -# CONFIG_KEYBOARD_OMAP4 is not set # CONFIG_KEYBOARD_XTKBD is not set CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=m @@ -2815,14 +2860,18 @@ CONFIG_TABLET_USB_HANWANG=m CONFIG_TABLET_USB_KBTAB=m CONFIG_TABLET_USB_WACOM=m CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_AD7877 is not set CONFIG_TOUCHSCREEN_AD7879=m CONFIG_TOUCHSCREEN_AD7879_I2C=m +# CONFIG_TOUCHSCREEN_AD7879_SPI is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m CONFIG_TOUCHSCREEN_AUO_PIXCIR=m CONFIG_TOUCHSCREEN_BU21013=m CONFIG_TOUCHSCREEN_CY8CTMG110=m CONFIG_TOUCHSCREEN_CYTTSP_CORE=m CONFIG_TOUCHSCREEN_CYTTSP_I2C=m +# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set CONFIG_TOUCHSCREEN_DYNAPRO=m CONFIG_TOUCHSCREEN_HAMPSHIRE=m CONFIG_TOUCHSCREEN_EETI=m @@ -2844,6 +2893,7 @@ CONFIG_TOUCHSCREEN_PENMOUNT=m CONFIG_TOUCHSCREEN_EDT_FT5X06=m CONFIG_TOUCHSCREEN_TOUCHRIGHT=m CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m CONFIG_TOUCHSCREEN_UCB1400=m CONFIG_TOUCHSCREEN_PIXCIR=m CONFIG_TOUCHSCREEN_WM97XX=m @@ -2872,12 +2922,14 @@ CONFIG_TOUCHSCREEN_USB_NEXIO=y CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y CONFIG_TOUCHSCREEN_TOUCHIT213=m CONFIG_TOUCHSCREEN_TSC_SERIO=m +# CONFIG_TOUCHSCREEN_TSC2005 is not set CONFIG_TOUCHSCREEN_TSC2007=m CONFIG_TOUCHSCREEN_ST1232=m CONFIG_TOUCHSCREEN_TPS6507X=m CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m +CONFIG_INPUT_AD714X_SPI=m CONFIG_INPUT_BMA150=m CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_MC13783_PWRBUTTON=m @@ -2895,12 +2947,15 @@ CONFIG_INPUT_KXTJ9=m CONFIG_INPUT_POWERMATE=m CONFIG_INPUT_YEALINK=m CONFIG_INPUT_CM109=m +CONFIG_INPUT_RETU_PWRBUTTON=m CONFIG_INPUT_UINPUT=m CONFIG_INPUT_PCF50633_PMU=m CONFIG_INPUT_PCF8574=m +CONFIG_INPUT_PWM_BEEPER=m CONFIG_INPUT_GPIO_ROTARY_ENCODER=m CONFIG_INPUT_ADXL34X=m CONFIG_INPUT_ADXL34X_I2C=m +CONFIG_INPUT_ADXL34X_SPI=m CONFIG_INPUT_CMA3000=m CONFIG_INPUT_CMA3000_I2C=m CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m @@ -2918,6 +2973,7 @@ CONFIG_SERIO_LIBPS2=y CONFIG_SERIO_RAW=m CONFIG_SERIO_ALTERA_PS2=m CONFIG_SERIO_PS2MULT=m +CONFIG_SERIO_ARC_PS2=m CONFIG_GAMEPORT=m CONFIG_GAMEPORT_NS558=m CONFIG_GAMEPORT_L4=m @@ -2971,6 +3027,8 @@ CONFIG_SERIAL_8250_DW=m # # Non-8250 serial port support # +# CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_MAX310X is not set CONFIG_SERIAL_MFD_HSU=m CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y @@ -2982,8 +3040,11 @@ CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 +# CONFIG_SERIAL_IFX6X60 is not set CONFIG_SERIAL_PCH_UART=m CONFIG_SERIAL_XILINX_PS_UART=m +CONFIG_SERIAL_ARC=m +CONFIG_SERIAL_ARC_NR_PORTS=1 CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set CONFIG_PPDEV=m @@ -3075,6 +3136,7 @@ CONFIG_I2C_SCMI=m # # I2C system bus drivers (mostly embedded / system-on-chip) # +# CONFIG_I2C_CBUS_GPIO is not set CONFIG_I2C_DESIGNWARE_CORE=m CONFIG_I2C_DESIGNWARE_PCI=m CONFIG_I2C_EG20T=m @@ -3095,6 +3157,7 @@ CONFIG_I2C_PARPORT=m CONFIG_I2C_PARPORT_LIGHT=m CONFIG_I2C_TAOS_EVM=m CONFIG_I2C_TINY_USB=m +CONFIG_I2C_VIPERBOARD=m # # Other I2C/SMBus bus drivers @@ -3105,7 +3168,32 @@ CONFIG_SCx200_ACB=m # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_SPI is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_ALTERA is not set +# CONFIG_SPI_BITBANG is not set +# CONFIG_SPI_BUTTERFLY is not set +# CONFIG_SPI_GPIO is not set +# CONFIG_SPI_LM70_LLP is not set +# CONFIG_SPI_OC_TINY is not set +# CONFIG_SPI_PXA2XX is not set +# CONFIG_SPI_PXA2XX_PCI is not set +# CONFIG_SPI_SC18IS602 is not set +# CONFIG_SPI_TOPCLIFF_PCH is not set +# CONFIG_SPI_XCOMM is not set +# CONFIG_SPI_XILINX is not set +# CONFIG_SPI_DESIGNWARE is not set + +# +# SPI Protocol Masters +# +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_TLE62X0 is not set # CONFIG_HSI is not set # @@ -3135,6 +3223,7 @@ CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_GPIOLIB=y CONFIG_OF_GPIO=y +CONFIG_GPIO_ACPI=y # CONFIG_DEBUG_GPIO is not set CONFIG_GPIO_SYSFS=y @@ -3143,6 +3232,7 @@ CONFIG_GPIO_SYSFS=y # # CONFIG_GPIO_GENERIC_PLATFORM is not set # CONFIG_GPIO_IT8761E is not set +# CONFIG_GPIO_TS5500 is not set CONFIG_GPIO_SCH=m CONFIG_GPIO_ICH=m # CONFIG_GPIO_VX855 is not set @@ -3172,7 +3262,10 @@ CONFIG_GPIO_AMD8111=m # # SPI GPIO expanders: # +# CONFIG_GPIO_MAX7301 is not set # CONFIG_GPIO_MCP23S08 is not set +# CONFIG_GPIO_MC33880 is not set +# CONFIG_GPIO_74X164 is not set # # AC97 GPIO expanders: @@ -3182,6 +3275,11 @@ CONFIG_GPIO_UCB1400=y # # MODULbus GPIO expanders: # + +# +# USB GPIO expanders: +# +CONFIG_GPIO_VIPERBOARD=m # CONFIG_W1 is not set CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set @@ -3200,7 +3298,10 @@ CONFIG_BATTERY_OLPC=m # CONFIG_CHARGER_MAX8903 is not set # CONFIG_CHARGER_LP8727 is not set # CONFIG_CHARGER_GPIO is not set +# CONFIG_CHARGER_BQ2415X is not set # CONFIG_CHARGER_SMB347 is not set +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_GPIO=y CONFIG_POWER_AVS=y CONFIG_HWMON=y CONFIG_HWMON_VID=m @@ -3211,8 +3312,10 @@ CONFIG_HWMON_VID=m # CONFIG_SENSORS_ABITUGURU=m CONFIG_SENSORS_ABITUGURU3=m +# CONFIG_SENSORS_AD7314 is not set CONFIG_SENSORS_AD7414=m CONFIG_SENSORS_AD7418=m +# CONFIG_SENSORS_ADCXX is not set CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m @@ -3249,6 +3352,7 @@ CONFIG_SENSORS_IT87=m CONFIG_SENSORS_JC42=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LM63=m +# CONFIG_SENSORS_LM70 is not set CONFIG_SENSORS_LM73=m CONFIG_SENSORS_LM75=m CONFIG_SENSORS_LM77=m @@ -3266,6 +3370,7 @@ CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_LTC4261=m CONFIG_SENSORS_LM95241=m CONFIG_SENSORS_LM95245=m +# CONFIG_SENSORS_MAX1111 is not set CONFIG_SENSORS_MAX16065=m CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_MAX1668=m @@ -3305,6 +3410,7 @@ CONFIG_SENSORS_SCH5627=m CONFIG_SENSORS_SCH5636=m CONFIG_SENSORS_ADS1015=m CONFIG_SENSORS_ADS7828=m +# CONFIG_SENSORS_ADS7871 is not set CONFIG_SENSORS_AMC6821=m CONFIG_SENSORS_INA2XX=m CONFIG_SENSORS_THMC50=m @@ -3335,6 +3441,12 @@ CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y +CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y +# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set +# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_FAIR_SHARE=y +CONFIG_STEP_WISE=y +# CONFIG_USER_SPACE is not set # CONFIG_CPU_THERMAL is not set CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y @@ -3419,6 +3531,7 @@ CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_DEBUG is not set CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y CONFIG_SSB_DRIVER_PCICORE=y +CONFIG_SSB_DRIVER_GPIO=y CONFIG_BCMA_POSSIBLE=y # @@ -3429,6 +3542,7 @@ CONFIG_BCMA_BLOCKIO=y CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y CONFIG_BCMA_DRIVER_GMAC_CMN=y +CONFIG_BCMA_DRIVER_GPIO=y # CONFIG_BCMA_DEBUG is not set # @@ -3437,6 +3551,8 @@ CONFIG_BCMA_DRIVER_GMAC_CMN=y CONFIG_MFD_CORE=y CONFIG_MFD_SM501=m CONFIG_MFD_SM501_GPIO=y +CONFIG_MFD_RTSX_PCI=m +CONFIG_MFD_TI_AM335X_TSCADC=m CONFIG_HTC_PASIC3=m CONFIG_UCB1400_CORE=m CONFIG_MFD_LM3533=m @@ -3444,18 +3560,25 @@ CONFIG_MFD_LM3533=m CONFIG_TPS65010=m CONFIG_TPS6507X=m CONFIG_MFD_TPS65217=m +# CONFIG_MFD_TPS65912_SPI is not set +# CONFIG_MFD_STMPE is not set # CONFIG_MFD_TMIO is not set +# CONFIG_MFD_DA9052_SPI is not set CONFIG_MFD_ARIZONA=y CONFIG_MFD_ARIZONA_I2C=m +# CONFIG_MFD_ARIZONA_SPI is not set CONFIG_MFD_WM5102=y CONFIG_MFD_WM5110=y +# CONFIG_MFD_WM831X_SPI is not set CONFIG_MFD_PCF50633=m CONFIG_PCF50633_ADC=m CONFIG_PCF50633_GPIO=m CONFIG_MFD_MC13783=m CONFIG_MFD_MC13XXX=m +# CONFIG_MFD_MC13XXX_SPI is not set CONFIG_MFD_MC13XXX_I2C=m CONFIG_ABX500_CORE=y +# CONFIG_EZX_PCAP is not set CONFIG_MFD_CS5535=m # CONFIG_MFD_TIMBERDALE is not set CONFIG_LPC_SCH=m @@ -3465,6 +3588,8 @@ CONFIG_MFD_RDC321X=m CONFIG_MFD_VX855=m CONFIG_MFD_WL1273_CORE=m # CONFIG_MFD_SYSCON is not set +CONFIG_MFD_VIPERBOARD=m +CONFIG_MFD_RETU=m # CONFIG_REGULATOR is not set CONFIG_MEDIA_SUPPORT=m @@ -3784,10 +3909,16 @@ CONFIG_RADIO_WL128X=m # CONFIG_DVB_FIREDTV=m CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_MEDIA_COMMON_OPTIONS=y + +# +# common driver options +# CONFIG_DVB_B2C2_FLEXCOP=m CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m +CONFIG_SMS_SIANO_RC=y CONFIG_MEDIA_SUBDRV_AUTOSELECT=y # @@ -4160,10 +4291,20 @@ CONFIG_XEN_FBDEV_FRONTEND=m # CONFIG_EXYNOS_VIDEO is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m +# CONFIG_LCD_L4F00242T03 is not set +# CONFIG_LCD_LMS283GF05 is not set +# CONFIG_LCD_LTV350QV is not set +# CONFIG_LCD_ILI9320 is not set +# CONFIG_LCD_TDO24M is not set +# CONFIG_LCD_VGG2432A4 is not set CONFIG_LCD_PLATFORM=m +# CONFIG_LCD_S6E63M0 is not set +# CONFIG_LCD_LD9040 is not set +# CONFIG_LCD_AMS369FG06 is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_LM3533=m +CONFIG_BACKLIGHT_PWM=m CONFIG_BACKLIGHT_APPLE=m # CONFIG_BACKLIGHT_SAHARA is not set # CONFIG_BACKLIGHT_ADP8860 is not set @@ -4198,6 +4339,7 @@ CONFIG_FONT_8x16=y # CONFIG_FONT_10x18 is not set CONFIG_FONT_AUTOSELECT=y # CONFIG_LOGO is not set +CONFIG_FB_SSD1307=m CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE=y # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set @@ -4381,6 +4523,7 @@ CONFIG_SND_VIA82XX_MODEM=m CONFIG_SND_VIRTUOSO=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m +CONFIG_SND_SPI=y CONFIG_SND_USB=y CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_UA101=m @@ -4393,6 +4536,7 @@ CONFIG_SND_FIREWIRE=y CONFIG_SND_FIREWIRE_LIB=m CONFIG_SND_FIREWIRE_SPEAKERS=m CONFIG_SND_ISIGHT=m +CONFIG_SND_SCS1X=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m @@ -4433,6 +4577,7 @@ CONFIG_HID_KYE=m CONFIG_HID_UCLOGIC=m CONFIG_HID_WALTOP=m CONFIG_HID_GYRATION=m +CONFIG_HID_ICADE=m CONFIG_HID_TWINHAN=m CONFIG_HID_KENSINGTON=m CONFIG_HID_LCPOWER=m @@ -4489,6 +4634,11 @@ CONFIG_HID_SENSOR_HUB=m CONFIG_USB_HID=m CONFIG_HID_PID=y CONFIG_USB_HIDDEV=y + +# +# I2C HID support +# +CONFIG_I2C_HID=m CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB_ARCH_HAS_XHCI=y @@ -4520,6 +4670,7 @@ CONFIG_USB_XHCI_HCD=m CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y +CONFIG_USB_EHCI_PCI=m CONFIG_USB_OXU210HP_HCD=m CONFIG_USB_ISP116X_HCD=m CONFIG_USB_ISP1760_HCD=m @@ -4692,8 +4843,8 @@ CONFIG_USB_EZUSB_FX2=m # # USB Physical Layer drivers # -CONFIG_OMAP_USB2=m CONFIG_USB_ISP1301=m +CONFIG_USB_RCAR_PHY=m CONFIG_USB_ATM=m CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_CXACRU=m @@ -4735,8 +4886,6 @@ CONFIG_USB_FUNCTIONFS=m CONFIG_USB_FUNCTIONFS_ETH=y CONFIG_USB_FUNCTIONFS_RNDIS=y CONFIG_USB_FUNCTIONFS_GENERIC=y -CONFIG_USB_FILE_STORAGE=m -# CONFIG_USB_FILE_STORAGE_TEST is not set # CONFIG_USB_MASS_STORAGE is not set CONFIG_USB_GADGET_TARGET=m CONFIG_USB_G_SERIAL=m @@ -4782,6 +4931,7 @@ CONFIG_SDIO_UART=m CONFIG_MMC_SDHCI=m CONFIG_MMC_SDHCI_PCI=m CONFIG_MMC_RICOH_MMC=y +CONFIG_MMC_SDHCI_ACPI=m CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_WBSD=m CONFIG_MMC_TIFM_SD=m @@ -4790,6 +4940,7 @@ CONFIG_MMC_CB710=m CONFIG_MMC_VIA_SDMMC=m CONFIG_MMC_VUB300=m CONFIG_MMC_USHC=m +CONFIG_MMC_REALTEK_PCI=m CONFIG_MEMSTICK=m # CONFIG_MEMSTICK_DEBUG is not set @@ -4805,6 +4956,7 @@ CONFIG_MSPRO_BLOCK=m CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK_R592=m +CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y @@ -4823,6 +4975,7 @@ CONFIG_LEDS_LP5523=m CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m CONFIG_LEDS_PCA9633=m +# CONFIG_LEDS_DAC124S085 is not set CONFIG_LEDS_BD2802=m CONFIG_LEDS_INTEL_SS4200=m CONFIG_LEDS_LT3593=m @@ -4853,10 +5006,6 @@ CONFIG_ACCESSIBILITY=y CONFIG_A11Y_BRAILLE_CONSOLE=y # CONFIG_INFINIBAND is not set CONFIG_EDAC=y - -# -# Reporting subsystems -# CONFIG_EDAC_LEGACY_SYSFS=y # CONFIG_EDAC_DEBUG is not set CONFIG_EDAC_DECODE_MCE=m @@ -4904,6 +5053,7 @@ CONFIG_RTC_DRV_RS5C372=m CONFIG_RTC_DRV_ISL1208=m CONFIG_RTC_DRV_ISL12022=m CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_PCF8523=m CONFIG_RTC_DRV_PCF8563=m CONFIG_RTC_DRV_PCF8583=m CONFIG_RTC_DRV_M41T80=m @@ -4919,6 +5069,15 @@ CONFIG_RTC_DRV_RV3029C2=m # # SPI RTC drivers # +# CONFIG_RTC_DRV_M41T93 is not set +# CONFIG_RTC_DRV_M41T94 is not set +# CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1390 is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_DS3234 is not set +# CONFIG_RTC_DRV_PCF2123 is not set # # Platform RTC drivers @@ -4973,6 +5132,7 @@ CONFIG_UIO=m CONFIG_UIO_CIF=m CONFIG_UIO_PDRV=m CONFIG_UIO_PDRV_GENIRQ=m +# CONFIG_UIO_DMEM_GENIRQ is not set CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m @@ -4993,6 +5153,7 @@ CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y # CONFIG_HYPERV=m CONFIG_HYPERV_UTILS=m +CONFIG_HYPERV_BALLOON=m # # Xen driver support @@ -5015,6 +5176,7 @@ CONFIG_XEN_PCIDEV_BACKEND=m CONFIG_XEN_PRIVCMD=m CONFIG_XEN_ACPI_PROCESSOR=m # CONFIG_XEN_MCE_LOG is not set +CONFIG_XEN_HAVE_PVMMU=y CONFIG_STAGING=y CONFIG_ET131X=m CONFIG_SLICOSS=m @@ -5090,10 +5252,8 @@ CONFIG_COMEDI_ADDI_APCI_1500=m CONFIG_COMEDI_ADDI_APCI_1516=m CONFIG_COMEDI_ADDI_APCI_1564=m CONFIG_COMEDI_ADDI_APCI_16XX=m -CONFIG_COMEDI_ADDI_APCI_2016=m CONFIG_COMEDI_ADDI_APCI_2032=m CONFIG_COMEDI_ADDI_APCI_2200=m -CONFIG_COMEDI_ADDI_APCI_3001=m CONFIG_COMEDI_ADDI_APCI_3120=m CONFIG_COMEDI_ADDI_APCI_3501=m CONFIG_COMEDI_ADDI_APCI_3XXX=m @@ -5173,18 +5333,12 @@ CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m CONFIG_RTL8192E=m CONFIG_R8712U=m -CONFIG_RTS_PSTOR=m -# CONFIG_RTS_PSTOR_DEBUG is not set CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set # CONFIG_TRANZPORT is not set CONFIG_IDE_PHISON=m CONFIG_LINE6_USB=m -# CONFIG_LINE6_USB_DEBUG is not set -# CONFIG_LINE6_USB_DUMP_CTRL is not set -# CONFIG_LINE6_USB_DUMP_MIDI is not set # CONFIG_LINE6_USB_DUMP_PCM is not set -# CONFIG_LINE6_USB_RAW is not set # CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m @@ -5259,11 +5413,7 @@ CONFIG_LIRC_ZILOG=m # Android # # CONFIG_ANDROID is not set -# CONFIG_PHONE is not set CONFIG_USB_WPAN_HCD=m -CONFIG_IPACK_BUS=m -CONFIG_BOARD_TPCI200=m -CONFIG_SERIAL_IPOCTAL=m CONFIG_WIMAX_GDM72XX=m CONFIG_WIMAX_GDM72XX_QOS=y CONFIG_WIMAX_GDM72XX_K_MODE=y @@ -5278,6 +5428,8 @@ CONFIG_SBYPASS=m CONFIG_BPCTL=m CONFIG_CED1401=m CONFIG_DGRP=m +CONFIG_SB105X=m +CONFIG_FIREWIRE_SERIAL=m CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m @@ -5363,7 +5515,10 @@ CONFIG_EXTCON_ARIZONA=m CONFIG_MEMORY=y # CONFIG_IIO is not set # CONFIG_VME_BUS is not set -# CONFIG_PWM is not set +CONFIG_PWM=y +CONFIG_IPACK_BUS=m +CONFIG_BOARD_TPCI200=m +CONFIG_SERIAL_IPOCTAL=m # # Firmware Drivers @@ -5388,7 +5543,6 @@ CONFIG_DCACHE_WORD_ACCESS=y # CONFIG_EXT3_FS is not set CONFIG_EXT4_FS=m CONFIG_EXT4_USE_FOR_EXT23=y -CONFIG_EXT4_FS_XATTR=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y # CONFIG_EXT4_DEBUG is not set @@ -5543,6 +5697,10 @@ CONFIG_UFS_FS=m # CONFIG_UFS_DEBUG is not set CONFIG_EXOFS_FS=m # CONFIG_EXOFS_DEBUG is not set +CONFIG_F2FS_FS=m +CONFIG_F2FS_STAT_FS=y +CONFIG_F2FS_FS_XATTR=y +CONFIG_F2FS_FS_POSIX_ACL=y CONFIG_ORE=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m @@ -5583,7 +5741,7 @@ CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_CIFS_ACL=y -# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_DEBUG is not set CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_SMB2=y CONFIG_CIFS_FSCACHE=y @@ -5806,7 +5964,6 @@ CONFIG_DEBUG_RODATA=y # CONFIG_DEBUG_SET_MODULE_RONX is not set # CONFIG_DEBUG_NX_TEST is not set CONFIG_DOUBLEFAULT=y -# CONFIG_DEBUG_TLBFLUSH is not set # CONFIG_IOMMU_STRESS is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y # CONFIG_X86_DECODER_SELFTEST is not set @@ -5846,7 +6003,7 @@ CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" -CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" +CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd" CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 # CONFIG_SECURITY_YAMA is not set @@ -5949,6 +6106,7 @@ CONFIG_CRYPTO_ARC4=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_BLOWFISH_COMMON=m CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST_COMMON=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_DES=m @@ -6018,6 +6176,7 @@ CONFIG_GENERIC_FIND_FIRST_BIT=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_IO=y +CONFIG_PERCPU_RWSEM=y CONFIG_CRC_CCITT=m CONFIG_CRC16=m CONFIG_CRC_T10DIF=m diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index 170138ceb..32673ba50 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.7.9-1-LIBRE-XEN +KERNEL_VERSION=3.8.1-1-LIBRE-XEN # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD index 83cd9437c..94e5b00cb 100644 --- a/libre/blender-libre/PKGBUILD +++ b/libre/blender-libre/PKGBUILD @@ -17,8 +17,8 @@ else fi pkgdesc="Fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support$spndesc" pkgver=2.66 -pkgrel=1 -pkgaev=7 +pkgrel=2 +pkgaev=6 arch=( i686 x86_64 @@ -29,83 +29,21 @@ license=( ) url="http://www.${pkgbase%$pkgflag}.org" depends=( - # used by ldd software "glibc package software" - # dependencies tree of binaries software (root) # + desktop-file-utils ffmpeg fftw freetype2 + hicolor-icon-theme jack libpng libtiff openal openimageio - opencolorio - # external softwares dependencies # opencollada - # softwares dependencies for desktop files and mime types # - desktop-file-utils - hicolor-icon-theme + opencolorio + openshadinglanguage shared-mime-info xdg-utils - # dependencies tree of binaries software (child) # - #alsa-lib - #boost-libs - #bzip2 - #celt - #dbus-core - #flac - #gcc-libs - #glew - #glibc - #glu - #gsm - #icu - #ilmbase - #json-c - #lame - #libasyncns - #libdrm - #libgl - #libglapi - #libice - #libjpeg-turbo - #libogg - #libpulse - #libsndfile - #libsm - #libtheora - #libva - #libvorbis - #libvpx - #libx11 - #libxau - #libxcb - #libxdamage - #libxdmcp - #libxext - #libxfixes - #libxi - #libxml2 - #libxmu - #libxt - #libxxf86vm - #ocr - #openexr - #opencore-amr - #openjpeg - #openssl - #pcre - #python - #rtmpdump - #sdl-libre - #schroedinger - #speex - #util-linux - #x264 - #xvidcore - #xz - #v4l-utils - #zlib ) if [ $spacenav == true ]; then depends+=( @@ -161,6 +99,7 @@ build() { -DWITH_CODEC_SNDFILE=ON\ -DWITH_CYCLES=ON\ -DWITH_CYCLES_CUDA_BINARIES=OFF\ + -DWITH_CYCLES_OSL=ON\ -DWITH_FFTW3=ON\ -DWITH_GAMEENGINE=ON\ -DWITH_IMAGE_REDCODE=OFF\ @@ -171,9 +110,7 @@ build() { -DWITH_PLAYER=ON\ -DWITH_PYTHON_INSTALL=OFF\ -DWITH_SYSTEM_GLEW=ON - setarch $CARCH make $MAKEFLAGS - setarch $CARCH make } diff --git a/libre/cdrkit-libre/PKGBUILD b/libre/cdrkit-libre/PKGBUILD index 41dea657a..af8125f1f 100644 --- a/libre/cdrkit-libre/PKGBUILD +++ b/libre/cdrkit-libre/PKGBUILD @@ -5,7 +5,7 @@ _pkgname=cdrkit pkgname=cdrkit-libre pkgver=1.1.11 -pkgrel=2.3 +pkgrel=2.4 pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction (without nonfree apple_driver utility)" arch=('i686' 'x86_64' 'mips64el') url="http://cdrkit.org/" @@ -13,9 +13,9 @@ license=('GPL2') depends=('file' 'bzip2') optdepends=('perl: for dirsplit') makedepends=('cmake') -provides=("cdrkit=${pkgver}") -conflicts=('cdrkit') -replaces=('cdrkit') +provides=("cdrkit=${pkgver}" 'cdrtools') +conflicts=('cdrkit' 'cdrtools') +replaces=('cdrkit' 'cdrtools') source=(http://cdrkit.org/releases/$_pkgname-$pkgver.tar.gz) md5sums=('efe08e2f3ca478486037b053acd512e9') diff --git a/libre/cdrtools-libre/PKGBUILD b/libre/cdrtools-libre/PKGBUILD deleted file mode 100644 index 453979842..000000000 --- a/libre/cdrtools-libre/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id$ -# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> -_pkgname=cdrtools -pkgname=cdrtools-libre -pkgver=3.01a12 -pkgrel=1 -pkgdesc="Original cdrtools supporting CD, DVD and BluRay burning (without nonfree apple_driver utility)" -arch=('i686' 'x86_64' 'mips64el') -url="http://cdrecord.berlios.de/private/cdrecord.html" -license=('CDDL') -depends=('acl') -replaces=('cdrtools') -conflicts=('cdrtools' 'cdrkit') -provides=("cdrtools=${pkgver}" 'cdrkit') -options=(!makeflags) -backup=('etc/default/cdrecord' 'etc/default/rscsi') -install=cdrtools.install -source=(http://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-$pkgver.tar.bz2) -md5sums=('563d80a7102175bea3e41fbfc269b914') - -build() { - cd "$srcdir"/cdrtools-${pkgver%%a*} - - # Remove nonfree apple_driver utility - rm -rvf mkisofs/{apple_driver{.c,.8,.mk,_man.mk},README.hfs_boot,Rhfs_boot.mk} - sed -i -e '/apple_driver/d' mkisofs/Makefile - sed -i -e '/README.hfs_boot/d' pkgdefs/CSW/CSWcdrtools/prototype - sed -i -e '/README.hfs_boot/d' pkgdefs/OCSW/CSWcdrtools/prototype - sed -i -e '/README.hfs_boot/d' vms/vms_name_fix.sh - - sed -i 's|/opt/schily|/usr|g' DEFAULTS/Defaults.linux - sed -i 's|DEFINSGRP=.*|DEFINSGRP=root|' DEFAULTS/Defaults.linux - - export GMAKE_NOWARN=true - make INS_BASE=/usr INS_RBASE=/ -} - -package() { - cd "$srcdir"/cdrtools-${pkgver%%a*} - - export GMAKE_NOWARN=true - make INS_BASE=/usr INS_RBASE=/ DESTDIR="$pkgdir" install - rm -rf "$pkgdir"/usr/include - rm -rf "$pkgdir"/usr/lib/{*.a,profiled} - - # autoload 'sg' module needed by cdrecord - install -d -m755 "$pkgdir"/usr/lib/modules-load.d/ - echo sg > "$pkgdir"/usr/lib/modules-load.d/cdrecord.conf - - # create symlinks for cdrkit compatibility - cd "$pkgdir"/usr/bin - ln -s cdrecord wodim - ln -s readcd readom - ln -s mkisofs genisoimage - ln -s cdda2wav icedax -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/cdrtools-libre/cdrtools.install b/libre/cdrtools-libre/cdrtools.install deleted file mode 100644 index 3f49eb1bb..000000000 --- a/libre/cdrtools-libre/cdrtools.install +++ /dev/null @@ -1,14 +0,0 @@ - -post_install() { - echo "To allow other users than root execute rscsi add an entry" - echo "to /etc/default/rscsi or use an \"rscsi\" user" - echo "" - post_upgrade -} - -post_upgrade() { - echo "The manual loading (or loading using rc.conf)" - echo "of the 'sg' module is no longer necessary." - echo "It is automatically loaded during boot by systemd-tools (udev 185)." -} - diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD index 8b0d1f23d..6cdce8580 100644 --- a/libre/clementine-libre/PKGBUILD +++ b/libre/clementine-libre/PKGBUILD @@ -9,13 +9,13 @@ _pkgname=clementine pkgname=clementine-libre pkgver=1.1.1 -pkgrel=4 +pkgrel=6 pkgdesc="A music player and library organizer, without spotify support" url="http://www.clementine-player.org/" license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod' - 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice' + 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt4' 'libimobiledevice' 'sparsehash' 'qjson' 'libcdio-paranoia' 'protobuf' 'qca' 'qca-ossl' 'gvfs') makedepends=('cmake' 'boost' 'mesa') optdepends=('gstreamer0.10-base-plugins: for more open formats' diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD index 7dc2cc337..724c4ec52 100644 --- a/libre/file-roller-libre/PKGBUILD +++ b/libre/file-roller-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 172924 2012-12-06 20:47:37Z heftig $ +# $Id: PKGBUILD 178905 2013-02-28 18:13:09Z ioni $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> _pkgname=file-roller pkgname=file-roller-libre pkgver=3.6.3 -pkgrel=1 +pkgrel=2 pkgdesc="Archive manipulator for GNOME" arch=('i686' 'x86_64' 'mips64el') license=('GPL') diff --git a/libre/h-client/PKGBUILD b/libre/h-client/PKGBUILD index 821517397..5e988d060 100644 --- a/libre/h-client/PKGBUILD +++ b/libre/h-client/PKGBUILD @@ -1,20 +1,20 @@ # Maintainer: Michał Masłowski <mtjm@mtjm.eu> pkgname=h-client -_pkgver=0.0a0.dev-r118 +_pkgver=0.0a0.dev-r129 pkgver=${_pkgver/-/.} pkgrel=1 pkgdesc="A client for an h-source server (such as http://www.h-node.org/)" arch=('any') url="https://savannah.nongnu.org/projects/h-client/" license=('GPL3') -depends=('python2' 'python2-distribute' 'python-pycurl' 'pygtk') +depends=('python2' 'python2-distribute' 'python2-pycurl' 'pygtk') options=(!emptydirs) # Official source is in SVN, this is made by "python2 setup.py sdist" # on a machine having Subversion 1.6.x (e.g. on Trisquel 4.0). source=("https://mtjm.eu/releases/hclient-${_pkgver}.tar.gz"{,.sig}) -sha512sums=('af962c67b363435cfa74f7c420760b0254ba3e7c1e6611d5ff276e6595e30dadf1b5d588cd2469647efdbb0099f70a027b9f65d8aeefc70ea712c9ef5d7cbace' - '7d4746297c4a0bd328b1e57f596e827b4a12d2f703d074f7e87ea0c9e3f747c2cfd48da971e81fdaf27939d463b359fac4638820f08486ef28502e769168692d') +sha512sums=('e4f8f88db5cd27bb3304c1421bd661da9c52a15297d273cd6fa81ccfd0f1c9b210dc87373ecc6d414585c525a570c7f783d706fa67e247562fd8c7fa5e59a9e7' + '5712b41c4a4d45482e96825762955855212c3594b61624495e6ddec0b85a4718e080da1c99be22cb91aa644ee65d3708cc06b004f84b6facf2531b7b4c897c03') build() { cd "$srcdir/hclient-${_pkgver}" diff --git a/libre/hydrogen-libre/PKGBUILD b/libre/hydrogen-libre/PKGBUILD index 5f4eef1b9..562d4f3fd 100644 --- a/libre/hydrogen-libre/PKGBUILD +++ b/libre/hydrogen-libre/PKGBUILD @@ -7,12 +7,12 @@ _pkgname=hydrogen pkgname=hydrogen-libre pkgver=0.9.5.1 -pkgrel=1 +pkgrel=3.1 pkgdesc="Advanced Drum Machine (without nonfree drumkits recommendation)" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.hydrogen-music.org/" -depends=('libarchive' 'liblrdf' 'qt' 'jack') +depends=('libarchive' 'liblrdf' 'qt4' 'jack') makedepends=('scons') #options=('!makeflags') replaces=("${_pkgname}") diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD index 64b0b812b..d8fc4308a 100644 --- a/libre/iceape-l10n/PKGBUILD +++ b/libre/iceape-l10n/PKGBUILD @@ -23,7 +23,7 @@ pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) pkgver=${_debver}.${_debrel} -pkgrel=2 +pkgrel=3 pkgdesc="Language packs for Debian Iceape." arch=('i686' 'x86_64' 'mips64el') @@ -74,7 +74,7 @@ package_iceape-l10n-$(echo $lang | tr A-Z a-z)() { " done -md5sums=('428246ef3fb64103ff2cf5eaae2a92ca' +md5sums=('7558c5a34cc5f661d4e96885300d0c41' '22a14a6a2f03d0004a1fa990892094ef' 'af2379ea50672fe37ff8550d5c9e20a0' 'e5975c3b1ffaa5fcb3f5203cdfe8e0fb' diff --git a/libre/iceape-l10n/region.properties b/libre/iceape-l10n/region.properties index 4399d8db7..551605dd7 100644 --- a/libre/iceape-l10n/region.properties +++ b/libre/iceape-l10n/region.properties @@ -24,9 +24,9 @@ browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+ gecko.handlerService.defaultHandlersVersion=3 # The default set of protocol handlers for irc: -gecko.handlerService.schemes.irc.0.name=Freenode -gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s +gecko.handlerService.schemes.irc.0.name=Freenode Web IRC +gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net # The default set of protocol handlers for ircs: -gecko.handlerService.schemes.ircs.0.name=Freenode -gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index b84a30e72..1dff5d2dd 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=3 +pkgrel=4 pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey." arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') @@ -35,7 +35,7 @@ md5sums=('1ee82aa6ec73c13e2099b4cb6f16a908' '7266333e31731af8bb50c2eca8d0bd26' '25b6fe16ac24cd5c852213e5c1adb272' 'c395d443a8c4c16880c7322bcf174743' - '3e0a275b57e5ccfeb7573e716693441a') + 'e6e4a2b5b5976404d7d54c21f9d1c2c3') build() { export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}" diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch index e316dbf4c..860fd0d82 100644 --- a/libre/iceape-libre/libre.patch +++ b/libre/iceape-libre/libre.patch @@ -46,14 +46,14 @@ # The default set of protocol handlers for irc: -gecko.handlerService.schemes.irc.0.name=Mibbit -gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s -+gecko.handlerService.schemes.irc.0.name=Freenode -+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s ++gecko.handlerService.schemes.irc.0.name=Freenode Web IRC ++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net # The default set of protocol handlers for ircs: -gecko.handlerService.schemes.ircs.0.name=Mibbit -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s -+gecko.handlerService.schemes.ircs.0.name=Freenode -+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s ++gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC ++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net --- comm-release.orig/mozilla/modules/libpref/src/init/all.js 2012-03-16 04:46:09.000000000 -0300 +++ comm-release/mozilla/modules/libpref/src/init/all.js 2012-05-12 04:03:52.163831535 -0300 @@ -47,7 +47,7 @@ diff --git a/libre/icecat-l10n/PKGBUILD b/libre/icecat-l10n/PKGBUILD index eeb2b0382..15e559623 100644 --- a/libre/icecat-l10n/PKGBUILD +++ b/libre/icecat-l10n/PKGBUILD @@ -108,7 +108,7 @@ pkgname=( done) ) pkgver=17.0.1 -pkgrel=2 +pkgrel=3 pkgdesc='Language packs for GNU IceCat.' arch=( any @@ -167,7 +167,7 @@ package_icecat-l10n-$(echo $lang | tr A-Z a-z) () { done sha512sums=( - 20064992e694b3fed0f75bee9d54af3427c01ae0048e0ec220895e58127954ceb4db47ea85627e86d9ea6614ce3feaf30f652d87f7c2e896fc00774a757a640a + 1ec2a61191cdcd98678cdc823cf7b03bfad1444c5e33b5f2e264863ee302639202680207fc36c9a0337d699dcc7d7cc99a3f02b9caa07dc64d907c0c42a51138 f3c627282fa78ef67335fa70671af848f2fff2252db1c4125838bcbfd92c61ae978b9a32885f4b33beac4eb4d8dc3fc034b18703686164a4903c4180de539439 d88793ed54794833ec6200d7a1957b68ebe8dd5c1dd6f4d030440919e5ca7f85f84fefd459603d29be57fd6b9d0961356c7760aedaca638bc3b58532ceae8441 6f3f6e026bc7d4ac6d6aa9e1ebb5995d663293f9b26190d33de8857cbfd5e6454bbda49bd13d6c6c1dab544ef0f2da0cdec50b1d9fbfb73aa5d66b0a6a67a87c diff --git a/libre/icecat-l10n/region.properties b/libre/icecat-l10n/region.properties index 4399d8db7..551605dd7 100644 --- a/libre/icecat-l10n/region.properties +++ b/libre/icecat-l10n/region.properties @@ -24,9 +24,9 @@ browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+ gecko.handlerService.defaultHandlersVersion=3 # The default set of protocol handlers for irc: -gecko.handlerService.schemes.irc.0.name=Freenode -gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s +gecko.handlerService.schemes.irc.0.name=Freenode Web IRC +gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net # The default set of protocol handlers for ircs: -gecko.handlerService.schemes.ircs.0.name=Freenode -gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 7d1492804..35b6b0e16 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -13,7 +13,7 @@ # If you are updating this package, don't forget to update the version number in # the value for 'browser.dictionaries.download.url' in 'libre.patch' -_pgo=true +_pgo=false pkgname=icecat pkgver=17.0.1 pkgrel=7 @@ -77,9 +77,9 @@ source=( md5sums=( c88a29aa92fc41a07e777a0e63ac5f7e 2a35cf0054d0459993e3c3bae3d9841d - 383e8e2a97a8b13fe56d153adb6878b6 + dfeb4ab2c96aae3356a4c347eee0b97b 3009b176cc5f9b1e416b1bf7c45b064b - fcd2d895a0335c1b5fb652401e9da0d5 + 1dec37a964098fb3bc46bc767a5c0587 b41f82994fa056ffa5f8e6d99570e27a b30ba2b5562558d510fdd09d626d0faa 64826fcf48816b13090042eefddbaa58 @@ -139,20 +139,12 @@ build() { chmod +x build/unix/run-icecat.sh # fix bug for bad file permition if $_pgo; then - export MOZ_PGO=1 - export DISPLAY=:99 - Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & - _fail=0 - - make -f client.mk build || _fail=1 + LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & + LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS=$MAKEFLAGS + kill $! || true else - _fail=0 - - make -f client.mk build || _fail=1 + LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS=$MAKEFLAGS fi - - kill $! || true - return $_fail } package() { diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch index 496c6b983..38b9fca01 100644 --- a/libre/icecat/libre.patch +++ b/libre/icecat/libre.patch @@ -59,12 +59,12 @@ diff -urN a/browser/locales/en-US/chrome/browser-region/region.properties b/brow gecko.handlerService.defaultHandlersVersion=3 + +# The default set of protocol handlers for irc: -+gecko.handlerService.schemes.irc.0.name=Freenode -+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s ++gecko.handlerService.schemes.irc.0.name=Freenode Web IRC ++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net + +# The default set of protocol handlers for ircs: -+gecko.handlerService.schemes.ircs.0.name=Freenode -+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s ++gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC ++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net diff -Nur a/dom/ipc/test.xul b/dom/ipc/test.xul --- a/dom/ipc/test.xul +++ b/dom/ipc/test.xul diff --git a/libre/icecat/mozconfig.pgo b/libre/icecat/mozconfig.pgo index 2f4ebe32b..30464c38c 100644 --- a/libre/icecat/mozconfig.pgo +++ b/libre/icecat/mozconfig.pgo @@ -1,3 +1,5 @@ # PGO -mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10' +ac_add_options --enable-profile-guided-optimization +mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' +mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index 607d15feb..2e4837872 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -23,7 +23,7 @@ pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) pkgver=$_debver.$_debrel -pkgrel=1 +pkgrel=2 pkgdesc="Language packs for Debian Iceweasel." arch=('any') @@ -74,7 +74,7 @@ package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() { " done -md5sums=('97761543729499b0d5f150e0379a20b1' +md5sums=('e88728730ecf9f0f145de5f70e362b15' '5f91205d41a4622848e61bee463f14a1' 'e29da15887bb4ab2b569c5c4dd776a25' '7b76f37c83a29b64749cdc22c5165631' diff --git a/libre/iceweasel-l10n/region.properties b/libre/iceweasel-l10n/region.properties index a5870f54c..fe7f265ce 100644 --- a/libre/iceweasel-l10n/region.properties +++ b/libre/iceweasel-l10n/region.properties @@ -18,9 +18,9 @@ browser.search.order.3=Seeks Search gecko.handlerService.defaultHandlersVersion=3 # The default set of protocol handlers for irc: -gecko.handlerService.schemes.irc.0.name=Freenode -gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s +gecko.handlerService.schemes.irc.0.name=Freenode Web IRC +gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net # The default set of protocol handlers for ircs: -gecko.handlerService.schemes.ircs.0.name=Freenode -gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 065835d99..1c036c545 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=$_debver.$_debrel -pkgrel=2 +pkgrel=3 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=('i686' 'x86_64' 'mips64el') @@ -53,7 +53,7 @@ md5sums=('b4c109e987f869f94220188a901d4425' 'e1d6920cb49c9de88b8e00eb14b1b0e7' 'f90c6a70d0a6d0a9e7f9a0eed6aeffd3' 'dfeb4ab2c96aae3356a4c347eee0b97b' - 'acb402fa414bed916fb0e09dfc1485c4' + '7ef2c05dbd5631741404f2589c4ea07e' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' '6dd547c72bb875a3101135a1c32d4783' diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 1691a4aa1..154fc3b94 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -199,14 +199,14 @@ diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio # The default set of protocol handlers for irc: -gecko.handlerService.schemes.irc.0.name=Mibbit -gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s -+gecko.handlerService.schemes.irc.0.name=Freenode -+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s ++gecko.handlerService.schemes.irc.0.name=Freenode Web IRC ++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net # The default set of protocol handlers for ircs: -gecko.handlerService.schemes.ircs.0.name=Mibbit -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s -+gecko.handlerService.schemes.ircs.0.name=Freenode -+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s ++gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC ++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net diff -ruN mozilla-release.orig/dom/ipc/test.xul mozilla-release/dom/ipc/test.xul --- mozilla-release.orig/dom/ipc/test.xul 2013-01-04 18:44:31.000000000 -0500 +++ mozilla-release/dom/ipc/test.xul 2013-01-10 18:19:26.000000000 -0500 diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 77e5f3883..5db404e8a 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 177595 2013-02-07 20:38:16Z eric $ +# $Id: PKGBUILD 178874 2013-02-27 23:08:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgname=kdelibs pkgname=kdelibs-libre pkgver=4.10.0 -pkgrel=2 +pkgrel=4 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -14,8 +14,8 @@ license=('GPL' 'LGPL' 'FDL') depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee' 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' - 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon' 'qtwebkit' - 'media-player-info' 'libxtst' 'libutempter') + 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon' + 'media-player-info' 'libxtst' 'libutempter' 'qtwebkit') makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa') provides=("kdelibs=$pkgver") replaces=('kdelibs') diff --git a/libre/lame-libre/PKGBUILD b/libre/lame-libre/PKGBUILD deleted file mode 100644 index 488219902..000000000 --- a/libre/lame-libre/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 151867 2012-03-03 15:53:13Z schiv $ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Contributor: Ionut Biru <ibiru@archlinux.org> -# Contributor: Hugo Doria <hugo@archlinux.org> -# Maintainer: Henry Jensen <hjensen@connochaetos.org> -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> - -_pkgname=lame -pkgname=lame-libre -pkgver=3.99.5 -pkgrel=1 -pkgdesc="A high quality MPEG Audio Layer III (MP3) encoder" -arch=('i686' 'x86_64' 'mips64el') -url="http://lame.sourceforge.net/" -depends=('ncurses') -makedepends=('nasm') -replaces=('lame') -provides=("lame=${pkgver}") -conflicts=('lame') -license=('LGPL') -options=('!libtool') -source=("http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.gz") -md5sums=('84835b313d4a8b68f5349816d33e07ce') - -build() { - cd "$srcdir/$_pkgname-$pkgver" - - ./configure --prefix=/usr \ - --enable-nasm \ - --enable-shared - make -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/lib32-mesa-demos-libre/PKGBUILD b/libre/lib32-mesa-demos-libre/PKGBUILD index 1719f138d..aa9fde2c3 100644 --- a/libre/lib32-mesa-demos-libre/PKGBUILD +++ b/libre/lib32-mesa-demos-libre/PKGBUILD @@ -1,25 +1,24 @@ -# $Id: PKGBUILD 94667 2010-10-09 11:21:35Z andyrtr $ +# $Id: PKGBUILD 178740 2013-02-26 16:15:13Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgbasename=mesa-demos-libre pkgname=lib32-$_pkgbasename -pkgver=8.0.1 -pkgrel=2 +pkgver=8.1.0 +pkgrel=1 arch=(x86_64) -pkgdesc="Mesa demos and tools (32-bit), libre" +pkgdesc="Mesa demos and tools (32-bit), without nonfree demos" url="http://mesa3d.sourceforge.net" license=('custom') -depends=('lib32-glew>=1.5.6' mesa-demos-libre) provides=("lib32-mesa-demos=$pkgver") replaces=('lib32-mesa-demos') conflicts=('lib32-mesa-demos') -makedepends=(gcc-multilib) +makedepends=(gcc-multilib 'lib32-mesa-libgl>=9.1' 'lib32-glew' 'libgl>=9.1') source=(ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2 mesa-demos-libre.patch) -md5sums=('320c2a4b6edc6faba35d9cb1e2a30bf4' - '1858e95d40ac9e5e0b59753ce9e673e3') +md5sums=('9df33ba69a26bbfbc7c8148602e59542' + '5ce0660b46beb1230194fbd852d33ab0') build() { export CC="gcc -m32" @@ -27,12 +26,21 @@ build() { export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" cd "${srcdir}/mesa-demos-${pkgver}" + + # Remove nonfree demos (pointblast and spriteblast) + rm -v src/demos/{pointblast,spriteblast}.c patch -Np1 -i "${srcdir}/mesa-demos-libre.patch" - ./configure --prefix=/usr + + ./configure --prefix=/usr \ + --enable-gles1 \ + --enable-gles2 + make } package() { + depends=('lib32-glew' mesa-demos-libre) + cd "${srcdir}/mesa-demos-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch b/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch index c5261f8e9..d630f373c 100755 --- a/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch +++ b/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch @@ -1,15 +1,15 @@ -diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.am mesa-demos-8.0.1//src/demos/Makefile.am ---- Desktop/mesa-demos-8.0.1//src/demos/Makefile.am 2010-07-13 14:46:40.000000000 -0400 -+++ mesa-demos-8.0.1/src/demos/Makefile.am 2011-06-04 15:34:18.000000000 -0400 -@@ -62,7 +62,6 @@ bin_PROGRAMS = \ - morph3d \ +diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.am mesa-demos-8.1.0/src/demos/Makefile.am +--- mesa-demos-8.1.0.orig/src/demos/Makefile.am 2012-12-15 05:17:06.000000000 -0200 ++++ mesa-demos-8.1.0/src/demos/Makefile.am 2013-02-26 17:22:04.845832793 -0200 +@@ -65,7 +65,6 @@ multiarb \ paltex \ + pixeltest \ - pointblast \ projtex \ ray \ readpix \ -@@ -71,7 +70,6 @@ bin_PROGRAMS = \ +@@ -74,7 +73,6 @@ shadowtex \ singlebuffer \ spectex \ @@ -17,36 +17,34 @@ diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.am mesa-demos-8.0.1//sr stex3d \ teapot \ terrain \ -diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.in mesa-demos-8.0.1//src/demos/Makefile.in ---- Desktop/mesa-demos-8.0.1//src/demos/Makefile.in 2010-07-13 14:53:23.000000000 -0400 -+++ mesa-demos-8.0.1/src/demos/Makefile.in 2011-06-04 15:35:32.000000000 -0400 -@@ -73,11 +73,10 @@ host_triplet = @host@ +diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos/Makefile.in +--- mesa-demos-8.1.0.orig/src/demos/Makefile.in 2013-02-24 09:12:04.000000000 -0200 ++++ mesa-demos-8.1.0/src/demos/Makefile.in 2013-02-26 17:48:36.711995049 -0200 +@@ -90,11 +90,11 @@ @HAVE_GLUT_TRUE@ ipers$(EXEEXT) isosurf$(EXEEXT) \ @HAVE_GLUT_TRUE@ lodbias$(EXEEXT) morph3d$(EXEEXT) \ @HAVE_GLUT_TRUE@ multiarb$(EXEEXT) paltex$(EXEEXT) \ --@HAVE_GLUT_TRUE@ pointblast$(EXEEXT) projtex$(EXEEXT) \ --@HAVE_GLUT_TRUE@ ray$(EXEEXT) readpix$(EXEEXT) reflect$(EXEEXT) \ --@HAVE_GLUT_TRUE@ renormal$(EXEEXT) shadowtex$(EXEEXT) \ --@HAVE_GLUT_TRUE@ singlebuffer$(EXEEXT) spectex$(EXEEXT) \ --@HAVE_GLUT_TRUE@ spriteblast$(EXEEXT) stex3d$(EXEEXT) \ -+@HAVE_GLUT_TRUE@ projtex$(EXEEXT) ray$(EXEEXT) readpix$(EXEEXT) \ -+@HAVE_GLUT_TRUE@ reflect$(EXEEXT) renormal$(EXEEXT) \ -+@HAVE_GLUT_TRUE@ shadowtex$(EXEEXT) singlebuffer$(EXEEXT) \ -+@HAVE_GLUT_TRUE@ spectex$(EXEEXT) stex3d$(EXEEXT) \ - @HAVE_GLUT_TRUE@ teapot$(EXEEXT) terrain$(EXEEXT) \ - @HAVE_GLUT_TRUE@ tessdemo$(EXEEXT) texcyl$(EXEEXT) \ - @HAVE_GLUT_TRUE@ texenv$(EXEEXT) textures$(EXEEXT) \ -@@ -188,9 +187,6 @@ multiarb_DEPENDENCIES = ../util/libutil. - paltex_SOURCES = paltex.c - paltex_OBJECTS = paltex.$(OBJEXT) - paltex_LDADD = $(LDADD) +-@HAVE_GLUT_TRUE@ pixeltest$(EXEEXT) pointblast$(EXEEXT) \ ++@HAVE_GLUT_TRUE@ pixeltest$(EXEEXT) \ + @HAVE_GLUT_TRUE@ projtex$(EXEEXT) ray$(EXEEXT) readpix$(EXEEXT) \ + @HAVE_GLUT_TRUE@ reflect$(EXEEXT) renormal$(EXEEXT) \ + @HAVE_GLUT_TRUE@ shadowtex$(EXEEXT) singlebuffer$(EXEEXT) \ +-@HAVE_GLUT_TRUE@ spectex$(EXEEXT) spriteblast$(EXEEXT) \ ++@HAVE_GLUT_TRUE@ spectex$(EXEEXT) \ + @HAVE_GLUT_TRUE@ stex3d$(EXEEXT) teapot$(EXEEXT) \ + @HAVE_GLUT_TRUE@ terrain$(EXEEXT) tessdemo$(EXEEXT) \ + @HAVE_GLUT_TRUE@ texcyl$(EXEEXT) texenv$(EXEEXT) \ +@@ -219,9 +219,6 @@ + pixeltest_SOURCES = pixeltest.c + pixeltest_OBJECTS = pixeltest.$(OBJEXT) + pixeltest_LDADD = $(LDADD) -pointblast_SOURCES = pointblast.c -pointblast_OBJECTS = pointblast.$(OBJEXT) -pointblast_LDADD = $(LDADD) projtex_SOURCES = projtex.c projtex_OBJECTS = projtex.$(OBJEXT) projtex_DEPENDENCIES = ../util/libutil.la -@@ -215,9 +211,6 @@ singlebuffer_LDADD = $(LDADD) +@@ -246,9 +243,6 @@ spectex_SOURCES = spectex.c spectex_OBJECTS = spectex.$(OBJEXT) spectex_LDADD = $(LDADD) @@ -56,66 +54,57 @@ diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.in mesa-demos-8.0.1//sr stex3d_SOURCES = stex3d.c stex3d_OBJECTS = stex3d.$(OBJEXT) stex3d_LDADD = $(LDADD) -@@ -285,21 +278,20 @@ SOURCES = arbfplight.c arbfslight.c arbo - fbo_firecube.c fbotexture.c fire.c fogcoord.c fplight.c \ - fslight.c gamma.c gearbox.c gears.c geartrain.c glinfo.c \ - gloss.c gltestperf.c ipers.c isosurf.c lodbias.c morph3d.c \ -- multiarb.c paltex.c pointblast.c projtex.c ray.c readpix.c \ -- reflect.c renormal.c shadowtex.c singlebuffer.c spectex.c \ -- spriteblast.c stex3d.c teapot.c terrain.c tessdemo.c texcyl.c \ -- texenv.c textures.c trispd.c $(tunnel_SOURCES) tunnel2.c \ -- vao_demo.c winpos.c -+ multiarb.c paltex.c projtex.c ray.c readpix.c reflect.c \ -+ renormal.c shadowtex.c singlebuffer.c spectex.c stex3d.c \ -+ teapot.c terrain.c tessdemo.c texcyl.c texenv.c textures.c \ -+ trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c winpos.c - DIST_SOURCES = arbfplight.c arbfslight.c arbocclude.c bounce.c \ - clearspd.c copypix.c cubemap.c dinoshade.c dissolve.c \ - drawpix.c engine.c fbo_firecube.c fbotexture.c fire.c \ - fogcoord.c fplight.c fslight.c gamma.c gearbox.c gears.c \ - geartrain.c glinfo.c gloss.c gltestperf.c ipers.c isosurf.c \ -- lodbias.c morph3d.c multiarb.c paltex.c pointblast.c projtex.c \ -- ray.c readpix.c reflect.c renormal.c shadowtex.c \ -- singlebuffer.c spectex.c spriteblast.c stex3d.c teapot.c \ -- terrain.c tessdemo.c texcyl.c texenv.c textures.c trispd.c \ -- $(tunnel_SOURCES) tunnel2.c vao_demo.c winpos.c -+ lodbias.c morph3d.c multiarb.c paltex.c projtex.c ray.c \ -+ readpix.c reflect.c renormal.c shadowtex.c singlebuffer.c \ -+ spectex.c stex3d.c teapot.c terrain.c tessdemo.c texcyl.c \ -+ texenv.c textures.c trispd.c $(tunnel_SOURCES) tunnel2.c \ -+ vao_demo.c winpos.c - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -@@ -653,9 +645,6 @@ multiarb$(EXEEXT): $(multiarb_OBJECTS) $ - paltex$(EXEEXT): $(paltex_OBJECTS) $(paltex_DEPENDENCIES) - @rm -f paltex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(paltex_OBJECTS) $(paltex_LDADD) $(LIBS) --pointblast$(EXEEXT): $(pointblast_OBJECTS) $(pointblast_DEPENDENCIES) +@@ -325,8 +319,8 @@ + fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \ + gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \ + ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \ +- pixeltest.c pointblast.c projtex.c ray.c readpix.c reflect.c \ +- renormal.c shadowtex.c singlebuffer.c spectex.c spriteblast.c \ ++ pixeltest.c projtex.c ray.c readpix.c reflect.c \ ++ renormal.c shadowtex.c singlebuffer.c spectex.c \ + stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \ + textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \ + winpos.c +@@ -336,8 +330,8 @@ + fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \ + gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \ + ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \ +- pixeltest.c pointblast.c projtex.c ray.c readpix.c reflect.c \ +- renormal.c shadowtex.c singlebuffer.c spectex.c spriteblast.c \ ++ pixeltest.c projtex.c ray.c readpix.c reflect.c \ ++ renormal.c shadowtex.c singlebuffer.c spectex.c \ + stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \ + textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \ + winpos.c +@@ -722,9 +716,6 @@ + pixeltest$(EXEEXT): $(pixeltest_OBJECTS) $(pixeltest_DEPENDENCIES) $(EXTRA_pixeltest_DEPENDENCIES) + @rm -f pixeltest$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pixeltest_OBJECTS) $(pixeltest_LDADD) $(LIBS) +-pointblast$(EXEEXT): $(pointblast_OBJECTS) $(pointblast_DEPENDENCIES) $(EXTRA_pointblast_DEPENDENCIES) - @rm -f pointblast$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pointblast_OBJECTS) $(pointblast_LDADD) $(LIBS) - projtex$(EXEEXT): $(projtex_OBJECTS) $(projtex_DEPENDENCIES) + projtex$(EXEEXT): $(projtex_OBJECTS) $(projtex_DEPENDENCIES) $(EXTRA_projtex_DEPENDENCIES) @rm -f projtex$(EXEEXT) $(AM_V_CCLD)$(LINK) $(projtex_OBJECTS) $(projtex_LDADD) $(LIBS) -@@ -680,9 +669,6 @@ singlebuffer$(EXEEXT): $(singlebuffer_OB - spectex$(EXEEXT): $(spectex_OBJECTS) $(spectex_DEPENDENCIES) +@@ -749,9 +740,6 @@ + spectex$(EXEEXT): $(spectex_OBJECTS) $(spectex_DEPENDENCIES) $(EXTRA_spectex_DEPENDENCIES) @rm -f spectex$(EXEEXT) $(AM_V_CCLD)$(LINK) $(spectex_OBJECTS) $(spectex_LDADD) $(LIBS) --spriteblast$(EXEEXT): $(spriteblast_OBJECTS) $(spriteblast_DEPENDENCIES) +-spriteblast$(EXEEXT): $(spriteblast_OBJECTS) $(spriteblast_DEPENDENCIES) $(EXTRA_spriteblast_DEPENDENCIES) - @rm -f spriteblast$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(spriteblast_OBJECTS) $(spriteblast_LDADD) $(LIBS) - stex3d$(EXEEXT): $(stex3d_OBJECTS) $(stex3d_DEPENDENCIES) + stex3d$(EXEEXT): $(stex3d_OBJECTS) $(stex3d_DEPENDENCIES) $(EXTRA_stex3d_DEPENDENCIES) @rm -f stex3d$(EXEEXT) $(AM_V_CCLD)$(LINK) $(stex3d_OBJECTS) $(stex3d_LDADD) $(LIBS) -@@ -756,7 +742,6 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/morph3d.Po@am__quote@ +@@ -828,7 +816,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiarb.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paltex.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixeltest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointblast.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projtex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ray.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readpix.Po@am__quote@ -@@ -765,7 +750,6 @@ distclean-compile: +@@ -837,7 +824,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shadowtex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/singlebuffer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spectex.Po@am__quote@ @@ -123,1070 +112,3 @@ diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.in mesa-demos-8.0.1//sr @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stex3d.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teapot.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terrain.Po@am__quote@ -diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/pointblast.c mesa-demos-8.0.1//src/demos/pointblast.c ---- Desktop/mesa-demos-8.0.1//src/demos/pointblast.c 2010-07-07 13:57:15.000000000 -0400 -+++ mesa-demos-8.0.1/src/demos/pointblast.c 1969-12-31 19:00:00.000000000 -0500 -@@ -1,504 +0,0 @@ -- --/* Copyright (c) Mark J. Kilgard, 1997. */ -- --/* This program is freely distributable without licensing fees -- and is provided without guarantee or warrantee expressed or -- implied. This program is -not- in the public domain. */ -- --/* This example demonstrates how to render particle effects -- with OpenGL. A cloud of pinkish/orange particles explodes with the -- particles bouncing off the ground. When the EXT_point_parameters -- is present , the particle size is attenuated based on eye distance. */ -- -- --#include <stdio.h> --#include <stdlib.h> --#include <string.h> --#include <math.h> /* for cos(), sin(), and sqrt() */ --#ifdef _WIN32 --#include <windows.h> --#endif --#include <GL/glew.h> --#include <GL/glut.h> -- --/* Some <math.h> files do not define M_PI... */ --#ifndef M_PI --#define M_PI 3.14159265 --#endif -- --#if 0 /* For debugging. */ --#undef GL_EXT_point_parameters --#endif -- --static GLfloat angle = -150; /* in degrees */ --static int spin = 0; --static int moving, begin; --static int newModel = 1; --static float theTime; --static int repeat = 1; --static int blend = 1; --int useMipmaps = 1; --int linearFiltering = 1; -- --static GLfloat constant[3] = { 1/5.0, 0.0, 0.0 }; --static GLfloat linear[3] = { 0.0, 1/5.0, 0.0 }; --static GLfloat theQuad[3] = { 0.25, 0.0, 1/60.0 }; -- --#define MAX_POINTS 2000 -- --static int numPoints = 200; -- --static GLfloat pointList[MAX_POINTS][3]; --static GLfloat pointTime[MAX_POINTS]; --static GLfloat pointVelocity[MAX_POINTS][2]; --static GLfloat pointDirection[MAX_POINTS][2]; --static int colorList[MAX_POINTS]; --static int animate = 1, motion = 0; -- --static GLfloat colorSet[][4] = { -- /* Shades of red. */ -- { 0.7, 0.2, 0.4, 0.5 }, -- { 0.8, 0.0, 0.7, 0.5 }, -- { 1.0, 0.0, 0.0, 0.5 }, -- { 0.9, 0.3, 0.6, 0.5 }, -- { 1.0, 0.4, 0.0, 0.5 }, -- { 1.0, 0.0, 0.5, 0.5 }, --}; -- --#define NUM_COLORS (sizeof(colorSet)/sizeof(colorSet[0])) -- --#define DEAD (NUM_COLORS+1) -- -- --#if 0 /* drand48 might be better on Unix machines */ --#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * drand48()) --#else --static float float_rand(void) { return rand() / (float) RAND_MAX; } --#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * float_rand()) --#endif -- --#define MEAN_VELOCITY 3.0 --#define GRAVITY 2.0 -- --/* Modeling units of ground extent in each X and Z direction. */ --#define EDGE 12 -- --static void --makePointList(void) --{ -- float angle, velocity, direction; -- int i; -- -- motion = 1; -- for (i=0; i<numPoints; i++) { -- pointList[i][0] = 0.0; -- pointList[i][1] = 0.0; -- pointList[i][2] = 0.0; -- pointTime[i] = 0.0; -- angle = (RANDOM_RANGE(60.0, 70.0)) * M_PI/180.0; -- direction = RANDOM_RANGE(0.0, 360.0) * M_PI/180.0; -- pointDirection[i][0] = cos(direction); -- pointDirection[i][1] = sin(direction); -- velocity = MEAN_VELOCITY + RANDOM_RANGE(-0.8, 1.0); -- pointVelocity[i][0] = velocity * cos(angle); -- pointVelocity[i][1] = velocity * sin(angle); -- colorList[i] = rand() % NUM_COLORS; -- } -- theTime = 0.0; --} -- --static void --updatePointList(void) --{ -- float distance; -- int i; -- -- static double t0 = -1.; -- double dt, t = glutGet(GLUT_ELAPSED_TIME) / 1000.0; -- if (t0 < 0.0) -- t0 = t; -- dt = t - t0; -- t0 = t; -- -- motion = 0; -- for (i=0; i<numPoints; i++) { -- distance = pointVelocity[i][0] * theTime; -- -- /* X and Z */ -- pointList[i][0] = pointDirection[i][0] * distance; -- pointList[i][2] = pointDirection[i][1] * distance; -- -- /* Z */ -- pointList[i][1] = -- (pointVelocity[i][1] - 0.5 * GRAVITY * pointTime[i])*pointTime[i]; -- -- /* If we hit the ground, bounce the point upward again. */ -- if (pointList[i][1] <= 0.0) { -- if (distance > EDGE) { -- /* Particle has hit ground past the distance duration of -- the particles. Mark particle as dead. */ -- colorList[i] = NUM_COLORS; /* Not moving. */ -- continue; -- } -- -- pointVelocity[i][1] *= 0.8; /* 80% of previous up velocity. */ -- pointTime[i] = 0.0; /* Reset the particles sense of up time. */ -- } -- motion = 1; -- pointTime[i] += dt; -- } -- theTime += dt; -- if (!motion && !spin) { -- if (repeat) { -- makePointList(); -- } else { -- glutIdleFunc(NULL); -- } -- } --} -- --static void --idle(void) --{ -- updatePointList(); -- if (spin) { -- angle += 0.3; -- newModel = 1; -- } -- glutPostRedisplay(); --} -- --static void --visible(int vis) --{ -- if (vis == GLUT_VISIBLE) { -- if (animate && (motion || spin)) { -- glutIdleFunc(idle); -- } -- } else { -- glutIdleFunc(NULL); -- } --} -- --static void --recalcModelView(void) --{ -- glPopMatrix(); -- glPushMatrix(); -- glRotatef(angle, 0.0, 1.0, 0.0); -- newModel = 0; --} -- --static void --redraw(void) --{ -- int i; -- -- glDepthMask(GL_TRUE); -- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); -- if (newModel) -- recalcModelView(); -- -- -- /* Draw the floor. */ --/* glEnable(GL_TEXTURE_2D);*/ -- glColor3f(0.5, 1.0, 0.5); -- glBegin(GL_QUADS); -- glTexCoord2f(0.0, 0.0); -- glVertex3f(-EDGE, -0.05, -EDGE); -- glTexCoord2f(20.0, 0.0); -- glVertex3f(EDGE, -0.05, -EDGE); -- glTexCoord2f(20.0, 20.0); -- glVertex3f(EDGE, -0.05, EDGE); -- glTexCoord2f(0.0, 20.0); -- glVertex3f(-EDGE, -0.05, EDGE); -- glEnd(); -- -- /* Allow particles to blend with each other. */ -- glDepthMask(GL_FALSE); -- -- if (blend) -- glEnable(GL_BLEND); -- -- glDisable(GL_TEXTURE_2D); -- glBegin(GL_POINTS); -- for (i=0; i<numPoints; i++) { -- /* Draw alive particles. */ -- if (colorList[i] != DEAD) { -- glColor4fv(colorSet[colorList[i]]); -- glVertex3fv(pointList[i]); -- } -- } -- glEnd(); -- -- glDisable(GL_BLEND); -- -- glutSwapBuffers(); --} -- --/* ARGSUSED2 */ --static void --mouse(int button, int state, int x, int y) --{ -- /* Scene can be spun around Y axis using left -- mouse button movement. */ -- if (button == GLUT_LEFT_BUTTON && state == GLUT_DOWN) { -- moving = 1; -- begin = x; -- } -- if (button == GLUT_LEFT_BUTTON && state == GLUT_UP) { -- moving = 0; -- } --} -- --/* ARGSUSED1 */ --static void --mouseMotion(int x, int y) --{ -- if (moving) { -- angle = angle + (x - begin); -- begin = x; -- newModel = 1; -- glutPostRedisplay(); -- } --} -- --static void --menu(int option) --{ -- switch (option) { -- case 0: -- makePointList(); -- break; --#ifdef GL_ARB_point_parameters -- case 1: -- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, constant); -- break; -- case 2: -- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, linear); -- break; -- case 3: -- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad); -- break; --#endif -- case 4: -- blend = 1; -- break; -- case 5: -- blend = 0; -- break; --#ifdef GL_ARB_point_parameters -- case 6: -- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 1.0); -- break; -- case 7: -- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 10.0); -- break; --#endif -- case 8: -- glEnable(GL_POINT_SMOOTH); -- break; -- case 9: -- glDisable(GL_POINT_SMOOTH); -- break; -- case 10: -- glPointSize(2.0); -- break; -- case 11: -- glPointSize(4.0); -- break; -- case 12: -- glPointSize(8.0); -- break; -- case 13: -- spin = 1 - spin; -- if (animate && (spin || motion)) { -- glutIdleFunc(idle); -- } else { -- glutIdleFunc(NULL); -- } -- break; -- case 14: -- numPoints = 200; -- break; -- case 15: -- numPoints = 500; -- break; -- case 16: -- numPoints = 1000; -- break; -- case 17: -- numPoints = 2000; -- break; -- case 666: -- exit(0); -- } -- glutPostRedisplay(); --} -- --/* ARGSUSED1 */ --static void --key(unsigned char c, int x, int y) --{ -- switch (c) { -- case 13: -- animate = 1 - animate; /* toggle. */ -- if (animate && (motion || spin)) { -- glutIdleFunc(idle); -- } else { -- glutIdleFunc(NULL); -- } -- break; -- case ' ': -- animate = 1; -- makePointList(); -- glutIdleFunc(idle); -- break; -- case 27: -- exit(0); -- } --} -- --/* Nice floor texture tiling pattern. */ --static char *circles[] = { -- "....xxxx........", -- "..xxxxxxxx......", -- ".xxxxxxxxxx.....", -- ".xxx....xxx.....", -- "xxx......xxx....", -- "xxx......xxx....", -- "xxx......xxx....", -- "xxx......xxx....", -- ".xxx....xxx.....", -- ".xxxxxxxxxx.....", -- "..xxxxxxxx......", -- "....xxxx........", -- "................", -- "................", -- "................", -- "................", --}; -- --static void --makeFloorTexture(void) --{ -- GLubyte floorTexture[16][16][3]; -- GLubyte *loc; -- int s, t; -- -- /* Setup RGB image for the texture. */ -- loc = (GLubyte*) floorTexture; -- for (t = 0; t < 16; t++) { -- for (s = 0; s < 16; s++) { -- if (circles[t][s] == 'x') { -- /* Nice blue. */ -- loc[0] = 0x1f; -- loc[1] = 0x1f; -- loc[2] = 0x8f; -- } else { -- /* Light gray. */ -- loc[0] = 0xca; -- loc[1] = 0xca; -- loc[2] = 0xca; -- } -- loc += 3; -- } -- } -- -- glPixelStorei(GL_UNPACK_ALIGNMENT, 1); -- -- if (useMipmaps) { -- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, -- GL_LINEAR_MIPMAP_LINEAR); -- gluBuild2DMipmaps(GL_TEXTURE_2D, 3, 16, 16, -- GL_RGB, GL_UNSIGNED_BYTE, floorTexture); -- } else { -- if (linearFiltering) { -- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); -- } else { -- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); -- } -- glTexImage2D(GL_TEXTURE_2D, 0, 3, 16, 16, 0, -- GL_RGB, GL_UNSIGNED_BYTE, floorTexture); -- } --} -- --int --main(int argc, char **argv) --{ -- int i; -- -- glutInitWindowSize(300, 300); -- glutInit(&argc, argv); -- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_MULTISAMPLE); -- -- for (i=1; i<argc; i++) { -- if(!strcmp("-noms", argv[i])) { -- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH); -- printf("forcing no multisampling\n"); -- } else if(!strcmp("-nomipmaps", argv[i])) { -- useMipmaps = 0; -- } else if(!strcmp("-nearest", argv[i])) { -- linearFiltering = 0; -- } -- } -- -- glutCreateWindow("point burst"); -- glewInit(); -- glutDisplayFunc(redraw); -- glutMouseFunc(mouse); -- glutMotionFunc(mouseMotion); -- glutVisibilityFunc(visible); -- glutKeyboardFunc(key); -- glutCreateMenu(menu); -- glutAddMenuEntry("Reset time", 0); -- glutAddMenuEntry("Constant", 1); -- glutAddMenuEntry("Linear", 2); -- glutAddMenuEntry("Quadratic", 3); -- glutAddMenuEntry("Blend on", 4); -- glutAddMenuEntry("Blend off", 5); -- glutAddMenuEntry("Threshold 1", 6); -- glutAddMenuEntry("Threshold 10", 7); -- glutAddMenuEntry("Point smooth on", 8); -- glutAddMenuEntry("Point smooth off", 9); -- glutAddMenuEntry("Point size 2", 10); -- glutAddMenuEntry("Point size 4", 11); -- glutAddMenuEntry("Point size 8", 12); -- glutAddMenuEntry("Toggle spin", 13); -- glutAddMenuEntry("200 points ", 14); -- glutAddMenuEntry("500 points ", 15); -- glutAddMenuEntry("1000 points ", 16); -- glutAddMenuEntry("2000 points ", 17); -- glutAddMenuEntry("Quit", 666); -- glutAttachMenu(GLUT_RIGHT_BUTTON); -- -- if (!glutExtensionSupported("GL_ARB_point_parameters")) { -- fprintf(stderr, "Sorry, GL_ARB_point_parameters is not supported.\n"); -- return -1; -- } -- -- glShadeModel(GL_FLAT); -- glEnable(GL_DEPTH_TEST); -- glEnable(GL_POINT_SMOOTH); -- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); -- glPointSize(8.0); --#if GL_ARB_point_parameters -- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad); --#endif -- glMatrixMode(GL_PROJECTION); -- gluPerspective( /* field of view in degree */ 40.0, -- /* aspect ratio */ 1.0, -- /* Z near */ 0.5, /* Z far */ 40.0); -- glMatrixMode(GL_MODELVIEW); -- gluLookAt(0.0, 1.0, 8.0, /* eye location */ -- 0.0, 1.0, 0.0, /* center is at (0,0,0) */ -- 0.0, 1.0, 0.); /* up is in postivie Y direction */ -- glPushMatrix(); /* dummy push so we can pop on model -- recalc */ -- -- makePointList(); -- makeFloorTexture(); -- -- glutMainLoop(); -- return 0; /* ANSI C requires main to return int. */ --} -diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/spriteblast.c mesa-demos-8.0.1//src/demos/spriteblast.c ---- Desktop/mesa-demos-8.0.1//src/demos/spriteblast.c 2010-07-07 13:57:15.000000000 -0400 -+++ mesa-demos-8.0.1/src/demos/spriteblast.c 1969-12-31 19:00:00.000000000 -0500 -@@ -1,555 +0,0 @@ -- --/* Copyright (c) Mark J. Kilgard, 1997. */ -- --/* This program is freely distributable without licensing fees -- and is provided without guarantee or warrantee expressed or -- implied. This program is -not- in the public domain. */ -- --/* This example demonstrates how to render particle effects -- with OpenGL. A cloud of pinkish/orange particles explodes with the -- particles bouncing off the ground. When the EXT_point_parameters -- is present , the particle size is attenuated based on eye distance. */ -- -- --/* Modified by Brian Paul to test GL_ARB_point_sprite */ -- -- --#include <stdio.h> --#include <stdlib.h> --#include <string.h> --#include <math.h> /* for cos(), sin(), and sqrt() */ --#ifdef _WIN32 --#include <windows.h> --#endif --#include <GL/glew.h> --#include <GL/glut.h> -- --/* Some <math.h> files do not define M_PI... */ --#ifndef M_PI --#define M_PI 3.14159265 --#endif -- --#if 0 /* For debugging. */ --#undef GL_EXT_point_parameters --#endif -- --static GLfloat angle = -150; /* in degrees */ --static int spin = 0; --static int moving, begin; --static float theTime; --static int repeat = 1; --static int blend = 1; --int useMipmaps = 1; --int linearFiltering = 1; -- --static GLfloat constant[3] = { .2, 0.0, 0.0 }; --static GLfloat linear[3] = { .0, .1, 0.0 }; --static GLfloat theQuad[3] = { .005, 0.1, 1/600.0 }; -- --#define MAX_POINTS 2000 -- --static int numPoints = 200; -- --static GLfloat pointList[MAX_POINTS][3]; --static GLfloat pointTime[MAX_POINTS]; --static GLfloat pointVelocity[MAX_POINTS][2]; --static GLfloat pointDirection[MAX_POINTS][2]; --static int colorList[MAX_POINTS]; --static int animate = 1, motion = 0, org = 0, sprite = 1, smooth = 1; -- --static GLfloat colorSet[][4] = { -- /* Shades of red. */ -- { 0.7, 0.2, 0.4, 0.5 }, -- { 0.8, 0.0, 0.7, 0.5 }, -- { 1.0, 0.0, 0.0, 0.5 }, -- { 0.9, 0.3, 0.6, 0.5 }, -- { 1.0, 0.4, 0.0, 0.5 }, -- { 1.0, 0.0, 0.5, 0.5 }, --}; -- --#define NUM_COLORS (sizeof(colorSet)/sizeof(colorSet[0])) -- --#define DEAD (NUM_COLORS+1) -- -- --/* GL */ --static GLint spritePattern[16][16] = { -- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, -- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, -- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, -- { 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0 }, -- { 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0 }, -- { 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0 }, -- { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0 }, -- { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0 }, -- { 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0 }, -- { 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0 }, -- { 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0 }, -- { 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0 }, -- { 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0 }, -- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, -- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, -- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } --}; -- -- -- -- --#if 0 /* drand48 might be better on Unix machines */ --#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * drand48()) --#else --static float float_rand(void) { return rand() / (float) RAND_MAX; } --#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * float_rand()) --#endif -- --#define MEAN_VELOCITY 3.0 --#define GRAVITY 2.0 -- --/* Modeling units of ground extent in each X and Z direction. */ --#define EDGE 12 -- --static void --makePointList(void) --{ -- float angle, velocity, direction; -- int i; -- -- motion = 1; -- for (i=0; i<numPoints; i++) { -- pointList[i][0] = 0.0; -- pointList[i][1] = 0.0; -- pointList[i][2] = 0.0; -- pointTime[i] = 0.0; -- angle = (RANDOM_RANGE(60.0, 70.0)) * M_PI/180.0; -- direction = RANDOM_RANGE(0.0, 360.0) * M_PI/180.0; -- pointDirection[i][0] = cos(direction); -- pointDirection[i][1] = sin(direction); -- velocity = MEAN_VELOCITY + RANDOM_RANGE(-0.8, 1.0); -- pointVelocity[i][0] = velocity * cos(angle); -- pointVelocity[i][1] = velocity * sin(angle); -- colorList[i] = rand() % NUM_COLORS; -- } -- theTime = 0.0; --} -- --static void --updatePointList(void) --{ -- float distance; -- int i; -- -- static double t0 = -1.; -- double dt, t = glutGet(GLUT_ELAPSED_TIME) / 1000.0; -- if (t0 < 0.0) -- t0 = t; -- dt = t - t0; -- t0 = t; -- -- motion = 0; -- for (i=0; i<numPoints; i++) { -- distance = pointVelocity[i][0] * theTime; -- -- /* X and Z */ -- pointList[i][0] = pointDirection[i][0] * distance; -- pointList[i][2] = pointDirection[i][1] * distance; -- -- /* Z */ -- pointList[i][1] = -- (pointVelocity[i][1] - 0.5 * GRAVITY * pointTime[i])*pointTime[i]; -- -- /* If we hit the ground, bounce the point upward again. */ -- if (pointList[i][1] <= 0.0) { -- if (distance > EDGE) { -- /* Particle has hit ground past the distance duration of -- the particles. Mark particle as dead. */ -- colorList[i] = NUM_COLORS; /* Not moving. */ -- continue; -- } -- -- pointVelocity[i][1] *= 0.8; /* 80% of previous up velocity. */ -- pointTime[i] = 0.0; /* Reset the particles sense of up time. */ -- } -- motion = 1; -- pointTime[i] += dt; -- } -- theTime += dt; -- if (!motion && !spin) { -- if (repeat) { -- makePointList(); -- } else { -- glutIdleFunc(NULL); -- } -- } --} -- --static void --idle(void) --{ -- updatePointList(); -- if (spin) { -- angle += 0.3; -- } -- glutPostRedisplay(); --} -- --static void --visible(int vis) --{ -- if (vis == GLUT_VISIBLE) { -- if (animate && (motion || spin)) { -- glutIdleFunc(idle); -- } -- } else { -- glutIdleFunc(NULL); -- } --} -- --static void --redraw(void) --{ -- int i; -- -- glDepthMask(GL_TRUE); -- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); -- -- glPushMatrix(); -- glRotatef(15.0, 1.0, 0.0, 0.0); -- glRotatef(angle, 0.0, 1.0, 0.0); -- -- -- /* Draw the floor. */ --/* glEnable(GL_TEXTURE_2D);*/ -- glColor3f(0.1, 0.5, 1.0); -- glBegin(GL_QUADS); -- glTexCoord2f(0.0, 0.0); -- glVertex3f(-EDGE, -0.05, -EDGE); -- glTexCoord2f(20.0, 0.0); -- glVertex3f(EDGE, -0.05, -EDGE); -- glTexCoord2f(20.0, 20.0); -- glVertex3f(EDGE, -0.05, EDGE); -- glTexCoord2f(0.0, 20.0); -- glVertex3f(-EDGE, -0.05, EDGE); -- glEnd(); -- -- /* Allow particles to blend with each other. */ -- glDepthMask(GL_FALSE); -- -- if (blend) -- glEnable(GL_BLEND); -- -- if (sprite) { -- glEnable(GL_TEXTURE_2D); --#ifdef GL_ARB_point_sprite -- glEnable(GL_POINT_SPRITE_ARB); --#endif -- } -- -- glColor3f(1,1,1); -- glBegin(GL_POINTS); -- for (i=0; i<numPoints; i++) { -- /* Draw alive particles. */ -- if (colorList[i] != DEAD) { -- if (!sprite) glColor4fv(colorSet[colorList[i]]); -- glVertex3fv(pointList[i]); -- } -- } -- glEnd(); -- -- glDisable(GL_TEXTURE_2D); --#ifdef GL_ARB_point_sprite -- glDisable(GL_POINT_SPRITE_ARB); --#endif -- glDisable(GL_BLEND); -- -- glPopMatrix(); -- -- glutSwapBuffers(); --} -- --/* ARGSUSED2 */ --static void --mouse(int button, int state, int x, int y) --{ -- /* Scene can be spun around Y axis using left -- mouse button movement. */ -- if (button == GLUT_LEFT_BUTTON && state == GLUT_DOWN) { -- moving = 1; -- begin = x; -- } -- if (button == GLUT_LEFT_BUTTON && state == GLUT_UP) { -- moving = 0; -- } --} -- --/* ARGSUSED1 */ --static void --mouseMotion(int x, int y) --{ -- if (moving) { -- angle = angle + (x - begin); -- begin = x; -- glutPostRedisplay(); -- } --} -- --static void --menu(int option) --{ -- switch (option) { -- case 0: -- makePointList(); -- break; --#ifdef GL_ARB_point_parameters -- case 1: -- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, constant); -- break; -- case 2: -- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, linear); -- break; -- case 3: -- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad); -- break; --#endif -- case 4: -- blend = 1; -- break; -- case 5: -- blend = 0; -- break; --#ifdef GL_ARB_point_parameters -- case 6: -- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 1.0); -- break; -- case 7: -- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 10.0); -- break; --#endif -- case 8: -- glEnable(GL_POINT_SMOOTH); -- smooth = 1; -- break; -- case 9: -- glDisable(GL_POINT_SMOOTH); -- smooth = 0; -- break; -- case 10: -- glPointSize(16.0); -- break; -- case 11: -- glPointSize(32.0); -- break; -- case 12: -- glPointSize(64.0); -- break; -- case 13: -- spin = 1 - spin; -- if (animate && (spin || motion)) { -- glutIdleFunc(idle); -- } else { -- glutIdleFunc(NULL); -- } -- break; -- case 14: -- numPoints = 200; -- break; -- case 15: -- numPoints = 500; -- break; -- case 16: -- numPoints = 1000; -- break; -- case 17: -- numPoints = 2000; -- break; -- case 666: -- exit(0); -- } -- glutPostRedisplay(); --} -- --/* ARGSUSED1 */ --static void --key(unsigned char c, int x, int y) --{ -- switch (c) { -- case 13: -- animate = 1 - animate; /* toggle. */ -- if (animate && (motion || spin)) { -- glutIdleFunc(idle); -- } else { -- glutIdleFunc(NULL); -- } -- break; -- case ' ': -- animate = 1; -- makePointList(); -- glutIdleFunc(idle); -- break; -- case 'o': -- case 'O': -- org ^= 1; --#ifdef GL_VERSION_2_0 --#ifdef GL_ARB_point_parameters -- glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, -- org ? GL_LOWER_LEFT : GL_UPPER_LEFT); --#endif --#endif -- glutPostRedisplay(); -- break; -- case 't': -- case 'T': -- sprite ^= 1; -- glutPostRedisplay(); -- break; -- case 's': -- case 'S': -- (smooth ^= 1) ? glEnable(GL_POINT_SMOOTH) : glDisable(GL_POINT_SMOOTH); -- glutPostRedisplay(); -- break; -- case '0': -- glPointSize(1.0); -- glutPostRedisplay(); -- break; -- case '1': -- glPointSize(16.0); -- glutPostRedisplay(); -- break; -- case '2': -- glPointSize(32.0); -- glutPostRedisplay(); -- break; -- case '3': -- glPointSize(64.0); -- glutPostRedisplay(); -- break; -- case '4': -- glPointSize(128.0); -- glutPostRedisplay(); -- break; -- case 27: -- exit(0); -- } --} -- -- -- --static void --makeSprite(void) --{ -- GLubyte texture[16][16][4]; -- int i, j; -- -- if (!glutExtensionSupported("GL_ARB_point_sprite")) { -- printf("Sorry, this demo requires GL_ARB_point_sprite.\n"); -- exit(0); -- } -- if (!glutExtensionSupported("GL_ARB_point_parameters")) { -- printf("Sorry, this demo requires GL_ARB_point_parameters.\n"); -- exit(0); -- } -- -- for (i = 0; i < 16; i++) { -- for (j = 0; j < 16; j++) { -- if (spritePattern[i][j]) { -- texture[i][j][0] = 255; -- texture[i][j][1] = 255; -- texture[i][j][2] = 255; -- texture[i][j][3] = 255; -- } -- else { -- texture[i][j][0] = 255; -- texture[i][j][1] = 0; -- texture[i][j][2] = 0; -- texture[i][j][3] = 0; -- } -- } -- } -- -- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE, -- texture); -- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); -- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); --#ifdef GL_ARB_point_sprite -- glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE); --#endif --} -- -- --static void --reshape(int width, int height) --{ -- GLfloat h = (GLfloat) height / (GLfloat) width; -- -- glViewport(0, 0, (GLint) width, (GLint) height); -- glMatrixMode(GL_PROJECTION); -- glLoadIdentity(); -- glFrustum(-1.0, 1.0, -h, h, 2.0, 30.0); -- glMatrixMode(GL_MODELVIEW); -- glLoadIdentity(); -- glTranslatef(0.0, 0.0, -10.0); --} -- --int --main(int argc, char **argv) --{ -- int i; -- -- glutInitWindowSize(600,300); -- glutInit(&argc, argv); -- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_MULTISAMPLE); -- -- for (i=1; i<argc; i++) { -- if(!strcmp("-noms", argv[i])) { -- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH); -- printf("forcing no multisampling\n"); -- } else if(!strcmp("-nomipmaps", argv[i])) { -- useMipmaps = 0; -- } else if(!strcmp("-nearest", argv[i])) { -- linearFiltering = 0; -- } -- } -- glutCreateWindow("sprite blast"); -- glewInit(); -- glutReshapeFunc(reshape); -- glutDisplayFunc(redraw); -- glutMouseFunc(mouse); -- glutMotionFunc(mouseMotion); -- glutVisibilityFunc(visible); -- glutKeyboardFunc(key); -- glutCreateMenu(menu); -- glutAddMenuEntry("Reset time", 0); -- glutAddMenuEntry("Constant", 1); -- glutAddMenuEntry("Linear", 2); -- glutAddMenuEntry("Quadratic", 3); -- glutAddMenuEntry("Blend on", 4); -- glutAddMenuEntry("Blend off", 5); -- glutAddMenuEntry("Threshold 1", 6); -- glutAddMenuEntry("Threshold 10", 7); -- glutAddMenuEntry("Point smooth on", 8); -- glutAddMenuEntry("Point smooth off", 9); -- glutAddMenuEntry("Point size 16", 10); -- glutAddMenuEntry("Point size 32", 11); -- glutAddMenuEntry("Point size 64", 12); -- glutAddMenuEntry("Toggle spin", 13); -- glutAddMenuEntry("200 points ", 14); -- glutAddMenuEntry("500 points ", 15); -- glutAddMenuEntry("1000 points ", 16); -- glutAddMenuEntry("2000 points ", 17); -- glutAddMenuEntry("Quit", 666); -- glutAttachMenu(GLUT_RIGHT_BUTTON); -- -- makePointList(); -- makeSprite(); -- -- glShadeModel(GL_FLAT); -- glEnable(GL_DEPTH_TEST); -- glEnable(GL_POINT_SMOOTH); -- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); -- glPointSize(32.0); --#ifdef GL_ARB_point_parameters -- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad); --#endif -- -- glutMainLoop(); -- return 0; /* ANSI C requires main to return int. */ --} diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index d64060918..898a24f12 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.8 +_kernver=3.8.1 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=4 +pkgrel=6 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 3717e9627..ddd854a03 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -10,7 +10,7 @@ _basekernel=3.0 _sublevel=66 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.65 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.66 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '7a7c3165d735a73cada5851d1b5d04ca') + '7870185804a1795293698f9a0b770720') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 13ca9d56d..1400b038f 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178342 2013-02-20 12:32:29Z tpowa $ +# $Id: PKGBUILD 178913 2013-02-28 18:41:03Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> @@ -10,18 +10,17 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -#_sublevel=9 -#pkgver=${_basekernel}.${_sublevel} -pkgver=${_basekernel} +_sublevel=1 +pkgver=${_basekernel}.${_sublevel} pkgrel=1 -#_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl') options=('!strip') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" - #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" # the main kernel config files 'config.i686' 'config.x86_64' # standard config files for mkinitcpio ramdisk @@ -32,15 +31,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'd0ceaebf20b53184c50e7f4980ed45d1' - '0b483b23413dbc451f2b041b9a475c03' + 'd5ad2ecc865a32378517c3c07ca99173' + '4d73ccd0f1825a4bd474d4fead6c0d42' + 'e132184c6d02ef580a504967c067e1c5' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '88d501404f172dac6fcb248978251560' - '5296bf025db8b17613bc7205459564f0') + '5296bf025db8b17613bc7205459564f0' + 'e46425096ddbfb9566ef276ac4b3e623') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -250,7 +251,7 @@ _package-headers() { mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include" - for i in acpi asm-generic config crypto drm generated linux math-emu \ + for i in acpi asm-generic config crypto drm generated keys linux math-emu \ media net pcmcia scsi sound trace uapi video xen; do cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/" done diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 1491a2ff6..4cdc0a65f 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.8.0 Kernel Configuration +# Linux/i386 3.8.0-2 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1493,6 +1493,9 @@ CONFIG_MTD_PLATRAM=m CONFIG_MTD_PMC551=m # CONFIG_MTD_PMC551_BUGFIX is not set # CONFIG_MTD_PMC551_DEBUG is not set +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# CONFIG_MTD_SST25L is not set # CONFIG_MTD_SLRAM is not set CONFIG_MTD_PHRAM=m CONFIG_MTD_MTDRAM=m @@ -1614,6 +1617,7 @@ CONFIG_BLK_DEV_RBD=m CONFIG_SENSORS_LIS3LV02D=m CONFIG_AD525X_DPOT=m CONFIG_AD525X_DPOT_I2C=m +# CONFIG_AD525X_DPOT_SPI is not set # CONFIG_IBM_ASM is not set CONFIG_PHANTOM=m CONFIG_INTEL_MID_PTI=m @@ -1635,9 +1639,11 @@ CONFIG_SENSORS_BH1770=m CONFIG_SENSORS_APDS990X=m CONFIG_HMC6352=m CONFIG_DS1682=m +# CONFIG_TI_DAC7512 is not set CONFIG_VMWARE_BALLOON=m CONFIG_BMP085=y CONFIG_BMP085_I2C=m +# CONFIG_BMP085_SPI is not set # CONFIG_PCH_PHUB is not set CONFIG_USB_SWITCH_FSA9480=m CONFIG_C2PORT=m @@ -1647,9 +1653,11 @@ CONFIG_C2PORT_DURAMAR_2150=m # EEPROM support # CONFIG_EEPROM_AT24=m +# CONFIG_EEPROM_AT25 is not set CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m CONFIG_EEPROM_93CX6=m +# CONFIG_EEPROM_93XX46 is not set CONFIG_CB710_CORE=m # CONFIG_CB710_DEBUG is not set CONFIG_CB710_DEBUG_ASSUMPTIONS=y @@ -2203,8 +2211,11 @@ CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y CONFIG_NET_VENDOR_MICREL=y CONFIG_KS8842=m +# CONFIG_KS8851 is not set CONFIG_KS8851_MLL=m CONFIG_KSZ884X_PCI=m +CONFIG_NET_VENDOR_MICROCHIP=y +# CONFIG_ENC28J60 is not set CONFIG_NET_VENDOR_MYRI=y CONFIG_MYRI10GE=m CONFIG_MYRI10GE_DCA=y @@ -2323,6 +2334,7 @@ CONFIG_MICREL_PHY=m CONFIG_MDIO_BUS_MUX=m CONFIG_MDIO_BUS_MUX_GPIO=m CONFIG_MDIO_BUS_MUX_MMIOREG=m +# CONFIG_MICREL_KS8995MA is not set CONFIG_PLIP=m CONFIG_PPP=m CONFIG_PPP_BSDCOMP=m @@ -2493,6 +2505,7 @@ CONFIG_LIBERTAS=m CONFIG_LIBERTAS_USB=m CONFIG_LIBERTAS_CS=m CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_SPI is not set # CONFIG_LIBERTAS_DEBUG is not set CONFIG_LIBERTAS_MESH=y CONFIG_HERMES=m @@ -2508,6 +2521,7 @@ CONFIG_ORINOCO_USB=m CONFIG_P54_COMMON=m CONFIG_P54_USB=m CONFIG_P54_PCI=m +# CONFIG_P54_SPI is not set CONFIG_P54_LEDS=y CONFIG_RT2X00=m CONFIG_RT2400PCI=m @@ -2543,10 +2557,12 @@ CONFIG_RTLWIFI=m CONFIG_RTL8192C_COMMON=m CONFIG_WL_TI=y CONFIG_WL1251=m +# CONFIG_WL1251_SPI is not set CONFIG_WL1251_SDIO=m CONFIG_WL12XX=m CONFIG_WL18XX=m CONFIG_WLCORE=m +# CONFIG_WLCORE_SPI is not set CONFIG_WLCORE_SDIO=m CONFIG_WL12XX_PLATFORM_DATA=y CONFIG_ZD1211RW=m @@ -2566,6 +2582,8 @@ CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 CONFIG_IEEE802154_DRIVERS=m CONFIG_IEEE802154_FAKEHARD=m CONFIG_IEEE802154_FAKELB=m +CONFIG_IEEE802154_AT86RF230=m +# CONFIG_IEEE802154_MRF24J40 is not set CONFIG_VMXNET3=m CONFIG_HYPERV_NET=m CONFIG_ISDN=y @@ -2821,14 +2839,18 @@ CONFIG_TABLET_USB_HANWANG=m CONFIG_TABLET_USB_KBTAB=m CONFIG_TABLET_USB_WACOM=m CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_AD7877 is not set CONFIG_TOUCHSCREEN_AD7879=m CONFIG_TOUCHSCREEN_AD7879_I2C=m +# CONFIG_TOUCHSCREEN_AD7879_SPI is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m CONFIG_TOUCHSCREEN_AUO_PIXCIR=m CONFIG_TOUCHSCREEN_BU21013=m CONFIG_TOUCHSCREEN_CY8CTMG110=m CONFIG_TOUCHSCREEN_CYTTSP_CORE=m CONFIG_TOUCHSCREEN_CYTTSP_I2C=m +# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set CONFIG_TOUCHSCREEN_DYNAPRO=m CONFIG_TOUCHSCREEN_HAMPSHIRE=m CONFIG_TOUCHSCREEN_EETI=m @@ -2879,12 +2901,14 @@ CONFIG_TOUCHSCREEN_USB_NEXIO=y CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y CONFIG_TOUCHSCREEN_TOUCHIT213=m CONFIG_TOUCHSCREEN_TSC_SERIO=m +# CONFIG_TOUCHSCREEN_TSC2005 is not set CONFIG_TOUCHSCREEN_TSC2007=m CONFIG_TOUCHSCREEN_ST1232=m CONFIG_TOUCHSCREEN_TPS6507X=m CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m +CONFIG_INPUT_AD714X_SPI=m CONFIG_INPUT_BMA150=m CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_MC13783_PWRBUTTON=m @@ -2910,6 +2934,7 @@ CONFIG_INPUT_PWM_BEEPER=m CONFIG_INPUT_GPIO_ROTARY_ENCODER=m CONFIG_INPUT_ADXL34X=m CONFIG_INPUT_ADXL34X_I2C=m +CONFIG_INPUT_ADXL34X_SPI=m CONFIG_INPUT_CMA3000=m CONFIG_INPUT_CMA3000_I2C=m @@ -2980,6 +3005,8 @@ CONFIG_SERIAL_8250_DW=m # # Non-8250 serial port support # +# CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_MAX310X is not set CONFIG_SERIAL_MFD_HSU=m CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y @@ -2991,6 +3018,7 @@ CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 +# CONFIG_SERIAL_IFX6X60 is not set CONFIG_SERIAL_PCH_UART=m CONFIG_SERIAL_XILINX_PS_UART=m CONFIG_SERIAL_ARC=m @@ -3116,7 +3144,32 @@ CONFIG_SCx200_ACB=m # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_SPI is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_ALTERA is not set +# CONFIG_SPI_BITBANG is not set +# CONFIG_SPI_BUTTERFLY is not set +# CONFIG_SPI_GPIO is not set +# CONFIG_SPI_LM70_LLP is not set +# CONFIG_SPI_OC_TINY is not set +# CONFIG_SPI_PXA2XX is not set +# CONFIG_SPI_PXA2XX_PCI is not set +# CONFIG_SPI_SC18IS602 is not set +# CONFIG_SPI_TOPCLIFF_PCH is not set +# CONFIG_SPI_XCOMM is not set +# CONFIG_SPI_XILINX is not set +# CONFIG_SPI_DESIGNWARE is not set + +# +# SPI Protocol Masters +# +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_TLE62X0 is not set # CONFIG_HSI is not set # @@ -3185,7 +3238,10 @@ CONFIG_GPIO_AMD8111=m # # SPI GPIO expanders: # +# CONFIG_GPIO_MAX7301 is not set # CONFIG_GPIO_MCP23S08 is not set +# CONFIG_GPIO_MC33880 is not set +# CONFIG_GPIO_74X164 is not set # # AC97 GPIO expanders: @@ -3232,8 +3288,10 @@ CONFIG_HWMON_VID=m # CONFIG_SENSORS_ABITUGURU=m CONFIG_SENSORS_ABITUGURU3=m +# CONFIG_SENSORS_AD7314 is not set CONFIG_SENSORS_AD7414=m CONFIG_SENSORS_AD7418=m +# CONFIG_SENSORS_ADCXX is not set CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m @@ -3270,6 +3328,7 @@ CONFIG_SENSORS_IT87=m CONFIG_SENSORS_JC42=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LM63=m +# CONFIG_SENSORS_LM70 is not set CONFIG_SENSORS_LM73=m CONFIG_SENSORS_LM75=m CONFIG_SENSORS_LM77=m @@ -3287,6 +3346,7 @@ CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_LTC4261=m CONFIG_SENSORS_LM95241=m CONFIG_SENSORS_LM95245=m +# CONFIG_SENSORS_MAX1111 is not set CONFIG_SENSORS_MAX16065=m CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_MAX1668=m @@ -3326,6 +3386,7 @@ CONFIG_SENSORS_SCH5627=m CONFIG_SENSORS_SCH5636=m CONFIG_SENSORS_ADS1015=m CONFIG_SENSORS_ADS7828=m +# CONFIG_SENSORS_ADS7871 is not set CONFIG_SENSORS_AMC6821=m CONFIG_SENSORS_INA2XX=m CONFIG_SENSORS_THMC50=m @@ -3474,18 +3535,25 @@ CONFIG_MFD_LM3533=m CONFIG_TPS65010=m CONFIG_TPS6507X=m CONFIG_MFD_TPS65217=m +# CONFIG_MFD_TPS65912_SPI is not set +# CONFIG_MFD_STMPE is not set # CONFIG_MFD_TMIO is not set +# CONFIG_MFD_DA9052_SPI is not set CONFIG_MFD_ARIZONA=y CONFIG_MFD_ARIZONA_I2C=m +# CONFIG_MFD_ARIZONA_SPI is not set CONFIG_MFD_WM5102=y CONFIG_MFD_WM5110=y +# CONFIG_MFD_WM831X_SPI is not set CONFIG_MFD_PCF50633=m CONFIG_PCF50633_ADC=m CONFIG_PCF50633_GPIO=m CONFIG_MFD_MC13783=m CONFIG_MFD_MC13XXX=m +# CONFIG_MFD_MC13XXX_SPI is not set CONFIG_MFD_MC13XXX_I2C=m CONFIG_ABX500_CORE=y +# CONFIG_EZX_PCAP is not set CONFIG_MFD_CS5535=m # CONFIG_MFD_TIMBERDALE is not set CONFIG_LPC_SCH=m @@ -4197,7 +4265,16 @@ CONFIG_FB_VIRTUAL=m # CONFIG_EXYNOS_VIDEO is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m +# CONFIG_LCD_L4F00242T03 is not set +# CONFIG_LCD_LMS283GF05 is not set +# CONFIG_LCD_LTV350QV is not set +# CONFIG_LCD_ILI9320 is not set +# CONFIG_LCD_TDO24M is not set +# CONFIG_LCD_VGG2432A4 is not set CONFIG_LCD_PLATFORM=m +# CONFIG_LCD_S6E63M0 is not set +# CONFIG_LCD_LD9040 is not set +# CONFIG_LCD_AMS369FG06 is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_LM3533=m @@ -4420,6 +4497,7 @@ CONFIG_SND_VIA82XX_MODEM=m CONFIG_SND_VIRTUOSO=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m +CONFIG_SND_SPI=y CONFIG_SND_USB=y CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_UA101=m @@ -4871,6 +4949,7 @@ CONFIG_LEDS_LP5523=m CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m CONFIG_LEDS_PCA9633=m +# CONFIG_LEDS_DAC124S085 is not set CONFIG_LEDS_BD2802=m CONFIG_LEDS_INTEL_SS4200=m CONFIG_LEDS_LT3593=m @@ -4964,6 +5043,15 @@ CONFIG_RTC_DRV_RV3029C2=m # # SPI RTC drivers # +# CONFIG_RTC_DRV_M41T93 is not set +# CONFIG_RTC_DRV_M41T94 is not set +# CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1390 is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_DS3234 is not set +# CONFIG_RTC_DRV_PCF2123 is not set # # Platform RTC drivers @@ -5866,7 +5954,7 @@ CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" -CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" +CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd" CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 # CONFIG_SECURITY_YAMA is not set diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index dcf662c3c..92976aa89 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.8.0 Kernel Configuration +# Linux/x86_64 3.8.0-2 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -1460,6 +1460,9 @@ CONFIG_MTD_PLATRAM=m CONFIG_MTD_PMC551=m # CONFIG_MTD_PMC551_BUGFIX is not set # CONFIG_MTD_PMC551_DEBUG is not set +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# CONFIG_MTD_SST25L is not set # CONFIG_MTD_SLRAM is not set CONFIG_MTD_PHRAM=m CONFIG_MTD_MTDRAM=m @@ -1562,6 +1565,7 @@ CONFIG_BLK_DEV_RBD=m CONFIG_SENSORS_LIS3LV02D=m CONFIG_AD525X_DPOT=m CONFIG_AD525X_DPOT_I2C=m +# CONFIG_AD525X_DPOT_SPI is not set # CONFIG_IBM_ASM is not set CONFIG_PHANTOM=m CONFIG_INTEL_MID_PTI=m @@ -1583,9 +1587,11 @@ CONFIG_SENSORS_BH1770=m CONFIG_SENSORS_APDS990X=m CONFIG_HMC6352=m CONFIG_DS1682=m +# CONFIG_TI_DAC7512 is not set CONFIG_VMWARE_BALLOON=m CONFIG_BMP085=y CONFIG_BMP085_I2C=m +# CONFIG_BMP085_SPI is not set CONFIG_PCH_PHUB=m CONFIG_USB_SWITCH_FSA9480=m CONFIG_C2PORT=m @@ -1595,9 +1601,11 @@ CONFIG_C2PORT_DURAMAR_2150=m # EEPROM support # CONFIG_EEPROM_AT24=m +# CONFIG_EEPROM_AT25 is not set CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m CONFIG_EEPROM_93CX6=m +# CONFIG_EEPROM_93XX46 is not set CONFIG_CB710_CORE=m # CONFIG_CB710_DEBUG is not set CONFIG_CB710_DEBUG_ASSUMPTIONS=y @@ -2108,8 +2116,11 @@ CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y CONFIG_NET_VENDOR_MICREL=y CONFIG_KS8842=m +# CONFIG_KS8851 is not set CONFIG_KS8851_MLL=m CONFIG_KSZ884X_PCI=m +CONFIG_NET_VENDOR_MICROCHIP=y +# CONFIG_ENC28J60 is not set CONFIG_NET_VENDOR_MYRI=y CONFIG_MYRI10GE=m CONFIG_MYRI10GE_DCA=y @@ -2215,6 +2226,7 @@ CONFIG_STE10XP=m CONFIG_LSI_ET1011C_PHY=m CONFIG_MICREL_PHY=m # CONFIG_MDIO_BITBANG is not set +# CONFIG_MICREL_KS8995MA is not set CONFIG_PLIP=m CONFIG_PPP=m CONFIG_PPP_BSDCOMP=m @@ -2385,6 +2397,7 @@ CONFIG_LIBERTAS=m CONFIG_LIBERTAS_USB=m CONFIG_LIBERTAS_CS=m CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_SPI is not set # CONFIG_LIBERTAS_DEBUG is not set CONFIG_LIBERTAS_MESH=y CONFIG_HERMES=m @@ -2400,6 +2413,7 @@ CONFIG_ORINOCO_USB=m CONFIG_P54_COMMON=m CONFIG_P54_USB=m CONFIG_P54_PCI=m +# CONFIG_P54_SPI is not set CONFIG_P54_LEDS=y CONFIG_RT2X00=m CONFIG_RT2400PCI=m @@ -2435,10 +2449,12 @@ CONFIG_RTLWIFI=m CONFIG_RTL8192C_COMMON=m CONFIG_WL_TI=y CONFIG_WL1251=m +# CONFIG_WL1251_SPI is not set CONFIG_WL1251_SDIO=m CONFIG_WL12XX=m CONFIG_WL18XX=m CONFIG_WLCORE=m +# CONFIG_WLCORE_SPI is not set CONFIG_WLCORE_SDIO=m CONFIG_WL12XX_PLATFORM_DATA=y CONFIG_ZD1211RW=m @@ -2458,6 +2474,8 @@ CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 CONFIG_IEEE802154_DRIVERS=m CONFIG_IEEE802154_FAKEHARD=m CONFIG_IEEE802154_FAKELB=m +CONFIG_IEEE802154_AT86RF230=m +# CONFIG_IEEE802154_MRF24J40 is not set CONFIG_XEN_NETDEV_FRONTEND=m CONFIG_XEN_NETDEV_BACKEND=m CONFIG_VMXNET3=m @@ -2694,14 +2712,18 @@ CONFIG_TABLET_USB_HANWANG=m CONFIG_TABLET_USB_KBTAB=m CONFIG_TABLET_USB_WACOM=m CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_AD7877 is not set CONFIG_TOUCHSCREEN_AD7879=m CONFIG_TOUCHSCREEN_AD7879_I2C=m +# CONFIG_TOUCHSCREEN_AD7879_SPI is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m CONFIG_TOUCHSCREEN_AUO_PIXCIR=m CONFIG_TOUCHSCREEN_BU21013=m CONFIG_TOUCHSCREEN_CY8CTMG110=m CONFIG_TOUCHSCREEN_CYTTSP_CORE=m CONFIG_TOUCHSCREEN_CYTTSP_I2C=m +# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set CONFIG_TOUCHSCREEN_DYNAPRO=m CONFIG_TOUCHSCREEN_HAMPSHIRE=m CONFIG_TOUCHSCREEN_EETI=m @@ -2750,12 +2772,14 @@ CONFIG_TOUCHSCREEN_USB_NEXIO=y CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y CONFIG_TOUCHSCREEN_TOUCHIT213=m CONFIG_TOUCHSCREEN_TSC_SERIO=m +# CONFIG_TOUCHSCREEN_TSC2005 is not set CONFIG_TOUCHSCREEN_TSC2007=m CONFIG_TOUCHSCREEN_ST1232=m CONFIG_TOUCHSCREEN_TPS6507X=m CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m +CONFIG_INPUT_AD714X_SPI=m CONFIG_INPUT_BMA150=m CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_MC13783_PWRBUTTON=m @@ -2779,6 +2803,7 @@ CONFIG_INPUT_PCF8574=m CONFIG_INPUT_GPIO_ROTARY_ENCODER=m CONFIG_INPUT_ADXL34X=m CONFIG_INPUT_ADXL34X_I2C=m +CONFIG_INPUT_ADXL34X_SPI=m CONFIG_INPUT_CMA3000=m CONFIG_INPUT_CMA3000_I2C=m CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m @@ -2849,6 +2874,8 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # # Non-8250 serial port support # +# CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_MAX310X is not set CONFIG_SERIAL_MFD_HSU=m CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y @@ -2859,6 +2886,7 @@ CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 +# CONFIG_SERIAL_IFX6X60 is not set CONFIG_SERIAL_PCH_UART=m CONFIG_SERIAL_ARC=m CONFIG_SERIAL_ARC_NR_PORTS=1 @@ -2978,7 +3006,31 @@ CONFIG_I2C_VIPERBOARD=m # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_SPI is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_ALTERA is not set +# CONFIG_SPI_BITBANG is not set +# CONFIG_SPI_BUTTERFLY is not set +# CONFIG_SPI_GPIO is not set +# CONFIG_SPI_LM70_LLP is not set +# CONFIG_SPI_OC_TINY is not set +# CONFIG_SPI_PXA2XX_PCI is not set +# CONFIG_SPI_SC18IS602 is not set +# CONFIG_SPI_TOPCLIFF_PCH is not set +# CONFIG_SPI_XCOMM is not set +# CONFIG_SPI_XILINX is not set +# CONFIG_SPI_DESIGNWARE is not set + +# +# SPI Protocol Masters +# +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_TLE62X0 is not set # CONFIG_HSI is not set # @@ -3044,7 +3096,10 @@ CONFIG_GPIO_LANGWELL=y # # SPI GPIO expanders: # +# CONFIG_GPIO_MAX7301 is not set # CONFIG_GPIO_MCP23S08 is not set +# CONFIG_GPIO_MC33880 is not set +# CONFIG_GPIO_74X164 is not set # # AC97 GPIO expanders: @@ -3089,8 +3144,10 @@ CONFIG_HWMON_VID=m # CONFIG_SENSORS_ABITUGURU=m CONFIG_SENSORS_ABITUGURU3=m +# CONFIG_SENSORS_AD7314 is not set CONFIG_SENSORS_AD7414=m CONFIG_SENSORS_AD7418=m +# CONFIG_SENSORS_ADCXX is not set CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m @@ -3127,6 +3184,7 @@ CONFIG_SENSORS_IT87=m CONFIG_SENSORS_JC42=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LM63=m +# CONFIG_SENSORS_LM70 is not set CONFIG_SENSORS_LM73=m CONFIG_SENSORS_LM75=m CONFIG_SENSORS_LM77=m @@ -3144,6 +3202,7 @@ CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_LTC4261=m CONFIG_SENSORS_LM95241=m CONFIG_SENSORS_LM95245=m +# CONFIG_SENSORS_MAX1111 is not set CONFIG_SENSORS_MAX16065=m CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_MAX1668=m @@ -3183,6 +3242,7 @@ CONFIG_SENSORS_SCH5627=m CONFIG_SENSORS_SCH5636=m CONFIG_SENSORS_ADS1015=m CONFIG_SENSORS_ADS7828=m +# CONFIG_SENSORS_ADS7871 is not set CONFIG_SENSORS_AMC6821=m CONFIG_SENSORS_INA2XX=m CONFIG_SENSORS_THMC50=m @@ -3324,18 +3384,25 @@ CONFIG_MFD_LM3533=m CONFIG_TPS65010=m CONFIG_TPS6507X=m CONFIG_MFD_TPS65217=m +# CONFIG_MFD_TPS65912_SPI is not set +# CONFIG_MFD_STMPE is not set # CONFIG_MFD_TMIO is not set +# CONFIG_MFD_DA9052_SPI is not set CONFIG_MFD_ARIZONA=y CONFIG_MFD_ARIZONA_I2C=m +# CONFIG_MFD_ARIZONA_SPI is not set CONFIG_MFD_WM5102=y CONFIG_MFD_WM5110=y +# CONFIG_MFD_WM831X_SPI is not set CONFIG_MFD_PCF50633=m CONFIG_PCF50633_ADC=m CONFIG_PCF50633_GPIO=m CONFIG_MFD_MC13783=m CONFIG_MFD_MC13XXX=m +# CONFIG_MFD_MC13XXX_SPI is not set CONFIG_MFD_MC13XXX_I2C=m CONFIG_ABX500_CORE=y +# CONFIG_EZX_PCAP is not set CONFIG_MFD_CS5535=m # CONFIG_MFD_TIMBERDALE is not set CONFIG_LPC_SCH=m @@ -4036,7 +4103,16 @@ CONFIG_XEN_FBDEV_FRONTEND=m # CONFIG_EXYNOS_VIDEO is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m +# CONFIG_LCD_L4F00242T03 is not set +# CONFIG_LCD_LMS283GF05 is not set +# CONFIG_LCD_LTV350QV is not set +# CONFIG_LCD_ILI9320 is not set +# CONFIG_LCD_TDO24M is not set +# CONFIG_LCD_VGG2432A4 is not set CONFIG_LCD_PLATFORM=m +# CONFIG_LCD_S6E63M0 is not set +# CONFIG_LCD_LD9040 is not set +# CONFIG_LCD_AMS369FG06 is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_LM3533=m @@ -4218,6 +4294,7 @@ CONFIG_SND_VIA82XX_MODEM=m CONFIG_SND_VIRTUOSO=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m +CONFIG_SND_SPI=y CONFIG_SND_USB=y CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_UA101=m @@ -4628,6 +4705,7 @@ CONFIG_MMC_SDHCI_ACPI=m CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_WBSD=m CONFIG_MMC_TIFM_SD=m +# CONFIG_MMC_SPI is not set CONFIG_MMC_SDRICOH_CS=m CONFIG_MMC_CB710=m CONFIG_MMC_VIA_SDMMC=m @@ -4668,6 +4746,7 @@ CONFIG_LEDS_LP5523=m CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m CONFIG_LEDS_PCA9633=m +# CONFIG_LEDS_DAC124S085 is not set CONFIG_LEDS_BD2802=m CONFIG_LEDS_INTEL_SS4200=m CONFIG_LEDS_LT3593=m @@ -4759,6 +4838,15 @@ CONFIG_RTC_DRV_RV3029C2=m # # SPI RTC drivers # +# CONFIG_RTC_DRV_M41T93 is not set +# CONFIG_RTC_DRV_M41T94 is not set +# CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1390 is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_DS3234 is not set +# CONFIG_RTC_DRV_PCF2123 is not set # # Platform RTC drivers @@ -5639,7 +5727,7 @@ CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" -CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" +CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd" CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 # CONFIG_SECURITY_YAMA is not set diff --git a/libre/linux-libre/drm-fix-track-free-areas-3.7.patch b/libre/linux-libre/drm-fix-track-free-areas-3.7.patch deleted file mode 100644 index 6d00c6d3e..000000000 --- a/libre/linux-libre/drm-fix-track-free-areas-3.7.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 9ff0ab9881bd47f7d8a95c07a2fa61f594a91d0a Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Sun, 16 Dec 2012 16:15:00 +0000 -Subject: [PATCH] drm: Only evict the blocks required to create the requested - hole - -Avoid clobbering adjacent blocks if they happen to expire earlier and -amalgamate together to form the requested hole. - -In passing this fixes a regression from -commit ea7b1dd44867e9cd6bac67e7c9fc3f128b5b255c -Author: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Fri Feb 18 17:59:12 2011 +0100 - - drm: mm: track free areas implicitly - -which swaps the end address for size (with a potential overflow) and -effectively causes the eviction code to clobber almost all earlier -buffers above the evictee. - -v2: Check the original hole not the adjusted as the coloring may confuse -us when later searching for the overlapping nodes. Also make sure that -we do apply the range restriction and color adjustment in the same -order for both scanning, searching and insertion. - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> -Cc: Daniel Vetter <daniel.vetter@ffwll.ch> ---- - drivers/gpu/drm/drm_mm.c | 45 +++++++++++++++++---------------------------- - include/drm/drm_mm.h | 2 +- - 2 files changed, 18 insertions(+), 29 deletions(-) - -diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c -index 0761a03..665553c 100644 ---- a/drivers/gpu/drm/drm_mm.c -+++ b/drivers/gpu/drm/drm_mm.c -@@ -213,11 +213,13 @@ static void drm_mm_insert_helper_range(struct drm_mm_node *hole_node, - - BUG_ON(!hole_node->hole_follows || node->allocated); - -- if (mm->color_adjust) -- mm->color_adjust(hole_node, color, &adj_start, &adj_end); -- - if (adj_start < start) - adj_start = start; -+ if (adj_end > end) -+ adj_end = end; -+ -+ if (mm->color_adjust) -+ mm->color_adjust(hole_node, color, &adj_start, &adj_end); - - if (alignment) { - unsigned tmp = adj_start % alignment; -@@ -489,7 +491,7 @@ void drm_mm_init_scan(struct drm_mm *mm, - mm->scan_size = size; - mm->scanned_blocks = 0; - mm->scan_hit_start = 0; -- mm->scan_hit_size = 0; -+ mm->scan_hit_end = 0; - mm->scan_check_range = 0; - mm->prev_scanned_node = NULL; - } -@@ -516,7 +518,7 @@ void drm_mm_init_scan_with_range(struct drm_mm *mm, - mm->scan_size = size; - mm->scanned_blocks = 0; - mm->scan_hit_start = 0; -- mm->scan_hit_size = 0; -+ mm->scan_hit_end = 0; - mm->scan_start = start; - mm->scan_end = end; - mm->scan_check_range = 1; -@@ -535,8 +537,7 @@ int drm_mm_scan_add_block(struct drm_mm_node *node) - struct drm_mm *mm = node->mm; - struct drm_mm_node *prev_node; - unsigned long hole_start, hole_end; -- unsigned long adj_start; -- unsigned long adj_end; -+ unsigned long adj_start, adj_end; - - mm->scanned_blocks++; - -@@ -553,14 +554,8 @@ int drm_mm_scan_add_block(struct drm_mm_node *node) - node->node_list.next = &mm->prev_scanned_node->node_list; - mm->prev_scanned_node = node; - -- hole_start = drm_mm_hole_node_start(prev_node); -- hole_end = drm_mm_hole_node_end(prev_node); -- -- adj_start = hole_start; -- adj_end = hole_end; -- -- if (mm->color_adjust) -- mm->color_adjust(prev_node, mm->scan_color, &adj_start, &adj_end); -+ adj_start = hole_start = drm_mm_hole_node_start(prev_node); -+ adj_end = hole_end = drm_mm_hole_node_end(prev_node); - - if (mm->scan_check_range) { - if (adj_start < mm->scan_start) -@@ -569,11 +564,14 @@ int drm_mm_scan_add_block(struct drm_mm_node *node) - adj_end = mm->scan_end; - } - -+ if (mm->color_adjust) -+ mm->color_adjust(prev_node, mm->scan_color, -+ &adj_start, &adj_end); -+ - if (check_free_hole(adj_start, adj_end, - mm->scan_size, mm->scan_alignment)) { - mm->scan_hit_start = hole_start; -- mm->scan_hit_size = hole_end; -- -+ mm->scan_hit_end = hole_end; - return 1; - } - -@@ -609,19 +607,10 @@ int drm_mm_scan_remove_block(struct drm_mm_node *node) - node_list); - - prev_node->hole_follows = node->scanned_preceeds_hole; -- INIT_LIST_HEAD(&node->node_list); - list_add(&node->node_list, &prev_node->node_list); - -- /* Only need to check for containement because start&size for the -- * complete resulting free block (not just the desired part) is -- * stored. */ -- if (node->start >= mm->scan_hit_start && -- node->start + node->size -- <= mm->scan_hit_start + mm->scan_hit_size) { -- return 1; -- } -- -- return 0; -+ return (drm_mm_hole_node_end(node) > mm->scan_hit_start && -+ node->start < mm->scan_hit_end); - } - EXPORT_SYMBOL(drm_mm_scan_remove_block); - -diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h -index 06d7f79..a1b66b7 100644 ---- a/include/drm/drm_mm.h -+++ b/include/drm/drm_mm.h -@@ -70,7 +70,7 @@ struct drm_mm { - unsigned long scan_color; - unsigned long scan_size; - unsigned long scan_hit_start; -- unsigned scan_hit_size; -+ unsigned long scan_hit_end; - unsigned scanned_blocks; - unsigned long scan_start; - unsigned long scan_end; --- -1.7.10.4 - diff --git a/libre/linux-libre/fat-3.6.x.patch b/libre/linux-libre/fat-3.6.x.patch deleted file mode 100644 index d8deeb788..000000000 --- a/libre/linux-libre/fat-3.6.x.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Dave Reisner <dreisner@archlinux.org> -Date: Thu, 29 Nov 2012 03:18:52 +0000 (+1100) -Subject: fs/fat: strip "cp" prefix from codepage in display -X-Git-Tag: next-20121130~1^2~97 -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnext%2Flinux-next.git;a=commitdiff_plain;h=f15914873184cc3f2a8d590fa4f7e32ab0a8a405 - -fs/fat: strip "cp" prefix from codepage in display - -Option parsing code expects an unsigned integer for the codepage option, -but prefixes and stores this option with "cp" before passing to -load_nls(). This makes the displayed option in /proc an invalid one. -Strip the prefix when printing so that the displayed option is valid for -reuse. - -Signed-off-by: Dave Reisner <dreisner@archlinux.org> -Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> ---- - -diff --git a/fs/fat/inode.c b/fs/fat/inode.c -index 3b733a7..3580681 100644 ---- a/fs/fat/inode.c -+++ b/fs/fat/inode.c -@@ -726,7 +726,8 @@ static int fat_show_options(struct seq_file *m, struct dentry *root) - if (opts->allow_utime) - seq_printf(m, ",allow_utime=%04o", opts->allow_utime); - if (sbi->nls_disk) -- seq_printf(m, ",codepage=%s", sbi->nls_disk->charset); -+ /* strip "cp" prefix from displayed option */ -+ seq_printf(m, ",codepage=%s", &sbi->nls_disk->charset[2]); - if (isvfat) { - if (sbi->nls_io) - seq_printf(m, ",iocharset=%s", sbi->nls_io->charset); diff --git a/libre/linux-libre/fix-watchdog-3.7.patch b/libre/linux-libre/fix-watchdog-3.7.patch deleted file mode 100644 index fe4431604..000000000 --- a/libre/linux-libre/fix-watchdog-3.7.patch +++ /dev/null @@ -1,38 +0,0 @@ -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=blobdiff_plain;f=kernel%2Fwatchdog.c;h=75a2ab3d0b0208dfa51e40339ffd00206622732e;hp=997c6a16ec2278969a10f251f63f237e7559d42e;hb=3935e89505a1c3ab3f3b0c7ef0eae54124f48905;hpb=74779e22261172ea728b989310f6ecc991b57d62 - -diff --git a/kernel/watchdog.c b/kernel/watchdog.c -index 997c6a1..75a2ab3 100644 ---- a/kernel/watchdog.c -+++ b/kernel/watchdog.c -@@ -344,6 +344,10 @@ static void watchdog_enable(unsigned int cpu) - { - struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer); - -+ /* kick off the timer for the hardlockup detector */ -+ hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); -+ hrtimer->function = watchdog_timer_fn; -+ - if (!watchdog_enabled) { - kthread_park(current); - return; -@@ -352,10 +356,6 @@ static void watchdog_enable(unsigned int cpu) - /* Enable the perf event */ - watchdog_nmi_enable(cpu); - -- /* kick off the timer for the hardlockup detector */ -- hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); -- hrtimer->function = watchdog_timer_fn; -- - /* done here because hrtimer_start can only pin to smp_processor_id() */ - hrtimer_start(hrtimer, ns_to_ktime(sample_period), - HRTIMER_MODE_REL_PINNED); -@@ -369,9 +369,6 @@ static void watchdog_disable(unsigned int cpu) - { - struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer); - -- if (!watchdog_enabled) -- return; -- - watchdog_set_prio(SCHED_NORMAL, 0); - hrtimer_cancel(hrtimer); - /* disable the perf event */ diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index c94a54bcc..e734fb2aa 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.8.0-1-LIBRE +KERNEL_VERSION=3.8.1-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/luxblend25/PKGBUILD b/libre/luxblend25/PKGBUILD index 6d249b329..82dd36a40 100644 --- a/libre/luxblend25/PKGBUILD +++ b/libre/luxblend25/PKGBUILD @@ -3,8 +3,8 @@ pkgbase=luxrender pkgname=luxblend25 -srcver=3a928b723b29 -pkgver=1.1.v2.66 +srcver=3b84c4d3f009 +pkgver=1.2.v2.66 _pkgver=${pkgver::3} reqname=blender reqver=${pkgver:5} @@ -32,10 +32,10 @@ replaces=( $pkgname ) source=( - "https://src.$pkgbase.net/$pkgname/archive/$srcver.tar.bz2" + "http://src.$pkgbase.net/$pkgname/archive/$srcver.tar.bz2" ) sha512sums=( - f5aadc77e699f6b7259ece271b0c50ca7be5858bb628b99aedbb23b64e5587ac59cc3d1c52e063ba89c9d340f915727046e4d3017b26238425d43d3bba14f017 + 15025d192088266d781a6e80ecb4982b188d73bb7c6b12c93689a4265e967f92bcf93fc724939447c5ee7ea3f63ce52ad6bf3d20a795dcebf86e6940a3aa33b3 ) package() { diff --git a/libre/mesa-demos-libre/PKGBUILD b/libre/mesa-demos-libre/PKGBUILD index 72b06da5b..38949606d 100644 --- a/libre/mesa-demos-libre/PKGBUILD +++ b/libre/mesa-demos-libre/PKGBUILD @@ -1,29 +1,33 @@ -# $Id: PKGBUILD 151279 2012-02-25 12:34:03Z pierre $ +# $Id: PKGBUILD 178740 2013-02-26 16:15:13Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor (Parabola): <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): <emulatorman@lavabit.com> pkgname='mesa-demos-libre' -pkgver=8.0.1 -pkgrel=2 +pkgver=8.1.0 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') -pkgdesc="Mesa demos and tools, libre" +pkgdesc="Mesa demos and tools, without nonfree demos" url="http://mesa3d.sourceforge.net" license=('custom') -depends=('glew') +depends=('libgl' 'glew') provides=("mesa-demos=$pkgver") replaces=('mesa-demos') conflicts=('mesa-demos') source=("ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2" - mesa-demos-libre.patch - LICENSE) -md5sums=('320c2a4b6edc6faba35d9cb1e2a30bf4' - '1858e95d40ac9e5e0b59753ce9e673e3' - '5c65a0fe315dd347e09b1f2826a1df5a') + 'LICENSE' + 'mesa-demos-libre.patch') +sha256sums=('9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a87a828' + '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2' + '476f58fc62e9074936643b0d61165c5160a6d5aed082e60c10b39d219f56913f') build() { cd "${srcdir}/mesa-demos-${pkgver}" + + # Remove nonfree demos (pointblast and spriteblast) + rm -v src/demos/{pointblast,spriteblast}.c patch -Np1 -i "${srcdir}/mesa-demos-libre.patch" + ./configure --prefix=/usr make } diff --git a/libre/mesa-demos-libre/mesa-demos-libre.patch b/libre/mesa-demos-libre/mesa-demos-libre.patch index c5261f8e9..d630f373c 100755 --- a/libre/mesa-demos-libre/mesa-demos-libre.patch +++ b/libre/mesa-demos-libre/mesa-demos-libre.patch @@ -1,15 +1,15 @@ -diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.am mesa-demos-8.0.1//src/demos/Makefile.am ---- Desktop/mesa-demos-8.0.1//src/demos/Makefile.am 2010-07-13 14:46:40.000000000 -0400 -+++ mesa-demos-8.0.1/src/demos/Makefile.am 2011-06-04 15:34:18.000000000 -0400 -@@ -62,7 +62,6 @@ bin_PROGRAMS = \ - morph3d \ +diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.am mesa-demos-8.1.0/src/demos/Makefile.am +--- mesa-demos-8.1.0.orig/src/demos/Makefile.am 2012-12-15 05:17:06.000000000 -0200 ++++ mesa-demos-8.1.0/src/demos/Makefile.am 2013-02-26 17:22:04.845832793 -0200 +@@ -65,7 +65,6 @@ multiarb \ paltex \ + pixeltest \ - pointblast \ projtex \ ray \ readpix \ -@@ -71,7 +70,6 @@ bin_PROGRAMS = \ +@@ -74,7 +73,6 @@ shadowtex \ singlebuffer \ spectex \ @@ -17,36 +17,34 @@ diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.am mesa-demos-8.0.1//sr stex3d \ teapot \ terrain \ -diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.in mesa-demos-8.0.1//src/demos/Makefile.in ---- Desktop/mesa-demos-8.0.1//src/demos/Makefile.in 2010-07-13 14:53:23.000000000 -0400 -+++ mesa-demos-8.0.1/src/demos/Makefile.in 2011-06-04 15:35:32.000000000 -0400 -@@ -73,11 +73,10 @@ host_triplet = @host@ +diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos/Makefile.in +--- mesa-demos-8.1.0.orig/src/demos/Makefile.in 2013-02-24 09:12:04.000000000 -0200 ++++ mesa-demos-8.1.0/src/demos/Makefile.in 2013-02-26 17:48:36.711995049 -0200 +@@ -90,11 +90,11 @@ @HAVE_GLUT_TRUE@ ipers$(EXEEXT) isosurf$(EXEEXT) \ @HAVE_GLUT_TRUE@ lodbias$(EXEEXT) morph3d$(EXEEXT) \ @HAVE_GLUT_TRUE@ multiarb$(EXEEXT) paltex$(EXEEXT) \ --@HAVE_GLUT_TRUE@ pointblast$(EXEEXT) projtex$(EXEEXT) \ --@HAVE_GLUT_TRUE@ ray$(EXEEXT) readpix$(EXEEXT) reflect$(EXEEXT) \ --@HAVE_GLUT_TRUE@ renormal$(EXEEXT) shadowtex$(EXEEXT) \ --@HAVE_GLUT_TRUE@ singlebuffer$(EXEEXT) spectex$(EXEEXT) \ --@HAVE_GLUT_TRUE@ spriteblast$(EXEEXT) stex3d$(EXEEXT) \ -+@HAVE_GLUT_TRUE@ projtex$(EXEEXT) ray$(EXEEXT) readpix$(EXEEXT) \ -+@HAVE_GLUT_TRUE@ reflect$(EXEEXT) renormal$(EXEEXT) \ -+@HAVE_GLUT_TRUE@ shadowtex$(EXEEXT) singlebuffer$(EXEEXT) \ -+@HAVE_GLUT_TRUE@ spectex$(EXEEXT) stex3d$(EXEEXT) \ - @HAVE_GLUT_TRUE@ teapot$(EXEEXT) terrain$(EXEEXT) \ - @HAVE_GLUT_TRUE@ tessdemo$(EXEEXT) texcyl$(EXEEXT) \ - @HAVE_GLUT_TRUE@ texenv$(EXEEXT) textures$(EXEEXT) \ -@@ -188,9 +187,6 @@ multiarb_DEPENDENCIES = ../util/libutil. - paltex_SOURCES = paltex.c - paltex_OBJECTS = paltex.$(OBJEXT) - paltex_LDADD = $(LDADD) +-@HAVE_GLUT_TRUE@ pixeltest$(EXEEXT) pointblast$(EXEEXT) \ ++@HAVE_GLUT_TRUE@ pixeltest$(EXEEXT) \ + @HAVE_GLUT_TRUE@ projtex$(EXEEXT) ray$(EXEEXT) readpix$(EXEEXT) \ + @HAVE_GLUT_TRUE@ reflect$(EXEEXT) renormal$(EXEEXT) \ + @HAVE_GLUT_TRUE@ shadowtex$(EXEEXT) singlebuffer$(EXEEXT) \ +-@HAVE_GLUT_TRUE@ spectex$(EXEEXT) spriteblast$(EXEEXT) \ ++@HAVE_GLUT_TRUE@ spectex$(EXEEXT) \ + @HAVE_GLUT_TRUE@ stex3d$(EXEEXT) teapot$(EXEEXT) \ + @HAVE_GLUT_TRUE@ terrain$(EXEEXT) tessdemo$(EXEEXT) \ + @HAVE_GLUT_TRUE@ texcyl$(EXEEXT) texenv$(EXEEXT) \ +@@ -219,9 +219,6 @@ + pixeltest_SOURCES = pixeltest.c + pixeltest_OBJECTS = pixeltest.$(OBJEXT) + pixeltest_LDADD = $(LDADD) -pointblast_SOURCES = pointblast.c -pointblast_OBJECTS = pointblast.$(OBJEXT) -pointblast_LDADD = $(LDADD) projtex_SOURCES = projtex.c projtex_OBJECTS = projtex.$(OBJEXT) projtex_DEPENDENCIES = ../util/libutil.la -@@ -215,9 +211,6 @@ singlebuffer_LDADD = $(LDADD) +@@ -246,9 +243,6 @@ spectex_SOURCES = spectex.c spectex_OBJECTS = spectex.$(OBJEXT) spectex_LDADD = $(LDADD) @@ -56,66 +54,57 @@ diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.in mesa-demos-8.0.1//sr stex3d_SOURCES = stex3d.c stex3d_OBJECTS = stex3d.$(OBJEXT) stex3d_LDADD = $(LDADD) -@@ -285,21 +278,20 @@ SOURCES = arbfplight.c arbfslight.c arbo - fbo_firecube.c fbotexture.c fire.c fogcoord.c fplight.c \ - fslight.c gamma.c gearbox.c gears.c geartrain.c glinfo.c \ - gloss.c gltestperf.c ipers.c isosurf.c lodbias.c morph3d.c \ -- multiarb.c paltex.c pointblast.c projtex.c ray.c readpix.c \ -- reflect.c renormal.c shadowtex.c singlebuffer.c spectex.c \ -- spriteblast.c stex3d.c teapot.c terrain.c tessdemo.c texcyl.c \ -- texenv.c textures.c trispd.c $(tunnel_SOURCES) tunnel2.c \ -- vao_demo.c winpos.c -+ multiarb.c paltex.c projtex.c ray.c readpix.c reflect.c \ -+ renormal.c shadowtex.c singlebuffer.c spectex.c stex3d.c \ -+ teapot.c terrain.c tessdemo.c texcyl.c texenv.c textures.c \ -+ trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c winpos.c - DIST_SOURCES = arbfplight.c arbfslight.c arbocclude.c bounce.c \ - clearspd.c copypix.c cubemap.c dinoshade.c dissolve.c \ - drawpix.c engine.c fbo_firecube.c fbotexture.c fire.c \ - fogcoord.c fplight.c fslight.c gamma.c gearbox.c gears.c \ - geartrain.c glinfo.c gloss.c gltestperf.c ipers.c isosurf.c \ -- lodbias.c morph3d.c multiarb.c paltex.c pointblast.c projtex.c \ -- ray.c readpix.c reflect.c renormal.c shadowtex.c \ -- singlebuffer.c spectex.c spriteblast.c stex3d.c teapot.c \ -- terrain.c tessdemo.c texcyl.c texenv.c textures.c trispd.c \ -- $(tunnel_SOURCES) tunnel2.c vao_demo.c winpos.c -+ lodbias.c morph3d.c multiarb.c paltex.c projtex.c ray.c \ -+ readpix.c reflect.c renormal.c shadowtex.c singlebuffer.c \ -+ spectex.c stex3d.c teapot.c terrain.c tessdemo.c texcyl.c \ -+ texenv.c textures.c trispd.c $(tunnel_SOURCES) tunnel2.c \ -+ vao_demo.c winpos.c - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -@@ -653,9 +645,6 @@ multiarb$(EXEEXT): $(multiarb_OBJECTS) $ - paltex$(EXEEXT): $(paltex_OBJECTS) $(paltex_DEPENDENCIES) - @rm -f paltex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(paltex_OBJECTS) $(paltex_LDADD) $(LIBS) --pointblast$(EXEEXT): $(pointblast_OBJECTS) $(pointblast_DEPENDENCIES) +@@ -325,8 +319,8 @@ + fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \ + gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \ + ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \ +- pixeltest.c pointblast.c projtex.c ray.c readpix.c reflect.c \ +- renormal.c shadowtex.c singlebuffer.c spectex.c spriteblast.c \ ++ pixeltest.c projtex.c ray.c readpix.c reflect.c \ ++ renormal.c shadowtex.c singlebuffer.c spectex.c \ + stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \ + textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \ + winpos.c +@@ -336,8 +330,8 @@ + fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \ + gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \ + ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \ +- pixeltest.c pointblast.c projtex.c ray.c readpix.c reflect.c \ +- renormal.c shadowtex.c singlebuffer.c spectex.c spriteblast.c \ ++ pixeltest.c projtex.c ray.c readpix.c reflect.c \ ++ renormal.c shadowtex.c singlebuffer.c spectex.c \ + stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \ + textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \ + winpos.c +@@ -722,9 +716,6 @@ + pixeltest$(EXEEXT): $(pixeltest_OBJECTS) $(pixeltest_DEPENDENCIES) $(EXTRA_pixeltest_DEPENDENCIES) + @rm -f pixeltest$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pixeltest_OBJECTS) $(pixeltest_LDADD) $(LIBS) +-pointblast$(EXEEXT): $(pointblast_OBJECTS) $(pointblast_DEPENDENCIES) $(EXTRA_pointblast_DEPENDENCIES) - @rm -f pointblast$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pointblast_OBJECTS) $(pointblast_LDADD) $(LIBS) - projtex$(EXEEXT): $(projtex_OBJECTS) $(projtex_DEPENDENCIES) + projtex$(EXEEXT): $(projtex_OBJECTS) $(projtex_DEPENDENCIES) $(EXTRA_projtex_DEPENDENCIES) @rm -f projtex$(EXEEXT) $(AM_V_CCLD)$(LINK) $(projtex_OBJECTS) $(projtex_LDADD) $(LIBS) -@@ -680,9 +669,6 @@ singlebuffer$(EXEEXT): $(singlebuffer_OB - spectex$(EXEEXT): $(spectex_OBJECTS) $(spectex_DEPENDENCIES) +@@ -749,9 +740,6 @@ + spectex$(EXEEXT): $(spectex_OBJECTS) $(spectex_DEPENDENCIES) $(EXTRA_spectex_DEPENDENCIES) @rm -f spectex$(EXEEXT) $(AM_V_CCLD)$(LINK) $(spectex_OBJECTS) $(spectex_LDADD) $(LIBS) --spriteblast$(EXEEXT): $(spriteblast_OBJECTS) $(spriteblast_DEPENDENCIES) +-spriteblast$(EXEEXT): $(spriteblast_OBJECTS) $(spriteblast_DEPENDENCIES) $(EXTRA_spriteblast_DEPENDENCIES) - @rm -f spriteblast$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(spriteblast_OBJECTS) $(spriteblast_LDADD) $(LIBS) - stex3d$(EXEEXT): $(stex3d_OBJECTS) $(stex3d_DEPENDENCIES) + stex3d$(EXEEXT): $(stex3d_OBJECTS) $(stex3d_DEPENDENCIES) $(EXTRA_stex3d_DEPENDENCIES) @rm -f stex3d$(EXEEXT) $(AM_V_CCLD)$(LINK) $(stex3d_OBJECTS) $(stex3d_LDADD) $(LIBS) -@@ -756,7 +742,6 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/morph3d.Po@am__quote@ +@@ -828,7 +816,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiarb.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paltex.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixeltest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointblast.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projtex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ray.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readpix.Po@am__quote@ -@@ -765,7 +750,6 @@ distclean-compile: +@@ -837,7 +824,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shadowtex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/singlebuffer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spectex.Po@am__quote@ @@ -123,1070 +112,3 @@ diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.in mesa-demos-8.0.1//sr @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stex3d.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teapot.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terrain.Po@am__quote@ -diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/pointblast.c mesa-demos-8.0.1//src/demos/pointblast.c ---- Desktop/mesa-demos-8.0.1//src/demos/pointblast.c 2010-07-07 13:57:15.000000000 -0400 -+++ mesa-demos-8.0.1/src/demos/pointblast.c 1969-12-31 19:00:00.000000000 -0500 -@@ -1,504 +0,0 @@ -- --/* Copyright (c) Mark J. Kilgard, 1997. */ -- --/* This program is freely distributable without licensing fees -- and is provided without guarantee or warrantee expressed or -- implied. This program is -not- in the public domain. */ -- --/* This example demonstrates how to render particle effects -- with OpenGL. A cloud of pinkish/orange particles explodes with the -- particles bouncing off the ground. When the EXT_point_parameters -- is present , the particle size is attenuated based on eye distance. */ -- -- --#include <stdio.h> --#include <stdlib.h> --#include <string.h> --#include <math.h> /* for cos(), sin(), and sqrt() */ --#ifdef _WIN32 --#include <windows.h> --#endif --#include <GL/glew.h> --#include <GL/glut.h> -- --/* Some <math.h> files do not define M_PI... */ --#ifndef M_PI --#define M_PI 3.14159265 --#endif -- --#if 0 /* For debugging. */ --#undef GL_EXT_point_parameters --#endif -- --static GLfloat angle = -150; /* in degrees */ --static int spin = 0; --static int moving, begin; --static int newModel = 1; --static float theTime; --static int repeat = 1; --static int blend = 1; --int useMipmaps = 1; --int linearFiltering = 1; -- --static GLfloat constant[3] = { 1/5.0, 0.0, 0.0 }; --static GLfloat linear[3] = { 0.0, 1/5.0, 0.0 }; --static GLfloat theQuad[3] = { 0.25, 0.0, 1/60.0 }; -- --#define MAX_POINTS 2000 -- --static int numPoints = 200; -- --static GLfloat pointList[MAX_POINTS][3]; --static GLfloat pointTime[MAX_POINTS]; --static GLfloat pointVelocity[MAX_POINTS][2]; --static GLfloat pointDirection[MAX_POINTS][2]; --static int colorList[MAX_POINTS]; --static int animate = 1, motion = 0; -- --static GLfloat colorSet[][4] = { -- /* Shades of red. */ -- { 0.7, 0.2, 0.4, 0.5 }, -- { 0.8, 0.0, 0.7, 0.5 }, -- { 1.0, 0.0, 0.0, 0.5 }, -- { 0.9, 0.3, 0.6, 0.5 }, -- { 1.0, 0.4, 0.0, 0.5 }, -- { 1.0, 0.0, 0.5, 0.5 }, --}; -- --#define NUM_COLORS (sizeof(colorSet)/sizeof(colorSet[0])) -- --#define DEAD (NUM_COLORS+1) -- -- --#if 0 /* drand48 might be better on Unix machines */ --#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * drand48()) --#else --static float float_rand(void) { return rand() / (float) RAND_MAX; } --#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * float_rand()) --#endif -- --#define MEAN_VELOCITY 3.0 --#define GRAVITY 2.0 -- --/* Modeling units of ground extent in each X and Z direction. */ --#define EDGE 12 -- --static void --makePointList(void) --{ -- float angle, velocity, direction; -- int i; -- -- motion = 1; -- for (i=0; i<numPoints; i++) { -- pointList[i][0] = 0.0; -- pointList[i][1] = 0.0; -- pointList[i][2] = 0.0; -- pointTime[i] = 0.0; -- angle = (RANDOM_RANGE(60.0, 70.0)) * M_PI/180.0; -- direction = RANDOM_RANGE(0.0, 360.0) * M_PI/180.0; -- pointDirection[i][0] = cos(direction); -- pointDirection[i][1] = sin(direction); -- velocity = MEAN_VELOCITY + RANDOM_RANGE(-0.8, 1.0); -- pointVelocity[i][0] = velocity * cos(angle); -- pointVelocity[i][1] = velocity * sin(angle); -- colorList[i] = rand() % NUM_COLORS; -- } -- theTime = 0.0; --} -- --static void --updatePointList(void) --{ -- float distance; -- int i; -- -- static double t0 = -1.; -- double dt, t = glutGet(GLUT_ELAPSED_TIME) / 1000.0; -- if (t0 < 0.0) -- t0 = t; -- dt = t - t0; -- t0 = t; -- -- motion = 0; -- for (i=0; i<numPoints; i++) { -- distance = pointVelocity[i][0] * theTime; -- -- /* X and Z */ -- pointList[i][0] = pointDirection[i][0] * distance; -- pointList[i][2] = pointDirection[i][1] * distance; -- -- /* Z */ -- pointList[i][1] = -- (pointVelocity[i][1] - 0.5 * GRAVITY * pointTime[i])*pointTime[i]; -- -- /* If we hit the ground, bounce the point upward again. */ -- if (pointList[i][1] <= 0.0) { -- if (distance > EDGE) { -- /* Particle has hit ground past the distance duration of -- the particles. Mark particle as dead. */ -- colorList[i] = NUM_COLORS; /* Not moving. */ -- continue; -- } -- -- pointVelocity[i][1] *= 0.8; /* 80% of previous up velocity. */ -- pointTime[i] = 0.0; /* Reset the particles sense of up time. */ -- } -- motion = 1; -- pointTime[i] += dt; -- } -- theTime += dt; -- if (!motion && !spin) { -- if (repeat) { -- makePointList(); -- } else { -- glutIdleFunc(NULL); -- } -- } --} -- --static void --idle(void) --{ -- updatePointList(); -- if (spin) { -- angle += 0.3; -- newModel = 1; -- } -- glutPostRedisplay(); --} -- --static void --visible(int vis) --{ -- if (vis == GLUT_VISIBLE) { -- if (animate && (motion || spin)) { -- glutIdleFunc(idle); -- } -- } else { -- glutIdleFunc(NULL); -- } --} -- --static void --recalcModelView(void) --{ -- glPopMatrix(); -- glPushMatrix(); -- glRotatef(angle, 0.0, 1.0, 0.0); -- newModel = 0; --} -- --static void --redraw(void) --{ -- int i; -- -- glDepthMask(GL_TRUE); -- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); -- if (newModel) -- recalcModelView(); -- -- -- /* Draw the floor. */ --/* glEnable(GL_TEXTURE_2D);*/ -- glColor3f(0.5, 1.0, 0.5); -- glBegin(GL_QUADS); -- glTexCoord2f(0.0, 0.0); -- glVertex3f(-EDGE, -0.05, -EDGE); -- glTexCoord2f(20.0, 0.0); -- glVertex3f(EDGE, -0.05, -EDGE); -- glTexCoord2f(20.0, 20.0); -- glVertex3f(EDGE, -0.05, EDGE); -- glTexCoord2f(0.0, 20.0); -- glVertex3f(-EDGE, -0.05, EDGE); -- glEnd(); -- -- /* Allow particles to blend with each other. */ -- glDepthMask(GL_FALSE); -- -- if (blend) -- glEnable(GL_BLEND); -- -- glDisable(GL_TEXTURE_2D); -- glBegin(GL_POINTS); -- for (i=0; i<numPoints; i++) { -- /* Draw alive particles. */ -- if (colorList[i] != DEAD) { -- glColor4fv(colorSet[colorList[i]]); -- glVertex3fv(pointList[i]); -- } -- } -- glEnd(); -- -- glDisable(GL_BLEND); -- -- glutSwapBuffers(); --} -- --/* ARGSUSED2 */ --static void --mouse(int button, int state, int x, int y) --{ -- /* Scene can be spun around Y axis using left -- mouse button movement. */ -- if (button == GLUT_LEFT_BUTTON && state == GLUT_DOWN) { -- moving = 1; -- begin = x; -- } -- if (button == GLUT_LEFT_BUTTON && state == GLUT_UP) { -- moving = 0; -- } --} -- --/* ARGSUSED1 */ --static void --mouseMotion(int x, int y) --{ -- if (moving) { -- angle = angle + (x - begin); -- begin = x; -- newModel = 1; -- glutPostRedisplay(); -- } --} -- --static void --menu(int option) --{ -- switch (option) { -- case 0: -- makePointList(); -- break; --#ifdef GL_ARB_point_parameters -- case 1: -- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, constant); -- break; -- case 2: -- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, linear); -- break; -- case 3: -- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad); -- break; --#endif -- case 4: -- blend = 1; -- break; -- case 5: -- blend = 0; -- break; --#ifdef GL_ARB_point_parameters -- case 6: -- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 1.0); -- break; -- case 7: -- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 10.0); -- break; --#endif -- case 8: -- glEnable(GL_POINT_SMOOTH); -- break; -- case 9: -- glDisable(GL_POINT_SMOOTH); -- break; -- case 10: -- glPointSize(2.0); -- break; -- case 11: -- glPointSize(4.0); -- break; -- case 12: -- glPointSize(8.0); -- break; -- case 13: -- spin = 1 - spin; -- if (animate && (spin || motion)) { -- glutIdleFunc(idle); -- } else { -- glutIdleFunc(NULL); -- } -- break; -- case 14: -- numPoints = 200; -- break; -- case 15: -- numPoints = 500; -- break; -- case 16: -- numPoints = 1000; -- break; -- case 17: -- numPoints = 2000; -- break; -- case 666: -- exit(0); -- } -- glutPostRedisplay(); --} -- --/* ARGSUSED1 */ --static void --key(unsigned char c, int x, int y) --{ -- switch (c) { -- case 13: -- animate = 1 - animate; /* toggle. */ -- if (animate && (motion || spin)) { -- glutIdleFunc(idle); -- } else { -- glutIdleFunc(NULL); -- } -- break; -- case ' ': -- animate = 1; -- makePointList(); -- glutIdleFunc(idle); -- break; -- case 27: -- exit(0); -- } --} -- --/* Nice floor texture tiling pattern. */ --static char *circles[] = { -- "....xxxx........", -- "..xxxxxxxx......", -- ".xxxxxxxxxx.....", -- ".xxx....xxx.....", -- "xxx......xxx....", -- "xxx......xxx....", -- "xxx......xxx....", -- "xxx......xxx....", -- ".xxx....xxx.....", -- ".xxxxxxxxxx.....", -- "..xxxxxxxx......", -- "....xxxx........", -- "................", -- "................", -- "................", -- "................", --}; -- --static void --makeFloorTexture(void) --{ -- GLubyte floorTexture[16][16][3]; -- GLubyte *loc; -- int s, t; -- -- /* Setup RGB image for the texture. */ -- loc = (GLubyte*) floorTexture; -- for (t = 0; t < 16; t++) { -- for (s = 0; s < 16; s++) { -- if (circles[t][s] == 'x') { -- /* Nice blue. */ -- loc[0] = 0x1f; -- loc[1] = 0x1f; -- loc[2] = 0x8f; -- } else { -- /* Light gray. */ -- loc[0] = 0xca; -- loc[1] = 0xca; -- loc[2] = 0xca; -- } -- loc += 3; -- } -- } -- -- glPixelStorei(GL_UNPACK_ALIGNMENT, 1); -- -- if (useMipmaps) { -- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, -- GL_LINEAR_MIPMAP_LINEAR); -- gluBuild2DMipmaps(GL_TEXTURE_2D, 3, 16, 16, -- GL_RGB, GL_UNSIGNED_BYTE, floorTexture); -- } else { -- if (linearFiltering) { -- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); -- } else { -- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); -- } -- glTexImage2D(GL_TEXTURE_2D, 0, 3, 16, 16, 0, -- GL_RGB, GL_UNSIGNED_BYTE, floorTexture); -- } --} -- --int --main(int argc, char **argv) --{ -- int i; -- -- glutInitWindowSize(300, 300); -- glutInit(&argc, argv); -- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_MULTISAMPLE); -- -- for (i=1; i<argc; i++) { -- if(!strcmp("-noms", argv[i])) { -- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH); -- printf("forcing no multisampling\n"); -- } else if(!strcmp("-nomipmaps", argv[i])) { -- useMipmaps = 0; -- } else if(!strcmp("-nearest", argv[i])) { -- linearFiltering = 0; -- } -- } -- -- glutCreateWindow("point burst"); -- glewInit(); -- glutDisplayFunc(redraw); -- glutMouseFunc(mouse); -- glutMotionFunc(mouseMotion); -- glutVisibilityFunc(visible); -- glutKeyboardFunc(key); -- glutCreateMenu(menu); -- glutAddMenuEntry("Reset time", 0); -- glutAddMenuEntry("Constant", 1); -- glutAddMenuEntry("Linear", 2); -- glutAddMenuEntry("Quadratic", 3); -- glutAddMenuEntry("Blend on", 4); -- glutAddMenuEntry("Blend off", 5); -- glutAddMenuEntry("Threshold 1", 6); -- glutAddMenuEntry("Threshold 10", 7); -- glutAddMenuEntry("Point smooth on", 8); -- glutAddMenuEntry("Point smooth off", 9); -- glutAddMenuEntry("Point size 2", 10); -- glutAddMenuEntry("Point size 4", 11); -- glutAddMenuEntry("Point size 8", 12); -- glutAddMenuEntry("Toggle spin", 13); -- glutAddMenuEntry("200 points ", 14); -- glutAddMenuEntry("500 points ", 15); -- glutAddMenuEntry("1000 points ", 16); -- glutAddMenuEntry("2000 points ", 17); -- glutAddMenuEntry("Quit", 666); -- glutAttachMenu(GLUT_RIGHT_BUTTON); -- -- if (!glutExtensionSupported("GL_ARB_point_parameters")) { -- fprintf(stderr, "Sorry, GL_ARB_point_parameters is not supported.\n"); -- return -1; -- } -- -- glShadeModel(GL_FLAT); -- glEnable(GL_DEPTH_TEST); -- glEnable(GL_POINT_SMOOTH); -- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); -- glPointSize(8.0); --#if GL_ARB_point_parameters -- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad); --#endif -- glMatrixMode(GL_PROJECTION); -- gluPerspective( /* field of view in degree */ 40.0, -- /* aspect ratio */ 1.0, -- /* Z near */ 0.5, /* Z far */ 40.0); -- glMatrixMode(GL_MODELVIEW); -- gluLookAt(0.0, 1.0, 8.0, /* eye location */ -- 0.0, 1.0, 0.0, /* center is at (0,0,0) */ -- 0.0, 1.0, 0.); /* up is in postivie Y direction */ -- glPushMatrix(); /* dummy push so we can pop on model -- recalc */ -- -- makePointList(); -- makeFloorTexture(); -- -- glutMainLoop(); -- return 0; /* ANSI C requires main to return int. */ --} -diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/spriteblast.c mesa-demos-8.0.1//src/demos/spriteblast.c ---- Desktop/mesa-demos-8.0.1//src/demos/spriteblast.c 2010-07-07 13:57:15.000000000 -0400 -+++ mesa-demos-8.0.1/src/demos/spriteblast.c 1969-12-31 19:00:00.000000000 -0500 -@@ -1,555 +0,0 @@ -- --/* Copyright (c) Mark J. Kilgard, 1997. */ -- --/* This program is freely distributable without licensing fees -- and is provided without guarantee or warrantee expressed or -- implied. This program is -not- in the public domain. */ -- --/* This example demonstrates how to render particle effects -- with OpenGL. A cloud of pinkish/orange particles explodes with the -- particles bouncing off the ground. When the EXT_point_parameters -- is present , the particle size is attenuated based on eye distance. */ -- -- --/* Modified by Brian Paul to test GL_ARB_point_sprite */ -- -- --#include <stdio.h> --#include <stdlib.h> --#include <string.h> --#include <math.h> /* for cos(), sin(), and sqrt() */ --#ifdef _WIN32 --#include <windows.h> --#endif --#include <GL/glew.h> --#include <GL/glut.h> -- --/* Some <math.h> files do not define M_PI... */ --#ifndef M_PI --#define M_PI 3.14159265 --#endif -- --#if 0 /* For debugging. */ --#undef GL_EXT_point_parameters --#endif -- --static GLfloat angle = -150; /* in degrees */ --static int spin = 0; --static int moving, begin; --static float theTime; --static int repeat = 1; --static int blend = 1; --int useMipmaps = 1; --int linearFiltering = 1; -- --static GLfloat constant[3] = { .2, 0.0, 0.0 }; --static GLfloat linear[3] = { .0, .1, 0.0 }; --static GLfloat theQuad[3] = { .005, 0.1, 1/600.0 }; -- --#define MAX_POINTS 2000 -- --static int numPoints = 200; -- --static GLfloat pointList[MAX_POINTS][3]; --static GLfloat pointTime[MAX_POINTS]; --static GLfloat pointVelocity[MAX_POINTS][2]; --static GLfloat pointDirection[MAX_POINTS][2]; --static int colorList[MAX_POINTS]; --static int animate = 1, motion = 0, org = 0, sprite = 1, smooth = 1; -- --static GLfloat colorSet[][4] = { -- /* Shades of red. */ -- { 0.7, 0.2, 0.4, 0.5 }, -- { 0.8, 0.0, 0.7, 0.5 }, -- { 1.0, 0.0, 0.0, 0.5 }, -- { 0.9, 0.3, 0.6, 0.5 }, -- { 1.0, 0.4, 0.0, 0.5 }, -- { 1.0, 0.0, 0.5, 0.5 }, --}; -- --#define NUM_COLORS (sizeof(colorSet)/sizeof(colorSet[0])) -- --#define DEAD (NUM_COLORS+1) -- -- --/* GL */ --static GLint spritePattern[16][16] = { -- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, -- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, -- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, -- { 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0 }, -- { 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0 }, -- { 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0 }, -- { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0 }, -- { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0 }, -- { 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0 }, -- { 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0 }, -- { 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0 }, -- { 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0 }, -- { 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0 }, -- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, -- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, -- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } --}; -- -- -- -- --#if 0 /* drand48 might be better on Unix machines */ --#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * drand48()) --#else --static float float_rand(void) { return rand() / (float) RAND_MAX; } --#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * float_rand()) --#endif -- --#define MEAN_VELOCITY 3.0 --#define GRAVITY 2.0 -- --/* Modeling units of ground extent in each X and Z direction. */ --#define EDGE 12 -- --static void --makePointList(void) --{ -- float angle, velocity, direction; -- int i; -- -- motion = 1; -- for (i=0; i<numPoints; i++) { -- pointList[i][0] = 0.0; -- pointList[i][1] = 0.0; -- pointList[i][2] = 0.0; -- pointTime[i] = 0.0; -- angle = (RANDOM_RANGE(60.0, 70.0)) * M_PI/180.0; -- direction = RANDOM_RANGE(0.0, 360.0) * M_PI/180.0; -- pointDirection[i][0] = cos(direction); -- pointDirection[i][1] = sin(direction); -- velocity = MEAN_VELOCITY + RANDOM_RANGE(-0.8, 1.0); -- pointVelocity[i][0] = velocity * cos(angle); -- pointVelocity[i][1] = velocity * sin(angle); -- colorList[i] = rand() % NUM_COLORS; -- } -- theTime = 0.0; --} -- --static void --updatePointList(void) --{ -- float distance; -- int i; -- -- static double t0 = -1.; -- double dt, t = glutGet(GLUT_ELAPSED_TIME) / 1000.0; -- if (t0 < 0.0) -- t0 = t; -- dt = t - t0; -- t0 = t; -- -- motion = 0; -- for (i=0; i<numPoints; i++) { -- distance = pointVelocity[i][0] * theTime; -- -- /* X and Z */ -- pointList[i][0] = pointDirection[i][0] * distance; -- pointList[i][2] = pointDirection[i][1] * distance; -- -- /* Z */ -- pointList[i][1] = -- (pointVelocity[i][1] - 0.5 * GRAVITY * pointTime[i])*pointTime[i]; -- -- /* If we hit the ground, bounce the point upward again. */ -- if (pointList[i][1] <= 0.0) { -- if (distance > EDGE) { -- /* Particle has hit ground past the distance duration of -- the particles. Mark particle as dead. */ -- colorList[i] = NUM_COLORS; /* Not moving. */ -- continue; -- } -- -- pointVelocity[i][1] *= 0.8; /* 80% of previous up velocity. */ -- pointTime[i] = 0.0; /* Reset the particles sense of up time. */ -- } -- motion = 1; -- pointTime[i] += dt; -- } -- theTime += dt; -- if (!motion && !spin) { -- if (repeat) { -- makePointList(); -- } else { -- glutIdleFunc(NULL); -- } -- } --} -- --static void --idle(void) --{ -- updatePointList(); -- if (spin) { -- angle += 0.3; -- } -- glutPostRedisplay(); --} -- --static void --visible(int vis) --{ -- if (vis == GLUT_VISIBLE) { -- if (animate && (motion || spin)) { -- glutIdleFunc(idle); -- } -- } else { -- glutIdleFunc(NULL); -- } --} -- --static void --redraw(void) --{ -- int i; -- -- glDepthMask(GL_TRUE); -- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); -- -- glPushMatrix(); -- glRotatef(15.0, 1.0, 0.0, 0.0); -- glRotatef(angle, 0.0, 1.0, 0.0); -- -- -- /* Draw the floor. */ --/* glEnable(GL_TEXTURE_2D);*/ -- glColor3f(0.1, 0.5, 1.0); -- glBegin(GL_QUADS); -- glTexCoord2f(0.0, 0.0); -- glVertex3f(-EDGE, -0.05, -EDGE); -- glTexCoord2f(20.0, 0.0); -- glVertex3f(EDGE, -0.05, -EDGE); -- glTexCoord2f(20.0, 20.0); -- glVertex3f(EDGE, -0.05, EDGE); -- glTexCoord2f(0.0, 20.0); -- glVertex3f(-EDGE, -0.05, EDGE); -- glEnd(); -- -- /* Allow particles to blend with each other. */ -- glDepthMask(GL_FALSE); -- -- if (blend) -- glEnable(GL_BLEND); -- -- if (sprite) { -- glEnable(GL_TEXTURE_2D); --#ifdef GL_ARB_point_sprite -- glEnable(GL_POINT_SPRITE_ARB); --#endif -- } -- -- glColor3f(1,1,1); -- glBegin(GL_POINTS); -- for (i=0; i<numPoints; i++) { -- /* Draw alive particles. */ -- if (colorList[i] != DEAD) { -- if (!sprite) glColor4fv(colorSet[colorList[i]]); -- glVertex3fv(pointList[i]); -- } -- } -- glEnd(); -- -- glDisable(GL_TEXTURE_2D); --#ifdef GL_ARB_point_sprite -- glDisable(GL_POINT_SPRITE_ARB); --#endif -- glDisable(GL_BLEND); -- -- glPopMatrix(); -- -- glutSwapBuffers(); --} -- --/* ARGSUSED2 */ --static void --mouse(int button, int state, int x, int y) --{ -- /* Scene can be spun around Y axis using left -- mouse button movement. */ -- if (button == GLUT_LEFT_BUTTON && state == GLUT_DOWN) { -- moving = 1; -- begin = x; -- } -- if (button == GLUT_LEFT_BUTTON && state == GLUT_UP) { -- moving = 0; -- } --} -- --/* ARGSUSED1 */ --static void --mouseMotion(int x, int y) --{ -- if (moving) { -- angle = angle + (x - begin); -- begin = x; -- glutPostRedisplay(); -- } --} -- --static void --menu(int option) --{ -- switch (option) { -- case 0: -- makePointList(); -- break; --#ifdef GL_ARB_point_parameters -- case 1: -- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, constant); -- break; -- case 2: -- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, linear); -- break; -- case 3: -- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad); -- break; --#endif -- case 4: -- blend = 1; -- break; -- case 5: -- blend = 0; -- break; --#ifdef GL_ARB_point_parameters -- case 6: -- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 1.0); -- break; -- case 7: -- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 10.0); -- break; --#endif -- case 8: -- glEnable(GL_POINT_SMOOTH); -- smooth = 1; -- break; -- case 9: -- glDisable(GL_POINT_SMOOTH); -- smooth = 0; -- break; -- case 10: -- glPointSize(16.0); -- break; -- case 11: -- glPointSize(32.0); -- break; -- case 12: -- glPointSize(64.0); -- break; -- case 13: -- spin = 1 - spin; -- if (animate && (spin || motion)) { -- glutIdleFunc(idle); -- } else { -- glutIdleFunc(NULL); -- } -- break; -- case 14: -- numPoints = 200; -- break; -- case 15: -- numPoints = 500; -- break; -- case 16: -- numPoints = 1000; -- break; -- case 17: -- numPoints = 2000; -- break; -- case 666: -- exit(0); -- } -- glutPostRedisplay(); --} -- --/* ARGSUSED1 */ --static void --key(unsigned char c, int x, int y) --{ -- switch (c) { -- case 13: -- animate = 1 - animate; /* toggle. */ -- if (animate && (motion || spin)) { -- glutIdleFunc(idle); -- } else { -- glutIdleFunc(NULL); -- } -- break; -- case ' ': -- animate = 1; -- makePointList(); -- glutIdleFunc(idle); -- break; -- case 'o': -- case 'O': -- org ^= 1; --#ifdef GL_VERSION_2_0 --#ifdef GL_ARB_point_parameters -- glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, -- org ? GL_LOWER_LEFT : GL_UPPER_LEFT); --#endif --#endif -- glutPostRedisplay(); -- break; -- case 't': -- case 'T': -- sprite ^= 1; -- glutPostRedisplay(); -- break; -- case 's': -- case 'S': -- (smooth ^= 1) ? glEnable(GL_POINT_SMOOTH) : glDisable(GL_POINT_SMOOTH); -- glutPostRedisplay(); -- break; -- case '0': -- glPointSize(1.0); -- glutPostRedisplay(); -- break; -- case '1': -- glPointSize(16.0); -- glutPostRedisplay(); -- break; -- case '2': -- glPointSize(32.0); -- glutPostRedisplay(); -- break; -- case '3': -- glPointSize(64.0); -- glutPostRedisplay(); -- break; -- case '4': -- glPointSize(128.0); -- glutPostRedisplay(); -- break; -- case 27: -- exit(0); -- } --} -- -- -- --static void --makeSprite(void) --{ -- GLubyte texture[16][16][4]; -- int i, j; -- -- if (!glutExtensionSupported("GL_ARB_point_sprite")) { -- printf("Sorry, this demo requires GL_ARB_point_sprite.\n"); -- exit(0); -- } -- if (!glutExtensionSupported("GL_ARB_point_parameters")) { -- printf("Sorry, this demo requires GL_ARB_point_parameters.\n"); -- exit(0); -- } -- -- for (i = 0; i < 16; i++) { -- for (j = 0; j < 16; j++) { -- if (spritePattern[i][j]) { -- texture[i][j][0] = 255; -- texture[i][j][1] = 255; -- texture[i][j][2] = 255; -- texture[i][j][3] = 255; -- } -- else { -- texture[i][j][0] = 255; -- texture[i][j][1] = 0; -- texture[i][j][2] = 0; -- texture[i][j][3] = 0; -- } -- } -- } -- -- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE, -- texture); -- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); -- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); --#ifdef GL_ARB_point_sprite -- glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE); --#endif --} -- -- --static void --reshape(int width, int height) --{ -- GLfloat h = (GLfloat) height / (GLfloat) width; -- -- glViewport(0, 0, (GLint) width, (GLint) height); -- glMatrixMode(GL_PROJECTION); -- glLoadIdentity(); -- glFrustum(-1.0, 1.0, -h, h, 2.0, 30.0); -- glMatrixMode(GL_MODELVIEW); -- glLoadIdentity(); -- glTranslatef(0.0, 0.0, -10.0); --} -- --int --main(int argc, char **argv) --{ -- int i; -- -- glutInitWindowSize(600,300); -- glutInit(&argc, argv); -- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_MULTISAMPLE); -- -- for (i=1; i<argc; i++) { -- if(!strcmp("-noms", argv[i])) { -- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH); -- printf("forcing no multisampling\n"); -- } else if(!strcmp("-nomipmaps", argv[i])) { -- useMipmaps = 0; -- } else if(!strcmp("-nearest", argv[i])) { -- linearFiltering = 0; -- } -- } -- glutCreateWindow("sprite blast"); -- glewInit(); -- glutReshapeFunc(reshape); -- glutDisplayFunc(redraw); -- glutMouseFunc(mouse); -- glutMotionFunc(mouseMotion); -- glutVisibilityFunc(visible); -- glutKeyboardFunc(key); -- glutCreateMenu(menu); -- glutAddMenuEntry("Reset time", 0); -- glutAddMenuEntry("Constant", 1); -- glutAddMenuEntry("Linear", 2); -- glutAddMenuEntry("Quadratic", 3); -- glutAddMenuEntry("Blend on", 4); -- glutAddMenuEntry("Blend off", 5); -- glutAddMenuEntry("Threshold 1", 6); -- glutAddMenuEntry("Threshold 10", 7); -- glutAddMenuEntry("Point smooth on", 8); -- glutAddMenuEntry("Point smooth off", 9); -- glutAddMenuEntry("Point size 16", 10); -- glutAddMenuEntry("Point size 32", 11); -- glutAddMenuEntry("Point size 64", 12); -- glutAddMenuEntry("Toggle spin", 13); -- glutAddMenuEntry("200 points ", 14); -- glutAddMenuEntry("500 points ", 15); -- glutAddMenuEntry("1000 points ", 16); -- glutAddMenuEntry("2000 points ", 17); -- glutAddMenuEntry("Quit", 666); -- glutAttachMenu(GLUT_RIGHT_BUTTON); -- -- makePointList(); -- makeSprite(); -- -- glShadeModel(GL_FLAT); -- glEnable(GL_DEPTH_TEST); -- glEnable(GL_POINT_SMOOTH); -- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); -- glPointSize(32.0); --#ifdef GL_ARB_point_parameters -- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad); --#endif -- -- glutMainLoop(); -- return 0; /* ANSI C requires main to return int. */ --} diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index b78d365db..7152ca13c 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.6 _extramodules=extramodules-3.8-LIBRE -pkgrel=7 +pkgrel=7.1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -36,7 +36,7 @@ package_virtualbox-libre-host-modules(){ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre kernel package)' - depends=('linux-libre>=3.7' 'linux-libre<3.8') + depends=('linux-libre>=3.8' 'linux-libre<3.9') provides=("virtualbox-host-modules=${pkgver}") replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') @@ -54,7 +54,7 @@ package_virtualbox-libre-guest-modules(){ pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre kernel package)' license=('GPL') - depends=('linux-libre>=3.7' 'linux-libre<3.8') + depends=('linux-libre>=3.8' 'linux-libre<3.9') provides=("virtualbox-guest-modules=${pkgver}") replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index dc9e21490..8f16e1ab9 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -13,7 +13,7 @@ pkgname=('virtualbox-libre' 'virtualbox-libre-sdk' 'virtualbox-libre-guest-utils') pkgver=4.2.6 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -39,7 +39,7 @@ makedepends=('alsa-lib' 'mesa' 'glu' 'python2' - 'qt' + 'qt4' 'sdl' 'sdl_ttf' 'vde2' @@ -170,7 +170,7 @@ package_virtualbox-libre() { 'sdl' 'shared-mime-info' 'virtualbox-libre-host-modules') - optdepends=('qt: VirtualBox GUI support' + optdepends=('qt4: VirtualBox GUI support' 'vde2: Virtual Distributed Ethernet support' 'virtualbox-libre-sdk: Developer kit' 'virtualbox-libre-host-dkms: Host kernel source modules for non-stock kernels' diff --git a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch index f59454192..b7bd659a0 100644 --- a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch +++ b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch @@ -184,10 +184,10 @@ index 260bc29..52b32cc 100644 -64_firefox=Bookmarks Backups
+64_self=Bookmarks Backups
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
-index 687c8d8..203d8cf 100644
+index 96cedd3..a0f8a75 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
-@@ -39,7 +39,7 @@ toolkit.jar:
+@@ -42,7 +42,7 @@ toolkit.jar:
+ content/global/mozilla.xhtml (mozilla.xhtml)
content/global/nsDragAndDrop.js (nsDragAndDrop.js)
content/global/resetProfile.css (resetProfile.css)
@@ -267,10 +267,10 @@ index f35c227..7062886 100644 %{C++
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index e3dd0df..ef7bb74 100644
+index 1045665..04bd1aa 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3669,7 +3669,7 @@ XREMain::XRE_mainRun()
+@@ -3698,7 +3698,7 @@ XREMain::XRE_mainRun()
if (gDoProfileReset) {
// Automatically migrate from the current application if we just
// reset the profile.
diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD index c2847b2e8..66154fb0c 100644 --- a/libre/xulrunner-libre/PKGBUILD +++ b/libre/xulrunner-libre/PKGBUILD @@ -6,7 +6,7 @@ # We're getting this from Debian Experimental _debname=iceweasel -_debver=18.0.1 +_debver=19.0 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -15,7 +15,7 @@ _pkgname=xulrunner pkgname=xulrunner-libre pkgver=${_debver}.${_debrel} pkgrel=1 -pkgdesc="Mozilla Runtime Environment" +pkgdesc="Mozilla Runtime Environment (built from Debian Iceweasel source code)" arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') depends=('gtk2' 'mozilla-common' 'nss>=3.14.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libvpx' 'python2') @@ -31,12 +31,12 @@ options=('!emptydirs') conflicts=('xulrunner') provides=("xulrunner=${_debver}") replaces=('xulrunner-oss' 'xulrunner') -md5sums=('5d481dd35a304702d1f311eeb3f1149f' - '6a4781e8ddc1b166f36930c4864e095f' +md5sums=('b4c109e987f869f94220188a901d4425' + 'e1d6920cb49c9de88b8e00eb14b1b0e7' '7f3317c25308a631ca31d8d280991bb4' '27271ce647a83906ef7a24605e840d61' '52e52f840a49eb1d14be1c0065b03a93' - '46a4b19b414065b99b870ea79b454f6e') + '2fde2f4bc158b217f3d71b33ef0bc626') build() { # WebRTC build tries to execute "python" and expects Python 2 @@ -45,9 +45,13 @@ build() { ln -s /usr/bin/python2 "$srcdir/python2-path/python" export PATH="$srcdir/python2-path:$PATH" + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-${_debver::4}" + export PYTHON="/usr/bin/python2" + export QUILT_PATCHES=debian/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' export QUILT_DIFF_ARGS='--no-timestamps' + mv mozilla-release "${_debname}-${_debver}" mv debian "${_debname}-${_debver}" cd "${_debname}-${_debver}" @@ -73,9 +77,6 @@ build() { patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch" patch -Np1 -i "$srcdir/shared-libs.patch" - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-${_debver::4}" - export PYTHON="/usr/bin/python2" - make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" } diff --git a/pcr/coin/PKGBUILD b/pcr/coin/PKGBUILD new file mode 100644 index 000000000..c584949c9 --- /dev/null +++ b/pcr/coin/PKGBUILD @@ -0,0 +1,59 @@ +# Contributor: Christian Hesse <mail@eworm.de> +# Contributor: Thomas Dziedzic < gostrc at gmail > +# Contributor: mickele +# Contributor: marcus fritzsch <fritschy@googlemail.com> +# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrières <aurelien@cwb.IO> + +pkgname=coin +pkgver=3.1.3 +pkgrel=9 +pkgdesc='A high-level 3D graphics toolkit on top of OpenGL' +url='http://www.coin3d.org/' +license=('GPL') +arch=('i686' 'x86_64') +depends=('mesa' 'expat') +makedepends=('doxygen') +optdepends=('openal: sound/dynamic linking support' + 'fontconfig: dynamic linking support' + 'zlib: dynamic linking support' + 'freetype2: dynamic linking support' + 'js: dynamic linking support' + 'simage: image format support') +options=('!libtool') +source=("https://bitbucket.org/Coin3D/coin/downloads/Coin-${pkgver}.tar.gz") + +build() { + cd Coin-${pkgver} + + # fix http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667139 + sed -i "/#include <Inventor\/C\/basic.h>/i #include <Inventor/C/errors/debugerror.h>" include/Inventor/SbBasic.h + + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --enable-optimization \ + --enable-3ds-import \ + --enable-javascript-api \ + --enable-threadsafe \ + --enable-exceptions \ + --enable-man \ + --with-mesa \ + --disable-debug \ + --enable-shared \ + --disable-maintainer-mode \ + --disable-dependency-tracking \ + --enable-system-expat + + make +} + +package() { + cd Coin-${pkgver} + + make DESTDIR=${pkgdir} install + + # final adjustments + for _FILE in threads deprecated errors events ; do + mv "${pkgdir}/usr/share/man/man3/${_FILE}.3" "${pkgdir}/usr/share/man/man3/coin-${_FILE}.3" + done +} diff --git a/pcr/eigen3/PKGBUILD b/pcr/eigen3/PKGBUILD new file mode 100644 index 000000000..a1e186325 --- /dev/null +++ b/pcr/eigen3/PKGBUILD @@ -0,0 +1,27 @@ +# Contributor: Chirantan Ekbote <chirantan.ekbote at gmail.com> +# Contributor: Kringel +# This PKGBUILD is a modified version of eigen 2.x in extra/eigen +# Maintainer: Parabola GNU / Linux-libre Aurélien Desbrières <aurelien@cwb.IO> + +pkgname=eigen3 +pkgver=3.1.2 +pkgrel=1 +pkgdesc="Eigen is a lightweight C++ template library for vector and matrix math, a.k.a. linear algebra." +arch=('any') +url='http://eigen.tuxfamily.org' +license=('MPL2') +makedepends=('cmake' 'pkgconfig') +source=("${pkgname}-${pkgver}.tar.bz2::http://bitbucket.org/eigen/eigen/get/${pkgver}.tar.bz2") + +build() { + mkdir -p "$srcdir"/build + cd "$srcdir"/build + cmake ../eigen-eigen-* \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr +} + +package() { + cd "$srcdir"/build + make DESTDIR="$pkgdir" install +} diff --git a/pcr/nexuiz-data/PKGBUILD b/pcr/nexuiz-data/PKGBUILD index edd338097..f6d3ba62c 100644 --- a/pcr/nexuiz-data/PKGBUILD +++ b/pcr/nexuiz-data/PKGBUILD @@ -9,11 +9,11 @@ pkgname=nexuiz-data _pkgsourcename=nexuiz pkgver=2.5.2 _zipver=252 -pkgrel=1 +pkgrel=3 arch=('any') pkgdesc="Nexuiz game data" conflicts=('nexuiz<2.5.1-3') -url="http://www.nexuiz.com/" +url="http://www.alientrap.org/games/nexuiz" license=("GPL") source=(http://downloads.sourceforge.net/${_pkgsourcename}/${_pkgsourcename}-${_zipver}.zip) md5sums=('d750bc328e58df8492f8d88bdcf818cb') diff --git a/pcr/nexuiz/PKGBUILD b/pcr/nexuiz/PKGBUILD index 5c3b50899..1e3fdfbeb 100644 --- a/pcr/nexuiz/PKGBUILD +++ b/pcr/nexuiz/PKGBUILD @@ -8,10 +8,10 @@ pkgname=nexuiz pkgver=2.5.2 _zipver=252 -pkgrel=2.2 +pkgrel=3 arch=('i686' 'x86_64') pkgdesc="A free software first person shooter" -url="http://www.alientrap.org/games/nexuiz/" +url="http://www.alientrap.org/games/nexuiz" license=("GPL") depends=('alsa-lib' 'curl' 'libjpeg>=8' 'libmodplug' 'libvorbis' 'libxpm' 'libxxf86dga' 'libxxf86vm' 'sdl' 'nexuiz-data' 'libpng>=1.4.0') makedepends=('mesa') diff --git a/pcr/skanlite/PKGBUILD b/pcr/skanlite/PKGBUILD new file mode 100644 index 000000000..42a164785 --- /dev/null +++ b/pcr/skanlite/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer: birdflesh <antkoul at gmail dot com> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=skanlite +pkgver=1.0 +pkgrel=1 +pkgdesc="Image Scanning Application for KDE" +arch=('i686' 'x86_64') +url='http://www.kde.org/applications/graphics/skanlite' +license=('GPL') +depends=('kdebase-runtime' 'libksane') +makedepends=('cmake' 'automoc4') +source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.bz2") +md5sums=('e22b2719f134d2483591082026961bf5') + +build() { + cd "$srcdir" + mkdir build + cd build + cmake ../$pkgname-$pkgver \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "$srcdir/build" + make DESTDIR="$pkgdir" install +} diff --git a/pcr/swig1/PKGBUILD b/pcr/swig1/PKGBUILD new file mode 100644 index 000000000..4cb83afd2 --- /dev/null +++ b/pcr/swig1/PKGBUILD @@ -0,0 +1,29 @@ +# Contributor: Hilton Medeiros <medeiros.hilton at gmail dot com> +# Contributor: Jason Chu <jason@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO> + +pkgname=swig1 +_pkgname=swig +pkgver=1.3.40 +pkgrel=1 +pkgdesc="A compiler that integrates C and C++ code with scripting languages (legacy version)" +arch=('i686' 'x86_64') +url="http://www.swig.org/" +license=('custom') +depends=('gcc-libs' 'zlib') +conflicts=('swig' 'swig-pantheon') +provides=('swig') +source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.gz") + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/pcr/yabause-git/PKGBUILD b/pcr/yabause-git/PKGBUILD index d2b351b36..6de78f4eb 100644 --- a/pcr/yabause-git/PKGBUILD +++ b/pcr/yabause-git/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com> pkgname=yabause-git -pkgver=20130213 +pkgver=20130301 pkgrel=1 pkgdesc="A Sega Saturn emulator (GIT version)" arch=('x86_64' 'i686') @@ -15,7 +15,7 @@ makedepends=('git' 'cmake' 'mesa' 'glu') #_port=gtk _port=qt -[ "${_port}" = "qt" ] && depends+=('qt') +[ "${_port}" = "qt" ] && depends+=('qt4') [ "${_port}" = "gtk" ] && depends+=('gtkglext') _gitroot="git://github.com/Guillaumito/yabause.git" diff --git a/pcr/yabause/PKGBUILD b/pcr/yabause/PKGBUILD index 0b80f72f9..bf5aca5f3 100644 --- a/pcr/yabause/PKGBUILD +++ b/pcr/yabause/PKGBUILD @@ -5,13 +5,13 @@ # Contributor: robb_force <robb_force@holybuffalo.net> pkgname=yabause pkgver=0.9.12 -pkgrel=1 +pkgrel=2 pkgdesc='A Sega Saturn emulator.' url='http://yabause.org/' license=('GPL') arch=('i686' 'x86_64') makedepends=('cmake' 'mesa' 'glu') -depends=('sdl' 'qt' 'openal' 'freeglut') +depends=('sdl' 'qt4' 'openal' 'freeglut') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('c7876c04489f8a1b59b3166598084cb8') diff --git a/social/ruby-headers/PKGBUILD b/social/ruby-headers/PKGBUILD index f621772e9..d68e97781 100644 --- a/social/ruby-headers/PKGBUILD +++ b/social/ruby-headers/PKGBUILD @@ -3,8 +3,8 @@ pkgname=ruby-headers _pkgname=ruby -pkgver=1.9.3_p194 -_pkgver=1.9.3-p194 +pkgver=1.9.3_p392 +_pkgver=1.9.3-p392 pkgrel=1 pkgdesc="A package of all Ruby headers needed by some gems like ruby-debug." arch=('any') @@ -14,7 +14,7 @@ depends=("ruby=$pkgver") source=("http://ftp.ruby-lang.org/pub/ruby/1.9/$_pkgname-$_pkgver.tar.bz2") build() { - /bin/true + : } package() { @@ -28,4 +28,4 @@ package() { install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } -md5sums=('2278eff4cfed3cbc0653bc73085caa34') +md5sums=('a810d64e2255179d2f334eb61fb8519c') |
