diff options
50 files changed, 2400 insertions, 323 deletions
diff --git a/community-testing/chromium-bsu/PKGBUILD b/community-testing/chromium-bsu/PKGBUILD new file mode 100644 index 000000000..338f16747 --- /dev/null +++ b/community-testing/chromium-bsu/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 77219 2012-10-07 13:58:24Z jelle $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=chromium-bsu +pkgver=0.9.15 +pkgrel=3 +pkgdesc="A fast paced top scrolling shooter" +arch=('i686' 'x86_64') +url="http://chromium-bsu.sourceforge.net/" +license=('custom:artistic') +depends=('freeglut' 'glu' 'sdl' 'openal' 'freealut' 'glpng' 'ftgl' 'fontconfig' 'sdl_image') +install=chromium-bsu.install +source=(http://downloads.sourceforge.net/project/$pkgname/Chromium%20B.S.U.%20source%20code/$pkgver/$pkgname-$pkgver.tar.gz) +md5sums=('d57137a1ac2292363b35192724c7e3be') + +build(){ + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + + install -Dm644 COPYING $pkgdir/usr/share/licenses/chromium-bsu/LICENSE +} + diff --git a/community-testing/chromium-bsu/chromium-bsu.install b/community-testing/chromium-bsu/chromium-bsu.install new file mode 100644 index 000000000..6b1b64bdd --- /dev/null +++ b/community-testing/chromium-bsu/chromium-bsu.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-testing/gambas3/PKGBUILD b/community-testing/gambas3/PKGBUILD index 9a993cc01..96dbccce8 100644 --- a/community-testing/gambas3/PKGBUILD +++ b/community-testing/gambas3/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 75179 2012-08-14 20:08:01Z dreisner $ +# $Id: PKGBUILD 77244 2012-10-07 20:04:02Z 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' - 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' '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-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-media' - 'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' + '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.2.1 -pkgrel=5 +pkgver=3.3.2 +pkgrel=3 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net/" @@ -26,11 +26,12 @@ makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite' 'librsvg' 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit' 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring' - 'gsl' 'gstreamer0.10' 'gstreamer0.10-base' 'gtkglext' 'ncurses' 'llvm') -options=('!emptydirs' '!makeflags') + 'gsl' 'gstreamer0.10' 'gstreamer0.10-base' 'gtkglext' 'ncurses' 'llvm' + 'gmime' 'glu') +options=('!emptydirs') source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" 'gambas3-script.install' 'gambas3-runtime.install') -md5sums=('e7aed820300ff8599e9f74029984f793' +md5sums=('2d148d3fbdff7a063157073d555f343c' 'b284be39d147ec799f1116a6abc068b4' '6d9e080b66443e7246387b1716d24e31') @@ -52,16 +53,16 @@ package_gambas3-runtime() { install=gambas3-runtime.install cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install cd ../gbx - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install cd ../lib/debug - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install cd ../eval - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install cd ../draw - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install install -D -m644 ../gb.component \ ${pkgdir}/usr/lib/gambas3 @@ -80,13 +81,13 @@ package_gambas3-runtime() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui.opengl - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 @@ -101,7 +102,7 @@ package_gambas3-devel() { pkgdesc="Development environment" cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install } package_gambas3-ide() { @@ -111,9 +112,9 @@ package_gambas3-ide() { pkgdesc="Integrated Development Environment" cd ${srcdir}/${pkgbase}-${pkgver} - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install -#!! with the ide !! + #!! with the ide !! install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.desktop \ ${pkgdir}/usr/share/applications/gambas3.desktop install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.png \ @@ -130,7 +131,7 @@ package_gambas3-script() { install=gambas3-script.install cd ${srcdir}/${pkgbase}-${pkgver} - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## needed for postinst with xdg-utils cd ${srcdir}/${pkgbase}-${pkgver}/app/mime @@ -145,18 +146,19 @@ package_gambas3-script() { } package_gambas3-examples() { - depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' - 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' + 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-net' 'gambas3-gb-net-curl' '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-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-image-io' '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-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-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') pkgdesc="Applications examples" cd ${srcdir}/${pkgbase}-${pkgver} - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install rm -r ${pkgdir}/usr/{bin,lib} rm -r ${pkgdir}/usr/share/gambas3/{info,control,gb.sdl} @@ -168,11 +170,11 @@ package_gambas3-gb-cairo() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.cairo - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -186,43 +188,59 @@ package_gambas3-gb-chart() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install ## Workaround for splitting - 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}/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]* ## } +package_gambas3-gb-complex() { + depends=('gambas3-runtime') + pkgdesc="Complex numbers component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + ## Workaround for splitting + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/gb.{comp{r,o}*,[d-v]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{compr*,[d-v]*} + ## +} + package_gambas3-gb-compress() { depends=('gambas3-runtime' 'bzip2' 'zlib') pkgdesc="Compression support component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2 - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install ## Workaround for splitting rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.component,gb.[d-v]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-v]* + rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp{o,l}*,gb.[d-v]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{compl*,[d-v]*} ## } @@ -232,11 +250,11 @@ package_gambas3-gb-crypt() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -244,19 +262,35 @@ package_gambas3-gb-crypt() { ## } +package_gambas3-gb-data() { + depends=('gambas3-runtime') + pkgdesc="Data containers component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + ## Workaround for splitting + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/gb.{c*,d{b,e,r}*,[e-v]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{c*,d{b,e}*,[e-v]*} + ## +} + package_gambas3-gb-db() { depends=('gambas3-runtime') pkgdesc="Database access component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## ## Workaround for splitting rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp*,gb.d{e,r}*,gb.[e-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.comp*,gb.de*,gb.[e-z]*} + 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]*} ## } @@ -266,13 +300,13 @@ package_gambas3-gb-db-form() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -291,11 +325,11 @@ package_gambas3-gb-db-mysql() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -309,11 +343,11 @@ package_gambas3-gb-db-odbc() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -327,11 +361,11 @@ package_gambas3-gb-db-postgresql() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -340,16 +374,16 @@ package_gambas3-gb-db-postgresql() { } package_gambas3-gb-db-sqlite2() { - depends=('gambas3-gb-db' 'sqlite2') + depends=('gambas3-gb-db' 'sqlite2' 'gcc-libs') pkgdesc="Sqlite2 database access component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2 - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -358,16 +392,16 @@ package_gambas3-gb-db-sqlite2() { } package_gambas3-gb-db-sqlite3() { - depends=('gambas3-gb-db' 'sqlite') + depends=('gambas3-gb-db' 'sqlite' 'gcc-libs') pkgdesc="Sqlite3 database access component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3 - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -376,18 +410,42 @@ package_gambas3-gb-db-sqlite3() { } package_gambas3-gb-desktop() { - depends=('gambas3-gb-image' 'libsm' 'libxtst' 'libgnome-keyring') + depends=('gambas3-gb-image' 'libsm' 'libxtst') pkgdesc="Desktop component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop/src/gnome + make DESTDIR="${pkgdir}" uninstall + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-desktop-gnome() { + depends=('gambas3-gb-desktop' 'libgnome-keyring') + pkgdesc="Desktop component for Gnome" + + ## 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.desktop/src/gnome + make -j1 DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -403,11 +461,11 @@ package_gambas3-gb-dbus() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -421,13 +479,13 @@ package_gambas3-gb-eval-highlight() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 @@ -446,15 +504,15 @@ package_gambas3-gb-form() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -475,15 +533,15 @@ package_gambas3-gb-form-dialog() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -504,15 +562,15 @@ package_gambas3-gb-form-mdi() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -533,13 +591,13 @@ package_gambas3-gb-form-stock() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk @@ -559,11 +617,11 @@ package_gambas3-gb-gtk() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall @@ -575,16 +633,16 @@ package_gambas3-gb-gtk() { } package_gambas3-gb-gtk-opengl() { - depends=('gambas3-gb-gtk' 'gtkglext') + depends=('gambas3-gb-gtk' 'gambas3-gb-opengl' 'gtkglext' 'glu') pkgdesc="GTK+ toolkit OpenGL component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -598,11 +656,11 @@ package_gambas3-gb-gsl() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.gsl - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -616,7 +674,7 @@ package_gambas3-gb-image() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## ## cleanup the workaround @@ -627,12 +685,12 @@ package_gambas3-gb-image() { } package_gambas3-gb-image-effect() { - depends=('gambas3-gb-image') + depends=('gambas3-gb-image' 'gcc-libs') pkgdesc="Image effect component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## ## cleanup the workaround @@ -648,11 +706,11 @@ package_gambas3-gb-image-imlib() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.imlib - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -662,15 +720,15 @@ package_gambas3-gb-image-imlib() { package_gambas3-gb-image-io() { depends=('gambas3-gb-image' 'gdk-pixbuf2') - pkgdesc="Input/Output component" + pkgdesc="Input/Output image component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.io - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -680,15 +738,33 @@ package_gambas3-gb-image-io() { package_gambas3-gb-jit() { depends=('gambas3-runtime' 'llvm') - pkgdesc="Just-in-time compiler for gambas" + pkgdesc="Just-in-time compiler component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.jit - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-libxml() { + depends=('gambas3-runtime' 'libxml2') + pkgdesc="libxml2 component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.libxml + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -698,15 +774,33 @@ package_gambas3-gb-jit() { package_gambas3-gb-media() { depends=('gambas3-runtime' 'gstreamer0.10' 'gstreamer0.10-base') - pkgdesc="Simplified interface to the GStreamer library" + pkgdesc="Simplified interface to the GStreamer library component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.media - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-mime() { + depends=('gambas3-runtime' 'gmime') + pkgdesc="MIME message component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.mime + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -716,15 +810,15 @@ package_gambas3-gb-media() { package_gambas3-gb-ncurses() { depends=('gambas3-runtime' 'ncurses') - pkgdesc="Ncurses component for gambas" + pkgdesc="Ncurses component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.ncurses - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -738,11 +832,11 @@ package_gambas3-gb-net() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -756,11 +850,11 @@ package_gambas3-gb-net-curl() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -768,17 +862,45 @@ package_gambas3-gb-net-curl() { ## } +package_gambas3-gb-net-pop3() { + depends=('gambas3-gb-net' 'gambas3-gb-mime') + pkgdesc="POP3 component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + 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.mime + 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.mime + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net + 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]*} + ## +} + package_gambas3-gb-net-smtp() { depends=('gambas3-runtime' 'glib2') pkgdesc="SMTP component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -792,11 +914,11 @@ package_gambas3-gb-opengl() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl @@ -809,16 +931,16 @@ package_gambas3-gb-opengl() { } package_gambas3-gb-opengl-glu() { - depends=('gambas3-gb-opengl') + depends=('gambas3-gb-opengl' 'glu') pkgdesc="GL Utility component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -832,11 +954,11 @@ package_gambas3-gb-opengl-glsl() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -850,7 +972,7 @@ package_gambas3-gb-option() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## ## cleanup the workaround @@ -866,11 +988,11 @@ package_gambas3-gb-pcre() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -884,11 +1006,11 @@ package_gambas3-gb-pdf() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -902,11 +1024,11 @@ package_gambas3-gb-qt4() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext @@ -926,11 +1048,11 @@ package_gambas3-gb-qt4-ext() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -939,16 +1061,16 @@ package_gambas3-gb-qt4-ext() { } package_gambas3-gb-qt4-opengl() { - depends=('gambas3-gb-qt4' 'libgl') + depends=('gambas3-gb-qt4' 'gambas3-gb-opengl') pkgdesc="Qt4 toolkit OpenGL component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -962,11 +1084,11 @@ package_gambas3-gb-qt4-webkit() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -980,13 +1102,13 @@ package_gambas3-gb-report() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -1005,11 +1127,11 @@ package_gambas3-gb-sdl() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -1023,11 +1145,11 @@ package_gambas3-gb-sdl-sound() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -1041,11 +1163,11 @@ package_gambas3-gb-settings() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -1057,11 +1179,11 @@ package_gambas3-gb-settings() { package_gambas3-gb-signal() { depends=('gambas3-runtime') - pkgdesc="Signal component" + pkgdesc="POSIX Signals component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## ## cleanup the workaround @@ -1077,11 +1199,11 @@ package_gambas3-gb-v4l() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -1091,11 +1213,11 @@ package_gambas3-gb-v4l() { package_gambas3-gb-vb() { depends=('gambas3-runtime') - pkgdesc="VB transitional component" + pkgdesc="Visual Basic transitional component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## ## Workaround for splitting @@ -1106,16 +1228,16 @@ package_gambas3-gb-vb() { } package_gambas3-gb-xml() { - depends=('gambas3-runtime') + depends=('gambas3-runtime' 'gcc-libs') pkgdesc="XML component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/html @@ -1138,11 +1260,11 @@ package_gambas3-gb-xml-html() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/html - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -1156,16 +1278,16 @@ package_gambas3-gb-xml-rpc() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/gb.net @@ -1187,11 +1309,11 @@ package_gambas3-gb-xml-xslt() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -1205,11 +1327,11 @@ package_gambas3-gb-web() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -1218,4 +1340,3 @@ package_gambas3-gb-web() { rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]* ## } - diff --git a/community-testing/gnash/PKGBUILD b/community-testing/gnash/PKGBUILD index 381e16b29..86bc19f73 100644 --- a/community-testing/gnash/PKGBUILD +++ b/community-testing/gnash/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 73757 2012-07-15 13:18:48Z ibiru $ +# $Id: PKGBUILD 77223 2012-10-07 17:51:25Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgbase=gnash pkgname=(gnash-common gnash-gtk) pkgver=0.8.10 -pkgrel=4 +pkgrel=5 arch=(i686 x86_64) url="http://www.gnu.org/software/gnash/" license=(GPL3) -makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool mesa +makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool mesa glu speex fontconfig gstreamer0.10-base gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils gconf gtkglext @@ -47,7 +47,7 @@ build() { package_gnash-common() { pkgdesc="A GNU Flash movie player" - depends=(curl giflib sdl agg libjpeg libpng libltdl mesa + depends=(curl giflib sdl agg libjpeg libpng libltdl libgl glu speex fontconfig cairo gstreamer0.10-base boost-libs) diff --git a/community-testing/gpac/PKGBUILD b/community-testing/gpac/PKGBUILD index 72b1487d7..24230e603 100644 --- a/community-testing/gpac/PKGBUILD +++ b/community-testing/gpac/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 73330 2012-07-06 15:22:46Z ibiru $ +# $Id: PKGBUILD 77246 2012-10-07 22:54:58Z ebelanger $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gpac pkgver=4065 -pkgrel=1 +pkgrel=2 pkgdesc="A multimedia framework based on the MPEG-4 Systems standard" arch=('i686' 'x86_64') url="http://gpac.sourceforge.net" license=('LGPL') -depends=('ffmpeg' 'libjpeg' 'libpng' 'mesa') -makedepends=('jack' 'a52dec' 'freetype2' 'libxv' 'faad2' 'libmad') +depends=('ffmpeg' 'libjpeg' 'libpng' 'glu') +makedepends=('jack' 'a52dec' 'freetype2' 'libxv' 'faad2' 'libmad' 'mesa') optdepends=('jack: for jack support' 'a52dec: for A52 support' 'faad2: for AAC support' 'libmad: for mp3 support') options=('!makeflags') diff --git a/community/openocd/PKGBUILD b/community/openocd/PKGBUILD index 798eeccc5..a30f719a8 100644 --- a/community/openocd/PKGBUILD +++ b/community/openocd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76200 2012-09-13 18:36:22Z bpiotrowski $ +# $Id: PKGBUILD 77217 2012-10-07 07:16:10Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Matthias Bauch <matthias.bauch@gmail.com> # Contributor: Laszlo Papp <djszapi2 at gmail com> @@ -6,7 +6,7 @@ pkgname=openocd pkgver=0.6.0 -pkgrel=1 +pkgrel=2 pkgdesc='Debugging, in-system programming and boundary-scan testing for embedded target devices' arch=('i686' 'x86_64') url='http://openocd.berlios.de' @@ -17,7 +17,7 @@ install=openocd.install source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2") md5sums=('824cbe192ca2c79055b6ae82579123cf') -_features=(parport ft2232_libftdi amtjtagaccel ep93xxat91rm9200gw16012 presto_libftdi usbprog oocd_trace jlink vsllink rlink arm-jtag-ew buspirate) +_features=(parport ft2232_libftdi amtjtagaccel ep93xxat91rm9200gw16012 presto_libftdi usbprog oocd_trace jlink vsllink rlink arm-jtag-ew buspirate stlink) build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/python2-fuse/PKGBUILD b/community/python2-fuse/PKGBUILD new file mode 100644 index 000000000..ef79aceef --- /dev/null +++ b/community/python2-fuse/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 77237 2012-10-07 19:35:53Z dwallace $ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: Chris Brannon <cmbrannon79@gmail.com> +# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> +# Contributor: Alexander Fehr <pizzapunk@gmail.com> + +pkgname=python2-fuse +pkgver=0.2.1 +pkgrel=4 +arch=('i686' 'x86_64') +pkgdesc="Python bindings for FUSE" +url="http://fuse.sourceforge.net/wiki/index.php/FusePython" +license=('LGPL') +depends=('fuse' 'python2') +replaces=('python-fuse') +conflicts=('python-fuse') +makedepends=('pkgconfig') +source=(http://downloads.sourceforge.net/sourceforge/fuse/fuse-python-${pkgver}.tar.gz) +md5sums=('9d9c5c2311ac04291ce822dfece108f8') + +package() { + cd "$srcdir/fuse-python-$pkgver" + + python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 +} diff --git a/gnome-unstable/epiphany-extensions/PKGBUILD b/gnome-unstable/epiphany-extensions/PKGBUILD new file mode 100644 index 000000000..4fac3a868 --- /dev/null +++ b/gnome-unstable/epiphany-extensions/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 168276 2012-10-07 15:06:59Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=epiphany-extensions +pkgver=3.6.0 +pkgrel=1 +url="http://www.gnome.org/projects/epiphany/" +pkgdesc="Various extentions for the Epiphany web browser" +arch=('i686' 'x86_64') +license=('GPL') +depends=('epiphany' 'opensp' 'hicolor-icon-theme') +makedepends=('intltool' 'gnome-doc-utils') +options=('!libtool' '!emptydirs') +install=epiphany-extensions.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('3a1cc21b44a7b00cfe055b87c23f20f16c9fbd2b5a30380338885a5ae0847f7a') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/epiphany-extensions/epiphany-extensions.install b/gnome-unstable/epiphany-extensions/epiphany-extensions.install new file mode 100644 index 000000000..c0ed9a0d7 --- /dev/null +++ b/gnome-unstable/epiphany-extensions/epiphany-extensions.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index 64bcc5bb4..9827d6813 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=cdfs pkgname=cdfs-libre pkgver=2.6.27 -pkgrel=28 +pkgrel=30 pkgdesc="File system module libre that 'exports' all tracks and boot images on a CD as normal files." arch=(i686 x86_64) url="http://www.elis.UGent.be/~ronsse/cdfs/" diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD index cf2fdca23..2aaf0e3fc 100644 --- a/libre/linux-libre-api-headers/PKGBUILD +++ b/libre/linux-libre-api-headers/PKGBUILD @@ -6,7 +6,7 @@ pkgname=linux-libre-api-headers _basekernel=3.5 -_sublevel=1 +_sublevel=5 pkgver=${_basekernel}.${_sublevel} pkgrel=1 pkgdesc="Kernel libre headers sanitized for use in userspace" @@ -19,7 +19,7 @@ replaces=('linux-api-headers') 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") md5sums=('2407fc9563a74acaf38aa0c06516eb1c' - '67b650dd355fbca16035510df063420b') + '2e138b46c5855fff8e0d7afe760a4150') build() { cd ${srcdir}/linux-${_basekernel} diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index eea164fc3..e8f6ff5a1 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=28 +pkgrel=30 epoch=1 _extramodules=extramodules-3.5-LIBRE arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index add9fd496..19d1b8908 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -11,7 +11,7 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=6 +pkgrel=11 pkgdesc="Modules for ThinkPad's SMAPI functionality" arch=('i686' 'x86_64') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index 0d01ae1e6..6448d0a4e 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20120422 _extramodules=extramodules-3.5-LIBRE -pkgrel=9 +pkgrel=11 pkgdesc="Kernel libre module that emulates SCSI devices" arch=('i686' 'x86_64') url="http://cdemu.sourceforge.net/" diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index 13a37fe88..e5112c8a9 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts') pkgver=4.2.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -40,7 +40,8 @@ package_virtualbox-libre-host-modules-lts(){ install=virtualbox-libre-host-modules-lts.install _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS - _extraver=extramodules-${_kernver%.*}-LIBRE-LTS + #_extraver=extramodules-${_kernver%.*}-LIBRE-LTS + _extraver=extramodules-3.0-LIBRE-LTS install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" @@ -59,7 +60,8 @@ package_virtualbox-libre-guest-modules-lts(){ install=virtualbox-libre-guest-modules-lts.install _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS - _extraver=extramodules-${_kernver%.*}-LIBRE-LTS + #_extraver=extramodules-${_kernver%.*}-LIBRE-LTS + _extraver=extramodules-3.0-LIBRE-LTS install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 8d3f61b3a..270e14af9 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.0 -pkgrel=2 +pkgrel=5.3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -39,7 +39,8 @@ package_virtualbox-libre-host-modules(){ install=virtualbox-libre-host-modules.install _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE - _extraver=extramodules-${_kernver%.*}-LIBRE + #_extraver=extramodules-${_kernver%.*}-LIBRE + _extraver=extramodules-3.5-LIBRE install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" @@ -58,13 +59,14 @@ package_virtualbox-libre-guest-modules(){ install=virtualbox-libre-guest-modules.install _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE - _extraver=extramodules-${_kernver%.*}-LIBRE + #_extraver=extramodules-${_kernver%.*}-LIBRE + _extraver=extramodules-3.5-LIBRE install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" install -m644 * "$pkgdir/usr/lib/modules/$_extraver" find "$pkgdir" -name '*.ko' -exec gzip -9 {} + - sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-host-modules.install" + sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-guest-modules.install" } diff --git a/pcr/minetest/PKGBUILD b/pcr/minetest/PKGBUILD index 8d11e3747..18546b470 100644 --- a/pcr/minetest/PKGBUILD +++ b/pcr/minetest/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> pkgname=minetest-git -pkgver=20120409 -pkgrel=1 +pkgver=20120918 +pkgrel=2 pkgdesc="An Infiniminer/Minecraft inspired game, git version." arch=('i686' 'x86_64') url="http://celeron.55.lt/~celeron55/minetest/" diff --git a/pcr/ryzom-client/PKGBUILD b/pcr/ryzom-client/PKGBUILD index dbcd531f4..fce700054 100644 --- a/pcr/ryzom-client/PKGBUILD +++ b/pcr/ryzom-client/PKGBUILD @@ -1,42 +1,63 @@ # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> -pkgname=('ryzom-client') -pkgver=0.8.0 -pkgrel=7 +pkgname=ryzom-client-hg +pkgver=2691 +pkgrel=3 +pkgdesc='An awesome free software 3D MMORPG game' arch=('x86_64' 'i686') url="http://www.ryzom.com" license=('AGPL3') -pkgdesc="An awesome free software 3D MMORPG game" -depends=('ryzom-data' 'ryzom-nel' 'luabind') -conflicts=('ryzom-client') groups=('ryzom') +depends=('ryzom-data' 'ryzom-nel-hg' 'luabind') +makedepends=('mercurial' 'kervalasquish-hg' + 'cmake' 'bison' 'lua' 'luabind' + 'curl' 'libpng' 'libwww' + 'boost' 'ryzom-nel-hg') -makedepends=('kervalasquish-hg' 'cmake' 'bison' - 'lua' 'luabind' 'curl' 'libpng' 'libwww' - 'boost' 'ryzom-nel') +conflicts=('ryzom-client' 'ryzom-client-hg') +replaces=('ryzom-client') +backup=('etc/client_default.cfg') +source=('ftp://ftp.ryzom.com/1210062202_client_default.cfg') +noextract=() -auser="shackra" -achangeset="56d1642e24ac" - -source=("https://bitbucket.org/$auser/ryzom/get/$achangeset.tar.gz") +_hgroot=http://ryzom.hg.sourceforge.net:8000/hgroot/ryzom/ryzom +_hgrepo=ryzom build() { - cd "$srcdir/$auser-ryzom-$achangeset/code" - if [[ -d "ryzom-client" ]]; then - rm -rf "ryzom-client" - mkdir "ryzom-client" + cd "$srcdir" + msg "Connecting to Mercurial server...." + + if [[ -d "$_hgrepo" ]]; then + cd "$_hgrepo" + hg pull -u + msg "The local files are updated." else - mkdir "ryzom-client" + hg clone "$_hgroot" "$_hgrepo" fi - - cd "ryzom-client" - cmake .. -Wno-dev -DFINAL_VERSION=ON -DWITH_RYZOM_CLIENT=ON -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL=OFF -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin - make -j3 + msg "Mercurial checkout done or server timeout" + msg "Starting build..." + + rm -rf "$srcdir/$_hgrepo-build" + cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build" + mkdir "$srcdir/$_hgrepo-build/code/ryzom-client" + cd "$srcdir/$_hgrepo-build/code/ryzom-client" + + # + # BUILD HERE + # + cmake .. -Wno-dev -DFINAL_VERSION=ON -DWITH_RYZOM_CLIENT=ON -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL=OFF -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc -DRYZOM_GAMES_PREFIX=bin + + make -j3 + + # Replacing client_default.cfg file + cp "$srcdir/1210062202_client_default.cfg" "$srcdir/$_hgrepo-build/code/ryzom-client/ryzom/client/client_default.cfg" + sed -i s/"data"/"\/usr\/share\/ryzom\/data"/ "$srcdir/$_hgrepo-build/code/ryzom-client/ryzom/client/client_default.cfg" + sed -i 's/= 1\.33333;/= 1\.7777;/' "$srcdir/$_hgrepo-build/code/ryzom-client/ryzom/client/client_default.cfg" } package() { - cd "$srcdir/$auser-ryzom-$achangeset/code/$pkgname" + cd "$srcdir/$_hgrepo-build/code/ryzom-client" make DESTDIR="$pkgdir" install } -sha256sums=('0abcf7daa01dab27a3b9a9276e521369693963be3a25624b3195023495212bc2') +sha256sums=('0753c04dd7d61c43ec88d59428752b609d65f439eb1de9018bf922294e65966f') diff --git a/pcr/ryzom-nel/PKGBUILD b/pcr/ryzom-nel/PKGBUILD index b45bef098..bc9fa3199 100644 --- a/pcr/ryzom-nel/PKGBUILD +++ b/pcr/ryzom-nel/PKGBUILD @@ -1,53 +1,68 @@ # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> -pkgname='ryzom-nel' -pkgver=0.8.0 -pkgrel=11 +pkgname=ryzom-nel-hg +pkgver=2687 +pkgrel=3 +pkgdesc='An awesome free software 3D MMORPG game, NeL engine' arch=('x86_64' 'i686') -conflicts=('ryzom-nel') -groups=('ryzom') - -pkgdesc="An awesome free software 3D MMORPG game, NeL engine" url="http://www.ryzom.com" license=('AGPL3') -depends=('freetype2' - 'libx11' - 'mesa' - 'libxxf86vm' - 'openal' - 'freealut' - 'libogg' - 'libvorbis' - 'libxml2' - 'libjpeg' - 'rrdtool' ) -makedepends=('cmake' 'bison' 'kervalasquish-hg') - -auser="shackra" -achangeset="56d1642e24ac" - -source=("https://bitbucket.org/$auser/ryzom/get/$achangeset.tar.gz") +groups=('ryzom') +depends=('mercurial' + 'freetype2' + 'libx11' + 'mesa-git' + 'libxxf86vm' + 'openal' + 'freealut' + 'libogg' + 'libvorbis' + 'libxml2' + 'libjpeg-turbo' + 'rrdtool' + 'libgl-git') +makedepends=('mercurial' 'cmake' 'bison') + +conflicts=('ryzom-nel' 'ryzom-nel-hg') +replaces=('ryzom-nel') +backup=('etc/nel/build_ig_boxes.cfg' + 'etc/nel/build_indoor_rbank.cfg' + 'etc/nel/build_rbank.cfg' + 'etc/nel/make_sheet_id.cfg' + 'etc/nel/zviewer.cfg') + +_hgroot=http://ryzom.hg.sourceforge.net/hgroot/ryzom/ryzom +_hgrepo=ryzom build() { - cd "$srcdir/$auser-ryzom-$achangeset/code" - - if [[ -d $pkgname ]]; then - rm -rf $pkgname - mkdir $pkgname + cd "$srcdir" + msg "Connecting to Mercurial server...." + + if [[ -d "$_hgrepo" ]]; then + cd "$_hgrepo" + hg pull -u + msg "The local files are updated." else - mkdir $pkgname + hg clone "$_hgroot" "$_hgrepo" fi - cd $pkgname + msg "Mercurial checkout done or server timeout" + msg "Starting build..." - #CMAKE_USE_RELATIVE_PATHS=true - cmake .. -Wno-dev -DWITH_RYZOM=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL=ON -DCMAKE_INSTALL_PREFIX=/usr -DNL_ETC_PREFIX=/etc/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DNL_SHARE_PREFIX=/usr/share/nel -DNL_BIN_PREFIX=/usr/bin -DNL_SBIN_PREFIX=/usr/sbin -DNL_LIB_PREFIX=/usr/lib/nel -DNL_DRIVER_PREFIX=/usr/lib/nel + rm -rf "$srcdir/$_hgrepo-build" + cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build" + mkdir "$srcdir/$_hgrepo-build/code/ryzom-nel" + cd "$srcdir/$_hgrepo-build/code/ryzom-nel" - make -j3 + # + # BUILD HERE + # + cmake .. -Wno-dev -DWITH_RYZOM=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL=ON -DCMAKE_INSTALL_PREFIX=/usr -DNL_ETC_PREFIX=/etc/nel + + make -j3 } package() { - cd "$srcdir/$auser-ryzom-$achangeset/code/$pkgname" + cd "$srcdir/$_hgrepo-build/code/ryzom-nel" make DESTDIR="$pkgdir" install } -sha256sums=('0abcf7daa01dab27a3b9a9276e521369693963be3a25624b3195023495212bc2') diff --git a/pcr/yate/PKGBUILD b/pcr/yate/PKGBUILD index 01428fa27..e668cd3ae 100644 --- a/pcr/yate/PKGBUILD +++ b/pcr/yate/PKGBUILD @@ -2,20 +2,21 @@ # Contributor: Yejun Yang <yejunx AT gmail DOT com> # Contributor: Biru Ionut <ionut@archlinux.ro> pkgname=yate - pkgver=4.1.0 + pkgver=4.2.0 pkgrel=1 pkgdesc="next-generation telephony engine" arch=('i686' 'x86_64') url="http://yate.null.ro" license=('GPL') depends=('speex' 'gsm' 'postgresql-libs' 'libmysqlclient' \ - 'alsa-lib') + 'alsa-lib' 'qt') makedepends=('pkgconfig') - source=(http://yate.null.ro/tarballs/yate4/${pkgname}-${pkgver}-1.tar.gz yate.init) + source=(http://yate.null.ro/tarballs/yate4/${pkgname}-${pkgver}-2.tar.gz yate.init) options=(!makeflags) - md5sums=('06adaa9b8dc4f18908b35e9659ab9ad5' - 'c0d344607046c47c1d75ac23d323817a') + md5sums=('e6fd37f26ff5c50aa3fa16f6b2803d68' + 'c0d344607046c47c1d75ac23d323817a') + build() { cd $srcdir/${pkgname} diff --git a/testing/asymptote/PKGBUILD b/testing/asymptote/PKGBUILD new file mode 100644 index 000000000..42ebbfb05 --- /dev/null +++ b/testing/asymptote/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 168270 2012-10-07 11:20:35Z remy $ +# Maintainer: Rémy Oudompheng <remy@archlinux.org> +# Contributor: Firmicus <francois.archlinux.org> +# Contributor: bender02 at gmx dot com + +pkgname=asymptote +pkgver=2.20 +pkgrel=1 +pkgdesc="A vector graphics language (like metapost)" +arch=('i686' 'x86_64') +url="http://asymptote.sourceforge.net/" +license=("GPL3") +depends=('texlive-core' 'gc' 'freeglut' 'glu' 'gsl' 'fftw' 'libsigsegv') +makedepends=('ghostscript' 'imagemagick') +optdepends=('python2: for the xasy GUI' + 'python-imaging: for the xasy GUI' + 'tix: for the xasy GUI') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tgz) +install=texlive.install +sha1sums=('4c86ab71cff57a592944303b11d9bb6ec34f1cbd') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --enable-gc=/usr \ + --prefix=/usr \ + --with-latex=/usr/share/texmf/tex/latex \ + --with-context=/usr/share/texmf/tex/context + make all +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check-all +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make -j1 DESTDIR="${pkgdir}" install-all + sed -i -e 's@env python@env python2@' ${pkgdir}/usr/share/asymptote/GUI/*.py + # this dir contains png files that are already embedded in the pdf documentation: + rm -rf ${pkgdir}/usr/share/info/asymptote +} diff --git a/testing/asymptote/texlive.install b/testing/asymptote/texlive.install new file mode 100644 index 000000000..a7e61f209 --- /dev/null +++ b/testing/asymptote/texlive.install @@ -0,0 +1,20 @@ +info_dir=usr/share/info + +post_install() { + install-info ${info_dir}/asy-faq.info.gz ${info_dir}/dir + echo ">>> updating the filename database for texlive..." + mktexlsr --quiet usr/share/texmf +} + +post_upgrade() { + post_install +} + +pre_remove() { + install-info --delete ${info_dir}/asy-faq.info.gz ${info_dir}/dir +} + +post_remove() { + echo ">>> updating the filename database for texlive..." + mktexlsr --quiet usr/share/texmf +} diff --git a/testing/bzflag/PKGBUILD b/testing/bzflag/PKGBUILD index e1eb83023..6bfbcb8af 100644 --- a/testing/bzflag/PKGBUILD +++ b/testing/bzflag/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 164278 2012-07-29 21:07:44Z eric $ +# $Id: PKGBUILD 168265 2012-10-07 09:47:30Z 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.0 -pkgrel=4 +pkgver=2.4.2 +pkgrel=1 pkgdesc='Multiplayer 3D tank battle game' url='http://bzflag.org/' license=('LGPL') options=('!libtool') arch=('i686' 'x86_64') -depends=('curl' 'glew' 'mesa' 'sdl') +depends=('curl' 'glew' 'glu' 'sdl') source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2") -sha1sums=('af469d63af7143479176ea0ac91ce2eaa6e4561f') +sha1sums=('36c67c0734a1318b34b39ed0da49606e05ebd291') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/ftgl/PKGBUILD b/testing/ftgl/PKGBUILD new file mode 100644 index 000000000..590190dae --- /dev/null +++ b/testing/ftgl/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 168280 2012-10-07 17:22:30Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Alexander Baldeck <alexander@archlinux.org> +# Contributor: tobias <tobias@archlinux.org> + +pkgname=ftgl +_pkgver=2.1.3-rc5 +pkgver=${_pkgver/-/} +pkgrel=4 +pkgdesc="OpenGL library to use arbitrary fonts" +arch=(i686 x86_64) +url="http://ftgl.wiki.sourceforge.net/" +license=(MIT) +depends=(freetype2 mesa glu) +makedepends=(doxygen) +options=('!libtool') +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$_pkgver.tar.bz2") +md5sums=('c7879018cde844059495b3029b0b6503') + +build() { + cd "$srcdir/$pkgname-${_pkgver/-/~}" + ./configure --prefix=/usr --with-pic --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-${_pkgver/-/~}" + make DESTDIR="$pkgdir" install + + # FS#23283: install missing headers for OpenCascade + install -m644 src/FT{Face,Library,Size}.h "$pkgdir/usr/include/FTGL/" + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/testing/gcc/PKGBUILD b/testing/gcc/PKGBUILD index f26b1d7ca..331627a12 100644 --- a/testing/gcc/PKGBUILD +++ b/testing/gcc/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 165238 2012-08-14 08:29:48Z allan $ +# $Id: PKGBUILD 168263 2012-10-07 08:55:23Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc # NOTE: libtool requires rebuilt with each new gcc version pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') -pkgver=4.7.1 -pkgrel=6 -_snapshot=4.7-20120721 -_libstdcppmanver=20120725 # Note: check source directory name when updating this +pkgver=4.7.2 +pkgrel=1 +#_snapshot=4.7-20120721 +_libstdcppmanver=20120924 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -16,14 +16,14 @@ url="http://gcc.gnu.org" makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada') checkdepends=('dejagnu') options=('!libtool' '!emptydirs') -source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 +source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 + #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 gcc_pure64.patch gcc-4.7.1-libada-pic.patch gcc-4.7.1-libgo-write.patch) -md5sums=('a1a53fda426bc6809cede8e85bbaf2a3' - '79c4381f983b71868c02da3379e1e8a2' +md5sums=('cc308a0891e778cfda7a151ab8a6e762' + '7f3d52515daafffb57c287f427381106' 'ced48436c1b3c981d721a829f1094de1' '2acbc9d35cc9d72329dc71d6b1f162ef' 'df82dd175ac566c8a6d46b11ac21f14c') diff --git a/testing/glew/PKGBUILD b/testing/glew/PKGBUILD index fb56bab67..fe8b9d925 100644 --- a/testing/glew/PKGBUILD +++ b/testing/glew/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 164281 2012-07-29 21:08:24Z eric $ +# $Id: PKGBUILD 168296 2012-10-08 03:48:49Z eric $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: SleepyDog pkgname=glew pkgver=1.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="The OpenGL Extension Wrangler Library" arch=('i686' 'x86_64') url="http://glew.sourceforge.net" license=('BSD' 'MIT' 'GPL') -depends=('libxmu' 'libxi' 'mesa') +depends=('libxmu' 'libxi' 'glu') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz) sha1sums=('641c6bb3f924ec786e1e6cf2b1b230f594e0f0e4') diff --git a/testing/jasper/PKGBUILD b/testing/jasper/PKGBUILD new file mode 100644 index 000000000..dc7b9662c --- /dev/null +++ b/testing/jasper/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 168284 2012-10-07 21:09:20Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=jasper +pkgver=1.900.1 +pkgrel=8 +pkgdesc="A software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard" +arch=('i686' 'x86_64') +url="http://www.ece.uvic.ca/~mdadams/jasper/" +license=('custom:JasPer2.0') +depends=('libjpeg' 'freeglut' 'libxmu' 'glu') +options=('!libtool') +source=(http://www.ece.uvic.ca/~mdadams/${pkgname}/software/${pkgname}-${pkgver}.zip jpc_dec.c.patch + patch-libjasper-stepsizes-overflow.diff jasper-1.900.1-CVE-2008-3520.patch + jasper-1.900.1-CVE-2008-3522.patch) +sha1sums=('9c5735f773922e580bf98c7c7dfda9bbed4c5191' + 'c1a0176a15210c0af14d85e55ce566921957d780' + 'f298566fef08c8a589d072582112cd51c72c3983' + '2483dba925670bf29f531d85d73c4e5ada513b01' + '0e7b6142cd9240ffb15a1ed7297c43c76fa09ee4') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/jpc_dec.c.patch" + patch -p1 -i "${srcdir}/patch-libjasper-stepsizes-overflow.diff" + patch -p1 -i "${srcdir}/jasper-1.900.1-CVE-2008-3520.patch" + patch -p1 -i "${srcdir}/jasper-1.900.1-CVE-2008-3522.patch" + ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/testing/jasper/jasper-1.900.1-CVE-2008-3520.patch b/testing/jasper/jasper-1.900.1-CVE-2008-3520.patch new file mode 100644 index 000000000..0f5e3b746 --- /dev/null +++ b/testing/jasper/jasper-1.900.1-CVE-2008-3520.patch @@ -0,0 +1,928 @@ +https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3520 + +OpenBSD jas_malloc hardening patches + +diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_cm.c jasper-1.900.1/src/libjasper/base/jas_cm.c +--- jasper-1.900.1.orig/src/libjasper/base/jas_cm.c 2007-01-19 22:43:05.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/base/jas_cm.c 2009-10-22 10:27:45.000000000 +0200 +@@ -704,8 +704,7 @@ static int jas_cmpxformseq_resize(jas_cm + { + jas_cmpxform_t **p; + assert(n >= pxformseq->numpxforms); +- p = (!pxformseq->pxforms) ? jas_malloc(n * sizeof(jas_cmpxform_t *)) : +- jas_realloc(pxformseq->pxforms, n * sizeof(jas_cmpxform_t *)); ++ p = jas_realloc2(pxformseq->pxforms, n, sizeof(jas_cmpxform_t *)); + if (!p) { + return -1; + } +@@ -889,13 +888,13 @@ static int jas_cmshapmatlut_set(jas_cmsh + jas_cmshapmatlut_cleanup(lut); + if (curv->numents == 0) { + lut->size = 2; +- if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t)))) ++ if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t)))) + goto error; + lut->data[0] = 0.0; + lut->data[1] = 1.0; + } else if (curv->numents == 1) { + lut->size = 256; +- if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t)))) ++ if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t)))) + goto error; + gamma = curv->ents[0] / 256.0; + for (i = 0; i < lut->size; ++i) { +@@ -903,7 +902,7 @@ static int jas_cmshapmatlut_set(jas_cmsh + } + } else { + lut->size = curv->numents; +- if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t)))) ++ if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t)))) + goto error; + for (i = 0; i < lut->size; ++i) { + lut->data[i] = curv->ents[i] / 65535.0; +@@ -953,7 +952,7 @@ static int jas_cmshapmatlut_invert(jas_c + return -1; + } + } +- if (!(invlut->data = jas_malloc(n * sizeof(jas_cmreal_t)))) ++ if (!(invlut->data = jas_alloc2(n, sizeof(jas_cmreal_t)))) + return -1; + invlut->size = n; + for (i = 0; i < invlut->size; ++i) { +diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_icc.c jasper-1.900.1/src/libjasper/base/jas_icc.c +--- jasper-1.900.1.orig/src/libjasper/base/jas_icc.c 2007-01-19 22:43:05.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/base/jas_icc.c 2009-10-22 10:27:45.000000000 +0200 +@@ -373,7 +373,7 @@ int jas_iccprof_save(jas_iccprof_t *prof + jas_icctagtab_t *tagtab; + + tagtab = &prof->tagtab; +- if (!(tagtab->ents = jas_malloc(prof->attrtab->numattrs * ++ if (!(tagtab->ents = jas_alloc2(prof->attrtab->numattrs, + sizeof(jas_icctagtabent_t)))) + goto error; + tagtab->numents = prof->attrtab->numattrs; +@@ -522,7 +522,7 @@ static int jas_iccprof_gettagtab(jas_str + } + if (jas_iccgetuint32(in, &tagtab->numents)) + goto error; +- if (!(tagtab->ents = jas_malloc(tagtab->numents * ++ if (!(tagtab->ents = jas_alloc2(tagtab->numents, + sizeof(jas_icctagtabent_t)))) + goto error; + tagtabent = tagtab->ents; +@@ -743,8 +743,7 @@ static int jas_iccattrtab_resize(jas_icc + { + jas_iccattr_t *newattrs; + assert(maxents >= tab->numattrs); +- newattrs = tab->attrs ? jas_realloc(tab->attrs, maxents * +- sizeof(jas_iccattr_t)) : jas_malloc(maxents * sizeof(jas_iccattr_t)); ++ newattrs = jas_realloc2(tab->attrs, maxents, sizeof(jas_iccattr_t)); + if (!newattrs) + return -1; + tab->attrs = newattrs; +@@ -999,7 +998,7 @@ static int jas_icccurv_input(jas_iccattr + + if (jas_iccgetuint32(in, &curv->numents)) + goto error; +- if (!(curv->ents = jas_malloc(curv->numents * sizeof(jas_iccuint16_t)))) ++ if (!(curv->ents = jas_alloc2(curv->numents, sizeof(jas_iccuint16_t)))) + goto error; + for (i = 0; i < curv->numents; ++i) { + if (jas_iccgetuint16(in, &curv->ents[i])) +@@ -1100,7 +1099,7 @@ static int jas_icctxtdesc_input(jas_icca + if (jas_iccgetuint32(in, &txtdesc->uclangcode) || + jas_iccgetuint32(in, &txtdesc->uclen)) + goto error; +- if (!(txtdesc->ucdata = jas_malloc(txtdesc->uclen * 2))) ++ if (!(txtdesc->ucdata = jas_alloc2(txtdesc->uclen, 2))) + goto error; + if (jas_stream_read(in, txtdesc->ucdata, txtdesc->uclen * 2) != + JAS_CAST(int, txtdesc->uclen * 2)) +@@ -1292,17 +1291,17 @@ static int jas_icclut8_input(jas_iccattr + jas_iccgetuint16(in, &lut8->numouttabents)) + goto error; + clutsize = jas_iccpowi(lut8->clutlen, lut8->numinchans) * lut8->numoutchans; +- if (!(lut8->clut = jas_malloc(clutsize * sizeof(jas_iccuint8_t))) || +- !(lut8->intabsbuf = jas_malloc(lut8->numinchans * +- lut8->numintabents * sizeof(jas_iccuint8_t))) || +- !(lut8->intabs = jas_malloc(lut8->numinchans * ++ if (!(lut8->clut = jas_alloc2(clutsize, sizeof(jas_iccuint8_t))) || ++ !(lut8->intabsbuf = jas_alloc3(lut8->numinchans, ++ lut8->numintabents, sizeof(jas_iccuint8_t))) || ++ !(lut8->intabs = jas_alloc2(lut8->numinchans, + sizeof(jas_iccuint8_t *)))) + goto error; + for (i = 0; i < lut8->numinchans; ++i) + lut8->intabs[i] = &lut8->intabsbuf[i * lut8->numintabents]; +- if (!(lut8->outtabsbuf = jas_malloc(lut8->numoutchans * +- lut8->numouttabents * sizeof(jas_iccuint8_t))) || +- !(lut8->outtabs = jas_malloc(lut8->numoutchans * ++ if (!(lut8->outtabsbuf = jas_alloc3(lut8->numoutchans, ++ lut8->numouttabents, sizeof(jas_iccuint8_t))) || ++ !(lut8->outtabs = jas_alloc2(lut8->numoutchans, + sizeof(jas_iccuint8_t *)))) + goto error; + for (i = 0; i < lut8->numoutchans; ++i) +@@ -1461,17 +1460,17 @@ static int jas_icclut16_input(jas_iccatt + jas_iccgetuint16(in, &lut16->numouttabents)) + goto error; + clutsize = jas_iccpowi(lut16->clutlen, lut16->numinchans) * lut16->numoutchans; +- if (!(lut16->clut = jas_malloc(clutsize * sizeof(jas_iccuint16_t))) || +- !(lut16->intabsbuf = jas_malloc(lut16->numinchans * +- lut16->numintabents * sizeof(jas_iccuint16_t))) || +- !(lut16->intabs = jas_malloc(lut16->numinchans * ++ if (!(lut16->clut = jas_alloc2(clutsize, sizeof(jas_iccuint16_t))) || ++ !(lut16->intabsbuf = jas_alloc3(lut16->numinchans, ++ lut16->numintabents, sizeof(jas_iccuint16_t))) || ++ !(lut16->intabs = jas_alloc2(lut16->numinchans, + sizeof(jas_iccuint16_t *)))) + goto error; + for (i = 0; i < lut16->numinchans; ++i) + lut16->intabs[i] = &lut16->intabsbuf[i * lut16->numintabents]; +- if (!(lut16->outtabsbuf = jas_malloc(lut16->numoutchans * +- lut16->numouttabents * sizeof(jas_iccuint16_t))) || +- !(lut16->outtabs = jas_malloc(lut16->numoutchans * ++ if (!(lut16->outtabsbuf = jas_alloc3(lut16->numoutchans, ++ lut16->numouttabents, sizeof(jas_iccuint16_t))) || ++ !(lut16->outtabs = jas_alloc2(lut16->numoutchans, + sizeof(jas_iccuint16_t *)))) + goto error; + for (i = 0; i < lut16->numoutchans; ++i) +diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_image.c jasper-1.900.1/src/libjasper/base/jas_image.c +--- jasper-1.900.1.orig/src/libjasper/base/jas_image.c 2007-01-19 22:43:05.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/base/jas_image.c 2009-10-22 10:27:45.000000000 +0200 +@@ -142,7 +142,7 @@ jas_image_t *jas_image_create(int numcmp + image->inmem_ = true; + + /* Allocate memory for the per-component information. */ +- if (!(image->cmpts_ = jas_malloc(image->maxcmpts_ * ++ if (!(image->cmpts_ = jas_alloc2(image->maxcmpts_, + sizeof(jas_image_cmpt_t *)))) { + jas_image_destroy(image); + return 0; +@@ -774,8 +774,7 @@ static int jas_image_growcmpts(jas_image + jas_image_cmpt_t **newcmpts; + int cmptno; + +- newcmpts = (!image->cmpts_) ? jas_malloc(maxcmpts * sizeof(jas_image_cmpt_t *)) : +- jas_realloc(image->cmpts_, maxcmpts * sizeof(jas_image_cmpt_t *)); ++ newcmpts = jas_realloc2(image->cmpts_, maxcmpts, sizeof(jas_image_cmpt_t *)); + if (!newcmpts) { + return -1; + } +diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_malloc.c jasper-1.900.1/src/libjasper/base/jas_malloc.c +--- jasper-1.900.1.orig/src/libjasper/base/jas_malloc.c 2007-01-19 22:43:05.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/base/jas_malloc.c 2009-10-22 10:27:45.000000000 +0200 +@@ -76,6 +76,9 @@ + + /* We need the prototype for memset. */ + #include <string.h> ++#include <limits.h> ++#include <errno.h> ++#include <stdint.h> + + #include "jasper/jas_malloc.h" + +@@ -113,18 +116,50 @@ void jas_free(void *ptr) + + void *jas_realloc(void *ptr, size_t size) + { +- return realloc(ptr, size); ++ return ptr ? realloc(ptr, size) : malloc(size); + } + +-void *jas_calloc(size_t nmemb, size_t size) ++void *jas_realloc2(void *ptr, size_t nmemb, size_t size) ++{ ++ if (!ptr) ++ return jas_alloc2(nmemb, size); ++ if (nmemb && SIZE_MAX / nmemb < size) { ++ errno = ENOMEM; ++ return NULL; ++ } ++ return jas_realloc(ptr, nmemb * size); ++ ++} ++ ++void *jas_alloc2(size_t nmemb, size_t size) ++{ ++ if (nmemb && SIZE_MAX / nmemb < size) { ++ errno = ENOMEM; ++ return NULL; ++ } ++ ++ return jas_malloc(nmemb * size); ++} ++ ++void *jas_alloc3(size_t a, size_t b, size_t c) + { +- void *ptr; + size_t n; +- n = nmemb * size; +- if (!(ptr = jas_malloc(n * sizeof(char)))) { +- return 0; ++ ++ if (a && SIZE_MAX / a < b) { ++ errno = ENOMEM; ++ return NULL; + } +- memset(ptr, 0, n); ++ ++ return jas_alloc2(a*b, c); ++} ++ ++void *jas_calloc(size_t nmemb, size_t size) ++{ ++ void *ptr; ++ ++ ptr = jas_alloc2(nmemb, size); ++ if (ptr) ++ memset(ptr, 0, nmemb*size); + return ptr; + } + +diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_seq.c jasper-1.900.1/src/libjasper/base/jas_seq.c +--- jasper-1.900.1.orig/src/libjasper/base/jas_seq.c 2007-01-19 22:43:05.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/base/jas_seq.c 2009-10-22 10:27:45.000000000 +0200 +@@ -114,7 +114,7 @@ jas_matrix_t *jas_matrix_create(int numr + matrix->datasize_ = numrows * numcols; + + if (matrix->maxrows_ > 0) { +- if (!(matrix->rows_ = jas_malloc(matrix->maxrows_ * ++ if (!(matrix->rows_ = jas_alloc2(matrix->maxrows_, + sizeof(jas_seqent_t *)))) { + jas_matrix_destroy(matrix); + return 0; +@@ -122,7 +122,7 @@ jas_matrix_t *jas_matrix_create(int numr + } + + if (matrix->datasize_ > 0) { +- if (!(matrix->data_ = jas_malloc(matrix->datasize_ * ++ if (!(matrix->data_ = jas_alloc2(matrix->datasize_, + sizeof(jas_seqent_t)))) { + jas_matrix_destroy(matrix); + return 0; +@@ -220,7 +220,7 @@ void jas_matrix_bindsub(jas_matrix_t *ma + mat0->numrows_ = r1 - r0 + 1; + mat0->numcols_ = c1 - c0 + 1; + mat0->maxrows_ = mat0->numrows_; +- mat0->rows_ = jas_malloc(mat0->maxrows_ * sizeof(jas_seqent_t *)); ++ mat0->rows_ = jas_alloc2(mat0->maxrows_, sizeof(jas_seqent_t *)); + for (i = 0; i < mat0->numrows_; ++i) { + mat0->rows_[i] = mat1->rows_[r0 + i] + c0; + } +diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_stream.c jasper-1.900.1/src/libjasper/base/jas_stream.c +--- jasper-1.900.1.orig/src/libjasper/base/jas_stream.c 2007-01-19 22:43:05.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/base/jas_stream.c 2009-10-22 10:27:45.000000000 +0200 +@@ -212,7 +212,7 @@ jas_stream_t *jas_stream_memopen(char *b + if (buf) { + obj->buf_ = (unsigned char *) buf; + } else { +- obj->buf_ = jas_malloc(obj->bufsize_ * sizeof(char)); ++ obj->buf_ = jas_malloc(obj->bufsize_); + obj->myalloc_ = 1; + } + if (!obj->buf_) { +@@ -992,7 +992,7 @@ static int mem_resize(jas_stream_memobj_ + unsigned char *buf; + + assert(m->buf_); +- if (!(buf = jas_realloc(m->buf_, bufsize * sizeof(unsigned char)))) { ++ if (!(buf = jas_realloc(m->buf_, bufsize))) { + return -1; + } + m->buf_ = buf; +diff -pruN jasper-1.900.1.orig/src/libjasper/bmp/bmp_dec.c jasper-1.900.1/src/libjasper/bmp/bmp_dec.c +--- jasper-1.900.1.orig/src/libjasper/bmp/bmp_dec.c 2007-01-19 22:43:07.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/bmp/bmp_dec.c 2009-10-22 10:27:45.000000000 +0200 +@@ -283,7 +283,7 @@ static bmp_info_t *bmp_getinfo(jas_strea + } + + if (info->numcolors > 0) { +- if (!(info->palents = jas_malloc(info->numcolors * ++ if (!(info->palents = jas_alloc2(info->numcolors, + sizeof(bmp_palent_t)))) { + bmp_info_destroy(info); + return 0; +diff -pruN jasper-1.900.1.orig/src/libjasper/include/jasper/jas_malloc.h jasper-1.900.1/src/libjasper/include/jasper/jas_malloc.h +--- jasper-1.900.1.orig/src/libjasper/include/jasper/jas_malloc.h 2007-01-19 22:43:04.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/include/jasper/jas_malloc.h 2009-10-22 10:27:45.000000000 +0200 +@@ -95,6 +95,9 @@ extern "C" { + #define jas_free MEMFREE + #define jas_realloc MEMREALLOC + #define jas_calloc MEMCALLOC ++#define jas_alloc2(a, b) MEMALLOC((a)*(b)) ++#define jas_alloc3(a, b, c) MEMALLOC((a)*(b)*(c)) ++#define jas_realloc2(p, a, b) MEMREALLOC((p), (a)*(b)) + #endif + + /******************************************************************************\ +@@ -115,6 +118,12 @@ void *jas_realloc(void *ptr, size_t size + /* Allocate a block of memory and initialize the contents to zero. */ + void *jas_calloc(size_t nmemb, size_t size); + ++/* size-checked double allocation .*/ ++void *jas_alloc2(size_t, size_t); ++ ++void *jas_alloc3(size_t, size_t, size_t); ++ ++void *jas_realloc2(void *, size_t, size_t); + #endif + + #ifdef __cplusplus +diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_cod.c jasper-1.900.1/src/libjasper/jp2/jp2_cod.c +--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_cod.c 2007-01-19 22:43:05.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jp2/jp2_cod.c 2009-10-22 10:30:24.000000000 +0200 +@@ -247,7 +247,7 @@ jp2_box_t *jp2_box_get(jas_stream_t *in) + box = 0; + tmpstream = 0; + +- if (!(box = jas_malloc(sizeof(jp2_box_t)))) { ++ if (!(box = jas_calloc(1, sizeof(jp2_box_t)))) { + goto error; + } + box->ops = &jp2_boxinfo_unk.ops; +@@ -372,7 +372,7 @@ static int jp2_bpcc_getdata(jp2_box_t *b + jp2_bpcc_t *bpcc = &box->data.bpcc; + unsigned int i; + bpcc->numcmpts = box->datalen; +- if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts * sizeof(uint_fast8_t)))) { ++ if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts, sizeof(uint_fast8_t)))) { + return -1; + } + for (i = 0; i < bpcc->numcmpts; ++i) { +@@ -416,7 +416,7 @@ static int jp2_colr_getdata(jp2_box_t *b + break; + case JP2_COLR_ICC: + colr->iccplen = box->datalen - 3; +- if (!(colr->iccp = jas_malloc(colr->iccplen * sizeof(uint_fast8_t)))) { ++ if (!(colr->iccp = jas_alloc2(colr->iccplen, sizeof(uint_fast8_t)))) { + return -1; + } + if (jas_stream_read(in, colr->iccp, colr->iccplen) != colr->iccplen) { +@@ -453,7 +453,7 @@ static int jp2_cdef_getdata(jp2_box_t *b + if (jp2_getuint16(in, &cdef->numchans)) { + return -1; + } +- if (!(cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t)))) { ++ if (!(cdef->ents = jas_alloc2(cdef->numchans, sizeof(jp2_cdefchan_t)))) { + return -1; + } + for (channo = 0; channo < cdef->numchans; ++channo) { +@@ -766,7 +766,7 @@ static int jp2_cmap_getdata(jp2_box_t *b + unsigned int i; + + cmap->numchans = (box->datalen) / 4; +- if (!(cmap->ents = jas_malloc(cmap->numchans * sizeof(jp2_cmapent_t)))) { ++ if (!(cmap->ents = jas_alloc2(cmap->numchans, sizeof(jp2_cmapent_t)))) { + return -1; + } + for (i = 0; i < cmap->numchans; ++i) { +@@ -828,10 +828,10 @@ static int jp2_pclr_getdata(jp2_box_t *b + return -1; + } + lutsize = pclr->numlutents * pclr->numchans; +- if (!(pclr->lutdata = jas_malloc(lutsize * sizeof(int_fast32_t)))) { ++ if (!(pclr->lutdata = jas_alloc2(lutsize, sizeof(int_fast32_t)))) { + return -1; + } +- if (!(pclr->bpc = jas_malloc(pclr->numchans * sizeof(uint_fast8_t)))) { ++ if (!(pclr->bpc = jas_alloc2(pclr->numchans, sizeof(uint_fast8_t)))) { + return -1; + } + for (i = 0; i < pclr->numchans; ++i) { +diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c jasper-1.900.1/src/libjasper/jp2/jp2_dec.c +--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c 2007-01-19 22:43:05.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c 2009-10-22 10:27:45.000000000 +0200 +@@ -336,7 +336,7 @@ jas_image_t *jp2_decode(jas_stream_t *in + } + + /* Allocate space for the channel-number to component-number LUT. */ +- if (!(dec->chantocmptlut = jas_malloc(dec->numchans * sizeof(uint_fast16_t)))) { ++ if (!(dec->chantocmptlut = jas_alloc2(dec->numchans, sizeof(uint_fast16_t)))) { + jas_eprintf("error: no memory\n"); + goto error; + } +@@ -354,7 +354,7 @@ jas_image_t *jp2_decode(jas_stream_t *in + if (cmapent->map == JP2_CMAP_DIRECT) { + dec->chantocmptlut[channo] = channo; + } else if (cmapent->map == JP2_CMAP_PALETTE) { +- lutents = jas_malloc(pclrd->numlutents * sizeof(int_fast32_t)); ++ lutents = jas_alloc2(pclrd->numlutents, sizeof(int_fast32_t)); + for (i = 0; i < pclrd->numlutents; ++i) { + lutents[i] = pclrd->lutdata[cmapent->pcol + i * pclrd->numchans]; + } +diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_enc.c jasper-1.900.1/src/libjasper/jp2/jp2_enc.c +--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_enc.c 2007-01-19 22:43:05.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jp2/jp2_enc.c 2009-10-22 10:27:45.000000000 +0200 +@@ -191,7 +191,7 @@ int sgnd; + } + bpcc = &box->data.bpcc; + bpcc->numcmpts = jas_image_numcmpts(image); +- if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts * ++ if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts, + sizeof(uint_fast8_t)))) { + goto error; + } +@@ -285,7 +285,7 @@ int sgnd; + } + cdef = &box->data.cdef; + cdef->numchans = jas_image_numcmpts(image); +- cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t)); ++ cdef->ents = jas_alloc2(cdef->numchans, sizeof(jp2_cdefchan_t)); + for (i = 0; i < jas_image_numcmpts(image); ++i) { + cdefchanent = &cdef->ents[i]; + cdefchanent->channo = i; +diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c jasper-1.900.1/src/libjasper/jpc/jpc_cs.c +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c 2009-10-22 09:58:16.000000000 +0200 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_cs.c 2009-10-22 10:27:45.000000000 +0200 +@@ -502,7 +502,7 @@ static int jpc_siz_getparms(jpc_ms_t *ms + !siz->tileheight || !siz->numcomps) { + return -1; + } +- if (!(siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t)))) { ++ if (!(siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t)))) { + return -1; + } + for (i = 0; i < siz->numcomps; ++i) { +@@ -986,7 +986,7 @@ static int jpc_qcx_getcompparms(jpc_qcxc + jpc_qcx_destroycompparms(compparms); + return -1; + } else if (compparms->numstepsizes > 0) { +- compparms->stepsizes = jas_malloc(compparms->numstepsizes * ++ compparms->stepsizes = jas_alloc2(compparms->numstepsizes, + sizeof(uint_fast16_t)); + assert(compparms->stepsizes); + for (i = 0; i < compparms->numstepsizes; ++i) { +@@ -1094,7 +1094,7 @@ static int jpc_ppm_getparms(jpc_ms_t *ms + + ppm->len = ms->len - 1; + if (ppm->len > 0) { +- if (!(ppm->data = jas_malloc(ppm->len * sizeof(unsigned char)))) { ++ if (!(ppm->data = jas_malloc(ppm->len))) { + goto error; + } + if (JAS_CAST(uint, jas_stream_read(in, ppm->data, ppm->len)) != ppm->len) { +@@ -1163,7 +1163,7 @@ static int jpc_ppt_getparms(jpc_ms_t *ms + } + ppt->len = ms->len - 1; + if (ppt->len > 0) { +- if (!(ppt->data = jas_malloc(ppt->len * sizeof(unsigned char)))) { ++ if (!(ppt->data = jas_malloc(ppt->len))) { + goto error; + } + if (jas_stream_read(in, (char *) ppt->data, ppt->len) != JAS_CAST(int, ppt->len)) { +@@ -1226,7 +1226,7 @@ static int jpc_poc_getparms(jpc_ms_t *ms + uint_fast8_t tmp; + poc->numpchgs = (cstate->numcomps > 256) ? (ms->len / 9) : + (ms->len / 7); +- if (!(poc->pchgs = jas_malloc(poc->numpchgs * sizeof(jpc_pocpchg_t)))) { ++ if (!(poc->pchgs = jas_alloc2(poc->numpchgs, sizeof(jpc_pocpchg_t)))) { + goto error; + } + for (pchgno = 0, pchg = poc->pchgs; pchgno < poc->numpchgs; ++pchgno, +@@ -1331,7 +1331,7 @@ static int jpc_crg_getparms(jpc_ms_t *ms + jpc_crgcomp_t *comp; + uint_fast16_t compno; + crg->numcomps = cstate->numcomps; +- if (!(crg->comps = jas_malloc(cstate->numcomps * sizeof(uint_fast16_t)))) { ++ if (!(crg->comps = jas_alloc2(cstate->numcomps, sizeof(uint_fast16_t)))) { + return -1; + } + for (compno = 0, comp = crg->comps; compno < cstate->numcomps; +@@ -1470,7 +1470,7 @@ static int jpc_unk_getparms(jpc_ms_t *ms + cstate = 0; + + if (ms->len > 0) { +- if (!(unk->data = jas_malloc(ms->len * sizeof(unsigned char)))) { ++ if (!(unk->data = jas_malloc(ms->len))) { + return -1; + } + if (jas_stream_read(in, (char *) unk->data, ms->len) != JAS_CAST(int, ms->len)) { +diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c jasper-1.900.1/src/libjasper/jpc/jpc_dec.c +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c 2009-10-22 09:58:16.000000000 +0200 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_dec.c 2009-10-22 10:30:50.000000000 +0200 +@@ -449,7 +449,7 @@ static int jpc_dec_process_sot(jpc_dec_t + + if (dec->state == JPC_MH) { + +- compinfos = jas_malloc(dec->numcomps * sizeof(jas_image_cmptparm_t)); ++ compinfos = jas_alloc2(dec->numcomps, sizeof(jas_image_cmptparm_t)); + assert(compinfos); + for (cmptno = 0, cmpt = dec->cmpts, compinfo = compinfos; + cmptno < dec->numcomps; ++cmptno, ++cmpt, ++compinfo) { +@@ -692,7 +692,7 @@ static int jpc_dec_tileinit(jpc_dec_t *d + tile->realmode = 1; + } + tcomp->numrlvls = ccp->numrlvls; +- if (!(tcomp->rlvls = jas_malloc(tcomp->numrlvls * ++ if (!(tcomp->rlvls = jas_alloc2(tcomp->numrlvls, + sizeof(jpc_dec_rlvl_t)))) { + return -1; + } +@@ -764,7 +764,7 @@ rlvl->bands = 0; + rlvl->cbgheightexpn); + + rlvl->numbands = (!rlvlno) ? 1 : 3; +- if (!(rlvl->bands = jas_malloc(rlvl->numbands * ++ if (!(rlvl->bands = jas_alloc2(rlvl->numbands, + sizeof(jpc_dec_band_t)))) { + return -1; + } +@@ -797,7 +797,7 @@ rlvl->bands = 0; + + assert(rlvl->numprcs); + +- if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_dec_prc_t)))) { ++ if (!(band->prcs = jas_alloc2(rlvl->numprcs, sizeof(jpc_dec_prc_t)))) { + return -1; + } + +@@ -834,7 +834,7 @@ rlvl->bands = 0; + if (!(prc->numimsbstagtree = jpc_tagtree_create(prc->numhcblks, prc->numvcblks))) { + return -1; + } +- if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_dec_cblk_t)))) { ++ if (!(prc->cblks = jas_alloc2(prc->numcblks, sizeof(jpc_dec_cblk_t)))) { + return -1; + } + +@@ -1181,7 +1181,7 @@ static int jpc_dec_process_siz(jpc_dec_t + return -1; + } + +- if (!(dec->cmpts = jas_malloc(dec->numcomps * sizeof(jpc_dec_cmpt_t)))) { ++ if (!(dec->cmpts = jas_alloc2(dec->numcomps, sizeof(jpc_dec_cmpt_t)))) { + return -1; + } + +@@ -1204,7 +1204,7 @@ static int jpc_dec_process_siz(jpc_dec_t + dec->numhtiles = JPC_CEILDIV(dec->xend - dec->tilexoff, dec->tilewidth); + dec->numvtiles = JPC_CEILDIV(dec->yend - dec->tileyoff, dec->tileheight); + dec->numtiles = dec->numhtiles * dec->numvtiles; +- if (!(dec->tiles = jas_malloc(dec->numtiles * sizeof(jpc_dec_tile_t)))) { ++ if (!(dec->tiles = jas_calloc(dec->numtiles, sizeof(jpc_dec_tile_t)))) { + return -1; + } + +@@ -1228,7 +1228,7 @@ static int jpc_dec_process_siz(jpc_dec_t + tile->pkthdrstreampos = 0; + tile->pptstab = 0; + tile->cp = 0; +- if (!(tile->tcomps = jas_malloc(dec->numcomps * ++ if (!(tile->tcomps = jas_calloc(dec->numcomps, + sizeof(jpc_dec_tcomp_t)))) { + return -1; + } +@@ -1489,7 +1489,7 @@ static jpc_dec_cp_t *jpc_dec_cp_create(u + cp->numlyrs = 0; + cp->mctid = 0; + cp->csty = 0; +- if (!(cp->ccps = jas_malloc(cp->numcomps * sizeof(jpc_dec_ccp_t)))) { ++ if (!(cp->ccps = jas_alloc2(cp->numcomps, sizeof(jpc_dec_ccp_t)))) { + return 0; + } + if (!(cp->pchglist = jpc_pchglist_create())) { +@@ -2048,7 +2048,7 @@ jpc_streamlist_t *jpc_streamlist_create( + } + streamlist->numstreams = 0; + streamlist->maxstreams = 100; +- if (!(streamlist->streams = jas_malloc(streamlist->maxstreams * ++ if (!(streamlist->streams = jas_alloc2(streamlist->maxstreams, + sizeof(jas_stream_t *)))) { + jas_free(streamlist); + return 0; +@@ -2068,8 +2068,8 @@ int jpc_streamlist_insert(jpc_streamlist + /* Grow the array of streams if necessary. */ + if (streamlist->numstreams >= streamlist->maxstreams) { + newmaxstreams = streamlist->maxstreams + 1024; +- if (!(newstreams = jas_realloc(streamlist->streams, +- (newmaxstreams + 1024) * sizeof(jas_stream_t *)))) { ++ if (!(newstreams = jas_realloc2(streamlist->streams, ++ (newmaxstreams + 1024), sizeof(jas_stream_t *)))) { + return -1; + } + for (i = streamlist->numstreams; i < streamlist->maxstreams; ++i) { +@@ -2155,8 +2155,7 @@ int jpc_ppxstab_grow(jpc_ppxstab_t *tab, + { + jpc_ppxstabent_t **newents; + if (tab->maxents < maxents) { +- newents = (tab->ents) ? jas_realloc(tab->ents, maxents * +- sizeof(jpc_ppxstabent_t *)) : jas_malloc(maxents * sizeof(jpc_ppxstabent_t *)); ++ newents = jas_realloc2(tab->ents, maxents, sizeof(jpc_ppxstabent_t *)); + if (!newents) { + return -1; + } +diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_enc.c jasper-1.900.1/src/libjasper/jpc/jpc_enc.c +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_enc.c 2007-01-19 22:43:07.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_enc.c 2009-10-22 10:27:45.000000000 +0200 +@@ -403,7 +403,7 @@ static jpc_enc_cp_t *cp_create(char *opt + vsteplcm *= jas_image_cmptvstep(image, cmptno); + } + +- if (!(cp->ccps = jas_malloc(cp->numcmpts * sizeof(jpc_enc_ccp_t)))) { ++ if (!(cp->ccps = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_ccp_t)))) { + goto error; + } + for (cmptno = 0, ccp = cp->ccps; cmptno < JAS_CAST(int, cp->numcmpts); ++cmptno, +@@ -656,7 +656,7 @@ static jpc_enc_cp_t *cp_create(char *opt + + if (ilyrrates && numilyrrates > 0) { + tcp->numlyrs = numilyrrates + 1; +- if (!(tcp->ilyrrates = jas_malloc((tcp->numlyrs - 1) * ++ if (!(tcp->ilyrrates = jas_alloc2((tcp->numlyrs - 1), + sizeof(jpc_fix_t)))) { + goto error; + } +@@ -940,7 +940,7 @@ startoff = jas_stream_getrwcount(enc->ou + siz->tilewidth = cp->tilewidth; + siz->tileheight = cp->tileheight; + siz->numcomps = cp->numcmpts; +- siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t)); ++ siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t)); + assert(siz->comps); + for (i = 0; i < JAS_CAST(int, cp->numcmpts); ++i) { + siz->comps[i].prec = cp->ccps[i].prec; +@@ -977,7 +977,7 @@ startoff = jas_stream_getrwcount(enc->ou + return -1; + } + crg = &enc->mrk->parms.crg; +- crg->comps = jas_malloc(crg->numcomps * sizeof(jpc_crgcomp_t)); ++ crg->comps = jas_alloc2(crg->numcomps, sizeof(jpc_crgcomp_t)); + if (jpc_putms(enc->out, enc->cstate, enc->mrk)) { + jas_eprintf("cannot write CRG marker\n"); + return -1; +@@ -1955,7 +1955,7 @@ jpc_enc_tile_t *jpc_enc_tile_create(jpc_ + tile->mctid = cp->tcp.mctid; + + tile->numlyrs = cp->tcp.numlyrs; +- if (!(tile->lyrsizes = jas_malloc(tile->numlyrs * ++ if (!(tile->lyrsizes = jas_alloc2(tile->numlyrs, + sizeof(uint_fast32_t)))) { + goto error; + } +@@ -1964,7 +1964,7 @@ jpc_enc_tile_t *jpc_enc_tile_create(jpc_ + } + + /* Allocate an array for the per-tile-component information. */ +- if (!(tile->tcmpts = jas_malloc(cp->numcmpts * sizeof(jpc_enc_tcmpt_t)))) { ++ if (!(tile->tcmpts = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_tcmpt_t)))) { + goto error; + } + /* Initialize a few members critical for error recovery. */ +@@ -2110,7 +2110,7 @@ static jpc_enc_tcmpt_t *tcmpt_create(jpc + jas_seq2d_ystart(tcmpt->data), jas_seq2d_xend(tcmpt->data), + jas_seq2d_yend(tcmpt->data), bandinfos); + +- if (!(tcmpt->rlvls = jas_malloc(tcmpt->numrlvls * sizeof(jpc_enc_rlvl_t)))) { ++ if (!(tcmpt->rlvls = jas_alloc2(tcmpt->numrlvls, sizeof(jpc_enc_rlvl_t)))) { + goto error; + } + for (rlvlno = 0, rlvl = tcmpt->rlvls; rlvlno < tcmpt->numrlvls; +@@ -2213,7 +2213,7 @@ static jpc_enc_rlvl_t *rlvl_create(jpc_e + rlvl->numvprcs = JPC_FLOORDIVPOW2(brprcbry - tlprctly, rlvl->prcheightexpn); + rlvl->numprcs = rlvl->numhprcs * rlvl->numvprcs; + +- if (!(rlvl->bands = jas_malloc(rlvl->numbands * sizeof(jpc_enc_band_t)))) { ++ if (!(rlvl->bands = jas_alloc2(rlvl->numbands, sizeof(jpc_enc_band_t)))) { + goto error; + } + for (bandno = 0, band = rlvl->bands; bandno < rlvl->numbands; +@@ -2290,7 +2290,7 @@ if (bandinfo->xstart != bandinfo->xend & + band->synweight = bandinfo->synenergywt; + + if (band->data) { +- if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_enc_prc_t)))) { ++ if (!(band->prcs = jas_alloc2(rlvl->numprcs, sizeof(jpc_enc_prc_t)))) { + goto error; + } + for (prcno = 0, prc = band->prcs; prcno < rlvl->numprcs; ++prcno, +@@ -2422,7 +2422,7 @@ if (!rlvlno) { + goto error; + } + +- if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_enc_cblk_t)))) { ++ if (!(prc->cblks = jas_alloc2(prc->numcblks, sizeof(jpc_enc_cblk_t)))) { + goto error; + } + for (cblkno = 0, cblk = prc->cblks; cblkno < prc->numcblks; +diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqdec.c jasper-1.900.1/src/libjasper/jpc/jpc_mqdec.c +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqdec.c 2007-01-19 22:43:07.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_mqdec.c 2009-10-22 10:27:45.000000000 +0200 +@@ -118,7 +118,7 @@ jpc_mqdec_t *jpc_mqdec_create(int maxctx + mqdec->in = in; + mqdec->maxctxs = maxctxs; + /* Allocate memory for the per-context state information. */ +- if (!(mqdec->ctxs = jas_malloc(mqdec->maxctxs * sizeof(jpc_mqstate_t *)))) { ++ if (!(mqdec->ctxs = jas_alloc2(mqdec->maxctxs, sizeof(jpc_mqstate_t *)))) { + goto error; + } + /* Set the current context to the first context. */ +diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqenc.c jasper-1.900.1/src/libjasper/jpc/jpc_mqenc.c +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqenc.c 2007-01-19 22:43:07.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_mqenc.c 2009-10-22 10:27:45.000000000 +0200 +@@ -197,7 +197,7 @@ jpc_mqenc_t *jpc_mqenc_create(int maxctx + mqenc->maxctxs = maxctxs; + + /* Allocate memory for the per-context state information. */ +- if (!(mqenc->ctxs = jas_malloc(mqenc->maxctxs * sizeof(jpc_mqstate_t *)))) { ++ if (!(mqenc->ctxs = jas_alloc2(mqenc->maxctxs, sizeof(jpc_mqstate_t *)))) { + goto error; + } + +diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_qmfb.c jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_qmfb.c 2007-01-19 22:43:07.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c 2009-10-22 10:27:45.000000000 +0200 +@@ -321,7 +321,7 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in + #if !defined(HAVE_VLA) + /* Get a buffer. */ + if (bufsize > QMFB_SPLITBUFSIZE) { +- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { ++ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { + /* We have no choice but to commit suicide in this case. */ + abort(); + } +@@ -389,7 +389,7 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in + #if !defined(HAVE_VLA) + /* Get a buffer. */ + if (bufsize > QMFB_SPLITBUFSIZE) { +- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { ++ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { + /* We have no choice but to commit suicide in this case. */ + abort(); + } +@@ -460,7 +460,7 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a, + #if !defined(HAVE_VLA) + /* Get a buffer. */ + if (bufsize > QMFB_SPLITBUFSIZE) { +- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { ++ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { + /* We have no choice but to commit suicide in this case. */ + abort(); + } +@@ -549,7 +549,7 @@ void jpc_qmfb_split_colres(jpc_fix_t *a, + #if !defined(HAVE_VLA) + /* Get a buffer. */ + if (bufsize > QMFB_SPLITBUFSIZE) { +- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { ++ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { + /* We have no choice but to commit suicide in this case. */ + abort(); + } +@@ -633,7 +633,7 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int + #if !defined(HAVE_VLA) + /* Allocate memory for the join buffer from the heap. */ + if (bufsize > QMFB_JOINBUFSIZE) { +- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { ++ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { + /* We have no choice but to commit suicide. */ + abort(); + } +@@ -698,7 +698,7 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int + #if !defined(HAVE_VLA) + /* Allocate memory for the join buffer from the heap. */ + if (bufsize > QMFB_JOINBUFSIZE) { +- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { ++ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { + /* We have no choice but to commit suicide. */ + abort(); + } +@@ -766,7 +766,7 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, + #if !defined(HAVE_VLA) + /* Allocate memory for the join buffer from the heap. */ + if (bufsize > QMFB_JOINBUFSIZE) { +- if (!(buf = jas_malloc(bufsize * JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) { ++ if (!(buf = jas_alloc2(bufsize, JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) { + /* We have no choice but to commit suicide. */ + abort(); + } +@@ -852,7 +852,7 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, + #if !defined(HAVE_VLA) + /* Allocate memory for the join buffer from the heap. */ + if (bufsize > QMFB_JOINBUFSIZE) { +- if (!(buf = jas_malloc(bufsize * numcols * sizeof(jpc_fix_t)))) { ++ if (!(buf = jas_alloc3(bufsize, numcols, sizeof(jpc_fix_t)))) { + /* We have no choice but to commit suicide. */ + abort(); + } +diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t1enc.c jasper-1.900.1/src/libjasper/jpc/jpc_t1enc.c +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t1enc.c 2007-01-19 22:43:07.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_t1enc.c 2009-10-22 10:27:45.000000000 +0200 +@@ -219,7 +219,7 @@ int jpc_enc_enccblk(jpc_enc_t *enc, jas_ + + cblk->numpasses = (cblk->numbps > 0) ? (3 * cblk->numbps - 2) : 0; + if (cblk->numpasses > 0) { +- cblk->passes = jas_malloc(cblk->numpasses * sizeof(jpc_enc_pass_t)); ++ cblk->passes = jas_alloc2(cblk->numpasses, sizeof(jpc_enc_pass_t)); + assert(cblk->passes); + } else { + cblk->passes = 0; +diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c 2007-01-19 22:43:07.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c 2009-10-22 10:27:45.000000000 +0200 +@@ -573,7 +573,7 @@ int jpc_pchglist_insert(jpc_pchglist_t * + } + if (pchglist->numpchgs >= pchglist->maxpchgs) { + newmaxpchgs = pchglist->maxpchgs + 128; +- if (!(newpchgs = jas_realloc(pchglist->pchgs, newmaxpchgs * sizeof(jpc_pchg_t *)))) { ++ if (!(newpchgs = jas_realloc2(pchglist->pchgs, newmaxpchgs, sizeof(jpc_pchg_t *)))) { + return -1; + } + pchglist->maxpchgs = newmaxpchgs; +diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2dec.c jasper-1.900.1/src/libjasper/jpc/jpc_t2dec.c +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2dec.c 2007-01-19 22:43:07.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_t2dec.c 2009-10-22 10:27:45.000000000 +0200 +@@ -478,7 +478,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d + return 0; + } + pi->numcomps = dec->numcomps; +- if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) { ++ if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) { + jpc_pi_destroy(pi); + return 0; + } +@@ -490,7 +490,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d + for (compno = 0, tcomp = tile->tcomps, picomp = pi->picomps; + compno < pi->numcomps; ++compno, ++tcomp, ++picomp) { + picomp->numrlvls = tcomp->numrlvls; +- if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls * ++ if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls, + sizeof(jpc_pirlvl_t)))) { + jpc_pi_destroy(pi); + return 0; +@@ -503,7 +503,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d + rlvlno < picomp->numrlvls; ++rlvlno, ++pirlvl, ++rlvl) { + /* XXX sizeof(long) should be sizeof different type */ + pirlvl->numprcs = rlvl->numprcs; +- if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs * ++ if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs, + sizeof(long)))) { + jpc_pi_destroy(pi); + return 0; +diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2enc.c jasper-1.900.1/src/libjasper/jpc/jpc_t2enc.c +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2enc.c 2007-01-19 22:43:07.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_t2enc.c 2009-10-22 10:27:45.000000000 +0200 +@@ -565,7 +565,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t + } + pi->pktno = -1; + pi->numcomps = cp->numcmpts; +- if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) { ++ if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) { + jpc_pi_destroy(pi); + return 0; + } +@@ -577,7 +577,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t + for (compno = 0, tcomp = tile->tcmpts, picomp = pi->picomps; + compno < pi->numcomps; ++compno, ++tcomp, ++picomp) { + picomp->numrlvls = tcomp->numrlvls; +- if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls * ++ if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls, + sizeof(jpc_pirlvl_t)))) { + jpc_pi_destroy(pi); + return 0; +@@ -591,7 +591,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t + /* XXX sizeof(long) should be sizeof different type */ + pirlvl->numprcs = rlvl->numprcs; + if (rlvl->numprcs) { +- if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs * ++ if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs, + sizeof(long)))) { + jpc_pi_destroy(pi); + return 0; +diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_tagtree.c jasper-1.900.1/src/libjasper/jpc/jpc_tagtree.c +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_tagtree.c 2007-01-19 22:43:07.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_tagtree.c 2009-10-22 10:27:45.000000000 +0200 +@@ -125,7 +125,7 @@ jpc_tagtree_t *jpc_tagtree_create(int nu + ++numlvls; + } while (n > 1); + +- if (!(tree->nodes_ = jas_malloc(tree->numnodes_ * sizeof(jpc_tagtreenode_t)))) { ++ if (!(tree->nodes_ = jas_alloc2(tree->numnodes_, sizeof(jpc_tagtreenode_t)))) { + return 0; + } + +diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_util.c jasper-1.900.1/src/libjasper/jpc/jpc_util.c +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_util.c 2007-01-19 22:43:07.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_util.c 2009-10-22 10:27:45.000000000 +0200 +@@ -109,7 +109,7 @@ int jpc_atoaf(char *s, int *numvalues, d + } + + if (n) { +- if (!(vs = jas_malloc(n * sizeof(double)))) { ++ if (!(vs = jas_alloc2(n, sizeof(double)))) { + return -1; + } + +diff -pruN jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c jasper-1.900.1/src/libjasper/mif/mif_cod.c +--- jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c 2007-01-19 22:43:05.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/mif/mif_cod.c 2009-10-22 10:27:45.000000000 +0200 +@@ -438,8 +438,7 @@ static int mif_hdr_growcmpts(mif_hdr_t * + int cmptno; + mif_cmpt_t **newcmpts; + assert(maxcmpts >= hdr->numcmpts); +- newcmpts = (!hdr->cmpts) ? jas_malloc(maxcmpts * sizeof(mif_cmpt_t *)) : +- jas_realloc(hdr->cmpts, maxcmpts * sizeof(mif_cmpt_t *)); ++ newcmpts = jas_realloc2(hdr->cmpts, maxcmpts, sizeof(mif_cmpt_t *)); + if (!newcmpts) { + return -1; + } diff --git a/testing/jasper/jasper-1.900.1-CVE-2008-3522.patch b/testing/jasper/jasper-1.900.1-CVE-2008-3522.patch new file mode 100644 index 000000000..4bf2e9b52 --- /dev/null +++ b/testing/jasper/jasper-1.900.1-CVE-2008-3522.patch @@ -0,0 +1,14 @@ +https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3522 + +diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_stream.c jasper-1.900.1/src/libjasper/base/jas_stream.c +--- jasper-1.900.1.orig/src/libjasper/base/jas_stream.c 2009-10-22 10:27:45.000000000 +0200 ++++ jasper-1.900.1/src/libjasper/base/jas_stream.c 2009-10-22 10:35:53.000000000 +0200 +@@ -553,7 +553,7 @@ int jas_stream_printf(jas_stream_t *stre + int ret; + + va_start(ap, fmt); +- ret = vsprintf(buf, fmt, ap); ++ ret = vsnprintf(buf, sizeof buf, fmt, ap); + jas_stream_puts(stream, buf); + va_end(ap); + return ret; diff --git a/testing/jasper/jpc_dec.c.patch b/testing/jasper/jpc_dec.c.patch new file mode 100644 index 000000000..ae1cd0617 --- /dev/null +++ b/testing/jasper/jpc_dec.c.patch @@ -0,0 +1,18 @@ +diff -urN jasper-1.900.1/src/libjasper/jpc/jpc_dec.c jasper-1.900.1-fix/src/libjasper/jpc/jpc_dec.c +--- jasper-1.900.1/src/libjasper/jpc/jpc_dec.c 2007-01-19 14:43:07.000000000 -0700 ++++ jasper-1.900.1-fix/src/libjasper/jpc/jpc_dec.c 2008-03-06 16:51:12.000000000 -0700 +@@ -1069,12 +1069,12 @@ + /* Apply an inverse intercomponent transform if necessary. */ + switch (tile->cp->mctid) { + case JPC_MCT_RCT: +- assert(dec->numcomps == 3); ++ assert(dec->numcomps >= 3); + jpc_irct(tile->tcomps[0].data, tile->tcomps[1].data, + tile->tcomps[2].data); + break; + case JPC_MCT_ICT: +- assert(dec->numcomps == 3); ++ assert(dec->numcomps >= 3); + jpc_iict(tile->tcomps[0].data, tile->tcomps[1].data, + tile->tcomps[2].data); + break; diff --git a/testing/jasper/patch-libjasper-stepsizes-overflow.diff b/testing/jasper/patch-libjasper-stepsizes-overflow.diff new file mode 100644 index 000000000..097559f68 --- /dev/null +++ b/testing/jasper/patch-libjasper-stepsizes-overflow.diff @@ -0,0 +1,14 @@ +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c 2007-01-19 22:43:07.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_cs.c 2007-04-06 01:29:02.000000000 +0200 +@@ -982,7 +982,10 @@ static int jpc_qcx_getcompparms(jpc_qcxc + compparms->numstepsizes = (len - n) / 2; + break; + } +- if (compparms->numstepsizes > 0) { ++ if (compparms->numstepsizes > 3 * JPC_MAXRLVLS + 1) { ++ jpc_qcx_destroycompparms(compparms); ++ return -1; ++ } else if (compparms->numstepsizes > 0) { + compparms->stepsizes = jas_malloc(compparms->numstepsizes * + sizeof(uint_fast16_t)); + assert(compparms->stepsizes); diff --git a/testing/kdebase-workspace/PKGBUILD b/testing/kdebase-workspace/PKGBUILD index 5f31e02e3..495c6f549 100644 --- a/testing/kdebase-workspace/PKGBUILD +++ b/testing/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 167577 2012-10-02 19:07:16Z andrea $ +# $Id: PKGBUILD 168268 2012-10-07 11:14:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace pkgver=4.9.2 -pkgrel=1 +pkgrel=3 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/kde-workspace' @@ -18,7 +18,7 @@ depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' 'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama' 'xorg-xrdb' 'libgles' 'libegl' 'libxres' 'xorg-xrandr' - 'xorg-xmessage' 'libusb-compat' 'kde-base-artwork') + 'xorg-xmessage' 'libusb-compat' 'kde-base-artwork' 'glu') makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager') optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces') install="${pkgname}.install" @@ -29,7 +29,8 @@ backup=('usr/share/config/kdm/kdmrc' options=('emptydirs') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' - 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') + 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch' + 'logind-support.patch') sha1sums=('091bec159d85db2a9a6d6b1b43a53183c23de488' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' '712a90999bd429883dcef5dcaf288aace332ced8' @@ -38,15 +39,20 @@ sha1sums=('091bec159d85db2a9a6d6b1b43a53183c23de488' 'b6f8e8692737b11eec1f8022ce74b5b23e247b1b' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - 'd509dac592bd8b310df27991b208c95b6d907514') + 'd509dac592bd8b310df27991b208c95b6d907514' + 'ccde71c42e19feaf40d3bd76e7396a0cb6df012f') build() { - cd "${srcdir}"/${_pkgname}-${pkgver} + cd ${_pkgname}-${pkgver} patch -p1 -i "${srcdir}"/kdm-xinitrd.patch patch -p0 -i "${srcdir}"/fixpath.patch patch -p0 -i "${srcdir}"/terminate-server.patch - cd "${srcdir}" + # KDEBUG 307412 + patch -p1 -i "${srcdir}"/logind-support.patch + + cd ../ + mkdir build cd build cmake ../${_pkgname}-${pkgver} \ @@ -61,7 +67,7 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install install -D -m644 "${srcdir}"/kde.pam "${pkgdir}"/etc/pam.d/kde diff --git a/testing/kdebase-workspace/logind-support.patch b/testing/kdebase-workspace/logind-support.patch new file mode 100644 index 000000000..9de205400 --- /dev/null +++ b/testing/kdebase-workspace/logind-support.patch @@ -0,0 +1,66 @@ +From: Lukas Tinkl <lukas@kde.org> +Date: Fri, 05 Oct 2012 09:57:13 +0000 +Subject: store the filedescriptor in a member variable +X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=a18b78d7da8cb8d627ad2e85f666bfcf1a2721e1 +--- +store the filedescriptor in a member variable + +make systemd-inhibit work as intended, PowerDevil now handles +power/sleep/lid buttons as intended + +BUG: 307412 +--- + + +--- a/powerdevil/daemon/powerdevilpolicyagent.cpp ++++ b/powerdevil/daemon/powerdevilpolicyagent.cpp +@@ -29,7 +29,6 @@ + #include <QtDBus/QDBusPendingReply> + #include <QtDBus/QDBusConnectionInterface> + #include <QtDBus/QDBusServiceWatcher> +-#include <QtDBus/QDBusUnixFileDescriptor> + + #include <KGlobal> + #include <KDebug> +@@ -225,6 +224,9 @@ + onActiveSessionChanged(m_activeSessionPath); + + // inhibit systemd handling of power/sleep/lid buttons ++ // http://www.freedesktop.org/wiki/Software/systemd/inhibit ++ kDebug() << "fd passing available:" << bool(managerIface.connection().connectionCapabilities() & QDBusConnection::UnixFileDescriptorPassing); ++ + QVariantList args; + args << "handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch"; // what + args << "PowerDevil"; // who +@@ -232,8 +234,9 @@ + args << "block"; // mode + QDBusPendingReply<QDBusUnixFileDescriptor> desc = managerIface.asyncCallWithArgumentList("Inhibit", args); + desc.waitForFinished(); +- if (desc.isValid() && desc.value().isValid()) { +- kDebug() << "systemd powersave events handling inhibited"; ++ if (desc.isValid()) { ++ m_systemdInhibitFd = desc.value(); ++ kDebug() << "systemd powersave events handling inhibited, descriptor:" << m_systemdInhibitFd.fileDescriptor(); + } + else + kWarning() << "failed to inhibit systemd powersave handling"; + +--- a/powerdevil/daemon/powerdevilpolicyagent.h ++++ b/powerdevil/daemon/powerdevilpolicyagent.h +@@ -27,6 +27,7 @@ + #include <QtCore/QWeakPointer> + + #include <QtDBus/QDBusContext> ++#include <QtDBus/QDBusUnixFileDescriptor> + + #include <kdemacros.h> + +@@ -108,6 +109,7 @@ + QString m_activeSessionPath; + QWeakPointer< QDBusInterface > m_sdSessionInterface; + QWeakPointer< QDBusInterface > m_sdSeatInterface; ++ QDBusUnixFileDescriptor m_systemdInhibitFd; + + // ConsoleKit support + bool m_ckAvailable; + diff --git a/testing/libreoffice/PKGBUILD b/testing/libreoffice/PKGBUILD index 2b30c747e..fee998363 100644 --- a/testing/libreoffice/PKGBUILD +++ b/testing/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165918 2012-09-03 20:33:25Z andyrtr $ +# $Id: PKGBUILD 168274 2012-10-07 14:01:51Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -23,10 +23,10 @@ pkgname=('libreoffice-common' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python' 'libreoffice-extension-wiki-publisher' - 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built -_LOver=3.6.1.2 -pkgver=3.6.1 -pkgrel=4 + 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) +_LOver=3.6.2.2 +pkgver=3.6.2 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -34,8 +34,7 @@ makedepends=( # makedepends 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' #'boost' 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' - 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' - #'saxon' - currently broken + 'glu' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=49.1" @@ -81,8 +80,8 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz ${_additional_source_url}/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz ${_additional_source_url}/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll + make-pyuno-work-with-system-wide-module-install.diff buildfix.diff - git_fixes.diff libreoffice-common.sh libreoffice-common.csh) noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz @@ -114,9 +113,9 @@ noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2 db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) -md5sums=('3ddcf145b74daa4361e48dafe97e7d21' - '7966e66099729d23d9ee594f526a50ed' - '2555590c1b4395857fc5c469f7f1bd0c' +md5sums=('ae171ba4633cc72dba4451b1bdd3385e' + 'cdad0734d247d91a79cb282fd851d2a7' + 'e9a7e3d35432b72a4603ce094deb6a67' '18f577b374d60b3c760a3a3350407632' 'f02578f5218f217a9f20e9c30e119c6a' '94e7f271e38c976462558b4278590178' @@ -147,8 +146,8 @@ md5sums=('3ddcf145b74daa4361e48dafe97e7d21' '0d2dcdfbf28d6208751b33057f5361f0' 'ce5a1def34578b75959ac31210f031f6' '185d60944ea767075d27247c3162b3bc' + '97bf43dda273d79ff90c848ab53b0e3c' '234e91ac65945ce1ab1e3839780e90f7' - '2445aca137bdbf0cf7526e91f768a1d0' 'abcb1b0a7deaffe13ab3d7ca70becb49' '72790a4103da259a55cadd66db931d00') @@ -171,8 +170,10 @@ build() { ln -s ../libreoffice-translations-$_LOver/translations . # buildfixes & bugfixes - patch -Np1 -i ${srcdir}/buildfix.diff - patch -Np1 -i ${srcdir}/git_fixes.diff + patch -Np1 -i ${srcdir}/buildfix.diff # leaves out a broken pdfimport test + + # fix not upstreamable pyuno paths - patch taken from Debian + patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff #use the CFLAGS but remove the LibO overridden ones for i in $CFLAGS; do @@ -266,7 +267,7 @@ build() { make # fake installation to create split file lists mkdir $srcdir/fakeinstall - make DESTDIR=${srcdir}/fakeinstall distro-pack-install + make DESTDIR=${srcdir}/fakeinstall distro-pack-install # -o build -o check } #check() { @@ -281,7 +282,6 @@ package_libreoffice-common() { depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6" 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 'clucene' 'lcms2' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2') - #'saxon' optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' 'libcups: adds printing support' @@ -373,27 +373,22 @@ package_libreoffice-postgresql-connector() { groups=('libreoffice') replaces=('libreoffice') - # no file-list so far - install -dm755 ${pkgdir}/usr/lib/libreoffice/program/services - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.uno.so ${pkgdir}/usr/lib/libreoffice/program - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc-impl.uno.so ${pkgdir}/usr/lib/libreoffice/program - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.ini ${pkgdir}/usr/lib/libreoffice/program - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/postgresql-sdbc.rdb ${pkgdir}/usr/lib/libreoffice/program/services - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/registry - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/postgresqlsdbc.xcd ${pkgdir}/usr/lib/libreoffice/share/registry + # workaround double entries in the file list + mv ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt.orig + sort ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt.orig | uniq 1>& ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt # create directories from *list.txt file -# for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do -# install -dm755 ${pkgdir}/${directory/\%dir/} -# done + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done # install files into the pkg from fakeinstall dir -# for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do -# dirname=`dirname $file` + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do + dirname=`dirname $file` # check if directory has been already been created - some are missing like manpages -# [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname # mv file from fakeinstall to pkgdir -# mv ${srcdir}/fakeinstall${file} ${pkgdir}$file -# done + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done } package_libreoffice-calc() { @@ -467,7 +462,7 @@ package_libreoffice-impress() { pkgdesc="Presentation Application for LibreOffice." install=libreoffice-impress.install depends=('libreoffice-common') - optdepends=('mesa: for the OGLTrans extension') + optdepends=('glu: for the OGLTrans extension') backup=() groups=('libreoffice') replaces=('libreoffice') @@ -550,7 +545,6 @@ package_libreoffice-sdk() { done # fix environment path to keep compatibility with openjdk6 and openjdk7 - #sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" /usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} } diff --git a/testing/libreoffice/make-pyuno-work-with-system-wide-module-install.diff b/testing/libreoffice/make-pyuno-work-with-system-wide-module-install.diff new file mode 100644 index 000000000..e86548136 --- /dev/null +++ b/testing/libreoffice/make-pyuno-work-with-system-wide-module-install.diff @@ -0,0 +1,44 @@ +diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh +index defd7b2..ea2a809 100755 +--- a/desktop/scripts/soffice.sh ++++ b/desktop/scripts/soffice.sh +@@ -128,6 +128,9 @@ if echo "$checks" | grep -q "cc" ; then + exit 1; + fi + ++PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH} ++export PYTHONPATH ++ + case "`uname -s`" in + NetBSD|OpenBSD|FreeBSD|DragonFly) + # this is a temporary hack until we can live with the default search paths +diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py +index f93ac5e..92a2891 100644 +--- a/pyuno/source/module/uno.py ++++ b/pyuno/source/module/uno.py +@@ -26,8 +26,12 @@ + # for a copy of the LGPLv3 License. + # + #************************************************************************* ++import os + import sys + ++sys.path.append('/usr/lib/libreoffice/program') ++if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: ++ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc" + import pyuno + + try: +diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py +index 610ac5f..df243d0 100755 +--- a/scripting/source/pyprov/officehelper.py ++++ b/scripting/source/pyprov/officehelper.py +@@ -53,7 +53,7 @@ def bootstrap(): + if "UNO_PATH" in os.environ: + sOffice = os.environ["UNO_PATH"] + else: +- sOffice = "" # lets hope for the best ++ sOffice = "/usr/lib/libreoffice/program" + sOffice = os.path.join(sOffice, "soffice") + if platform.startswith("win"): + sOffice += ".exe" diff --git a/testing/libtool/PKGBUILD b/testing/libtool/PKGBUILD index 51384d997..99f3d8ee4 100644 --- a/testing/libtool/PKGBUILD +++ b/testing/libtool/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 161917 2012-06-16 14:55:31Z heftig $ +# $Id: PKGBUILD 168294 2012-10-08 01:42:04Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -6,7 +6,7 @@ pkgname=('libtool' 'libltdl') pkgver=2.4.2 -pkgrel=6 +pkgrel=7 pkgdesc="A generic library support script" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libtool" @@ -28,7 +28,7 @@ check() { } package_libtool() { - depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.7.1') + depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.7.2') groups=('base-devel') install=libtool.install diff --git a/testing/qt3/PKGBUILD b/testing/qt3/PKGBUILD new file mode 100644 index 000000000..969cb6aba --- /dev/null +++ b/testing/qt3/PKGBUILD @@ -0,0 +1,124 @@ +# $Id: PKGBUILD 168290 2012-10-07 22:25:27Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=qt3 +pkgver=3.3.8b +pkgrel=2 +epoch=1 +pkgdesc="The QT3 gui toolkit" +arch=('i686' 'x86_64') +url="http://www.trolltech.com/products/qt/index.html" +license=('GPL') +depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'glu' 'libxft' + 'libxrandr' 'libmng') +makedepends=('mysql' 'postgresql' 'unixodbc' 'sqlite' 'mesa') +optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc') +options=('!libtool') +install=qt.install +source=(ftp://ftp.trolltech.com/qt/source/qt-x11-free-${pkgver}.tar.gz + qt.profile qt3-png15.patch qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2 + eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch) +sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854' + 'd2e257a9011208b2cb81b9cf47915b9a2f9dab83' + '3d19510c46016a1a211d97bf8f82b01498b1b33c' + '33418e5b117458af23c72cdbffc0c339bc34bdc4' + '116afa0e737bdf27ea27f9b3653aeb56db9ec151' + '40c7b8f06a21f809ddeb8b5560e9da63ccac6a17' + '1346320614f6f86fbeb10b9fbad721dea29f5b61' + 'd9b83b8f6f9c8bd98d290dc1d0e9913a00b62c3f') + +# qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/ +# other qt-patches come from fedora and gentoo + +build() { + unset QMAKESPEC + export QTDIR="${srcdir}"/qt-x11-free-${pkgver} + export PATH=${QTDIR}/bin:${PATH} + export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} + export QMAKESPEC=$QTDIR/mkspecs/linux-g++ + cd "${srcdir}"/qt-x11-free-${pkgver} + # apply qt patches from kde.org + for i in ../qt-copy-kde-patches/*; do + patch -p0 -i $i + done + # apply other qt patches and one security fix from debian/gentoo + for i in ../qt-patches/*; do + patch -p1 -i $i + done + # fix CJK font/chars select error (FS#11245) + patch -p1 -i "${srcdir}"/eastern_asian_languagues.diff + # fix build problem against new unixODBC + patch -p1 -i "${srcdir}"/qt-odbc.patch + # fix build with gcc 4.6.0 + patch -p1 -i "${srcdir}"/gcc-4.6.patch + + patch -p0 -i "${srcdir}"/qt3-png15.patch + # start compiling qt + sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix + rm -rf doc/html examples tutorial + sed -i "s|sub-tutorial sub-examples||" Makefile + sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf + sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-32/qmake.conf + sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-64/qmake.conf + sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix + sed -i "s|read acceptance|acceptance=yes|" configure + + # remove unwanted mkspecs + rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*} + + if [ "$CARCH" = "x86_64" ]; then + export ARCH="-64" + else unset ARCH + fi + + ./configure -prefix /opt/qt \ + -platform linux-g++$ARCH \ + -system-zlib \ + -qt-gif \ + -release \ + -shared \ + -sm \ + -nis \ + -thread \ + -stl \ + -system-lib{png,jpeg,mng} \ + -no-g++-exceptions \ + -plugin-sql-{mysql,psql,sqlite,odbc} + + # fix /opt/qt/lib path + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/src/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/designer/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/editor/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/assistant/lib/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/uilib/Makefile + + cd "${srcdir}"/qt-x11-free-${pkgver} + make -C qmake + cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/mysql + "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro + cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/psql + "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro + + cd "${srcdir}"/qt-x11-free-${pkgver} + # fix the broken makefiles + #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile + make +} + +package() { + cd "${srcdir}"/qt-x11-free-${pkgver} + make INSTALL_ROOT="${pkgdir}" install + rm -rf "${pkgdir}"/opt/qt/{phrasebooks,templates,translations} + sed -i "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" "${pkgdir}"/opt/qt/lib/*.prl + install -D -m755 qmake/qmake "${pkgdir}"/opt/qt/bin/qmake + install -D -m755 "${srcdir}"/qt.profile "${pkgdir}"/etc/profile.d/qt3.sh + ln -sf /opt/qt/bin/qtconfig "${pkgdir}"/opt/qt/bin/qt3config + rm -f "${pkgdir}"/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH + + # install man pages + install -d -m755 "${pkgdir}"/opt/qt/man + cp -r "${srcdir}"/qt-x11-free-${pkgver}/doc/man/{man1,man3} "${pkgdir}"/opt/qt/man/ + + install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/ + echo '/opt/qt/lib' > "${pkgdir}"/etc/ld.so.conf.d/qt3.conf +} diff --git a/testing/qt3/eastern_asian_languagues.diff b/testing/qt3/eastern_asian_languagues.diff new file mode 100644 index 000000000..7c25eef7d --- /dev/null +++ b/testing/qt3/eastern_asian_languagues.diff @@ -0,0 +1,39 @@ +--- qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-01-15 21:09:13.000000000 +0200 ++++ qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-03-10 11:34:22.000000000 +0200 +@@ -966,20 +966,22 @@ + + #ifdef Q_WS_X11 + if (script == QFont::Han) { +- // modify script according to locale +- static QFont::Script defaultHan = QFont::UnknownScript; +- if (defaultHan == QFont::UnknownScript) { +- QCString locale = setlocale(LC_ALL, NULL); +- if (locale.contains("ko")) +- defaultHan = QFont::Han_Korean; +- else if (locale.contains("zh_TW") || locale.contains("zh_HK")) +- defaultHan = QFont::Han_TraditionalChinese; +- else if (locale.contains("zh")) +- defaultHan = QFont::Han_SimplifiedChinese; +- else +- defaultHan = QFont::Han_Japanese; +- } +- script = defaultHan; ++ // modify script according to locale ++ static QFont::Script defaultHan; ++ QCString locale = setlocale(LC_ALL, NULL); ++ ++ if (locale.contains("ko")) ++ defaultHan = QFont::Han_Korean; ++ else if (locale.contains("zh_TW") || locale.contains("zh_HK")) ++ defaultHan = QFont::Han_TraditionalChinese; ++ else if (locale.contains("zh")) ++ defaultHan = QFont::Han_SimplifiedChinese; ++ else if (locale.contains("ja")) ++ defaultHan = QFont::Han_Japanese; ++ else ++ defaultHan = QFont::Han; // don't change ++ ++ script = defaultHan; + } + #endif + diff --git a/testing/qt3/gcc-4.6.patch b/testing/qt3/gcc-4.6.patch new file mode 100644 index 000000000..bcbffcea6 --- /dev/null +++ b/testing/qt3/gcc-4.6.patch @@ -0,0 +1,33 @@ +diff -up qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef qt-x11-free-3.3.8b/src/tools/qmap.h +--- qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef 2008-01-15 13:09:13.000000000 -0600 ++++ qt-x11-free-3.3.8b/src/tools/qmap.h 2011-01-30 21:14:29.275088725 -0600 +@@ -49,6 +49,7 @@ + #include "qvaluelist.h" + #endif // QT_H + ++#include <cstddef> + #ifndef QT_NO_STL + #include <iterator> + #include <map> +diff -up qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluelist.h +--- qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef 2008-01-15 13:09:13.000000000 -0600 ++++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2011-01-30 21:14:01.765846592 -0600 +@@ -47,6 +47,7 @@ + #include "qdatastream.h" + #endif // QT_H + ++#include <cstddef> + #ifndef QT_NO_STL + #include <iterator> + #include <list> +diff -up qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluevector.h +--- qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef 2008-01-15 13:09:13.000000000 -0600 ++++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h 2011-01-30 21:14:01.765846592 -0600 +@@ -45,6 +45,7 @@ + #include "qdatastream.h" + #endif // QT_H + ++#include <cstddef> + #ifndef QT_NO_STL + #include <vector> + #endif diff --git a/testing/qt3/qt-copy-kde-patches.tar.bz2 b/testing/qt3/qt-copy-kde-patches.tar.bz2 Binary files differnew file mode 100644 index 000000000..519f7173a --- /dev/null +++ b/testing/qt3/qt-copy-kde-patches.tar.bz2 diff --git a/testing/qt3/qt-odbc.patch b/testing/qt3/qt-odbc.patch new file mode 100644 index 000000000..6f21e3cf1 --- /dev/null +++ b/testing/qt3/qt-odbc.patch @@ -0,0 +1,19 @@ +diff -up qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp +--- qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig 2009-02-24 11:32:27.000000000 +0100 ++++ qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp 2009-02-24 11:33:43.000000000 +0100 +@@ -57,13 +57,13 @@ + #endif + + // newer platform SDKs use SQLLEN instead of SQLINTEGER +-#ifdef SQLLEN ++#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) + # define QSQLLEN SQLLEN + #else + # define QSQLLEN SQLINTEGER + #endif + +-#ifdef SQLULEN ++#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) + # define QSQLULEN SQLULEN + #else + # define QSQLULEN SQLUINTEGER diff --git a/testing/qt3/qt-patches.tar.bz2 b/testing/qt3/qt-patches.tar.bz2 Binary files differnew file mode 100644 index 000000000..3f4aee171 --- /dev/null +++ b/testing/qt3/qt-patches.tar.bz2 diff --git a/testing/qt3/qt.install b/testing/qt3/qt.install new file mode 100644 index 000000000..6d042daae --- /dev/null +++ b/testing/qt3/qt.install @@ -0,0 +1,12 @@ +post_install() { + post_remove +} + +post_upgrade() { + post_remove +} + +post_remove() { + # this can be removed in future versions + sed -e '/\/opt\/qt\/lib/d' -i etc/ld.so.conf +} diff --git a/testing/qt3/qt.profile b/testing/qt3/qt.profile new file mode 100644 index 000000000..ed4d232ae --- /dev/null +++ b/testing/qt3/qt.profile @@ -0,0 +1,4 @@ +export QTDIR=/opt/qt +export QT_XFT=true +export PATH=$PATH:$QTDIR/bin +export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig diff --git a/testing/qt3/qt3-png15.patch b/testing/qt3/qt3-png15.patch new file mode 100644 index 000000000..e64fea36a --- /dev/null +++ b/testing/qt3/qt3-png15.patch @@ -0,0 +1,212 @@ +$NetBSD: patch-as,v 1.5 2011/03/25 15:28:26 wiz Exp $ + +--- src/kernel/qpngio.cpp.orig 2007-02-02 10:01:15.000000000 -0400 ++++ src/kernel/qpngio.cpp +@@ -43,6 +43,7 @@ + #include "qiodevice.h" + + #include <png.h> ++#include <zlib.h> + + + #ifdef Q_OS_TEMP +@@ -123,9 +124,24 @@ void setup_qt( QImage& image, png_struct + png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, + 0, 0, 0); + ++ png_colorp info_ptr_palette = NULL; ++ int info_ptr_num_palette = 0; ++ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) { ++ png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &info_ptr_num_palette); ++ } ++ ++ png_bytep info_ptr_trans_alpha = NULL; ++ int info_ptr_num_trans = 0; ++ png_color_16p info_ptr_trans_color = NULL; ++ ++ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { ++ png_get_tRNS(png_ptr, info_ptr, &info_ptr_trans_alpha, &info_ptr_num_trans, &info_ptr_trans_color); ++ } ++ ++ + if ( color_type == PNG_COLOR_TYPE_GRAY ) { + // Black & White or 8-bit grayscale +- if ( bit_depth == 1 && info_ptr->channels == 1 ) { ++ if ( bit_depth == 1 && png_get_channels(png_ptr, info_ptr) == 1 ) { + png_set_invert_mono( png_ptr ); + png_read_update_info( png_ptr, info_ptr ); + if (!image.create( width, height, 1, 2, QImage::BigEndian )) +@@ -159,7 +175,7 @@ void setup_qt( QImage& image, png_struct + image.setColor( i, qRgba(c,c,c,0xff) ); + } + if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { +- const int g = info_ptr->trans_values.gray; ++ const int g = info_ptr_trans_color->gray; + if (g < ncols) { + image.setAlphaBuffer(TRUE); + image.setColor(g, image.color(g) & RGB_MASK); +@@ -168,7 +184,7 @@ void setup_qt( QImage& image, png_struct + } + } else if ( color_type == PNG_COLOR_TYPE_PALETTE + && png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE) +- && info_ptr->num_palette <= 256 ) ++ && info_ptr_num_palette <= 256 ) + { + // 1-bit and 8-bit color + if ( bit_depth != 1 ) +@@ -176,28 +192,28 @@ void setup_qt( QImage& image, png_struct + png_read_update_info( png_ptr, info_ptr ); + png_get_IHDR(png_ptr, info_ptr, + &width, &height, &bit_depth, &color_type, 0, 0, 0); +- if (!image.create(width, height, bit_depth, info_ptr->num_palette, ++ if (!image.create(width, height, bit_depth, info_ptr_num_palette, + QImage::BigEndian)) + return; + int i = 0; + if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { + image.setAlphaBuffer( TRUE ); +- while ( i < info_ptr->num_trans ) { ++ while ( i < info_ptr_num_trans ) { + image.setColor(i, qRgba( +- info_ptr->palette[i].red, +- info_ptr->palette[i].green, +- info_ptr->palette[i].blue, +- info_ptr->trans[i] ++ info_ptr_palette[i].red, ++ info_ptr_palette[i].green, ++ info_ptr_palette[i].blue, ++ info_ptr_trans_alpha[i] + ) + ); + i++; + } + } +- while ( i < info_ptr->num_palette ) { ++ while ( i < info_ptr_num_palette ) { + image.setColor(i, qRgba( +- info_ptr->palette[i].red, +- info_ptr->palette[i].green, +- info_ptr->palette[i].blue, ++ info_ptr_palette[i].red, ++ info_ptr_palette[i].green, ++ info_ptr_palette[i].blue, + 0xff + ) + ); +@@ -284,7 +300,7 @@ void read_png_image(QImageIO* iio) + return; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + iio->setStatus(-4); + return; +@@ -469,7 +485,7 @@ bool QPNGImageWriter::writeImage(const Q + return FALSE; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + return FALSE; + } +@@ -491,10 +507,16 @@ bool QPNGImageWriter::writeImage(const Q + + png_set_write_fn(png_ptr, (void*)this, qpiw_write_fn, qpiw_flush_fn); + ++#warning XXXtnn not too sure about this ++/* ++according to png.h, channels is only used on read, not writes, so we ++should be able to comment this out. ++ + info_ptr->channels = + (image.depth() == 32) + ? (image.hasAlphaBuffer() ? 4 : 3) + : 1; ++*/ + + png_set_IHDR(png_ptr, info_ptr, image.width(), image.height(), + image.depth() == 1 ? 1 : 8 /* per channel */, +@@ -504,11 +526,12 @@ bool QPNGImageWriter::writeImage(const Q + : PNG_COLOR_TYPE_RGB + : PNG_COLOR_TYPE_PALETTE, 0, 0, 0); + ++ png_color_8 sig_bit; ++ sig_bit.red = 8; ++ sig_bit.green = 8; ++ sig_bit.blue = 8; ++ png_set_sBIT(png_ptr, info_ptr, &sig_bit); + +- //png_set_sBIT(png_ptr, info_ptr, 8); +- info_ptr->sig_bit.red = 8; +- info_ptr->sig_bit.green = 8; +- info_ptr->sig_bit.blue = 8; + + if (image.depth() == 1 && image.bitOrder() == QImage::LittleEndian) + png_set_packswap(png_ptr); +@@ -522,11 +545,14 @@ bool QPNGImageWriter::writeImage(const Q + png_set_PLTE(png_ptr, info_ptr, palette, num_palette); + int* trans = new int[num_palette]; + int num_trans = 0; ++ png_colorp info_ptr_palette = NULL; ++ int tmp; ++ png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &tmp); + for (int i=0; i<num_palette; i++) { + QRgb rgb=image.color(i); +- info_ptr->palette[i].red = qRed(rgb); +- info_ptr->palette[i].green = qGreen(rgb); +- info_ptr->palette[i].blue = qBlue(rgb); ++ info_ptr_palette[i].red = qRed(rgb); ++ info_ptr_palette[i].green = qGreen(rgb); ++ info_ptr_palette[i].blue = qBlue(rgb); + if (image.hasAlphaBuffer()) { + trans[i] = rgb >> 24; + if (trans[i] < 255) { +@@ -534,6 +560,7 @@ bool QPNGImageWriter::writeImage(const Q + } + } + } ++ png_set_PLTE(png_ptr, info_ptr, info_ptr_palette, num_palette); + if (num_trans) { + copy_trans = new png_byte[num_trans]; + for (int i=0; i<num_trans; i++) +@@ -544,7 +571,10 @@ bool QPNGImageWriter::writeImage(const Q + } + + if ( image.hasAlphaBuffer() ) { +- info_ptr->sig_bit.alpha = 8; ++ png_color_8p sig_bit; ++ png_get_sBIT(png_ptr, info_ptr, &sig_bit); ++ sig_bit->alpha = 8; ++ png_set_sBIT(png_ptr, info_ptr, sig_bit); + } + + // Swap ARGB to RGBA (normal PNG format) before saving on +@@ -1030,7 +1060,7 @@ int QPNGFormat::decode(QImage& img, QIma + return -1; + } + +- if (setjmp((png_ptr)->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_read_struct(&png_ptr, &info_ptr, 0); + image = 0; + return -1; +@@ -1057,7 +1087,7 @@ int QPNGFormat::decode(QImage& img, QIma + + if ( !png_ptr ) return 0; + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_read_struct(&png_ptr, &info_ptr, 0); + image = 0; + state = MovieStart; +@@ -1117,7 +1147,7 @@ void QPNGFormat::end(png_structp png, pn + consumer->frameDone(QPoint(offx,offy),r); + consumer->end(); + state = FrameStart; +- unused_data = (int)png->buffer_size; // Since libpng doesn't tell us ++ unused_data = png_process_data_pause(png, 0); + } + + #ifdef PNG_USER_CHUNKS_SUPPORTED diff --git a/testing/smpeg/PKGBUILD b/testing/smpeg/PKGBUILD new file mode 100644 index 000000000..96b7420ee --- /dev/null +++ b/testing/smpeg/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 168278 2012-10-07 17:15:25Z heftig $ +# Maintainer: Eric Belanger <eric@archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=smpeg +pkgver=0.4.4 +pkgrel=7 +pkgdesc="SDL MPEG Player Library" +arch=('i686' 'x86_64') +url="http://icculus.org/smpeg/" +license=('LGPL') +depends=('sdl') +makedepends=('gtk' 'mesa' 'glu') +optdepends=('gtk: to use gtv ' 'glu: to use glmovie') +options=('!libtool' '!makeflags') +source=(http://mirrors.dotsrc.org/lokigames/open-source/smpeg/${pkgname}-${pkgver}.tar.gz + smpeg-0.4.4-gcc41.patch) +md5sums=('59c76ac704088ef5539210190c4e1fe3' + '8b979a58307d7196655758bd3d2466c4') +sha1sums=('6d7f4449472e6270ab435b2224f3fad951c35259' + '7d9a2ad7f6b702dfe3adcb87601d9b55022bbd1e') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -p1 -i $srcdir/smpeg-0.4.4-gcc41.patch + ./configure --prefix=/usr --mandir=/usr/share/man --disable-static + make LDFLAGS+=-lstdc++ +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + + # fix aclocal warnings + sed -i "s#(AM_PATH_SMPEG#([AM_PATH_SMPEG]#" ${pkgdir}/usr/share/aclocal/smpeg.m4 +} diff --git a/testing/smpeg/smpeg-0.4.4-gcc41.patch b/testing/smpeg/smpeg-0.4.4-gcc41.patch new file mode 100644 index 000000000..4a0eeb453 --- /dev/null +++ b/testing/smpeg/smpeg-0.4.4-gcc41.patch @@ -0,0 +1,41 @@ +Index: MPEGaudio.h +=================================================================== +RCS file: /cvs/cvsroot/smpeg/MPEGaudio.h,v +retrieving revision 1.23 +diff -u -p -r1.23 MPEGaudio.h +--- smpeg/MPEGaudio.h 17 Jul 2001 19:52:24 -0000 1.23 ++++ smpeg/MPEGaudio.h 6 Dec 2005 06:10:43 -0000 +@@ -151,12 +151,6 @@ private: + /* The actual MPEG audio class */ + class MPEGaudio : public MPEGerror, public MPEGaudioaction { + +- friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len); +- friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len); +-#ifdef THREADED_AUDIO +- friend int Decode_MPEGaudio(void *udata); +-#endif +- + public: + MPEGaudio(MPEGstream *stream, bool initSDL = true); + virtual ~MPEGaudio(); +@@ -367,6 +361,20 @@ public: + #define N_TIMESTAMPS 5 + + double timestamp[N_TIMESTAMPS]; ++ ++ /* Functions which access MPEGaudio internals */ ++ friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len); ++ friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len); ++#ifdef THREADED_AUDIO ++ friend int Decode_MPEGaudio(void *udata); ++#endif + }; + ++/* Need to duplicate the prototypes, this is not a typo :) */ ++void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len); ++int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len); ++#ifdef THREADED_AUDIO ++int Decode_MPEGaudio(void *udata); ++#endif ++ + #endif /* _MPEGAUDIO_H_ */ diff --git a/testing/swt/PKGBUILD b/testing/swt/PKGBUILD new file mode 100644 index 000000000..f6db69266 --- /dev/null +++ b/testing/swt/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 168272 2012-10-07 11:37:04Z guillaume $ +# Maintainer: Guillaume ALAUX <guillaume@archlinux.org> +pkgname=swt +pkgver=4.2 +pkgrel=2 +_date=201206081400 +pkgdesc="An open source widget toolkit for Java" +arch=('i686' 'x86_64') +url="http://www.eclipse.org/swt/" +license=('EPL') +depends=('java-runtime>=6' 'gtk2>=2.20.1' 'libxtst') +optdepends=('libgnomeui' 'mesa' 'glu' 'libwebkit') +makedepends=('java-environment' 'libxtst' 'mesa' 'glu' 'libgnomeui' 'unzip' 'pkgconfig' 'libwebkit' 'apache-ant') +if [ "${CARCH}" = "i686" ]; then + _carch=x86 + md5sums=('3efe0404f6129183abae46f7620fe14f' + '2f556ab534fc2488c6e8c0ee6c02825c') +fi +if [ "${CARCH}" = "x86_64" ]; then + _carch=x86_64 + md5sums=('9e06b576116ff409f395571603582827' + '2f556ab534fc2488c6e8c0ee6c02825c') +fi +source=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-${_carch}.zip + build-swt.xml) +# To test this pkg: +# http://www.eclipse.org/swt/examples.php#standaloneOutsideEclipse + +build() { + cd ${srcdir} + unzip -oq src.zip -d src + + . /etc/profile.d/jdk.sh + . /etc/profile.d/apache-ant.sh + + # Shared objects + cd src + ./build.sh + + # SWT jar + ant -f ../build-swt.xml compile +} + +package() { + cd ${srcdir}/src + + # Shared objects + export OUTPUT_DIR=${pkgdir}/usr/lib + install -dm755 ${OUTPUT_DIR} + make -f make_linux.mak install + + # SWT jar + ant -f ../build-swt.xml jar + install -Dm755 ../swt.jar ${pkgdir}/usr/share/java/swt-${pkgver}.jar + ln -s swt-${pkgver}.jar ${pkgdir}/usr/share/java/swt.jar +} diff --git a/testing/swt/build-swt.xml b/testing/swt/build-swt.xml new file mode 100644 index 000000000..a161204f8 --- /dev/null +++ b/testing/swt/build-swt.xml @@ -0,0 +1,17 @@ +<project name="SWT" default="jar" basedir="."> + <property name="src" location="."/> + <property name="build" location="build"/> + + <target name="init"> + <tstamp/> + <mkdir dir="${build}"/> + </target> + + <target name="compile" depends="init" description="Compile the SWT toolset"> + <javac srcdir="${src}" destdir="${build}" target="1.6" /> + </target> + + <target name="jar"> + <jar destfile="swt.jar" basedir="${build}"/> + </target> +</project> diff --git a/testing/xine-lib/PKGBUILD b/testing/xine-lib/PKGBUILD index 98355362b..5112660a3 100644 --- a/testing/xine-lib/PKGBUILD +++ b/testing/xine-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163069 2012-07-06 15:22:28Z ibiru $ +# $Id: PKGBUILD 168288 2012-10-07 22:15:57Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-lib pkgver=1.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64') url="http://www.xine-project.org" @@ -11,11 +11,11 @@ license=('LGPL' 'GPL') depends=('libxvmc' 'ffmpeg' 'libxinerama') makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'mesa' 'libmodplug' 'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad' - 'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs' 'libvdpau') + 'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs' 'libvdpau' 'glu') optdepends=('imagemagick: for using the imagemagick plugin' \ 'jack: for using the jack plugin' \ 'vcdimager: for using the vcd plugin' \ - 'mesa: for using the opengl plugin' \ + 'glu: for using the opengl plugin' \ 'wavpack: for using the wavpack plugin' \ 'faad2: for using the faad plugin' \ 'libmng: for using the mng plugin' \ |