diff options
91 files changed, 0 insertions, 7251 deletions
diff --git a/community-staging/cegui/PKGBUILD b/community-staging/cegui/PKGBUILD deleted file mode 100644 index 36ec36e3b..000000000 --- a/community-staging/cegui/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 47894 2011-05-26 00:25:26Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Juergen Hoetzel <juergen@archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com>, -# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> - -pkgname=cegui -pkgver=0.7.5 -pkgrel=3 -pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" -arch=('i686' 'x86_64') -url="http://crayzedsgui.sourceforge.net" -#options=('!libtool') -license=("MIT") -depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua' 'silly') -makedepends=('python2' 'doxygen') -source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz) -md5sums=('38c79d1fdfaaa10f481c99a2ac479516') - -build() { - cd $srcdir/CEGUI-${pkgver} - - sed -i '1i#include <cstddef>' cegui/include/CEGUIString.h - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --disable-xerces-c \ - --enable-null-renderer - - make -} - -package() { - cd $srcdir/CEGUI-${pkgver} - - make DESTDIR=${pkgdir} install - - #build docs - cd doc/doxygen && doxygen - cd .. && make DESTDIR=${pkgdir} install-html - - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE -} - diff --git a/community-staging/clementine/PKGBUILD b/community-staging/clementine/PKGBUILD deleted file mode 100644 index c276ec0d6..000000000 --- a/community-staging/clementine/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 47879 2011-05-25 20:42:25Z stephane $ -#Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -#Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > -#Contributor: Dany Martineau <dany.luc.martineau@gmail.com> - -pkgname=clementine -pkgver=0.7.1 -pkgrel=4 -pkgdesc="A music player and library organizer" -url="http://www.clementine-player.org/" -license=('GPL') -arch=('i686' 'x86_64') -depends=('gstreamer0.10' 'taglib' 'glew' 'liblastfm' 'libgpod' 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice') -makedepends=('cmake' 'boost') -optdepends=('gstreamer0.10-base-plugins: for more open formats' - 'gstreamer0.10-good-plugins: for use with "Good" plugin libraries' - 'gstreamer0.10-bad-plugins: for use with "Bad" plugin libraries' - 'gstreamer0.10-ugly-plugins: for use with "Ugly" plugin libraries') -source=(http://clementine-player.googlecode.com/files/${pkgname}-${pkgver}.tar.gz - clementine-0.7.1-fix-devicekit.patch) -sha1sums=('8b2025b8876f9f3fe33ef5001e0621f3a5d0f142' - 'd595e2746949363680e0d64fe2fb97b524c8d27c') -install=clementine.install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ../clementine-0.7.1-fix-devicekit.patch - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DSTATIC_SQLITE=0 -DENABLE_GIO=OFF - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community-staging/clementine/clementine-0.7.1-fix-devicekit.patch b/community-staging/clementine/clementine-0.7.1-fix-devicekit.patch deleted file mode 100644 index 797a2c864..000000000 --- a/community-staging/clementine/clementine-0.7.1-fix-devicekit.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur clementine-0.7.1.ori/src/config.h.in clementine-0.7.1/src/config.h.in ---- clementine-0.7.1.ori/src/config.h.in 2011-03-29 12:16:15.000000000 -0700 -+++ clementine-0.7.1/src/config.h.in 2011-05-09 16:00:26.505080057 -0700 -@@ -29,6 +29,7 @@ - #cmakedefine HAVE_STATIC_SQLITE - - #cmakedefine HAVE_DBUS -+#cmakedefine HAVE_DEVICEKIT - #cmakedefine HAVE_GIO - #cmakedefine HAVE_IMOBILEDEVICE - #cmakedefine HAVE_LIBARCHIVE diff --git a/community-staging/clementine/clementine.install b/community-staging/clementine/clementine.install deleted file mode 100644 index 2d71a7563..000000000 --- a/community-staging/clementine/clementine.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - - -post_remove() { - post_install $1 -} diff --git a/community-staging/csfml/PKGBUILD b/community-staging/csfml/PKGBUILD deleted file mode 100644 index d0920b18d..000000000 --- a/community-staging/csfml/PKGBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: PKGBUILD 47932 2011-05-26 06:40:32Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> - -pkgname=csfml - -_git=true - -if [[ "${_git}" = "true" ]]; then - pkgver=1.99.git20110526 -fi - -pkgrel=1 -pkgdesc='C bindings for sfml' -arch=('i686' 'x86_64') -url='http://www.sfml-dev.org/' -license=('zlib') -depends=('sfml') -makedepends=('git' 'cmake' 'doxygen') - -_gitroot='https://github.com/LaurentGomila/SFML.git' -_gitname='SFML' - -build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [ -d $_gitname ] ; then - cd $_gitname && git pull origin - msg "The local files are updated." - else - git clone $_gitroot - cd $_gitname - fi - - msg "GIT checkout done or server timeout" - msg "Starting make..." - - rm -rf "$srcdir/$_gitname-build" - cp -r "$srcdir/$_gitname" "$srcdir/$_gitname-build" - cd "$srcdir/$_gitname-build" - - cd bindings/c/ - mkdir build && cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr .. \ - -DBUILD_DOC=true - make - make doc -} - -package() { - cd "$srcdir/$_gitname-build/bindings/c/build/" - - make DESTDIR="$pkgdir/" install - - install -Dm644 ../license.txt \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - - make clean -} - diff --git a/community-staging/frogatto/PKGBUILD b/community-staging/frogatto/PKGBUILD deleted file mode 100644 index 434ddd9fb..000000000 --- a/community-staging/frogatto/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 47897 2011-05-26 00:34:36Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Tom Wambold <tom5760@gmail.com> - -pkgname='frogatto' -arch=('i686' 'x86_64') -pkgver=1.1 -pkgrel=3 -pkgdesc="An old-school 2d platformer game, starring a certain quixotic frog" -url="http://www.frogatto.com" -license=('GPL') -depends=('libgl' 'mesa' 'glew' 'sdl' 'sdl_image' 'sdl_ttf' 'sdl_mixer' 'libpng' 'boost-libs' 'frogatto-data') -makedepends=('boost') -source=(http://www.frogatto.com/files/$pkgname-$pkgver.tar.bz2 - frogatto - frogatto.desktop) -md5sums=('8c01c8a1d7ecf820a682eb684d8bf739' - '9ed2c9ea59e95fe3c0b3ad49e58f8890' - 'e31563b04748a39292a59aaad633ff58') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - sed -i 's/ccache //g' Makefile - sed -i 's/-lprofiler//g' Makefile - sed -i 's/-lboost_regex-mt/-lboost_regex/g' Makefile - sed -i 's/-lboost_system-mt/-lboost_system/g' Makefile - sed -i 's/-lboost_thread-mt/-lboost_thread/g' Makefile - sed -i 's/-lboost_iostreams-mt/-lboost_iostreams/g' Makefile - make game server -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - install -D -m755 game $pkgdir/opt/frogatto/game - install -D -m755 server $pkgdir/opt/frogatto/server - - install -D -m644 LICENSE $pkgdir/usr/share/licenses/frogatto/LICENSE - - cd $srcdir - install -DT -m755 frogatto $pkgdir/usr/bin/frogatto - install -D -m644 frogatto.desktop $pkgdir/usr/share/applications/frogatto.desktop -} - -# vim:set ts=2 sw=2 et: diff --git a/community-staging/frogatto/frogatto b/community-staging/frogatto/frogatto deleted file mode 100644 index 0d741e0de..000000000 --- a/community-staging/frogatto/frogatto +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd /opt/frogatto -exec /opt/frogatto/game $* diff --git a/community-staging/frogatto/frogatto.desktop b/community-staging/frogatto/frogatto.desktop deleted file mode 100644 index b0795467a..000000000 --- a/community-staging/frogatto/frogatto.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Frogatto -GenericName=Old-school 2D platformer -Comment=Old-school 2D platformer -Exec=/usr/bin/frogatto -Terminal=false -MultipleArgs=false -Type=Application -Icon=/opt/frogatto/images/window-icon.png -Categories=Game;ArcadeGame diff --git a/community-staging/gambas3/PKGBUILD b/community-staging/gambas3/PKGBUILD deleted file mode 100644 index 45dee93f7..000000000 --- a/community-staging/gambas3/PKGBUILD +++ /dev/null @@ -1,1080 +0,0 @@ -# Maintainer: Laurent Carlier <lordheavym@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-form-stock' 'gambas3-gb-gtk' 'gambas3-gb-gui' '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-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-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') -pkgver=2.99.1 -pkgrel=3 -pkgdesc="A free development environment based on a Basic interpreter." -arch=('i686' 'x86_64') -url="http://gambas.sourceforge.net/" -license=('GPL') -groups=('gambas3') -makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils' - 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'qt' 'gtk2' 'imlib2' 'gdk-pixbuf2' - 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg' - 'curl' 'poppler' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' - 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring') -options=('!emptydirs' '!makeflags') -source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" - 'gambas3-script.install' 'gambas3-runtime.install') -md5sums=('ab4c182b9d7dfec06b3a42bb002a779a' - 'b284be39d147ec799f1116a6abc068b4' - 'a8ec8e5a6aba7a7e453ce7a35c1800a9') - -build() { - cd ${srcdir}/${pkgbase}-${pkgver} - - ./reconf-all - ./configure --prefix=/usr -C - - make bindir=${pkgdir}/usr/bin -} - -package_gambas3-runtime() { - depends=('libffi' 'xdg-utils') - pkgdesc="Gambas3 runtime environment" - install=gambas3-runtime.install - - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc - make DESTDIR="${pkgdir}" install - - cd ../gbx - make DESTDIR="${pkgdir}" install - cd ../lib/debug - make DESTDIR="${pkgdir}" install - cd ../eval - make DESTDIR="${pkgdir}" install - cd ../draw - make DESTDIR="${pkgdir}" install - install -D -m644 ../gb.component \ - ${pkgdir}/usr/lib/gambas3 - - cd ${srcdir}/${pkgbase}-${pkgver}/main - ln -s gbx3 ${pkgdir}/usr/bin/gbr3 - gbc/gbi3 -r ${pkgdir}/usr gb - rm -f ${pkgdir}/usr/lib/gambas3/gb.{so*,la} - - ## needed for postinst with xdg-utils - install -d -m755 ${pkgdir}/usr/share/gambas3/mime - install -D -m644 mime/* \ - ${pkgdir}/usr/share/gambas3/mime/ - install -d -m755 ${pkgdir}/usr/share/gambas3/icons - install -D -m644 mime/application-x-gambas.png \ - ${pkgdir}/usr/share/gambas3/icons/application-x-gambas.png - - cd gbc - make DESTDIR="${pkgdir}" uninstall -} - -package_gambas3-devel() { - depends=('gambas3-runtime') - pkgdesc="Gambas3 development environment" - - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc - make DESTDIR="${pkgdir}" install -} - -package_gambas3-ide() { - depends=('gambas3-devel' 'gambas3-gb-db-form' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' - 'gambas3-gb-form-dialog' 'gambas3-gb-settings' 'gambas3-gb-form-mdi' 'gambas3-gb-image-effect' - 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-webkit') - pkgdesc="Gambas3 Integrated Development Environment" - - cd ${srcdir}/${pkgbase}-${pkgver} - make XDG_UTILS='' DESTDIR="${pkgdir}" install - -#!! 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 \ - ${pkgdir}/usr/share/pixmaps/gambas3.png - - rm -r ${pkgdir}/usr/bin/gb* - rm -r ${pkgdir}/usr/lib - rm -r ${pkgdir}/usr/share/gambas3 -} - -package_gambas3-script() { - depends=('gambas3-devel') - pkgdesc="Gambas3 scripter and server programs support" - install=gambas3-script.install - - cd ${srcdir}/${pkgbase}-${pkgver} - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## needed for postinst with xdg-utils - cd ${srcdir}/${pkgbase}-${pkgver}/app/mime - install -d -m755 ${pkgdir}/usr/share/gambas3/mime - install -D -m644 *.xml ${pkgdir}/usr/share/gambas3/mime/ - install -D -m644 *.png ${pkgdir}/usr/share/gambas3/mime/ - ## - - rm -r ${pkgdir}/usr/bin/{gambas*,gb{[a-r]*,x*}} - rm -r ${pkgdir}/usr/lib - rm -r ${pkgdir}/usr/share/gambas3/[c-i]* -} - -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' - '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-gui' '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') - pkgdesc="Gambas3 examples" - - cd ${srcdir}/${pkgbase}-${pkgver} - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - rm -r ${pkgdir}/usr/{bin,lib} - rm -r ${pkgdir}/usr/share/gambas3/{info,control,gb.sdl} -} - -package_gambas3-gb-cairo() { - depends=('gambas3-runtime' 'cairo') - pkgdesc="Gambas3 cairo component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.cairo - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-chart() { - depends=('gambas3-gb-form') - pkgdesc="Gambas3 chart component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make 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 - 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-compress() { - depends=('gambas3-runtime' 'bzip2' 'zlib') - pkgdesc="Gambas3 compression support component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2 - make DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib - make 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]* - ## -} - -package_gambas3-gb-crypt() { - depends=('gambas3-runtime') - pkgdesc="Gambas3 MD5/DES crypting component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db() { - depends=('gambas3-runtime') - pkgdesc="Gambas3 database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make 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]*} - ## -} - -package_gambas3-gb-db-form() { - depends=('gambas3-gb-db' 'gambas3-gb-form') - pkgdesc="Gambas3 database form component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make 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 - rm -r ${pkgdir}/usr/share/gambas3/control - rm -r ${pkgdir}/usr/lib/gambas3/gb.{chart*,[e-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{chart*,[e-z]*} - ## -} - -package_gambas3-gb-db-mysql() { - depends=('gambas3-gb-db' 'libmysqlclient') - pkgdesc="Gambas3 MySQL database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db-odbc() { - depends=('gambas3-gb-db' 'unixodbc') - pkgdesc="Gambas3 ODBC database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db-postgresql() { - depends=('gambas3-gb-db' 'postgresql-libs') - pkgdesc="Gambas3 PostgreSQL database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db-sqlite2() { - depends=('gambas3-gb-db' 'sqlite2') - pkgdesc="Gambas3 Sqlite2 database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db-sqlite3() { - depends=('gambas3-gb-db' 'sqlite3') - pkgdesc="Gambas3 Sqlite3 database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-desktop() { - depends=('gambas3-gb-image' 'libsm' 'libxtst' 'libgnome-keyring') - pkgdesc="Gambas3 desktop component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop - make DESTDIR="${pkgdir}" install - - ## 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-dbus() { - depends=('gambas3-runtime' 'dbus-core') - pkgdesc="Gambas3 DBUS component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-eval-highlight() { - depends=('gambas3-runtime') - pkgdesc="Gambas3 expression evaluator highlight component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.[f-z]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[f-z]* - ## -} - -package_gambas3-gb-form() { - depends=('gambas3-gb-gui') - pkgdesc="Gambas3 form component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make 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 - rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form.*,gb.report} - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}} - ## -} - -package_gambas3-gb-form-dialog() { - depends=('gambas3-gb-form') - pkgdesc="Gambas3 form dialog component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make 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 - rm -r ${pkgdir}/usr/share/gambas3/control - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,g*,m*,s*}} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,m*,s*}} - ## -} - -package_gambas3-gb-form-mdi() { - depends=('gambas3-gb-form') - pkgdesc="Gambas3 form MDI component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make 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 - rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form,gb.report} - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,d*,g*,s*}} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,d*,s*}} - ## -} - -package_gambas3-gb-form-stock() { - depends=('gambas3-runtime') - pkgdesc="Gambas3 default stock icons component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make 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 - rm -r ${pkgdir}/usr/lib/gambas3/gb.{eval*,[m-w]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{eval*,[m-w]*} - ## -} - -package_gambas3-gb-gtk() { - depends=('gambas3-gb-image' 'gtk2' 'librsvg') - pkgdesc="Gambas3 graphical GTK+ toolkit component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-gui() { - depends=('gambas3-gb-qt4' 'gambas3-gb-gtk') - pkgdesc="Gambas3 automatic gui toolkit chooser" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-e]*,gb.[i-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-e]*,gb.[i-z]*} - ## -} - -package_gambas3-gb-image() { - depends=('gambas3-runtime') - pkgdesc="Gambas3 image component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## cleanup the workaround - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.e*,gb.[j-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.e*,gb.[j-z]*} - ## -} - -package_gambas3-gb-image-effect() { - depends=('gambas3-gb-image') - pkgdesc="Gambas3 image effect component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## cleanup the workaround - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.{c*,l*,s*},gb.[j-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.{i*,l*},gb.[j-z]*} - ## -} - -package_gambas3-gb-image-imlib() { - depends=('gambas3-gb-image' 'imlib2') - pkgdesc="Gambas3 imlib component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.imlib - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-image-io() { - depends=('gambas3-gb-image' 'gdk-pixbuf2') - pkgdesc="Gambas3 input/output component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.io - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-net() { - depends=('gambas3-runtime') - pkgdesc="Gambas3 network component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-net-curl() { - depends=('gambas3-gb-net' 'curl') - pkgdesc="Gambas3 curl component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-net-smtp() { - depends=('gambas3-runtime' 'glib2') - pkgdesc="Gambas3 SMTP component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-opengl() { - depends=('gambas3-runtime' 'libgl' 'glew') - pkgdesc="Gambas3 OpenGL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-opengl-glu() { - depends=('gambas3-gb-opengl') - pkgdesc="Gambas3 GL Utility component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-opengl-glsl() { - depends=('gambas3-gb-opengl') - pkgdesc="Gambas3 GLSL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-option() { - depends=('gambas3-runtime') - pkgdesc="Gambas3 getopt component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## cleanup the workaround - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-n]*,gb.[p-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-n]*,gb.[p-z]*} - ## -} - -package_gambas3-gb-pcre() { - depends=('gambas3-runtime' 'pcre') - pkgdesc="Gambas3 PCRE component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-pdf() { - depends=('gambas3-runtime' 'poppler') - pkgdesc="Gambas3 PDF component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-qt4() { - depends=('gambas3-gb-image' 'qt') - pkgdesc="Gambas3 Qt4 toolkit component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-qt4-ext() { - depends=('gambas3-gb-qt4') - pkgdesc="Gambas3 Qt4 toolkit extended component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-qt4-opengl() { - depends=('gambas3-gb-qt4' 'libgl') - pkgdesc="Gambas3 Qt4 toolkit OpenGL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-qt4-webkit() { - depends=('gambas3-gb-qt4') - pkgdesc="Gambas3 Qt4 toolkit webkit component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-report() { - depends=('gambas3-gb-form' 'gambas3-gb-image-io') - pkgdesc="Gambas3 report component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make 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 - rm -r ${pkgdir}/usr/share/gambas3/control/gb.[d-f]* - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-m]*,[s-w]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-m]*,[s-w]*} - ## -} - -package_gambas3-gb-sdl() { - depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew' 'libgl') - pkgdesc="Gambas3 SDL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-sdl-sound() { - depends=('gambas3-runtime' 'sdl_mixer') - pkgdesc="Gambas3 SDL sound component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-settings() { - depends=('gambas3-runtime') - pkgdesc="Gambas3 setting component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-r]*,[t-w]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-r]*,[t-w]*} - ## -} - -package_gambas3-gb-signal() { - depends=('gambas3-runtime') - pkgdesc="Gambas3 signal component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## cleanup the workaround - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-r]*,gb.[t-z]*,gb.so*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-r]*,gb.[t-z]*} - ## -} - -package_gambas3-gb-v4l() { - depends=('gambas3-runtime' 'v4l-utils' 'libjpeg' 'libpng') - pkgdesc="Gambas3 video4linux component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-vb() { - depends=('gambas3-runtime') - pkgdesc="Gambas3 VB transitional component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## Workaround for splitting - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/gb.[a-u]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[a-u]* - ## -} - -package_gambas3-gb-xml() { - depends=('gambas3-runtime' 'libxml2') - pkgdesc="Gambas3 XML component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/rpc - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-xml-rpc() { - depends=('gambas3-gb-xml' 'gambas3-gb-net' 'gambas3-gb-net-curl') - pkgdesc="Gambas3 XML-RPC component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.xml.{[c-l]*,xslt*,so*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.xml.{[i-l]*,x*} - ## -} - -package_gambas3-gb-xml-xslt() { - depends=('gambas3-gb-xml' 'libxslt') - pkgdesc="Gambas3 XML-XSLT component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-web() { - depends=('gambas3-runtime') - pkgdesc="Gambas3 CGI component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.[c-v]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]* - ## -} diff --git a/community-staging/gambas3/gambas3-runtime.install b/community-staging/gambas3/gambas3-runtime.install deleted file mode 100644 index c6aad0d55..000000000 --- a/community-staging/gambas3/gambas3-runtime.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas3/mime/application-x-gambas.png application-x-gambas - xdg-mime install /usr/share/gambas3/mime/application-x-gambas.xml -} - -pre_remove() { - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas - xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambas.xml -} - -# vim:set ts=2 sw=2 et: diff --git a/community-staging/gambas3/gambas3-script.install b/community-staging/gambas3/gambas3-script.install deleted file mode 100644 index 77c1aa52f..000000000 --- a/community-staging/gambas3/gambas3-script.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas3/mime/application-x-gambasscript.png application-x-gambasscript - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas3/mime/application-x-gambasserverpage.png application-x-gambasserverpage - xdg-mime install /usr/share/gambas3/mime/application-x-gambasscript.xml - xdg-mime install /usr/share/gambas3/mime/application-x-gambasserverpage.xml -} - -pre_remove() { - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage - xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasscript.xml - xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasserverpage.xml -} diff --git a/community-staging/gambas3/gambas3.install b/community-staging/gambas3/gambas3.install deleted file mode 100644 index c6aad0d55..000000000 --- a/community-staging/gambas3/gambas3.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas3/mime/application-x-gambas.png application-x-gambas - xdg-mime install /usr/share/gambas3/mime/application-x-gambas.xml -} - -pre_remove() { - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas - xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambas.xml -} - -# vim:set ts=2 sw=2 et: diff --git a/community-staging/gource/PKGBUILD b/community-staging/gource/PKGBUILD deleted file mode 100644 index 2c357a634..000000000 --- a/community-staging/gource/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 47914 2011-05-26 01:27:25Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com> -# Contributor: Olivier Ramonat <olivier at ramonat dot fr> -pkgname=gource -pkgver=0.34 -pkgrel=2 -pkgdesc="software version control visualization" -license=(GPL3) -arch=(i686 x86_64) -url=http://code.google.com/p/gource/ -depends=('ftgl' 'sdl' 'sdl_image' 'pcre' 'glew') -source=(http://gource.googlecode.com/files/$pkgname-$pkgver.tar.gz) -md5sums=('292a62d687874e871067e985d717d71a') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR=$pkgdir install -} -# vim: ts=2:sw=2 et: diff --git a/community-staging/lightspark/PKGBUILD b/community-staging/lightspark/PKGBUILD deleted file mode 100644 index d1a23e996..000000000 --- a/community-staging/lightspark/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> - -pkgname=lightspark -pkgver=0.4.7.1 -pkgrel=4 -pkgdesc='An alternative Flash Player for Linux.' -arch=('i686' 'x86_64') -url='http://lightspark.sourceforge.net' -license=('LGPL3') -conflicts=('lightspark-git') -depends=('mesa' 'ftgl' 'sdl' 'gtk2' 'curl' 'zlib' 'ffmpeg' 'glew' 'pcre' 'libpulse' 'libffi' 'boost-libs' 'glibmm' 'gtkglext' 'desktop-file-utils' 'libxml++' 'libxml2') -makedepends=('cmake' 'nasm' 'xulrunner' 'llvm' 'glproto' 'boost' 'pkgconfig' 'fontconfig') -optdepends=('gnash-gtk: fallback support') -install="${pkgname}.install" -source=("http://launchpad.net/${pkgname}/trunk/${pkgname}-${pkgver:0:5}/+download/${pkgname}-${pkgver}.tar.gz") -md5sums=('fee5cd52a8a23e858979a8f4ec778266') - -build() { - rm -rf build - mkdir build - cd build - - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCOMPILE_PLUGIN=1 \ - -DCMAKE_BUILD_TYPE=Release \ - -DGNASH_EXE_PATH=/usr/bin/gtk-gnash \ - ../${pkgname}-${pkgver} - - make -} - -package() { - cd build - - make DESTDIR=${pkgdir} install -} diff --git a/community-staging/lightspark/lightspark.install b/community-staging/lightspark/lightspark.install deleted file mode 100644 index 75e2b7b55..000000000 --- a/community-staging/lightspark/lightspark.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/community-staging/performous/PKGBUILD b/community-staging/performous/PKGBUILD deleted file mode 100644 index 01aab85d1..000000000 --- a/community-staging/performous/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 47952 2011-05-26 11:21:56Z lcarlier $ -# Maintainer : Laurent Carlier <lordheavym@gmail.com> -# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> - -pkgname=performous -pkgver=0.6.1 -pkgrel=6 -pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' -arch=('i686' 'x86_64') -url="http://performous.org/" -license=('GPL') -depends=('boost-libs>=1.46' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew' 'libxml++' 'portaudio' 'portmidi' \ - 'opencv' 'librsvg' 'libjpeg' 'libpng' 'cairo') -makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.46') -optdepends=('performous-freesongs: free songs for performous') -source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2) -md5sums=('451a759de77984b5a699e91107fe52e2') - -build() { - cd ${srcdir}/Performous-${pkgver}-Source - - mkdir -p build - cd build - - # fix config loading with libxml++ - export LDFLAGS=${LDFLAGS/-Wl,--as-needed/} - # fix to built against boost 1.46, upstream (git) now support v3 - export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" - - cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr .. - - make -} - -package() { - cd ${srcdir}/Performous-${pkgver}-Source/build - - make DESTDIR="$pkgdir" install -} diff --git a/community-staging/root/PKGBUILD b/community-staging/root/PKGBUILD deleted file mode 100644 index 4f46232cf..000000000 --- a/community-staging/root/PKGBUILD +++ /dev/null @@ -1,78 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Sebastian Voecking <voeck@web.de> - -pkgname=root -pkgver=5.28.00d -pkgrel=2 -pkgdesc='C++ data analysis framework and interpreter from CERN.' -arch=('i686' 'x86_64') -url='http://root.cern.ch' -license=('LGPL2.1') -depends=('avahi' 'desktop-file-utils' 'ftgl' 'giflib' 'glew' 'graphviz' 'gsl' 'libldap' 'libmysqlclient' - 'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran') -makedepends=('fftw') -install='root.install' -source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz" - 'root.sh' - 'rootd' - 'root.desktop' - 'root.xml') -md5sums=('53505fcb256df38526d446916e6efc15' - '0e883ad44f99da9bc7c23bc102800b62' - 'efd06bfa230cc2194b38e0c8939e72af' - 'ac61b17395d75a2705fefa2ef841a6bf' - 'e2cf69b204192b5889ceb5b4dedc66f7') - -build() { - cd ${pkgname} - - if [ ${CARCH} == 'i686' ]; then - TARGET=linux; - else - TARGET=linuxx8664gcc; - fi - - # python2 switch - find . -type f -exec sed -i -e 's/python -O/python2 -O/g' -e 's/python -c/python2 -c/g' {} \; - sed -i 's/python 2/python2 2/g' configure - - ./configure \ - ${TARGET} \ - --prefix=/usr \ - --disable-builtin-glew \ - --disable-builtin-freetype \ - --disable-builtin-ftgl \ - --disable-builtin-pcre \ - --disable-builtin-zlib \ - --enable-gdml \ - --enable-gsl-shared \ - --enable-minuit2 \ - --enable-soversion \ - --enable-roofit \ - --enable-python \ - --with-python-incdir=/usr/include/python2.7 \ - --with-python-libdir=/usr/lib - #--disable-krb5 - # disable krb5 because of compile error - - # move from aur - #--disable-builtin-afterimage \ - - #--with-python-incdir=/usr/include/python2.7/Python.h \ - #--with-python-libdir=/usr/lib/libpython2.7.so - - make -} - -package() { - cd ${pkgname} - - make DESTDIR=${pkgdir} install - - install -D ${srcdir}/root.sh ${pkgdir}/etc/profile.d/root.sh - install -D ${srcdir}/rootd ${pkgdir}/etc/rc.d/rootd - install -D -m644 ${srcdir}/root.desktop ${pkgdir}/usr/share/applications/root.desktop - install -D -m644 ${srcdir}/root.xml ${pkgdir}/usr/share/mime/packages/root.xml - - rm -rf ${pkgdir}/etc/root/daemons -} diff --git a/community-staging/root/root.desktop b/community-staging/root/root.desktop deleted file mode 100644 index ca382111c..000000000 --- a/community-staging/root/root.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Exec=root -Terminal=true -Name=ROOT -Name[de]=ROOT -Comment=An object-oriented data analysis framework -Comment[de]=Ein objektorientiertes Framework zur Datenanalyse -StartupNotify=true -MimeType=application/x-root;text/x-c++src -Categories=Science;Development;Application; diff --git a/community-staging/root/root.install b/community-staging/root/root.install deleted file mode 100644 index 457af7314..000000000 --- a/community-staging/root/root.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() { - if ! [ `grep '/usr/lib/root' etc/ld.so.conf` ]; then - echo "/usr/lib/root" >> etc/ld.so.conf - sbin/ldconfig -r . - fi - - update-desktop-database >/dev/null - - update-mime-database /usr/share/mime >/dev/null -} - -pre_remove() { - cat etc/ld.so.conf | grep -v '/usr/lib/root' >/tmp/.pacroot - mv /tmp/.pacroot etc/ld.so.conf - chmod 644 etc/ld.so.conf - sbin/ldconfig -r . -} diff --git a/community-staging/root/root.sh b/community-staging/root/root.sh deleted file mode 100644 index 685e6036b..000000000 --- a/community-staging/root/root.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [ $PYTHONPATH ]; then - export PYTHONPATH=$PYTHONPATH:/usr/lib/root; -else - export PYTHONPATH=/usr/lib/root; -fi diff --git a/community-staging/root/root.xml b/community-staging/root/root.xml deleted file mode 100644 index af8dd69c5..000000000 --- a/community-staging/root/root.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> - <mime-type type="application/x-root"> - <comment>ROOT file</comment> - <comment xml:lang="de">ROOT-Datei</comment> - <glob pattern="*.root"/> - <magic priority="80"> - <match value="root" type="string" offset="0:64"/> - </magic> - </mime-type> -</mime-info> diff --git a/community-staging/root/rootd b/community-staging/root/rootd deleted file mode 100755 index fb2c3388c..000000000 --- a/community-staging/root/rootd +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/rootd` -case "$1" in - start) - stat_busy "Starting ROOT file server daemon" - [ -z "$PID" ] && /usr/bin/rootd >>/var/log/root.log 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - PID=`pidof -o %PPID /usr/sbin/rootd` - echo $PID >/var/run/rootd.pid - add_daemon rootd - stat_done - fi - ;; - stop) - stat_busy "Stopping ROOT file server daemon" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon rootd - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-staging/rss-glx/PKGBUILD b/community-staging/rss-glx/PKGBUILD deleted file mode 100644 index 37c440cf4..000000000 --- a/community-staging/rss-glx/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 48037 2011-05-27 16:21:40Z spupykin $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> -# Contributor: Tate "Tatey" Johnson <tatey86@tpg.com.au> - -pkgname=rss-glx -pkgver=0.9.1 -pkgrel=6 -pkgdesc="The Really Slick Screensavers port to GLX" -arch=('i686' 'x86_64') -url="http://rss-glx.sourceforge.net/" -license=('GPL') -depends=('desktop-file-utils' 'freealut' 'glew' 'imagemagick') -optdepends=('xscreensaver: xscreensaver integration') -install=rss-glx.install -options=('!libtool') -source=(http://downloads.sourceforge.net/rss-glx/${pkgname}_${pkgver}.tar.bz2 - rss-glx-desktops.tar.bz2) -md5sums=('a772bd143cd8d141edf4d9eff9860ab3' - '4211215c9a4918b0dff30a7000647dd9') - -build() { - cd ${srcdir}/${pkgname}_${pkgver} - - [ "$CARCH" = "x86_64" ] && (sed -i -e 's|@LIBS@|@LIBS@ -fopenmp|g' src/Makefile.in) - - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --program-transform-name='s/plasma/plasma_rss/' \ - --with-configdir=/usr/share/xscreensaver/config \ - --with-kdessconfigdir=/usr/share/applnk/System/ScreenSavers \ - --enable-shared=yes --enable-static=no - make CFLAGS="$CFLAGS -I/usr/include/ImageMagick" - make DESTDIR=${pkgdir} install - - # FS#18300 - install -d ${pkgdir}/usr/lib/xscreensaver/ - list=$(ls ${pkgdir}/usr/bin --ignore rss-glx_install.pl) - for i in $list; do - ln -s "/usr/bin/$i" "$pkgdir/usr/lib/xscreensaver/" - done - - install -d ${pkgdir}/usr/share/applications/screensavers - install -m644 ${srcdir}/${pkgname}-desktops/*.desktop ${pkgdir}/usr/share/applications/screensavers -} diff --git a/community-staging/rss-glx/rss-glx-desktops.tar.bz2 b/community-staging/rss-glx/rss-glx-desktops.tar.bz2 Binary files differdeleted file mode 100644 index 940fd5277..000000000 --- a/community-staging/rss-glx/rss-glx-desktops.tar.bz2 +++ /dev/null diff --git a/community-staging/rss-glx/rss-glx.install b/community-staging/rss-glx/rss-glx.install deleted file mode 100644 index 758642618..000000000 --- a/community-staging/rss-glx/rss-glx.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - cat << 'EOM' - --> If you want to integrate the RSS screen savers with xscreensaver - --> for your user, then install the xscreensaver package and launch - --> the command "rss-glx_install.pl" -EOM - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/community-staging/sfml/PKGBUILD b/community-staging/sfml/PKGBUILD deleted file mode 100644 index 806e373d4..000000000 --- a/community-staging/sfml/PKGBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: PKGBUILD 47923 2011-05-26 03:12:35Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Ondrej Martinak <omartinak@gmail.com> - -pkgname=sfml - -_git=true - -if [[ "${_git}" = "true" ]]; then - pkgver=1.99.git20110526 -fi - -pkgrel=1 -pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API' -arch=('i686' 'x86_64') -url='http://www.sfml-dev.org/' -license=('zlib') -depends=('libsndfile' 'libxrandr' 'libjpeg' 'openal' 'glew' 'freetype2') -makedepends=('git' 'mesa' 'cmake' 'doxygen') - -_gitroot='https://github.com/LaurentGomila/SFML.git' -_gitname='SFML' - -build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [ -d $_gitname ] ; then - cd $_gitname && git pull origin - msg "The local files are updated." - else - git clone $_gitroot - cd $_gitname - fi - - msg "GIT checkout done or server timeout" - msg "Starting make..." - - rm -rf "$srcdir/$_gitname-build" - cp -r "$srcdir/$_gitname" "$srcdir/$_gitname-build" - cd "$srcdir/$_gitname-build" - - mkdir build && cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr .. \ - -DBUILD_DOC=true \ - -DBUILD_EXAMPLES=true - make - make doc -} - -package() { - cd "$srcdir/$_gitname-build/build" - make DESTDIR="$pkgdir/" install - - install -Dm644 ../license.txt \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - - make clean -} - diff --git a/community-staging/sfml/sfml.install b/community-staging/sfml/sfml.install deleted file mode 100644 index 9d18b5251..000000000 --- a/community-staging/sfml/sfml.install +++ /dev/null @@ -1,3 +0,0 @@ -post_install() { - echo "To view the SFML samples, go to /opt/SFML/samples/bin and run them individually" -} diff --git a/community-staging/sfml/use-system-libs.patch b/community-staging/sfml/use-system-libs.patch deleted file mode 100644 index 5d3200225..000000000 --- a/community-staging/sfml/use-system-libs.patch +++ /dev/null @@ -1,70 +0,0 @@ -Only in SFML-1.6-old/lib: libsfml-graphics.so.1.6 -Binary files SFML-1.6-old/lib/libsfml-network.so.1.6 and SFML-1.6/lib/libsfml-network.so.1.6 differ -Binary files SFML-1.6-old/lib/libsfml-system.so.1.6 and SFML-1.6/lib/libsfml-system.so.1.6 differ -Binary files SFML-1.6-old/lib/libsfml-window.so.1.6 and SFML-1.6/lib/libsfml-window.so.1.6 differ -diff -ur SFML-1.6-old/src/SFML/Graphics/ImageLoader.cpp SFML-1.6/src/SFML/Graphics/ImageLoader.cpp ---- SFML-1.6-old/src/SFML/Graphics/ImageLoader.cpp 2010-01-27 15:00:05.000000000 +0100 -+++ SFML-1.6/src/SFML/Graphics/ImageLoader.cpp 2010-08-16 12:27:33.983627625 +0200 -@@ -28,10 +28,10 @@ - #include <SFML/Graphics/ImageLoader.hpp>
- extern "C"
- {
-- #include <SFML/Graphics/libjpeg/jpeglib.h>
-- #include <SFML/Graphics/libjpeg/jerror.h>
-+ #include <jpeglib.h>
-+ #include <jerror.h>
- }
--#include <SFML/Graphics/libpng/png.h>
-+#include <png.h>
- #include <SFML/Graphics/SOIL/SOIL.h>
- #include <iostream>
-
-Only in SFML-1.6-old/src/SFML/Graphics: ImageLoader.cpp.rej -diff -ur SFML-1.6-old/src/SFML/Graphics/Makefile SFML-1.6/src/SFML/Graphics/Makefile ---- SFML-1.6-old/src/SFML/Graphics/Makefile 2010-01-27 15:00:05.000000000 +0100 -+++ SFML-1.6/src/SFML/Graphics/Makefile 2010-08-16 12:25:13.663501212 +0200 -@@ -1,15 +1,5 @@ - SRC = $(wildcard *.cpp)
--SRCGLEW = $(wildcard ./GLEW/*.c)
--SRCJPEG = $(wildcard ./libjpeg/*.c)
--SRCPNG = $(wildcard ./libpng/*.c)
--SRCSOIL = $(wildcard ./SOIL/*.c)
--SRCZLIB = $(wildcard ./zlib/*.c)
- OBJ = $(SRC:.cpp=.o)
--OBJGLEW = $(SRCGLEW:.c=.o)
--OBJJPEG = $(SRCJPEG:.c=.o)
--OBJPNG = $(SRCPNG:.c=.o)
--OBJSOIL = $(SRCSOIL:.c=.o)
--OBJZLIB = $(SRCZLIB:.c=.o)
-
- ifeq ($(STATIC), yes)
- LIB = libsfml-graphics-s.a
-@@ -23,22 +13,19 @@ -
- all: $(LIB)
-
--libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-- $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-+libsfml-graphics-s.a: $(OBJ)
-+ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) -static -lGLEW -ljpeg -lpng -lsoil -lz -lSOIL
-
--libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype -lX11 -lGL
-+libsfml-graphics.so: $(OBJ)
-+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lGLEW -ljpeg -lpng -lSOIL -lz -lfreetype -lX11 -lGL
-
- $(OBJ): %.o: %.cpp
- $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
-
--$(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c
-- $(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG
--
- .PHONY: clean mrproper
-
- clean:
-- @rm -rf $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-+ @rm -rf $(OBJ)
-
- mrproper: clean
- @rm -rf $(LIBNAME)
-Only in SFML-1.6-old/src/SFML/Graphics: Makefile.rej diff --git a/community-staging/spring/PKGBUILD b/community-staging/spring/PKGBUILD deleted file mode 100644 index 38ce61979..000000000 --- a/community-staging/spring/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 47908 2011-05-26 01:20:52Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Arkham <arkham at archlinux dot us> -# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> - -pkgname=spring -pkgver=0.82.7.1 -pkgrel=4 -pkgdesc='A free 3D real-time-strategy (RTS) game engine' -arch=('i686' 'x86_64') -url="http://springrts.com/" -license=('GPL') -depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis') -makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python' 'java-environment') -optdepends=('python: python-based bots' - 'java-runtime: java-based bots') -source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma - gcc46.patch) -md5sums=('378cf0b18a5dd5b840964e5945778503' - 'e9586b611db1ed04fe4f0c5982fda7d2') - -build() { - bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma - - cd spring_$pkgver - - sed -i '1i\ - #include <list>' rts/lib/lobby/Connection.h - patch -Np1 < $srcdir/gcc46.patch - cmake . \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DDATADIR=share/spring - make -} - -package() { - cd spring_$pkgver - - make DESTDIR=$pkgdir install - - install -d $pkgdir/etc/spring - echo '$HOME/.spring' > $pkgdir/etc/spring/datadir -} - -# vim sw=2:ts=2 et: diff --git a/community-staging/spring/gcc46.patch b/community-staging/spring/gcc46.patch deleted file mode 100644 index 4f6865cac..000000000 --- a/community-staging/spring/gcc46.patch +++ /dev/null @@ -1,67 +0,0 @@ -From: Jan Dittberner <jandd@debian.org> -Subject: Patch for FTBFS with g++ 4.6.0 -Bug-Debian: http://bugs.debian.org/625097 -Bug: http://springrts.com/mantis/view.php?id=2415 ---- a/AI/Skirmish/E323AI/AAStar.h -+++ b/AI/Skirmish/E323AI/AAStar.h -@@ -4,6 +4,7 @@ - #include <queue> - #include <vector> - #include <list> -+#include <cstddef> // for NULL - - class AAStar { - public: ---- a/rts/Rendering/ShadowHandler.cpp -+++ b/rts/Rendering/ShadowHandler.cpp -@@ -318,6 +318,11 @@ - xmid = 1.0f - (sqrt(fabs(x2)) / (sqrt(fabs(x2)) + sqrt(fabs(x1)))); - ymid = 1.0f - (sqrt(fabs(y2)) / (sqrt(fabs(y2)) + sqrt(fabs(y1)))); - -+ shadowParams.x = xmid; -+ shadowParams.y = ymid; -+ shadowParams.z = p17; -+ shadowParams.w = p18; -+ - shadowMatrix[ 0] = cross1.x / maxLengthX; - shadowMatrix[ 4] = cross1.y / maxLengthX; - shadowMatrix[ 8] = cross1.z / maxLengthX; ---- a/rts/Rendering/ShadowHandler.h -+++ b/rts/Rendering/ShadowHandler.h -@@ -38,7 +38,7 @@ - CMatrix44f shadowMatrix; - void CalcMinMaxView(void); - -- const float4 GetShadowParams() const { return float4(xmid, ymid, p17, p18); } -+ const float4& GetShadowParams() const { return shadowParams; } - - enum ShadowGenProgram { - SHADOWGEN_PROGRAM_MODEL = 0, -@@ -76,6 +76,7 @@ - //! to write the (FBO) depth-buffer texture - std::vector<Shader::IProgramObject*> shadowGenProgs; - -+ float4 shadowParams; - float x1, x2, y1, y2; - float xmid, ymid; - float p17, p18; ---- a/rts/Rendering/GLContext.cpp -+++ b/rts/Rendering/GLContext.cpp -@@ -9,6 +9,7 @@ - #include "GLContext.h" - - #include <list> -+#include <cstddef> // for NULL - - - using namespace std; ---- a/rts/System/MemPool.h -+++ b/rts/System/MemPool.h -@@ -4,6 +4,7 @@ - #define _MEM_POOL_H_ - - #include <new> -+#include <cstddef> // for NULL - - const size_t MAX_MEM_SIZE=200; - diff --git a/community-staging/supertux/PKGBUILD b/community-staging/supertux/PKGBUILD deleted file mode 100644 index dbcd690af..000000000 --- a/community-staging/supertux/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> -# Contributor: Eric Belanger <belanger@astro.umontreal.ca> -# Contributor: vande198 -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=supertux -pkgver=0.3.3 -pkgrel=3 -pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games" -arch=('i686' 'x86_64') -url="http://super-tux.sourceforge.net/" -license=('GPL') -depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'libgl' 'glew') -makedepends=('cmake' 'boost') -source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2) -md5sums=('f3f803e629ee51a9de0b366a036e393d') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp - cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin . - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install -} diff --git a/community-staging/supertux/compile.patch b/community-staging/supertux/compile.patch deleted file mode 100644 index 05376fe91..000000000 --- a/community-staging/supertux/compile.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -ruN supertux-0.3.1.orig/src/console.hpp supertux-0.3.1/src/console.hpp ---- supertux-0.3.1.orig/src/console.hpp 2008-01-03 21:59:27.000000000 +0100 -+++ supertux-0.3.1/src/console.hpp 2008-08-23 11:57:47.000000000 +0200 -@@ -27,6 +27,8 @@ - #include <sstream> - #include <iostream> - #include <squirrel.h> -+#include <memory> -+#include <cstdlib> - - class Console; - class ConsoleStreamBuffer; -diff -ruN supertux-0.3.1.orig/src/lisp/lexer.cpp supertux-0.3.1/src/lisp/lexer.cpp ---- supertux-0.3.1.orig/src/lisp/lexer.cpp 2008-01-03 21:59:26.000000000 +0100 -+++ supertux-0.3.1/src/lisp/lexer.cpp 2008-08-23 13:45:58.000000000 +0200 -@@ -21,6 +21,7 @@ - #include <sstream> - #include <stdexcept> - #include <iostream> -+#include <cstring> - - #include "lexer.hpp" - -diff -ruN supertux-0.3.1.orig/src/sprite/sprite_manager.hpp supertux-0.3.1/src/sprite/sprite_manager.hpp ---- supertux-0.3.1.orig/src/sprite/sprite_manager.hpp 2008-01-03 21:59:26.000000000 +0100 -+++ supertux-0.3.1/src/sprite/sprite_manager.hpp 2008-08-23 13:29:34.000000000 +0200 -@@ -21,6 +21,7 @@ - #define SUPERTUX_SPRITE_MANAGER_H - - #include <map> -+#include <string> - - class SpriteData; - class Sprite; -diff -ruN supertux-0.3.1.orig/src/textscroller.hpp supertux-0.3.1/src/textscroller.hpp ---- supertux-0.3.1.orig/src/textscroller.hpp 2008-01-03 21:59:27.000000000 +0100 -+++ supertux-0.3.1/src/textscroller.hpp 2008-08-23 13:34:35.000000000 +0200 -@@ -24,6 +24,7 @@ - #include <vector> - #include <string> - #include <map> -+#include <memory> - - #include "screen.hpp" - #include "math/vector.hpp" -diff -ruN supertux-0.3.1.orig/src/title.cpp supertux-0.3.1/src/title.cpp ---- supertux-0.3.1.orig/src/title.cpp 2008-01-03 21:59:28.000000000 +0100 -+++ supertux-0.3.1/src/title.cpp 2008-08-23 12:05:19.000000000 +0200 -@@ -32,6 +32,7 @@ - #include <SDL.h> - #include <SDL_image.h> - #include <physfs.h> -+#include <algorithm> - - #include "title.hpp" - #include "mainloop.hpp" -diff -ruN supertux-0.3.1.orig/src/video/sdl_texture.hpp supertux-0.3.1/src/video/sdl_texture.hpp ---- supertux-0.3.1.orig/src/video/sdl_texture.hpp 2008-01-03 21:59:22.000000000 +0100 -+++ supertux-0.3.1/src/video/sdl_texture.hpp 2008-08-23 13:37:14.000000000 +0200 -@@ -23,6 +23,7 @@ - #include <config.h> - - #include <SDL.h> -+#include <algorithm> - - #include "texture.hpp" - #include "color.hpp" diff --git a/community-staging/supertux/gcc44.patch b/community-staging/supertux/gcc44.patch deleted file mode 100644 index b58d9c29d..000000000 --- a/community-staging/supertux/gcc44.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -ruN supertux-0.3.1.orig/src/console.hpp supertux-0.3.1/src/console.hpp ---- supertux-0.3.1.orig/src/console.hpp 2008-01-03 20:59:27.000000000 +0000 -+++ supertux-0.3.1/src/console.hpp 2009-05-17 19:43:26.914307646 +0000 -@@ -27,6 +27,8 @@ - #include <sstream> - #include <iostream> - #include <squirrel.h> -+#include <memory> -+#include <cstdlib> - - class Console; - class ConsoleStreamBuffer; -diff -ruN supertux-0.3.1.orig/src/lisp/lexer.cpp supertux-0.3.1/src/lisp/lexer.cpp ---- supertux-0.3.1.orig/src/lisp/lexer.cpp 2008-01-03 20:59:26.000000000 +0000 -+++ supertux-0.3.1/src/lisp/lexer.cpp 2009-05-17 19:43:27.037705317 +0000 -@@ -21,6 +21,7 @@ - #include <sstream> - #include <stdexcept> - #include <iostream> -+#include <cstring> - - #include "lexer.hpp" - -diff -ruN supertux-0.3.1.orig/src/lisp/lisp.cpp supertux-0.3.1/src/lisp/lisp.cpp ---- supertux-0.3.1.orig/src/lisp/lisp.cpp 2008-01-03 20:59:26.000000000 +0000 -+++ supertux-0.3.1/src/lisp/lisp.cpp 2009-05-17 19:44:29.305165638 +0000 -@@ -18,7 +18,7 @@ - // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - #include <config.h> -- -+#include <cstdio> - #include "lisp.hpp" - - namespace lisp -diff -ruN supertux-0.3.1.orig/src/random_generator.cpp supertux-0.3.1/src/random_generator.cpp ---- supertux-0.3.1.orig/src/random_generator.cpp 2008-01-03 20:59:27.000000000 +0000 -+++ supertux-0.3.1/src/random_generator.cpp 2009-05-17 19:44:05.851002254 +0000 -@@ -39,6 +39,7 @@ - #include <stdexcept> - #include <time.h> - #include <cassert> -+#include <cstdio> - #include "random_generator.hpp" - - RandomGenerator systemRandom; // global random number generator -diff -ruN supertux-0.3.1.orig/src/sprite/sprite_manager.hpp supertux-0.3.1/src/sprite/sprite_manager.hpp ---- supertux-0.3.1.orig/src/sprite/sprite_manager.hpp 2008-01-03 20:59:26.000000000 +0000 -+++ supertux-0.3.1/src/sprite/sprite_manager.hpp 2009-05-17 19:43:27.037705317 +0000 -@@ -21,6 +21,7 @@ - #define SUPERTUX_SPRITE_MANAGER_H - - #include <map> -+#include <string> - - class SpriteData; - class Sprite; -diff -ruN supertux-0.3.1.orig/src/textscroller.hpp supertux-0.3.1/src/textscroller.hpp ---- supertux-0.3.1.orig/src/textscroller.hpp 2008-01-03 20:59:27.000000000 +0000 -+++ supertux-0.3.1/src/textscroller.hpp 2009-05-17 19:43:27.037705317 +0000 -@@ -24,6 +24,7 @@ - #include <vector> - #include <string> - #include <map> -+#include <memory> - - #include "screen.hpp" - #include "math/vector.hpp" -diff -ruN supertux-0.3.1.orig/src/title.cpp supertux-0.3.1/src/title.cpp ---- supertux-0.3.1.orig/src/title.cpp 2008-01-03 20:59:28.000000000 +0000 -+++ supertux-0.3.1/src/title.cpp 2009-05-17 19:43:27.041000359 +0000 -@@ -32,6 +32,7 @@ - #include <SDL.h> - #include <SDL_image.h> - #include <physfs.h> -+#include <algorithm> - - #include "title.hpp" - #include "mainloop.hpp" -diff -ruN supertux-0.3.1.orig/src/video/sdl_texture.hpp supertux-0.3.1/src/video/sdl_texture.hpp ---- supertux-0.3.1.orig/src/video/sdl_texture.hpp 2008-01-03 20:59:22.000000000 +0000 -+++ supertux-0.3.1/src/video/sdl_texture.hpp 2009-05-17 19:43:27.041000359 +0000 -@@ -23,6 +23,7 @@ - #include <config.h> - - #include <SDL.h> -+#include <algorithm> - - #include "texture.hpp" - #include "color.hpp" diff --git a/community-staging/vdrift/PKGBUILD b/community-staging/vdrift/PKGBUILD deleted file mode 100644 index 41dab8d90..000000000 --- a/community-staging/vdrift/PKGBUILD +++ /dev/null @@ -1,66 +0,0 @@ -# $Id: PKGBUILD 47904 2011-05-26 00:55:30Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Anton Bazhenov <anton.bazhenov at gmail> -# Contributor: Lone_Wolf lonewolf@xs4all.nl - -pkgname=vdrift -pkgver=2010.06.30 -pkgrel=3 -pkgdesc="An open source driving simulation made with drift racing in mind" -arch=('i686' 'x86_64') -url="http://vdrift.net/" -license=('GPL') -depends=('sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data') -makedepends=('scons' 'boost' 'asio') -source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgname-${pkgver//./-}/$pkgname-${pkgver//./-}.tar.bz2 - $pkgname.desktop) -md5sums=('ddcaf90bb25f9ce9cc084d7f467d7b56' - '8bb429f37bcb4aed5e7ab1d80c5a4f93') - -build() { - cd "$srcdir"/$pkgname-${pkgver//./-} - - # select arch - if [ `uname -m` = "x86_64" ]; then - _sconsarch="a64" - else - _sconsarch="686" - fi - - # patch for crashing with bad drivers - sed -i 's/glGenerateMipmap/glGenerateMipmapEXT/g' src/texture.cpp - - # build and install - scons \ - "destdir"="$pkgdir" \ - "arch"=$_sconsarch \ - "release"=1 \ - "force_feedback"=1 \ - "prefix"=/usr \ - "datadir"=share/$pkgname/data || return 1 -} - -package() { - cd "$srcdir"/$pkgname-${pkgver//./-} - - scons install || return 1 - - # remove some unneeded files - find "$pkgdir"/usr/share/$pkgname -name SConscript -delete - - # install icons - install -Dm644 data/textures/icons/$pkgname-16x16.png \ - "$pkgdir"/usr/share/icons/hicolor/16x16/apps/$pkgname.png - install -Dm644 data/textures/icons/$pkgname-32x32.png \ - "$pkgdir"/usr/share/icons/hicolor/32x32/apps/$pkgname.png - install -Dm644 data/textures/icons/$pkgname-64x64.png \ - "$pkgdir"/usr/share/icons/hicolor/64x64/apps/$pkgname.png - - # install .desktop file - install -Dm644 ../$pkgname.desktop \ - "$pkgdir"/usr/share/applications/$pkgname.desktop - - # delete installed data (will be provided by -data package) - rm -r "$pkgdir"/usr/share/$pkgname -} -# vim: sw=2:ts=2 et: diff --git a/community-staging/vdrift/vdrift.desktop b/community-staging/vdrift/vdrift.desktop deleted file mode 100644 index 7078f0d9c..000000000 --- a/community-staging/vdrift/vdrift.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Name=VDrift -Version=2009-06-15 -GenericName=Racing Simulation -Comment=An open source driving simulation made with drift racing in mind -Exec=vdrift -Icon=vdrift.png -Terminal=false -Categories=Game;Simulation; diff --git a/community-staging/widelands/PKGBUILD b/community-staging/widelands/PKGBUILD deleted file mode 100644 index e2a882999..000000000 --- a/community-staging/widelands/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 47900 2011-05-26 00:39:20Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Arkham <arkham at archlinux dot us> -# Contributor: Christoph Zeiler <rabyte*gmail> - -pkgname=widelands -pkgver=16 -_realver=build16 -pkgrel=2 -pkgdesc="A realtime strategy game with emphasis on economy and transport" -arch=('i686' 'x86_64') -url="http://widelands.org/" -license=('GPL') -depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2') -makedepends=('cmake' 'boost') -source=(http://launchpad.net/$pkgname/build16/$_realver/+download/$pkgname-$_realver-src.tar.bz2 - $pkgname.desktop - $pkgname.png - $pkgname.sh) -md5sums=('3d8c28e145b73c64d8ed1625319d25a2' - '15820bf099fd6f16251fe70a75c534bb' - '3dfda7e9ca76ca00dd98d745d0ceb328' - '7cae50aba5ed0cd2cfeea79124637b46') - -build() { - cd $srcdir/$pkgname-$_realver-src - - mkdir -p build/compile && cd build/compile - - cmake ../.. -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWL_INSTALL_PREFIX=/usr \ - -DWL_INSTALL_DATADIR=share/$pkgname \ - -DWL_INSTALL_BINDIR=bin - make -} - -package() { - cd $srcdir/$pkgname-$_realver-src/build/compile - - make DESTDIR="$pkgdir" install - - # Install bin, icon and desktop file - #install -Dm 755 src/$pkgname $pkgdir/usr/share/$pkgname/$pkgname - #install -Dm 755 $srcdir/$pkgname.sh $pkgdir/usr/bin/$pkgname - install -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png - install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop -} diff --git a/community-staging/widelands/widelands-build15-gcc-4.5-patch b/community-staging/widelands/widelands-build15-gcc-4.5-patch deleted file mode 100644 index 6ba313358..000000000 --- a/community-staging/widelands/widelands-build15-gcc-4.5-patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc ---- widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc 2010-04-16 15:41:22.000000000 +0000 -+++ widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc 2010-07-01 21:15:56.000000000 +0000 -@@ -113,7 +113,7 @@ - posx, posy, width, height, - g_gr->get_picture(PicMod_UI, "pics/but1.png"), - &Main_Menu_New_Map::button_clicked, *this, 4, -- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); -+ Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); - - posy += height + spacing + spacing + spacing; - -@@ -142,7 +142,7 @@ - if (m_currentworld == m_worlds.size()) - m_currentworld = 0; - m_world->set_title -- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name -+ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name - ()); - break; - } -diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc ---- widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc 2010-04-16 15:41:22.000000000 +0000 -+++ widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc 2010-07-01 21:17:39.000000000 +0000 -@@ -272,7 +272,7 @@ - posx, posy, width, height, - g_gr->get_picture(PicMod_UI, "pics/but1.png"), - &Main_Menu_New_Random_Map::button_clicked, *this, 8, -- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); -+ Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); - - posy += height + spacing + spacing + spacing; - -@@ -343,7 +343,7 @@ - if (m_currentworld == m_worlds.size()) - m_currentworld = 0; - m_world->set_title -- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); -+ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); - break; - case 9: - break; -@@ -476,7 +476,7 @@ - (strcmp(mapInfo.worldName.c_str(), m_worlds[m_currentworld].c_str())) - ++m_currentworld; - m_world->set_title -- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); -+ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); - - button_clicked(-1); // Update other values in UI as well - diff --git a/community-staging/widelands/widelands.desktop b/community-staging/widelands/widelands.desktop deleted file mode 100644 index 9715d816c..000000000 --- a/community-staging/widelands/widelands.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Widelands -GenericName=Widelands -Comment=Realtime strategy game -Icon=widelands -Exec=widelands -Type=Application -Categories=Game;StrategyGame; diff --git a/community-staging/widelands/widelands.png b/community-staging/widelands/widelands.png Binary files differdeleted file mode 100644 index c329cf667..000000000 --- a/community-staging/widelands/widelands.png +++ /dev/null diff --git a/community-staging/widelands/widelands.sh b/community-staging/widelands/widelands.sh deleted file mode 100644 index 0b21a1694..000000000 --- a/community-staging/widelands/widelands.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd /usr/share/widelands -./widelands $* diff --git a/community-testing/gitg/PKGBUILD b/community-testing/gitg/PKGBUILD deleted file mode 100644 index 19c71018e..000000000 --- a/community-testing/gitg/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> -# Contributor: Blaž Tomžič <blaz.tomazic@gmail.com> -# Contributor: Thomas Dziedzic < gostrc at gmail > -# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> -# Contributor: M Rawash <mrawash@gmail.com> -# Contributor: DonVla <donvla@users.sourceforge.net> - -pkgname=gitg -pkgver=0.2.2 -pkgrel=1 -pkgdesc='A GIT repository viewer based on GTK+' -arch=('i686' 'x86_64') -url='http://trac.novowork.com/gitg/' -license=('GPL') -depends=('gconf' 'gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop-schemas') -makedepends=('intltool') -install="${pkgname}.install" -source=("ftp://ftp.gnome.org/pub/GNOME/sources/gitg/0.2/${pkgname}-${pkgver}.tar.bz2") -sha256sums=('cfa1b1d2bdd1211c09e00dca42130ea98e98fde576d85e18eabfde1802d0d04a') - -build() { - cd ${pkgname}-${pkgver} - - ./configure \ - --prefix=/usr - make -} - -package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install -} diff --git a/community-testing/gitg/gitg.install b/community-testing/gitg/gitg.install deleted file mode 100644 index 787d6085e..000000000 --- a/community-testing/gitg/gitg.install +++ /dev/null @@ -1,17 +0,0 @@ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> -# Contributor: DonVla <donvla@users.sourceforge.net> -# gitg install file - -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q -} diff --git a/community/balsa/balsa-2.4.8-libnotify-0.7.patch b/community/balsa/balsa-2.4.8-libnotify-0.7.patch deleted file mode 100644 index 0cef7f54a..000000000 --- a/community/balsa/balsa-2.4.8-libnotify-0.7.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- libbalsa/information.c -+++ libbalsa/information.c -@@ -27,6 +27,9 @@ - - #ifdef HAVE_NOTIFY - #include <libnotify/notify.h> -+#ifndef NOTIFY_CHECK_VERSION -+#define NOTIFY_CHECK_VERSION(x,y,z) 0 -+#endif - #include <gtk/gtk.h> - #endif - #include <string.h> -@@ -122,7 +125,11 @@ - g_free(msg); - - note = -+#if NOTIFY_CHECK_VERSION (0, 7, 0) -+ notify_notification_new("Balsa", escaped->str, icon_str); -+#else - notify_notification_new("Balsa", escaped->str, icon_str, NULL); -+#endif - g_string_free(escaped, TRUE); - - notify_notification_set_timeout(note, 7000); /* 7 seconds */ ---- src/main-window.c -+++ src/main-window.c -@@ -85,6 +85,12 @@ - - #define MAILBOX_DATA "mailbox_data" - -+#ifdef HAVE_NOTIFY -+#ifndef NOTIFY_CHECK_VERSION -+#define NOTIFY_CHECK_VERSION(x,y,z) 0 -+#endif -+#endif -+ - enum { - OPEN_MAILBOX_NODE, - CLOSE_MAILBOX_NODE, -@@ -3406,7 +3412,11 @@ - } else { - num_total = num_new; - balsa_app.main_window->new_mail_note = -+#if NOTIFY_CHECK_VERSION (0, 7, 0) -+ notify_notification_new("Balsa", NULL, NULL); -+#else - notify_notification_new("Balsa", NULL, NULL, NULL); -+#endif - g_object_add_weak_pointer(G_OBJECT(balsa_app.main_window-> - new_mail_note), - (gpointer) & balsa_app.main_window-> diff --git a/community/epdfview/0001-r329.patch b/community/epdfview/0001-r329.patch deleted file mode 100644 index ae6e4a3a1..000000000 --- a/community/epdfview/0001-r329.patch +++ /dev/null @@ -1,79 +0,0 @@ -From dc6c25e8f1a7a3845fa7d14b9dfbd22deb9dd6ef Mon Sep 17 00:00:00 2001 -From: jordi <jordi@cb4bfb15-1111-0410-82e2-95233c8f1c7e> -Date: Fri, 20 Mar 2009 08:06:32 +0000 -Subject: [PATCH 1/3] I had to change the return valud of MainView's scroll-event handler, since Gtk+ expects a gboolean that tells whether to propagate the event. Since we didn't return any value, depending on the compilation flags the mouse wheel didn't work at all. - -This closes #118. - -git-svn-id: svn://svn.emma-soft.com/epdfview@329 cb4bfb15-1111-0410-82e2-95233c8f1c7e ---- - trunk/src/gtk/MainView.cxx | 21 ++++++++++++++------- - trunk/src/gtk/PageView.cxx | 7 ------- - 2 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/trunk/src/gtk/MainView.cxx b/trunk/src/gtk/MainView.cxx -index b983bff..4a52cd3 100644 ---- a/trunk/src/gtk/MainView.cxx -+++ b/trunk/src/gtk/MainView.cxx -@@ -77,7 +77,7 @@ static void main_window_zoom_in_cb (GtkWidget *, gpointer); - static void main_window_zoom_out_cb (GtkWidget *, gpointer); - static void main_window_zoom_width_cb (GtkToggleAction *, gpointer); - static void main_window_set_page_mode (GtkRadioAction *, GtkRadioAction *, gpointer); --static void main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data); -+static gboolean main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data); - - #if defined (HAVE_CUPS) - static void main_window_print_cb (GtkWidget *, gpointer); -@@ -1479,18 +1479,25 @@ main_window_set_page_mode (GtkRadioAction *action, GtkRadioAction *current, gpoi - pter->setPageMode (mode); - } - --void -+gboolean - main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data) - { - g_assert ( NULL != data && "The data parameter is NULL."); - - MainPter *pter = (MainPter *)data; - // Only zoom when the CTRL-Button is down... -- if ( !(event->state & GDK_CONTROL_MASK) ) return; -- if ( event->direction == GDK_SCROLL_UP ) { -- pter->zoomInActivated (); -- } else if ( event->direction == GDK_SCROLL_DOWN ) { -- pter->zoomOutActivated (); -+ if ( GDK_CONTROL_MASK == (event->state & GDK_CONTROL_MASK) ) -+ { -+ if ( event->direction == GDK_SCROLL_UP ) -+ { -+ pter->zoomInActivated (); -+ } -+ else if ( event->direction == GDK_SCROLL_DOWN ) -+ { -+ pter->zoomOutActivated (); -+ } -+ return TRUE; - } -+ return FALSE; - } - -diff --git a/trunk/src/gtk/PageView.cxx b/trunk/src/gtk/PageView.cxx -index 0546561..adaa823 100644 ---- a/trunk/src/gtk/PageView.cxx -+++ b/trunk/src/gtk/PageView.cxx -@@ -527,13 +527,6 @@ page_view_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data) - { - g_assert ( NULL != data && "The data parameter is NULL."); - -- // don't scroll when the CRTL-Button is down, because then the page should -- // actually be zoomed and not scrolled. Zooming is handelt by the MainView -- // class. -- if ( event->state & GDK_CONTROL_MASK ) -- { -- return FALSE; -- } - PagePter *pter = (PagePter *)data; - GtkAdjustment *adjustment = - gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (widget)); --- -1.7.4 - diff --git a/community/epdfview/0002-r354.patch b/community/epdfview/0002-r354.patch deleted file mode 100644 index 771b93a01..000000000 --- a/community/epdfview/0002-r354.patch +++ /dev/null @@ -1,77 +0,0 @@ -From d8d3dac5fc3fe519b443d22f74258af4aaf48d0c Mon Sep 17 00:00:00 2001 -From: jordi <jordi@cb4bfb15-1111-0410-82e2-95233c8f1c7e> -Date: Mon, 11 Oct 2010 15:53:47 +0000 -Subject: [PATCH 2/3] Added support for poppler's API changes in 0.15.0 by Michal Schmidt. - -git-svn-id: svn://svn.emma-soft.com/epdfview@354 cb4bfb15-1111-0410-82e2-95233c8f1c7e ---- - trunk/configure.ac | 16 ++++++++++------ - trunk/src/PDFDocument.cxx | 12 +++++++++++- - 2 files changed, 21 insertions(+), 7 deletions(-) - -diff --git a/trunk/configure.ac b/trunk/configure.ac -index 7ce0ddc..6cbd0e2 100644 ---- a/trunk/configure.ac -+++ b/trunk/configure.ac -@@ -40,18 +40,22 @@ PKG_CHECK_MODULES([POPPLER], [poppler-glib >= $POPPLER_REQUIRED gdk-2.0 >= $GTK2 - AC_SUBST([POPPLER_CFLAGS]) - AC_SUBST([POPPLER_LIBS]) - dnl Check if we have poppler version 0.5.2 or higher. --PKG_CHECK_EXISTS([poppler-glib >= 0.5.2], [have_poppler_052=yes]) --if test "x$have_poppler_052" = "xyes"; then -+PKG_CHECK_EXISTS([poppler-glib >= 0.5.2], [have_poppler_0_5_2=yes]) -+if test "x$have_poppler_0_5_2" = "xyes"; then - AC_DEFINE([HAVE_POPPLER_0_5_2], [1], [Define to 1 if you have Poppler version 0.5.2 or higher.]) - fi --PKG_CHECK_EXISTS([poppler-glib >= 0.6], [have_poppler_060=yes]) --if test "x$have_poppler_060" = "xyes"; then -+PKG_CHECK_EXISTS([poppler-glib >= 0.6], [have_poppler_0_6_0=yes]) -+if test "x$have_poppler_0_6_0" = "xyes"; then - AC_DEFINE([HAVE_POPPLER_0_6_0], [1], [Define to 1 if you have Poppler version 0.6.0 or higher.]) - fi --PKG_CHECK_EXISTS([poppler-glib >= 0.8], [have_poppler_080=yes]) --if test "x$have_poppler_080" = "xyes"; then -+PKG_CHECK_EXISTS([poppler-glib >= 0.8], [have_poppler_0_8_0=yes]) -+if test "x$have_poppler_0_8_0" = "xyes"; then - AC_DEFINE([HAVE_POPPLER_0_8_0], [1], [Define to 1 if you have Poppler version 0.8.0 or higher.]) - fi -+PKG_CHECK_EXISTS([poppler-glib >= 0.15], [have_poppler_0_15_0=yes]) -+if test "x$have_poppler_0_15_0" = "xyes"; then -+ AC_DEFINE([HAVE_POPPLER_0_15_0], [1], [Define to 1 if you have Poppler version 0.15.0 or higher.]) -+fi - - EPDFVIEW_PATH_CUPS([CUPS], [have_cups=yes]) - AM_CONDITIONAL(cups_printing, test "x$have_cups" = "xyes") -diff --git a/trunk/src/PDFDocument.cxx b/trunk/src/PDFDocument.cxx -index 6567e9b..a590a20 100644 ---- a/trunk/src/PDFDocument.cxx -+++ b/trunk/src/PDFDocument.cxx -@@ -678,14 +678,24 @@ PDFDocument::setTextSelection (DocumentRectangle *rect) - gdouble pageWidth, pageHeight; - poppler_page_get_size(page, &pageWidth, &pageHeight); - -+#if defined (HAVE_POPPLER_0_15_0) -+ PopplerRectangle textRect = { rect->getX1() / getZoom(), -+ rect->getY1() / getZoom(), -+ rect->getX2() / getZoom(), -+ rect->getY2() / getZoom()}; -+#else // !HAVE_POPPLER_0_15_0 - //for get text we must exchange y coordinate, don't ask me where logic here. - PopplerRectangle textRect = { rect->getX1() / getZoom(), - (pageHeight - rect->getY2() / getZoom()), - rect->getX2() * getZoom() / getZoom(), - (pageHeight - rect->getY1() / getZoom())}; -+#endif // HAVE_POPPLER_0_15_0 - repairEmpty(textRect); - --#if defined (HAVE_POPPLER_0_6_0) -+#if defined (HAVE_POPPLER_0_15_0) -+ gchar *text = poppler_page_get_selected_text(page, POPPLER_SELECTION_GLYPH, -+ &textRect); -+#elif defined (HAVE_POPPLER_0_6_0) - gchar *text = poppler_page_get_text(page, POPPLER_SELECTION_GLYPH, - &textRect); - #else // !HAVE_POPPLER_0_6_0 --- -1.7.4 - diff --git a/community/epdfview/0003-r357.patch b/community/epdfview/0003-r357.patch deleted file mode 100644 index c1aa9a1a6..000000000 --- a/community/epdfview/0003-r357.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 951a8f66463c0dc38fa05931bd8df7b45707f6e8 Mon Sep 17 00:00:00 2001 -From: jordi <jordi@cb4bfb15-1111-0410-82e2-95233c8f1c7e> -Date: Wed, 17 Nov 2010 16:02:45 +0000 -Subject: [PATCH 3/3] Applied patch by Dennis Sheil <dennis-poppler@vartmp.com> to use the correct variable type for linearization since poppler version 0.15.1. - -git-svn-id: svn://svn.emma-soft.com/epdfview@357 cb4bfb15-1111-0410-82e2-95233c8f1c7e ---- - trunk/THANKS | 1 + - trunk/configure.ac | 5 +++++ - trunk/src/IDocument.cxx | 15 ++++++++++++++- - trunk/src/IDocument.h | 8 ++++++++ - trunk/src/PDFDocument.cxx | 4 ++++ - 5 files changed, 32 insertions(+), 1 deletions(-) - -diff --git a/trunk/THANKS b/trunk/THANKS -index 48dcb2b..7888d1a 100644 ---- a/trunk/THANKS -+++ b/trunk/THANKS -@@ -4,6 +4,7 @@ contributions: - - Alain Mendizabal <alainmendi@gmail.com>, for his Basque translation. - - Alex Dedul <rotmer@gmail.com>, for his patch. - - Alexander <lothalev@gmail.com>, for corrections in the Polish translation. -+ - Dennis Sheil <dennis-poppler@vartmp.com>, for his patch. - - Enrico Tröger <enrico.troeger@uvena.de>, for his full screen patch and others. - - Daniel Nylander <po@danielnylander.se>, for his Swedish translation. - - Daniel Pielmeie <daniel.pielmeie@googlemail.com>, for his patches. -diff --git a/trunk/configure.ac b/trunk/configure.ac -index 6cbd0e2..f8316b0 100644 ---- a/trunk/configure.ac -+++ b/trunk/configure.ac -@@ -56,6 +56,11 @@ PKG_CHECK_EXISTS([poppler-glib >= 0.15], [have_poppler_0_15_0=yes]) - if test "x$have_poppler_0_15_0" = "xyes"; then - AC_DEFINE([HAVE_POPPLER_0_15_0], [1], [Define to 1 if you have Poppler version 0.15.0 or higher.]) - fi -+PKG_CHECK_EXISTS([poppler-glib >= 0.15.1], [have_poppler_0_15_1=yes]) -+if test "x$have_poppler_0_15_1" = "xyes"; then -+ AC_DEFINE([HAVE_POPPLER_0_15_1], [1], [Define to 1 if you have Poppler version 0.15.1 or higher.]) -+fi -+ - - EPDFVIEW_PATH_CUPS([CUPS], [have_cups=yes]) - AM_CONDITIONAL(cups_printing, test "x$have_cups" = "xyes") -diff --git a/trunk/src/IDocument.cxx b/trunk/src/IDocument.cxx -index f1b71c5..f560f34 100644 ---- a/trunk/src/IDocument.cxx -+++ b/trunk/src/IDocument.cxx -@@ -755,11 +755,16 @@ IDocument::setFormat (gchar *format) - const gchar * - IDocument::getLinearized () - { -+#if defined (HAVE_POPPLER_0_15_1) -+ if ( m_Linearized ) return "Yes"; -+ else return "No"; -+#else - if ( NULL == m_Linearized ) - { - return "No"; - } - return m_Linearized; -+#endif - } - - /// -@@ -768,14 +773,22 @@ IDocument::getLinearized () - /// @param linearized Set to "Yes" if the document is linearized. "No" - /// otherwise. IDocument will free it. - /// -+#if defined (HAVE_POPPLER_0_15_1) - void --IDocument::setLinearized (gchar *linearized) -+IDocument::setLinearized (gboolean *linearized) -+{ -+ m_Linearized = linearized; -+} -+#else -+void -+ IDocument::setLinearized (gchar *linearized) - { - gchar *oldLinearized = m_Linearized; - m_Linearized = g_strdup (linearized); - g_free (oldLinearized); - g_free (linearized); - } -+#endif - - /// - /// @brief Gets the document's creation date. -diff --git a/trunk/src/IDocument.h b/trunk/src/IDocument.h -index fbb3954..32aadf2 100644 ---- a/trunk/src/IDocument.h -+++ b/trunk/src/IDocument.h -@@ -306,7 +306,11 @@ namespace ePDFView - const gchar *getFormat (void); - void setFormat (gchar *format); - const gchar *getLinearized (void); -+#if defined (HAVE_POPPLER_0_15_1) -+ void setLinearized (gboolean *linearized); -+#else - void setLinearized (gchar *linearized); -+#endif - const gchar *getCreationDate (void); - void setCreationDate (gchar *date); - const gchar *getModifiedDate (void); -@@ -382,7 +386,11 @@ namespace ePDFView - /// The document's keyword. - gchar *m_Keywords; - /// Tells if the document is linearized or not. -+#if defined (HAVE_POPPLER_0_15_1) -+ gboolean *m_Linearized; -+#else - gchar *m_Linearized; -+#endif - /// The document's modification date and time. - gchar *m_ModifiedDate; - /// @brief The list of classes that will receive notifications -diff --git a/trunk/src/PDFDocument.cxx b/trunk/src/PDFDocument.cxx -index a590a20..4d425cd 100644 ---- a/trunk/src/PDFDocument.cxx -+++ b/trunk/src/PDFDocument.cxx -@@ -324,7 +324,11 @@ PDFDocument::loadMetadata (void) - gchar *format = NULL; - gchar *keywords = NULL; - PopplerPageLayout layout = POPPLER_PAGE_LAYOUT_UNSET; -+#if defined (HAVE_POPPLER_0_15_1) -+ gboolean *linearized = NULL; -+#else - gchar *linearized = NULL; -+#endif - GTime modDate; - PopplerPageMode mode = POPPLER_PAGE_MODE_UNSET; - gchar *producer = NULL; --- -1.7.4 - diff --git a/community/epdfview/m_Linearized.patch b/community/epdfview/m_Linearized.patch deleted file mode 100644 index 7cad8d9c6..000000000 --- a/community/epdfview/m_Linearized.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- src/IDocument.cxx 2011-02-06 14:45:34.173334040 +0100 -+++ src/IDocument.cxx 2011-02-06 14:51:23.173334040 +0100 -@@ -135,7 +135,11 @@ - m_FindPage = 0; - m_Format = NULL; - m_Keywords = NULL; -+#if defined (HAVE_POPPLER_0_15_1) -+ m_Linearized = FALSE; -+#else - m_Linearized = NULL; -+#endif - m_ModifiedDate = NULL; - m_PageCache = NULL; - m_PageCacheAge = 0; -@@ -164,7 +168,9 @@ - g_free (m_FileName); - g_free (m_Format); - g_free (m_Keywords); -+#if !defined (HAVE_POPPLER_0_15_1) - g_free (m_Linearized); -+#endif - g_free (m_ModifiedDate); - g_free (m_Password); - g_free (m_Producer); diff --git a/community/gimmie/ChangeLog b/community/gimmie/ChangeLog deleted file mode 100644 index 7fd5bbf99..000000000 --- a/community/gimmie/ChangeLog +++ /dev/null @@ -1,2 +0,0 @@ -2007-06-26 tardo <tardo@nagi-fanboi.net> -* Built for x86_64 diff --git a/community/gimmie/PKGBUILD b/community/gimmie/PKGBUILD deleted file mode 100644 index 601d39576..000000000 --- a/community/gimmie/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 44484 2011-04-07 20:23:57Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: György Balló <ballogy@freestart.hu> - -pkgname=gimmie -pkgver=0.2.8 -pkgrel=16 -pkgdesc="desktop organizer which allows interaction with applications, contacts, documents, etc" -arch=('i686' 'x86_64') -url="http://beatniksoftware.com/gimmie/" -license=('LGPL') -depends=('libgnomecups' 'dbus-python' 'python2-gconf' 'python-gnomeapplet' - 'python-gnomedesktop' 'python2-libgnome' 'python-wnck' 'pyxdg' - 'hicolor-icon-theme' 'xdg-utils') -makedepends=('findutils' 'perlxml' 'krb5') -options=(!libtool) -install=$pkgname.install -source=(http://www.beatniksoftware.com/gimmie/releases/$pkgname-$pkgver.tar.gz) -md5sums=('721b8ec80f0247e1281aeb4aa5614c2f') - -build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i 's@^#!.*python$@#!/usr/bin/python2@' gimmie/gimmie_{threads,bar}.py - - export CFLAGS="$CFLAGS `pkg-config --cflags glib-2.0`" - export LDFLAGS="$LDFLAGS `pkg-config --libs glib-2.0`" - - export CFLAGS="$CFLAGS `pkg-config --cflags gtk+-2.0`" - export LDFLAGS="$LDFLAGS `pkg-config --libs gtk+-2.0`" - - export CFLAGS="$CFLAGS `pkg-config --cflags pygtk-2.0`" - export LDFLAGS="$LDFLAGS `pkg-config --libs pygtk-2.0`" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir="/usr/lib/$pkgname" \ - --disable-static --disable-schemas-install \ - --with-gconf-schema-file-dir=/usr/share/gconf/schemas \ - PYTHON=/usr/bin/python2 - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install -} diff --git a/community/gimmie/gimmie.install b/community/gimmie/gimmie.install deleted file mode 100644 index 015be0a4d..000000000 --- a/community/gimmie/gimmie.install +++ /dev/null @@ -1,22 +0,0 @@ -pkgname=gimmie - -post_install() { - gconfpkg --install $pkgname - xdg-icon-resource forceupdate -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - gconfpkg --uninstall $pkgname -} - -post_remove() { - xdg-icon-resource forceupdate -} diff --git a/community/nbd/nbd.conf.d b/community/nbd/nbd.conf.d deleted file mode 100644 index d89ca09b1..000000000 --- a/community/nbd/nbd.conf.d +++ /dev/null @@ -1,8 +0,0 @@ -# -# Configuration for network block device (nbd) daemon -# - -NBD_PORT=2000 -NBD_DEV="/srv/http/sysrcd.dat" -NBD_ARGS="-r" - diff --git a/community/python-sympy/PKGBUILD b/community/python-sympy/PKGBUILD deleted file mode 100644 index bc3221a2a..000000000 --- a/community/python-sympy/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Contributor: Peter Garceau <RockyChimp@gmail.com> -pkgname=python-sympy -pkgver=0.6.7 -pkgrel=2 -pkgdesc="Symbolic manipulation package (Computer Algebra System), written in pure Python" -url="http://code.google.com/p/sympy" -license=('BSD') -depends=('python2') -conflicts=('sympy') -provides=('sympy') -arch=('i686' 'x86_64') -source=(http://sympy.googlecode.com/files/sympy-${pkgver}.tar.gz) -md5sums=('d73e0a5a128f38f930d566110f4b668b') - -build() { - cd "${srcdir}/sympy-${pkgver}" - - # python2 fix - for file in sympy/galgebra/GA.py sympy/galgebra/tests/test_GA.py; do - sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file - done - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' sympy/mpmath/tests/runtests.py - - python2 setup.py install --root "${pkgdir}" - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/community/python-sympy/test.patch b/community/python-sympy/test.patch deleted file mode 100644 index 81e00f2db..000000000 --- a/community/python-sympy/test.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -216,7 +216,7 @@ setup( - license = 'BSD', - url = 'http://code.google.com/p/sympy', - packages = ['sympy'] + modules + tests + pyglet_packages, -- scripts = ['bin/isympy', 'bin/test', 'bin/doctest'], -+ scripts = ['bin/isympy'], - ext_modules = [], - package_data = { 'sympy.utilities.mathml' : ['data/*.xsl'] }, - data_files = [('share/man/man1', ['doc/man/isympy.1'])], diff --git a/community/wine/PKGBUILD b/community/wine/PKGBUILD deleted file mode 100644 index c9bc1dae8..000000000 --- a/community/wine/PKGBUILD +++ /dev/null @@ -1,144 +0,0 @@ -# $Id: PKGBUILD 48061 2011-05-27 19:54:08Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Eduardo Romero <eduardo@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> - -pkgname=wine -pkgver=1.3.21 -pkgrel=1 - -_pkgbasever=${pkgver/rc/-rc} - -source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) -md5sums=('dfcefe48a9aae82f7f1aa4d2c6617961') - -pkgdesc="A compatibility layer for running Windows programs" -url="http://www.winehq.com" -arch=(i686 x86_64) -license=(LGPL) -install=wine.install - -depends=( - fontconfig lib32-fontconfig - mesa lib32-mesa - libxcursor lib32-libxcursor - libxrandr lib32-libxrandr - libxdamage lib32-libxdamage - libxxf86dga lib32-libxxf86dga - alsa-lib lib32-alsa-lib - desktop-file-utils -) - -makedepends=(autoconf ncurses bison perl fontforge flex prelink - 'gcc>=4.5.0-2' 'gcc-multilib>=4.5.0-2' - giflib lib32-giflib - libxpm lib32-libxpm - libpng lib32-libpng - libxinerama lib32-libxinerama - libxcomposite lib32-libxcomposite - libxmu lib32-libxmu - libxxf86vm lib32-libxxf86vm - libxml2 lib32-libxml2 - libxslt lib32-libxslt - libldap lib32-libldap - lcms lib32-lcms - mpg123 lib32-mpg123 - openal lib32-openal - jack lib32-jack - libcups lib32-libcups - gnutls lib32-gnutls - v4l-utils lib32-v4l-utils - oss -) - -optdepends=( - giflib lib32-giflib - libpng lib32-libpng - libldap lib32-libldap - lcms lib32-lcms - libxml2 lib32-libxml2 - mpg123 lib32-mpg123 - openal lib32-openal - jack lib32-jack - libcups lib32-libcups - gnutls lib32-gnutls - v4l-utils lib32-v4l-utils - oss -) - -if [[ $CARCH == i686 ]]; then - # Strip lib32 etc. on i686 - depends=(${depends[@]/*32-*/}) - makedepends=(${makedepends[@]/*32-*/}) - makedepends=(${makedepends[@]/*-multilib*/}) - optdepends=(${optdepends[@]/*32-*/}) -else - provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver") - conflicts=('bin32-wine' 'wine-wow64') - replaces=('bin32-wine') -fi - -build() { - cd "$srcdir" - - # Allow ccache to work - mv $pkgname-$_pkgbasever $pkgname - - # Get rid of old build dirs - rm -rf $pkgname-{32,64}-build - mkdir $pkgname-32-build - - if [[ $CARCH == x86_64 ]]; then - msg2 "Building Wine-64..." - - mkdir $pkgname-64-build - cd "$srcdir/$pkgname-64-build" - ../$pkgname/configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libdir=/usr/lib \ - --with-x \ - --enable-win64 - - make - - _wine32opts=( - --libdir=/usr/lib32 - --with-wine64="$srcdir/$pkgname-64-build" - ) - - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - fi - - msg2 "Building Wine-32..." - cd "$srcdir/$pkgname-32-build" - ../$pkgname/configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --with-x \ - "${_wine32opts[@]}" - - make -} - -package() { - msg2 "Packaging Wine-32..." - cd "$srcdir/$pkgname-32-build" - - if [[ $CARCH == i686 ]]; then - make prefix="$pkgdir/usr" install - else - make prefix="$pkgdir/usr" \ - libdir="$pkgdir/usr/lib32" \ - dlldir="$pkgdir/usr/lib32/wine" install - - msg2 "Packaging Wine-64..." - cd "$srcdir/$pkgname-64-build" - make prefix="$pkgdir/usr" \ - libdir="$pkgdir/usr/lib" \ - dlldir="$pkgdir/usr/lib/wine" install - fi -} - -# vim:set ts=8 sts=2 sw=2 et: diff --git a/community/wine/wine.install b/community/wine/wine.install deleted file mode 100644 index f71262186..000000000 --- a/community/wine/wine.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64." - echo "If you are on x86_64, the default WINEARCH will be win64." - echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine." - echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64." - echo "See the Arch wiki on wine for more information." -} - -post_remove() { - update-desktop-database -q -} diff --git a/core/mkinitcpio-busybox/loadfont-setfont-optional-psf2-font-support.patch b/core/mkinitcpio-busybox/loadfont-setfont-optional-psf2-font-support.patch deleted file mode 100644 index a7592de09..000000000 --- a/core/mkinitcpio-busybox/loadfont-setfont-optional-psf2-font-support.patch +++ /dev/null @@ -1,453 +0,0 @@ -From 8ce1dc03c1b2b61e51527b987579c09c991cc4b2 Mon Sep 17 00:00:00 2001 -From: Harald Becker <ralda@gmx.de> -Date: Sun, 21 Feb 2010 12:10:26 +0000 -Subject: loadfont/setfont: optional PSF2 font support - -Signed-off-by: Harald Becker <ralda@gmx.de> -Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> ---- -diff --git a/console-tools/Config.in b/console-tools/Config.in -index cd0a931..195685b 100644 ---- a/console-tools/Config.in -+++ b/console-tools/Config.in -@@ -135,4 +135,21 @@ config SHOWKEY - help - Shows keys pressed. - -+comment "Common options for loadfont and setfont" -+ depends on LOADFONT || SETFONT -+ -+config FEATURE_LOADFONT_PSF2 -+ bool "Support for PSF2 console fonts" -+ default n -+ depends on LOADFONT || SETFONT -+ help -+ Support PSF2 console fonts. -+ -+config FEATURE_LOADFONT_RAW -+ bool "Support for old (raw) console fonts" -+ default n -+ depends on LOADFONT || SETFONT -+ help -+ Support old (raw) console fonts. -+ - endmenu -diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c -index e833474..e51142c 100644 ---- a/console-tools/loadfont.c -+++ b/console-tools/loadfont.c -@@ -13,7 +13,7 @@ - #include <sys/kd.h> - - #ifndef KDFONTOP --#define KDFONTOP 0x4B72 -+# define KDFONTOP 0x4B72 - struct console_font_op { - unsigned op; /* KD_FONT_OP_* */ - unsigned flags; /* KD_FONT_FLAG_* */ -@@ -21,91 +21,137 @@ struct console_font_op { - unsigned charcount; - unsigned char *data; /* font data with height fixed to 32 */ - }; -- --#define KD_FONT_OP_SET 0 /* Set font */ --#define KD_FONT_OP_GET 1 /* Get font */ --#define KD_FONT_OP_SET_DEFAULT 2 /* Set font to default, -- data points to name / NULL */ --#define KD_FONT_OP_COPY 3 /* Copy from another console */ -- --#define KD_FONT_FLAG_OLD 0x80000000 /* Invoked via old interface */ --#define KD_FONT_FLAG_DONT_RECALC 1 /* Don't call adjust_height() */ -+# define KD_FONT_OP_SET 0 /* Set font */ -+# define KD_FONT_OP_GET 1 /* Get font */ -+# define KD_FONT_OP_SET_DEFAULT 2 /* Set font to default, data points to name / NULL */ -+# define KD_FONT_OP_COPY 3 /* Copy from another console */ -+# define KD_FONT_FLAG_OLD 0x80000000 /* Invoked via old interface */ -+# define KD_FONT_FLAG_DONT_RECALC 1 /* Don't call adjust_height() */ - /* (Used internally for PIO_FONT support) */ - #endif /* KDFONTOP */ - - - enum { -- PSF_MAGIC1 = 0x36, -- PSF_MAGIC2 = 0x04, -- -- PSF_MODE512 = 0x01, -- PSF_MODEHASTAB = 0x02, -- PSF_MAXMODE = 0x03, -- PSF_SEPARATOR = 0xffff -+ PSF1_MAGIC0 = 0x36, -+ PSF1_MAGIC1 = 0x04, -+ PSF1_MODE512 = 0x01, -+ PSF1_MODEHASTAB = 0x02, -+ PSF1_MODEHASSEQ = 0x04, -+ PSF1_MAXMODE = 0x05, -+ PSF1_STARTSEQ = 0xfffe, -+ PSF1_SEPARATOR = 0xffff, - }; - --struct psf_header { -- unsigned char magic1, magic2; /* Magic number */ -+struct psf1_header { -+ unsigned char magic[2]; /* Magic number */ - unsigned char mode; /* PSF font mode */ - unsigned char charsize; /* Character size */ - }; - --#define PSF_MAGIC_OK(x) ((x)->magic1 == PSF_MAGIC1 && (x)->magic2 == PSF_MAGIC2) -+#define psf1h(x) ((struct psf1_header*)(x)) -+ -+#define PSF1_MAGIC_OK(x) ( \ -+ (x)->magic[0] == PSF1_MAGIC0 \ -+ && (x)->magic[1] == PSF1_MAGIC1 \ -+) -+ -+#if ENABLE_FEATURE_LOADFONT_PSF2 -+enum { -+ PSF2_MAGIC0 = 0x72, -+ PSF2_MAGIC1 = 0xb5, -+ PSF2_MAGIC2 = 0x4a, -+ PSF2_MAGIC3 = 0x86, -+ PSF2_HAS_UNICODE_TABLE = 0x01, -+ PSF2_MAXVERSION = 0, -+ PSF2_STARTSEQ = 0xfe, -+ PSF2_SEPARATOR = 0xff -+}; -+ -+struct psf2_header { -+ unsigned char magic[4]; -+ unsigned int version; -+ unsigned int headersize; /* offset of bitmaps in file */ -+ unsigned int flags; -+ unsigned int length; /* number of glyphs */ -+ unsigned int charsize; /* number of bytes for each character */ -+ unsigned int height; /* max dimensions of glyphs */ -+ unsigned int width; /* charsize = height * ((width + 7) / 8) */ -+}; -+ -+#define psf2h(x) ((struct psf2_header*)(x)) -+ -+#define PSF2_MAGIC_OK(x) ( \ -+ (x)->magic[0] == PSF2_MAGIC0 \ -+ && (x)->magic[1] == PSF2_MAGIC1 \ -+ && (x)->magic[2] == PSF2_MAGIC2 \ -+ && (x)->magic[3] == PSF2_MAGIC3 \ -+) -+#endif /* ENABLE_FEATURE_LOADFONT_PSF2 */ - --static void do_loadfont(int fd, unsigned char *inbuf, int unit, int fontsize) -+ -+static void do_loadfont(int fd, unsigned char *inbuf, int height, int width, int charsize, int fontsize) - { -- char *buf; -+ unsigned char *buf; -+ int charwidth = 32 * ((width+7)/8); - int i; - -- if (unit < 1 || unit > 32) -- bb_error_msg_and_die("bad character size %d", unit); -+ if (height < 1 || height > 32 || width < 1 || width > 32) -+ bb_error_msg_and_die("bad character size %dx%d", height, width); - -- buf = xzalloc(16 * 1024); -+ buf = xzalloc(charwidth * ((fontsize < 128) ? 128 : fontsize)); - for (i = 0; i < fontsize; i++) -- memcpy(buf + (32 * i), inbuf + (unit * i), unit); -+ memcpy(buf + (i*charwidth), inbuf + (i*charsize), charsize); - - { /* KDFONTOP */ - struct console_font_op cfo; -- - cfo.op = KD_FONT_OP_SET; - cfo.flags = 0; -- cfo.width = 8; -- cfo.height = unit; -+ cfo.width = width; -+ cfo.height = height; - cfo.charcount = fontsize; -- cfo.data = (void*)buf; --#if 0 -- if (!ioctl_or_perror(fd, KDFONTOP, &cfo, "KDFONTOP ioctl failed (will try PIO_FONTX)")) -- goto ret; /* success */ --#else -+ cfo.data = buf; - xioctl(fd, KDFONTOP, &cfo); --#endif - } - --#if 0 --/* These ones do not honour -C tty (they set font on current tty regardless) -- * On x86, this distinction is visible on framebuffer consoles -- * (regular character consoles may have only one shared font anyway) -- */ --#if defined(PIO_FONTX) && !defined(__sparc__) -- { -- struct consolefontdesc cfd; -- -- cfd.charcount = fontsize; -- cfd.charheight = unit; -- cfd.chardata = buf; -- -- if (!ioctl_or_perror(fd, PIO_FONTX, &cfd, "PIO_FONTX ioctl failed (will try PIO_FONT)")) -- goto ret; /* success */ -- } --#endif -- xioctl(fd, PIO_FONT, buf); -- ret: --#endif /* 0 */ - free(buf); - } - --static void do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize) -+/* -+ * Format of the Unicode information: -+ * -+ * For each font position <uc>*<seq>*<term> -+ * where <uc> is a 2-byte little endian Unicode value (PSF1) -+ * or an UTF-8 coded value (PSF2), -+ * <seq> = <ss><uc><uc>*, <ss> = psf1 ? 0xFFFE : 0xFE, -+ * <term> = psf1 ? 0xFFFF : 0xFF. -+ * and * denotes zero or more occurrences of the preceding item. -+ * -+ * Semantics: -+ * The leading <uc>* part gives Unicode symbols that are all -+ * represented by this font position. The following sequences -+ * are sequences of Unicode symbols - probably a symbol -+ * together with combining accents - also represented by -+ * this font position. -+ * -+ * Example: -+ * At the font position for a capital A-ring glyph, we -+ * may have: -+ * 00C5,212B,FFFE,0041,030A,FFFF -+ * Some font positions may be described by sequences only, -+ * namely when there is no precomposed Unicode value for the glyph. -+ */ -+#if !ENABLE_FEATURE_LOADFONT_PSF2 -+#define do_loadtable(fd, inbuf, tailsz, fontsize, psf2) \ -+ do_loadtable(fd, inbuf, tailsz, fontsize) -+#endif -+static void do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize, int psf2) - { -+#if !ENABLE_FEATURE_LOADFONT_PSF2 -+/* gcc 4.3.1 code size: */ -+# define psf2 0 /* +0 bytes */ -+// const int psf2 = 0; /* +8 bytes */ -+// enum { psf2 = 0 }; /* +13 bytes */ -+#endif - struct unimapinit advice; - struct unimapdesc ud; - struct unipair *up; -@@ -114,15 +160,48 @@ static void do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize) - uint16_t unicode; - - maxct = tailsz; /* more than enough */ -- up = xmalloc(maxct * sizeof(struct unipair)); -+ up = xmalloc(maxct * sizeof(*up)); - - for (glyph = 0; glyph < fontsize; glyph++) { -- while (tailsz >= 2) { -- unicode = (((uint16_t) inbuf[1]) << 8) + inbuf[0]; -- tailsz -= 2; -- inbuf += 2; -- if (unicode == PSF_SEPARATOR) -- break; -+ while (tailsz > 0) { -+ if (!psf2) { /* PSF1 */ -+ unicode = (((uint16_t) inbuf[1]) << 8) + inbuf[0]; -+ tailsz -= 2; -+ inbuf += 2; -+ if (unicode == PSF1_SEPARATOR) -+ break; -+ } else { /* PSF2 */ -+#if ENABLE_FEATURE_LOADFONT_PSF2 -+ --tailsz; -+ unicode = *inbuf++; -+ if (unicode == PSF2_SEPARATOR) { -+ break; -+ } else if (unicode == PSF2_STARTSEQ) { -+ bb_error_msg_and_die("unicode sequences not implemented"); -+ } else if (unicode >= 0xC0) { -+ if (unicode >= 0xFC) -+ unicode &= 0x01, maxct = 5; -+ else if (unicode >= 0xF8) -+ unicode &= 0x03, maxct = 4; -+ else if (unicode >= 0xF0) -+ unicode &= 0x07, maxct = 3; -+ else if (unicode >= 0xE0) -+ unicode &= 0x0F, maxct = 2; -+ else -+ unicode &= 0x1F, maxct = 1; -+ do { -+ if (tailsz <= 0 || *inbuf < 0x80 || *inbuf > 0xBF) -+ bb_error_msg_and_die("illegal UTF-8 character"); -+ --tailsz; -+ unicode = (unicode << 6) + (*inbuf++ & 0x3F); -+ } while (--maxct > 0); -+ } else if (unicode >= 0x80) { -+ bb_error_msg_and_die("illegal UTF-8 character"); -+ } -+#else -+ return; -+#endif -+ } - up[ct].unicode = unicode; - up[ct].fontpos = glyph; - ct++; -@@ -139,58 +218,78 @@ static void do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize) - ud.entry_ct = ct; - ud.entries = up; - xioctl(fd, PIO_UNIMAP, &ud); -+#undef psf2 - } - --static void do_load(int fd, struct psf_header *psfhdr, size_t len) -+static void do_load(int fd, unsigned char *buffer, size_t len) - { -- int unit; -- int fontsize; -- int hastable; -- unsigned head0, head = head; -- -- /* test for psf first */ -- if (len >= sizeof(struct psf_header) && PSF_MAGIC_OK(psfhdr)) { -- if (psfhdr->mode > PSF_MAXMODE) -+ int height; -+ int width = 8; -+ int charsize; -+ int fontsize = 256; -+ int has_table = 0; -+ unsigned char *font = buffer; -+ unsigned char *table; -+ -+ if (len >= sizeof(struct psf1_header) && PSF1_MAGIC_OK(psf1h(buffer))) { -+ if (psf1h(buffer)->mode > PSF1_MAXMODE) - bb_error_msg_and_die("unsupported psf file mode"); -- fontsize = ((psfhdr->mode & PSF_MODE512) ? 512 : 256); --#if !defined(PIO_FONTX) || defined(__sparc__) -- if (fontsize != 256) -- bb_error_msg_and_die("only fontsize 256 supported"); -+ if (psf1h(buffer)->mode & PSF1_MODE512) -+ fontsize = 512; -+ if (psf1h(buffer)->mode & PSF1_MODEHASTAB) -+ has_table = 1; -+ height = charsize = psf1h(buffer)->charsize; -+ font += sizeof(struct psf1_header); -+ } else -+#if ENABLE_FEATURE_LOADFONT_PSF2 -+ if (len >= sizeof(struct psf2_header) && PSF2_MAGIC_OK(psf2h(buffer))) { -+ if (psf2h(buffer)->version > PSF2_MAXVERSION) -+ bb_error_msg_and_die("unsupported psf file version"); -+ fontsize = psf2h(buffer)->length; -+ if (psf2h(buffer)->flags & PSF2_HAS_UNICODE_TABLE) -+ has_table = 2; -+ charsize = psf2h(buffer)->charsize; -+ height = psf2h(buffer)->height; -+ width = psf2h(buffer)->width; -+ font += psf2h(buffer)->headersize; -+ } else - #endif -- hastable = (psfhdr->mode & PSF_MODEHASTAB); -- unit = psfhdr->charsize; -- head0 = sizeof(struct psf_header); -- -- head = head0 + fontsize * unit; -- if (head > len || (!hastable && head != len)) -- bb_error_msg_and_die("input file: bad length"); -- } else { -- /* file with three code pages? */ -- if (len == 9780) { -- head0 = 40; -- unit = 16; -- } else { -- /* bare font */ -- if (len & 0377) -- bb_error_msg_and_die("input file: bad length"); -- head0 = 0; -- unit = len / 256; -- } -- fontsize = 256; -- hastable = 0; -+#if ENABLE_FEATURE_LOADFONT_RAW -+ if (len == 9780) { /* file with three code pages? */ -+ charsize = height = 16; -+ font += 40; -+ } else if ((len & 0377) == 0) { /* bare font */ -+ charsize = height = len / 256; -+ } else -+#endif -+ { -+ bb_error_msg_and_die("input file: bad length or unsupported font type"); - } - -- do_loadfont(fd, (unsigned char *)psfhdr + head0, unit, fontsize); -- if (hastable) -- do_loadtable(fd, (unsigned char *)psfhdr + head, len - head, fontsize); -+#if !defined(PIO_FONTX) || defined(__sparc__) -+ if (fontsize != 256) -+ bb_error_msg_and_die("only fontsize 256 supported"); -+#endif -+ -+ table = font + fontsize * charsize; -+ buffer += len; -+ -+ if (table > buffer || (!has_table && table != buffer)) -+ bb_error_msg_and_die("input file: bad length"); -+ -+ do_loadfont(fd, font, height, width, charsize, fontsize); -+ -+ if (has_table) -+ do_loadtable(fd, table, buffer - table, fontsize, has_table - 1); - } - -+ - #if ENABLE_LOADFONT - int loadfont_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; - int loadfont_main(int argc UNUSED_PARAM, char **argv) - { - size_t len; -- struct psf_header *psfhdr; -+ unsigned char *buffer; - - // no arguments allowed! - opt_complementary = "=0"; -@@ -202,11 +301,11 @@ int loadfont_main(int argc UNUSED_PARAM, char **argv) - * just read the entire file. - */ - len = 32*1024; // can't be larger -- psfhdr = xmalloc_read(STDIN_FILENO, &len); -+ buffer = xmalloc_read(STDIN_FILENO, &len); - // xmalloc_open_zipped_read_close(filename, &len); -- if (!psfhdr) -+ if (!buffer) - bb_perror_msg_and_die("error reading input font"); -- do_load(get_console_fd_or_die(), psfhdr, len); -+ do_load(get_console_fd_or_die(), buffer, len); - - return EXIT_SUCCESS; - } -@@ -269,7 +368,7 @@ int setfont_main(int argc UNUSED_PARAM, char **argv) - size_t len; - unsigned opts; - int fd; -- struct psf_header *psfhdr; -+ unsigned char *buffer; - char *mapfilename; - const char *tty_name = CURRENT_TTY; - -@@ -287,10 +386,10 @@ int setfont_main(int argc UNUSED_PARAM, char **argv) - } - // load font - len = 32*1024; // can't be larger -- psfhdr = xmalloc_open_zipped_read_close(*argv, &len); -- if (!psfhdr) -+ buffer = xmalloc_open_zipped_read_close(*argv, &len); -+ if (!buffer) - bb_simple_perror_msg_and_die(*argv); -- do_load(fd, psfhdr, len); -+ do_load(fd, buffer, len); - - // load the screen map, if any - if (opts & 1) { // -m --- -cgit v0.8.2.1 diff --git a/core/udev/01-settle.patch b/core/udev/01-settle.patch deleted file mode 100644 index 88e23d2a2..000000000 --- a/core/udev/01-settle.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 2738ec2cf721db0c0deac2ba0abdc73cf7739e9f Mon Sep 17 00:00:00 2001 -From: Kay Sievers <kay.sievers@vrfy.org> -Date: Mon, 16 May 2011 13:17:48 +0200 -Subject: [PATCH 1/7] udevd: create queue file before daemonizing to reliably - block 'settle' - ---- - udev/udevd.c | 22 ++++++++++++---------- - 1 files changed, 12 insertions(+), 10 deletions(-) - -diff --git a/udev/udevd.c b/udev/udevd.c -index be4b071..258d787 100644 ---- a/udev/udevd.c -+++ b/udev/udevd.c -@@ -1408,6 +1408,13 @@ int main(int argc, char *argv[]) - - udev_monitor_set_receive_buffer_size(monitor, 128*1024*1024); - -+ /* create queue file before signalling 'ready', to make sure we block 'settle' */ -+ udev_queue_export = udev_queue_export_new(udev); -+ if (udev_queue_export == NULL) { -+ err(udev, "error creating queue file\n"); -+ goto exit; -+ } -+ - if (daemonize) { - pid_t pid; - int fd; -@@ -1421,8 +1428,8 @@ int main(int argc, char *argv[]) - rc = 4; - goto exit; - default: -- rc = 0; -- goto exit; -+ rc = EXIT_SUCCESS; -+ goto exit_keep_queue; - } - - setsid(); -@@ -1521,12 +1528,6 @@ int main(int argc, char *argv[]) - goto exit; - } - -- udev_queue_export = udev_queue_export_new(udev); -- if (udev_queue_export == NULL) { -- err(udev, "error creating queue file\n"); -- goto exit; -- } -- - memset(&ep_ctrl, 0, sizeof(struct epoll_event)); - ep_ctrl.events = EPOLLIN; - ep_ctrl.data.fd = fd_ctrl; -@@ -1708,9 +1709,10 @@ int main(int argc, char *argv[]) - } - } - -- udev_queue_export_cleanup(udev_queue_export); -- rc = 0; -+ rc = EXIT_SUCCESS; - exit: -+ udev_queue_export_cleanup(udev_queue_export); -+exit_keep_queue: - if (fd_ep >= 0) - close(fd_ep); - worker_list_cleanup(udev); --- -1.7.5.1 - diff --git a/core/udev/02-settle.patch b/core/udev/02-settle.patch deleted file mode 100644 index 4bcb7fdde..000000000 --- a/core/udev/02-settle.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 12f79fb0b9c919787d8a7d4307895d3d6b4b029b Mon Sep 17 00:00:00 2001 -From: Nix <nix@esperi.org.uk> -Date: Mon, 16 May 2011 22:51:38 +0200 -Subject: [PATCH 7/7] libudev: queue - accept NULL passed into - udev_queue_export_cleanup() - ---- - libudev/libudev-queue-private.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/libudev/libudev-queue-private.c b/libudev/libudev-queue-private.c -index 0dcf9b0..6e13d8a 100644 ---- a/libudev/libudev-queue-private.c -+++ b/libudev/libudev-queue-private.c -@@ -104,9 +104,10 @@ void udev_queue_export_cleanup(struct udev_queue_export *udev_queue_export) - { - char filename[UTIL_PATH_SIZE]; - -+ if (udev_queue_export == NULL) -+ return; - util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev_queue_export->udev), "/queue.tmp", NULL); - unlink(filename); -- - util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev_queue_export->udev), "/queue.bin", NULL); - unlink(filename); - } --- -1.7.5.1 - diff --git a/core/udev/cdsymlinks.sh b/core/udev/cdsymlinks.sh deleted file mode 100755 index 498abda4a..000000000 --- a/core/udev/cdsymlinks.sh +++ /dev/null @@ -1,44 +0,0 @@ -#! /bin/sh -# Creates cdsymlinks in /dev -# for Archlinux by Tobias Powalowski <tpowa@archlinux.org> - -# check on cd/dvd drives and if persistant rules file is used -if [ -d /dev/cd -a ! -e /etc/udev/rules.d/75-persistent-cd.rules ]; then - # remove existing device files - rm /dev/cdrom* - rm /dev/cdrw* - rm /dev/dvd* - rm /dev/dvdrw* - # start creating symlinks - for i in /dev/cd/cdrom-*; do - if [ -h $i ]; then - [ "$CD_NUMBER" = "" ] && ln -s $i /dev/cdrom - [ "$CD_NUMBER" = "" ] && CD_NUMBER="-1" - ! [ "$CD_NUMBER" = "" ] && CD_NUMBER="$((CD_NUMBER+1))" && ln -s $i /dev/cdrom$CD_NUMBER - fi - done - - for i in /dev/cd/cdrw-*; do - if [ -h $i ]; then - [ "$CDRW_NUMBER" = "" ] && ln -s $i /dev/cdrw - [ "$CDRW_NUMBER" = "" ] && CDRW_NUMBER="-1" - ! [ "$CDRW_NUMBER" = "" ] && CDRW_NUMBER="$((CDRW_NUMBER+1))" && ln -s $i /dev/cdrw$CDRW_NUMBER - fi - done - - for i in /dev/cd/dvd-*; do - if [ -h $i ]; then - [ "$DVD_NUMBER" = "" ] && ln -s $i /dev/dvd - [ "$DVD_NUMBER" = "" ] && DVD_NUMBER="-1" - ! [ "$DVD_NUMBER" = "" ] && DVD_NUMBER="$((DVD_NUMBER+1))" && ln -s $i /dev/dvd$DVD_NUMBER - fi - done - - for i in /dev/cd/dvdrw-*; do - if [ -h $i ]; then - [ "$DVDRW_NUMBER" = "" ] && ln -s $i /dev/dvdrw - [ "$DVDRW_NUMBER" = "" ] && DVDRW_NUMBER="-1" - ! [ "$DVDRW_NUMBER" = "" ] && DVDRW_NUMBER="$((DVDRW_NUMBER+1))" && ln -s $i /dev/dvdrw$DVDRW_NUMBER - fi - done -fi diff --git a/extra/xorg-server/glx-pixmap-crash.patch b/extra/xorg-server/glx-pixmap-crash.patch deleted file mode 100644 index 48f258eb5..000000000 --- a/extra/xorg-server/glx-pixmap-crash.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 390ba6686d1baf80627c01d4a4273981d6606cc9 Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Mon, 28 Mar 2011 16:30:09 +0000 -Subject: glx: Fix lifetime tracking for pixmaps - -GLX pixmaps take a reference on the underlying pixmap; X and GLX pixmap -IDs can be destroyed in either order with no error. Only windows need -to be tracked under both XIDs. - -Fixes piglit/glx-pixmap-life. - -Reviewed-by: Michel Dänzer <michel@daenzer.net> -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/glx/glxcmds.c b/glx/glxcmds.c -index 66d4c7e..d5b764f 100644 ---- a/glx/glxcmds.c -+++ b/glx/glxcmds.c -@@ -1127,10 +1127,11 @@ DoCreateGLXDrawable(ClientPtr client, __GLXscreen *pGlxScreen, - return BadAlloc; - } - -- /* Add the glx drawable under the XID of the underlying X drawable -- * too. That way we'll get a callback in DrawableGone and can -- * clean up properly when the drawable is destroyed. */ -- if (drawableId != glxDrawableId && -+ /* -+ * Windows aren't refcounted, so track both the X and the GLX window -+ * so we get called regardless of destruction order. -+ */ -+ if (drawableId != glxDrawableId && type == GLX_DRAWABLE_WINDOW && - !AddResource(pDraw->id, __glXDrawableRes, pGlxDraw)) { - pGlxDraw->destroy (pGlxDraw); - return BadAlloc; -@@ -1161,6 +1162,8 @@ DoCreateGLXPixmap(ClientPtr client, __GLXscreen *pGlxScreen, __GLXconfig *config - err = DoCreateGLXDrawable(client, pGlxScreen, config, pDraw, drawableId, - glxDrawableId, GLX_DRAWABLE_PIXMAP); - -+ ((PixmapPtr)pDraw)->refcnt++; -+ - return err; - } - -diff --git a/glx/glxext.c b/glx/glxext.c -index 3f3dd79..9cfc096 100644 ---- a/glx/glxext.c -+++ b/glx/glxext.c -@@ -118,15 +118,15 @@ static Bool DrawableGone(__GLXdrawable *glxPriv, XID xid) - { - __GLXcontext *c, *next; - -- /* If this drawable was created using glx 1.3 drawable -- * constructors, we added it as a glx drawable resource under both -- * its glx drawable ID and it X drawable ID. Remove the other -- * resource now so we don't a callback for freed memory. */ -- if (glxPriv->drawId != glxPriv->pDraw->id) { -- if (xid == glxPriv->drawId) -- FreeResourceByType(glxPriv->pDraw->id, __glXDrawableRes, TRUE); -- else -- FreeResourceByType(glxPriv->drawId, __glXDrawableRes, TRUE); -+ if (glxPriv->type == GLX_DRAWABLE_WINDOW) { -+ /* If this was created by glXCreateWindow, free the matching resource */ -+ if (glxPriv->drawId != glxPriv->pDraw->id) { -+ if (xid == glxPriv->drawId) -+ FreeResourceByType(glxPriv->pDraw->id, __glXDrawableRes, TRUE); -+ else -+ FreeResourceByType(glxPriv->drawId, __glXDrawableRes, TRUE); -+ } -+ /* otherwise this window was implicitly created by MakeCurrent */ - } - - for (c = glxAllContexts; c; c = next) { -@@ -143,6 +143,10 @@ static Bool DrawableGone(__GLXdrawable *glxPriv, XID xid) - c->readPriv = NULL; - } - -+ /* drop our reference to any backing pixmap */ -+ if (glxPriv->type == GLX_DRAWABLE_PIXMAP) -+ glxPriv->pDraw->pScreen->DestroyPixmap((PixmapPtr)glxPriv->pDraw); -+ - glxPriv->destroy(glxPriv); - - return True; --- -cgit v0.8.3-6-g21f6 diff --git a/multilib-testing/lib32-udev/PKGBUILD b/multilib-testing/lib32-udev/PKGBUILD deleted file mode 100644 index 081db8c4a..000000000 --- a/multilib-testing/lib32-udev/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id$ -# Maintainer: Aaron Griffin <aaron@archlinux.org> -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgname=('lib32-udev') -pkgver=171 -pkgrel=1 -arch=('x86_64') -pkgdesc="The userspace dev tools (udev) (32-bit)" -url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" -license=('GPL') -options=(!makeflags !libtool) -depends=('lib32-glibc' 'lib32-glib2' 'lib32-acl' 'lib32-libusb-compat' 'udev') -makedepends=('gcc-multilib' 'coreutils' 'util-linux' 'pciutils' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection') -source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-$pkgver.tar.bz2) -md5sums=('bdf4617284be2ecac11767437417e209') - -build() { - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd $srcdir/udev-$pkgver - - ./configure --libdir=/usr/lib32 - make -} - -package() { - - cd $srcdir/udev-$pkgver - - make DESTDIR=${pkgdir} install - rm -rf ${pkgdir}/usr/{etc,include,lib,libexec,sbin,share} - rm -rf ${pkgdir}/usr/lib32/girepository* -} diff --git a/multilib/lib32-libjpeg/PKGBUILD b/multilib/lib32-libjpeg/PKGBUILD deleted file mode 100644 index 46c3ad07e..000000000 --- a/multilib/lib32-libjpeg/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 38658 2011-01-30 08:53:28Z bluewind $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Judd Vinet <jvinet@zeroflux.org> - -_pkgbasename=libjpeg -pkgname=lib32-$_pkgbasename -pkgver=8.3.0 -_pkgver=8c -pkgrel=1 -pkgdesc="Library of JPEG support functions (32-bit)" -arch=('x86_64') -url="http://www.ijg.org/" -license=('custom') -depends=('lib32-glibc' $_pkgbasename) -makedepends=('libtool' 'gcc-multilib') -options=('!libtool') -source=(http://www.ijg.org/files/jpegsrc.v${_pkgver}.tar.gz) -md5sums=('a2c10c04f396a9ce72894beb18b4e1f9') - -build() { - cd $srcdir/jpeg-${_pkgver} - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --enable-shared --enable-static \ - --libdir=/usr/lib32 - make -} - -package() { - cd $srcdir/jpeg-${_pkgver} - make DESTDIR="$pkgdir" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/staging/glew/PKGBUILD b/staging/glew/PKGBUILD deleted file mode 100644 index 6270e8c8f..000000000 --- a/staging/glew/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 125318 2011-05-25 20:28:27Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: SleepyDog - -pkgname=glew -pkgver=1.6.0 -pkgrel=1 -pkgdesc="The OpenGL Extension Wrangler Library" -arch=('i686' 'x86_64') -url="http://glew.sourceforge.net" -license=('BSD' 'MIT' 'GPL') -depends=('libxmu' 'libxi' 'mesa') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz) -sha1sums=('ed555d15d0f01239b262c4cf803e97d60d8a18b6') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|lib64|lib|' config/Makefile.linux - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GLEW_DEST="${pkgdir}/usr" install.all - install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - rm "${pkgdir}"/usr/lib/{libGLEW,libGLEWmx}.a - chmod 0755 "${pkgdir}"/usr/lib/libGLEW*.so.${pkgver} -} diff --git a/staging/hugin/PKGBUILD b/staging/hugin/PKGBUILD deleted file mode 100644 index d09e302dd..000000000 --- a/staging/hugin/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 125347 2011-05-26 02:15:23Z eric $ -# Maintainer: Tobias Kieslich <tobias@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Dominik Ryba <domryba@post.pl> - -pkgname=hugin -pkgver=2010.4.0 -pkgrel=4 -pkgdesc="A frontend to the panorama-tools" -arch=('i686' 'x86_64') -url="http://hugin.sourceforge.net/" -license=('LGPL') -depends=('wxgtk' 'libpano13' 'boost-libs' 'enblend-enfuse' 'exiv2' 'openexr' - 'autopano-sift-c' 'lapack' 'desktop-file-utils' 'make' 'perl-exiftool') -makedepends=('zip' 'cmake' 'boost') -install=${pkgname}.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 hugin-gcc46.patch) -md5sums=('bfd716655461987312b2f2f00c90dcc5' - '4393c7b31da60f230c85e63a6a2e43a0') -sha1sums=('47f25c0a8b97c27108e567bcd22203c87f268d07' - '52798a155a037f853f41402f797e8a4cb6bb3e07') - -build() { - cd "${srcdir}" - (cd ${pkgname}-${pkgver}; patch -p1 -i ../hugin-gcc46.patch) - mkdir build && cd build - - cmake "${srcdir}/${pkgname}-${pkgver}" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \ - -DENABLE_LAPACK=yes - - make -} - -package(){ - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/hugin/hugin-gcc46.patch b/staging/hugin/hugin-gcc46.patch deleted file mode 100644 index 98a70ad50..000000000 --- a/staging/hugin/hugin-gcc46.patch +++ /dev/null @@ -1,16 +0,0 @@ - -diff -r 0377a1af6110 -r 1fc6ad6e7c7a src/foreign/vigra/vigra/multi_iterator.hxx ---- a/src/foreign/vigra/vigra/multi_iterator.hxx Mon Jun 25 16:36:21 2007 +0000 -+++ b/src/foreign/vigra/vigra/multi_iterator.hxx Tue Jan 25 21:14:13 2011 +0000 -@@ -41,6 +41,7 @@ - #define VIGRA_MULTI_ITERATOR_HXX - - #include <sys/types.h> -+#include <stddef.h> - #include "tinyvector.hxx" - #include "iteratortags.hxx" - - - - - diff --git a/staging/hugin/hugin.install b/staging/hugin/hugin.install deleted file mode 100644 index 362749233..000000000 --- a/staging/hugin/hugin.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/gnome - update-desktop-database -q - update-mime-database usr/share/mime > /dev/null -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/gnome - update-desktop-database -q - update-mime-database usr/share/mime > /dev/null -} diff --git a/staging/koffice/PKGBUILD b/staging/koffice/PKGBUILD deleted file mode 100644 index 1884dd92c..000000000 --- a/staging/koffice/PKGBUILD +++ /dev/null @@ -1,301 +0,0 @@ -# $Id: PKGBUILD 125678 2011-05-28 00:58:39Z andrea $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > - -pkgbase=koffice -pkgname=( - 'koffice-filters' - 'koffice-interfaces' - 'koffice-libs' - 'koffice-plugins' - 'koffice-pics' - 'koffice-servicetypes' - 'koffice-templates' - 'koffice-tools' - 'koffice-karbon' - 'koffice-karbon-doc' -# 'koffice-kchart' -# 'koffice-kchart-doc' - 'koffice-kexi' - 'koffice-kexi-doc' - 'koffice-kformula' - 'koffice-kformula-doc' - 'koffice-kounavail' - 'koffice-kplato' -# 'koffice-kplato-doc' - 'koffice-kpresenter' - 'koffice-kpresenter-doc' - 'koffice-krita' -# 'koffice-krita-doc' # no krita-doc anymore upstream - 'koffice-kspread' - 'koffice-kspread-doc' - 'koffice-kword' -# 'koffice-kword-doc' # see http://userbase.kde.org/KWord/Manual for documentation (not supplied by upstream anymore in the sources) - 'koffice-handbook' - 'koffice-thesaurus-doc' -# 'koffice-kdgantt' # still an empty package -) -pkgver=2.3.3 -pkgrel=4 -arch=('i686' 'x86_64') -url='http://koffice.kde.org' -license=('GPL' 'LGPL' 'FDL') -makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms' - 'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd' - 'libwpg' 'opengtl' 'kdegraphics-libs') -groups=('koffice') -source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2" - 'kde4-koffice-libwpg02.patch' 'gcc46.patch') -sha256sums=('31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099' - '69106deb4081d71b5bd8f2e4f5af67ca689e4ce9f2bb49c11dbce5fb3409d612' - 'e095c0b2bbedf41da6535a68b2275464dafd3f194566028d0135322f596e4739') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - patch -p1 -i "${srcdir}/kde4-koffice-libwpg02.patch" - patch -p1 -i "${srcdir}"/gcc46.patch - - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -##### 1st package common files, depends, optdepends of the koffice applications ##### - -package_koffice-filters(){ - pkgdesc="Filters for the KDE office suite" - optdepends=('libgsf: Microsoft Word document importer' 'libwpd: WordPerfect document importer' - 'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter' - 'kdegraphics-libs: support for raw images') - install=filters.install - cd "${srcdir}/build/filters" - make DESTDIR="${pkgdir}" install -} - -package_koffice-interfaces(){ - pkgdesc="Interfaces for the KDE office suite" - depends=('kdelibs' 'koffice-libs') - cd "${srcdir}/build/interfaces" - make DESTDIR="${pkgdir}" install -} - -package_koffice-libs(){ - pkgdesc="Libs for the KDE office suite" - depends=('kdepimlibs' 'qca' 'lcms' 'koffice-servicetypes') - cd "${srcdir}/build/libs" - make DESTDIR="${pkgdir}" install -} - -package_koffice-plugins(){ - pkgdesc="Plugins for the KDE office suite" - depends=('koffice-libs') - replaces=('koffice-kchart') - conflicts=('koffice-kchart') - cd "${srcdir}/build/plugins" - make DESTDIR="${pkgdir}" install -} - -package_koffice-pics(){ - pkgdesc="Icons for the KDE office suite" - install=koffice.install - cd "${srcdir}/build/pics" - make DESTDIR="${pkgdir}" install -} - -package_koffice-servicetypes(){ - pkgdesc="Servicetypes for the KDE office suite" - cd "${srcdir}/build/servicetypes" - make DESTDIR="${pkgdir}" install -} - -package_koffice-templates(){ - pkgdesc="Templates for the KDE office suite" - cd "${srcdir}/build/templates" - make DESTDIR="${pkgdir}" install -} - -package_koffice-tools(){ - pkgdesc="Tools for the KDE office suite" - depends=('koffice-libs') - cd "${srcdir}/build/tools" - make DESTDIR="${pkgdir}" install -} - -#### package common files done ##### - -#### package apps and their docs ##### - -package_koffice-karbon(){ - pkgdesc="Vector drawing application for KDE" - depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates') - optdepends=('koffice-filters: import/export filters') - install=koffice.install - cd "${srcdir}/build/karbon" - make DESTDIR="${pkgdir}" install -} - -package_koffice-karbon-doc(){ - pkgdesc="Documentation for karbon" - cd "${srcdir}/build/doc/karbon" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kexi(){ - pkgdesc="Integrated data management application for the KDE office suite" - depends=('kdelibs' 'koffice-libs' 'koffice-kspread' 'sqlite3') - cd "${srcdir}/build/kexi" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kexi-doc(){ - pkgdesc="Documentation for kexi" - cd "${srcdir}/build/doc/kexi" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kformula(){ - pkgdesc="Formula editor for the KDE office suite" - depends=('kdelibs' 'koffice-libs') - cd "${srcdir}/build/kformula" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kformula-doc() { - pkgdesc="Documentation for koffice-kformula" - cd "${srcdir}/build/doc/kformula" - make DESTDIR="${pkgdir}" install -} - - -package_koffice-kounavail(){ - pkgdesc="Kounavail for the KDE office suite" - depends=('kdelibs' 'koffice-libs') - cd "${srcdir}/build/kounavail" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kplato(){ - pkgdesc="Project management application for KDE" - depends=('hicolor-icon-theme' 'koffice-libs' 'kdepimlibs' 'koffice-templates' \ - 'koffice-plugins' 'koffice-kword') - install=koffice.install - cd "${srcdir}/build/kplato" - make DESTDIR="${pkgdir}" install -} - -#package_koffice-kplato-doc(){ -# pkgdesc="Documentation for kplato" -# cd ${srcdir}/build/doc/kplato -# make DESTDIR="${pkgdir}" install -#} - -package_koffice-kpresenter(){ - pkgdesc="Presentation tool for KDE" - depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates') - optdepends=('koffice-filters: import/export filters') - install=koffice.install - cd "${srcdir}/build/kpresenter" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kpresenter-doc(){ - pkgdesc="Documentation for kpresenter" - cd "${srcdir}/build/doc/kpresenter" - make DESTDIR="${pkgdir}" install -} - -package_koffice-krita(){ - pkgdesc="Graphics editor for KDE" - depends=('hicolor-icon-theme' 'glew' 'qimageblitz' 'koffice-libs' \ - 'koffice-templates' 'koffice-plugins' 'poppler-qt' 'shared-mime-info' \ - 'openexr' 'opengtl') - optdepends=('koffice-filters: import/export filters') - install=krita.install - cd "${srcdir}/build/krita" - make DESTDIR="${pkgdir}" install -} - -#package_koffice-krita-doc(){ -# pkgdesc="Documentation for krita" -# cd ${srcdir}/build/doc/krita -# make DESTDIR="${pkgdir}" install -#} - - -package_koffice-kspread(){ - pkgdesc="Spreadsheet application for KDE" - depends=('hicolor-icon-theme' 'gsl' 'koffice-libs' 'koffice-templates' 'koffice-plugins') - optdepends=('koffice-filters: import/export filters') - install=koffice.install - cd "${srcdir}/build/kspread" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kspread-doc(){ - pkgdesc="Documentation for kspread" - cd "${srcdir}/build/doc/kspread" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kword(){ - pkgdesc="Wordprocessor for KDE" - depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates' 'koffice-pics' \ - 'koffice-kounavail' 'koffice-plugins') - optdepends=('koffice-filters: import/export filters') - install=koffice.install - cd "${srcdir}/build/kword" - make DESTDIR="${pkgdir}" install - - # some sed lines to have python2 in extension scripts - sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/oouno.py" - sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/importdoxyxml.py" - sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/onlinehelp.py" -} - -#package_koffice-kword-doc(){ -# pkgdesc="Documentation for kword" -# cd ${srcdir}/build/doc/kword -# make DESTDIR="${pkgdir}" install -#} - -##### package apps done ##### - -#package_koffice-kchart(){ -# pkgdesc="Charting tool for KDE" -# depends=('hicolor-icon-theme' 'koffice-interfaces' 'koffice-templates') -# optdepends=('koffice-filters: import/export filters') -# install=koffice.install -# cd "${srcdir}/build/kchart" -# make DESTDIR="${pkgdir}" install -#} - -#package_koffice-kchart-doc(){ -# pkgdesc="Documentation for kchart" -# cd "${srcdir}/build/doc/kchart" -# make DESTDIR="${pkgdir}" install -#} - -#package_koffice-kdgantt(){ -# pkgdesc="Gantt for KDE" -# cd "${srcdir}/build/kdgantt" -# make DESTDIR="${pkgdir}" install -#} - -package_koffice-handbook() { - pkgdesc="Documentation for koffice" - cd "${srcdir}/build/doc/koffice" - make DESTDIR="${pkgdir}" install -} - -package_koffice-thesaurus-doc(){ - pkgdesc="Documentation for koffice-thesaurus" - cd "${srcdir}/build/doc/thesaurus" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/koffice/filters.install b/staging/koffice/filters.install deleted file mode 100644 index 7c8a8bd2b..000000000 --- a/staging/koffice/filters.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/koffice/gcc46.patch b/staging/koffice/gcc46.patch deleted file mode 100644 index dcf8a4f85..000000000 --- a/staging/koffice/gcc46.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46 koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc ---- koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46 2011-02-17 06:13:40.000000000 -0600 -+++ koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc 2011-02-19 21:15:56.597142885 -0600 -@@ -80,6 +80,9 @@ ImageType imfTypeToKisType(Imf::PixelTyp - return IT_FLOAT16; - case Imf::FLOAT: - return IT_FLOAT32; -+ default: -+ // shouldn't reach here -+ return IT_UNSUPPORTED; - } - } - -@@ -93,6 +96,9 @@ const KoColorSpace* kisTypeToColorSpace( - case IT_UNKNOWN: - case IT_UNSUPPORTED: - return 0; -+ default: -+ // shouldn't reach here -+ return 0; - } - } - diff --git a/staging/koffice/kde4-koffice-libwpg02.patch b/staging/koffice/kde4-koffice-libwpg02.patch deleted file mode 100644 index e2a55a216..000000000 --- a/staging/koffice/kde4-koffice-libwpg02.patch +++ /dev/null @@ -1,1323 +0,0 @@ -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt ---- koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt 2011-01-18 07:40:25.000000000 +0100 -@@ -1,16 +1,11 @@ - -- - include_directories(${CMAKE_BINARY_DIR}/filters/ ${WPD_INCLUDE_DIR} ${LIBWPG_INCLUDE_DIR}/) - --set(wpgimport_PART_SRCS --WPGImport.cpp --OdgExporter.cxx --FileOutputHandler.cxx --GraphicsElement.cxx) -+set(wpgimport_PART_SRCS WPGImport.cpp) - - kde4_add_plugin(wpgimport ${wpgimport_PART_SRCS}) - --target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES}) -+target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES} ${WPD_LIBRARIES}) - - install(TARGETS wpgimport DESTINATION ${PLUGIN_INSTALL_DIR}) - install(FILES karbon_wpg_import.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx ---- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,95 +0,0 @@ --/* libwpg -- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch) -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Library General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpg.sourceforge.net -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#include "FileOutputHandler.hxx" -- --FileOutputHandler::FileOutputHandler(std::ostringstream &contentStream) : -- mbIsTagOpened(false), -- mContentStream(contentStream) --{ --} -- --void FileOutputHandler::startDocument() --{ --} -- --void FileOutputHandler::startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList) --{ -- if (mbIsTagOpened) -- { -- mContentStream << ">"; -- mbIsTagOpened = false; -- } -- mContentStream << "<" << psName; -- -- for (std::vector<std::pair<std::string, std::string> >::const_iterator i = xPropList.begin(); i != xPropList.end(); i++) -- { -- mContentStream << " " << (*i).first.c_str() << "=\"" << (*i).second.c_str() << "\""; -- } -- mbIsTagOpened = true; -- msOpenedTagName = psName; --} -- --void FileOutputHandler::endElement(const char *psName) --{ -- if (mbIsTagOpened) -- { -- if( msOpenedTagName == psName ) -- { -- mContentStream << "/>"; -- mbIsTagOpened = false; -- } -- else // should not happen, but handle it -- { -- mContentStream << ">"; -- mContentStream << "</" << psName << ">"; -- mbIsTagOpened = false; -- } -- } -- else -- { -- mContentStream << "</" << psName << ">"; -- mbIsTagOpened = false; -- } --} -- --void FileOutputHandler::characters(const std::string &sCharacters) --{ -- if (mbIsTagOpened) -- { -- mContentStream << ">"; -- mbIsTagOpened = false; -- } -- mContentStream << sCharacters.c_str(); --} -- --void FileOutputHandler::endDocument() --{ -- if (mbIsTagOpened) -- { -- mContentStream << ">"; -- mbIsTagOpened = false; -- } --} -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx ---- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,49 +0,0 @@ --/* libwpg -- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch) -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Library General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpg.sourceforge.net -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#ifndef FILEOUTPUTHANDLER_H --#define FILEOUTPUTHANDLER_H -- --#include <iostream> --#include <sstream> --#include <string> --#include "GraphicsHandler.hxx" -- --class FileOutputHandler : public GraphicsHandler --{ -- public: -- explicit FileOutputHandler(std::ostringstream &contentStream); -- virtual void startDocument(); -- virtual void endDocument(); -- virtual void startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList); -- virtual void endElement(const char *psName); -- virtual void characters(const std::string &sCharacters); -- -- private: -- bool mbIsTagOpened; -- std::string msOpenedTagName; -- std::ostringstream &mContentStream; --}; --#endif -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx ---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,66 +0,0 @@ --/* GraphicsElement: The items we are collecting to be put into the Writer -- * document: paragraph and spans of text, as well as section breaks. -- * -- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca) -- * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpg.sourceforge.net -- * -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#include "GraphicsElement.hxx" --#include "GraphicsHandler.hxx" --#include <string.h> -- --#define ASCII_SPACE 0x0020 -- --void TagGraphicsElement::print() const --{ --} -- --void OpenTagGraphicsElement::write(GraphicsHandler *pHandler) const --{ -- pHandler->startElement(getTagName().c_str(), maAttrList); --} -- --void OpenTagGraphicsElement::print() const --{ -- TagGraphicsElement::print(); --} -- --void OpenTagGraphicsElement::addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue) --{ -- std::pair<std::string, std::string> tmpAttribute; -- tmpAttribute.first = szAttributeName; -- tmpAttribute.second = sAttributeValue; -- maAttrList.push_back(tmpAttribute); --} -- --void CloseTagGraphicsElement::write(GraphicsHandler *pHandler) const --{ -- -- pHandler->endElement(getTagName().c_str()); --} -- --void CharDataGraphicsElement::write(GraphicsHandler *pHandler) const --{ -- pHandler->characters(msData); --} -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx ---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,84 +0,0 @@ --/* GraphicsElement: The items we are collecting to be put into the Writer -- * document: paragraph and spans of text, as well as section breaks. -- * -- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca) -- * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpd.sourceforge.net -- * -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#ifndef _GRAPHICSELEMENT_H --#define _GRAPHICSELEMENT_H --#include <string> --#include <map> --#include <vector> -- --#include "GraphicsHandler.hxx" -- --class GraphicsElement --{ --public: -- virtual ~GraphicsElement() {} -- virtual void write(GraphicsHandler *pHandler) const = 0; -- virtual void print() const {} --}; -- --class TagGraphicsElement : public GraphicsElement --{ --public: -- explicit TagGraphicsElement(const char *szTagName) : msTagName(szTagName) {} -- const std::string &getTagName() const { return msTagName; } -- virtual void print() const; --private: -- const std::string msTagName; --}; -- --class OpenTagGraphicsElement : public TagGraphicsElement --{ --public: -- explicit OpenTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {} -- ~OpenTagGraphicsElement() {} -- void addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue); -- virtual void write(GraphicsHandler *pHandler) const; -- virtual void print () const; --private: -- std::vector<std::pair<std::string, std::string> > maAttrList; --}; -- --class CloseTagGraphicsElement : public TagGraphicsElement --{ --public: -- explicit CloseTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {} -- virtual void write(GraphicsHandler *pHandler) const; --}; -- --class CharDataGraphicsElement : public GraphicsElement --{ --public: -- CharDataGraphicsElement(const char *sData) : GraphicsElement(), msData(sData) {} -- virtual void write(GraphicsHandler *pHandler) const; --private: -- std::string msData; --}; -- -- --#endif -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx ---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,43 +0,0 @@ --/* -- * Copyright (C) 2004 William Lachance (wlach@interlog.com) -- * Copyright (C) 2004 Net Integration Technologies (http://www.net-itech.com) -- * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU General Public License -- * as published by the Free Software Foundation; either version 2 -- * of the License, or (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * Contributor(s): Martin Gallwey (gallwey@sun.com) -- * -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ --#ifndef _GRAPHICSHANDLER_H --#define _GRAPHICSHANDLER_H --#include <string> --#include <map> --#include <vector> -- --class GraphicsHandler --{ --public: -- virtual ~GraphicsHandler() {} -- virtual void startDocument() = 0; -- virtual void endDocument() = 0; -- virtual void startElement(const char *psName, const std::vector< std::pair <std::string, std::string> > &xPropList) = 0; -- virtual void endElement(const char *psName) = 0; -- virtual void characters(const std::string &sCharacters) = 0; --}; --#endif -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx ---- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,662 +0,0 @@ --/* libwpg -- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org) -- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch) -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Library General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpg.sourceforge.net -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#include "OdgExporter.hxx" --#include "GraphicsElement.hxx" --#include "GraphicsHandler.hxx" --#include <locale.h> -- --static std::string doubleToString(const double value) --{ -- std::ostringstream tempStream; -- tempStream << value; -- std::string decimalPoint(localeconv()->decimal_point); -- if ((decimalPoint.size() == 0) || (decimalPoint == ".")) -- return tempStream.str(); -- std::string stringValue(tempStream.str()); -- if (!stringValue.empty()) -- { -- std::string::size_type pos; -- while ((pos = stringValue.find(decimalPoint)) != std::string::npos) -- stringValue.replace(pos,decimalPoint.size(),"."); -- } -- return stringValue; --} -- -- --OdgExporter::OdgExporter(GraphicsHandler *pHandler, const bool isFlatXML): -- mpHandler(pHandler), -- m_fillRule(AlternatingFill), -- m_gradientIndex(1), -- m_dashIndex(1), -- m_styleIndex(1), -- m_width(0.0f), -- m_height(0.0f), -- m_isFlatXML(isFlatXML) --{ --} -- --OdgExporter::~OdgExporter() --{ -- for (std::vector <GraphicsElement *>::iterator iterStroke = mStrokeDashElements.begin(); -- iterStroke != mStrokeDashElements.end(); iterStroke++) -- delete (*iterStroke); -- -- for (std::vector <GraphicsElement *>::iterator iterGradient = mGradientElements.begin(); -- iterGradient != mGradientElements.end(); iterGradient++) -- delete (*iterGradient); -- -- for (std::vector <GraphicsElement *>::iterator iterAutomaticStyles = mAutomaticStylesElements.begin(); -- iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++) -- delete (*iterAutomaticStyles); -- -- for (std::vector<GraphicsElement *>::iterator bodyIter = mBodyElements.begin(); -- bodyIter != mBodyElements.end(); bodyIter++) -- delete (*bodyIter); --} -- --void OdgExporter::startGraphics(double width, double height) --{ -- m_gradientIndex = 1; -- m_dashIndex = 1; -- m_styleIndex = 1; -- m_width = width; -- m_height = height; -- -- -- mpHandler->startDocument(); -- OpenTagGraphicsElement tmpOfficeDocumentContent("office:document"); -- tmpOfficeDocumentContent.addAttribute("xmlns:office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:dc", "http://purl.org/dc/elements/1.1/"); -- tmpOfficeDocumentContent.addAttribute("xmlns:svg", "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:config", "urn:oasis:names:tc:opendocument:xmlns:config:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:ooo", "http://openoffice.org/2004/office"); -- tmpOfficeDocumentContent.addAttribute("office:version", "1.0"); -- if (m_isFlatXML) -- tmpOfficeDocumentContent.addAttribute("office:mimetype", "application/x-vnd.oasis.openoffice.drawing"); -- tmpOfficeDocumentContent.write(mpHandler); -- -- OpenTagGraphicsElement("office:settings").write(mpHandler); -- -- OpenTagGraphicsElement configItemSetOpenElement("config:config-item-set"); -- configItemSetOpenElement.addAttribute("config:name", "ooo:view-settings"); -- configItemSetOpenElement.write(mpHandler); -- -- OpenTagGraphicsElement configItemOpenElement1("config:config-item"); -- configItemOpenElement1.addAttribute("config:name", "VisibleAreaTop"); -- configItemOpenElement1.addAttribute("config:type", "int"); -- configItemOpenElement1.write(mpHandler); -- mpHandler->characters("0"); -- mpHandler->endElement("config:config-item"); -- -- OpenTagGraphicsElement configItemOpenElement2("config:config-item"); -- configItemOpenElement2.addAttribute("config:name", "VisibleAreaLeft"); -- configItemOpenElement2.addAttribute("config:type", "int"); -- configItemOpenElement2.write(mpHandler); -- mpHandler->characters("0"); -- mpHandler->endElement("config:config-item"); -- -- OpenTagGraphicsElement configItemOpenElement3("config:config-item"); -- configItemOpenElement3.addAttribute("config:name", "VisibleAreaWidth"); -- configItemOpenElement3.addAttribute("config:type", "int"); -- configItemOpenElement3.write(mpHandler); -- m_value.str(""); -- m_value << (unsigned)(2540 * width); -- mpHandler->characters(m_value.str()); -- mpHandler->endElement("config:config-item"); -- -- OpenTagGraphicsElement configItemOpenElement4("config:config-item"); -- configItemOpenElement4.addAttribute("config:name", "VisibleAreaHeight"); -- configItemOpenElement4.addAttribute("config:type", "int"); -- configItemOpenElement4.write(mpHandler); -- m_value.str(""); -- m_value << (unsigned)(2540 * height); -- mpHandler->characters(m_value.str()); -- mpHandler->endElement("config:config-item"); -- -- mpHandler->endElement("config:config-item-set"); -- -- mpHandler->endElement("office:settings"); -- --} -- --void OdgExporter::endGraphics() --{ -- OpenTagGraphicsElement("office:styles").write(mpHandler); -- -- for (std::vector <GraphicsElement *>::const_iterator iterStroke = mStrokeDashElements.begin(); -- iterStroke != mStrokeDashElements.end(); iterStroke++) -- (*iterStroke)->write(mpHandler); -- -- for (std::vector <GraphicsElement *>::const_iterator iterGradient = mGradientElements.begin(); -- iterGradient != mGradientElements.end(); iterGradient++) -- (*iterGradient)->write(mpHandler); -- -- mpHandler->endElement("office:styles"); -- -- OpenTagGraphicsElement("office:automatic-styles").write(mpHandler); -- -- for (std::vector <GraphicsElement *>::const_iterator iterAutomaticStyles = mAutomaticStylesElements.begin(); -- iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++) -- (*iterAutomaticStyles)->write(mpHandler); -- -- OpenTagGraphicsElement tmpStylePageLayoutOpenElement("style:page-layout"); -- tmpStylePageLayoutOpenElement.addAttribute("style:name", "PM0"); -- tmpStylePageLayoutOpenElement.write(mpHandler); -- -- OpenTagGraphicsElement tmpStylePageLayoutPropertiesOpenElement("style:page-layout-properties"); -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-top", "0in"); -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-bottom", "0in"); -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-left", "0in"); -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-right", "0in"); -- m_value.str(""); -- m_value << doubleToString(m_width) << "in"; -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-width", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(m_height) << "in"; -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-height", m_value.str()); -- m_value.str(""); -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("style:print-orientation", "portrait"); -- tmpStylePageLayoutPropertiesOpenElement.write(mpHandler); -- -- mpHandler->endElement("style:page-layout-properties"); -- -- mpHandler->endElement("style:page-layout"); -- -- OpenTagGraphicsElement tmpStyleStyleOpenElement("style:style"); -- tmpStyleStyleOpenElement.addAttribute("style:name", "dp1"); -- tmpStyleStyleOpenElement.addAttribute("style:family", "drawing-page"); -- tmpStyleStyleOpenElement.write(mpHandler); -- -- OpenTagGraphicsElement tmpStyleDrawingPagePropertiesOpenElement("style:drawing-page-properties"); -- // tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:background-size", "border"); -- tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:fill", "none"); -- tmpStyleDrawingPagePropertiesOpenElement.write(mpHandler); -- -- mpHandler->endElement("style:drawing-page-properties"); -- -- mpHandler->endElement("style:style"); -- -- mpHandler->endElement("office:automatic-styles"); -- -- OpenTagGraphicsElement("office:master-styles").write(mpHandler); -- -- OpenTagGraphicsElement tmpStyleMasterPageOpenElement("style:master-page"); -- tmpStyleMasterPageOpenElement.addAttribute("style:name", "Default"); -- tmpStyleMasterPageOpenElement.addAttribute("style:page-layout-name", "PM0"); -- tmpStyleMasterPageOpenElement.addAttribute("draw:style-name", "dp1"); -- tmpStyleMasterPageOpenElement.write(mpHandler); -- -- mpHandler->endElement("style:master-page"); -- -- mpHandler->endElement("office:master-styles"); -- -- OpenTagGraphicsElement("office:body").write(mpHandler); -- -- OpenTagGraphicsElement("office:drawing").write(mpHandler); -- -- OpenTagGraphicsElement tmpDrawPageOpenElement("draw:page"); -- tmpDrawPageOpenElement.addAttribute("draw:name", "page1"); -- tmpDrawPageOpenElement.addAttribute("draw:style-name", "dp1"); -- tmpDrawPageOpenElement.addAttribute("draw:master-page-name", "Default"); -- tmpDrawPageOpenElement.write(mpHandler); -- -- for (std::vector<GraphicsElement *>::const_iterator bodyIter = mBodyElements.begin(); -- bodyIter != mBodyElements.end(); bodyIter++) -- { -- (*bodyIter)->write(mpHandler); -- } -- -- mpHandler->endElement("draw:page"); -- mpHandler->endElement("office:drawing"); -- mpHandler->endElement("office:body"); -- mpHandler->endElement("office:document"); -- -- mpHandler->endDocument(); --} -- --void OdgExporter::setPen(const libwpg::WPGPen& pen) --{ -- m_pen = pen; --} -- --void OdgExporter::setBrush(const libwpg::WPGBrush& brush) --{ -- m_brush = brush; --} -- --void OdgExporter::setFillRule(FillRule rule) --{ -- m_fillRule = rule; --} -- --void OdgExporter::startLayer(unsigned int) --{ --} -- --void OdgExporter::endLayer(unsigned int) --{ --} -- --void OdgExporter::drawRectangle(const libwpg::WPGRect& rect, double rx, double ) --{ -- writeStyle(); -- OpenTagGraphicsElement *pDrawRectElement = new OpenTagGraphicsElement("draw:rect"); -- m_value.str(""); -- m_value << "gr" << m_styleIndex-1; -- pDrawRectElement->addAttribute("draw:style-name", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(rect.x1) << "in"; -- pDrawRectElement->addAttribute("svg:x", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(rect.y1) << "in"; -- pDrawRectElement->addAttribute("svg:y", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(rect.x2-rect.x1) << "in"; -- pDrawRectElement->addAttribute("svg:width", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(rect.y2-rect.y1) << "in"; -- pDrawRectElement->addAttribute("svg:height", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(rx) << "in"; -- // FIXME: what to do when rx != ry ? -- pDrawRectElement->addAttribute("draw:corner-radius", m_value.str()); -- m_value.str(""); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawRectElement)); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:rect"))); --} -- --void OdgExporter::drawEllipse(const libwpg::WPGPoint& center, double rx, double ry) --{ -- writeStyle(); -- OpenTagGraphicsElement *pDrawEllipseElement = new OpenTagGraphicsElement("draw:ellipse"); -- m_value.str(""); -- m_value << "gr" << m_styleIndex-1; -- pDrawEllipseElement->addAttribute("draw:style-name", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(center.x - rx) << "in"; -- pDrawEllipseElement->addAttribute("svg:x", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(center.y - ry) << "in"; -- pDrawEllipseElement->addAttribute("svg:y", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(2 * rx) << "in"; -- pDrawEllipseElement->addAttribute("svg:width", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(2 * ry) << "in"; -- pDrawEllipseElement->addAttribute("svg:height", m_value.str()); -- m_value.str(""); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawEllipseElement)); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:ellipse"))); --} -- --void OdgExporter::drawPolygon(const libwpg::WPGPointArray& vertices) --{ -- if(vertices.count() < 2) -- return; -- -- if(vertices.count() == 2) -- { -- const libwpg::WPGPoint& p1 = vertices[0]; -- const libwpg::WPGPoint& p2 = vertices[1]; -- -- writeStyle(); -- OpenTagGraphicsElement *pDrawLineElement = new OpenTagGraphicsElement("draw:line"); -- m_value.str(""); -- m_value << "gr" << m_styleIndex-1; -- pDrawLineElement->addAttribute("draw:style-name", m_value.str()); -- m_value.str(""); -- pDrawLineElement->addAttribute("draw:text-style-name", "P1"); -- pDrawLineElement->addAttribute("draw:layer", "layout"); -- m_value << doubleToString(p1.x) << "in"; -- pDrawLineElement->addAttribute("svg:x1", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(p1.y) << "in"; -- pDrawLineElement->addAttribute("svg:y1", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(p2.x) << "in"; -- pDrawLineElement->addAttribute("svg:x2", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(p2.y) << "in"; -- pDrawLineElement->addAttribute("svg:y2", m_value.str()); -- m_value.str(""); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawLineElement)); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:line"))); -- } -- else -- { -- // draw as path -- libwpg::WPGPath path; -- path.moveTo(vertices[0]); -- for(unsigned long ii = 1; ii < vertices.count(); ii++) -- path.lineTo(vertices[ii]); -- path.closed = true; -- drawPath(path); -- } --} -- --void OdgExporter::drawPath(const libwpg::WPGPath& path) --{ -- if(path.count() == 0) -- return; -- -- // try to find the bounding box -- // this is simple convex hull technique, the bounding box might not be -- // accurate but that should be enough for this purpose -- libwpg::WPGPoint p = path.element(0).point; -- libwpg::WPGPoint q = path.element(0).point; -- for(unsigned k = 0; k < path.count(); k++) -- { -- libwpg::WPGPathElement element = path.element(k); -- p.x = (p.x > element.point.x) ? element.point.x : p.x; -- p.y = (p.y > element.point.y) ? element.point.y : p.y; -- q.x = (q.x < element.point.x) ? element.point.x : q.x; -- q.y = (q.y < element.point.y) ? element.point.y : q.y; -- if(element.type == libwpg::WPGPathElement::CurveToElement) -- { -- p.x = (p.x > element.extra1.x) ? element.extra1.x : p.x; -- p.y = (p.y > element.extra1.y) ? element.extra1.y : p.y; -- q.x = (q.x < element.extra1.x) ? element.extra1.x : q.x; -- q.y = (q.y < element.extra1.y) ? element.extra1.y : q.y; -- p.x = (p.x > element.extra2.x) ? element.extra2.x : p.x; -- p.y = (p.y > element.extra2.y) ? element.extra2.y : p.y; -- q.x = (q.x < element.extra2.x) ? element.extra2.x : q.x; -- q.y = (q.y < element.extra2.y) ? element.extra2.y : q.y; -- } -- } -- double vw = q.x - p.x; -- double vh = q.y - p.y; -- -- writeStyle(); -- -- OpenTagGraphicsElement *pDrawPathElement = new OpenTagGraphicsElement("draw:path"); -- m_value.str(""); -- m_value << "gr" << m_styleIndex-1; -- pDrawPathElement->addAttribute("draw:style-name", m_value.str()); -- m_value.str(""); -- pDrawPathElement->addAttribute("draw:text-style-name", "P1"); -- pDrawPathElement->addAttribute("draw:layer", "layout"); -- m_value << doubleToString(p.x) << "in"; -- pDrawPathElement->addAttribute("svg:x", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(p.y) << "in"; -- pDrawPathElement->addAttribute("svg:y", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(vw) << "in"; -- pDrawPathElement->addAttribute("svg:width", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(vh) << "in"; -- pDrawPathElement->addAttribute("svg:height", m_value.str()); -- m_value.str(""); -- m_value << "0 0 " << (int)(vw*2540) << " " << (int)(vh*2540); -- pDrawPathElement->addAttribute("svg:viewBox", m_value.str()); -- m_value.str(""); -- -- for(unsigned i = 0; i < path.count(); i++) -- { -- libwpg::WPGPathElement element = path.element(i); -- libwpg::WPGPoint point = element.point; -- switch(element.type) -- { -- // 2540 is 2.54*1000, 2.54 in = 1 in -- case libwpg::WPGPathElement::MoveToElement: -- m_value << "M" << (int)((point.x-p.x)*2540) << " "; -- m_value << (int)((point.y-p.y)*2540); -- break; -- -- case libwpg::WPGPathElement::LineToElement: -- m_value << "L" << (int)((point.x-p.x)*2540) << " "; -- m_value << (int)((point.y-p.y)*2540); -- break; -- -- case libwpg::WPGPathElement::CurveToElement: -- m_value << "C" << (int)((element.extra1.x-p.x)*2540) << " "; -- m_value << (int)((element.extra1.y-p.y)*2540) << " "; -- m_value << (int)((element.extra2.x-p.x)*2540) << " "; -- m_value << (int)((element.extra2.y-p.y)*2540) << " "; -- m_value << (int)((point.x-p.x)*2540) << " "; -- m_value << (int)((point.y-p.y)*2540); -- break; -- -- default: -- break; -- } -- } -- if(path.closed) -- m_value << " Z"; -- pDrawPathElement->addAttribute("svg:d", m_value.str()); -- m_value.str(""); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawPathElement)); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:path"))); --} -- -- --void OdgExporter::drawBitmap(const libwpg::WPGBitmap& bitmap) --{ -- OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame"); -- m_value.str(""); -- m_value << doubleToString(bitmap.rect.x1) << "in"; -- pDrawFrameElement->addAttribute("svg:x", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(bitmap.rect.y1) << "in"; -- pDrawFrameElement->addAttribute("svg:y", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(bitmap.rect.height()) << "in"; -- pDrawFrameElement->addAttribute("svg:height", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(bitmap.rect.width()) << "in"; -- pDrawFrameElement->addAttribute("svg:width", m_value.str()); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement)); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data"))); -- -- libwpg::WPGString base64Binary; -- bitmap.generateBase64DIB(base64Binary); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr()))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame"))); --} -- --void OdgExporter::drawImageObject(const libwpg::WPGBinaryData& binaryData) --{ -- if (binaryData.mimeType.length() <= 0) -- return; -- OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame"); -- m_value.str(""); -- m_value << doubleToString(binaryData.rect.x1) << "in"; -- pDrawFrameElement->addAttribute("svg:x", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(binaryData.rect.y1) << "in"; -- pDrawFrameElement->addAttribute("svg:y", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(binaryData.rect.height()) << "in"; -- pDrawFrameElement->addAttribute("svg:height", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(binaryData.rect.width()) << "in"; -- pDrawFrameElement->addAttribute("svg:width", m_value.str()); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement)); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data"))); -- -- libwpg::WPGString base64Binary = binaryData.getBase64Data(); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr()))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame"))); --} -- -- --static std::string colorToHex(const libwpg::WPGColor& color) --{ -- char hexdigits[] = "0123456789abcdef"; -- char buffer[] = "123456"; -- buffer[0] = hexdigits[(color.red >> 4) & 15]; -- buffer[1] = hexdigits[color.red & 15]; -- buffer[2] = hexdigits[(color.green >> 4) & 15]; -- buffer[3] = hexdigits[color.green & 15]; -- buffer[4] = hexdigits[(color.blue >> 4) & 15]; -- buffer[5] = hexdigits[color.blue & 15]; -- return std::string(buffer); --} -- --void OdgExporter::writeStyle() --{ -- m_value.str(""); -- m_name.str(""); -- -- if(!m_pen.solid && (m_pen.dashArray.count() >=2 ) ) -- { -- // ODG only supports dashes with the same length of spaces inbetween -- // here we take the first space and assume everything else the same -- // note that dash length is written in percentage -- double distance = m_pen.dashArray.at(1); -- OpenTagGraphicsElement *tmpDrawStrokeDashElement = new OpenTagGraphicsElement("draw:stroke-dash"); -- tmpDrawStrokeDashElement->addAttribute("draw:style", "rect"); -- m_value << "Dash_" << m_dashIndex++; -- tmpDrawStrokeDashElement->addAttribute("draw:name", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(distance*100) << "%"; -- tmpDrawStrokeDashElement->addAttribute("draw:distance", m_value.str()); -- m_value.str(""); -- for(unsigned i = 0; i < m_pen.dashArray.count()/2; i++) -- { -- m_name << "draw:dots" << i+1; -- tmpDrawStrokeDashElement->addAttribute(m_name.str(), "1"); -- m_name.str(""); -- m_name << "draw:dots" << i+1 << "-length"; -- m_value << doubleToString(100*m_pen.dashArray.at(i*2)) << "%"; -- tmpDrawStrokeDashElement->addAttribute(m_name.str(), m_value.str()); -- m_name.str(""); -- m_value.str(""); -- } -- mStrokeDashElements.push_back(static_cast<GraphicsElement *>(tmpDrawStrokeDashElement)); -- mStrokeDashElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:stroke-dash"))); -- } -- -- if(m_brush.style == libwpg::WPGBrush::Gradient) -- { -- OpenTagGraphicsElement *tmpDrawGradientElement = new OpenTagGraphicsElement("draw:gradient"); -- tmpDrawGradientElement->addAttribute("draw:style", "linear"); -- m_value << "Gradient_" << m_gradientIndex++; -- tmpDrawGradientElement->addAttribute("draw:name", m_value.str()); -- m_value.str(""); -- -- // ODG angle unit is 0.1 degree -- double angle = -m_brush.gradient.angle(); -- while(angle < 0) -- angle += 360; -- while(angle > 360) -- angle -= 360; -- -- m_value << (unsigned)(angle*10); -- tmpDrawGradientElement->addAttribute("draw:angle", m_value.str()); -- m_value.str(""); -- -- libwpg::WPGColor startColor = m_brush.gradient.stopColor(0); -- libwpg::WPGColor stopColor = m_brush.gradient.stopColor(1); -- m_value << "#" << colorToHex(startColor); -- tmpDrawGradientElement->addAttribute("draw:start-color", m_value.str()); -- m_value.str(""); -- m_value << "#" << colorToHex(stopColor); -- tmpDrawGradientElement->addAttribute("draw:end-color", m_value.str()); -- m_value.str(""); -- tmpDrawGradientElement->addAttribute("draw:start-intensity", "100%"); -- tmpDrawGradientElement->addAttribute("draw:end-intensity", "100%"); -- tmpDrawGradientElement->addAttribute("draw:border", "0%"); -- mGradientElements.push_back(static_cast<GraphicsElement *>(tmpDrawGradientElement)); -- mGradientElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:gradient"))); -- } -- -- OpenTagGraphicsElement *tmpStyleStyleElement = new OpenTagGraphicsElement("style:style"); -- m_value << "gr" << m_styleIndex; -- tmpStyleStyleElement->addAttribute("style:name", m_value.str()); -- m_value.str(""); -- tmpStyleStyleElement->addAttribute("style:family", "graphic"); -- tmpStyleStyleElement->addAttribute("style:parent-style-name", "standard"); -- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleStyleElement)); -- -- OpenTagGraphicsElement *tmpStyleGraphicPropertiesElement = new OpenTagGraphicsElement("style:graphic-properties"); -- -- if(m_pen.width > 0.0) -- { -- m_value << doubleToString(m_pen.width) << "in"; -- tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-width", m_value.str()); -- m_value.str(""); -- m_value << "#" << colorToHex(m_pen.foreColor); -- tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-color", m_value.str()); -- m_value.str(""); -- -- if(!m_pen.solid) -- { -- tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "dash"); -- m_value << "Dash_" << m_dashIndex-1; -- tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke-dash", m_value.str()); -- m_value.str(""); -- } -- } -- else -- tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "none"); -- -- if(m_brush.style == libwpg::WPGBrush::NoBrush) -- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "none"); -- -- if(m_brush.style == libwpg::WPGBrush::Solid) -- { -- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "solid"); -- m_value << "#" << colorToHex(m_brush.foreColor); -- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-color", m_value.str()); -- m_value.str(""); -- } -- -- if(m_brush.style == libwpg::WPGBrush::Gradient) -- { -- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "gradient"); -- m_value << "Gradient_" << m_gradientIndex-1; -- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-gradient-name", m_value.str()); -- m_value.str(""); -- } -- -- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleGraphicPropertiesElement)); -- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:graphic-properties"))); -- -- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:style"))); -- m_styleIndex++; --} -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx ---- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,116 +0,0 @@ --/* libwpg -- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org) -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Library General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpg.sourceforge.net -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#ifndef __ODGEXPORTER_H__ --#define __ODGEXPORTER_H__ -- --#include <iostream> --#include <sstream> --#include <string> -- --#include <libwpg/libwpg.h> --#include "GraphicsElement.hxx" -- --class OdgExporter : public libwpg::WPGPaintInterface { --public: -- explicit OdgExporter(GraphicsHandler *pHandler, -- const bool isFlatXML = false); -- ~OdgExporter(); -- --#if LIBWPG_VERSION_MINOR<2 -- void startGraphics(double imageWidth, double imageHeight); -- void endGraphics(); -- void startLayer(unsigned int id); -- void endLayer(unsigned int id); -- -- void setPen(const libwpg::WPGPen& pen); -- void setBrush(const libwpg::WPGBrush& brush); -- void setFillRule(FillRule rule); -- -- void drawRectangle(const libwpg::WPGRect& rect, double rx, double ry); -- void drawEllipse(const libwpg::WPGPoint& center, double rx, double ry); -- void drawPolygon(const libwpg::WPGPointArray& vertices); -- void drawPath(const libwpg::WPGPath& path); -- void drawBitmap(const libwpg::WPGBitmap& bitmap); -- void drawImageObject(const libwpg::WPGBinaryData& binaryData); -- --private: -- std::vector <GraphicsElement *> mBodyElements; -- std::vector <GraphicsElement *> mAutomaticStylesElements; -- std::vector <GraphicsElement *> mStrokeDashElements; -- std::vector <GraphicsElement *> mGradientElements; -- GraphicsHandler *mpHandler; -- -- libwpg::WPGPen m_pen; -- libwpg::WPGBrush m_brush; -- FillRule m_fillRule; -- int m_gradientIndex; -- int m_dashIndex; -- int m_styleIndex; -- void writeStyle(); -- std::ostringstream m_value, m_name; -- double m_width, m_height; -- const bool m_isFlatXML; --#else -- virtual void startGraphics(const ::WPXPropertyList &propList); -- virtual void endGraphics(); -- virtual void setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &gradient); -- virtual void startLayer(const ::WPXPropertyList &propList); -- virtual void endLayer(); -- virtual void drawRectangle(const ::WPXPropertyList& propList); -- virtual void drawEllipse(const ::WPXPropertyList& propList); -- virtual void drawPolygon(const ::WPXPropertyListVector &vertices); -- virtual void drawPath(const ::WPXPropertyListVector &path); -- virtual void drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData &binaryData); -- virtual void startEmbeddedGraphics(const ::WPXPropertyList &propList); -- virtual void endEmbeddedGraphics(); -- virtual void drawPolyline(const ::WPXPropertyListVector &vertices); -- virtual void startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path); -- virtual void endTextObject(); -- virtual void startTextLine(const ::WPXPropertyList &propList); -- virtual void endTextLine(); -- virtual void startTextSpan(const ::WPXPropertyList &propList); -- virtual void endTextSpan(); -- virtual void insertText(const ::WPXString &str); -- -- --private: -- std::vector <GraphicsElement *> mBodyElements; -- std::vector <GraphicsElement *> mAutomaticStylesElements; -- std::vector <GraphicsElement *> mStrokeDashElements; -- std::vector <GraphicsElement *> mGradientElements; -- GraphicsHandler *mpHandler; -- -- int m_gradientIndex; -- int m_dashIndex; -- int m_styleIndex; -- void writeStyle(); -- std::ostringstream m_value, m_name; -- double m_width, m_height; -- const bool m_isFlatXML; --#endif --}; -- --#endif // __ODGEXPORTER_H__ -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp ---- koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp 2011-01-02 17:46:15.000000000 +0100 -@@ -20,28 +20,26 @@ - #include <WPGImport.h> - #include <WPGImport.moc> - --#include <QBuffer> --#include <QByteArray> --#include <QString> -- --#include <kdebug.h> - #include <KoFilterChain.h> - #include <KoGlobal.h> - #include <KoUnit.h> -+#include <KoXmlWriter.h> -+ - #include <kpluginfactory.h> -+#include <KDebug> - --#include <KoXmlWriter.h> -+ -+#include <QtCore/QString> -+#include <QtCore/QFile> - - #include <libwpg/libwpg.h> - #if LIBWPG_VERSION_MINOR<2 - #include <libwpg/WPGStreamImplementation.h> - #else - #include <libwpd-stream/libwpd-stream.h> -+#include <libwpd/libwpd.h> - #endif - --#include "FileOutputHandler.hxx" --#include "OdgExporter.hxx" -- - #include <iostream> - - K_PLUGIN_FACTORY(WPGImportFactory, registerPlugin<WPGImport>();) -@@ -56,35 +54,13 @@ - { - } - --static QByteArray createManifest() --{ -- KoXmlWriter* manifestWriter; -- QByteArray manifestData; -- QBuffer manifestBuffer(&manifestData); -- -- manifestBuffer.open(QIODevice::WriteOnly); -- manifestWriter = new KoXmlWriter(&manifestBuffer); -- -- manifestWriter->startDocument("manifest:manifest"); -- manifestWriter->startElement("manifest:manifest"); -- manifestWriter->addAttribute("xmlns:manifest", "urn:oasis:names:tc:openoffice:xmlns:manifest:1.0"); -- manifestWriter->addManifestEntry("/", "application/vnd.oasis.opendocument.graphics"); -- //manifestWriter->addManifestEntry( "styles.xml", "text/xml" ); -- manifestWriter->addManifestEntry("content.xml", "text/xml"); -- manifestWriter->endElement(); -- manifestWriter->endDocument(); -- delete manifestWriter; -- -- return manifestData; --} -- - - KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByteArray& to) - { - if (from != "application/x-wpg") - return KoFilter::NotImplemented; - -- if (to != "application/vnd.oasis.opendocument.graphics") -+ if (to != "image/svg+xml") - return KoFilter::NotImplemented; - - #if LIBWPG_VERSION_MINOR<2 -@@ -96,6 +72,7 @@ - input = olestream; - } - } -+ libwpg::WPGString output; - #else - WPXInputStream* input = new WPXFileStream(m_chain->inputFile().toLocal8Bit()); - if (input->isOLEStream()) { -@@ -105,59 +82,31 @@ - input = olestream; - } - } -+ ::WPXString output; - #endif - - if (!libwpg::WPGraphics::isSupported(input)) { -- std::cerr << "ERROR: Unsupported file format (unsupported version) or file is encrypted!" << std::endl; -+ kWarning() << "ERROR: Unsupported file format (unsupported version) or file is encrypted!"; - delete input; - return KoFilter::NotImplemented; - } - -- // do the conversion -- std::ostringstream tmpStringStream; -- FileOutputHandler tmpHandler(tmpStringStream); -- OdgExporter exporter(&tmpHandler); -- libwpg::WPGraphics::parse(input, &exporter); -- delete input; -- -- -- // create output store -- KoStore* storeout; -- storeout = KoStore::createStore(m_chain->outputFile(), KoStore::Write, -- "application/vnd.oasis.opendocument.graphics", KoStore::Zip); -- -- if (!storeout) { -- kWarning() << "Couldn't open the requested file."; -- return KoFilter::FileNotFound; -- } -- --#if 0 -- if (!storeout->open("styles.xml")) { -- kWarning() << "Couldn't open the file 'styles.xml'."; -- return KoFilter::CreationError; -+ if (!libwpg::WPGraphics::generateSVG(input, output)) { -+ kWarning() << "ERROR: SVG Generation failed!"; -+ delete input; -+ return KoFilter::ParsingError; - } -- //storeout->write( createStyles() ); -- storeout->close(); --#endif - -- if (!storeout->open("content.xml")) { -- kWarning() << "Couldn't open the file 'content.xml'."; -- return KoFilter::CreationError; -- } -- storeout->write(tmpStringStream.str().c_str()); -- storeout->close(); -+ delete input; - -- // store document manifest -- storeout->enterDirectory("META-INF"); -- if (!storeout->open("manifest.xml")) { -- kWarning() << "Couldn't open the file 'META-INF/manifest.xml'."; -- return KoFilter::CreationError; -+ QFile outputFile(m_chain->outputFile()); -+ if(!outputFile.open(QIODevice::WriteOnly | QIODevice::Text)) { -+ kWarning() << "ERROR: Could not open output file" << m_chain->outputFile(); -+ return KoFilter::InternalError; - } -- storeout->write(createManifest()); -- storeout->close(); - -- // we are done! -- delete storeout; -+ outputFile.write(output.cstr()); -+ outputFile.close(); - - return KoFilter::OK; - } - diff --git a/staging/koffice/koffice.install b/staging/koffice/koffice.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/koffice/koffice.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/koffice/krita.install b/staging/koffice/krita.install deleted file mode 100644 index ce5c32e1b..000000000 --- a/staging/koffice/krita.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}
\ No newline at end of file diff --git a/testing/mkinitcpio-busybox/PKGBUILD b/testing/mkinitcpio-busybox/PKGBUILD deleted file mode 100644 index e58f87add..000000000 --- a/testing/mkinitcpio-busybox/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 123921 2011-05-14 11:29:02Z thomas $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> -pkgname=mkinitcpio-busybox -pkgver=1.18.4 -pkgrel=1 -pkgdesc="base initramfs tools" -arch=('i686' 'x86_64') -url="http://www.busybox.net/" -license=('GPL') -depends=('glibc') -source=(http://busybox.net/downloads/busybox-${pkgver}.tar.bz2 - config) -sha256sums=('4d24d37bd6f1bd153e8cf9a984ec2f32f18464f73ca535e2cc2e8be9694097fa' - 'dd6dca08fbc335f1394e0f1b619df6895349c759d0c6e43456aed411e16d4194') - -build() { - cd "${srcdir}/busybox-${pkgver}" - - unset CFLAGS CXXFLAGS - if [ ${CARCH} = "x86_64" ]; then - sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=x86-64 -mtune=generic -Os -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config - else - sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=i686 -mtune=generic -Os -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config - fi - make -} - -package() { - install -D -m755 "${srcdir}/busybox-${pkgver}"/busybox "${pkgdir}/lib/initcpio/busybox" -} -# vim:set ts=2 sw=2 et: diff --git a/testing/mkinitcpio-busybox/config b/testing/mkinitcpio-busybox/config deleted file mode 100644 index 1aa333faf..000000000 --- a/testing/mkinitcpio-busybox/config +++ /dev/null @@ -1,986 +0,0 @@ -# -# Automatically generated make config: don't edit -# Busybox version: 1.18.2 -# Wed Jan 26 23:08:18 2011 -# -CONFIG_HAVE_DOT_CONFIG=y - -# -# Busybox Settings -# - -# -# General Configuration -# -# CONFIG_DESKTOP is not set -# CONFIG_EXTRA_COMPAT is not set -# CONFIG_INCLUDE_SUSv2 is not set -# CONFIG_USE_PORTABLE_CODE is not set -CONFIG_PLATFORM_LINUX=y -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_SHOW_USAGE=y -# CONFIG_FEATURE_VERBOSE_USAGE is not set -# CONFIG_FEATURE_COMPRESS_USAGE is not set -CONFIG_FEATURE_INSTALLER=y -# CONFIG_INSTALL_NO_USR is not set -# CONFIG_LOCALE_SUPPORT is not set -CONFIG_UNICODE_SUPPORT=y -# CONFIG_UNICODE_USING_LOCALE is not set -# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set -CONFIG_SUBST_WCHAR=63 -CONFIG_LAST_SUPPORTED_WCHAR=767 -# CONFIG_UNICODE_COMBINING_WCHARS is not set -# CONFIG_UNICODE_WIDE_WCHARS is not set -# CONFIG_UNICODE_BIDI_SUPPORT is not set -# CONFIG_UNICODE_NEUTRAL_TABLE is not set -# CONFIG_UNICODE_PRESERVE_BROKEN is not set -CONFIG_LONG_OPTS=y -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set -# CONFIG_FEATURE_WTMP is not set -# CONFIG_FEATURE_UTMP is not set -# CONFIG_FEATURE_PIDFILE is not set -CONFIG_FEATURE_SUID=y -# CONFIG_FEATURE_SUID_CONFIG is not set -# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set -# CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set -CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox" -CONFIG_FEATURE_SYSLOG=y -CONFIG_FEATURE_HAVE_RPC=y - -# -# Build Options -# -# CONFIG_STATIC is not set -# CONFIG_PIE is not set -# CONFIG_NOMMU is not set -# CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_INDIVIDUAL is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y -CONFIG_CROSS_COMPILER_PREFIX="" -CONFIG_EXTRA_CFLAGS="" - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_DEBUG_PESSIMIZE is not set -# CONFIG_WERROR is not set -CONFIG_NO_DEBUG_LIB=y -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set - -# -# Installation Options ("make install" behavior) -# -CONFIG_INSTALL_APPLET_SYMLINKS=y -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set -# CONFIG_INSTALL_APPLET_DONT is not set -# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set -# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set -# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set -CONFIG_PREFIX="./_install" - -# -# Busybox Library Tuning -# -CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=3 -CONFIG_FEATURE_FAST_TOP=y -# CONFIG_FEATURE_ETC_NETWORKS is not set -# CONFIG_FEATURE_USE_TERMIOS is not set -CONFIG_FEATURE_EDITING=y -CONFIG_FEATURE_EDITING_MAX_LEN=1024 -# CONFIG_FEATURE_EDITING_VI is not set -CONFIG_FEATURE_EDITING_HISTORY=15 -# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set -CONFIG_FEATURE_TAB_COMPLETION=y -# CONFIG_FEATURE_USERNAME_COMPLETION is not set -CONFIG_FEATURE_EDITING_FANCY_PROMPT=y -# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set -CONFIG_FEATURE_NON_POSIX_CP=y -CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y -# CONFIG_FEATURE_HWIB is not set - -# -# Applets -# - -# -# Archival Utilities -# -# CONFIG_FEATURE_SEAMLESS_XZ is not set -# CONFIG_FEATURE_SEAMLESS_LZMA is not set -# CONFIG_FEATURE_SEAMLESS_BZ2 is not set -# CONFIG_FEATURE_SEAMLESS_GZ is not set -# CONFIG_FEATURE_SEAMLESS_Z is not set -# CONFIG_AR is not set -# CONFIG_FEATURE_AR_LONG_FILENAMES is not set -# CONFIG_FEATURE_AR_CREATE is not set -# CONFIG_BUNZIP2 is not set -# CONFIG_BZIP2 is not set -# CONFIG_CPIO is not set -# CONFIG_FEATURE_CPIO_O is not set -# CONFIG_FEATURE_CPIO_P is not set -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -# CONFIG_GUNZIP is not set -# CONFIG_GZIP is not set -# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set -# CONFIG_LZOP is not set -# CONFIG_LZOP_COMPR_HIGH is not set -# CONFIG_RPM2CPIO is not set -# CONFIG_RPM is not set -# CONFIG_TAR is not set -# CONFIG_FEATURE_TAR_CREATE is not set -# CONFIG_FEATURE_TAR_AUTODETECT is not set -# CONFIG_FEATURE_TAR_FROM is not set -# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set -# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set -# CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set -# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set -# CONFIG_FEATURE_TAR_TO_COMMAND is not set -# CONFIG_FEATURE_TAR_UNAME_GNAME is not set -# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set -# CONFIG_FEATURE_TAR_SELINUX is not set -# CONFIG_UNCOMPRESS is not set -# CONFIG_UNLZMA is not set -# CONFIG_FEATURE_LZMA_FAST is not set -# CONFIG_LZMA is not set -# CONFIG_UNXZ is not set -# CONFIG_XZ is not set -# CONFIG_UNZIP is not set - -# -# Coreutils -# -CONFIG_BASENAME=y -CONFIG_CAT=y -# CONFIG_DATE is not set -# CONFIG_FEATURE_DATE_ISOFMT is not set -# CONFIG_FEATURE_DATE_NANO is not set -# CONFIG_FEATURE_DATE_COMPAT is not set -CONFIG_TEST=y -CONFIG_FEATURE_TEST_64=y -# CONFIG_TR is not set -# CONFIG_FEATURE_TR_CLASSES is not set -# CONFIG_FEATURE_TR_EQUIV is not set -# CONFIG_BASE64 is not set -# CONFIG_CAL is not set -# CONFIG_CATV is not set -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set -CONFIG_CHROOT=y -# CONFIG_CKSUM is not set -# CONFIG_COMM is not set -CONFIG_CP=y -# CONFIG_FEATURE_CP_LONG_OPTIONS is not set -CONFIG_CUT=y -CONFIG_DD=y -# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set -# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set -# CONFIG_FEATURE_DD_IBS_OBS is not set -CONFIG_DF=y -# CONFIG_FEATURE_DF_FANCY is not set -CONFIG_DIRNAME=y -# CONFIG_DOS2UNIX is not set -# CONFIG_UNIX2DOS is not set -CONFIG_DU=y -# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -CONFIG_FEATURE_ENV_LONG_OPTIONS=y -# CONFIG_EXPAND is not set -# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set -CONFIG_EXPR=y -CONFIG_EXPR_MATH_SUPPORT_64=y -CONFIG_FALSE=y -# CONFIG_FOLD is not set -# CONFIG_FSYNC is not set -CONFIG_HEAD=y -CONFIG_FEATURE_FANCY_HEAD=y -# CONFIG_HOSTID is not set -# CONFIG_ID is not set -CONFIG_INSTALL=y -CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y -# CONFIG_LENGTH is not set -CONFIG_LN=y -# CONFIG_LOGNAME is not set -CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y -CONFIG_FEATURE_LS_RECURSIVE=y -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -# CONFIG_FEATURE_LS_COLOR is not set -# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set -# CONFIG_MD5SUM is not set -CONFIG_MKDIR=y -CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -CONFIG_FEATURE_MV_LONG_OPTIONS=y -# CONFIG_NICE is not set -# CONFIG_NOHUP is not set -# CONFIG_OD is not set -# CONFIG_PRINTENV is not set -CONFIG_PRINTF=y -CONFIG_PWD=y -CONFIG_READLINK=y -CONFIG_FEATURE_READLINK_FOLLOW=y -# CONFIG_REALPATH is not set -CONFIG_RM=y -CONFIG_RMDIR=y -CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y -CONFIG_SEQ=y -# CONFIG_SHA1SUM is not set -# CONFIG_SHA256SUM is not set -# CONFIG_SHA512SUM is not set -CONFIG_SLEEP=y -CONFIG_FEATURE_FANCY_SLEEP=y -CONFIG_FEATURE_FLOAT_SLEEP=y -CONFIG_SORT=y -# CONFIG_FEATURE_SORT_BIG is not set -# CONFIG_SPLIT is not set -# CONFIG_FEATURE_SPLIT_FANCY is not set -CONFIG_STAT=y -CONFIG_FEATURE_STAT_FORMAT=y -# CONFIG_STTY is not set -# CONFIG_SUM is not set -# CONFIG_SYNC is not set -# CONFIG_TAC is not set -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -# CONFIG_TEE is not set -# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set -CONFIG_TOUCH=y -CONFIG_TRUE=y -# CONFIG_TTY is not set -CONFIG_UNAME=y -# CONFIG_UNEXPAND is not set -# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set -CONFIG_UNIQ=y -# CONFIG_USLEEP is not set -# CONFIG_UUDECODE is not set -# CONFIG_UUENCODE is not set -CONFIG_WC=y -CONFIG_FEATURE_WC_LARGE=y -# CONFIG_WHO is not set -# CONFIG_WHOAMI is not set -CONFIG_YES=y - -# -# Common options for cp and mv -# -# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set - -# -# Common options for ls, more and telnet -# -CONFIG_FEATURE_AUTOWIDTH=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y -# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set - -# -# Console Utilities -# -# CONFIG_CHVT is not set -# CONFIG_FGCONSOLE is not set -# CONFIG_CLEAR is not set -# CONFIG_DEALLOCVT is not set -# CONFIG_DUMPKMAP is not set -CONFIG_KBD_MODE=y -CONFIG_LOADFONT=y -CONFIG_LOADKMAP=y -CONFIG_OPENVT=y -# CONFIG_RESET is not set -# CONFIG_RESIZE is not set -# CONFIG_FEATURE_RESIZE_PRINT is not set -# CONFIG_SETCONSOLE is not set -# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set -CONFIG_SETFONT=y -# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set -CONFIG_DEFAULT_SETFONT_DIR="" -# CONFIG_SETKEYCODES is not set -# CONFIG_SETLOGCONS is not set -# CONFIG_SHOWKEY is not set - -# -# Common options for loadfont and setfont -# -CONFIG_FEATURE_LOADFONT_PSF2=y -CONFIG_FEATURE_LOADFONT_RAW=y - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -# CONFIG_PIPE_PROGRESS is not set -# CONFIG_RUN_PARTS is not set -# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set -# CONFIG_FEATURE_RUN_PARTS_FANCY is not set -# CONFIG_START_STOP_DAEMON is not set -# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set -# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set -# CONFIG_WHICH is not set - -# -# Editors -# -# CONFIG_PATCH is not set -CONFIG_AWK=y -# CONFIG_FEATURE_AWK_LIBM is not set -# CONFIG_CMP is not set -# CONFIG_DIFF is not set -# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set -# CONFIG_FEATURE_DIFF_DIR is not set -# CONFIG_ED is not set -CONFIG_SED=y -CONFIG_VI=y -CONFIG_FEATURE_VI_MAX_LEN=4096 -CONFIG_FEATURE_VI_8BIT=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -CONFIG_FEATURE_VI_USE_SIGNALS=y -CONFIG_FEATURE_VI_DOT_CMD=y -CONFIG_FEATURE_VI_READONLY=y -CONFIG_FEATURE_VI_SETOPTS=y -CONFIG_FEATURE_VI_SET=y -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_ASK_TERMINAL=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y -# CONFIG_FEATURE_ALLOW_EXEC is not set - -# -# Finding Utilities -# -# CONFIG_FIND is not set -# CONFIG_FEATURE_FIND_PRINT0 is not set -# CONFIG_FEATURE_FIND_MTIME is not set -# CONFIG_FEATURE_FIND_MMIN is not set -# CONFIG_FEATURE_FIND_PERM is not set -# CONFIG_FEATURE_FIND_TYPE is not set -# CONFIG_FEATURE_FIND_XDEV is not set -# CONFIG_FEATURE_FIND_MAXDEPTH is not set -# CONFIG_FEATURE_FIND_NEWER is not set -# CONFIG_FEATURE_FIND_INUM is not set -# CONFIG_FEATURE_FIND_EXEC is not set -# CONFIG_FEATURE_FIND_USER is not set -# CONFIG_FEATURE_FIND_GROUP is not set -# CONFIG_FEATURE_FIND_NOT is not set -# CONFIG_FEATURE_FIND_DEPTH is not set -# CONFIG_FEATURE_FIND_PAREN is not set -# CONFIG_FEATURE_FIND_SIZE is not set -# CONFIG_FEATURE_FIND_PRUNE is not set -# CONFIG_FEATURE_FIND_DELETE is not set -# CONFIG_FEATURE_FIND_PATH is not set -# CONFIG_FEATURE_FIND_REGEX is not set -# CONFIG_FEATURE_FIND_CONTEXT is not set -# CONFIG_FEATURE_FIND_LINKS is not set -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set -# CONFIG_FEATURE_GREP_CONTEXT is not set -# CONFIG_XARGS is not set -# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set -# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set -# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set -# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set - -# -# Init Utilities -# -# CONFIG_BOOTCHARTD is not set -# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set -# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set -CONFIG_HALT=y -# CONFIG_FEATURE_CALL_TELINIT is not set -CONFIG_TELINIT_PATH="" -# CONFIG_INIT is not set -# CONFIG_FEATURE_USE_INITTAB is not set -# CONFIG_FEATURE_KILL_REMOVED is not set -CONFIG_FEATURE_KILL_DELAY=0 -# CONFIG_FEATURE_INIT_SCTTY is not set -# CONFIG_FEATURE_INIT_SYSLOG is not set -# CONFIG_FEATURE_EXTRA_QUIET is not set -# CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INITRD is not set -CONFIG_INIT_TERMINAL_TYPE="" -# CONFIG_MESG is not set - -# -# Login/Password Management Utilities -# -# CONFIG_ADD_SHELL is not set -# CONFIG_REMOVE_SHELL is not set -# CONFIG_FEATURE_SHADOWPASSWDS is not set -# CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_USE_BB_SHADOW is not set -# CONFIG_USE_BB_CRYPT is not set -# CONFIG_USE_BB_CRYPT_SHA is not set -# CONFIG_ADDUSER is not set -# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set -# CONFIG_FEATURE_CHECK_NAMES is not set -CONFIG_FIRST_SYSTEM_ID=0 -CONFIG_LAST_SYSTEM_ID=0 -# CONFIG_ADDGROUP is not set -# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set -# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set -# CONFIG_DELUSER is not set -# CONFIG_DELGROUP is not set -# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set -# CONFIG_GETTY is not set -# CONFIG_LOGIN is not set -# CONFIG_PAM is not set -# CONFIG_LOGIN_SCRIPTS is not set -# CONFIG_FEATURE_NOLOGIN is not set -# CONFIG_FEATURE_SECURETTY is not set -# CONFIG_PASSWD is not set -# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set -# CONFIG_CRYPTPW is not set -# CONFIG_CHPASSWD is not set -# CONFIG_SU is not set -# CONFIG_FEATURE_SU_SYSLOG is not set -# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set -# CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set - -# -# Linux Ext2 FS Progs -# -# CONFIG_CHATTR is not set -# CONFIG_FSCK is not set -# CONFIG_LSATTR is not set -# CONFIG_TUNE2FS is not set - -# -# Linux Module Utilities -# -CONFIG_MODINFO=y -# CONFIG_MODPROBE_SMALL is not set -# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set -# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set -CONFIG_INSMOD=y -CONFIG_RMMOD=y -CONFIG_LSMOD=y -CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y -# CONFIG_MODPROBE is not set -# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set -# CONFIG_DEPMOD is not set - -# -# Options common to multiple modutils -# -# CONFIG_FEATURE_2_4_MODULES is not set -# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y -# CONFIG_FEATURE_MODUTILS_ALIAS is not set -# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set -CONFIG_DEFAULT_MODULES_DIR="" -CONFIG_DEFAULT_DEPMOD_FILE="" - -# -# Linux System Utilities -# -# CONFIG_BLOCKDEV is not set -# CONFIG_REV is not set -# CONFIG_ACPID is not set -# CONFIG_FEATURE_ACPID_COMPAT is not set -# CONFIG_BLKID is not set -CONFIG_DMESG=y -CONFIG_FEATURE_DMESG_PRETTY=y -# CONFIG_FBSET is not set -# CONFIG_FEATURE_FBSET_FANCY is not set -# CONFIG_FEATURE_FBSET_READMODE is not set -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -# CONFIG_FDISK is not set -CONFIG_FDISK_SUPPORT_LARGE_DISKS=y -# CONFIG_FEATURE_FDISK_WRITABLE is not set -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_GPT_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -# CONFIG_FINDFS is not set -# CONFIG_FLOCK is not set -# CONFIG_FREERAMDISK is not set -# CONFIG_FSCK_MINIX is not set -# CONFIG_MKFS_EXT2 is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_FEATURE_MINIX2 is not set -# CONFIG_MKFS_REISER is not set -# CONFIG_MKFS_VFAT is not set -CONFIG_GETOPT=y -CONFIG_FEATURE_GETOPT_LONG=y -CONFIG_HEXDUMP=y -# CONFIG_FEATURE_HEXDUMP_REVERSE is not set -# CONFIG_HD is not set -# CONFIG_HWCLOCK is not set -# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set -# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set -# CONFIG_IPCRM is not set -# CONFIG_IPCS is not set -CONFIG_LOSETUP=y -# CONFIG_LSPCI is not set -# CONFIG_LSUSB is not set -# CONFIG_MDEV is not set -# CONFIG_FEATURE_MDEV_CONF is not set -# CONFIG_FEATURE_MDEV_RENAME is not set -# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set -# CONFIG_FEATURE_MDEV_EXEC is not set -# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set -# CONFIG_MKSWAP is not set -# CONFIG_FEATURE_MKSWAP_UUID is not set -# CONFIG_MORE is not set -CONFIG_MOUNT=y -CONFIG_FEATURE_MOUNT_FAKE=y -CONFIG_FEATURE_MOUNT_VERBOSE=y -CONFIG_FEATURE_MOUNT_HELPERS=y -CONFIG_FEATURE_MOUNT_LABEL=y -CONFIG_FEATURE_MOUNT_NFS=y -CONFIG_FEATURE_MOUNT_CIFS=y -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y -# CONFIG_PIVOT_ROOT is not set -# CONFIG_RDATE is not set -# CONFIG_RDEV is not set -# CONFIG_READPROFILE is not set -# CONFIG_RTCWAKE is not set -# CONFIG_SCRIPT is not set -# CONFIG_SCRIPTREPLAY is not set -# CONFIG_SETARCH is not set -# CONFIG_SWAPONOFF is not set -# CONFIG_FEATURE_SWAPON_PRI is not set -CONFIG_SWITCH_ROOT=y -CONFIG_UMOUNT=y -CONFIG_FEATURE_UMOUNT_ALL=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -CONFIG_FEATURE_MOUNT_LOOP_CREATE=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set -CONFIG_VOLUMEID=y - -# -# Filesystem/Volume identification -# -# CONFIG_FEATURE_VOLUMEID_EXT is not set -# CONFIG_FEATURE_VOLUMEID_BTRFS is not set -# CONFIG_FEATURE_VOLUMEID_REISERFS is not set -# CONFIG_FEATURE_VOLUMEID_FAT is not set -# CONFIG_FEATURE_VOLUMEID_HFS is not set -# CONFIG_FEATURE_VOLUMEID_JFS is not set -# CONFIG_FEATURE_VOLUMEID_XFS is not set -# CONFIG_FEATURE_VOLUMEID_NTFS is not set -# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set -# CONFIG_FEATURE_VOLUMEID_UDF is not set -# CONFIG_FEATURE_VOLUMEID_LUKS is not set -# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set -# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set -# CONFIG_FEATURE_VOLUMEID_ROMFS is not set -# CONFIG_FEATURE_VOLUMEID_SYSV is not set -# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set -# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set - -# -# Miscellaneous Utilities -# -# CONFIG_CONSPY is not set -# CONFIG_NANDWRITE is not set -# CONFIG_NANDDUMP is not set -# CONFIG_UBIATTACH is not set -# CONFIG_UBIDETACH is not set -# CONFIG_ADJTIMEX is not set -# CONFIG_BBCONFIG is not set -# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set -# CONFIG_BEEP is not set -CONFIG_FEATURE_BEEP_FREQ=0 -CONFIG_FEATURE_BEEP_LENGTH_MS=0 -# CONFIG_CHAT is not set -# CONFIG_FEATURE_CHAT_NOFAIL is not set -# CONFIG_FEATURE_CHAT_TTY_HIFI is not set -# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set -# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set -# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set -# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set -# CONFIG_FEATURE_CHAT_CLR_ABORT is not set -# CONFIG_CHRT is not set -# CONFIG_CROND is not set -# CONFIG_FEATURE_CROND_D is not set -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -CONFIG_FEATURE_CROND_DIR="" -# CONFIG_CRONTAB is not set -# CONFIG_DC is not set -# CONFIG_FEATURE_DC_LIBM is not set -# CONFIG_DEVFSD is not set -# CONFIG_DEVFSD_MODLOAD is not set -# CONFIG_DEVFSD_FG_NP is not set -# CONFIG_DEVFSD_VERBOSE is not set -# CONFIG_FEATURE_DEVFS is not set -# CONFIG_DEVMEM is not set -# CONFIG_EJECT is not set -# CONFIG_FEATURE_EJECT_SCSI is not set -# CONFIG_FBSPLASH is not set -# CONFIG_FLASHCP is not set -# CONFIG_FLASH_LOCK is not set -# CONFIG_FLASH_UNLOCK is not set -# CONFIG_FLASH_ERASEALL is not set -# CONFIG_IONICE is not set -# CONFIG_INOTIFYD is not set -# CONFIG_LAST is not set -# CONFIG_FEATURE_LAST_SMALL is not set -# CONFIG_FEATURE_LAST_FANCY is not set -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=9999999 -CONFIG_FEATURE_LESS_BRACKETS=y -CONFIG_FEATURE_LESS_FLAGS=y -# CONFIG_FEATURE_LESS_MARKS is not set -# CONFIG_FEATURE_LESS_REGEXP is not set -# CONFIG_FEATURE_LESS_WINCH is not set -# CONFIG_FEATURE_LESS_DASHCMD is not set -# CONFIG_FEATURE_LESS_LINENUMS is not set -# CONFIG_HDPARM is not set -# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set -# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set -# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set -# CONFIG_MAKEDEVS is not set -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -# CONFIG_FEATURE_MAKEDEVS_TABLE is not set -# CONFIG_MAN is not set -# CONFIG_MICROCOM is not set -# CONFIG_MOUNTPOINT is not set -# CONFIG_MT is not set -# CONFIG_RAIDAUTORUN is not set -# CONFIG_READAHEAD is not set -# CONFIG_RFKILL is not set -# CONFIG_RUNLEVEL is not set -# CONFIG_RX is not set -# CONFIG_SETSID is not set -CONFIG_STRINGS=y -# CONFIG_TASKSET is not set -# CONFIG_FEATURE_TASKSET_FANCY is not set -# CONFIG_TIME is not set -# CONFIG_TIMEOUT is not set -# CONFIG_TTYSIZE is not set -# CONFIG_VOLNAME is not set -# CONFIG_WALL is not set -# CONFIG_WATCHDOG is not set - -# -# Networking Utilities -# -# CONFIG_NBDCLIENT is not set -CONFIG_NC=y -CONFIG_NC_SERVER=y -CONFIG_NC_EXTRA=y -# CONFIG_NC_110_COMPAT is not set -CONFIG_FEATURE_IPV6=y -# CONFIG_FEATURE_UNIX_LOCAL is not set -CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y -# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set -# CONFIG_ARP is not set -# CONFIG_ARPING is not set -# CONFIG_BRCTL is not set -# CONFIG_FEATURE_BRCTL_FANCY is not set -# CONFIG_FEATURE_BRCTL_SHOW is not set -# CONFIG_DNSD is not set -# CONFIG_ETHER_WAKE is not set -# CONFIG_FAKEIDENTD is not set -# CONFIG_FTPD is not set -# CONFIG_FEATURE_FTP_WRITE is not set -# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set -# CONFIG_HOSTNAME is not set -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_RANGES is not set -# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set -# CONFIG_FEATURE_HTTPD_PROXY is not set -# CONFIG_FEATURE_HTTPD_GZIP is not set -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -CONFIG_FEATURE_IFCONFIG_SLIP=y -CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y -CONFIG_FEATURE_IFCONFIG_HW=y -CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y -# CONFIG_IFENSLAVE is not set -# CONFIG_IFPLUGD is not set -# CONFIG_IFUPDOWN is not set -CONFIG_IFUPDOWN_IFSTATE_PATH="" -# CONFIG_FEATURE_IFUPDOWN_IP is not set -# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set -# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set -# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set -# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set -# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set -# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set -# CONFIG_INETD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set -# CONFIG_FEATURE_INETD_RPC is not set -CONFIG_IP=y -CONFIG_FEATURE_IP_ADDRESS=y -CONFIG_FEATURE_IP_LINK=y -CONFIG_FEATURE_IP_ROUTE=y -CONFIG_FEATURE_IP_TUNNEL=y -CONFIG_FEATURE_IP_RULE=y -CONFIG_FEATURE_IP_SHORT_FORMS=y -# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set -CONFIG_IPADDR=y -CONFIG_IPLINK=y -CONFIG_IPROUTE=y -CONFIG_IPTUNNEL=y -CONFIG_IPRULE=y -# CONFIG_IPCALC is not set -# CONFIG_FEATURE_IPCALC_FANCY is not set -# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set -# CONFIG_NAMEIF is not set -# CONFIG_FEATURE_NAMEIF_EXTENDED is not set -CONFIG_NETSTAT=y -CONFIG_FEATURE_NETSTAT_WIDE=y -CONFIG_FEATURE_NETSTAT_PRG=y -CONFIG_NSLOOKUP=y -# CONFIG_NTPD is not set -# CONFIG_FEATURE_NTPD_SERVER is not set -CONFIG_PING=y -CONFIG_PING6=y -CONFIG_FEATURE_FANCY_PING=y -# CONFIG_PSCAN is not set -CONFIG_ROUTE=y -# CONFIG_SLATTACH is not set -# CONFIG_TCPSVD is not set -CONFIG_TELNET=y -# CONFIG_FEATURE_TELNET_TTYPE is not set -# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set -# CONFIG_TELNETD is not set -# CONFIG_FEATURE_TELNETD_STANDALONE is not set -# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set -CONFIG_TFTP=y -# CONFIG_TFTPD is not set - -# -# Common options for tftp/tftpd -# -CONFIG_FEATURE_TFTP_GET=y -# CONFIG_FEATURE_TFTP_PUT is not set -# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set -# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set -# CONFIG_TFTP_DEBUG is not set -# CONFIG_TRACEROUTE is not set -# CONFIG_TRACEROUTE6 is not set -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set -# CONFIG_TUNCTL is not set -# CONFIG_FEATURE_TUNCTL_UG is not set -# CONFIG_UDHCPD is not set -# CONFIG_DHCPRELAY is not set -# CONFIG_DUMPLEASES is not set -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set -CONFIG_DHCPD_LEASES_FILE="" -# CONFIG_UDHCPC is not set -# CONFIG_FEATURE_UDHCPC_ARPING is not set -# CONFIG_FEATURE_UDHCP_PORT is not set -CONFIG_UDHCP_DEBUG=0 -# CONFIG_FEATURE_UDHCP_RFC3397 is not set -CONFIG_UDHCPC_DEFAULT_SCRIPT="" -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" -# CONFIG_UDPSVD is not set -# CONFIG_VCONFIG is not set -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_LONG_OPTIONS=y -CONFIG_FEATURE_WGET_TIMEOUT=y -# CONFIG_ZCIP is not set - -# -# Print Utilities -# -# CONFIG_LPD is not set -# CONFIG_LPR is not set -# CONFIG_LPQ is not set - -# -# Mail Utilities -# -# CONFIG_MAKEMIME is not set -CONFIG_FEATURE_MIME_CHARSET="" -# CONFIG_POPMAILDIR is not set -# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set -# CONFIG_REFORMIME is not set -# CONFIG_FEATURE_REFORMIME_COMPAT is not set -# CONFIG_SENDMAIL is not set - -# -# Process Utilities -# -# CONFIG_IOSTAT is not set -# CONFIG_MPSTAT is not set -# CONFIG_PMAP is not set -# CONFIG_POWERTOP is not set -# CONFIG_SMEMCAP is not set -CONFIG_FREE=y -# CONFIG_FUSER is not set -CONFIG_KILL=y -CONFIG_KILLALL=y -# CONFIG_KILLALL5 is not set -# CONFIG_NMETER is not set -CONFIG_PGREP=y -CONFIG_PIDOF=y -CONFIG_FEATURE_PIDOF_SINGLE=y -CONFIG_FEATURE_PIDOF_OMIT=y -# CONFIG_PKILL is not set -CONFIG_PS=y -CONFIG_FEATURE_PS_WIDE=y -# CONFIG_FEATURE_PS_TIME is not set -# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set -# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set -# CONFIG_RENICE is not set -# CONFIG_BB_SYSCTL is not set -# CONFIG_TOP is not set -# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set -# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set -# CONFIG_FEATURE_TOP_SMP_CPU is not set -# CONFIG_FEATURE_TOP_DECIMALS is not set -# CONFIG_FEATURE_TOP_SMP_PROCESS is not set -# CONFIG_FEATURE_TOPMEM is not set -# CONFIG_FEATURE_SHOW_THREADS is not set -CONFIG_UPTIME=y -# CONFIG_WATCH is not set - -# -# Runit Utilities -# -# CONFIG_RUNSV is not set -# CONFIG_RUNSVDIR is not set -# CONFIG_FEATURE_RUNSVDIR_LOG is not set -# CONFIG_SV is not set -CONFIG_SV_DEFAULT_SERVICE_DIR="" -# CONFIG_SVLOGD is not set -# CONFIG_CHPST is not set -# CONFIG_SETUIDGID is not set -# CONFIG_ENVUIDGID is not set -# CONFIG_ENVDIR is not set -# CONFIG_SOFTLIMIT is not set -# CONFIG_CHCON is not set -# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set -# CONFIG_GETENFORCE is not set -# CONFIG_GETSEBOOL is not set -# CONFIG_LOAD_POLICY is not set -# CONFIG_MATCHPATHCON is not set -# CONFIG_RESTORECON is not set -# CONFIG_RUNCON is not set -# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set -# CONFIG_SELINUXENABLED is not set -# CONFIG_SETENFORCE is not set -# CONFIG_SETFILES is not set -# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set -# CONFIG_SETSEBOOL is not set -# CONFIG_SESTATUS is not set - -# -# Shells -# -CONFIG_ASH=y -CONFIG_ASH_BASH_COMPAT=y -CONFIG_ASH_JOB_CONTROL=y -CONFIG_ASH_ALIAS=y -CONFIG_ASH_GETOPTS=y -CONFIG_ASH_BUILTIN_ECHO=y -CONFIG_ASH_BUILTIN_PRINTF=y -CONFIG_ASH_BUILTIN_TEST=y -CONFIG_ASH_CMDCMD=y -# CONFIG_ASH_MAIL is not set -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -# CONFIG_ASH_RANDOM_SUPPORT is not set -CONFIG_ASH_EXPAND_PRMT=y -CONFIG_CTTYHACK=y -# CONFIG_HUSH is not set -# CONFIG_HUSH_BASH_COMPAT is not set -# CONFIG_HUSH_BRACE_EXPANSION is not set -# CONFIG_HUSH_HELP is not set -# CONFIG_HUSH_INTERACTIVE is not set -# CONFIG_HUSH_SAVEHISTORY is not set -# CONFIG_HUSH_JOB is not set -# CONFIG_HUSH_TICK is not set -# CONFIG_HUSH_IF is not set -# CONFIG_HUSH_LOOPS is not set -# CONFIG_HUSH_CASE is not set -# CONFIG_HUSH_FUNCTIONS is not set -# CONFIG_HUSH_LOCAL is not set -# CONFIG_HUSH_RANDOM_SUPPORT is not set -# CONFIG_HUSH_EXPORT_N is not set -# CONFIG_HUSH_MODE_X is not set -# CONFIG_MSH is not set -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set -# CONFIG_FEATURE_BASH_IS_ASH is not set -# CONFIG_FEATURE_BASH_IS_HUSH is not set -CONFIG_FEATURE_BASH_IS_NONE=y -CONFIG_SH_MATH_SUPPORT=y -# CONFIG_SH_MATH_SUPPORT_64 is not set -CONFIG_FEATURE_SH_EXTRA_QUIET=y -# CONFIG_FEATURE_SH_STANDALONE is not set -# CONFIG_FEATURE_SH_NOFORK is not set - -# -# System Logging Utilities -# -# CONFIG_SYSLOGD is not set -# CONFIG_FEATURE_ROTATE_LOGFILE is not set -# CONFIG_FEATURE_REMOTE_LOG is not set -# CONFIG_FEATURE_SYSLOGD_DUP is not set -CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 -# CONFIG_FEATURE_IPC_SYSLOG is not set -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 -# CONFIG_LOGREAD is not set -# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set -# CONFIG_KLOGD is not set -# CONFIG_FEATURE_KLOGD_KLOGCTL is not set -# CONFIG_LOGGER is not set diff --git a/testing/network-manager-applet/PKGBUILD b/testing/network-manager-applet/PKGBUILD deleted file mode 100644 index 60394a46b..000000000 --- a/testing/network-manager-applet/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 125653 2011-05-27 18:09:01Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Arjan Timmerman <arjan@archlinux.org> -# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> -# Contributor: Tor Krill <tor@krill.nu> -# Contributor: Will Rea <sillywilly@gmail.com> - -pkgname=network-manager-applet -pkgver=0.8.9997 -pkgrel=1 -pkgdesc="GNOME frontends to NetWorkmanager" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org/projects/NetworkManager/" -depends=('networkmanager' 'libgnome-keyring' 'polkit-gnome' 'gtk3' - 'notification-daemon' 'libnotify' 'gnome-icon-theme' - 'mobile-broadband-provider-info' 'gconf') -makedepends=('intltool' 'gnome-bluetooth' 'gtk-doc') -optdepends=('gnome-bluetooth: for PAN/DUN support') -options=('!libtool') -install=network-manager-applet.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -sha256sums=('1620e52bfdba18f3640e57a3d450e913ad73a6e529dd0bad895d4c07700018ab') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/networkmanager \ - --disable-static \ - --disable-maintainer-mode - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain nm-applet ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/testing/network-manager-applet/network-manager-applet.install b/testing/network-manager-applet/network-manager-applet.install deleted file mode 100644 index 9922d12b2..000000000 --- a/testing/network-manager-applet/network-manager-applet.install +++ /dev/null @@ -1,18 +0,0 @@ -pkgname=network-manager-applet - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor -} diff --git a/testing/networkmanager/NetworkManager.conf b/testing/networkmanager/NetworkManager.conf deleted file mode 100644 index c37b59680..000000000 --- a/testing/networkmanager/NetworkManager.conf +++ /dev/null @@ -1,2 +0,0 @@ -[main] -plugins=keyfile diff --git a/testing/networkmanager/PKGBUILD b/testing/networkmanager/PKGBUILD deleted file mode 100644 index ecfc88f0a..000000000 --- a/testing/networkmanager/PKGBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: PKGBUILD 125645 2011-05-27 17:39:58Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinxu.org> -# Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org> -# Contributor: Tor Krill <tor@krill.nu> -# Contributor: Will Rea <sillywilly@gmail.com> -# Contributor: Valentine Sinitsyn <e_val@inbox.ru> - -pkgname=networkmanager -pkgver=0.8.9997 -pkgrel=1 -pkgdesc="Network Management daemon" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org/projects/NetworkManager/" -depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wireless_tools' 'wpa_supplicant' 'ppp' 'dhcpcd') -makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection' 'gtk-doc') -optdepends=('modemmanager: for modem management service' - 'dhclient: alternative DHCP/DHCPv6 client' - 'iptables: Connection sharing' - 'dnsmasq: Connection sharing' - 'bluez: Bluetooth support') -options=('!libtool') -backup=('etc/NetworkManager/NetworkManager.conf') -install=networkmanager.install -source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.8/NetworkManager-${pkgver}.tar.bz2 - NetworkManager.conf disable_set_hostname.patch) -sha256sums=('af2e08546cfcd51731be8f4d944b77876ba2eca93cf4f15509caf5572cac6596' - '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' - '1e4586991bc96ef004dc520c794047a336c54433e0bd4edc3879fb6e7ab0e553') - -build() { - cd "${srcdir}/NetworkManager-${pkgver}" - - patch -Np1 -i "${srcdir}/disable_set_hostname.patch" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/networkmanager \ - --with-crypto=nss \ - --with-distro=arch \ - --with-dhclient=/usr/sbin/dhclient \ - --with-dhcpcd=/sbin/dhcpcd \ - --with-iptables=/usr/sbin/iptables \ - --disable-static \ - --enable-more-warnings=no \ - --disable-wimax - - make -} - -package() { - cd "${srcdir}/NetworkManager-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m644 "${srcdir}/NetworkManager.conf" "${pkgdir}/etc/NetworkManager/" - - rm -rf "${pkgdir}/var/run/" -} diff --git a/testing/networkmanager/disable_set_hostname.patch b/testing/networkmanager/disable_set_hostname.patch deleted file mode 100644 index 6c9e2f6c6..000000000 --- a/testing/networkmanager/disable_set_hostname.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Nur NetworkManager-0.8.2.orig/src/nm-policy.c NetworkManager-0.8.2/src/nm-policy.c ---- NetworkManager-0.8.2.orig/src/nm-policy.c 2010-11-03 12:58:42.000000000 -0700 -+++ NetworkManager-0.8.2/src/nm-policy.c 2010-11-23 06:22:32.436707081 -0800 -@@ -342,6 +342,7 @@ - return; - } - -+#if 0 - /* Try automatically determined hostname from the best device's IP config */ - if (!best4) - best4 = get_best_ip4_device (policy->manager, &best_req4); -@@ -396,6 +397,7 @@ - } - } - -+#endif - /* If no automatically-configured hostname, try using the hostname from - * when NM started up. - */ diff --git a/testing/networkmanager/networkmanager.install b/testing/networkmanager/networkmanager.install deleted file mode 100644 index de40c17ed..000000000 --- a/testing/networkmanager/networkmanager.install +++ /dev/null @@ -1,9 +0,0 @@ -post_upgrade() { - (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG -ATTENTION: - /etc/NetworkManager/nm-system-settings.conf has been replaced - by /etc/NetworkManager/NetworkManager.conf. Make sure you move - any custom settings to the new config file. -MSG - true -} diff --git a/testing/openvpn/PKGBUILD b/testing/openvpn/PKGBUILD deleted file mode 100644 index d0d7111b6..000000000 --- a/testing/openvpn/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 123913 2011-05-14 10:10:30Z thomas $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgname=openvpn -pkgver=2.2.0 -pkgrel=1 -pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)" -arch=(i686 x86_64) -url="http://openvpn.net/index.php/open-source.html" -depends=('openssl' 'lzo2') -license=('custom') -backup=(usr/share/openvpn/easy-rsa/vars - usr/share/openvpn/easy-rsa/openssl.cnf - etc/conf.d/openvpn-tapdev) -source=(http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz - openvpn.rc - openvpn-tapdev.rc - openvpn-tapdev.conf) -md5sums=('4f440603eac45fec7be218b87d570834' - 'a3809b9727f0c2af2d0770f5c7442db2' - 'd2c48e970088d679dd3c2afd914ff731' - '722f483c9e3ce2ec66d3301aaf7cf3d5') - -build() { - cd $srcdir/$pkgname-$pkgver - # Build openvpn - CFLAGS="$CFLAGS -DPLUGIN_LIBDIR=\\\"/usr/lib/openvpn\\\"" ./configure --prefix=/usr --enable-password-save --mandir=/usr/share/man - make - - # Build plugins - for plug in auth-pam down-root; do - cd $srcdir/$pkgname-$pkgver/plugin/$plug - make - done -} - -package() { - cd $srcdir/$pkgname-$pkgver - # Install openvpn - make DESTDIR=$pkgdir install - install -d -m755 $pkgdir/etc/openvpn - # Install examples - install -d -m755 $pkgdir/usr/share/openvpn - cp -r sample-config-files $pkgdir/usr/share/openvpn/examples - find $pkgdir/usr/share/openvpn -type f -exec chmod 644 {} \; - find $pkgdir/usr/share/openvpn -type d -exec chmod 755 {} \; - # Install license - install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING - # Install plugins - for plug in auth-pam down-root; do - cd $srcdir/$pkgname-$pkgver/plugin/$plug - install -D -m755 openvpn-$plug.so $pkgdir/usr/lib/openvpn/openvpn-$plug.so - done - # Install easy-rsa - cd $srcdir/$pkgname-$pkgver - make -C easy-rsa/2.0 install DESTDIR=$pkgdir PREFIX=usr/share/openvpn/easy-rsa - # Install rc scripts - install -D -m755 $srcdir/openvpn.rc $pkgdir/etc/rc.d/openvpn - install -D -m755 $srcdir/openvpn-tapdev.rc $pkgdir/etc/rc.d/openvpn-tapdev - install -D -m644 $srcdir/openvpn-tapdev.conf $pkgdir/etc/conf.d/openvpn-tapdev -} diff --git a/testing/openvpn/openvpn-tapdev.conf b/testing/openvpn/openvpn-tapdev.conf deleted file mode 100644 index afa5586dd..000000000 --- a/testing/openvpn/openvpn-tapdev.conf +++ /dev/null @@ -1,12 +0,0 @@ -# -# /etc/conf.d/openvpn-tapdev -# -# Place openvpn-tapdev before network into your DAEMONS array -# This will create permanent tap devices which you can use for bridging -# -# Example: -# TAPDEVS="work home" -# Will create two tap devices "work" and "home" -# - -TAPDEVS="" diff --git a/testing/openvpn/openvpn-tapdev.rc b/testing/openvpn/openvpn-tapdev.rc deleted file mode 100755 index 2c51f8248..000000000 --- a/testing/openvpn/openvpn-tapdev.rc +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -. /etc/conf.d/openvpn-tapdev - -case "$1" in - start) - stat_busy "Creating tap devices for OpenVPN ... " - success=0 - for tapdev in ${TAPDEVS}; do - stat_append "${tapdev} " - /usr/sbin/openvpn --mktun --dev-type tap --dev ${tapdev} >/dev/null 2>&1 || success=$? - done - if [ $success -eq 0 ]; then - add_daemon openvpn-tapdev - stat_done - else - stat_fail - fi - ;; - stop) - stat_busy "Destroying tap devices for OpenVPN ..." - for tapdev in ${TAPDEVS}; do - stat_append "${tapdev} " - /usr/sbin/openvpn --rmtun --dev-type tap --dev ${tapdev} >/dev/null 2>&1 || success=$? - done - rm_daemon openvpn-tapdev - stat_done - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/openvpn/openvpn.rc b/testing/openvpn/openvpn.rc deleted file mode 100755 index 96c28b641..000000000 --- a/testing/openvpn/openvpn.rc +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -CFGDIR="/etc/openvpn" -STATEDIR="/var/run/openvpn" - -case "$1" in - start) - stat_busy "Starting OpenVPN ... " - success=0 - mkdir -p "${STATEDIR}" - for cfg in "${CFGDIR}"/*.conf; do - stat_append "$(basename "${cfg}" .conf) " - /usr/sbin/openvpn --daemon --writepid "${STATEDIR}"/"$(basename "${cfg}" .conf)".pid --cd "${CFGDIR}" --config "${cfg}" || success=$? - done - if [ $success -eq 0 ]; then - add_daemon openvpn - stat_done - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping OpenVPN ..." - for pidfile in "${STATEDIR}"/*.pid; do - stat_append "$(basename "${pidfile}" .pid) " - kill $(cat "${pidfile}" 2>/dev/null) 2>/dev/null - rm -f "${pidfile}" - done - rm_daemon openvpn - stat_done - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/pyalpm/PKGBUILD b/testing/pyalpm/PKGBUILD deleted file mode 100644 index 0db22e4d7..000000000 --- a/testing/pyalpm/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# Maintainer : Rémy Oudompheng <remy@archlinux.org> - -pkgname=pyalpm -pkgver=0.4.2 -pkgrel=1 -pkgdesc="Libalpm bindings for Python 3" -arch=('i686' 'x86_64') -url="http://projects.archlinux.org/users/remy/pyalpm.git/" -license=('GPL') -depends=('python>=3.2' 'pacman<3.6') -source=("ftp://ftp.archlinux.org/other/pyalpm/$pkgname-$pkgver.tar.gz") -md5sums=('d5d45cafa98050a4d3c77e4a8f597ff3') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - python setup.py build -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - python setup.py install --root=${pkgdir} -} - diff --git a/testing/udev/80-drivers.rules b/testing/udev/80-drivers.rules deleted file mode 100644 index 56ac06cb4..000000000 --- a/testing/udev/80-drivers.rules +++ /dev/null @@ -1,14 +0,0 @@ -# do not edit this file, it will be overwritten on update - -ACTION=="remove", GOTO="drivers_end" - -DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/lib/udev/load-modules.sh $env{MODALIAS}" -SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/lib/udev/load-modules.sh tifm_sd" -SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/lib/udev/load-modules.sh tifm_ms" -SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh ms_block" -SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh mspro_block" -SUBSYSTEM=="i2o", RUN+="/lib/udev/load-modules.sh i2o_block" -SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/lib/udev/load-modules.sh sg" -SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/lib/udev/load-modules.sh ppdev" - -LABEL="drivers_end" diff --git a/testing/udev/81-arch.rules b/testing/udev/81-arch.rules deleted file mode 100644 index 3e71a9118..000000000 --- a/testing/udev/81-arch.rules +++ /dev/null @@ -1,114 +0,0 @@ -# Udev rules for Archlinux by Tobias Powalowski <tpowa@archlinux.org> -# do not edit this file, it will be overwritten on update -# -# There are a number of modifiers that are allowed to be used in some -# of the different fields. They provide the following subsitutions: -# -# %n the "kernel number" of the device. -# For example, 'sda3' has a "kernel number" of '3' -# %k the kernel name for the device. -# %M the kernel major number for the device -# %m the kernel minor number for the device -# %b the bus id for the device -# %c the string returned by the PROGRAM -# %s{filename} the content of a sysfs attribute. -# %% the '%' char itself. -# -# There are a number of modifiers that are allowed to be used in some of the -# fields. See the udev man page for a full description of them. -# global stuff -# - -##################################### -###### Hotplug rules - begin -# Only additional modules, -# which are not detectable, -# are loaded here! -##################################### -# check if the device has already been claimed by a driver -ACTION!="add", GOTO="drivers_end" - -#PNP addon modules -SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP0800", RUN+="/lib/udev/load-modules.sh pcspkr" -SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="*PNP051[01]*", RUN+="/lib/udev/load-modules.sh irtty-sir" -SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNPb02f", RUN+="/lib/udev/load-modules.sh analog" - -# PARPORT addon modules -SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP040*", RUN+="/lib/udev/load-modules.sh lp" -SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP040*", RUN+="/lib/udev/load-modules.sh ppdev" - -# fix ide cdrom detection on old proliant servers -SUBSYSTEM=="pci", ENV{MODALIAS}=="pci:v00000E11d00000001sv00000000sd00000000bc06sc02i00", RUN+="/lib/udev/load-modules.sh ide-generic" - -LABEL="drivers_end" -##################################### -##### Hotplug rules - end -##################################### - -##################################### -# Additional Archlinux -# Permissions and Symlinks - begin -##################################### - -# permission for sg devices -KERNEL=="sg[0-9]*", ATTRS{type}!="3|6", GROUP="disk", MODE="0660" - -# permissions for IDE CD devices -SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", GROUP="optical" - -# permissions for SCSI CD devices -SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", ATTRS{type}=="5", SYMLINK+="scd%n", GROUP="optical" -SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="5", GROUP="optical" - -# permissions for removable devices like cardreaders or sticks -KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="0", GROUP="storage" - -# permissions for firewire external drives -KERNEL=="sd*", ATTRS{scsi_level}=="5", GROUP="storage" - -# permissions for usb to scsi external adapters -KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="7", GROUP="storage" - -# permissions for ide storage like pcmcia card readers -ACTION!="add", GOTO="pcmcia_end" -SUBSYSTEM!="block", GOTO="pcmcia_end" -KERNEL=="hd*[!0-9]", IMPORT{program}="ata_id --export $tempnode" -KERNEL=="hd*", IMPORT{parent}=="ID_*" -KERNEL=="hd*", ENV{ID_TYPE}=="generic", GROUP="storage" -LABEL="pcmcia_end" - -# permissions for SCSI scanners -SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="6", GROUP="scanner" - -# mem -KERNEL=="ram0", SYMLINK+="ramdisk" -KERNEL=="ram1", SYMLINK+="ram" - -# video4linux - -KERNEL=="vbi0", SYMLINK+="vbi" -KERNEL=="radio0", SYMLINK+="radio" -KERNEL=="radio[0-9]*", GROUP="video" -KERNEL=="video0", SYMLINK+="video" -KERNEL=="vtx0", SYMLINK+="vtx" - -# video devices -### xorg resets those permissions, adjust your xorg.conf! -KERNEL=="3dfx*", GROUP="video" -KERNEL=="fb[0-9]*", GROUP="video" - -# misc -KERNEL=="sgi_fetchop", MODE="0666" -KERNEL=="sonypi", MODE="0666" - -# USB devices -KERNEL=="legousbtower*", MODE="0666" - -# kbd devices -KERNEL=="kbd", MODE="0664" - -# miscellaneous -KERNEL=="rtc|rtc0", GROUP="audio", MODE="0664" -####################################### -# Permissions and Symlinks - end -####################################### diff --git a/testing/udev/PKGBUILD b/testing/udev/PKGBUILD deleted file mode 100644 index 0db5f45cf..000000000 --- a/testing/udev/PKGBUILD +++ /dev/null @@ -1,106 +0,0 @@ -# $Id: PKGBUILD 125635 2011-05-27 11:47:52Z tomegun $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Maintainer: Thomas Bächler <thomas@archlinux.org> -# Maintainer: Tom Gundersen <teg@jklm.no> - -pkgbase="udev" -pkgname=('udev' 'udev-compat') -pkgver=171 -pkgrel=1 -arch=(i686 x86_64) -url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" -license=('GPL') -groups=('base') -# older initscripts versions required start_udev -options=(!makeflags !libtool) -makedepends=('glibc' 'coreutils' 'util-linux' 'pciutils' 'libusb-compat' 'glib2' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection') -source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2 - 80-drivers.rules - 81-arch.rules - load-modules.sh - static-audio-nodes-permissions.patch) - -build() { - cd $srcdir/$pkgbase-$pkgver - # fix https://bugs.archlinux.org/task/24362 (will be in udev-172) - patch -Np1 -i ../static-audio-nodes-permissions.patch - ./configure --sysconfdir=/etc --with-rootlibdir=/lib --libexecdir=/lib/udev\ - --sbindir=/sbin --with-systemdsystemunitdir=/lib/systemd/system\ - --disable-rule-generator - make -} - -package_udev() { - pkgdesc="The userspace dev tools (udev)" - depends=('glibc' 'coreutils' 'util-linux' 'libusb-compat' 'glib2' - 'module-init-tools>=3.11' 'pciutils') - install=udev.install - backup=(etc/udev/udev.conf - etc/modprobe.d/framebuffer_blacklist.conf) - conflicts=('pcmcia-cs' 'hotplug' 'initscripts<2009.07') - replaces=('devfsd') - - cd $srcdir/$pkgbase-$pkgver - make DESTDIR=${pkgdir} install - # Replace original 80-drivers.rules with custom one. - install -D -m644 $srcdir/80-drivers.rules $pkgdir/lib/udev/rules.d/80-drivers.rules - # Install our rule for permissions and symlinks - install -D -m644 $srcdir/81-arch.rules $pkgdir/lib/udev/rules.d/81-arch.rules - # install our module loading subsystem - install -D -m755 $srcdir/load-modules.sh $pkgdir/lib/udev/load-modules.sh - - # create framebuffer blacklist - mkdir -p $pkgdir/etc/modprobe.d/ - for mod in $(find /lib/modules/*/kernel/drivers/video -name '*fb.ko.gz' -exec basename {} .ko.gz \;); do - echo "blacklist $mod" - done | sort -u > $pkgdir/etc/modprobe.d/framebuffer_blacklist.conf - - # create static devices in /lib/udev/devices/ - mkdir ${pkgdir}/lib/udev/devices/pts - mkdir ${pkgdir}/lib/udev/devices/shm - - mknod -m 0600 ${pkgdir}/lib/udev/devices/console c 5 1 - mknod -m 0666 ${pkgdir}/lib/udev/devices/null c 1 3 - mknod -m 0660 ${pkgdir}/lib/udev/devices/zero c 1 5 - mknod -m 0666 ${pkgdir}/lib/udev/devices/kmsg c 1 11 - - ln -snf /proc/self/fd ${pkgdir}/lib/udev/devices/fd - ln -snf /proc/self/fd/0 ${pkgdir}/lib/udev/devices/stdin - ln -snf /proc/self/fd/1 ${pkgdir}/lib/udev/devices/stdout - ln -snf /proc/self/fd/2 ${pkgdir}/lib/udev/devices/stderr - ln -snf /proc/kcore ${pkgdir}/lib/udev/devices/core - - # these static devices are created for convenience, to autoload the modules if necessary - # /dev/loop0 - mknod -m 0660 ${pkgdir}/lib/udev/devices/loop0 b 7 0 - chgrp disk ${pkgdir}/lib/udev/devices/loop0 - # /dev/net/tun - mkdir ${pkgdir}/lib/udev/devices/net - mknod -m 0666 ${pkgdir}/lib/udev/devices/net/tun c 10 200 - # /dev/fuse - mknod -m 0666 ${pkgdir}/lib/udev/devices/fuse c 10 229 - # /dev/ppp - mknod -m 0600 ${pkgdir}/lib/udev/devices/ppp c 108 0 - - # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group - for i in $pkgdir/lib/udev/rules.d/*.rules; do - sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g; - s#GROUP="tape"#GROUP="storage"#g; - s#GROUP="cdrom"#GROUP="optical"#g' $i - done -} - -package_udev-compat() { - pkgdesc="The userspace dev tools (udev) - additional rules for older kernels" - depends=('udev') - groups=('') - cd $srcdir/$pkgbase-$pkgver - install -d -m755 ${pkgdir}/lib/${pkgbase}/rules.d - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules -} -md5sums=('bdf4617284be2ecac11767437417e209' - '4427855146513a4703ab5c7eb8a0156e' - 'd8725e64fd0ce6e784ae795fae424c0a' - 'f91fddc67609b45b244a624977c4247b' - '4f625aea95a5597afd8cdf189421f193') diff --git a/testing/udev/load-modules.sh b/testing/udev/load-modules.sh deleted file mode 100755 index 1e2af913e..000000000 --- a/testing/udev/load-modules.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash -# Implement blacklisting for udev-loaded modules - -[ $# -ne 1 ] && exit 1 - -. /etc/rc.conf - -# grab modules from rc.conf -BLACKLIST="${MOD_BLACKLIST[@]}" -MODPROBE="/sbin/modprobe" -LOGGER="/usr/bin/logger" -RESOLVEALIAS="${MODPROBE} --resolve-alias" -USEBLACKLIST="--use-blacklist" - -if [ -f /proc/cmdline ]; then - for cmd in $(cat /proc/cmdline); do - case $cmd in - disablemodules=*) eval $cmd ;; - load_modules=off) exit ;; - esac - done - #parse cmdline entries of the form "disablemodules=x,y,z" - if [ -n "$disablemodules" ]; then - BLACKLIST="$BLACKLIST $(echo $disablemodules | sed 's|,| |g')" - fi -fi - -#MODULES entries in rc.conf that begin with ! are blacklisted -for mod in ${MODULES[@]}; do - if [ "${mod}" != "${mod#!}" ]; then - BLACKLIST="$BLACKLIST ${mod#!}" - fi -done - -if [ "$MOD_AUTOLOAD" = "yes" -o "$MOD_AUTOLOAD" = "YES" ]; then - if [ -n "${BLACKLIST}" ]; then - # If an alias name is on the blacklist, load no modules for this device - if echo "${BLACKLIST}" | /bin/grep -q -e " $1 " -e "^$1 " -e " $1\$"; then - $LOGGER -p info -t "$(basename $0)" "Not loading module alias '$1' because it is blacklisted" - exit - fi - #sanitize the blacklist - BLACKLIST="$(echo "$BLACKLIST" | sed -e 's|-|_|g')" - # Try to find all modules for the alias - mods=$($RESOLVEALIAS $1) - # If no modules could be found, try if the alias name is a module name - # In that case, omit the --use-blacklist parameter to imitate normal modprobe behaviour - [ -z "${mods}" ] && $MODPROBE -qni $1 && mods="$1" && USEBLACKLIST="" - [ -z "${mods}" ] && $LOGGER -p local0.debug -t "$(basename $0)" "'$1' is not a valid module or alias name" - for mod in ${mods}; do - # Find the module and all its dependencies - deps="$($MODPROBE -i --show-depends ${mod})" - [ $? -ne 0 ] && continue - - #sanitize the module names - deps="$(echo "$deps" | sed \ - -e "s#^insmod /lib.*/\(.*\)\.ko.*#\1#g" \ - -e 's|-|_|g')" - - # If the module or any of its dependencies is blacklisted, don't load it - for dep in $deps; do - if echo "${BLACKLIST}" | /bin/grep -q -e " ${dep} " -e "^${dep} " -e " ${dep}\$"; then - if [ "${dep}" = "${mod}" ]; then - $LOGGER -p local0.info -t "$(basename $0)" "Not loading module '${mod}' for alias '$1' because it is blacklisted" - else - $LOGGER -p local0.info -t "$(basename $0)" "Not loading module '${mod}' for alias '$1' because its dependency '${dep}' is blacklisted" - fi - continue 2 - fi - done - # modprobe usually uses the "blacklist" statements from modprobe.conf only to blacklist all aliases - # of a module, but not the module itself. We use --use-blacklist here so that modprobe also blacklists - # module names if we resolved alias names manually above - $MODPROBE $USEBLACKLIST ${mod} - done - else - $MODPROBE $USEBLACKLIST $1 - fi -fi -# vim: set et ts=4: diff --git a/testing/udev/static-audio-nodes-permissions.patch b/testing/udev/static-audio-nodes-permissions.patch deleted file mode 100644 index b1fc4f935..000000000 --- a/testing/udev/static-audio-nodes-permissions.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3e227830ad6494700e18ae03297e8fb833ff26bf Mon Sep 17 00:00:00 2001 -From: Kay Sievers <kay.sievers@vrfy.org> -Date: Fri, 27 May 2011 02:50:29 +0200 -Subject: [PATCH] rules: apply 'audio' group of the static snd/{seq,timer} - nodes - ---- - rules/rules.d/50-udev-default.rules | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules -index cd745ef..cacb533 100644 ---- a/rules/rules.d/50-udev-default.rules -+++ b/rules/rules.d/50-udev-default.rules -@@ -38,7 +38,8 @@ SUBSYSTEM=="graphics", GROUP="video" - SUBSYSTEM=="drm", GROUP="video" - - # sound --SUBSYSTEM=="sound", GROUP="audio" -+SUBSYSTEM=="sound", GROUP="audio", \ -+ OPTIONS+="static_node=snd/seq", OPTIONS+="static_node=snd/timer" - - # DVB (video) - SUBSYSTEM=="dvb", GROUP="video" --- -1.7.5.3 - diff --git a/testing/udev/udev.install b/testing/udev/udev.install deleted file mode 100644 index b2ed69467..000000000 --- a/testing/udev/udev.install +++ /dev/null @@ -1,49 +0,0 @@ -# arg 1: the new package version -# arg 2: the old package version - -post_upgrade() { - if [ "$(vercmp $2 100)" -lt 0 ]; then - echo "ATTENTION UDEV:" - echo "----------" - echo "udev >=098 rules syntax has changed, please update your own rules." - echo "udev >=099 Added persistent network and CD/DVD Symlink generator rules." - echo "Please read the instructions carefully before reboot." - echo "They are located in /etc/udev/readme-udev-arch.txt" - echo "----------" - fi - if [ "$(vercmp $2 169)" -lt 0 ]; then - echo "ATTENTION UDEV:" - echo "---------------" - echo "Kernel 2.6.32 or newer is now required." - echo "OSS emulation modules are not loaded by default, add to rc.conf if needed." - echo "Arch specific cd symlinks are now no longer created." - echo "cd and net persistent rules will no longer be autogenerated," - echo "see <https://wiki.archlinux.org/index.php/Udev> for details." - echo "Errors are now logged (possibly to the console) by default." - echo "---------------" - fi -} - -post_install() { - # If a ramfs is mounted, we still need to make sure that /dev/{console,null,zero} exist - # The Archlinux installer bind-mounts /dev to /mnt/dev, thus making the real /dev invisible - ROOTDIR="" - [ "$(stat -c %D /)" != "$(stat -c %D /dev)" ] && ROOTDIR=$(mktemp -d /tmp/udevinstall.XXXXXX) - [ -n "${ROOTDIR}" ] && mount --bind / ${ROOTDIR} - if [ ! -c ${ROOTDIR}/dev/console ]; then - rm -f ${ROOTDIR}/dev/console - mknod -m600 ${ROOTDIR}/dev/console c 5 1 - fi - if [ ! -c ${ROOTDIR}/dev/null ]; then - rm -f ${ROOTDIR}/dev/null - mknod -m644 ${ROOTDIR}/dev/null c 1 3 - fi - if [ ! -c ${ROOTDIR}/dev/zero ]; then - rm -f ${ROOTDIR}/dev/zero - mknod -m644 ${ROOTDIR}/dev/zero c 1 5 - fi - if [ -n "${ROOTDIR}" ]; then - umount ${ROOTDIR} - rmdir ${ROOTDIR} - fi -} |
