diff options
Diffstat (limited to 'staging')
670 files changed, 0 insertions, 35220 deletions
diff --git a/staging/akonadi/PKGBUILD b/staging/akonadi/PKGBUILD deleted file mode 100644 index 26571d1a8..000000000 --- a/staging/akonadi/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 163118 2012-07-07 15:44:55Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgname=akonadi -pkgver=1.7.2 -pkgrel=2 -pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" -arch=('i686' 'x86_64') -url='http://pim.kde.org/akonadi' -license=('LGPL') -depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') -install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('c73bb835057a3ee07d37a4f7daaf7ecf') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE - make -} - -package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/akonadi/akonadi.install b/staging/akonadi/akonadi.install deleted file mode 100644 index 7c8a8bd2b..000000000 --- a/staging/akonadi/akonadi.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/alsa-plugins/PKGBUILD b/staging/alsa-plugins/PKGBUILD deleted file mode 100644 index 3f11bce25..000000000 --- a/staging/alsa-plugins/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 161283 2012-06-08 22:45:29Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Daniel Ehlers <danielehlers@mindeye.net> - -pkgname=alsa-plugins -pkgver=1.0.25 -pkgrel=2 -pkgdesc="Extra alsa plugins" -arch=(i686 x86_64) -url="http://www.alsa-project.org" -license=(GPL) -depends=(alsa-lib) -makedepends=(libpulse jack ffmpeg) -optdepends=('libpulse: PulseAudio plugin' - 'jack: Jack plugin' - 'ffmpeg: libavcodec resampling plugin' - 'libsamplerate: libsamplerate resampling plugin' - 'speex: libspeexdsp resampling plugin') -options=('!libtool') -source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2" - alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch - alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch) -md5sums=('038c023eaa51171f018fbf7141255185' - '50d9adcda20756d063e676a563c201d9' - '697c6275f678d86ded2e5092d8a154c9') - -build() { - cd $pkgname-$pkgver - patch -Np1 -i ../alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch - patch -Np1 -i ../alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch - ./configure --prefix=/usr - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - - install -d "$pkgdir/usr/share/doc/$pkgname" - install -m644 doc/README* doc/*.txt "$pkgdir/usr/share/doc/$pkgname/" -} diff --git a/staging/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch b/staging/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch deleted file mode 100644 index cce4f7e7e..000000000 --- a/staging/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -u -r alsa-plugins-1.0.25/a52/pcm_a52.c alsa-plugins-1.0.25-ffmpeg/a52/pcm_a52.c ---- alsa-plugins-1.0.25/a52/pcm_a52.c 2012-01-25 08:57:07.000000000 +0100 -+++ alsa-plugins-1.0.25-ffmpeg/a52/pcm_a52.c 2012-06-09 00:42:52.177219012 +0200 -@@ -702,7 +702,6 @@ - rec->channels = channels; - rec->format = format; - -- avcodec_init(); - avcodec_register_all(); - - rec->codec = avcodec_find_encoder_by_name("ac3_fixed"); diff --git a/staging/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch b/staging/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch deleted file mode 100644 index f4ebbf466..000000000 --- a/staging/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch +++ /dev/null @@ -1,29 +0,0 @@ -Ffmpeg 0.11 (LIBAVCODEC_VERSION_MAJOR = 54) removed the CH_LAYOUT_* aliases for -the AV_CH_LAYOUT_* defines. - -diff -pru alsa-plugins-1.0.25-original/a52/pcm_a52.c alsa-plugins-1.0.25-for-ffmpeg-0.11/a52/pcm_a52.c ---- alsa-plugins-1.0.25-original/a52/pcm_a52.c 2012-01-25 08:57:07.000000000 +0100 -+++ alsa-plugins-1.0.25-for-ffmpeg-0.11/a52/pcm_a52.c 2012-06-01 14:59:47.096671464 +0200 -@@ -441,7 +441,21 @@ static int a52_prepare(snd_pcm_ioplug_t - #else - rec->avctx->sample_fmt = SAMPLE_FMT_S16; - #endif --#if LIBAVCODEC_VERSION_MAJOR > 52 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3) -+#if (LIBAVCODEC_VERSION_MAJOR >= 54) -+ switch (io->channels) { -+ case 2: -+ rec->avctx->channel_layout = AV_CH_LAYOUT_STEREO; -+ break; -+ case 4: -+ rec->avctx->channel_layout = AV_CH_LAYOUT_QUAD; -+ break; -+ case 6: -+ rec->avctx->channel_layout = AV_CH_LAYOUT_5POINT1; -+ break; -+ default: -+ break; -+ } -+#elif (LIBAVCODEC_VERSION_MAJOR > 52 && LIBAVCODEC_VERSION_MAJOR < 54) || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3) - switch (io->channels) { - case 2: - rec->avctx->channel_layout = CH_LAYOUT_STEREO; diff --git a/staging/amarok/PKGBUILD b/staging/amarok/PKGBUILD deleted file mode 100644 index 707ab7bc4..000000000 --- a/staging/amarok/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 160958 2012-06-07 13:34:21Z foutrelis $ -# Maintainer: Ronald van Haren <ronald@archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: damir <damir@archlinux.org> - -pkgname=amarok -replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') -pkgver=2.5.0 -pkgrel=3 -pkgdesc="The powerful music player for KDE" -arch=("i686" "x86_64") -url="http://amarok.kde.org" -license=('GPL2' 'LGPL2.1' 'FDL') -depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras' - 'liblastfm' 'ffmpeg' 'libofa' 'qjson') -makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth' - 'libmygpo-qt') -optdepends=("libgpod: support for Apple iPod audio devices" - "libmtp: support for portable media devices" - "loudmouth: backend needed by mp3tunes for syncing" - "ifuse: support for Apple iPod Touch and iPhone" - "libmygpo-qt: gpodder.net Internet Service") -install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - "toolbarfix.patch" - "amarok-2.5.0-ffmpeg-fixes.patch") -sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2' - 'd22bc6a36a33ea12035ebbb8959d1fdfbb39275f' - '61193ccc48e9f99b4856eef27fe7a4aaf465feec') - -build() { - cd "${srcdir}" - - patch -Np0 -i "${srcdir}"/toolbarfix.patch - patch -Np0 -i "${srcdir}"/amarok-2.5.0-ffmpeg-fixes.patch - - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package(){ - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/amarok/amarok-2.5.0-ffmpeg-fixes.patch b/staging/amarok/amarok-2.5.0-ffmpeg-fixes.patch deleted file mode 100644 index 602fe47f5..000000000 --- a/staging/amarok/amarok-2.5.0-ffmpeg-fixes.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -upr amarok-2.5.0.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp amarok-2.5.0/src/musicbrainz/MusicDNSAudioDecoder.cpp ---- amarok-2.5.0.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp 2012-06-07 16:12:22.000000000 +0300 -+++ amarok-2.5.0/src/musicbrainz/MusicDNSAudioDecoder.cpp 2012-06-07 16:14:56.000000000 +0300 -@@ -136,7 +136,7 @@ MusicDNSAudioDecoder::run() - foreach( Meta::TrackPtr track, m_tracks ) - { - //TODO replace with "avformat_open_input" since av_open_input_file is deprecated -- if( av_open_input_file( &pFormatCtx, ( const char * )track->playableUrl().toLocalFile().toAscii(), NULL, 0, NULL ) ) -+ if( avformat_open_input( &pFormatCtx, ( const char * )track->playableUrl().toLocalFile().toAscii(), NULL, NULL ) ) - { - warning() << QLatin1String( "Unable to open input file: " ) + track->playableUrl().toLocalFile(); - continue; -@@ -259,4 +259,4 @@ MusicDNSAudioDecoder::run() - } - - --#include "MusicDNSAudioDecoder.moc" -\ No newline at end of file -+#include "MusicDNSAudioDecoder.moc" diff --git a/staging/amarok/amarok.install b/staging/amarok/amarok.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/staging/amarok/amarok.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/amarok/toolbarfix.patch b/staging/amarok/toolbarfix.patch deleted file mode 100644 index ec012ca74..000000000 --- a/staging/amarok/toolbarfix.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -rup amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp amarok-2.5.0.new/src/context/toolbar/AppletToolbar.cpp ---- amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp 2011-12-15 08:36:48.000000000 +0100 -+++ amarok-2.5.0.new/src/context/toolbar/AppletToolbar.cpp 2012-01-29 20:20:01.901360205 +0100 -@@ -108,6 +108,17 @@ Context::AppletToolbar::appletRemoved( P - } - } - -+void Context::AppletToolbar::setContainment( Containment * containment ) -+{ -+ m_cont = containment; -+} -+ -+Context::Containment * -+Context::AppletToolbar::containment() const -+{ -+ return m_cont; -+} -+ - QSizeF - Context::AppletToolbar::sizeHint( Qt::SizeHint which, const QSizeF &constraint ) const - { -Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.cpp.orig -Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.cpp.rej -diff -rup amarok-2.5.0/src/context/toolbar/AppletToolbar.h amarok-2.5.0.new/src/context/toolbar/AppletToolbar.h ---- amarok-2.5.0/src/context/toolbar/AppletToolbar.h 2011-12-15 08:36:48.000000000 +0100 -+++ amarok-2.5.0.new/src/context/toolbar/AppletToolbar.h 2012-01-29 20:17:52.414686784 +0100 -@@ -55,6 +55,9 @@ class AppletToolbar : public QGraphicsWi - - void appletRemoved( Plasma::Applet* applet ); - -+ void setContainment( Containment * containment ); -+ Containment* containment() const; -+ - signals: - void showApplet( Plasma::Applet* ); - void appletAddedToToolbar( Plasma::Applet* applet, int loc ); -Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.h.orig -diff -rup amarok-2.5.0/src/context/ToolbarView.cpp amarok-2.5.0.new/src/context/ToolbarView.cpp ---- amarok-2.5.0/src/context/ToolbarView.cpp 2011-12-15 08:36:48.000000000 +0100 -+++ amarok-2.5.0.new/src/context/ToolbarView.cpp 2012-01-29 20:17:52.394686782 +0100 -@@ -74,7 +74,9 @@ Context::ToolbarView::ToolbarView( Plasm - setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); - - // now we create the toolbar -- m_toolbar = new AppletToolbar( containment ); -+ m_toolbar = new AppletToolbar(0); -+ scene->addItem(m_toolbar.data()); -+ m_toolbar.data()->setContainment( qobject_cast<Context::Containment *>(containment) ); - m_toolbar.data()->setZValue( m_toolbar.data()->zValue() + 1000 ); - m_toolbar.data()->setPos( TOOLBAR_X_OFFSET, 0 ); - -@@ -96,7 +98,7 @@ Context::ToolbarView::ToolbarView( Plasm - - Context::ToolbarView::~ToolbarView() - { -- -+ delete m_toolbar.data(); - } - - void -Only in amarok-2.5.0.new/src/context: ToolbarView.cpp.orig diff --git a/staging/avidemux/PKGBUILD b/staging/avidemux/PKGBUILD deleted file mode 100644 index bd131f484..000000000 --- a/staging/avidemux/PKGBUILD +++ /dev/null @@ -1,116 +0,0 @@ -# $Id: PKGBUILD 160694 2012-06-03 22:00:36Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgbase=avidemux -pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') -pkgver=2.5.6 -pkgrel=3 -arch=('i686' 'x86_64') -license=('GPL') -url="http://fixounet.free.fr/avidemux/" -makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \ - 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \ - 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva') -options=('!makeflags') -source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz) -sha1sums=('47205c236bf6a4435b9d4dd944493c7b7e2752f5') - -build() { - cd "${srcdir}/${pkgbase}_${pkgver}" - mkdir build - cd build - cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 .. - make - -# plugin build expects libraries to be already installed; we fake a prefix -# in build/ by symlinking all libraries to build/lib/ - mkdir -p lib - cd lib - find ../avidemux -name '*.so*' | xargs ln -sft . - cd ../../plugins - mkdir build - cd build - cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR="${srcdir}/avidemux_${pkgver}" \ - -D AVIDEMUX_CORECONFIG_DIR="${srcdir}/avidemux_${pkgver}/build/config" \ - -D AVIDEMUX_INSTALL_PREFIX="${srcdir}/avidemux_${pkgver}/build" \ - -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON .. - make -} - -package_avidemux-cli() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split)" - depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva') - optdepends=('lame: for the corresponding audio encoder plugin' - 'faac: for the corresponding audio encoder plugin' - 'faad2: for the corresponding audio decoder plugin' - 'opencore-amr: for the corresponding audio decoder plugin' - 'jack: for the corresponding audio device plugin' - 'libpulse: for the corresponding audio device plugin' - 'sdl: for the corresponding audio device plugin' - 'x264: for the corresponding video encoder plugin' - 'xvidcore: for the corresponding video encoder plugin') - provides=('avidemux') - conflicts=('avidemux') - replaces=('avidemux') - - cd "${srcdir}/${pkgbase}_${pkgver}/build" - make DESTDIR="${pkgdir}" install - - cd "${srcdir}/${pkgbase}_${pkgver}/plugins/build" - make DESTDIR="${pkgdir}" install - rm -r "${pkgdir}"/usr/share/avidemux - rm "${pkgdir}"/usr/bin/avidemux2_{gtk,qt4} - rm "${pkgdir}"/usr/lib/*{_gtk,_qt4,Gtk,QT4}.so - rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/x264/*{Gtk,Qt}.so - rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/xvid/*{Gtk,Qt}.so - rm "${pkgdir}"/usr/lib/ADM_plugins/videoFilter/*{_gtk,_qt4}.so - - ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so "${pkgdir}/usr/lib/libADM_vidEnc_xvid.so" - ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so "${pkgdir}/usr/lib/libADM_vidEnc_x264.so" - - install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png" - install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1" -} - -package_avidemux-gtk() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI" - depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils') - install=avidemux.install - - cd "${srcdir}/${pkgbase}_${pkgver}" - install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk" - - install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid} - install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter - - install -D -m755 build/lib/*{_gtk,Gtk}.so "${pkgdir}/usr/lib" - install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264" - install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid" - install -D -m755 plugins/build/ADM_videoFilters/*/*_gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter" - - install -D -m644 avidemux2-gtk.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" - sed -i "s|\[\$e\]||" "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" -} - -package_avidemux-qt() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI" - depends=("avidemux-cli=${pkgver}" 'qt') - install=avidemux.install - - cd "${srcdir}/${pkgbase}_${pkgver}" - install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4" - install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid} - install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter - - install -D -m755 build/lib/*{_qt4,QT4}.so "${pkgdir}/usr/lib" - install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264" - install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid" - install -D -m755 plugins/build/ADM_videoFilters/*/*_qt4.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter" - - install -d "${pkgdir}/usr/share/avidemux/i18n" - install -D -m644 build/po/*.qm "${pkgdir}/usr/share/avidemux/i18n" - - install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop" - sed -i 's/Name=avidemux2/Name=avidemux (QT)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" - sed -i 's/avidemux2_gtk/avidemux2_qt4/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" -} diff --git a/staging/avidemux/avidemux.install b/staging/avidemux/avidemux.install deleted file mode 100644 index e111ef946..000000000 --- a/staging/avidemux/avidemux.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/avogadro/PKGBUILD b/staging/avogadro/PKGBUILD deleted file mode 100644 index cf03f9277..000000000 --- a/staging/avogadro/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 163125 2012-07-07 16:07:39Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Nick B <Shirakawasuna at gmail _dot_com> - -pkgname=avogadro -pkgver=1.0.3 -pkgrel=6 -pkgdesc="An advanced molecular editor based on Qt" -arch=('i686' 'x86_64') -url="http://avogadro.openmolecules.net/wiki/Main_Page" -license=('GPL2') -depends=('eigen2' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy') -makedepends=('cmake' 'boost') -install=avogadro.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'replace-qt4_automoc-with-qt4_wrap_cpp.patch' - 'fix-boost.patch' - 'fix-opengl-headers.patch') -md5sums=('92c2702c1980f70fb6d87a1a58147911' - 'aec516daab066c15326a9681f8f15abc' - '46282e4709429447e44a0a54d51ad2ec' - 'f420bfd22e3d5d8fcddc625cf5e711f6') - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/replace-qt4_automoc-with-qt4_wrap_cpp.patch - patch -p1 -i "${srcdir}"/fix-boost.patch - patch -p1 -i "${srcdir}"/fix-opengl-headers.patch - - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DQT_MKSPECS_RELATIVE=share/qt/mkspecs - make -} - -package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/avogadro/avogadro.install b/staging/avogadro/avogadro.install deleted file mode 100644 index 2eaa60550..000000000 --- a/staging/avogadro/avogadro.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/staging/avogadro/fix-boost.patch b/staging/avogadro/fix-boost.patch deleted file mode 100644 index 8fb53ef12..000000000 --- a/staging/avogadro/fix-boost.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- avogadro-1.0.3/libavogadro/src/CMakeLists.txt~ 2011-11-29 18:33:01.777291627 +0000 -+++ avogadro-1.0.3/libavogadro/src/CMakeLists.txt 2011-11-29 18:33:23.480814612 +0000 -@@ -149,7 +149,7 @@ - endforeach(P_ITEM ${PYTHON_SRCS}) - endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND) - --QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS}) -+QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) - - # you have to add link_directories before you add the target - if(ENABLE_PYTHON AND ALL_PYTHON_FOUND) ---- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt~ 2011-11-29 18:37:15.449506548 +0000 -+++ avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt 2011-11-29 18:37:52.729831744 +0000 -@@ -11,7 +11,7 @@ - # use all cpp files in this directory - FILE(GLOB wrapper_SRCS "*.cpp") - --QT4_WRAP_CPP(MOC_SRCS moleculelist.h) -+QT4_WRAP_CPP(MOC_SRCS moleculelist.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) - - ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS}) - SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro) ---- avogadro-1.0.3/libavogadro/CMakeLists.txt~ 2011-11-29 19:41:34.066938217 +0000 -+++ avogadro-1.0.3/libavogadro/CMakeLists.txt 2011-11-29 19:42:53.084320315 +0000 -@@ -18,7 +18,7 @@ - # Assume all MOC stuff is in the headers, replace .cpp and use qt4_wrap_cpp - # We should probably scan the header to verify the Q_OBJECT macro is used - string(REPLACE ".cpp" ".h" hdr_list "${src_list}") -- qt4_wrap_cpp(moc_files ${hdr_list}) -+ qt4_wrap_cpp(moc_files ${hdr_list} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) - # Now sort out the ui and qrc files, process them as appropriate - set(ui_plugin_files) - set(qrc_plugin_files) diff --git a/staging/avogadro/fix-opengl-headers.patch b/staging/avogadro/fix-opengl-headers.patch deleted file mode 100644 index e6e8bc3b5..000000000 --- a/staging/avogadro/fix-opengl-headers.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- avogadro-1.0.3/libavogadro/src/camera.cpp~ 2012-02-27 18:35:52.109999585 +0000 -+++ avogadro-1.0.3/libavogadro/src/camera.cpp 2012-02-27 18:36:27.103053453 +0000 -@@ -25,6 +25,8 @@ - #include "camera.h" - #include "glwidget.h" - #include <avogadro/molecule.h> -+#include <Eigen/LU> -+#include <GL/glu.h> - - using namespace Eigen; - ---- avogadro-1.0.3/libavogadro/src/glpainter_p.cpp~ 2012-02-27 18:37:28.535894209 +0000 -+++ avogadro-1.0.3/libavogadro/src/glpainter_p.cpp 2012-02-27 18:37:46.912413557 +0000 -@@ -42,6 +42,7 @@ - #include <QColor> - #include <QVarLengthArray> - #include <Eigen/Geometry> -+#include <GL/glu.h> - - namespace Avogadro - { ---- avogadro-1.0.3/libavogadro/src/glwidget.cpp~ 2012-02-27 18:37:55.099014598 +0000 -+++ avogadro-1.0.3/libavogadro/src/glwidget.cpp 2012-02-27 18:38:30.805395066 +0000 -@@ -70,6 +70,8 @@ - - #include <openbabel/mol.h> - -+#include <GL/glu.h> -+ - using namespace OpenBabel; - using namespace Eigen; - ---- avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp~ 2012-02-27 18:36:53.646173944 +0000 -+++ avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp 2012-02-27 18:37:10.739370227 +0000 -@@ -36,6 +36,7 @@ - #include <QFile> - #include <QDebug> - #include <Eigen/Geometry> -+#include <GL/glu.h> - - namespace Avogadro - { ---- avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp~ 2012-02-27 18:38:47.491928000 +0000 -+++ avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp 2012-02-27 18:39:05.735115136 +0000 -@@ -44,6 +44,8 @@ - #include <QComboBox> - #include <QDebug> - -+#include <GL/glu.h> -+ - using namespace std; - using namespace OpenBabel; - using namespace Eigen; diff --git a/staging/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch b/staging/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch deleted file mode 100644 index 11f58a505..000000000 --- a/staging/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch +++ /dev/null @@ -1,778 +0,0 @@ -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt ---- avogadro-1.0.3/libavogadro/src/CMakeLists.txt 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt 2011-11-29 18:49:58.520790652 +0100 -@@ -75,6 +75,42 @@ - zmatrix.h - ) - -+SET(libavogadro_MOC_HDRS -+ animation.h -+ atom.h -+ bond.h -+ color.h -+ colorbutton.h -+ colors/elementcolor.h -+ cube.h -+ elementdetail_p.h -+ elementtranslator.h -+ engine.h -+ engines/bsdyengine.h -+ extension.h -+ fragment.h -+ glwidget.h -+ mesh.h -+ molecule.h -+ moleculefile.h -+ moleculefile_p.h -+ periodictablescene_p.h -+ periodictableview.h -+ plotwidget.h -+ plugin.h -+ pluginmanager.h -+ primitive.h -+ protein.h -+ pythonengine_p.h -+ pythonerror.h -+ pythonextension_p.h -+ pythontool_p.h -+ residue.h -+ tool.h -+ toolgroup.h -+ zmatrix.h -+) -+ - set(libavogadro_SRCS ${libavogadro_SRCS} ${libavogadro_UIS}) - # Also add in the qtiocompressor class - #set(libavogadro_SRCS ${libavogadro_SRCS} ../qtiocompressor/qtiocompressor.cpp) -@@ -113,7 +148,7 @@ - endforeach(P_ITEM ${PYTHON_SRCS}) - endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND) - --qt4_automoc(${libavogadro_SRCS}) -+QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS}) - - # you have to add link_directories before you add the target - if(ENABLE_PYTHON AND ALL_PYTHON_FOUND) -@@ -149,7 +184,7 @@ - COMMAND ${CMAKE_COMMAND} -E ${header_cmd} "${from}" "${to}") - endforeach(headerFile ${libavogadro_HDRS}) - --add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS}) -+add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_MOC_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS}) - set_target_properties(avogadro - PROPERTIES VERSION ${Avogadro_VERSION_FULL} SOVERSION 1 ) - target_link_libraries(avogadro ${AVO_LINK_LIBRARIES}) -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/animation.cpp avogadro-1.0.3-edit/libavogadro/src/animation.cpp ---- avogadro-1.0.3/libavogadro/src/animation.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/animation.cpp 2011-11-29 18:48:47.967839537 +0100 -@@ -224,5 +224,3 @@ - } - - } // end namespace Avogadro -- --#include "animation.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/atom.cpp avogadro-1.0.3-edit/libavogadro/src/atom.cpp ---- avogadro-1.0.3/libavogadro/src/atom.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/atom.cpp 2011-11-29 18:48:39.561218412 +0100 -@@ -293,5 +293,3 @@ - } - - } // End namespace Avogadro -- --#include "atom.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/bond.cpp avogadro-1.0.3-edit/libavogadro/src/bond.cpp ---- avogadro-1.0.3/libavogadro/src/bond.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/bond.cpp 2011-11-29 18:49:00.067773985 +0100 -@@ -166,5 +166,3 @@ - } - - } // End namespace Avogadro -- --#include "bond.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/color.cpp avogadro-1.0.3-edit/libavogadro/src/color.cpp ---- avogadro-1.0.3/libavogadro/src/color.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/color.cpp 2011-11-29 18:49:05.207746140 +0100 -@@ -152,5 +152,3 @@ - return "Generic Color"; - } - } -- --#include "color.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colorbutton.cpp avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp ---- avogadro-1.0.3/libavogadro/src/colorbutton.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp 2011-11-29 18:49:11.987709410 +0100 -@@ -94,5 +94,3 @@ - } - - } // end namespace -- --#include "colorbutton.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp ---- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp 2011-11-29 18:50:11.077389292 +0100 -@@ -63,7 +63,5 @@ - - } - --#include "elementcolor.moc" - //this is a static color plugin... - //Q_EXPORT_PLUGIN2(elementcolor, Avogadro::ElementColorFactory) -- -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/cube.cpp avogadro-1.0.3-edit/libavogadro/src/cube.cpp ---- avogadro-1.0.3/libavogadro/src/cube.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/cube.cpp 2011-11-29 18:50:26.357306516 +0100 -@@ -322,5 +322,3 @@ - } - - } // End namespace Avogadro -- --#include "cube.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp ---- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp 2011-11-29 18:50:37.680578505 +0100 -@@ -132,5 +132,3 @@ - } - - } // End namespace Avogadro -- --#include "elementdetail_p.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp ---- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp 2011-11-29 18:50:48.160521729 +0100 -@@ -401,5 +401,3 @@ - } - - } // End namespace Avogadro -- --#include "elementtranslator.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engine.cpp avogadro-1.0.3-edit/libavogadro/src/engine.cpp ---- avogadro-1.0.3/libavogadro/src/engine.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/engine.cpp 2011-11-29 18:50:54.397154610 +0100 -@@ -377,5 +377,3 @@ - return m_molecule->bonds(); - } - } -- --#include "engine.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp ---- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp 2011-11-29 18:51:18.733689435 +0100 -@@ -442,7 +442,5 @@ - } - - } -- --#include "bsdyengine.moc" - // This is a static engine... - // Q_EXPORT_PLUGIN2( bsdyengine, Avogadro::BSDYEngineFactory ) -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/extension.cpp avogadro-1.0.3-edit/libavogadro/src/extension.cpp ---- avogadro-1.0.3/libavogadro/src/extension.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/extension.cpp 2011-11-29 18:51:56.360152261 +0100 -@@ -80,5 +80,3 @@ - } - - } -- --#include "extension.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/fragment.cpp avogadro-1.0.3-edit/libavogadro/src/fragment.cpp ---- avogadro-1.0.3/libavogadro/src/fragment.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/fragment.cpp 2011-11-29 18:52:01.906788880 +0100 -@@ -82,5 +82,3 @@ - } - - } // End namespace Avogadro -- --#include "fragment.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/glwidget.cpp avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp ---- avogadro-1.0.3/libavogadro/src/glwidget.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp 2011-11-29 18:52:14.346721486 +0100 -@@ -1966,5 +1966,3 @@ - d->updateCache = true; - } - } -- --#include "glwidget.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/mesh.cpp avogadro-1.0.3-edit/libavogadro/src/mesh.cpp ---- avogadro-1.0.3/libavogadro/src/mesh.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/mesh.cpp 2011-11-29 18:52:23.033341093 +0100 -@@ -231,5 +231,3 @@ - } - - } // End namespace Avogadro -- --#include "mesh.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/molecule.cpp avogadro-1.0.3-edit/libavogadro/src/molecule.cpp ---- avogadro-1.0.3/libavogadro/src/molecule.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/molecule.cpp 2011-11-29 18:52:33.573283993 +0100 -@@ -1575,5 +1575,3 @@ - } - - } // End namespace Avogadro -- --#include "molecule.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile.cpp avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp ---- avogadro-1.0.3/libavogadro/src/moleculefile.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp 2011-11-29 18:56:26.728687548 +0100 -@@ -22,23 +22,14 @@ - 02110-1301, USA. - **********************************************************************/ - --#include "moleculefile.h" -+#include "moleculefile_p.h" - - #include <avogadro/molecule.h> - --#include <QFile> - #include <QFileInfo> --#include <QStringList> --#include <QThread> - #include <QDebug> - #include <QPointer> - --#include <openbabel/mol.h> --#include <openbabel/obconversion.h> -- --// Included in obconversion.h --//#include <iostream> -- - namespace Avogadro { - - using OpenBabel::OBConversion; -@@ -578,164 +569,6 @@ - return false; - } - -- class ReadFileThread : public QThread -- { -- // Q_OBJECT -- -- public: -- ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile) -- { -- } -- -- void addConformer(const OpenBabel::OBMol &conformer) -- { -- unsigned int numAtoms = conformer.NumAtoms(); -- std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms); -- for (unsigned int i = 0; i < numAtoms; ++i) -- coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray())); -- m_moleculeFile->m_conformers.push_back(coords); -- } -- -- void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol ¤t) -- { -- if (!c) { -- // this is the first molecule read -- m_moleculeFile->setConformerFile(true); -- addConformer(current); -- return; -- } -- -- if (!m_moleculeFile->isConformerFile()) -- return; -- -- // as long as we are not sure if this really is a -- // conformer/trajectory file, add the conformers -- addConformer(current); -- -- // performance: check only certain molecule 1-10,20,50 -- switch (c) { -- case 1: -- case 2: -- case 3: -- case 4: -- case 5: -- case 6: -- case 7: -- case 8: -- case 9: -- case 10: -- case 20: -- case 50: -- break; -- default: -- return; -- } -- -- if (first.NumAtoms() != current.NumAtoms()) { -- m_moleculeFile->setConformerFile(false); -- m_moleculeFile->m_conformers.clear(); -- return; -- } -- -- for (unsigned int i = 0; i < first.NumAtoms(); ++i) { -- OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1); -- OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1); -- if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) { -- m_moleculeFile->setConformerFile(false); -- m_moleculeFile->m_conformers.clear(); -- return; -- } -- } -- } -- -- void run() -- { -- // Check that the file can be read from disk -- if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) { -- // Cannot read the file -- m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.") -- .arg(m_moleculeFile->m_fileName)); -- return; -- } -- -- // Construct the OpenBabel objects, set the file type -- OpenBabel::OBConversion conv; -- OpenBabel::OBFormat *inFormat; -- if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) { -- // Input format not supported -- m_moleculeFile->m_error.append( -- QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType)); -- return; -- } else { -- inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data()); -- if (!inFormat || !conv.SetInFormat(inFormat)) { -- // Input format not supported -- m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.") -- .arg(m_moleculeFile->m_fileName)); -- return; -- } -- } -- -- // set any options -- if (!m_moleculeFile->m_fileOptions.isEmpty()) { -- foreach(const QString &option, -- m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) { -- conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS); -- } -- } -- -- // Now attempt to read the molecule in -- ifstream ifs; -- ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc -- if (!ifs) // Should not happen, already checked file could be opened -- return; -- -- // read all molecules -- OpenBabel::OBMol firstOBMol, currentOBMol; -- unsigned int c = 0; -- conv.SetInStream(&ifs); -- m_moleculeFile->streamposRef().push_back(ifs.tellg()); -- while (ifs.good() && conv.Read(¤tOBMol)) { -- if (!c) -- firstOBMol = currentOBMol; -- -- if (c > 20 && !m_moleculeFile->isConformerFile()) -- m_moleculeFile->setFirstReady(true); -- -- // detect conformer/trajectory files -- detectConformers(c, firstOBMol, currentOBMol); -- // store information about molecule -- m_moleculeFile->streamposRef().push_back(ifs.tellg()); -- m_moleculeFile->titlesRef().append(currentOBMol.GetTitle()); -- // increment count -- ++c; -- } -- m_moleculeFile->streamposRef().pop_back(); -- -- // signle molecule files are not conformer files -- if (c == 1) { -- m_moleculeFile->setConformerFile(false); -- m_moleculeFile->m_conformers.clear(); -- } -- -- // check for empty titles -- for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) { -- if (!m_moleculeFile->titlesRef()[i].isEmpty()) -- continue; -- -- QString title; -- if (m_moleculeFile->isConformerFile()) -- title = tr("Conformer %1").arg(i+1); -- else -- title = tr("Molecule %1").arg(i+1); -- -- m_moleculeFile->titlesRef()[i] = title; -- } -- } -- -- MoleculeFile *m_moleculeFile; -- }; // end ReadFileThread class -- - MoleculeFile* MoleculeFile::readFile(const QString &fileName, - const QString &fileType, const QString &fileOptions, bool wait) - { -@@ -794,6 +627,3 @@ - } - - } // end namespace Avogadro -- --#include "moleculefile.moc" -- -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile_p.h avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h ---- avogadro-1.0.3/libavogadro/src/moleculefile_p.h 1970-01-01 01:00:00.000000000 +0100 -+++ avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h 2011-11-29 18:57:43.108273764 +0100 -@@ -0,0 +1,202 @@ -+/********************************************************************** -+ MoleculeFile - Class representing molecule file. -+ -+ Copyright (C) 2009 Marcus Hanwell, Tim Vandermeersch -+ -+ This file is part of the Avogadro molecular editor project. -+ For more information, see <http://avogadro.openmolecules.net/> -+ -+ Avogadro 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. -+ -+ Avogadro is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+ 02110-1301, USA. -+ **********************************************************************/ -+ -+#ifndef MOLECULEFILE_P_H -+#define MOLECULEFILE_P_H -+ -+#include "moleculefile.h" -+ -+#include <openbabel/mol.h> -+#include <openbabel/obconversion.h> -+ -+#include <QFile> -+#include <QStringList> -+#include <QThread> -+ -+namespace Avogadro { -+ -+ using OpenBabel::OBConversion; -+ using std::ifstream; -+ -+class ReadFileThread : public QThread -+{ -+ Q_OBJECT -+ -+ public: -+ ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile) -+ { -+ } -+ -+ void addConformer(const OpenBabel::OBMol &conformer) -+ { -+ unsigned int numAtoms = conformer.NumAtoms(); -+ std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms); -+ for (unsigned int i = 0; i < numAtoms; ++i) -+ coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray())); -+ m_moleculeFile->m_conformers.push_back(coords); -+ } -+ -+ void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol ¤t) -+ { -+ if (!c) { -+ // this is the first molecule read -+ m_moleculeFile->setConformerFile(true); -+ addConformer(current); -+ return; -+ } -+ -+ if (!m_moleculeFile->isConformerFile()) -+ return; -+ -+ // as long as we are not sure if this really is a -+ // conformer/trajectory file, add the conformers -+ addConformer(current); -+ -+ // performance: check only certain molecule 1-10,20,50 -+ switch (c) { -+ case 1: -+ case 2: -+ case 3: -+ case 4: -+ case 5: -+ case 6: -+ case 7: -+ case 8: -+ case 9: -+ case 10: -+ case 20: -+ case 50: -+ break; -+ default: -+ return; -+ } -+ -+ if (first.NumAtoms() != current.NumAtoms()) { -+ m_moleculeFile->setConformerFile(false); -+ m_moleculeFile->m_conformers.clear(); -+ return; -+ } -+ -+ for (unsigned int i = 0; i < first.NumAtoms(); ++i) { -+ OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1); -+ OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1); -+ if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) { -+ m_moleculeFile->setConformerFile(false); -+ m_moleculeFile->m_conformers.clear(); -+ return; -+ } -+ } -+ } -+ -+ void run() -+ { -+ // Check that the file can be read from disk -+ if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) { -+ // Cannot read the file -+ m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.") -+ .arg(m_moleculeFile->m_fileName)); -+ return; -+ } -+ -+ // Construct the OpenBabel objects, set the file type -+ OpenBabel::OBConversion conv; -+ OpenBabel::OBFormat *inFormat; -+ if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) { -+ // Input format not supported -+ m_moleculeFile->m_error.append( -+ QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType)); -+ return; -+ } else { -+ inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data()); -+ if (!inFormat || !conv.SetInFormat(inFormat)) { -+ // Input format not supported -+ m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.") -+ .arg(m_moleculeFile->m_fileName)); -+ return; -+ } -+ } -+ -+ // set any options -+ if (!m_moleculeFile->m_fileOptions.isEmpty()) { -+ foreach(const QString &option, -+ m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) { -+ conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS); -+ } -+ } -+ -+ // Now attempt to read the molecule in -+ ifstream ifs; -+ ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc -+ if (!ifs) // Should not happen, already checked file could be opened -+ return; -+ -+ // read all molecules -+ OpenBabel::OBMol firstOBMol, currentOBMol; -+ unsigned int c = 0; -+ conv.SetInStream(&ifs); -+ m_moleculeFile->streamposRef().push_back(ifs.tellg()); -+ while (ifs.good() && conv.Read(¤tOBMol)) { -+ if (!c) -+ firstOBMol = currentOBMol; -+ -+ if (c > 20 && !m_moleculeFile->isConformerFile()) -+ m_moleculeFile->setFirstReady(true); -+ -+ // detect conformer/trajectory files -+ detectConformers(c, firstOBMol, currentOBMol); -+ // store information about molecule -+ m_moleculeFile->streamposRef().push_back(ifs.tellg()); -+ m_moleculeFile->titlesRef().append(currentOBMol.GetTitle()); -+ // increment count -+ ++c; -+ } -+ m_moleculeFile->streamposRef().pop_back(); -+ -+ // signle molecule files are not conformer files -+ if (c == 1) { -+ m_moleculeFile->setConformerFile(false); -+ m_moleculeFile->m_conformers.clear(); -+ } -+ -+ // check for empty titles -+ for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) { -+ if (!m_moleculeFile->titlesRef()[i].isEmpty()) -+ continue; -+ -+ QString title; -+ if (m_moleculeFile->isConformerFile()) -+ title = tr("Conformer %1").arg(i+1); -+ else -+ title = tr("Molecule %1").arg(i+1); -+ -+ m_moleculeFile->titlesRef()[i] = title; -+ } -+ } -+ -+ MoleculeFile *m_moleculeFile; -+}; -+ -+} // end namespace Avogadro -+ -+#endif // MOLECULEFILE_P_H -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp ---- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp 2011-11-29 18:52:50.259860261 +0100 -@@ -213,5 +213,3 @@ - } - - } // End namespace Avogadro -- --#include "periodictablescene_p.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictableview.cpp avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp ---- avogadro-1.0.3/libavogadro/src/periodictableview.cpp 2011-11-29 19:30:25.130970122 +0000 -+++ avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp 2011-11-29 18:52:50.259860261 +0100 -@@ -69,4 +69,3 @@ - - } // End namespace Avogadro - --#include "periodictableview.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plotwidget.cpp avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp ---- avogadro-1.0.3/libavogadro/src/plotwidget.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp 2011-11-29 18:53:09.389756626 +0100 -@@ -27,7 +27,6 @@ - **********************************************************************/ - - #include "plotwidget.h" --#include "plotwidget.moc" - - #include <math.h> - #include <QDebug> -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plugin.cpp avogadro-1.0.3-edit/libavogadro/src/plugin.cpp ---- avogadro-1.0.3/libavogadro/src/plugin.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/plugin.cpp 2011-11-29 18:53:16.016387394 +0100 -@@ -65,5 +65,3 @@ - } - - } // end namespace Avogadro -- --#include "plugin.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp ---- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp 2011-11-29 18:53:23.569679807 +0100 -@@ -784,5 +784,3 @@ - } - - } -- --#include "pluginmanager.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/primitive.cpp avogadro-1.0.3-edit/libavogadro/src/primitive.cpp ---- avogadro-1.0.3/libavogadro/src/primitive.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/primitive.cpp 2011-11-29 18:53:29.139649631 +0100 -@@ -77,5 +77,3 @@ - } - - } -- --#include "primitive.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/protein.cpp avogadro-1.0.3-edit/libavogadro/src/protein.cpp ---- avogadro-1.0.3/libavogadro/src/protein.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/protein.cpp 2011-11-29 18:53:37.952935219 +0100 -@@ -978,5 +978,3 @@ - } - - } // End namespace Avogadro -- --#include "protein.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt ---- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt 2011-11-29 18:58:02.354836165 +0100 -@@ -11,9 +11,9 @@ - # use all cpp files in this directory - FILE(GLOB wrapper_SRCS "*.cpp") - --qt4_automoc(moleculelist.cpp) -+QT4_WRAP_CPP(MOC_SRCS moleculelist.h) - --ADD_LIBRARY(python-module MODULE ${wrapper_SRCS}) -+ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS}) - SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro) - SET_TARGET_PROPERTIES(python-module PROPERTIES PREFIX "") - if (WIN32) -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp ---- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp 2011-11-29 19:26:07.562214311 +0100 -+++ avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp 2011-11-29 19:26:14.538843182 +0100 -@@ -70,4 +70,3 @@ - - } - --#include "moleculelist.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp ---- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp 2011-11-29 18:53:45.492894371 +0100 -@@ -289,5 +289,3 @@ - - - } -- --#include "pythonengine_p.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonerror.cpp avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp ---- avogadro-1.0.3/libavogadro/src/pythonerror.cpp 2011-11-29 19:24:26.949426045 +0100 -+++ avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp 2011-11-29 19:24:41.176015640 +0100 -@@ -112,4 +112,3 @@ - - } // namespace - --#include "pythonerror.moc" - -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp ---- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp 2011-11-29 18:53:54.082847836 +0100 -@@ -340,5 +340,3 @@ - } - - } -- --#include "pythonextension_p.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp ---- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp 2011-11-29 18:54:02.269470152 +0100 -@@ -344,5 +344,3 @@ - } - - } -- --#include "pythontool_p.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/residue.cpp avogadro-1.0.3-edit/libavogadro/src/residue.cpp ---- avogadro-1.0.3/libavogadro/src/residue.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/residue.cpp 2011-11-29 18:54:14.316071557 +0100 -@@ -160,6 +160,3 @@ - } - - } // End namespace Avogadro -- -- #include "residue.moc" -- -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/tool.cpp avogadro-1.0.3-edit/libavogadro/src/tool.cpp ---- avogadro-1.0.3/libavogadro/src/tool.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/tool.cpp 2011-11-29 18:55:05.515794184 +0100 -@@ -117,5 +117,3 @@ - } - - } // end namespace Avogadro -- --#include "tool.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/toolgroup.cpp avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp ---- avogadro-1.0.3/libavogadro/src/toolgroup.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp 2011-11-29 18:55:11.699094018 +0100 -@@ -206,5 +206,3 @@ - } - - } // end namespace Avogadro -- --#include "toolgroup.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/zmatrix.cpp avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp ---- avogadro-1.0.3/libavogadro/src/zmatrix.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp 2011-11-29 18:55:17.209064168 +0100 -@@ -149,5 +149,3 @@ - - - } // End namespace Avogadro -- --#include "zmatrix.moc" diff --git a/staging/bind/127.0.0.zone b/staging/bind/127.0.0.zone deleted file mode 100644 index 509c311f6..000000000 --- a/staging/bind/127.0.0.zone +++ /dev/null @@ -1,11 +0,0 @@ -$ORIGIN 0.0.127.in-addr.arpa. - -@ 1D IN SOA localhost. root.localhost. ( - 42 ; serial (yyyymmdd##) - 3H ; refresh - 15M ; retry - 1W ; expiry - 1D ) ; minimum ttl - - 1D IN NS localhost. -1 1D IN PTR localhost. diff --git a/staging/bind/PKGBUILD b/staging/bind/PKGBUILD deleted file mode 100644 index 99bbd00d4..000000000 --- a/staging/bind/PKGBUILD +++ /dev/null @@ -1,86 +0,0 @@ -# $Id: PKGBUILD 161312 2012-06-09 06:22:34Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> -# Contributor: Mario Vazquez <mario_vazq@hotmail.com> - -pkgname=bind - -# Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.9.1.P1 -_pkgver=9.9.1-P1 -pkgrel=2 - -pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols' -url='http://www.isc.org/software/bind/' -license=('custom:ISC') -arch=('i686' 'x86_64') -options=('!makeflags' '!libtool') -depends=('openssl' 'krb5' 'libxml2') -source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" - 'root.hint::http://www.internic.net/zones/named.root' - 'remove-tools.patch' - 'named' - 'named.conf' - 'named.conf.d' - 'named.service' - 'named.logrotate' - 'localhost.zone' - '127.0.0.zone') -sha1sums=('a2263b96ccd8a143ea54b39958142c542bf605a8' - 'cbdecd1ea8e7b612b33b63d66bc57273795d1f54' - '18f477f510df31e6c6f547ee2d5fc46e973479bf' - '46232e9db243c6c05e170a1781d7a7f413be5d03' - '5ca7a5f2a132548a090a045a2df3acea6b35d9eb' - '7848edbfb9a848843f57c11c02b0289eefd42d00' - '05fb2346a30dee2f99c40914dd23708729839b64' - '9ffb5c3f72390a517aeae557e32349d5d278cb63' - '76a0d4cd1b913db177a5a375bebc47e5956866ec' - '53be0f1437ebe595240d8dbdd819939582b97fb9') - -provides=('dns-server') - -install=install -backup=('etc/logrotate.d/named' - 'etc/conf.d/named' - 'etc/named.conf') - -build() { - cd "${srcdir}/bind-${_pkgver}" - - patch -p1 -i ../remove-tools.patch - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --disable-linux-caps \ - --with-openssl \ - --with-libxml2 \ - --with-libtool \ - - make -} - -package() { - cd "${srcdir}/bind-${_pkgver}" - - install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - make DESTDIR="${pkgdir}" install - - rmdir "${pkgdir}/var/run" - install -d "${pkgdir}"/usr/share/doc/bind - install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind - - install -D -m755 ../named "${pkgdir}"/etc/rc.d/named - install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named - install -D -m644 ../named.service "${pkgdir}"/usr/lib/systemd/system/named.service - install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named - install -D -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf - - install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named - install -m640 -o 0 -g 40 ../root.hint "${pkgdir}"/var/named - install -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named - install -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named -} diff --git a/staging/bind/install b/staging/bind/install deleted file mode 100644 index 287d0e05b..000000000 --- a/staging/bind/install +++ /dev/null @@ -1,21 +0,0 @@ -post_install() { - getent group named &>/dev/null || groupadd -g 40 named - getent passwd named &>/dev/null || useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named - passwd -l named &>/dev/null - - touch var/log/named.log - chown named:named var/log/named.log - - # create an rndc.key if it doesn't already exist - if [[ ! -s etc/rndc.key ]]; then - usr/sbin/rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key - chown root:named etc/rndc.key - chmod 640 etc/rndc.key - fi -} - -pre_remove() { - getent passwd named &>/dev/null && userdel named >/dev/null - getent group named &>/dev/null && groupdel named >/dev/null - return 0 -} diff --git a/staging/bind/localhost.zone b/staging/bind/localhost.zone deleted file mode 100644 index e3ff9641c..000000000 --- a/staging/bind/localhost.zone +++ /dev/null @@ -1,10 +0,0 @@ -$ORIGIN localhost. -@ 1D IN SOA @ root ( - 42 ; serial (yyyymmdd##) - 3H ; refresh - 15M ; retry - 1W ; expiry - 1D ) ; minimum ttl - - 1D IN NS @ - 1D IN A 127.0.0.1 diff --git a/staging/bind/named b/staging/bind/named deleted file mode 100755 index 7907f9983..000000000 --- a/staging/bind/named +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/named - -[[ -d /var/run/named ]] || mkdir -p /var/run/named -chown named:named /var/run/named - -PIDFILE=/var/run/named/named.pid -PID=$(cat $PIDFILE 2>/dev/null) -readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/named' || { PID=; rm $PIDFILE 2>/dev/null; } - -case "$1" in - start) - stat_busy "Starting BIND" - [ -z "$PID" ] && /usr/sbin/named ${NAMED_ARGS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon named - stat_done - fi - ;; - stop) - stat_busy "Stopping BIND" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon named - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - reload) - stat_busy "Reloading BIND" - [ ! -z "$PID" ] && rndc reload &>/dev/null || kill -HUP $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - *) - echo "usage: $0 {start|stop|reload|restart}" -esac -exit 0 diff --git a/staging/bind/named.conf b/staging/bind/named.conf deleted file mode 100644 index 38fb12cbe..000000000 --- a/staging/bind/named.conf +++ /dev/null @@ -1,64 +0,0 @@ -// -// /etc/named.conf -// - -options { - directory "/var/named"; - pid-file "/var/run/named/named.pid"; - auth-nxdomain yes; - datasize default; -// Uncomment these to enable IPv6 connections support -// IPv4 will still work: -// listen-on-v6 { any; }; -// Add this for no IPv4: -// listen-on { none; }; - - // Default security settings. - allow-recursion { 127.0.0.1; }; - allow-transfer { none; }; - allow-update { none; }; - version none; - hostname none; - server-id none; -}; - -zone "localhost" IN { - type master; - file "localhost.zone"; - allow-transfer { any; }; -}; - -zone "0.0.127.in-addr.arpa" IN { - type master; - file "127.0.0.zone"; - allow-transfer { any; }; -}; - -zone "." IN { - type hint; - file "root.hint"; -}; - -//zone "example.org" IN { -// type slave; -// file "example.zone"; -// masters { -// 192.168.1.100; -// }; -// allow-query { any; }; -// allow-transfer { any; }; -//}; - -logging { - channel xfer-log { - file "/var/log/named.log"; - print-category yes; - print-severity yes; - print-time yes; - severity info; - }; - category xfer-in { xfer-log; }; - category xfer-out { xfer-log; }; - category notify { xfer-log; }; -}; - diff --git a/staging/bind/named.conf.d b/staging/bind/named.conf.d deleted file mode 100644 index aecbd2307..000000000 --- a/staging/bind/named.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to BIND -# -NAMED_ARGS="-u named" diff --git a/staging/bind/named.logrotate b/staging/bind/named.logrotate deleted file mode 100644 index ef1a2d032..000000000 --- a/staging/bind/named.logrotate +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/named.log { - missingok - postrotate - /bin/kill -HUP `cat /var/run/named/named.pid 2>/dev/null` 2>/dev/null || true - endscript -} diff --git a/staging/bind/named.service b/staging/bind/named.service deleted file mode 100644 index 77196f785..000000000 --- a/staging/bind/named.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Internet domain name server - -[Service] -ExecStart=/usr/sbin/named -f -u named -ExecReload=/usr/sbin/rndc reload -ExecStop=/usr/sbin/rndc stop - -[Install] -WantedBy=multi-user.target diff --git a/staging/bind/remove-tools.patch b/staging/bind/remove-tools.patch deleted file mode 100644 index cbd1c53ad..000000000 --- a/staging/bind/remove-tools.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur old/bin/Makefile.in new/bin/Makefile.in ---- old/bin/Makefile.in 2009-10-05 05:07:08.000000000 -0700 -+++ new/bin/Makefile.in 2011-08-28 19:14:17.025674400 -0700 -@@ -19,7 +19,7 @@ - VPATH = @srcdir@ - top_srcdir = @top_srcdir@ - --SUBDIRS = named rndc dig dnssec tests tools nsupdate \ -+SUBDIRS = named rndc dnssec tests tools nsupdate \ - check confgen @PKCS11_TOOLS@ - TARGETS = - diff --git a/staging/binutils/PKGBUILD b/staging/binutils/PKGBUILD deleted file mode 100644 index fc28ad232..000000000 --- a/staging/binutils/PKGBUILD +++ /dev/null @@ -1,96 +0,0 @@ -# $Id: PKGBUILD 165120 2012-08-11 08:23:19Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc - -pkgname=binutils -pkgver=2.22 -pkgrel=10 -_date=20120323 -pkgdesc="A set of programs to assemble and manipulate binary and object files" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/binutils/" -license=('GPL') -groups=('base-devel') -depends=('glibc>=2.16' 'zlib') -checkdepends=('dejagnu') -options=('!libtool' '!distcc' '!ccache') -install=binutils.install -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2) -md5sums=('de2ac4298732827f8af706fc24020330') - -mksource() { - mkdir ${pkgname}-${_date} - cd ${pkgname}-${_date} - export _TAG=binutils-2_22-branch - export 'CVSROOT=:pserver:anoncvs@sourceware.org:/cvs/src' - cvs -z9 co -r $_TAG binutils || return 1 - mv src binutils - tar -cvjf ../binutils-${pkgver}_${_date}.tar.bz2 binutils/* -} - -build() { - cd ${srcdir} - mkdir binutils-build && cd binutils-build - - [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib" - - ${srcdir}/binutils/configure --prefix=/usr \ - --with-lib-path=/usr/lib:/usr/local/lib \ - --enable-ld=default --enable-gold \ - --enable-plugins --enable-threads \ - --enable-shared $CONFIGFLAG - - # check the host environment and makes sure all the necessary tools are available - make configure-host - - make tooldir=${pkgdir}/usr - - # Rebuild libiberty.a with -fPIC - cp -a libiberty libiberty-pic - make -C libiberty-pic clean - make CFLAGS="$CFLAGS -fPIC" -C libiberty-pic - - # Rebuild libbfd.a with -fPIC - # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API - cp -a bfd bfd-pic - make -C bfd-pic clean - make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd-pic - - # Rebuild libopcodes.a with -fPIC - cp -a opcodes opcodes-pic - make -C opcodes-pic clean - make CFLAGS="$CFLAGS -fPIC" -C opcodes-pic -} - -check() { - cd ${srcdir}/binutils-build - - # do not abort on errors - manually check log files - # gold testsuite does not build with _FORTIFY_SOURCE (due to -O0 -Werror) - make CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}" \ - CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/}" -k check || true -} - -package() { - cd ${srcdir}/binutils-build - make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install - - # Add some useful headers - install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include - install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include - - # install libraries rebuilt with -fPIC - install -m644 libiberty-pic/libiberty.a ${pkgdir}/usr/lib - install -m644 bfd-pic/libbfd.a ${pkgdir}/usr/lib - install -m644 opcodes/libopcodes.a ${pkgdir}/usr/lib - - # Remove Windows/Novell specific man pages - rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}* - - # Remove these symlinks, they are not ABI stable. - # Programs should compile static to the .a file. - rm -f ${pkgdir}/usr/lib/lib{bfd,opcodes}.so - echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so - echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so -} diff --git a/staging/binutils/binutils.install b/staging/binutils/binutils.install deleted file mode 100644 index 8bf9f3a47..000000000 --- a/staging/binutils/binutils.install +++ /dev/null @@ -1,17 +0,0 @@ -infodir=usr/share/info -filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - diff --git a/staging/boost/PKGBUILD b/staging/boost/PKGBUILD deleted file mode 100644 index 0b6dc502c..000000000 --- a/staging/boost/PKGBUILD +++ /dev/null @@ -1,113 +0,0 @@ -# $Id: PKGBUILD 163072 2012-07-06 15:51:12Z ibiru $ -# Maintainer: kevin <kevin@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Kritoke <kritoke@gamebox.net> -# Contributor: Luca Roccia <little_rock@users.sourceforge.net> - -pkgbase=boost -pkgname=('boost-libs' 'boost') -pkgver=1.50.0 -_boostver=${pkgver//./_} -pkgrel=1 -arch=('i686' 'x86_64') -url="http://www.boost.org/" -makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') -source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz) -license=('custom') -md5sums=('dbc07ab0254df3dda6300fd737b3f264') - -_stagedir="${srcdir}/stagedir" - -build() { - # set python path for bjam - cd "${srcdir}/${pkgbase}_${_boostver}/tools" - echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam - echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam - echo "using mpi ;" >> build/v2/user-config.jam - - cd "${srcdir}"/${pkgbase}_${_boostver} - - # build bjam - cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine" - ./build.sh cc - - _bindir="bin.linuxx86" - [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64" - - install -d "${_stagedir}"/usr/bin - install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam - - # build tools - cd "${srcdir}/${pkgbase}_${_boostver}/tools/" - "${_stagedir}"/usr/bin/bjam --toolset=gcc - - # copy the tools - cd "${srcdir}/${pkgbase}_${_boostver}/dist/bin" - for i in *;do - install -m755 "${i}" "${_stagedir}/usr/bin/${i}" - done - - #boostbook needed by quickbook - cd "${srcdir}/${pkgbase}_${_boostver}/dist/" - cp -r share "${_stagedir}" - - # build libs - cd "${srcdir}/${pkgbase}_${_boostver}" - - # default "minimal" install: "release link=shared,static - # runtime-link=shared threading=single,multi" - # --layout=tagged will add the "-mt" suffix for multithreaded libraries - # and installs includes in /usr/include/boost. - # --layout=system no longer adds the -mt suffix for multi-threaded libs. - # install to ${_stagedir} in preparation for split packaging - - "${_stagedir}"/usr/bin/bjam \ - release debug-symbols=off threading=multi \ - runtime-link=shared link=shared,static \ - cflags=-fno-strict-aliasing \ - toolset=gcc \ - --prefix="${_stagedir}" \ - -sTOOLS=gcc \ - --layout=system \ - ${MAKEFLAGS} \ - install -} - -package_boost() { - pkgdesc="Free peer-reviewed portable C++ source libraries - Development" - depends=("boost-libs=${pkgver}") - optdepends=('python: for python bindings' - 'python2: for python2 bindings' - 'boost-build: to use boost jam for building your project.') - - install -d "${pkgdir}"/usr/{include,lib,share} - # headers/source files - cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/ - - # static libs - cp -r "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/ - - # utilities (bjam, bcp, pyste) - cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/ - - #boostbook - cp -r "${_stagedir}"/share/* "${pkgdir}"/usr/share - - # license - install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \ - "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt -} - -package_boost-libs() { - pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime" - depends=('gcc-libs' 'bzip2' 'zlib' 'icu') - optdepends=('openmpi: for mpi support') - - install -d "${pkgdir}/usr/lib" - #shared libs - cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib/" - - # license - install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \ - "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt -} diff --git a/staging/bzflag/PKGBUILD b/staging/bzflag/PKGBUILD deleted file mode 100644 index f85dd2996..000000000 --- a/staging/bzflag/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 169489 2012-10-22 02:45:00Z bisson $ -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> -# Contributor: Kevin Piche <kevin@archlinux.org> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> - -pkgname=bzflag -pkgver=2.4.2 -pkgrel=2 -pkgdesc='Multiplayer 3D tank battle game' -url='http://bzflag.org/' -license=('LGPL') -options=('!libtool') -arch=('i686' 'x86_64') -depends=('curl' 'glew' 'glu' 'sdl') -makedepends=('mesa') # glu requires <GL/gl.h> -source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2") -sha1sums=('36c67c0734a1318b34b39ed0da49606e05ebd291') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr - make - - cd misc - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -Dm644 misc/bzflag.desktop "${pkgdir}"/usr/share/applications/bzflag.desktop - install -Dm644 data/bzflag-48x48.png "${pkgdir}"/usr/share/pixmaps/bzflag-48x48.png -} diff --git a/staging/bzr/PKGBUILD b/staging/bzr/PKGBUILD deleted file mode 100644 index 22244baf0..000000000 --- a/staging/bzr/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 168772 2012-10-15 21:04:59Z eric $ -# Maintainer : -# Contributor: Hugo Doria <hugo@archlinux.org> - -pkgname=bzr -pkgver=2.5.1 -pkgrel=2 -pkgdesc="A decentralized revision control system (bazaar)" -arch=('i686' 'x86_64') -url="http://bazaar.canonical.com/en/" -license=('GPL') -depends=('python2') -optdepends=('python2-paramiko: for sftp support') -source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.sig}) -md5sums=('ac5079858364a046071000d5cdccb67b' - 'c83dd08dd2c3e27edbab873500d7d6eb') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|man/man1|share/man/man1|' setup.py - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ - bzrlib/{plugins/bash_completion/bashcomp.py,tests/ssl_certs/create_ssls.py,patiencediff.py,_patiencediff_py.py} - python2 setup.py build -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 - - # bash-completion - install -D -m644 contrib/bash/bzr \ - "${pkgdir}/usr/share/bash-completion/completions/bzr" -} diff --git a/staging/cabal-install/PKGBUILD b/staging/cabal-install/PKGBUILD deleted file mode 100644 index 30bffb560..000000000 --- a/staging/cabal-install/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -pkgname=cabal-install -pkgver=0.14.0 -pkgrel=2 -pkgdesc="The command-line interface for Cabal and Hackage." -url="http://hackage.haskell.org/package/cabal-install" -license=('custom:BSD3') -arch=('i686' 'x86_64') -makedepends=('haskell-http=4000.2.3-1' 'haskell-zlib=0.5.3.3-4' 'haskell-mtl=2.1.1-1' 'haskell-network=2.3.0.14-1' 'haskell-random=1.0.1.1-2') -depends=('ghc' 'gmp' 'zlib') -source=(http://hackage.haskell.org/packages/archive/cabal-install/$pkgver/cabal-install-$pkgver.tar.gz) -md5sums=('638514bd1a5792d75866481852148ae5') - -build() { - cd cabal-install-${pkgver} - runhaskell Setup configure --enable-shared --enable-split-objs --enable-executable-stripping --prefix=/usr - runhaskell Setup build -} - -package() { - cd cabal-install-${pkgver} - runhaskell Setup copy --destdir=$pkgdir - - # rm license installed to wrong location - rm -rf ${pkgdir}/usr/share/doc - - install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE - - # add bash completion - install -d ${pkgdir}/usr/share/bash-completion/completions - install -m644 bash-completion/cabal \ - ${pkgdir}/usr/share/bash-completion/completions -} diff --git a/staging/calligra/PKGBUILD b/staging/calligra/PKGBUILD deleted file mode 100644 index 85b4826c3..000000000 --- a/staging/calligra/PKGBUILD +++ /dev/null @@ -1,221 +0,0 @@ -# $Id: PKGBUILD 169379 2012-10-20 09:05:17Z andrea $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgbase=calligra -pkgname=('calligra-filters' - 'calligra-libs' - 'calligra-plugins' - 'calligra-tools' - 'calligra-karbon' - 'calligra-kexi' - 'calligra-plan' - 'calligra-stage' - 'calligra-krita' - 'calligra-sheets' - 'calligra-words' - 'calligra-handbook' - 'calligra-braindump' - 'calligra-flow') -pkgver=2.5.3 -pkgrel=6 -arch=('i686' 'x86_64') -url='http://www.calligra-suite.org/' -license=('FDL1.2' 'GPL2' 'LGPL') -makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble' - 'lcms2' 'libmysqlclient' 'libpqxx' 'freetds' 'xbase' 'libwpg' - 'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw' - 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'mesa') -groups=('calligra') -source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('83e2679b7ecb923b953ace06db7ca4c2') - -build() { - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_active=OFF - make -} - -package_calligra-filters() { - pkgdesc="Filters for the Calligra office suite" - optdepends=('libwpg: Corel WordPerfect Graphics image importer' - 'libwps: Microsoft Works file word processor format import') - conflicts=('koffice-filters') - replaces=('koffice-filters') - install=calligra-filters.install - - cd "${srcdir}"/build/filters - make DESTDIR="${pkgdir}" install -} - -package_calligra-libs() { - pkgdesc="Libraries for the Calligra office suite" - depends=('kdepimlibs' 'lcms2') - conflicts=('koffice-interfaces' 'koffice-libs' 'koffice-pics' - 'koffice-servicetypes' 'koffice-templates' 'calligra-interfaces' - 'calligra-libs' 'calligra-pics' 'calligra-servicetypes' - 'calligra-templates') - replaces=('koffice-interfaces' 'koffice-libs' 'koffice-pics' - 'koffice-servicetypes' 'koffice-templates' 'calligra-interfaces' - 'calligra-libs' 'calligra-pics' 'calligra-servicetypes' - 'calligra-templates') - - for d in interfaces libs pics servicetypes templates; do - cd "${srcdir}"/build/${d} - make DESTDIR="${pkgdir}" install - done -} - -package_calligra-plugins() { - pkgdesc="Plugins for the Calligra office suite" - depends=('calligra-libs' 'calligra-filters') - optdepends=('kdeedu-marble: map shape for Calligra') - conflicts=('koffice-plugins' 'koffice-kchart') - replaces=('koffice-plugins' 'koffice-kchart' 'koffice-kformula') - - cd "${srcdir}"/build/plugins - make DESTDIR="${pkgdir}" install -} - -package_calligra-tools() { - pkgdesc="Tools for the Calligra office suite" - depends=('calligra-libs') - conflicts=('koffice-tools') - replaces=('koffice-tools') - install=calligra-tools.install - - cd "${srcdir}"/build/tools - make DESTDIR="${pkgdir}" install -} - -package_calligra-karbon() { - pkgdesc="Create scalable vector drawings" - depends=('calligra-libs' 'kdebase-runtime' 'pstoedit') - optdepends=('calligra-filters: import/export filters' - 'calligra-tools: extra calligra tools') - conflicts=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc') - replaces=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc') - install=calligra-karbon.install - - cd "${srcdir}"/build/karbon - make DESTDIR="${pkgdir}" install -} - -package_calligra-kexi() { - pkgdesc="Develop desktop database applications" - depends=('calligra-libs' 'glew' 'fftw') - optdepends=('libmysqlclient: MySQL driver' - 'libpqxx: PostgreSQL driver' - 'freetds: Sybase & MS SQL driver' - 'xbase: XBase driver' - 'calligra-sheets: Spreadsheet-to-Kexi-table import plugin' - 'kdeedu-marble: map form widget' - 'calligra-plugins: extra calligra plugins') - conflicts=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc') - replaces=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc') - install=calligra-kexi.install - - cd "${srcdir}"/build/kexi - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/kexi - make DESTDIR="${pkgdir}" install -} - -package_calligra-plan() { - pkgdesc="Calligra Project Management Component" - depends=('calligra-words') - conflicts=('koffice-kplato' 'calligra-kplato') - replaces=('koffice-kplato' 'calligra-kplato') - install=calligra-plan.install - - cd "${srcdir}"/build/plan - make DESTDIR="${pkgdir}" install -} - -package_calligra-stage() { - pkgdesc="Write presentation documents" - depends=('calligra-libs' 'kdebase-runtime') - optdepends=('calligra-plugins: extra calligra plugins') - conflicts=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc') - replaces=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc') - install=calligra-stage.install - - cd "${srcdir}"/build/stage - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/stage - make DESTDIR="${pkgdir}" install -} - -package_calligra-krita() { - pkgdesc="Edit and paint images" - depends=('calligra-plugins' 'kdebase-runtime' 'eigen2' - 'poppler-qt' 'libkdcraw' 'fftw' 'glew' 'opengtl') - conflicts=('koffice-krita' 'calligra-krita-doc') - replaces=('koffice-krita' 'calligra-krita-doc') - install=calligra-krita.install - - cd "${srcdir}"/build/krita - make DESTDIR="${pkgdir}" install -} - -package_calligra-sheets() { - pkgdesc="Write spreadsheet documents" - depends=('calligra-libs' 'gsl' 'kdebase-runtime') - optdepends=('calligra-filters: import/export filters' - 'calligra-plugins: extra calligra plugins' - 'calligra-tools: extra calligra tools') - conflicts=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables') - replaces=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables') - install=calligra-sheets.install - - cd "${srcdir}"/build/sheets - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/sheets - make DESTDIR="${pkgdir}" install -} - -package_calligra-words() { - pkgdesc="Word Processor" - depends=('calligra-libs' 'kdegraphics-okular') - optdepends=('calligra-tools: extra calligra tools') - conflicts=('koffice-kword') - replaces=('koffice-kword') - install=calligra-words.install - - cd "${srcdir}"/build/words - make DESTDIR="${pkgdir}" install -} - -package_calligra-handbook() { - pkgdesc="Documentation for Calligra" - conflicts=('koffice-handbook') - replaces=('koffice-handbook') - options=('docs') - - cd "${srcdir}"/build/doc/calligra - make DESTDIR="${pkgdir}" install -} - -package_calligra-braindump() { - pkgdesc="Notes and idea gathering" - depends=('calligra-libs' 'kdebase-runtime') - install=calligra-braindump.install - - cd "${srcdir}"/build/braindump - make DESTDIR="${pkgdir}" install -} - -package_calligra-flow() { - pkgdesc="Flowchart & Diagram Editing" - depends=('calligra-words') - conflicts=('calligra-flow-doc') - replaces=('calligra-flow-doc') - install=calligra-flow.install - - cd "${srcdir}"/build/flow - make DESTDIR="${pkgdir}" install -} diff --git a/staging/calligra/calligra-braindump.install b/staging/calligra/calligra-braindump.install deleted file mode 100644 index c2179f6e2..000000000 --- a/staging/calligra/calligra-braindump.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}
\ No newline at end of file diff --git a/staging/calligra/calligra-filters.install b/staging/calligra/calligra-filters.install deleted file mode 100644 index 7c8a8bd2b..000000000 --- a/staging/calligra/calligra-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/calligra/calligra-flow.install b/staging/calligra/calligra-flow.install deleted file mode 100644 index 6c87527e2..000000000 --- a/staging/calligra/calligra-flow.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/calligra/calligra-karbon.install b/staging/calligra/calligra-karbon.install deleted file mode 100644 index c2179f6e2..000000000 --- a/staging/calligra/calligra-karbon.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}
\ No newline at end of file diff --git a/staging/calligra/calligra-kexi.install b/staging/calligra/calligra-kexi.install deleted file mode 100644 index b8c7ebf27..000000000 --- a/staging/calligra/calligra-kexi.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/calligra/calligra-krita.install b/staging/calligra/calligra-krita.install deleted file mode 100644 index 33d234a02..000000000 --- a/staging/calligra/calligra-krita.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}
\ No newline at end of file diff --git a/staging/calligra/calligra-plan.install b/staging/calligra/calligra-plan.install deleted file mode 100644 index c2179f6e2..000000000 --- a/staging/calligra/calligra-plan.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}
\ No newline at end of file diff --git a/staging/calligra/calligra-sheets.install b/staging/calligra/calligra-sheets.install deleted file mode 100644 index 6c87527e2..000000000 --- a/staging/calligra/calligra-sheets.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/calligra/calligra-stage.install b/staging/calligra/calligra-stage.install deleted file mode 100644 index 6c87527e2..000000000 --- a/staging/calligra/calligra-stage.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/calligra/calligra-tools.install b/staging/calligra/calligra-tools.install deleted file mode 100644 index 6c87527e2..000000000 --- a/staging/calligra/calligra-tools.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/calligra/calligra-words.install b/staging/calligra/calligra-words.install deleted file mode 100644 index 6c87527e2..000000000 --- a/staging/calligra/calligra-words.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/calligra/calligra.install b/staging/calligra/calligra.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/calligra/calligra.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/cinepaint/LICENSE b/staging/cinepaint/LICENSE deleted file mode 100644 index 746207229..000000000 --- a/staging/cinepaint/LICENSE +++ /dev/null @@ -1,25 +0,0 @@ -Copyright (c) 2005, Kai-Uwe Behrmann -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution.ntributors may be used to endorse or promote - products derived from this software without specific prior written - permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/staging/cinepaint/PKGBUILD b/staging/cinepaint/PKGBUILD deleted file mode 100644 index d8d5e0195..000000000 --- a/staging/cinepaint/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 169355 2012-10-20 02:54:29Z eric $ -# Maintainer: tobias [tobias.archlinux.org] -# Contributor: tobias [tobias.justdreams.de] - -pkgname=cinepaint -pkgver=1.3 -pkgrel=5 -pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures" -arch=('i686' 'x86_64') -license=('LGPL' 'GPL' 'MIT') -url="http://www.cinepaint.org" -depends=('gtk2' 'openexr' 'lcms' 'libxpm' 'fltk' 'ftgl' 'libxxf86vm') -makedepends=('python2' 'gutenprint>=5.2.9') -optdepends=('python2: for python plug-ins' - 'gutenprint: for print plug-ins' - 'ghostscript: for pdf plug-ins') -options=('!libtool') -install=cinepaint.install -source=(http://downloads.sourceforge.net/project/cinepaint/CinePaint/CinePaint-${pkgver}/${pkgname}-${pkgver}.tgz - LICENSE cinepaint-libpng15.patch cinepaint-missing-include.patch) -sha1sums=('1982e32b0f461f4fd0ff0fe17a2e81ccd8dbd52b' - 'ca8411db87f3fc51bbdfade22f4e1f555b2ee19e' - '3dfc9f06f02791aee59b60d33ddf9d305b0f1de5' - 'a4f43aabdbb33d059f1a38442cd6625e4f00c5b9') - -build() { - cd "${srcdir}/${pkgname}" - patch -p1 -i ../cinepaint-libpng15.patch - patch -p1 -i ../cinepaint-missing-include.patch - find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} + - sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in - -# aclocal -I aclocal -# autoconf - sh autogen.sh - - LIBS+="-lstdc++ -lm -lX11" ./configure --prefix=/usr --libdir=/usr/lib --mandir=/usr/share/man \ - --enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2 - sed -i 's/-Wl,,/-Wl,/' lib/fl_i18n/Makefile plug-ins/bracketing_to_hdr/Makefile \ - plug-ins/collect/Makefile plug-ins/icc_examin/icc_examin/Makefile plug-ins/pdf/Makefile - make -} - -package() { - cd "${srcdir}/${pkgname}" - make DESTDIR="${pkgdir}" install - sed -i -e "s|-I$srcdir/cinepaint||" -e "s|-I$srcdir/cinepaint/lib||" -e "/libcinepaint.la/d" \ - -e "s|$srcdir/cinepaint/lib/.libs/\$dlname||" "${pkgdir}/usr/bin/cinepainttool" - sed -i "s/cinepaint.png/cinepaint/" "${pkgdir}/usr/share/applications/cinepaint.desktop" - install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/cinepaint/cinepaint-libpng15.patch b/staging/cinepaint/cinepaint-libpng15.patch deleted file mode 100644 index e22edafae..000000000 --- a/staging/cinepaint/cinepaint-libpng15.patch +++ /dev/null @@ -1,452 +0,0 @@ -diff -Naur cinepaint.old/plug-ins/png/png.c cinepaint/plug-ins/png/png.c ---- cinepaint.old/plug-ins/png/png.c 2012-01-23 12:39:42.000000000 -0500 -+++ cinepaint/plug-ins/png/png.c 2012-01-23 12:39:50.000000000 -0500 -@@ -390,6 +390,16 @@ - gchar *progress; /* Title for progress display... */ - guchar alpha[256], /* Index -> Alpha */ - *alpha_ptr; /* Temporary pointer */ -+ png_byte color_type; -+ png_byte bit_depth; -+ png_colorp palette; -+ int num_palette; -+ png_charpp iccp_name; -+ int compression_type; -+ png_bytepp iccp_profile; -+ png_uint_32 iccp_proflen; -+ png_uint_32 width, height; -+ png_byte channels; - - /* - * PNG 0.89 and newer have a sane, forwards compatible constructor. -@@ -405,7 +415,7 @@ - info = (png_infop)calloc(sizeof(png_info), 1); - #endif /* PNG_LIBPNG_VER > 88 */ - -- if (setjmp (pp->jmpbuf)) -+ if (setjmp (png_jmpbuf(pp))) - { - g_message ("%s\nPNG error. File corrupted?", filename); - return image; -@@ -442,21 +452,26 @@ - */ - - png_read_info(pp, info); -+ color_type = png_get_color_type(pp, info); -+ width=png_get_image_width(pp, info); -+ height=png_get_image_height(pp, info); - - /* - * Latest attempt, this should be my best yet :) - */ - -+ bit_depth = png_get_bit_depth(pp, info); -+ - #ifndef WORDS_BIGENDIAN -- if(info->bit_depth == 16) -+ if(bit_depth == 16) - png_set_swap(pp); - #endif - -- if (info->color_type == PNG_COLOR_TYPE_GRAY && info->bit_depth < 8) { -+ if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { - png_set_expand(pp); - } - -- if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) { -+ if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8) { - png_set_packing(pp); - } - -@@ -464,8 +479,8 @@ - * Expand G+tRNS to GA, RGB+tRNS to RGBA - */ - -- if (info->color_type != PNG_COLOR_TYPE_PALETTE && -- (info->valid & PNG_INFO_tRNS)) { -+ if (color_type != PNG_COLOR_TYPE_PALETTE && -+ (png_get_valid(pp, info, PNG_INFO_tRNS))) { - png_set_expand(pp); - } - -@@ -482,7 +497,7 @@ - - #if PNG_LIBPNG_VER > 99 - if (png_get_valid(pp, info, PNG_INFO_tRNS) && -- info->color_type == PNG_COLOR_TYPE_PALETTE) -+ color_type == PNG_COLOR_TYPE_PALETTE) - { - png_get_tRNS(pp, info, &alpha_ptr, &num, NULL); - /* Copy the existing alpha values from the tRNS chunk */ -@@ -505,9 +520,9 @@ - - png_read_update_info(pp, info); - -- if(info->bit_depth==16) -+ if(bit_depth==16) - { -- switch (info->color_type) -+ switch (color_type) - { - case PNG_COLOR_TYPE_RGB : /* RGB */ - bpp = 6; -@@ -545,7 +560,7 @@ - } - else - { -- switch (info->color_type) -+ switch (color_type) - { - case PNG_COLOR_TYPE_RGB : /* RGB */ - bpp = 3; -@@ -582,7 +597,7 @@ - }; - } - -- image = gimp_image_new(info->width, info->height, image_type); -+ image = gimp_image_new(width, height, image_type); - if (image == -1) - { - g_message("Can't allocate new image\n%s", filename); -@@ -595,7 +610,7 @@ - * Create the "background" layer to hold the image... - */ - -- layer = gimp_layer_new(image, _("Background"), info->width, info->height, -+ layer = gimp_layer_new(image, _("Background"), width, height, - layer_type, 100, NORMAL_MODE); - gimp_image_add_layer(image, layer, 0); - -@@ -627,20 +642,21 @@ - - empty= 0; /* by default assume no full transparent palette entries */ - -- if (info->color_type & PNG_COLOR_MASK_PALETTE) { -+ if (color_type & PNG_COLOR_MASK_PALETTE) { - - #if PNG_LIBPNG_VER > 99 -+ png_get_PLTE(pp, info, &palette, &num_palette); - if (png_get_valid(pp, info, PNG_INFO_tRNS)) { - for (empty= 0; empty < 256 && alpha[empty] == 0; ++empty); - /* Calculates number of fully transparent "empty" entries */ - -- gimp_image_set_cmap(image, (guchar *) (info->palette + empty), -- info->num_palette - empty); -+ gimp_image_set_cmap(image, (guchar *) (palette + empty), -+ num_palette - empty); - } else { -- gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette); -+ gimp_image_set_cmap(image, (guchar *)palette, num_palette); - } - #else -- gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette); -+ gimp_image_set_cmap(image, (guchar *)palette, num_palette); - #endif /* PNG_LIBPNG_VER > 99 */ - - } -@@ -659,18 +675,19 @@ - */ - - tile_height = gimp_tile_height (); -- pixel = g_new(guchar, tile_height * info->width * bpp); -+ pixel = g_new(guchar, tile_height * width * bpp); - pixels = g_new(guchar *, tile_height); -+ channels=png_get_channels(pp, info); - -- if(info->bit_depth==16) -+ if(bit_depth==16) - { - for (i = 0; i < tile_height; i ++) -- pixels[i] = pixel + info->width * info->channels * i * 2; -+ pixels[i] = pixel + width * channels * i * 2; - } - else - { - for (i = 0; i < tile_height; i ++) -- pixels[i] = pixel + info->width * info->channels * i; -+ pixels[i] = pixel + width * channels * i; - } - - for (pass = 0; pass < num_passes; pass ++) -@@ -680,11 +697,11 @@ - */ - - for (begin = 0, end = tile_height; -- begin < info->height; -+ begin < height; - begin += tile_height, end += tile_height) - { -- if (end > info->height) -- end = info->height; -+ if (end > height) -+ end = height; - - num = end - begin; - -@@ -697,20 +714,21 @@ - gimp_pixel_rgn_set_rect(&pixel_rgn, pixel, 0, begin, - drawable->width, num); - -- gimp_progress_update(((double)pass + (double)end / (double)info->height) / -+ gimp_progress_update(((double)pass + (double)end / (double)height) / - (double)num_passes); - }; - }; - - #if defined(PNG_iCCP_SUPPORTED) - /* set icc profile */ -- if (info->iccp_proflen > 0) { -- gimp_image_set_icc_profile_by_mem (image, info->iccp_proflen, -- info->iccp_profile, -- ICC_IMAGE_PROFILE); -+ png_get_iCCP(pp, info, (png_charpp)iccp_name, &compression_type, iccp_profile, &iccp_proflen); -+ if (iccp_proflen > 0) { -+ gimp_image_set_icc_profile_by_mem (image, iccp_proflen, -+ (gchar *)iccp_profile, -+ ICC_IMAGE_PROFILE); - printf ("%s:%d %s() set embedded profile \"%s\"\n", - __FILE__,__LINE__,__func__, -- info->iccp_name); -+ (char *)iccp_name); - } - #endif - -@@ -808,6 +826,14 @@ - blue; /* Used for palette background */ - time_t cutime; /* Time since epoch */ - struct tm *gmt; /* GMT broken down */ -+ png_byte color_type; -+ png_byte bit_depth; -+ int filter_method=0; -+ png_colorp palette; -+ int num_palette; -+ png_charpp iccp_name; -+ png_uint_32 height; -+ int compression_type; - - /* - * PNG 0.89 and newer have a sane, forwards compatible constructor. -@@ -824,7 +849,7 @@ - info = (png_infop)calloc(sizeof(png_info), 1); - #endif /* PNG_LIBPNG_VER > 88 */ - -- if (setjmp (pp->jmpbuf)) -+ if (setjmp (png_jmpbuf(pp))) - { - g_message ("%s\nPNG error. Couldn't save image", filename); - return 0; -@@ -857,15 +882,6 @@ - drawable = gimp_drawable_get (drawable_ID); - type = gimp_drawable_type (drawable_ID); - -- /* -- * Set the image dimensions, bit depth, interlacing and compression -- */ -- -- png_set_compression_level (pp, pngvals.compression_level); -- -- info->width = drawable->width; -- info->height = drawable->height; -- info->interlace_type = pngvals.interlaced; - - /* - * Set color type and remember bytes per pixel count -@@ -874,71 +890,69 @@ - switch (type) - { - case RGB_IMAGE : -- info->color_type = PNG_COLOR_TYPE_RGB; -- info->bit_depth = 8; -+ color_type = PNG_COLOR_TYPE_RGB; -+ bit_depth = 8; - bpp = 3; - break; - case RGBA_IMAGE : -- info->color_type = PNG_COLOR_TYPE_RGB_ALPHA; -- info->bit_depth = 8; -+ color_type = PNG_COLOR_TYPE_RGB_ALPHA; -+ bit_depth = 8; - bpp = 4; - break; - case GRAY_IMAGE : -- info->color_type = PNG_COLOR_TYPE_GRAY; -- info->bit_depth = 8; -+ color_type = PNG_COLOR_TYPE_GRAY; -+ bit_depth = 8; - bpp = 1; - break; - case GRAYA_IMAGE : -- info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA; -- info->bit_depth = 8; -+ color_type = PNG_COLOR_TYPE_GRAY_ALPHA; -+ bit_depth = 8; - bpp = 2; - break; - case INDEXED_IMAGE : - bpp = 1; -- info->bit_depth = 8; -- info->color_type = PNG_COLOR_TYPE_PALETTE; -- info->valid |= PNG_INFO_PLTE; -- info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors); -- info->num_palette= num_colors; -+ bit_depth = 8; -+ color_type = PNG_COLOR_TYPE_PALETTE; -+ png_get_valid(pp, info, PNG_INFO_PLTE); -+ png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors); - break; - case INDEXEDA_IMAGE : - bpp = 2; -- info->bit_depth = 8; -- info->color_type = PNG_COLOR_TYPE_PALETTE; -+ bit_depth = 8; -+ color_type = PNG_COLOR_TYPE_PALETTE; - respin_cmap (pp, info, image_ID); /* fix up transparency */ - break; - case U16_RGB_IMAGE : -- info->color_type = PNG_COLOR_TYPE_RGB; -- info->bit_depth = 16; -+ color_type = PNG_COLOR_TYPE_RGB; -+ bit_depth = 16; - bpp = 6; - break; - case U16_RGBA_IMAGE : -- info->color_type = PNG_COLOR_TYPE_RGB_ALPHA; -- info->bit_depth = 16; -+ color_type = PNG_COLOR_TYPE_RGB_ALPHA; -+ bit_depth = 16; - bpp = 8; - break; - case U16_GRAY_IMAGE : -- info->color_type = PNG_COLOR_TYPE_GRAY; -- info->bit_depth = 16; -+ color_type = PNG_COLOR_TYPE_GRAY; -+ bit_depth = 16; - bpp = 2; - break; - case U16_GRAYA_IMAGE : -- info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA; -- info->bit_depth = 16; -+ color_type = PNG_COLOR_TYPE_GRAY_ALPHA; -+ bit_depth = 16; - bpp = 4; - break; - case U16_INDEXED_IMAGE : - bpp = 2; -- info->bit_depth = 16; -- info->color_type = PNG_COLOR_TYPE_PALETTE; -- info->valid |= PNG_INFO_PLTE; -- info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors); -- info->num_palette= num_colors; -+ bit_depth = 16; -+ color_type = PNG_COLOR_TYPE_PALETTE; -+ png_get_valid(pp, info, PNG_INFO_PLTE); -+ png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors); - break; - case U16_INDEXEDA_IMAGE : - bpp = 4; -- info->bit_depth = 16; -- info->color_type = PNG_COLOR_TYPE_PALETTE; -+ bit_depth = 16; -+ color_type = PNG_COLOR_TYPE_PALETTE; - respin_cmap (pp, info, image_ID); /* fix up transparency */ - break; - default: -@@ -950,30 +964,36 @@ - * Fix bit depths for (possibly) smaller colormap images - */ - -- if (info->valid & PNG_INFO_PLTE) { -- if (info->num_palette <= 2) -- info->bit_depth= 1; -- else if (info->num_palette <= 4) -- info->bit_depth= 2; -- else if (info->num_palette <= 16) -- info->bit_depth= 4; -+ if (png_get_valid(pp, info, PNG_INFO_PLTE)) { -+ png_get_PLTE(pp, info, &palette, &num_palette); -+ if (num_palette <= 2) -+ bit_depth= 1; -+ else if (num_palette <= 4) -+ bit_depth= 2; -+ else if (num_palette <= 16) -+ bit_depth= 4; - /* otherwise the default is fine */ - } - -+ png_set_compression_level (pp, pngvals.compression_level); -+ png_set_IHDR(pp, info, drawable->width, drawable->height, -+ bit_depth, color_type, pngvals.interlaced, compression_type, filter_method); -+ -+ - // write icc profile - #if defined(PNG_iCCP_SUPPORTED) - if (gimp_image_has_icc_profile (image_ID, ICC_IMAGE_PROFILE)) { -- int size; -+ int size; - char *buffer; - - buffer = gimp_image_get_icc_profile_by_mem (image_ID, &size, - ICC_IMAGE_PROFILE); - png_set_iCCP (pp, info, - gimp_image_get_icc_profile_description (image_ID, ICC_IMAGE_PROFILE), -- 0, buffer, size); -+ 0, (png_const_bytep)buffer, size); - printf ("%s:%d %s() embedd icc profile \"%s\"\n", - __FILE__,__LINE__,__func__, -- info->iccp_name); -+ (char *)iccp_name); - } - #endif - -@@ -1039,13 +1059,13 @@ - * Convert unpacked pixels to packed if necessary - */ - -- if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) -+ if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8) - png_set_packing(pp); - - /* Set swapping for 16 bit per sample images */ - - #ifndef WORDS_BIGENDIAN -- if (info->bit_depth == 16) -+ if (bit_depth == 16) - png_set_swap(pp); - #endif - -@@ -1063,6 +1083,7 @@ - - gimp_pixel_rgn_init(&pixel_rgn, drawable, 0, 0, drawable->width, - drawable->height, FALSE, FALSE); -+ height=png_get_image_height(pp, info); - - for (pass = 0; pass < num_passes; pass ++) - { -@@ -1077,7 +1098,7 @@ - num = end - begin; - - gimp_pixel_rgn_get_rect (&pixel_rgn, pixel, 0, begin, drawable->width, num); -- if (info->valid & PNG_INFO_tRNS) { -+ if (png_get_valid(pp, info, PNG_INFO_tRNS)) { - for (i = 0; i < num; ++i) { - fixed= pixels[i]; - for (k = 0; k < drawable->width; ++k) { -@@ -1085,7 +1106,7 @@ - } - } - /* Forgot this case before, what if there are too many colors? */ -- } else if (info->valid & PNG_INFO_PLTE && bpp == 2) { -+ } else if (png_get_valid(pp, info, PNG_INFO_PLTE) && bpp == 2) { - for (i = 0; i < num; ++i) { - fixed= pixels[i]; - for (k = 0; k < drawable->width; ++k) { -@@ -1095,9 +1116,8 @@ - } - - png_write_rows (pp, pixels, num); -- - gimp_progress_update (((double)pass + (double)end / -- (double)info->height) / (double)num_passes); -+ (double)height) / (double)num_passes); - }; - }; - diff --git a/staging/cinepaint/cinepaint-missing-include.patch b/staging/cinepaint/cinepaint-missing-include.patch deleted file mode 100644 index ed159213a..000000000 --- a/staging/cinepaint/cinepaint-missing-include.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp ---- cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp 2012-04-20 18:51:10.625503826 -0400 -+++ cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp 2012-04-20 18:52:04.478835055 -0400 -@@ -32,6 +32,7 @@ - - #include <list> - #include <string> -+#include <unistd.h> - - #include "icc_modell_beobachter.h" - diff --git a/staging/cinepaint/cinepaint.install b/staging/cinepaint/cinepaint.install deleted file mode 100644 index 5e5cfef4d..000000000 --- a/staging/cinepaint/cinepaint.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - update-desktop-database -q -} diff --git a/staging/clamav/PKGBUILD b/staging/clamav/PKGBUILD deleted file mode 100644 index e9603a4ff..000000000 --- a/staging/clamav/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 161850 2012-06-15 15:33:18Z bisson $ -# Contributor: Dale Blount <dale@archlinux.org> -# Contributor: Gregor Ibic <gregor.ibic@intelicom.si> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> - -pkgname=clamav -pkgver=0.97.5 -pkgrel=1 -pkgdesc='Anti-virus toolkit for Unix' -url='http://www.clamav.net/' -license=('GPL') -options=('!libtool') -arch=('i686' 'x86_64') -depends=('bzip2' 'libltdl') -backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/conf.d/clamav') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" - 'rc.d' - 'conf.d' - 'service' - 'service.fresh' - 'logrotate' - 'tmpfiles.d' - 'config.patch') -sha1sums=('1bb317ead4a1a677a9a11a063fc35a63f22309e9' - 'c9d508c1e5972f0f849d8694c1872455fa9e74de' - 'cb116cdab49a810381a515cbcfb6a6c148547f07' - 'df522b0488f3901e491f148c9300f6bae348c605' - 'cda9a087e5593992150cb456e34c5f6f589aca82' - '7cace58743a36dae3e63e5e0c6cc73ea5ef9a6ee' - 'a224ea9b4d0f4f196827347d54bed51e11c197ea' - '1c8ef193919b041135115170acd6313f008de808') - -install=install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -p1 -i ../config.patch - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc/clamav \ - --with-dbdir=/var/lib/clamav \ - --disable-clamav \ - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # Make sure conf files get installed, because make install - # doesn't do that if clamav is already installed upon building. - install -Dm644 etc/clamd.conf "${pkgdir}"/etc/clamav/clamd.conf - install -Dm644 etc/freshclam.conf "${pkgdir}"/etc/clamav/freshclam.conf - - install -Dm644 ../service.fresh "${pkgdir}"/usr/lib/systemd/system/freshclamd.service - install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/clamd.service - install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/clamav.conf - install -Dm644 ../logrotate "${pkgdir}"/etc/logrotate.d/clamav - install -Dm644 ../conf.d "${pkgdir}"/etc/conf.d/clamav - install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/clamav -} diff --git a/staging/clamav/conf.d b/staging/clamav/conf.d deleted file mode 100644 index 9cd44d9f8..000000000 --- a/staging/clamav/conf.d +++ /dev/null @@ -1,8 +0,0 @@ -# clamav startup script config options - -# change these to "yes" to start -START_FRESHCLAM="no" -START_CLAMD="no" - -# Options to pass to freshclam (man freshclam for more info). -FRESHCLAM_OPTS="-c 12" diff --git a/staging/clamav/config.patch b/staging/clamav/config.patch deleted file mode 100644 index 0640df2c3..000000000 --- a/staging/clamav/config.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -arU 0 old/etc/clamd.conf new/etc/clamd.conf ---- old/etc/clamd.conf 2010-12-02 19:31:21.773357389 +0100 -+++ new/etc/clamd.conf 2010-12-02 19:31:45.873357389 +0100 -@@ -14 +14 @@ --#LogFile /tmp/clamd.log -+LogFile /var/log/clamav/clamd.log -@@ -34 +34 @@ --#LogTime yes -+LogTime yes -@@ -61 +61 @@ --#PidFile /var/run/clamd.pid -+PidFile /run/clamav/clamd.pid -@@ -65 +65 @@ --#TemporaryDirectory /var/tmp -+TemporaryDirectory /tmp -@@ -80 +80 @@ --#LocalSocket /tmp/clamd.socket -+LocalSocket /var/lib/clamav/clamd.sock -@@ -190 +190 @@ --#User clamav -+User clamav -diff -arU 0 old/etc/freshclam.conf new/etc/freshclam.conf ---- old/etc/freshclam.conf 2010-12-02 19:31:21.773357389 +0100 -+++ new/etc/freshclam.conf 2010-12-02 19:31:51.190024057 +0100 -@@ -17 +17 @@ --#UpdateLogFile /var/log/freshclam.log -+UpdateLogFile /var/log/clamav/freshclam.log -@@ -121 +121 @@ --#NotifyClamd /path/to/clamd.conf -+NotifyClamd /etc/clamav/clamd.conf diff --git a/staging/clamav/gcc47.patch b/staging/clamav/gcc47.patch deleted file mode 100644 index 17fc924d9..000000000 --- a/staging/clamav/gcc47.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 8b6757e866d1480c997d5ae497e0512000d82b35 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?T=C3=B6r=C3=B6k=20Edvin?= <edwin@clamav.net> -Date: Mon, 14 May 2012 20:13:21 +0300 -Subject: [PATCH 1/2] Fix build with gcc-4.7 - ---- - .../c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp b/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp -index 274f816..a4e7eee 100644 ---- a/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp -+++ b/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp -@@ -19,6 +19,7 @@ - #include "llvm/Support/ErrorHandling.h" - #include "llvm/System/DynamicLibrary.h" - #include "llvm/Config/config.h" -+#include <unistd.h> - using namespace llvm; - - // AtExitHandlers - List of functions to call when the program exits, --- -1.7.2.3 - - -From c609c8ea0409b2882aa3e6ef4dc48c210cf2d292 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?T=C3=B6r=C3=B6k=20Edvin?= <edwin@clamav.net> -Date: Tue, 15 May 2012 23:36:29 +0300 -Subject: [PATCH 2/2] wrap unistd in ifdef - ---- - .../c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp b/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp -index a4e7eee..c1cd5e8 100644 ---- a/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp -+++ b/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp -@@ -19,7 +19,9 @@ - #include "llvm/Support/ErrorHandling.h" - #include "llvm/System/DynamicLibrary.h" - #include "llvm/Config/config.h" -+#ifdef HAVE_UNISTD_H - #include <unistd.h> -+#endif - using namespace llvm; - - // AtExitHandlers - List of functions to call when the program exits, --- -1.7.2.3 - diff --git a/staging/clamav/install b/staging/clamav/install deleted file mode 100644 index a2092e815..000000000 --- a/staging/clamav/install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - getent group clamav &>/dev/null || groupadd -r -g 64 clamav >/dev/null - getent passwd clamav &>/dev/null || useradd -r -u 64 -g clamav -d /dev/null -s /bin/false -c "Clam AntiVirus" clamav >/dev/null - - chown -R clamav:clamav /var/lib/clamav - install -o clamav -g clamav -d /run/clamav - install -o clamav -g clamav -d /var/log/clamav -} - -post_remove() { - getent passwd clamav &>/dev/null && userdel clamav >/dev/null - getent group clamav &>/dev/null && groupdel clamav >/dev/null - return 0 -} diff --git a/staging/clamav/logrotate b/staging/clamav/logrotate deleted file mode 100644 index 6a9051bed..000000000 --- a/staging/clamav/logrotate +++ /dev/null @@ -1,8 +0,0 @@ -/var/log/clamav/clamd.log /var/log/clamav/freshclam.log { - create 644 clamav clamav - sharedscripts - postrotate - /bin/kill -HUP `cat /run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true - /bin/kill -HUP `cat /run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true - endscript -} diff --git a/staging/clamav/rc.d b/staging/clamav/rc.d deleted file mode 100644 index 127c86c0f..000000000 --- a/staging/clamav/rc.d +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -[[ -f /etc/conf.d/clamav ]] && source /etc/conf.d/clamav - -PID_FC=$(pidof -o %PPID /usr/bin/freshclam) -PID_CD=$(pidof -o %PPID /usr/sbin/clamd) - -case "$1" in - start) - if [[ $START_CLAMD = yes ]]; then - stat_busy "Starting ClamD" - [[ -z $PID_CD ]] && /usr/sbin/clamd - if [[ $? -gt 0 ]]; then - stat_fail - else - add_daemon clamav - stat_done - fi - fi - sleep 1 - if [[ $START_FRESHCLAM = yes ]]; then - stat_busy "Starting FreshClam" - [[ -z $PID_FC ]] && /usr/bin/freshclam -p /run/clamav/freshclam.pid -d $FRESHCLAM_OPTS - if [[ $? -gt 0 ]]; then - stat_fail - else - add_daemon clamav - stat_done - fi - fi - ;; - stop) - if [[ $START_CLAMD = yes ]]; then - stat_busy "Stopping ClamD" - [[ -n $PID_CD ]] && kill $PID_CD &> /dev/null - if [[ $? -gt 0 ]]; then - stat_fail - else - rm_daemon clamav - stat_done - fi - fi - - if [[ $START_FRESHCLAM = yes ]]; then - stat_busy "Stopping FreshClam" - [[ -n $PID_FC ]] && kill $PID_FC &> /dev/null - if [[ $? -gt 0 ]]; then - stat_fail - else - rm_daemon clamav - stat_done - fi - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/staging/clamav/service b/staging/clamav/service deleted file mode 100644 index 5bf9eb14e..000000000 --- a/staging/clamav/service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=clamav daemon - -[Service] -Type=forking -PIDFile=/run/clamav/clamd.pid -ExecStart=/usr/sbin/clamd - -[Install] -WantedBy=multi-user.target diff --git a/staging/clamav/service.fresh b/staging/clamav/service.fresh deleted file mode 100644 index a0a72c2e6..000000000 --- a/staging/clamav/service.fresh +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=clamav updater - -[Service] -Type=forking -PIDFile=/run/clamav/freshclam.pid -ExecStart=/usr/bin/freshclam -d -p /run/clamav/freshclam.pid - -[Install] -WantedBy=multi-user.target diff --git a/staging/clamav/tmpfiles.d b/staging/clamav/tmpfiles.d deleted file mode 100644 index 22d29941e..000000000 --- a/staging/clamav/tmpfiles.d +++ /dev/null @@ -1 +0,0 @@ -d /run/clamav 0755 clamav clamav diff --git a/staging/cloog/PKGBUILD b/staging/cloog/PKGBUILD deleted file mode 100644 index 68d83c76a..000000000 --- a/staging/cloog/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161822 2012-06-15 04:19:17Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> - -pkgname=cloog -pkgver=0.17.0 -pkgrel=2 -pkgdesc="Library that generates loops for scanning polyhedra" -arch=('i686' 'x86_64') -url="http://www.bastoul.net/cloog/" -license=('GPL') -depends=('isl' 'gmp') -conflicts=('cloog-ppl<0.15.10-2') -options=('!libtool') -source=(http://www.bastoul.net/cloog/pages/download/$pkgname-$pkgver.tar.gz) -md5sums=('0aa3302c81f65ca62c114e5264f8a802') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --with-isl=system --with-gmp=system - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - make check -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install -} diff --git a/staging/cronie/PKGBUILD b/staging/cronie/PKGBUILD deleted file mode 100644 index 65386def0..000000000 --- a/staging/cronie/PKGBUILD +++ /dev/null @@ -1,68 +0,0 @@ -# Contributor: Kaiting Chen <kaiting.chen@kiwilight.com> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> - -pkgname='cronie' -pkgver=1.4.8 -pkgrel=2 -pkgdesc='Daemon that runs specified programs at scheduled times and related tools' -url='https://fedorahosted.org/cronie/' -license=('custom:BSD') -arch=('i686' 'x86_64') -depends=('pam' 'bash' 'run-parts') -optdepends=('smtp-server: sending cron job output via email') - -source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'cron.deny' - 'service' - 'pam.d' - 'rc.d') -sha1sums=('1d2ce3a6ca2a6f96ff31921e4060be3199dc10f3' - '0f279b8fb820340267d578dc85511c980715f91e' - '3038a05476829f72fc4918bee9176b273ce10340' - '5eff7fb31f6bc0a924243ff046704726cf20c221' - 'c08c040ed5cb12bc4fd15639a5242d31ec247ef5') - -backup=('etc/anacrontab' - 'etc/conf.d/crond' - 'etc/pam.d/crond' - 'etc/cron.deny') - -conflicts=('cron') -provides=('cron') -groups=('base') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-anacron \ - --with-inotify \ - --with-pam \ - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - chmod u+s "${pkgdir}"/usr/bin/crontab - install -d "${pkgdir}"/var/spool/{ana,}cron - install -d "${pkgdir}"/etc/cron.{d,hourly,daily,weekly,monthly} - - install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/crond - install -Dm644 ../pam.d "${pkgdir}"/etc/pam.d/crond - install -Dm644 ../cron.deny "${pkgdir}"/etc/cron.deny - install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/cronie.service - - install -Dm644 crond.sysconfig "${pkgdir}"/etc/conf.d/crond - install -Dm644 contrib/anacrontab "${pkgdir}"/etc/anacrontab - install -Dm644 contrib/0hourly "${pkgdir}"/etc/cron.d/0hourly - install -Dm755 contrib/0anacron "${pkgdir}"/etc/cron.hourly/0anacron - - install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/cronie/COPYING -} diff --git a/staging/cronie/cron.deny b/staging/cronie/cron.deny deleted file mode 100644 index 06e685cc8..000000000 --- a/staging/cronie/cron.deny +++ /dev/null @@ -1 +0,0 @@ -# without this file, only users listed in /etc/cron.allow can use crontab diff --git a/staging/cronie/pam.d b/staging/cronie/pam.d deleted file mode 100644 index 9a254ebc0..000000000 --- a/staging/cronie/pam.d +++ /dev/null @@ -1,10 +0,0 @@ -auth required pam_unix.so -auth required pam_env.so - -account required pam_access.so -account required pam_unix.so -account required pam_time.so - -session required pam_loginuid.so -session required pam_limits.so -session required pam_unix.so diff --git a/staging/cronie/rc.d b/staging/cronie/rc.d deleted file mode 100755 index d0659685c..000000000 --- a/staging/cronie/rc.d +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -name=crond -. /etc/conf.d/crond -PID=$(pidof -o %PPID /usr/sbin/crond) - -case "$1" in -start) - stat_busy "Starting $name daemon" - [[ -z "$PID" ]] && /usr/sbin/crond $CRONDARGS &>/dev/null \ - && { add_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -stop) - stat_busy "Stopping $name daemon" - [[ -n "$PID" ]] && kill $PID &>/dev/null \ - && { rm_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -reload) - stat_busy "Reloading $name daemon" - [[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \ - && { stat_done; } \ - || { stat_fail; exit 1; } - ;; -restart) - $0 stop - sleep 1 - $0 start - ;; -*) - echo "usage: $0 {start|stop|restart|reload}" - ;; -esac -exit 0 diff --git a/staging/cronie/service b/staging/cronie/service deleted file mode 100644 index 5ae193bfc..000000000 --- a/staging/cronie/service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Periodic Command Scheduler - -[Service] -ExecStart=/usr/sbin/crond -n -ExecReload=/bin/kill -HUP $MAINPID -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/staging/dbus-python/PKGBUILD b/staging/dbus-python/PKGBUILD deleted file mode 100644 index b6b1bc24f..000000000 --- a/staging/dbus-python/PKGBUILD +++ /dev/null @@ -1,66 +0,0 @@ -# $Id: PKGBUILD 168669 2012-10-13 22:15:37Z eric $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=dbus-python -pkgname=('python-dbus' 'python2-dbus' 'python-dbus-common') -pkgver=1.1.1 -pkgrel=2 -pkgdesc="Python bindings for DBUS" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL') -url="http://www.freedesktop.org/wiki/Software/DBusBindings" -makedepends=('docutils' 'dbus-glib' 'python' 'python2') -options=('!libtool') -source=(http://dbus.freedesktop.org/releases/${pkgbase}/${pkgbase}-${pkgver}.tar.gz) -md5sums=('742c7432ad0f7c3f98291d58fa2e35dc') - -build() { - cd "${srcdir}" - mkdir build-python2 build-python3 - cd "${srcdir}/build-python2" - PYTHON=python2 ../${pkgbase}-${pkgver}/configure --prefix=/usr - make - - - cd "${srcdir}/build-python3" - ../${pkgbase}-${pkgver}/configure --prefix=/usr - make -} - -package_python-dbus-common() { - pkgdesc="Common dbus-python files shared between python-dbus and python2-dbus" - conflicts=('dbus-python<1.1.0') - - cd "${srcdir}/build-python3" - make DESTDIR="${pkgdir}" install-data - rm -rf "${pkgdir}"/usr/lib/python* -} - -package_python-dbus() { - depends=('python-dbus-common' 'python' 'dbus-core') - optdepends=('dbus-glib: glib mainloop support') - pkgdesc="Python 3.3 bindings for DBUS" - - cd "${srcdir}/build-python3" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}/usr/share" - rm -rf "${pkgdir}/usr/include" - rm -rf "${pkgdir}/usr/lib/pkgconfig" -} - -package_python2-dbus() { - depends=('python-dbus-common' 'python2' 'dbus-core') - optdepends=('dbus-glib: glib mainloop support') - pkgdesc="Python 2.7 bindings for DBUS" - replaces=('dbus-python') - conflicts=('dbus-python') - provides=("dbus-python=$pkgver") - - cd "${srcdir}/build-python2" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}/usr/share" - rm -rf "${pkgdir}/usr/include" - rm -rf "${pkgdir}/usr/lib/pkgconfig" -} diff --git a/staging/dmraid/PKGBUILD b/staging/dmraid/PKGBUILD deleted file mode 100644 index f50754782..000000000 --- a/staging/dmraid/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 161388 2012-06-10 18:50:00Z dreisner $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -#Contributor: Urs Wolfer <uwolfer @ fwo.ch> - -pkgname=dmraid -pkgver=1.0.0.rc16.3 -pkgrel=6 -pkgdesc="Device mapper RAID interface" -url="http://people.redhat.com/~heinzm/sw/dmraid/" -conflicts=('mkinitcpio<0.7') -depends=('device-mapper>=2.0.54') -arch=('i686' 'x86_64') -license=('GPL') -source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2 - http://people.redhat.com/~heinzm/sw/dmraid/src/$pkgname-1.0.0.rc16-3.tar.bz2 - dmraid_install - dmraid_hook - dmraid_tmpfiles - dmraid.service) -install=dmraid.install -md5sums=('819338fcef98e8e25819f0516722beeb' - '2297d23cee1aef23ec6ad8d6d1870356' - 'faec669dc85f87187b45b5d3968efe2c' - '56a8bb0ece8d206cd8efb504ee072ddd' - 'de0af1fdb9ed4c109b8119160167d2e9') - -build() { - cd "$pkgname/1.0.0.rc16-3/$pkgname" - ./configure --enable-led --enable-intel_led - make -} - -package() { - cd "$pkgname/1.0.0.rc16-3/$pkgname" - make DESTDIR="$pkgdir" prefix=/usr libdir=/usr/lib mandir=/usr/share/man includedir=/usr/include install - install -D -m644 "$srcdir"/dmraid_install "$pkgdir"/usr/lib/initcpio/install/dmraid - install -D -m644 "$srcdir"/dmraid_hook "$pkgdir"/usr/lib/initcpio/hooks/dmraid - install -D -m644 "$srcdir"/dmraid_tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/dmraid.conf - - # fix permissions - chmod 644 "$pkgdir"/usr/include/dmraid/* "$pkgdir"/usr/lib/libdmraid.a - - install -Dm644 "$srcdir/dmraid.service" "$pkgdir/usr/lib/systemd/system/dmraid.service" -} diff --git a/staging/dmraid/dmraid.install b/staging/dmraid/dmraid.install deleted file mode 100644 index 64899e785..000000000 --- a/staging/dmraid/dmraid.install +++ /dev/null @@ -1,14 +0,0 @@ -post_upgrade() { - if [ "$(vercmp $2 1.0.0.rc15)" -lt 0 ]; then - # important upgrade notice - echo ">>>" - echo ">>> IMPORTANT DMRAID UPGRADE NOTICE" - echo ">>> -------------------------------" - echo ">>> Version 1.0.0.rc15 and greater introduce a new name scheme:" - echo ">>> You need to add an additional 'p' in front of your number." - echo ">>> e.g. <yourname><number> --> <yourname>p<number>" - echo ">>> firsthd1 --> firsthdp1" - echo ">>> Please change your bootloader and fstab accordingly." - echo ">>>" - fi -} diff --git a/staging/dmraid/dmraid.service b/staging/dmraid/dmraid.service deleted file mode 100644 index 1fd142ff2..000000000 --- a/staging/dmraid/dmraid.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Assemble FakeRAID arrays -DefaultDependencies=no -Requires=systemd-udev-settle.service -After=systemd-udev-settle.service -Before=basic.target shutdown.target -Conflicts=shutdown.target - -[Service] -ExecStart=/sbin/dmraid --ignorelocking --activate y -Z -Type=oneshot -TimeoutSec=0 -RemainAfterExit=true - -[Install] -WantedBy=basic.target diff --git a/staging/dmraid/dmraid_hook b/staging/dmraid/dmraid_hook deleted file mode 100644 index 37283e83e..000000000 --- a/staging/dmraid/dmraid_hook +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/ash - -run_hook() { - modprobe -a -q dm-mod dm-mirror >/dev/null 2>&1 - msg ":: Activating dmraid arrays..." - # prevent any event monitoring calls with -I - if [ "$quiet" = "y" ]; then - dmraid -ay -I -Z >/dev/null - else - dmraid -ay -I -Z - fi -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/staging/dmraid/dmraid_install b/staging/dmraid/dmraid_install deleted file mode 100644 index d3238c1f7..000000000 --- a/staging/dmraid/dmraid_install +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -build() { - add_module 'dm-mod' - add_module 'dm-mirror' - - add_binary 'dmraid' - add_binary 'dmsetup' - add_file "/usr/lib/udev/rules.d/10-dm.rules" - add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" - add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" - - add_runscript -} - -help() { - cat <<HELPEOF -This hook loads the necessary modules for a dmraid root device. -HELPEOF -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/staging/dmraid/dmraid_tmpfiles b/staging/dmraid/dmraid_tmpfiles deleted file mode 100644 index 4f21ac1fc..000000000 --- a/staging/dmraid/dmraid_tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/lock/dmraid 1777 root root diff --git a/staging/dvdauthor/PKGBUILD b/staging/dvdauthor/PKGBUILD deleted file mode 100644 index 1a5f8b6c4..000000000 --- a/staging/dvdauthor/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 169519 2012-10-23 00:56:41Z eric $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Travis Willard <travisw@wmpub.ca> -# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> -# Contributor: Nicolai Lissner <nlissne@linux01.gwdg.de> - -pkgname=dvdauthor -pkgver=0.7.1 -pkgrel=2 -pkgdesc="DVD authoring tools" -arch=('i686' 'x86_64') -url="http://dvdauthor.sourceforge.net/" -license=('GPL') -depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi') -options=('!makeflags') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('2694a5a3ef460106ea3caf0f7f60ff80') - -build() { - cd "${srcdir}/${pkgname}" - - ./configure --prefix=/usr \ - --sysconfdir=/etc - make -} - -package() { - cd "${srcdir}/${pkgname}" - - make DESTDIR="${pkgdir}" install -} diff --git a/staging/dvdauthor/dvdauthor-0.7.0-libpng15.patch b/staging/dvdauthor/dvdauthor-0.7.0-libpng15.patch deleted file mode 100644 index 2bb636380..000000000 --- a/staging/dvdauthor/dvdauthor-0.7.0-libpng15.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- src/spuunmux.c -+++ src/spuunmux.c -@@ -39,6 +39,7 @@ - #include <netinet/in.h> - - #include <png.h> -+#include <zlib.h> - - #include "rgb.h" - #include "common.h" -@@ -610,7 +611,7 @@ - png_destroy_write_struct(&png_ptr, (png_infopp)NULL); - return -1; - } /*if*/ -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - png_destroy_write_struct(&png_ptr, &info_ptr); - fclose(fp); diff --git a/staging/ekiga/PKGBUILD b/staging/ekiga/PKGBUILD deleted file mode 100644 index 9ec154322..000000000 --- a/staging/ekiga/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 163123 2012-07-07 16:03:55Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Tom K <tomk@runbox.com> - -pkgname=ekiga -pkgver=3.3.2 -pkgrel=6 -pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" -url="http://www.ekiga.org" -license=(GPL) -arch=(i686 x86_64) -depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf') -makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost') -optdepends=('evolution-data-server: Evolution integration') -options=(!emptydirs) -groups=('gnome-extra') -install=ekiga.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - gcc47.patch) -sha256sums=('d4dd47a47696c53e6f3839eef6e0e896dd3d07babb2e68ff8fe994d67ba8807a' - '9e3000016e1174be5d6cc60c89abeaeb61a98eb163a38abf11f4af4f2d6363ec') - -build() { - cd "$pkgname-$pkgver" - patch -Np1 -i "$srcdir/gcc47.patch" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-schemas-install \ - --disable-scrollkeeper --enable-dbus - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install - - install -m755 -d "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain ekiga "$pkgdir"/etc/gconf/schemas/*.schemas - rm -f "$pkgdir"/etc/gconf/schemas/*.schemas -} diff --git a/staging/ekiga/ekiga.install b/staging/ekiga/ekiga.install deleted file mode 100644 index 91f3a57a0..000000000 --- a/staging/ekiga/ekiga.install +++ /dev/null @@ -1,22 +0,0 @@ -pkgname=ekiga - -post_install() { - gconfpkg --install $pkgname - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - gconfpkg --uninstall $pkgname -} - -post_remove() { - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} diff --git a/staging/ekiga/gcc47.patch b/staging/ekiga/gcc47.patch deleted file mode 100644 index f12c37524..000000000 --- a/staging/ekiga/gcc47.patch +++ /dev/null @@ -1,99 +0,0 @@ -From f81a43f2c4ed5e5083e3a850bc7164d11a910358 Mon Sep 17 00:00:00 2001 -From: Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr> -Date: Sat, 24 Mar 2012 09:17:40 +0000 -Subject: Fix compile error with gcc 4.7 - ---- -diff --git a/lib/engine/account/bank-impl.h b/lib/engine/account/bank-impl.h -index e16848e..b0a8775 100644 ---- a/lib/engine/account/bank-impl.h -+++ b/lib/engine/account/bank-impl.h -@@ -203,7 +203,7 @@ template<typename AccountType> - void - Ekiga::BankImpl<AccountType>::add_account (boost::shared_ptr<AccountType> account) - { -- add_object (account); -+ this->add_object (account); - - account->questions.connect (boost::ref (questions)); - } -@@ -213,7 +213,7 @@ template<typename AccountType> - void - Ekiga::BankImpl<AccountType>::remove_account (boost::shared_ptr<AccountType> account) - { -- remove_object (account); -+ this->remove_object (account); - } - - #endif -diff --git a/lib/engine/addressbook/book-impl.h b/lib/engine/addressbook/book-impl.h -index 711d8d9..4fea7d5 100644 ---- a/lib/engine/addressbook/book-impl.h -+++ b/lib/engine/addressbook/book-impl.h -@@ -204,7 +204,7 @@ void - Ekiga::BookImpl<ContactType>::add_contact (boost::shared_ptr<ContactType> contact) - { - contact->questions.connect (boost::ref (questions)); -- add_object (contact); -+ this->add_object (contact); - } - - -@@ -212,7 +212,7 @@ template<typename ContactType> - void - Ekiga::BookImpl<ContactType>::remove_contact (boost::shared_ptr<ContactType> contact) - { -- remove_object (contact); -+ this->remove_object (contact); - } - - #endif -diff --git a/lib/engine/addressbook/source-impl.h b/lib/engine/addressbook/source-impl.h -index a30cd03..630236f 100644 ---- a/lib/engine/addressbook/source-impl.h -+++ b/lib/engine/addressbook/source-impl.h -@@ -206,7 +206,7 @@ template<typename BookType> - void - Ekiga::SourceImpl<BookType>::add_book (boost::shared_ptr<BookType> book) - { -- add_object (book); -+ this->add_object (book); - - add_connection (book, book->contact_added.connect (boost::bind (boost::ref (contact_added), book, _1))); - -diff --git a/lib/engine/presence/cluster-impl.h b/lib/engine/presence/cluster-impl.h -index 245a7c6..92074a8 100644 ---- a/lib/engine/presence/cluster-impl.h -+++ b/lib/engine/presence/cluster-impl.h -@@ -147,7 +147,7 @@ Ekiga::ClusterImpl<HeapType>::add_heap (boost::shared_ptr<HeapType> heap) - - add_connection (heap, heap->questions.connect (boost::ref (questions))); - -- add_object (heap); -+ this->add_object (heap); - } - - template<typename HeapType> -diff --git a/lib/engine/presence/heap-impl.h b/lib/engine/presence/heap-impl.h -index d63c491..15fe86f 100644 ---- a/lib/engine/presence/heap-impl.h -+++ b/lib/engine/presence/heap-impl.h -@@ -160,14 +160,14 @@ Ekiga::HeapImpl<PresentityType>::add_presentity (boost::shared_ptr<PresentityTyp - { - presentity->questions.connect (boost::ref (questions)); - -- add_object (presentity); -+ this->add_object (presentity); - } - - template<typename PresentityType> - void - Ekiga::HeapImpl<PresentityType>::remove_presentity (boost::shared_ptr<PresentityType> presentity) - { -- remove_object (presentity); -+ this->remove_object (presentity); - } - - #endif --- -cgit v0.9.0.2 diff --git a/staging/emacs/PKGBUILD b/staging/emacs/PKGBUILD deleted file mode 100644 index 3fa2f0677..000000000 --- a/staging/emacs/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 169485 2012-10-22 00:40:50Z eric $ -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> -# Contributor: Renchi Raju <renchi@green.tam.uiuc.edu> - -pkgname=emacs -pkgver=24.2 -pkgrel=2 -pkgdesc="The extensible, customizable, self-documenting real-time display editor" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/emacs/emacs.html" -license=('GPL3') -depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick') -install=emacs.install -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig}) -md5sums=('1676803a50e8adc817fdaaebb9234f14' 'ca1766337f419ef827dd96d1ff78f158') - - -build() { - cd "$srcdir"/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ - --localstatedir=/var --with-x-toolkit=gtk3 --with-xft - make -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install - - # remove conflict with ctags package - mv "$pkgdir"/usr/bin/{ctags,ctags.emacs} - mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1} - # fix all the 777 perms on directories - find "$pkgdir"/usr/share/emacs/$_majorver -type d -exec chmod 755 {} \; - # fix user/root permissions on usr/share files - find "$pkgdir"/usr/share/emacs/$_majorver -exec chown root:root {} \; - # fix perms on /var/games - chmod 775 "$pkgdir"/var/games - chmod 775 "$pkgdir"/var/games/emacs - chmod 664 "$pkgdir"/var/games/emacs/* - chown -R root:games "$pkgdir"/var/games -} diff --git a/staging/emacs/emacs.install b/staging/emacs/emacs.install deleted file mode 100644 index d84f1de14..000000000 --- a/staging/emacs/emacs.install +++ /dev/null @@ -1,32 +0,0 @@ -ICON_PATH=usr/share/icons/hicolor -INFO_DIR=usr/share/info - -INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse -ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc eshell eudc flymake -forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode -org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail -speedbar tramp url vip viper widget woman) - -post_install() { - gtk-update-icon-cache -q -t -f ${ICON_PATH} - update-desktop-database -q - - [[ -x usr/bin/install-info ]] || return 0 - for f in ${INFO_FILES[@]}; do - install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - gtk-update-icon-cache -q -t -f ${ICON_PATH} - update-desktop-database -q - - [[ -x usr/bin/install-info ]] || return 0 - for f in ${INFO_FILES[@]}; do - install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null - done -} diff --git a/staging/enblend-enfuse/PKGBUILD b/staging/enblend-enfuse/PKGBUILD deleted file mode 100644 index 376b0ddb8..000000000 --- a/staging/enblend-enfuse/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 169359 2012-10-20 04:34:58Z eric $ -# Maintainer: tobias <tobias@archlinux.org> -# Contributor: Dominik Ryba <domryba@post.pl> - -pkgname=enblend-enfuse -pkgver=4.0 -pkgrel=8 -pkgdesc="Intelligent blend tool for overlapping picture" -arch=("i686" "x86_64") -license=('GPL') -url="http://enblend.sourceforge.net" -depends=('openexr' 'glew' 'libxmi' 'freeglut' 'lcms' 'libpng' 'boost-libs') -makedepends=('boost' 'mesa') -replaces=('enblend') -conflicts=('enblend') -provides=('enblend') -install=${pkgname}.install -source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz{,.asc} \ - libpng-1.4.patch enblend-4.0-libpng15.patch) -sha1sums=('34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033' - 'aac6364b29b0a9d6c61c3db0982f52ce1579e934' - 'eae6cf48ea082865130302d0b4d1ca0b884a563b' - '71e961d90be842eafe9d473d8d70b04b29077036') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d" - sed -i 's/info.arith_code = TRUE/info.arith_code = FALSE/' src/vigra_impex/jpeg.cxx - patch -p1 -i ../libpng-1.4.patch - patch -p0 -i ../enblend-4.0-libpng15.patch - LIBS="-lboost_system" ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d" - make DESTDIR="${pkgdir}" install - install -D -m644 doc/enblend.info "${pkgdir}/usr/share/info/enblend.info" - install -D -m644 doc/enfuse.info "${pkgdir}/usr/share/info/enfuse.info" -} diff --git a/staging/enblend-enfuse/enblend-4.0-libpng15.patch b/staging/enblend-enfuse/enblend-4.0-libpng15.patch deleted file mode 100644 index d4465ccad..000000000 --- a/staging/enblend-enfuse/enblend-4.0-libpng15.patch +++ /dev/null @@ -1,220 +0,0 @@ ---- src/vigra_impex/png.cxx -+++ src/vigra_impex/png.cxx -@@ -81,7 +81,7 @@ - static void PngError( png_structp png_ptr, png_const_charp error_msg ) - { - png_error_message = std::string(error_msg); -- longjmp( png_ptr->jmpbuf, 1 ); -+ longjmp( png_jmpbuf( png_ptr ), 1 ); - } - - // called on non-fatal errors -@@ -213,7 +213,7 @@ - vigra_postcondition( png != 0, "could not create the read struct." ); - - // create info struct -- if (setjmp(png->jmpbuf)) { -+ if (setjmp(png_jmpbuf( png ))) { - png_destroy_read_struct( &png, &info, NULL ); - vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() ); - } -@@ -221,14 +221,14 @@ - vigra_postcondition( info != 0, "could not create the info struct." ); - - // init png i/o -- if (setjmp(png->jmpbuf)) { -+ if (setjmp(png_jmpbuf( png ))) { - png_destroy_read_struct( &png, &info, NULL ); - vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() ); - } - png_init_io( png, file.get() ); - - // specify that the signature was already read -- if (setjmp(png->jmpbuf)) { -+ if (setjmp(png_jmpbuf( png ))) { - png_destroy_read_struct( &png, &info, NULL ); - vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() ); - } -@@ -244,13 +244,13 @@ - void PngDecoderImpl::init() - { - // read all chunks up to the image data -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() ); - png_read_info( png, info ); - - // pull over the header fields - int interlace_method, compression_method, filter_method; -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() ); - png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type, - &interlace_method, &compression_method, &filter_method ); -@@ -264,7 +264,7 @@ - - // transform palette to rgb - if ( color_type == PNG_COLOR_TYPE_PALETTE) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() ); - png_set_palette_to_rgb(png); - color_type = PNG_COLOR_TYPE_RGB; -@@ -273,7 +273,7 @@ - - // expand gray values to at least one byte size - if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str()); - png_set_expand_gray_1_2_4_to_8(png); - bit_depth = 8; -@@ -283,7 +283,7 @@ - #if 0 - // strip alpha channel - if ( color_type & PNG_COLOR_MASK_ALPHA ) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() ); - png_set_strip_alpha(png); - color_type ^= PNG_COLOR_MASK_ALPHA; -@@ -323,12 +323,12 @@ - - // read icc profile - #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED) -- char * dummyName; -+ png_charpp dummyName; - int dummyCompType; -- char * profilePtr; -+ png_bytepp profilePtr; - png_uint_32 profileLen; -- if (info->valid & PNG_INFO_iCCP) { -- png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ; -+ if (png_get_valid(png, info, PNG_INFO_iCCP)) { -+ png_get_iCCP(png, info, dummyName, &dummyCompType, profilePtr, &profileLen) ; - iccProfilePtr = (unsigned char *) profilePtr; - iccProfileLength = profileLen; - } -@@ -340,7 +340,7 @@ - // image gamma - double image_gamma = 0.45455; - if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() ); - png_get_gAMA( png, info, &image_gamma ); - } -@@ -349,26 +349,26 @@ - double screen_gamma = 2.2; - - // set gamma correction -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() ); - png_set_gamma( png, screen_gamma, image_gamma ); - #endif - - // interlace handling, get number of read passes needed -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str()); - n_interlace_passes = png_set_interlace_handling(png); - - // update png library state to reflect any changes that were made -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() ); - png_read_update_info( png, info ); - -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str()); - n_channels = png_get_channels(png, info); - -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str()); - rowsize = png_get_rowbytes(png, info); - -@@ -379,7 +379,7 @@ - void PngDecoderImpl::nextScanline() - { - for (int i=0; i < n_interlace_passes; i++) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str()); - png_read_row(png, row_data.begin(), NULL); - } -@@ -545,7 +545,7 @@ - vigra_postcondition( png != 0, "could not create the write struct." ); - - // create info struct -- if (setjmp(png->jmpbuf)) { -+ if (setjmp(png_jmpbuf( png ))) { - png_destroy_write_struct( &png, &info ); - vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() ); - } -@@ -556,7 +556,7 @@ - } - - // init png i/o -- if (setjmp(png->jmpbuf)) { -+ if (setjmp(png_jmpbuf( png ))) { - png_destroy_write_struct( &png, &info ); - vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() ); - } -@@ -571,7 +571,7 @@ - void PngEncoderImpl::finalize() - { - // write the IHDR -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() ); - png_set_IHDR( png, info, width, height, bit_depth, color_type, - PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, -@@ -579,7 +579,7 @@ - - // set resolution - if (x_resolution > 0 && y_resolution > 0) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() ); - png_set_pHYs(png, info, (png_uint_32) (x_resolution / 0.0254 + 0.5), - (png_uint_32) (y_resolution / 0.0254 + 0.5), -@@ -588,7 +588,7 @@ - - // set offset - if (position.x > 0 && position.y > 0) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() ); - png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL); - } -@@ -597,12 +597,12 @@ - // set icc profile - if (iccProfile.size() > 0) { - png_set_iCCP(png, info, "icc", 0, -- (char *)iccProfile.begin(), iccProfile.size()); -+ iccProfile.begin(), iccProfile.size()); - } - #endif - - // write the info struct -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() ); - png_write_info( png, info ); - -@@ -634,10 +634,10 @@ - } - - // write the whole image -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() ); - png_write_image( png, row_pointers.begin() ); -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() ); - png_write_end(png, info); - } diff --git a/staging/enblend-enfuse/enblend-enfuse.install b/staging/enblend-enfuse/enblend-enfuse.install deleted file mode 100644 index 24ea28a4e..000000000 --- a/staging/enblend-enfuse/enblend-enfuse.install +++ /dev/null @@ -1,22 +0,0 @@ -infodir=usr/share/info -filelist=(enblend.info enfuse.info) - -post_install() { - [[ -x usr/bin/install-info ]] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [[ -x usr/bin/install-info ]] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/enblend-enfuse/libpng-1.4.patch b/staging/enblend-enfuse/libpng-1.4.patch deleted file mode 100644 index 3bf852b58..000000000 --- a/staging/enblend-enfuse/libpng-1.4.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx enblend-enfuse-3.2/src/vigra_impex/png.cxx ---- enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx 2010-01-19 22:09:36.000000000 -0500 -+++ enblend-enfuse-3.2/src/vigra_impex/png.cxx 2010-01-19 22:13:43.000000000 -0500 -@@ -275,8 +275,8 @@ - // expand gray values to at least one byte size - if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) { - if (setjmp(png->jmpbuf)) -- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str()); -- png_set_gray_1_2_4_to_8(png); -+ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str()); -+ png_set_expand_gray_1_2_4_to_8(png); - bit_depth = 8; - } - diff --git a/staging/exiv2/PKGBUILD b/staging/exiv2/PKGBUILD deleted file mode 100644 index 499ace7a9..000000000 --- a/staging/exiv2/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -#$Id: PKGBUILD 164301 2012-07-30 00:12:14Z eric $ -# Maintainer: tobias <tobias@arhlinux.org> - -pkgname=exiv2 -pkgver=0.23 -pkgrel=1 -pkgdesc="Exif and Iptc metadata manipulation library and tools" -arch=('i686' 'x86_64') -url="http://exiv2.org" -license=('GPL') -depends=('gcc-libs' 'zlib' 'expat') -options=('!libtool') -source=("http://www.exiv2.org/${pkgname}-${pkgver}.tar.gz") -sha1sums=('5f342bf642477526f41add11d6ee7787cdcd639f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - CPPFLAGS="-D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/ffmpeg/PKGBUILD b/staging/ffmpeg/PKGBUILD deleted file mode 100644 index 1021dc3ab..000000000 --- a/staging/ffmpeg/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 161328 2012-06-09 17:10:50Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Contributor: Paul Mattal <paul@archlinux.org> - -pkgname=ffmpeg -pkgver=0.11.1 -pkgrel=1 -epoch=1 -pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" -arch=('i686' 'x86_64') -url="http://ffmpeg.org/" -license=('GPL') -depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex v4l-utils x264 xvidcore zlib) -makedepends=('yasm' 'git' 'libvdpau') -source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) -md5sums=('ff8cb914f657e164dd60ea1008b555a8') - -build() { - cd $pkgname-$pkgver - - ./configure \ - --prefix=/usr \ - --enable-libmp3lame \ - --enable-libvorbis \ - --enable-libxvid \ - --enable-libx264 \ - --enable-libvpx \ - --enable-libtheora \ - --enable-libgsm \ - --enable-libspeex \ - --enable-postproc \ - --enable-shared \ - --enable-x11grab \ - --enable-libopencore_amrnb \ - --enable-libopencore_amrwb \ - --enable-libschroedinger \ - --enable-libopenjpeg \ - --enable-librtmp \ - --enable-libpulse \ - --enable-libv4l2 \ - --enable-gpl \ - --enable-version3 \ - --enable-runtime-cpudetect \ - --disable-debug \ - --disable-static - - make - make tools/qt-faststart - make doc/ff{mpeg,play,server}.1 -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install install-man - install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/ffmpegthumbnailer/PKGBUILD b/staging/ffmpegthumbnailer/PKGBUILD deleted file mode 100644 index f9afaf39a..000000000 --- a/staging/ffmpegthumbnailer/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 23110 2010-08-06 11:01:51Z rvanharen $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: boromil@gmail.com - -pkgname=ffmpegthumbnailer -pkgver=2.0.7 -pkgrel=5 -pkgdesc="Lightweight video thumbnailer that can be used by file managers." -url="http://code.google.com/p/ffmpegthumbnailer/" -license=('GPL2') -arch=('i686' 'x86_64') -depends=('ffmpeg' 'libjpeg' 'libpng') -optdepends=('gvfs: support for gio uris') -source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz" - 'ffmpegthumbnailer.desktop' 'ffmpegapi_fix_r241.patch') -options=('!libtool') -sha1sums=('b8f5371aa995fefd1fb75e306e8cd76e8c9f3a73' - 'bdd3ae35a5c6f0e1f4b0c7926f72b3429b2eaa53' - '4e1a6a0f06ae3ae322ea44046599ebf3ab693cb6') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Don't use deprecated (removed?) ffmpeg api - patch -Np0 -i "${srcdir}/ffmpegapi_fix_r241.patch" - - ./configure --prefix=/usr --enable-gio - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # FS#24105: Generate thumbnails in nautilus - # FS#26540: Rename to .thumbnailer for nautilus - install -Dm644 "${srcdir}/ffmpegthumbnailer.desktop" \ - "${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.thumbnailer" -} diff --git a/staging/ffmpegthumbnailer/ffmpegapi_fix_r241.patch b/staging/ffmpegthumbnailer/ffmpegapi_fix_r241.patch deleted file mode 100644 index 37e65b059..000000000 --- a/staging/ffmpegthumbnailer/ffmpegapi_fix_r241.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- libffmpegthumbnailer/moviedecoder.cpp.old 2012-05-20 11:57:04.503450287 +0200 -+++ libffmpegthumbnailer/moviedecoder.cpp 2012-05-20 11:57:14.633450566 +0200 -@@ -58,19 +58,26 @@ - void MovieDecoder::initialize(const string& filename) - { - av_register_all(); -- avcodec_init(); - avcodec_register_all(); - - string inputFile = filename == "-" ? "pipe:" : filename; - m_AllowSeek = (filename != "-") && (filename.find("rtsp://") != 0); -- -+ -+#if LIBAVCODEC_VERSION_MAJOR < 53 - if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, inputFile.c_str(), NULL, 0, NULL) != 0) -+#else -+ if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, inputFile.c_str(), NULL, NULL) != 0) -+#endif - { - destroy(); - throw logic_error(string("Could not open input file: ") + filename); - } - -+#if LIBAVCODEC_VERSION_MAJOR < 53 - if (av_find_stream_info(m_pFormatContext) < 0) -+#else -+ if (avformat_find_stream_info(m_pFormatContext, NULL) < 0) -+#endif - { - destroy(); - throw logic_error(string("Could not find stream information")); -@@ -90,8 +97,12 @@ - - if ((!m_FormatContextWasGiven) && m_pFormatContext) - { -+#if LIBAVCODEC_VERSION_MAJOR < 53 - av_close_input_file(m_pFormatContext); - m_pFormatContext = NULL; -+#else -+ avformat_close_input(&m_pFormatContext); -+#endif - } - - if (m_pPacket) -@@ -159,7 +170,11 @@ - - m_pVideoCodecContext->workaround_bugs = 1; - -+#if LIBAVCODEC_VERSION_MAJOR < 53 - if (avcodec_open(m_pVideoCodecContext, m_pVideoCodec) < 0) -+#else -+ if (avcodec_open2(m_pVideoCodecContext, m_pVideoCodec, NULL) < 0) -+#endif - { - throw logic_error("Could not open video codec"); - } diff --git a/staging/ffmpegthumbnailer/ffmpegthumbnailer.desktop b/staging/ffmpegthumbnailer/ffmpegthumbnailer.desktop deleted file mode 100644 index 79203e5bc..000000000 --- a/staging/ffmpegthumbnailer/ffmpegthumbnailer.desktop +++ /dev/null @@ -1,4 +0,0 @@ -[Thumbnailer Entry] -TryExec=ffmpegthumbnailer -Exec=ffmpegthumbnailer -s %s -i %u -o %o -c png -f -t 10 -MimeType=video/flv;video/webm;video/mkv;video/mp4;video/mpeg;video/avi;video/ogg;video/quicktime;video/x-avi;video/x-flv;video/x-mp4;video/x-mpeg;video/x-webm;video/x-mkv;application/x-extension-webm;video/x-matroska;video/x-ms-wmv;video/x-msvideo;video/x-msvideo/avi;video/x-theora/ogg;video/x-theora/ogv;video/x-ms-asf;video/x-m4v; diff --git a/staging/fyre/PKGBUILD b/staging/fyre/PKGBUILD deleted file mode 100644 index db81bc725..000000000 --- a/staging/fyre/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 169349 2012-10-20 00:55:07Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=fyre -pkgver=1.0.1 -pkgrel=6 -pkgdesc="Rendering of the Peter de Jong map" -arch=('i686' 'x86_64') -url="http://fyre.navi.cx/" -license=('GPL') -depends=('openexr' 'libglade' 'gnet' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils') -install=fyre.install -source=(http://releases.navi.cx/fyre/fyre-${pkgver}.tar.bz2) -sha1sums=('41c0ec45eff16cc1bba081c5c855a3980e404835') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make update_xdgmime=/bin/false update_fdodesktop=/bin/false gtk_update_icon_cache=/bin/false \ - prefix="${pkgdir}/usr" install -} diff --git a/staging/fyre/fyre.install b/staging/fyre/fyre.install deleted file mode 100644 index 388efbb11..000000000 --- a/staging/fyre/fyre.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-mime-database usr/share/mime &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/gcc/PKGBUILD b/staging/gcc/PKGBUILD deleted file mode 100644 index d047ccc8c..000000000 --- a/staging/gcc/PKGBUILD +++ /dev/null @@ -1,270 +0,0 @@ -# $Id: PKGBUILD 165125 2012-08-11 08:33:21Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: libtool requires rebuilt with each new gcc version - -pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') -pkgver=4.7.1 -pkgrel=6 -_snapshot=4.7-20120721 -_libstdcppmanver=20120725 # Note: check source directory name when updating this -pkgdesc="The GNU Compiler Collection" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL' 'custom') -url="http://gcc.gnu.org" -makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada') -checkdepends=('dejagnu') -options=('!libtool' '!emptydirs') -source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 - gcc_pure64.patch - gcc-4.7.1-libada-pic.patch - gcc-4.7.1-libgo-write.patch) -md5sums=('a1a53fda426bc6809cede8e85bbaf2a3' - '79c4381f983b71868c02da3379e1e8a2' - 'ced48436c1b3c981d721a829f1094de1' - '2acbc9d35cc9d72329dc71d6b1f162ef' - 'df82dd175ac566c8a6d46b11ac21f14c') - - -if [ -n "${_snapshot}" ]; then - _basedir="${srcdir}/gcc-${_snapshot}" -else - _basedir="${srcdir}/gcc-${pkgver}" -fi - -build() { - cd ${_basedir} - - # Do not install libiberty - sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in - - # Do not run fixincludes - sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - - if [ "${CARCH}" = "x86_64" ]; then - patch -p1 -i ${srcdir}/gcc_pure64.patch - fi - - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53679 - patch -p1 -i ${srcdir}/gcc-4.7.1-libgo-write.patch - - # bug to file... - patch -p1 -i ${srcdir}/gcc-4.7.1-libada-pic.patch - - echo ${pkgver} > gcc/BASE-VER - - cd ${srcdir} - mkdir gcc-build && cd gcc-build - - ${_basedir}/configure --prefix=/usr \ - --libdir=/usr/lib --libexecdir=/usr/lib \ - --mandir=/usr/share/man --infodir=/usr/share/info \ - --with-bugurl=https://bugs.archlinux.org/ \ - --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \ - --enable-shared --enable-threads=posix \ - --with-system-zlib --enable-__cxa_atexit \ - --disable-libunwind-exceptions --enable-clocale=gnu \ - --disable-libstdcxx-pch --enable-libstdcxx-time \ - --enable-gnu-unique-object --enable-linker-build-id \ - --with-ppl --enable-cloog-backend=isl \ - --disable-ppl-version-check --disable-cloog-version-check \ - --enable-lto --enable-gold --enable-ld=default \ - --enable-plugin --with-plugin-ld=ld.gold \ - --with-linker-hash-style=gnu \ - --disable-multilib --disable-libssp \ - --disable-build-with-cxx --disable-build-poststage1-with-cxx \ - --enable-checking=release - make -} - -check() { - cd gcc-build - - # increase stack size to prevent test failures - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827 - ulimit -s 32768 - - # do not abort on error as some are "expected" - make -k check || true - ${_basedir}/contrib/test_summary -} - -package_gcc-libs() -{ - pkgdesc="Runtime libraries shipped by GCC" - groups=('base') - depends=('glibc>=2.16') - install=gcc-libs.install - - cd gcc-build - make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libstdc++-v3/src libitm; do - make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES - done - make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install - make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info - make -j1 -C $CHOST/libitm DESTDIR=${pkgdir} install-info - - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=${pkgdir} install-target-libgfortran - make -j1 DESTDIR=${pkgdir} install-target-libobjc - - # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} - rm -r ${pkgdir}/usr/lib/{gcc/,libgfortran.spec} - - # remove static libraries - find ${pkgdir} -name *.a -delete - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc() -{ - pkgdesc="The GNU Compiler Collection - C and C++ frontends" - depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.22' 'libmpc' 'cloog' 'ppl') - groups=('base-devel') - install=gcc.install - - cd gcc-build - - make -j1 DESTDIR=${pkgdir} install - - install -d $pkgdir/usr/share/gdb/auto-load/usr/lib - mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.17-gdb.py - - # unfortunately it is much, much easier to install the lot and clean-up the mess... - rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} - rm $pkgdir/usr/lib/*.so* - rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a - rm $pkgdir/usr/lib/libgfortran.spec - rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{libcaf_single,libgfortranbegin}.a - rm -r $pkgdir/usr/lib/go - rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info - rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo - rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 - rm $pkgdir/usr/share/man/man3/ffi* - - # many packages expect this symlinks - ln -s gcc ${pkgdir}/usr/bin/cc - - # POSIX conformance launcher scripts for c89 and c99 - cat > $pkgdir/usr/bin/c89 <<"EOF" -#!/bin/sh -fl="-std=c89" -for opt; do - case "$opt" in - -ansi|-std=c89|-std=iso9899:1990) fl="";; - -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - cat > $pkgdir/usr/bin/c99 <<"EOF" -#!/bin/sh -fl="-std=c99" -for opt; do - case "$opt" in - -std=c99|-std=iso9899:1999) fl="";; - -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - chmod 755 $pkgdir/usr/bin/c{8,9}9 - - # install the libstdc++ man pages - install -dm755 ${pkgdir}/usr/share/man/man3 - install -m644 ${srcdir}/libstdc++-api.${_libstdcppmanver}.man/man3/* \ - ${pkgdir}/usr/share/man/man3/ - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-fortran() -{ - pkgdesc="Fortran front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - install=gcc-fortran.install - - cd gcc-build - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=$pkgdir install-target-libgfortran - make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS - make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info} - install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951 - - # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so* - rm ${pkgdir}/usr/share/info/libquadmath.info - - ln -s gfortran ${pkgdir}/usr/bin/f95 - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-objc() -{ - pkgdesc="Objective-C front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - - cd gcc-build - make -j1 DESTDIR=$pkgdir install-target-libobjc - install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - - # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib/libobjc.so* - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-ada() -{ - pkgdesc="Ada front-end for GCC (GNAT)" - depends=("gcc=$pkgver-$pkgrel") - install=gcc-ada.install - - cd gcc-build/gcc - make -j1 DESTDIR=$pkgdir ada.install-{common,info} - install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver - - ln -s gcc ${pkgdir}/usr/bin/gnatgcc - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-go() -{ - pkgdesc="Go front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - install=gcc-go.install - - cd gcc-build - make -j1 DESTDIR=$pkgdir install-target-libgo - make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info} - install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1 - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION -} diff --git a/staging/gcc/gcc-4.7.0-cloog-0.17.patch b/staging/gcc/gcc-4.7.0-cloog-0.17.patch deleted file mode 100644 index c7146fa04..000000000 --- a/staging/gcc/gcc-4.7.0-cloog-0.17.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure ---- gcc-4.6-20120120-orig/configure 2011-12-18 20:03:44.000000000 +1000 -+++ gcc-4.6-20120120/configure 2012-02-03 17:55:14.885990135 +1000 -@@ -6049,8 +6049,8 @@ - LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}" - - if test "${cloog_org}" = yes ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5 --$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5 -+$as_echo_n "checking for version 0.17 of CLooG... " >&6; } - if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -@@ -6061,8 +6061,7 @@ - main () - { - #if CLOOG_VERSION_MAJOR != 0 \ -- || CLOOG_VERSION_MINOR != 16 \ -- || CLOOG_VERSION_REVISION < 1 -+ || CLOOG_VERSION_MINOR != 17 - choke me - #endif - ; diff --git a/staging/gcc/gcc-4.7.1-libada-pic.patch b/staging/gcc/gcc-4.7.1-libada-pic.patch deleted file mode 100644 index 591da1e4a..000000000 --- a/staging/gcc/gcc-4.7.1-libada-pic.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur gcc-4.7.1-orig/libada/Makefile.in gcc-4.7.1/libada/Makefile.in ---- gcc-4.7.1-orig/libada/Makefile.in 2012-06-13 01:12:37.000000000 +1000 -+++ gcc-4.7.1/libada/Makefile.in 2012-06-16 15:04:32.179911023 +1000 -@@ -54,7 +54,7 @@ - PICFLAG = @PICFLAG@ - GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc - GNATLIBCFLAGS= -g -O2 --GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) \ -+GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(PICFLAG) \ - -fexceptions -DIN_RTS @have_getipinfo@ - - host_subdir = @host_subdir@ diff --git a/staging/gcc/gcc-4.7.1-libgo-mksysinfo.patch b/staging/gcc/gcc-4.7.1-libgo-mksysinfo.patch deleted file mode 100644 index 427efe8a6..000000000 --- a/staging/gcc/gcc-4.7.1-libgo-mksysinfo.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- libgo/mksysinfo.sh 2012-06-29 14:23:30.684708901 +0200 -+++ libgo/mksysinfo.sh 2012-06-29 14:23:20.782761973 +0200 -@@ -522,10 +522,10 @@ grep '^const _DT_' gen-sysinfo.go | - # The rusage struct. - rusage=`grep '^type _rusage struct' gen-sysinfo.go` - if test "$rusage" != ""; then -- rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'` -- rusage=`echo $rusage | sed -e 's/^ *//'` - # Remove anonymous unions from GNU/Linux <bits/resource.h>. - rusage=`echo $rusage | sed -e 's/Godump_[0-9]* struct {\([^}]*\)};/\1/g'` -+ rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'` -+ rusage=`echo $rusage | sed -e 's/^ *//'` - nrusage= - while test -n "$rusage"; do - field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/'` diff --git a/staging/gcc/gcc-4.7.1-libgo-write.patch b/staging/gcc/gcc-4.7.1-libgo-write.patch deleted file mode 100644 index a7be83fda..000000000 --- a/staging/gcc/gcc-4.7.1-libgo-write.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur gcc-4.7.1-orig/libgo/runtime/print.c gcc-4.7.1/libgo/runtime/print.c ---- gcc-4.7.1-orig/libgo/runtime/print.c 2012-05-26 04:22:14.000000000 +1000 -+++ gcc-4.7.1/libgo/runtime/print.c 2012-06-16 15:06:28.553138502 +1000 -@@ -17,7 +17,8 @@ - G* g = runtime_g(); - - if(g == nil || g->writebuf == nil) { -- runtime_write(2, v, n); -+ ssize_t bytesWritten = runtime_write(2, v, n); -+ (void)bytesWritten; - return; - } - diff --git a/staging/gcc/gcc-ada.install b/staging/gcc/gcc-ada.install deleted file mode 100644 index df0553a4f..000000000 --- a/staging/gcc/gcc-ada.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(gnat-style.info gnat_rm.info gnat_ugn.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/staging/gcc/gcc-fortran.install b/staging/gcc/gcc-fortran.install deleted file mode 100644 index b15d89a97..000000000 --- a/staging/gcc/gcc-fortran.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -file="gfortran.info" - -post_install() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file.gz $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null -} diff --git a/staging/gcc/gcc-go.install b/staging/gcc/gcc-go.install deleted file mode 100644 index 7dc50dee5..000000000 --- a/staging/gcc/gcc-go.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(gccgo.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/staging/gcc/gcc-libs.install b/staging/gcc/gcc-libs.install deleted file mode 100644 index 23553b8f0..000000000 --- a/staging/gcc/gcc-libs.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -filelist=(libgomp.info libquadmath.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/staging/gcc/gcc.install b/staging/gcc/gcc.install deleted file mode 100644 index 3407a5e1f..000000000 --- a/staging/gcc/gcc.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/staging/gcc/gcc_pure64.patch b/staging/gcc/gcc_pure64.patch deleted file mode 100644 index a9b09bbcf..000000000 --- a/staging/gcc/gcc_pure64.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur gcc-orig/gcc/config/i386/linux64.h gcc/gcc/config/i386/linux64.h ---- gcc-orig/gcc/config/i386/linux64.h 2011-07-08 01:38:34.000000000 +1000 -+++ gcc/gcc/config/i386/linux64.h 2011-07-24 19:48:05.000000000 +1000 -@@ -28,6 +28,6 @@ - #define GNU_USER_LINK_EMULATION64 "elf_x86_64" - #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" - --#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" -+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" - #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" -diff -Naur gcc-orig/gcc/config/i386/t-linux64 gcc/gcc/config/i386/t-linux64 ---- gcc-orig/gcc/config/i386/t-linux64 2011-07-08 01:38:34.000000000 +1000 -+++ gcc/gcc/config/i386/t-linux64 2011-07-24 19:49:41.000000000 +1000 -@@ -34,8 +34,8 @@ - comma=, - MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) - MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) --MULTILIB_OSDIRNAMES = m64=../lib64 --MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) -+MULTILIB_OSDIRNAMES = m64=../lib -+MULTILIB_OSDIRNAMES+= m32=../lib32 - MULTILIB_OSDIRNAMES+= mx32=../libx32 - - LIBGCC = stmp-multilib diff --git a/staging/geeqie/PKGBUILD b/staging/geeqie/PKGBUILD deleted file mode 100644 index 53fdb8a31..000000000 --- a/staging/geeqie/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 164303 2012-07-30 00:23:10Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> -# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> - -pkgname=geeqie -pkgver=1.0 -pkgrel=7 -pkgdesc="A lightweight image browser and viewer (fork of GQview)" -arch=('i686' 'x86_64') -url="http://geeqie.sourceforge.net/" -license=('GPL3') -depends=('exiv2' 'gtk2' 'lcms' 'desktop-file-utils') -makedepends=('intltool' 'doxygen' 'gnome-doc-utils') -optdepends=('librsvg: SVG rendering') -replaces=('gqview-devel') -install=geeqie.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -sha1sums=('8494a557d67d20e6ad720645ec789dd2b33a3266') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - CPPFLAGS="-D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr - make -} - -package(){ - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/geeqie/geeqie.install b/staging/geeqie/geeqie.install deleted file mode 100644 index 2eaa60550..000000000 --- a/staging/geeqie/geeqie.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/staging/gegl/PKGBUILD b/staging/gegl/PKGBUILD deleted file mode 100644 index e6b74a230..000000000 --- a/staging/gegl/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 169363 2012-10-20 05:42:33Z eric $ -# Maintainer: Daniel Isenmann <daniel@archlinux.org> - -pkgname=gegl -pkgver=0.2.0 -pkgrel=5 -pkgdesc="Graph based image processing framework" -arch=('i686' 'x86_64') -url="http://www.gegl.org/" -license=('GPL3' 'LGPL3') -depends=('babl' 'gtk2') -makedepends=('intltool' 'ruby' 'lua' 'openexr' 'ffmpeg' 'librsvg' 'jasper' 'exiv2') -optdepends=('openexr: for using the openexr plugin' \ - 'ffmpeg: for using the ffmpeg plugin' \ - 'librsvg: for using the svg plugin' \ - 'jasper: for using the jasper plugin') -options=('!libtool') -source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 gegl-0.2.0-ffmpeg-0.11.diff) -sha1sums=('764cc66cb3c7b261b8fc18a6268a0e264a91d573' - 'c10fd988c634fcf0948cc91a51d6528f6f1704ba') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < "${srcdir}/gegl-0.2.0-ffmpeg-0.11.diff" - ./configure --prefix=/usr --with-sdl --with-openexr --with-librsvg \ - --with-libavformat --with-jasper --disable-docs - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/gegl/gegl-0.2.0-ffmpeg-0.11.diff b/staging/gegl/gegl-0.2.0-ffmpeg-0.11.diff deleted file mode 100644 index a33ec6f7f..000000000 --- a/staging/gegl/gegl-0.2.0-ffmpeg-0.11.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur gegl-0.2.0/operations/external/ff-load.c gegl-0.2.0-1/operations/external/ff-load.c ---- gegl-0.2.0/operations/external/ff-load.c 2012-04-01 13:17:57.000000000 +0200 -+++ gegl-0.2.0-1/operations/external/ff-load.c 2012-07-11 12:42:05.174756560 +0200 -@@ -271,7 +271,7 @@ - gint err; - - ff_cleanup (o); -- err = av_open_input_file (&p->ic, o->path, NULL, 0, NULL); -+err = avformat_open_input (&p->ic, o->path, NULL, NULL); - if (err < 0) - { - print_error (o->path, err); diff --git a/staging/ghc/PKGBUILD b/staging/ghc/PKGBUILD deleted file mode 100644 index b2d0b96e9..000000000 --- a/staging/ghc/PKGBUILD +++ /dev/null @@ -1,129 +0,0 @@ -# $Id: PKGBUILD 166459 2012-09-08 06:24:57Z tdziedzic $ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Special note for devs looking to upgrade this package: -# ghc places a unique hash for each library when it is built. -# Libraries depend on versions specified by those hashes. -# This implies that all libraries need to be rebuilt when ghc is rebuilt. - -pkgname=ghc -pkgver=7.6.1 -pkgrel=1 -pkgdesc='The Glasgow Haskell Compiler' -arch=('i686' 'x86_64') -url='http://www.haskell.org/ghc/' -license=('custom') -# libffi might be needed in the future: http://hackage.haskell.org/trac/ghc/ticket/4496 -depends=('perl' 'gmp>=5.0' 'gcc') # 'libffi') -makedepends=('ghc' 'perl' 'libxslt' 'docbook-xsl') -checkdepends=('python2') -install='ghc.install' -# keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this... -#options=('!makeflags') -# missing rtl? -provides=('haskell-array=0.4.0.1' - 'haskell-base=4.6.0.0' - 'haskell-binary=0.5.1.1' - 'haskell-bin-package-db=0.0.0.0' - 'haskell-bytestring=0.10.0.0' - 'haskell-containers=0.5.0.0' - 'haskell-deepseq=1.3.0.1' - 'haskell-directory=1.2.0.0' - 'haskell-filepath=1.3.0.1' - 'haskell-ghc-prim=0.3.0.0' - 'haskell-haskell2010=1.1.1.0' - 'haskell-haskell98=2.0.0.2' - 'haskell-hoopl=3.9.0.0' - 'haskell-hpc=0.6.0.0' - 'haskell-integer-gmp=0.5.0.0' - 'haskell-old-locale=1.0.0.5' - 'haskell-old-time=1.1.0.1' - 'haskell-pretty=1.1.1.0' - 'haskell-process=1.1.0.2' - 'haskell-template-haskell=2.8.0.0' - 'haskell-time=1.4.0.1' - 'haskell-unix=2.6.0.0' - 'haskell-cabal=1.16.0') -replaces=('haskell-array<0.4.0.1' - 'haskell-base<4.6.0.0' - 'haskell-binary<0.5.1.1' - 'haskell-bin-package-db<0.0.0.0' - 'haskell-bytestring<0.10.0.0' - 'haskell-containers<0.5.0.0' - 'haskell-deepseq<1.3.0.1' - 'haskell-directory<1.2.0.0' - 'haskell-filepath<1.3.0.1' - 'haskell-ghc-prim<0.3.0.0' - 'haskell-haskell2010<1.1.1.0' - 'haskell-haskell98<2.0.0.2' - 'haskell-hoopl<3.9.0.0' - 'haskell-hpc<0.6.0.0' - 'haskell-integer-gmp<0.5.0.0' - 'haskell-old-locale<1.0.0.5' - 'haskell-old-time<1.1.0.1' - 'haskell-pretty<1.1.1.0' - 'haskell-process<1.1.0.2' - 'haskell-template-haskell<2.8.0.0' - 'haskell-time<1.4.0.1' - 'haskell-unix<2.6.0.0' - 'haskell-cabal<1.16.0') -source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2" - "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2" - 'build.mk') -md5sums=('e9d892d2970550ec5e70130b3621f6b6' - '0d93c458e3b445a7e524ef6ae459ce11' - 'c367ef26300648ee9b8aca3dee5c9669') - -build() { - cd ghc-${pkgver} - - cp ${srcdir}/build.mk mk/build.mk - - ./configure \ - --prefix=/usr - - make -} - -check() { - # keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this... - unset MAKEFLAGS - - cd ghc-${pkgver} - - # python2 rename - sed -e 's/PYTHON = python/&2/' -i testsuite/mk/boilerplate.mk - sed -e 's_#!/usr/bin/env python_&2_' -i testsuite/timeout/calibrate testsuite/timeout/timeout.py - - # upstream known failures on both i686 and x86_64: - # ghci.debugger/scripts break011 [bad stderr] (ghci) - # perf/compiler parsing001 [stat not good enough] (normal) - # simplCore/should_compile spec-inline [stderr mismatch] (optasm) - # upstream known failures on i686 only: - # numrun012 test fails on i686 works on x86_64 - http://hackage.haskell.org/trac/ghc/ticket/5856 - make test - - # enabling threads to speed up - # causes more failures than make test, need to investigate - # upstream known failures on both i686 and x86_64: - # perf/compiler parsing001 [stat not good enough] (normal) - # simplCore/should_compile spec-inline [stderr mismatch] (optasm) - # upstream known failures on i686 only: - # numrun012 test fails on i686 works on x86_64 - http://hackage.haskell.org/trac/ghc/ticket/5856 - #make THREADS=9 test - - # will most likely cause lots of failures - # enable this when upstream has 0 test failures from a simple 'make test' - # zero unexpected failures on all tier 1 platforms - http://hackage.haskell.org/trac/ghc/ticket/5757 - #make fulltest -} - -package() { - cd ghc-${pkgver} - - make DESTDIR=${pkgdir} install - - install -d ${pkgdir}/usr/share/licenses/ghc - install -m644 LICENSE \ - ${pkgdir}/usr/share/licenses/ghc -} diff --git a/staging/ghc/build.mk b/staging/ghc/build.mk deleted file mode 100644 index bb57594bf..000000000 --- a/staging/ghc/build.mk +++ /dev/null @@ -1,200 +0,0 @@ -# ----------------------------------------------------------------------------- -# A Sample build.mk -# -# Uncomment one of the following BuildFlavour settings to get the desired -# overall build type, and then tweak the options in the relevant section -# below. - -# Uncomment one of these to select a build profile below: - -# Full build with max optimisation and everything enabled (very slow build) -BuildFlavour = perf - -# As above but build GHC using the LLVM backend -#BuildFlavour = perf-llvm - -# Fast build with optimised libraries, no profiling (RECOMMENDED): -#BuildFlavour = quick - -# Even faster build. NOT RECOMMENDED: the libraries will be -# completely unoptimised, so any code built with this compiler -# (including stage2) will run very slowly: -#BuildFlavour = quickest - -# Profile the stage2 compiler: -#BuildFlavour = prof - -# A development build, working on the stage 1 compiler: -#BuildFlavour = devel1 - -# A development build, working on the stage 2 compiler: -#BuildFlavour = devel2 - -# An unregisterised, optimised build of ghc, for porting: -#BuildFlavour = unreg - -GhcLibWays = v - -# -------- 1. A Performance/Distribution build-------------------------------- - -ifeq "$(BuildFlavour)" "perf" - -# perf matches the default settings, repeated here for comparison: - -SRC_HC_OPTS = -O -H64m -GhcStage1HcOpts = -O -fasm -GhcStage2HcOpts = -O2 -fasm -GhcHcOpts = -Rghc-timing -GhcLibHcOpts = -O2 -GhcLibWays += p - -ifeq "$(PlatformSupportsSharedLibs)" "YES" -GhcLibWays += dyn -endif - -endif - -# ---------------- Perf build using LLVM ------------------------------------- - -ifeq "$(BuildFlavour)" "perf-llvm" - -SRC_HC_OPTS = -O -H64m -fllvm -GhcStage1HcOpts = -O -fllvm -GhcStage2HcOpts = -O2 -fllvm -GhcHcOpts = -Rghc-timing -GhcLibHcOpts = -O2 -GhcLibWays += p - -ifeq "$(PlatformSupportsSharedLibs)" "YES" -GhcLibWays += dyn -endif - -endif - -# -------- A Fast build ------------------------------------------------------ - -ifeq "$(BuildFlavour)" "quickest" - -SRC_HC_OPTS = -H64m -O0 -fasm -GhcStage1HcOpts = -O -fasm -GhcStage2HcOpts = -O0 -fasm -GhcLibHcOpts = -O0 -fasm -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO - -endif - -# -------- A Fast build with optimised libs ---------------------------------- - -ifeq "$(BuildFlavour)" "quick" - -SRC_HC_OPTS = -H64m -O0 -fasm -GhcStage1HcOpts = -O -fasm -GhcStage2HcOpts = -O0 -fasm -GhcLibHcOpts = -O -fasm -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO - -endif - -# -------- Profile the stage2 compiler --------------------------------------- - -ifeq "$(BuildFlavour)" "prof" - -SRC_HC_OPTS = -H64m -O0 -fasm -GhcStage1HcOpts = -O -fasm -GhcStage2HcOpts = -O -fasm -GhcLibHcOpts = -O -fasm - -GhcLibWays += p -GhcProfiled = YES - -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO - -endif - - -# -------- A Development build (stage 1) ------------------------------------- - -ifeq "$(BuildFlavour)" "devel1" - -SRC_HC_OPTS = -H64m -O -fasm -GhcLibHcOpts = -O -dcore-lint -GhcStage1HcOpts = -Rghc-timing -O0 -DDEBUG -GhcStage2HcOpts = -Rghc-timing -O -fasm -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO -LAX_DEPENDENCIES = YES - -endif - -# -------- A Development build (stage 2) ------------------------------------- - -ifeq "$(BuildFlavour)" "devel2" - -SRC_HC_OPTS = -H64m -O -fasm -GhcLibHcOpts = -O -dcore-lint -GhcStage1HcOpts = -Rghc-timing -O -fasm -GhcStage2HcOpts = -Rghc-timing -O0 -DDEBUG -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO -LAX_DEPENDENCIES = YES - -# After stage 1 and the libraries have been built, you can uncomment this line: - -# stage=2 - -# Then stage 1 will not be touched by the build system, until -# you comment the line again. This is a useful trick for when you're -# working on stage 2 and want to freeze stage 1 and the libraries for -# a while. - -endif - -# -------- A Unregisterised build) ------------------------------------------- - -ifeq "$(BuildFlavour)" "unreg" - -# Note that the LLVM backend works in unregisterised mode as well as -# registerised mode. This often makes it a good choice for porting -# GHC. - -GhcUnregisterised = YES -GhcWithNativeCodeGen = NO - -SRC_HC_OPTS = -O -H64m # -fllvm -GhcStage1HcOpts = -O -GhcStage2HcOpts = -O2 -GhcHcOpts = -Rghc-timing -GhcLibHcOpts = -O2 -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO - -endif - -# ----------------------------------------------------------------------------- -# Other settings that might be useful - -# NoFib settings -NoFibWays = -STRIP_CMD = : - diff --git a/staging/ghc/ghc.install b/staging/ghc/ghc.install deleted file mode 100644 index c0200e4a6..000000000 --- a/staging/ghc/ghc.install +++ /dev/null @@ -1,10 +0,0 @@ -pre_upgrade() { - echo '==> Unregistering cabalized packages...' - [[ -d /usr/share/haskell ]] && find /usr/share/haskell -maxdepth 2 -name 'unregister.sh' -exec {} \; - echo '==> Done.' -} - -post_upgrade() { - echo '==> All cabalized packages need to be reinstalled now.' - echo '==> See /usr/share/haskell/ and ghc-pkg list --user for a tentative list of affected packages.' -} diff --git a/staging/ghc/print-provides-replaces.sh b/staging/ghc/print-provides-replaces.sh deleted file mode 100755 index 33d1da051..000000000 --- a/staging/ghc/print-provides-replaces.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. PKGBUILD - -if [[ ! -d src/ghc-${pkgver}/libraries ]]; then - echo "error: no directory src/ghc-${pkgver}/libraries: You must extract the source tarball under src/" - exit 1 -fi - -declare -A exclude -# no Win32 cause we're not building on windows -exclude['Win32']=1 -# no integer-simple because we use integer-gmp -exclude['integer-simple']=1 -# extract excluded libraries from ghc.mk -for exclude_pkg in $(sed 's/PKGS_THAT_ARE_INTREE_ONLY := //p' -n src/ghc-${pkgver}/ghc.mk); do - exclude[${exclude_pkg}]=1 -done - -cd src/ghc-${pkgver}/libraries - -# $1 is the name of the variable -# $2 is the string for the test, either '=' or '<' -print_var() { - printf "$1=(" - for pkg in $(ls ./*/*.cabal | awk -F '/' '{ print $2 }'); do - [[ ${exclude[${pkg}]} ]] && continue - version=$(awk 'tolower($0) ~ /^version:/ {print $2 }' $pkg/$pkg.cabal) - printf "'haskell-$pkg$2$version'\n " - done - # also add cabal - version=$(awk 'tolower($0) ~ /^version:/ { print $2 }' Cabal/Cabal/Cabal.cabal) - printf "'haskell-cabal$2$version'\n " - echo -e '\b)' -} - -print_var 'provides' '=' -print_var 'replaces' '<' diff --git a/staging/ghc/silence-gen_contents_index.diff b/staging/ghc/silence-gen_contents_index.diff deleted file mode 100644 index 6d835f8fb..000000000 --- a/staging/ghc/silence-gen_contents_index.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- ghc-7.4.2/libraries/gen_contents_index.original 2012-06-10 22:23:28.810059378 +0000 -+++ ghc-7.4.2/libraries/gen_contents_index 2012-06-10 22:24:00.289814576 +0000 -@@ -47,7 +47,6 @@ - esac - - # Now create the combined contents and index pages --echo $HADDOCK_ARGS - $HADDOCK --gen-index --gen-contents -o . \ - -t "Haskell Hierarchical Libraries" \ - -p "prologue.txt" \ diff --git a/staging/gimp-ufraw/PKGBUILD b/staging/gimp-ufraw/PKGBUILD deleted file mode 100644 index 037d2b52c..000000000 --- a/staging/gimp-ufraw/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 164305 2012-07-30 00:32:08Z eric $ -# Maintainer: Tobias Kieslich <tobias@archlinux.org> - -pkgname=gimp-ufraw -pkgver=0.18 -pkgrel=5 -pkgdesc="Standalone or gimp plugin converter for raw files" -url="http://ufraw.sourceforge.net/" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gtkimageview' 'exiv2' 'lcms' 'bzip2' 'desktop-file-utils') -makedepends=('gimp' 'cinepaint') -optdepends=('gimp: to use the gimp import plugin for raw images' - 'cinepaint: to use the cinepaint import plugin for raw images') -install=gimp-ufraw.install -source=(http://downloads.sourceforge.net/ufraw/ufraw-${pkgver}.tar.gz) -sha1sums=('41c9ad7aa7f1cbb63a6b0b330b3599b18a7e8cd2') - -build() { - cd "${srcdir}/ufraw-${pkgver}" - - ./configure --prefix=/usr \ - --enable-extras \ - --enable-mime \ - --enable-openmp - sed -i "s/-ffast-math -fomit-frame-pointer -W -Wall -O3/${CFLAGS}/" Makefile - make -} - -package() { - cd "${srcdir}/ufraw-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -f "${pkgdir}/usr/bin/dcraw" -} diff --git a/staging/gimp-ufraw/gimp-ufraw.install b/staging/gimp-ufraw/gimp-ufraw.install deleted file mode 100644 index 80312d4a6..000000000 --- a/staging/gimp-ufraw/gimp-ufraw.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/staging/glew/PKGBUILD b/staging/glew/PKGBUILD deleted file mode 100644 index 4cc448ce2..000000000 --- a/staging/glew/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 169341 2012-10-19 22:31:09Z eric $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: SleepyDog - -pkgname=glew -pkgver=1.9.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' 'glu') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz) -sha1sums=('9291f5c5afefd482c7f3e91ffb3cd4716c6c9ffe') - -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/glibc/PKGBUILD b/staging/glibc/PKGBUILD deleted file mode 100644 index 4331b76b5..000000000 --- a/staging/glibc/PKGBUILD +++ /dev/null @@ -1,159 +0,0 @@ -# $Id: PKGBUILD 165122 2012-08-11 08:27:45Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: valgrind requires rebuilt with each major glibc version - -pkgname=glibc -pkgver=2.16.0 -pkgrel=3 -pkgdesc="GNU C Library" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/libc" -license=('GPL' 'LGPL') -groups=('base') -depends=('linux-api-headers>=3.5' 'tzdata') -makedepends=('gcc>=4.7') -backup=(etc/gai.conf - etc/locale.gen - etc/nscd.conf) -options=('!strip') -install=glibc.install -source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} - glibc-2.15-fix-res_query-assert.patch - glibc-2.15-revert-c5a0802a.patch - glibc-2.16-rpcgen-cpp-path.patch - nscd.rcd - nscd.service - nscd.tmpfiles - locale.gen.txt - locale-gen) -md5sums=('80b181b02ab249524ec92822c0174cf7' - '2a1221a15575820751c325ef4d2fbb90' - '31f415b41197d85d3bbee3d1eecd06a3' - '0a0383d50d63f1c02919fe9943b82014' - 'ea6a43915474e8276e9361eed6a01280' - '589d79041aa767a5179eaa4e2737dd3f' - 'ad8a9af15ab7eeaa23dc7ee85024af9f' - 'bccbe5619e75cf1d97312ec3681c605c' - '07ac979b6ab5eeb778d55f041529d623' - '476e9113489f93b348b21e144b6a8fcf') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # fix res_query assertion - # http://sourceware.org/bugzilla/show_bug.cgi?id=13013 - patch -p1 -i ${srcdir}/glibc-2.15-fix-res_query-assert.patch - - # revert commit c5a0802a - causes various hangs - # https://bugzilla.redhat.com/show_bug.cgi?id=552960 - patch -p1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch - - # prevent need for /lib/cpp symlink - # http://sourceware.org/git/?p=glibc.git;a=commit;h=bf9b740a - patch -p1 -i ${srcdir}/glibc-2.16-rpcgen-cpp-path.patch - - cd ${srcdir} - mkdir glibc-build - cd glibc-build - - if [[ ${CARCH} = "i686" ]]; then - # Hack to fix NPTL issues with Xen, only required on 32bit platforms - # TODO: make separate glibc-xen package for i686 - export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" - fi - - echo "slibdir=/lib" >> configparms - - # remove hardening options from CFLAGS for building libraries - CFLAGS=${CFLAGS/-fstack-protector/} - CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/} - - ${srcdir}/${pkgname}-${pkgver}/configure --prefix=/usr \ - --libdir=/usr/lib --libexecdir=/usr/lib \ - --with-headers=/usr/include \ - --enable-add-ons=nptl,libidn \ - --enable-obsolete-rpc \ - --enable-kernel=2.6.32 \ - --enable-bind-now --disable-profile \ - --enable-stackguard-randomization \ - --enable-multi-arch - - # build libraries with hardening disabled - echo "build-programs=no" >> configparms - make - - # re-enable hardening for programs - sed -i "/build-programs=/s#no#yes#" configparms - echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms - echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms - make - - # remove harding in preparation to run test-suite - sed -i '2,4d' configparms -} - -check() { - cd ${srcdir}/glibc-build - make -k check -} - -package() { - cd ${srcdir}/glibc-build - - ln -s usr/lib ${pkgdir}/lib - - install -dm755 ${pkgdir}/etc - touch ${pkgdir}/etc/ld.so.conf - - make install_root=${pkgdir} install - - rm -f ${pkgdir}/etc/ld.so.{cache,conf} - - install -dm755 ${pkgdir}/{etc/rc.d,usr/{sbin,lib/{,locale,systemd/system,tmpfiles.d}}} - - install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.conf ${pkgdir}/etc/nscd.conf - sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf - install -m755 ${srcdir}/nscd.rcd ${pkgdir}/etc/rc.d/nscd - install -m644 ${srcdir}/nscd.service ${pkgdir}/usr/lib/systemd/system - install -m644 ${srcdir}/nscd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/nscd.conf - - install -m644 ${srcdir}/${pkgname}-${pkgver}/posix/gai.conf ${pkgdir}/etc/gai.conf - - install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin - - # create /etc/locale.gen - install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen - sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \ - ${srcdir}/glibc-2.16.0/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen - - if [[ ${CARCH} = "x86_64" ]]; then - # fix paths and compliance with binary blobs... - sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd - ln -s usr/lib ${pkgdir}/lib64 - fi - - # Do not strip the following files for improved debugging support - # ("improved" as in not breaking gdb and valgrind...): - # ld-${pkgver}.so - # libc-${pkgver}.so - # libpthread-${pkgver}.so - # libthread_db-1.0.so - - cd $pkgdir - strip $STRIP_BINARIES sbin/{ldconfig,sln} \ - usr/bin/{gencat,getconf,getent,iconv,locale,localedef} \ - usr/bin/{makedb,pcprofiledump,pldd,rpcgen,sprof} \ - usr/lib/getconf/* \ - usr/sbin/{iconvconfig,nscd} - [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4 - - strip $STRIP_STATIC usr/lib/*.a - - strip $STRIP_SHARED usr/lib/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \ - usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \ - usr/lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \ - usr/lib/{libmemusage,libpcprofile,libSegFault}.so \ - usr/lib/{pt_chown,{audit,gconv}/*.so} -} diff --git a/staging/glibc/glibc-2.14-libdl-crash.patch b/staging/glibc/glibc-2.14-libdl-crash.patch deleted file mode 100644 index 6c9d2718e..000000000 --- a/staging/glibc/glibc-2.14-libdl-crash.patch +++ /dev/null @@ -1,132 +0,0 @@ -diff --git a/elf/dl-close.c b/elf/dl-close.c -index 73b2a2f..9bd91e3 100644 ---- a/elf/dl-close.c -+++ b/elf/dl-close.c -@@ -1,5 +1,5 @@ - /* Close a shared object opened by `_dl_open'. -- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc. -+ Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map) - if (map->l_direct_opencount > 0 || map->l_type != lt_loaded - || dl_close_state != not_pending) - { -- if (map->l_direct_opencount == 0) -- { -- if (map->l_type == lt_loaded) -- dl_close_state = rerun; -- else if (map->l_type == lt_library) -- { -- struct link_map **oldp = map->l_initfini; -- map->l_initfini = map->l_orig_initfini; -- _dl_scope_free (oldp); -- } -- } -+ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded) -+ dl_close_state = rerun; - - /* There are still references to this object. Do nothing more. */ - if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) -diff --git a/elf/dl-deps.c b/elf/dl-deps.c -index 9e30594..3890d00 100644 ---- a/elf/dl-deps.c -+++ b/elf/dl-deps.c -@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map, - nneeded * sizeof needed[0]); - atomic_write_barrier (); - l->l_initfini = l_initfini; -+ l->l_free_initfini = 1; - } - - /* If we have no auxiliary objects just go on to the next map. */ -@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING")); - l_initfini[nlist] = NULL; - atomic_write_barrier (); - map->l_initfini = l_initfini; -+ map->l_free_initfini = 1; - if (l_reldeps != NULL) - { - atomic_write_barrier (); -@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING")); - _dl_scope_free (old_l_reldeps); - } - if (old_l_initfini != NULL) -- map->l_orig_initfini = old_l_initfini; -+ _dl_scope_free (old_l_initfini); - -diff --git a/elf/dl-libc.c b/elf/dl-libc.c -index 7be9483..a13fce3 100644 ---- a/elf/dl-libc.c -+++ b/elf/dl-libc.c -@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem) - - for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) - { -- /* Remove all additional names added to the objects. */ - for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next) - { - struct libname_list *lnp = l->l_libname->next; - - l->l_libname->next = NULL; - -+ /* Remove all additional names added to the objects. */ - while (lnp != NULL) - { - struct libname_list *old = lnp; -@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem) - if (! old->dont_free) - free (old); - } -+ -+ /* Free the initfini dependency list. */ -+ if (l->l_free_initfini) -+ free (l->l_initfini); - } - - if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 -diff --git a/elf/rtld.c b/elf/rtld.c -index 4a9109e..617e30e 100644 ---- a/elf/rtld.c -+++ b/elf/rtld.c -@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", - lnp->dont_free = 1; - lnp = lnp->next; - } -+ l->l_free_initfini = 0; - - if (l != &GL(dl_rtld_map)) - _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0, -diff --git a/include/link.h b/include/link.h -index e877104..051b99a 100644 ---- a/include/link.h -+++ b/include/link.h -@@ -1,6 +1,6 @@ - /* Data structure for communication from the run-time dynamic linker for - loaded ELF shared objects. -- Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. -+ Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -192,6 +192,9 @@ struct link_map - during LD_TRACE_PRELINKING=1 - contains any DT_SYMBOLIC - libraries. */ -+ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be -+ freed, ie. not allocated with -+ the dummy malloc in ld.so. */ - - /* Collected information about own RPATH directories. */ - struct r_search_path_struct l_rpath_dirs; -@@ -240,9 +243,6 @@ struct link_map - - /* List of object in order of the init and fini calls. */ - struct link_map **l_initfini; -- /* The init and fini list generated at startup, saved when the -- object is also loaded dynamically. */ -- struct link_map **l_orig_initfini; - - /* List of the dependencies introduced through symbol binding. */ - struct link_map_reldeps diff --git a/staging/glibc/glibc-2.14-reexport-rpc-interface.patch b/staging/glibc/glibc-2.14-reexport-rpc-interface.patch deleted file mode 100644 index e2beea881..000000000 --- a/staging/glibc/glibc-2.14-reexport-rpc-interface.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/include/libc-symbols.h b/include/libc-symbols.h -index 67e1ca2..5e7cca5 100644 ---- a/include/libc-symbols.h -+++ b/include/libc-symbols.h -@@ -635,7 +635,7 @@ for linking") - # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) - # define libc_hidden_def(name) hidden_def (name) - # define libc_hidden_weak(name) hidden_weak (name) --# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version) -+# define libc_hidden_nolink(name, version) hidden_def (name) - # define libc_hidden_ver(local, name) hidden_ver (local, name) - # define libc_hidden_data_def(name) hidden_data_def (name) - # define libc_hidden_data_weak(name) hidden_data_weak (name) -diff --git a/sunrpc/Makefile b/sunrpc/Makefile -index 5134ce9..40c73d1 100644 ---- a/sunrpc/Makefile -+++ b/sunrpc/Makefile -@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \ - des_crypt.h) - headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \ - $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h --headers = rpc/netdb.h -+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc) - install-others = $(inst_sysconfdir)/rpc - generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \ - $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen diff --git a/staging/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/staging/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch deleted file mode 100644 index eb0fd822d..000000000 --- a/staging/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab@redhat.com> -Date: Tue, 17 May 2011 17:42:30 +0200 -Subject: [PATCH] Reinstall NIS RPC headers - ---- - nis/Makefile | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/nis/Makefile b/nis/Makefile -index b5c9609..d2934d9 100644 ---- a/nis/Makefile -+++ b/nis/Makefile -@@ -23,9 +23,9 @@ subdir := nis - - aux := nis_hash - -+headers := $(wildcard rpcsvc/*.[hx]) - distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \ -- nisplus-parser.h nis_xdr.h nss \ -- $(wildcard rpcsvc/*.[hx]) -+ nisplus-parser.h nis_xdr.h nss - - # These are the databases available for the nis (and perhaps later nisplus) - # service. This must be a superset of the services in nss. --- -1.7.5.4 - diff --git a/staging/glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch b/staging/glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch deleted file mode 100644 index 6f0a0398f..000000000 --- a/staging/glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/resolv/res_query.c b/resolv/res_query.c -index 947c651..abccd4a 100644 ---- a/resolv/res_query.c -+++ b/resolv/res_query.c -@@ -556,12 +556,16 @@ __libc_res_nquerydomain(res_state statp, - * copy without '.' if present. - */ - n = strlen(name); -- if (n >= MAXDNAME) { -+ -+ /* Decrement N prior to checking it against MAXDNAME -+ so that we detect a wrap to SIZE_MAX and return -+ a reasonable error. */ -+ n--; -+ if (n >= MAXDNAME - 1) { - RES_SET_H_ERRNO(statp, NO_RECOVERY); - return (-1); - } -- n--; -- if (n >= 0 && name[n] == '.') { -+ if (name[n] == '.') { - strncpy(nbuf, name, n); - nbuf[n] = '\0'; - } else diff --git a/staging/glibc/glibc-2.15-arena.patch b/staging/glibc/glibc-2.15-arena.patch deleted file mode 100644 index 46f52e98d..000000000 --- a/staging/glibc/glibc-2.15-arena.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/malloc/arena.c b/malloc/arena.c -index d3cf4b9..b1c9469 100644 ---- a/malloc/arena.c -+++ b/malloc/arena.c -@@ -828,7 +828,7 @@ arena_get2(mstate a_tsd, size_t size) - { - if (mp_.arena_max != 0) - narenas_limit = mp_.arena_max; -- else -+ else if (narenas > mp_.arena_test) - { - int n = __get_nprocs (); - -@@ -842,7 +842,14 @@ arena_get2(mstate a_tsd, size_t size) - } - repeat:; - size_t n = narenas; -- if (__builtin_expect (n <= mp_.arena_test || n < narenas_limit, 0)) -+ /* NB: the following depends on the fact that (size_t)0 - 1 is a -+ very large number and that the underflow is OK. If arena_max -+ is set the value of arena_test is irrelevant. If arena_test -+ is set but narenas is not yet larger or equal to arena_test -+ narenas_limit is 0. There is no possibility for narenas to -+ be too big for the test to always fail since there is not -+ enough address space to create that many arenas. */ -+ if (__builtin_expect (n <= narenas_limit - 1, 0)) - { - if (catomic_compare_and_exchange_bool_acq (&narenas, n + 1, n)) - goto repeat; diff --git a/staging/glibc/glibc-2.15-avx.patch b/staging/glibc/glibc-2.15-avx.patch deleted file mode 100644 index 5439da8d0..000000000 --- a/staging/glibc/glibc-2.15-avx.patch +++ /dev/null @@ -1,196 +0,0 @@ -diff --git a/sysdeps/x86_64/fpu/multiarch/e_atan2.c b/sysdeps/x86_64/fpu/multiarch/e_atan2.c -index 6867c6e..3a615fc 100644 ---- a/sysdeps/x86_64/fpu/multiarch/e_atan2.c -+++ b/sysdeps/x86_64/fpu/multiarch/e_atan2.c -@@ -14,7 +14,7 @@ extern double __ieee754_atan2_fma4 (double, double); - - libm_ifunc (__ieee754_atan2, - HAS_FMA4 ? __ieee754_atan2_fma4 -- : (HAS_AVX ? __ieee754_atan2_avx : __ieee754_atan2_sse2)); -+ : (HAS_YMM_USABLE ? __ieee754_atan2_avx : __ieee754_atan2_sse2)); - strong_alias (__ieee754_atan2, __atan2_finite) - - # define __ieee754_atan2 __ieee754_atan2_sse2 -diff --git a/sysdeps/x86_64/fpu/multiarch/e_exp.c b/sysdeps/x86_64/fpu/multiarch/e_exp.c -index 3c65028..7b2320a 100644 ---- a/sysdeps/x86_64/fpu/multiarch/e_exp.c -+++ b/sysdeps/x86_64/fpu/multiarch/e_exp.c -@@ -14,7 +14,7 @@ extern double __ieee754_exp_fma4 (double); - - libm_ifunc (__ieee754_exp, - HAS_FMA4 ? __ieee754_exp_fma4 -- : (HAS_AVX ? __ieee754_exp_avx : __ieee754_exp_sse2)); -+ : (HAS_YMM_USABLE ? __ieee754_exp_avx : __ieee754_exp_sse2)); - strong_alias (__ieee754_exp, __exp_finite) - - # define __ieee754_exp __ieee754_exp_sse2 -diff --git a/sysdeps/x86_64/fpu/multiarch/e_log.c b/sysdeps/x86_64/fpu/multiarch/e_log.c -index 3b468d0..ab277d6 100644 ---- a/sysdeps/x86_64/fpu/multiarch/e_log.c -+++ b/sysdeps/x86_64/fpu/multiarch/e_log.c -@@ -14,7 +14,7 @@ extern double __ieee754_log_fma4 (double); - - libm_ifunc (__ieee754_log, - HAS_FMA4 ? __ieee754_log_fma4 -- : (HAS_AVX ? __ieee754_log_avx -+ : (HAS_YMM_USABLE ? __ieee754_log_avx - : __ieee754_log_sse2)); - strong_alias (__ieee754_log, __log_finite) - -diff --git a/sysdeps/x86_64/fpu/multiarch/s_atan.c b/sysdeps/x86_64/fpu/multiarch/s_atan.c -index 3160201..78c7e09 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_atan.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_atan.c -@@ -12,7 +12,8 @@ extern double __atan_fma4 (double); - # define __atan_fma4 ((void *) 0) - # endif - --libm_ifunc (atan, HAS_FMA4 ? __atan_fma4 : HAS_AVX ? __atan_avx : __atan_sse2); -+libm_ifunc (atan, (HAS_FMA4 ? __atan_fma4 : -+ HAS_YMM_USABLE ? __atan_avx : __atan_sse2)); - - # define atan __atan_sse2 - #endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_sin.c b/sysdeps/x86_64/fpu/multiarch/s_sin.c -index 1ba9dbc..417acd0 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_sin.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_sin.c -@@ -17,10 +17,12 @@ extern double __sin_fma4 (double); - # define __sin_fma4 ((void *) 0) - # endif - --libm_ifunc (__cos, HAS_FMA4 ? __cos_fma4 : HAS_AVX ? __cos_avx : __cos_sse2); -+libm_ifunc (__cos, (HAS_FMA4 ? __cos_fma4 : -+ HAS_YMM_USABLE ? __cos_avx : __cos_sse2)); - weak_alias (__cos, cos) - --libm_ifunc (__sin, HAS_FMA4 ? __sin_fma4 : HAS_AVX ? __sin_avx : __sin_sse2); -+libm_ifunc (__sin, (HAS_FMA4 ? __sin_fma4 : -+ HAS_YMM_USABLE ? __sin_avx : __sin_sse2)); - weak_alias (__sin, sin) - - # define __cos __cos_sse2 -diff --git a/sysdeps/x86_64/fpu/multiarch/s_tan.c b/sysdeps/x86_64/fpu/multiarch/s_tan.c -index 8f6601e..3047155 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_tan.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_tan.c -@@ -12,7 +12,8 @@ extern double __tan_fma4 (double); - # define __tan_fma4 ((void *) 0) - # endif - --libm_ifunc (tan, HAS_FMA4 ? __tan_fma4 : HAS_AVX ? __tan_avx : __tan_sse2); -+libm_ifunc (tan, (HAS_FMA4 ? __tan_fma4 : -+ HAS_YMM_USABLE ? __tan_avx : __tan_sse2)); - - # define tan __tan_sse2 - #endif -diff --git a/sysdeps/x86_64/multiarch/init-arch.c b/sysdeps/x86_64/multiarch/init-arch.c -index 65b0ee9..76d146c 100644 ---- a/sysdeps/x86_64/multiarch/init-arch.c -+++ b/sysdeps/x86_64/multiarch/init-arch.c -@@ -1,6 +1,6 @@ - /* Initialize CPU feature data. - This file is part of the GNU C Library. -- Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc. -+ Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. - Contributed by Ulrich Drepper <drepper@redhat.com>. - - The GNU C Library is free software; you can redistribute it and/or -@@ -144,6 +144,18 @@ __init_cpu_features (void) - else - kind = arch_kind_other; - -+ if (__cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx & bit_AVX) -+ { -+ /* Reset the AVX bit in case OSXSAVE is disabled. */ -+ if ((__cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx & bit_OSXSAVE) != 0 -+ && ({ unsigned int xcrlow; -+ unsigned int xcrhigh; -+ asm ("xgetbv" -+ : "=a" (xcrlow), "=d" (xcrhigh) : "c" (0)); -+ (xcrlow & 6) == 6; })) -+ __cpu_features.feature[index_YMM_Usable] |= bit_YMM_Usable; -+ } -+ - __cpu_features.family = family; - __cpu_features.model = model; - atomic_write_barrier (); -diff --git a/sysdeps/x86_64/multiarch/init-arch.h b/sysdeps/x86_64/multiarch/init-arch.h -index 2a1df39..2dc75ab 100644 ---- a/sysdeps/x86_64/multiarch/init-arch.h -+++ b/sysdeps/x86_64/multiarch/init-arch.h -@@ -1,5 +1,5 @@ - /* This file is part of the GNU C Library. -- Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc. -+ Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public -@@ -22,11 +22,13 @@ - #define bit_Prefer_SSE_for_memop (1 << 3) - #define bit_Fast_Unaligned_Load (1 << 4) - #define bit_Prefer_PMINUB_for_stringop (1 << 5) -+#define bit_YMM_Usable (1 << 6) - - #define bit_SSE2 (1 << 26) - #define bit_SSSE3 (1 << 9) - #define bit_SSE4_1 (1 << 19) - #define bit_SSE4_2 (1 << 20) -+#define bit_OSXSAVE (1 << 27) - #define bit_AVX (1 << 28) - #define bit_POPCOUNT (1 << 23) - #define bit_FMA (1 << 12) -@@ -48,6 +50,7 @@ - # define index_Prefer_SSE_for_memop FEATURE_INDEX_1*FEATURE_SIZE - # define index_Fast_Unaligned_Load FEATURE_INDEX_1*FEATURE_SIZE - # define index_Prefer_PMINUB_for_stringop FEATURE_INDEX_1*FEATURE_SIZE -+# define index_YMM_Usable FEATURE_INDEX_1*FEATURE_SIZE - - #else /* __ASSEMBLER__ */ - -@@ -92,7 +95,7 @@ extern struct cpu_features - - - extern void __init_cpu_features (void) attribute_hidden; --#define INIT_ARCH()\ -+# define INIT_ARCH() \ - do \ - if (__cpu_features.kind == arch_kind_unknown) \ - __init_cpu_features (); \ -@@ -125,23 +128,21 @@ extern const struct cpu_features *__get_cpu_features (void) - # define index_Slow_BSF FEATURE_INDEX_1 - # define index_Prefer_SSE_for_memop FEATURE_INDEX_1 - # define index_Fast_Unaligned_Load FEATURE_INDEX_1 -+# define index_YMM_Usable FEATURE_INDEX_1 - --#define HAS_ARCH_FEATURE(idx, bit) \ -- ((__get_cpu_features ()->feature[idx] & (bit)) != 0) -+# define HAS_ARCH_FEATURE(name) \ -+ ((__get_cpu_features ()->feature[index_##name] & (bit_##name)) != 0) - --#define HAS_FAST_REP_STRING \ -- HAS_ARCH_FEATURE (index_Fast_Rep_String, bit_Fast_Rep_String) -+# define HAS_FAST_REP_STRING HAS_ARCH_FEATURE (Fast_Rep_String) - --#define HAS_FAST_COPY_BACKWARD \ -- HAS_ARCH_FEATURE (index_Fast_Copy_Backward, bit_Fast_Copy_Backward) -+# define HAS_FAST_COPY_BACKWARD HAS_ARCH_FEATURE (Fast_Copy_Backward) - --#define HAS_SLOW_BSF \ -- HAS_ARCH_FEATURE (index_Slow_BSF, bit_Slow_BSF) -+# define HAS_SLOW_BSF HAS_ARCH_FEATURE (Slow_BSF) - --#define HAS_PREFER_SSE_FOR_MEMOP \ -- HAS_ARCH_FEATURE (index_Prefer_SSE_for_memop, bit_Prefer_SSE_for_memop) -+# define HAS_PREFER_SSE_FOR_MEMOP HAS_ARCH_FEATURE (Prefer_SSE_for_memop) - --#define HAS_FAST_UNALIGNED_LOAD \ -- HAS_ARCH_FEATURE (index_Fast_Unaligned_Load, bit_Fast_Unaligned_Load) -+# define HAS_FAST_UNALIGNED_LOAD HAS_ARCH_FEATURE (Fast_Unaligned_Load) -+ -+# define HAS_YMM_USABLE HAS_ARCH_FEATURE (YMM_Usable) - - #endif /* __ASSEMBLER__ */ --- -1.7.9 - diff --git a/staging/glibc/glibc-2.15-confstr-local-buffer-extent.patch b/staging/glibc/glibc-2.15-confstr-local-buffer-extent.patch deleted file mode 100644 index 483b28532..000000000 --- a/staging/glibc/glibc-2.15-confstr-local-buffer-extent.patch +++ /dev/null @@ -1,297 +0,0 @@ -diff --git a/posix/confstr.c b/posix/confstr.c -index 3c9566d..cad6561 100644 ---- a/posix/confstr.c -+++ b/posix/confstr.c -@@ -35,6 +34,10 @@ confstr (name, buf, len) - const char *string = ""; - size_t string_len = 1; - -+ /* Note that this buffer must be large enough for the longest strings -+ used below. */ -+ char restenvs[4 * sizeof "POSIX_V7_LPBIG_OFFBIG"]; -+ - switch (name) - { - case _CS_PATH: -@@ -53,59 +56,55 @@ confstr (name, buf, len) - wint_t types are no greater than the width of type long. - - Currently this means all environment which the system allows. */ -- { -- char restenvs[4 * sizeof "POSIX_V7_LPBIG_OFFBIG"]; -- -- string_len = 0; -+ string_len = 0; - #ifndef _POSIX_V7_ILP32_OFF32 -- if (__sysconf (_SC_V7_ILP32_OFF32) > 0) -+ if (__sysconf (_SC_V7_ILP32_OFF32) > 0) - #endif - #if !defined _POSIX_V7_ILP32_OFF32 || _POSIX_V7_ILP32_OFF32 > 0 -- { -- memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFF32", -- sizeof "POSIX_V7_ILP32_OFF32" - 1); -- string_len += sizeof "POSIX_V7_ILP32_OFF32" - 1; -- } -+ { -+ memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFF32", -+ sizeof "POSIX_V7_ILP32_OFF32" - 1); -+ string_len += sizeof "POSIX_V7_ILP32_OFF32" - 1; -+ } - #endif - #ifndef _POSIX_V7_ILP32_OFFBIG -- if (__sysconf (_SC_V7_ILP32_OFFBIG) > 0) -+ if (__sysconf (_SC_V7_ILP32_OFFBIG) > 0) - #endif - #if !defined _POSIX_V7_ILP32_OFFBIG || _POSIX_V7_ILP32_OFFBIG > 0 -- { -- if (string_len) -- restenvs[string_len++] = '\n'; -- memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFFBIG", -- sizeof "POSIX_V7_ILP32_OFFBIG" - 1); -- string_len += sizeof "POSIX_V7_ILP32_OFFBIG" - 1; -- } -+ { -+ if (string_len) -+ restenvs[string_len++] = '\n'; -+ memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFFBIG", -+ sizeof "POSIX_V7_ILP32_OFFBIG" - 1); -+ string_len += sizeof "POSIX_V7_ILP32_OFFBIG" - 1; -+ } - #endif - #ifndef _POSIX_V7_LP64_OFF64 -- if (__sysconf (_SC_V7_LP64_OFF64) > 0) -+ if (__sysconf (_SC_V7_LP64_OFF64) > 0) - #endif - #if !defined _POSIX_V7_LP64_OFF64 || _POSIX_V7_LP64_OFF64 > 0 -- { -- if (string_len) -- restenvs[string_len++] = '\n'; -- memcpy (restenvs + string_len, "POSIX_V7_LP64_OFF64", -- sizeof "POSIX_V7_LP64_OFF64" - 1); -- string_len += sizeof "POSIX_V7_LP64_OFF64" - 1; -- } -+ { -+ if (string_len) -+ restenvs[string_len++] = '\n'; -+ memcpy (restenvs + string_len, "POSIX_V7_LP64_OFF64", -+ sizeof "POSIX_V7_LP64_OFF64" - 1); -+ string_len += sizeof "POSIX_V7_LP64_OFF64" - 1; -+ } - #endif - #ifndef _POSIX_V7_LPBIG_OFFBIG -- if (__sysconf (_SC_V7_LPBIG_OFFBIG) > 0) -+ if (__sysconf (_SC_V7_LPBIG_OFFBIG) > 0) - #endif - #if !defined _POSIX_V7_LPBIG_OFFBIG || _POSIX_V7_LPBIG_OFFBIG > 0 -- { -- if (string_len) -- restenvs[string_len++] = '\n'; -- memcpy (restenvs + string_len, "POSIX_V7_LPBIG_OFFBIG", -- sizeof "POSIX_V7_LPBIG_OFFBIG" - 1); -- string_len += sizeof "POSIX_V7_LPBIG_OFFBIG" - 1; -- } --#endif -- restenvs[string_len++] = '\0'; -- string = restenvs; -- } -+ { -+ if (string_len) -+ restenvs[string_len++] = '\n'; -+ memcpy (restenvs + string_len, "POSIX_V7_LPBIG_OFFBIG", -+ sizeof "POSIX_V7_LPBIG_OFFBIG" - 1); -+ string_len += sizeof "POSIX_V7_LPBIG_OFFBIG" - 1; -+ } -+#endif -+ restenvs[string_len++] = '\0'; -+ string = restenvs; - break; - - case _CS_V6_WIDTH_RESTRICTED_ENVS: -@@ -116,59 +115,55 @@ confstr (name, buf, len) - wint_t types are no greater than the width of type long. - - Currently this means all environment which the system allows. */ -- { -- char restenvs[4 * sizeof "POSIX_V6_LPBIG_OFFBIG"]; -- -- string_len = 0; -+ string_len = 0; - #ifndef _POSIX_V6_ILP32_OFF32 -- if (__sysconf (_SC_V6_ILP32_OFF32) > 0) -+ if (__sysconf (_SC_V6_ILP32_OFF32) > 0) - #endif - #if !defined _POSIX_V6_ILP32_OFF32 || _POSIX_V6_ILP32_OFF32 > 0 -- { -- memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFF32", -- sizeof "POSIX_V6_ILP32_OFF32" - 1); -- string_len += sizeof "POSIX_V6_ILP32_OFF32" - 1; -- } -+ { -+ memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFF32", -+ sizeof "POSIX_V6_ILP32_OFF32" - 1); -+ string_len += sizeof "POSIX_V6_ILP32_OFF32" - 1; -+ } - #endif - #ifndef _POSIX_V6_ILP32_OFFBIG -- if (__sysconf (_SC_V6_ILP32_OFFBIG) > 0) -+ if (__sysconf (_SC_V6_ILP32_OFFBIG) > 0) - #endif - #if !defined _POSIX_V6_ILP32_OFFBIG || _POSIX_V6_ILP32_OFFBIG > 0 -- { -- if (string_len) -- restenvs[string_len++] = '\n'; -- memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFFBIG", -- sizeof "POSIX_V6_ILP32_OFFBIG" - 1); -- string_len += sizeof "POSIX_V6_ILP32_OFFBIG" - 1; -- } -+ { -+ if (string_len) -+ restenvs[string_len++] = '\n'; -+ memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFFBIG", -+ sizeof "POSIX_V6_ILP32_OFFBIG" - 1); -+ string_len += sizeof "POSIX_V6_ILP32_OFFBIG" - 1; -+ } - #endif - #ifndef _POSIX_V6_LP64_OFF64 -- if (__sysconf (_SC_V6_LP64_OFF64) > 0) -+ if (__sysconf (_SC_V6_LP64_OFF64) > 0) - #endif - #if !defined _POSIX_V6_LP64_OFF64 || _POSIX_V6_LP64_OFF64 > 0 -- { -- if (string_len) -- restenvs[string_len++] = '\n'; -- memcpy (restenvs + string_len, "POSIX_V6_LP64_OFF64", -- sizeof "POSIX_V6_LP64_OFF64" - 1); -- string_len += sizeof "POSIX_V6_LP64_OFF64" - 1; -- } -+ { -+ if (string_len) -+ restenvs[string_len++] = '\n'; -+ memcpy (restenvs + string_len, "POSIX_V6_LP64_OFF64", -+ sizeof "POSIX_V6_LP64_OFF64" - 1); -+ string_len += sizeof "POSIX_V6_LP64_OFF64" - 1; -+ } - #endif - #ifndef _POSIX_V6_LPBIG_OFFBIG -- if (__sysconf (_SC_V6_LPBIG_OFFBIG) > 0) -+ if (__sysconf (_SC_V6_LPBIG_OFFBIG) > 0) - #endif - #if !defined _POSIX_V6_LPBIG_OFFBIG || _POSIX_V6_LPBIG_OFFBIG > 0 -- { -- if (string_len) -- restenvs[string_len++] = '\n'; -- memcpy (restenvs + string_len, "POSIX_V6_LPBIG_OFFBIG", -- sizeof "POSIX_V6_LPBIG_OFFBIG" - 1); -- string_len += sizeof "POSIX_V6_LPBIG_OFFBIG" - 1; -- } --#endif -- restenvs[string_len++] = '\0'; -- string = restenvs; -- } -+ { -+ if (string_len) -+ restenvs[string_len++] = '\n'; -+ memcpy (restenvs + string_len, "POSIX_V6_LPBIG_OFFBIG", -+ sizeof "POSIX_V6_LPBIG_OFFBIG" - 1); -+ string_len += sizeof "POSIX_V6_LPBIG_OFFBIG" - 1; -+ } -+#endif -+ restenvs[string_len++] = '\0'; -+ string = restenvs; - break; - - case _CS_V5_WIDTH_RESTRICTED_ENVS: -@@ -179,59 +174,55 @@ confstr (name, buf, len) - wint_t types are no greater than the width of type long. - - Currently this means all environment which the system allows. */ -- { -- char restenvs[4 * sizeof "XBS5_LPBIG_OFFBIG"]; -- -- string_len = 0; -+ string_len = 0; - #ifndef _XBS5_ILP32_OFF32 -- if (__sysconf (_SC_XBS5_ILP32_OFF32) > 0) -+ if (__sysconf (_SC_XBS5_ILP32_OFF32) > 0) - #endif - #if !defined _XBS5_ILP32_OFF32 || _XBS5_ILP32_OFF32 > 0 -- { -- memcpy (restenvs + string_len, "XBS5_ILP32_OFF32", -- sizeof "XBS5_ILP32_OFF32" - 1); -- string_len += sizeof "XBS5_ILP32_OFF32" - 1; -- } -+ { -+ memcpy (restenvs + string_len, "XBS5_ILP32_OFF32", -+ sizeof "XBS5_ILP32_OFF32" - 1); -+ string_len += sizeof "XBS5_ILP32_OFF32" - 1; -+ } - #endif - #ifndef _XBS5_ILP32_OFFBIG -- if (__sysconf (_SC_XBS5_ILP32_OFFBIG) > 0) -+ if (__sysconf (_SC_XBS5_ILP32_OFFBIG) > 0) - #endif - #if !defined _XBS5_ILP32_OFFBIG || _XBS5_ILP32_OFFBIG > 0 -- { -- if (string_len) -- restenvs[string_len++] = '\n'; -- memcpy (restenvs + string_len, "XBS5_ILP32_OFFBIG", -- sizeof "XBS5_ILP32_OFFBIG" - 1); -- string_len += sizeof "XBS5_ILP32_OFFBIG" - 1; -- } -+ { -+ if (string_len) -+ restenvs[string_len++] = '\n'; -+ memcpy (restenvs + string_len, "XBS5_ILP32_OFFBIG", -+ sizeof "XBS5_ILP32_OFFBIG" - 1); -+ string_len += sizeof "XBS5_ILP32_OFFBIG" - 1; -+ } - #endif - #ifndef _XBS5_LP64_OFF64 -- if (__sysconf (_SC_XBS5_LP64_OFF64) > 0) -+ if (__sysconf (_SC_XBS5_LP64_OFF64) > 0) - #endif - #if !defined _XBS5_LP64_OFF64 || _XBS5_LP64_OFF64 > 0 -- { -- if (string_len) -- restenvs[string_len++] = '\n'; -- memcpy (restenvs + string_len, "XBS5_LP64_OFF64", -- sizeof "XBS5_LP64_OFF64" - 1); -- string_len += sizeof "XBS5_LP64_OFF64" - 1; -- } -+ { -+ if (string_len) -+ restenvs[string_len++] = '\n'; -+ memcpy (restenvs + string_len, "XBS5_LP64_OFF64", -+ sizeof "XBS5_LP64_OFF64" - 1); -+ string_len += sizeof "XBS5_LP64_OFF64" - 1; -+ } - #endif - #ifndef _XBS5_LPBIG_OFFBIG -- if (__sysconf (_SC_XBS5_LPBIG_OFFBIG) > 0) -+ if (__sysconf (_SC_XBS5_LPBIG_OFFBIG) > 0) - #endif - #if !defined _XBS5_LPBIG_OFFBIG || _XBS5_LPBIG_OFFBIG > 0 -- { -- if (string_len) -- restenvs[string_len++] = '\n'; -- memcpy (restenvs + string_len, "XBS5_LPBIG_OFFBIG", -- sizeof "XBS5_LPBIG_OFFBIG" - 1); -- string_len += sizeof "XBS5_LPBIG_OFFBIG" - 1; -- } --#endif -- restenvs[string_len++] = '\0'; -- string = restenvs; -- } -+ { -+ if (string_len) -+ restenvs[string_len++] = '\n'; -+ memcpy (restenvs + string_len, "XBS5_LPBIG_OFFBIG", -+ sizeof "XBS5_LPBIG_OFFBIG" - 1); -+ string_len += sizeof "XBS5_LPBIG_OFFBIG" - 1; -+ } -+#endif -+ restenvs[string_len++] = '\0'; -+ string = restenvs; - break; - - case _CS_XBS5_ILP32_OFF32_CFLAGS: diff --git a/staging/glibc/glibc-2.15-do-not-install-timezone-files-2.patch b/staging/glibc/glibc-2.15-do-not-install-timezone-files-2.patch deleted file mode 100644 index d28237f85..000000000 --- a/staging/glibc/glibc-2.15-do-not-install-timezone-files-2.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/timezone/Makefile b/timezone/Makefile -index 00bfba6..9e55a6a 100644 ---- a/timezone/Makefile -+++ b/timezone/Makefile -@@ -45,7 +45,6 @@ include ../Makeconfig # Get objpfx defined so we can use it below. - CPPFLAGS-zic = -DNOT_IN_libc - - ifeq ($(have-ksh),yes) --install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab - install-bin-script = tzselect - generated += tzselect - endif -@@ -111,7 +110,3 @@ $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make - -e 's%@TZDIR@%$(zonedir)%g' < $< > $@.new - chmod 555 $@.new - mv -f $@.new $@ -- --$(addprefix $(inst_zonedir)/,iso3166.tab zone.tab): \ -- $(inst_zonedir)/%: % $(+force) -- $(do-install) diff --git a/staging/glibc/glibc-2.15-do-not-install-timezone-files.patch b/staging/glibc/glibc-2.15-do-not-install-timezone-files.patch deleted file mode 100644 index e4f29bc1a..000000000 --- a/staging/glibc/glibc-2.15-do-not-install-timezone-files.patch +++ /dev/null @@ -1,124 +0,0 @@ -diff --git a/timezone/Makefile b/timezone/Makefile -index e8fb716..d5ea538 100644 ---- a/timezone/Makefile -+++ b/timezone/Makefile -@@ -1,4 +1,4 @@ --# Copyright (C) 1998,1999,2000,2002,2005,2007 Free Software Foundation, Inc. -+# Copyright (C) 1998-2000,2002,2005,2007,2012 Free Software Foundation, Inc. - # This file is part of the GNU C Library. - - # The GNU C Library is free software; you can redistribute it and/or -@@ -49,33 +49,6 @@ include ../Makeconfig # Get objpfx defined so we can use it below. - - CPPFLAGS-zic = -DNOT_IN_libc - --# z.* use this variable. --define nl -- -- --endef --ifndef avoid-generated --ifndef inhibit_timezone_rules ---include $(addprefix $(objpfx)z.,$(tzfiles)) --endif --endif -- --# Make these absolute file names. --installed-localtime-file := $(firstword $(filter /%,$(inst_localtime-file)) \ -- $(addprefix $(inst_zonedir)/, \ -- $(localtime-file))) --installed-posixrules-file := $(firstword $(filter /%,$(posixrules-file)) \ -- $(addprefix $(inst_zonedir)/, \ -- $(posixrules-file))) -- --ifeq ($(cross-compiling),no) --# Don't try to install the zoneinfo files since we can't run zic. --install-others = $(addprefix $(inst_zonedir)/,$(zonenames) \ -- $(zonenames:%=posix/%) \ -- $(zonenames:%=right/%)) \ -- $(installed-localtime-file) $(installed-posixrules-file) --endif -- - ifeq ($(have-ksh),yes) - install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab - install-bin-script = tzselect -@@ -85,79 +58,6 @@ endif - include ../Rules - - --$(tzfiles:%=$(objpfx)z.%): $(objpfx)z.%: % Makefile --# Kludge alert: we use an implicit rule (in what we are generating here) --# because that is the only way to tell Make that the one command builds all --# the files. --# The extra kludge for the $(tzlinks) files is necessary since running zic --# this file requires all other files to exist. Blech! -- $(make-target-directory) -- (echo 'define $*-zones' ;\ -- $(AWK) '$$1 == "Zone" { print $$2 } $$1 == "Link" { print $$3 }' $^ ;\ -- echo 'endef' ;\ -- echo '$*-zones := $$(subst $$(nl), ,$$($*-zones))' ;\ -- echo 'ifdef $*-zones' ;\ -- if test x$(findstring $*, $(tzlinks)) != x; then \ -- echo '$$(addprefix $$(inst_zonedir)/right/,$$($*-zones)): \';\ -- echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/right/,$$($$t-zones)))' ;\ -- echo '$$(addprefix $$(inst_zonedir)/posix/,$$($*-zones)): \';\ -- echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/posix/,$$($$t-zones)))' ;\ -- echo '$$(addprefix $$(inst_zonedir)/,$$($*-zones)): \' ;\ -- echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/,$$($$t-zones)))' ;\ -- fi ;\ -- echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/right/,$$($*-zones)): \' ;\ -- echo '$< $$(objpfx)zic leapseconds yearistype' ;\ -- echo ' $$(tzcompile)' ;\ -- echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/posix/,$$($*-zones)): \' ;\ -- echo '$< $$(objpfx)zic /dev/null yearistype' ;\ -- echo ' $$(tzcompile)' ;\ -- echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/,$$($*-zones)): \' ;\ -- echo '$< $$(objpfx)zic $$(leapseconds) yearistype' ;\ -- echo ' $$(tzcompile)' ;\ -- echo 'endif' ;\ -- echo 'zonenames := $$(zonenames) $$($*-zones)' ;\ -- ) > $@.new -- mv $@.new $@ -- --.PHONY: echo-zonenames --echo-zonenames: -- @echo 'Known zones: $(zonenames)' -- -- --# We have to use `-d $(inst_zonedir)' to explictly tell zic where to --# place the output files although $(zonedir) is compiled in. But the --# user might have set $(install_root) on the command line of `make install'. --zic-cmd = $(built-program-cmd) -d $(inst_zonedir) --tzcompile = $(zic-cmd)$(target-zone-flavor) -L $(word 3,$^) \ -- -y $(dir $(word 4,$^))$(notdir $(word 4,$^)) $< -- --# The source files specify the zone names relative to the -d directory, --# so for the posix/ and right/ flavors we need to pass -d $(inst_zonedir)/posix --# and the like. This magic extracts /posix or /right if it's the first --# component after $(inst_zonedir) in the target name $@. --target-zone-flavor = $(filter /posix /right, \ -- /$(firstword $(subst /, , \ -- $(patsubst $(inst_zonedir)/%,%,$@)))) -- --ifdef localtime --$(installed-localtime-file): $(inst_zonedir)/$(localtime) $(objpfx)zic \ -- $(+force) -- $(make-target-directory) -- if test -r $@; then \ -- echo Site timezone NOT reset to Factory.; \ -- else \ -- rm -f $@T; \ -- $(SHELL) $(..)scripts/rellns-sh $< $@T; \ -- mv -f $@T $@; \ -- fi --endif --ifdef posixrules --$(installed-posixrules-file): $(inst_zonedir)/$(posixrules) $(objpfx)zic \ -- $(+force) -- $(zic-cmd) -p $(posixrules) --endif -- -- - $(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o - - tz-cflags = -DTZDIR='"$(zonedir)"' \ diff --git a/staging/glibc/glibc-2.15-feraiseexcept-plt.patch b/staging/glibc/glibc-2.15-feraiseexcept-plt.patch deleted file mode 100644 index c41acc169..000000000 --- a/staging/glibc/glibc-2.15-feraiseexcept-plt.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/sysdeps/i386/fpu/feupdateenv.c b/sysdeps/i386/fpu/feupdateenv.c -index 70f9ee2..6e2ce35 100644 ---- a/sysdeps/i386/fpu/feupdateenv.c -+++ b/sysdeps/i386/fpu/feupdateenv.c -@@ -1,5 +1,5 @@ - /* Install given floating-point environment and raise exceptions. -- Copyright (C) 1997,99,2000,01,07,2010 Free Software Foundation, Inc. -+ Copyright (C) 1997,99,2000,01,07,2010,2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. - -@@ -44,7 +44,7 @@ __feupdateenv (const fenv_t *envp) - /* Raise the saved exception. Incidently for us the implementation - defined format of the values in objects of type fexcept_t is the - same as the ones specified using the FE_* constants. */ -- feraiseexcept ((int) temp); -+ __feraiseexcept ((int) temp); - - /* Success. */ - return 0; diff --git a/staging/glibc/glibc-2.15-fix-res_query-assert.patch b/staging/glibc/glibc-2.15-fix-res_query-assert.patch deleted file mode 100644 index a894da9c7..000000000 --- a/staging/glibc/glibc-2.15-fix-res_query-assert.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/resolv/res_query.c -+++ a/resolv/res_query.c -@@ -122,6 +122,7 @@ __libc_res_nquery(res_state statp, - int *resplen2) - { - HEADER *hp = (HEADER *) answer; -+ HEADER *hp2; - int n, use_malloc = 0; - u_int oflags = statp->_flags; - -@@ -239,26 +240,25 @@ __libc_res_nquery(res_state statp, - /* __libc_res_nsend might have reallocated the buffer. */ - hp = (HEADER *) *answerp; - -- /* We simplify the following tests by assigning HP to HP2. It -- is easy to verify that this is the same as ignoring all -- tests of HP2. */ -- HEADER *hp2 = answerp2 ? (HEADER *) *answerp2 : hp; -- -- if (n < (int) sizeof (HEADER) && answerp2 != NULL -- && *resplen2 > (int) sizeof (HEADER)) -+ /* We simplify the following tests by assigning HP to HP2 or -+ vice versa. It is easy to verify that this is the same as -+ ignoring all tests of HP or HP2. */ -+ if (answerp2 == NULL || *resplen2 < (int) sizeof (HEADER)) - { -- /* Special case of partial answer. */ -- assert (hp != hp2); -- hp = hp2; -+ hp2 = hp; - } -- else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER) -- && n > (int) sizeof (HEADER)) -+ else - { -- /* Special case of partial answer. */ -- assert (hp != hp2); -- hp2 = hp; -+ hp2 = (HEADER *) *answerp2; -+ if (n < (int) sizeof (HEADER)) -+ { -+ hp = hp2; -+ } - } - -+ /* Make sure both hp and hp2 are defined */ -+ assert((hp != NULL) && (hp2 != NULL)); -+ - if ((hp->rcode != NOERROR || ntohs(hp->ancount) == 0) - && (hp2->rcode != NOERROR || ntohs(hp2->ancount) == 0)) { - #ifdef DEBUG diff --git a/staging/glibc/glibc-2.15-fmtmsg-locking.patch b/staging/glibc/glibc-2.15-fmtmsg-locking.patch deleted file mode 100644 index f5976abd9..000000000 --- a/staging/glibc/glibc-2.15-fmtmsg-locking.patch +++ /dev/null @@ -1,148 +0,0 @@ -diff --git a/stdlib/fmtmsg.c b/stdlib/fmtmsg.c -index 9203317..4c02302 100644 ---- a/stdlib/fmtmsg.c -+++ b/stdlib/fmtmsg.c -@@ -103,7 +103,6 @@ fmtmsg (long int classification, const char *label, int severity, - const char *text, const char *action, const char *tag) - { - __libc_once_define (static, once); -- int result = MM_OK; - struct severity_info *severity_rec; - - /* Make sure everything is initialized. */ -@@ -124,17 +123,6 @@ fmtmsg (long int classification, const char *label, int severity, - return MM_NOTOK; - } - -- for (severity_rec = severity_list; severity_rec != NULL; -- severity_rec = severity_rec->next) -- if (severity == severity_rec->severity) -- /* Bingo. */ -- break; -- -- /* If we don't know anything about the severity level return an error. */ -- if (severity_rec == NULL) -- return MM_NOTOK; -- -- - #ifdef __libc_ptf_call - /* We do not want this call to be cut short by a thread - cancellation. Therefore disable cancellation for now. */ -@@ -143,54 +131,73 @@ fmtmsg (long int classification, const char *label, int severity, - 0); - #endif - -- /* Now we can print. */ -- if (classification & MM_PRINT) -- { -- int do_label = (print & label_mask) && label != MM_NULLLBL; -- int do_severity = (print & severity_mask) && severity != MM_NULLSEV; -- int do_text = (print & text_mask) && text != MM_NULLTXT; -- int do_action = (print & action_mask) && action != MM_NULLACT; -- int do_tag = (print & tag_mask) && tag != MM_NULLTAG; -- -- if (__fxprintf (stderr, "%s%s%s%s%s%s%s%s%s%s\n", -- do_label ? label : "", -- do_label && (do_severity | do_text | do_action | do_tag) -- ? ": " : "", -- do_severity ? severity_rec->string : "", -- do_severity && (do_text | do_action | do_tag) -- ? ": " : "", -- do_text ? text : "", -- do_text && (do_action | do_tag) ? "\n" : "", -- do_action ? "TO FIX: " : "", -- do_action ? action : "", -- do_action && do_tag ? " " : "", -- do_tag ? tag : "") < 0) -- /* Oh, oh. An error occurred during the output. */ -- result = MM_NOMSG; -- } -+ __libc_lock_lock (lock); - -- if (classification & MM_CONSOLE) -+ for (severity_rec = severity_list; severity_rec != NULL; -+ severity_rec = severity_rec->next) -+ if (severity == severity_rec->severity) -+ /* Bingo. */ -+ break; -+ -+ /* If we don't know anything about the severity level return an error. */ -+ int result = MM_NOTOK; -+ if (severity_rec != NULL) - { -- int do_label = label != MM_NULLLBL; -- int do_severity = severity != MM_NULLSEV; -- int do_text = text != MM_NULLTXT; -- int do_action = action != MM_NULLACT; -- int do_tag = tag != MM_NULLTAG; -- -- syslog (LOG_ERR, "%s%s%s%s%s%s%s%s%s%s\n", -- do_label ? label : "", -- do_label && (do_severity | do_text | do_action | do_tag) -- ? ": " : "", -- do_severity ? severity_rec->string : "", -- do_severity && (do_text | do_action | do_tag) ? ": " : "", -- do_text ? text : "", -- do_text && (do_action | do_tag) ? "\n" : "", -- do_action ? "TO FIX: " : "", -- do_action ? action : "", -- do_action && do_tag ? " " : "", -- do_tag ? tag : ""); -+ result = MM_OK; -+ -+ /* Now we can print. */ -+ if (classification & MM_PRINT) -+ { -+ int do_label = (print & label_mask) && label != MM_NULLLBL; -+ int do_severity = (print & severity_mask) && severity != MM_NULLSEV; -+ int do_text = (print & text_mask) && text != MM_NULLTXT; -+ int do_action = (print & action_mask) && action != MM_NULLACT; -+ int do_tag = (print & tag_mask) && tag != MM_NULLTAG; -+ int need_colon = (do_label -+ && (do_severity | do_text | do_action | do_tag)); -+ -+ if (__fxprintf (stderr, "%s%s%s%s%s%s%s%s%s%s\n", -+ do_label ? label : "", -+ need_colon ? ": " : "", -+ do_severity ? severity_rec->string : "", -+ do_severity && (do_text | do_action | do_tag) -+ ? ": " : "", -+ do_text ? text : "", -+ do_text && (do_action | do_tag) ? "\n" : "", -+ do_action ? "TO FIX: " : "", -+ do_action ? action : "", -+ do_action && do_tag ? " " : "", -+ do_tag ? tag : "") < 0) -+ /* Oh, oh. An error occurred during the output. */ -+ result = MM_NOMSG; -+ } -+ -+ if (classification & MM_CONSOLE) -+ { -+ int do_label = label != MM_NULLLBL; -+ int do_severity = severity != MM_NULLSEV; -+ int do_text = text != MM_NULLTXT; -+ int do_action = action != MM_NULLACT; -+ int do_tag = tag != MM_NULLTAG; -+ int need_colon = (do_label -+ && (do_severity | do_text | do_action | do_tag)); -+ -+ syslog (LOG_ERR, "%s%s%s%s%s%s%s%s%s%s\n", -+ do_label ? label : "", -+ need_colon ? ": " : "", -+ do_severity ? severity_rec->string : "", -+ do_severity && (do_text | do_action | do_tag) ? ": " : "", -+ do_text ? text : "", -+ do_text && (do_action | do_tag) ? "\n" : "", -+ do_action ? "TO FIX: " : "", -+ do_action ? action : "", -+ do_action && do_tag ? " " : "", -+ do_tag ? tag : ""); -+ } - } - -+ __libc_lock_unlock (lock); -+ - #ifdef __libc_ptf_call - __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0); - #endif diff --git a/staging/glibc/glibc-2.15-gb18030.patch.gz b/staging/glibc/glibc-2.15-gb18030.patch.gz Binary files differdeleted file mode 100644 index dde59c056..000000000 --- a/staging/glibc/glibc-2.15-gb18030.patch.gz +++ /dev/null diff --git a/staging/glibc/glibc-2.15-ifunc.patch b/staging/glibc/glibc-2.15-ifunc.patch deleted file mode 100644 index 115afa02a..000000000 --- a/staging/glibc/glibc-2.15-ifunc.patch +++ /dev/null @@ -1,262 +0,0 @@ -diff --git a/Makeconfig b/Makeconfig -index 2db2821..68547b2 100644 ---- a/Makeconfig -+++ b/Makeconfig -@@ -900,6 +900,12 @@ else - libdl = $(common-objpfx)dlfcn/libdl.a - endif - -+ifeq ($(build-shared),yes) -+libm = $(common-objpfx)math/libm.so$(libm.so-version) -+else -+libm = $(common-objpfx)math/libm.a -+endif -+ - # These are the subdirectories containing the library source. The order - # is more or less arbitrary. The sorting step will take care of the - # dependencies. -diff --git a/elf/Makefile b/elf/Makefile -index 052e763..3f1772a 100644 ---- a/elf/Makefile -+++ b/elf/Makefile -@@ -124,7 +124,8 @@ distribute := rtld-Rules \ - tst-initordera1.c tst-initordera2.c tst-initorderb1.c \ - tst-initorderb2.c tst-initordera3.c tst-initordera4.c \ - tst-initorder.c \ -- tst-initorder2.c -+ tst-initorder2.c \ -+ tst-relsort1.c tst-relsort1mod1.c tst-relsort1mod2.c - - CFLAGS-dl-runtime.c = -fexceptions -fasynchronous-unwind-tables - CFLAGS-dl-lookup.c = -fexceptions -fasynchronous-unwind-tables -@@ -227,7 +228,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ - tst-audit1 tst-audit2 \ - tst-stackguard1 tst-addr1 tst-thrlock \ - tst-unique1 tst-unique2 tst-unique3 tst-unique4 \ -- tst-initorder tst-initorder2 -+ tst-initorder tst-initorder2 tst-relsort1 - # reldep9 - test-srcs = tst-pathopt - selinux-enabled := $(shell cat /selinux/enforce 2> /dev/null) -@@ -290,7 +291,9 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ - tst-initordera1 tst-initorderb1 \ - tst-initordera2 tst-initorderb2 \ - tst-initordera3 tst-initordera4 \ -- tst-initorder2a tst-initorder2b tst-initorder2c tst-initorder2d -+ tst-initorder2a tst-initorder2b tst-initorder2c \ -+ tst-initorder2d \ -+ tst-relsort1mod1 tst-relsort1mod2 - ifeq (yes,$(have-initfini-array)) - modules-names += tst-array2dep tst-array5dep - endif -@@ -1195,3 +1198,9 @@ CFLAGS-tst-auditmod6b.c += $(AVX-CFLAGS) - CFLAGS-tst-auditmod6c.c += $(AVX-CFLAGS) - CFLAGS-tst-auditmod7b.c += $(AVX-CFLAGS) - endif -+ -+$(objpfx)tst-relsort1: $(libdl) -+$(objpfx)tst-relsort1mod1.so: $(libm) $(objpfx)tst-relsort1mod2.so -+$(objpfx)tst-relsort1mod2.so: $(libm) -+$(objpfx)tst-relsort1.out: $(objpfx)tst-relsort1mod1.so \ -+ $(objpfx)tst-relsort1mod2.so -diff --git a/elf/dl-open.c b/elf/dl-open.c -index a0b5c50..a56bdc1 100644 ---- a/elf/dl-open.c -+++ b/elf/dl-open.c -@@ -1,5 +1,5 @@ - /* Load a shared object at runtime, relocate it, and run its initializer. -- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc. -+ Copyright (C) 1996-2007, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -302,45 +302,109 @@ dl_open_worker (void *a) - if (GLRO(dl_lazy)) - reloc_mode |= mode & RTLD_LAZY; - -- /* Relocate the objects loaded. We do this in reverse order so that copy -- relocs of earlier objects overwrite the data written by later objects. */ -- -+ /* Sort the objects by dependency for the relocation process. This -+ allows IFUNC relocations to work and it also means copy -+ relocation of dependencies are if necessary overwritten. */ -+ size_t nmaps = 0; - struct link_map *l = new; -- while (l->l_next) -- l = l->l_next; -- while (1) -+ do -+ { -+ if (! l->l_real->l_relocated) -+ ++nmaps; -+ l = l->l_next; -+ } -+ while (l != NULL); -+ struct link_map *maps[nmaps]; -+ nmaps = 0; -+ l = new; -+ do - { - if (! l->l_real->l_relocated) -+ maps[nmaps++] = l; -+ l = l->l_next; -+ } -+ while (l != NULL); -+ if (nmaps > 1) -+ { -+ char seen[nmaps]; -+ memset (seen, '\0', nmaps); -+ size_t i = 0; -+ while (1) - { --#ifdef SHARED -- if (__builtin_expect (GLRO(dl_profile) != NULL, 0)) -+ ++seen[i]; -+ struct link_map *thisp = maps[i]; -+ -+ /* Find the last object in the list for which the current one is -+ a dependency and move the current object behind the object -+ with the dependency. */ -+ size_t k = nmaps - 1; -+ while (k > i) - { -- /* If this here is the shared object which we want to profile -- make sure the profile is started. We can find out whether -- this is necessary or not by observing the `_dl_profile_map' -- variable. If was NULL but is not NULL afterwars we must -- start the profiling. */ -- struct link_map *old_profile_map = GL(dl_profile_map); -+ struct link_map **runp = maps[k]->l_initfini; -+ if (runp != NULL) -+ /* Look through the dependencies of the object. */ -+ while (*runp != NULL) -+ if (__builtin_expect (*runp++ == thisp, 0)) -+ { -+ /* Move the current object to the back past the last -+ object with it as the dependency. */ -+ memmove (&maps[i], &maps[i + 1], -+ (k - i) * sizeof (maps[0])); -+ maps[k] = thisp; -+ -+ if (seen[i + 1] > 1) -+ { -+ ++i; -+ goto next_clear; -+ } -+ -+ char this_seen = seen[i]; -+ memmove (&seen[i], &seen[i + 1], -+ (k - i) * sizeof (seen[0])); -+ seen[k] = this_seen; -+ -+ goto next; -+ } -+ -+ --k; -+ } - -- _dl_relocate_object (l, l->l_scope, reloc_mode | RTLD_LAZY, 1); -+ if (++i == nmaps) -+ break; -+ next_clear: -+ memset (&seen[i], 0, (nmaps - i) * sizeof (seen[0])); -+ next:; -+ } -+ } - -- if (old_profile_map == NULL && GL(dl_profile_map) != NULL) -- { -- /* We must prepare the profiling. */ -- _dl_start_profile (); -+ for (size_t i = nmaps; i-- > 0; ) -+ { -+ l = maps[i]; - -- /* Prevent unloading the object. */ -- GL(dl_profile_map)->l_flags_1 |= DF_1_NODELETE; -- } -+#ifdef SHARED -+ if (__builtin_expect (GLRO(dl_profile) != NULL, 0)) -+ { -+ /* If this here is the shared object which we want to profile -+ make sure the profile is started. We can find out whether -+ this is necessary or not by observing the `_dl_profile_map' -+ variable. If it was NULL but is not NULL afterwars we must -+ start the profiling. */ -+ struct link_map *old_profile_map = GL(dl_profile_map); -+ -+ _dl_relocate_object (l, l->l_scope, reloc_mode | RTLD_LAZY, 1); -+ -+ if (old_profile_map == NULL && GL(dl_profile_map) != NULL) -+ { -+ /* We must prepare the profiling. */ -+ _dl_start_profile (); -+ -+ /* Prevent unloading the object. */ -+ GL(dl_profile_map)->l_flags_1 |= DF_1_NODELETE; - } -- else --#endif -- _dl_relocate_object (l, l->l_scope, reloc_mode, 0); - } -- -- if (l == new) -- break; -- l = l->l_prev; -+ else -+#endif -+ _dl_relocate_object (l, l->l_scope, reloc_mode, 0); - } - - /* If the file is not loaded now as a dependency, add the search -diff --git a/elf/tst-relsort1.c b/elf/tst-relsort1.c -new file mode 100644 -index 0000000..972100c ---- /dev/null -+++ b/elf/tst-relsort1.c -@@ -0,0 +1,19 @@ -+#include <dlfcn.h> -+#include <stdio.h> -+ -+ -+static int -+do_test () -+{ -+ const char lib[] = "$ORIGIN/tst-relsort1mod1.so"; -+ void *h = dlopen (lib, RTLD_NOW); -+ if (h == NULL) -+ { -+ puts (dlerror ()); -+ return 1; -+ } -+ return 0; -+} -+ -+#define TEST_FUNCTION do_test () -+#include "../test-skeleton.c" -diff --git a/elf/tst-relsort1mod1.c b/elf/tst-relsort1mod1.c -new file mode 100644 -index 0000000..9e4a943 ---- /dev/null -+++ b/elf/tst-relsort1mod1.c -@@ -0,0 +1,7 @@ -+extern int foo (double); -+ -+int -+bar (void) -+{ -+ return foo (1.2); -+} -diff --git a/elf/tst-relsort1mod2.c b/elf/tst-relsort1mod2.c -new file mode 100644 -index 0000000..a2c3e55 ---- /dev/null -+++ b/elf/tst-relsort1mod2.c -@@ -0,0 +1,7 @@ -+#include <math.h> -+ -+int -+foo (double d) -+{ -+ return floor (d) != 0.0; -+} diff --git a/staging/glibc/glibc-2.15-lddebug-scopes.patch b/staging/glibc/glibc-2.15-lddebug-scopes.patch deleted file mode 100644 index 808cf8d7c..000000000 --- a/staging/glibc/glibc-2.15-lddebug-scopes.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0c95ab64cb4ec0d22bb222647d9d20c7b4903e38 Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab@redhat.com> -Date: Fri, 7 Oct 2011 09:31:27 +0200 -Subject: [PATCH] Horrible workaround for horribly broken software - ---- - elf/rtld.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/elf/rtld.c b/elf/rtld.c -index 978c609..8422b9f 100644 ---- a/elf/rtld.c -+++ b/elf/rtld.c -@@ -1393,7 +1393,9 @@ of this helper program; chances are you did not intend to run this program.\n\ - char *copy = malloc (len); - if (copy == NULL) - _dl_fatal_printf ("out of memory\n"); -- l->l_libname->name = l->l_name = memcpy (copy, dsoname, len); -+ l->l_libname->name = memcpy (copy, dsoname, len); -+ if (GLRO(dl_debug_mask)) -+ l->l_name = copy; - } - - /* Add the vDSO to the object list. */ --- -1.7.3.4 - diff --git a/staging/glibc/glibc-2.15-multiarch-x86-strcmp.patch b/staging/glibc/glibc-2.15-multiarch-x86-strcmp.patch deleted file mode 100644 index 38c9e617f..000000000 --- a/staging/glibc/glibc-2.15-multiarch-x86-strcmp.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c b/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c -index d10e872..d4fcd2b 100644 ---- a/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c -+++ b/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c -@@ -6,6 +6,8 @@ extern __typeof (strcasecmp_l) __strcasecmp_l_nonascii; - #define USE_IN_EXTENDED_LOCALE_MODEL 1 - #include <string/strcasecmp.c> - -+strong_alias (__strcasecmp_l_nonascii, __strcasecmp_l_ia32) -+ - /* The needs of strcasecmp in libc are minimal, no need to go through - the IFUNC. */ - strong_alias (__strcasecmp_l_nonascii, __GI___strcasecmp_l) -diff --git a/sysdeps/i386/i686/multiarch/strcmp.S b/sysdeps/i386/i686/multiarch/strcmp.S -index 5410d17..b3b9eb8 100644 ---- a/sysdeps/i386/i686/multiarch/strcmp.S -+++ b/sysdeps/i386/i686/multiarch/strcmp.S -@@ -111,6 +111,7 @@ END(STRCMP) - # endif - #endif - --#ifndef USE_AS_STRNCMP -+#if !defined USE_AS_STRNCMP && !defined USE_AS_STRCASECMP_L \ -+ && !defined USE_AS_STRNCASECMP_L - # include "../strcmp.S" - #endif -diff --git a/sysdeps/i386/i686/multiarch/strncase_l-c.c b/sysdeps/i386/i686/multiarch/strncase_l-c.c -index 0c68b8d..7e601af 100644 ---- a/sysdeps/i386/i686/multiarch/strncase_l-c.c -+++ b/sysdeps/i386/i686/multiarch/strncase_l-c.c -@@ -6,6 +6,8 @@ extern __typeof (strncasecmp_l) __strncasecmp_l_nonascii; - #define USE_IN_EXTENDED_LOCALE_MODEL 1 - #include <string/strncase.c> - -+strong_alias (__strncasecmp_l_nonascii, __strncasecmp_l_ia32) -+ - /* The needs of strcasecmp in libc are minimal, no need to go through - the IFUNC. */ - strong_alias (__strncasecmp_l_nonascii, __GI___strncasecmp_l) diff --git a/staging/glibc/glibc-2.15-nearbyintf-rounding.patch b/staging/glibc/glibc-2.15-nearbyintf-rounding.patch deleted file mode 100644 index b2bb9caac..000000000 --- a/staging/glibc/glibc-2.15-nearbyintf-rounding.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff --git a/math/libm-test.inc b/math/libm-test.inc -index c8186c8..1016753 100644 ---- a/math/libm-test.inc -+++ b/math/libm-test.inc -@@ -4632,6 +4632,29 @@ nearbyint_test (void) - TEST_f_f (nearbyint, 524286.75, 524287.0); - TEST_f_f (nearbyint, 524288.75, 524289.0); - -+ TEST_f_f (nearbyint, 1048576.75, 1048577.0); -+ TEST_f_f (nearbyint, 2097152.75, 2097153.0); -+ TEST_f_f (nearbyint, 2492472.75, 2492473.0); -+ TEST_f_f (nearbyint, 2886220.75, 2886221.0); -+ TEST_f_f (nearbyint, 3058792.75, 3058793.0); -+ TEST_f_f (nearbyint, -1048576.75, -1048577.0); -+ TEST_f_f (nearbyint, -2097152.75, -2097153.0); -+ TEST_f_f (nearbyint, -2492472.75, -2492473.0); -+ TEST_f_f (nearbyint, -2886220.75, -2886221.0); -+ TEST_f_f (nearbyint, -3058792.75, -3058793.0); -+#ifndef TEST_FLOAT -+ TEST_f_f (nearbyint, 70368744177664.75, 70368744177665.0); -+ TEST_f_f (nearbyint, 140737488355328.75, 140737488355329.0); -+ TEST_f_f (nearbyint, 281474976710656.75, 281474976710657.0); -+ TEST_f_f (nearbyint, 562949953421312.75, 562949953421313.0); -+ TEST_f_f (nearbyint, 1125899906842624.75, 1125899906842625.0); -+ TEST_f_f (nearbyint, -70368744177664.75, -70368744177665.0); -+ TEST_f_f (nearbyint, -140737488355328.75, -140737488355329.0); -+ TEST_f_f (nearbyint, -281474976710656.75, -281474976710657.0); -+ TEST_f_f (nearbyint, -562949953421312.75, -562949953421313.0); -+ TEST_f_f (nearbyint, -1125899906842624.75, -1125899906842625.0); -+#endif -+ - END (nearbyint); - } - -diff --git a/sysdeps/ieee754/flt-32/s_nearbyintf.c b/sysdeps/ieee754/flt-32/s_nearbyintf.c -index 04ef9ab..a6d602b 100644 ---- a/sysdeps/ieee754/flt-32/s_nearbyintf.c -+++ b/sysdeps/ieee754/flt-32/s_nearbyintf.c -@@ -30,18 +30,12 @@ __nearbyintf(float x) - { - fenv_t env; - int32_t i0,j0,sx; -- u_int32_t i,i1; - float w,t; - GET_FLOAT_WORD(i0,x); - sx = (i0>>31)&1; - j0 = ((i0>>23)&0xff)-0x7f; - if(j0<23) { - if(j0<0) { -- if((i0&0x7fffffff)==0) return x; -- i1 = (i0&0x07fffff); -- i0 &= 0xfff00000; -- i0 |= ((i1|-i1)>>9)&0x400000; -- SET_FLOAT_WORD(x,i0); - libc_feholdexceptf (&env); - w = TWO23[sx]+x; - t = w-TWO23[sx]; -@@ -49,17 +43,11 @@ __nearbyintf(float x) - GET_FLOAT_WORD(i0,t); - SET_FLOAT_WORD(t,(i0&0x7fffffff)|(sx<<31)); - return t; -- } else { -- i = (0x007fffff)>>j0; -- if((i0&i)==0) return x; /* x is integral */ -- i>>=1; -- if((i0&i)!=0) i0 = (i0&(~i))|((0x100000)>>j0); - } - } else { - if(__builtin_expect(j0==0x80, 0)) return x+x; /* inf or NaN */ - else return x; /* x is integral */ - } -- SET_FLOAT_WORD(x,i0); - libc_feholdexceptf (&env); - w = TWO23[sx]+x; - t = w-TWO23[sx]; diff --git a/staging/glibc/glibc-2.15-negative-result-cache.patch b/staging/glibc/glibc-2.15-negative-result-cache.patch deleted file mode 100644 index c09e79a17..000000000 --- a/staging/glibc/glibc-2.15-negative-result-cache.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff --git a/nscd/aicache.c b/nscd/aicache.c -index aaaf80d..e1f1244 100644 ---- a/nscd/aicache.c -+++ b/nscd/aicache.c -@@ -1,5 +1,5 @@ - /* Cache handling for host lookup. -- Copyright (C) 2004-2008, 2009, 2010, 2011 Free Software Foundation, Inc. -+ Copyright (C) 2004-2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@redhat.com>, 2004. - -@@ -514,8 +514,9 @@ next_nip: - if (fd != -1) - TEMP_FAILURE_RETRY (send (fd, ¬found, total, MSG_NOSIGNAL)); - -- /* If we cannot permanently store the result, so be it. */ -- if (__builtin_expect (db->negtimeout == 0, 0)) -+ /* If we have a transient error or cannot permanently store the -+ result, so be it. */ -+ if (rc4 == EAGAIN || __builtin_expect (db->negtimeout == 0, 0)) - { - /* Mark the old entry as obsolete. */ - if (dh != NULL) -diff --git a/nscd/grpcache.c b/nscd/grpcache.c -index e9607c6..a698f36 100644 ---- a/nscd/grpcache.c -+++ b/nscd/grpcache.c -@@ -1,5 +1,5 @@ - /* Cache handling for group lookup. -- Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc. -+ Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. - -@@ -120,8 +120,9 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req, - else - written = total; - -- /* If we cannot permanently store the result, so be it. */ -- if (db->negtimeout == 0) -+ /* If we have a transient error or cannot permanently store -+ the result, so be it. */ -+ if (errno == EAGAIN || __builtin_expect (db->negtimeout == 0, 0)) - { - /* Mark the old entry as obsolete. */ - if (dh != NULL) -diff --git a/nscd/hstcache.c b/nscd/hstcache.c -index 4d68ade..c72feaa 100644 ---- a/nscd/hstcache.c -+++ b/nscd/hstcache.c -@@ -1,5 +1,5 @@ - /* Cache handling for host lookup. -- Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc. -+ Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. - -@@ -141,8 +141,9 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req, - MSG_NOSIGNAL)) != total) - all_written = false; - -- /* If we cannot permanently store the result, so be it. */ -- if (__builtin_expect (db->negtimeout == 0, 0)) -+ /* If we have a transient error or cannot permanently store -+ the result, so be it. */ -+ if (errval == EAGAIN || __builtin_expect (db->negtimeout == 0, 0)) - { - /* Mark the old entry as obsolete. */ - if (dh != NULL) -diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c -index 4ac9942..2019991 100644 ---- a/nscd/initgrcache.c -+++ b/nscd/initgrcache.c -@@ -1,5 +1,5 @@ - /* Cache handling for host lookup. -- Copyright (C) 2004-2006, 2008, 2009, 2011 Free Software Foundation, Inc. -+ Copyright (C) 2004-2006, 2008, 2009, 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@redhat.com>, 2004. - -@@ -202,8 +202,9 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req, - written = TEMP_FAILURE_RETRY (send (fd, ¬found, total, - MSG_NOSIGNAL)); - -- /* If we cannot permanently store the result, so be it. */ -- if (__builtin_expect (db->negtimeout == 0, 0)) -+ /* If we have a transient error or cannot permanently store -+ the result, so be it. */ -+ if (all_tryagain || __builtin_expect (db->negtimeout == 0, 0)) - { - /* Mark the old entry as obsolete. */ - if (dh != NULL) -diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c -index 49e130c..e2ba09d 100644 ---- a/nscd/pwdcache.c -+++ b/nscd/pwdcache.c -@@ -1,5 +1,5 @@ - /* Cache handling for passwd lookup. -- Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc. -+ Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. - -@@ -124,8 +124,9 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req, - written = TEMP_FAILURE_RETRY (send (fd, ¬found, total, - MSG_NOSIGNAL)); - -- /* If we cannot permanently store the result, so be it. */ -- if (__builtin_expect (db->negtimeout == 0, 0)) -+ /* If we have a transient error or cannot permanently store -+ the result, so be it. */ -+ if (errno == EAGAIN || __builtin_expect (db->negtimeout == 0, 0)) - { - /* Mark the old entry as obsolete. */ - if (dh != NULL) -diff --git a/nscd/servicescache.c b/nscd/servicescache.c -index d3d5dce..a6337e3 100644 ---- a/nscd/servicescache.c -+++ b/nscd/servicescache.c -@@ -1,5 +1,5 @@ - /* Cache handling for services lookup. -- Copyright (C) 2007, 2008, 2009, 2011 Free Software Foundation, Inc. -+ Copyright (C) 2007, 2008, 2009, 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@drepper.com>, 2007. - -@@ -108,8 +108,9 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req, - written = TEMP_FAILURE_RETRY (send (fd, ¬found, total, - MSG_NOSIGNAL)); - -- /* If we cannot permanently store the result, so be it. */ -- if (__builtin_expect (db->negtimeout == 0, 0)) -+ /* If we have a transient error or cannot permanently store -+ the result, so be it. */ -+ if (errval == EAGAIN || __builtin_expect (db->negtimeout == 0, 0)) - { - /* Mark the old entry as obsolete. */ - if (dh != NULL) diff --git a/staging/glibc/glibc-2.15-non-signalling-comparisons.patch b/staging/glibc/glibc-2.15-non-signalling-comparisons.patch deleted file mode 100644 index 874f8b4cb..000000000 --- a/staging/glibc/glibc-2.15-non-signalling-comparisons.patch +++ /dev/null @@ -1,886 +0,0 @@ -diff --git a/math/w_acos.c b/math/w_acos.c -index 3138408..0490933 100644 ---- a/math/w_acos.c -+++ b/math/w_acos.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -25,7 +25,8 @@ - double - __acos (double x) - { -- if (__builtin_expect (fabs (x) > 1.0, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (isgreater (fabs (x), 1.0), 0) -+ && _LIB_VERSION != _IEEE_) - { - /* acos(|x|>1) */ - feraiseexcept (FE_INVALID); -diff --git a/math/w_acosf.c b/math/w_acosf.c -index 0e41a2c..2500a7d 100644 ---- a/math/w_acosf.c -+++ b/math/w_acosf.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -25,7 +25,8 @@ - float - __acosf (float x) - { -- if (__builtin_expect (fabsf (x) > 1.0f, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (isgreater (fabsf (x), 1.0f), 0) -+ && _LIB_VERSION != _IEEE_) - { - /* acos(|x|>1) */ - feraiseexcept (FE_INVALID); -diff --git a/math/w_acosh.c b/math/w_acosh.c -index 0bd2686..d632987 100644 ---- a/math/w_acosh.c -+++ b/math/w_acosh.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -24,7 +24,7 @@ - double - __acosh (double x) - { -- if (__builtin_expect (x < 1.0, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (isless (x, 1.0), 0) && _LIB_VERSION != _IEEE_) - /* acosh(x<1) */ - return __kernel_standard (x, x, 29); - -diff --git a/math/w_acoshf.c b/math/w_acoshf.c -index c59bf94..f77df2b 100644 ---- a/math/w_acoshf.c -+++ b/math/w_acoshf.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -24,7 +24,7 @@ - float - __acoshf (float x) - { -- if (__builtin_expect (x < 1.0f, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (isless (x, 1.0f), 0) && _LIB_VERSION != _IEEE_) - /* acosh(x<1) */ - return __kernel_standard_f (x, x, 129); - -diff --git a/math/w_acoshl.c b/math/w_acoshl.c -index 819bdfc..cc823b8 100644 ---- a/math/w_acoshl.c -+++ b/math/w_acoshl.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -24,7 +24,7 @@ - long double - __acoshl (long double x) - { -- if (__builtin_expect (x < 1.0L, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (isless (x, 1.0L), 0) && _LIB_VERSION != _IEEE_) - /* acosh(x<1) */ - return __kernel_standard (x, x, 229); - -diff --git a/math/w_acosl.c b/math/w_acosl.c -index 6417068..05023b4 100644 ---- a/math/w_acosl.c -+++ b/math/w_acosl.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -25,7 +25,8 @@ - long double - __acosl (long double x) - { -- if (__builtin_expect (fabsl (x) > 1.0L, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (isgreater (fabsl (x), 1.0L), 0) -+ && _LIB_VERSION != _IEEE_) - { - /* acos(|x|>1) */ - feraiseexcept (FE_INVALID); -diff --git a/math/w_asin.c b/math/w_asin.c -index d4e89ce..0fa9487 100644 ---- a/math/w_asin.c -+++ b/math/w_asin.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -25,7 +25,8 @@ - double - __asin (double x) - { -- if (__builtin_expect (fabs (x) > 1.0, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (isgreater (fabs (x), 1.0), 0) -+ && _LIB_VERSION != _IEEE_) - { - /* asin(|x|>1) */ - feraiseexcept (FE_INVALID); -diff --git a/math/w_asinf.c b/math/w_asinf.c -index 270961f..c28edab 100644 ---- a/math/w_asinf.c -+++ b/math/w_asinf.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -25,7 +25,8 @@ - float - __asinf (float x) - { -- if (__builtin_expect (fabsf (x) > 1.0f, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (isgreater (fabsf (x), 1.0f), 0) -+ && _LIB_VERSION != _IEEE_) - { - /* asin(|x|>1) */ - feraiseexcept (FE_INVALID); -diff --git a/math/w_asinl.c b/math/w_asinl.c -index 32e5273..e4036d8 100644 ---- a/math/w_asinl.c -+++ b/math/w_asinl.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -25,7 +25,8 @@ - long double - __asinl (long double x) - { -- if (__builtin_expect (fabsl (x) > 1.0L, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (isgreater (fabsl (x), 1.0L), 0) -+ && _LIB_VERSION != _IEEE_) - { - /* asin(|x|>1) */ - feraiseexcept (FE_INVALID); -diff --git a/math/w_atanh.c b/math/w_atanh.c -index 1022bd5..190d2e9 100644 ---- a/math/w_atanh.c -+++ b/math/w_atanh.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -24,7 +24,8 @@ - double - __atanh (double x) - { -- if (__builtin_expect (fabs (x) >= 1.0, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (isgreaterequal (fabs (x), 1.0), 0) -+ && _LIB_VERSION != _IEEE_) - return __kernel_standard (x, x, - fabs (x) > 1.0 - ? 30 /* atanh(|x|>1) */ -diff --git a/math/w_atanhf.c b/math/w_atanhf.c -index 3c8cf83..e0c5dc3 100644 ---- a/math/w_atanhf.c -+++ b/math/w_atanhf.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -24,7 +24,8 @@ - float - __atanhf (float x) - { -- if (__builtin_expect (fabsf (x) >= 1.0f, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (isgreaterequal (fabsf (x), 1.0f), 0) -+ && _LIB_VERSION != _IEEE_) - return __kernel_standard_f (x, x, - fabsf (x) > 1.0f - ? 130 /* atanh(|x|>1) */ -diff --git a/math/w_atanhl.c b/math/w_atanhl.c -index f582acf..319535d 100644 ---- a/math/w_atanhl.c -+++ b/math/w_atanhl.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -24,7 +24,8 @@ - long double - __atanhl (long double x) - { -- if (__builtin_expect (fabsl (x) >= 1.0L, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (isgreaterequal (fabsl (x), 1.0L), 0) -+ && _LIB_VERSION != _IEEE_) - return __kernel_standard (x, x, - fabsl (x) > 1.0L - ? 230 /* atanh(|x|>1) */ -diff --git a/math/w_exp2.c b/math/w_exp2.c -index bf22326..7a3b0af 100644 ---- a/math/w_exp2.c -+++ b/math/w_exp2.c -@@ -12,7 +12,8 @@ static const double u_threshold = (double) (DBL_MIN_EXP - DBL_MANT_DIG - 1); - double - __exp2 (double x) - { -- if (__builtin_expect (x <= u_threshold || x > o_threshold, 0) -+ if (__builtin_expect (islessequal (x, u_threshold) -+ || isgreater (x, o_threshold), 0) - && _LIB_VERSION != _IEEE_ && __finite (x)) - /* exp2 overflow: 44, exp2 underflow: 45 */ - return __kernel_standard (x, x, 44 + (x <= o_threshold)); -diff --git a/math/w_exp2f.c b/math/w_exp2f.c -index 7215fca..c4e9e94 100644 ---- a/math/w_exp2f.c -+++ b/math/w_exp2f.c -@@ -12,7 +12,8 @@ static const float u_threshold = (float) (FLT_MIN_EXP - FLT_MANT_DIG - 1); - float - __exp2f (float x) - { -- if (__builtin_expect (x <= u_threshold || x > o_threshold, 0) -+ if (__builtin_expect (islessequal (x, u_threshold) -+ || isgreater (x, o_threshold), 0) - && _LIB_VERSION != _IEEE_ && __finitef (x)) - /* exp2 overflow: 144, exp2 underflow: 145 */ - return __kernel_standard_f (x, x, 144 + (x <= o_threshold)); -diff --git a/math/w_exp2l.c b/math/w_exp2l.c -index ac8d231..442a637 100644 ---- a/math/w_exp2l.c -+++ b/math/w_exp2l.c -@@ -13,7 +13,8 @@ static const long double u_threshold - long double - __exp2l (long double x) - { -- if (__builtin_expect (x <= u_threshold || x > o_threshold, 0) -+ if (__builtin_expect (islessequal (x, u_threshold) -+ || isgreater (x, o_threshold), 0) - && _LIB_VERSION != _IEEE_ && __finitel (x)) - /* exp2 overflow: 244, exp2 underflow: 245 */ - return __kernel_standard (x, x, 244 + (x <= o_threshold)); -diff --git a/math/w_j0.c b/math/w_j0.c -index 1dff8b4..f8d3724 100644 ---- a/math/w_j0.c -+++ b/math/w_j0.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -25,7 +25,8 @@ - double - j0 (double x) - { -- if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0) -+ && _LIB_VERSION != _IEEE_) - /* j0(|x|>X_TLOSS) */ - return __kernel_standard (x, x, 34); - -@@ -40,7 +41,8 @@ strong_alias (j0, j0l) - double - y0 (double x) - { -- if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0) -+ && _LIB_VERSION != _IEEE_) - { - if (x < 0.0) - { -diff --git a/math/w_j0f.c b/math/w_j0f.c -index fc52f26..cef36aa 100644 ---- a/math/w_j0f.c -+++ b/math/w_j0f.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -25,7 +25,7 @@ - float - j0f (float x) - { -- if (__builtin_expect (fabsf (x) > (float) X_TLOSS, 0) -+ if (__builtin_expect (isgreater (fabsf (x), (float) X_TLOSS), 0) - && _LIB_VERSION != _IEEE_) - /* j0(|x|>X_TLOSS) */ - return __kernel_standard_f (x, x, 134); -@@ -38,7 +38,8 @@ j0f (float x) - float - y0f (float x) - { -- if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0) -+ if (__builtin_expect (islessequal (x, 0.0f) -+ || isgreater (x, (float) X_TLOSS), 0) - && _LIB_VERSION != _IEEE_) - { - if (x < 0.0f) -diff --git a/math/w_j0l.c b/math/w_j0l.c -index 8d72d50..144f33c 100644 ---- a/math/w_j0l.c -+++ b/math/w_j0l.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -25,7 +25,8 @@ - long double - __j0l (long double x) - { -- if (__builtin_expect (fabsl (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (isgreater (fabsl (x), X_TLOSS), 0) -+ && _LIB_VERSION != _IEEE_) - /* j0(|x|>X_TLOSS) */ - return __kernel_standard (x, x, 234); - -@@ -38,7 +39,8 @@ weak_alias (__j0l, j0l) - long double - __y0l (long double x) - { -- if (__builtin_expect (x <= 0.0L || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (islessequal (x, 0.0L) || isgreater (x, X_TLOSS), 0) -+ && _LIB_VERSION != _IEEE_) - { - if (x < 0.0L) - { -diff --git a/math/w_j1.c b/math/w_j1.c -index 358e0e1..e9a5357 100644 ---- a/math/w_j1.c -+++ b/math/w_j1.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -25,7 +25,8 @@ - double - j1 (double x) - { -- if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0) -+ && _LIB_VERSION != _IEEE_) - /* j1(|x|>X_TLOSS) */ - return __kernel_standard (x, x, 36); - -@@ -40,7 +41,8 @@ strong_alias (j1, j1l) - double - y1 (double x) - { -- if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0) -+ && _LIB_VERSION != _IEEE_) - { - if (x < 0.0) - { -diff --git a/math/w_j1f.c b/math/w_j1f.c -index 096fdf5..29bd949 100644 ---- a/math/w_j1f.c -+++ b/math/w_j1f.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -25,7 +25,8 @@ - float - j1f (float x) - { -- if (__builtin_expect (fabsf (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (isgreater (fabsf (x), X_TLOSS), 0) -+ && _LIB_VERSION != _IEEE_) - /* j1(|x|>X_TLOSS) */ - return __kernel_standard_f (x, x, 136); - -@@ -37,7 +38,8 @@ j1f (float x) - float - y1f (float x) - { -- if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0) -+ if (__builtin_expect (islessequal (x, 0.0f) -+ || isgreater (x, (float) X_TLOSS), 0) - && _LIB_VERSION != _IEEE_) - { - if (x < 0.0f) -diff --git a/math/w_j1l.c b/math/w_j1l.c -index 93e4ee4..01b8551 100644 ---- a/math/w_j1l.c -+++ b/math/w_j1l.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -25,7 +25,8 @@ - long double - __j1l (long double x) - { -- if (__builtin_expect (fabsl (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (isgreater (fabsl (x), X_TLOSS), 0) -+ && _LIB_VERSION != _IEEE_) - /* j1(|x|>X_TLOSS) */ - return __kernel_standard (x, x, 236); - -@@ -38,7 +39,8 @@ weak_alias (__j1l, j1l) - long double - __y1l (long double x) - { -- if (__builtin_expect (x <= 0.0L || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (islessequal (x, 0.0L) || isgreater (x, X_TLOSS), 0) -+ && _LIB_VERSION != _IEEE_) - { - if (x < 0.0L) - { -diff --git a/math/w_jn.c b/math/w_jn.c -index f0dd8c6..fd3fb16 100644 ---- a/math/w_jn.c -+++ b/math/w_jn.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -25,7 +25,8 @@ - double - jn (int n, double x) - { -- if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0) -+ && _LIB_VERSION != _IEEE_) - /* jn(n,|x|>X_TLOSS) */ - return __kernel_standard (n, x, 38); - -@@ -40,7 +41,8 @@ strong_alias (jn, jnl) - double - yn (int n, double x) - { -- if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0) -+ && _LIB_VERSION != _IEEE_) - { - if (x < 0.0) - { -diff --git a/math/w_jnf.c b/math/w_jnf.c -index ef29eb4..36d6f6d 100644 ---- a/math/w_jnf.c -+++ b/math/w_jnf.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -25,7 +25,7 @@ - float - jnf (int n, float x) - { -- if (__builtin_expect (fabsf (x) > (float) X_TLOSS, 0) -+ if (__builtin_expect (isgreater (fabsf (x), (float) X_TLOSS), 0) - && _LIB_VERSION != _IEEE_) - /* jn(n,|x|>X_TLOSS) */ - return __kernel_standard_f (n, x, 138); -@@ -38,7 +38,8 @@ jnf (int n, float x) - float - ynf (int n, float x) - { -- if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0) -+ if (__builtin_expect (islessequal (x, 0.0f) -+ || isgreater (x, (float) X_TLOSS), 0) - && _LIB_VERSION != _IEEE_) - { - if (x < 0.0f) -diff --git a/math/w_log.c b/math/w_log.c -index efc1c4c..ec33605 100644 ---- a/math/w_log.c -+++ b/math/w_log.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -25,7 +25,7 @@ - double - __log (double x) - { -- if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_) - { - if (x == 0.0) - { -diff --git a/math/w_log10.c b/math/w_log10.c -index 2717ade..fe799ad 100644 ---- a/math/w_log10.c -+++ b/math/w_log10.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -25,7 +25,7 @@ - double - __log10 (double x) - { -- if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_) - { - if (x == 0.0) - { -diff --git a/math/w_log10f.c b/math/w_log10f.c -index 60737ca..4b821f7 100644 ---- a/math/w_log10f.c -+++ b/math/w_log10f.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -25,7 +25,7 @@ - float - __log10f (float x) - { -- if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_) - { - if (x == 0.0f) - { -diff --git a/math/w_log10l.c b/math/w_log10l.c -index b26f18c..0e5a137 100644 ---- a/math/w_log10l.c -+++ b/math/w_log10l.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -25,7 +25,7 @@ - long double - __log10l (long double x) - { -- if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_) - { - if (x == 0.0L) - { -diff --git a/math/w_log2.c b/math/w_log2.c -index 998e5d9..e58e109 100644 ---- a/math/w_log2.c -+++ b/math/w_log2.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -25,7 +25,7 @@ - double - __log2 (double x) - { -- if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_) - { - if (x == 0.0) - { -diff --git a/math/w_log2f.c b/math/w_log2f.c -index 6d91bf4..6963ed2 100644 ---- a/math/w_log2f.c -+++ b/math/w_log2f.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -25,7 +25,7 @@ - float - __log2f (float x) - { -- if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_) - { - if (x == 0.0) - { -diff --git a/math/w_log2l.c b/math/w_log2l.c -index e51c1bc..eed04ff6c 100644 ---- a/math/w_log2l.c -+++ b/math/w_log2l.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -25,7 +25,7 @@ - long double - __log2l (long double x) - { -- if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_) - { - if (x == 0.0L) - { -diff --git a/math/w_logf.c b/math/w_logf.c -index 8aa27c8..38d408f 100644 ---- a/math/w_logf.c -+++ b/math/w_logf.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -25,7 +25,7 @@ - float - __logf (float x) - { -- if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_) - { - if (x == 0.0f) - { -diff --git a/math/w_logl.c b/math/w_logl.c -index a3139ff..593b37d 100644 ---- a/math/w_logl.c -+++ b/math/w_logl.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -25,7 +25,7 @@ - long double - __logl (long double x) - { -- if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_) - { - if (x == 0.0L) - { -diff --git a/math/w_sqrt.c b/math/w_sqrt.c -index 409a6df..f6ba542 100644 ---- a/math/w_sqrt.c -+++ b/math/w_sqrt.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -24,7 +24,7 @@ - double - __sqrt (double x) - { -- if (__builtin_expect (x < 0.0, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (isless (x, 0.0), 0) && _LIB_VERSION != _IEEE_) - return __kernel_standard (x, x, 26); /* sqrt(negative) */ - - return __ieee754_sqrt (x); -diff --git a/math/w_sqrtf.c b/math/w_sqrtf.c -index 3c3d2f8..c128e9b 100644 ---- a/math/w_sqrtf.c -+++ b/math/w_sqrtf.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -24,7 +24,7 @@ - float - __sqrtf (float x) - { -- if (__builtin_expect (x < 0.0f, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (isless (x, 0.0f), 0) && _LIB_VERSION != _IEEE_) - return __kernel_standard_f (x, x, 126); /* sqrt(negative) */ - - return __ieee754_sqrtf (x); -diff --git a/math/w_sqrtl.c b/math/w_sqrtl.c -index 5e18f44..2a4a048 100644 ---- a/math/w_sqrtl.c -+++ b/math/w_sqrtl.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -24,7 +24,7 @@ - long double - __sqrtl (long double x) - { -- if (__builtin_expect (x < 0.0L, 0) && _LIB_VERSION != _IEEE_) -+ if (__builtin_expect (isless (x, 0.0L), 0) && _LIB_VERSION != _IEEE_) - return __kernel_standard (x, x, 226); /* sqrt(negative) */ - - return __ieee754_sqrtl (x); -diff --git a/sysdeps/ieee754/dbl-64/e_atanh.c b/sysdeps/ieee754/dbl-64/e_atanh.c -index 9fc21ab..5f471b1 100644 ---- a/sysdeps/ieee754/dbl-64/e_atanh.c -+++ b/sysdeps/ieee754/dbl-64/e_atanh.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -46,7 +46,7 @@ __ieee754_atanh (double x) - { - double xa = fabs (x); - double t; -- if (xa < 0.5) -+ if (isless (xa, 0.5)) - { - if (__builtin_expect (xa < 0x1.0p-28, 0)) - { -@@ -57,11 +57,11 @@ __ieee754_atanh (double x) - t = xa + xa; - t = 0.5 * __log1p (t + t * xa / (1.0 - xa)); - } -- else if (__builtin_expect (xa < 1.0, 1)) -+ else if (__builtin_expect (isless (xa, 1.0), 1)) - t = 0.5 * __log1p ((xa + xa) / (1.0 - xa)); - else - { -- if (xa > 1.0) -+ if (isgreater (xa, 1.0)) - return (x - x) / (x - x); - - return x / 0.0; -diff --git a/sysdeps/ieee754/dbl-64/w_exp.c b/sysdeps/ieee754/dbl-64/w_exp.c -index ee42587..b584ed8 100644 ---- a/sysdeps/ieee754/dbl-64/w_exp.c -+++ b/sysdeps/ieee754/dbl-64/w_exp.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -28,12 +28,12 @@ u_threshold= -7.45133219101941108420e+02; /* 0xc0874910, 0xD52D3051 */ - double - __exp (double x) - { -- if (__builtin_expect (x > o_threshold, 0)) -+ if (__builtin_expect (isgreater (x, o_threshold), 0)) - { - if (_LIB_VERSION != _IEEE_) - return __kernel_standard_f (x, x, 6); - } -- else if (__builtin_expect (x < u_threshold, 0)) -+ else if (__builtin_expect (isless (x, u_threshold), 0)) - { - if (_LIB_VERSION != _IEEE_) - return __kernel_standard_f (x, x, 7); -diff --git a/sysdeps/ieee754/flt-32/e_atanhf.c b/sysdeps/ieee754/flt-32/e_atanhf.c -index 75ed691..7af2f6c 100644 ---- a/sysdeps/ieee754/flt-32/e_atanhf.c -+++ b/sysdeps/ieee754/flt-32/e_atanhf.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -46,7 +46,7 @@ __ieee754_atanhf (float x) - { - float xa = fabsf (x); - float t; -- if (xa < 0.5f) -+ if (isless (xa, 0.5f)) - { - if (__builtin_expect (xa < 0x1.0p-28f, 0)) - { -@@ -57,11 +57,11 @@ __ieee754_atanhf (float x) - t = xa + xa; - t = 0.5f * __log1pf (t + t * xa / (1.0f - xa)); - } -- else if (__builtin_expect (xa < 1.0f, 1)) -+ else if (__builtin_expect (isless (xa, 1.0f), 1)) - t = 0.5f * __log1pf ((xa + xa) / (1.0f - xa)); - else - { -- if (xa > 1.0f) -+ if (isgreater (xa, 1.0f)) - return (x - x) / (x - x); - - return x / 0.0f; -diff --git a/sysdeps/ieee754/flt-32/w_expf.c b/sysdeps/ieee754/flt-32/w_expf.c -index 5500872..bc3b2f6 100644 ---- a/sysdeps/ieee754/flt-32/w_expf.c -+++ b/sysdeps/ieee754/flt-32/w_expf.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -28,12 +28,12 @@ u_threshold= -1.0397208405e+02; /* 0xc2cff1b5 */ - float - __expf (float x) - { -- if (__builtin_expect (x > o_threshold, 0)) -+ if (__builtin_expect (isgreater (x, o_threshold), 0)) - { - if (_LIB_VERSION != _IEEE_) - return __kernel_standard_f (x, x, 106); - } -- else if (__builtin_expect (x < u_threshold, 0)) -+ else if (__builtin_expect (isless (x, u_threshold), 0)) - { - if (_LIB_VERSION != _IEEE_) - return __kernel_standard_f (x, x, 107); -diff --git a/sysdeps/ieee754/ldbl-96/w_expl.c b/sysdeps/ieee754/ldbl-96/w_expl.c -index ec9d8a7..d61c0a3 100644 ---- a/sysdeps/ieee754/ldbl-96/w_expl.c -+++ b/sysdeps/ieee754/ldbl-96/w_expl.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. - -@@ -30,12 +30,12 @@ u_threshold= -1.140019167866942050398521670162263001513e4; - long double - __expl (long double x) - { -- if (__builtin_expect (x > o_threshold, 0)) -+ if (__builtin_expect (isgreater (x, o_threshold), 0)) - { - if (_LIB_VERSION != _IEEE_) - return __kernel_standard (x, x, 206); - } -- else if (__builtin_expect (x < u_threshold, 0)) -+ else if (__builtin_expect (isless (x, u_threshold), 0)) - { - if (_LIB_VERSION != _IEEE_) - return __kernel_standard (x, x, 207); diff --git a/staging/glibc/glibc-2.15-regex.patch b/staging/glibc/glibc-2.15-regex.patch deleted file mode 100644 index 6385f2c08..000000000 --- a/staging/glibc/glibc-2.15-regex.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/posix/regex_internal.c b/posix/regex_internal.c -index bc19243..124f8cc 100644 ---- a/posix/regex_internal.c -+++ b/posix/regex_internal.c -@@ -868,7 +868,7 @@ re_string_peek_byte_case (const re_string_t *pstr, int idx) - } - - static unsigned char --internal_function __attribute ((pure)) -+internal_function - re_string_fetch_byte_case (re_string_t *pstr) - { - if (BE (!pstr->mbs_allocated, 1)) --- -1.7.3.4 - diff --git a/staging/glibc/glibc-2.15-revert-c5a0802a.patch b/staging/glibc/glibc-2.15-revert-c5a0802a.patch deleted file mode 100644 index d8894723a..000000000 --- a/staging/glibc/glibc-2.15-revert-c5a0802a.patch +++ /dev/null @@ -1,226 +0,0 @@ -diff -rup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S ---- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-22 18:04:12.937212834 +0000 -+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-22 18:04:42.104222278 +0000 -@@ -137,7 +137,6 @@ __pthread_cond_wait: - cmpl $PI_BIT, %eax - jne 18f - --90: - movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %ecx - movl %ebp, %edx - xorl %esi, %esi -@@ -151,9 +150,6 @@ __pthread_cond_wait: - sete 16(%esp) - je 19f - -- cmpl $-EAGAIN, %eax -- je 91f -- - /* Normal and PI futexes dont mix. Use normal futex functions only - if the kernel does not support the PI futex functions. */ - cmpl $-ENOSYS, %eax -@@ -398,78 +394,6 @@ __pthread_cond_wait: - #endif - call __lll_unlock_wake - jmp 11b -- --91: --.LcleanupSTART2: -- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to -- call it again. */ -- -- /* Get internal lock. */ -- movl $1, %edx -- xorl %eax, %eax -- LOCK --#if cond_lock == 0 -- cmpxchgl %edx, (%ebx) --#else -- cmpxchgl %edx, cond_lock(%ebx) --#endif -- jz 92f -- --#if cond_lock == 0 -- movl %ebx, %edx --#else -- leal cond_lock(%ebx), %edx --#endif --#if (LLL_SHARED-LLL_PRIVATE) > 255 -- xorl %ecx, %ecx --#endif -- cmpl $-1, dep_mutex(%ebx) -- setne %cl -- subl $1, %ecx -- andl $(LLL_SHARED-LLL_PRIVATE), %ecx --#if LLL_PRIVATE != 0 -- addl $LLL_PRIVATE, %ecx --#endif -- call __lll_lock_wait -- --92: -- /* Increment the cond_futex value again, so it can be used as a new -- expected value. */ -- addl $1, cond_futex(%ebx) -- movl cond_futex(%ebx), %ebp -- -- /* Unlock. */ -- LOCK --#if cond_lock == 0 -- subl $1, (%ebx) --#else -- subl $1, cond_lock(%ebx) --#endif -- je 93f --#if cond_lock == 0 -- movl %ebx, %eax --#else -- leal cond_lock(%ebx), %eax --#endif --#if (LLL_SHARED-LLL_PRIVATE) > 255 -- xorl %ecx, %ecx --#endif -- cmpl $-1, dep_mutex(%ebx) -- setne %cl -- subl $1, %ecx -- andl $(LLL_SHARED-LLL_PRIVATE), %ecx --#if LLL_PRIVATE != 0 -- addl $LLL_PRIVATE, %ecx --#endif -- call __lll_unlock_wake -- --93: -- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */ -- xorl %ecx, %ecx -- movl dep_mutex(%ebx), %edi -- jmp 90b --.LcleanupEND2: -- - .size __pthread_cond_wait, .-__pthread_cond_wait - versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait, - GLIBC_2_3_2) -@@ -642,10 +566,6 @@ __condvar_w_cleanup: - .long .LcleanupEND-.Lsub_cond_futex - .long __condvar_w_cleanup-.LSTARTCODE - .uleb128 0 -- .long .LcleanupSTART2-.LSTARTCODE -- .long .LcleanupEND2-.LcleanupSTART2 -- .long __condvar_w_cleanup-.LSTARTCODE -- .uleb128 0 - .long .LcallUR-.LSTARTCODE - .long .LENDCODE-.LcallUR - .long 0 -Only in b/nptl/sysdeps/unix/sysv/linux/i386/i486: pthread_cond_wait.S.orig -diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S ---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-22 18:04:12.941212837 +0000 -+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-22 18:05:05.155229737 +0000 -@@ -23,7 +23,6 @@ - #include <lowlevelcond.h> - #include <tcb-offsets.h> - #include <pthread-pi-defines.h> --#include <pthread-errnos.h> - #include <stap-probe.h> - - #include <kernel-features.h> -@@ -137,14 +136,11 @@ __pthread_cond_wait: - cmpl $PI_BIT, %eax - jne 61f - --90: - movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %esi - movl $SYS_futex, %eax - syscall - - movl $1, %r8d -- cmpq $-EAGAIN, %rax -- je 91f - #ifdef __ASSUME_REQUEUE_PI - jmp 62f - #else -@@ -331,70 +327,6 @@ __pthread_cond_wait: - - 13: movq %r10, %rax - jmp 14b -- --91: --.LcleanupSTART2: -- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to -- call it again. */ -- movq 8(%rsp), %rdi -- -- /* Get internal lock. */ -- movl $1, %esi -- xorl %eax, %eax -- LOCK --#if cond_lock == 0 -- cmpxchgl %esi, (%rdi) --#else -- cmpxchgl %esi, cond_lock(%rdi) --#endif -- jz 92f -- --#if cond_lock != 0 -- addq $cond_lock, %rdi --#endif -- LP_OP(cmp) $-1, dep_mutex-cond_lock(%rdi) -- movl $LLL_PRIVATE, %eax -- movl $LLL_SHARED, %esi -- cmovne %eax, %esi -- callq __lll_lock_wait --#if cond_lock != 0 -- subq $cond_lock, %rdi --#endif --92: -- /* Increment the cond_futex value again, so it can be used as a new -- expected value. */ -- incl cond_futex(%rdi) -- movl cond_futex(%rdi), %edx -- -- /* Release internal lock. */ -- LOCK --#if cond_lock == 0 -- decl (%rdi) --#else -- decl cond_lock(%rdi) --#endif -- jz 93f -- --#if cond_lock != 0 -- addq $cond_lock, %rdi --#endif -- LP_OP(cmp) $-1, dep_mutex-cond_lock(%rdi) -- movl $LLL_PRIVATE, %eax -- movl $LLL_SHARED, %esi -- cmovne %eax, %esi -- /* The call preserves %rdx. */ -- callq __lll_unlock_wake --#if cond_lock != 0 -- subq $cond_lock, %rdi --#endif --93: -- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */ -- xorq %r10, %r10 -- mov dep_mutex(%rdi), %R8_LP -- leaq cond_futex(%rdi), %rdi -- jmp 90b --.LcleanupEND2: -- - .size __pthread_cond_wait, .-__pthread_cond_wait - versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait, - GLIBC_2_3_2) -@@ -547,15 +479,11 @@ __condvar_cleanup1: - .uleb128 .LcleanupSTART-.LSTARTCODE - .uleb128 .LcleanupEND-.LcleanupSTART - .uleb128 __condvar_cleanup1-.LSTARTCODE -- .uleb128 0 -- .uleb128 .LcleanupSTART2-.LSTARTCODE -- .uleb128 .LcleanupEND2-.LcleanupSTART2 -- .uleb128 __condvar_cleanup1-.LSTARTCODE -- .uleb128 0 -+ .uleb128 0 - .uleb128 .LcallUR-.LSTARTCODE - .uleb128 .LENDCODE-.LcallUR - .uleb128 0 -- .uleb128 0 -+ .uleb128 0 - .Lcstend: - diff --git a/staging/glibc/glibc-2.15-revert-netlink-cache.patch b/staging/glibc/glibc-2.15-revert-netlink-cache.patch deleted file mode 100644 index 87d04c794..000000000 --- a/staging/glibc/glibc-2.15-revert-netlink-cache.patch +++ /dev/null @@ -1,680 +0,0 @@ -diff --git a/include/ifaddrs.h b/include/ifaddrs.h -index e1c6cac..50e4c48 100644 ---- a/include/ifaddrs.h -+++ b/include/ifaddrs.h -@@ -21,13 +21,8 @@ struct in6addrinfo - extern void __check_pf (bool *seen_ipv4, bool *seen_ipv6, - struct in6addrinfo **in6ai, size_t *in6ailen) - attribute_hidden; --extern void __free_in6ai (struct in6addrinfo *in6ai) attribute_hidden; - extern void __check_native (uint32_t a1_index, int *a1_native, - uint32_t a2_index, int *a2_native) - attribute_hidden; - --#ifdef IS_IN_nscd --extern uint32_t __bump_nl_timestamp (void) attribute_hidden; --#endif -- - #endif /* ifaddrs.h */ -diff --git a/inet/check_pf.c b/inet/check_pf.c -index 0fa34cc..b015432 100644 ---- a/inet/check_pf.c -+++ b/inet/check_pf.c -@@ -1,5 +1,5 @@ - /* Determine protocol families for which interfaces exist. Generic version. -- Copyright (C) 2003, 2006, 2011 Free Software Foundation, Inc. -+ Copyright (C) 2003, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -54,19 +54,3 @@ __check_pf (bool *seen_ipv4, bool *seen_ipv6, - - (void) freeifaddrs (ifa); - } -- -- --void --__free_in6ai (struct in6addrinfo *in6ai) --{ -- /* Nothing to do. */ --} -- -- --#ifdef IS_IN_nscd --uint32_t --__bump_nl_timestamp (void) --{ -- return 0; --} --#endif -diff --git a/nscd/connections.c b/nscd/connections.c -index c741996..2b5c7ef 100644 ---- a/nscd/connections.c -+++ b/nscd/connections.c -@@ -24,7 +24,6 @@ - #include <errno.h> - #include <fcntl.h> - #include <grp.h> --#include <ifaddrs.h> - #include <libintl.h> - #include <pthread.h> - #include <pwd.h> -@@ -33,10 +32,6 @@ - #include <stdlib.h> - #include <unistd.h> - #include <arpa/inet.h> --#ifdef HAVE_NETLINK --# include <linux/netlink.h> --# include <linux/rtnetlink.h> --#endif - #ifdef HAVE_EPOLL - # include <sys/epoll.h> - #endif -@@ -252,11 +247,6 @@ static int sock; - int inotify_fd = -1; - #endif - --#ifdef HAVE_NETLINK --/* Descriptor for netlink status updates. */ --static int nl_status_fd = -1; --#endif -- - #ifndef __ASSUME_SOCK_CLOEXEC - /* Negative if SOCK_CLOEXEC is not supported, positive if it is, zero - before be know the result. */ -@@ -913,65 +903,6 @@ cannot set socket to close on exec: %s; disabling paranoia mode"), - exit (1); - } - --#ifdef HAVE_NETLINK -- if (dbs[hstdb].enabled) -- { -- /* Try to open netlink socket to monitor network setting changes. */ -- nl_status_fd = socket (AF_NETLINK, -- SOCK_RAW | SOCK_CLOEXEC | SOCK_NONBLOCK, -- NETLINK_ROUTE); -- if (nl_status_fd != -1) -- { -- struct sockaddr_nl snl; -- memset (&snl, '\0', sizeof (snl)); -- snl.nl_family = AF_NETLINK; -- /* XXX Is this the best set to use? */ -- snl.nl_groups = (RTMGRP_IPV4_IFADDR | RTMGRP_TC | RTMGRP_IPV4_MROUTE -- | RTMGRP_IPV4_ROUTE | RTMGRP_IPV4_RULE -- | RTMGRP_IPV6_IFADDR | RTMGRP_IPV6_MROUTE -- | RTMGRP_IPV6_ROUTE | RTMGRP_IPV6_IFINFO -- | RTMGRP_IPV6_PREFIX); -- -- if (bind (nl_status_fd, (struct sockaddr *) &snl, sizeof (snl)) != 0) -- { -- close (nl_status_fd); -- nl_status_fd = -1; -- } -- else -- { -- /* Start the timestamp process. */ -- dbs[hstdb].head->extra_data[NSCD_HST_IDX_CONF_TIMESTAMP] -- = __bump_nl_timestamp (); -- --# ifndef __ASSUME_SOCK_CLOEXEC -- if (have_sock_cloexec < 0) -- { -- /* We don't want to get stuck on accept. */ -- int fl = fcntl (nl_status_fd, F_GETFL); -- if (fl == -1 -- || fcntl (nl_status_fd, F_SETFL, fl | O_NONBLOCK) == -1) -- { -- dbg_log (_("\ --cannot change socket to nonblocking mode: %s"), -- strerror (errno)); -- exit (1); -- } -- -- /* The descriptor needs to be closed on exec. */ -- if (paranoia -- && fcntl (nl_status_fd, F_SETFD, FD_CLOEXEC) == -1) -- { -- dbg_log (_("cannot set socket to close on exec: %s"), -- strerror (errno)); -- exit (1); -- } -- } --# endif -- } -- } -- } --#endif -- - /* Change to unprivileged uid/gid/groups if specified in config file */ - if (server_user != NULL) - finish_drop_privileges (); -@@ -1895,18 +1826,6 @@ main_loop_poll (void) - } - #endif - --#ifdef HAVE_NETLINK -- size_t idx_nl_status_fd = 0; -- if (nl_status_fd != -1) -- { -- idx_nl_status_fd = nused; -- conns[nused].fd = nl_status_fd; -- conns[nused].events = POLLRDNORM; -- ++nused; -- firstfree = nused; -- } --#endif -- - while (1) - { - /* Wait for any event. We wait at most a couple of seconds so -@@ -2049,20 +1968,6 @@ disabled inotify after read error %d"), - } - #endif - --#ifdef HAVE_NETLINK -- if (idx_nl_status_fd != 0 && conns[idx_nl_status_fd].revents != 0) -- { -- char buf[4096]; -- /* Read all the data. We do not interpret it here. */ -- while (TEMP_FAILURE_RETRY (read (nl_status_fd, buf, -- sizeof (buf))) != -1) -- ; -- -- dbs[hstdb].head->extra_data[NSCD_HST_IDX_CONF_TIMESTAMP] -- = __bump_nl_timestamp (); -- } --#endif -- - for (size_t cnt = first; cnt < nused && n > 0; ++cnt) - if (conns[cnt].revents != 0) - { -@@ -2141,17 +2046,6 @@ main_loop_epoll (int efd) - } - # endif - --# ifdef HAVE_NETLINK -- if (nl_status_fd != -1) -- { -- ev.events = EPOLLRDNORM; -- ev.data.fd = nl_status_fd; -- if (epoll_ctl (efd, EPOLL_CTL_ADD, nl_status_fd, &ev) == -1) -- /* We cannot use epoll. */ -- return; -- } --# endif -- - while (1) - { - struct epoll_event revs[100]; -@@ -2268,18 +2162,6 @@ main_loop_epoll (int efd) - } - } - # endif --# ifdef HAVE_NETLINK -- else if (revs[cnt].data.fd == nl_status_fd) -- { -- char buf[4096]; -- /* Read all the data. We do not interpret it here. */ -- while (TEMP_FAILURE_RETRY (read (nl_status_fd, buf, -- sizeof (buf))) != -1) -- ; -- -- __bump_nl_timestamp (); -- } --# endif - else - { - /* Remove the descriptor from the epoll descriptor. */ -@@ -2303,7 +2185,6 @@ main_loop_epoll (int efd) - time_t laststart = now - ACCEPT_TIMEOUT; - assert (starttime[sock] == 0); - assert (inotify_fd == -1 || starttime[inotify_fd] == 0); -- assert (nl_status_fd == -1 || starttime[nl_status_fd] == 0); - for (int cnt = highest; cnt > STDERR_FILENO; --cnt) - if (starttime[cnt] != 0 && starttime[cnt] < laststart) - { -diff --git a/nscd/nscd-client.h b/nscd/nscd-client.h -index b5cd2d2..caad26a 100644 ---- a/nscd/nscd-client.h -+++ b/nscd/nscd-client.h -@@ -260,17 +260,12 @@ struct hashentry - - - /* Current persistent database version. */ --#define DB_VERSION 2 -+#define DB_VERSION 1 - - /* Maximum time allowed between updates of the timestamp. */ - #define MAPPING_TIMEOUT (5 * 60) - - --/* Used indices for the EXTRA_DATA element of 'database_pers_head'. -- Each database has its own indices. */ --#define NSCD_HST_IDX_CONF_TIMESTAMP 0 -- -- - /* Header of persistent database file. */ - struct database_pers_head - { -@@ -279,8 +274,6 @@ struct database_pers_head - volatile int32_t gc_cycle; - volatile int32_t nscd_certainly_running; - volatile nscd_time_t timestamp; -- /* Room for extensions. */ -- volatile uint32_t extra_data[4]; - - nscd_ssize_t module; - nscd_ssize_t data_size; -@@ -329,12 +322,6 @@ extern int __nscd_open_socket (const char *key, size_t keylen, - request_type type, void *response, - size_t responselen) attribute_hidden; - --/* Try to get a file descriptor for the shared meory segment -- containing the database. */ --extern struct mapped_database *__nscd_get_mapping (request_type type, -- const char *key, -- struct mapped_database **mappedp) attribute_hidden; -- - /* Get reference of mapping. */ - extern struct mapped_database *__nscd_get_map_ref (request_type type, - const char *name, -@@ -384,7 +371,4 @@ extern ssize_t writeall (int fd, const void *buf, size_t len) - extern ssize_t sendfileall (int tofd, int fromfd, off_t off, size_t len) - attribute_hidden; - --/* Get netlink timestamp counter from mapped area or zero. */ --extern uint32_t __nscd_get_nl_timestamp (void); -- - #endif /* nscd.h */ -diff --git a/nscd/nscd_gethst_r.c b/nscd/nscd_gethst_r.c -index 6ee142d..70631fa 100644 ---- a/nscd/nscd_gethst_r.c -+++ b/nscd/nscd_gethst_r.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 1998-2005, 2006, 2007, 2008, 2009, 2011 -+/* Copyright (C) 1998-2005, 2006, 2007, 2008, 2009 - Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. -@@ -98,27 +98,6 @@ libc_freeres_fn (hst_map_free) - } - - --uint32_t --__nscd_get_nl_timestamp (void) --{ -- if (__nss_not_use_nscd_hosts != 0) -- return 0; -- -- struct mapped_database *map = __hst_map_handle.mapped; -- -- if (map == NULL -- || (map != NO_MAPPING -- && map->head->nscd_certainly_running == 0 -- && map->head->timestamp + MAPPING_TIMEOUT < time (NULL))) -- map = __nscd_get_mapping (GETFDHST, "hosts", &__hst_map_handle.mapped); -- -- if (map == NO_MAPPING) -- return 0; -- -- return map->head->extra_data[NSCD_HST_IDX_CONF_TIMESTAMP]; --} -- -- - int __nss_have_localdomain attribute_hidden; - - static int -diff --git a/nscd/nscd_helper.c b/nscd/nscd_helper.c -index 365b599..fe63f9a 100644 ---- a/nscd/nscd_helper.c -+++ b/nscd/nscd_helper.c -@@ -277,9 +277,9 @@ __nscd_unmap (struct mapped_database *mapped) - - /* Try to get a file descriptor for the shared meory segment - containing the database. */ --struct mapped_database * --__nscd_get_mapping (request_type type, const char *key, -- struct mapped_database **mappedp) -+static struct mapped_database * -+get_mapping (request_type type, const char *key, -+ struct mapped_database **mappedp) - { - struct mapped_database *result = NO_MAPPING; - #ifdef SCM_RIGHTS -@@ -449,8 +449,8 @@ __nscd_get_map_ref (request_type type, const char *name, - || (cur->head->nscd_certainly_running == 0 - && cur->head->timestamp + MAPPING_TIMEOUT < time (NULL)) - || cur->head->data_size > cur->datasize) -- cur = __nscd_get_mapping (type, name, -- (struct mapped_database **) &mapptr->mapped); -+ cur = get_mapping (type, name, -+ (struct mapped_database **) &mapptr->mapped); - - if (__builtin_expect (cur != NO_MAPPING, 1)) - { -diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c -index 1a023f9..4979805 100644 ---- a/sysdeps/posix/getaddrinfo.c -+++ b/sysdeps/posix/getaddrinfo.c -@@ -2386,7 +2386,7 @@ getaddrinfo (const char *name, const char *service, - || (hints->ai_family == PF_INET6 && ! seen_ipv6)) - { - /* We cannot possibly return a valid answer. */ -- __free_in6ai (in6ai); -+ free (in6ai); - return EAI_NONAME; - } - } -@@ -2400,7 +2400,7 @@ getaddrinfo (const char *name, const char *service, - { - if (hints->ai_flags & AI_NUMERICSERV) - { -- __free_in6ai (in6ai); -+ free (in6ai); - return EAI_NONAME; - } - -@@ -2422,7 +2422,7 @@ getaddrinfo (const char *name, const char *service, - if (last_i != 0) - { - freeaddrinfo (p); -- __free_in6ai (in6ai); -+ free (in6ai); - - return -(last_i & GAIH_EAI); - } -@@ -2434,7 +2434,7 @@ getaddrinfo (const char *name, const char *service, - } - else - { -- __free_in6ai (in6ai); -+ free (in6ai); - return EAI_FAMILY; - } - -@@ -2622,7 +2622,7 @@ getaddrinfo (const char *name, const char *service, - p->ai_canonname = canonname; - } - -- __free_in6ai (in6ai); -+ free (in6ai); - - if (p) - { -diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile -index e684b16..c907af4 100644 ---- a/sysdeps/unix/sysv/linux/Makefile -+++ b/sysdeps/unix/sysv/linux/Makefile -@@ -173,6 +173,6 @@ CFLAGS-mq_receive.c += -fexceptions - endif - - ifeq ($(subdir),nscd) --sysdep-CFLAGS += -DHAVE_EPOLL -DHAVE_SENDFILE -DHAVE_INOTIFY -DHAVE_NETLINK -+sysdep-CFLAGS += -DHAVE_EPOLL -DHAVE_SENDFILE -DHAVE_INOTIFY - CFLAGS-gai.c += -DNEED_NETLINK - endif -diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c -index 0738a70..d5ad7ea 100644 ---- a/sysdeps/unix/sysv/linux/check_pf.c -+++ b/sysdeps/unix/sysv/linux/check_pf.c -@@ -1,5 +1,5 @@ - /* Determine protocol families for which interfaces exist. Linux version. -- Copyright (C) 2003, 2006-2008, 2010, 2011 Free Software Foundation, Inc. -+ Copyright (C) 2003, 2006, 2007, 2008, 2010, 2011 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -33,9 +33,6 @@ - - #include <not-cancel.h> - #include <kernel-features.h> --#include <bits/libc-lock.h> --#include <atomic.h> --#include <nscd/nscd-client.h> - - - #ifndef IFA_F_HOMEADDRESS -@@ -46,42 +43,9 @@ - #endif - - --struct cached_data --{ -- uint32_t timestamp; -- uint32_t usecnt; -- bool seen_ipv4; -- bool seen_ipv6; -- size_t in6ailen; -- struct in6addrinfo in6ai[0]; --}; -- --static struct cached_data noai6ai_cached = -- { -- .usecnt = 1, /* Make sure we never try to delete this entry. */ -- .in6ailen = 0 -- }; -- --static struct cached_data *cache; --__libc_lock_define_initialized (static, lock); -- -- --#ifdef IS_IN_nscd --static uint32_t nl_timestamp; -- --uint32_t --__bump_nl_timestamp (void) --{ -- if (atomic_increment_val (&nl_timestamp) == 0) -- atomic_increment (&nl_timestamp); -- -- return nl_timestamp; --} --#endif -- -- --static struct cached_data * --make_request (int fd, pid_t pid) -+static int -+make_request (int fd, pid_t pid, bool *seen_ipv4, bool *seen_ipv6, -+ struct in6addrinfo **in6ai, size_t *in6ailen) - { - struct req - { -@@ -135,6 +99,9 @@ make_request (int fd, pid_t pid) - sizeof (nladdr))) < 0) - goto out_fail; - -+ *seen_ipv4 = false; -+ *seen_ipv6 = false; -+ - bool done = false; - struct in6ailist - { -@@ -142,8 +109,6 @@ make_request (int fd, pid_t pid) - struct in6ailist *next; - } *in6ailist = NULL; - size_t in6ailistlen = 0; -- bool seen_ipv4 = false; -- bool seen_ipv6 = false; - - do - { -@@ -207,12 +172,12 @@ make_request (int fd, pid_t pid) - { - if (*(const in_addr_t *) address - != htonl (INADDR_LOOPBACK)) -- seen_ipv4 = true; -+ *seen_ipv4 = true; - } - else - { - if (!IN6_IS_ADDR_LOOPBACK (address)) -- seen_ipv6 = true; -+ *seen_ipv6 = true; - } - } - -@@ -246,47 +211,30 @@ make_request (int fd, pid_t pid) - } - while (! done); - -- struct cached_data *result; -- if (seen_ipv6 && in6ailist != NULL) -+ if (*seen_ipv6 && in6ailist != NULL) - { -- result = malloc (sizeof (*result) -- + in6ailistlen * sizeof (struct in6addrinfo)); -- if (result == NULL) -+ *in6ai = malloc (in6ailistlen * sizeof (**in6ai)); -+ if (*in6ai == NULL) - goto out_fail; - --#ifdef IS_IN_nscd -- result->timestamp = nl_timestamp; --#else -- result->timestamp = __nscd_get_nl_timestamp (); --#endif -- result->usecnt = 2; -- result->seen_ipv4 = seen_ipv4; -- result->seen_ipv6 = true; -- result->in6ailen = in6ailistlen; -+ *in6ailen = in6ailistlen; - - do - { -- result->in6ai[--in6ailistlen] = in6ailist->info; -+ (*in6ai)[--in6ailistlen] = in6ailist->info; - in6ailist = in6ailist->next; - } - while (in6ailist != NULL); - } -- else -- { -- atomic_add (&noai6ai_cached.usecnt, 2); -- noai6ai_cached.seen_ipv4 = seen_ipv4; -- noai6ai_cached.seen_ipv6 = seen_ipv6; -- result = &noai6ai_cached; -- } - - if (use_malloc) - free (buf); -- return result; -+ return 0; - - out_fail: - if (use_malloc) - free (buf); -- return NULL; -+ return -1; - } - - -@@ -310,65 +258,28 @@ __check_pf (bool *seen_ipv4, bool *seen_ipv6, - - if (! __no_netlink_support) - { -- struct cached_data *olddata = NULL; -- struct cached_data *data = NULL; -+ int fd = __socket (PF_NETLINK, SOCK_RAW, NETLINK_ROUTE); - -- __libc_lock_lock (lock); -- --#ifdef IS_IN_nscd --# define cache_valid() nl_timestamp != 0 && cache->timestamp == nl_timestamp --#else --# define cache_valid() \ -- ({ uint32_t val = __nscd_get_nl_timestamp (); \ -- val != 0 && cache->timestamp == val; }) --#endif -- if (cache != NULL && cache_valid ()) -- { -- data = cache; -- atomic_increment (&cache->usecnt); -- } -- else -+ if (__builtin_expect (fd >= 0, 1)) - { -- int fd = __socket (PF_NETLINK, SOCK_RAW, NETLINK_ROUTE); -+ struct sockaddr_nl nladdr; -+ memset (&nladdr, '\0', sizeof (nladdr)); -+ nladdr.nl_family = AF_NETLINK; - -- if (__builtin_expect (fd >= 0, 1)) -- { -- struct sockaddr_nl nladdr; -- memset (&nladdr, '\0', sizeof (nladdr)); -- nladdr.nl_family = AF_NETLINK; -- -- socklen_t addr_len = sizeof (nladdr); -- -- if(__bind (fd, (struct sockaddr *) &nladdr, sizeof (nladdr)) == 0 -- && __getsockname (fd, (struct sockaddr *) &nladdr, -- &addr_len) == 0) -- data = make_request (fd, nladdr.nl_pid); -- -- close_not_cancel_no_status (fd); -- } -- -- if (data != NULL) -- { -- olddata = cache; -- cache = data; -- } -- } -+ socklen_t addr_len = sizeof (nladdr); - -- __libc_lock_unlock (lock); -+ bool success -+ = (__bind (fd, (struct sockaddr *) &nladdr, sizeof (nladdr)) == 0 -+ && __getsockname (fd, (struct sockaddr *) &nladdr, -+ &addr_len) == 0 -+ && make_request (fd, nladdr.nl_pid, seen_ipv4, seen_ipv6, -+ in6ai, in6ailen) == 0); - -- if (data != NULL) -- { -- /* It worked. */ -- *seen_ipv4 = data->seen_ipv4; -- *seen_ipv6 = data->seen_ipv6; -- *in6ailen = data->in6ailen; -- *in6ai = data->in6ai; -- -- if (olddata != NULL && olddata->usecnt > 0 -- && atomic_add_zero (&olddata->usecnt, -1)) -- free (olddata); -+ close_not_cancel_no_status (fd); - -- return; -+ if (success) -+ /* It worked. */ -+ return; - } - - #if __ASSUME_NETLINK_SUPPORT == 0 -@@ -407,26 +318,3 @@ __check_pf (bool *seen_ipv4, bool *seen_ipv6, - (void) freeifaddrs (ifa); - #endif - } -- -- --void --__free_in6ai (struct in6addrinfo *ai) --{ -- if (ai != NULL) -- { -- struct cached_data *data = -- (struct cached_data *) ((char *) ai -- - offsetof (struct cached_data, in6ai)); -- -- if (atomic_add_zero (&data->usecnt, -1)) -- { -- __libc_lock_lock (lock); -- -- if (data->usecnt == 0) -- /* Still unused. */ -- free (data); -- -- __libc_lock_unlock (lock); -- } -- } --} diff --git a/staging/glibc/glibc-2.15-rintf-rounding.patch b/staging/glibc/glibc-2.15-rintf-rounding.patch deleted file mode 100644 index e0240ac6c..000000000 --- a/staging/glibc/glibc-2.15-rintf-rounding.patch +++ /dev/null @@ -1,158 +0,0 @@ -diff --git a/math/libm-test.inc b/math/libm-test.inc -index 6243e1e..c8186c8 100644 ---- a/math/libm-test.inc -+++ b/math/libm-test.inc -@@ -5037,6 +5037,22 @@ rint_test (void) - TEST_f_f (rint, 262142.75, 262143.0); - TEST_f_f (rint, 524286.75, 524287.0); - TEST_f_f (rint, 524288.75, 524289.0); -+ TEST_f_f (rint, 1048576.75, 1048577.0); -+ TEST_f_f (rint, 2097152.75, 2097153.0); -+ TEST_f_f (rint, -1048576.75, -1048577.0); -+ TEST_f_f (rint, -2097152.75, -2097153.0); -+#ifndef TEST_FLOAT -+ TEST_f_f (rint, 70368744177664.75, 70368744177665.0); -+ TEST_f_f (rint, 140737488355328.75, 140737488355329.0); -+ TEST_f_f (rint, 281474976710656.75, 281474976710657.0); -+ TEST_f_f (rint, 562949953421312.75, 562949953421313.0); -+ TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0); -+ TEST_f_f (rint, -70368744177664.75, -70368744177665.0); -+ TEST_f_f (rint, -140737488355328.75, -140737488355329.0); -+ TEST_f_f (rint, -281474976710656.75, -281474976710657.0); -+ TEST_f_f (rint, -562949953421312.75, -562949953421313.0); -+ TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0); -+#endif - #ifdef TEST_LDOUBLE - /* The result can only be represented in long double. */ - TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L); -@@ -5137,6 +5153,22 @@ rint_test_tonearest (void) - TEST_f_f (rint, -0.1, -0.0); - TEST_f_f (rint, -0.25, -0.0); - TEST_f_f (rint, -0.625, -1.0); -+ TEST_f_f (rint, 1048576.75, 1048577.0); -+ TEST_f_f (rint, 2097152.75, 2097153.0); -+ TEST_f_f (rint, -1048576.75, -1048577.0); -+ TEST_f_f (rint, -2097152.75, -2097153.0); -+#ifndef TEST_FLOAT -+ TEST_f_f (rint, 70368744177664.75, 70368744177665.0); -+ TEST_f_f (rint, 140737488355328.75, 140737488355329.0); -+ TEST_f_f (rint, 281474976710656.75, 281474976710657.0); -+ TEST_f_f (rint, 562949953421312.75, 562949953421313.0); -+ TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0); -+ TEST_f_f (rint, -70368744177664.75, -70368744177665.0); -+ TEST_f_f (rint, -140737488355328.75, -140737488355329.0); -+ TEST_f_f (rint, -281474976710656.75, -281474976710657.0); -+ TEST_f_f (rint, -562949953421312.75, -562949953421313.0); -+ TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0); -+#endif - #ifdef TEST_LDOUBLE - /* The result can only be represented in long double. */ - TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L); -@@ -5207,6 +5239,22 @@ rint_test_towardzero (void) - TEST_f_f (rint, -0.1, -0.0); - TEST_f_f (rint, -0.25, -0.0); - TEST_f_f (rint, -0.625, -0.0); -+ TEST_f_f (rint, 1048576.75, 1048576.0); -+ TEST_f_f (rint, 2097152.75, 2097152.0); -+ TEST_f_f (rint, -1048576.75, -1048576.0); -+ TEST_f_f (rint, -2097152.75, -2097152.0); -+#ifndef TEST_FLOAT -+ TEST_f_f (rint, 70368744177664.75, 70368744177664.0); -+ TEST_f_f (rint, 140737488355328.75, 140737488355328.0); -+ TEST_f_f (rint, 281474976710656.75, 281474976710656.0); -+ TEST_f_f (rint, 562949953421312.75, 562949953421312.0); -+ TEST_f_f (rint, 1125899906842624.75, 1125899906842624.0); -+ TEST_f_f (rint, -70368744177664.75, -70368744177664.0); -+ TEST_f_f (rint, -140737488355328.75, -140737488355328.0); -+ TEST_f_f (rint, -281474976710656.75, -281474976710656.0); -+ TEST_f_f (rint, -562949953421312.75, -562949953421312.0); -+ TEST_f_f (rint, -1125899906842624.75, -1125899906842624.0); -+#endif - #ifdef TEST_LDOUBLE - /* The result can only be represented in long double. */ - TEST_f_f (rint, 4503599627370495.5L, 4503599627370495.0L); -@@ -5277,6 +5325,22 @@ rint_test_downward (void) - TEST_f_f (rint, -0.1, -1.0); - TEST_f_f (rint, -0.25, -1.0); - TEST_f_f (rint, -0.625, -1.0); -+ TEST_f_f (rint, 1048576.75, 1048576.0); -+ TEST_f_f (rint, 2097152.75, 2097152.0); -+ TEST_f_f (rint, -1048576.75, -1048577.0); -+ TEST_f_f (rint, -2097152.75, -2097153.0); -+#ifndef TEST_FLOAT -+ TEST_f_f (rint, 70368744177664.75, 70368744177664.0); -+ TEST_f_f (rint, 140737488355328.75, 140737488355328.0); -+ TEST_f_f (rint, 281474976710656.75, 281474976710656.0); -+ TEST_f_f (rint, 562949953421312.75, 562949953421312.0); -+ TEST_f_f (rint, 1125899906842624.75, 1125899906842624.0); -+ TEST_f_f (rint, -70368744177664.75, -70368744177665.0); -+ TEST_f_f (rint, -140737488355328.75, -140737488355329.0); -+ TEST_f_f (rint, -281474976710656.75, -281474976710657.0); -+ TEST_f_f (rint, -562949953421312.75, -562949953421313.0); -+ TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0); -+#endif - #ifdef TEST_LDOUBLE - /* The result can only be represented in long double. */ - TEST_f_f (rint, 4503599627370495.5L, 4503599627370495.0L); -@@ -5347,6 +5411,22 @@ rint_test_upward (void) - TEST_f_f (rint, -0.1, -0.0); - TEST_f_f (rint, -0.25, -0.0); - TEST_f_f (rint, -0.625, -0.0); -+ TEST_f_f (rint, 1048576.75, 1048577.0); -+ TEST_f_f (rint, 2097152.75, 2097153.0); -+ TEST_f_f (rint, -1048576.75, -1048576.0); -+ TEST_f_f (rint, -2097152.75, -2097152.0); -+#ifndef TEST_FLOAT -+ TEST_f_f (rint, 70368744177664.75, 70368744177665.0); -+ TEST_f_f (rint, 140737488355328.75, 140737488355329.0); -+ TEST_f_f (rint, 281474976710656.75, 281474976710657.0); -+ TEST_f_f (rint, 562949953421312.75, 562949953421313.0); -+ TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0); -+ TEST_f_f (rint, -70368744177664.75, -70368744177664.0); -+ TEST_f_f (rint, -140737488355328.75, -140737488355328.0); -+ TEST_f_f (rint, -281474976710656.75, -281474976710656.0); -+ TEST_f_f (rint, -562949953421312.75, -562949953421312.0); -+ TEST_f_f (rint, -1125899906842624.75, -1125899906842624.0); -+#endif - #ifdef TEST_LDOUBLE - /* The result can only be represented in long double. */ - TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L); -diff --git a/sysdeps/ieee754/flt-32/s_rintf.c b/sysdeps/ieee754/flt-32/s_rintf.c -index 9ea9b6f..9ba6b57 100644 ---- a/sysdeps/ieee754/flt-32/s_rintf.c -+++ b/sysdeps/ieee754/flt-32/s_rintf.c -@@ -26,34 +26,22 @@ float - __rintf(float x) - { - int32_t i0,j0,sx; -- u_int32_t i,i1; - float w,t; - GET_FLOAT_WORD(i0,x); - sx = (i0>>31)&1; - j0 = ((i0>>23)&0xff)-0x7f; - if(j0<23) { - if(j0<0) { -- if((i0&0x7fffffff)==0) return x; -- i1 = (i0&0x07fffff); -- i0 &= 0xfff00000; -- i0 |= ((i1|-i1)>>9)&0x400000; -- SET_FLOAT_WORD(x,i0); - w = TWO23[sx]+x; - t = w-TWO23[sx]; - GET_FLOAT_WORD(i0,t); - SET_FLOAT_WORD(t,(i0&0x7fffffff)|(sx<<31)); - return t; -- } else { -- i = (0x007fffff)>>j0; -- if((i0&i)==0) return x; /* x is integral */ -- i>>=1; -- if((i0&i)!=0) i0 = (i0&(~i))|((0x100000)>>j0); - } - } else { - if(j0==0x80) return x+x; /* inf or NaN */ - else return x; /* x is integral */ - } -- SET_FLOAT_WORD(x,i0); - w = TWO23[sx]+x; - return w-TWO23[sx]; - } diff --git a/staging/glibc/glibc-2.15-scanf.patch b/staging/glibc/glibc-2.15-scanf.patch deleted file mode 100644 index a2561b232..000000000 --- a/staging/glibc/glibc-2.15-scanf.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c -index 0e71deb..e18a6c3 100644 ---- a/stdio-common/vfscanf.c -+++ b/stdio-common/vfscanf.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 1991-2006, 2007, 2010, 2011 Free Software Foundation, Inc. -+/* Copyright (C) 1991-2007, 2010, 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -274,7 +274,7 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr, - CHAR_T *old = wp; \ - size_t newsize = (UCHAR_MAX + 1 > 2 * wpmax \ - ? UCHAR_MAX + 1 : 2 * wpmax); \ -- if (use_malloc || __libc_use_alloca (newsize)) \ -+ if (use_malloc || !__libc_use_alloca (newsize)) \ - { \ - wp = realloc (use_malloc ? wp : NULL, newsize); \ - if (wp == NULL) \ diff --git a/staging/glibc/glibc-2.15-strcasecmp-disable-avx.patch b/staging/glibc/glibc-2.15-strcasecmp-disable-avx.patch deleted file mode 100644 index 4c104fa55..000000000 --- a/staging/glibc/glibc-2.15-strcasecmp-disable-avx.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S -index f93c83d..d8aa889 100644 ---- a/sysdeps/x86_64/multiarch/strcmp.S -+++ b/sysdeps/x86_64/multiarch/strcmp.S -@@ -105,11 +105,6 @@ ENTRY(__strcasecmp) - jne 1f - call __init_cpu_features - 1: --# ifdef HAVE_AVX_SUPPORT -- leaq __strcasecmp_avx(%rip), %rax -- testl $bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip) -- jnz 2f --# endif - leaq __strcasecmp_sse42(%rip), %rax - testl $bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip) - jnz 2f -@@ -128,11 +123,6 @@ ENTRY(__strncasecmp) - jne 1f - call __init_cpu_features - 1: --# ifdef HAVE_AVX_SUPPORT -- leaq __strncasecmp_avx(%rip), %rax -- testl $bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip) -- jnz 2f --# endif - leaq __strncasecmp_sse42(%rip), %rax - testl $bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip) - jnz 2f -@@ -152,19 +142,6 @@ weak_alias (__strncasecmp, strncasecmp) - # include "strcmp-sse42.S" - - --# ifdef HAVE_AVX_SUPPORT --# if defined USE_AS_STRCASECMP_L || defined USE_AS_STRNCASECMP_L --# define LABEL(l) .L##l##_avx --# define GLABEL(l) l##_avx --# define USE_AVX 1 --# undef STRCMP_SSE42 --# define STRCMP_SSE42 STRCMP_AVX --# define SECTION avx --# include "strcmp-sse42.S" --# endif --# endif -- -- - # undef ENTRY - # define ENTRY(name) \ - .type STRCMP_SSE2, @function; \ diff --git a/staging/glibc/glibc-2.15-testsuite.patch b/staging/glibc/glibc-2.15-testsuite.patch deleted file mode 100644 index 7eaeaed65..000000000 --- a/staging/glibc/glibc-2.15-testsuite.patch +++ /dev/null @@ -1,110 +0,0 @@ -From d4c2917fc5091dae7ab1b30c165becb70d3c3453 Mon Sep 17 00:00:00 2001 -From: Allan McRae <allan@archlinux.org> -Date: Mon, 16 Apr 2012 14:06:47 +1000 -Subject: [PATCH] Fix test-suite failues with -Wl,--as-needed - -Signed-off-by: Allan McRae <allan@archlinux.org> ---- - ChangeLog | 24 ++++++++++++++++++++++++ - elf/Makefile | 21 ++++++++++++++++++++- - nptl/ChangeLog | 5 +++++ - nptl/Makefile | 3 ++- - stdlib/Makefile | 1 + - 5 files changed, 52 insertions(+), 2 deletions(-) - -diff --git a/elf/Makefile b/elf/Makefile -index 57dcab0..47729c3 100644 ---- a/elf/Makefile -+++ b/elf/Makefile -@@ -500,6 +500,18 @@ $(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb - $(objpfx)tst-initordera4.so: $(objpfx)tst-initordera3.so - $(objpfx)tst-initorder: $(objpfx)tst-initordera4.so $(objpfx)tst-initordera1.so $(objpfx)tst-initorderb2.so - -+LDFLAGS-nodel2mod3.so = $(no-as-needed) -+LDFLAGS-reldepmod5.so = $(no-as-needed) -+LDFLAGS-reldep6mod1.so = $(no-as-needed) -+LDFLAGS-reldep6mod4.so = $(no-as-needed) -+LDFLAGS-reldep8mod3.so = $(no-as-needed) -+LDFLAGS-unload4mod1.so = $(no-as-needed) -+LDFLAGS-unload4mod2.so = $(no-as-needed) -+LDFLAGS-tst-initorder = $(no-as-needed) -+LDFLAGS-tst-initordera2.so = $(no-as-needed) -+LDFLAGS-tst-initordera3.so = $(no-as-needed) -+LDFLAGS-tst-initordera4.so = $(no-as-needed) -+LDFLAGS-tst-initorderb2.so = $(no-as-needed) - LDFLAGS-tst-tlsmod5.so = -nostdlib - LDFLAGS-tst-tlsmod6.so = -nostdlib - -@@ -633,7 +645,7 @@ $(objpfx)vismain.out: $(addprefix $(objpfx),vismod3.so) - vismain-ENV = LD_PRELOAD=$(addprefix $(objpfx),vismod3.so) - - $(objpfx)noload: $(objpfx)testobj1.so $(common-objpfx)dlfcn/libdl.so --LDFLAGS-noload = -rdynamic -+LDFLAGS-noload = -rdynamic $(no-as-needed) - $(objpfx)noload.out: $(objpfx)testobj5.so - - $(objpfx)noload-mem: $(objpfx)noload.out -@@ -678,6 +690,7 @@ $(objpfx)reldep4: $(libdl) - $(objpfx)reldep4.out: $(objpfx)reldep4mod1.so $(objpfx)reldep4mod2.so - - $(objpfx)next: $(objpfx)nextmod1.so $(objpfx)nextmod2.so $(libdl) -+LDFLAGS-next = $(no-as-needed) - - $(objpfx)unload2: $(libdl) - $(objpfx)unload2.out: $(objpfx)unload2mod.so $(objpfx)unload2dep.so -@@ -1025,6 +1038,8 @@ $(objpfx)order2mod1.so: $(objpfx)order2mod4.so - $(objpfx)order2mod4.so: $(objpfx)order2mod3.so - $(objpfx)order2mod2.so: $(objpfx)order2mod3.so - order2mod2.so-no-z-defs = yes -+LDFLAGS-order2mod1.so = $(no-as-needed) -+LDFLAGS-order2mod2.so = $(no-as-needed) - - tst-stackguard1-ARGS = --command "$(built-program-cmd) --child" - tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child" -@@ -1113,6 +1128,10 @@ $(objpfx)tst-initorder2: $(objpfx)tst-initorder2a.so $(objpfx)tst-initorder2d.so - $(objpfx)tst-initorder2a.so: $(objpfx)tst-initorder2b.so - $(objpfx)tst-initorder2b.so: $(objpfx)tst-initorder2c.so - $(objpfx)tst-initorder2c.so: $(objpfx)tst-initorder2d.so -+LDFLAGS-tst-initorder2 = $(no-as-needed) -+LDFLAGS-tst-initorder2a.so = $(no-as-needed) -+LDFLAGS-tst-initorder2b.so = $(no-as-needed) -+LDFLAGS-tst-initorder2c.so = $(no-as-needed) - define o-iterator-doit - $(objpfx)tst-initorder2$o.os: tst-initorder2.c; \ - $$(compile-command.c) -DNAME=\"$o\" -diff --git a/nptl/Makefile b/nptl/Makefile -index 09acd8a..07a1022 100644 ---- a/nptl/Makefile -+++ b/nptl/Makefile -@@ -458,6 +458,7 @@ $(objpfx)tst-tls4: $(libdl) $(shared-thread-library) - $(objpfx)tst-tls4.out: $(objpfx)tst-tls4moda.so $(objpfx)tst-tls4modb.so - - $(objpfx)tst-tls5: $(objpfx)tst-tls5mod.so $(shared-thread-library) -+LDFLAGS-tst-tls5 = $(no-as-needed) - LDFLAGS-tst-tls5mod.so = -Wl,-soname,tst-tls5mod.so - - ifeq ($(build-shared),yes) -@@ -503,7 +504,7 @@ $(objpfx)tst-clock2: $(common-objpfx)rt/librt.a - $(objpfx)tst-rwlock14: $(common-objpfx)rt/librt.a - endif - --LDFLAGS-tst-cancel24 = -lstdc++ -+LDFLAGS-tst-cancel24 = $(no-as-needed) -lstdc++ - - extra-B-pthread.so = -B$(common-objpfx)nptl/ - $(objpfx)libpthread.so: $(addprefix $(objpfx),$(crti-objs) $(crtn-objs)) -diff --git a/stdlib/Makefile b/stdlib/Makefile -index 44eb20d..f7811c5 100644 ---- a/stdlib/Makefile -+++ b/stdlib/Makefile -@@ -138,6 +138,7 @@ $(objpfx)tst-fmtmsg.out: tst-fmtmsg.sh $(objpfx)tst-fmtmsg - $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)stdlib/ - - $(objpfx)tst-putenv: $(objpfx)tst-putenvmod.so -+LDFLAGS-tst-putenv = $(no-as-needed) - - $(objpfx)tst-putenvmod.so: $(objpfx)tst-putenvmod.os - $(build-module) --- -1.7.3.4 - diff --git a/staging/glibc/glibc-2.15-vdso.patch b/staging/glibc/glibc-2.15-vdso.patch deleted file mode 100644 index 7fd394f90..000000000 --- a/staging/glibc/glibc-2.15-vdso.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/elf/Makefile b/elf/Makefile -index 8234ba7..25ffc57 100644 ---- a/elf/Makefile -+++ b/elf/Makefile -@@ -1203,3 +1203,14 @@ $(objpfx)tst-relsort1mod1.so: $(libm) $(objpfx)tst-relsort1mod2.so - $(objpfx)tst-relsort1mod2.so: $(libm) - $(objpfx)tst-relsort1.out: $(objpfx)tst-relsort1mod1.so \ - $(objpfx)tst-relsort1mod2.so -+ -+tests: $(objpfx)tst-unused-dep.out -+ -+$(objpfx)tst-unused-dep.out: $(objpfx)testobj1.so -+ LD_TRACE_LOADED_OBJECTS=1 \ -+ LD_DEBUG=unused \ -+ LD_PRELOAD= \ -+ $(elf-objpfx)${rtld-installed-name} \ -+ --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \ -+ $< > $@ -+ cmp $@ /dev/null > /dev/null -diff --git a/elf/rtld.c b/elf/rtld.c -index 2e4f97f..3e15447 100644 ---- a/elf/rtld.c -+++ b/elf/rtld.c -@@ -1,5 +1,5 @@ - /* Run time dynamic linker. -- Copyright (C) 1995-2010, 2011 Free Software Foundation, Inc. -+ Copyright (C) 1995-2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -1375,6 +1375,9 @@ of this helper program; chances are you did not intend to run this program.\n\ - _dl_setup_hash (l); - l->l_relocated = 1; - -+ /* The vDSO is always used. */ -+ l->l_used = 1; -+ - /* Initialize l_local_scope to contain just this map. This allows - the use of dl_lookup_symbol_x to resolve symbols within the vdso. - So we create a single entry list pointing to l_real as its only diff --git a/staging/glibc/glibc-2.15-vfprintf-nargs.patch b/staging/glibc/glibc-2.15-vfprintf-nargs.patch deleted file mode 100644 index f8dde53f5..000000000 --- a/staging/glibc/glibc-2.15-vfprintf-nargs.patch +++ /dev/null @@ -1,180 +0,0 @@ -diff --git a/stdio-common/Makefile b/stdio-common/Makefile -index a847b28..080badc 100644 ---- a/stdio-common/Makefile -+++ b/stdio-common/Makefile -@@ -59,7 +59,8 @@ tests := tstscanf test_rdwr test-popen tstgetln test-fseek \ - tst-popen tst-unlockedio tst-fmemopen2 tst-put-error tst-fgets \ - tst-fwrite bug16 bug17 tst-swscanf tst-sprintf2 bug18 bug18a \ - bug19 bug19a tst-popen2 scanf13 scanf14 scanf15 bug20 bug21 bug22 \ -- scanf16 scanf17 tst-setvbuf1 tst-grouping bug23 bug24 -+ scanf16 scanf17 tst-setvbuf1 tst-grouping bug23 bug24 \ -+ bug-vfprintf-nargs - - test-srcs = tst-unbputc tst-printf - -diff --git a/stdio-common/bug-vfprintf-nargs.c b/stdio-common/bug-vfprintf-nargs.c -new file mode 100644 -index 0000000..13c66c0 ---- /dev/null -+++ b/stdio-common/bug-vfprintf-nargs.c -@@ -0,0 +1,78 @@ -+/* Test for vfprintf nargs allocation overflow (BZ #13656). -+ Copyright (C) 2012 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ Contributed by Kees Cook <keescook@chromium.org>, 2012. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C 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 -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, write to the Free -+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -+ 02111-1307 USA. */ -+ -+#include <stdio.h> -+#include <stdlib.h> -+#include <stdint.h> -+#include <unistd.h> -+#include <inttypes.h> -+#include <string.h> -+#include <signal.h> -+ -+static int -+format_failed (const char *fmt, const char *expected) -+{ -+ char output[80]; -+ -+ printf ("%s : ", fmt); -+ -+ memset (output, 0, sizeof output); -+ /* Having sprintf itself detect a failure is good. */ -+ if (sprintf (output, fmt, 1, 2, 3, "test") > 0 -+ && strcmp (output, expected) != 0) -+ { -+ printf ("FAIL (output '%s' != expected '%s')\n", output, expected); -+ return 1; -+ } -+ puts ("ok"); -+ return 0; -+} -+ -+static int -+do_test (void) -+{ -+ int rc = 0; -+ char buf[64]; -+ -+ /* Regular positionals work. */ -+ if (format_failed ("%1$d", "1") != 0) -+ rc = 1; -+ -+ /* Regular width positionals work. */ -+ if (format_failed ("%1$*2$d", " 1") != 0) -+ rc = 1; -+ -+ /* Positional arguments are constructed via read_int, so nargs can only -+ overflow on 32-bit systems. On 64-bit systems, it will attempt to -+ allocate a giant amount of memory and possibly crash, which is the -+ expected situation. Since the 64-bit behavior is arch-specific, only -+ test this on 32-bit systems. */ -+ if (sizeof (long int) == 4) -+ { -+ sprintf (buf, "%%1$d %%%" PRIdPTR "$d", UINT32_MAX / sizeof (int)); -+ if (format_failed (buf, "1 %$d") != 0) -+ rc = 1; -+ } -+ -+ return rc; -+} -+ -+#define TEST_FUNCTION do_test () -+#include "../test-skeleton.c" -diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c -index 863cd5d..c802e46 100644 ---- a/stdio-common/vfprintf.c -+++ b/stdio-common/vfprintf.c -@@ -235,6 +235,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) - 0 if unknown. */ - int readonly_format = 0; - -+ /* For the argument descriptions, which may be allocated on the heap. */ -+ void *args_malloced = NULL; -+ - /* This table maps a character into a number representing a - class. In each step there is a destination label for each - class. */ -@@ -1647,9 +1650,10 @@ do_positional: - determine the size of the array needed to store the argument - attributes. */ - size_t nargs = 0; -- int *args_type; -- union printf_arg *args_value = NULL; -+ size_t bytes_per_arg; -+ union printf_arg *args_value; - int *args_size; -+ int *args_type; - - /* Positional parameters refer to arguments directly. This could - also determine the maximum number of arguments. Track the -@@ -1698,13 +1702,38 @@ do_positional: - - /* Determine the number of arguments the format string consumes. */ - nargs = MAX (nargs, max_ref_arg); -+ /* Calculate total size needed to represent a single argument across -+ all three argument-related arrays. */ -+ bytes_per_arg = sizeof (*args_value) + sizeof (*args_size) -+ + sizeof (*args_type); -+ -+ /* Check for potential integer overflow. */ -+ if (__builtin_expect (nargs > SIZE_MAX / bytes_per_arg, 0)) -+ { -+ __set_errno (ERANGE); -+ done = -1; -+ goto all_done; -+ } - -- /* Allocate memory for the argument descriptions. */ -- args_type = alloca (nargs * sizeof (int)); -+ /* Allocate memory for all three argument arrays. */ -+ if (__libc_use_alloca (nargs * bytes_per_arg)) -+ args_value = alloca (nargs * bytes_per_arg); -+ else -+ { -+ args_value = args_malloced = malloc (nargs * bytes_per_arg); -+ if (args_value == NULL) -+ { -+ done = -1; -+ goto all_done; -+ } -+ } -+ -+ /* Set up the remaining two arrays to each point past the end of the -+ prior array, since space for all three has been allocated now. */ -+ args_size = &args_value[nargs].pa_int; -+ args_type = &args_size[nargs]; - memset (args_type, s->_flags2 & _IO_FLAGS2_FORTIFY ? '\xff' : '\0', -- nargs * sizeof (int)); -- args_value = alloca (nargs * sizeof (union printf_arg)); -- args_size = alloca (nargs * sizeof (int)); -+ nargs * sizeof (*args_type)); - - /* XXX Could do sanity check here: If any element in ARGS_TYPE is - still zero after this loop, format is invalid. For now we -@@ -1973,8 +2002,8 @@ do_positional: - } - - all_done: -- if (__builtin_expect (workstart != NULL, 0)) -- free (workstart); -+ free (args_malloced); -+ free (workstart); - /* Unlock the stream. */ - _IO_funlockfile (s); - _IO_cleanup_region_end (0); diff --git a/staging/glibc/glibc-2.16-rpcgen-cpp-path.patch b/staging/glibc/glibc-2.16-rpcgen-cpp-path.patch deleted file mode 100644 index 822b57294..000000000 --- a/staging/glibc/glibc-2.16-rpcgen-cpp-path.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c -index 06d951a..2103b10 100644 ---- a/sunrpc/rpc_main.c -+++ b/sunrpc/rpc_main.c -@@ -75,12 +75,9 @@ struct commandline - - static const char *cmdname; - --#define SVR4_CPP "/usr/ccs/lib/cpp" --#define SUNOS_CPP "/lib/cpp" -- - static const char *svcclosetime = "120"; - static int cppDefined; /* explicit path for C preprocessor */ --static const char *CPP = SUNOS_CPP; -+static const char *CPP = "/lib/cpp"; - static const char CPPFLAGS[] = "-C"; - static char *pathbuf; - static int cpp_pid; -@@ -327,23 +324,17 @@ find_cpp (void) - { - struct stat buf; - -- if (stat (CPP, &buf) < 0) -- { /* /lib/cpp or explicit cpp does not exist */ -- if (cppDefined) -- { -- fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP); -- crash (); -- } -- else -- { /* try the other one */ -- CPP = SVR4_CPP; -- if (stat (CPP, &buf) < 0) -- { /* can't find any cpp */ -- fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout); -- crash (); -- } -- } -+ if (stat (CPP, &buf) == 0) -+ return; -+ -+ if (cppDefined) /* user specified cpp but it does not exist */ -+ { -+ fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP); -+ crash (); - } -+ -+ /* fall back to system CPP */ -+ CPP = "cpp"; - } - - /* -@@ -374,8 +365,13 @@ open_input (const char *infile, const char *define) - close (1); - dup2 (pd[1], 1); - close (pd[0]); -- execv (arglist[0], (char **) arglist); -- perror ("execv"); -+ execvp (arglist[0], (char **) arglist); -+ if (errno == ENOENT) -+ { -+ fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP); -+ exit (1); -+ } -+ perror ("execvp"); - exit (1); - case -1: - perror ("fork"); diff --git a/staging/glibc/glibc-__i686.patch b/staging/glibc/glibc-__i686.patch deleted file mode 100644 index 16f84c536..000000000 --- a/staging/glibc/glibc-__i686.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/nptl/sysdeps/pthread/pt-initfini.c b/nptl/sysdeps/pthread/pt-initfini.c -index 9c00dc0..f5d4df8 100644 ---- a/nptl/sysdeps/pthread/pt-initfini.c -+++ b/nptl/sysdeps/pthread/pt-initfini.c -@@ -45,6 +45,11 @@ - /* Embed an #include to pull in the alignment and .end directives. */ - asm ("\n#include \"defs.h\""); - -+asm ("\n#if defined __i686 && defined __ASSEMBLER__"); -+asm ("\n#undef __i686"); -+asm ("\n#define __i686 __i686"); -+asm ("\n#endif"); -+ - /* The initial common code ends here. */ - asm ("\n/*@HEADER_ENDS*/"); - -diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h -index 64ef400..726b1df 100644 ---- a/sysdeps/unix/sysv/linux/i386/sysdep.h -+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h -@@ -29,6 +29,10 @@ - #include <dl-sysdep.h> - #include <tls.h> - -+#if defined __i686 && defined __ASSEMBLER__ -+#undef __i686 -+#define __i686 __i686 -+#endif - - /* For Linux we can use the system call table in the header file - /usr/include/asm/unistd.h diff --git a/staging/glibc/glibc.install b/staging/glibc/glibc.install deleted file mode 100644 index 7f85ade96..000000000 --- a/staging/glibc/glibc.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11}) - -post_upgrade() { - sbin/ldconfig -r . - [ -x sbin/init ] && sbin/init u - usr/sbin/locale-gen - - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/staging/glibc/locale-gen b/staging/glibc/locale-gen deleted file mode 100755 index 5aff344c4..000000000 --- a/staging/glibc/locale-gen +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -set -e - -LOCALEGEN=/etc/locale.gen -LOCALES=/usr/share/i18n/locales -if [ -n "$POSIXLY_CORRECT" ]; then - unset POSIXLY_CORRECT -fi - - -[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0; - -# Remove all old locale dir and locale-archive before generating new -# locale data. -rm -rf /usr/lib/locale/* || true - -umask 022 - -is_entry_ok() { - if [ -n "$locale" -a -n "$charset" ] ; then - true - else - echo "error: Bad entry '$locale $charset'" - false - fi -} - -echo "Generating locales..." -while read locale charset; do \ - case $locale in \#*) continue;; "") continue;; esac; \ - is_entry_ok || continue - echo -n " `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \ - echo -n ".$charset"; \ - echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \ - echo -n '...'; \ - if [ -f $LOCALES/$locale ]; then input=$locale; else \ - input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \ - localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \ - echo ' done'; \ -done < $LOCALEGEN -echo "Generation complete." diff --git a/staging/glibc/locale.gen.txt b/staging/glibc/locale.gen.txt deleted file mode 100644 index ccdd81734..000000000 --- a/staging/glibc/locale.gen.txt +++ /dev/null @@ -1,23 +0,0 @@ -# Configuration file for locale-gen -# -# lists of locales that are to be generated by the locale-gen command. -# -# Each line is of the form: -# -# <locale> <charset> -# -# where <locale> is one of the locales given in /usr/share/i18n/locales -# and <charset> is one of the character sets listed in /usr/share/i18n/charmaps -# -# Examples: -# en_US ISO-8859-1 -# en_US.UTF-8 UTF-8 -# de_DE ISO-8859-1 -# de_DE@euro ISO-8859-15 -# -# The locale-gen command will generate all the locales, -# placing them in /usr/lib/locale. -# -# A list of supported locales is included in this file. -# Uncomment the ones you need. -# diff --git a/staging/glibc/nscd.rcd b/staging/glibc/nscd.rcd deleted file mode 100755 index 4b48ab002..000000000 --- a/staging/glibc/nscd.rcd +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash - -daemon_name="nscd" - -. /etc/rc.conf -. /etc/rc.d/functions - - -get_pid() { - pidof -o %PPID $daemon_name -} - -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - PID=$(get_pid) - if [[ -z $PID ]]; then - rm -f /run/$daemon_name.pid - mkdir -p /run/nscd /var/db/nscd - rm -f /run/nscd/* /var/db/nscd/* - $daemon_name - if (( $? > 0 )); then - stat_fail - exit 1 - else - echo $(get_pid) > /var/run/$daemon_name.pid - add_daemon $daemon_name - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $daemon_name daemon" - PID=$(get_pid) - [[ -n $PID ]] && nscd --shutdown &> /dev/null - if (( $? > 0 )); then - stat_fail - exit 1 - else - rm -f /run/$daemon_name.pid &> /dev/null - rm_daemon $daemon_name - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" -esac - -exit 0 diff --git a/staging/glibc/nscd.service b/staging/glibc/nscd.service deleted file mode 100644 index de5315e9b..000000000 --- a/staging/glibc/nscd.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Name Service Cache Daemon -After=syslog.target - -[Service] -Type=forking -ExecStart=/usr/sbin/nscd -ExecStop=/usr/sbin/nscd --shutdown -ExecReload=/usr/sbin/nscd -i passwd -ExecReload=/usr/sbin/nscd -i group -ExecReload=/usr/sbin/nscd -i hosts -ExecReload=/usr/sbin/nscd -i service -Restart=always -PIDFile=/run/nscd/nscd.pid - -[Install] -WantedBy=multi-user.target diff --git a/staging/glibc/nscd.tmpfiles b/staging/glibc/nscd.tmpfiles deleted file mode 100644 index 8a24a785e..000000000 --- a/staging/glibc/nscd.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/nscd 0755 root root diff --git a/staging/glu/PKGBUILD b/staging/glu/PKGBUILD deleted file mode 100644 index 1aadbccb1..000000000 --- a/staging/glu/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 166931 2012-09-22 12:55:01Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: Laurent Carlier <lordheavym@gmail.com> - -pkgname=glu -pkgver=9.0.0 -pkgrel=1 -pkgdesc="Mesa OpenGL Utility library" -arch=('i686' 'x86_64') -url="http://cgit.freedesktop.org/mesa/glu/" -license=('LGPL') -depends=('libgl') -makedepends=('mesa') -options=('!libtool') -source=(ftp://ftp.freedesktop.org/pub/mesa/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --disable-static - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - make -k check -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install -} diff --git a/staging/gnome-color-manager/PKGBUILD b/staging/gnome-color-manager/PKGBUILD deleted file mode 100644 index eb07f67d8..000000000 --- a/staging/gnome-color-manager/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 164427 2012-08-01 05:12:33Z eric $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -pkgname=gnome-color-manager -pkgver=3.4.2 -pkgrel=2 -pkgdesc="Color profile manager for the GNOME desktop" -arch=(i686 x86_64) -url="http://projects.gnome.org/gnome-color-manager/" -license=(GPL2) -depends=('libcanberra' 'vte3' 'exiv2' 'hicolor-icon-theme' 'desktop-file-utils' 'clutter-gtk' - 'mash' 'shared-color-profiles' 'shared-color-targets' 'gnome-desktop') -makedepends=('intltool' 'gtk-doc') -install=gnome-color-manager.install -options=('!libtool' '!emptydirs') -groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('ad69ac0ac242be0ad5b7966e0c2978a9a1440e52ee816993e4a8eb2cf6f0c922') - -build(){ - cd $pkgname-$pkgver - - # man pages need docbook-sgml, which we don't have - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/gnome-color-manager --disable-static --disable-man-pages - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/staging/gnome-color-manager/gnome-color-manager.install b/staging/gnome-color-manager/gnome-color-manager.install deleted file mode 100644 index 04fda0ddc..000000000 --- a/staging/gnome-color-manager/gnome-color-manager.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall gnome-color-manager - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/gnome-python-desktop/PKGBUILD b/staging/gnome-python-desktop/PKGBUILD deleted file mode 100644 index 4788632d1..000000000 --- a/staging/gnome-python-desktop/PKGBUILD +++ /dev/null @@ -1,107 +0,0 @@ -# $Id: PKGBUILD 168784 2012-10-16 00:01:27Z allan $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Arjan Timmerman <arjan@soulfly.nl> -# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> - -pkgbase=gnome-python-desktop -pkgname=('gnome-python-desktop' 'python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck') -pkgver=2.32.0 -pkgrel=11 -arch=(i686 x86_64) -license=('GPL' 'LGPL') -options=('!libtool') -makedepends=('intltool' 'pkg-config' 'gnome-python' 'libgtop' 'totem-plparser' 'gnome-desktop2' 'metacity' 'librsvg' 'libwnck') -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2 - gnome-python-desktop-2.32.0-metacity-build.patch) -sha256sums=('09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9' - 'f012f9bd2f9baa527f07ad2f6e312c875bb6f2d3204270a1b053278a3a0c86b3') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - patch -p1 -i ../gnome-python-desktop-2.32.0-metacity-build.patch - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --enable-metacity - make -} - -package_gnome-python-desktop() { - depends=('python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck' 'gnome2-python') - pkgdesc="Python bindings for the GNOME desktop environment" - - cd "${srcdir}/${pkgbase}-${pkgver}" - make install-pkgconfigDATA DESTDIR="${pkgdir}" -} - -package_python2-gnomedesktop() { - depends=('pygtk' 'gnome-desktop2' 'python2-gnomevfs') - pkgdesc="Python bindings for gnome-desktop 2.x" - conflicts=('python-gnomedesktop<=2.32.0-10') - replaces=('python-gnomedesktop<=2.32.0-10') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C gnomedesktop install DESTDIR="${pkgdir}" -} - -package_python2-gnomekeyring() { - depends=('pygtk' 'libgnome-keyring') - pkgdesc="Python bindings for libgnome-keyring" - conflicts=('python-gnomekeyring<=2.32.0-10') - replaces=('python-gnomekeyring<=2.32.0-10') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C gnomekeyring install DESTDIR="${pkgdir}" -} - -package_python2-gtop() { - depends=('pygtk' 'libgtop') - pkgdesc="Python bindings for libgtop" - conflicts=('python-gtop<=2.32.0-10') - replaces=('python-gtop<=2.32.0-10') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C gtop install DESTDIR="${pkgdir}" -} - -package_python2-metacity() { - depends=('pygtk' 'metacity') - pkgdesc="Python bindings for metacity" - conflicts=('python-metacity<=2.32.0-10') - replaces=('python-metacity<=2.32.0-10') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C metacity install DESTDIR="${pkgdir}" -} - -package_python2-rsvg() { - depends=('pygtk' 'librsvg') - pkgdesc="Python bindings for librsvg" - conflicts=('python-rsvg<=2.32.0-10') - replaces=('python-rsvg<=2.32.0-10') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C rsvg install DESTDIR="${pkgdir}" - install -m755 -d "${pkgdir}/usr/share/pygtk/2.0/defs" - install -m644 rsvg/rsvg.defs "${pkgdir}/usr/share/pygtk/2.0/defs/" -} - -package_python2-totem-plparser() { - depends=('pygtk' 'totem-plparser' 'python2-gnomevfs') - pkgdesc="Python bindings for totem-plparser" - conflicts=('python-totem-plparser<=2.32.0-10') - replaces=('python-totem-plparser<=2.32.0-10') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C totem install DESTDIR="${pkgdir}" - install -m755 -d "${pkgdir}/usr/share/pygtk/2.0/defs" - install -m644 totem/plparser.defs "${pkgdir}/usr/share/pygtk/2.0/defs/" -} - -package_python2-wnck() { - depends=('pygtk' 'libwnck') - pkgdesc="Python bindings for libwnck" - conflicts=('python-wnck<=2.32.0-10') - replaces=('python-wnck<=2.32.0-10') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C wnck install DESTDIR="${pkgdir}" -} diff --git a/staging/gnome-python-desktop/gnome-python-desktop-2.32.0-metacity-build.patch b/staging/gnome-python-desktop/gnome-python-desktop-2.32.0-metacity-build.patch deleted file mode 100644 index 5054dd2bd..000000000 --- a/staging/gnome-python-desktop/gnome-python-desktop-2.32.0-metacity-build.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Daniel Drake <dsd@laptop.org> - -Fix build against metacity-2.34.2. The port to GSettings -removed these constants from the codebase. - -Index: gnome-python-desktop-2.32.0/metacity/metacity.defs -=================================================================== ---- gnome-python-desktop-2.32.0.orig/metacity/metacity.defs -+++ gnome-python-desktop-2.32.0/metacity/metacity.defs -@@ -120,32 +120,6 @@ - ) - ) - --(define-enum FocusMode -- (in-module "Meta") -- (c-name "MetaFocusMode") --; (gtype-id "META_TYPE_FOCUS_MODE") -- (values -- '("click" "META_FOCUS_MODE_CLICK") -- '("sloppy" "META_FOCUS_MODE_SLOPPY") -- '("mouse" "META_FOCUS_MODE_MOUSE") -- ) --) -- --(define-enum ActionTitlebar -- (in-module "Meta") -- (c-name "MetaActionTitlebar") --; (gtype-id "META_TYPE_ACTION_TITLEBAR") -- (values -- '("toggle-shade" "META_ACTION_TITLEBAR_TOGGLE_SHADE") -- '("toggle-maximize" "META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE") -- '("minimize" "META_ACTION_TITLEBAR_MINIMIZE") -- '("none" "META_ACTION_TITLEBAR_NONE") -- '("lower" "META_ACTION_TITLEBAR_LOWER") -- '("menu" "META_ACTION_TITLEBAR_MENU") -- '("last" "META_ACTION_TITLEBAR_LAST") -- ) --) -- - (define-enum FrameType - (in-module "Meta") - (c-name "MetaFrameType") diff --git a/staging/gnucash/PKGBUILD b/staging/gnucash/PKGBUILD deleted file mode 100644 index 829e4439e..000000000 --- a/staging/gnucash/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 165077 2012-08-10 00:52:20Z eric $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> -# Contributor: Mark Schneider <queueRAM@gmail.com> - -pkgname=gnucash -pkgver=2.4.11 -pkgrel=1 -pkgdesc="A personal and small-business financial-accounting application" -arch=('i686' 'x86_64') -url="http://www.gnucash.org" -license=("GPL") -depends=('gtkhtml' 'slib' 'goffice' 'libgnomeui' 'libdbi-drivers' 'aqbanking' 'desktop-file-utils') -makedepends=('intltool') -optdepends=('evince: for print preview' - 'perl-finance-quote: for stock information lookups' - 'perl-date-manip: for stock information lookups') -options=('!libtool' '!makeflags' '!emptydirs') -install=gnucash.install -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('c157ad7ea0960c71966f5071acd9018580ece538') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc \ - --libexecdir=/usr/lib --disable-schemas-install --enable-ofx --enable-aqbanking - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - cd src/doc/design - make DESTDIR="${pkgdir}" install-info - - install -dm755 "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnucash "${pkgdir}"/etc/gconf/schemas/*.schemas - rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas -} diff --git a/staging/gnucash/gnucash.install b/staging/gnucash/gnucash.install deleted file mode 100644 index d6a48c31b..000000000 --- a/staging/gnucash/gnucash.install +++ /dev/null @@ -1,34 +0,0 @@ -pkgname=gnucash -info_dir=usr/share/info -info_files=(gnucash-design.info) - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -post_remove() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/staging/gpsd/PKGBUILD b/staging/gpsd/PKGBUILD deleted file mode 100644 index 0bdb7e748..000000000 --- a/staging/gpsd/PKGBUILD +++ /dev/null @@ -1,83 +0,0 @@ -# $Id: PKGBUILD 161333 2012-06-09 19:56:32Z tomegun $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Giacomo Rizzo <alt@free-os.it> - -pkgname=gpsd -pkgver=3.6 -pkgrel=1 -pkgdesc="GPS daemon and library to support USB/serial GPS devices" -arch=('i686' 'x86_64') -url="http://catb.org/gpsd/" -license=('BSD') -depends=('python2' 'libusb' 'bluez' 'desktop-file-utils') -optdepends=('php: generate a PHP status page for your GPS' - 'php-gd: image support for the PHP status page' - 'pygtk: GUI frontends') -makedepends=('scons' 'docbook-xsl' 'chrpath') -backup=('etc/conf.d/gpsd') -options=('!libtool') -install="${pkgname}.install" -source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} - 'gpsd' 'gpsd.conf.d') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # fix python 2.7 path - sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ - -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ - $(find . -name '*.py') - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gegps \ - gpscat gpsfake gpsprof xgps xgpsspeed - - scons prefix=/usr \ - systemd=yes \ - libQgpsmm=no \ - PYTHONPATH=/usr/bin/python2 - scons build -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Fix man pages path (FS#21715) - sed -i 's|.so gps.1|.so man1/gps.1|' cgps.1 lcdgps.1 xgps.1 xgpsspeed.1 - - export DESTDIR="${pkgdir}" - scons install - - install -D -m644 "${srcdir}/gpsd.conf.d" "${pkgdir}/etc/conf.d/gpsd" - - sed -i 's|/lib/udev/gpsd|/usr/lib/udev/gpsd|' gpsd.rules - - install -D -m644 "gpsd.rules" "${pkgdir}/usr/lib/udev/rules.d/99-gpsd-usb.rules" - - sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug - install -D -m755 gpsd.hotplug "${pkgdir}/usr/lib/udev/gpsd.hotplug" - - # GPSD needs RPATH - chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/libgps{,d}.so.20.0.0 - chrpath -r /usr/lib/ "${pkgdir}"/usr/bin/{gpsdecode,gpsctl,gpspipe,gpxlogger,lcdgps} - chrpath -r /usr/lib/ "${pkgdir}"/usr/sbin/{gpsd,gpsdctl} - chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python2.7/site-packages/gps/{clienthelpers,packet}.so - - install -D -m644 packaging/X11/xgps.desktop \ - "${pkgdir}/usr/share/applications/xgps.desktop" - install -D -m644 packaging/X11/xgpsspeed.desktop \ - "${pkgdir}/usr/share/applications/xgpsspeed.desktop" - install -D -m644 packaging/X11/gpsd-logo.png \ - "${pkgdir}/usr/share/gpsd/gpsd-logo.png" - - install -D -m755 "${srcdir}/gpsd" "${pkgdir}/etc/rc.d/gpsd" - - install -D -m644 systemd/gpsd.service "${pkgdir}/usr/lib/systemd/system/gpsd.service" - install -D -m644 systemd/gpsd.socket "${pkgdir}/usr/lib/systemd/system/gpsd.socket" - - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} -md5sums=('064a5ad75593f8c3ea3fe85010647832' - '6473da46f6bad52d38f88670f84cd92b' - '6602d04bb037bc500424f00f24f58837' - '3e963df3f9f7ef3572ecc648ae829315') diff --git a/staging/gpsd/gpsd b/staging/gpsd/gpsd deleted file mode 100755 index 2ca7efe26..000000000 --- a/staging/gpsd/gpsd +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/gpsd ] && . /etc/conf.d/gpsd - -NAME=gpsd -DAEMON=/usr/sbin/gpsd -PIDFILE=/run/gpsd.pid -PID=$(cat $PIDFILE 2>/dev/null) - -case "$1" in - start) - stat_busy "Starting gpsd" - [ -z "$PID" ] && "$DAEMON" -P $PIDFILE -F /run/gpsd.sock ${GPSD_OPTIONS} ${DEVICES} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon $NAME - stat_done - fi - ;; - stop) - stat_busy "Stopping $NAME" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f $PIDFILE &>/dev/null - rm_daemon $NAME - stat_done - fi - ;; - - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/staging/gpsd/gpsd.conf.d b/staging/gpsd/gpsd.conf.d deleted file mode 100644 index 9fef72cb9..000000000 --- a/staging/gpsd/gpsd.conf.d +++ /dev/null @@ -1,5 +0,0 @@ -# Default settings for gpsd. -START_DAEMON="true" -GPSD_OPTIONS="" -DEVICES="" -USBAUTO="true" diff --git a/staging/gpsd/gpsd.install b/staging/gpsd/gpsd.install deleted file mode 100644 index 8f20cf484..000000000 --- a/staging/gpsd/gpsd.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/staging/gstreamer0.10-ugly/PKGBUILD b/staging/gstreamer0.10-ugly/PKGBUILD deleted file mode 100644 index a93aea115..000000000 --- a/staging/gstreamer0.10-ugly/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 160680 2012-06-03 16:55:40Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=gstreamer0.10-ugly -pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') -pkgver=0.10.19 -pkgrel=2 -arch=('i686' 'x86_64') -license=('LGPL') -makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') -url="http://gstreamer.freedesktop.org/" -options=(!libtool) -source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.xz - opencore-amr.patch) -md5sums=('ba26045c8c8c91f0d48d327ccf53ac0c' - 'd8feb6c99bfaff8be6b2c48ea4e98e47') - -build() { - cd "${srcdir}/gst-plugins-ugly-${pkgver}" - patch -Np0 -i "${srcdir}/opencore-amr.patch" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental \ - --with-package-name="GStreamer Ugly Plugins (Archlinux)" \ - --with-package-origin="http://www.archlinux.org/" - make - sed -e 's/gst-libs gst ext/gst-libs gst/' -i Makefile -} - -check() { - cd "${srcdir}/gst-plugins-ugly-${pkgver}" - make check -} - -package_gstreamer0.10-ugly() { - pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries" - depends=('gstreamer0.10-base>=0.10.34') - - cd "${srcdir}/gst-plugins-ugly-${pkgver}" - make DESTDIR="${pkgdir}" install -} - -package_gstreamer0.10-ugly-plugins() { - pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)" - depends=("gstreamer0.10-ugly=${pkgver}" 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') - groups=('gstreamer0.10-plugins') - replaces=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec') - conflicts=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec') - - cd "${srcdir}/gst-plugins-ugly-${pkgver}" - make -C ext DESTDIR="${pkgdir}" install -} diff --git a/staging/gstreamer0.10-ugly/opencore-amr.patch b/staging/gstreamer0.10-ugly/opencore-amr.patch deleted file mode 100644 index 0a350dc46..000000000 --- a/staging/gstreamer0.10-ugly/opencore-amr.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- ext/amrnb/amrnbdec.h.orig 2012-03-12 16:49:14.417405139 +0000 -+++ ext/amrnb/amrnbdec.h 2012-03-12 16:49:35.393899419 +0000 -@@ -22,7 +22,7 @@ - - #include <gst/gst.h> - #include <gst/audio/gstaudiodecoder.h> --#include <interf_dec.h> -+#include <opencore-amrnb/interf_dec.h> - - G_BEGIN_DECLS - ---- ext/amrnb/amrnbenc.h.orig 2012-03-12 16:49:23.833996062 +0000 -+++ ext/amrnb/amrnbenc.h 2012-03-12 16:49:46.597141876 +0000 -@@ -21,7 +21,7 @@ - #define __GST_AMRNBENC_H__ - - #include <gst/gst.h> --#include <interf_enc.h> -+#include <opencore-amrnb/interf_enc.h> - #include <gst/audio/gstaudioencoder.h> - - G_BEGIN_DECLS ---- ext/amrwbdec/amrwbdec.h.orig 2012-03-12 16:47:48.658100992 +0000 -+++ ext/amrwbdec/amrwbdec.h 2012-03-12 16:48:12.177910733 +0000 -@@ -22,8 +22,8 @@ - - #include <gst/gst.h> - #include <gst/audio/gstaudiodecoder.h> --#include <dec_if.h> --#include <if_rom.h> -+#include <opencore-amrwb/dec_if.h> -+#include <opencore-amrwb/if_rom.h> - - G_BEGIN_DECLS - diff --git a/staging/gthumb/PKGBUILD b/staging/gthumb/PKGBUILD deleted file mode 100644 index 1dce3cd09..000000000 --- a/staging/gthumb/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 164309 2012-07-30 03:08:17Z eric $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: Tobias Kieslich <tobias@justdreams.de> - -pkgname=gthumb -pkgver=3.0.1 -pkgrel=2 -pkgdesc="Image browser and viewer for the GNOME Desktop" -arch=(i686 x86_64) -license=('GPL') -url="http://live.gnome.org/gthumb" -depends=('desktop-file-utils' 'hicolor-icon-theme' 'dconf' 'librsvg' 'clutter-gtk' - 'gstreamer0.10-base' 'gsettings-desktop-schemas') -makedepends=('intltool' 'gnome-doc-utils' 'libchamplain' 'libopenraw' 'exiv2' 'libsoup-gnome' - 'brasero' 'librsvg' 'libopenraw' 'liboauth') -optdepends=('libopenraw: read RAW files' - 'exiv2: metadata support' - 'libchamplain: map viewer' - 'brasero: burn discs' - 'libsoup-gnome: web albums' - 'liboauth: web albums') -options=('!libtool' '!emptydirs') -install=gthumb.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('1fb2939e4896a012c7d0320a31e3c6139214218e9f6ec39c6370febeda94725c') - -build() { - cd $pkgname-$pkgver - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --enable-libchamplain --enable-libopenraw - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/staging/gthumb/gthumb.install b/staging/gthumb/gthumb.install deleted file mode 100644 index 9d4e7822f..000000000 --- a/staging/gthumb/gthumb.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.1) < 0 )); then - gconfpkg --uninstall gthumb - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/haskell-http/PKGBUILD b/staging/haskell-http/PKGBUILD deleted file mode 100644 index 5eb7da013..000000000 --- a/staging/haskell-http/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 - -_hkgname=HTTP -pkgname=haskell-http -pkgver=4000.2.4 -pkgrel=1 -pkgdesc="A library for client-side HTTP" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' 'sh' 'haskell-network=2.3.1.0-1' 'haskell-parsec=3.1.3-1' 'haskell-mtl=2.1.2-1') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('5edcd9fd16a9cb72a140a29442d514b7') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/staging/haskell-http/haskell-http.install b/staging/haskell-http/haskell-http.install deleted file mode 100644 index fdebb1cb8..000000000 --- a/staging/haskell-http/haskell-http.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-http -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/staging/haskell-mtl/PKGBUILD b/staging/haskell-mtl/PKGBUILD deleted file mode 100644 index f1fa7c286..000000000 --- a/staging/haskell-mtl/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -_hkgname=mtl -pkgname=haskell-mtl -pkgver=2.1.2 -pkgrel=1 -pkgdesc="Monad transformer library" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' 'sh' 'haskell-transformers=0.3.0.0-2') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('943c110524d96126bfa0e61f7df1ebcd') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/staging/haskell-mtl/haskell-mtl.install b/staging/haskell-mtl/haskell-mtl.install deleted file mode 100644 index 9325811e8..000000000 --- a/staging/haskell-mtl/haskell-mtl.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-mtl -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/staging/haskell-network/PKGBUILD b/staging/haskell-network/PKGBUILD deleted file mode 100644 index 7f5d13fc1..000000000 --- a/staging/haskell-network/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 - -_hkgname=network -pkgname=haskell-network -pkgver=2.3.1.0 -pkgrel=1 -pkgdesc="Networking-related facilities" -url="http://hackage.haskell.org/package/network" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' 'sh' 'haskell-parsec=3.1.3-1') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('d824db8fc068cab60fa178ab330a57a2') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/staging/haskell-network/haskell-network.install b/staging/haskell-network/haskell-network.install deleted file mode 100644 index a56c31d0a..000000000 --- a/staging/haskell-network/haskell-network.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-network -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/staging/haskell-parsec/PKGBUILD b/staging/haskell-parsec/PKGBUILD deleted file mode 100644 index 9c7c1aafb..000000000 --- a/staging/haskell-parsec/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# As generated by cabal2arch 0.7.6 - -_hkgname=parsec -pkgname=haskell-parsec -pkgver=3.1.3 -pkgrel=1 -pkgdesc="Monadic parser combinators" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' 'sh' 'haskell-mtl=2.1.2-1' 'haskell-text=0.11.2.3-1') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('d72fc94b81153132c61125a1ec52a4a5') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/staging/haskell-parsec/haskell-parsec.install b/staging/haskell-parsec/haskell-parsec.install deleted file mode 100644 index dfa0701b9..000000000 --- a/staging/haskell-parsec/haskell-parsec.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-parsec -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/staging/haskell-random/PKGBUILD b/staging/haskell-random/PKGBUILD deleted file mode 100644 index 07cc5e2c2..000000000 --- a/staging/haskell-random/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> - -_hkgname=random -pkgname=haskell-random -pkgver=1.0.1.1 -pkgrel=3 -pkgdesc="A basic random number generation library" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' 'sh') -source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") -install=${pkgname}.install -md5sums=('9a249cfa7ff6793cbf2be06e9fcd7538') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} - diff --git a/staging/haskell-random/haskell-random.install b/staging/haskell-random/haskell-random.install deleted file mode 100644 index b6d807e1a..000000000 --- a/staging/haskell-random/haskell-random.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-random -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/staging/haskell-text/PKGBUILD b/staging/haskell-text/PKGBUILD deleted file mode 100644 index 5a23030d5..000000000 --- a/staging/haskell-text/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -_hkgname=text -pkgname=haskell-text -pkgver=0.11.2.3 -pkgrel=1 -pkgdesc="An efficient packed Unicode text type." -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' 'sh') -source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") -install=${pkgname}.install -md5sums=('7a469d49a7576fb3a18785cb64d4ee6c') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/staging/haskell-text/haskell-text.install b/staging/haskell-text/haskell-text.install deleted file mode 100644 index 620db3921..000000000 --- a/staging/haskell-text/haskell-text.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-text -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/staging/haskell-transformers/PKGBUILD b/staging/haskell-transformers/PKGBUILD deleted file mode 100644 index 51822a8ad..000000000 --- a/staging/haskell-transformers/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 166465 2012-09-08 07:26:25Z tdziedzic $ - -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Contributor: Rémy Oudompheng <remy@archlinux.org> - -_hkgname=transformers -pkgname=haskell-transformers -pkgver=0.3.0.0 -pkgrel=2 -pkgdesc="Concrete functor and monad transformers" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' 'sh') -source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz") -install=${pkgname}.install -md5sums=('852dc0b79cc2bcb39136287d3dd385e5') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/staging/haskell-transformers/haskell-transformers.install b/staging/haskell-transformers/haskell-transformers.install deleted file mode 100644 index eec2af6e1..000000000 --- a/staging/haskell-transformers/haskell-transformers.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-transformers -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/staging/haskell-zlib/PKGBUILD b/staging/haskell-zlib/PKGBUILD deleted file mode 100644 index 30834b3c1..000000000 --- a/staging/haskell-zlib/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package originally generated by cabal2arch 0.7.6 - -_hkgname=zlib -pkgname=haskell-zlib -pkgver=0.5.3.3 -pkgrel=5 -pkgdesc="Compression and decompression in the gzip and zlib formats" -url="http://hackage.haskell.org/package/zlib" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' 'zlib' 'sh') -source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") -install=${pkgname}.install -md5sums=('1649e56d13ce2c6a6a9210227401dbbc') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - - # ghc 7.6 includes bytestring 0.10 - sed 's/bytestring == 0.9.*/bytestring == 0.10.*/' -i zlib.cabal - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/staging/haskell-zlib/haskell-zlib.install b/staging/haskell-zlib/haskell-zlib.install deleted file mode 100644 index d387b7b65..000000000 --- a/staging/haskell-zlib/haskell-zlib.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-zlib -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/staging/hugin/PKGBUILD b/staging/hugin/PKGBUILD deleted file mode 100644 index ce710b619..000000000 --- a/staging/hugin/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 169361 2012-10-20 05:11:16Z eric $ -# Maintainer: Tobias Kieslich <tobias@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Dominik Ryba <domryba@post.pl> - -pkgname=hugin -pkgver=2011.4.0 -pkgrel=7 -pkgdesc="A frontend to the panorama-tools" -arch=('i686' 'x86_64') -url="http://hugin.sourceforge.net/" -license=('GPL') -depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c' - 'lapack' 'desktop-file-utils' 'make' 'perl-image-exiftool') -makedepends=('zip' 'cmake' 'boost' 'tclap' 'mesa') -install=hugin.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - gcc47.patch) -sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b' - 'aa0fc9425bd7a4b5e270412f4ca72258fac77298') - -build() { - cd "${srcdir}" - patch -Np0 -i gcc47.patch - mkdir build - cd build - export CXXFLAGS+=" -fpermissive" - 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/gcc47.patch b/staging/hugin/gcc47.patch deleted file mode 100644 index 3814b871c..000000000 --- a/staging/hugin/gcc47.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur hugin-2011.4.0.orig/src/celeste/Utilities.cpp hugin-2011.4.0/src/celeste/Utilities.cpp ---- hugin-2011.4.0.orig/src/celeste/Utilities.cpp 2012-07-08 15:18:16.864454043 +0000 -+++ hugin-2011.4.0/src/celeste/Utilities.cpp 2012-07-08 15:18:20.341089422 +0000 -@@ -27,6 +27,7 @@ - - #include <math.h> - #include <stdlib.h> -+#include <unistd.h> - #include "Utilities.h" - - using namespace std; 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/ifuse/PKGBUILD b/staging/ifuse/PKGBUILD deleted file mode 100644 index 6ee370576..000000000 --- a/staging/ifuse/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 74529 2012-07-29 23:09:58Z tomegun $ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Gabriel Martinez < reitaka at gmail dot com > - -pkgname=ifuse -pkgver=1.1.2 -pkgrel=2 -pkgdesc='A fuse filesystem to access the contents of an iPhone or iPod Touch' -url='http://libimobiledevice.org/' -arch=('i686' 'x86_64') -license=('LGPL2.1') -depends=('libimobiledevice' 'fuse') -source=("http://www.libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2") -md5sums=('4152526b2ac3c505cb41797d997be14d') - -build() { - cd "${pkgname}-${pkgver}" - - ./configure --prefix=/usr - make -} - -package() { - cd "${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/ilmbase/PKGBUILD b/staging/ilmbase/PKGBUILD deleted file mode 100644 index fe1618f48..000000000 --- a/staging/ilmbase/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=ilmbase -pkgver=1.0.3 -pkgrel=1 -depends=('gcc-libs') -pkgdesc="Base libraries from ILM for OpenEXR" -arch=(i686 x86_64) -url="http://www.openexr.com" -license=('custom') -options=('!libtool') -source=(https://github.com/downloads/openexr/openexr/$pkgname-$pkgver.tar.gz - ilmbase-IexMath.patch) -md5sums=('d99962ec7e2bfac0647aaabf6b91d5de' - '9c8efaf15f60bccf79749ec879657962') - -build() { - cd "${srcdir}/$pkgname-$pkgver" - patch -p0 -i "${srcdir}/ilmbase-IexMath.patch" - ./configure --prefix=/usr - make -} - -check() { - cd "${srcdir}/$pkgname-$pkgver" - # one of the tests fails randomly for an unknown reason - make check || true -} - -package() { - cd "${srcdir}/$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install - install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" -} diff --git a/staging/ilmbase/ilmbase-IexMath.patch b/staging/ilmbase/ilmbase-IexMath.patch deleted file mode 100644 index 546034966..000000000 --- a/staging/ilmbase/ilmbase-IexMath.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- IexMath/IexMathFpu.cpp.orig 2012-07-26 20:51:55.000000000 +0200 -+++ IexMath/IexMathFpu.cpp 2012-10-04 15:30:47.000000000 +0200 -@@ -27,8 +27,7 @@ - #endif - - --#ifdef HAVE_UCONTEXT_H -- -+#if defined(HAVE_UCONTEXT_H) && (defined(x86_64) || defined(i386_)) - - #include <ucontext.h> - #include <signal.h> diff --git a/staging/imagemagick/PKGBUILD b/staging/imagemagick/PKGBUILD deleted file mode 100644 index 04ce425a9..000000000 --- a/staging/imagemagick/PKGBUILD +++ /dev/null @@ -1,82 +0,0 @@ -# $Id: PKGBUILD 169345 2012-10-20 00:21:55Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgbase=imagemagick -pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.0.1 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://www.imagemagick.org/" -license=('custom') -makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ - 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr') -source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ - perlmagick.rpath.patch) -sha1sums=('47926535dd68b38f5ae8a01e470cebf671018831' - '23405f80904b1de94ebd7bd6fe2a332471b8c283') - -build() { - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - - sed '/AC_PATH_XTRA/d' -i configure.ac - autoreconf --force --install - patch -p0 -i ../perlmagick.rpath.patch - - ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ - --disable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \ - --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ - --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \ - --without-gvc --without-djvu --without-autotrace --without-webp \ - --without-jbig --without-fpx --without-dps --without-fftw - make -} - -check() { - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} -# make check -} - -package_imagemagick() { - pkgdesc="An image viewing/manipulation program" - depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr') - optdepends=('ghostscript: for Ghostscript support' - 'openexr: for OpenEXR support' - 'libwmf: for WMF support' - 'librsvg: for SVG support' - 'libxml2: for XML support' - 'jasper: for JPEG-2000 support' - 'libpng: for PNG support') - backup=('etc/ImageMagick/coder.xml' - 'etc/ImageMagick/colors.xml' - 'etc/ImageMagick/delegates.xml' - 'etc/ImageMagick/log.xml' - 'etc/ImageMagick/magic.xml' - 'etc/ImageMagick/mime.xml' - 'etc/ImageMagick/policy.xml' - 'etc/ImageMagick/quantization-table.xml' - 'etc/ImageMagick/thresholds.xml' - 'etc/ImageMagick/type.xml' - 'etc/ImageMagick/type-dejavu.xml' - 'etc/ImageMagick/type-ghostscript.xml' - 'etc/ImageMagick/type-windows.xml') - options=('!docs' 'libtool' '!emptydirs') - - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - make DESTDIR="${pkgdir}" install - chmod 755 "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Image/Magick/Magick.so" - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE" - install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE" - -#Cleaning - find "${pkgdir}" -name '*.bs' -delete - rm -f "${pkgdir}"/usr/lib/*.la -} - -package_imagemagick-doc() { - pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)" - - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - make DESTDIR="${pkgdir}" install-data-html - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE" - install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE" -} diff --git a/staging/imagemagick/perlmagick.rpath.patch b/staging/imagemagick/perlmagick.rpath.patch deleted file mode 100644 index 958c0f2ee..000000000 --- a/staging/imagemagick/perlmagick.rpath.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.in.orig 2009-05-26 16:22:11.000000000 -0300 -+++ Makefile.in 2009-05-26 16:23:27.000000000 -0300 -@@ -10067,6 +10067,7 @@ - - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER) - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS) -+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile - - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEFILE) - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install diff --git a/staging/inkscape/PKGBUILD b/staging/inkscape/PKGBUILD deleted file mode 100644 index 2dfb0e8c7..000000000 --- a/staging/inkscape/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 169480 2012-10-21 23:53:47Z bisson $ -# Contributor: tobias <tobias@archlinux.org> -# Contributor: Tobias Kieslich <tobias@justdreams.de> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> - -pkgname=inkscape -pkgver=0.48.3.1 -pkgrel=7 -pkgdesc='Vector graphics editor using the SVG file format' -url='http://inkscape.sourceforge.net/' -license=('GPL' 'LGPL') -arch=('i686' 'x86_64') -makedepends=('boost' 'intltool') -depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib' 'popt' - 'python2' 'desktop-file-utils' 'hicolor-icon-theme') -optdepends=('pstoedit: latex formulas' - 'texlive-core: latex formulas' - 'python2-numpy: some extensions' - 'python2-lxml: some extensions and filters' - 'pyxml: some extensions' - 'uniconvertor: reading/writing to some proprietary formats') -options=('!libtool') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" - 'poppler20.patch' - 'libpng15.patch') -sha1sums=('9a09a97d184e09c2ee7f9956bfe073b7313e919e' - '7316c2903c157781838cce289a709d100dc40fec' - 'd6512f3cb38ca8e2436dc485aa652490d17b3a52') - -install=install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py - sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py - sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp - sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py - sed -i 's|"python"|"python2"|g' src/main.cpp - - patch -p1 -i ../poppler20.patch - patch -p1 -i ../libpng15.patch - - ./configure \ - --prefix=/usr \ - --with-python \ - --with-perl \ - --enable-lcms \ - --enable-poppler-cairo \ - --disable-dependency-tracking \ - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} diff --git a/staging/inkscape/install b/staging/inkscape/install deleted file mode 100644 index 6e803bf1d..000000000 --- a/staging/inkscape/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 -} - - -post_remove() { - post_install -} diff --git a/staging/inkscape/libpng15.patch b/staging/inkscape/libpng15.patch deleted file mode 100644 index e24913ed6..000000000 --- a/staging/inkscape/libpng15.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- inkscape-0.48.1/src/extension/internal/pdfinput/svg-builder.cpp -+++ inkscape-0.48.1-mod//src/extension/internal/pdfinput/svg-builder.cpp -@@ -1443,7 +1443,7 @@ - return NULL; - } - // Set error handler -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_write_struct(&png_ptr, &info_ptr); - return NULL; - } ---- inkscape-0.48.1/src/helper/png-write.cpp -+++ inkscape-0.48.1-mod//src/helper/png-write.cpp -@@ -165,7 +165,7 @@ - /* Set error handling. REQUIRED if you aren't supplying your own - * error hadnling functions in the png_create_write_struct() call. - */ -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - /* If we get here, we had a problem reading the file */ - fclose(fp); - png_destroy_write_struct(&png_ptr, &info_ptr); ---- inkscape-0.48.1/src/sp-image.cpp -+++ inkscape-0.48.1-mod//src/sp-image.cpp -@@ -386,9 +386,13 @@ - - #if defined(PNG_iCCP_SUPPORTED) - { -- char* name = 0; -+ png_charp name = 0; - int compression_type = 0; -- char* profile = 0; -+#if (PNG_LIBPNG_VER < 10500) -+ png_charp profile = 0; -+#else -+ png_bytep profile = 0; -+#endif - png_uint_32 proflen = 0; - if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) { - // g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type); diff --git a/staging/inkscape/poppler20.patch b/staging/inkscape/poppler20.patch deleted file mode 100644 index ecb74603f..000000000 --- a/staging/inkscape/poppler20.patch +++ /dev/null @@ -1,642 +0,0 @@ -diff -Naur old/src/extension/internal/pdfinput/pdf-parser.cpp new/src/extension/internal/pdfinput/pdf-parser.cpp ---- old/src/extension/internal/pdfinput/pdf-parser.cpp 2011-07-08 20:25:09.468790000 +0200 -+++ new/src/extension/internal/pdfinput/pdf-parser.cpp 2012-05-13 21:07:11.334781215 +0200 -@@ -367,14 +367,14 @@ - for (i = 0; i < obj->arrayGetLength(); ++i) { - obj->arrayGet(i, &obj2); - if (!obj2.isStream()) { -- error(-1, const_cast<char*>("Weird page contents")); -+ error(errInternal, -1, const_cast<char*>("Weird page contents")); - obj2.free(); - return; - } - obj2.free(); - } - } else if (!obj->isStream()) { -- error(-1, const_cast<char*>("Weird page contents")); -+ error(errInternal, -1, const_cast<char*>("Weird page contents")); - return; - } - parser = new Parser(xref, new Lexer(xref, obj), gFalse); -@@ -419,7 +419,7 @@ - - // too many arguments - something is wrong - } else { -- error(getPos(), const_cast<char*>("Too many args in content stream")); -+ error(errInternal, getPos(), const_cast<char*>("Too many args in content stream")); - if (printCommands) { - printf("throwing away arg: "); - obj.print(stdout); -@@ -436,7 +436,7 @@ - - // args at end with no command - if (numArgs > 0) { -- error(getPos(), const_cast<char*>("Leftover args in content stream")); -+ error(errInternal, getPos(), const_cast<char*>("Leftover args in content stream")); - if (printCommands) { - printf("%d leftovers:", numArgs); - for (i = 0; i < numArgs; ++i) { -@@ -502,7 +502,7 @@ - name = cmd->getCmd(); - if (!(op = findOp(name))) { - if (ignoreUndef == 0) -- error(getPos(), const_cast<char*>("Unknown operator '%s'"), name); -+ error(errInternal, getPos(), const_cast<char*>("Unknown operator '%s'"), name); - return; - } - -@@ -510,26 +510,26 @@ - argPtr = args; - if (op->numArgs >= 0) { - if (numArgs < op->numArgs) { -- error(getPos(), const_cast<char*>("Too few (%d) args to '%s' operator"), numArgs, name); -+ error(errInternal, getPos(), const_cast<char*>("Too few (%d) args to '%s' operator"), numArgs, name); - return; - } - if (numArgs > op->numArgs) { - #if 0 -- error(getPos(), "Too many (%d) args to '%s' operator", numArgs, name); -+ error(errInternal, getPos(), "Too many (%d) args to '%s' operator", numArgs, name); - #endif - argPtr += numArgs - op->numArgs; - numArgs = op->numArgs; - } - } else { - if (numArgs > -op->numArgs) { -- error(getPos(), const_cast<char*>("Too many (%d) args to '%s' operator"), -+ error(errInternal, getPos(), const_cast<char*>("Too many (%d) args to '%s' operator"), - numArgs, name); - return; - } - } - for (i = 0; i < numArgs; ++i) { - if (!checkArg(&argPtr[i], op->tchk[i])) { -- error(getPos(), const_cast<char*>("Arg #%d to '%s' operator is wrong type (%s)"), -+ error(errInternal, getPos(), const_cast<char*>("Arg #%d to '%s' operator is wrong type (%s)"), - i, name, argPtr[i].getTypeName()); - return; - } -@@ -690,7 +690,7 @@ - return; - } - if (!obj1.isDict()) { -- error(getPos(), const_cast<char*>("ExtGState '%s' is wrong type"), args[0].getName()); -+ error(errInternal, getPos(), const_cast<char*>("ExtGState '%s' is wrong type"), args[0].getName()); - obj1.free(); - return; - } -@@ -705,7 +705,7 @@ - if (state->parseBlendMode(&obj2, &mode)) { - state->setBlendMode(mode); - } else { -- error(getPos(), const_cast<char*>("Invalid blend mode in ExtGState")); -+ error(errInternal, getPos(), const_cast<char*>("Invalid blend mode in ExtGState")); - } - } - obj2.free(); -@@ -764,7 +764,7 @@ - state->setTransfer(funcs); - } - } else if (!obj2.isNull()) { -- error(getPos(), const_cast<char*>("Invalid transfer function in ExtGState")); -+ error(errInternal, getPos(), const_cast<char*>("Invalid transfer function in ExtGState")); - } - obj2.free(); - -@@ -784,7 +784,7 @@ - funcs[0] = Function::parse(&obj3); - if (funcs[0]->getInputSize() != 1 || - funcs[0]->getOutputSize() != 1) { -- error(getPos(), -+ error(errInternal, getPos(), - const_cast<char*>("Invalid transfer function in soft mask in ExtGState")); - delete funcs[0]; - funcs[0] = NULL; -@@ -809,11 +809,7 @@ - blendingColorSpace = NULL; - isolated = knockout = gFalse; - if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) { --#ifdef POPPLER_NEW_COLOR_SPACE_API - blendingColorSpace = GfxColorSpace::parse(&obj5, NULL); --#else -- blendingColorSpace = GfxColorSpace::parse(&obj5); --#endif - } - obj5.free(); - if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) { -@@ -840,15 +836,15 @@ - delete funcs[0]; - } - } else { -- error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group")); -+ error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group")); - } - obj4.free(); - } else { -- error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group")); -+ error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group")); - } - obj3.free(); - } else if (!obj2.isNull()) { -- error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState")); -+ error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState")); - } - } - obj2.free(); -@@ -876,7 +872,7 @@ - // check form type - dict->lookup(const_cast<char*>("FormType"), &obj1); - if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) { -- error(getPos(), const_cast<char*>("Unknown form type")); -+ error(errInternal, getPos(), const_cast<char*>("Unknown form type")); - } - obj1.free(); - -@@ -884,7 +880,7 @@ - dict->lookup(const_cast<char*>("BBox"), &obj1); - if (!obj1.isArray()) { - obj1.free(); -- error(getPos(), const_cast<char*>("Bad form bounding box")); -+ error(errInternal, getPos(), const_cast<char*>("Bad form bounding box")); - return; - } - for (i = 0; i < 4; ++i) { -@@ -1012,19 +1008,11 @@ - - state->setFillPattern(NULL); - res->lookupColorSpace(args[0].getName(), &obj); --#ifdef POPPLER_NEW_COLOR_SPACE_API - if (obj.isNull()) { - colorSpace = GfxColorSpace::parse(&args[0], NULL); - } else { - colorSpace = GfxColorSpace::parse(&obj, NULL); - } --#else -- if (obj.isNull()) { -- colorSpace = GfxColorSpace::parse(&args[0]); -- } else { -- colorSpace = GfxColorSpace::parse(&obj); -- } --#endif - obj.free(); - if (colorSpace) { - state->setFillColorSpace(colorSpace); -@@ -1032,7 +1020,7 @@ - state->setFillColor(&color); - builder->updateStyle(state); - } else { -- error(getPos(), const_cast<char*>("Bad color space (fill)")); -+ error(errInternal, getPos(), const_cast<char*>("Bad color space (fill)")); - } - } - -@@ -1043,19 +1031,11 @@ - - state->setStrokePattern(NULL); - res->lookupColorSpace(args[0].getName(), &obj); --#ifdef POPPLER_NEW_COLOR_SPACE_API - if (obj.isNull()) { - colorSpace = GfxColorSpace::parse(&args[0], NULL); - } else { - colorSpace = GfxColorSpace::parse(&obj, NULL); - } --#else -- if (obj.isNull()) { -- colorSpace = GfxColorSpace::parse(&args[0]); -- } else { -- colorSpace = GfxColorSpace::parse(&obj); -- } --#endif - obj.free(); - if (colorSpace) { - state->setStrokeColorSpace(colorSpace); -@@ -1063,7 +1043,7 @@ - state->setStrokeColor(&color); - builder->updateStyle(state); - } else { -- error(getPos(), const_cast<char*>("Bad color space (stroke)")); -+ error(errInternal, getPos(), const_cast<char*>("Bad color space (stroke)")); - } - } - -@@ -1072,7 +1052,7 @@ - int i; - - if (numArgs != state->getFillColorSpace()->getNComps()) { -- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'sc' command")); -+ error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'sc' command")); - return; - } - state->setFillPattern(NULL); -@@ -1088,7 +1068,7 @@ - int i; - - if (numArgs != state->getStrokeColorSpace()->getNComps()) { -- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SC' command")); -+ error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SC' command")); - return; - } - state->setStrokePattern(NULL); -@@ -1109,7 +1089,7 @@ - if (!((GfxPatternColorSpace *)state->getFillColorSpace())->getUnder() || - numArgs - 1 != ((GfxPatternColorSpace *)state->getFillColorSpace()) - ->getUnder()->getNComps()) { -- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command")); -+ error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command")); - return; - } - for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) { -@@ -1120,23 +1100,15 @@ - state->setFillColor(&color); - builder->updateStyle(state); - } --#ifdef POPPLER_NEW_COLOR_SPACE_API - if (args[numArgs-1].isName() && - (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { - state->setFillPattern(pattern); - builder->updateStyle(state); - } --#else -- if (args[numArgs-1].isName() && -- (pattern = res->lookupPattern(args[numArgs-1].getName()))) { -- state->setFillPattern(pattern); -- builder->updateStyle(state); -- } --#endif - - } else { - if (numArgs != state->getFillColorSpace()->getNComps()) { -- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command")); -+ error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command")); - return; - } - state->setFillPattern(NULL); -@@ -1161,7 +1133,7 @@ - ->getUnder() || - numArgs - 1 != ((GfxPatternColorSpace *)state->getStrokeColorSpace()) - ->getUnder()->getNComps()) { -- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command")); -+ error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command")); - return; - } - for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) { -@@ -1172,23 +1144,15 @@ - state->setStrokeColor(&color); - builder->updateStyle(state); - } --#ifdef POPPLER_NEW_COLOR_SPACE_API - if (args[numArgs-1].isName() && - (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { - state->setStrokePattern(pattern); - builder->updateStyle(state); - } --#else -- if (args[numArgs-1].isName() && -- (pattern = res->lookupPattern(args[numArgs-1].getName()))) { -- state->setStrokePattern(pattern); -- builder->updateStyle(state); -- } --#endif - - } else { - if (numArgs != state->getStrokeColorSpace()->getNComps()) { -- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command")); -+ error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command")); - return; - } - state->setStrokePattern(NULL); -@@ -1212,7 +1176,7 @@ - - void PdfParser::opLineTo(Object args[], int numArgs) { - if (!state->isCurPt()) { -- error(getPos(), const_cast<char*>("No current point in lineto")); -+ error(errInternal, getPos(), const_cast<char*>("No current point in lineto")); - return; - } - state->lineTo(args[0].getNum(), args[1].getNum()); -@@ -1222,7 +1186,7 @@ - double x1, y1, x2, y2, x3, y3; - - if (!state->isCurPt()) { -- error(getPos(), const_cast<char*>("No current point in curveto")); -+ error(errInternal, getPos(), const_cast<char*>("No current point in curveto")); - return; - } - x1 = args[0].getNum(); -@@ -1238,7 +1202,7 @@ - double x1, y1, x2, y2, x3, y3; - - if (!state->isCurPt()) { -- error(getPos(), const_cast<char*>("No current point in curveto1")); -+ error(errInternal, getPos(), const_cast<char*>("No current point in curveto1")); - return; - } - x1 = state->getCurX(); -@@ -1254,7 +1218,7 @@ - double x1, y1, x2, y2, x3, y3; - - if (!state->isCurPt()) { -- error(getPos(), const_cast<char*>("No current point in curveto2")); -+ error(errInternal, getPos(), const_cast<char*>("No current point in curveto2")); - return; - } - x1 = args[0].getNum(); -@@ -1282,7 +1246,7 @@ - - void PdfParser::opClosePath(Object args[], int numArgs) { - if (!state->isCurPt()) { -- error(getPos(), const_cast<char*>("No current point in closepath")); -+ error(errInternal, getPos(), const_cast<char*>("No current point in closepath")); - return; - } - state->closePath(); -@@ -1298,7 +1262,7 @@ - - void PdfParser::opStroke(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in stroke")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in stroke")); - return; - } - if (state->isPath()) { -@@ -1314,7 +1278,7 @@ - - void PdfParser::opCloseStroke(Object * /*args[]*/, int /*numArgs*/) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in closepath/stroke")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in closepath/stroke")); - return; - } - state->closePath(); -@@ -1331,7 +1295,7 @@ - - void PdfParser::opFill(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in fill")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in fill")); - return; - } - if (state->isPath()) { -@@ -1347,7 +1311,7 @@ - - void PdfParser::opEOFill(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in eofill")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in eofill")); - return; - } - if (state->isPath()) { -@@ -1363,7 +1327,7 @@ - - void PdfParser::opFillStroke(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in fill/stroke")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in fill/stroke")); - return; - } - if (state->isPath()) { -@@ -1376,7 +1340,7 @@ - - void PdfParser::opCloseFillStroke(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in closepath/fill/stroke")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in closepath/fill/stroke")); - return; - } - if (state->isPath()) { -@@ -1388,7 +1352,7 @@ - - void PdfParser::opEOFillStroke(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in eofill/stroke")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in eofill/stroke")); - return; - } - if (state->isPath()) { -@@ -1399,7 +1363,7 @@ - - void PdfParser::opCloseEOFillStroke(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in closepath/eofill/stroke")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in closepath/eofill/stroke")); - return; - } - if (state->isPath()) { -@@ -1440,7 +1404,7 @@ - doShadingPatternFillFallback((GfxShadingPattern *)pattern, gFalse, eoFill); - break; - default: -- error(getPos(), const_cast<char*>("Unimplemented pattern type (%d) in fill"), -+ error(errInternal, getPos(), const_cast<char*>("Unimplemented pattern type (%d) in fill"), - pattern->getType()); - break; - } -@@ -1459,7 +1423,7 @@ - doShadingPatternFillFallback((GfxShadingPattern *)pattern, gTrue, gFalse); - break; - default: -- error(getPos(), const_cast<char*>("Unimplemented pattern type (%d) in stroke"), -+ error(errInternal, getPos(), const_cast<char*>("Unimplemented pattern type (%d) in stroke"), - pattern->getType()); - break; - } -@@ -1579,15 +1543,9 @@ - double *matrix = NULL; - GBool savedState = gFalse; - --#ifdef POPPLER_NEW_COLOR_SPACE_API - if (!(shading = res->lookupShading(args[0].getName(), NULL))) { - return; - } --#else -- if (!(shading = res->lookupShading(args[0].getName()))) { -- return; -- } --#endif - - // save current graphics state - if (shading->getType() != 2 && shading->getType() != 3) { -@@ -2156,7 +2114,7 @@ - - void PdfParser::opShowText(Object args[], int numArgs) { - if (!state->getFont()) { -- error(getPos(), const_cast<char*>("No font in show")); -+ error(errInternal, getPos(), const_cast<char*>("No font in show")); - return; - } - if (fontChanged) { -@@ -2170,7 +2128,7 @@ - double tx, ty; - - if (!state->getFont()) { -- error(getPos(), const_cast<char*>("No font in move/show")); -+ error(errInternal, getPos(), const_cast<char*>("No font in move/show")); - return; - } - if (fontChanged) { -@@ -2188,7 +2146,7 @@ - double tx, ty; - - if (!state->getFont()) { -- error(getPos(), const_cast<char*>("No font in move/set/show")); -+ error(errInternal, getPos(), const_cast<char*>("No font in move/set/show")); - return; - } - if (fontChanged) { -@@ -2211,7 +2169,7 @@ - int i; - - if (!state->getFont()) { -- error(getPos(), const_cast<char*>("No font in show/space")); -+ error(errInternal, getPos(), const_cast<char*>("No font in show/space")); - return; - } - if (fontChanged) { -@@ -2236,7 +2194,7 @@ - } else if (obj.isString()) { - doShowText(obj.getString()); - } else { -- error(getPos(), const_cast<char*>("Element of show/space array must be number or string")); -+ error(errInternal, getPos(), const_cast<char*>("Element of show/space array must be number or string")); - } - obj.free(); - } -@@ -2334,7 +2292,7 @@ - if (charProc.isStream()) { - //parse(&charProc, gFalse); // TODO: parse into SVG font - } else { -- error(getPos(), const_cast<char*>("Missing or bad Type3 CharProc entry")); -+ error(errInternal, getPos(), const_cast<char*>("Missing or bad Type3 CharProc entry")); - } - //out->endType3Char(state); - if (resDict) { -@@ -2410,7 +2368,7 @@ - return; - } - if (!obj1.isStream()) { -- error(getPos(), const_cast<char*>("XObject '%s' is wrong type"), name); -+ error(errInternal, getPos(), const_cast<char*>("XObject '%s' is wrong type"), name); - obj1.free(); - return; - } -@@ -2426,9 +2384,9 @@ - /* out->psXObject(obj1.getStream(), - obj3.isStream() ? obj3.getStream() : (Stream *)NULL);*/ - } else if (obj2.isName()) { -- error(getPos(), const_cast<char*>("Unknown XObject subtype '%s'"), obj2.getName()); -+ error(errInternal, getPos(), const_cast<char*>("Unknown XObject subtype '%s'"), obj2.getName()); - } else { -- error(getPos(), const_cast<char*>("XObject subtype is missing or wrong type")); -+ error(errInternal, getPos(), const_cast<char*>("XObject subtype is missing or wrong type")); - } - obj2.free(); - obj1.free(); -@@ -2559,11 +2517,7 @@ - } - } - if (!obj1.isNull()) { --#ifdef POPPLER_NEW_COLOR_SPACE_API - colorSpace = GfxColorSpace::parse(&obj1, NULL); --#else -- colorSpace = GfxColorSpace::parse(&obj1); --#endif - } else if (csMode == streamCSDeviceGray) { - colorSpace = new GfxDeviceGrayColorSpace(); - } else if (csMode == streamCSDeviceRGB) { -@@ -2648,11 +2602,7 @@ - obj2.free(); - } - } --#ifdef POPPLER_NEW_COLOR_SPACE_API - maskColorSpace = GfxColorSpace::parse(&obj1, NULL); --#else -- maskColorSpace = GfxColorSpace::parse(&obj1); --#endif - obj1.free(); - if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) { - goto err1; -@@ -2758,7 +2708,7 @@ - err2: - obj1.free(); - err1: -- error(getPos(), const_cast<char*>("Bad image parameters")); -+ error(errInternal, getPos(), const_cast<char*>("Bad image parameters")); - } - - void PdfParser::doForm(Object *str) { -@@ -2783,7 +2733,7 @@ - // check form type - dict->lookup(const_cast<char*>("FormType"), &obj1); - if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) { -- error(getPos(), const_cast<char*>("Unknown form type")); -+ error(errInternal, getPos(), const_cast<char*>("Unknown form type")); - } - obj1.free(); - -@@ -2791,7 +2741,7 @@ - dict->lookup(const_cast<char*>("BBox"), &bboxObj); - if (!bboxObj.isArray()) { - bboxObj.free(); -- error(getPos(), const_cast<char*>("Bad form bounding box")); -+ error(errInternal, getPos(), const_cast<char*>("Bad form bounding box")); - return; - } - for (i = 0; i < 4; ++i) { -@@ -2827,11 +2777,7 @@ - if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) { - transpGroup = gTrue; - if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) { --#ifdef POPPLER_NEW_COLOR_SPACE_API - blendingColorSpace = GfxColorSpace::parse(&obj3, NULL); --#else -- blendingColorSpace = GfxColorSpace::parse(&obj3); --#endif - } - obj3.free(); - if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) { -@@ -2990,7 +2936,7 @@ - parser->getObj(&obj); - while (!obj.isCmd(const_cast<char*>("ID")) && !obj.isEOF()) { - if (!obj.isName()) { -- error(getPos(), const_cast<char*>("Inline image dictionary key must be a name object")); -+ error(errInternal, getPos(), const_cast<char*>("Inline image dictionary key must be a name object")); - obj.free(); - } else { - key = copyString(obj.getName()); -@@ -3005,7 +2951,7 @@ - parser->getObj(&obj); - } - if (obj.isEOF()) { -- error(getPos(), const_cast<char*>("End of file in inline image")); -+ error(errInternal, getPos(), const_cast<char*>("End of file in inline image")); - obj.free(); - dict.free(); - return NULL; -@@ -3020,11 +2966,11 @@ - } - - void PdfParser::opImageData(Object args[], int numArgs) { -- error(getPos(), const_cast<char*>("Internal: got 'ID' operator")); -+ error(errInternal, getPos(), const_cast<char*>("Internal: got 'ID' operator")); - } - - void PdfParser::opEndImage(Object args[], int numArgs) { -- error(getPos(), const_cast<char*>("Internal: got 'EI' operator")); -+ error(errInternal, getPos(), const_cast<char*>("Internal: got 'EI' operator")); - } - - //------------------------------------------------------------------------ -diff -Naur old/src/extension/internal/pdfinput/svg-builder.cpp new/src/extension/internal/pdfinput/svg-builder.cpp ---- old/src/extension/internal/pdfinput/svg-builder.cpp 2011-07-08 20:25:09.468790000 +0200 -+++ new/src/extension/internal/pdfinput/svg-builder.cpp 2012-05-13 20:45:22.303804308 +0200 -@@ -961,9 +961,7 @@ - _font_style = sp_repr_css_attr_new(); - GfxFont *font = state->getFont(); - // Store original name -- if (font->getOrigName()) { -- _font_specification = font->getOrigName()->getCString(); -- } else if (font->getName()) { -+ if (font->getName()) { - _font_specification = font->getName()->getCString(); - } else { - _font_specification = (char*) "Arial"; diff --git a/staging/isl/PKGBUILD b/staging/isl/PKGBUILD deleted file mode 100644 index 0f946e67b..000000000 --- a/staging/isl/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 161820 2012-06-15 04:14:28Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> - -pkgname=isl -pkgver=0.10 -pkgrel=1 -pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints" -arch=('i686' 'x86_64') -url="http://www.kotnet.org/~skimo/isl/" -license=('LGPL2.1') -options=('!libtool') -source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2) -md5sums=('c1ece653891bb2a5f55ca25e3f4e8f35') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - make check -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make -j1 DESTDIR="$pkgdir/" install - - install -dm755 $pkgdir/usr/share/gdb/auto-load/usr/lib/ - mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.10.0.0-gdb.py -} diff --git a/staging/k3b/PKGBUILD b/staging/k3b/PKGBUILD deleted file mode 100644 index e22f80e9d..000000000 --- a/staging/k3b/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 160702 2012-06-04 03:41:19Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=k3b -pkgver=2.0.2 -pkgrel=5 -pkgdesc="Feature-rich and easy to handle CD burning application" -arch=('i686' 'x86_64') -url="http://k3b.org/" -license=('GPL') -depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' 'libmad' - 'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrkit' 'libxft') -makedepends=('cmake' 'automoc4' 'docbook-xml') -optdepends=('dvd+rw-tools: for dvd burning support' - 'vcdimager: for vcd burning support' - 'transcode: for advanced mpeg conversion support' - 'emovix: for bootable multimedia cd/dvd support' - 'cdrdao: for disk-at-once (DAO) mode support') -options=('!libtool') -install=k3b.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \ - k3b-2.0.2-ffmpeg.patch k3b-2.0.2-libavformat54.patch) -sha1sums=('8b30a4d07942e82559b01bc07dea6bcf2defd532' - '8120c0e22e6c41ea285ca6060be13723ed91c52b' - '5b35bff3f7670686a32bd71afea2deaca4331631') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/k3b-2.0.2-ffmpeg.patch" - patch -p1 -i "${srcdir}/k3b-2.0.2-libavformat54.patch" - cd .. - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release - make -} - -package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/k3b/k3b-2.0.2-ffmpeg.patch b/staging/k3b/k3b-2.0.2-ffmpeg.patch deleted file mode 100644 index 2878b1edc..000000000 --- a/staging/k3b/k3b-2.0.2-ffmpeg.patch +++ /dev/null @@ -1,96 +0,0 @@ -commit 61ca30beb978f68e72257408777c6433f33129bd -Author: Michal Malek <michalm@jabster.pl> -Date: Sun Aug 28 20:18:53 2011 +0200 - - Fixed compilation with new FFMPEG - - BUG: 274817 - FIXED-IN: 2.0.3 - -diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp -index 0ad59fc..0c5f366 100644 ---- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp -+++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp -@@ -109,7 +109,13 @@ bool K3bFFMpegFile::open() - #else - ::AVCodecContext* codecContext = d->formatContext->streams[0]->codec; - #endif -- if( codecContext->codec_type != CODEC_TYPE_AUDIO ) { -+ if( codecContext->codec_type != -+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) -+ AVMEDIA_TYPE_AUDIO) -+#else -+ CODEC_TYPE_AUDIO) -+#endif -+ { - kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename; - return false; - } -@@ -225,8 +231,11 @@ QString K3bFFMpegFile::typeComment() const - QString K3bFFMpegFile::title() const - { - // FIXME: is this UTF8 or something?? -- if( d->formatContext->title[0] != '\0' ) -- return QString::fromLocal8Bit( d->formatContext->title ); -+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "TITLE", NULL, 0 ); -+ if( ade == NULL ) -+ return QString(); -+ if( ade->value != '\0' ) -+ return QString::fromLocal8Bit( ade->value ); - else - return QString(); - } -@@ -235,8 +244,11 @@ QString K3bFFMpegFile::title() const - QString K3bFFMpegFile::author() const - { - // FIXME: is this UTF8 or something?? -- if( d->formatContext->author[0] != '\0' ) -- return QString::fromLocal8Bit( d->formatContext->author ); -+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "ARTIST", NULL, 0 ); -+ if( ade == NULL ) -+ return QString(); -+ if( ade->value != '\0' ) -+ return QString::fromLocal8Bit( ade->value ); - else - return QString(); - } -@@ -245,8 +257,11 @@ QString K3bFFMpegFile::author() const - QString K3bFFMpegFile::comment() const - { - // FIXME: is this UTF8 or something?? -- if( d->formatContext->comment[0] != '\0' ) -- return QString::fromLocal8Bit( d->formatContext->comment ); -+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "COMMENT", NULL, 0 ); -+ if( ade == NULL ) -+ return QString(); -+ if( ade->value != '\0' ) -+ return QString::fromLocal8Bit( ade->value ); - else - return QString(); - } -@@ -309,8 +324,13 @@ int K3bFFMpegFile::fillOutputBuffer() - #if LIBAVCODEC_VERSION_MAJOR < 52 - int len = ::avcodec_decode_audio( - #else -+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) -+ int len = ::avcodec_decode_audio3( -+ #else - int len = ::avcodec_decode_audio2( -+ #endif - #endif -+ - #ifdef FFMPEG_BUILD_PRE_4629 - &d->formatContext->streams[0]->codec, - #else -@@ -318,7 +338,11 @@ int K3bFFMpegFile::fillOutputBuffer() - #endif - (short*)d->alignedOutputBuffer, - &d->outputBufferSize, -+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) -+ &d->packet ); -+#else - d->packetData, d->packetSize ); -+#endif - - if( d->packetSize <= 0 || len < 0 ) - ::av_free_packet( &d->packet ); diff --git a/staging/k3b/k3b-2.0.2-libavformat54.patch b/staging/k3b/k3b-2.0.2-libavformat54.patch deleted file mode 100644 index 174a776b8..000000000 --- a/staging/k3b/k3b-2.0.2-libavformat54.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp -=================================================================== ---- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp -+++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp -@@ -88,7 +88,7 @@ bool K3bFFMpegFile::open() - close(); - - // open the file -- int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 ); -+ int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, NULL); - if( err < 0 ) { - kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err; - return false; -@@ -143,7 +143,7 @@ bool K3bFFMpegFile::open() - } - - // dump some debugging info -- ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 ); -+ ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 ); - - return true; - } diff --git a/staging/k3b/k3b.install b/staging/k3b/k3b.install deleted file mode 100644 index 413ad60f7..000000000 --- a/staging/k3b/k3b.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kactivities/PKGBUILD b/staging/kactivities/PKGBUILD deleted file mode 100644 index 6e12edcc9..000000000 --- a/staging/kactivities/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 160981 2012-06-07 20:18:35Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kactivities -pkgver=4.8.4 -pkgrel=1 -arch=('i686' 'x86_64') -pkgdesc='API for using and interacting with Activities' -url='http://kde.org/' -license=('GPL' 'FDL') -depends=('kdelibs') -makedepends=('cmake' 'automoc4') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('3f42c18bae5a1d6bbd7fca471d8b4f9755875e06') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install -} diff --git a/staging/kdeaccessibility-jovie/PKGBUILD b/staging/kdeaccessibility-jovie/PKGBUILD deleted file mode 100644 index 3916ba424..000000000 --- a/staging/kdeaccessibility-jovie/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 161001 2012-06-07 20:31:36Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeaccessibility-jovie -pkgver=4.8.4 -pkgrel=1 -arch=('i686' 'x86_64') -pkgdesc='A text to speech application' -url='http://kde.org/applications/utilities/jovie/' -license=('GPL' 'FDL') -groups=('kde' 'kdeaccessibility') -depends=('kdebase-runtime' 'speech-dispatcher') -makedepends=('cmake' 'automoc4') -replaces=('kdeaccessibility-kttsd') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/jovie-${pkgver}.tar.xz") -sha1sums=('d9d829c09312bc6f962c36521629ba1bee8f1431') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../jovie-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install - cd $srcdir/build/doc - make DESTDIR=$pkgdir install -} diff --git a/staging/kdeaccessibility-jovie/kdeaccessibility-jovie.install b/staging/kdeaccessibility-jovie/kdeaccessibility-jovie.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdeaccessibility-jovie/kdeaccessibility-jovie.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/kdeaccessibility-kaccessible/PKGBUILD b/staging/kdeaccessibility-kaccessible/PKGBUILD deleted file mode 100644 index 3d60899b7..000000000 --- a/staging/kdeaccessibility-kaccessible/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 161002 2012-06-07 20:32:03Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeaccessibility-kaccessible -pkgver=4.8.4 -pkgrel=1 -arch=('i686' 'x86_64') -pkgdesc='Provides accessibility services like focus tracking and a screenreader' -url='http://accessibility.kde.org/' -license=('GPL' 'FDL') -groups=('kde' 'kdeaccessibility') -depends=('kdelibs' 'speech-dispatcher') -makedepends=('cmake' 'automoc4') -source=("http://download.kde.org/stable/${pkgver}/src/kaccessible-${pkgver}.tar.xz") -sha1sums=('d467fa3857b2c5a2aa3a5421b5d7c74fe3c7f981') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kaccessible-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install -} diff --git a/staging/kdeaccessibility-kmag/PKGBUILD b/staging/kdeaccessibility-kmag/PKGBUILD deleted file mode 100644 index d57d99c8b..000000000 --- a/staging/kdeaccessibility-kmag/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 161003 2012-06-07 20:32:25Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeaccessibility-kmag -pkgver=4.8.4 -pkgrel=1 -arch=('i686' 'x86_64') -pkgdesc='Screen Magnifier' -url='http://kde.org/applications/utilities/kmag/' -license=('GPL' 'FDL') -groups=('kde' 'kdeaccessibility') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kmag-${pkgver}.tar.xz") -sha1sums=('7b5b51422d4241d6303841805a04b2eace0c7a2d') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kmag-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install - cd $srcdir/build/doc - make DESTDIR=$pkgdir install -} diff --git a/staging/kdeaccessibility-kmag/kdeaccessibility-kmag.install b/staging/kdeaccessibility-kmag/kdeaccessibility-kmag.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdeaccessibility-kmag/kdeaccessibility-kmag.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/kdeaccessibility-kmousetool/PKGBUILD b/staging/kdeaccessibility-kmousetool/PKGBUILD deleted file mode 100644 index 46e295f53..000000000 --- a/staging/kdeaccessibility-kmousetool/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 161004 2012-06-07 20:32:48Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeaccessibility-kmousetool -pkgver=4.8.4 -pkgrel=1 -arch=('i686' 'x86_64') -pkgdesc='Clicks the mouse for you, reducing the effects of RSI' -url='http://kde.org/applications/utilities/kmousetool/' -license=('GPL' 'FDL') -groups=('kde' 'kdeaccessibility') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kmousetool-${pkgver}.tar.xz") -sha1sums=('6667336267a3a65bf0b33a8454299558ad458108') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kmousetool-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install - cd $srcdir/build/doc - make DESTDIR=$pkgdir install -} diff --git a/staging/kdeaccessibility-kmousetool/kdeaccessibility-kmousetool.install b/staging/kdeaccessibility-kmousetool/kdeaccessibility-kmousetool.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdeaccessibility-kmousetool/kdeaccessibility-kmousetool.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/kdeaccessibility-kmouth/PKGBUILD b/staging/kdeaccessibility-kmouth/PKGBUILD deleted file mode 100644 index 07523ee30..000000000 --- a/staging/kdeaccessibility-kmouth/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 161005 2012-06-07 20:33:11Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeaccessibility-kmouth -pkgver=4.8.4 -pkgrel=1 -arch=('i686' 'x86_64') -pkgdesc='Speech Synthesizer Frontend' -url='http://kde.org/applications/utilities/kmouth/' -license=('GPL' 'FDL') -groups=('kde' 'kdeaccessibility') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kmouth-${pkgver}.tar.xz") -sha1sums=('104bb2c434deabbaa57326fe567fc90c4067f36c') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kmouth-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install - cd $srcdir/build/doc - make DESTDIR=$pkgdir install -} diff --git a/staging/kdeaccessibility-kmouth/kdeaccessibility-kmouth.install b/staging/kdeaccessibility-kmouth/kdeaccessibility-kmouth.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdeaccessibility-kmouth/kdeaccessibility-kmouth.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/kdeadmin/PKGBUILD b/staging/kdeadmin/PKGBUILD deleted file mode 100644 index 20da86dd5..000000000 --- a/staging/kdeadmin/PKGBUILD +++ /dev/null @@ -1,80 +0,0 @@ -# $Id: PKGBUILD 161006 2012-06-07 20:33:40Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdeadmin -pkgname=('kdeadmin-kcron' - 'kdeadmin-ksystemlog' - 'kdeadmin-kuser' - 'kdeadmin-system-config-printer-kde') -pkgver=4.8.4 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeadmin') -makedepends=('cmake' 'automoc4' 'kdebindings-python2' 'system-config-printer-common') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" - 'syslog-path.patch') -sha1sums=('b825e40b29b4ae684265cb13b7935737d7ae6d68' - '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') - -build() { - cd ${srcdir}/${pkgbase}-${pkgver} - patch -p1 -i ${srcdir}/syslog-path.patch - - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_strigi-analyzer=OFF \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 - make -} - -package_kdeadmin-kcron() { - pkgdesc='Configure and schedule tasks' - depends=('kdelibs') - cd $srcdir/build/kcron - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kcron - make DESTDIR=$pkgdir install -} - -package_kdeadmin-ksystemlog() { - pkgdesc='System log viewer tool' - depends=('kdebase-runtime') - url="http://kde.org/applications/system/ksystemlog/" - cd $srcdir/build/ksystemlog - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ksystemlog - make DESTDIR=$pkgdir install -} - -package_kdeadmin-kuser() { - pkgdesc='User Manager' - depends=('kdebase-runtime' 'kdepimlibs') - url="http://kde.org/applications/system/kuser/" - install='kdeadmin.install' - cd $srcdir/build/kuser - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kuser - make DESTDIR=$pkgdir install -} - -package_kdeadmin-system-config-printer-kde() { - pkgdesc='Configure local and remote Printers' - depends=('kdebindings-python2' 'system-config-printer-common' 'cups' 'python2-gobject2') - url="http://kde.org/applications/system/printerapplet/" - cd $srcdir/build/system-config-printer-kde - make DESTDIR=$pkgdir install - - # Use the python2 executable - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - "${pkgdir}"/usr/share/apps/system-config-printer-kde/{system-config-printer-kde,authconn}.py - sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' \ - "${pkgdir}"/usr/share/apps/system-config-printer-kde/pysmb.py -} diff --git a/staging/kdeadmin/kdeadmin.install b/staging/kdeadmin/kdeadmin.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdeadmin/kdeadmin.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/kdeadmin/syslog-path.patch b/staging/kdeadmin/syslog-path.patch deleted file mode 100644 index 8a9142bf6..000000000 --- a/staging/kdeadmin/syslog-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h~ 2011-01-27 14:24:29.840000005 +0100 -+++ kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h 2011-01-27 14:24:53.803333335 +0100 -@@ -39,7 +39,7 @@ - SystemConfiguration() : - GenericLogModeConfiguration( - QLatin1String( SYSTEM_LOG_MODE_ID ), -- QStringList() << QLatin1String( "/var/log/syslog" ), -+ QStringList() << QLatin1String( "/var/log/messages.log" ), - QList<int>() << INFORMATION_LOG_LEVEL_ID - ) { - diff --git a/staging/kdeartwork/PKGBUILD b/staging/kdeartwork/PKGBUILD deleted file mode 100644 index 721a2c411..000000000 --- a/staging/kdeartwork/PKGBUILD +++ /dev/null @@ -1,104 +0,0 @@ -# $Id: PKGBUILD 161007 2012-06-07 20:34:11Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdeartwork -pkgname=('kdeartwork-aurorae' - 'kdeartwork-colorschemes' - 'kdeartwork-desktopthemes' - 'kdeartwork-emoticons' - 'kdeartwork-iconthemes' - 'kdeartwork-kscreensaver' - 'kdeartwork-sounds' - 'kdeartwork-styles' - 'kdeartwork-wallpapers' - 'kdeartwork-weatherwallpapers') -pkgver=4.8.4 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeartwork') -makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' - 'libkexiv2') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('c7e15538d3141af8673d16f498c6af7bff62a87f') - -build() { - cd $srcdir - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package_kdeartwork-aurorae() { - pkgdesc='An Aurorae theme based on the Oxygen plasma theme' - cd $srcdir/build/aurorae - make DESTDIR=$pkgdir install -} - -package_kdeartwork-colorschemes() { - pkgdesc='KDE color schemes' - replaces=('kdeaccessibility-colorschemes') - cd $srcdir/build/ColorSchemes - make DESTDIR=$pkgdir install -} - -package_kdeartwork-desktopthemes() { - pkgdesc='KDE desktop themes' - cd $srcdir/build/desktopthemes - make DESTDIR=$pkgdir install -} - -package_kdeartwork-emoticons() { - pkgdesc='KDE emoticons' - cd $srcdir/build/emoticons - make DESTDIR=$pkgdir install -} - -package_kdeartwork-iconthemes() { - pkgdesc='KDE icon themes' - replaces=('kdeaccessibility-iconthemes') - cd $srcdir/build/IconThemes - make DESTDIR=$pkgdir install -} - -package_kdeartwork-kscreensaver() { - pkgdesc='KDE screensaver' - depends=('kdebase-workspace' 'libkexiv2') - cd $srcdir/build/kscreensaver - make DESTDIR=$pkgdir install -} - -package_kdeartwork-sounds() { - pkgdesc='KDE sounds' - cd $srcdir/build/sounds - make DESTDIR=$pkgdir install -} - -package_kdeartwork-styles() { - pkgdesc='KDE styles' - depends=('kdebase-workspace') - cd $srcdir/build/styles - make DESTDIR=$pkgdir install - cd $srcdir/build/kwin-styles - make DESTDIR=$pkgdir install -} - -package_kdeartwork-wallpapers() { - pkgdesc='KDE wallpapers' - cd $srcdir/build/wallpapers - make DESTDIR=$pkgdir install - cd $srcdir/build/HighResolutionWallpapers - make DESTDIR=$pkgdir install -} - -package_kdeartwork-weatherwallpapers() { - pkgdesc='KDE weather wallpapers' - cd $srcdir/build/WeatherWallpapers - make DESTDIR=$pkgdir install -} diff --git a/staging/kdebase-konsole/PKGBUILD b/staging/kdebase-konsole/PKGBUILD deleted file mode 100644 index d6694aca5..000000000 --- a/staging/kdebase-konsole/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 161008 2012-06-07 20:38:54Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdebase-konsole -pkgver=4.8.4 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://kde.org/applications/system/konsole/' -pkgdesc="Terminal" -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdebase') -depends=('kdebase-runtime' 'kdebase-lib') -makedepends=('cmake' 'automoc4') -source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.xz") -sha1sums=('a5900aa089a28fcaa69b45cfc7b46f556a38bd11') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../konsole-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdebase-runtime/PKGBUILD b/staging/kdebase-runtime/PKGBUILD deleted file mode 100644 index 3bb05e66b..000000000 --- a/staging/kdebase-runtime/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 164640 2012-08-01 17:28:14Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgname=kdebase-runtime -pkgver=4.9.0 -pkgrel=2 -pkgdesc="Plugins and applications necessary for the running of KDE applications" -arch=('i686' 'x86_64') -url='https://projects.kde.org/projects/kde/kde-runtime' -license=('GPL' 'LGPL') -depends=('kdepimlibs' 'nepomuk-core' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' -'xorg-xauth' 'kactivities') -makedepends=('pkg-config' 'cmake' 'automoc4' 'openslp' 'doxygen' 'networkmanager') -optdepends=('htdig: to build the search index in khelpcenter' - 'rarian: needed by khelpcenter' - 'gdb: drkonq crash handler') -install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz") -sha1sums=('89a9e5c7e52cb925217b45a568a354cc041bc28d') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kde-runtime-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_QNtrack=OFF \ - -DWITH_Xine=OFF - make -} - -package() { - cd "$srcdir/build" - make DESTDIR="$pkgdir" install - rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme" - - ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/" -} diff --git a/staging/kdebase-runtime/kdebase-runtime.install b/staging/kdebase-runtime/kdebase-runtime.install deleted file mode 100644 index c77e68041..000000000 --- a/staging/kdebase-runtime/kdebase-runtime.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdebase-workspace/PKGBUILD b/staging/kdebase-workspace/PKGBUILD deleted file mode 100644 index 23b69758b..000000000 --- a/staging/kdebase-workspace/PKGBUILD +++ /dev/null @@ -1,89 +0,0 @@ -# $Id: PKGBUILD 169062 2012-10-17 16:13:01Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgname=kdebase-workspace -_pkgname=kde-workspace -pkgver=4.9.2 -pkgrel=5 -pkgdesc="Provides the interface and basic tools for the KDE workspace" -arch=('i686' 'x86_64') -url='https://projects.kde.org/projects/kde/kde-workspace' -license=('GPL' 'LGPL' 'FDL') -groups=('kde') -# note on libxdamage: -# not detected by namcap because libgl depends on it -# but nvidia providing libgl does not depend on libxdamage -depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' - 'qimageblitz' 'polkit-kde' 'xorg-xprop' 'libxdamage' - 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama' - 'xorg-xrdb' 'libgles' 'libegl' 'libxres' 'xorg-xrandr' - 'xorg-xmessage' 'libusb-compat' 'kde-base-artwork') -makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager' 'mesa') -optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces') -install="${pkgname}.install" -backup=('usr/share/config/kdm/kdmrc') -source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" - 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate' - 'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch' - 'logind-support.patch') -sha1sums=('091bec159d85db2a9a6d6b1b43a53183c23de488' - '5db3a245201bd4a50e65aa2ef583cf5490e4f646' - '660eae40a707d2711d8d7f32a93214865506b795' - 'b7980f2e199963caf8e92b499042d244ece2fca0' - '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' - 'b6f8e8692737b11eec1f8022ce74b5b23e247b1b' - 'bbe55f2000217474ce7246f12ee437ceaaf7e9ae' - 'c079ebd157c836ba996190f0d2bcea1a7828d02c' - 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - 'd509dac592bd8b310df27991b208c95b6d907514' - 'ccde71c42e19feaf40d3bd76e7396a0cb6df012f') - -build() { - cd ${_pkgname}-${pkgver} - - # reads the shell scripts in /etc/kde/ - patch -p0 -i "${srcdir}"/etc-scripts.patch - # FS#26120 - patch -p1 -i "${srcdir}"/kdm-xinitrd.patch - - # KDEBUG#202629 - patch -p0 -i "${srcdir}"/terminate-server.patch - # KDEBUG#307412 (fixed upstream) - patch -p1 -i "${srcdir}"/logind-support.patch - - cd ../ - - mkdir build - cd build - cmake ../${_pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_Xmms=OFF \ - -DWITH_Googlegadgets=OFF \ - -DWITH_libgps=OFF \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DWITH_CkConnector=OFF - make -} - -package() { - cd build - make DESTDIR="${pkgdir}" install - - install -D -m644 "${srcdir}"/kde.pam "${pkgdir}"/etc/pam.d/kde - install -D -m644 "${srcdir}"/kde-np.pam "${pkgdir}"/etc/pam.d/kde-np - install -D -m644 "${srcdir}"/kscreensaver.pam "${pkgdir}"/etc/pam.d/kscreensaver - - install -d -m755 "${pkgdir}"/usr/share/xsessions/ - ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop \ - "${pkgdir}"/usr/share/xsessions/ - install -d -m755 "${pkgdir}"/etc/kde/{env,shutdown} - - install -d -g 135 -o 135 "${pkgdir}"/var/lib/kdm - install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm - install -D -m644 "${srcdir}"/kdm.service \ - "${pkgdir}"/usr/lib/systemd/system/kdm.service - install -Dm644 "${srcdir}"/kdm.logrotate "${pkgdir}"/etc/logrotate.d/kdm -} diff --git a/staging/kdebase-workspace/etc-scripts.patch b/staging/kdebase-workspace/etc-scripts.patch deleted file mode 100644 index 903a90a53..000000000 --- a/staging/kdebase-workspace/etc-scripts.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- startkde.cmake.orig 2009-01-15 14:24:44.000000000 +0100 -+++ startkde.cmake 2009-01-15 14:33:08.000000000 +0100 -@@ -206,7 +190,7 @@ - # For anything else (that doesn't set env vars, or that needs a window manager), - # better use the Autostart folder. - --libpath=`kde4-config --path lib | tr : '\n'` -+libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/') - - for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do - for file in "$prefix"*.sh; do diff --git a/staging/kdebase-workspace/fixpath.patch b/staging/kdebase-workspace/fixpath.patch deleted file mode 100644 index be2b8383e..000000000 --- a/staging/kdebase-workspace/fixpath.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- startkde.cmake.orig 2009-01-15 14:24:44.000000000 +0100 -+++ startkde.cmake 2009-01-15 14:33:08.000000000 +0100 -@@ -34,22 +34,6 @@ - MALLOC_CHECK_=2 - export MALLOC_CHECK_ - --# in case we have been started with full pathname spec without being in PATH --bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` --if [ -n "$bindir" ]; then -- qbindir=`$bindir/kde4-config --qt-binaries` -- if [ -n "$qbindir" ]; then -- case $PATH in -- $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;; -- *) PATH=$qbindir:$PATH; export PATH;; -- esac -- fi -- case $PATH in -- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; -- *) PATH=$bindir:$PATH; export PATH;; -- esac --fi -- - # Boot sequence: - # - # kdeinit is used to fork off processes which improves memory usage -@@ -206,7 +190,7 @@ - # For anything else (that doesn't set env vars, or that needs a window manager), - # better use the Autostart folder. - --libpath=`kde4-config --path lib | tr : '\n'` -+libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/') - - for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do - for file in "$prefix"*.sh; do diff --git a/staging/kdebase-workspace/kde-np.pam b/staging/kdebase-workspace/kde-np.pam deleted file mode 100644 index eccaa08f4..000000000 --- a/staging/kdebase-workspace/kde-np.pam +++ /dev/null @@ -1,12 +0,0 @@ -#%PAM-1.0 -auth required pam_tally.so onerr=succeed file=/var/log/faillog -auth required pam_shells.so -auth requisite pam_nologin.so -auth required pam_env.so -auth optional pam_permit.s - -account include system-login - -password include system-login - -session include system-login diff --git a/staging/kdebase-workspace/kde.pam b/staging/kdebase-workspace/kde.pam deleted file mode 100644 index a0a29483d..000000000 --- a/staging/kdebase-workspace/kde.pam +++ /dev/null @@ -1,8 +0,0 @@ -#%PAM-1.0 -auth include system-login - -account include system-login - -password include system-login - -session include system-login diff --git a/staging/kdebase-workspace/kdebase-workspace.install b/staging/kdebase-workspace/kdebase-workspace.install deleted file mode 100644 index f7d6d305b..000000000 --- a/staging/kdebase-workspace/kdebase-workspace.install +++ /dev/null @@ -1,25 +0,0 @@ -post_install() { - groupadd -g 135 kdm &>/dev/null - useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null - chown -R 135:135 var/lib/kdm &>/dev/null - xdg-icon-resource forceupdate --theme hicolor &>/dev/null - update-desktop-database -q -} - -post_upgrade() { - getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null - getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null - chown -R 135:135 var/lib/kdm &>/dev/null - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_remove() { - if getent passwd kdm >/dev/null 2>&1; then - userdel kdm - fi - if getent group kdm >/dev/null 2>&1; then - groupdel kdm - fi - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} diff --git a/staging/kdebase-workspace/kdm b/staging/kdebase-workspace/kdm deleted file mode 100644 index 799d58f4b..000000000 --- a/staging/kdebase-workspace/kdm +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=$(pidof -o %PPID /usr/bin/kdm) -case "$1" in - start) - stat_busy "Starting KDE Desktop Manager" - [ -z "$PID" ] && /usr/bin/kdm &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon kdm - stat_done - fi - ;; - stop) - stat_busy "Stopping KDE Desktop Manager" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon kdm - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/staging/kdebase-workspace/kdm-xinitrd.patch b/staging/kdebase-workspace/kdm-xinitrd.patch deleted file mode 100644 index f5fc0e571..000000000 --- a/staging/kdebase-workspace/kdm-xinitrd.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c~ 2011-10-04 22:11:24.787771512 +0000 -+++ kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c 2011-10-04 22:13:58.612702824 +0000 -@@ -742,6 +742,15 @@ - "[ -f /etc/xprofile ] && . /etc/xprofile\n" - "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n" - "\n" -+"# run all system xinitrc shell scripts.\n" -+"if [ -d /etc/X11/xinit/xinitrc.d ]; then\n" -+" for i in /etc/X11/xinit/xinitrc.d/* ; do\n" -+" if [ -x \"$i\" ]; then\n" -+" . \"$i\"\n" -+" fi\n" -+" done\n" -+"fi\n" -+"\n" - "if [ -d /etc/X11/Xresources ]; then\n" - " for i in /etc/X11/Xresources/*; do\n" - " [ -f $i ] && xrdb -merge $i\n" diff --git a/staging/kdebase-workspace/kdm.logrotate b/staging/kdebase-workspace/kdm.logrotate deleted file mode 100644 index 34331feae..000000000 --- a/staging/kdebase-workspace/kdm.logrotate +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/kdm.log { - maxage 365 - size=+1024k - notifempty - missingok -} diff --git a/staging/kdebase-workspace/kdm.service b/staging/kdebase-workspace/kdm.service deleted file mode 100644 index c57aba920..000000000 --- a/staging/kdebase-workspace/kdm.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=K Display Manager -After=systemd-user-sessions.service - -[Service] -ExecStart=/usr/bin/kdm -nodaemon - -[Install] -Alias=display-manager.service diff --git a/staging/kdebase-workspace/kscreensaver.pam b/staging/kdebase-workspace/kscreensaver.pam deleted file mode 100644 index b4d80c21f..000000000 --- a/staging/kdebase-workspace/kscreensaver.pam +++ /dev/null @@ -1 +0,0 @@ -auth required pam_unix_auth.so diff --git a/staging/kdebase-workspace/logind-support.patch b/staging/kdebase-workspace/logind-support.patch deleted file mode 100644 index 9de205400..000000000 --- a/staging/kdebase-workspace/logind-support.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: Lukas Tinkl <lukas@kde.org> -Date: Fri, 05 Oct 2012 09:57:13 +0000 -Subject: store the filedescriptor in a member variable -X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=a18b78d7da8cb8d627ad2e85f666bfcf1a2721e1 ---- -store the filedescriptor in a member variable - -make systemd-inhibit work as intended, PowerDevil now handles -power/sleep/lid buttons as intended - -BUG: 307412 ---- - - ---- a/powerdevil/daemon/powerdevilpolicyagent.cpp -+++ b/powerdevil/daemon/powerdevilpolicyagent.cpp -@@ -29,7 +29,6 @@ - #include <QtDBus/QDBusPendingReply> - #include <QtDBus/QDBusConnectionInterface> - #include <QtDBus/QDBusServiceWatcher> --#include <QtDBus/QDBusUnixFileDescriptor> - - #include <KGlobal> - #include <KDebug> -@@ -225,6 +224,9 @@ - onActiveSessionChanged(m_activeSessionPath); - - // inhibit systemd handling of power/sleep/lid buttons -+ // http://www.freedesktop.org/wiki/Software/systemd/inhibit -+ kDebug() << "fd passing available:" << bool(managerIface.connection().connectionCapabilities() & QDBusConnection::UnixFileDescriptorPassing); -+ - QVariantList args; - args << "handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch"; // what - args << "PowerDevil"; // who -@@ -232,8 +234,9 @@ - args << "block"; // mode - QDBusPendingReply<QDBusUnixFileDescriptor> desc = managerIface.asyncCallWithArgumentList("Inhibit", args); - desc.waitForFinished(); -- if (desc.isValid() && desc.value().isValid()) { -- kDebug() << "systemd powersave events handling inhibited"; -+ if (desc.isValid()) { -+ m_systemdInhibitFd = desc.value(); -+ kDebug() << "systemd powersave events handling inhibited, descriptor:" << m_systemdInhibitFd.fileDescriptor(); - } - else - kWarning() << "failed to inhibit systemd powersave handling"; - ---- a/powerdevil/daemon/powerdevilpolicyagent.h -+++ b/powerdevil/daemon/powerdevilpolicyagent.h -@@ -27,6 +27,7 @@ - #include <QtCore/QWeakPointer> - - #include <QtDBus/QDBusContext> -+#include <QtDBus/QDBusUnixFileDescriptor> - - #include <kdemacros.h> - -@@ -108,6 +109,7 @@ - QString m_activeSessionPath; - QWeakPointer< QDBusInterface > m_sdSessionInterface; - QWeakPointer< QDBusInterface > m_sdSeatInterface; -+ QDBusUnixFileDescriptor m_systemdInhibitFd; - - // ConsoleKit support - bool m_ckAvailable; - diff --git a/staging/kdebase-workspace/terminate-server.patch b/staging/kdebase-workspace/terminate-server.patch deleted file mode 100644 index 094591317..000000000 --- a/staging/kdebase-workspace/terminate-server.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kdm/config.def 2009-08-27 10:17:39.000000000 +0200 -+++ kdm/config.def 2009-10-31 00:40:21.000000000 +0100 -@@ -1448,7 +1448,7 @@ - - Key: TerminateServer - Type: bool --Default: false -+Default: true - User: core - Instance: #:*/! - Merge: xdm diff --git a/staging/kdebase/PKGBUILD b/staging/kdebase/PKGBUILD deleted file mode 100644 index 68efa7ac1..000000000 --- a/staging/kdebase/PKGBUILD +++ /dev/null @@ -1,120 +0,0 @@ -# $Id: PKGBUILD 160993 2012-06-07 20:27:36Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdebase -pkgname=('kdebase-dolphin' - 'kdebase-kdepasswd' - 'kdebase-kdialog' - 'kdebase-keditbookmarks' - 'kdebase-kfind' - 'kdebase-konq-plugins' - 'kdebase-konqueror' - 'kdebase-lib' - 'kdebase-plasma') -pkgver=4.8.4 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdebase') -makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml') -source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz") -sha1sums=('a1d6951b27c868c738a36dbd21702b658f3d6245') - -build() { - cd ${srcdir} - mkdir build - cd build - cmake ../kde-baseapps-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package_kdebase-dolphin() { - pkgdesc='File Manager' - depends=('kdebase-runtime' 'kdebase-lib') - optdepends=('kdegraphics-svgpart: thumbailers for SVG files' - 'kdegraphics-thumbnailers: thumbnailers for graphics file' - 'ruby: servicemenu installation') - url="http://kde.org/applications/system/dolphin/" - install=kdebase-dolphin.install - cd $srcdir/build/dolphin - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/dolphin - make DESTDIR=$pkgdir install -} - -package_kdebase-kdepasswd() { - pkgdesc='Change Password' - depends=('kdebase-runtime' 'kdebase-lib') - cd $srcdir/build/kdepasswd - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kdepasswd - make DESTDIR=$pkgdir install -} - -package_kdebase-kdialog() { - pkgdesc='A utility for displaying dialog boxes from shell scripts' - depends=('kdebase-runtime') - cd $srcdir/build/kdialog - make DESTDIR=$pkgdir install -} - -package_kdebase-keditbookmarks() { - pkgdesc='Bookmark Organizer and Editor' - depends=('kdebase-runtime') - cd $srcdir/build/keditbookmarks - make DESTDIR=$pkgdir install -} - -package_kdebase-kfind() { - pkgdesc='Find Files/Folders' - depends=('kdebase-runtime' 'kdebase-lib') - url="http://kde.org/applications/utilities/kfind/" - install='kdebase.install' - cd $srcdir/build/kfind - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kfind - make DESTDIR=$pkgdir install -} - -package_kdebase-konq-plugins() { - pkgdesc='Extra plugins for Konqueror' - depends=('kdebase-konqueror' 'tidyhtml') - replaces=('konq-plugins') - install='kdebase.install' - cd $srcdir/build/konq-plugins - make DESTDIR=$pkgdir install -} - -package_kdebase-konqueror() { - pkgdesc='KDE File Manager & Web Browser' - depends=('kdebase-dolphin' 'kdebase-keditbookmarks') - optdepends=('kwebkitpart: to enable webkit engine') - url="http://kde.org/applications/internet/konqueror/" - install='kdebase-konqueror.install' - conflicts=('kdebase-nsplugins') - replaces=('kdebase-nsplugins') - for i in konqueror doc/konqueror nsplugins; do - cd $srcdir/build/${i} - make DESTDIR=$pkgdir install - done -} - -package_kdebase-lib() { - pkgdesc='KDE libraries for the basic desktop applications' - groups=() - depends=('kdelibs') - cd $srcdir/build/lib - make DESTDIR=$pkgdir install -} - -package_kdebase-plasma() { - pkgdesc='Display the contents of folders (User´s home folder as default)' - depends=('kdebase-workspace' 'kdebase-lib') - cd $srcdir/build/plasma - make DESTDIR=$pkgdir install -} diff --git a/staging/kdebase/kdebase-dolphin.install b/staging/kdebase/kdebase-dolphin.install deleted file mode 100644 index 660593cf5..000000000 --- a/staging/kdebase/kdebase-dolphin.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdebase/kdebase-konqueror.install b/staging/kdebase/kdebase-konqueror.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/staging/kdebase/kdebase-konqueror.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdebase/kdebase.install b/staging/kdebase/kdebase.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdebase/kdebase.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/kdebindings-kimono/PKGBUILD b/staging/kdebindings-kimono/PKGBUILD deleted file mode 100644 index 5ac4fb7a7..000000000 --- a/staging/kdebindings-kimono/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 161009 2012-06-07 20:39:21Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdebindings-kimono -pkgver=4.8.4 -pkgrel=1 -pkgdesc=".NET/Mono bindings for the KDE libraries" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kdebindings') -depends=('kdebindings-qyoto' 'kdebindings-smokekde') -makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs') -conflicts=('kdebindings-csharp') -source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.xz") -sha1sums=('9c8e41ebcec01cede7987958bb4d7ce775587e45') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kimono-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_Soprano=OFF - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdebindings-korundum/PKGBUILD b/staging/kdebindings-korundum/PKGBUILD deleted file mode 100644 index 154443486..000000000 --- a/staging/kdebindings-korundum/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 161010 2012-06-07 20:39:45Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdebindings-korundum -pkgver=4.8.4 -pkgrel=1 -pkgdesc="KDE bindings for ruby" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kdebindings') -depends=('kdebindings-qtruby' 'kdebindings-smokekde') -makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' - 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') -conflicts=('kdebindings-ruby') -options=('!makeflags') -source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz" - 'korundum-4.8.0-ruby19.patch') -sha1sums=('ce722ea7c64ce90d11370e393a87cb067962853e' - '73299f56a891d8a5475ac07dd485619859312f70') - -build() { - cd "${srcdir}/korundum-${pkgver}" - patch -p1 -i "${srcdir}/korundum-4.8.0-ruby19.patch" - cd .. - mkdir build - cd build - - cmake ../korundum-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCUSTOM_RUBY_SITE_LIB_DIR=$(ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]') \ - -DCUSTOM_RUBY_SITE_ARCH_DIR=$(ruby -e 'puts RbConfig::CONFIG["vendorarchdir"]') - - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdebindings-korundum/korundum-4.8.0-ruby19.patch b/staging/kdebindings-korundum/korundum-4.8.0-ruby19.patch deleted file mode 100644 index ac4d32ae9..000000000 --- a/staging/kdebindings-korundum/korundum-4.8.0-ruby19.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up korundum-4.8.0/src/krubypluginfactory.cpp.ruby19 korundum-4.8.0/src/krubypluginfactory.cpp ---- korundum-4.8.0/src/krubypluginfactory.cpp.ruby19 2011-07-27 13:37:29.000000000 -0500 -+++ korundum-4.8.0/src/krubypluginfactory.cpp 2012-02-17 08:30:38.785635819 -0600 -@@ -39,7 +39,7 @@ - extern "C" { - extern VALUE rb_load_path; - extern VALUE qt_internal_module; --void Init_prelude(void); -+// void Init_prelude(void); - } - - // -@@ -165,7 +165,7 @@ QObject *KRubyPluginFactory::create(cons - #if RUBY_VERSION >= 0x10900 - VALUE gem = rb_define_module("Gem"); - rb_const_set(gem, rb_intern("Enable"), Qtrue); -- Init_prelude(); -+// Init_prelude(); - #endif - - ruby_incpush(QFile::encodeName(program.path())); -@@ -342,7 +342,7 @@ int kdemain(int argc, char **argv) - #if RUBY_VERSION >= 0x10900 - VALUE gem = rb_define_module("Gem"); - rb_const_set(gem, rb_intern("Enable"), Qtrue); -- Init_prelude(); -+// Init_prelude(); - #endif - - ruby_incpush(QFile::encodeName(program.path())); diff --git a/staging/kdebindings-kross/PKGBUILD b/staging/kdebindings-kross/PKGBUILD deleted file mode 100644 index 836a60020..000000000 --- a/staging/kdebindings-kross/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 161011 2012-06-07 20:40:10Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgbase=kdebindings-kross -pkgname=('kdebindings-kross-python' -# 'kdebindings-kross-ruby' - 'kdebindings-kross-java') -pkgver=4.8.4 -pkgrel=1 -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kdebindings') -makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment') -source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.xz") -sha1sums=('b5b73e10aa51377abe4da74eb98589fcc7eb83c4') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kross-interpreters-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_ruby=OFF \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 - make -} - -package_kdebindings-kross-python() { - pkgdesc="Python2 language interpreters to enable in-process scripting with Kross" - depends=('kdelibs' 'python2') - - cd "${srcdir}"/build/python - make DESTDIR="${pkgdir}" install -} - -package_kdebindings-kross-java() { - pkgdesc="Java language interpreters to enable in-process scripting with Kross" - depends=('kdelibs' 'java-environment') - - cd "${srcdir}"/build/java - make DESTDIR="${pkgdir}" install -} - -package_kdebindings-kross-ruby() { - pkgdesc="Ruby language interpreters to enable in-process scripting with Kross" - depends=('kdelibs' 'ruby') - - cd "${srcdir}"/build/ruby - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdebindings-perlkde/PKGBUILD b/staging/kdebindings-perlkde/PKGBUILD deleted file mode 100644 index 7122b3f4b..000000000 --- a/staging/kdebindings-perlkde/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161070 2012-06-07 23:17:28Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdebindings-perlkde -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Perl bindings for the KDE libraries" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kdebindings') -depends=('kdebindings-perlqt' 'kdebindings-smokekde') -makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs' - 'kdegraphics-okular' 'kdesdk-kate') -source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz") -sha1sums=('5d94e2f4d6a32cf4cc7ff1d577d925de53ec8dee') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../perlkde-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdebindings-perlqt/PKGBUILD b/staging/kdebindings-perlqt/PKGBUILD deleted file mode 100644 index ac2a4f463..000000000 --- a/staging/kdebindings-perlqt/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161072 2012-06-07 23:20:05Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdebindings-perlqt -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Perl bindings for the Qt libraries" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kdebindings') -depends=('kdebindings-smokeqt' 'perl-list-moreutils') -makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') -source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.xz") -sha1sums=('86a7706bff687f1721d0b17e9bde3aa36e0970fb') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../perlqt-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdebindings-python/PKGBUILD b/staging/kdebindings-python/PKGBUILD deleted file mode 100644 index f7a8b2651..000000000 --- a/staging/kdebindings-python/PKGBUILD +++ /dev/null @@ -1,75 +0,0 @@ -# $Id: PKGBUILD 168462 2012-10-12 06:36:34Z eric $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgbase=kdebindings-python -pkgname=('kdebindings-python' - 'kdebindings-python2') -pkgver=4.9.2 -pkgrel=2 -url='https://projects.kde.org/projects/kde/kdebindings/pykde4' -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kdebindings') -makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' - 'pyqt' 'qscintilla' 'python2-sip' 'python-sip') -source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz" - 'pyqt495.patch') -sha1sums=('44b3f02797c43a59f8c3a91131a2488a733cfa11' - '0935c32e55806873f2d088613594559285da7e9c') - -build() { - export PYTHONDONTWRITEBYTECODE="TRUE" - - cd pykde4-${pkgver} - patch -p1 -i "${srcdir}"/pyqt495.patch - cd ../ - - mkdir build - cd build - cmake ../pykde4-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DPYTHON_EXECUTABLE=/usr/bin/python3 \ - -DPYTHON_LIBRARY=/usr/lib/libpython3.3m.so.1.0 - make - cd .. - - mkdir build-python2 - cd build-python2 - cmake ../pykde4-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 - make -} - -package_kdebindings-python() { - pkgdesc="A set of Python 3.x bindings for KDE" - depends=('kdepim-runtime' 'pyqt' 'qscintilla') - - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} - -package_kdebindings-python2() { - pkgdesc="A set of Python 2.x bindings for KDE" - depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla') - conflicts=('kdebindings-python<4.8.1-2') - - cd "${srcdir}"/build-python2 - make DESTDIR="${pkgdir}" install - - # Fix conflicts - rm "${pkgdir}"/usr/bin/pykdeuic4 - ln -sf /usr/lib/python2.7/site-packages/PyQt4/uic/pykdeuic4.py \ - "${pkgdir}"/usr/bin/python2-pykdeuic4 - - mv "${pkgdir}"/usr/share/apps/pykde4/examples \ - "${pkgdir}"/usr/share/apps/pykde4/python2-examples - - mv "${pkgdir}"/usr/share/sip/PyKDE4 \ - "${pkgdir}"/usr/share/sip/python2-PyKDE4 - - # Use the python2 executable - find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -} diff --git a/staging/kdebindings-python/pyqt495.patch b/staging/kdebindings-python/pyqt495.patch deleted file mode 100644 index b8a9df258..000000000 --- a/staging/kdebindings-python/pyqt495.patch +++ /dev/null @@ -1,95 +0,0 @@ -From: Luca Beltrame <lbeltrame@kde.org> -Date: Mon, 01 Oct 2012 18:47:56 +0000 -Subject: Remove duplicated QVector<int> definition, since it's in PyQt now. -X-Git-Url: http://quickgit.kde.org/?p=pykde4.git&a=commitdiff&h=017822bd0dfc83fe9a7a483ecc33f4aab839a3c6 ---- -Remove duplicated QVector<int> definition, since it's in PyQt now. -Simon, if you have time, please review if everything is OK. - -CCMAIL: simon@simonzone.com ---- - - ---- a/sip/kdecore/typedefs.sip -+++ b/sip/kdecore/typedefs.sip -@@ -951,78 +951,4 @@ - %End - }; - --%MappedType QVector<int> --{ --%TypeHeaderCode --#include <qvector.h> --%End -- --%ConvertFromTypeCode -- // Create the list. -- PyObject *l; -- -- if ((l = PyList_New(sipCpp->size())) == NULL) -- return NULL; -- -- // Set the list elements. -- for (int i = 0; i < sipCpp->size(); ++i) -- { -- int t = (sipCpp->at(i)); -- --#if PY_MAJOR_VERSION >= 3 -- PyObject *tobj = PyLong_FromLong(t); --#else -- PyObject *tobj = PyInt_FromLong(t); --#endif -- -- PyList_SET_ITEM(l, i, tobj); -- } -- -- return l; --%End -- --%ConvertToTypeCode -- // Check the type if that is all that is required. -- if (sipIsErr == NULL) -- { -- if (!PyList_Check(sipPy)) -- return 0; -- -- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) { -- PyObject *tobj = PyList_GET_ITEM(sipPy, i); --#if PY_MAJOR_VERSION >= 3 -- if (!PyNumber_Check(tobj)) --#else -- if (!PyInt_Check(tobj)) --#endif -- return 0; -- } -- return 1; -- } -- -- QVector<int> *qv = new QVector<int>; -- -- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) -- { -- PyObject *tobj = PyList_GET_ITEM(sipPy, i); -- #if PY_MAJOR_VERSION >= 3 -- int t = PyLong_AsLong (tobj); --#else -- int t = PyInt_AS_LONG (tobj); --#endif -- -- if (*sipIsErr) -- { -- delete qv; -- return 0; -- } -- -- qv->append(t); -- } -- -- *sipCppPtr = qv; -- -- return sipGetState(sipTransferObj); --%End --}; -- -+ - diff --git a/staging/kdebindings-qtruby/PKGBUILD b/staging/kdebindings-qtruby/PKGBUILD deleted file mode 100644 index 922fb2a4f..000000000 --- a/staging/kdebindings-qtruby/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 160991 2012-06-07 20:25:04Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdebindings-qtruby -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Qt bindings for ruby" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kdebindings') -depends=('kdebindings-smokeqt' 'ruby') -makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') -conflicts=('kdebindings-ruby') -source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.xz") -sha1sums=('ce9f9b45d7e9edc839257a1f1c53b1e699503b47') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../qtruby-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCUSTOM_RUBY_SITE_LIB_DIR=`ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]'` - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdebindings-qyoto/PKGBUILD b/staging/kdebindings-qyoto/PKGBUILD deleted file mode 100644 index cc8bcde15..000000000 --- a/staging/kdebindings-qyoto/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 160990 2012-06-07 20:24:35Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdebindings-qyoto -pkgver=4.8.4 -pkgrel=1 -pkgdesc=".NET/Mono bindings for the Qt libraries" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kdebindings') -depends=('kdebindings-smokeqt' 'mono') -makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') -conflicts=('kdebindings-csharp') -source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.xz") -sha1sums=('8df3ad9630e8435e6af5af5809520662c95ee516') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../qyoto-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdebindings-smokegen/PKGBUILD b/staging/kdebindings-smokegen/PKGBUILD deleted file mode 100644 index b695b529d..000000000 --- a/staging/kdebindings-smokegen/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 160984 2012-06-07 20:20:09Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdebindings-smokegen -pkgver=4.8.4 -pkgrel=1 -pkgdesc="A general purpose C++ parser with a plugin infrastructure" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -conflicts=('kdebindings-smoke') -source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.xz") -sha1sums=('5ff7d15ed1cdea07f455fbf1189885518cf43cb6') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../smokegen-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdebindings-smokekde/PKGBUILD b/staging/kdebindings-smokekde/PKGBUILD deleted file mode 100644 index 2493b0d80..000000000 --- a/staging/kdebindings-smokekde/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 160988 2012-06-07 20:22:50Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdebindings-smokekde -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Language independent library for KDE bindings" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kdebindings') -depends=('kdebindings-smokeqt') -makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' - 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') -conflicts=('kdebindings-smoke') -source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.xz") -sha1sums=('d028d68485bc32cfe6bc60dbd597d8f72c9e70ef') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../smokekde-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdebindings-smokeqt/PKGBUILD b/staging/kdebindings-smokeqt/PKGBUILD deleted file mode 100644 index d33d69b83..000000000 --- a/staging/kdebindings-smokeqt/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 160985 2012-06-07 20:20:37Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdebindings-smokeqt -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Language independent library for Qt bindings" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kdebindings') -depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'kdebindings-smokegen') -makedepends=('cmake' 'automoc4') -conflicts=('kdebindings-smoke') -source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.xz") -sha1sums=('bf2be3e7ccf8d451f001fd2f08c306fb7f72169a') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../smokeqt-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_Qwt5=OFF - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdeedu-analitza/PKGBUILD b/staging/kdeedu-analitza/PKGBUILD deleted file mode 100644 index eaabf93f9..000000000 --- a/staging/kdeedu-analitza/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 161000 2012-06-07 20:31:13Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-analitza -pkgver=4.8.4 -pkgrel=1 -pkgdesc="A library to add mathematical features to your program" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.xz") -sha1sums=('d3b831730408078c31b686bc49c1d465de5e80da') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../analitza-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdeedu-blinken/PKGBUILD b/staging/kdeedu-blinken/PKGBUILD deleted file mode 100644 index 79dcf306a..000000000 --- a/staging/kdeedu-blinken/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161012 2012-06-07 20:41:03Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-blinken -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Memory Enhancement Game" -url="http://kde.org/applications/education/blinken/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.xz") -sha1sums=('571e1f06270d38e56149a8770517bf892859e2eb') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../blinken-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdeedu-blinken/kdeedu-blinken.install b/staging/kdeedu-blinken/kdeedu-blinken.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdeedu-blinken/kdeedu-blinken.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/kdeedu-cantor/PKGBUILD b/staging/kdeedu-cantor/PKGBUILD deleted file mode 100644 index 09149811a..000000000 --- a/staging/kdeedu-cantor/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 161013 2012-06-07 20:41:28Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-cantor -pkgver=4.8.4 -pkgrel=1 -pkgdesc="KDE Frontend to Mathematical Software" -url="http://kde.org/applications/education/cantor/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime' 'libspectre' 'kdeedu-analitza' 'libqalculate') -makedepends=('cmake' 'automoc4' 'r') -optdepends=('maxima: Maxima backend' - 'octave: Octave backend' - 'r: R backend') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz") -sha1sums=('8e284e632144a92f503092738d19843272d0412e') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../cantor-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdeedu-cantor/kdeedu-cantor.install b/staging/kdeedu-cantor/kdeedu-cantor.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/staging/kdeedu-cantor/kdeedu-cantor.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdeedu-kalgebra/PKGBUILD b/staging/kdeedu-kalgebra/PKGBUILD deleted file mode 100644 index e58035821..000000000 --- a/staging/kdeedu-kalgebra/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161014 2012-06-07 20:41:53Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-kalgebra -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Graph Calculator" -url="http://kde.org/applications/education/kalgebra/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.xz") -sha1sums=('be0bcd290c61713a0365e9eab2ddc8d58f447f34') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kalgebra-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdeedu-kalgebra/kdeedu-kalgebra.install b/staging/kdeedu-kalgebra/kdeedu-kalgebra.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/staging/kdeedu-kalgebra/kdeedu-kalgebra.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdeedu-kalzium/PKGBUILD b/staging/kdeedu-kalzium/PKGBUILD deleted file mode 100644 index 552153632..000000000 --- a/staging/kdeedu-kalzium/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161015 2012-06-07 20:42:17Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-kalzium -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Periodic Table of Elements" -url="http://kde.org/applications/education/kalzium/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdelibs' 'avogadro' 'ocaml' 'facile') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz") -sha1sums=('28ed27164680a28e478cc6e0a13c918bc2119dc2') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kalzium-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdeedu-kalzium/kdeedu-kalzium.install b/staging/kdeedu-kalzium/kdeedu-kalzium.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdeedu-kalzium/kdeedu-kalzium.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/kdeedu-kanagram/PKGBUILD b/staging/kdeedu-kanagram/PKGBUILD deleted file mode 100644 index b03e2e501..000000000 --- a/staging/kdeedu-kanagram/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161016 2012-06-07 20:42:50Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-kanagram -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Letter Order Game" -url="http://kde.org/applications/education/kanagram/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime' 'libkdeedu') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.xz") -sha1sums=('e897cc67ae046a4d7580f22a0ace534525fa6f1b') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kanagram-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdeedu-kanagram/kdeedu-kanagram.install b/staging/kdeedu-kanagram/kdeedu-kanagram.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdeedu-kanagram/kdeedu-kanagram.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/kdeedu-kbruch/PKGBUILD b/staging/kdeedu-kbruch/PKGBUILD deleted file mode 100644 index 29383f7c1..000000000 --- a/staging/kdeedu-kbruch/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161017 2012-06-07 20:43:15Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-kbruch -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Exercise Fractions" -url="http://kde.org/applications/education/kbruch/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.xz") -sha1sums=('40c24efddc30441a8de2ec315e1933ca429da14b') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kbruch-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdeedu-kbruch/kdeedu-kbruch.install b/staging/kdeedu-kbruch/kdeedu-kbruch.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdeedu-kbruch/kdeedu-kbruch.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/kdeedu-kgeography/PKGBUILD b/staging/kdeedu-kgeography/PKGBUILD deleted file mode 100644 index d8e46ddc4..000000000 --- a/staging/kdeedu-kgeography/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161018 2012-06-07 20:43:42Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-kgeography -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Geography Trainer" -url="http://kde.org/applications/education/kgeography/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.xz") -sha1sums=('4637c5a792164d083f0ea05e6733160922d8c73b') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kgeography-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdeedu-kgeography/kdeedu-kgeography.install b/staging/kdeedu-kgeography/kdeedu-kgeography.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdeedu-kgeography/kdeedu-kgeography.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/kdeedu-khangman/PKGBUILD b/staging/kdeedu-khangman/PKGBUILD deleted file mode 100644 index 44e83bed2..000000000 --- a/staging/kdeedu-khangman/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161019 2012-06-07 20:44:18Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-khangman -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Hangman Game" -url="http://kde.org/applications/education/khangman/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime' 'libkdeedu') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.xz") -sha1sums=('aa544ba55833983bd21ebf594f2003a66b251901') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../khangman-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdeedu-khangman/kdeedu-khangman.install b/staging/kdeedu-khangman/kdeedu-khangman.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdeedu-khangman/kdeedu-khangman.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/kdeedu-kig/PKGBUILD b/staging/kdeedu-kig/PKGBUILD deleted file mode 100644 index 25cb8dbe1..000000000 --- a/staging/kdeedu-kig/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 163120 2012-07-07 15:50:46Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-kig -pkgver=4.8.4 -pkgrel=2 -pkgdesc="Interactive Geometry" -url="http://kde.org/applications/education/kig/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.xz") -sha1sums=('dcbde5fbb34e0c569a2ef95a328cf69a924cd38e') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kig-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install - - # Use the python2 executable - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/bin/pykig.py -} diff --git a/staging/kdeedu-kig/kdeedu-kig.install b/staging/kdeedu-kig/kdeedu-kig.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/staging/kdeedu-kig/kdeedu-kig.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdeedu-kiten/PKGBUILD b/staging/kdeedu-kiten/PKGBUILD deleted file mode 100644 index 8f6a77a42..000000000 --- a/staging/kdeedu-kiten/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161021 2012-06-07 20:45:17Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-kiten -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Japanese Reference/Study Tool" -url="http://kde.org/applications/education/kiten/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.xz") -sha1sums=('f7b5f9b6cbbda37c539f1ffce9bd905f0be3658e') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kiten-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdeedu-kiten/kdeedu-kiten.install b/staging/kdeedu-kiten/kdeedu-kiten.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdeedu-kiten/kdeedu-kiten.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/kdeedu-klettres/PKGBUILD b/staging/kdeedu-klettres/PKGBUILD deleted file mode 100644 index d6f3cf26e..000000000 --- a/staging/kdeedu-klettres/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161022 2012-06-07 20:46:03Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-klettres -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Learn The Alphabet" -url="http://kde.org/applications/education/klettres/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.xz") -sha1sums=('b5dc64cdd09f265cd7a84d0ee14a93ea4ae067be') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../klettres-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdeedu-klettres/kdeedu-klettres.install b/staging/kdeedu-klettres/kdeedu-klettres.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdeedu-klettres/kdeedu-klettres.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/kdeedu-kmplot/PKGBUILD b/staging/kdeedu-kmplot/PKGBUILD deleted file mode 100644 index 4184aa4c9..000000000 --- a/staging/kdeedu-kmplot/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161023 2012-06-07 20:46:32Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-kmplot -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Mathematical Function Plotter" -url="http://kde.org/applications/education/kmplot/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.xz") -sha1sums=('07ada013e1a046afe3bb3542a2485b1ec0d4736e') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kmplot-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdeedu-kmplot/kdeedu-kmplot.install b/staging/kdeedu-kmplot/kdeedu-kmplot.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/staging/kdeedu-kmplot/kdeedu-kmplot.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdeedu-kstars/PKGBUILD b/staging/kdeedu-kstars/PKGBUILD deleted file mode 100644 index 791efc270..000000000 --- a/staging/kdeedu-kstars/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 161024 2012-06-07 20:46:58Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-kstars -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Desktop Planetarium" -url="http://kde.org/applications/education/kstars/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime' 'libindi') -makedepends=('cmake' 'automoc4' 'eigen') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.xz") -sha1sums=('579cec66cfb172258d2967872a2b9c32d4514c75') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kstars-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_Xplanet=OFF - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdeedu-kstars/kdeedu-kstars.install b/staging/kdeedu-kstars/kdeedu-kstars.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdeedu-kstars/kdeedu-kstars.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/kdeedu-ktouch/PKGBUILD b/staging/kdeedu-ktouch/PKGBUILD deleted file mode 100644 index dd8bbe762..000000000 --- a/staging/kdeedu-ktouch/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161025 2012-06-07 20:47:44Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-ktouch -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Touch Typing Tutor" -url="http://kde.org/applications/education/ktouch/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz") -sha1sums=('95e7712b9644d1b3491c988bc591d7c5b4e4d3b7') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../ktouch-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdeedu-ktouch/kdeedu-ktouch.install b/staging/kdeedu-ktouch/kdeedu-ktouch.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdeedu-ktouch/kdeedu-ktouch.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/kdeedu-kturtle/PKGBUILD b/staging/kdeedu-kturtle/PKGBUILD deleted file mode 100644 index b9eead881..000000000 --- a/staging/kdeedu-kturtle/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161026 2012-06-07 20:48:11Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-kturtle -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Educational Programming Environment" -url="http://kde.org/applications/education/kturtle/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.xz") -sha1sums=('160972878f61c37575fb5953b88354fe174fe8ab') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kturtle-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdeedu-kturtle/kdeedu-kturtle.install b/staging/kdeedu-kturtle/kdeedu-kturtle.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdeedu-kturtle/kdeedu-kturtle.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/kdeedu-kwordquiz/PKGBUILD b/staging/kdeedu-kwordquiz/PKGBUILD deleted file mode 100644 index 819e9cfa4..000000000 --- a/staging/kdeedu-kwordquiz/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161027 2012-06-07 20:48:34Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-kwordquiz -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Flash Card Trainer" -url="http://kde.org/applications/education/kwordquiz/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime' 'libkdeedu') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.xz") -sha1sums=('ab6cf92bbedef4115951d3cc53a9f3b91ac11875') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kwordquiz-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdeedu-kwordquiz/kdeedu-kwordquiz.install b/staging/kdeedu-kwordquiz/kdeedu-kwordquiz.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/staging/kdeedu-kwordquiz/kdeedu-kwordquiz.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdeedu-marble/PKGBUILD b/staging/kdeedu-marble/PKGBUILD deleted file mode 100644 index 31eb0e03f..000000000 --- a/staging/kdeedu-marble/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 160995 2012-06-07 20:28:36Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-marble -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Desktop Globe" -url="http://kde.org/applications/education/marble/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4' 'gpsd') -optdepends=('gpsd: gps support') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz") -sha1sums=('ec3cd41a1d333e9e3b34595adf6e4859315159b9') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../marble-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdeedu-marble/kdeedu-marble.install b/staging/kdeedu-marble/kdeedu-marble.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/staging/kdeedu-marble/kdeedu-marble.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdeedu-parley/PKGBUILD b/staging/kdeedu-parley/PKGBUILD deleted file mode 100644 index c0232b9d5..000000000 --- a/staging/kdeedu-parley/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161028 2012-06-07 20:49:00Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-parley -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Vocabulary Trainer" -url="http://kde.org/applications/education/parley/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime' 'libkdeedu') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.xz") -sha1sums=('bfc361363fa0cb866fd1d704b86d71401c1c4ea6') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../parley-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdeedu-parley/kdeedu-parley.install b/staging/kdeedu-parley/kdeedu-parley.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/staging/kdeedu-parley/kdeedu-parley.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdeedu-rocs/PKGBUILD b/staging/kdeedu-rocs/PKGBUILD deleted file mode 100644 index 2d3dd044a..000000000 --- a/staging/kdeedu-rocs/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 163122 2012-07-07 16:00:36Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-rocs -pkgver=4.8.4 -pkgrel=2 -pkgdesc="Rocs Graph Theory" -url="http://kde.org/applications/education/rocs/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4' 'boost') -source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.xz") -sha1sums=('991e5aa15e59cc432a9c9f140fe90bd47f8f8e15') -options=('!makeflags') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../rocs-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdeedu-step/PKGBUILD b/staging/kdeedu-step/PKGBUILD deleted file mode 100644 index 81f82038e..000000000 --- a/staging/kdeedu-step/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161030 2012-06-07 20:50:01Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-step -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Interactive Physical Simulator" -url="http://kde.org/applications/education/step/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime' 'libqalculate' 'gsl') -makedepends=('cmake' 'automoc4' 'eigen') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.xz") -sha1sums=('498d8243309388fa8b59cd968c0c92fc588eda11') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../step-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdeedu-step/kdeedu-step.install b/staging/kdeedu-step/kdeedu-step.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdeedu-step/kdeedu-step.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/kdegames/PKGBUILD b/staging/kdegames/PKGBUILD deleted file mode 100644 index e0659a661..000000000 --- a/staging/kdegames/PKGBUILD +++ /dev/null @@ -1,518 +0,0 @@ -# $Id: PKGBUILD 161031 2012-06-07 20:51:29Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdegames -pkgname=('kdegames-bomber' - 'kdegames-bovo' - 'kdegames-granatier' - 'kdegames-kajongg' - 'kdegames-kapman' - 'kdegames-katomic' - 'kdegames-kbattleship' - 'kdegames-kblackbox' - 'kdegames-kblocks' - 'kdegames-kbounce' - 'kdegames-kbreakout' - 'kdegames-kdiamond' - 'kdegames-kfourinline' - 'kdegames-kgoldrunner' - 'kdegames-kigo' - 'kdegames-killbots' - 'kdegames-kiriki' - 'kdegames-kjumpingcube' - 'kdegames-klines' - 'kdegames-klickety' - 'kdegames-kmahjongg' - 'kdegames-kmines' - 'kdegames-knetwalk' - 'kdegames-kolf' - 'kdegames-kollision' - 'kdegames-konquest' - 'kdegames-kpatience' - 'kdegames-kreversi' - 'kdegames-kshisen' - 'kdegames-ksirk' - 'kdegames-kspaceduel' - 'kdegames-ksquares' - 'kdegames-ksudoku' - 'kdegames-ktron' - 'kdegames-ktuberling' - 'kdegames-kubrick' - 'kdegames-libkdegames' - 'kdegames-libkmahjongg' - 'kdegames-lskat' - 'kdegames-palapeli') -pkgver=4.8.4 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdegames') -makedepends=('cmake' 'automoc4' 'ggz-client-libs' 'twisted' 'kdebindings-python2' - 'openal') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('00a68215c3e8b41ec8b7949c5d82af8e54766e97') - -build() { - cd $srcdir - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 - make -} - -package_kdegames-bomber() { - pkgdesc='Arcade Bombing Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/bomber/" - install='kdegames.install' - cd $srcdir/build/bomber - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/bomber - make DESTDIR=$pkgdir install -} - -package_kdegames-bovo() { - pkgdesc='Five-in-a-row Board Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/bovo/" - install='kdegames.install' - cd $srcdir/build/bovo - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/bovo - make DESTDIR=$pkgdir install -} - -package_kdegames-granatier() { - pkgdesc='Granatier' - depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal') - url="http://kde.org/applications/games/granatier/" - install='kdegames.install' - cd $srcdir/build/granatier - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/granatier - make DESTDIR=$pkgdir install -} - -package_kdegames-kajongg() { - pkgdesc='The ancient Chinese board game for 4 players' - depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python2' 'twisted') - url="http://www.kde.org/applications/games/kajongg/" - install='kdegames.install' - cd $srcdir/build/kajongg - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kajongg - make DESTDIR=$pkgdir install - - # Use the python2 executable - find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -} - -package_kdegames-kapman() { - pkgdesc='Eat pills escaping ghosts' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kapman/" - install='kdegames.install' - cd $srcdir/build/kapman - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kapman - make DESTDIR=$pkgdir install -} - -package_kdegames-katomic() { - pkgdesc='Sokoban-like Logic Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/katomic/" - install='kdegames.install' - cd $srcdir/build/katomic - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/katomic - make DESTDIR=$pkgdir install -} - -package_kdegames-kbattleship() { - pkgdesc='Battleship Game' - depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs') - url="http://kde.org/applications/games/kbattleship/" - install='kdegames-kbattleship.install' - cd $srcdir/build/kbattleship - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kbattleship - make DESTDIR=$pkgdir install - install -D -m644 $srcdir/${pkgbase}-${pkgver}/kbattleship/src/module.dsc \ - $pkgdir/usr/share/ggz/kbattleship.dsc -} - -package_kdegames-kblackbox() { - pkgdesc='Blackbox Logic Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kblackbox/" - install='kdegames.install' - cd $srcdir/build/kblackbox - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kblackbox - make DESTDIR=$pkgdir install -} - -package_kdegames-kblocks() { - pkgdesc='Falling Blocks Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kblocks/" - install='kdegames.install' - cd $srcdir/build/kblocks - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kblocks - make DESTDIR=$pkgdir install -} - -package_kdegames-kbounce() { - pkgdesc='Ball Bouncing Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kbounce/" - install='kdegames.install' - cd $srcdir/build/kbounce - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kbounce - make DESTDIR=$pkgdir install -} - -package_kdegames-kbreakout() { - pkgdesc='Breakout-like Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kbreakout/" - install='kdegames.install' - cd $srcdir/build/kbreakout - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kbreakout - make DESTDIR=$pkgdir install -} - -package_kdegames-kdiamond() { - pkgdesc='Three-in-a-row game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kdiamond/" - install='kdegames.install' - cd $srcdir/build/kdiamond - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kdiamond - make DESTDIR=$pkgdir install -} - -package_kdegames-kfourinline() { - pkgdesc='Four-in-a-row Board Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kfourinline/" - install='kdegames-kfourinline.install' - cd $srcdir/build/kfourinline - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kfourinline - make DESTDIR=$pkgdir install -} - -package_kdegames-kgoldrunner() { - pkgdesc='A game of action and puzzle-solving' - depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal') - url="http://kde.org/applications/games/kgoldrunner/" - install='kdegames.install' - cd $srcdir/build/kgoldrunner - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kgoldrunner - make DESTDIR=$pkgdir install -} - -package_kdegames-kigo() { - pkgdesc='Go Board Game' - depends=('kdebase-runtime' 'kdegames-libkdegames' 'gnugo') - url="http://kde.org/applications/games/kigo/" - install='kdegames-kigo.install' - cd $srcdir/build/kigo - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kigo - make DESTDIR=$pkgdir install - install -D -m644 $srcdir/${pkgbase}-${pkgver}/kigo/src/module.dsc \ - $pkgdir/usr/share/ggz/kigo.dsc -} - -package_kdegames-killbots() { - pkgdesc='Killbots' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/killbots/" - install='kdegames.install' - cd $srcdir/build/killbots - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/killbots - make DESTDIR=$pkgdir install -} - -package_kdegames-kiriki() { - pkgdesc='Yahtzee-like Dice Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kiriki/" - install='kdegames.install' - cd $srcdir/build/kiriki - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kiriki - make DESTDIR=$pkgdir install -} - -package_kdegames-kjumpingcube() { - pkgdesc='Territory Capture Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kjumpingcube/" - install='kdegames.install' - cd $srcdir/build/kjumpingcube - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kjumpingcube - make DESTDIR=$pkgdir install -} - -package_kdegames-klickety() { - pkgdesc='Board Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - replaces=('kdegames-ksame') - conflicts=('kdegames-ksame') - url="http://kde.org/applications/games/ksame/" - install='kdegames.install' - cd $srcdir/build/klickety - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/klickety - make DESTDIR=$pkgdir install -} - -package_kdegames-klines() { - pkgdesc='Tactical Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/klines/" - install='kdegames.install' - cd $srcdir/build/klines - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/klines - make DESTDIR=$pkgdir install -} - -package_kdegames-kmahjongg() { - pkgdesc='Mahjongg Solitaire' - depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg') - url="http://kde.org/applications/games/kmahjongg/" - install='kdegames.install' - cd $srcdir/build/kmahjongg - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kmahjongg - make DESTDIR=$pkgdir install -} - -package_kdegames-kmines() { - pkgdesc='Minesweeper-like Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kmines/" - install='kdegames.install' - cd $srcdir/build/kmines - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kmines - make DESTDIR=$pkgdir install -} - -package_kdegames-knetwalk() { - pkgdesc='Network Construction Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/knetwalk/" - install='kdegames.install' - cd $srcdir/build/knetwalk - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/knetwalk - make DESTDIR=$pkgdir install -} - -package_kdegames-kolf() { - pkgdesc='Miniature Golf' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kolf/" - install='kdegames-kolf.install' - cd $srcdir/build/kolf - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kolf - make DESTDIR=$pkgdir install -} - -package_kdegames-kollision() { - pkgdesc='A simple ball dodging game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kollision/" - install='kdegames.install' - cd $srcdir/build/kollision - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kollision - make DESTDIR=$pkgdir install -} - -package_kdegames-konquest() { - pkgdesc='Galactic Strategy Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/konquest/" - install='kdegames.install' - cd $srcdir/build/konquest - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/konquest - make DESTDIR=$pkgdir install -} - -package_kdegames-kpatience() { - pkgdesc='Patience Card Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kpatience/" - install='kdegames-kpatience.install' - replaces=('kdegames-kpat') - cd $srcdir/build/kpat - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kpat - make DESTDIR=$pkgdir install -} - -package_kdegames-kreversi() { - pkgdesc='Reversi Board Game' - depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs') - url="http://kde.org/applications/games/kreversi/" - install='kdegames-kreversi.install' - cd $srcdir/build/kreversi - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kreversi - make DESTDIR=$pkgdir install - install -D -m644 $srcdir/${pkgbase}-${pkgver}/kreversi/module.dsc \ - $pkgdir/usr/share/ggz/kreversi.dsc -} - -package_kdegames-kshisen() { - pkgdesc='Shisen-Sho Mahjongg-like Tile Game' - depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg') - url="http://kde.org/applications/games/kshisen/" - install='kdegames.install' - cd $srcdir/build/kshisen - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kshisen - make DESTDIR=$pkgdir install -} - -package_kdegames-ksirk() { - pkgdesc='World Domination Strategy Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/ksirk/" - install='kdegames.install' - cd $srcdir/build/ksirk - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ksirk - make DESTDIR=$pkgdir install -} - -package_kdegames-kspaceduel() { - pkgdesc='Space Arcade Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kspaceduel/" - install='kdegames-kspaceduel.install' - cd $srcdir/build/kspaceduel - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kspaceduel - make DESTDIR=$pkgdir install -} - -package_kdegames-ksquares() { - pkgdesc='Connect the dots to create squares' - depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs') - url="http://kde.org/applications/games/ksquares/" - install='kdegames-ksquares.install' - cd $srcdir/build/ksquares - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ksquares - make DESTDIR=$pkgdir install - install -D -m644 $srcdir/${pkgbase}-${pkgver}/ksquares/src/module.dsc \ - $pkgdir/usr/share/ggz/ksquares.dsc -} - -package_kdegames-ksudoku() { - pkgdesc='KSudoku, Sudoku game & more for KDE' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/ksudoku/" - install='kdegames.install' - cd $srcdir/build/ksudoku - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ksudoku - make DESTDIR=$pkgdir install -} - -package_kdegames-ktron() { - pkgdesc='Tron-like Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/ktron/" - install='kdegames.install' - cd $srcdir/build/ktron - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ktron - make DESTDIR=$pkgdir install -} - -package_kdegames-ktuberling() { - pkgdesc='Picture Game for Children' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/ktuberling/" - install='kdegames-ktuberling.install' - cd $srcdir/build/ktuberling - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ktuberling - make DESTDIR=$pkgdir install -} - -package_kdegames-kubrick() { - pkgdesc='A 3-D game based on Rubik´s Cube' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kubrick/" - install='kdegames.install' - cd $srcdir/build/kubrick - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kubrick - make DESTDIR=$pkgdir install -} - -package_kdegames-libkdegames() { - pkgdesc='KDE game library' - groups=() - depends=('kdelibs') - cd $srcdir/build/libkdegames - make DESTDIR=$pkgdir install - for i in $srcdir/${pkgbase}-${pkgver}/cmake/modules/*.cmake; do - install -D -m644 $i $pkgdir/usr/share/apps/cmake/modules/$(basename $i) - done -} - -package_kdegames-libkmahjongg() { - pkgdesc='Library used for loading and rendering of Mahjongg tilesets' - groups=() - depends=('kdelibs') - cd $srcdir/build/libkmahjongg - make DESTDIR=$pkgdir install -} - -package_kdegames-lskat() { - pkgdesc='Card Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/lskat/" - install='kdegames-lskat.install' - cd $srcdir/build/lskat - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/lskat - make DESTDIR=$pkgdir install -} - -package_kdegames-palapeli() { - pkgdesc='Jigsaw puzzle game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/palapeli/" - install='kdegames-palapeli.install' - cd $srcdir/build/palapeli - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/palapeli - make DESTDIR=$pkgdir install -} diff --git a/staging/kdegames/kdegames-kbattleship.install b/staging/kdegames/kdegames-kbattleship.install deleted file mode 100644 index ac4516ed0..000000000 --- a/staging/kdegames/kdegames-kbattleship.install +++ /dev/null @@ -1,24 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q - ggz-config -i -f -m usr/share/ggz/kbattleship.dsc >& /dev/null -} - -pre_remove() { - if [ -f usr/share/ggz/kbattleship.dsc ]; then - ggz-config -r -m usr/share/ggz/kbattleship.dsc >& /dev/null - fi -} - -pre_upgrade() { - pre_remove -} - -post_upgrade() { - post_install -} - -post_remove() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} diff --git a/staging/kdegames/kdegames-kfourinline.install b/staging/kdegames/kdegames-kfourinline.install deleted file mode 100644 index 9b20edb30..000000000 --- a/staging/kdegames/kdegames-kfourinline.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdegames/kdegames-kigo.install b/staging/kdegames/kdegames-kigo.install deleted file mode 100644 index 9b20edb30..000000000 --- a/staging/kdegames/kdegames-kigo.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdegames/kdegames-kolf.install b/staging/kdegames/kdegames-kolf.install deleted file mode 100644 index 9b20edb30..000000000 --- a/staging/kdegames/kdegames-kolf.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdegames/kdegames-kpatience.install b/staging/kdegames/kdegames-kpatience.install deleted file mode 100644 index 3af34a012..000000000 --- a/staging/kdegames/kdegames-kpatience.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdegames/kdegames-kreversi.install b/staging/kdegames/kdegames-kreversi.install deleted file mode 100644 index 4623e6e49..000000000 --- a/staging/kdegames/kdegames-kreversi.install +++ /dev/null @@ -1,22 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - ggz-config -i -f -m usr/share/ggz/kreversi.dsc >& /dev/null -} - -pre_remove() { - if [ -f usr/share/ggz/kreversi.dsc ]; then - ggz-config -r -m usr/share/ggz/kreversi.dsc >& /dev/null - fi -} - -pre_upgrade() { - pre_remove -} - -post_upgrade() { - post_install -} - -post_remove() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} diff --git a/staging/kdegames/kdegames-kspaceduel.install b/staging/kdegames/kdegames-kspaceduel.install deleted file mode 100644 index 9b20edb30..000000000 --- a/staging/kdegames/kdegames-kspaceduel.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdegames/kdegames-ksquares.install b/staging/kdegames/kdegames-ksquares.install deleted file mode 100644 index 5a619897d..000000000 --- a/staging/kdegames/kdegames-ksquares.install +++ /dev/null @@ -1,22 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - ggz-config -i -f -m usr/share/ggz/ksquares.dsc >& /dev/null -} - -pre_remove() { - if [ -f usr/share/ggz/ksquares.dsc ]; then - ggz-config -r -m usr/share/ggz/ksquares.dsc >& /dev/null - fi -} - -pre_upgrade() { - pre_remove -} - -post_upgrade() { - post_install -} - -post_remove() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} diff --git a/staging/kdegames/kdegames-ktuberling.install b/staging/kdegames/kdegames-ktuberling.install deleted file mode 100644 index 9b20edb30..000000000 --- a/staging/kdegames/kdegames-ktuberling.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdegames/kdegames-lskat.install b/staging/kdegames/kdegames-lskat.install deleted file mode 100644 index 9b20edb30..000000000 --- a/staging/kdegames/kdegames-lskat.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdegames/kdegames-palapeli.install b/staging/kdegames/kdegames-palapeli.install deleted file mode 100644 index c77e68041..000000000 --- a/staging/kdegames/kdegames-palapeli.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdegames/kdegames.install b/staging/kdegames/kdegames.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdegames/kdegames.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/kdegraphics-gwenview/PKGBUILD b/staging/kdegraphics-gwenview/PKGBUILD deleted file mode 100644 index c91a7ce44..000000000 --- a/staging/kdegraphics-gwenview/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 164642 2012-08-01 17:29:10Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-gwenview -pkgver=4.9.0 -pkgrel=2 -pkgdesc="A fast and easy to use image viewer for KDE" -url="http://kde.org/applications/graphics/gwenview/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdegraphics') -depends=('kdebase-lib' 'libkipi') -makedepends=('cmake' 'automoc4') -optdepends=('kipi-plugins: extra plugins to share photos') -install=$pkgname.install -source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.xz") -sha1sums=('df2f8cba8de3f5afbbe65ba70faee46a30945283') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../gwenview-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdegraphics-gwenview/kdegraphics-gwenview.install b/staging/kdegraphics-gwenview/kdegraphics-gwenview.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/staging/kdegraphics-gwenview/kdegraphics-gwenview.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdegraphics-kamera/PKGBUILD b/staging/kdegraphics-kamera/PKGBUILD deleted file mode 100644 index 0d257b72c..000000000 --- a/staging/kdegraphics-kamera/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 161033 2012-06-07 20:54:17Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-kamera -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Configure Kamera" -url="http://kde.org/applications/graphics/kamera/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdegraphics') -depends=('kdebase-runtime' 'gphoto2') -makedepends=('cmake' 'automoc4') -source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.xz") -sha1sums=('fc92327482bf1cd9b067667285ede00e3e464653') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kamera-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdegraphics-kcolorchooser/PKGBUILD b/staging/kdegraphics-kcolorchooser/PKGBUILD deleted file mode 100644 index ab3ca314f..000000000 --- a/staging/kdegraphics-kcolorchooser/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161034 2012-06-07 20:54:41Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-kcolorchooser -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Color Chooser" -url="http://kde.org/applications/graphics/kcolorchooser/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdegraphics') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.xz") -sha1sums=('2f5ee55c86a503e458b1884939a62408bedbfc70') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kcolorchooser-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install b/staging/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.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/kdegraphics-kgamma/PKGBUILD b/staging/kdegraphics-kgamma/PKGBUILD deleted file mode 100644 index a486f8b03..000000000 --- a/staging/kdegraphics-kgamma/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 161035 2012-06-07 20:55:09Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-kgamma -pkgver=4.8.4 -pkgrel=1 -pkgdesc="A monitor calibration tool" -url="http://kde.org/applications/graphics/kgamma/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdegraphics') -# note on libxxf86vm: -# not detected by namcap because libgl depends on it -# but nvidia providing libgl does not depend on libxxf86vm -depends=('kdebase-runtime' 'libxxf86vm') -makedepends=('cmake' 'automoc4') -source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.xz") -sha1sums=('812a84564db52fb6a8b8e0e829eb762d479092ec') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kgamma-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdegraphics-kolourpaint/PKGBUILD b/staging/kdegraphics-kolourpaint/PKGBUILD deleted file mode 100644 index edb3a98d0..000000000 --- a/staging/kdegraphics-kolourpaint/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161036 2012-06-07 20:55:31Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-kolourpaint -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Paint Program" -url="http://kde.org/applications/graphics/kolourpaint/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdegraphics') -depends=('kdebase-runtime' 'qimageblitz') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.xz") -sha1sums=('1dc706ed29339df9fcc68ee606588941319bbf09') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kolourpaint-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install b/staging/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/staging/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdegraphics-kruler/PKGBUILD b/staging/kdegraphics-kruler/PKGBUILD deleted file mode 100644 index d01237f4d..000000000 --- a/staging/kdegraphics-kruler/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161037 2012-06-07 20:56:01Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-kruler -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Screen Ruler" -url="http://kde.org/applications/graphics/kruler/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdegraphics') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.xz") -sha1sums=('b3fb40888f6cf2ad419e1f30a97c2052ffbae1d7') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kruler-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdegraphics-kruler/kdegraphics-kruler.install b/staging/kdegraphics-kruler/kdegraphics-kruler.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/staging/kdegraphics-kruler/kdegraphics-kruler.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdegraphics-ksaneplugin/PKGBUILD b/staging/kdegraphics-ksaneplugin/PKGBUILD deleted file mode 100644 index 5ef15e0a0..000000000 --- a/staging/kdegraphics-ksaneplugin/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161038 2012-06-07 20:56:27Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-ksaneplugin -pkgver=4.8.4 -pkgrel=1 -pkgdesc="A scan plugin that implements the scanning" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('libksane') -makedepends=('cmake' 'automoc4') -replaces=('kdegraphics-libs') -conflicts=('kdegraphics-libs') -source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.xz") -sha1sums=('b7a3204ef27f04bffca0fd77d84bd46b236687b7') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../ksaneplugin-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdegraphics-ksnapshot/PKGBUILD b/staging/kdegraphics-ksnapshot/PKGBUILD deleted file mode 100644 index de5685030..000000000 --- a/staging/kdegraphics-ksnapshot/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 161039 2012-06-07 20:56:51Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-ksnapshot -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Screen Capture Program" -url="http://kde.org/applications/graphics/ksnapshot/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdegraphics') -depends=('kdelibs' 'libkipi') -makedepends=('cmake' 'automoc4') -optdepends=('kipi-plugins') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.xz") -sha1sums=('1cbd1ea468e7722feb8c96dd5f1f3a18bb91d4ef') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../ksnapshot-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install b/staging/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/staging/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdegraphics-mobipocket/PKGBUILD b/staging/kdegraphics-mobipocket/PKGBUILD deleted file mode 100644 index f6a042f16..000000000 --- a/staging/kdegraphics-mobipocket/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 161040 2012-06-07 20:57:16Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-mobipocket -pkgver=4.8.4 -pkgrel=1 -pkgdesc="A collection of plugins to handle mobipocket files" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdelibs') -makedepends=('cmake' 'automoc4' 'kdegraphics-okular') -replaces=('kdegraphics-libs') -conflicts=('kdegraphics-libs') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('0c38ef851c054b0ee3689d41ff5f7f6fb3d83f67') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdegraphics-mobipocket/kdegraphics-mobipocket.install b/staging/kdegraphics-mobipocket/kdegraphics-mobipocket.install deleted file mode 100644 index 660593cf5..000000000 --- a/staging/kdegraphics-mobipocket/kdegraphics-mobipocket.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdegraphics-okular/PKGBUILD b/staging/kdegraphics-okular/PKGBUILD deleted file mode 100644 index 3cd282c26..000000000 --- a/staging/kdegraphics-okular/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 160986 2012-06-07 20:21:32Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-okular -pkgver=4.8.4 -pkgrel=1 -pkgdesc='Document Viewer' -arch=('i686' 'x86_64') -url="http://kde.org/applications/graphics/okular/" -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdegraphics') -depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre' - 'ebook-tools' 'libspectre') -makedepends=('cmake' 'automoc4') -optdepends=('kdegraphics-mobipocket: mobipocket support') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.xz") -sha1sums=('34ff243a4fa77400631aa44b31cbe54910f8091e') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../okular-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdegraphics-okular/kdegraphics-okular.install b/staging/kdegraphics-okular/kdegraphics-okular.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/staging/kdegraphics-okular/kdegraphics-okular.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdegraphics-strigi-analyzer/PKGBUILD b/staging/kdegraphics-strigi-analyzer/PKGBUILD deleted file mode 100644 index 0ec15a35d..000000000 --- a/staging/kdegraphics-strigi-analyzer/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161041 2012-06-07 20:57:42Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-strigi-analyzer -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Strigi analyzers for various graphics file formats" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdelibs') -makedepends=('cmake' 'automoc4') -replaces=('kdegraphics-libs') -conflicts=('kdegraphics-libs') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('208dd945c1ecfaee97457585dc7a52916dd2318f') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdegraphics-svgpart/PKGBUILD b/staging/kdegraphics-svgpart/PKGBUILD deleted file mode 100644 index 5efd04dba..000000000 --- a/staging/kdegraphics-svgpart/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161042 2012-06-07 20:58:07Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-svgpart -pkgver=4.8.4 -pkgrel=1 -pkgdesc="A KPart for viewving SVGs" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdelibs') -makedepends=('cmake' 'automoc4') -replaces=('kdegraphics-libs') -conflicts=('kdegraphics-libs') -source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.xz") -sha1sums=('3c202f0a58035c56e7e46a983c254a6284b97ee9') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../svgpart-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdegraphics-thumbnailers/PKGBUILD b/staging/kdegraphics-thumbnailers/PKGBUILD deleted file mode 100644 index 4f5a55b41..000000000 --- a/staging/kdegraphics-thumbnailers/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161043 2012-06-07 20:58:33Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-thumbnailers -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Thumbnailers for various graphics file formats" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('libkexiv2' 'libkdcraw') -makedepends=('cmake' 'automoc4') -replaces=('kdegraphics-libs') -conflicts=('kdegraphics-libs') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('57e753881f9ca78c4c188c49a3a1b258b92adb83') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdelibs3/PKGBUILD b/staging/kdelibs3/PKGBUILD deleted file mode 100644 index 107727721..000000000 --- a/staging/kdelibs3/PKGBUILD +++ /dev/null @@ -1,97 +0,0 @@ -# $Id: PKGBUILD 169353 2012-10-20 02:30:14Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=kdelibs3 -pkgver=3.5.10 -pkgrel=15 -pkgdesc='KDE3 Core Libraries' -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL') -depends=('libxslt' 'pcre' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper' - 'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates') -makedepends=('cups' 'hspell') -optdepends=('hspell: for Hebrew spell-checking support') -options=('libtool' '!makeflags') -install=kdelibs3.install -source=("ftp://ftp.kde.org/pub/kde/stable/${pkgver}/src/kdelibs-${pkgver}.tar.bz2" - 'ftp://ftp.archlinux.org/other/kde/kde-3.5-1074156.patch.gz' - 'acinclude.patch' - 'kde3.profile' - 'kde4-compatibility.patch' - 'kconf_updaterc' - 'openssl.patch' - 'kdelibs3-missing-include.patch' - 'kdelibs3-cups16.patch') -sha1sums=('c930a25f4419134def55b8466c3a6f737227fb82' - 'c8ca21e4848a627760746d0a8a64bf4f90684c3e' - '50c9de71b102507fb78b192ecc22a5fc3e031bc3' - 'fbd6e773edf3e8bb8e1272629984025e041da2ca' - '5fbbf7a5e2032878815fa055bfb5020f478d2b25' - '35e56fe4c5f71685e64b13f448dcacc620166e06' - '50e92950498463defb9149ffcf8cbc2e8cd1063b' - 'e5f5b8c060a2db9cedb82bf18caadfa869921779' - '6a6c544b3336bfe89bb17ef737d783a7ec006c6c') - -build() { - cd "$srcdir"/kdelibs-${pkgver} - - . /etc/profile.d/qt3.sh - . "$srcdir"/kde3.profile - - patch -p0 -i "$srcdir"/kde-3.5-1074156.patch - patch -p1 -i "$srcdir"/acinclude.patch - patch -p1 -i "$srcdir"/kde4-compatibility.patch - patch -p1 -i "${srcdir}"/openssl.patch - patch -p0 -i "$srcdir"/kdelibs3-missing-include.patch - patch -p1 -i "${srcdir}"/kdelibs3-cups16.patch - - sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh - make -f admin/Makefile.common cvs - - ./configure --prefix=/opt/kde \ - --with-distribution='Arch Linux' \ - --with-alsa \ - --disable-debug \ - --disable-dnssd \ - --disable-dnotify \ - --enable-inotify \ - --enable-sendfile \ - --without-lua \ - --with-hspell \ - --enable-gcc-hidden-visibility \ - --enable-final \ - --enable-new-ldflags LDFLAGS="${LDFLAGS} -L/opt/qt/lib" \ - --without-arts \ - --disable-libfam - make -} - -package() { - cd "$srcdir"/kdelibs-${pkgver} - - make DESTDIR="$pkgdir" install - - # disable broken kconf_update by default - install -D -m644 "$srcdir"/kconf_updaterc \ - "$pkgdir"/opt/kde/share/config/kconf_updaterc - - # install KDE3 profile - install -D -m755 "$srcdir"/kde3.profile "$pkgdir"/etc/profile.d/kde3.sh - # make KDE3 styles available to Qt3 - install -d -m755 "$pkgdir"/opt/qt/plugins - ln -sf /opt/kde/lib/kde3/plugins/styles "$pkgdir"/opt/qt/plugins/styles - - # cert bundle seems to be hardcoded - # link it to the one from ca-certificates - rm -f "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt - ln -sf /etc/ssl/certs/ca-certificates.crt "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt - - # we don't have khelpcenter anyway - rm -rf "$pkgdir"/opt/kde/share/doc - - install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/ - echo '/opt/kde/lib' > "${pkgdir}"/etc/ld.so.conf.d/kdelibs3.conf -} diff --git a/staging/kdelibs3/acinclude.patch b/staging/kdelibs3/acinclude.patch deleted file mode 100644 index 0610d6df5..000000000 --- a/staging/kdelibs3/acinclude.patch +++ /dev/null @@ -1,66 +0,0 @@ -2009-12-10 Stepan Kasal <skasal@redhat.com> - -The change of implementation of AC_REQUIRE in 2.64 caused a regression -in the arts project. -This can be fixed by shuffling some macro calls. - -I suppose that most of this patch will not be needed with a future -release of Autoconf. -But the last chunk of this patch is a real bug in this source and -should go upstream. - ---- arts-1.5.10/admin/acinclude.m4.in 2008-08-20 18:07:05.000000000 +0200 -+++ arts-1.5.10/admin/acinclude.m4.in 2009-12-09 17:30:57.000000000 +0100 -@@ -3081,8 +3081,18 @@ - fi - ]) - -+AC_DEFUN([AC_CHECK_COMPILERS_CC], -+[ -+ dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS -+ CFLAGS=" $CFLAGS" -+ AC_PROG_CC -+ CXXFLAGS=" $CXXFLAGS" -+ AC_PROG_CXX -+]) -+ - AC_DEFUN([AC_CHECK_COMPILERS], - [ -+ AC_REQUIRE([AC_CHECK_COMPILERS_CC]) - AC_ARG_ENABLE(debug, - AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]), - [ -@@ -3141,11 +3151,6 @@ - [kde_use_profiling="no"] - ) - -- dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS -- CFLAGS=" $CFLAGS" -- -- AC_PROG_CC -- - AC_PROG_CPP - - if test "$GCC" = "yes"; then -@@ -3174,10 +3179,6 @@ - LDFLAGS="" - fi - -- CXXFLAGS=" $CXXFLAGS" -- -- AC_PROG_CXX -- - KDE_CHECK_FOR_BAD_COMPILER - - if test "$GXX" = "yes" || test "$CXX" = "KCC"; then -@@ -3503,8 +3504,8 @@ - AC_REQUIRE([AC_LIBTOOL_DLOPEN]) - AC_REQUIRE([KDE_CHECK_LIB64]) - --AC_OBJEXT --AC_EXEEXT -+AC_REQUIRE([AC_OBJEXT]) -+AC_REQUIRE([AC_EXEEXT]) - - AM_PROG_LIBTOOL - AC_LIBTOOL_CXX diff --git a/staging/kdelibs3/kconf_updaterc b/staging/kdelibs3/kconf_updaterc deleted file mode 100644 index 24c2623fb..000000000 --- a/staging/kdelibs3/kconf_updaterc +++ /dev/null @@ -1,2 +0,0 @@ -updateInfoAdded=false -autoUpdateDisabled=true diff --git a/staging/kdelibs3/kde3.profile b/staging/kdelibs3/kde3.profile deleted file mode 100755 index ef09631ff..000000000 --- a/staging/kdelibs3/kde3.profile +++ /dev/null @@ -1,6 +0,0 @@ -export PATH=$PATH:/opt/kde/bin -if [ ! -z $XDG_DATA_DIRS ]; then - export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/kde/share -else - export XDG_DATA_DIRS=/opt/kde/share -fi diff --git a/staging/kdelibs3/kde4-compatibility.patch b/staging/kdelibs3/kde4-compatibility.patch deleted file mode 100644 index 129c314ae..000000000 --- a/staging/kdelibs3/kde4-compatibility.patch +++ /dev/null @@ -1,1012 +0,0 @@ -diff -Nura kdelibs-3.5.10/kdecore/kcrash.cpp kdelibs-3.5.10.new/kdecore/kcrash.cpp ---- kdelibs-3.5.10/kdecore/kcrash.cpp 2007-01-15 12:34:17.000000000 +0100 -+++ kdelibs-3.5.10.new/kdecore/kcrash.cpp 2009-08-06 06:18:06.000000000 +0200 -@@ -158,7 +158,7 @@ - int i = 0; - - // argument 0 has to be drkonqi -- argv[i++] = "drkonqi"; -+ argv[i++] = "/usr/lib/kde4/libexec/drkonqi"; - - #if defined Q_WS_X11 - // start up on the correct display -@@ -325,7 +325,7 @@ - _exit(253); - if(!geteuid() && setuid(getuid()) < 0) - _exit(253); -- execvp("drkonqi", const_cast< char** >( argv )); -+ execvp("/usr/lib/kde4/libexec/drkonqi", const_cast< char** >( argv )); - _exit(errno); - } - else -diff -Nura kdelibs-3.5.10/kded/Makefile.am kdelibs-3.5.10.new/kded/Makefile.am ---- kdelibs-3.5.10/kded/Makefile.am 2005-10-10 17:06:29.000000000 +0200 -+++ kdelibs-3.5.10.new/kded/Makefile.am 2009-08-06 06:21:37.000000000 +0200 -@@ -58,7 +58,7 @@ - servicetype_DATA = kdedmodule.desktop - servicetypedir = $(kde_servicetypesdir) - --xdg_menu_DATA = applications.menu -+xdg_menu_DATA = kde-applications.menu - - update_DATA = kded.upd - updatedir = $(kde_datadir)/kconf_update -diff -Nura kdelibs-3.5.10/kded/Makefile.in kdelibs-3.5.10.new/kded/Makefile.in ---- kdelibs-3.5.10/kded/Makefile.in 2008-08-20 18:05:57.000000000 +0200 -+++ kdelibs-3.5.10.new/kded/Makefile.in 2009-08-06 06:22:19.000000000 +0200 -@@ -535,7 +535,7 @@ - - servicetype_DATA = kdedmodule.desktop - servicetypedir = $(kde_servicetypesdir) --xdg_menu_DATA = applications.menu -+xdg_menu_DATA = kde-applications.menu - update_DATA = kded.upd - updatedir = $(kde_datadir)/kconf_update - #>- all: all-am -@@ -1173,7 +1173,7 @@ - -rm -f kded.moc vfolder_menu.moc kdedmodule.moc kbuildsycoca.moc - - #>+ 2 --KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am -+KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h kde-applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am - - #>+ 2 - docs-am: -diff -Nura kdelibs-3.5.10/kded/applications.menu kdelibs-3.5.10.new/kded/applications.menu ---- kdelibs-3.5.10/kded/applications.menu 2005-09-10 10:27:40.000000000 +0200 -+++ kdelibs-3.5.10.new/kded/applications.menu 1970-01-01 01:00:00.000000000 +0100 -@@ -1,469 +0,0 @@ -- <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" -- "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd"> -- --<Menu> -- <Name>Applications</Name> -- <Directory>kde-main.directory</Directory> -- <!-- Search the default locations --> -- <KDELegacyDirs/> -- <DefaultAppDirs/> -- <DefaultDirectoryDirs/> -- <DefaultLayout> -- <Merge type="menus"/> -- <Merge type="files"/> -- <Separator/> -- <Menuname>More</Menuname> -- </DefaultLayout> -- <Layout> -- <Merge type="menus"/> -- <Menuname>Applications</Menuname> -- <Merge type="files"/> -- </Layout> -- -- <Menu> -- <Name>Applications</Name> -- <Directory>kde-unknown.directory</Directory> -- <OnlyUnallocated/> -- <Include> -- <Not> -- <!-- Don't list non-KDE core applications --> -- <And> -- <Category>Core</Category> -- <Not><Category>KDE</Category></Not> -- </And> -- <!-- Don't list SUSE's YaST in here --> -- <Category>X-SuSE-YaST</Category> -- </Not> -- </Include> -- </Menu> -- <Menu> -- <Name>Development</Name> -- <Directory>kde-development.directory</Directory> -- <Menu> -- <Name>X-KDE-KDevelopIDE</Name> -- <Directory>kde-development-kdevelop.directory</Directory> -- <Include> -- <And> -- <Category>Development</Category> -- <Category>X-KDE-KDevelopIDE</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Translation</Name> -- <Directory>kde-development-translation.directory</Directory> -- <Include> -- <And> -- <Category>Development</Category> -- <Category>Translation</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Web Development</Name> -- <Directory>kde-development-webdevelopment.directory</Directory> -- <Include> -- <And> -- <Category>Development</Category> -- <Category>WebDevelopment</Category> -- </And> -- </Include> -- </Menu> -- <Include> -- <And> -- <Category>Development</Category> -- <Not><Category>X-KDE-KDevelopIDE</Category></Not> -- <Not><Category>Translation</Category></Not> -- <Not><Category>WebDevelopment</Category></Not> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Science</Name> -- <Directory>kde-science.directory</Directory> -- <Include> -- <And><!-- Include /any/ Science app which is not an Education app --> -- <Or> -- <Category>Astronomy</Category> -- <Category>Biology</Category> -- <Category>Chemistry</Category> -- <Category>Geology</Category> -- <Category>MedicalSoftware</Category> -- <Category>Physics</Category> -- <Category>Math</Category> -- <Category>Science</Category> -- </Or> -- <Not><Category>Education</Category></Not> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Edutainment</Name> -- <Directory>kde-edutainment.directory</Directory> -- <Menu> -- <Name>Languages</Name> -- <Directory>kde-edu-languages.directory</Directory> -- <Include> -- <And> -- <Category>Education</Category> -- <Or> -- <Category>Languages</Category> -- <Category>X-KDE-Edu-Language</Category> -- </Or> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Mathematics</Name> -- <Directory>kde-edu-mathematics.directory</Directory> -- <Include> -- <And> -- <Category>Education</Category> -- <Category>Math</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Miscellaneous</Name> -- <Directory>kde-edu-miscellaneous.directory</Directory> -- <Include> -- <And> -- <Category>Education</Category> -- <Not> -- <Category>Languages</Category> -- <Category>X-KDE-Edu-Language</Category> -- <Category>Math</Category> -- <Category>Science</Category> -- <Category>Teaching</Category> -- <Category>X-KDE-Edu-Teaching</Category> -- </Not> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Science</Name> -- <Directory>kde-edu-science.directory</Directory> -- <Include> -- <And> -- <Category>Education</Category> -- <Category>Science</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Tools</Name> -- <Directory>kde-edu-tools.directory</Directory> -- <Include> -- <And> -- <Category>Education</Category> -- <Or> -- <Category>Teaching</Category> -- <Category>X-KDE-Edu-Teaching</Category> -- </Or> -- </And> -- </Include> -- </Menu> -- </Menu> -- <Menu> -- <Name>Games</Name> -- <Directory>kde-games.directory</Directory> -- <Menu> -- <Name>Arcade</Name> -- <Directory>kde-games-arcade.directory</Directory> -- <Include> -- <And> -- <Category>Game</Category> -- <Category>ArcadeGame</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Board</Name> -- <Directory>kde-games-board.directory</Directory> -- <Include> -- <And> -- <Category>Game</Category> -- <Category>BoardGame</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Card</Name> -- <Directory>kde-games-card.directory</Directory> -- <Include> -- <And> -- <Category>Game</Category> -- <Category>CardGame</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Kidsgames</Name> -- <Directory>kde-games-kids.directory</Directory> -- <Include> -- <And> -- <Category>Game</Category> -- <Or> -- <Category>X-KDE-KidsGame</Category> -- <Category>KidsGame</Category> -- </Or> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>TacticStrategy</Name> -- <Directory>kde-games-strategy.directory</Directory> -- <Include> -- <And> -- <Category>Game</Category> -- <Category>StrategyGame</Category> -- </And> -- </Include> -- </Menu> -- <Include> -- <And> -- <Category>Game</Category> -- <Not> -- <Category>ArcadeGame</Category> -- <Category>BoardGame</Category> -- <Category>CardGame</Category> -- <Category>X-KDE-KidsGame</Category> -- <Category>KidsGame</Category> -- <Category>StrategyGame</Category> -- </Not> -- </And> -- </Include> -- <Menu> -- <Name>Toys</Name> -- <Directory>kde-toys.directory</Directory> -- <Include> -- <Category>Amusement</Category> -- </Include> -- </Menu> -- </Menu> -- <Menu> -- <Name>Graphics</Name> -- <Directory>kde-graphics.directory</Directory> -- <Include> -- <And> -- <Category>Graphics</Category> -- <Not><Category>X-KDE-More</Category></Not> -- </And> -- </Include> -- <Menu> -- <Name>More</Name> -- <Directory>kde-more.directory</Directory> -- <Include> -- <And> -- <Category>Graphics</Category> -- <Category>X-KDE-More</Category> -- </And> -- </Include> -- </Menu> -- </Menu> -- <Menu> -- <Name>Internet</Name> -- <Directory>kde-internet.directory</Directory> -- <Include> -- <And> -- <Category>Network</Category> -- <Not><Category>X-KDE-More</Category></Not> -- </And> -- </Include> -- <Menu> -- <Name>Terminal</Name> -- <Directory>kde-internet-terminal.directory</Directory> -- </Menu> -- <Menu> -- <Name>More</Name> -- <Directory>kde-more.directory</Directory> -- <Include> -- <And> -- <Category>Network</Category> -- <Category>X-KDE-More</Category> -- </And> -- </Include> -- </Menu> -- </Menu> -- <Menu> -- <Name>Multimedia</Name> -- <Directory>kde-multimedia.directory</Directory> -- <Include> -- <And> -- <Category>AudioVideo</Category> -- <Not><Category>X-KDE-More</Category></Not> -- </And> -- </Include> -- <Menu> -- <Name>More</Name> -- <Directory>kde-more.directory</Directory> -- <Include> -- <And> -- <Category>AudioVideo</Category> -- <Category>X-KDE-More</Category> -- </And> -- </Include> -- </Menu> -- </Menu> -- <Menu> -- <Name>Office</Name> -- <Directory>kde-office.directory</Directory> -- <Layout> -- <Merge type="menus"/> -- <Filename>kde-koshell.desktop</Filename> -- <Filename>kde-Kontact.desktop</Filename> -- <Separator/> -- <Filename>kde-kword.desktop</Filename> -- <Filename>kde-kspread.desktop</Filename> -- <Filename>kde-kpresenter.desktop</Filename> -- <Merge type="files"/> -- <Separator/> -- <Menuname>More</Menuname> -- </Layout> -- <Include> -- <And> -- <Category>Office</Category> -- <Not><Category>X-KDE-More</Category></Not> -- </And> -- </Include> -- <Menu> -- <Name>More</Name> -- <Directory>kde-more.directory</Directory> -- <Include> -- <And> -- <Category>Office</Category> -- <Category>X-KDE-More</Category> -- </And> -- </Include> -- </Menu> -- </Menu> -- <Menu> -- <Name>Settingsmenu</Name> -- <Directory>kde-settingsmenu.directory</Directory> -- <Include> -- <Category>Settings</Category> -- </Include> -- </Menu> -- <Menu> -- <Name>System</Name> -- <Directory>kde-system.directory</Directory> -- <Include> -- <And> -- <Category>System</Category> -- <Not><Category>X-KDE-More</Category></Not> -- </And> -- </Include> -- <Menu> -- <Name>More</Name> -- <Directory>kde-more.directory</Directory> -- <Include> -- <And> -- <Category>System</Category> -- <Category>X-KDE-More</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>ScreenSavers</Name> -- <Directory>kde-system-screensavers.directory</Directory> -- </Menu> -- <Menu> -- <Name>Terminal</Name> -- <Directory>kde-system-terminal.directory</Directory> -- </Menu> -- </Menu> -- <Menu> -- <Name>Utilities</Name> -- <Directory>kde-utilities.directory</Directory> -- <Include> -- <And> -- <Category>Utility</Category> -- <Not><Category>Accessibility</Category></Not> -- <Not><Category>X-KDE-Utilities-Desktop</Category></Not> -- <Not><Category>X-KDE-Utilities-File</Category></Not> -- <Not><Category>X-KDE-Utilities-Peripherals</Category></Not> -- <Not><Category>X-KDE-Utilities-PIM</Category></Not> -- <Not><Category>X-KDE-More</Category></Not> -- </And> -- </Include> -- <Menu> -- <Name>Accessibility</Name> -- <Directory>kde-utilities-accessibility.directory</Directory> -- <Include> -- <And> -- <Category>Utility</Category> -- <Category>Accessibility</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Desktop</Name> -- <Directory>kde-utilities-desktop.directory</Directory> -- <Include> -- <And> -- <Category>Utility</Category> -- <Category>X-KDE-Utilities-Desktop</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Editors</Name> -- <Directory>kde-editors.directory</Directory> -- <Include> -- <Category>TextEditor</Category> -- </Include> -- </Menu> -- <Menu> -- <Name>File</Name> -- <Directory>kde-utilities-file.directory</Directory> -- <Include> -- <And> -- <Category>Utility</Category> -- <Category>X-KDE-Utilities-File</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Peripherals</Name> -- <Directory>kde-utilities-peripherals.directory</Directory> -- <Include> -- <And> -- <Category>Utility</Category> -- <Category>X-KDE-Utilities-Peripherals</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>PIM</Name> -- <Directory>kde-utilities-pim.directory</Directory> -- <Include> -- <And> -- <Category>Utility</Category> -- <Category>X-KDE-Utilities-PIM</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>XUtilities</Name> -- <Directory>kde-utilities-xutils.directory</Directory> -- </Menu> -- <Menu> -- <Name>More</Name> -- <Directory>kde-more.directory</Directory> -- <Include> -- <And> -- <Category>Utility</Category> -- <Category>X-KDE-More</Category> -- </And> -- </Include> -- </Menu> -- </Menu> -- <Include> -- <And> -- <Category>KDE</Category> -- <Category>Core</Category> -- </And> -- </Include> -- <DefaultMergeDirs/> -- <MergeFile>applications-kmenuedit.menu</MergeFile> --</Menu> -diff -Nura kdelibs-3.5.10/kded/kbuildsycoca.cpp kdelibs-3.5.10.new/kded/kbuildsycoca.cpp ---- kdelibs-3.5.10/kded/kbuildsycoca.cpp 2007-05-14 09:52:43.000000000 +0200 -+++ kdelibs-3.5.10.new/kded/kbuildsycoca.cpp 2009-08-06 06:23:48.000000000 +0200 -@@ -379,7 +379,7 @@ - connect(g_vfolder, SIGNAL(newService(const QString &, KService **)), - this, SLOT(slotCreateEntry(const QString &, KService **))); - -- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true); -+ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true); - - KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false); - entry->setLayoutInfo(kdeMenu->layoutList); -diff -Nura kdelibs-3.5.10/kded/kde-applications.menu kdelibs-3.5.10.new/kded/kde-applications.menu ---- kdelibs-3.5.10/kded/kde-applications.menu 1970-01-01 01:00:00.000000000 +0100 -+++ kdelibs-3.5.10.new/kded/kde-applications.menu 2005-09-10 10:27:40.000000000 +0200 -@@ -0,0 +1,469 @@ -+ <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" -+ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd"> -+ -+<Menu> -+ <Name>Applications</Name> -+ <Directory>kde-main.directory</Directory> -+ <!-- Search the default locations --> -+ <KDELegacyDirs/> -+ <DefaultAppDirs/> -+ <DefaultDirectoryDirs/> -+ <DefaultLayout> -+ <Merge type="menus"/> -+ <Merge type="files"/> -+ <Separator/> -+ <Menuname>More</Menuname> -+ </DefaultLayout> -+ <Layout> -+ <Merge type="menus"/> -+ <Menuname>Applications</Menuname> -+ <Merge type="files"/> -+ </Layout> -+ -+ <Menu> -+ <Name>Applications</Name> -+ <Directory>kde-unknown.directory</Directory> -+ <OnlyUnallocated/> -+ <Include> -+ <Not> -+ <!-- Don't list non-KDE core applications --> -+ <And> -+ <Category>Core</Category> -+ <Not><Category>KDE</Category></Not> -+ </And> -+ <!-- Don't list SUSE's YaST in here --> -+ <Category>X-SuSE-YaST</Category> -+ </Not> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Development</Name> -+ <Directory>kde-development.directory</Directory> -+ <Menu> -+ <Name>X-KDE-KDevelopIDE</Name> -+ <Directory>kde-development-kdevelop.directory</Directory> -+ <Include> -+ <And> -+ <Category>Development</Category> -+ <Category>X-KDE-KDevelopIDE</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Translation</Name> -+ <Directory>kde-development-translation.directory</Directory> -+ <Include> -+ <And> -+ <Category>Development</Category> -+ <Category>Translation</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Web Development</Name> -+ <Directory>kde-development-webdevelopment.directory</Directory> -+ <Include> -+ <And> -+ <Category>Development</Category> -+ <Category>WebDevelopment</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Include> -+ <And> -+ <Category>Development</Category> -+ <Not><Category>X-KDE-KDevelopIDE</Category></Not> -+ <Not><Category>Translation</Category></Not> -+ <Not><Category>WebDevelopment</Category></Not> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Science</Name> -+ <Directory>kde-science.directory</Directory> -+ <Include> -+ <And><!-- Include /any/ Science app which is not an Education app --> -+ <Or> -+ <Category>Astronomy</Category> -+ <Category>Biology</Category> -+ <Category>Chemistry</Category> -+ <Category>Geology</Category> -+ <Category>MedicalSoftware</Category> -+ <Category>Physics</Category> -+ <Category>Math</Category> -+ <Category>Science</Category> -+ </Or> -+ <Not><Category>Education</Category></Not> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Edutainment</Name> -+ <Directory>kde-edutainment.directory</Directory> -+ <Menu> -+ <Name>Languages</Name> -+ <Directory>kde-edu-languages.directory</Directory> -+ <Include> -+ <And> -+ <Category>Education</Category> -+ <Or> -+ <Category>Languages</Category> -+ <Category>X-KDE-Edu-Language</Category> -+ </Or> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Mathematics</Name> -+ <Directory>kde-edu-mathematics.directory</Directory> -+ <Include> -+ <And> -+ <Category>Education</Category> -+ <Category>Math</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Miscellaneous</Name> -+ <Directory>kde-edu-miscellaneous.directory</Directory> -+ <Include> -+ <And> -+ <Category>Education</Category> -+ <Not> -+ <Category>Languages</Category> -+ <Category>X-KDE-Edu-Language</Category> -+ <Category>Math</Category> -+ <Category>Science</Category> -+ <Category>Teaching</Category> -+ <Category>X-KDE-Edu-Teaching</Category> -+ </Not> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Science</Name> -+ <Directory>kde-edu-science.directory</Directory> -+ <Include> -+ <And> -+ <Category>Education</Category> -+ <Category>Science</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Tools</Name> -+ <Directory>kde-edu-tools.directory</Directory> -+ <Include> -+ <And> -+ <Category>Education</Category> -+ <Or> -+ <Category>Teaching</Category> -+ <Category>X-KDE-Edu-Teaching</Category> -+ </Or> -+ </And> -+ </Include> -+ </Menu> -+ </Menu> -+ <Menu> -+ <Name>Games</Name> -+ <Directory>kde-games.directory</Directory> -+ <Menu> -+ <Name>Arcade</Name> -+ <Directory>kde-games-arcade.directory</Directory> -+ <Include> -+ <And> -+ <Category>Game</Category> -+ <Category>ArcadeGame</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Board</Name> -+ <Directory>kde-games-board.directory</Directory> -+ <Include> -+ <And> -+ <Category>Game</Category> -+ <Category>BoardGame</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Card</Name> -+ <Directory>kde-games-card.directory</Directory> -+ <Include> -+ <And> -+ <Category>Game</Category> -+ <Category>CardGame</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Kidsgames</Name> -+ <Directory>kde-games-kids.directory</Directory> -+ <Include> -+ <And> -+ <Category>Game</Category> -+ <Or> -+ <Category>X-KDE-KidsGame</Category> -+ <Category>KidsGame</Category> -+ </Or> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>TacticStrategy</Name> -+ <Directory>kde-games-strategy.directory</Directory> -+ <Include> -+ <And> -+ <Category>Game</Category> -+ <Category>StrategyGame</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Include> -+ <And> -+ <Category>Game</Category> -+ <Not> -+ <Category>ArcadeGame</Category> -+ <Category>BoardGame</Category> -+ <Category>CardGame</Category> -+ <Category>X-KDE-KidsGame</Category> -+ <Category>KidsGame</Category> -+ <Category>StrategyGame</Category> -+ </Not> -+ </And> -+ </Include> -+ <Menu> -+ <Name>Toys</Name> -+ <Directory>kde-toys.directory</Directory> -+ <Include> -+ <Category>Amusement</Category> -+ </Include> -+ </Menu> -+ </Menu> -+ <Menu> -+ <Name>Graphics</Name> -+ <Directory>kde-graphics.directory</Directory> -+ <Include> -+ <And> -+ <Category>Graphics</Category> -+ <Not><Category>X-KDE-More</Category></Not> -+ </And> -+ </Include> -+ <Menu> -+ <Name>More</Name> -+ <Directory>kde-more.directory</Directory> -+ <Include> -+ <And> -+ <Category>Graphics</Category> -+ <Category>X-KDE-More</Category> -+ </And> -+ </Include> -+ </Menu> -+ </Menu> -+ <Menu> -+ <Name>Internet</Name> -+ <Directory>kde-internet.directory</Directory> -+ <Include> -+ <And> -+ <Category>Network</Category> -+ <Not><Category>X-KDE-More</Category></Not> -+ </And> -+ </Include> -+ <Menu> -+ <Name>Terminal</Name> -+ <Directory>kde-internet-terminal.directory</Directory> -+ </Menu> -+ <Menu> -+ <Name>More</Name> -+ <Directory>kde-more.directory</Directory> -+ <Include> -+ <And> -+ <Category>Network</Category> -+ <Category>X-KDE-More</Category> -+ </And> -+ </Include> -+ </Menu> -+ </Menu> -+ <Menu> -+ <Name>Multimedia</Name> -+ <Directory>kde-multimedia.directory</Directory> -+ <Include> -+ <And> -+ <Category>AudioVideo</Category> -+ <Not><Category>X-KDE-More</Category></Not> -+ </And> -+ </Include> -+ <Menu> -+ <Name>More</Name> -+ <Directory>kde-more.directory</Directory> -+ <Include> -+ <And> -+ <Category>AudioVideo</Category> -+ <Category>X-KDE-More</Category> -+ </And> -+ </Include> -+ </Menu> -+ </Menu> -+ <Menu> -+ <Name>Office</Name> -+ <Directory>kde-office.directory</Directory> -+ <Layout> -+ <Merge type="menus"/> -+ <Filename>kde-koshell.desktop</Filename> -+ <Filename>kde-Kontact.desktop</Filename> -+ <Separator/> -+ <Filename>kde-kword.desktop</Filename> -+ <Filename>kde-kspread.desktop</Filename> -+ <Filename>kde-kpresenter.desktop</Filename> -+ <Merge type="files"/> -+ <Separator/> -+ <Menuname>More</Menuname> -+ </Layout> -+ <Include> -+ <And> -+ <Category>Office</Category> -+ <Not><Category>X-KDE-More</Category></Not> -+ </And> -+ </Include> -+ <Menu> -+ <Name>More</Name> -+ <Directory>kde-more.directory</Directory> -+ <Include> -+ <And> -+ <Category>Office</Category> -+ <Category>X-KDE-More</Category> -+ </And> -+ </Include> -+ </Menu> -+ </Menu> -+ <Menu> -+ <Name>Settingsmenu</Name> -+ <Directory>kde-settingsmenu.directory</Directory> -+ <Include> -+ <Category>Settings</Category> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>System</Name> -+ <Directory>kde-system.directory</Directory> -+ <Include> -+ <And> -+ <Category>System</Category> -+ <Not><Category>X-KDE-More</Category></Not> -+ </And> -+ </Include> -+ <Menu> -+ <Name>More</Name> -+ <Directory>kde-more.directory</Directory> -+ <Include> -+ <And> -+ <Category>System</Category> -+ <Category>X-KDE-More</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>ScreenSavers</Name> -+ <Directory>kde-system-screensavers.directory</Directory> -+ </Menu> -+ <Menu> -+ <Name>Terminal</Name> -+ <Directory>kde-system-terminal.directory</Directory> -+ </Menu> -+ </Menu> -+ <Menu> -+ <Name>Utilities</Name> -+ <Directory>kde-utilities.directory</Directory> -+ <Include> -+ <And> -+ <Category>Utility</Category> -+ <Not><Category>Accessibility</Category></Not> -+ <Not><Category>X-KDE-Utilities-Desktop</Category></Not> -+ <Not><Category>X-KDE-Utilities-File</Category></Not> -+ <Not><Category>X-KDE-Utilities-Peripherals</Category></Not> -+ <Not><Category>X-KDE-Utilities-PIM</Category></Not> -+ <Not><Category>X-KDE-More</Category></Not> -+ </And> -+ </Include> -+ <Menu> -+ <Name>Accessibility</Name> -+ <Directory>kde-utilities-accessibility.directory</Directory> -+ <Include> -+ <And> -+ <Category>Utility</Category> -+ <Category>Accessibility</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Desktop</Name> -+ <Directory>kde-utilities-desktop.directory</Directory> -+ <Include> -+ <And> -+ <Category>Utility</Category> -+ <Category>X-KDE-Utilities-Desktop</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Editors</Name> -+ <Directory>kde-editors.directory</Directory> -+ <Include> -+ <Category>TextEditor</Category> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>File</Name> -+ <Directory>kde-utilities-file.directory</Directory> -+ <Include> -+ <And> -+ <Category>Utility</Category> -+ <Category>X-KDE-Utilities-File</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Peripherals</Name> -+ <Directory>kde-utilities-peripherals.directory</Directory> -+ <Include> -+ <And> -+ <Category>Utility</Category> -+ <Category>X-KDE-Utilities-Peripherals</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>PIM</Name> -+ <Directory>kde-utilities-pim.directory</Directory> -+ <Include> -+ <And> -+ <Category>Utility</Category> -+ <Category>X-KDE-Utilities-PIM</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>XUtilities</Name> -+ <Directory>kde-utilities-xutils.directory</Directory> -+ </Menu> -+ <Menu> -+ <Name>More</Name> -+ <Directory>kde-more.directory</Directory> -+ <Include> -+ <And> -+ <Category>Utility</Category> -+ <Category>X-KDE-More</Category> -+ </And> -+ </Include> -+ </Menu> -+ </Menu> -+ <Include> -+ <And> -+ <Category>KDE</Category> -+ <Category>Core</Category> -+ </And> -+ </Include> -+ <DefaultMergeDirs/> -+ <MergeFile>applications-kmenuedit.menu</MergeFile> -+</Menu> diff --git a/staging/kdelibs3/kdelibs3-cups16.patch b/staging/kdelibs3/kdelibs3-cups16.patch deleted file mode 100644 index 6736d49d3..000000000 --- a/staging/kdelibs3/kdelibs3-cups16.patch +++ /dev/null @@ -1,724 +0,0 @@ -diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/cupsdconf2/cupsdconf.cpp kdelibs-3.5.10/kdeprint/cups/cupsdconf2/cupsdconf.cpp ---- kdelibs-3.5.10-orig/kdeprint/cups/cupsdconf2/cupsdconf.cpp 2012-10-06 14:49:37.521406729 -0400 -+++ kdelibs-3.5.10/kdeprint/cups/cupsdconf2/cupsdconf.cpp 2012-10-06 15:08:17.460612585 -0400 -@@ -629,26 +629,26 @@ - cups_lang_t* lang = cupsLangDefault(); - ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, cupsLangEncoding(lang)); - ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, lang->language); -- request_->request.op.operation_id = CUPS_GET_PRINTERS; -+ ippSetOperation(request_, CUPS_GET_PRINTERS); - request_ = cupsDoRequest(http_, request_, "/printers/"); - if (request_) - { - QString name; - int type(0); -- ipp_attribute_t *attr = request_->attrs; -+ ipp_attribute_t *attr = ippFirstAttribute(request_); - while (attr) - { - // check new printer (keep only local non-implicit printers) -- if (!attr->name) -+ if (!ippGetName(attr)) - { - if (!(type & CUPS_PRINTER_REMOTE) && !(type & CUPS_PRINTER_IMPLICIT) && !name.isEmpty()) - resources_.append(new CupsResource("/printers/"+name)); - name = ""; - type = 0; - } -- else if (strcmp(attr->name, "printer-name") == 0) name = attr->values[0].string.text; -- else if (strcmp(attr->name, "printer-type") == 0) type = attr->values[0].integer; -- attr = attr->next; -+ else if (strcmp(ippGetName(attr), "printer-name") == 0) name = ippGetString(attr, 0, NULL); -+ else if (strcmp(ippGetName(attr), "printer-type") == 0) type = ippGetInteger(attr, 0); -+ attr = ippNextAttribute(request_); - } - if (!(type & CUPS_PRINTER_REMOTE) && !(type & CUPS_PRINTER_IMPLICIT) && !name.isEmpty()) - resources_.append(new CupsResource("/printers/"+name)); -@@ -658,26 +658,26 @@ - request_ = ippNew(); - ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, cupsLangEncoding(lang)); - ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, lang->language); -- request_->request.op.operation_id = CUPS_GET_CLASSES; -+ ippSetOperation(request_, CUPS_GET_CLASSES); - request_ = cupsDoRequest(http_, request_, "/classes/"); - if (request_) - { - QString name; - int type(0); -- ipp_attribute_t *attr = request_->attrs; -+ ipp_attribute_t *attr = ippFirstAttribute(request_); - while (attr) - { - // check new class (keep only local classes) -- if (!attr->name) -+ if (!ippGetName(attr)) - { - if (!(type & CUPS_PRINTER_REMOTE) && !name.isEmpty()) - resources_.append(new CupsResource("/classes/"+name)); - name = ""; - type = 0; - } -- else if (strcmp(attr->name, "printer-name") == 0) name = attr->values[0].string.text; -- else if (strcmp(attr->name, "printer-type") == 0) type = attr->values[0].integer; -- attr = attr->next; -+ else if (strcmp(ippGetName(attr), "printer-name") == 0) name = ippGetString(attr, 0, NULL); -+ else if (strcmp(ippGetName(attr), "printer-type") == 0) type = ippGetInteger(attr, 0); -+ attr = ippNextAttribute(request_); - } - if (!(type & CUPS_PRINTER_REMOTE) && !name.isEmpty()) - resources_.append(new CupsResource("/classes/"+name)); -diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/ipprequest.cpp kdelibs-3.5.10/kdeprint/cups/ipprequest.cpp ---- kdelibs-3.5.10-orig/kdeprint/cups/ipprequest.cpp 2012-10-06 14:49:37.521406729 -0400 -+++ kdelibs-3.5.10/kdeprint/cups/ipprequest.cpp 2012-10-06 15:12:00.919127451 -0400 -@@ -51,32 +51,34 @@ - kdDebug(500) << "Null request" << endl; - return; - } -- kdDebug(500) << "State = 0x" << QString::number(req->state, 16) << endl; -- kdDebug(500) << "ID = 0x" << QString::number(req->request.status.request_id, 16) << endl; -+ kdDebug(500) << "State = 0x" << QString::number(ippGetState(req), 16) << endl; -+ kdDebug(500) << "ID = 0x" << QString::number(ippGetRequestId(req), 16) << endl; - if (answer) - { -- kdDebug(500) << "Status = 0x" << QString::number(req->request.status.status_code, 16) << endl; -- kdDebug(500) << "Status message = " << ippErrorString(req->request.status.status_code) << endl; -+ kdDebug(500) << "Status = 0x" << QString::number(ippGetStatusCode(req), 16) << endl; -+ kdDebug(500) << "Status message = " << ippErrorString(ippGetStatusCode(req)) << endl; - } - else -- kdDebug(500) << "Operation = 0x" << QString::number(req->request.op.operation_id, 16) << endl; -- kdDebug(500) << "Version = " << (int)(req->request.status.version[0]) << "." << (int)(req->request.status.version[1]) << endl; -+ kdDebug(500) << "Operation = 0x" << QString::number(ippGetOperation(req), 16) << endl; -+ int minorVersion; -+ int majorVersion = ippGetVersion(req, &minorVersion); -+ kdDebug(500) << "Version = " << (int)(majorVersion) << "." << (int)(minorVersion) << endl; - kdDebug(500) << endl; - -- ipp_attribute_t *attr = req->attrs; -+ ipp_attribute_t *attr = ippFirstAttribute(req); - while (attr) - { -- QString s = QString::fromLatin1("%1 (0x%2) = ").arg(attr->name).arg(attr->value_tag, 0, 16); -- for (int i=0;i<attr->num_values;i++) -+ QString s = QString::fromLatin1("%1 (0x%2) = ").arg(ippGetName(attr)).arg(ippGetValueTag(attr), 0, 16); -+ for (int i=0;i<ippGetCount(attr);i++) - { -- switch (attr->value_tag) -+ switch (ippGetValueTag(attr)) - { - case IPP_TAG_INTEGER: - case IPP_TAG_ENUM: -- s += ("0x"+QString::number(attr->values[i].integer, 16)); -+ s += ("0x"+QString::number(ippGetInteger(attr, i), 16)); - break; - case IPP_TAG_BOOLEAN: -- s += (attr->values[i].boolean ? "true" : "false"); -+ s += (ippGetBoolean(attr, i) ? "true" : "false"); - break; - case IPP_TAG_STRING: - case IPP_TAG_TEXT: -@@ -88,16 +90,16 @@ - case IPP_TAG_TEXTLANG: - case IPP_TAG_CHARSET: - case IPP_TAG_LANGUAGE: -- s += attr->values[i].string.text; -+ s += ippGetString(attr, i, NULL); - break; - default: - break; - } -- if (i != (attr->num_values-1)) -+ if (i != (ippGetCount(attr)-1)) - s += ", "; - } - kdDebug(500) << s << endl; -- attr = attr->next; -+ attr = ippNextAttribute(req); - } - } - -@@ -177,7 +179,7 @@ - ipp_attribute_t *attr = ippAddStrings(request_,(ipp_tag_t)group,(ipp_tag_t)type,name.latin1(),(int)(values.count()),NULL,NULL); - int i(0); - for (QStringList::ConstIterator it=values.begin(); it != values.end(); ++it, i++) -- attr->values[i].string.text = strdup((*it).local8Bit()); -+ ippSetString(request_, &attr, i, strdup((*it).local8Bit())); - } - } - -@@ -193,7 +195,7 @@ - ipp_attribute_t *attr = ippAddIntegers(request_,(ipp_tag_t)group,(ipp_tag_t)type,name.latin1(),(int)(values.count()),NULL); - int i(0); - for (QValueList<int>::ConstIterator it=values.begin(); it != values.end(); ++it, i++) -- attr->values[i].integer = *it; -+ ippSetInteger(request_, &attr, i, *it); - } - } - -@@ -209,19 +211,19 @@ - ipp_attribute_t *attr = ippAddBooleans(request_,(ipp_tag_t)group,name.latin1(),(int)(values.count()),NULL); - int i(0); - for (QValueList<bool>::ConstIterator it=values.begin(); it != values.end(); ++it, i++) -- attr->values[i].boolean = (char)(*it); -+ ippSetBoolean(request_, &attr, i, (char)(*it)); - } - } - - void IppRequest::setOperation(int op) - { -- request_->request.op.operation_id = (ipp_op_t)op; -- request_->request.op.request_id = 1; // 0 is not RFC-compliant, should be at least 1 -+ ippSetOperation(request_, (ipp_op_t)op); -+ ippSetRequestId(request_, 1); // 0 is not RFC-compliant, should be at least 1 - } - - int IppRequest::status() - { -- return (request_ ? request_->request.status.status_code : (connect_ ? cupsLastError() : -2)); -+ return (request_ ? ippGetStatusCode(request_) : (connect_ ? cupsLastError() : -2)); - } - - QString IppRequest::statusMessage() -@@ -248,7 +250,7 @@ - ipp_attribute_t *attr = ippFindAttribute(request_, name.latin1(), (ipp_tag_t)type); - if (attr) - { -- value = attr->values[0].integer; -+ value = ippGetInteger(attr, 0); - return true; - } - else return false; -@@ -260,7 +262,7 @@ - ipp_attribute_t *attr = ippFindAttribute(request_, name.latin1(), (ipp_tag_t)type); - if (attr) - { -- value = QString::fromLocal8Bit(attr->values[0].string.text); -+ value = QString::fromLocal8Bit(ippGetString(attr, 0, NULL)); - return true; - } - else return false; -@@ -273,8 +275,8 @@ - values.clear(); - if (attr) - { -- for (int i=0;i<attr->num_values;i++) -- values.append(QString::fromLocal8Bit(attr->values[i].string.text)); -+ for (int i=0;i<ippGetCount(attr);i++) -+ values.append(QString::fromLocal8Bit(ippGetString(attr, i, NULL))); - return true; - } - else return false; -@@ -286,7 +288,7 @@ - ipp_attribute_t *attr = ippFindAttribute(request_, name.latin1(), IPP_TAG_BOOLEAN); - if (attr) - { -- value = (bool)attr->values[0].boolean; -+ value = (bool)ippGetBoolean(attr, 0); - return true; - } - else return false; -@@ -338,10 +340,10 @@ - } - - /* No printers found */ -- if ( request_ && request_->request.status.status_code == 0x406 ) -+ if ( request_ && ippGetStatusCode(request_) == 0x406 ) - return true; - -- if (!request_ || request_->state == IPP_ERROR || (request_->request.status.status_code & 0x0F00)) -+ if (!request_ || ippGetState(request_) == IPP_ERROR || (ippGetStatusCode(request_) & 0x0F00)) - return false; - - -@@ -356,36 +358,36 @@ - output << "<tr><th bgcolor=\"dark blue\"><font color=\"white\">" << i18n("Attribute") << "</font></th>" << endl; - output << "<th bgcolor=\"dark blue\"><font color=\"white\">" << i18n("Values") << "</font></th></tr>" << endl; - // go to the first attribute of the specified group -- ipp_attribute_t *attr = request_->attrs; -- while (attr && attr->group_tag != group) -- attr = attr->next; -+ ipp_attribute_t *attr = ippFirstAttribute(request_); -+ while (attr && ippGetGroupTag(attr) != group) -+ attr = ippNextAttribute(request_); - // print each attribute -- ipp_uchar_t *d; -- QCString dateStr; -- QDateTime dt; -- bool bg(false); -- while (attr && attr->group_tag == group) -+ const ipp_uchar_t *d; -+ QCString dateStr; -+ QDateTime dt; -+ bool bg(false); -+ while (attr && ippGetGroupTag(attr) == group) - { -- output << " <tr bgcolor=\"" << (bg ? "#ffffd9" : "#ffffff") << "\">\n <td><b>" << attr->name << "</b></td>\n <td>" << endl; -+ output << " <tr bgcolor=\"" << (bg ? "#ffffd9" : "#ffffff") << "\">\n <td><b>" << ippGetName(attr) << "</b></td>\n <td>" << endl; - bg = !bg; -- for (int i=0; i<attr->num_values; i++) -+ for (int i=0; i<ippGetCount(attr); i++) - { -- switch (attr->value_tag) -+ switch (ippGetValueTag(attr)) - { - case IPP_TAG_INTEGER: -- if (attr->name && strstr(attr->name, "time")) -+ if (ippGetName(attr) && strstr(ippGetName(attr), "time")) - { -- dt.setTime_t((unsigned int)(attr->values[i].integer)); -+ dt.setTime_t((unsigned int)(ippGetInteger(attr, i))); - output << dt.toString(); - } - else -- output << attr->values[i].integer; -+ output << ippGetInteger(attr, i); - break; - case IPP_TAG_ENUM: -- output << "0x" << hex << attr->values[i].integer << dec; -+ output << "0x" << hex << ippGetInteger(attr, i) << dec; - break; - case IPP_TAG_BOOLEAN: -- output << (attr->values[i].boolean ? i18n("True") : i18n("False")); -+ output << (ippGetBoolean(attr, i) ? i18n("True") : i18n("False")); - break; - case IPP_TAG_STRING: - case IPP_TAG_TEXTLANG: -@@ -397,18 +399,25 @@ - case IPP_TAG_CHARSET: - case IPP_TAG_LANGUAGE: - case IPP_TAG_MIMETYPE: -- output << attr->values[i].string.text; -+ output << ippGetString(attr, i, NULL); - break; - case IPP_TAG_RESOLUTION: -- output << "( " << attr->values[i].resolution.xres -- << ", " << attr->values[i].resolution.yres << " )"; -+ int xres; -+ int yres; -+ ipp_res_t units; -+ xres = ippGetResolution(attr, i, &yres, &units); -+ output << "( " << xres -+ << ", " << yres << " )"; - break; - case IPP_TAG_RANGE: -- output << "[ " << (attr->values[i].range.lower > 0 ? attr->values[i].range.lower : 1) -- << ", " << (attr->values[i].range.upper > 0 ? attr->values[i].range.upper : 65535) << " ]"; -+ int lowervalue; -+ int uppervalue; -+ lowervalue = ippGetRange(attr, i, &uppervalue); -+ output << "[ " << (lowervalue > 0 ? lowervalue : 1) -+ << ", " << (uppervalue > 0 ? uppervalue : 65535) << " ]"; - break; - case IPP_TAG_DATE: -- d = attr->values[i].date; -+ d = ippGetDate(attr, i); - dateStr.sprintf("%.4d-%.2d-%.2d, %.2d:%.2d:%.2d %c%.2d%.2d", - d[0]*256+d[1], d[2], d[3], - d[4], d[5], d[6], -@@ -418,11 +427,11 @@ - default: - continue; - } -- if (i < attr->num_values-1) -+ if (i < ippGetCount(attr)-1) - output << "<br>"; - } - output << "</td>\n </tr>" << endl; -- attr = attr->next; -+ attr = ippNextAttribute(request_); - } - // end table - output << "</table>" << endl; -@@ -438,31 +447,34 @@ - ipp_attribute_t *attr = first(); - while (attr) - { -- if (group != -1 && attr->group_tag != group) -+ if (group != -1 && ippGetGroupTag(attr) != group) - { -- attr = attr->next; -+ attr = ippNextAttribute(request_); - continue; - } - QString value; -- for (int i=0; i<attr->num_values; i++) -+ for (int i=0; i<ippGetCount(attr); i++) - { -- switch (attr->value_tag) -+ switch (ippGetValueTag(attr)) - { - case IPP_TAG_INTEGER: - case IPP_TAG_ENUM: -- value.append(QString::number(attr->values[i].integer)).append(","); -+ value.append(QString::number(ippGetInteger(attr, i))).append(","); - break; - case IPP_TAG_BOOLEAN: -- value.append((attr->values[i].boolean ? "true" : "false")).append(","); -+ value.append((ippGetBoolean(attr, i) ? "true" : "false")).append(","); - break; - case IPP_TAG_RANGE: -- if (attr->values[i].range.lower > 0) -- value.append(QString::number(attr->values[i].range.lower)); -- if (attr->values[i].range.lower != attr->values[i].range.upper) -+ int lowervalue; -+ int uppervalue; -+ lowervalue = ippGetRange(attr, i, &uppervalue); -+ if (lowervalue > 0) -+ value.append(QString::number(lowervalue)); -+ if (lowervalue != uppervalue) - { - value.append("-"); -- if (attr->values[i].range.upper > 0) -- value.append(QString::number(attr->values[i].range.upper)); -+ if (uppervalue > 0) -+ value.append(QString::number(uppervalue)); - } - value.append(","); - break; -@@ -476,7 +488,7 @@ - case IPP_TAG_TEXTLANG: - case IPP_TAG_CHARSET: - case IPP_TAG_LANGUAGE: -- value.append(QString::fromLocal8Bit(attr->values[i].string.text)).append(","); -+ value.append(QString::fromLocal8Bit(ippGetString(attr, i, NULL))).append(","); - break; - default: - break; -@@ -484,8 +496,8 @@ - } - if (!value.isEmpty()) - value.truncate(value.length()-1); -- opts[QString::fromLocal8Bit(attr->name)] = value; -- attr = attr->next; -+ opts[QString::fromLocal8Bit(ippGetName(attr))] = value; -+ attr = ippNextAttribute(request_); - } - } - return opts; -@@ -542,3 +554,7 @@ - } - #endif - } -+ -+ -+ipp_attribute_t* IppRequest::first() -+{ return (request_ ? ippFirstAttribute(request_) : NULL); } -diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/ipprequest.h kdelibs-3.5.10/kdeprint/cups/ipprequest.h ---- kdelibs-3.5.10-orig/kdeprint/cups/ipprequest.h 2012-10-06 14:49:37.521406729 -0400 -+++ kdelibs-3.5.10/kdeprint/cups/ipprequest.h 2012-10-06 15:06:05.581489574 -0400 -@@ -72,7 +72,7 @@ - bool keyword(const QString& name, QStringList& value); - bool mime(const QString& name, QString& value); - ipp_attribute_t* first(); -- ipp_attribute_t* last(); -+ ipp_t* request(); - QMap<QString,QString> toMap(int group = -1); - void setMap(const QMap<QString,QString>& opts); - -@@ -178,12 +178,6 @@ - inline bool IppRequest::doRequest(const QString& res) - { return doFileRequest(res); } - --inline ipp_attribute_t* IppRequest::first() --{ return (request_ ? request_->attrs : NULL); } -- --inline ipp_attribute_t* IppRequest::last() --{ return (request_ ? request_->last : NULL); } -- - inline void IppRequest::setHost(const QString& host) - { host_ = host; } - -@@ -193,4 +187,7 @@ - inline void IppRequest::dump(int state) - { dump_ = state; } - -+inline ipp_t* IppRequest::request() -+{ return request_; } -+ - #endif -diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/kmcupsjobmanager.cpp kdelibs-3.5.10/kdeprint/cups/kmcupsjobmanager.cpp ---- kdelibs-3.5.10-orig/kdeprint/cups/kmcupsjobmanager.cpp 2012-10-06 14:49:37.521406729 -0400 -+++ kdelibs-3.5.10/kdeprint/cups/kmcupsjobmanager.cpp 2012-10-06 15:13:31.451859386 -0400 -@@ -36,6 +36,8 @@ - #include <kdebug.h> - #include <kurl.h> - -+#include "config.h" -+ - KMCupsJobManager::KMCupsJobManager(QObject *parent, const char *name, const QStringList & /*args*/) - : KMJobManager(parent,name) - { -@@ -166,17 +168,18 @@ - void KMCupsJobManager::parseListAnswer(IppRequest& req, KMPrinter *pr) - { - ipp_attribute_t *attr = req.first(); -+ ipp_attribute_t *nextAttr; - KMJob *job = new KMJob(); - QString uri; - while (attr) - { -- QString name(attr->name); -- if (name == "job-id") job->setId(attr->values[0].integer); -- else if (name == "job-uri") job->setUri(QString::fromLocal8Bit(attr->values[0].string.text)); -- else if (name == "job-name") job->setName(QString::fromLocal8Bit(attr->values[0].string.text)); -+ QString name(ippGetName(attr)); -+ if (name == "job-id") job->setId(ippGetInteger(attr, 0)); -+ else if (name == "job-uri") job->setUri(QString::fromLocal8Bit(ippGetString(attr, 0, NULL))); -+ else if (name == "job-name") job->setName(QString::fromLocal8Bit(ippGetString(attr, 0, NULL))); - else if (name == "job-state") - { -- switch (attr->values[0].integer) -+ switch (ippGetInteger(attr, 0)) - { - case IPP_JOB_PENDING: - job->setState(KMJob::Queued); -@@ -204,29 +207,30 @@ - break; - } - } -- else if (name == "job-k-octets") job->setSize(attr->values[0].integer); -- else if (name == "job-originating-user-name") job->setOwner(QString::fromLocal8Bit(attr->values[0].string.text)); -- else if (name == "job-k-octets-completed") job->setProcessedSize(attr->values[0].integer); -- else if (name == "job-media-sheets") job->setPages(attr->values[0].integer); -- else if (name == "job-media-sheets-completed") job->setProcessedPages(attr->values[0].integer); -+ else if (name == "job-k-octets") job->setSize(ippGetInteger(attr, 0)); -+ else if (name == "job-originating-user-name") job->setOwner(QString::fromLocal8Bit(ippGetString(attr, 0, NULL))); -+ else if (name == "job-k-octets-completed") job->setProcessedSize(ippGetInteger(attr, 0)); -+ else if (name == "job-media-sheets") job->setPages(ippGetInteger(attr, 0)); -+ else if (name == "job-media-sheets-completed") job->setProcessedPages(ippGetInteger(attr, 0)); - else if (name == "job-printer-uri" && !pr->isRemote()) - { -- QString str(attr->values[0].string.text); -+ QString str(ippGetString(attr, 0, NULL)); - int p = str.findRev('/'); - if (p != -1) - job->setPrinter(str.mid(p+1)); - } - else if (name == "job-priority") - { -- job->setAttribute(0, QString::fromLatin1("%1").arg(attr->values[0].integer, 3)); -+ job->setAttribute(0, QString::fromLatin1("%1").arg(ippGetInteger(attr, 0), 3)); - } - else if (name == "job-billing") - { - job->setAttributeCount(2); -- job->setAttribute(1, QString::fromLocal8Bit(attr->values[0].string.text)); -+ job->setAttribute(1, QString::fromLocal8Bit(ippGetString(attr, 0, NULL))); - } - -- if (name.isEmpty() || attr == req.last()) -+ nextAttr = ippNextAttribute(req.request()); -+ if (name.isEmpty() || (!nextAttr)) - { - if (job->printer().isEmpty()) - job->setPrinter(pr->printerName()); -@@ -234,8 +238,7 @@ - addJob(job); // don't use job after this call !!! - job = new KMJob(); - } -- -- attr = attr->next; -+ attr = nextAttr; - } - delete job; - } -diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/kmcupsmanager.cpp kdelibs-3.5.10/kdeprint/cups/kmcupsmanager.cpp ---- kdelibs-3.5.10-orig/kdeprint/cups/kmcupsmanager.cpp 2012-10-06 14:49:37.521406729 -0400 -+++ kdelibs-3.5.10/kdeprint/cups/kmcupsmanager.cpp 2012-10-06 15:14:22.311521604 -0400 -@@ -476,19 +476,20 @@ - void KMCupsManager::processRequest(IppRequest* req) - { - ipp_attribute_t *attr = req->first(); -+ ipp_attribute_t *nextAttr; - KMPrinter *printer = new KMPrinter(); - while (attr) - { -- QString attrname(attr->name); -+ QString attrname(ippGetName(attr)); - if (attrname == "printer-name") - { -- QString value = QString::fromLocal8Bit(attr->values[0].string.text); -+ QString value = QString::fromLocal8Bit(ippGetString(attr, 0, NULL)); - printer->setName(value); - printer->setPrinterName(value); - } - else if (attrname == "printer-type") - { -- int value = attr->values[0].integer; -+ int value = ippGetInteger(attr, 0); - printer->setType(0); - printer->addType(((value & CUPS_PRINTER_CLASS) || (value & CUPS_PRINTER_IMPLICIT) ? KMPrinter::Class : KMPrinter::Printer)); - if ((value & CUPS_PRINTER_REMOTE)) printer->addType(KMPrinter::Remote); -@@ -499,7 +500,7 @@ - } - else if (attrname == "printer-state") - { -- switch (attr->values[0].integer) -+ switch (ippGetInteger(attr, 0)) - { - case IPP_PRINTER_IDLE: printer->setState(KMPrinter::Idle); break; - case IPP_PRINTER_PROCESSING: printer->setState(KMPrinter::Processing); break; -@@ -508,22 +509,24 @@ - } - else if (attrname == "printer-uri-supported") - { -- printer->setUri(KURL(attr->values[0].string.text)); -+ printer->setUri(KURL(ippGetString(attr, 0, NULL))); - } - else if (attrname == "printer-location") - { -- printer->setLocation(QString::fromLocal8Bit(attr->values[0].string.text)); -+ printer->setLocation(QString::fromLocal8Bit(ippGetString(attr, 0, NULL))); - } - else if (attrname == "printer-is-accepting-jobs") - { -- printer->setAcceptJobs(attr->values[0].boolean); -+ printer->setAcceptJobs(ippGetBoolean(attr, 0)); - } -- if (attrname.isEmpty() || attr == req->last()) -+ -+ nextAttr = ippNextAttribute(req->request()); -+ if (attrname.isEmpty() || (!nextAttr)) - { - addPrinter(printer); - printer = new KMPrinter(); - } -- attr = attr->next; -+ attr = nextAttr; - } - delete printer; - } -@@ -817,6 +820,7 @@ - { - QStringList list; - IppRequest req; -+ ipp_attribute_t *nextAttr; - req.setOperation(CUPS_GET_DEVICES); - if (req.doRequest("/")) - { -@@ -824,12 +828,13 @@ - ipp_attribute_t *attr = req.first(); - while (attr) - { -- QString attrname(attr->name); -- if (attrname == "device-info") desc = attr->values[0].string.text; -- else if (attrname == "device-make-and-model") printer = attr->values[0].string.text; -- else if (attrname == "device-uri") uri = attr->values[0].string.text; -- else if ( attrname == "device-class" ) cl = attr->values[ 0 ].string.text; -- if (attrname.isEmpty() || attr == req.last()) -+ QString attrname(ippGetName(attr)); -+ if (attrname == "device-info") desc = ippGetString(attr, 0, NULL); -+ else if (attrname == "device-make-and-model") printer = ippGetString(attr, 0, NULL); -+ else if (attrname == "device-uri") uri = ippGetString(attr, 0, NULL); -+ else if ( attrname == "device-class" ) cl = ippGetString(attr, 0, NULL); -+ nextAttr = ippNextAttribute(req.request()); -+ if (attrname.isEmpty() || (!nextAttr)) - { - if (!uri.isEmpty()) - { -@@ -838,7 +843,7 @@ - } - uri = desc = printer = cl = QString::null; - } -- attr = attr->next; -+ attr = nextAttr; - } - } - return list; -diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/kmcupsuimanager.cpp kdelibs-3.5.10/kdeprint/cups/kmcupsuimanager.cpp ---- kdelibs-3.5.10-orig/kdeprint/cups/kmcupsuimanager.cpp 2012-10-06 14:49:37.521406729 -0400 -+++ kdelibs-3.5.10/kdeprint/cups/kmcupsuimanager.cpp 2012-10-06 15:14:55.177970017 -0400 -@@ -60,6 +60,8 @@ - #include <kaction.h> - #include <kmessagebox.h> - -+#include "config.h" -+ - KMCupsUiManager::KMCupsUiManager(QObject *parent, const char *name, const QStringList & /*args*/) - : KMUiManager(parent,name) - { -@@ -143,22 +145,22 @@ - ipp_attribute_t *attr = req.first(); - while (attr) - { -- if (attr->name && strcmp(attr->name,"device-uri") == 0) -+ if (ippGetName(attr) && strcmp(ippGetName(attr),"device-uri") == 0) - { -- if (strncmp(attr->values[0].string.text,"socket",6) == 0) backend->enableBackend(KMWizard::TCP,true); -- else if (strncmp(attr->values[0].string.text,"parallel",8) == 0) backend->enableBackend(KMWizard::Local,true); -- else if (strncmp(attr->values[0].string.text,"serial",6) == 0) backend->enableBackend(KMWizard::Local,true); -- else if (strncmp(attr->values[0].string.text,"smb",3) == 0) backend->enableBackend(KMWizard::SMB,true); -- else if (strncmp(attr->values[0].string.text,"lpd",3) == 0) backend->enableBackend(KMWizard::LPD,true); -- else if (strncmp(attr->values[0].string.text,"usb",3) == 0) backend->enableBackend(KMWizard::Local,true); -- else if (strncmp(attr->values[0].string.text,"http",4) == 0 || strncmp(attr->values[0].string.text,"ipp",3) == 0) -+ if (strncmp(ippGetString(attr, 0, NULL),"socket",6) == 0) backend->enableBackend(KMWizard::TCP,true); -+ else if (strncmp(ippGetString(attr, 0, NULL),"parallel",8) == 0) backend->enableBackend(KMWizard::Local,true); -+ else if (strncmp(ippGetString(attr, 0, NULL),"serial",6) == 0) backend->enableBackend(KMWizard::Local,true); -+ else if (strncmp(ippGetString(attr, 0, NULL),"smb",3) == 0) backend->enableBackend(KMWizard::SMB,true); -+ else if (strncmp(ippGetString(attr, 0, NULL),"lpd",3) == 0) backend->enableBackend(KMWizard::LPD,true); -+ else if (strncmp(ippGetString(attr, 0, NULL),"usb",3) == 0) backend->enableBackend(KMWizard::Local,true); -+ else if (strncmp(ippGetString(attr, 0, NULL),"http",4) == 0 || strncmp(ippGetString(attr, 0, NULL),"ipp",3) == 0) - { - backend->enableBackend(KMWizard::IPP,true); - backend->enableBackend(KMWizard::Custom+1,true); - } -- else if (strncmp(attr->values[0].string.text,"fax",3) == 0) backend->enableBackend(KMWizard::Custom+2,true); -+ else if (strncmp(ippGetString(attr, 0, NULL),"fax",3) == 0) backend->enableBackend(KMWizard::Custom+2,true); - } -- attr = attr->next; -+ attr = ippNextAttribute(req.request()); - } - backend->enableBackend(KMWizard::Class, true); - backend->enableBackend(KMWizard::Custom+5, true); -diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/kmwfax.cpp kdelibs-3.5.10/kdeprint/cups/kmwfax.cpp ---- kdelibs-3.5.10-orig/kdeprint/cups/kmwfax.cpp 2012-10-06 14:49:37.521406729 -0400 -+++ kdelibs-3.5.10/kdeprint/cups/kmwfax.cpp 2012-10-06 15:15:28.044418449 -0400 -@@ -30,6 +30,8 @@ - #include <kiconloader.h> - #include <kurl.h> - -+#include "config.h" -+ - KMWFax::KMWFax(QWidget *parent, const char *name) - : KMWizardPage(parent,name) - { -@@ -55,11 +57,11 @@ - ipp_attribute_t *attr = req.first(); - while (attr) - { -- if (attr->name && strcmp(attr->name,"device-uri") == 0 && strncmp(attr->values[0].string.text,"fax",3) == 0) -+ if (ippGetName(attr) && strcmp(ippGetName(attr),"device-uri") == 0 && strncmp(ippGetString(attr, 0, NULL),"fax",3) == 0) - { -- m_list->insertItem(SmallIcon("blockdevice"),QString::fromLatin1(attr->values[0].string.text)); -+ m_list->insertItem(SmallIcon("blockdevice"),QString::fromLatin1(ippGetString(attr, 0, NULL))); - } -- attr = attr->next; -+ attr = ippNextAttribute(req.request()); - } - } - } -diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/kmwippselect.cpp kdelibs-3.5.10/kdeprint/cups/kmwippselect.cpp ---- kdelibs-3.5.10-orig/kdeprint/cups/kmwippselect.cpp 2012-10-06 14:49:37.521406729 -0400 -+++ kdelibs-3.5.10/kdeprint/cups/kmwippselect.cpp 2012-10-06 15:15:56.867560417 -0400 -@@ -29,6 +29,8 @@ - #include <kdebug.h> - #include <kiconloader.h> - -+#include "config.h" -+ - KMWIppSelect::KMWIppSelect(QWidget *parent, const char *name) - : KMWizardPage(parent,name) - { -@@ -83,9 +85,9 @@ - ipp_attribute_t *attr = req.first(); - while (attr) - { -- if (attr->name && strcmp(attr->name,"printer-name") == 0) -- m_list->insertItem(SmallIcon("kdeprint_printer"),QString::fromLatin1(attr->values[0].string.text)); -- attr = attr->next; -+ if (ippGetName(attr) && strcmp(ippGetName(attr),"printer-name") == 0) -+ m_list->insertItem(SmallIcon("kdeprint_printer"),QString::fromLatin1(ippGetString(attr, 0, NULL))); -+ attr = ippNextAttribute(req.request()); - } - m_list->sort(); - } diff --git a/staging/kdelibs3/kdelibs3-missing-include.patch b/staging/kdelibs3/kdelibs3-missing-include.patch deleted file mode 100644 index 5b84ef746..000000000 --- a/staging/kdelibs3/kdelibs3-missing-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- kdeprint/cups/cupsdconf2/cups-util.c.old 2012-01-19 01:30:26.000000000 -0500 -+++ kdeprint/cups/cupsdconf2/cups-util.c 2012-01-19 01:31:33.000000000 -0500 -@@ -2,6 +2,7 @@ - #include <cups/http.h> - #include <cups/cups.h> - #include <stdlib.h> -+#include <stdio.h> - #include <fcntl.h> - #include <sys/stat.h> - #include <unistd.h> diff --git a/staging/kdelibs3/kdelibs3.install b/staging/kdelibs3/kdelibs3.install deleted file mode 100644 index 7291ac0a2..000000000 --- a/staging/kdelibs3/kdelibs3.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - post_remove -} - -post_upgrade() { - post_remove -} - -post_remove() { - # this can be removed in future versions - sed -ie '/\/opt\/kde\/lib/d' etc/ld.so.conf -} diff --git a/staging/kdelibs3/openssl.patch b/staging/kdelibs3/openssl.patch deleted file mode 100644 index a948b884a..000000000 --- a/staging/kdelibs3/openssl.patch +++ /dev/null @@ -1,180 +0,0 @@ -diff -up kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.cc ---- kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x 2009-09-04 23:10:53.000000000 +0200 -+++ kdelibs-3.5.10/kio/kssl/kopenssl.cc 2009-09-04 23:10:53.000000000 +0200 -@@ -96,9 +96,14 @@ static int (*K_BIO_write) (BIO *b, cons - static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *, - const EVP_CIPHER *,unsigned char *,int , - pem_password_cb *, void *) = 0L; -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L; -+static ASN1_ITEM *K_NETSCAPE_X509_it = 0L; -+#else - static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L; - static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L; - static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L; -+#endif - static int (*K_X509_print_fp) (FILE *, X509*) = 0L; - static int (*K_i2d_PKCS12) (PKCS12*, unsigned char**) = 0L; - static int (*K_i2d_PKCS12_fp) (FILE *, PKCS12*) = 0L; -@@ -430,9 +435,14 @@ KConfig *cfg; - K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl"); - K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write"); - K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio"); -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp"); -+ K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it"); -+#else - K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth"); - K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp"); - K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER"); -+#endif - K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp"); - K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12"); - K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp"); -@@ -594,7 +604,7 @@ KConfig *cfg; - K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session"); - K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION"); - K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION"); -- K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers"); -+ K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers"); - #endif - - -@@ -982,7 +992,13 @@ int KOpenSSLProxy::PEM_write_bio_X509(BI - else return -1; - } - -- -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) { -+ if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it) -+ return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x); -+ else return -1; -+} -+#else - ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) { - if (K_X509_asn1_meth) return (K_X509_asn1_meth)(); - else return 0L; -@@ -994,7 +1010,7 @@ int KOpenSSLProxy::ASN1_i2d_fp(FILE *out - return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x); - else return -1; - } -- -+#endif - - int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) { - if (K_X509_print_fp) return (K_X509_print_fp)(fp, x); -diff -up kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.h ---- kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x 2006-07-22 10:16:39.000000000 +0200 -+++ kdelibs-3.5.10/kio/kssl/kopenssl.h 2009-09-04 23:10:53.000000000 +0200 -@@ -48,6 +48,9 @@ class KOpenSSLProxyPrivate; - #include <openssl/stack.h> - #include <openssl/bn.h> - #undef crypt -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+#define STACK _STACK -+#endif - #endif - - #include <kstaticdeleter.h> -@@ -446,12 +449,12 @@ public: - */ - int PEM_write_bio_X509(BIO *bp, X509 *x); - -- -+#if OPENSSL_VERSION_NUMBER < 0x10000000L - /* - * X509_asn1_meth - used for netscape output - */ - ASN1_METHOD *X509_asn1_meth(); -- -+#endif - - /* - * ASN1_i2d_fp - used for netscape output -@@ -531,6 +534,9 @@ public: - */ - void sk_free(STACK *s); - -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); } -+#endif - - /* - * Number of elements in the stack -@@ -543,6 +549,9 @@ public: - */ - char *sk_value(STACK *s, int n); - -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); } -+#endif - - /* - * Create a new stack -@@ -555,6 +564,9 @@ public: - */ - int sk_push(STACK *s, char *d); - -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); } -+#endif - - /* - * Duplicate the stack -diff -up kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc ---- kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x 2005-10-10 17:05:44.000000000 +0200 -+++ kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc 2009-09-04 23:10:53.000000000 +0200 -@@ -87,7 +87,7 @@ KSMIMECryptoPrivate::KSMIMECryptoPrivate - - - STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList<KSSLCertificate> &certs) { -- STACK_OF(X509) *x509 = sk_new(NULL); -+ STACK_OF(X509) *x509 = reinterpret_cast<STACK_OF(X509)*>(sk_new(NULL)); - KSSLCertificate *cert = certs.first(); - while(cert) { - sk_X509_push(x509, cert->getCert()); -diff -up kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksslcertificate.cc ---- kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x 2006-01-19 18:06:12.000000000 +0100 -+++ kdelibs-3.5.10/kio/kssl/ksslcertificate.cc 2009-09-04 23:10:53.000000000 +0200 -@@ -1003,17 +1003,31 @@ return qba; - QByteArray KSSLCertificate::toNetscape() { - QByteArray qba; - #ifdef KSSL_HAVE_SSL --ASN1_HEADER ah; --ASN1_OCTET_STRING os; --KTempFile ktf; -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ NETSCAPE_X509 nx; -+ ASN1_OCTET_STRING hdr; -+#else -+ ASN1_HEADER ah; -+ ASN1_OCTET_STRING os; -+#endif -+ KTempFile ktf; - -- os.data = (unsigned char *)NETSCAPE_CERT_HDR; -- os.length = strlen(NETSCAPE_CERT_HDR); -- ah.header = &os; -- ah.data = (char *)getCert(); -- ah.meth = d->kossl->X509_asn1_meth(); -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ hdr.data = (unsigned char *)NETSCAPE_CERT_HDR; -+ hdr.length = strlen(NETSCAPE_CERT_HDR); -+ nx.header = &hdr; -+ nx.cert = getCert(); -+ -+ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx); -+#else -+ os.data = (unsigned char *)NETSCAPE_CERT_HDR; -+ os.length = strlen(NETSCAPE_CERT_HDR); -+ ah.header = &os; -+ ah.data = (char *)getCert(); -+ ah.meth = d->kossl->X509_asn1_meth(); - -- d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah); -+ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah); -+#endif - - ktf.close(); - diff --git a/staging/kdemultimedia/PKGBUILD b/staging/kdemultimedia/PKGBUILD deleted file mode 100644 index 1cb3c9ee8..000000000 --- a/staging/kdemultimedia/PKGBUILD +++ /dev/null @@ -1,111 +0,0 @@ -# $Id: PKGBUILD 161262 2012-06-08 07:13:37Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdemultimedia -pkgname=('kdemultimedia-dragonplayer' - 'kdemultimedia-ffmpegthumbs' - 'kdemultimedia-juk' - 'kdemultimedia-kioslave' - 'kdemultimedia-kmix' - 'kdemultimedia-kscd' - 'kdemultimedia-mplayerthumbs') -pkgver=4.8.4 -pkgrel=2 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdemultimedia') -makedepends=('cmake' 'automoc4' 'kdelibs' 'ffmpeg' 'mplayer' 'libpulse' - 'libmusicbrainz3' 'taglib' 'libcanberra') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" - 'mplayerthumbs.config' - 'ffmpeg0.11.patch') -sha1sums=('dac721e82308a6347d578361e25da7c466a26ba7' - 'ba016fa2563c14ffcba852c62506b66bfc6ee683' - '48331f7e2dab760c20708b81fe6c4d47c83a63e7') - -build() { - cd ${srcdir}/${pkgbase}-${pkgver}/ffmpegthumbs - patch -p1 -i ${srcdir}/ffmpeg0.11.patch - - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_TunePimp=OFF - make -} - -package_kdemultimedia-dragonplayer() { - pkgdesc='Video Player' - depends=('kdebase-runtime') - url="http://kde.org/applications/multimedia/dragonplayer/" - install='kdemultimedia-dragonplayer.install' - cd $srcdir/build/dragonplayer - make DESTDIR=$pkgdir install - cd $srcdir/build/dragonplayer/doc - make DESTDIR=$pkgdir install -} - -package_kdemultimedia-ffmpegthumbs() { - pkgdesc='Video Files (ffmpegthumbs)' - depends=('kdebase-runtime' 'ffmpeg') - install='kdemultimedia.install' - cd $srcdir/build/ffmpegthumbs - make DESTDIR=$pkgdir install -} - -package_kdemultimedia-juk() { - pkgdesc='Music Player' - depends=('kdebase-runtime' 'taglib') - url="http://kde.org/applications/multimedia/juk" - install='kdemultimedia.install' - cd $srcdir/build/juk - make DESTDIR=$pkgdir install - cd $srcdir/build/juk/doc - make DESTDIR=$pkgdir install -} - -package_kdemultimedia-kioslave() { - pkgdesc='Audio CD Browser' - depends=('kdelibs' 'libmusicbrainz3' 'cdparanoia') - conflicts=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc') - replaces=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc') - for i in kioslave libkcddb libkcompactdisc; do - cd $srcdir/build/${i} - make DESTDIR=$pkgdir install - done -} - -package_kdemultimedia-kmix() { - pkgdesc='Sound Mixer' - depends=('kdebase-runtime') - url="http://kde.org/applications/multimedia/kmix" - install='kdemultimedia.install' - cd $srcdir/build/kmix - make DESTDIR=$pkgdir install - cd $srcdir/build/kmix/doc - make DESTDIR=$pkgdir install -} - -package_kdemultimedia-kscd() { - pkgdesc='CD Player' - depends=('kdebase-runtime' 'libmusicbrainz3') - url="http://kde.org/applications/multimedia/kscd" - install='kdemultimedia.install' - cd $srcdir/build/kscd - make DESTDIR=$pkgdir install -} - -package_kdemultimedia-mplayerthumbs() { - pkgdesc='Video Files (MPlayerThumbs)' - depends=('kdebase-runtime' 'mplayer') - replaces=('mplayerthumbs') - conflicts=('mplayerthumbs') - cd $srcdir/build/mplayerthumbs - make DESTDIR=$pkgdir install - install -D -m644 $srcdir/mplayerthumbs.config $pkgdir/usr/share/config/mplayerthumbs -} diff --git a/staging/kdemultimedia/ffmpeg0.11.patch b/staging/kdemultimedia/ffmpeg0.11.patch deleted file mode 100644 index 527ac3992..000000000 --- a/staging/kdemultimedia/ffmpeg0.11.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Christoph Feck <christoph@maxiom.de> -Date: Tue, 29 May 2012 13:53:18 +0000 -Subject: Two deprecated calls have been removed from ffmpeg 0.11. -X-Git-Tag: v4.8.80 -X-Git-Url: http://quickgit.kde.org/?p=ffmpegthumbs.git&a=commitdiff&h=4f03b20614c122e3e14473d42a000c0bffdce39c ---- -Two deprecated calls have been removed from ffmpeg 0.11. - -BUG:300732 ---- - - ---- a/ffmpegthumbnailer/moviedecoder.cpp -+++ b/ffmpegthumbnailer/moviedecoder.cpp -@@ -52,12 +52,11 @@ MovieDecoder::~MovieDecoder() - void MovieDecoder::initialize(const QString& filename) - { - av_register_all(); -- avcodec_init(); - avcodec_register_all(); - - QFileInfo fileInfo(filename); - -- if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, fileInfo.absoluteFilePath().toUtf8().data(), NULL, 0, NULL) != 0) { -+ if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, fileInfo.absoluteFilePath().toLocal8Bit().data(), NULL, NULL) != 0) { - kDebug() << "Could not open input file: " << fileInfo.absoluteFilePath(); - return; - } - diff --git a/staging/kdemultimedia/kdemultimedia-dragonplayer.install b/staging/kdemultimedia/kdemultimedia-dragonplayer.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/staging/kdemultimedia/kdemultimedia-dragonplayer.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdemultimedia/kdemultimedia.install b/staging/kdemultimedia/kdemultimedia.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdemultimedia/kdemultimedia.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/kdemultimedia/mplayerthumbs.config b/staging/kdemultimedia/mplayerthumbs.config deleted file mode 100644 index 761a17953..000000000 --- a/staging/kdemultimedia/mplayerthumbs.config +++ /dev/null @@ -1,2 +0,0 @@ -[MPlayerThumbsCfg] -backend=0 diff --git a/staging/kdenetwork/PKGBUILD b/staging/kdenetwork/PKGBUILD deleted file mode 100644 index c5c680d3c..000000000 --- a/staging/kdenetwork/PKGBUILD +++ /dev/null @@ -1,111 +0,0 @@ -# $Id: PKGBUILD 161045 2012-06-07 21:00:18Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdenetwork -pkgname=('kdenetwork-filesharing' - 'kdenetwork-kdnssd' - 'kdenetwork-kget' - 'kdenetwork-kopete' - 'kdenetwork-kppp' - 'kdenetwork-krdc' - 'kdenetwork-krfb') -pkgver=4.8.4 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdenetwork') -makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp' - 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn' - 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu' - 'libktorrent' 'libmms' 'mediastreamer') - source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('b3926c5cd929cec209421c2f1cb8659cc1c82458') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \ - -DWITH_Xmms=OFF \ - -DWITH_LibMeanwhile=OFF \ - -DWITH_qq=OFF - make -} - -package_kdenetwork-filesharing() { - pkgdesc='Konqueror properties dialog plugin to share a directory with the local network' - depends=('kdelibs' 'smbclient') - install='kdenetwork.install' - cd $srcdir/build/filesharing - make DESTDIR=$pkgdir install -} - -package_kdenetwork-kdnssd() { - pkgdesc='Monitors the network for DNS-SD services' - depends=('kdelibs') - cd $srcdir/build/kdnssd - make DESTDIR=$pkgdir install -} - -package_kdenetwork-kget() { - pkgdesc='Download Manager' - depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms') - url="http://kde.org/applications/internet/kget/" - install='kdenetwork-kget.install' - cd $srcdir/build/kget - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kget - make DESTDIR=$pkgdir install -} - -package_kdenetwork-kopete() { - pkgdesc='Instant Messenger' - depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn' - 'libidn' 'qimageblitz' 'libgadu' 'mediastreamer') - url="http://kde.org/applications/internet/kopete/" - install='kdenetwork-kopete.install' - cd $srcdir/build/kopete - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kopete - make DESTDIR=$pkgdir install -} - -package_kdenetwork-kppp() { - pkgdesc='Internet Dial-Up Tool' - depends=('kdebase-runtime' 'ppp') - url="http://kde.org/applications/internet/kppp/" - install='kdenetwork-kppp.install' - cd $srcdir/build/kppp - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kppp - make DESTDIR=$pkgdir install -} - -package_kdenetwork-krdc() { - pkgdesc='Remote Desktop Client' - depends=('kdebase-runtime' 'libvncserver' 'rdesktop') - optdepends=('kdebase-keditbookmarks: to edit bookmarks') - url="http://kde.org/applications/internet/krdc/" - cd $srcdir/build/krdc - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/krdc - make DESTDIR=$pkgdir install -} - -package_kdenetwork-krfb() { - pkgdesc='Desktop Sharing' - # note on libxdamage: - # not detected by namcap because libgl depends on it - # but nvidia providing libgl does not depend on libxdamage - depends=('kdebase-runtime' 'libvncserver' 'libxdamage') - cd $srcdir/build/krfb - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/krfb - make DESTDIR=$pkgdir install -} diff --git a/staging/kdenetwork/kdenetwork-kget.install b/staging/kdenetwork/kdenetwork-kget.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/staging/kdenetwork/kdenetwork-kget.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdenetwork/kdenetwork-kopete.install b/staging/kdenetwork/kdenetwork-kopete.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/staging/kdenetwork/kdenetwork-kopete.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdenetwork/kdenetwork-kppp.install b/staging/kdenetwork/kdenetwork-kppp.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/staging/kdenetwork/kdenetwork-kppp.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdenetwork/kdenetwork.install b/staging/kdenetwork/kdenetwork.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdenetwork/kdenetwork.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/kdepim-runtime/PKGBUILD b/staging/kdepim-runtime/PKGBUILD deleted file mode 100644 index c679d03e5..000000000 --- a/staging/kdepim-runtime/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 160983 2012-06-07 20:19:38Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgname=kdepim-runtime -pkgver=4.8.4 -pkgrel=1 -pkgdesc='KDE PIM Runtime Environment' -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -depends=('kdepimlibs' 'kdebase-runtime') -makedepends=('cmake' 'automoc4' 'boost') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('3a375afb62b4ee01d491c4787b559132317aa983') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdepim-runtime/kdepim-runtime.install b/staging/kdepim-runtime/kdepim-runtime.install deleted file mode 100644 index c77e68041..000000000 --- a/staging/kdepim-runtime/kdepim-runtime.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdepim/PKGBUILD b/staging/kdepim/PKGBUILD deleted file mode 100644 index 0443acf50..000000000 --- a/staging/kdepim/PKGBUILD +++ /dev/null @@ -1,244 +0,0 @@ -# $Id: PKGBUILD 161046 2012-06-07 21:01:36Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdepim -pkgname=('kdepim-akonadiconsole' - 'kdepim-akregator' - 'kdepim-blogilo' - 'kdepim-console' - 'kdepim-kaddressbook' - 'kdepim-kalarm' - 'kdepim-kjots' - 'kdepim-kleopatra' - 'kdepim-kmail' - 'kdepim-knode' - 'kdepim-knotes' - 'kdepim-kontact' - 'kdepim-korganizer' - 'kdepim-kresources' - 'kdepim-ktimetracker' - 'kdepim-libkdepim') -pkgver=4.8.4 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://pim.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdepim') -makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' - 'kde-agent') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('aae8f027ab1ef75283d6e4b2bdf76c91d04087ea') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DKDEPIM_BUILD_MOBILE=OFF - make -} - -package_kdepim-akonadiconsole() { - pkgdesc='Akonadi Management and Debugging Console' - depends=('kdepim-libkdepim') - url='http://pim.kde.org' - install='kdepim.install' - cd "${srcdir}"/build/akonadiconsole - make DESTDIR="${pkgdir}" install -} - -package_kdepim-akregator() { - pkgdesc='A Feed Reader for KDE' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/internet/akregator/" - install='kdepim.install' - cd "${srcdir}"/build/akregator - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/akregator - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/kontact/plugins/akregator - make DESTDIR="${pkgdir}" install -} - -package_kdepim-blogilo() { - pkgdesc='A KDE Blogging Client' - depends=('kdepim-runtime') - url="http://kde.org/applications/internet/blogilo/" - replaces=('blogilo') - conflicts=('blogilo') - install='kdepim.install' - cd "${srcdir}"/build/blogilo - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/blogilo - make DESTDIR="${pkgdir}" install -} - -package_kdepim-console() { - pkgdesc='Command line tool for accessing calendar files' - depends=('kdepim-runtime') - url='http://pim.kde.org' - install='kdepim.install' - cd "${srcdir}"/build/console - make DESTDIR="${pkgdir}" install -} - -package_kdepim-kaddressbook() { - pkgdesc='Contact Manager' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/office/kaddressbook/" - install='kdepim.install' - cd "${srcdir}"/build/kaddressbook - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/kontact/plugins/kaddressbook - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/plugins/kaddressbook - make DESTDIR="${pkgdir}" install -} - -package_kdepim-kalarm() { - pkgdesc='Personal Alarm Scheduler' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/utilities/kalarm/" - install='kdepim.install' - cd "${srcdir}"/build/kalarm - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/kalarm - make DESTDIR="${pkgdir}" install -} - -package_kdepim-kjots() { - pkgdesc='Note Taker' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/utilities/kjots/" - install='kdepim.install' - cd "${srcdir}"/build/kjots - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/kjots - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/kontact/plugins/kjots - make DESTDIR="${pkgdir}" install -} - -package_kdepim-kleopatra() { - pkgdesc='Certificate Manager and Unified Crypto GUI' - depends=('kdepim-libkdepim') - install=kdepim-kleopatra.install - url="http://kde.org/applications/utilities/kleopatra/" - cd "${srcdir}"/build/kleopatra - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/kleopatra - make DESTDIR="${pkgdir}" install -} - -package_kdepim-kmail() { - pkgdesc='Mail Client' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/internet/kmail/" - install='kdepim-kmail.install' - conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' - 'kdepim-mimelib' 'kdepim-plugins') - replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' - 'kdepim-mimelib' 'kdepim-plugins') - for i in kmail doc/kmail kmailcvt ksendemail libksieve mailcommon \ - mailfilteragent ontologies kontact/plugins/kmail; do - cd "${srcdir}"/build/${i} - make DESTDIR="${pkgdir}" install - done -} - -package_kdepim-knode() { - pkgdesc='News Reader' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/internet/knode/" - install='kdepim.install' - cd "${srcdir}"/build/knode - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/knode - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/kontact/plugins/knode - make DESTDIR="${pkgdir}" install -} - -package_kdepim-knotes() { - pkgdesc='Popup Notes' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/utilities/knotes/" - install='kdepim.install' - cd "${srcdir}"/build/knotes - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/knotes - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/kontact/plugins/knotes - make DESTDIR="${pkgdir}" install -} - -package_kdepim-kontact() { - pkgdesc='Personal Information Manager' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/office/kontact/" - install='kdepim.install' - conflcits=('kdepim-kontactinterfaces') - replaces=('kdepim-kontactinterfaces') - for i in kontact/src doc/kontact \ - kontact/plugins/summary kontact/plugins/specialdates; do - cd "${srcdir}"/build/${i} - make DESTDIR="${pkgdir}" install - done -} - -package_kdepim-korganizer() { - pkgdesc='Calendar and Scheduling Program' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/office/korganizer" - install='kdepim-korganizer.install' - cd "${srcdir}"/build/korganizer - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/korganizer - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/kontact/plugins/korganizer - make DESTDIR="${pkgdir}" install -} - -package_kdepim-kresources() { - pkgdesc='KDE PIM resources' - depends=('kdepim-libkdepim') - url='http://pim.kde.org' - cd "${srcdir}"/build/kresources - make DESTDIR="${pkgdir}" install -} - -package_kdepim-ktimetracker() { - pkgdesc='Personal Time Tracker' - depends=('kdepim-kresources') - url="http://kde.org/applications/utilities/ktimetracker/" - install='kdepim.install' - cd "${srcdir}"/build/ktimetracker - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/ktimetracker - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/kontact/plugins/ktimetracker - make DESTDIR="${pkgdir}" install -} - -package_kdepim-libkdepim() { - pkgdesc='Library for KDE PIM' - groups=() - depends=('kde-agent' 'kdepim-runtime') - url='http://pim.kde.org' - conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' - 'kdepim-strigi-analyzer' 'kdepim-akonadi') - replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' - 'kdepim-strigi-analyzer' 'kdepim-akonadi') - for i in akonadi_next calendarsupport calendarviews incidenceeditor-ng \ - kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \ - messagecomposer messagecore messagelist messageviewer icons \ - strigi-analyzer templateparser plugins/messageviewer \ - plugins/ktexteditor; do - cd "${srcdir}"/build/${i} - make DESTDIR="${pkgdir}" install - done -} diff --git a/staging/kdepim/kdepim-kleopatra.install b/staging/kdepim/kdepim-kleopatra.install deleted file mode 100644 index 5787df72f..000000000 --- a/staging/kdepim/kdepim-kleopatra.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdepim/kdepim-kmail.install b/staging/kdepim/kdepim-kmail.install deleted file mode 100644 index 5787df72f..000000000 --- a/staging/kdepim/kdepim-kmail.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdepim/kdepim-korganizer.install b/staging/kdepim/kdepim-korganizer.install deleted file mode 100644 index 5787df72f..000000000 --- a/staging/kdepim/kdepim-korganizer.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdepim/kdepim.install b/staging/kdepim/kdepim.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdepim/kdepim.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/kdepimlibs/PKGBUILD b/staging/kdepimlibs/PKGBUILD deleted file mode 100644 index e106a1f2f..000000000 --- a/staging/kdepimlibs/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 160978 2012-06-07 20:13:07Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgname=kdepimlibs -pkgver=4.8.4 -pkgrel=1 -pkgdesc="KDE PIM Libraries" -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL') -depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison') -makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl') -install='kdepimlibs.install' -source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('34f693ac71896d0d8653fc2a81323d1e91531bb2') - -build() { - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install -} diff --git a/staging/kdepimlibs/kdepimlibs.install b/staging/kdepimlibs/kdepimlibs.install deleted file mode 100644 index 99262607c..000000000 --- a/staging/kdepimlibs/kdepimlibs.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 -}
\ No newline at end of file diff --git a/staging/kdeplasma-addons/PKGBUILD b/staging/kdeplasma-addons/PKGBUILD deleted file mode 100644 index 671925434..000000000 --- a/staging/kdeplasma-addons/PKGBUILD +++ /dev/null @@ -1,619 +0,0 @@ -# $Id: PKGBUILD 161047 2012-06-07 21:02:44Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdeplasma-addons -pkgname=('kdeplasma-addons-applets-bball' - 'kdeplasma-addons-applets-binary-clock' - 'kdeplasma-addons-applets-blackboard' - 'kdeplasma-addons-applets-bookmarks' - 'kdeplasma-addons-applets-bubblemon' - 'kdeplasma-addons-applets-calculator' - 'kdeplasma-addons-applets-charselect' - 'kdeplasma-addons-applets-comic' - 'kdeplasma-addons-applets-community' - 'kdeplasma-addons-applets-dict' - 'kdeplasma-addons-applets-eyes' - 'kdeplasma-addons-applets-fifteenpuzzle' - 'kdeplasma-addons-applets-filewatcher' - 'kdeplasma-addons-applets-frame' - 'kdeplasma-addons-applets-fuzzy-clock' - 'kdeplasma-addons-applets-icontasks' - 'kdeplasma-addons-applets-incomingmsg' - 'kdeplasma-addons-applets-kdeobservatory' - 'kdeplasma-addons-applets-kimpanel' - 'kdeplasma-addons-applets-knowledgebase' - 'kdeplasma-addons-applets-kolourpicker' - 'kdeplasma-addons-applets-konqprofiles' - 'kdeplasma-addons-applets-konsoleprofiles' - 'kdeplasma-addons-applets-lancelot' - 'kdeplasma-addons-applets-leavenote' - 'kdeplasma-addons-applets-life' - 'kdeplasma-addons-applets-luna' - 'kdeplasma-addons-applets-magnifique' - 'kdeplasma-addons-applets-mediaplayer' - 'kdeplasma-addons-applets-microblog' - 'kdeplasma-addons-applets-news' - 'kdeplasma-addons-applets-notes' - 'kdeplasma-addons-applets-nowplaying' - 'kdeplasma-addons-applets-paste' - 'kdeplasma-addons-applets-pastebin' - 'kdeplasma-addons-applets-plasmaboard' - 'kdeplasma-addons-applets-previewer' - 'kdeplasma-addons-applets-qalculate' - 'kdeplasma-addons-applets-rememberthemilk' - 'kdeplasma-addons-applets-rssnow' - 'kdeplasma-addons-applets-showdashboard' - 'kdeplasma-addons-applets-showdesktop' - 'kdeplasma-addons-applets-social-news' - 'kdeplasma-addons-applets-spellcheck' - 'kdeplasma-addons-applets-systemloadviewer' - 'kdeplasma-addons-applets-timer' - 'kdeplasma-addons-applets-unitconverter' - 'kdeplasma-addons-applets-weather' - 'kdeplasma-addons-applets-weatherstation' - 'kdeplasma-addons-applets-webslice' - 'kdeplasma-addons-containments' - 'kdeplasma-addons-libs' - 'kdeplasma-addons-runners-audioplayercontrol' - 'kdeplasma-addons-runners-browserhistory' - 'kdeplasma-addons-runners-characters' - 'kdeplasma-addons-runners-contacts' - 'kdeplasma-addons-runners-converter' - 'kdeplasma-addons-runners-datetime' - 'kdeplasma-addons-runners-events' - 'kdeplasma-addons-runners-katesessions' - 'kdeplasma-addons-runners-konquerorsessions' - 'kdeplasma-addons-runners-konsolesessions' - 'kdeplasma-addons-runners-kopete' - 'kdeplasma-addons-runners-mediawiki' - 'kdeplasma-addons-runners-spellchecker' - 'kdeplasma-addons-wallpapers-mandelbrot' - 'kdeplasma-addons-wallpapers-marble' - 'kdeplasma-addons-wallpapers-pattern' - 'kdeplasma-addons-wallpapers-potd' - 'kdeplasma-addons-wallpapers-virus' - 'kdeplasma-addons-wallpapers-weather') -pkgver=4.8.4 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL') -groups=('kde' 'kdeplasma-addons') -makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen' - 'scim' 'qwt' 'boost' 'libkexiv2' 'ibus') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('725d26e3aa59d02bc73a77b43e6aae92bc961254') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package_kdeplasma-addons-applets-bball() { - pkgdesc='A bouncy ball for plasma' - depends=('kdebase-workspace') - install='kdeplasma-addons-applets.install' - cd $srcdir/build/applets/bball - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-binary-clock() { - pkgdesc='Time displayed in binary format' - depends=('kdebase-workspace') - cd $srcdir/build/applets/binary-clock - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-blackboard() { - pkgdesc='Black Board' - depends=('kdebase-workspace') - cd $srcdir/build/applets/blackboard - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-bookmarks() { - pkgdesc='Quick Access to the Bookmarks' - depends=('kdebase-workspace') - cd $srcdir/build/applets/bookmarks - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-bubblemon() { - pkgdesc='A pretty bubble that monitors your system.' - depends=('kdebase-workspace') - cd $srcdir/build/applets/bubblemon - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-calculator() { - pkgdesc='Calculate simple sums' - depends=('kdebase-workspace') - cd $srcdir/build/applets/calculator - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-charselect() { - pkgdesc='View, select, and copy characters from a font collection' - depends=('kdebase-workspace') - cd $srcdir/build/applets/charselect - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-comic() { - pkgdesc='View comic strips from the Internet' - depends=('kdebase-workspace' 'kdeplasma-addons-libs') - cd $srcdir/build/applets/comic - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-community() { - pkgdesc='Communicate using the Social Desktop' - depends=('kdebase-workspace') - cd $srcdir/build/applets/community - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-dict() { - pkgdesc='Look up the meaning of words and their translation into different languages' - depends=('kdebase-workspace') - cd $srcdir/build/applets/dict - make DESTDIR=$pkgdir install - # FIXME - # /usr/share/icons/oxygen/scalable/apps/accessories-dictionary.svgz - rm -rf $pkgdir/usr/share/icons -} - -package_kdeplasma-addons-applets-eyes() { - pkgdesc='XEyes clone' - depends=('kdebase-workspace') - install='kdeplasma-addons-applets.install' - cd $srcdir/build/applets/eyes - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-fifteenpuzzle() { - pkgdesc='Put the pieces in order' - depends=('kdebase-workspace') - install='kdeplasma-addons-applets.install' - cd $srcdir/build/applets/fifteenPuzzle - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-filewatcher() { - pkgdesc='Watch for changes in specified files' - depends=('kdebase-workspace') - cd $srcdir/build/applets/fileWatcher - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-frame() { - pkgdesc='Display your favorite pictures' - depends=('kdebase-workspace' 'libkexiv2') - cd $srcdir/build/applets/frame - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-fuzzy-clock() { - pkgdesc='Time displayed in a less precise format' - depends=('kdebase-workspace') - cd $srcdir/build/applets/fuzzy-clock - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-icontasks() { - pkgdesc='Switch between running applications' - depends=('kdebase-workspace') - cd $srcdir/build/applets/icontasks - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-incomingmsg() { - pkgdesc='Notification of new messages' - depends=('kdebase-workspace') - cd $srcdir/build/applets/incomingmsg - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-kdeobservatory() { - pkgdesc='Visualize the KDE ecosystem' - depends=('kdebase-workspace' 'kdeplasma-addons-libs' 'qwt') - install='kdeplasma-addons-applets.install' - cd $srcdir/build/applets/kdeobservatory - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-kimpanel() { - pkgdesc='A generic input method panel for Oriental languages' - depends=('kdebase-workspace' 'kdeplasma-addons-libs') - optdepends=('scim: SCIM backend' - 'fcitx: FCITX backend' - 'ibus: IBUS backend') - cd $srcdir/build/applets/kimpanel - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-knowledgebase() { - pkgdesc='Opendesktop Knowledgebase' - depends=('kdebase-workspace') - cd $srcdir/build/applets/knowledgebase - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-kolourpicker() { - pkgdesc='Pick a color from the desktop' - depends=('kdebase-workspace') - cd $srcdir/build/applets/kolourpicker - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-konqprofiles() { - pkgdesc='List and launch Konqueror profiles' - depends=('kdebase-workspace') - cd $srcdir/build/applets/konqprofiles - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-konsoleprofiles() { - pkgdesc='List and launch Konsole profiles' - depends=('kdebase-workspace') - cd $srcdir/build/applets/konsoleprofiles - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-lancelot() { - pkgdesc='Launcher to start applications' - depends=('kdebase-workspace' 'kdeplasma-addons-libs') - replaces=('lancelot') - provides=('lancelot') - conflicts=('lancelot') - install='kdeplasma-addons-applets-lancelot.install' - cd $srcdir/build/applets/lancelot - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-leavenote() { - pkgdesc='Leave notes for users while they are away' - depends=('kdebase-workspace') - cd $srcdir/build/applets/leavenote - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-life() { - pkgdesc='Life' - depends=('kdebase-workspace') - install='kdeplasma-addons-applets.install' - cd $srcdir/build/applets/life - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-luna() { - pkgdesc='Display moon phases for your location' - depends=('kdebase-workspace') - install='kdeplasma-addons-applets.install' - cd $srcdir/build/applets/luna - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-magnifique() { - pkgdesc='A magnification glass for the Plasma desktop' - depends=('kdebase-workspace') - cd $srcdir/build/applets/magnifique - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-mediaplayer() { - pkgdesc='Widget that can play video and sound' - depends=('kdebase-workspace') - cd $srcdir/build/applets/mediaplayer - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-microblog() { - pkgdesc='Update and view your microblog status.' - depends=('kdebase-workspace' 'kdeplasma-addons-libs' 'qoauth' 'qca-ossl') - cd $srcdir/build/applets/microblog - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-news() { - pkgdesc='Show news from various sources' - depends=('kdebase-workspace') - cd $srcdir/build/applets/news - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-notes() { - pkgdesc='Desktop sticky notes' - depends=('kdebase-workspace') - cd $srcdir/build/applets/notes - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-nowplaying() { - pkgdesc='Displays currently playing audio' - depends=('kdebase-workspace') - cd $srcdir/build/applets/nowplaying - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-paste() { - pkgdesc='Paste text snippets' - depends=('kdebase-workspace') - cd $srcdir/build/applets/paste - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-pastebin() { - pkgdesc='Paste text/images to a remote server' - depends=('kdebase-workspace') - cd $srcdir/build/applets/pastebin - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-plasmaboard() { - pkgdesc='A virtual, on-screen keyboard' - depends=('kdebase-workspace') - cd $srcdir/build/applets/plasmaboard - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-previewer() { - pkgdesc='Preview This File' - depends=('kdebase-workspace') - install='kdeplasma-addons-applets.install' - cd $srcdir/build/applets/previewer - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-qalculate() { - pkgdesc='A powerful mathematical equation solver' - depends=('kdebase-workspace') - install='kdeplasma-addons-applets.install' - cd $srcdir/build/applets/qalculate - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-rememberthemilk() { - pkgdesc='Remember The Milk Todo list applet' - depends=('kdebase-workspace' 'kdeplasma-addons-libs') - cd $srcdir/build/applets/rememberthemilk - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-rssnow() { - pkgdesc='Show news from various sources' - depends=('kdebase-workspace') - cd $srcdir/build/applets/rssnow - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-showdashboard() { - pkgdesc='Show the Plasma widget dashboard above other windows' - depends=('kdebase-workspace') - cd $srcdir/build/applets/showdashboard - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-showdesktop() { - pkgdesc='Show the Plasma desktop' - depends=('kdebase-workspace') - cd $srcdir/build/applets/showdesktop - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-social-news() { - pkgdesc='Stay informed with the Social Desktop' - replaces=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities') - conflicts=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities') - depends=('kdebase-workspace' 'kdeplasma-addons-libs') - cd $srcdir/build/applets/social-news - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-spellcheck() { - pkgdesc='Fast spell checking' - depends=('kdebase-workspace') - cd $srcdir/build/applets/spellcheck - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-systemloadviewer() { - pkgdesc='Tiny CPU/RAM/Swap monitor' - depends=('kdebase-workspace') - cd $srcdir/build/applets/systemloadviewer - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-timer() { - pkgdesc='Countdown over a specified time period' - depends=('kdebase-workspace') - cd $srcdir/build/applets/timer - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-unitconverter() { - pkgdesc='Plasmoid for converting units' - depends=('kdebase-workspace') - cd $srcdir/build/applets/unitconverter - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-weather() { - pkgdesc='Displays Weather information' - depends=('kdebase-workspace' 'kdeplasma-addons-libs') - cd $srcdir/build/applets/weather - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-weatherstation() { - pkgdesc='Weather reports with an LCD display style' - depends=('kdebase-workspace' 'kdeplasma-addons-libs') - cd $srcdir/build/applets/weatherstation - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-webslice() { - pkgdesc='Show a part of a webpage' - depends=('kdebase-workspace') - cd $srcdir/build/applets/webslice - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-containments() { - pkgdesc='Activities types for Plasma shells' - depends=('kdebase-workspace') - cd $srcdir/build/containments - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-libs() { - pkgdesc='Plasma Addon Library' - depends=('kdebase-workspace') - groups=() - replaces=('kdeplasma-addons-dataengines') - provides=('kdeplasma-addons-dataengines') - conflicts=('kdeplasma-addons-dataengines') - cd $srcdir/build/libs - make DESTDIR=$pkgdir install - cd $srcdir/build/dataengines - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-runners-audioplayercontrol() { - pkgdesc='Allows to control MPRIS audio players (it is able to search through Amarok´s collection, too)' - depends=('kdebase-workspace') - cd $srcdir/build/runners/audioplayercontrol - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-runners-browserhistory() { - pkgdesc='Searches in Konqueror´s history' - depends=('kdebase-workspace') - cd $srcdir/build/runners/browserhistory - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-runners-characters() { - pkgdesc='special Characters' - depends=('kdebase-workspace') - cd $srcdir/build/runners/characters - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-runners-contacts() { - pkgdesc='Finds entries in your address book' - depends=('kdebase-workspace') - cd $srcdir/build/runners/contacts - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-runners-converter() { - pkgdesc='Convert values to different units' - depends=('kdebase-workspace') - cd $srcdir/build/runners/converter - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-runners-datetime() { - pkgdesc='The current date and time, locally or in any timezone' - depends=('kdebase-workspace') - cd $srcdir/build/runners/datetime - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-runners-events() { - pkgdesc='Calendar Events runner' - depends=('kdebase-workspace') - cd $srcdir/build/runners/events - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-runners-katesessions() { - pkgdesc='Matches Kate Sessions' - depends=('kdebase-workspace') - cd $srcdir/build/runners/katesessions - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-runners-konquerorsessions() { - pkgdesc='Matches Konqueror Sessions' - depends=('kdebase-workspace') - cd $srcdir/build/runners/konquerorsessions - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-runners-konsolesessions() { - pkgdesc='Matches Konsole Sessions' - depends=('kdebase-workspace') - cd $srcdir/build/runners/konsolesessions - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-runners-kopete() { - pkgdesc='Kopete Contact runner' - depends=('kdebase-workspace') - cd $srcdir/build/runners/kopete - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-runners-mediawiki() { - pkgdesc='Search on Wikitravel' - depends=('kdebase-workspace') - cd $srcdir/build/runners/mediawiki - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-runners-spellchecker() { - pkgdesc='Check the spelling of a word' - depends=('kdebase-workspace') - cd $srcdir/build/runners/spellchecker - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-wallpapers-mandelbrot() { - pkgdesc='Mandelbrot' - depends=('kdebase-workspace') - cd $srcdir/build/wallpapers/mandelbrot - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-wallpapers-marble() { - pkgdesc='Globe' - depends=('kdebase-workspace' 'kdeedu-marble') - cd $srcdir/build/wallpapers/marble - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-wallpapers-pattern() { - pkgdesc='Pattern' - depends=('kdebase-workspace') - cd $srcdir/build/wallpapers/pattern - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-wallpapers-potd() { - pkgdesc='Picture of the Day' - depends=('kdebase-workspace' 'kdeplasma-addons-libs') - cd $srcdir/build/wallpapers/potd - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-wallpapers-virus() { - pkgdesc='Virus' - depends=('kdebase-workspace') - cd $srcdir/build/wallpapers/virus - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-wallpapers-weather() { - pkgdesc='Weather' - depends=('kdebase-workspace' 'kdeplasma-addons-libs') - cd $srcdir/build/wallpapers/weather - make DESTDIR=$pkgdir install -} diff --git a/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install b/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install deleted file mode 100644 index ce5c32e1b..000000000 --- a/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.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/staging/kdeplasma-addons/kdeplasma-addons-applets.install b/staging/kdeplasma-addons/kdeplasma-addons-applets.install deleted file mode 100644 index c4ef46ba8..000000000 --- a/staging/kdeplasma-addons/kdeplasma-addons-applets.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 -}
\ No newline at end of file diff --git a/staging/kdesdk-kate/PKGBUILD b/staging/kdesdk-kate/PKGBUILD deleted file mode 100644 index 56fe82a45..000000000 --- a/staging/kdesdk-kate/PKGBUILD +++ /dev/null @@ -1,68 +0,0 @@ -# $Id: PKGBUILD 160987 2012-06-07 20:22:16Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgbase=kdesdk-kate -pkgname=('kdebase-katepart' - 'kdebase-kwrite' - 'kdesdk-kate') -pkgver=4.8.4 -pkgrel=1 -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -makedepends=('kdelibs ''cmake' 'automoc4') -source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz" - 'pkgbuild-syntax-highlight.patch') -sha1sums=('5a70b64c92892781d50781fcaac81ff352ec3ed9' - '0a928253bd2077f0264d96a6c8823c69c47b6a8d') - -build() { - cd "${srcdir}"/kate-${pkgver} - patch -p1 -i "${srcdir}"/pkgbuild-syntax-highlight.patch - - cd "${srcdir}" - mkdir build - cd build - cmake ../kate-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package_kdebase-katepart() { - pkgdesc="A fast and feature-rich text editor component" - depends=('kdelibs') - url="http://kate-editor.org/about-katepart/" - install='kdebase-katepart.install' - - cd "${srcdir}"/build/part - make DESTDIR="${pkgdir}" install -} - -package_kdebase-kwrite() { - pkgdesc="Text Editor" - depends=('kdebase-runtime' 'kdebase-katepart') - groups=('kde' 'kdebase') - url="http://www.kde.org/applications/utilities/kwrite/" - install='kdebase-kwrite.install' - - cd "${srcdir}"/build/kwrite - make DESTDIR="${pkgdir}" install - - cd "${srcdir}"/build/doc/kwrite - make DESTDIR="${pkgdir}" install -} - -package_kdesdk-kate() { - pkgdesc="Advanced Text Editor" - depends=('kdebase-runtime' 'kdebase-katepart') - groups=('kde' 'kdesdk') - url="http://www.kde.org/applications/utilities/kate/" - install='kdesdk-kate.install' - optdepends=('kdebase-konsole: open a terminal in Kate') - - cd "${srcdir}"/build/kate - make DESTDIR="${pkgdir}" install - - cd "${srcdir}"/build/doc/kate - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdesdk-kate/kdebase-katepart.install b/staging/kdesdk-kate/kdebase-katepart.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdesdk-kate/kdebase-katepart.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/kdesdk-kate/kdebase-kwrite.install b/staging/kdesdk-kate/kdebase-kwrite.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/staging/kdesdk-kate/kdebase-kwrite.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdesdk-kate/kdesdk-kate.install b/staging/kdesdk-kate/kdesdk-kate.install deleted file mode 100644 index 0446d161b..000000000 --- a/staging/kdesdk-kate/kdesdk-kate.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdesdk-kate/pkgbuild-syntax-highlight.patch b/staging/kdesdk-kate/pkgbuild-syntax-highlight.patch deleted file mode 100644 index 27729d1ad..000000000 --- a/staging/kdesdk-kate/pkgbuild-syntax-highlight.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kate-4.7.80/part/syntax/data/bash.xml~ 2011-11-20 06:14:30.581097154 +0000 -+++ kate-4.7.80/part/syntax/data/bash.xml 2011-11-20 06:14:45.494553146 +0000 -@@ -8,7 +8,7 @@ - <!ENTITY noword "(?![\w$+-])"> <!-- no word, $, + or - following --> - <!ENTITY pathpart "([\w_@.%*?+-]|\\ )"> <!-- valid character in a file name --> - ]> --<language name="Bash" version="2.14" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL"> -+<language name="Bash" version="2.14" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL"> - - <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl) - Changes by Matthew Woehlke (mw_triad@users.sourceforge.net) diff --git a/staging/kdesdk/PKGBUILD b/staging/kdesdk/PKGBUILD deleted file mode 100644 index 8d1a4d2b8..000000000 --- a/staging/kdesdk/PKGBUILD +++ /dev/null @@ -1,264 +0,0 @@ -# $Id: PKGBUILD 161048 2012-06-07 21:04:07Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdesdk -pkgname=('kdesdk-cervisia' - 'kdesdk-dolphin-plugins' - 'kdesdk-kapptemplate' - 'kdesdk-kcachegrind' - 'kdesdk-kdeaccounts-plugin' - 'kdesdk-kdepalettes' - 'kdesdk-kioslave' - 'kdesdk-kmtrace' - 'kdesdk-kompare' - 'kdesdk-kpartloader' - 'kdesdk-kprofilemethod' - 'kdesdk-kstartperf' - 'kdesdk-kuiviewer' - 'kdesdk-lokalize' - 'kdesdk-okteta' - 'kdesdk-poxml' - 'kdesdk-scripts' - 'kdesdk-strigi-analyzer' - 'kdesdk-umbrello') -pkgver=4.8.4 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdesdk') -makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs' - 'kdebase-lib') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" - 'fix-python2-path.patch') -sha1sums=('62c176ee3dda5bbc013db7d1033ff89c105e3fd1' - '923cabd7a877cf9a68efeb24fbf3d5827e1d949e') - -build() { - cd ${srcdir}/${pkgbase}-${pkgver} - - # Fix hardcoded python2 cmd - patch -Np1 -i ${srcdir}/fix-python2-path.patch - - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package_kdesdk-cervisia() { - pkgdesc='CVS Frontend' - depends=('kdebase-runtime') - url="http://kde.org/applications/development/cervisia/" - install='kdesdk-cervisia.install' - cd $srcdir/build/cervisia - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/cervisia - make DESTDIR=$pkgdir install -} - -package_kdesdk-dolphin-plugins() { - pkgdesc='Extra Dolphin plugins' - depends=('kdebase-dolphin') - optdepends=('bzr: bazaar support' - 'git: git support' - 'mercurial: hg support' - 'subversion: svn support') - install='kdesdk.install' - for i in bazaar git hg svn; do - cd $srcdir/build/dolphin-plugins/$i - make DESTDIR=$pkgdir install - done -} - -package_kdesdk-kapptemplate() { - pkgdesc='KDE Template Generator' - depends=('kdebase-runtime') - url="http://kde.org/applications/development/kapptemplate/" - install='kdesdk.install' - cd $srcdir/build/kapptemplate - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kapptemplate - make DESTDIR=$pkgdir install -} - -package_kdesdk-kcachegrind() { - pkgdesc='Visualization of Performance Profiling Data' - depends=('kdebase-runtime' 'python2') - optdepends=('php: PHP support') - url="http://kde.org/applications/development/kcachegrind/" - install='kdesdk-kcachegrind.install' - cd $srcdir/build/kcachegrind - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kcachegrind - make DESTDIR=$pkgdir install - - # Fix python 2 path - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - "${pkgdir}"/usr/bin/hotshot2calltree -} - -package_kdesdk-kdeaccounts-plugin() { - pkgdesc='KDE Repository Accounts' - depends=('kdebase-runtime' 'kdepimlibs') - cd $srcdir/build/kdeaccounts-plugin - make DESTDIR=$pkgdir install -} - -package_kdesdk-kdepalettes() { - pkgdesc='Palettes for the Gimp that match the KDE standard color palette' - optdepends=('gimp') - install -D -m644 $srcdir/${pkgbase}-${pkgver}/kdepalettes/KDE_Gimp \ - $pkgdir/usr/share/gimp/2.0/palettes/KDE.gpl -} - -package_kdesdk-kioslave() { - pkgdesc='KDED Subversion Module' - depends=('kdebase-runtime' 'subversion') - install='kdesdk.install' - cd $srcdir/build/kioslave - make DESTDIR=$pkgdir install -} - -package_kdesdk-kmtrace() { - pkgdesc='A KDE tool to assist with malloc debugging using glibc´s "mtrace" functionality' - depends=('kdebase-runtime') - cd $srcdir/build/kmtrace - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kmtrace - make DESTDIR=$pkgdir install -} - -package_kdesdk-kompare() { - pkgdesc='Diff/Patch Frontend' - depends=('kdebase-runtime') - url="http://kde.org/applications/development/kompare/" - install='kdesdk-kompare.install' - cd $srcdir/build/kompare - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kompare - make DESTDIR=$pkgdir install -} - -package_kdesdk-kpartloader() { - pkgdesc='A test application for KParts' - depends=('kdebase-runtime') - install='kdesdk.install' - cd $srcdir/build/kpartloader - make DESTDIR=$pkgdir install -} - -package_kdesdk-kprofilemethod() { - pkgdesc='Macros helping to profile' - cd $srcdir/build/kprofilemethod - make DESTDIR=$pkgdir install -} - -package_kdesdk-kspy() { - pkgdesc='An Object Inspector for Qt/KDE applications' - depends=('kdebase-runtime') - cd $srcdir/build/kspy - make DESTDIR=$pkgdir install -} - -package_kdesdk-kstartperf() { - pkgdesc='Startup time measurement tool for KDE applications' - depends=('kdebase-runtime') - cd $srcdir/build/kstartperf - make DESTDIR=$pkgdir install -} - -package_kdesdk-kuiviewer() { - pkgdesc='Qt Designer UI File Viewer' - depends=('kdebase-runtime') - url="http://kde.org/applications/development/kuiviewer/" - install='kdesdk-kuiviewer.install' - cd $srcdir/build/kuiviewer - make DESTDIR=$pkgdir install -} - -package_kdesdk-lokalize() { - pkgdesc='Computer-Aided Translation System' - depends=('kdebase-runtime' 'kdebindings-python2') - url="http://kde.org/applications/development/lokalize/" - optdepends=('translate-toolkit: enable extra python script') - install='kdesdk-lokalize.install' - cd $srcdir/build/lokalize - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/lokalize - make DESTDIR=$pkgdir install - - # Fix python 2 path - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - "${pkgdir}"/usr/share/apps/lokalize/scripts/odf/xliffmerge.py -} - -package_kdesdk-okteta() { - pkgdesc='Hex Editor' - depends=('kdebase-runtime') - replaces=('kdeutils-okteta') - conflicts=('kdeutils-okteta') - url="http://kde.org/applications/utilities/okteta/" - install='kdesdk-okteta.install' - cd $srcdir/build/okteta - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/okteta - make DESTDIR=$pkgdir install -} - -package_kdesdk-poxml() { - pkgdesc='Translates DocBook XML files using gettext po files' - depends=('qt' 'antlr2') - cd $srcdir/build/poxml - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/poxml - make DESTDIR=$pkgdir install -} - -package_kdesdk-scheck() { - pkgdesc='An interface style to highlight accel and style guide conflicts' - depends=('kdebase-runtime') - cd $srcdir/build/scheck - make DESTDIR=$pkgdir install -} - -package_kdesdk-scripts() { - pkgdesc='KDE SDK scripts' - depends=('python2') - cd $srcdir/build/scripts - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/scripts - make DESTDIR=$pkgdir install - - # Fix python 2 path - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - "${pkgdir}"/usr/bin/kde-systemsettings-tree.py - sed -i 's|#! /usr/bin/env python|#!/usr/bin/env python2|' \ - "${pkgdir}"/usr/bin/{{kdelnk2desktop,zonetab2pot}.py,kde_generate_export_header} -} - -package_kdesdk-strigi-analyzer() { - pkgdesc='Strigi-Analyzer for KDE SDK' - depends=('kdelibs') - cd $srcdir/build/strigi-analyzer - make DESTDIR=$pkgdir install -} - -package_kdesdk-umbrello() { - pkgdesc='UML Modeller' - depends=('kdebase-runtime') - url="http://kde.org/applications/development/umbrello/" - install='kdesdk-umbrello.install' - cd $srcdir/build/umbrello - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/umbrello - make DESTDIR=$pkgdir install - - # Fix python 2 path - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - "${pkgdir}"/usr/share/apps/umbrello/headings/heading.py -} diff --git a/staging/kdesdk/fix-python2-path.patch b/staging/kdesdk/fix-python2-path.patch deleted file mode 100644 index 720487031..000000000 --- a/staging/kdesdk/fix-python2-path.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- kdesdk-4.5.80/lokalize/scripts/msgmerge.py~ 2010-11-24 11:22:42.120000002 +0100 -+++ kdesdk-4.5.80/lokalize/scripts/msgmerge.py 2010-11-24 11:22:42.146666670 +0100 -@@ -114,7 +114,7 @@ - print >>sys.stderr, "Execution failed:", e - - cmd='%s/odf/xliffmerge.py -i %s -t %s -o %s' % (ourPath,xliffpathname,xlifftemplatepathname,xliffpathname) -- if os.name!='nt': cmd='python '+cmd -+ if os.name!='nt': cmd='python2 '+cmd - else: cmd=cmd.replace('/','\\') - os.system(cmd) - ---- kdesdk-4.5.80/lokalize/scripts/xliff2odf.py~ 2010-11-24 11:24:10.853333336 +0100 -+++ kdesdk-4.5.80/lokalize/scripts/xliff2odf.py 2010-11-24 11:24:10.883333336 +0100 -@@ -42,7 +42,7 @@ - xliff2odf.convertxliff(xliffinput, translatedodfpathname, odf) - - ourpath=([p for p in sys.path if os.path.exists(p+'/xliff2odf.py')]+[''])[0] -- os.system('python "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId())) -+ os.system('python2 "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId())) - - try: convert() - except: print 'error occured' ---- kdesdk-4.5.80/scripts/svn2log.sh~ 2010-11-24 11:46:24.863333337 +0100 -+++ kdesdk-4.5.80/scripts/svn2log.sh 2010-11-24 11:46:24.896666669 +0100 -@@ -17,6 +17,6 @@ - svn cat svn://anonsvn.kde.org/home/kde/trunk/kde-common/accounts > /tmp/accounts.$PPID - - echo "Creating changelog..."; --svn log -v --xml $1 | python $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8 -+svn log -v --xml $1 | python2 $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8 - - rm /tmp/accounts.$PPID
\ No newline at end of file diff --git a/staging/kdesdk/kdesdk-cervisia.install b/staging/kdesdk/kdesdk-cervisia.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/staging/kdesdk/kdesdk-cervisia.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdesdk/kdesdk-kcachegrind.install b/staging/kdesdk/kdesdk-kcachegrind.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/staging/kdesdk/kdesdk-kcachegrind.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdesdk/kdesdk-kompare.install b/staging/kdesdk/kdesdk-kompare.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/staging/kdesdk/kdesdk-kompare.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdesdk/kdesdk-kuiviewer.install b/staging/kdesdk/kdesdk-kuiviewer.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/staging/kdesdk/kdesdk-kuiviewer.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdesdk/kdesdk-lokalize.install b/staging/kdesdk/kdesdk-lokalize.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/staging/kdesdk/kdesdk-lokalize.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdesdk/kdesdk-okteta.install b/staging/kdesdk/kdesdk-okteta.install deleted file mode 100644 index 3f06b8deb..000000000 --- a/staging/kdesdk/kdesdk-okteta.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 -} diff --git a/staging/kdesdk/kdesdk-umbrello.install b/staging/kdesdk/kdesdk-umbrello.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/staging/kdesdk/kdesdk-umbrello.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdesdk/kdesdk.install b/staging/kdesdk/kdesdk.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdesdk/kdesdk.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/kdetoys/PKGBUILD b/staging/kdetoys/PKGBUILD deleted file mode 100644 index bed520be2..000000000 --- a/staging/kdetoys/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 161049 2012-06-07 21:04:47Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdetoys -pkgname=('kdetoys-amor' - 'kdetoys-kteatime' - 'kdetoys-ktux') -pkgver=4.8.4 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdetoys') -makedepends=('cmake' 'automoc4' 'kdebase-workspace') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('dd5f63f0e833135bac73a2e12692b1e6dd412f67') - -build() { - cd $srcdir - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package_kdetoys-amor() { - pkgdesc='On-Screen Creature' - depends=('kdebase-runtime') - install='kdetoys.install' - cd $srcdir/build/amor - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/amor - make DESTDIR=$pkgdir install -} - -package_kdetoys-kteatime() { - pkgdesc='Tea Cooker' - depends=('kdebase-runtime') - install='kdetoys.install' - cd $srcdir/build/kteatime - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kteatime - make DESTDIR=$pkgdir install -} - -package_kdetoys-ktux() { - pkgdesc='KTux' - depends=('kdebase-workspace' ) - install='kdetoys.install' - cd $srcdir/build/ktux - make DESTDIR=$pkgdir install -} diff --git a/staging/kdetoys/kdetoys.install b/staging/kdetoys/kdetoys.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdetoys/kdetoys.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/kdeutils-filelight/PKGBUILD b/staging/kdeutils-filelight/PKGBUILD deleted file mode 100644 index 1b7ab972c..000000000 --- a/staging/kdeutils-filelight/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 161051 2012-06-07 21:05:35Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeutils-filelight -pkgver=4.8.4 -pkgrel=1 -pkgdesc='View disk usage information' -url='http://kde.org/applications/utilities/filelight' -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -groups=('kde' 'kdeutils') -replaces=('filelight') -conflicts=('filelight') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/filelight-${pkgver}.tar.xz") -sha1sums=('3023e9daa8bc5271bed3f3c08076952bcaf75efd') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../filelight-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install - cd $srcdir/build/doc - make DESTDIR=$pkgdir install -} diff --git a/staging/kdeutils-filelight/kdeutils-filelight.install b/staging/kdeutils-filelight/kdeutils-filelight.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/staging/kdeutils-filelight/kdeutils-filelight.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdeutils-kcalc/PKGBUILD b/staging/kdeutils-kcalc/PKGBUILD deleted file mode 100644 index e913b2928..000000000 --- a/staging/kdeutils-kcalc/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 161052 2012-06-07 21:06:01Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeutils-kcalc -pkgver=4.8.4 -pkgrel=1 -pkgdesc='Scientific Calculator' -url='http://kde.org/applications/utilities/kcalc/' -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -groups=('kde' 'kdeutils') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kcalc-${pkgver}.tar.xz") -sha1sums=('f1cb6cda210c67fd19eca387df2d2224393d45ef') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kcalc-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install - cd $srcdir/build/doc - make DESTDIR=$pkgdir install -} diff --git a/staging/kdeutils-kcalc/kdeutils-kcalc.install b/staging/kdeutils-kcalc/kdeutils-kcalc.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdeutils-kcalc/kdeutils-kcalc.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/kdeutils-kcharselect/PKGBUILD b/staging/kdeutils-kcharselect/PKGBUILD deleted file mode 100644 index 9fa85d2a3..000000000 --- a/staging/kdeutils-kcharselect/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 161053 2012-06-07 21:06:27Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeutils-kcharselect -pkgver=4.8.4 -pkgrel=1 -pkgdesc='Character Selector' -url="http://kde.org/applications/utilities/kcharselect/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -groups=('kde' 'kdeutils') -source=("http://download.kde.org/stable/${pkgver}/src/kcharselect-${pkgver}.tar.xz") -sha1sums=('0e00a25ca3c813ab335cd12ff0ec4b1f22c8076c') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kcharselect-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install - cd $srcdir/build/doc - make DESTDIR=$pkgdir install -} diff --git a/staging/kdeutils-kdf/PKGBUILD b/staging/kdeutils-kdf/PKGBUILD deleted file mode 100644 index 3cfef1202..000000000 --- a/staging/kdeutils-kdf/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 161054 2012-06-07 21:06:50Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeutils-kdf -pkgver=4.8.4 -pkgrel=1 -url="http://kde.org/applications/system/kdiskfree/" -arch=('i686' 'x86_64') -pkgdesc='View Disk Usage' -license=('GPL' 'LGPL' 'FDL') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -groups=('kde' 'kdeutils') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kdf-${pkgver}.tar.xz") -sha1sums=('c83f9659d693f27166519969f85c630fdeaa3d9c') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kdf-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install - cd $srcdir/build/doc - make DESTDIR=$pkgdir install -} diff --git a/staging/kdeutils-kdf/kdeutils-kdf.install b/staging/kdeutils-kdf/kdeutils-kdf.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdeutils-kdf/kdeutils-kdf.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/kdeutils-kfloppy/PKGBUILD b/staging/kdeutils-kfloppy/PKGBUILD deleted file mode 100644 index d2ae2567e..000000000 --- a/staging/kdeutils-kfloppy/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 161055 2012-06-07 21:07:14Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeutils-kfloppy -pkgver=4.8.4 -pkgrel=1 -pkgdesc='Floppy Formatter' -url='http://kde.org/applications/utilities/kfloppy/' -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -groups=('kde' 'kdeutils') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kfloppy-${pkgver}.tar.xz") -sha1sums=('597e7d1fa546a898b4e46a9750632be8dc8a01a7') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kfloppy-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install - cd $srcdir/build/doc - make DESTDIR=$pkgdir install -} diff --git a/staging/kdeutils-kfloppy/kdeutils-kfloppy.install b/staging/kdeutils-kfloppy/kdeutils-kfloppy.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/staging/kdeutils-kfloppy/kdeutils-kfloppy.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdeutils-kgpg/PKGBUILD b/staging/kdeutils-kgpg/PKGBUILD deleted file mode 100644 index d2f0babf6..000000000 --- a/staging/kdeutils-kgpg/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 161056 2012-06-07 21:07:36Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeutils-kgpg -pkgver=4.8.4 -pkgrel=1 -pkgdesc='A GnuPG frontend' -url='http://kde.org/applications/utilities/kgpg/' -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdebase-runtime' 'kdepimlibs' 'kde-agent') -makedepends=('cmake' 'automoc4') -groups=('kde' 'kdeutils') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kgpg-${pkgver}.tar.xz") -sha1sums=('4b201d0db0d97d258597b0b345848acec5bd0130') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kgpg-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install - cd $srcdir/build/doc - make DESTDIR=$pkgdir install -} diff --git a/staging/kdeutils-kgpg/kdeutils-kgpg.install b/staging/kdeutils-kgpg/kdeutils-kgpg.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/staging/kdeutils-kgpg/kdeutils-kgpg.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdeutils-kremotecontrol/PKGBUILD b/staging/kdeutils-kremotecontrol/PKGBUILD deleted file mode 100644 index c4603ff7a..000000000 --- a/staging/kdeutils-kremotecontrol/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id$ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeutils-kremotecontrol -pkgver=4.8.4 -pkgrel=1 -pkgdesc='Configure your remote controls for use with applications' -url='http://kde.org/applications/utilities/kremotecontrol/' -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdebase-workspace') -makedepends=('cmake' 'automoc4') -groups=('kde' 'kdeutils') -replaces=('kdeutils-kdelirc') -conflicts=('kdeutils-kdelirc') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kremotecontrol-${pkgver}.tar.xz") -sha1sums=('2c967b6d5738d3947401d9055f0956dfd16b2ec2') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kremotecontrol-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install - cd $srcdir/build/doc - make DESTDIR=$pkgdir install -} diff --git a/staging/kdeutils-kremotecontrol/kdeutils-kremotecontrol.install b/staging/kdeutils-kremotecontrol/kdeutils-kremotecontrol.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdeutils-kremotecontrol/kdeutils-kremotecontrol.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/kdeutils-ksecrets/PKGBUILD b/staging/kdeutils-ksecrets/PKGBUILD deleted file mode 100644 index 1ebadf22d..000000000 --- a/staging/kdeutils-ksecrets/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161058 2012-06-07 21:12:37Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeutils-ksecrets -pkgver=4.8.4 -pkgrel=1 -pkgdesc='Secrets Management Infrastructure for KDE' -url='http://techbase.kde.org/Projects/Utils/ksecretsservice' -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdebase-workspace' 'qca-ossl') -makedepends=('cmake' 'automoc4') -groups=('kde' 'kdeutils') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/ksecrets-${pkgver}.tar.xz") -sha1sums=('d0fd2c601833cf1ffe52760472e22d667a6a6408') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../ksecrets-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdeutils-ksecrets/kdeutils-ksecrets.install b/staging/kdeutils-ksecrets/kdeutils-ksecrets.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/staging/kdeutils-ksecrets/kdeutils-ksecrets.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdeutils-ktimer/PKGBUILD b/staging/kdeutils-ktimer/PKGBUILD deleted file mode 100644 index 0b0024a7b..000000000 --- a/staging/kdeutils-ktimer/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 161059 2012-06-07 21:13:01Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeutils-ktimer -pkgver=4.8.4 -pkgrel=1 -pkgdesc='Countdown Launcher' -url='http://kde.org/applications/utilities/ktimer/' -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -groups=('kde' 'kdeutils') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/ktimer-${pkgver}.tar.xz") -sha1sums=('39e117449beffa8e2a38f7b45f69965a71de3805') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../ktimer-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install - cd $srcdir/build/doc - make DESTDIR=$pkgdir install -} diff --git a/staging/kdeutils-ktimer/kdeutils-ktimer.install b/staging/kdeutils-ktimer/kdeutils-ktimer.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdeutils-ktimer/kdeutils-ktimer.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/kdeutils-kwallet/PKGBUILD b/staging/kdeutils-kwallet/PKGBUILD deleted file mode 100644 index ffdc2773b..000000000 --- a/staging/kdeutils-kwallet/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 161060 2012-06-07 21:13:24Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeutils-kwallet -pkgver=4.8.4 -pkgrel=1 -pkgdesc='Wallet Management Tool' -url='http://kde.org/applications/system/kwalletmanager/' -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -groups=('kde' 'kdeutils') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kwallet-${pkgver}.tar.xz") -sha1sums=('8c85c9de379f0e8ad8a3dffc2136c6b25c0fa4a9') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kwallet-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install - cd $srcdir/build/doc - make DESTDIR=$pkgdir install -} diff --git a/staging/kdeutils-kwallet/kdeutils-kwallet.install b/staging/kdeutils-kwallet/kdeutils-kwallet.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/staging/kdeutils-kwallet/kdeutils-kwallet.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdeutils-superkaramba/PKGBUILD b/staging/kdeutils-superkaramba/PKGBUILD deleted file mode 100644 index 75a276a5f..000000000 --- a/staging/kdeutils-superkaramba/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161062 2012-06-07 21:14:04Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeutils-superkaramba -pkgver=4.8.4 -pkgrel=1 -pkgdesc='An engine for cool desktop eyecandy' -url='http://kde.org/applications/utilities/superkaramba/' -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdebase-runtime' 'qimageblitz') -makedepends=('cmake' 'automoc4') -groups=('kde' 'kdeutils') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/superkaramba-${pkgver}.tar.xz") -sha1sums=('b013e4bd063790e5970cf798f247edb87d576900') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../superkaramba-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install -} diff --git a/staging/kdeutils-superkaramba/kdeutils-superkaramba.install b/staging/kdeutils-superkaramba/kdeutils-superkaramba.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/staging/kdeutils-superkaramba/kdeutils-superkaramba.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdeutils-sweeper/PKGBUILD b/staging/kdeutils-sweeper/PKGBUILD deleted file mode 100644 index 83403779c..000000000 --- a/staging/kdeutils-sweeper/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 161063 2012-06-07 21:14:31Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeutils-sweeper -pkgver=4.8.4 -pkgrel=1 -pkgdesc='System Cleaner' -url='http://kde.org/applications/utilities/sweeper' -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -groups=('kde' 'kdeutils') -source=("http://download.kde.org/stable/${pkgver}/src/sweeper-${pkgver}.tar.xz") -sha1sums=('8a4dd11724ed14987981dfaa60e742cfd80ee6d9') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../sweeper-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install - cd $srcdir/build/doc - make DESTDIR=$pkgdir install -} diff --git a/staging/kdewebdev/PKGBUILD b/staging/kdewebdev/PKGBUILD deleted file mode 100644 index 436307f25..000000000 --- a/staging/kdewebdev/PKGBUILD +++ /dev/null @@ -1,70 +0,0 @@ -# $Id: PKGBUILD 161064 2012-06-07 21:15:01Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdewebdev -pkgname=('kdewebdev-kfilereplace' - 'kdewebdev-kimagemapeditor' - 'kdewebdev-klinkstatus' - 'kdewebdev-kommander') -pkgver=4.8.4 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdewebdev') -makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepimlibs' 'boost') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('bab86ef6c04515a454298cee46eccb25e590f972') - -build() { - cd $srcdir - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package_kdewebdev-kfilereplace() { - pkgdesc='Search & Replace Tool' - depends=('kdebase-runtime') - url="http://kde.org/applications/utilities/kfilereplace/" - install='kdewebdev.install' - cd $srcdir/build/kfilereplace - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kfilereplace - make DESTDIR=$pkgdir install -} - -package_kdewebdev-kimagemapeditor() { - pkgdesc='HTML Image Map Editor' - depends=('kdebase-runtime') - url="http://www.kde.org/applications/development/kimagemapeditor/" - install='kdewebdev-kimagemapeditor.install' - cd $srcdir/build/kimagemapeditor - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kimagemapeditor - make DESTDIR=$pkgdir install -} - -package_kdewebdev-klinkstatus() { - pkgdesc='Link Checker' - depends=('kdebase-runtime' 'kdepimlibs' 'tidyhtml') - url="http://www.kde.org/applications/development/klinkstatus/" - install='kdewebdev.install' - cd $srcdir/build/klinkstatus - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/klinkstatus - make DESTDIR=$pkgdir install -} - -package_kdewebdev-kommander() { - pkgdesc='Executor for Kommander dialogs' - depends=('kdebase-runtime') - url="http://www.kde.org/applications/development/kommander/" - cd $srcdir/build/kommander - make DESTDIR=$pkgdir install -} diff --git a/staging/kdewebdev/kdewebdev-kimagemapeditor.install b/staging/kdewebdev/kdewebdev-kimagemapeditor.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/staging/kdewebdev/kdewebdev-kimagemapeditor.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdewebdev/kdewebdev.install b/staging/kdewebdev/kdewebdev.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdewebdev/kdewebdev.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/konversation/PKGBUILD b/staging/konversation/PKGBUILD deleted file mode 100644 index ee8a55574..000000000 --- a/staging/konversation/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 168681 2012-10-14 00:39:34Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: James Rayner <iphitus@gmail.com> -# Contributor: Sergio Jovani Guzman <moret@paretux.org> - -pkgname=konversation -pkgver=1.4 -pkgrel=3 -pkgdesc="A user friendly IRC client for KDE" -arch=('i686' 'x86_64') -url="http://konversation.kde.org" -depends=('kdebase-runtime' 'kdepimlibs') -makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml') -optdepends=('python: python scripting support') -license=('GPL2' 'FDL') -install=${pkgname}.install -options=('!makeflags') -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('90741721f68a02d4345b9006a8ae53bc49ef3777') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install - - # Remove a bunch of symlinks pointing to non-existant files - for _lang in pt_BR uk sv et de en nl; do - rm "${pkgdir}"/usr/share/doc/kde/html/${_lang}/konversation/common - done -} diff --git a/staging/konversation/konversation.install b/staging/konversation/konversation.install deleted file mode 100644 index 8834e059a..000000000 --- a/staging/konversation/konversation.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kradio/PKGBUILD b/staging/kradio/PKGBUILD deleted file mode 100644 index 2071f88e9..000000000 --- a/staging/kradio/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 160707 2012-06-04 07:57:09Z eric $ -# Maintainer: -# Contributor: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=kradio -pkgver=4.0.4 -pkgrel=2 -arch=('i686' 'x86_64') -license=('GPL2') -pkgdesc="A comfortable KDE internet and AM/FM radio application" -url="http://kradio.sourceforge.net/" -depends=('kdebase-runtime' 'lirc-utils' 'libmms' 'ffmpeg') -makedepends=('automoc4' 'cmake') -install=$pkgname.install -source=("http://downloads.sourceforge.net/$pkgname/kradio4-$pkgver.tar.bz2"{,.asc}) -md5sums=('4b5495a4f1dda21f7201bc8db0d4f95e' - '51c6d4ec0047d2df595b458bde285012') - -build() { - cd "$srcdir" - mkdir build - cd build - cmake ../${pkgname}4-$pkgver \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release - make -} - -package() { - cd "$srcdir/build" - make DESTDIR="$pkgdir" install -} diff --git a/staging/kradio/kradio.install b/staging/kradio/kradio.install deleted file mode 100644 index 460e85d7f..000000000 --- a/staging/kradio/kradio.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/krb5/PKGBUILD b/staging/krb5/PKGBUILD deleted file mode 100644 index 89899a36c..000000000 --- a/staging/krb5/PKGBUILD +++ /dev/null @@ -1,92 +0,0 @@ -# $Id: PKGBUILD 161299 2012-06-09 01:56:21Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> - -pkgname=krb5 -pkgver=1.10.2 -pkgrel=2 -pkgdesc="The Kerberos network authentication system" -arch=('i686' 'x86_64') -url="http://web.mit.edu/kerberos/" -license=('custom') -depends=('e2fsprogs' 'libldap' 'keyutils') -makedepends=('perl') -backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf') -source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.10/${pkgname}-${pkgver}-signed.tar - krb5-1.10.1-gcc47.patch - krb5-kadmind - krb5-kadmind.service - krb5-kdc - krb5-kdc.service - krb5-kpropd - krb5-kpropd.service - krb5-kpropd@.service - krb5-kpropd.socket) -sha1sums=('8b6e2c5bf0c65aacd368b3698add7888f2a7332d' - '78b759d566b1fdefd9bbcd06df14f07f12effe96' - '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' - 'a2a01e7077d9e89cda3457ea0e216debb3dc353c' - '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' - 'f5e4fa073e11b0fcb4e3098a5d58a4f791ec841e' - '7f402078fa65bb9ff1beb6cbbbb017450df78560' - '614401dd4ac18e310153240bb26eb32ff1e8cf5b' - '023a8164f8ee7066ac814486a68bc605e79f6101' - 'f3677d30dbbd7106c581379c2c6ebb1bf7738912') -options=('!emptydirs') - -build() { - tar zxvf ${pkgname}-${pkgver}.tar.gz - cd "${srcdir}/${pkgname}-${pkgver}/src" - - # With gcc47 : deltat.c:1694:12: error: 'yylval' may be used uninitialized - # in this function [-Werror=maybe-uninitialized] - # As this is generated code, just ignore the complaint. - patch -Np2 -i ../../krb5-1.10.1-gcc47.patch - rm lib/krb5/krb/deltat.c - - # FS#25384 - sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4 - - export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all" - export CPPFLAGS+=" -I/usr/include/et" - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --localstatedir=/var/lib \ - --enable-shared \ - --with-system-et \ - --with-system-ss \ - --disable-rpath \ - --without-tcl \ - --enable-dns-for-realm \ - --with-ldap \ - --without-system-verto - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}/src" - make DESTDIR="${pkgdir}" EXAMPLEDIR=/usr/share/doc/${pkgname}/examples install - - # Fix FS#29889 - install -m 644 plugins/kdb/ldap/libkdb_ldap/kerberos.{ldif,schema} "${pkgdir}"/usr/share/doc/${pkgname}/examples - - # Sample KDC config file - install -dm 755 "${pkgdir}"/var/lib/krb5kdc - install -pm 644 config-files/kdc.conf "${pkgdir}"/var/lib/krb5kdc/kdc.conf - - # Default configuration file - install -dm 755 "${pkgdir}"/etc - install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf - - install -dm 755 "${pkgdir}"/etc/rc.d - install -m 755 ../../krb5-{kdc,kadmind,kpropd} "${pkgdir}"/etc/rc.d - - install -dm 755 "${pkgdir}"/usr/share/aclocal - install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal - - install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE - - # systemd stuff - install -dm 755 "${pkgdir}"/usr/lib/systemd/system - install -m 644 ../../krb5-{kadmind.service,kdc.service,kpropd.service,kpropd@.service,kpropd.socket} \ - "${pkgdir}"/usr/lib/systemd/system -} diff --git a/staging/krb5/krb5-1.10.1-gcc47.patch b/staging/krb5/krb5-1.10.1-gcc47.patch deleted file mode 100644 index ffd01c2a3..000000000 --- a/staging/krb5/krb5-1.10.1-gcc47.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y krb5-1.10.1/src/lib/krb5/krb/x-deltat.y ---- krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y 2011-09-06 07:34:32.000000000 -0400 -+++ krb5-1.10.1/src/lib/krb5/krb/x-deltat.y 2012-03-24 13:15:11.543551318 -0400 -@@ -44,6 +44,7 @@ - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wuninitialized" -+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" - #endif - - #include <ctype.h> diff --git a/staging/krb5/krb5-kadmind b/staging/krb5/krb5-kadmind deleted file mode 100644 index 04df0dcff..000000000 --- a/staging/krb5/krb5-kadmind +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/kadmind` -case "$1" in - start) - stat_busy "Starting Kerberos Admin Daemon" - if [ -z "$PID" ]; then - /usr/sbin/kadmind - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon krb5-kadmind - stat_done - fi - ;; - stop) - stat_busy "Stopping Kerberos Admin Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon krb5-kadmind - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/staging/krb5/krb5-kadmind.service b/staging/krb5/krb5-kadmind.service deleted file mode 100644 index f3836c898..000000000 --- a/staging/krb5/krb5-kadmind.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Kerberos 5 administration server - -[Service] -ExecStart=/usr/sbin/kadmind -nofork - -[Install] -WantedBy=multi-user.target diff --git a/staging/krb5/krb5-kdc b/staging/krb5/krb5-kdc deleted file mode 100644 index 05a03411e..000000000 --- a/staging/krb5/krb5-kdc +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/krb5kdc` -case "$1" in - start) - stat_busy "Starting Kerberos Authentication" - if [ -z "$PID" ]; then - /usr/sbin/krb5kdc - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon krb5-kdc - stat_done - fi - ;; - stop) - stat_busy "Stopping Kerberos Authentication" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon krb5-kdc - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/staging/krb5/krb5-kdc.service b/staging/krb5/krb5-kdc.service deleted file mode 100644 index 6ec93bb72..000000000 --- a/staging/krb5/krb5-kdc.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Kerberos 5 KDC - -[Service] -ExecStart=/usr/sbin/krb5kdc -n -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/staging/krb5/krb5-kpropd b/staging/krb5/krb5-kpropd deleted file mode 100644 index a0077d68e..000000000 --- a/staging/krb5/krb5-kpropd +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/kpropd` -case "$1" in - start) - stat_busy "Starting Kerberos Database Propagation Daemon" - if [ -z "$PID" ]; then - /usr/sbin/kpropd -S - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon kpropd - stat_done - fi - ;; - stop) - stat_busy "Stopping Kerberos Database Propagation Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon kpropd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/staging/krb5/krb5-kpropd.service b/staging/krb5/krb5-kpropd.service deleted file mode 100644 index a7c5b579d..000000000 --- a/staging/krb5/krb5-kpropd.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Kerberos 5 propagation server - -[Service] -ExecStart=/usr/sbin/kpropd -S - -[Install] -WantedBy=multi-user.target diff --git a/staging/krb5/krb5-kpropd.socket b/staging/krb5/krb5-kpropd.socket deleted file mode 100644 index 4389290c0..000000000 --- a/staging/krb5/krb5-kpropd.socket +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Kerberos 5 propagation server - -[Socket] -ListenStream=754 -Accept=yes - -[Install] -WantedBy=sockets.target diff --git a/staging/libdrm/COPYING b/staging/libdrm/COPYING deleted file mode 100644 index 6e74c337c..000000000 --- a/staging/libdrm/COPYING +++ /dev/null @@ -1,48 +0,0 @@ - Copyright 2005 Adam Jackson. - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation on the rights to use, copy, modify, merge, - publish, distribute, sub license, and/or sell copies of the Software, - and to permit persons to whom the Software is furnished to do so, - subject to the following conditions: - - The above copyright notice and this permission notice (including the - next paragraph) shall be included in all copies or substantial - portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NON-INFRINGEMENT. IN NO EVENT SHALL ADAM JACKSON BE LIABLE FOR ANY - CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - ------------------------------------------------------------------------- - - Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. - Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. - All Rights Reserved. - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice (including the - next paragraph) shall be included in all copies or substantial - portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS - SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. diff --git a/staging/libdrm/PKGBUILD b/staging/libdrm/PKGBUILD deleted file mode 100644 index af789e2a9..000000000 --- a/staging/libdrm/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 161498 2012-06-12 01:59:59Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libdrm -pkgver=2.4.35 -pkgrel=1 -pkgdesc="Userspace interface to kernel DRM services" -arch=(i686 x86_64) -license=('custom') -depends=('glibc' 'libpciaccess') -makedepends=('cairo' 'valgrind') -replaces=('libdrm-new' 'libdrm-nouveau') -options=('!libtool') -url="http://dri.freedesktop.org/" -source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 - no-pthread-stubs.patch - COPYING -) -sha1sums=('a1d8d4945f782371d7855dbd693db885bd7e3d83' - '2a5410baa3e6e078f9378ce486a88f41d22fd838' - 'ba3dcd636997ee0d30df14b03dae05c24ae5d094') - -build() { - cd $pkgname-$pkgver - patch -Np1 -i ../no-pthread-stubs.patch - - #libtoolize --force - autoreconf --force --install - ./configure --prefix=/usr \ - --enable-udev \ - --enable-vmwgfx-experimental-api - make -} - -check() { - cd $pkgname-$pkgver - make -k check -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - install -m755 -d "$pkgdir/usr/share/licenses/$pkgname" - install -m644 ../COPYING "$pkgdir/usr/share/licenses/$pkgname/" -} diff --git a/staging/libdrm/git_fixes.diff b/staging/libdrm/git_fixes.diff deleted file mode 100644 index dc80155f2..000000000 --- a/staging/libdrm/git_fixes.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c -index 19441f3..eb9dd32 100644 ---- a/intel/intel_bufmgr_gem.c -+++ b/intel/intel_bufmgr_gem.c -@@ -958,7 +958,7 @@ static void drm_intel_gem_bo_purge_vma_cache(drm_intel_bufmgr_gem *bufmgr_gem) - bufmgr_gem->vma_cache.next, - vma_list); - assert(bo_gem->map_count == 0); -- DRMLISTDEL(&bo_gem->vma_list); -+ DRMLISTDELINIT(&bo_gem->vma_list); - - if (bo_gem->mem_virtual) { - munmap(bo_gem->mem_virtual, bo_gem->bo.size); diff --git a/staging/libdrm/no-pthread-stubs.patch b/staging/libdrm/no-pthread-stubs.patch deleted file mode 100644 index 6745f4bc4..000000000 --- a/staging/libdrm/no-pthread-stubs.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -Nur libdrm-2.4.34.orig/configure.ac libdrm-2.4.34/configure.ac ---- libdrm-2.4.34.orig/configure.ac 2012-05-12 14:54:06.375335490 +0000 -+++ libdrm-2.4.34/configure.ac 2012-05-12 14:54:32.075142065 +0000 -@@ -47,10 +47,6 @@ - LT_INIT([disable-static]) - - --PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs) --AC_SUBST(PTHREADSTUBS_CFLAGS) --AC_SUBST(PTHREADSTUBS_LIBS) -- - pkgconfigdir=${libdir}/pkgconfig - AC_SUBST(pkgconfigdir) - AC_ARG_ENABLE([udev], -diff -Nur libdrm-2.4.34.orig/intel/Makefile.am libdrm-2.4.34/intel/Makefile.am ---- libdrm-2.4.34.orig/intel/Makefile.am 2012-05-12 14:54:06.372001955 +0000 -+++ libdrm-2.4.34/intel/Makefile.am 2012-05-12 14:55:24.164745055 +0000 -@@ -26,7 +26,6 @@ - $(WARN_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/intel \ -- $(PTHREADSTUBS_CFLAGS) \ - $(PCIACCESS_CFLAGS) \ - $(VALGRIND_CFLAGS) \ - -I$(top_srcdir)/include/drm -@@ -35,7 +34,6 @@ - libdrm_intel_ladir = $(libdir) - libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined - libdrm_intel_la_LIBADD = ../libdrm.la \ -- @PTHREADSTUBS_LIBS@ \ - @PCIACCESS_LIBS@ \ - @CLOCK_LIB@ - -diff -Nur libdrm-2.4.34.orig/nouveau/Makefile.am libdrm-2.4.34/nouveau/Makefile.am ---- libdrm-2.4.34.orig/nouveau/Makefile.am 2012-05-12 14:54:06.331998148 +0000 -+++ libdrm-2.4.34/nouveau/Makefile.am 2012-05-12 14:56:00.941132085 +0000 -@@ -2,14 +2,13 @@ - $(WARN_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/nouveau \ -- $(PTHREADSTUBS_CFLAGS) \ - -I$(top_srcdir)/include/drm \ - -DDEBUG - - libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la - libdrm_nouveau_ladir = $(libdir) - libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined --libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_nouveau_la_LIBADD = ../libdrm.la - - libdrm_nouveau_la_SOURCES = nouveau.c \ - pushbuf.c \ -diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am ---- libdrm-2.4.34.orig/radeon/Makefile.am 2012-05-12 14:54:06.365334765 +0000 -+++ libdrm-2.4.34/radeon/Makefile.am 2012-05-12 14:55:48.084557437 +0000 -@@ -26,13 +26,12 @@ - $(WARN_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/radeon \ -- $(PTHREADSTUBS_CFLAGS) \ - -I$(top_srcdir)/include/drm - - libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la - libdrm_radeon_ladir = $(libdir) - libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_radeon_la_LIBADD = ../libdrm.la - - libdrm_radeon_la_SOURCES = \ - radeon_bo_gem.c \ diff --git a/staging/libimobiledevice/PKGBUILD b/staging/libimobiledevice/PKGBUILD deleted file mode 100644 index 46ae8c1e2..000000000 --- a/staging/libimobiledevice/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 163816 2012-07-20 15:09:08Z tomegun $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Gabriel Martinez < reitaka at gmail dot com > - -pkgname=libimobiledevice -pkgver=1.1.4 -pkgrel=1 -pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux" -url="http://libimobiledevice.org/" -arch=('i686' 'x86_64') -license=('GPL2' 'LGPL2.1') -depends=('usbmuxd' 'gnutls' 'libgcrypt') -options=('!libtool') -source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2) - -build() { - cd "$pkgname-$pkgver" - - PYTHON=/usr/bin/python2 ./configure --prefix=/usr - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} -md5sums=('3f28cbc6a2e30d34685049c0abde5183') diff --git a/staging/libimobiledevice/swig-version-check.patch b/staging/libimobiledevice/swig-version-check.patch deleted file mode 100644 index c56b095db..000000000 --- a/staging/libimobiledevice/swig-version-check.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nur libimobiledevice-1.0.3.old/configure libimobiledevice-1.0.3/configure ---- libimobiledevice-1.0.3.old/configure 2010-10-04 07:38:37.000000000 -0700 -+++ libimobiledevice-1.0.3/configure 2010-10-08 05:43:05.466686656 -0700 -@@ -3477,9 +3477,7 @@ - if test -z "$available_patch" ; then - available_patch=0 - fi -- if test $available_major -ne $required_major \ -- -o $available_minor -ne $required_minor \ -- -o $available_patch -lt $required_patch ; then -+ if test $available_major -lt $required_major ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SWIG version >= 1.3.21 is required. You have $swig_version. You should look at http://www.swig.org" >&5 - $as_echo "$as_me: WARNING: SWIG version >= 1.3.21 is required. You have $swig_version. You should look at http://www.swig.org" >&2;} - SWIG=false diff --git a/staging/libkdcraw/PKGBUILD b/staging/libkdcraw/PKGBUILD deleted file mode 100644 index 5f6f4ec2e..000000000 --- a/staging/libkdcraw/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 160996 2012-06-07 20:29:34Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=libkdcraw -pkgver=4.8.4 -pkgrel=1 -pkgdesc="A C++ interface used to decode RAW picture" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdelibs' 'lcms') -makedepends=('cmake' 'automoc4') -replaces=('kdegraphics-libs') -conflicts=('kdegraphics-libs') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('ba67432cb3353a55d57ae749b42919399dfda3e2') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/libkdcraw/libkdcraw.install b/staging/libkdcraw/libkdcraw.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/libkdcraw/libkdcraw.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/libkdeedu/PKGBUILD b/staging/libkdeedu/PKGBUILD deleted file mode 100644 index 1bd7cb89b..000000000 --- a/staging/libkdeedu/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 160994 2012-06-07 20:28:08Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=libkdeedu -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Libraries used by KDE Education applications" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdelibs') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -replaces=('kdeedu-libkdeedu' 'kdeedu-data') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('055fa35db3c482c61f8eab7d1912532823a88726') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/libkdeedu/libkdeedu.install b/staging/libkdeedu/libkdeedu.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/libkdeedu/libkdeedu.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/libkexiv2/PKGBUILD b/staging/libkexiv2/PKGBUILD deleted file mode 100644 index c3c77a8f3..000000000 --- a/staging/libkexiv2/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 164638 2012-08-01 17:27:37Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=libkexiv2 -pkgver=4.9.0 -pkgrel=3 -pkgdesc="A library to manipulate pictures metadata" -url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdelibs') -makedepends=('cmake' 'automoc4') -replaces=('kdegraphics-libs') -conflicts=('kdegraphics-libs') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('121c63ebf328ca87e67b7cf0cf72d0f276e4ae2c') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/libkipi/PKGBUILD b/staging/libkipi/PKGBUILD deleted file mode 100644 index 1714d1617..000000000 --- a/staging/libkipi/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 145371 2011-12-22 07:58:59Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=libkipi -pkgver=4.8.4 -pkgrel=1 -pkgdesc="An interface to use kipi-plugins from a KDE application" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdelibs') -makedepends=('cmake' 'automoc4') -replaces=('kdegraphics-libs') -conflicts=('kdegraphics-libs') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('d30ef671be8caf8eb9ead68de53cf187f0fcf88b') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/libkipi/libkipi.install b/staging/libkipi/libkipi.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/libkipi/libkipi.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/libksane/PKGBUILD b/staging/libksane/PKGBUILD deleted file mode 100644 index b695d5cd8..000000000 --- a/staging/libksane/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 160999 2012-06-07 20:30:47Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=libksane -pkgver=4.8.4 -pkgrel=1 -pkgdesc="An image scanning library" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdelibs' 'sane') -makedepends=('cmake' 'automoc4') -replaces=('kdegraphics-libs') -conflicts=('kdegraphics-libs') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('5ac35d8478ccace1495ae42eb2169918cebc8d95') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/libksane/libksane.install b/staging/libksane/libksane.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/libksane/libksane.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/libmpc/PKGBUILD b/staging/libmpc/PKGBUILD deleted file mode 100644 index 6a77bce43..000000000 --- a/staging/libmpc/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 165110 2012-08-11 08:18:39Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> - -pkgname=libmpc -pkgver=1.0 -pkgrel=1 -pkgdesc="Library for the arithmetic of complex numbers with arbitrarily high precision" -arch=('i686' 'x86_64') -url="http://www.multiprecision.org/" -license=('LGPL') -depends=('mpfr>=3.0.0') -options=('!libtool') -install=libmpc.install -source=(http://www.multiprecision.org/mpc/download/mpc-${pkgver/_/-}.tar.gz) -md5sums=('13370ceb2e266c5eeb2f7e78c24b7858') - -build() { - cd "${srcdir}/mpc-${pkgver}" - ./configure --prefix=/usr - make -} - -check() { - cd "${srcdir}/mpc-${pkgver}" - make check -} - -package() { - cd "${srcdir}/mpc-${pkgver}" - make DESTDIR="${pkgdir}" install - mv ${pkgdir}/usr/share/info/{mpc,libmpc}.info -} diff --git a/staging/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch b/staging/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch deleted file mode 100644 index 3bf324728..000000000 --- a/staging/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- trunk/configure.ac 2011/02/21 12:18:31 932 -+++ trunk/configure.ac 2011/02/21 16:41:09 936 -@@ -33,7 +33,7 @@ - AC_CANONICAL_HOST - AC_CONFIG_MACRO_DIR([m4]) - --dnl Extra arguments to configure -+# Extra arguments to configure - AC_ARG_WITH([mpfr_include], - [AC_HELP_STRING([--with-mpfr-include=DIR], - [MPFR include directory])], -@@ -85,18 +85,19 @@ - ) - - --dnl Setup CC and CFLAGS -+# Setup CC and CFLAGS -+AC_PROG_CC -+AC_LANG(C) - --dnl Check for user specification of CC or CFLAGS -+# Set up LibTool -+AC_PROG_LIBTOOL -+ -+# Check for user specification of CC or CFLAGS - if test -n "$CFLAGS" || test -n "$CC" ; then - user_redefine_cc=yes - fi - --# Check for programs --AC_PROG_CC --AC_LANG(C) -- --dnl Check GMP Header -+# Check GMP Header - AC_MSG_CHECKING(for gmp.h) - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #include "gmp.h" -@@ -105,22 +106,19 @@ - AC_MSG_ERROR([gmp.h can't be found, or is unusable.]) - ]) - --dnl Check for GMP CFLAGS in gmp.h -+# Check for GMP CFLAGS in gmp.h - if test -z "$user_redefine_cc" ; then - MPC_GMP_CC_CFLAGS - fi - - --dnl Configs for Windows DLLs -+# Configs for Windows DLLs - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - MPC_WINDOWS - esac - - --dnl Finally set up LibTool --AC_PROG_LIBTOOL -- - # Checks for header files. - AC_HEADER_STDC - AC_CHECK_HEADERS([complex.h locale.h inttypes.h stdint.h limits.h unistd.h sys/time.h]) diff --git a/staging/libmpc/libmpc.install b/staging/libmpc/libmpc.install deleted file mode 100644 index b0718c745..000000000 --- a/staging/libmpc/libmpc.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(libmpc.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/staging/libofx/PKGBUILD b/staging/libofx/PKGBUILD deleted file mode 100644 index eeeca6a9e..000000000 --- a/staging/libofx/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 165073 2012-08-09 23:42:01Z eric $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> - -pkgbase=libofx -pkgname=('libofx' 'libofx-doc') -pkgver=0.9.5 -pkgrel=1 -pkgdesc="API for the OFX banking standard" -arch=('i686' 'x86_64') -url="http://libofx.sourceforge.net" -license=('GPL') -depends=('opensp' 'curl' 'libxml++') -checkdepends=('gnupg') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz libofx-gcc47.patch) -sha1sums=('7e5245d68a0f3f7efad2fd809b2afbbff6ba0e73' - '6c327e24543cb8ba901bfb204343a85c68264654') - -build() { - cd "$srcdir/$pkgbase-$pkgver" - patch -p1 -i "$srcdir/libofx-gcc47.patch" - ./configure --prefix=/usr - make -} - -check() { - cd "$srcdir/$pkgbase-$pkgver" - make check -} - -package_libofx() { - options=('!libtool' '!docs') - - cd "$srcdir/$pkgbase-$pkgver" - make DESTDIR="$pkgdir" install -} - -package_libofx-doc() { - pkgdesc="Documention of the OFX banking standard API" - depends=() - - cd "$srcdir/$pkgbase-$pkgver" - make DESTDIR="$pkgdir" install-docDATA - make -C doc DESTDIR="$pkgdir" install -} diff --git a/staging/libofx/libofx-gcc47.patch b/staging/libofx/libofx-gcc47.patch deleted file mode 100644 index 899fe09e0..000000000 --- a/staging/libofx/libofx-gcc47.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nru libofx-0.9.4/debian/patches/fix-ftbfs-gcc4.7.diff libofx-0.9.4/debian/patches/fix-ftbfs-gcc4.7.diff ---- libofx-0.9.4.orig/ofxconnect/ofxpartner.cpp 2011-03-30 22:30:50.000000000 +0000 -+++ libofx-0.9.4/ofxconnect/ofxpartner.cpp 2012-04-17 06:08:38.711940892 +0000 -@@ -37,6 +37,7 @@ - #include <vector> - #include <algorithm> - #include <string.h> -+#include <unistd.h> - - using std::string; - using std::vector; diff --git a/staging/libotr/PKGBUILD b/staging/libotr/PKGBUILD deleted file mode 100644 index ebc81d058..000000000 --- a/staging/libotr/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 166024 2012-09-04 14:32:25Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> -# Contributor: Bug <Bug2000@gmail.com> - -pkgname=libotr -pkgver=4.0.0 -pkgrel=1 -pkgdesc='Off-the-Record Messaging Library and Toolkit' -url='http://www.cypherpunks.ca/otr/' -license=('GPL' 'LGPL') -arch=('i686' 'x86_64') -depends=('libgcrypt') -options=('!libtool') -source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz") -sha1sums=('8865e9011b8674290837afcf7caf90c492ae09cc') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/libpst/PKGBUILD b/staging/libpst/PKGBUILD deleted file mode 100644 index ee01ca472..000000000 --- a/staging/libpst/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 163183 2012-07-08 14:59:15Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=libpst -pkgname=('libpst' 'libpst-docs') -pkgver=0.6.54 -pkgrel=2 -arch=('i686' 'x86_64') -url="http://www.five-ten-sg.com/libpst/" -license=('GPL') -makedepends=('python2' 'boost') -source=(http://www.five-ten-sg.com/libpst/packages/${pkgbase}-${pkgver}.tar.gz) -sha1sums=('a4713b87e330556acb0786b4efa975a3c739cd84') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man \ - --disable-static --enable-libpst-shared --disable-dii PYTHON_VERSION=2 - make -} - -package_libpst() { - pkgdesc="Outlook .pst file converter" - depends=('gcc-libs') - optdepends=('boost-libs: for libpst python interface') - options=('!libtool' '!docs') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install -} - -package_libpst-docs() { - pkgdesc="Documentation for Outlook .pst file converter" - options=('!libtool') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install-htmlDATA - cd "${srcdir}/${pkgbase}-${pkgver}/html" - make DESTDIR="${pkgdir}" install-htmldevelDATA -} diff --git a/staging/libreoffice/PKGBUILD b/staging/libreoffice/PKGBUILD deleted file mode 100644 index bdc003773..000000000 --- a/staging/libreoffice/PKGBUILD +++ /dev/null @@ -1,711 +0,0 @@ -# $Id: PKGBUILD 168948 2012-10-16 19:11:51Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> - -pkgbase="libreoffice" -pkgname=('libreoffice-common' - 'libreoffice-base' - 'libreoffice-calc' - 'libreoffice-draw' - 'libreoffice-gnome' - 'libreoffice-impress' - 'libreoffice-kde4' - 'libreoffice-math' - 'libreoffice-sdk' - 'libreoffice-sdk-doc' - 'libreoffice-writer' - 'libreoffice-en-US' - 'libreoffice-postgresql-connector' - 'libreoffice-extension-pdfimport' - 'libreoffice-extension-presenter-screen' - 'libreoffice-extension-presentation-minimizer' - 'libreoffice-extension-report-builder' - 'libreoffice-scripting-beanshell' - 'libreoffice-scripting-javascript' - 'libreoffice-extension-scripting-python' - 'libreoffice-extension-wiki-publisher' - 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) -_LOver=3.6.2.2 -pkgver=3.6.2 -pkgrel=3 -arch=('i686' 'x86_64') -license=('LGPL3') -url="http://www.libreoffice.org/" -makedepends=( # makedepends - 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' #'boost' - 'apache-ant' 'gperf' 'poppler>=0.20.5' 'kdelibs' 'gconf' 'cppunit' - 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' - 'glu' 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' - # the runtime dependencies - "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" - 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=49.1" - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' - 'ttf-dejavu') # to satisfy regression tests - -# http://download.documentfoundation.org/mirrors/all.html -# http://wiki.documentfoundation.org/Mirrors - -_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" -#_mirror="http://dev-builds.libreoffice.org/pre-releases/src" -_additional_source_url="http://dev-www.libreoffice.org/src" -_additional_source_url2="http://dev-www.libreoffice.org/extern" -source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz - ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - ${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 - ${_additional_source_url}/94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2 - ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz - ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip - ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip - ${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz - ${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip - ${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz - ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip - ${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz - ${_additional_source_url}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz - ${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz - ${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz - ${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip - ${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - ${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip - ${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip - ${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip - ${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip - ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip - ${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip - ${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip - ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip - ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - ${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 - ${_additional_source_url}/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 - ${_additional_source_url}/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz - ${_additional_source_url}/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 - ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll - make-pyuno-work-with-system-wide-module-install.diff - buildfix.diff - libreoffice-common.sh libreoffice-common.csh) -noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2 - 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 - 185d60944ea767075d27247c3162b3bc-unowinreg.dll - 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 - ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip - 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip - 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz - fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz - 6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 - 0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz - 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip - 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz - a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip - 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz - 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz - 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz - af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz - eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip - 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip - 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip - f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip - 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip - d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip - 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip - ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip - db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip - ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 - ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) -md5sums=('ae171ba4633cc72dba4451b1bdd3385e' - 'cdad0734d247d91a79cb282fd851d2a7' - 'e9a7e3d35432b72a4603ce094deb6a67' - '18f577b374d60b3c760a3a3350407632' - 'f02578f5218f217a9f20e9c30e119c6a' - '94e7f271e38c976462558b4278590178' - '1f24ab1d39f4a51faf22244c94a6203f' - '35c94d2df8893241173de1d16b6034c0' - '798b2ffdc8bcfe7bca2cf92b62caf685' - 'fdb27bfe2dbe2e7b57ae194d9bf36bab' - 'ada24d37d8d638b3d8a9985e80bc2978' - '2a177023f9ea8ec8bd00837605c5df1b' - 'a7983f859eafb2677d7ff386a023bc40' - '3c219630e4302863a9a83d0efde889db' - '2ae988b339daec234019a7066f96733e' - '2c9b0f83ed5890af02c0df1c1776f39b' - 'af3c3acf618de6108d65fcdc92b492e1' - 'eeb2c7ddf0d302fba4bfc6e97eac9624' - '39bb3fcea1514f1369fcfc87542390fd' - '3404ab6b1792ae5f16bbd603bd1e1d03' - '97b2d4dba862397f446b217e2b623e71' - 'f94d9870737518e3b597f9265f4e9803' - '8ce2fcd72becf06c41f7201d15373ed9' - 'd8bd5eed178db6e2b18eeed243f85aa8' - '3bdf40c0d199af31923e900d082ca2dd' - 'ace6ab49184e329db254e454a010f56d' - 'db60e4fde8dd6d6807523deb71ee34dc' - 'ba2930200c9f019c2d93a8c88c651a0f' - '0ff7d225d087793c8c2c680d77aac3e7' - '6097739c841f671cb21332b9cc593ae7' - '0d2dcdfbf28d6208751b33057f5361f0' - 'ce5a1def34578b75959ac31210f031f6' - '185d60944ea767075d27247c3162b3bc' - '97bf43dda273d79ff90c848ab53b0e3c' - '234e91ac65945ce1ab1e3839780e90f7' - 'abcb1b0a7deaffe13ab3d7ca70becb49' - '72790a4103da259a55cadd66db931d00') - -build() { - - unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS - [ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh - [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh - - cd ${srcdir}/libreoffice-core-$_LOver - - # move external sources into place - mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources - for source in "${noextract[@]}"; do - ln -s ${srcdir}/$source . - done - popd - - ln -s ../libreoffice-help-$_LOver/helpcontent2 . - ln -s ../libreoffice-translations-$_LOver/translations . - - # buildfixes & bugfixes - patch -Np1 -i ${srcdir}/buildfix.diff # leaves out a broken pdfimport test - - # fix not upstreamable pyuno paths - patch taken from Debian - patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff - - #use the CFLAGS but remove the LibO overridden ones - for i in $CFLAGS; do - case "$i" in - -O?|-pipe|-Wall|-g|-fexceptions) continue;; - esac - ARCH_FLAGS="$ARCH_FLAGS $i" - done - - # python2 fix - export PYTHON=python2 - - #autoconf -f - - # non-SMP test build - #export MAKEFLAGS="-j1" - #./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ - - ./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ - --with-unix-wrapper="libreoffice" \ - --enable-split-app-modules \ - --with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \ - --with-external-tar="${srcdir}/ext_sources" \ - --disable-fetch-external \ - --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ - --libdir=/usr/lib --mandir=/usr/share/man \ - --disable-verbose \ - --with-lang="" \ - --enable-crashdump \ - --enable-dbus \ - --enable-evolution2\ - --enable-gio\ - --disable-gnome-vfs\ - --disable-kde\ - --enable-kde4\ - --enable-gtk3 \ - --enable-lockdown\ - --enable-mergelibs \ - --enable-opengl \ - --enable-odk\ - --enable-ext-scripting-beanshell \ - --enable-ext-scripting-javascript \ - --enable-ext-wiki-publisher \ - --enable-ext-nlpsolver \ - --disable-ext-mysql-connector \ - --with-system-mysql \ - --enable-librsvg=system \ - --without-fonts\ - --without-afms\ - --without-ppds\ - --without-system-libwps\ - --without-system-libcdr \ - --without-system-mdds\ - --without-myspell-dicts \ - --without-system-libvisio \ - --without-system-libcmis \ - --without-system-libexttextcat \ - --without-system-jfreereport \ - --without-system-apache-commons \ - --with-system-dicts \ - --with-external-dict-dir=/usr/share/hunspell \ - --with-external-hyph-dir=/usr/share/hyphen \ - --with-external-thes-dir=/usr/share/mythes \ - --with-system-beanshell \ - --with-system-cppunit\ - --with-system-graphite\ - --with-system-libwpg \ - --with-system-libwps \ - --with-system-redland\ - --without-system-saxon\ - --disable-mozilla \ - --without-system-mozilla \ - --without-system-mozilla-headers \ - --with-ant-home="/usr/share/apache-ant"\ - --without-system-boost\ - --with-system-cairo\ - --with-system-libs\ - --with-system-mythes\ - --with-system-headers\ - --with-system-hsqldb \ - --with-alloc=system\ - --with-system-clucene\ - --without-system-servlet-api \ - --with-java-target-version=1.5 \ - $EXTRAOPTS - -#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool - - touch src.downloaded - #./download - make - # fake installation to create split file lists - mkdir $srcdir/fakeinstall - make DESTDIR=${srcdir}/fakeinstall distro-pack-install # -o build -o check -} - -#check() { -# cd ${srcdir}/build -# make check -#} - -package_libreoffice-common() { - - pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" - install=libreoffice-common.install - depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6" - 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 'clucene' 'lcms2' - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2') - optdepends=('libreoffice-langpack: additional language support' - 'java-runtime: adds java support' - 'libcups: adds printing support' - 'gconf: adds additional gnome support' - 'nss: adds support for signed files/macros' - 'pstoedit: translates PostScript and PDF graphics into other vector formats' - 'libmythes: for use in thesaurus' - 'beanshell: interactive java -- good for prototyping /macros' - 'vigra: C++ computer vision library, usable in Basebmp' - 'libmspack: library for Microsoft compression formats for use in FontOOo' - 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images' - 'sane: for scanner access' - 'unixodbc: adds ODBC database support' - 'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress' - 'gtk2: for browser plugin') - backup=(etc/libreoffice/sofficerc - etc/libreoffice/bootstraprc - etc/libreoffice/psprint.conf) - groups=('libreoffice') - provides=('go-openoffice') - conflicts=('go-openoffice') - replaces=('go-openoffice' 'openoffice-base' 'libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/common_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/common_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done - - # put configuration files into place - install -dm755 ${pkgdir}/etc/libreoffice - install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/ - install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/ - # install dummy links to make them found by LibO - cd ${pkgdir}/usr/lib/libreoffice/program/ - ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} . - cd ${pkgdir}/usr/lib/libreoffice/share/psprint/ - ln -vsf /etc/libreoffice/psprint.conf . - - # set python-uno PYTHON path - install -dm755 ${pkgdir}/etc/profile.d - install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/ - - # move bash-completion files to its new place - install -dm755 ${pkgdir}/usr/share/bash-completion/completions - mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh - rm -rf ${pkgdir}/etc/bash_completion.d - - # some files would conflict - rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar - rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar - rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb -} - -package_libreoffice-base() { - pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI." - install=libreoffice-base.install - depends=('libreoffice-common' 'hsqldb-java') - optdepends=('libreoffice-postgresql-connector') - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/base_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/base_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-postgresql-connector() { - pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice" - depends=('libreoffice-base' 'postgresql-libs') - groups=('libreoffice') - replaces=('libreoffice') - - # workaround double entries in the file list - mv ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt.orig - sort ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt.orig | uniq 1>& ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-calc() { - pkgdesc="Spreadsheet application for LibreOffice." - install=libreoffice-calc.install - depends=('libreoffice-common' 'lpsolve' ) - optdepends=() - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-draw() { - pkgdesc="Drawing Application for LibreOffice." - install=libreoffice-draw.install - depends=('libreoffice-common') - optdepends=() - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-gnome() { - pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment." - depends=('libreoffice-common' 'gtk2' 'gtk3') #'dbus-glib' - optdepends=() - backup=() - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-impress() { - pkgdesc="Presentation Application for LibreOffice." - install=libreoffice-impress.install - depends=('libreoffice-common') - optdepends=('glu: for the OGLTrans extension') - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-kde4() { - pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment." - depends=('libreoffice-common' 'kdelibs') - optdepends=() - backup=() - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-math() { - pkgdesc="Equation Editor Application for LibreOffice." - depends=('libreoffice-common') - optdepends=() - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/math_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/math_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-sdk() { - pkgdesc="Software Development Kit for LibreOffice." - depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') - optdepends=() - backup=() - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done - - # fix environment path to keep compatibility with openjdk6 and openjdk7 - sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} -} - -package_libreoffice-sdk-doc() { - pkgdesc="Software Development Kit documentation for LibreOffice" - depends=('libreoffice-common' 'libreoffice-sdk') - optdepends=() - backup=() - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done - - #fix permissions - find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \; -} - -package_libreoffice-writer() { - pkgdesc="Word Processor Application for LibreOffice." - install=libreoffice-writer.install - depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2') - optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images') - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-en-US() { - pkgdesc="English (US) language pack for LibreOffice" - #arch=('any') - provides=('openoffice-en-US' 'libreoffice-langpack') - replaces=(openoffice-en-US) - conflicts=(openoffice-en-US) - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-extension-pdfimport() { - - pkgdesc="This extension allows you to import and modify PDF documents" - depends=('libreoffice-common' 'poppler') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport -} - -package_libreoffice-extension-presenter-screen() { - - pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide" - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen -} - -package_libreoffice-extension-presentation-minimizer() { - - pkgdesc="This extension reduce the file size of the current presentation" - depends=('libreoffice-common' 'gcc-libs') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer -} - -package_libreoffice-extension-report-builder() { - - pkgdesc="This extension creates smart-looking database reports" - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder -} - -package_libreoffice-scripting-beanshell() { - - pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell" - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services} - mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/ScriptProviderForBeanShell.jar ${pkgdir}/usr/lib/libreoffice/program/classes/ - mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforbeanshell.rdb ${pkgdir}/usr/lib/libreoffice/program/services/ -} - -package_libreoffice-scripting-javascript() { - - pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript" - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services} - mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/ - mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/xml/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/ -} - -package_libreoffice-extension-scripting-python() { - - pkgdesc="LibreOffice extension - Enables support for scripts in Python" - depends=('libreoffice-common' 'python2') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python -} - -package_libreoffice-extension-wiki-publisher() { - - pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language" - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher -} - -package_libreoffice-extension-nlpsolver() { - - pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models" - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver -} diff --git a/staging/libreoffice/PKGBUILD.36 b/staging/libreoffice/PKGBUILD.36 deleted file mode 100644 index 71ee72c1c..000000000 --- a/staging/libreoffice/PKGBUILD.36 +++ /dev/null @@ -1,715 +0,0 @@ -# $Id: PKGBUILD 160067 2012-05-29 19:20:54Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> - -pkgbase="libreoffice" -pkgname=('libreoffice-common' - 'libreoffice-base' - 'libreoffice-calc' - 'libreoffice-draw' - 'libreoffice-gnome' - 'libreoffice-impress' - 'libreoffice-kde4' - 'libreoffice-math' - 'libreoffice-sdk' - 'libreoffice-sdk-doc' - 'libreoffice-writer' - 'libreoffice-en-US' - 'libreoffice-postgresql-connector' - 'libreoffice-extension-pdfimport' - 'libreoffice-extension-presenter-screen' - 'libreoffice-extension-presentation-minimizer' - 'libreoffice-extension-report-builder' - 'libreoffice-scripting-beanshell' - 'libreoffice-scripting-javascript' - 'libreoffice-extension-scripting-python' - 'libreoffice-extension-wiki-publisher' - 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built -_LOver=3.6.0.4 -pkgver=3.6.0 -pkgrel=1 -arch=('i686' 'x86_64') -license=('LGPL3') -url="http://www.libreoffice.org/" -makedepends=( # makedepends - 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' #'boost' - 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' - 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' - 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' - #'saxon' - currently broken - # the runtime dependencies - "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" - 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=49.1" - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' - 'ttf-dejavu') # to satisfy regression tests - -# http://download.documentfoundation.org/mirrors/all.html -# http://wiki.documentfoundation.org/Mirrors - -_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" -#_mirror="http://dev-builds.libreoffice.org/pre-releases/src" -_additional_source_url="http://dev-www.libreoffice.org/src" -_additional_source_url2="http://dev-www.libreoffice.org/extern" -source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz - ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - ${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 - ${_additional_source_url}/a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2 - ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz - ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip - ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip - ${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz - ${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip - ${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz - ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip - ${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz - ${_additional_source_url}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz - ${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz - ${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz - ${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip - ${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - ${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip - ${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip - ${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip - ${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip - ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip - ${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip - ${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip - ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip - ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - ${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 - ${_additional_source_url}/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 - ${_additional_source_url}/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz - ${_additional_source_url}/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 - ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll - buildfix.diff - libreoffice-common.sh libreoffice-common.csh) -noextract=(a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2 - 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 - 185d60944ea767075d27247c3162b3bc-unowinreg.dll - 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 - ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip - 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip - 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz - fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz - 6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 - 0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz - 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip - 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz - a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip - 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz - 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz - 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz - af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz - eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip - 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip - 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip - f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip - 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip - d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip - 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip - ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip - db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip - ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 - ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) -md5sums=('67cf97e86c75363238a371f64ef5f606' - '8422b0c4c797abeefed3ee4490586dd2' - '6cc8fa86be8c657ba23434c6c8d99416' - '18f577b374d60b3c760a3a3350407632' - 'f02578f5218f217a9f20e9c30e119c6a' - 'a9a1db27688bad49418667b434d29c1f' - '1f24ab1d39f4a51faf22244c94a6203f' - '35c94d2df8893241173de1d16b6034c0' - '798b2ffdc8bcfe7bca2cf92b62caf685' - 'fdb27bfe2dbe2e7b57ae194d9bf36bab' - 'ada24d37d8d638b3d8a9985e80bc2978' - '2a177023f9ea8ec8bd00837605c5df1b' - 'a7983f859eafb2677d7ff386a023bc40' - '3c219630e4302863a9a83d0efde889db' - '2ae988b339daec234019a7066f96733e' - '2c9b0f83ed5890af02c0df1c1776f39b' - 'af3c3acf618de6108d65fcdc92b492e1' - 'eeb2c7ddf0d302fba4bfc6e97eac9624' - '39bb3fcea1514f1369fcfc87542390fd' - '3404ab6b1792ae5f16bbd603bd1e1d03' - '97b2d4dba862397f446b217e2b623e71' - 'f94d9870737518e3b597f9265f4e9803' - '8ce2fcd72becf06c41f7201d15373ed9' - 'd8bd5eed178db6e2b18eeed243f85aa8' - '3bdf40c0d199af31923e900d082ca2dd' - 'ace6ab49184e329db254e454a010f56d' - 'db60e4fde8dd6d6807523deb71ee34dc' - 'ba2930200c9f019c2d93a8c88c651a0f' - '0ff7d225d087793c8c2c680d77aac3e7' - '6097739c841f671cb21332b9cc593ae7' - '0d2dcdfbf28d6208751b33057f5361f0' - 'ce5a1def34578b75959ac31210f031f6' - '185d60944ea767075d27247c3162b3bc' - '234e91ac65945ce1ab1e3839780e90f7' - 'f0e72d0e1bc93a50a3aa9d31350b156c' - '867c682b45f477f916786e00c45d7ab7') - -build() { - - unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS - [ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh - [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh - - cd ${srcdir}/libreoffice-core-$_LOver - - # move external sources into place - mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources - for source in "${noextract[@]}"; do - ln -s ${srcdir}/$source . - done - popd - - ln -s ../libreoffice-help-$_LOver/helpcontent2 . - ln -s ../libreoffice-translations-$_LOver/translations . - - # buildfixes & bugfixes - patch -Np1 -i ${srcdir}/buildfix.diff - - #use the CFLAGS but remove the LibO overridden ones - for i in $CFLAGS; do - case "$i" in - -O?|-pipe|-Wall|-g|-fexceptions) continue;; - esac - ARCH_FLAGS="$ARCH_FLAGS $i" - done - - # python2 fix - export PYTHON=python2 - - #autoconf -f - - # non-SMP test build - #export MAKEFLAGS="-j1" - #./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ - - ./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ - --with-unix-wrapper="libreoffice" \ - --enable-split-app-modules \ - --with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \ - --with-external-tar="${srcdir}/ext_sources" \ - --disable-fetch-external \ - --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ - --libdir=/usr/lib --mandir=/usr/share/man \ - --disable-verbose \ - --with-lang="" \ - --enable-crashdump \ - --enable-dbus \ - --enable-evolution2\ - --enable-gio\ - --disable-gnome-vfs\ - --disable-kde\ - --enable-kde4\ - --enable-gtk3 \ - --enable-lockdown\ - --enable-mergelibs \ - --enable-opengl \ - --enable-odk\ - --enable-ext-scripting-beanshell \ - --enable-ext-scripting-javascript \ - --enable-ext-wiki-publisher \ - --enable-ext-nlpsolver \ - --disable-ext-mysql-connector \ - --with-system-mysql \ - --enable-librsvg=system \ - --without-fonts\ - --without-afms\ - --without-ppds\ - --without-system-libwps\ - --without-system-libcdr \ - --without-system-mdds\ - --without-myspell-dicts \ - --without-system-libvisio \ - --without-system-libcmis \ - --without-system-libexttextcat \ - --without-system-jfreereport \ - --without-system-apache-commons \ - --with-system-dicts \ - --with-external-dict-dir=/usr/share/hunspell \ - --with-external-hyph-dir=/usr/share/hyphen \ - --with-external-thes-dir=/usr/share/mythes \ - --with-system-beanshell \ - --with-system-cppunit\ - --with-system-graphite\ - --with-system-libwpg \ - --with-system-libwps \ - --with-system-redland\ - --without-system-saxon\ - --disable-mozilla \ - --without-system-mozilla \ - --without-system-mozilla-headers \ - --with-ant-home="/usr/share/apache-ant"\ - --without-system-boost\ - --with-system-cairo\ - --with-system-libs\ - --with-system-mythes\ - --with-system-headers\ - --with-system-hsqldb \ - --with-alloc=system\ - --with-system-clucene\ - --without-system-servlet-api \ - --with-java-target-version=1.5 \ - $EXTRAOPTS - -#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool - - touch src.downloaded - #./download - make - # fake installation to create split file lists - mkdir $srcdir/fakeinstall - make DESTDIR=${srcdir}/fakeinstall distro-pack-install -} - -#check() { -# cd ${srcdir}/build -# make check -#} - -package_libreoffice-common() { - - pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" - install=libreoffice-common.install - depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6" - 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2') - #'saxon' - optdepends=('libreoffice-langpack: additional language support' - 'java-runtime: adds java support' - 'libcups: adds printing support' - 'gconf: adds additional gnome support' - 'nss: adds support for signed files/macros' - 'pstoedit: translates PostScript and PDF graphics into other vector formats' - 'poppler: for shipped pdfimport extension' - 'libmythes: for use in thesaurus' - 'beanshell: interactive java -- good for prototyping /macros' - 'vigra: C++ computer vision library, usable in Basebmp' - 'libmspack: library for Microsoft compression formats for use in FontOOo' - 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images' - 'clucene: full-text search engine library needed in the help section' - 'sane: for scanner access' - 'unixodbc: adds ODBC database support' - 'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress') - backup=(etc/libreoffice/sofficerc - etc/libreoffice/bootstraprc - etc/libreoffice/psprint.conf) - groups=('libreoffice') - provides=('go-openoffice') - conflicts=('go-openoffice') - replaces=('go-openoffice' 'openoffice-base' 'libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/common_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/common_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done - - # put configuration files into place - install -dm755 ${pkgdir}/etc/libreoffice - install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/ - install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/ - # install dummy links to make them found by LibO - cd ${pkgdir}/usr/lib/libreoffice/program/ - ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} . - cd ${pkgdir}/usr/lib/libreoffice/share/psprint/ - ln -vsf /etc/libreoffice/psprint.conf . - - # set python-uno PYTHON path - install -dm755 ${pkgdir}/etc/profile.d - install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/ - - # move bash-completion files to its new place - install -dm755 ${pkgdir}/usr/share/bash-completion/completions - mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh - rm -rf ${pkgdir}/etc/bash_completion.d - - # some files would conflict - rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar - rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar - rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb -} - -package_libreoffice-base() { - pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI." - install=libreoffice-base.install - depends=('libreoffice-common' 'hsqldb-java') - optdepends=('libreoffice-postgresql-connector') - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/base_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/base_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-postgresql-connector() { - pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice" - depends=('libreoffice-base' 'postgresql-libs') - groups=('libreoffice') - replaces=('libreoffice') - - # no file-list so far - install -dm755 ${pkgdir}/usr/lib/libreoffice/program/services - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.uno.so ${pkgdir}/usr/lib/libreoffice/program - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc-impl.uno.so ${pkgdir}/usr/lib/libreoffice/program - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.ini ${pkgdir}/usr/lib/libreoffice/program - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/postgresql-sdbc.rdb ${pkgdir}/usr/lib/libreoffice/program/services - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/registry - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/postgresqlsdbc.xcd ${pkgdir}/usr/lib/libreoffice/share/registry - - # create directories from *list.txt file -# for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do -# install -dm755 ${pkgdir}/${directory/\%dir/} -# done -# # install files into the pkg from fakeinstall dir -# for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do -# dirname=`dirname $file` -# # check if directory has been already been created - some are missing like manpages -# [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname -# # mv file from fakeinstall to pkgdir -# mv ${srcdir}/fakeinstall${file} ${pkgdir}$file -# done -} - -package_libreoffice-calc() { - pkgdesc="Spreadsheet application for LibreOffice." - install=libreoffice-calc.install - depends=('libreoffice-common' 'lpsolve' ) - optdepends=() - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-draw() { - pkgdesc="Drawing Application for LibreOffice." - install=libreoffice-draw.install - depends=('libreoffice-common') - optdepends=() - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-gnome() { - pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment." - depends=('libreoffice-common' 'gtk2' 'gtk3') #'dbus-glib' - optdepends=() - backup=() - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-impress() { - pkgdesc="Presentation Application for LibreOffice." - install=libreoffice-impress.install - depends=('libreoffice-common') - optdepends=('mesa: for the OGLTrans extension') - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-kde4() { - pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment." - depends=('libreoffice-common' 'kdelibs') - optdepends=() - backup=() - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-math() { - pkgdesc="Equation Editor Application for LibreOffice." - depends=('libreoffice-common') - optdepends=() - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/math_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/math_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-sdk() { - pkgdesc="Software Development Kit for LibreOffice." - depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') - optdepends=() - backup=() - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done - - # fix environment path to keep compatibility with openjdk6 and openjdk7 - #sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" /usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} - sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} -} - -package_libreoffice-sdk-doc() { - pkgdesc="Software Development Kit documentation for LibreOffice" - depends=('libreoffice-common' 'libreoffice-sdk') - optdepends=() - backup=() - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done - - #fix permissions - find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \; -} - -package_libreoffice-writer() { - pkgdesc="Word Processor Application for LibreOffice." - install=libreoffice-writer.install - depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2') - optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images') - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-en-US() { - pkgdesc="English (US) language pack for LibreOffice" - #arch=('any') - provides=('openoffice-en-US' 'libreoffice-langpack') - replaces=(openoffice-en-US) - conflicts=(openoffice-en-US) - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-extension-pdfimport() { - - pkgdesc="This extension allows you to import and modify PDF documents" - depends=('libreoffice-common' 'poppler') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport -} - -package_libreoffice-extension-presenter-screen() { - - pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide" - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen -} - -package_libreoffice-extension-presentation-minimizer() { - - pkgdesc="This extension reduce the file size of the current presentation" - depends=('libreoffice-common' 'gcc-libs') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer -} - -package_libreoffice-extension-report-builder() { - - pkgdesc="This extension creates smart-looking database reports" - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder -} - -package_libreoffice-scripting-beanshell() { - - pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell" - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services} - mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/ScriptProviderForBeanShell.jar ${pkgdir}/usr/lib/libreoffice/program/classes/ - mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforbeanshell.rdb ${pkgdir}/usr/lib/libreoffice/program/services/ -} - -package_libreoffice-scripting-javascript() { - - pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript" - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services} - mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/ - mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/xml/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/ -} - -package_libreoffice-extension-scripting-python() { - - pkgdesc="LibreOffice extension - Enables support for scripts in Python" - depends=('libreoffice-common' 'python2') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python -} - -package_libreoffice-extension-wiki-publisher() { - - pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language" - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher -} - -package_libreoffice-extension-nlpsolver() { - - pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models" - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver -} diff --git a/staging/libreoffice/buildfix.diff b/staging/libreoffice/buildfix.diff deleted file mode 100644 index 327b10bb1..000000000 --- a/staging/libreoffice/buildfix.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- libreoffice-core-3.5.99.1/sdext/Module_sdext.mk 2012-06-07 13:57:10.000000000 +0200 -+++ libreoffice-core-3.5.99.1/sdext/Module_sdext.mk.new 2012-06-09 18:21:03.376024873 +0200 -@@ -49,9 +49,6 @@ - StaticLibrary_pdfimport_s \ - )) - --$(eval $(call gb_Module_add_check_targets,sdext,\ -- CppunitTest_pdfimport \ --)) - endif - - ifeq ($(ENABLE_PRESENTER_SCREEN),YES) diff --git a/staging/libreoffice/buildfix_icu49.diff b/staging/libreoffice/buildfix_icu49.diff deleted file mode 100644 index 7a774dee0..000000000 --- a/staging/libreoffice/buildfix_icu49.diff +++ /dev/null @@ -1,42 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=410307 - ---- i18npool/source/breakiterator/data/char_in.txt -+++ i18npool/source/breakiterator/data/char_in.txt -@@ -15,7 +15,7 @@ - $CR = [\p{Grapheme_Cluster_Break = CR}]; - $LF = [\p{Grapheme_Cluster_Break = LF}]; - $Control = [\p{Grapheme_Cluster_Break = Control}]; --$Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; -+# $Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; - $Extend = [\p{Grapheme_Cluster_Break = Extend}]; - $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}]; - $BengaliLetter = [\u0985-\u09B9 \u09CE \u09DC-\u09E1 \u09F0-\u09F1]; -@@ -72,7 +72,7 @@ - [^$Control $CR $LF] $Extend; - - [^$Control $CR $LF] $SpacingMark; --$Prepend [^$Control $CR $LF]; -+# $Prepend [^$Control $CR $LF]; - - - ## ------------------------------------------------- -@@ -94,7 +94,7 @@ - - $Extend [^$Control $CR $LF]; - $SpacingMark [^$Control $CR $LF]; --[^$Control $CR $LF] $Prepend; -+# [^$Control $CR $LF] $Prepend; - - - ## ------------------------------------------------- ---- i18npool/source/breakiterator/data/char.txt -+++ i18npool/source/breakiterator/data/char.txt -@@ -16,7 +16,7 @@ - $CR = [\p{Grapheme_Cluster_Break = CR}]; - $LF = [\p{Grapheme_Cluster_Break = LF}]; - $Control = [\p{Grapheme_Cluster_Break = Control}]; --$Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; -+# $Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; - $Extend = [\p{Grapheme_Cluster_Break = Extend}]; - $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}]; - # True Indic wants to move by syllables. Break up SpacingMark. This based on Unicode 6.0 data diff --git a/staging/libreoffice/fix_broken_hebrew_wordwrapping.diff b/staging/libreoffice/fix_broken_hebrew_wordwrapping.diff deleted file mode 100644 index ba4850c77..000000000 --- a/staging/libreoffice/fix_broken_hebrew_wordwrapping.diff +++ /dev/null @@ -1,360 +0,0 @@ -From 20c24114143d6d38774b56a142fd4ae05094308e Mon Sep 17 00:00:00 2001 -From: Caolán McNamara <caolanm@redhat.com> -Date: Sun, 13 May 2012 21:41:30 +0000 -Subject: Resolves: fdo#49849 implement Unicode 6.1 hebrew line breaking rules - -i.e. sync with svn diff -c 31071 -http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr/line.txt - -Change-Id: I I I41b3d02f1a0da3b83a9684f29d466660d96254c6 ---- -diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx -index 14051d4..ffd590c 100644 ---- a/i18npool/qa/cppunit/test_breakiterator.cxx -+++ b/i18npool/qa/cppunit/test_breakiterator.cxx -@@ -42,6 +42,7 @@ - #include <unotest/bootstrapfixturebase.hxx> - - #include <rtl/strbuf.hxx> -+#include <rtl/ustrbuf.hxx> - - #include <string.h> - -@@ -58,6 +59,9 @@ public: - void testWeak(); - void testAsian(); - void testThai(); -+#if TODO -+ void testNorthernThai(); -+#endif - - CPPUNIT_TEST_SUITE(TestBreakIterator); - CPPUNIT_TEST(testLineBreaking); -@@ -71,6 +71,9 @@ - CPPUNIT_TEST(testWeak); - CPPUNIT_TEST(testAsian); - CPPUNIT_TEST(testThai); -+#if TODO -+ CPPUNIT_TEST(testNorthernThai); -+#endif - CPPUNIT_TEST_SUITE_END(); - - private: -@@ -80,28 +83,46 @@ - uno::Reference<i18n::XBreakIterator> m_xBreak; - }; - --//See https://bugs.freedesktop.org/show_bug.cgi?id=31271 for motivation - void TestBreakIterator::testLineBreaking() - { -- ::rtl::OUString aTest1(RTL_CONSTASCII_USTRINGPARAM("(some text here)")); -- - i18n::LineBreakHyphenationOptions aHyphOptions; - i18n::LineBreakUserOptions aUserOptions; - lang::Locale aLocale; - -- aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")); -- aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")); -- -+ //See https://bugs.freedesktop.org/show_bug.cgi?id=31271 - { -- //Here we want the line break to leave text here) on the next line -- i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest1, strlen("(some tex"), aLocale, 0, aHyphOptions, aUserOptions); -- CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 6); -+ ::rtl::OUString aTest(RTL_CONSTASCII_USTRINGPARAM("(some text here)")); -+ -+ aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")); -+ aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")); -+ -+ { -+ //Here we want the line break to leave text here) on the next line -+ i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, strlen("(some tex"), aLocale, 0, aHyphOptions, aUserOptions); -+ CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 6); -+ } -+ -+ { -+ //Here we want the line break to leave "here)" on the next line -+ i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, strlen("(some text here"), aLocale, 0, aHyphOptions, aUserOptions); -+ CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 11); -+ } - } - -+ //See https://bugs.freedesktop.org/show_bug.cgi?id=49849 - { -- //Here we want the line break to leave "here)" on the next line -- i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest1, strlen("(some text here"), aLocale, 0, aHyphOptions, aUserOptions); -- CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 11); -+ const sal_Unicode HEBREW1[] = { 0x05DE, 0x05D9, 0x05DC, 0x05D9, 0x5DD }; -+ ::rtl::OUString aWord(HEBREW1, SAL_N_ELEMENTS(HEBREW1)); -+ ::rtl::OUString aTest(rtl::OUStringBuffer(aWord).append(' ').append(aWord).makeStringAndClear()); -+ -+ aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("he")); -+ aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IL")); -+ -+ { -+ //Here we want the line break to happen at the whitespace -+ i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, aTest.getLength()-1, aLocale, 0, aHyphOptions, aUserOptions); -+ CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == aWord.getLength()+1); -+ } - } - } - -@@ -295,27 +320,29 @@ void TestBreakIterator::testThai() - aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("th")); - aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH")); - -- i18n::Boundary aBounds; -- { -- const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; -- ::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1)); -- aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, -- i18n::WordType::DICTIONARY_WORD, true); -- CPPUNIT_ASSERT_MESSAGE("Should skip full word", -- aBounds.startPos == 0 && aBounds.endPos == aTest.getLength()); -- } -+ const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; -+ ::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1)); -+ i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, -+ i18n::WordType::DICTIONARY_WORD, true); -+ CPPUNIT_ASSERT_MESSAGE("Should skip full word", -+ aBounds.startPos == 0 && aBounds.endPos == aTest.getLength()); -+} - --#ifdef TODO -- { -- const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; -- ::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1)); -- aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, -- i18n::WordType::DICTIONARY_WORD, true); -- CPPUNIT_ASSERT_MESSAGE("Should skip full word", -- aBounds.startPos == 0 && aBounds.endPos == aTest.getLength()); -- } --#endif -+#if TODO -+void TestBreakIterator::testNorthernThai() -+{ -+ lang::Locale aLocale; -+ aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nod")); -+ aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH")); -+ -+ const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; -+ ::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1)); -+ i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, -+ i18n::WordType::DICTIONARY_WORD, true); -+ CPPUNIT_ASSERT_MESSAGE("Should skip full word", -+ aBounds.startPos == 0 && aBounds.endPos == aTest.getLength()); - } -+#endif - - void TestBreakIterator::setUp() - { -diff --git a/i18npool/source/breakiterator/data/README b/i18npool/source/breakiterator/data/README -new file mode 100644 -index 0000000..8d7598d ---- a/dev/null -+++ b/i18npool/source/breakiterator/data/README -@@ -0,0 +1,12 @@ -+The originals of these come from svn checkout -+http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr they no -+longer appear in the icu tarballs, but are in icu's svn -+ -+At various stages these copies have been customized and are not horribly out of -+sync. It unclear which diffs from the base versions are deliberate and which -+are now accidental :-( -+ -+We need to review the various issues referenced in the commits that caused -+custimizations and see if they're still relevant or not, write regression tests -+for them, if any are still relavant then apply the changes back on top of the -+latest versions. -diff --git a/i18npool/source/breakiterator/data/line.txt b/i18npool/source/breakiterator/data/line.txt -index cbabee6..91c8f3d 100644 ---- a/i18npool/source/breakiterator/data/line.txt -+++ b/i18npool/source/breakiterator/data/line.txt -@@ -61,11 +61,13 @@ $BB = [:LineBreak = Break_Before:]; - $BK = [:LineBreak = Mandatory_Break:]; - $B2 = [:LineBreak = Break_Both:]; - $CB = [:LineBreak = Contingent_Break:]; -+$CJ = [:LineBreak = Conditional_Japanese_Starter:]; - $CL = [:LineBreak = Close_Punctuation:] ; - $CM = [:LineBreak = Combining_Mark:]; - $CR = [:LineBreak = Carriage_Return:]; - $EX = [:LineBreak = Exclamation:]; - $GL = [:LineBreak = Glue:]; -+$HL = [:LineBreak = Hebrew_Letter:]; - $HY = [:LineBreak = Hyphen:]; - $H2 = [:LineBreak = H2:]; - $H3 = [:LineBreak = H3:]; -@@ -77,7 +79,7 @@ $JV = [:LineBreak = JV:]; - $JT = [:LineBreak = JT:]; - $LF = [:LineBreak = Line_Feed:]; - $NL = [:LineBreak = Next_Line:]; --$NS = [:LineBreak = Nonstarter:]; -+$NS = [[:LineBreak = Nonstarter:] $CJ]; - $NU = [:LineBreak = Numeric:]; - $OP = [[:LineBreak = Open_Punctuation:] - $DG]; - $PO = [:LineBreak = Postfix_Numeric:]; -@@ -118,6 +120,7 @@ $B2cm = $B2 $CM*; - $CLcm = $CL $CM*; - $EXcm = $EX $CM*; - $GLcm = $GL $CM*; -+$HLcm = $HL $CM*; - $HYcm = $HY $CM*; - $H2cm = $H2 $CM*; - $H3cm = $H3 $CM*; -@@ -150,6 +153,7 @@ $B2 $CM+; - $CL $CM+; - $EX $CM+; - $GL $CM+; -+$HL $CM+; - $HY $CM+; - $H2 $CM+; - $H3 $CM+; -@@ -186,7 +190,7 @@ $CANT_CM = [ $SP $BK $CR $LF $NL $ZW $CM]; # Bases that can't take CMs - # so for this one case we need to manually list out longer sequences. - # - $AL_FOLLOW_NOCM = [$BK $CR $LF $NL $ZW $SP]; --$AL_FOLLOW_CM = [$CL $EX $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP]; -+$AL_FOLLOW_CM = [$CL $EX $HL $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP]; - $AL_FOLLOW = [$AL_FOLLOW_NOCM $AL_FOLLOW_CM]; - - -@@ -320,8 +324,13 @@ $LB20NonBreaks $CM* ($BAcm | $HYcm | $NScm); - $BBcm [^$CB]; # $BB x - $BBcm $LB20NonBreaks $CM*; - -+# LB 21a Don't break after Hebrew + Hyphen -+# HL (HY | BA) x -+# -+$HLcm ($HYcm | $BAcm) [^$CB]?; -+ - # LB 22 --$ALcm $INcm; -+($ALcm | $HLcm) $INcm; - $CM+ $INcm; # by rule 10, any otherwise unattached CM behaves as AL - $IDcm $INcm; - $INcm $INcm; -@@ -331,16 +340,18 @@ $NUcm $INcm; - # $LB 23 - $IDcm $POcm; - $ALcm $NUcm; # includes $LB19 -+$HLcm $NUcm; - $CM+ $NUcm; # Rule 10, any otherwise unattached CM behaves as AL - $NUcm $ALcm; -+$NUcm $HLcm; - - # - # LB 24 - # - $PRcm $IDcm; - $ALcm $PRcm; --$PRcm $ALcm; --$POcm $ALcm; -+$PRcm ($ALcm | $HLcm); -+$POcm ($ALcm | $HLcm); - - # - # LB 25 Numbers. -@@ -361,8 +372,8 @@ $PRcm ($JLcm | $JVcm | $JTcm | $H2cm | $H3cm); - - # LB 28 Do not break between alphabetics - # --$ALcm $ALcm; --$CM+ $ALcm; # The $CM+ is from rule 10, and unattached CM is treated as AL -+($ALcm | $HLcm) ($ALcm | $HLcm); -+$CM+ ($ALcm | $HLcm); # The $CM+ is from rule 10, an unattached CM is treated as AL - - # LB 29 - $IScm ($ALcm | $NUcm); -@@ -371,11 +382,9 @@ $IScm ($ALcm | $NUcm); - # Rule 30 Do not break between letters, numbers or ordinary symbols - # and opening or closing punctuation - # --($ALcm | $NUcm) $OPcm; -+($ALcm | $HLcm | $NUcm) $OPcm; - $CM+ $OPcm; --$CLcm ($ALcm | $NUcm); -- -- -+$CLcm ($ALcm | $HLcm | $NUcm); - - # - # Reverse Rules. -@@ -391,6 +400,7 @@ $CM+ $B2; - $CM+ $CL; - $CM+ $EX; - $CM+ $GL; -+$CM+ $HL; - $CM+ $HY; - $CM+ $H2; - $CM+ $H3; -@@ -544,24 +554,25 @@ $CM* ($BA | $HY | $NS) $CM* [$LB20NonBreaks-$CM]; # . x (BA | HY | NS) - $CM* [$LB20NonBreaks-$CM] $CM* $BB; # BB x . - [^$CB] $CM* $BB; # - -- -+# LB21a -+[^$CB] $CM* ($HY | $BA) $CM* $HL; - - # LB 22 --$CM* $IN $CM* $ALPlus; -+$CM* $IN $CM* ($ALPlus | $HL); - $CM* $IN $CM* $ID; - $CM* $IN $CM* $IN; - $CM* $IN $CM* $NU; - - # LB 23 - $CM* $PO $CM* $ID; --$CM* $NU $CM* $ALPlus; --$CM* $ALPlus $CM* $NU; -+$CM* $NU $CM* ($ALPlus | $HL); -+$CM* ($ALPlus | $HL) $CM* $NU; - - # LB 24 - $CM* $ID $CM* $PR; - $CM* $PR $CM* $ALPlus; --$CM* $ALPlus $CM* $PR; --$CM* $ALPlus $CM* $PO; -+$CM* ($ALPlus | $HL) $CM* $PR; -+$CM* ($ALPlus | $HL) $CM* $PO; - - $CM* $ALPlus $CM* ($IS | $SY | $HY)+ / $SP; - $CM* $NU+ $CM* $HY+ / $SP; -@@ -580,15 +591,14 @@ $CM* $PO $CM* ($H3 | $H2 | $JT | $JV | $JL); - $CM* ($H3 | $H2 | $JT | $JV | $JL) $CM* $PR; - - # LB 28 --$CM* $ALPlus $CM* $ALPlus; -- -+$CM* ($ALPlus | $HL) $CM* ($ALPlus | $HL); - - # LB 29 - $CM* ($NU | $ALPlus) $CM* $IS+ [^$SP]; - - # LB 30 --$CM* $OP $CM* ($NU | $ALPlus); --$CM* ($NU | $ALPlus) $CM* ($CL | $SY)+ [^$SP]; -+$CM* $OP $CM* ($ALPlus | $HL | $NU); -+$CM* ($ALPlus | $HL | $NU) $CM* ($CL | $SY)+ [^$SP]; - - - ## ------------------------------------------------- -@@ -609,6 +619,9 @@ $SP+ $CM* $QU; - $SP+ $CM* $CL; - $SP+ $CM* $B2; - -+# LB 21 -+$CM* ($HY | $BA) $CM* $HL; -+ - # LB 18 - ($CM* ($IS | $SY))+ $CM* $NU; - $CL $CM* ($NU | $IS | $SY); -@@ -629,6 +642,6 @@ $dictionary $dictionary; - # turn off rule chaining. We don't want to move more - # than necessary. - # --[$CM $OP $QU $CL $B2 $PR $HY $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $dictionary]; -+[$CM $OP $QU $CL $B2 $PR $HY $BA $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $BA $dictionary]; - $dictionary $dictionary; - --- -cgit v0.9.0.2-2-gbebe diff --git a/staging/libreoffice/libreoffice-base.install b/staging/libreoffice/libreoffice-base.install deleted file mode 100644 index 80312d4a6..000000000 --- a/staging/libreoffice/libreoffice-base.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/staging/libreoffice/libreoffice-calc.install b/staging/libreoffice/libreoffice-calc.install deleted file mode 100644 index 80312d4a6..000000000 --- a/staging/libreoffice/libreoffice-calc.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/staging/libreoffice/libreoffice-common.csh b/staging/libreoffice/libreoffice-common.csh deleted file mode 100644 index 5efa39404..000000000 --- a/staging/libreoffice/libreoffice-common.csh +++ /dev/null @@ -1,8 +0,0 @@ -#setenv PYTHONPATH ${PYTHONPATH}:/usr/lib/libreoffice/program - -# to force a certain look'n feel - -#setenv SAL_USE_VCLPLUGIN gen -#setenv SAL_USE_VCLPLUGIN kde4 -#setenv SAL_USE_VCLPLUGIN gtk -#setenv SAL_USE_VCLPLUGIN gtk3 diff --git a/staging/libreoffice/libreoffice-common.install b/staging/libreoffice/libreoffice-common.install deleted file mode 100644 index e66b66f3d..000000000 --- a/staging/libreoffice/libreoffice-common.install +++ /dev/null @@ -1,47 +0,0 @@ -post_install() { - -xdg-icon-resource forceupdate --theme hicolor -update-desktop-database -q -update-mime-database usr/share/mime > /dev/null 2>&1 - -echo " * see https://wiki.archlinux.org/index.php/LibreOffice" -echo "-------------------------------------------------------------------" -echo "LibreOffice has been split into several packages:" -echo "- libreoffice-common" -echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications" -echo "- libreoffice-{gnome,kde4} - desktop integration plugins" -echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using" -echo " the LibreOffice APIs and for creating" -echo " extensions (UNO components)." -echo "-------------------------------------------------------------------" -echo " * you need to install at least one libreoffice-langpack" -echo " * you may want to pacman -Ss libreoffice-extensions" -echo " to see what additional extensions are prepared to install" -echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg - for spell checking" -echo " * make sure you have installed some ttf font (ttf-dejavu recommended)" -} - -post_upgrade() { -# post_install $1 -xdg-icon-resource forceupdate --theme hicolor -update-desktop-database -q -update-mime-database usr/share/mime > /dev/null 2>&1 - if [ "`vercmp $2 3.4.2rc1`" -lt 0 ]; then - # important upgrade notice - echo "LibreOffice has been split into several packages:" - echo "- libreoffice-common" - echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications" - echo "- libreoffice-{gnome,kde4} - desktop integration plugins" - echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using" - echo " the LibreOffice APIs and for creating" - echo " extensions (UNO components)." - echo "Now you need to install at least one libreoffice-langpack!" - fi -} - -post_remove() { -update-desktop-database -q -xdg-icon-resource forceupdate --theme hicolor -update-mime-database usr/share/mime > /dev/null 2>&1 -} diff --git a/staging/libreoffice/libreoffice-common.sh b/staging/libreoffice/libreoffice-common.sh deleted file mode 100644 index 795867125..000000000 --- a/staging/libreoffice/libreoffice-common.sh +++ /dev/null @@ -1,8 +0,0 @@ -#export PYTHONPATH="$PYTHONPATH:/usr/lib/libreoffice/program" - -# to force a certain look'n feel - -#export SAL_USE_VCLPLUGIN=gen -#export SAL_USE_VCLPLUGIN=kde4 -#export SAL_USE_VCLPLUGIN=gtk -#export SAL_USE_VCLPLUGIN=gtk3 diff --git a/staging/libreoffice/libreoffice-draw.install b/staging/libreoffice/libreoffice-draw.install deleted file mode 100644 index 80312d4a6..000000000 --- a/staging/libreoffice/libreoffice-draw.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/staging/libreoffice/libreoffice-impress.install b/staging/libreoffice/libreoffice-impress.install deleted file mode 100644 index 80312d4a6..000000000 --- a/staging/libreoffice/libreoffice-impress.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/staging/libreoffice/libreoffice-writer.install b/staging/libreoffice/libreoffice-writer.install deleted file mode 100644 index 80312d4a6..000000000 --- a/staging/libreoffice/libreoffice-writer.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/staging/libreoffice/make-pyuno-work-with-system-wide-module-install.diff b/staging/libreoffice/make-pyuno-work-with-system-wide-module-install.diff deleted file mode 100644 index e86548136..000000000 --- a/staging/libreoffice/make-pyuno-work-with-system-wide-module-install.diff +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh -index defd7b2..ea2a809 100755 ---- a/desktop/scripts/soffice.sh -+++ b/desktop/scripts/soffice.sh -@@ -128,6 +128,9 @@ if echo "$checks" | grep -q "cc" ; then - exit 1; - fi - -+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH} -+export PYTHONPATH -+ - case "`uname -s`" in - NetBSD|OpenBSD|FreeBSD|DragonFly) - # this is a temporary hack until we can live with the default search paths -diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py -index f93ac5e..92a2891 100644 ---- a/pyuno/source/module/uno.py -+++ b/pyuno/source/module/uno.py -@@ -26,8 +26,12 @@ - # for a copy of the LGPLv3 License. - # - #************************************************************************* -+import os - import sys - -+sys.path.append('/usr/lib/libreoffice/program') -+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: -+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc" - import pyuno - - try: -diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py -index 610ac5f..df243d0 100755 ---- a/scripting/source/pyprov/officehelper.py -+++ b/scripting/source/pyprov/officehelper.py -@@ -53,7 +53,7 @@ def bootstrap(): - if "UNO_PATH" in os.environ: - sOffice = os.environ["UNO_PATH"] - else: -- sOffice = "" # lets hope for the best -+ sOffice = "/usr/lib/libreoffice/program" - sOffice = os.path.join(sOffice, "soffice") - if platform.startswith("win"): - sOffice += ".exe" diff --git a/staging/libtorrent-rasterbar/PKGBUILD b/staging/libtorrent-rasterbar/PKGBUILD deleted file mode 100644 index a416c7110..000000000 --- a/staging/libtorrent-rasterbar/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 163074 2012-07-06 16:12:17Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Hugo Doria <hugo@archlinux.org> - -pkgname=libtorrent-rasterbar -pkgver=0.16.1 -pkgrel=1 -epoch=1 -pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" -url="http://www.rasterbar.com/products/libtorrent/" -arch=('i686' 'x86_64') -license=('custom') -depends=('boost-libs' 'geoip' 'python2') -makedepends=('boost') -options=('!libtool' '!emptydirs') -source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz) -sha1sums=('798944301ee6ef8e0d8de3d944c59d184ef1a4d3') - -build() { - cd $pkgname-$pkgver - PYTHON2=/usr/bin/python2 ./configure --prefix=/usr \ - --enable-python-binding \ - --with-libgeoip=system - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/staging/libxcb/PKGBUILD b/staging/libxcb/PKGBUILD deleted file mode 100644 index 2ca76afe7..000000000 --- a/staging/libxcb/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 168070 2012-10-05 16:55:34Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=libxcb -pkgver=1.9 -pkgrel=1 -pkgdesc="X11 client-side library" -arch=(i686 x86_64) -url="http://xcb.freedesktop.org/" -depends=('xcb-proto>=1.7' 'libxdmcp' 'libxau') -makedepends=('pkgconfig' 'libxslt' 'python2') -options=('!libtool') -license=('custom') -source=($url/dist/$pkgname-$pkgver.tar.bz2 - libxcb-1.1-no-pthread-stubs.patch) -sha1sums=('ad2fb95eeec41ba3d39502a4f7460c3b64fdf061' - 'd2df03ddf3e949c10c2c185256b0eb7fa02837ab') - -build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/libxcb-1.1-no-pthread-stubs.patch" - PYTHON=/usr/bin/python2 - ./autogen.sh --prefix=/usr \ - --enable-xinput \ - --disable-static - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -m755 -d "$pkgdir/usr/share/licenses/$pkgname" - install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/staging/libxcb/libxcb-1.1-no-pthread-stubs.patch b/staging/libxcb/libxcb-1.1-no-pthread-stubs.patch deleted file mode 100644 index 8e8162f0a..000000000 --- a/staging/libxcb/libxcb-1.1-no-pthread-stubs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libxcb-1.8.1/configure.ac 2012-03-09 15:38:38.000000000 +0100 -+++ libxcb-1.8.1/configure.ac.new 2012-03-09 16:50:40.107109896 +0100 -@@ -35,7 +35,7 @@ - - # Checks for pkg-config packages - PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.7) --NEEDED="pthread-stubs xau >= 0.99.2" -+NEEDED="xau >= 0.99.2" - PKG_CHECK_MODULES(NEEDED, $NEEDED) - - have_xdmcp="no" diff --git a/staging/licq/PKGBUILD b/staging/licq/PKGBUILD deleted file mode 100644 index f852cde06..000000000 --- a/staging/licq/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 163193 2012-07-08 16:00:41Z ibiru $ -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> - -pkgname=licq -pkgver=1.6.0 -pkgrel=5 -pkgdesc="Advanced graphical ICQ clone and more for Unix" -arch=('i686' 'x86_64') -url="http://www.licq.org" -license=('GPL') -depends=('boost-libs' 'gpgme' 'libxss' 'qt') -makedepends=('cmake' 'boost') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2) -md5sums=('383153697e281a0b1b4ff008936731b8') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # licq - mkdir build - cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr .. - make - - # qt4-gui - cd ../plugins/qt4-gui - mkdir build - cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_MODULE_PATH="${srcdir}/${pkgname}-${pkgver}/cmake" .. - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}/build" - make DESTDIR="${pkgdir}" install - - cd ../plugins/qt4-gui/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/lm_sensors/PKGBUILD b/staging/lm_sensors/PKGBUILD deleted file mode 100644 index 35a5292a2..000000000 --- a/staging/lm_sensors/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 161414 2012-06-11 02:28:41Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=lm_sensors -pkgver=3.3.2 -pkgrel=3 -pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring" -arch=('i686' 'x86_64') -url="http://www.lm-sensors.org/" -license=('GPL' 'LGPL') -depends=('perl' 'sysfsutils') -makedepends=('rrdtool') -optdepends=('rrdtool: for logging with sensord') -backup=('etc/sensors3.conf' 'etc/conf.d/healthd' 'etc/conf.d/sensord') -options=('!emptydirs') -source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig} \ - sensors.rc fancontrol.rc healthd healthd.conf healthd.rc sensord.conf \ - sensord.rc fancontrol.service daemonarg.patch linux_3.0.patch) -sha1sums=('5d0f026ad763124e8c2ad733b6e1ad5e6473993d' - 'a486d9fb6c5b0aff4520f6312106c67f5163f1cf' - 'b2e664b9b87759991f02d0a1e8cac5e95098c0a5' - 'a068ac0a3115a6191a487e11422506baa922b40a' - '78b5cd36c3cb8e98b972cdd8c4a12687d79a79a8' - '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc' - 'e662881f5d3f3f35a1bc97ba45d2c471dd28c37f' - 'de8d4d65406815c389f8a04e2a8508a1ae6749c8' - '72a60251d1d55a67307dab4105d9f3f01a080af4' - '7a4a4d1442aeeba0ba8aefb742a3ef187b593f4c' - '34241388c4001bfb6e49b7e10da1217e29a258d6' - '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i -e 's|/etc/sysconfig|/etc/conf.d|' \ - -e 's|/etc/init.d/lm_sensors|/etc/rc.d/sensors|' prog/{detect/sensors-detect,init/lm_sensors.service} - sed -i 's@\(/bin/systemctl\|/lib/systemd/system\)@/usr\1@g' prog/detect/sensors-detect - patch -p1 < ../daemonarg.patch - patch -p0 < ../linux_3.0.patch - make PREFIX=/usr -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \ - PREFIX=/usr MANDIR=/usr/share/man DESTDIR="${pkgdir}" install - install -D -m644 prog/init/lm_sensors.service "${pkgdir}/usr/lib/systemd/system/lm_sensors.service" - install -D -m755 "${srcdir}/sensors.rc" "${pkgdir}/etc/rc.d/sensors" - install -D -m755 "${srcdir}/fancontrol.rc" "${pkgdir}/etc/rc.d/fancontrol" - install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd" - install -D -m755 "${srcdir}/healthd.rc" "${pkgdir}/etc/rc.d/healthd" - install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/conf.d/healthd" - install -D -m755 "${srcdir}/sensord.rc" "${pkgdir}/etc/rc.d/sensord" - install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord" - install -D -m644 "${srcdir}/fancontrol.service" "${pkgdir}/usr/lib/systemd/system/fancontrol.service" -} diff --git a/staging/lm_sensors/daemonarg.patch b/staging/lm_sensors/daemonarg.patch deleted file mode 100644 index 4b80cef19..000000000 --- a/staging/lm_sensors/daemonarg.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -ru lm_sensors-3.1.2-1/prog/pwm/fancontrol lm_sensors-3.1.2-1_pyropeter/usr/sbin/fancontrol ---- lm_sensors-3.1.2-1/prog/pwm/fancontrol 2010-02-03 03:45:15.000000000 +0100 -+++ lm_sensors-3.1.2-1_pyropeter/prog/pwm/fancontrol 2010-03-07 01:37:09.000000000 +0100 -@@ -5,7 +5,9 @@ - # - # Version 0.70 - # --# Usage: fancontrol [CONFIGFILE] -+# Usage: fancontrol [-D] [CONFIGFILE] -+# -+# (-D causes fancontrol to 'fork' to the background after some tests) - # - # Dependencies: - # bash, egrep, sed, cut, sleep, readlink, lm_sensors :) -@@ -43,6 +45,12 @@ - #DEBUG=1 - MAX=255 - -+DAEMON=0 -+if [ "$1" = "-D" ]; then -+ DAEMON=1 -+ shift -+fi -+ - declare -i pwmval - - function LoadConfig { -@@ -303,7 +311,6 @@ - echo "File $PIDFILE exists, is fancontrol already running?" - exit 1 - fi --echo $$ > "$PIDFILE" - - # $1 = pwm file name - function pwmdisable() -@@ -475,6 +482,14 @@ - let fcvcount=$fcvcount+1 - done - -+if [ "$DAEMON" -gt 0 ]; then -+ echo "Forking..." -+ $0 $* &> /dev/null & -+ exit 0 -+fi -+ -+echo $$ > "$PIDFILE" -+ - echo 'Starting automatic fan control...' - - # main loop calling the main function at specified intervals diff --git a/staging/lm_sensors/fancontrol.rc b/staging/lm_sensors/fancontrol.rc deleted file mode 100644 index 8e98d06f2..000000000 --- a/staging/lm_sensors/fancontrol.rc +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=$(pidof -o %PPID -x /usr/sbin/fancontrol) -case "$1" in - start) - stat_busy "Starting fancontrol" - [ -z "$PID" ] && /usr/sbin/fancontrol -D &>/dev/null - if [ $? -gt 0 -o -n "$PID" ]; then - stat_fail - else - add_daemon fancontrol - stat_done - fi - ;; - stop) - stat_busy "Stopping fancontrol" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon fancontrol - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/staging/lm_sensors/fancontrol.service b/staging/lm_sensors/fancontrol.service deleted file mode 100644 index c86b498f8..000000000 --- a/staging/lm_sensors/fancontrol.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Fan control daemon - -[Service] -PIDFile=/var/run/fancontrol.pid -ExecStart=/usr/sbin/fancontrol - -[Install] -WantedBy=multi-user.target diff --git a/staging/lm_sensors/healthd b/staging/lm_sensors/healthd deleted file mode 100644 index 0315dd788..000000000 --- a/staging/lm_sensors/healthd +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -# -# /usr/sbin/healthd -# - -. /etc/conf.d/healthd - -cmd="${ALARM_CMD}" -addr="${ADMIN_EMAIL}" -slp="${ALARM_SLEEP}" -sensors="/usr/bin/sensors" - - -while [ $# -gt 0 ] ; do - case "${1}" in - -c ) cmd="${2}" ; shift 2 ;; - -m ) addr="${2}" ; shift 2 ;; - -s ) slp="${2}" ; shift 2 ;; - * ) shift 1 ;; - esac -done - -[ -n "${cmd}" ] && [ -n "$( which -- "${cmd%% *}" )" ] || \ - [ -n "${addr}" ] || exit 1 - -[ "${slp}" -ge 2 ] || slp=600 - -while true ; do - sleep 15 - message="$( $sensors )" - case "$message" in - '' ) message='Could not get any sensor values !' ;; - *ALARM* ) : ;; - * ) message='' ;; - esac - if [ -n "$message" ]; then - if [ -n "${addr}" ]; then - echo "$message" | mail -s \ - "Sensors ALARM detected at host: $( hostname )" \ - "${addr}" - fi - [ -z "${cmd}" ] || ${cmd} & - sleep ${slp} - fi -done & diff --git a/staging/lm_sensors/healthd.conf b/staging/lm_sensors/healthd.conf deleted file mode 100644 index a8b2c3fa3..000000000 --- a/staging/lm_sensors/healthd.conf +++ /dev/null @@ -1,17 +0,0 @@ -# -# /etc/conf.d/healthd -# - -# reset any pending alarms on startup -ALARM_RESET="yes" - -# where to sent mails on alarm -ADMIN_EMAIL="root" - -# Seconds to sleep when alarm detected before checking again -# If you want to fill up your mail inbox set this to 2. ;-) -ALARM_SLEEP=600 - -# command to run in background on each alarm -# N.B.: If you choose to use the beep command, you'll need to install it: pacman -S beep -ALARM_CMD="beep -f 800 -l 500 -d 500 -r 600" diff --git a/staging/lm_sensors/healthd.rc b/staging/lm_sensors/healthd.rc deleted file mode 100644 index 7bb79519f..000000000 --- a/staging/lm_sensors/healthd.rc +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -# -# /etc/rc.d/healthd -# - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/healthd - -maybe_alarm_reset() { - case "${ALARM_RESET}" in - yes) /usr/bin/sensors > /dev/null - ;; - no) true - ;; - *) false - esac - return $? -} - -PID=$(pidof -x -o %PPID /usr/sbin/healthd) -case "${1}" in - start) - stat_busy "Starting Health Daemon" - [ -z "${PID}" ] && maybe_alarm_reset && /usr/sbin/healthd &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - echo "${PID}" > /var/run/healthd.pid - add_daemon healthd - stat_done - fi - ;; - stop) - stat_busy "Stopping Health Daemon" - [ ! -z "${PID}" ] && kill ${PID} &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon healthd - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/staging/lm_sensors/linux_3.0.patch b/staging/lm_sensors/linux_3.0.patch deleted file mode 100644 index da02a3d49..000000000 --- a/staging/lm_sensors/linux_3.0.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- prog/detect/sensors-detect 2011-08-02 10:23:46.000000000 +0200 -+++ prog/detect/sensors-detect 2011-08-02 10:24:04.000000000 +0200 -@@ -2472,7 +2472,7 @@ - - sub initialize_kernel_version - { -- `uname -r` =~ /(\d+)\.(\d+)\.(\d+)(.*)/; -+ `uname -r` =~ /(\d+)\.(\d+)(.*)/; - @kernel_version = ($1, $2, $3, $4); - chomp($kernel_arch = `uname -m`); - diff --git a/staging/lm_sensors/sensord.conf b/staging/lm_sensors/sensord.conf deleted file mode 100644 index a1cf091c1..000000000 --- a/staging/lm_sensors/sensord.conf +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to sensord -# -SENSORD_ARGS="" diff --git a/staging/lm_sensors/sensord.rc b/staging/lm_sensors/sensord.rc deleted file mode 100644 index e3ef4d26d..000000000 --- a/staging/lm_sensors/sensord.rc +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/sensord - -PID=$(pidof -o %PPID /usr/sbin/sensord) -case "$1" in - start) - stat_busy "Starting sensord" - [ -z "$PID" ] && /usr/sbin/sensord ${SENSORD_ARGS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon sensord - stat_done - fi - ;; - stop) - stat_busy "Stopping sensord" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon sensord - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/staging/lm_sensors/sensors.rc b/staging/lm_sensors/sensors.rc deleted file mode 100644 index 4acde2202..000000000 --- a/staging/lm_sensors/sensors.rc +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/bash - -# description: sensors is used for monitoring motherboard sensor values. -# config: /etc/conf.d/lm_sensors - -# See also the lm_sensors homepage at: -# http://www2.lm-sensors.nu/~lm78/index.html - -# It uses a config file /etc/conf.d/lm_sensors that contains the modules to -# be loaded/unloaded. That file is sourced into this one. - -# The format of that file a shell script that simply defines the modules -# in order as normal shell variables with the special names: -# MODULE_1, MODULE_2, MODULE_3, etc. - -. /etc/rc.conf -. /etc/rc.d/functions - -PSENSORS=/usr/bin/sensors - -if $(grep -q sysfs /proc/mounts); then - WITHSYS=1 -else - WITHSYS=0 -fi - -if [ $WITHSYS == "0" ]; then - # If sensors isn't supported by the kernel, try loading the module... - [ -e /proc/sys/dev/sensors ] || /sbin/modprobe i2c-proc &>/dev/null - - # Don't bother if /proc/sensors still doesn't exist, kernel doesn't have support for sensors. - if ! [ -e /proc/sys/dev/sensors ]; then - echo "lm_sensors: kernel does not have sensors support" - stat_fail - fi - - # If sensors was not already running, unload the module... - [ -e /var/run/daemons/sensors ] || /sbin/modprobe -r i2c-proc &>/dev/null -fi - -if [ -e /etc/conf.d/lm_sensors ]; then - CONFIG=/etc/conf.d/lm_sensors -elif [ -e /etc/sysconfig/lm_sensors ]; then - # Moving config to new Arch-specific location - mv /etc/sysconfig/lm_sensors /etc/conf.d/lm_sensors - CONFIG=/etc/conf.d/lm_sensors -fi - -case "$1" in - start) - stat_busy "Starting Up Sensors" - - if [ -r "$CONFIG" ]; then - . "$CONFIG" - modules=$(grep \^MODULE_ $CONFIG | wc -l | tr -d ' ') - i=0 - while [ $i -lt $modules ] ; do - module=$(eval echo '$'MODULE_$i) - # echo starting module __${module}__ #debug - /sbin/modprobe $module &>/dev/null - i=$(expr $i + 1) - done - fi - - $PSENSORS -s - - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon sensors - stat_done - fi - ;; - - stop) - stat_busy "Shutting Down Sensors" - - if [ -r "$CONFIG" ]; then - . "$CONFIG" - modules=$(grep \^MODULE_ $CONFIG | wc -l | tr -d ' ') - i=$(expr $modules - 1) - while [ $i -ge 0 ] ; do - module=$(eval echo '$'MODULE_$i) - # echo stoping module __${module}__ #debug - /sbin/modprobe -r $module &>/dev/null - i=$(expr $i - 1) - done - fi - - if [ $WITHSYS == "0" ]; then - /sbin/modprobe -r i2c-proc &>/dev/null - fi - - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon sensors - stat_done - fi - ;; - - status) - $PSENSORS - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - condrestart) - [ -e /var/run/daemons/sensors ] && $0 restart || : - ;; - - *) - echo "Usage: $0 {start|stop|restart|status|condrestart}" -esac -exit 0 diff --git a/staging/lvm2/11-dm-initramfs.rules b/staging/lvm2/11-dm-initramfs.rules deleted file mode 100644 index d2c167324..000000000 --- a/staging/lvm2/11-dm-initramfs.rules +++ /dev/null @@ -1,3 +0,0 @@ -# needed with new udev/mkinitcpio and as implemented in dracut: -# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54> -SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist" diff --git a/staging/lvm2/PKGBUILD b/staging/lvm2/PKGBUILD deleted file mode 100644 index 02e48d1aa..000000000 --- a/staging/lvm2/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# $Id: PKGBUILD 161875 2012-06-16 00:54:28Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgbase=lvm2 -pkgname=('lvm2' 'device-mapper') -pkgver=2.02.96 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://sourceware.org/lvm2/" -license=('GPL2' 'LGPL2.1') -groups=('base') -source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc} - lvm2_install - lvm2_hook - 11-dm-initramfs.rules - lvm.service) -sha1sums=('29d5097f0ca92c7665f29f862eca78bcf981ff6f' - '12e9016485c415c344524e6e75e23dfa6ca097ac' - '3e1680f9b76ce9150d08865d99db90fd15532271' - 'cedc9948123c870f9c5aa3357d0075b41a9c8135' - 'f6a554eea9557c3c236df2943bb6e7e723945c41' - '17df8689630a77e46899a8bd56997d9db896d5af') - -build() { - cd "${srcdir}/LVM2.${pkgver}" - unset LDFLAGS - - ./configure --prefix=/ --sbindir=/sbin --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ - --includedir=/usr/include --with-usrlibdir=/usr/lib --libdir=/usr/lib --with-udev-prefix=/usr \ - --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-pkgconfig --enable-readline \ - --enable-dmeventd --enable-cmdlib --enable-applib --enable-udev_sync --enable-udev_rules - make -} - -package_device-mapper() { - pkgdesc="Device mapper userspace library and tools" - url="http://sourceware.org/dm/" - depends=('glibc' 'udev') - - cd "${srcdir}/LVM2.${pkgver}" - make DESTDIR="${pkgdir}" install_device-mapper - # extra udev rule for device-mapper in initramfs - install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/usr/lib/initcpio/udev/11-dm-initramfs.rules" -} - -package_lvm2() { - pkgdesc="Logical Volume Manager 2 utilities" - depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline') - conflicts=('lvm' 'mkinitcpio<0.7') - backup=('etc/lvm/lvm.conf') - options=('!makeflags') - - cd "${srcdir}/LVM2.${pkgver}" - make DESTDIR="${pkgdir}" install_lvm2 - # install applib - make -C liblvm DESTDIR="${pkgdir}" install - # /etc directories - install -d "${pkgdir}"/etc/lvm/{archive,backup} - # mkinitcpio hook - install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2" - install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2" - # systemd unit - install -D -m644 "${srcdir}/lvm.service" "${pkgdir}/usr/lib/systemd/system/lvm.service" -} diff --git a/staging/lvm2/lvm.service b/staging/lvm2/lvm.service deleted file mode 100644 index 277d5a773..000000000 --- a/staging/lvm2/lvm.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=LVM activation -DefaultDependencies=no -Requires=systemd-udev-settle.service -After=systemd-udev-settle.service -Before=basic.target shutdown.target -Conflicts=shutdown.target - -[Service] -ExecStart=/sbin/vgchange --sysinit --available y -Type=oneshot -TimeoutSec=0 -RemainAfterExit=yes - -[Install] -WantedBy=basic.target diff --git a/staging/lvm2/lvm2_hook b/staging/lvm2/lvm2_hook deleted file mode 100644 index e69b3349a..000000000 --- a/staging/lvm2/lvm2_hook +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/ash - -run_hook() { - local pvdev - - modprobe -q dm-mod >/dev/null 2>&1 - - # If the lvmwait= parameter has been specified on the command line - # wait for the device(s) before trying to activate the volume group(s) - for pvdev in ${lvmwait//,/ }; do - poll_device ${pvdev} ${rootdelay} - done - - msg "Activating logical volumes..." - [ -d /etc/lvm ] && lvm vgscan - - if [ -n "$quiet" ]; then - lvm vgchange --sysinit -a y >/dev/null - else - lvm vgchange --sysinit -a y - fi -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/staging/lvm2/lvm2_install b/staging/lvm2/lvm2_install deleted file mode 100644 index 145ce49b2..000000000 --- a/staging/lvm2/lvm2_install +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -build() { - local mod - for mod in dm-mod dm-snapshot dm-mirror; do - add_module "$mod" - done - - add_binary "/sbin/lvm" - add_binary "/sbin/dmsetup" - add_file "/usr/lib/udev/rules.d/10-dm.rules" - add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" - add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" - add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules" - add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules" - - add_runscript -} - -help() { - cat <<HELPEOF -This hook loads the necessary modules for an LVM2 root device. - -The optional lvmwait= parameter followed by a comma-separated -list of device names can be given on the command line. -It will cause the hook to wait until all given devices exist -before trying to scan and activate any volume groups. -HELPEOF -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/staging/lyx/PKGBUILD b/staging/lyx/PKGBUILD deleted file mode 100644 index e6341f0a0..000000000 --- a/staging/lyx/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 163195 2012-07-08 16:34:34Z ibiru $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Jason Chu <jason@archlinux.org> - -pkgname=lyx -pkgver=2.0.3 -pkgrel=4 -pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end" -arch=('i686' 'x86_64') -url="http://www.lyx.org" -depends=('qt' 'texlive-core' 'python2' 'imagemagick' 'enchant' 'boost-libs' 'libmythes') -makedepends=('boost') -optdepends=('rcs: built-in version control system' - 'texlive-latexextra: float wrap support') -license=('GPL') -source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz - lyx.desktop lyxrc.dist) -backup=('etc/lyx/lyxrc.dist') -install=lyx.install -options=('emptydirs') -sha1sums=('109dae0ef22a7d8944964b32ee380ad170b0665f' - 'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad' - '56416642cc3da2a13b87b84e6b87c1a239f3d09a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - find . -type f -exec sed -i 's|#!.*python|#!/usr/bin/env python2|' {} + - sed -i 's|"python|"python2|' lib/configure.py src/support/os.cpp - export CXXFLAGS="$CXXFLAGS -fpermissive" - ./configure --prefix=/usr \ - --with-frontend=qt4 --without-included-boost \ - --without-included-mythes - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - # install desktop entry - install -Dm644 "${srcdir}/lyx.desktop" \ - "${pkgdir}/usr/share/applications/lyx.desktop" - install -Dm644 "lib/images/lyx.png" \ - "${pkgdir}/usr/share/pixmaps/lyx.png" - - # install default config file - install -Dm644 "${srcdir}/lyxrc.dist" "${pkgdir}/etc/lyx/lyxrc.dist" - ln -sf /etc/lyx/lyxrc.dist "${pkgdir}/usr/share/lyx/lyxrc.dist" -} diff --git a/staging/lyx/lyx.desktop b/staging/lyx/lyx.desktop deleted file mode 100644 index 649b30c98..000000000 --- a/staging/lyx/lyx.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=LyX Document Processor -GenericName=Document Processor -Comment=High level LaTeX frontend -Exec=lyx %F -TryExec=lyx -Icon=lyx -StartupNotify=false -StartupWMClass=Lyx -Terminal=false -Categories=Office;WordProcessor;Qt; -MimeType=text/x-lyx;application/x-lyx; diff --git a/staging/lyx/lyx.install b/staging/lyx/lyx.install deleted file mode 100644 index c15c17b3a..000000000 --- a/staging/lyx/lyx.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove () { - post_install -} - - - diff --git a/staging/lyx/lyxrc.dist b/staging/lyx/lyxrc.dist deleted file mode 100644 index dd18694f9..000000000 --- a/staging/lyx/lyxrc.dist +++ /dev/null @@ -1,14 +0,0 @@ -### This file is part of -### ======================================================== -### LyX, The Document Processor -### -### Copyright 1995 Matthias Ettrich -### Copyright 1995-2011 The LyX Team. -### -### ======================================================== - -# The file lyxrc.dist gives initial global options for all LyX users. -# Almost all settings here can be overridden through the preferences in LyX. - -\thesaurusdir_path "/usr/share/mythes" -\hunspelldir_path "/usr/share/myspell" diff --git a/staging/mediastreamer/PKGBUILD b/staging/mediastreamer/PKGBUILD deleted file mode 100644 index 54da3e832..000000000 --- a/staging/mediastreamer/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 160758 2012-06-05 07:24:49Z eric $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Adrià Arrufat <swiftscythe@gmail.com> - -pkgname=mediastreamer -pkgver=2.8.2 -pkgrel=2 -pkgdesc="A library written in C that allows you to create and run audio and video streams" -arch=('i686' 'x86_64') -url="http://www.linphone.org/" -license=('GPL') -depends=('ortp' 'speex' 'ffmpeg' 'v4l-utils' 'libxv' 'libpulse') -makedepends=('intltool') -options=('!libtool') -source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} - mediastreamer-ffmpeg.patch) -md5sums=('e51ea9d5fce1396b374d10473dfbadec' - '805da7def98f367e621363fa0c951fe8' - 'f147546489a973f148ce3dd2dba36834') - -build() { - cd "${srcdir}"/$pkgname-$pkgver - patch -p1 -i "${srcdir}"/mediastreamer-ffmpeg.patch - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}"/$pkgname-$pkgver - make DESTDIR="${pkgdir}" install -} diff --git a/staging/mediastreamer/mediastreamer-ffmpeg.patch b/staging/mediastreamer/mediastreamer-ffmpeg.patch deleted file mode 100644 index 944d4b833..000000000 --- a/staging/mediastreamer/mediastreamer-ffmpeg.patch +++ /dev/null @@ -1,205 +0,0 @@ -diff --git a/include/mediastreamer2/msvideo.h b/include/mediastreamer2/msvideo.h -index 5ae8a63..86edf86 100644 ---- mediastreamer2/include/mediastreamer2/msvideo.h -+++ mediastreamer2/include/mediastreamer2/msvideo.h -@@ -21,6 +21,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - #define msvideo_h - - #include <mediastreamer2/msfilter.h> -+#ifndef INT64_C -+#define INT64_C(c) (c ## LL) -+#define UINT64_C(c) (c ## ULL) -+#endif -+#include <libavutil/avutil.h> -+#include <libavcodec/version.h> - - /* some global constants for video MSFilter(s) */ - #define MS_VIDEO_SIZE_SQCIF_W 128 -@@ -206,7 +212,9 @@ extern "C"{ - MS2_PUBLIC int ms_pix_fmt_to_ffmpeg(MSPixFmt fmt); - MS2_PUBLIC MSPixFmt ffmpeg_pix_fmt_to_ms(int fmt); - MS2_PUBLIC MSPixFmt ms_fourcc_to_pix_fmt(uint32_t fourcc); -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - MS2_PUBLIC void ms_ffmpeg_check_init(void); -+#endif - MS2_PUBLIC int ms_yuv_buf_init_from_mblk(MSPicture *buf, mblk_t *m); - MS2_PUBLIC int ms_yuv_buf_init_from_mblk_with_size(MSPicture *buf, mblk_t *m, int w, int h); - MS2_PUBLIC int ms_picture_init_from_mblk_with_size(MSPicture *buf, mblk_t *m, MSPixFmt fmt, int w, int h); -diff --git a/src/h264dec.c b/src/h264dec.c -index 223de3d..8c40a7c 100644 ---- mediastreamer2/src/h264dec.c -+++ mediastreamer2/src/h264dec.c -@@ -44,7 +44,9 @@ typedef struct _DecData{ - static void ffmpeg_init(){ - static bool_t done=FALSE; - if (!done){ -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - avcodec_init(); -+#endif - avcodec_register_all(); - done=TRUE; - } -diff --git a/src/mscommon.c b/src/mscommon.c -index 2cab005..bebb946 100644 ---- mediastreamer2/src/mscommon.c -+++ mediastreamer2/src/mscommon.c -@@ -33,9 +33,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - #include "mediastreamer2/mscodecutils.h" - #include "mediastreamer2/msfilter.h" - #include <ortp/ortp_srtp.h> -+#ifndef INT64_C -+#define INT64_C(c) (c ## LL) -+#define UINT64_C(c) (c ## ULL) -+#endif -+#include <libavutil/avutil.h> -+#include <libavcodec/version.h> - - extern void __register_ffmpeg_encoders_if_possible(void); -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - extern void ms_ffmpeg_check_init(); -+#endif - extern bool_t libmsandroiddisplay_init(void); - extern void libmsandroiddisplaybad_init(void); - extern void libmsandroidopengldisplay_init(void); -@@ -645,7 +653,9 @@ void ms_init(){ - } - } - #if !defined(NO_FFMPEG) -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - ms_ffmpeg_check_init(); -+#endif - __register_ffmpeg_encoders_if_possible(); - #endif - #endif -diff --git a/src/videodec.c b/src/videodec.c -index c04e1e9..a455075 100644 ---- mediastreamer2/src/videodec.c -+++ mediastreamer2/src/videodec.c -@@ -27,9 +27,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - #include "mediastreamer2/msvideo.h" - #include "mediastreamer2/msticker.h" - #include "rfc2429.h" -+#ifndef INT64_C -+#define INT64_C(c) (c ## LL) -+#define UINT64_C(c) (c ## ULL) -+#endif -+#include <libavutil/avutil.h> -+#include <libavcodec/version.h> - -- -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - extern void ms_ffmpeg_check_init(); -+#endif - - - typedef struct DecState{ -@@ -50,7 +57,9 @@ typedef struct DecState{ - - static void dec_init(MSFilter *f, enum CodecID cid){ - DecState *s=(DecState *)ms_new0(DecState,1); -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - ms_ffmpeg_check_init(); -+#endif - - avcodec_get_context_defaults(&s->av_context); - s->av_codec=NULL; -diff --git a/src/videoenc.c b/src/videoenc.c -index 21d016f..520f06a 100644 ---- mediastreamer2/src/videoenc.c -+++ mediastreamer2/src/videoenc.c -@@ -37,7 +37,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - #define RATE_CONTROL_MARGIN 15000 /*bits/second*/ - -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - static bool_t avcodec_initialized=FALSE; -+#endif - - #ifdef ENABLE_LOG_FFMPEG - -@@ -51,6 +53,7 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) - - #endif - -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - void ms_ffmpeg_check_init(){ - if(!avcodec_initialized){ - avcodec_init(); -@@ -62,6 +65,7 @@ void ms_ffmpeg_check_init(){ - #endif - } - } -+#endif - - /* the goal of this small object is to tell when to send I frames at startup: - at 2 and 4 seconds*/ -@@ -201,7 +205,9 @@ static void enc_init(MSFilter *f, enum CodecID codec) - { - EncState *s=(EncState *)ms_new(EncState,1); - f->data=s; -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - ms_ffmpeg_check_init(); -+#endif - s->profile=0;/*always default to profile 0*/ - s->comp_buf=NULL; - s->fps=15; -@@ -300,9 +306,13 @@ static void prepare_h263(EncState *s){ - if (s->profile==0){ - s->codec=CODEC_ID_H263; - }else{ -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - c->flags|=CODEC_FLAG_H263P_UMV; -+#endif - c->flags|=CODEC_FLAG_AC_PRED; -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT; -+#endif - /* - c->flags|=CODEC_FLAG_OBMC; - c->flags|=CODEC_FLAG_AC_PRED; -@@ -372,7 +382,11 @@ static void add_rfc2190_header(mblk_t **packet, AVCodecContext *context){ - // assume video size is CIF or QCIF - if (context->width == 352 && context->height == 288) header->b_wptr[1] = 0x60; - else header->b_wptr[1] = 0x40; -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - if (context->coded_frame->pict_type != FF_I_TYPE) header->b_wptr[1] |= 0x10; -+#else -+ if (context->coded_frame->pict_type != AV_PICTURE_TYPE_I) header->b_wptr[1] |= 0x10; -+#endif - header->b_wptr += 4; - header->b_cont = *packet; - *packet = header; -@@ -779,7 +793,11 @@ static void process_frame(MSFilter *f, mblk_t *inm){ - s->req_vfu=TRUE; - } - if (s->req_vfu){ -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - pict.pict_type=FF_I_TYPE; -+#else -+ pict.pict_type=AV_PICTURE_TYPE_I; -+#endif - s->req_vfu=FALSE; - } - comp_buf->b_rptr=comp_buf->b_wptr=comp_buf->b_datap->db_base; -@@ -799,7 +817,11 @@ static void process_frame(MSFilter *f, mblk_t *inm){ - if (s->framenum==1){ - video_starter_first_frame (&s->starter,f->ticker->time); - } -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - if (c->coded_frame->pict_type==FF_I_TYPE){ -+#else -+ if (c->coded_frame->pict_type==AV_PICTURE_TYPE_I){ -+#endif - ms_message("Emitting I-frame"); - } - comp_buf->b_wptr+=error; -@@ -1067,7 +1089,9 @@ MSFilterDesc ms_mjpeg_enc_desc={ - #endif - - void __register_ffmpeg_encoders_if_possible(void){ -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - ms_ffmpeg_check_init(); -+#endif - if (avcodec_find_encoder(CODEC_ID_MPEG4)) - ms_filter_register(&ms_mpeg4_enc_desc); - if (avcodec_find_encoder(CODEC_ID_H263)){ diff --git a/staging/mesa/LICENSE b/staging/mesa/LICENSE deleted file mode 100644 index ae33d2709..000000000 --- a/staging/mesa/LICENSE +++ /dev/null @@ -1,82 +0,0 @@ -Disclaimer - -Mesa is a 3-D graphics library with an API which is very similar to -that of OpenGL* -To the extent that Mesa utilizes the OpenGL command syntax or state -machine, it is being used with authorization from Silicon Graphics, -Inc.(SGI). However, the author does not possess an OpenGL license -from SGI, and makes no claim that Mesa is in any way a compatible -replacement for OpenGL or associated with SGI. Those who want a -licensed implementation of OpenGL should contact a licensed -vendor. - -Please do not refer to the library as MesaGL (for legal -reasons). It's just Mesa or The Mesa 3-D graphics -library - -* OpenGL is a trademark of Silicon Graphics Incorporated. - -License / Copyright Information - -The Mesa distribution consists of several components. Different copyrights -and licenses apply to different components. For example, GLUT is copyrighted -by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa -device drivers are copyrighted by their authors. See below for a list of -Mesa's main components and the license for each. - -The core Mesa library is licensed according to the terms of the MIT license. -This allows integration with the XFree86, Xorg and DRI projects. - -The default Mesa license is as follows: - -Copyright (C) 1999-2007 Brian Paul All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Attention, Contributors - -When contributing to the Mesa project you must agree to the licensing terms -of the component to which you're contributing. -The following section lists the primary components of the Mesa distribution -and their respective licenses. - - -Mesa Component Licenses - -Component Location Primary Author License ----------------------------------------------------------------------------- -Main Mesa code src/mesa/ Brian Paul Mesa (MIT) - -Device drivers src/mesa/drivers/* See drivers See drivers - -Ext headers include/GL/glext.h SGI SGI Free B - include/GL/glxext.h - -GLUT src/glut/ Mark Kilgard Mark's copyright - -Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL - -SGI GLU library src/glu/sgi/ SGI SGI Free B - -demo programs progs/demos/ various see source files - -X demos progs/xdemos/ Brian Paul see source files - -SGI demos progs/samples/ SGI SGI copyright - -RedBook demos progs/redbook/ SGI SGI copyright diff --git a/staging/mesa/PKGBUILD b/staging/mesa/PKGBUILD deleted file mode 100644 index 92e1705b6..000000000 --- a/staging/mesa/PKGBUILD +++ /dev/null @@ -1,297 +0,0 @@ -# $Id: PKGBUILD 168066 2012-10-05 15:41:36Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgbase=mesa -pkgname=('libglapi' 'libgl' 'mesa' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'svga-dri' 'nouveau-dri') - -_git=true -_gitdate=20121005 -#_git=false - -if [ "${_git}" = "true" ]; then - pkgver=8.99.git_$_gitdate - else - pkgver=8.0.4 -fi -pkgrel=1 -arch=('i686' 'x86_64') -makedepends=('glproto>=1.4.16' 'libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>=1.1.3' 'expat>=2.1.0' 'libx11>=1.5.0' 'libxt>=1.1.3' - 'gcc-libs>=4.7.1-6' 'dri2proto>=2.8' 'python2' 'libxml2' 'imake' 'llvm' 'systemd' 'libvdpau>=0.5') -url="http://mesa3d.sourceforge.net" -license=('custom') -options=('!libtool') -source=(LICENSE - pthread_fix.diff) -if [ "${_git}" = "true" ]; then - # mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0 - #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz') - source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-542f6feda9bf18267dbd337943a5e871400d425a.tar.gz") - else - source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" - #source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/8.0/MesaLib-8.0-rc2.tar.bz2" -) -fi -md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' - '03956ac54a44467678120f485b626633' - '52760839a596df5058fcbb63a2bb10da') - -build() { - cd ${srcdir}/?esa-* - - # build fix from master http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd4fde8f674f5e3efa19e929f97de4ecfd82391b - patch -Np1 -i ${srcdir}/pthread_fix.diff - - COMMONOPTS="--prefix=/usr \ - --sysconfdir=/etc \ - --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \ - --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ - --enable-gallium-llvm \ - --enable-egl \ - --enable-gallium-egl \ - --with-egl-platforms=x11,drm \ - --enable-shared-glapi \ - --enable-gbm \ - --enable-glx-tls \ - --enable-dri \ - --enable-glx \ - --enable-osmesa \ - --enable-gles1 \ - --enable-gles2 \ - --enable-texture-float \ - --enable-xa \ - --enable-vdpau " - -# not default: -# --enable-gallium-egl enable optional EGL state tracker (not required for -# EGL support in Gallium with OpenGL and OpenGL ES) -# [default=disable] -# --enable-xa enable build of the XA X Acceleration API [default=no] - - -if [ "${_git}" = "true" ]; then - ./autogen.sh \ - $COMMONOPTS - else - autoreconf -vfi - ./configure \ - $COMMONOPTS -fi - - make -} - -package_libglapi() { - depends=('glibc') - pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions" - - make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/libglapi" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libglapi/" -} - -package_libgl() { - depends=('libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>=1.1.3' 'expat>=2.1.0' 'libglapi' 'gcc-libs') - pkgdesc="Mesa 3-D graphics library and DRI software rasterizer" - - # fix linking because of splitted package - make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install - - # libGL & libdricore - make -C ${srcdir}/?esa-*/src/glx DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install - - # fix linking because of splitted package - cleanup - make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall - - - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install - - # See FS#26284 - install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions" - ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" - - install -m755 -d "${pkgdir}/usr/share/licenses/libgl" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/" -} - -package_mesa() { - # check also gl.pc - depends=('libgl' 'libx11>=1.5.0' 'libxext>=1.3.1' 'libxdamage' 'libxfixes' 'libxcb' 'libxxf86vm') - optdepends=('opengl-man-pages: for the OpenGL API man pages') - pkgdesc="Mesa 3-D graphics libraries and include files" - - make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-glHEADERS - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri DESTDIR="${pkgdir}" install-driincludeHEADERS - make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-pkgconfigDATA - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri DESTDIR="${pkgdir}" install-pkgconfigDATA - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/common DESTDIR="${pkgdir}" install-sysconfDATA - - make -C ${srcdir}/?esa-*/src/gallium/targets/xa-vmwgfx DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/mesa" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/" -} - -package_osmesa() { - depends=('libglapi' 'gcc-libs') - optdepends=('opengl-man-pages: for the OpenGL API man pages') - pkgdesc="Mesa 3D off-screen rendering library" - - # fix linking because of splitted package - make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install - - make -C ${srcdir}/?esa-*/src/mesa/drivers/osmesa DESTDIR="${pkgdir}" install - - # fix linking because of splitted package - cleanup - make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall - - install -m755 -d "${pkgdir}/usr/share/licenses/osmesa" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/osmesa/" -} - -package_libgbm() { - depends=('systemd' 'libglapi' 'libdrm') - pkgdesc="Mesa gbm library" - - # fix linking because of splitted package - make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install - - make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" install - - # fix linking because of splitted package - cleanup - make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall - - install -m755 -d "${pkgdir}/usr/share/licenses/libgbm" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgbm/" -} - -package_libgles() { - depends=('libglapi' 'libdrm' 'khrplatform-devel') - pkgdesc="Mesa GLES libraries and headers" - - # fix linking because of splitted package - make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install - - make -C ${srcdir}/?esa-*/src/mapi/es1api DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/mapi/es2api DESTDIR="${pkgdir}" install - - # fix linking because of splitted package - cleanup - make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall - - install -m755 -d "${pkgdir}/usr/share/licenses/libgles" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgles/" -} - -package_libegl() { - # check also egl.pc - depends=('libx11' 'libxext' 'libxdamage' 'libxfixes' 'libxxf86vm' 'libxcb' 'libgbm' 'khrplatform-devel') - pkgdesc="Mesa EGL libraries and headers" - - make -C ${srcdir}/?esa-*/src/gallium/targets/egl-static DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/doc/libegl" - install -m644 ${srcdir}/?esa-*/docs/egl.html "${pkgdir}/usr/share/doc/libegl/" - - # fix linking because of splitted package - make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" install - - make -C ${srcdir}/?esa-*/src/egl DESTDIR="${pkgdir}" install - - # fix linking because of splitted package - cleanup - make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" uninstall - make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall - - install -m755 -d "${pkgdir}/usr/share/licenses/libegl" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/" - - # fix file conflicts - rm -rf ${pkgdir}/usr/include/KHR -} - -package_khrplatform-devel() { - pkgdesc="Khronos platform development package" - - install -m755 -d "${pkgdir}/usr/include/KHR" - install -m644 ${srcdir}/?esa-*/include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/" - - install -m755 -d "${pkgdir}/usr/share/licenses/khrplatform-devel" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/khrplatform-devel/" -} - -package_ati-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI Radeon" - conflicts=('xf86-video-ati<6.9.0-6') - - # fix linking because of splitted package - make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install - - # classic mesa drivers for radeon,r200 - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install - # gallium3D driver for r300,r600,radeonsi - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-radeonsi DESTDIR="${pkgdir}" install - # vdpau driver - make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-r300 DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-r600 DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-radeonsi DESTDIR="${pkgdir}" install - - # fix linking because of splitted package - cleanup - make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall - - install -m755 -d "${pkgdir}/usr/share/licenses/ati-dri" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/ati-dri/" -} - -package_intel-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for Intel" - - # fix linking because of splitted package - make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install - - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install - - # fix linking because of splitted package - cleanup - make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall - - install -m755 -d "${pkgdir}/usr/share/licenses/intel-dri" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/intel-dri/" -} - -package_nouveau-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau" - - # fix linking because of splitted package - make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install - - # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install - # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install - # vdpau driver - make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-nouveau DESTDIR="${pkgdir}" install - - # fix linking because of splitted package - cleanup - make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall - - install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/nouveau-dri/" -} - -package_svga-dri() { - depends=('gcc-libs' 'libdrm' 'expat') - pkgdesc="Gallium3D VMware guest GL driver" - - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/svga-dri" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/svga-dri/" -} diff --git a/staging/mesa/mesa-8.0.3-llvm-3.1-fixes.patch b/staging/mesa/mesa-8.0.3-llvm-3.1-fixes.patch deleted file mode 100644 index a567b5926..000000000 --- a/staging/mesa/mesa-8.0.3-llvm-3.1-fixes.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -index a50a51d..f1bb4d9 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -@@ -235,7 +235,24 @@ lp_disassemble(const void* func) - int AsmPrinterVariant = AsmInfo->getAssemblerDialect(); - #endif - --#if HAVE_LLVM >= 0x0300 -+#if HAVE_LLVM >= 0x0301 -+ OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple)); -+ if (!MRI) { -+ debug_printf("error: no register info for target %s\n", Triple.c_str()); -+ return; -+ } -+ -+ OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo()); -+ if (!MII) { -+ debug_printf("error: no instruction info for target %s\n", Triple.c_str()); -+ return; -+ } -+#endif -+ -+#if HAVE_LLVM >= 0x0301 -+ OwningPtr<MCInstPrinter> Printer( -+ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI)); -+#elif HAVE_LLVM == 0x0300 - OwningPtr<MCInstPrinter> Printer( - T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI)); - #elif HAVE_LLVM >= 0x0208 -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -index fe7616b..68f8808 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -@@ -62,7 +62,11 @@ - extern "C" void - lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE) - { -+#if HAVE_LLVM >= 0x0301 -+ llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener()); -+#else - llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener()); -+#endif - } - - diff --git a/staging/mesa/mesa-radeon-parallel-make.diff b/staging/mesa/mesa-radeon-parallel-make.diff deleted file mode 100644 index 2fc5a4793..000000000 --- a/staging/mesa/mesa-radeon-parallel-make.diff +++ /dev/null @@ -1,129 +0,0 @@ -From cebbdd4ac23725963207bf6f8fc7101150e6065f Mon Sep 17 00:00:00 2001 -From: Tom Stellard <thomas.stellard@amd.com> -Date: Wed, 29 Aug 2012 13:01:15 +0000 -Subject: radeon/llvm: Cleanup makefile - -Hopefully, this will fix all the parallel make problems people have -been having. ---- -diff --git a/src/gallium/drivers/radeon/Makefile b/src/gallium/drivers/radeon/Makefile -index 43f668a..7f1c613 100644 ---- a/src/gallium/drivers/radeon/Makefile -+++ b/src/gallium/drivers/radeon/Makefile -@@ -20,8 +20,6 @@ tablegen = $(TBLGEN) -I $(LLVM_INCLUDEDIR) $1 $2 -o $3 - - HAVE_LLVM_INTRINSICS = $(shell grep IntrinsicsR600.td $(LLVM_INCLUDEDIR)/llvm/Intrinsics.td) - --gen: $(GENERATED_SOURCES) -- - SIRegisterInfo.td: SIGenRegisterInfo.pl - $(PERL) $^ > $@ - -@@ -38,37 +36,37 @@ endif - R600RegisterInfo.td: R600GenRegisterInfo.pl - $(PERL) $^ > $@ - --AMDGPUGenRegisterInfo.inc: *.td -+AMDGPUGenRegisterInfo.inc: $(TD_FILES) - $(call tablegen, -gen-register-info, AMDGPU.td, $@) - --AMDGPUGenInstrInfo.inc: *.td -+AMDGPUGenInstrInfo.inc: $(TD_FILES) - $(call tablegen, -gen-instr-info, AMDGPU.td, $@) - --AMDGPUGenAsmWriter.inc: *.td -+AMDGPUGenAsmWriter.inc: $(TD_FILES) - $(call tablegen, -gen-asm-writer, AMDGPU.td, $@) - --AMDGPUGenDAGISel.inc: *.td -+AMDGPUGenDAGISel.inc: $(TD_FILES) - $(call tablegen, -gen-dag-isel, AMDGPU.td, $@) - --AMDGPUGenCallingConv.inc: *.td -+AMDGPUGenCallingConv.inc: $(TD_FILES) - $(call tablegen, -gen-callingconv, AMDGPU.td, $@) - --AMDGPUGenSubtargetInfo.inc: *.td -+AMDGPUGenSubtargetInfo.inc: $(TD_FILES) - $(call tablegen, -gen-subtarget, AMDGPU.td, $@) - --AMDGPUGenEDInfo.inc: *.td -+AMDGPUGenEDInfo.inc: $(TD_FILES) - $(call tablegen, -gen-enhanced-disassembly-info, AMDGPU.td, $@) - --AMDGPUGenIntrinsics.inc: *.td -+AMDGPUGenIntrinsics.inc: $(TD_FILES) - $(call tablegen, -gen-tgt-intrinsic, AMDGPU.td, $@) - --AMDGPUGenCodeEmitter.inc: *.td -+AMDGPUGenCodeEmitter.inc: $(TD_FILES) - $(call tablegen, -gen-emitter, AMDGPU.td, $@) - --AMDGPUGenMCCodeEmitter.inc: *.td -+AMDGPUGenMCCodeEmitter.inc: $(TD_FILES) - $(call tablegen, -mc-emitter -gen-emitter, AMDGPU.td, $@) - --AMDGPUGenDFAPacketizer.inc: *.td -+AMDGPUGenDFAPacketizer.inc: $(TD_FILES) - $(call tablegen, -gen-dfa-packetizer, AMDGPU.td, $@) - - LOADER_LIBS=$(shell llvm-config --libs bitreader asmparser) -diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources -index 2eb1120..333dd03 100644 ---- a/src/gallium/drivers/radeon/Makefile.sources -+++ b/src/gallium/drivers/radeon/Makefile.sources -@@ -1,4 +1,30 @@ - -+TD_FILES := \ -+ AMDGPU.td \ -+ AMDGPUInstrInfo.td \ -+ AMDGPUInstructions.td \ -+ AMDGPUIntrinsics.td \ -+ AMDGPURegisterInfo.td \ -+ AMDILBase.td \ -+ AMDILInstrInfo.td \ -+ AMDILIntrinsics.td \ -+ AMDILRegisterInfo.td \ -+ Processors.td \ -+ R600InstrInfo.td \ -+ R600Instructions.td \ -+ R600Intrinsics.td \ -+ R600IntrinsicsNoOpenCL.td \ -+ R600IntrinsicsOpenCL.td \ -+ R600RegisterInfo.td \ -+ R600Schedule.td \ -+ SIInstrFormats.td \ -+ SIInstrInfo.td \ -+ SIInstructions.td \ -+ SIIntrinsics.td \ -+ SIRegisterInfo.td \ -+ SISchedule.td -+ -+ - GENERATED_SOURCES := \ - R600Intrinsics.td \ - R600RegisterInfo.td \ --- -cgit v0.9.0.2-2-gbebe -From 2baaa5c7eb21517f0197bfd91154e9b4886fbb1b Mon Sep 17 00:00:00 2001 -From: Tom Stellard <thomas.stellard@amd.com> -Date: Thu, 06 Sep 2012 14:05:22 +0000 -Subject: radeon/llvm: Remove R600InstrInfo.td from TD_FILES - -Fixes build bug introduced by -cebbdd4ac23725963207bf6f8fc7101150e6065f ---- -diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources -index 333dd03..f387636 100644 ---- a/src/gallium/drivers/radeon/Makefile.sources -+++ b/src/gallium/drivers/radeon/Makefile.sources -@@ -10,7 +10,6 @@ TD_FILES := \ - AMDILIntrinsics.td \ - AMDILRegisterInfo.td \ - Processors.td \ -- R600InstrInfo.td \ - R600Instructions.td \ - R600Intrinsics.td \ - R600IntrinsicsNoOpenCL.td \ --- -cgit v0.9.0.2-2-gbebe diff --git a/staging/mesa/pthread_fix.diff b/staging/mesa/pthread_fix.diff deleted file mode 100644 index bdfe2d865..000000000 --- a/staging/mesa/pthread_fix.diff +++ /dev/null @@ -1,23 +0,0 @@ -From dd4fde8f674f5e3efa19e929f97de4ecfd82391b Mon Sep 17 00:00:00 2001 -From: Matt Turner <mattst88@gmail.com> -Date: Thu, 27 Sep 2012 22:49:52 +0000 -Subject: build: Set PTHREAD_LIBS for pkgconfig files if empty - ---- -diff --git a/configure.ac b/configure.ac -index 770df2f..dc2720d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -509,6 +509,10 @@ AC_CHECK_DECLS([signbit],[], - - dnl Check for pthreads - AX_PTHREAD -+dnl AX_PTHREADS leaves PTHREAD_LIBS empty for gcc and sets PTHREAD_CFLAGS -+dnl to -pthread, which causes problems if we need -lpthread to appear in -+dnl pkgconfig files. -+test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread" - - dnl SELinux awareness. - AC_ARG_ENABLE([selinux], --- -cgit v0.9.0.2-2-gbebe diff --git a/staging/miro/PKGBUILD b/staging/miro/PKGBUILD deleted file mode 100644 index 1b4c5711a..000000000 --- a/staging/miro/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 168800 2012-10-16 01:40:22Z eric $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> - -pkgname=miro -pkgver=5.0.4 -pkgrel=2 -pkgdesc="The free and open source internet TV platform" -arch=('i686' 'x86_64') -url="http://www.getmiro.com" -license=('GPL2') -depends=('python2-dbus' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf' - 'python2-pysqlite' 'pywebkitgtk' 'shared-mime-info' - 'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme' - 'gstreamer0.10-python' 'python2-notify' 'libtorrent-rasterbar' - 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python2-pycurl' - 'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen' 'xdg-utils') -makedepends=('pkg-config' 'boost') -install=miro.install -source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz" - 'ffmpeg.patch') -sha1sums=('1144f98149ff07208b994a7cedb45a4beaaa451f' - 'ce0f42be2a0a3ac99f07b5abfabf0975928c841c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - cd linux - patch -p2 -i "${srcdir}"/ffmpeg.patch - - python2 setup.py install --root="${pkgdir}" - - # fix miro startup script so --debug works with python2 - sed -i "s|which python|which python2|" "${pkgdir}/usr/bin/miro" - sed -i "s|./miro.real|/usr/bin/miro.real|" "${pkgdir}/usr/bin/miro" - - # fix python scripts for python2 - sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}"/usr/share/miro/resources/searchengines/update-icons.py - for i in usr/share/miro/resources/testdata/echonest-replies/generate.py usr/share/miro/resources/searchengines/update-icons.py \ - usr/share/miro/resources/testdata/7digital-replies/generate.py; do - sed -i "s|/usr/bin/python|/usr/bin/python2|" "${pkgdir}"/${i} - done - - # Fakeroot segfaults on these; remove - if [ ${CARCH} == "i686" ]; then - rm -f "${pkgdir}"/usr/bin/codegen.Linux-x86_64 || true - else - rm -f "${pkgdir}"/usr/bin/codegen.Linux-i686 || true - fi -} diff --git a/staging/miro/ffmpeg.patch b/staging/miro/ffmpeg.patch deleted file mode 100644 index 99c14107d..000000000 --- a/staging/miro/ffmpeg.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- miro-5.0.1/linux/miro-segmenter.c~ 2012-07-06 14:33:24.618082171 +0000 -+++ miro-5.0.1/linux/miro-segmenter.c 2012-07-06 15:10:19.564146117 +0000 -@@ -156,7 +156,7 @@ - exit(1); - } - -- ret = av_open_input_file(&ic, input, ifmt, 0, NULL); -+ ret = avformat_open_input(&ic, input, ifmt, 0); - if (ret != 0) { - fprintf(stderr, "Could not open input file, make sure it is an mpegts file: %d\n", ret); - exit(1); -@@ -215,12 +215,7 @@ - } - } - -- if (av_set_parameters(oc, NULL) < 0) { -- fprintf(stderr, "Invalid output format parameters\n"); -- exit(1); -- } -- -- dump_format(oc, 0, input, 1); -+ av_dump_format(oc, 0, input, 1); - - if (video_st) { - codec = avcodec_find_decoder(video_st->codec->codec_id); -@@ -233,12 +228,12 @@ - } - } - -- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) { -+ if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) { - fprintf(stderr, "Could not open '%s'\n", output_filename); - exit(1); - } - -- if (av_write_header(oc)) { -+ if (avformat_write_header(oc, NULL)) { - fprintf(stderr, "Could not write mpegts header to first output file\n"); - - exit(1); -@@ -274,10 +269,10 @@ - } - - if (segment_time - prev_segment_time >= segment_duration) { -- put_flush_packet(oc->pb); -- url_fclose(oc->pb); -+ avio_flush(oc->pb); -+ avio_close(oc->pb); - -- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) { -+ if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) { - fprintf(stderr, "Could not open '%s'\n", output_filename); - break; - } -@@ -307,7 +302,7 @@ - av_freep(&oc->streams[i]); - } - -- url_fclose(oc->pb); -+ avio_close(oc->pb); - av_free(oc); - - /* End-of-transcode marker. */ diff --git a/staging/miro/miro.install b/staging/miro/miro.install deleted file mode 100644 index a5ee228aa..000000000 --- a/staging/miro/miro.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() { - update-desktop-database -q - xdg-icon-resource forceupdate --theme hicolor - update-mime-database usr/share/mime > /dev/null -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - update-desktop-database -q - xdg-icon-resource forceupdate --theme hicolor - update-mime-database usr/share/mime > /dev/null -} - - diff --git a/staging/mkvtoolnix/PKGBUILD b/staging/mkvtoolnix/PKGBUILD deleted file mode 100644 index 48bd96863..000000000 --- a/staging/mkvtoolnix/PKGBUILD +++ /dev/null @@ -1,84 +0,0 @@ -# $Id: PKGBUILD 163225 2012-07-11 10:08:56Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: xduugu <xduugu@gmx.com> - -pkgbase=mkvtoolnix -pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk') -pkgver=5.7.0 -pkgrel=2 -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" -makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk' - 'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby') -source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('99ea44be570412dadafe4ccaee0cfe6e') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - # Disable automagic curl dep used for online update checking - sed -i -e '/curl/d' configure.in - export CURL_CFLAGS="" CURL_LIBS="" - - export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=3" - export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=3" - - autoreconf - - ./configure --prefix=/usr \ - --with-boost-libdir=/usr/lib \ - --disable-gui - rake - - mv src/mkvinfo{,-cli} - - ./configure --prefix=/usr \ - --with-boost-libdir=/usr/lib - rake -} - -package_mkvtoolnix-cli() { - pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version" - depends=('libmatroska' 'expat' 'flac' 'libvorbis' 'file' 'boost-libs' 'lzo2') - provides=('mkvtoolnix') - conflicts=('mkvtoolnix') - replaces=('mkvtoolnix') - - cd "${srcdir}/${pkgbase}-${pkgver}" - - rake DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/usr/bin/mkvinfo - install -Dm755 src/mkvinfo-cli "${pkgdir}"/usr/bin/mkvinfo - - rm -rf "${pkgdir}"/usr/bin/mmg - rm -rf "${pkgdir}"/usr/share/man/ja/man1/mmg.1 - rm -rf "${pkgdir}"/usr/share/man/man1/mmg.1 - rm -rf "${pkgdir}"/usr/share/man/nl/man1/mmg.1 - rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mmg.1 - rm -rf "${pkgdir}"/usr/share/man/uk/man1/mmg.1 - rm -rf "${pkgdir}"/usr/share/applications - rm -rf "${pkgdir}"/usr/share/icons - rm -rf "${pkgdir}"/usr/share/mime -} - -package_mkvtoolnix-gtk() { - pkgdesc="Set of tools to create, edit and inspect Matroska files - wxGTK GUI" - depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils') - install=mkvtoolnix.install - - cd "${srcdir}/${pkgbase}-${pkgver}" - - rake DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/usr/bin/mkv* - install -Dm755 src/mkvinfo "${pkgdir}"/usr/bin/mkvinfo-gtk - sed -ri 's/^(Exec=mkvinfo)/\1-gtk/' "${pkgdir}"/usr/share/applications/mkvinfo.desktop - - rm -rf "${pkgdir}"/usr/share/doc - rm -rf "${pkgdir}"/usr/share/locale - rm -rf "${pkgdir}"/usr/share/man/ja/man1/mkv* - rm -rf "${pkgdir}"/usr/share/man/man1/mkv* - rm -rf "${pkgdir}"/usr/share/man/nl/man1/mkv* - rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mkv* - rm -rf "${pkgdir}"/usr/share/man/uk/man1/mkv* -} diff --git a/staging/mkvtoolnix/mkvtoolnix.install b/staging/mkvtoolnix/mkvtoolnix.install deleted file mode 100644 index 74d9eb2ef..000000000 --- a/staging/mkvtoolnix/mkvtoolnix.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - if [ -f usr/bin/update-mime-database ]; then - update-mime-database usr/share/mime &> /dev/null - fi -} - -post_upgrade() { - post_install -} - -pre_remove() { - post_install -} diff --git a/staging/moc/PKGBUILD b/staging/moc/PKGBUILD deleted file mode 100644 index f8d55e21b..000000000 --- a/staging/moc/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 160696 2012-06-03 22:26:49Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=moc -pkgver=20120224 -pkgrel=2 -pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats" -arch=('i686' 'x86_64') -url="http://moc.daper.net/" -license=('GPL') -depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file') -makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug') -optdepends=('speex: for using the speex plugin' - 'ffmpeg: for using the ffmpeg plugin' - 'taglib: for using the musepack plugin' - 'libmpcdec: for using the musepack plugin' - 'wavpack: for using the wavpack plugin' - 'libmodplug: for using the modplug plugin') -options=('!libtool') -source=(ftp://ftp.archlinux.org/other/moc/${pkgname}-${pkgver}.tar.xz{,.sig}) -sha1sums=('8ad3521d99fe6f2514907088c70e50c84ec09b46' - 'e8b2396d99692b0c4f85971d3fa6f5aecb1eb9d3') - -# source PKGBUILD && mksource -mksource() { - [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1) - _svnver=2412 - _svntrunk="svn://daper.net/moc/trunk" - _svnmod="${pkgname}-${pkgver}" - mkdir ${pkgname}-${pkgver} - pushd ${pkgname}-${pkgver} - svn co ${_svntrunk} --config-dir ./ -r ${_svnver} ${_svnmod} - find . -depth -type d -name .svn -exec rm -rf {} \; - tar -cJf ../${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/* - popd - rm -r ${pkgname}-${pkgver} - gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - -# Disabling aac to use the external ffmpeg to play them (FS#13164) - autoreconf -i - ./configure --prefix=/usr --without-rcc --without-aac \ - --with-oss --with-alsa --with-jack --with-mp3 \ - --with-musepack --with-vorbis --with-flac --with-wavpack \ - --with-sndfile --with-modplug --with-ffmpeg --with-speex \ - --with-samplerate --with-curl --disable-debug - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/mpd/PKGBUILD b/staging/mpd/PKGBUILD deleted file mode 100644 index 64f1527fb..000000000 --- a/staging/mpd/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# $Id: PKGBUILD 162849 2012-07-01 23:58:44Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: Angel Velasquez <angvp@archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> -# Contributor: Ben <ben@benmazer.net> - -pkgname=mpd -pkgver=0.17 -pkgrel=2 -pkgdesc='Flexible, powerful, server-side application for playing music' -url='http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki' -license=('GPL') -arch=('i686' 'x86_64') -depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2' - 'sqlite' 'jack' 'libmms' 'wavpack' 'libmpcdec' 'avahi' 'libid3tag' - 'libpulse') -makedepends=('doxygen') -source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2" - 'tmpfiles.d' - 'rc.d') -sha1sums=('36201f32ca5729b62b0e6cbddb19ade20ee3f7d7' - 'f4d5922abb69abb739542d8e93f4dfd748acdad7' - '3470d489565f0ed479f1665dd2876f66acb5a585') - -backup=('etc/mpd.conf') -install=install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --enable-lastfm \ - --enable-jack \ - --enable-pulse \ - --enable-documentation \ - --disable-libwrap \ - --disable-cue \ - --disable-sidplay \ - --disable-documentation \ - --with-systemdsystemunitdir=/usr/lib/systemd/system - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - sed \ - -e '/^#playlist_directory/c playlist_directory "/var/lib/mpd/playlists"' \ - -e '/^#db_file/c db_file "/var/lib/mpd/mpd.db"' \ - -e '/^#pid_file/c pid_file "/run/mpd/mpd.pid"' \ - -e '/^#state_file/c state_file "/var/lib/mpd/mpdstate"' \ - -e '/^#user/c user "mpd"' \ - -i doc/mpdconf.example - - install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/mpd - install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists - install -Dm644 doc/mpdconf.example "${pkgdir}"/etc/mpd.conf - install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf -} diff --git a/staging/mpd/install b/staging/mpd/install deleted file mode 100644 index 261b8fd0d..000000000 --- a/staging/mpd/install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - getent group mpd &>/dev/null || groupadd -r -g 45 mpd >/dev/null - getent passwd mpd &>/dev/null || useradd -r -u 45 -g mpd -d /var/lib/mpd -s /bin/false -G audio mpd >/dev/null - true -} - -post_remove() { - getent passwd mpd &>/dev/null && userdel mpd >/dev/null - getent group mpd &>/dev/null && groupdel mpd >/dev/null - true -} diff --git a/staging/mpd/rc.d b/staging/mpd/rc.d deleted file mode 100755 index f00e16067..000000000 --- a/staging/mpd/rc.d +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy 'Starting Music Player Daemon' - /usr/bin/mpd /etc/mpd.conf &> /dev/null && - { add_daemon mpd; stat_done; } || stat_fail - ;; - stop) - stat_busy 'Stopping Music Player Daemon' - /usr/bin/mpd --kill /etc/mpd.conf &> /dev/null && - { rm_daemon mpd; stat_done; } || stat_fail - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/staging/mpd/tmpfiles.d b/staging/mpd/tmpfiles.d deleted file mode 100644 index 41c4e743a..000000000 --- a/staging/mpd/tmpfiles.d +++ /dev/null @@ -1 +0,0 @@ -d /run/mpd 0755 mpd mpd diff --git a/staging/nmap/ChangeLog b/staging/nmap/ChangeLog deleted file mode 100644 index f87ec482e..000000000 --- a/staging/nmap/ChangeLog +++ /dev/null @@ -1,19 +0,0 @@ -2012-02-22 Angel Velasquez <angvp@archlinux.org> - * Lua 5.2 rebuild - -2008-10-28 Douglas Soares de Andrade <douglas@archlinux.org> - - * Python 2.6 rebuild. - -2008-07-23 Hugo Doria <hugo@archlinux.org> - - * Added pygtk in optdepends: 4.68-3 - -2008-07-09 Douglas Soares de Andrade <douglas@archlinux.org> - - * Fixing the pixmaps path for i686: 4.68 - -2008-07-09 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 4.68 - diff --git a/staging/nmap/PKGBUILD b/staging/nmap/PKGBUILD deleted file mode 100644 index ceb05eae7..000000000 --- a/staging/nmap/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 150913 2012-02-23 15:15:39Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Hugo Doria <hugo@archlinux.org> - -pkgname=nmap -pkgver=5.51 -pkgrel=4 -pkgdesc="A network exploration tool and security/port scanner" -arch=('i686' 'x86_64') -url="http://nmap.org" -license=('GPL') -depends=('pcre' 'openssl' 'libpcap' 'lua') -# python is needed for zenmap -makedepends=('python2') -optdepends=('pygtk: gui for nmap') -options=('!makeflags') -source=(http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2) -md5sums=('0b80d2cb92ace5ebba8095a4c2850275') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - echo "TryExec=/usr/bin/pygtk-demo" >> zenmap/install_scripts/unix/zenmap.desktop - echo "TryExec=/usr/bin/pygtk-demo" >> zenmap/install_scripts/unix/zenmap-root.desktop - - # Force usage of external libpcap - # OSX bug check fails because of missing types - # autoreconf fails because our autotools are too new (?) - sed -i 's/have_libpcap=no/have_libpcap=yes/g' {.,ncat,nping}/configure - - ./configure --prefix=/usr --mandir=/usr/share/man \ - --libexecdir=/usr/lib - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - - # remove zenmap uninstall script - rm "${pkgdir}/usr/bin/uninstall_zenmap" - - # install custom GPL2 license - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/staging/ntp/PKGBUILD b/staging/ntp/PKGBUILD deleted file mode 100644 index b758ce06d..000000000 --- a/staging/ntp/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 161303 2012-06-09 05:27:03Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: kevin <kevin@archlinux.org> - -pkgname=ntp -pkgver=4.2.6.p5 -_realver=4.2.6p5 -pkgrel=7 -pkgdesc='Network Time Protocol reference implementation' -url='http://www.ntp.org/' -license=('custom') -arch=('i686' 'x86_64') -makedepends=('perl-html-parser') -depends=('openssl' 'readline' 'libcap') -backup=('etc/ntp.conf' 'etc/conf.d/ntpd.conf') -source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz" - 'ntpd' - 'ntpdate' - 'ntp.conf' - 'ntpd.conf' - 'logrotate.d' - 'ntpd.service') -sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192' - '4e324e625c1f080b5c028be5092aa71adbf9bd99' - '01394b8a952f5edc85d19df8335eeac3980320f4' - 'eb1f63814b9adbd3d518e880fa3b38c375f0fe91' - '4537d1f58b299d463db5048129cb264511474b0b' - '4f76f7f9ffc8315ff9924f793f272d4f6939b816' - '81df5c4d51cb69bc29363625ff49e2bd388d1fa9') - -install=install - -build() { - cd "${srcdir}/${pkgname}-${_realver}" - - ./configure \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --enable-linuxcaps \ - - make -} - -package() { - cd "${srcdir}/${pkgname}-$_realver" - - make DESTDIR="${pkgdir}" install - - rmdir "${pkgdir}"/usr/{lib,sbin} - install -d -o 87 "${pkgdir}"/var/lib/ntp - install -Dm755 ../ntpd "${pkgdir}"/etc/rc.d/ntpd - install -Dm755 ../ntpdate "${pkgdir}"/etc/rc.d/ntpdate - install -Dm644 ../ntp.conf "${pkgdir}"/etc/ntp.conf - install -Dm644 ../ntpd.conf "${pkgdir}"/etc/conf.d/ntpd.conf - install -Dm644 ../logrotate.d "${pkgdir}"/etc/logrotate.d/ntpd - install -Dm644 ../ntpd.service "${pkgdir}"/usr/lib/systemd/system/ntpd.service - install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - cd html - ../scripts/html2man - install -d "${pkgdir}"/usr/share/man - mv man/man* "${pkgdir}"/usr/share/man - mv "${pkgdir}/usr/share/man/man8/ntpd.8" "${pkgdir}/usr/share/man/man8/ntp-ntpd.8" # we should ditch openntpd -} diff --git a/staging/ntp/install b/staging/ntp/install deleted file mode 100644 index e6eddf8a4..000000000 --- a/staging/ntp/install +++ /dev/null @@ -1,37 +0,0 @@ -post_install() { - getent group ntp &>/dev/null || groupadd -g 87 ntp >/dev/null - getent passwd ntp &>/dev/null || useradd -u 87 -g ntp -d /var/lib/ntp -c 'Network Time Protocol' -s /bin/false ntp >/dev/null - true -} - -post_upgrade() { - if [[ $(vercmp $2 4.2.6.p3) -le 0 ]]; then - cat <<EOF - -==> The file /etc/conf.d/ntp-client.conf has been renamed /etc/conf.d/ntpd.conf -==> If you made changes to the former, please update the latter. - -EOF - fi - if [[ $(vercmp $2 4.2.6.p5-1) -le 0 ]]; then - cat <<EOF - -==> The PID file /var/run/ntpd.pid has been renamed /run/ntpd.pid -==> and the new rc.d script only takes the latter into account. -==> To stop your old ntpd process, please kill it manually. - -EOF - fi - if [[ $(vercmp $2 4.2.6.p5-3) -le 0 ]]; then - post_install - fi - if [[ $(vercmp $2 4.2.6.p5-5) -le 0 ]]; then - chown -R ntp /var/lib/ntp - fi -} - -post_remove() { - getent passwd ntp &>/dev/null && userdel ntp >/dev/null - getent group ntp &>/dev/null && groupdel ntp >/dev/null - true -} diff --git a/staging/ntp/logrotate.d b/staging/ntp/logrotate.d deleted file mode 100644 index 8a9f066c3..000000000 --- a/staging/ntp/logrotate.d +++ /dev/null @@ -1,4 +0,0 @@ -/var/log/ntp.log { - missingok - copytruncate -} diff --git a/staging/ntp/ntp.conf b/staging/ntp/ntp.conf deleted file mode 100644 index a27b22820..000000000 --- a/staging/ntp/ntp.conf +++ /dev/null @@ -1,23 +0,0 @@ -# With the default settings below, ntpd will only synchronize your clock. -# -# For details, see: -# - the ntp.conf man page -# - http://support.ntp.org/bin/view/Support/GettingStarted -# - https://wiki.archlinux.org/index.php/Network_Time_Protocol_daemon - -# Associate to public NTP pool servers; see http://www.pool.ntp.org/ -server 0.pool.ntp.org -server 1.pool.ntp.org -server 2.pool.ntp.org - -# Only allow read-only access from localhost -restrict default noquery nopeer -restrict 127.0.0.1 -restrict ::1 - -# Location of drift and log files -driftfile /var/lib/ntp/ntp.drift -logfile /var/log/ntp.log - -# NOTE: If you run dhcpcd and have lines like 'restrict' and 'fudge' appearing -# here, be sure to add '-Y -N' to the dhcpcd_ethX variables in /etc/conf.d/net diff --git a/staging/ntp/ntpd b/staging/ntp/ntpd deleted file mode 100755 index 480fa1088..000000000 --- a/staging/ntp/ntpd +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/ntpd.conf - -unset PID -PIDFILE='/run/ntpd.pid' - -if [[ -r ${PIDFILE} ]]; then - read -r PID <"${PIDFILE}" - if [[ -n ${PID} && ! -d /proc/${PID} ]]; then - rm -f "${PIDFILE}" - unset PID - fi -fi - -case "$1" in - start) - stat_busy "Starting NTP Daemon" - if [[ -z ${PID} ]] && /usr/bin/ntpd ${NTPD_ARGS} -p "${PIDFILE}" &>/dev/null; then - add_daemon ntpd - stat_done - else - stat_fail - exit 1 - fi - ;; - stop) - stat_busy "Stopping NTP Daemon" - if [[ -n ${PID} ]] && kill "${PID}" &>/dev/null; then - rm ${PIDFILE} - rm_daemon ntpd - stat_done - else - stat_fail - exit 1 - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/staging/ntp/ntpd.conf b/staging/ntp/ntpd.conf deleted file mode 100644 index 047961fde..000000000 --- a/staging/ntp/ntpd.conf +++ /dev/null @@ -1,5 +0,0 @@ -# client options for "ntpd -q" - ntpdate equivalent -NTP_CLIENT_OPTION="-g -u ntp" - -# arguments passed to ntpd when started -NTPD_ARGS="-g -u ntp" diff --git a/staging/ntp/ntpd.service b/staging/ntp/ntpd.service deleted file mode 100644 index e0cbf879e..000000000 --- a/staging/ntp/ntpd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Network Time Service -After=network.target - -[Service] -Type=forking -PIDFile=/run/ntpd.pid -EnvironmentFile=/etc/conf.d/ntpd.conf -ExecStart=/usr/bin/ntpd $NTPD_ARGS -p /run/ntpd.pid - -[Install] -WantedBy=multi-user.target diff --git a/staging/ntp/ntpdate b/staging/ntp/ntpdate deleted file mode 100755 index a8e746785..000000000 --- a/staging/ntp/ntpdate +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/ntpd.conf - -case "$1" in - start) - stat_busy "Starting NTP Client" - if /usr/bin/ntpd -q ${NTP_CLIENT_OPTION} &>/dev/null; then - add_daemon ntpdate - stat_done - else - stat_fail - exit 1 - fi - ;; - stop) - stat_busy "Stopping NTP Client" - rm_daemon ntpdate - stat_done - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/staging/obex-data-server/PKGBUILD b/staging/obex-data-server/PKGBUILD deleted file mode 100644 index 32d465533..000000000 --- a/staging/obex-data-server/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 169396 2012-10-20 10:00:06Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Geoffroy Carrier <geoffroy@archlinux.org> -# Contributor: Roman Kyrylych <roman@archlinux.org> -# Contributor: Keerthi <keerthi.linux@gmail.com> - -pkgname=obex-data-server -pkgver=0.4.6 -pkgrel=3 -pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality" -arch=('i686' 'x86_64') -url="http://wiki.muiline.com/obex-data-server" -license=('GPL') -depends=('dbus-glib' 'openobex' 'imagemagick') -source=("http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz") -md5sums=('961ca5db6fe9c97024e133cc6203cc4d') - -build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc - make -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install -} diff --git a/staging/opal/PKGBUILD b/staging/opal/PKGBUILD deleted file mode 100644 index 7bc062dbe..000000000 --- a/staging/opal/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 161382 2012-06-10 15:56:57Z jgc $ -# Maintainer: Jan de Groot <jan@archlinux.org> -# Contributor: Tom K <tomk@runbox.com> -pkgname=opal -pkgver=3.10.5 -pkgrel=1 -pkgdesc="Open Phone Abstraction Library" -arch=(i686 x86_64) -url="http://www.opalvoip.org" -license=('GPL') -depends=('ptlib' 'libtheora' 'x264' 'speex' 'gsm') -makedepends=('ffmpeg') -options=(!makeflags) -source=(http://downloads.sourceforge.net/sourceforge/opalvoip/$pkgname-$pkgver.tar.bz2 - opal-ffmpeg.patch) -md5sums=('22b0d716ed1cbc935245539e0bbab38f' '53bb06a376fb57a306522bfa6a573217') - -build() { - cd "${srcdir}/opal-${pkgver}" - patch -Np1 -i "${srcdir}/opal-ffmpeg.patch" - CXXFLAGS="$CXXFLAGS -fpermissive" \ - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make -} - -package() { - cd "${srcdir}/opal-${pkgver}" - make DESTDIR="${pkgdir}" install - chmod 644 "${pkgdir}/usr/lib/libopal_s.a" -} diff --git a/staging/opal/opal-ffmpeg.patch b/staging/opal/opal-ffmpeg.patch deleted file mode 100644 index ebfd1f037..000000000 --- a/staging/opal/opal-ffmpeg.patch +++ /dev/null @@ -1,194 +0,0 @@ -diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/plugins/video/H.263-1998/h263-1998.cxx ---- opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx 2012-04-26 06:56:01.000000000 +0200 -+++ opal-3.10.5.patched/plugins/video/H.263-1998/h263-1998.cxx 2012-06-10 16:39:35.447021150 +0200 -@@ -51,6 +51,7 @@ - #endif - - #include "h263-1998.h" -+#include <libavutil/opt.h> - #include <limits> - #include <iomanip> - #include <stdio.h> -@@ -324,9 +325,9 @@ - // Level 2+ - // works with eyeBeam, signaled via non-standard "D" - if (atoi(value) == 1) -- m_context->flags |= CODEC_FLAG_H263P_UMV; -+ av_opt_set_int(m_context->priv_data, "umv", 1, 0); - else -- m_context->flags &= ~CODEC_FLAG_H263P_UMV; -+ av_opt_set_int(m_context->priv_data, "umv", 0, 0); - return; - } - -@@ -335,9 +336,9 @@ - // Annex F: Advanced Prediction Mode - // does not work with eyeBeam - if (atoi(value) == 1) -- m_context->flags |= CODEC_FLAG_OBMC; -+ av_opt_set_int(m_context->priv_data, "obmc", 1, 0); - else -- m_context->flags &= ~CODEC_FLAG_OBMC; -+ av_opt_set_int(m_context->priv_data, "obmc", 0, 0); - return; - } - #endif -@@ -367,9 +368,9 @@ - // Annex K: Slice Structure - // does not work with eyeBeam - if (atoi(value) != 0) -- m_context->flags |= CODEC_FLAG_H263P_SLICE_STRUCT; -+ av_opt_set_int(m_context->priv_data, "structured_slices", 1, 0); - else -- m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT; -+ av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0); - return; - } - -@@ -377,9 +378,9 @@ - // Annex S: Alternative INTER VLC mode - // does not work with eyeBeam - if (atoi(value) == 1) -- m_context->flags |= CODEC_FLAG_H263P_AIV; -+ av_opt_set_int(m_context->priv_data, "aiv", 1, 0); - else -- m_context->flags &= ~CODEC_FLAG_H263P_AIV; -+ av_opt_set_int(m_context->priv_data, "aiv", 0, 0); - return; - } - } -@@ -445,15 +446,6 @@ - PTRACE(5, m_prefix, "qmax set to " << m_context->qmax); - PTRACE(5, m_prefix, "payload size set to " << m_context->rtp_payload_size); - -- #define CODEC_TRACER_FLAG(tracer, flag) \ -- PTRACE(4, m_prefix, #flag " is " << ((m_context->flags & flag) ? "enabled" : "disabled")); -- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_UMV); -- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_OBMC); -- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_AC_PRED); -- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_SLICE_STRUCT) -- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_LOOP_FILTER); -- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_AIV); -- - return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0; - } - -@@ -516,7 +508,7 @@ - - // Need to copy to local buffer to guarantee 16 byte alignment - memcpy(m_inputFrame->data[0], OPAL_VIDEO_FRAME_DATA_PTR(header), header->width*header->height*3/2); -- m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE; -+ m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_NONE; - - /* - m_inputFrame->pts = (int64_t)srcRTP.GetTimestamp()*m_context->time_base.den/m_context->time_base.num/VIDEO_CLOCKRATE; -@@ -598,13 +590,13 @@ - m_context->rtp_callback = &H263_RFC2190_EncoderContext::RTPCallBack; - m_context->opaque = this; // used to separate out packets from different encode threads - -- m_context->flags &= ~CODEC_FLAG_H263P_UMV; -+ av_opt_set_int(m_context->priv_data, "umv", 0, 0); - m_context->flags &= ~CODEC_FLAG_4MV; - #if LIBAVCODEC_RTP_MODE - m_context->flags &= ~CODEC_FLAG_H263P_AIC; - #endif -- m_context->flags &= ~CODEC_FLAG_H263P_AIV; -- m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT; -+ av_opt_set_int(m_context->priv_data, "aiv", 0, 0); -+ av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0); - - return true; - } -diff -ru opal-3.10.5/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.5.patched/plugins/video/H.264/gpl/h264_helper.cxx ---- opal-3.10.5/plugins/video/H.264/gpl/h264_helper.cxx 2012-04-26 06:56:00.000000000 +0200 -+++ opal-3.10.5.patched/plugins/video/H.264/gpl/h264_helper.cxx 2012-06-10 16:49:11.210568639 +0200 -@@ -25,6 +25,7 @@ - #include <fstream> - #include <stdlib.h> - #include <sys/stat.h> -+#include <unistd.h> - - - #ifndef PLUGINCODEC_TRACING -diff -ru opal-3.10.5/plugins/video/H.264/h264-x264.cxx opal-3.10.5.patched/plugins/video/H.264/h264-x264.cxx ---- opal-3.10.5/plugins/video/H.264/h264-x264.cxx 2012-04-26 06:56:00.000000000 +0200 -+++ opal-3.10.5.patched/plugins/video/H.264/h264-x264.cxx 2012-06-10 17:04:19.695646950 +0200 -@@ -1035,13 +1035,10 @@ - return false; - - m_context->workaround_bugs = FF_BUG_AUTODETECT; -- m_context->error_recognition = FF_ER_AGGRESSIVE; - m_context->idct_algo = FF_IDCT_H264; - m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK; - m_context->flags = CODEC_FLAG_INPUT_PRESERVED | CODEC_FLAG_EMU_EDGE; -- m_context->flags2 = CODEC_FLAG2_BRDO | -- CODEC_FLAG2_MEMC_ONLY | -- CODEC_FLAG2_DROP_FRAME_TIMECODE | -+ m_context->flags2 = CODEC_FLAG2_DROP_FRAME_TIMECODE | - CODEC_FLAG2_SKIP_RD | - CODEC_FLAG2_CHUNKS; - -diff -ru opal-3.10.5/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.5.patched/plugins/video/H.264/shared/x264wrap.cxx ---- opal-3.10.5/plugins/video/H.264/shared/x264wrap.cxx 2012-04-26 06:56:00.000000000 +0200 -+++ opal-3.10.5.patched/plugins/video/H.264/shared/x264wrap.cxx 2012-06-10 17:04:46.012171051 +0200 -@@ -33,6 +33,7 @@ - - #include <codec/opalplugin.hpp> - #include <stdio.h> -+#include <unistd.h> - - - #if defined(X264_LICENSED) || defined(GPL_HELPER_APP) -diff -ru opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.5.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx ---- opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2012-04-26 06:56:02.000000000 +0200 -+++ opal-3.10.5.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2012-06-10 16:46:33.498089705 +0200 -@@ -101,8 +101,10 @@ - #include <libavutil/bswap.h> - #include <libavcodec/mpegvideo.h> - -+ - #else /* LIBAVCODEC_HAVE_SOURCE_DIR */ - #include LIBAVCODEC_HEADER -+#include <libavutil/opt.h> - #endif /* LIBAVCODEC_HAVE_SOURCE_DIR */ - } - -@@ -589,17 +591,17 @@ - m_avpicture->quality = m_videoQMin; - - #ifdef USE_ORIG -- m_avcontext->flags |= CODEC_FLAG_PART; // data partitioning -+ av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0); - m_avcontext->flags |= CODEC_FLAG_4MV; // 4 motion vectors - #else - m_avcontext->max_b_frames=0; /*don't use b frames*/ - m_avcontext->flags|=CODEC_FLAG_AC_PRED; -- m_avcontext->flags|=CODEC_FLAG_H263P_UMV; -+ av_opt_set_int(m_avcontext->priv_data, "umv", 1, 0); - /*c->flags|=CODEC_FLAG_QPEL;*/ /*don't enable this one: this forces profile_level to advanced simple profile */ - m_avcontext->flags|=CODEC_FLAG_4MV; - m_avcontext->flags|=CODEC_FLAG_GMC; - m_avcontext->flags|=CODEC_FLAG_LOOP_FILTER; -- m_avcontext->flags|=CODEC_FLAG_H263P_SLICE_STRUCT; -+ av_opt_set_int(m_avcontext->priv_data, "structured_slices", 1, 0); - #endif - m_avcontext->opaque = this; // for use in RTP callback - } -@@ -804,7 +806,7 @@ - // Should the next frame be an I-Frame? - if ((flags & PluginCodec_CoderForceIFrame) || (m_frameNum == 0)) - { -- m_avpicture->pict_type = FF_I_TYPE; -+ m_avpicture->pict_type = AV_PICTURE_TYPE_I; - } - else // No IFrame requested, let avcodec decide what to do - { -@@ -1325,7 +1327,7 @@ - - void MPEG4DecoderContext::SetStaticDecodingParams() { - m_avcontext->flags |= CODEC_FLAG_4MV; -- m_avcontext->flags |= CODEC_FLAG_PART; -+ av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0); - m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations - } - diff --git a/staging/opencv/PKGBUILD b/staging/opencv/PKGBUILD deleted file mode 100644 index ed87a8d3d..000000000 --- a/staging/opencv/PKGBUILD +++ /dev/null @@ -1,111 +0,0 @@ -# $Id: PKGBUILD 169516 2012-10-22 21:28:51Z schiv $ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> - -pkgbase=opencv -pkgname=('opencv' 'opencv-docs' 'opencv-samples') -_realname=OpenCV -pkgver=2.4.2 -pkgrel=5 -pkgdesc="Open Source Computer Vision Library" -arch=('i686' 'x86_64') -license=('BSD') -url="http://opencv.org/" -depends=('jasper' 'gstreamer0.10-base' 'openexr>=1.7.0' - 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils' 'ilmbase>=1.0.3') -makedepends=('cmake' 'python2-numpy' 'eigen2') -optdepends=('opencv-docs' - 'opencv-samples' - 'eigen2' - 'python2-numpy: Python 2.x interface') -options=('!libtool') -source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2") -md5sums=('059ef86fc1724d69b75832a0d2929ff5') - -_cmakeopts=('-D CMAKE_BUILD_TYPE=Release' - '-D CMAKE_INSTALL_PREFIX=/usr' - '-D CMAKE_SKIP_RPATH=ON' - '-D BUILD_TESTS=OFF' - '-D ENABLE_SSE=ON' - '-D ENABLE_SSE2=ON' - '-D ENABLE_SSE3=OFF' - '-D ENABLE_SSSE3=OFF' - '-D ENABLE_SSE41=OFF' - '-D ENABLE_SSE42=OFF' - '-D BUILD_EXAMPLES=ON' - '-D INSTALL_C_EXAMPLES=ON' - '-D INSTALL_PYTHON_EXAMPLES=ON' - '-D WITH_XINE=ON' - '-D WITH_QT=OFF' - '-D WITH_QT_OPENGL=OFF' - '-D WITH_UNICAP=OFF' - '-D WITH_PVAPI=OFF' - '-D WITH_OPENNI=OFF' - '-D WITH_TBB=OFF' - '-D WITH_IPP=OFF' - '-D WITH_CUDA=OFF' - '-D USE_FAST_MATH=ON') - -build() { - cd "$srcdir/$_realname-$pkgver" - - # x64, i.e "Athlon64" and upwards, can use SSE3 - [ $CARCH = x86_64 ] && \ - _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON} - - cmake ${_cmakeopts[@]} . - - make -} - -package_opencv() { - cd "$srcdir/$_realname-$pkgver" - - make DESTDIR="$pkgdir" install - - # install license file - install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - cd "$pkgdir/usr/share" - - # separate docs package; also be -R friendly - [ -d $_realname/doc ] && mv $_realname/doc "$srcdir/opencv-doc" - - # separate samples package - [ -d $_realname/samples ] && mv $_realname/samples "$srcdir/opencv-samples" -} - -package_opencv-docs() { - pkgdesc+=" (documentation)" - unset depends - unset optdepends - options=('docs') - - cd "$srcdir" - - mkdir -p "$pkgdir/usr/share/doc" - cp -r opencv-doc "$pkgdir/usr/share/doc/$_realname" - - # install license file - install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -package_opencv-samples() { - pkgdesc+=" (samples)" - depends=('bash') - unset optdepends - unset options - - cd "$srcdir" - - mkdir -p "$pkgdir/usr/share/$_realname" - cp -r opencv-samples "$pkgdir/usr/share/$_realname/samples" - - # install license file - install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/openexr/PKGBUILD b/staging/openexr/PKGBUILD deleted file mode 100644 index 9c9431644..000000000 --- a/staging/openexr/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 169347 2012-10-20 00:48:45Z eric $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=openexr -pkgver=1.7.1 -pkgrel=2 -pkgdesc="An high dynamic-range image file format library" -url="http://www.openexr.com/" -arch=('i686' 'x86_64') -license=('BSD') -depends=('zlib' 'ilmbase') -options=('!libtool') -source=("https://github.com/downloads/${pkgname}/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'gcc43.patch') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 -i "${srcdir}/gcc43.patch" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} - -md5sums=('a9e0369dfd68941c50cdaa93e9d7a8d1' - 'd91fae759053a70bcedcf02eb33ca4a2') diff --git a/staging/openexr/gcc43.patch b/staging/openexr/gcc43.patch deleted file mode 100644 index ab99eb9a1..000000000 --- a/staging/openexr/gcc43.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- exrenvmap/blurImage.cpp -+++ exrenvmap/blurImage.cpp -@@ -39,6 +39,8 @@ - // - //----------------------------------------------------------------------------- - -+#include <cstring> -+ - #include <blurImage.h> - - #include <resizeImage.h> diff --git a/staging/openssh/PKGBUILD b/staging/openssh/PKGBUILD deleted file mode 100644 index a492d3cb0..000000000 --- a/staging/openssh/PKGBUILD +++ /dev/null @@ -1,96 +0,0 @@ -# $Id: PKGBUILD 161379 2012-06-10 13:19:01Z bluewind $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: Aaron Griffin <aaron@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=openssh -pkgver=6.0p1 -pkgrel=3 -pkgdesc='Free version of the SSH connectivity tools' -url='http://www.openssh.org/portable.html' -license=('custom:BSD') -arch=('i686' 'x86_64') -depends=('krb5' 'openssl' 'libedit' 'ldns') -optdepends=('xorg-xauth: X11 forwarding' - 'x11-ssh-askpass: input passphrase in X') -source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" - 'sshd.close-sessions' - 'sshdgenkeys.service' - 'sshd@.service' - 'sshd.service' - 'sshd.socket' - 'tmpfiles.d' - 'sshd.confd' - 'sshd.pam' - 'sshd') -sha1sums=('f691e53ef83417031a2854b8b1b661c9c08e4422' - '954bf1660aa32620c37034320877f4511b767ccb' - '6c71de2c2ca9622aa8e863acd94b135555e11125' - 'bd6eae36c7ef9efb7147778baad7858b81f2d660' - '83a257b8f6a62237383262cb0e2583e5609ddac0' - 'a30fb5fda6d0143345bae47684edaffb8d0a92a7' - 'b5cf44205e8f4365c00bfbee110d7c0e563627aa' - 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' - '659e3ee95c269014783ff8b318c6f50bf7496fbd' - 'ed36e3a522f619ff6b13e253526596e4cca11e9f') - -backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib/ssh \ - --sysconfdir=/etc/ssh \ - --with-ldns \ - --with-libedit \ - --with-ssl-engine \ - --with-pam \ - --with-privsep-user=nobody \ - --with-kerberos5=/usr \ - --with-xauth=/usr/bin/xauth \ - --with-mantype=man \ - --with-md5-passwords \ - --with-pid-dir=/run \ - - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # The connect.sh test must be run by a user with a decent login shell; - # chroot builds use nobody with /bin/false. - make tests || true -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm "${pkgdir}"/usr/share/man/man1/slogin.1 - ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz - - install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" - - install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service - install -Dm644 ../sshd@.service "${pkgdir}"/usr/lib/systemd/system/sshd@.service - install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service - install -Dm644 ../sshd.socket "${pkgdir}"/usr/lib/systemd/system/sshd.socket - install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/openssh.conf - - install -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389 - install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd - install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd - install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd - - install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh - install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id - install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1 - - sed \ - -e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \ - -e '/^#UsePAM no$/c UsePAM yes' \ - -i "${pkgdir}"/etc/ssh/sshd_config -} diff --git a/staging/openssh/sshd b/staging/openssh/sshd deleted file mode 100755 index 4bf4780f5..000000000 --- a/staging/openssh/sshd +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/sshd - -PIDFILE=/run/sshd.pid -PID=$(cat $PIDFILE 2>/dev/null) -if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then - PID= - rm $PIDFILE 2>/dev/null -fi - -case "$1" in - start) - stat_busy 'Starting Secure Shell Daemon' - /usr/bin/ssh-keygen -A - [[ -d /var/empty ]] || mkdir -p /var/empty - [[ -z $PID ]] && /usr/sbin/sshd $SSHD_ARGS - if [[ $? -gt 0 ]]; then - stat_fail - else - add_daemon sshd - stat_done - fi - ;; - stop) - stat_busy 'Stopping Secure Shell Daemon' - [[ ! -z $PID ]] && kill $PID &> /dev/null - if [[ $? -gt 0 ]]; then - stat_fail - else - rm_daemon sshd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/staging/openssh/sshd.close-sessions b/staging/openssh/sshd.close-sessions deleted file mode 100644 index be2a709fc..000000000 --- a/staging/openssh/sshd.close-sessions +++ /dev/null @@ -1,17 +0,0 @@ -# Close sshd sessions before shutting down the network; see FS#17389. - -sshd_close_sessions () { - if ck_daemon sshd; then - return - fi - /etc/rc.d/sshd stop - stat_busy "Stopping Secure Shell Sessions" - for i in $(pgrep sshd); do - if readlink -q /proc/$i/exe | grep -q '^/usr/sbin/sshd'; then - kill $i - fi - done &>/dev/null - stat_done -} - -add_hook shutdown_start sshd_close_sessions diff --git a/staging/openssh/sshd.confd b/staging/openssh/sshd.confd deleted file mode 100644 index 5ce7c0079..000000000 --- a/staging/openssh/sshd.confd +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to sshd -# -SSHD_ARGS="" diff --git a/staging/openssh/sshd.pam b/staging/openssh/sshd.pam deleted file mode 100644 index aeef8be27..000000000 --- a/staging/openssh/sshd.pam +++ /dev/null @@ -1,13 +0,0 @@ -#%PAM-1.0 -#auth required pam_securetty.so #Disable remote root -auth required pam_unix.so -auth required pam_env.so -account required pam_nologin.so -account required pam_unix.so -account required pam_time.so -password required pam_unix.so -session required pam_unix_session.so -session required pam_limits.so -session optional pam_loginuid.so --session optional pam_ck_connector.so nox11 --session optional pam_systemd.so diff --git a/staging/openssh/sshd.service b/staging/openssh/sshd.service deleted file mode 100644 index 7c8f88372..000000000 --- a/staging/openssh/sshd.service +++ /dev/null @@ -1,19 +0,0 @@ -[Unit] -Description=OpenSSH Daemon -After=sshdgenkeys.service - -[Service] -ExecStart=/usr/sbin/sshd -D -ExecReload=/bin/kill -HUP $MAINPID -KillMode=process -Restart=always - -[Install] -WantedBy=multi-user.target -Also=sshdgenkeys.service - -# Note that this is the service file for running a single SSH server for all -# incoming connections, suitable only for systems with a large amount of SSH -# traffic. In almost all other cases it is a better idea to use sshd.socket + -# sshd@.service (i.e. the on-demand spawning version for one instance per -# connection). diff --git a/staging/openssh/sshd.socket b/staging/openssh/sshd.socket deleted file mode 100644 index 6a67bfe86..000000000 --- a/staging/openssh/sshd.socket +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Conflicts=sshd.service - -[Socket] -ListenStream=22 -Accept=yes - -[Install] -WantedBy=sockets.target -Also=sshdgenkeys.service diff --git a/staging/openssh/sshd@.service b/staging/openssh/sshd@.service deleted file mode 100644 index 2fd9b0814..000000000 --- a/staging/openssh/sshd@.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=OpenSSH Per-Connection Daemon -After=sshdgenkeys.service - -[Service] -ExecStart=-/usr/sbin/sshd -i -StandardInput=socket -StandardError=syslog diff --git a/staging/openssh/sshdgenkeys.service b/staging/openssh/sshdgenkeys.service deleted file mode 100644 index 47c1c3fd6..000000000 --- a/staging/openssh/sshdgenkeys.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=SSH Key Generation -ConditionPathExists=|!/etc/ssh/ssh_host_key -ConditionPathExists=|!/etc/ssh/ssh_host_key.pub -ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key -ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub -ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key -ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key.pub -ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key -ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub - -[Service] -ExecStart=/usr/bin/ssh-keygen -A -Type=oneshot -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/staging/openssh/tmpfiles.d b/staging/openssh/tmpfiles.d deleted file mode 100644 index 7c5b26100..000000000 --- a/staging/openssh/tmpfiles.d +++ /dev/null @@ -1 +0,0 @@ -d /var/empty 0755 root root - diff --git a/staging/pathological/PKGBUILD b/staging/pathological/PKGBUILD deleted file mode 100644 index acf263add..000000000 --- a/staging/pathological/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 167400 2012-10-01 23:04:53Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=pathological -pkgver=1.1.3 -pkgrel=8 -pkgdesc="A puzzle game with the same feel as frozen bubble" -arch=('i686' 'x86_64') -url="http://pathological.sourceforge.net/" -license=('GPL') -depends=('python2-pygame') -makedepends=('netpbm') -install=pathological.install -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz - pathological.desktop pygame_181.patch encoding.patch) -sha1sums=('70b1c9e12704c7fd3b301aa90bceee2e8373b7b9' - '9b57f854ce9621542d810a21c61325de343950d7' - '6f0aa0f74a87bd53771f2db6d3117981c4f070d3' - '7dbaa9ced7da0094280425a68b4c8db3382f230a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 < ../encoding.patch - patch -p1 < ../pygame_181.patch - sed -i 's|X11R6/include/X11|share|' Makefile - sed -i 's|usr/games|usr/bin|' Makefile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' "${pkgdir}/usr/share/games/pathological/pathological.py" - install -D -m644 ../pathological.desktop "${pkgdir}/usr/share/applications/pathological.desktop" - chown root:games "${pkgdir}/var/games" - chmod 775 "${pkgdir}/var/games" - rm "${pkgdir}/var/games/pathological_scores" -} diff --git a/staging/pathological/encoding.patch b/staging/pathological/encoding.patch deleted file mode 100644 index 394875809..000000000 --- a/staging/pathological/encoding.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- pathological.py.orig 2009-07-10 01:49:39.000000000 -0400 -+++ pathological.py 2009-07-10 01:49:53.000000000 -0400 -@@ -1,4 +1,5 @@ - #!/usr/bin/python -+# -*- coding: utf-8 -*- - """ - Copyright (C) 2003 John-Paul Gignac - diff --git a/staging/pathological/pathological.desktop b/staging/pathological/pathological.desktop deleted file mode 100644 index 54817684f..000000000 --- a/staging/pathological/pathological.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Pathological -Comment=A puzzle game involving paths and marbles -Exec=pathological -Icon=pathological.xpm -Terminal=false -Type=Application -Categories=Application;Game; diff --git a/staging/pathological/pathological.install b/staging/pathological/pathological.install deleted file mode 100644 index 4bc716839..000000000 --- a/staging/pathological/pathological.install +++ /dev/null @@ -1,29 +0,0 @@ -post_install() { -if [ ! -e var/games/pathological_scores ]; then - cat << _EOF > var/games/pathological_scores -0 all-boards 1 John-Paul -0 all-boards 1 Kim -0 all-boards 1 Matths -0 all-boards 1 Carrie -0 all-boards 1 Mike -0 all-boards 1 Dale -0 all-boards 1 Alesh -0 all-boards 1 Thanks to -0 all-boards 1 everyone who -0 all-boards 1 contributed! -_EOF -fi - chown root:games var/games/pathological_scores - chmod 664 var/games/pathological_scores -} - -pre_upgrade() { - if [ -e usr/share/games/pathological/pathological_scores ]; then - mv usr/share/games/pathological/pathological_scores var/games/ - fi -} - -post_upgrade() { - chown root:games var/games/pathological_scores - chmod 664 var/games/pathological_scores -} diff --git a/staging/pathological/pygame_181.patch b/staging/pathological/pygame_181.patch deleted file mode 100644 index 4789f1519..000000000 --- a/staging/pathological/pygame_181.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- pathological-1.1.3.orig.orig/pathological.py 2009-04-15 10:50:11.000000000 -0400 -+++ pathological-1.1.3.orig/pathological.py 2009-04-15 10:50:56.000000000 -0400 -@@ -169,6 +169,7 @@ - if not pygame.mixer or not pygame.mixer.music: - print "Background music not available." - return -+ pygame.mixer.music.stop() - fullname = os.path.join('music', name) - try: - pygame.mixer.music.load(fullname) diff --git a/staging/perl-sdl/PKGBUILD b/staging/perl-sdl/PKGBUILD deleted file mode 100644 index 6b9965fb0..000000000 --- a/staging/perl-sdl/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 165571 2012-08-25 14:10:50Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> - -pkgname=perl-sdl -pkgver=2.540 -pkgrel=2 -pkgdesc="Simple DirectMedia Layer for Perl" -arch=(i686 x86_64) -license=(LGPL) -url="http://sdl.perl.org" -depends=(perl-alien-sdl perl-tie-simple - sdl_net sdl_ttf sdl_image sdl_mixer sdl_gfx sdl_pango mesa smpeg) -makedepends=('perl-module-build>=0.40') -options=('!emptydirs') -replaces=(sdl_perl) -conflicts=(sdl_perl) -provides=("sdl_perl=$pkgver") -# http://search.cpan.org/dist/SDL/ -_author=JTPALMER -source=(http://search.cpan.org/CPAN/authors/id/${_author::1}/${_author::2}/$_author/SDL-$pkgver.tar.gz) -md5sums=('1a5d7849cbdfde4982b28458e38ab172') - -build() { - cd SDL-$pkgver - # Perl selects the proper CFLAGS set for binary modules - unset CFLAGS - # install module in vendor directories - perl Build.PL installdirs=vendor - perl Build -} - -check() { - cd SDL-$pkgver - perl Build test || true -} - -package() { - cd SDL-$pkgver - perl Build install destdir="$pkgdir" -} diff --git a/staging/poppler/PKGBUILD b/staging/poppler/PKGBUILD deleted file mode 100644 index 9bf72ace2..000000000 --- a/staging/poppler/PKGBUILD +++ /dev/null @@ -1,80 +0,0 @@ -# $Id: PKGBUILD 168910 2012-10-16 14:16:26Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=poppler -pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.20.5 -pkgrel=1 -arch=(i686 x86_64) -license=('GPL') -makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection' 'icu') -options=('!libtool' '!emptydirs') -url="http://poppler.freedesktop.org/" -_testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a -source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz - http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('8a80ae83eb7a327b031808d09ee1d54d' - '9dc64c254a31e570507bdd4ad4ba629a') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - sed -i -e '/AC_PATH_XTRA/d' configure.ac - - autoreconf -fi - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --enable-cairo-output \ - --enable-xpdf-headers \ - --enable-libjpeg --enable-zlib \ - --enable-poppler-qt4 \ - --enable-poppler-glib - make -} - -check() { - cd "${srcdir}" - ln -sf test-${_testtag} test - cd ${pkgbase}-${pkgver} - LANG=en_US.UTF8 make check || /bin/true -} - -package_poppler() { - pkgdesc="PDF rendering library based on xpdf 3.0" - depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data') - conflicts=("poppler-qt3<${pkgver}") - - cd "${srcdir}/${pkgbase}-${pkgver}" - sed -e 's/^glib_subdir =.*/glib_subdir =/' \ - -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile - make DESTDIR="${pkgdir}" install - - rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4}.pc -} - -package_poppler-glib() { - pkgdesc="Poppler glib bindings" - depends=("poppler=${pkgver}" 'glib2') - - cd "${srcdir}/${pkgbase}-${pkgver}/poppler" - make DESTDIR="${pkgdir}" install-libLTLIBRARIES - cd "${srcdir}/${pkgbase}-${pkgver}/glib" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m644 ../poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/" - rm -f "${pkgdir}"/usr/lib/libpoppler.* - rm -f "${pkgdir}/usr/bin/poppler-glib-demo" -} - -package_poppler-qt() { - pkgdesc="Poppler Qt bindings" - depends=("poppler=${pkgver}" 'qt') - - cd "${srcdir}/${pkgbase}-${pkgver}/poppler" - make DESTDIR="${pkgdir}" install-libLTLIBRARIES - cd "${srcdir}/${pkgbase}-${pkgver}/qt4" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/" - rm -f "${pkgdir}"/usr/lib/libpoppler.* -} diff --git a/staging/pork/PKGBUILD b/staging/pork/PKGBUILD deleted file mode 100644 index f927a6f45..000000000 --- a/staging/pork/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 71194 2012-05-24 17:29:40Z jlichtblau $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=pork -pkgver=0.99.8.1 -pkgrel=6 -pkgdesc="Console-based AOL Instant Messenger & IRC client" -arch=('i686' 'x86_64') -url="http://dev.ojnk.net/" -license=('GPL') -depends=('ncurses' 'perl') -source=(http://downloads.sourceforge.net/sourceforge/ojnk/$pkgname-$pkgver.tar.gz) -sha256sums=('f0d4cad21017fd75b3c200342c54dd56d9ff7bc38d1e9b3c8ba686ba53d585ed') - -build() { - cd $pkgname-$pkgver - - ./configure --prefix=/usr - make -} - -package() { - cd $pkgname-$pkgver - - make DESTDIR=${pkgdir} install -} diff --git a/staging/ppl/PKGBUILD b/staging/ppl/PKGBUILD deleted file mode 100644 index 0e5798dcd..000000000 --- a/staging/ppl/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 162774 2012-06-30 08:11:58Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: ezzetabi <ezzetabi at gawab dot com> - -pkgname=ppl -pkgver=1.0 -pkgrel=1 -pkgdesc="A modern library for convex polyhedra and other numerical abstractions." -arch=('i686' 'x86_64') -url="http://bugseng.com/products/ppl" -license=('GPL3') -depends=('gmp>=5.0') -options=('!docs' '!libtool') -source=(http://bugseng.com/products/ppl/download/ftp/releases/$pkgver/ppl-$pkgver.tar.gz{,.sign}) -md5sums=('c4566928c6b7bb63e95f96d1a7b5cb4c' - '5f490df826c76fed296060ca8fca4eb5') - -build() { - cd $srcdir/ppl-$pkgver - ./configure --prefix=/usr --enable-interfaces="c,cxx" - make -} - -check() { - cd $srcdir/ppl-$pkgver - make check -} - -package() { - cd $srcdir/ppl-$pkgver - make DESTDIR=$pkgdir install -} - diff --git a/staging/psiconv/PKGBUILD b/staging/psiconv/PKGBUILD deleted file mode 100644 index 6936b4b7f..000000000 --- a/staging/psiconv/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 169523 2012-10-23 01:05:39Z eric $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=psiconv -pkgver=0.9.8 -pkgrel=10 -pkgdesc="Converts Psion 5(MX) files to more commonly used file formats" -arch=('i686' 'x86_64') -url="http://software.frodo.looijaard.name/psiconv/" -license=('GPL') -depends=('imagemagick') -makedepends=('bc') -backup=('etc/psiconv/psiconv.conf') -options=('!libtool') -source=("http://software.frodo.looijaard.name/${pkgname}/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('8d7548e3c6b9cd408544736133728acd') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/pstoedit/PKGBUILD b/staging/pstoedit/PKGBUILD deleted file mode 100644 index c8cfb6c43..000000000 --- a/staging/pstoedit/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 169481 2012-10-21 23:53:55Z eric $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: damir <damir@archlinux.org> -# Contributor: Tobias Powalowski <t.powa@gmx.de> - -pkgname=pstoedit -pkgver=3.60 -pkgrel=3 -pkgdesc="Translates PostScript and PDF graphics into other vector formats" -arch=('i686' 'x86_64') -url="http://www.pstoedit.net/" -license=('GPL') -depends=('gcc-libs' 'plotutils' 'gd' 'imagemagick') -makedepends=('ghostscript') -options=('!libtool' '!makeflags') -source=("http://downloads.sourceforge.net/sourceforge/pstoedit/pstoedit-${pkgver}.tar.gz" - 'pstoedit-3.50-parallel.patch' 'pstoedit-3.50-plugin-close.patch') -sha1sums=('649ade3d873429548eb6dd9f3e13cb79a8d6a1a2' - '6e278b164d3e59fbb11e7fd5ae8ffb038932d69a' - '54bbe019de66eb4cb8525371462595d21fbd074e') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i 's/-pedantic//' configure - - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/pstoedit/pstoedit-3.50-parallel.patch b/staging/pstoedit/pstoedit-3.50-parallel.patch deleted file mode 100644 index 4f1f73b04..000000000 --- a/staging/pstoedit/pstoedit-3.50-parallel.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/src/Makefile.am b/src/Makefile.am -index d6178df..66f377b 100755 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -86,6 +86,7 @@ libp2edrvstd_la_SOURCES= \ - $(sample_drivers_src) - libp2edrvstd_la_LIBADD=-L. libpstoedit.la - libp2edrvstd_la_LDFLAGS=-no-undefined -module -+libp2edrvstd_la_DEPENDENCIES = libpstoedit.la - - #libp2edrvplugins_la_SOURCES=drvmif.cpp drvcgm.cpp drvrtf.cpp drvwwmf.cpp - #libp2edrvplugins_la_LIBADD= -@@ -95,15 +96,18 @@ libp2edrvstd_la_LDFLAGS=-no-undefined -module - libp2edrvlplot_la_SOURCES=drvlplot.cpp drvlplot.h initlibrary.cpp - libp2edrvlplot_la_LIBADD=$(LIBPLOTTER_LDFLAGS) -L. libpstoedit.la - libp2edrvlplot_la_LDFLAGS=-no-undefined -module -+libp2edrvlplot_la_DEPENDENCIES = libpstoedit.la - - libp2edrvswf_la_SOURCES=drvswf.cpp drvswf.h initlibrary.cpp - libp2edrvswf_la_LIBADD=$(LIBMING_LDFLAGS) -L. libpstoedit.la - libp2edrvswf_la_LDFLAGS=-no-undefined -module -+libp2edrvswf_la_DEPENDENCIES = libpstoedit.la - - # note the __ stand for ++ - automake treats all no alphanums chars as _ - libp2edrvmagick___la_SOURCES=drvmagick++.cpp drvmagick++.h initlibrary.cpp - libp2edrvmagick___la_LIBADD=-L. libpstoedit.la - libp2edrvmagick___la_LDFLAGS=-no-undefined ${LIBMAGICK_LDFLAGS} -module -+libp2edrvmagick___la_DEPENDENCIES = libpstoedit.la - # moved to configure.ac because needed only for g++ libp2edrvmagick___la_CPPFLAGS=$(LIBMAGICK_CFLAGS) $(AM_CPPFLAGS) -Wno-long-long - - if USE_EMFBYSOURCE -@@ -113,6 +117,7 @@ else - libp2edrvwmf_la_SOURCES=drvwmf.cpp drvwmf.h initlibrary.cpp - libp2edrvwmf_la_LDFLAGS=-no-undefined $(LIBEMF_LDFLAGS) -L. libpstoedit.la -module - endif -+libp2edrvwmf_la_DEPENDENCIES = libpstoedit.la - - libpstoedit_la_SOURCES = \ - dynload.cpp dynload.h \ -@@ -135,6 +140,7 @@ libpstoedit_la_LDFLAGS = -no-undefined - - pstoedit_SOURCES = cmdmain.cpp - pstoedit_LDFLAGS = -no-undefined -L. libpstoedit.la ${LIBLD_LDFLAGS} -+pstoedit_DEPENDENCIES = libpstoedit.la - - pkginclude_HEADERS = \ - pstoedit.h \ diff --git a/staging/pstoedit/pstoedit-3.50-plugin-close.patch b/staging/pstoedit/pstoedit-3.50-plugin-close.patch deleted file mode 100644 index 6787d6aef..000000000 --- a/staging/pstoedit/pstoedit-3.50-plugin-close.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://bugzilla.redhat.com/507035 - -diff --git a/src/dynload.cpp b/src/dynload.cpp -index c0db355..7c073ef 100644 ---- a/src/dynload.cpp -+++ b/src/dynload.cpp -@@ -147,7 +147,6 @@ void DynLoader::close() - - DynLoader::~DynLoader() - { -- close(); - libname=0; - } - diff --git a/staging/ptlib/PKGBUILD b/staging/ptlib/PKGBUILD deleted file mode 100644 index d2901620b..000000000 --- a/staging/ptlib/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 161375 2012-06-10 12:11:23Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=ptlib -pkgver=2.10.5 -pkgrel=1 -pkgdesc="Portable Windows Library" -arch=('i686' 'x86_64') -url="http://www.opalvoip.org" -license=('GPL') -depends=('sdl' 'libpulse' 'v4l-utils' 'libldap') -replaces=('pwlib') -conflicts=('pwlib') -source=(http://downloads.sourceforge.net/sourceforge/opalvoip/$pkgname-$pkgver.tar.bz2) -md5sums=('20e0bc3cc85affed55e1481bf96c8c6b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --libdir=/usr/lib \ - --sysconfdir=/etc --localstatedir=/var \ - --enable-opal --enable-plugins \ - --enable-oss --enable-v4l2 \ - --disable-avc --enable-sdl \ - --enable-ipv6 --enable-v4l \ - --enable-dc --disable-odbc \ - --enable-expat --enable-httpforms - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} -md5sums=('a5a571457ff3a398995b34f66d6c3cbb') diff --git a/staging/pyalpm/PKGBUILD b/staging/pyalpm/PKGBUILD deleted file mode 100644 index c9d420471..000000000 --- a/staging/pyalpm/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# Maintainer : Rémy Oudompheng <remy@archlinux.org> - -pkgname=pyalpm -pkgver=0.5.3 -pkgrel=2 -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>=4') -source=("ftp://ftp.archlinux.org/other/pyalpm/$pkgname-$pkgver.tar.gz") -md5sums=('a76019106d17de3a5933c773013a63d1') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - python setup.py build -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - python setup.py install --root=${pkgdir} -} - diff --git a/staging/pycrypto/PKGBUILD b/staging/pycrypto/PKGBUILD deleted file mode 100644 index d4987b4b3..000000000 --- a/staging/pycrypto/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 168667 2012-10-13 21:58:25Z eric $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Kritoke <kritoke@gamebox.net> - -pkgbase=pycrypto -pkgname=('python2-crypto' 'python-crypto') -pkgver=2.6 -pkgrel=3 -arch=('i686' 'x86_64') -makedepends=('python2' 'python') -url="http://www.dlitz.net/software/pycrypto/" -license=('custom') -source=("http://ftp.dlitz.net/pub/dlitz/crypto/${pkgbase}/${pkgbase}-${pkgver}.tar.gz") -sha256sums=('7293c9d7e8af2e44a82f86eb9c3b058880f4bcc884bf3ad6c8a34b64986edde8') - -build() { - cd "${srcdir}" - find ${pkgbase}-${pkgver}/LEGAL -type f -exec chmod 644 {} \; - find ${pkgbase}-${pkgver}/LEGAL -type d -exec chmod 755 {} \; - - cp -r ${pkgbase}-${pkgver} ${pkgbase}-${pkgver}-py3 - cd "${srcdir}/${pkgbase}-${pkgver}" - python2 setup.py build - - cd "${srcdir}/${pkgbase}-${pkgver}-py3" - python setup.py build -} - -package_python2-crypto() { - pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python 2." - depends=('python2') - replaces=('pycrypto') - conflicts=('pycrypto') - provides=("pycrypto=${pkgver}") - - cd "${srcdir}/${pkgbase}-${pkgver}" - python2 setup.py install --root="${pkgdir}" --optimize=1 - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/" - cp -r LEGAL "${pkgdir}/usr/share/licenses/${pkgname}/" -} - -package_python-crypto() { - pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python 3." - depends=('python') - - cd "${srcdir}/${pkgbase}-${pkgver}-py3" - python setup.py install --root="${pkgdir}" --optimize=1 - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/" - cp -r LEGAL "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/pygobject/PKGBUILD b/staging/pygobject/PKGBUILD deleted file mode 100644 index c5b861096..000000000 --- a/staging/pygobject/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id: PKGBUILD 168794 2012-10-16 00:45:16Z allan $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgbase=pygobject -pkgname=(python-gobject python2-gobject pygobject-devel) -pkgver=3.2.2 -pkgrel=2 -arch=('i686' 'x86_64') -url="https://live.gnome.org/PyGObject" -license=('LGPL') -makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 'gobject-introspection') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) -options=('!libtool') -sha256sums=('4653790baaff0176fd814b88cfb5378c45906a120b25d01be2554f423b726eb0') - -build() { - cp -a "$pkgbase-$pkgver" python2-build - mkdir devel - - ( - cd python2-build - export PYTHON=/usr/bin/python2 - ./configure --prefix=/usr - make - ) - - ( - cd "$pkgbase-$pkgver" - ./configure --prefix=/usr - make - ) -} - -package_python-gobject() { - pkgdesc="Python 3 bindings for GObject" - depends=('gobject-introspection' 'python-cairo' "pygobject-devel=$pkgver") - - cd "$pkgbase-$pkgver" - make DESTDIR="$pkgdir" install - rm -r "$pkgdir"/usr/{include,lib/pkgconfig} -} - -package_python2-gobject() { - pkgdesc="Python 2 bindings for GObject" - depends=('gobject-introspection' 'python2-cairo' "pygobject-devel=$pkgver") - - cd "python2-build" - make DESTDIR="$pkgdir" install - mv "$pkgdir"/usr/{include,lib/pkgconfig} "$srcdir/devel" -} - -package_pygobject-devel() { - pkgdesc="Development files for the pygobject bindings" - cd "devel" - mkdir -p "$pkgdir"/usr/{include,lib} - mv include "$pkgdir/usr/" - mv pkgconfig "$pkgdir/usr/lib/" -} diff --git a/staging/pygobject2/PKGBUILD b/staging/pygobject2/PKGBUILD deleted file mode 100644 index 4ba2bfa2a..000000000 --- a/staging/pygobject2/PKGBUILD +++ /dev/null @@ -1,86 +0,0 @@ -# $Id: PKGBUILD 168792 2012-10-16 00:40:21Z allan $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=pygobject2 -pkgname=(python-gobject2 python2-gobject2 pygobject2-devel) -pkgver=2.28.6 -pkgrel=7 -arch=('i686' 'x86_64') -url="http://www.pygtk.org/" -license=('LGPL') -makedepends=('python' 'python2') -source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/pygobject-${pkgver}.tar.xz - python2-fix-type.patch - python3-fix-build.patch - python3-fix-maketrans.patch) -options=('!libtool') -sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8' - 'b7b415499ffc0817cf551edf76a3fe47938db2c9f6240046eae681e6ef9b37ea' - 'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca' - '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a') - -build() { - cd "${srcdir}" - cp -a "pygobject-${pkgver}" python2-build - mkdir devel - - ( - cd python2-build - export PYTHON=/usr/bin/python2 - ./configure --prefix=/usr --disable-introspection - make - ) - - ( - cd "pygobject-${pkgver}" - #patches available in 2.28 branch but unreleased. - patch -Np1 -i "${srcdir}/python2-fix-type.patch" - patch -Np1 -i "${srcdir}/python3-fix-build.patch" - patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch" - - ./configure --prefix=/usr --disable-introspection - make - ) -} - -package_python-gobject2() { - pkgdesc="Python 3 bindings for GObject2" - depends=('glib2' 'pygobject2-devel' 'python') - replaces=('py3gobject') - provides=("py3gobject=$pkgver") - - cd "${srcdir}/pygobject-${pkgver}" - make DESTDIR="${pkgdir}" install - - # Delete devel stuff - rm -r "$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}} -} - -package_python2-gobject2() { - pkgdesc="Python 2 bindings for GObject2" - depends=('glib2' 'pygobject2-devel' 'python2') - replaces=('pygobject') - provides=("pygobject=$pkgver") - - cd "${srcdir}/python2-build" - make DESTDIR="${pkgdir}" install - - find "$pkgdir"/usr/share/pygobject -name '*.py' | \ - xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" - - # Split devel stuff - mv "$pkgdir"/usr/{include,lib/pkgconfig,share/{gtk-doc,pygobject/xsl}} \ - "$srcdir/devel/" -} - -package_pygobject2-devel() { - pkgdesc="Development files for the pygobject bindings" - - cd "${srcdir}/devel" - mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject} - - mv include "$pkgdir/usr/" - mv pkgconfig "$pkgdir/usr/lib/" - mv gtk-doc "$pkgdir/usr/share/" - mv xsl "$pkgdir/usr/share/pygobject/" -} diff --git a/staging/pygobject2/python2-fix-type.patch b/staging/pygobject2/python2-fix-type.patch deleted file mode 100644 index 78e7ddfd5..000000000 --- a/staging/pygobject2/python2-fix-type.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001 -From: Ryan Lortie <desrt@desrt.ca> -Date: Mon, 12 Mar 2012 16:44:14 -0400 -Subject: gio-types.defs: change some enums to flags - -These flags types were originally incorrectly handled in glib as being -enums. That bug was fixed, but they're still enums here, leading to -warnings about the mismatch. - -Change them to flags. - -https://bugzilla.gnome.org/show_bug.cgi?id=668522 ---- - gio/gio-types.defs | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gio/gio-types.defs b/gio/gio-types.defs -index 331e0bc..7eee5c8 100644 ---- a/gio/gio-types.defs -+++ b/gio/gio-types.defs -@@ -526,7 +526,7 @@ - ) - ) - --(define-enum MountMountFlags -+(define-flags MountMountFlags - (in-module "gio") - (c-name "GMountMountFlags") - (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS") -@@ -545,7 +545,7 @@ - ) - ) - --(define-enum DriveStartFlags -+(define-flags DriveStartFlags - (in-module "gio") - (c-name "GDriveStartFlags") - (gtype-id "G_TYPE_DRIVE_START_FLAGS") -@@ -770,7 +770,7 @@ - ) - ) - --(define-enum SocketMsgFlags -+(define-flags SocketMsgFlags - (in-module "gio") - (c-name "GSocketMsgFlags") - (gtype-id "G_TYPE_SOCKET_MSG_FLAGS") --- -1.7.9.1 - diff --git a/staging/pygobject2/python3-fix-build.patch b/staging/pygobject2/python3-fix-build.patch deleted file mode 100644 index 4cb8cfe57..000000000 --- a/staging/pygobject2/python3-fix-build.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e2dc4ac346a16b6976b92e84819c7203629beb4a Mon Sep 17 00:00:00 2001 -From: Ignacio Casal Quinteiro <icq@gnome.org> -Date: Thu, 21 Apr 2011 14:52:20 +0000 -Subject: [python3] fix build. PYcairo_IMPORT doesn't exists anymore - ---- -diff --git a/gi/pygi-foreign-cairo.c b/gi/pygi-foreign-cairo.c -index 81b9865..edf52d7 100644 ---- a/gi/pygi-foreign-cairo.c -+++ b/gi/pygi-foreign-cairo.c -@@ -30,7 +30,7 @@ - #include <pycairo/py3cairo.h> - #endif - --Pycairo_CAPI_t *Pycairo_CAPI; -+static Pycairo_CAPI_t *Pycairo_CAPI; - - #include "pygi-foreign.h" - -@@ -117,7 +117,12 @@ cairo_surface_release (GIBaseInfo *base_info, - static PyMethodDef _gi_cairo_functions[] = {0,}; - PYGLIB_MODULE_START(_gi_cairo, "_gi_cairo") - { -+#if PY_VERSION_HEX < 0x03000000 - Pycairo_IMPORT; -+#else -+ Pycairo_CAPI = (Pycairo_CAPI_t*) PyCObject_Import("cairo", "CAPI"); -+#endif -+ - if (Pycairo_CAPI == NULL) - return PYGLIB_MODULE_ERROR_RETURN; - --- -cgit v0.9 diff --git a/staging/pygobject2/python3-fix-maketrans.patch b/staging/pygobject2/python3-fix-maketrans.patch deleted file mode 100644 index f5bc0e77c..000000000 --- a/staging/pygobject2/python3-fix-maketrans.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 667bec76ccbc85cc1d54a0e68977dbda241c028c Mon Sep 17 00:00:00 2001 -From: Martin Pitt <martin.pitt@ubuntu.com> -Date: Wed, 13 Jul 2011 06:42:22 +0000 -Subject: [python3] Fix maketrans import - -Python3 moved the maketrans() function from the string module to a str method. -This unbreaks gi/module.py for Python 3 again. ---- -diff --git a/gi/module.py b/gi/module.py -index 70df76c..d56bdaf 100644 ---- a/gi/module.py -+++ b/gi/module.py -@@ -24,7 +24,11 @@ from __future__ import absolute_import - - import os - import gobject --import string -+try: -+ maketrans = ''.maketrans -+except AttributeError: -+ # fallback for Python 2 -+ from string import maketrans - - import gi - from .overrides import registry -@@ -124,7 +128,7 @@ class IntrospectionModule(object): - # Don't use upper() here to avoid locale specific - # identifier conversion (e. g. in Turkish 'i'.upper() == 'i') - # see https://bugzilla.gnome.org/show_bug.cgi?id=649165 -- ascii_upper_trans = string.maketrans( -+ ascii_upper_trans = maketrans( - 'abcdefgjhijklmnopqrstuvwxyz', - 'ABCDEFGJHIJKLMNOPQRSTUVWXYZ') - for value_info in info.get_values(): --- -cgit v0.9 diff --git a/staging/pyopenssl/PKGBUILD b/staging/pyopenssl/PKGBUILD deleted file mode 100644 index 12bf75be8..000000000 --- a/staging/pyopenssl/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 168651 2012-10-13 20:29:33Z eric $ -# Maintainer : Ionut Biru<ibiru@archlinux.org> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgbase=pyopenssl -pkgname=('python-pyopenssl' 'python2-pyopenssl') -pkgver=0.13 -pkgrel=2 -arch=('i686' 'x86_64') -url="http://pypi.python.org/pypi/pyOpenSSL" -license=('LGPL2.1') -makedepends=('python' 'python2' 'openssl') -source=(http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${pkgver}.tar.gz) -md5sums=('767bca18a71178ca353dff9e10941929') - -build() { - cd "${srcdir}" - cp -a "pyOpenSSL-${pkgver}"{,-python2} - - #build python 3 module - cd "pyOpenSSL-${pkgver}" - python setup.py build - - #build python 2 module - cd ../"pyOpenSSL-${pkgver}-python2" - python2 setup.py build -} - -package_python-pyopenssl(){ - pkgdesc="Python3 wrapper module around the OpenSSL library" - depends=('python>=3.3' 'openssl') - replaces=('pyopenssl') - provides=('pyopenssl') - conflicts=('pyopenssl') - - cd "${srcdir}/pyOpenSSL-${pkgver}" - python setup.py install --root "${pkgdir}" --optimize=1 -} - -package_python2-pyopenssl(){ - pkgdesc="Python2 wrapper module around the OpenSSL library" - depends=('python2>=2.7' 'openssl') - - cd "${srcdir}/pyOpenSSL-${pkgver}-python2" - python2 setup.py install --root "${pkgdir}" --optimize=1 -} diff --git a/staging/pyqt/PKGBUILD b/staging/pyqt/PKGBUILD deleted file mode 100644 index 6f3b1a230..000000000 --- a/staging/pyqt/PKGBUILD +++ /dev/null @@ -1,90 +0,0 @@ -# $Id: PKGBUILD 168744 2012-10-15 09:20:47Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> -# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> - -pkgbase=pyqt -pkgname=('pyqt-common' 'pyqt' 'python2-pyqt') -pkgver=4.9.5 -pkgrel=2 -arch=('i686' 'x86_64') -url="http://riverbankcomputing.co.uk/software/pyqt/intro" -license=('GPL') -makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon' - 'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus') -source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz") -md5sums=('e4cdd6619c63655f7510efb4df8462fb') - -build() { - cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver} - - cd PyQt-x11-gpl-${pkgver} - python configure.py \ - --confirm-license \ - --qsci-api - - # Thanks Gerardo for the rpath fix - find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g' - - make - - ### Python2 version ### - cd ../Py2Qt-x11-gpl-${pkgver} - python2 configure.py \ - --confirm-license \ - -v /usr/share/sip \ - --qsci-api - - # Thanks Gerardo for the rpath fix - find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g' - - make -} - -package_pyqt-common(){ - pkgdesc="Common PyQt files shared between pyqt and python2-pyqt" - - cd PyQt-x11-gpl-${pkgver} - make -C pyrcc DESTDIR="${pkgdir}" install - make -C pylupdate DESTDIR="${pkgdir}" install - - install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api -} - -package_pyqt(){ - pkgdesc="A set of Python 3.x bindings for the Qt toolkit" - depends=('qtwebkit' 'python-sip' 'python-dbus' 'pyqt-common') - optdepends=('phonon: enable audio and video in PyQt applications' - 'qscintilla: QScintilla API' - 'qt-assistant-compat: add PyQt online help in Qt Assistant') - - cd PyQt-x11-gpl-${pkgver} - # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR - make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install - - # Provided by pyqt-common - rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4} - rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api -} - -package_python2-pyqt(){ - pkgdesc="A set of Python 2.x bindings for the Qt toolkit" - depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt-common') - optdepends=('phonon: enable audio and video in PyQt applications' - 'python2-opengl: enable OpenGL 3D graphics in PyQt applications' - 'qscintilla: QScintilla API' - 'qt-assistant-compat: add PyQt online help in Qt Assistant') - provides=('python2-qt') - - cd Py2Qt-x11-gpl-${pkgver} - # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR - make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install - - # Fix conflicts with pyqt - mv "${pkgdir}"/usr/bin/{,python2-}pyuic4 - - # Provided by pyqt - rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4} - rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so - rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api -} diff --git a/staging/python-cairo/PKGBUILD b/staging/python-cairo/PKGBUILD deleted file mode 100644 index 578fec081..000000000 --- a/staging/python-cairo/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 167695 2012-10-03 01:10:24Z stephane $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=python-cairo -pkgver=1.10.0 -pkgrel=2 -pkgdesc="Python bindings for the cairo graphics library" -arch=('i686' 'x86_64') -license=('LGPL3') -depends=('python' 'cairo') -makedepends=('pkg-config') -options=('!libtool') -source=(http://cairographics.org/releases/pycairo-${pkgver}.tar.bz2) -url="http://www.cairographics.org/pycairo" -md5sums=('e6fd3f2f1e6a72e0db0868c4985669c5') - -build() { - cd "${srcdir}/pycairo-${pkgver}" - - # Ensure that ./waf has created the cached unpacked version - # of the wafadmin source tree. - # This will be created to a subdirectory like - # .waf3-1.5.18-a7b91e2a913ce55fa6ecdf310df95752 - python3 ./waf --version - - ./waf configure --prefix=/usr - ./waf build -} - -package() { - cd "${srcdir}/pycairo-${pkgver}" - ./waf install --destdir="${pkgdir}" -} diff --git a/staging/python-egenix-mx-base/PKGBUILD b/staging/python-egenix-mx-base/PKGBUILD deleted file mode 100644 index f48fd8fb8..000000000 --- a/staging/python-egenix-mx-base/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 168671 2012-10-13 23:05:54Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> - -pkgbase=python-egenix-mx-base -pkgname=('python2-egenix-mx-base') -_origname=egenix-mx-base -pkgver=3.2.4 -pkgrel=2 -pkgdesc="A collection of Python tools" -arch=('i686' 'x86_64') -license=('custom') -url="http://www.egenix.com/products/python/mxBase/" -makedepends=('python2') -source=("http://downloads.egenix.com/python/${_origname}-${pkgver}.tar.gz") -sha1sums=('22d7fcbd582177f9a43245eadc3644f3b48cc9a7') - -build() { - cd "${srcdir}/${_origname}-${pkgver}" - - find . -name \*.py -exec sed -i -e "s|^#!.*python|#!/usr/bin/python2|" {} \; - - python2 setup.py build -} - -package_python2-egenix-mx-base() { - depends=('python2>=2.7') - cd "${srcdir}/${_origname}-${pkgver}" - python2 setup.py install --root="${pkgdir}" --skip-build --optimize=1 - install -D -m644 COPYRIGHT "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/staging/python-iwscan/PKGBUILD b/staging/python-iwscan/PKGBUILD deleted file mode 100644 index 3abb6747e..000000000 --- a/staging/python-iwscan/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 168715 2012-10-14 20:19:42Z eric $ -# Maintainer: Daniel Isenmann <daniel@archlinux.org> - -pkgbase=python-iwscan -pkgname=python2-iwscan -pkgver=20090609 -pkgrel=4 -pkgdesc="A Python interface to iwlist, using the iwlib library" -arch=('i686' 'x86_64') -url="http://projects.otaku42.de/browser/python-iwscan" -license=('LGPL') -depends=('python2' 'wireless_tools') -conflicts=('python-iwscan<=20090609-3') -replaces=('python-iwscan<=20090609-3') -source=(ftp://ftp.archlinux.org/other/${pkgbase}/${pkgbase}-20090609.tar.gz) -md5sums=('30fbe8ad3b07e67c1c35db2de16077d8') - -build() { - cd "${srcdir}/${pkgbase}" - python2 setup.py build -} - -package_python2-iwscan() { - cd "${srcdir}/${pkgbase}" - python2 setup.py install --root="${pkgdir}" -} diff --git a/staging/python-lxml/PKGBUILD b/staging/python-lxml/PKGBUILD deleted file mode 100644 index 33aa7dc70..000000000 --- a/staging/python-lxml/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 168387 2012-10-09 21:43:30Z eric $ -# Maintainer: - -pkgname=('python-lxml' 'python2-lxml') -pkgver=3.0 -pkgrel=1 -pkgdesc="Python binding for the libxml2 and libxslt libraries" -arch=('i686' 'x86_64') -license=('BSD' 'custom') -url="http://lxml.de/" -makedepends=('python2' 'python' 'libxslt') -source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc}) -sha1sums=('8dbbd03a637bb563113cf07049a4d5a109369441' - 'b38447fd3f9cfb30b4d56ffe3bec42739afb2947') - -check() { - cd "${srcdir}"/lxml-$pkgver - make PYTHON=python2 test - make PYTHON=python test -} - -package_python2-lxml() { - depends=('python2' 'libxslt') - optdepends=('python2-beautifulsoup3: support for parsing not well formed HTML') - - cd "${srcdir}"/lxml-$pkgver - python2 setup.py install --root="${pkgdir}" --optimize=1 - - install -Dm644 LICENSES.txt \ - "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE - install -Dm644 doc/licenses/BSD.txt \ - "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt - install -Dm644 doc/licenses/elementtree.txt \ - "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt -} - -package_python-lxml() { - depends=('python' 'libxslt') - - cd "${srcdir}"/lxml-$pkgver - python setup.py install --root="${pkgdir}" --optimize=1 - - install -Dm644 LICENSES.txt \ - "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE - install -Dm644 doc/licenses/BSD.txt \ - "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt - install -Dm644 doc/licenses/elementtree.txt \ - "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt -} diff --git a/staging/python-markupsafe/PKGBUILD b/staging/python-markupsafe/PKGBUILD deleted file mode 100644 index 0ead0adad..000000000 --- a/staging/python-markupsafe/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 168655 2012-10-13 20:45:16Z eric $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Alex Anthony <alex.anthony28991@gmail.com> - -pkgname=('python-markupsafe' 'python2-markupsafe') -pkgver=0.15 -pkgrel=2 -pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python" -arch=('i686' 'x86_64') -url="http://pypi.python.org/pypi/MarkupSafe" -license=('custom') -makedepends=('python-distribute' 'python2-distribute') -source=("http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz") -md5sums=('4e7c4d965fe5e033fa2d7bb7746bb186') - -build() { - cp -r MarkupSafe-${pkgver} python2-MarkupSafe-${pkgver} - cd "${srcdir}/MarkupSafe-${pkgver}" - python setup.py build - - cd "${srcdir}/python2-MarkupSafe-${pkgver}" - python2 setup.py build -} - -package_python-markupsafe() { - depends=('python') - - cd "${srcdir}/MarkupSafe-${pkgver}" - python setup.py install --root="${pkgdir}" --optimize=1 - - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python-markupsafe/LICENSE" -} - -package_python2-markupsafe() { - depends=('python2') - - cd "${srcdir}/python2-MarkupSafe-${pkgver}" - python2 setup.py install --root="${pkgdir}" --optimize=1 - - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python2-markupsafe/LICENSE" -} diff --git a/staging/python-notify/PKGBUILD b/staging/python-notify/PKGBUILD deleted file mode 100644 index 6cf46c8dc..000000000 --- a/staging/python-notify/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 168721 2012-10-14 20:45:08Z eric $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> - -pkgbase=python-notify -pkgname=python2-notify -pkgver=0.1.1 -pkgrel=12 -pkgdesc="Python bindings for libnotify" -arch=('i686' 'x86_64') -url="http://www.galago-project.org/" -license=('GPL') -depends=('pygtk>=2.22.0' 'libnotify>=0.7.1') -makedepends=('python2') -conflicts=('python-notify<=0.1.1-11') -replaces=('python-notify<=0.1.1-11') -options=(!libtool) -source=(http://www.galago-project.org/files/releases/source/notify-python/notify-python-${pkgver}.tar.gz - libnotify07.patch - notify-python-0.1.1-fix-GTK-symbols.patch) -md5sums=('8f0ef0939cc8edd2efd896ce5ba80cf4' - 'b40c4542575d5aef559908fe60a21634' - 'c6922028da5951e69a6a0167bdb4461c') - -build() { - cd "${srcdir}/notify-python-${pkgver}" - - patch -Np1 -i "${srcdir}/libnotify07.patch" - patch -Np1 -i "${srcdir}/notify-python-0.1.1-fix-GTK-symbols.patch" - - ./configure --prefix=/usr - - # WARNING - we touch src/pynotify.override in build because upstream did not rebuild pynotify.c - # from the input definitions, this forces pynotify.c to be regenerated, at some point this can be removed - touch src/pynotify.override - - make clean - make -} - -package_python2-notify() { - cd "${srcdir}/notify-python-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/python-notify/libnotify07.patch b/staging/python-notify/libnotify07.patch deleted file mode 100644 index 289573d50..000000000 --- a/staging/python-notify/libnotify07.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up notify-python-0.1.1/src/pynotify.defs.notify070 notify-python-0.1.1/src/pynotify.defs ---- notify-python-0.1.1/src/pynotify.defs.notify070 2010-11-02 17:11:14.928179237 -0400 -+++ notify-python-0.1.1/src/pynotify.defs 2010-11-02 17:11:51.153180231 -0400 -@@ -38,7 +38,6 @@ - '("const-gchar*" "summary") - '("const-gchar*" "message" (null-ok) (default "NULL")) - '("const-gchar*" "icon" (null-ok) (default "NULL")) -- '("GtkWidget*" "attach" (null-ok) (default "NULL")) - ) - ) - -@@ -53,24 +52,6 @@ - ) - ) - --(define-method attach_to_widget -- (of-object "NotifyNotification") -- (c-name "notify_notification_attach_to_widget") -- (return-type "none") -- (parameters -- '("GtkWidget*" "attach") -- ) --) -- --(define-method attach_to_status_icon -- (of-object "NotifyNotification") -- (c-name "notify_notification_attach_to_status_icon") -- (return-type "none") -- (parameters -- '("GtkStatusIcon*" "attach") -- ) --) -- - (define-method show - (of-object "NotifyNotification") - (c-name "notify_notification_show") diff --git a/staging/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch b/staging/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch deleted file mode 100644 index f985c0136..000000000 --- a/staging/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up notify-python-0.1.1/src/__init__.py.BAD notify-python-0.1.1/src/__init__.py ---- notify-python-0.1.1/src/__init__.py.BAD 2010-08-31 09:04:45.353844005 -0400 -+++ notify-python-0.1.1/src/__init__.py 2010-08-31 09:04:49.281844300 -0400 -@@ -1 +1,21 @@ -+""" -+Fedora's libnotify.so is not linked against GTK2 or GTK3. The idea -+was to support being linked against different parallel-installable -+GTK stacks. -+ -+Unfortunately, python needs to jump through some special hoops in order -+to share symbols with extension modules, specifically, pygtk, which does -+link against GTK2. -+ -+Without using sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL), -+the result is: -+libnotify-WARNING **: Missing symbol 'gdk_screen_make_display_name' -+ -+Thanks to David Malcolm for figuring out the workaround. -+""" -+import ctypes -+import sys -+sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL) -+import gtk -+ - from _pynotify import * diff --git a/staging/python-pygame/PKGBUILD b/staging/python-pygame/PKGBUILD deleted file mode 100644 index 2cd71fc35..000000000 --- a/staging/python-pygame/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 167394 2012-10-01 22:41:51Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgbase=python-pygame -pkgname=python2-pygame -pkgver=1.9.1 -pkgrel=6 -pkgdesc="Python game library" -arch=('i686' 'x86_64') -url="http://www.pygame.org/" -license=('LGPL') -depends=('sdl_mixer' 'sdl_ttf' 'sdl_image' 'python2' 'portmidi') -source=(http://pygame.org/ftp/pygame-${pkgver}release.tar.gz \ - config.patch pygame-v4l.patch) -sha1sums=('a45aeb0623e36ae7a1707b5f41ee6274f72ca4fa' - '285815e28705d5a2aea53c9d952d35fddf10dd13' - '7e693fb2ef5ef636f9965ba1a4eb854f8b0b5070') - -build() { - cd "${srcdir}/pygame-${pkgver}release" - patch -Np0 -i "${srcdir}/config.patch" - patch -Np1 -i "${srcdir}/pygame-v4l.patch" -} - -package_python2-pygame() { - cd "${srcdir}/pygame-${pkgver}release" - python2 config.py -auto - python2 setup.py install --root="${pkgdir}" --prefix=/usr - -# Copying the examples and tests - cp -R examples lib/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame" - cp -R test/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame/tests" - - find "${pkgdir}" -type f -exec sed -i 's#/usr/bin/env python#/usr/bin/env python2#' {} + - -# Fixing permissions - chmod 644 "${pkgdir}"/usr/include/python2.7/pygame/* -} diff --git a/staging/python-pygame/config.patch b/staging/python-pygame/config.patch deleted file mode 100644 index b3dab162c..000000000 --- a/staging/python-pygame/config.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: config_unix.py -=================================================================== ---- config_unix.py (revision 2567) -+++ config_unix.py (working copy) -@@ -174,7 +174,7 @@ - - for d in DEPS[1:]: - if not d.found: -- if not confirm(""" -+ if "-auto" not in sys.argv and not confirm(""" - Warning, some of the pygame dependencies were not found. Pygame can still - compile and install, but games that depend on those missing dependencies - will not run. Would you like to continue the configuration?"""): -Index: config_msys.py -=================================================================== ---- config_msys.py (revision 2567) -+++ config_msys.py (working copy) -@@ -283,7 +283,7 @@ - - for d in DEPS[1:]: - if not d.found: -- if not confirm(""" -+ if "-auto" not in sys.argv and not confirm(""" - Warning, some of the pygame dependencies were not found. Pygame can still - compile and install, but games that depend on those missing dependencies - will not run. Would you like to continue the configuration?"""): diff --git a/staging/python-pygame/pygame-v4l.patch b/staging/python-pygame/pygame-v4l.patch deleted file mode 100644 index 3b5a2b9d2..000000000 --- a/staging/python-pygame/pygame-v4l.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff -crB pygame-1.9.1release/Setup.in pygame-1.9.1release-v4lpatch//Setup.in -*** pygame-1.9.1release/Setup.in Thu Jul 2 06:41:56 2009 ---- pygame-1.9.1release-v4lpatch//Setup.in Thu Mar 24 17:31:22 2011 -*************** -*** 34,40 **** - _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG) - movie src/movie.c $(SDL) $(SMPEG) $(DEBUG) - scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG) -! _camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG) - pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG) - - GFX = src/SDL_gfx/SDL_gfxPrimitives.c ---- 34,40 ---- - _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG) - movie src/movie.c $(SDL) $(SMPEG) $(DEBUG) - scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG) -! _camera src/_camera.c src/camera_v4l2.c $(SDL) $(DEBUG) - pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG) - - GFX = src/SDL_gfx/SDL_gfxPrimitives.c -diff -crB pygame-1.9.1release/src/_camera.c pygame-1.9.1release-v4lpatch//src/_camera.c -*** pygame-1.9.1release/src/_camera.c Sun Mar 15 20:30:41 2009 ---- pygame-1.9.1release-v4lpatch//src/_camera.c Thu Mar 24 16:58:18 2011 -*************** -*** 160,179 **** - { - #if defined(__unix__) - if (v4l2_open_device(self) == 0) { -! if (v4l_open_device(self) == 0) { -! v4l2_close_device(self); -! return NULL; -! } else { -! self->camera_type = CAM_V4L; -! if (v4l_init_device(self) == 0) { -! v4l2_close_device(self); -! return NULL; -! } -! if (v4l_start_capturing(self) == 0) { -! v4l2_close_device(self); -! return NULL; -! } -! } - } else { - self->camera_type = CAM_V4L2; - if (v4l2_init_device(self) == 0) { ---- 160,167 ---- - { - #if defined(__unix__) - if (v4l2_open_device(self) == 0) { -! v4l2_close_device(self); -! return NULL; - } else { - self->camera_type = CAM_V4L2; - if (v4l2_init_device(self) == 0) { -diff -crB pygame-1.9.1release/src/camera.h pygame-1.9.1release-v4lpatch//src/camera.h -*** pygame-1.9.1release/src/camera.h Fri Oct 10 04:37:10 2008 ---- pygame-1.9.1release-v4lpatch//src/camera.h Thu Mar 24 16:44:32 2011 -*************** -*** 39,45 **** - - #include <asm/types.h> /* for videodev2.h */ - -- #include <linux/videodev.h> - #include <linux/videodev2.h> - #endif - ---- 39,44 ---- -*************** -*** 51,57 **** - #define RGB_OUT 1 - #define YUV_OUT 2 - #define HSV_OUT 4 -- #define CAM_V4L 1 - #define CAM_V4L2 2 - - struct buffer ---- 50,55 ---- -*************** -*** 111,118 **** - int v4l2_close_device (PyCameraObject* self); - int v4l2_open_device (PyCameraObject* self); - -- /* internal functions specific to v4l */ -- int v4l_open_device (PyCameraObject* self); -- int v4l_init_device(PyCameraObject* self); -- int v4l_start_capturing(PyCameraObject* self); - #endif ---- 109,112 ---- diff --git a/staging/python-pyspi/PKGBUILD b/staging/python-pyspi/PKGBUILD deleted file mode 100644 index e230fd562..000000000 --- a/staging/python-pyspi/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 168788 2012-10-16 00:26:49Z allan $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgbase=python-pyspi -pkgname=python2-pyspi -pkgver=0.6.1 -pkgrel=1 -pkgdesc="Python AT-SPI bindings" -arch=('i686' 'x86_64') -url="http://people.redhat.com/zcerza/dogtail" -license=('LGPL') -depends=('python2' 'at-spi') -makedepends=('pyrex') -conflicts=('python-pyspi<=0.6.1-5') -conflicts=('python-pyspi<=0.6.1-5') -source=("http://dlc.sun.com/osol/jds/downloads/sources/pyspi-${pkgver}.tar.gz" - 'pyspi-build.patch') -md5sums=('def336bd566ea688a06ec03db7ccf1f4' - '721f74cbae653a258c00b83acf7dd1da') - -build() { - cd ${srcdir}/pyspi-${pkgver} - patch -Np1 -i ${srcdir}/pyspi-build.patch - # Pyrex tells us to use __cinit__ instead of __new__ - sed -i 's/__new__/__cinit__/' pyspi.pyx -} - -package_python2-pyspi() { - cd ${srcdir}/pyspi-${pkgver} - python2 setup.py install --root=${pkgdir} -} diff --git a/staging/python-pyspi/pyspi-build.patch b/staging/python-pyspi/pyspi-build.patch deleted file mode 100644 index 3d12c5ed5..000000000 --- a/staging/python-pyspi/pyspi-build.patch +++ /dev/null @@ -1,1693 +0,0 @@ -diff -Naur pyspi-0.6.1-old/cspi.pxd pyspi-0.6.1/cspi.pxd ---- pyspi-0.6.1-old/cspi.pxd 2006-08-04 06:27:10.000000000 +1000 -+++ pyspi-0.6.1/cspi.pxd 2009-05-09 15:24:31.000000000 +1000 -@@ -14,9 +14,7 @@ - - ctypedef struct AccessibleTextRange - ctypedef struct AccessibleKeySet -- ctypedef enum SPIBoolean: -- FALSE = 0, -- TRUE -+ ctypedef unsigned int SPIBoolean - - ctypedef struct AccessibleEvent: - char *type -diff -Naur pyspi-0.6.1-old/pyspi.pyx pyspi-0.6.1/pyspi.pyx ---- pyspi-0.6.1-old/pyspi.pyx 2006-10-03 02:46:41.000000000 +1000 -+++ pyspi-0.6.1/pyspi.pyx 2009-05-09 15:24:31.000000000 +1000 -@@ -25,9 +25,15 @@ - cdef class Event (EventBase) - cdef class DeviceEvent - --ctypedef enum bool: -+ctypedef unsigned int bool -+ -+import __builtin__ -+try: -+ False = __builtin__.False -+ True = __builtin__.True -+except AttributeError: - False = 0 -- True -+ True = 1 - - # SPIExceptionCode values: - (SPI_EXCEPTION_UNSPECIFIED, SPI_EXCEPTION_DISCONNECT, SPI_EXCEPTION_NO_IMPL, SPI_EXCEPTION_IO, SPI_EXCEPTION_BAD_DATA)=range(5) -@@ -731,7 +737,7 @@ - Wrapper around the low-level cspi.AccessibleComponent_ functions, - giving an OO-style API. - """ -- def getExtents (self, type=0): -+ def getExtents (self, key_type=0): - """ - Wraps cspi.AccessibleComponent_getExtents, returning an - (x,y,w,h) tuple. -@@ -741,7 +747,7 @@ - cspi.AccessibleComponent_getExtents (self.__item, &x, &y, &w, &h, type) - return (x, y, w, h) - -- def getPosition (self, type = 0): -+ def getPosition (self, key_type = 0): - """ - Wraps cspi.AccessibleComponent_getPosition, returning an - (x,y) tuple. -@@ -991,11 +997,11 @@ - Wraps cspi.AccessibleHyperlink_getObject - """ - self.__checkSelf () -- cdef Accessible object -- object = Accessible () -- object.__setItem (cspi.AccessibleHyperlink_getObject (self.__item, i)) -- object.__checkSelf () -- return object -+ cdef Accessible obj -+ obj = Accessible () -+ obj.__setItem (cspi.AccessibleHyperlink_getObject (self.__item, i)) -+ obj.__checkSelf () -+ return obj - - def getURI (self, i): - """ -@@ -1032,7 +1038,7 @@ - cspi.AccessibleImage_getImageSize(self.__item, &w, &h); - return [w, h] - -- def getImagePosition (self, type=0): -+ def getImagePosition (self, key_type=0): - """ - Wraps cspi.AccessibleImage_getImagePosition, returning a (x,y) - pair -@@ -1042,7 +1048,7 @@ - cspi.AccessibleImage_getImagePosition(self.__item, &x, &y, type) - return [x, y] - -- def getImageExtents (self, type=0): -+ def getImageExtents (self, key_type=0): - """ - Wraps cspi.AccessibleImage_getImageExtents, returning a - (x,y,w,h) tuple -@@ -1551,7 +1557,7 @@ - cdef cspi.AccessibleDeviceListener *__item - cdef public object modMasks - -- def __init__ (self, callback, eventMask = cspi.SPI_KEY_PRESSED | cspi.SPI_KEY_RELEASED): -+ def __init__ (self, callback, eventMask = <int> cspi.SPI_KEY_PRESSED | <int> cspi.SPI_KEY_RELEASED): - """ - Registers a python callback function to be called. - -diff -Naur pyspi-0.6.1-old/pyspi.pyx.orig pyspi-0.6.1/pyspi.pyx.orig ---- pyspi-0.6.1-old/pyspi.pyx.orig 1970-01-01 10:00:00.000000000 +1000 -+++ pyspi-0.6.1/pyspi.pyx.orig 2006-10-03 02:46:41.000000000 +1000 -@@ -0,0 +1,1592 @@ -+# Authors: -+# Zack Cerza <zcerza@redhat.com> -+# Chris Lee <clee@redhat.com> -+# Lawrence Lim <llim@redhat.com> -+# David Malcolm <dmalcolm@redhat.com> -+ -+cdef class Registry -+ -+cdef class Base -+cdef class EventBase -+cdef class StateSet -+cdef class Accessible (Base) -+cdef class Desktop (Accessible) -+cdef class Application (Accessible) -+cdef class Component (Accessible) -+cdef class Action (Base) -+cdef class Text (Base) -+cdef class EditableText (Text) -+cdef class Hypertext (Text) -+cdef class Hyperlink (Base) -+cdef class Image (Base) -+cdef class Value (Base) -+cdef class Selection (Base) -+cdef class Table (Base) -+cdef class Event (EventBase) -+cdef class DeviceEvent -+ -+ctypedef enum bool: -+ False = 0 -+ True -+ -+# SPIExceptionCode values: -+(SPI_EXCEPTION_UNSPECIFIED, SPI_EXCEPTION_DISCONNECT, SPI_EXCEPTION_NO_IMPL, SPI_EXCEPTION_IO, SPI_EXCEPTION_BAD_DATA)=range(5) -+ -+# SPIExceptionType values: -+(SPI_EXCEPTION_SOURCE_UNSPECIFIED, SPI_EXCEPTION_SOURCE_ACCESSIBLE, SPI_EXCEPTION_SOURCE_REGISTRY, SPI_EXCEPTION_SOURCE_DEVICE)=range(4) -+ -+# Accessible roles -+(SPI_ROLE_INVALID, SPI_ROLE_ACCEL_LABEL, SPI_ROLE_ALERT, SPI_ROLE_ANIMATION, SPI_ROLE_ARROW, SPI_ROLE_CALENDAR, SPI_ROLE_CANVAS, SPI_ROLE_CHECK_BOX, SPI_ROLE_CHECK_MENU_ITEM, SPI_ROLE_COLOR_CHOOSER, SPI_ROLE_COLUMN_HEADER, SPI_ROLE_COMBO_BOX, SPI_ROLE_DATE_EDITOR, SPI_ROLE_DESKTOP_ICON, SPI_ROLE_DESKTOP_FRAME, SPI_ROLE_DIAL, SPI_ROLE_DIALOG, SPI_ROLE_DIRECTORY_PANE, SPI_ROLE_DRAWING_AREA, SPI_ROLE_FILE_CHOOSER, SPI_ROLE_FILLER, SPI_ROLE_FONT_CHOOSER, SPI_ROLE_FRAME, SPI_ROLE_GLASS_PANE, SPI_ROLE_HTML_CONTAINER, SPI_ROLE_ICON, SPI_ROLE_IMAGE, SPI_ROLE_INTERNAL_FRAME, SPI_ROLE_LABEL, SPI_ROLE_LAYERED_PANE, SPI_ROLE_LIST, SPI_ROLE_LIST_ITEM, SPI_ROLE_MENU, SPI_ROLE_MENU_BAR, SPI_ROLE_MENU_ITEM, SPI_ROLE_OPTION_PANE, SPI_ROLE_PAGE_TAB, SPI_ROLE_PAGE_TAB_LIST, SPI_ROLE_PANEL, SPI_ROLE_PASSWORD_TEXT, SPI_ROLE_POPUP_MENU, SPI_ROLE_PROGRESS_BAR, SPI_ROLE_PUSH_BUTTON, SPI_ROLE_RADIO_BUTTON, SPI_ROLE_RADIO_MENU_ITEM, SPI_ROLE_ROOT_PANE, SPI_ROLE_ROW_HEADER, SPI_ROLE_SCROLL_BAR, SPI_ROLE_SCROLL_PANE, SPI_ROLE_SEPARATOR, SPI_ROLE_SLIDER, SPI_ROLE_SPIN_BUTTON, SPI_ROLE_SPLIT_PANE, SPI_ROLE_STATUS_BAR, SPI_ROLE_TABLE, SPI_ROLE_TABLE_CELL, SPI_ROLE_TABLE_COLUMN_HEADER, SPI_ROLE_TABLE_ROW_HEADER, SPI_ROLE_TEAROFF_MENU_ITEM, SPI_ROLE_TERMINAL, SPI_ROLE_TEXT, SPI_ROLE_TOGGLE_BUTTON, SPI_ROLE_TOOL_BAR, SPI_ROLE_TOOL_TIP, SPI_ROLE_TREE, SPI_ROLE_TREE_TABLE, SPI_ROLE_UNKNOWN, SPI_ROLE_VIEWPORT, SPI_ROLE_WINDOW, SPI_ROLE_EXTENDED, SPI_ROLE_HEADER, SPI_ROLE_FOOTER, SPI_ROLE_PARAGRAPH, SPI_ROLE_RULER, SPI_ROLE_APPLICATION, SPI_ROLE_AUTOCOMPLETE, SPI_ROLE_EDITBAR, SPI_ROLE_EMBEDDED, SPI_ROLE_LAST_DEFINED)=range(79) -+ -+# Accessible states -+(SPI_STATE_INVALID, SPI_STATE_ACTIVE, SPI_STATE_ARMED, SPI_STATE_BUSY, SPI_STATE_CHECKED, SPI_STATE_COLLAPSED, SPI_STATE_DEFUNCT, SPI_STATE_EDITABLE, SPI_STATE_ENABLED, SPI_STATE_EXPANDABLE, SPI_STATE_EXPANDED, SPI_STATE_FOCUSABLE, SPI_STATE_FOCUSED, SPI_STATE_HORIZONTAL, SPI_STATE_ICONIFIED, SPI_STATE_MODAL, SPI_STATE_MULTI_LINE, SPI_STATE_MULTISELECTABLE, SPI_STATE_OPAQUE, SPI_STATE_PRESSED, SPI_STATE_RESIZABLE, SPI_STATE_SELECTABLE, SPI_STATE_SELECTED, SPI_STATE_SENSITIVE, SPI_STATE_SHOWING, SPI_STATE_SINGLE_LINE, SPI_STATE_STALE, SPI_STATE_TRANSIENT, SPI_STATE_VERTICAL, SPI_STATE_VISIBLE, SPI_STATE_MANAGES_DESCENDANTS, SPI_STATE_INDETERMINATE) = range(32); -+ -+# Accessible relation types -+(SPI_RELATION_NULL, SPI_RELATION_LABEL_FOR, SPI_RELATION_LABELED_BY, SPI_RELATION_CONTROLLER_FOR, SPI_RELATION_CONTROLLED_BY, SPI_RELATION_MEMBER_OF, SPI_RELATION_NODE_CHILD_OF, SPI_RELATION_EXTENDED, SPI_RELATION_FLOWS_TO, SPI_RELATION_FLOWS_FROM, SPI_RELATION_SUBWINDOW_OF, SPI_RELATION_EMBEDS, SPI_RELATION_EMBEDDED_BY, SPI_RELATION_POPUP_FOR, SPI_RELATION_LAST_DEFINED) = range (15); -+ -+# AccessibleComponent layers -+(SPI_LAYER_INVALID, SPI_LAYER_BACKGROUND, SPI_LAYER_CANVAS, SPI_LAYER_WIDGET, SPI_LAYER_MDI, SPI_LAYER_POPUP, SPI_LAYER_OVERLAY, SPI_LAYER_WINDOW, SPI_LAYER_LAST_DEFINED) = range(9) -+ -+#AccessibleKeySynthType -+(SPI_KEY_PRESS, SPI_KEY_RELEASE, SPI_KEY_PRESSRELEASE, SPI_KEY_SYM, SPI_KEY_STRING) = range(5) -+ -+# AccessibleKeyListenerSyncType -+(SPI_KEYLISTENER_NOSYNC, SPI_KEYLISTENER_SYNCHRONOUS, SPI_KEYLISTENER_CANCONSUME, SPI_KEYLISTENER_ALL_WINDOWS) = range(4) -+ -+# AccessibleDeviceEventType -+SPI_KEY_PRESSED = 1<<0 -+SPI_KEY_RELEASED = 1<<1 -+SPI_BUTTON_PRESSED = 1<<2 -+SPI_BUTTON_RELEASED = 1<<3 -+ -+cdef cspi.AccessibleKeySet *SPI_KEYSET_ALL_KEYS -+SPI_KEYSET_ALL_KEYS = NULL -+ -+Accessibility_MODIFIER_SHIFT = 1 << 0 -+Accessibility_MODIFIER_SHIFTLOCK = 1 << 1 -+Accessibility_MODIFIER_CONTROL = 1 << 2 -+Accessibility_MODIFIER_ALT = 1 << 3 -+Accessibility_MODIFIER_META = 1 << 4 -+Accessibility_MODIFIER_META2 = 1 << 5 -+Accessibility_MODIFIER_META3 = 1 << 6 -+Accessibility_MODIFIER_NUMLOCK = 1 << 7 -+ -+ -+cdef object string(char * string): -+ cdef object pyString -+ pyString = string -+ cspi.SPI_freeString(string) -+ return pyString -+ -+import os -+class X11Exception(Exception): -+ def __init__(self, display = os.environ.get('DISPLAY', None)): -+ self.display = display -+ def __str__(self): -+ msg = "Cannot open display" -+ if self.display: return msg + ': ' + self.display -+ else: return msg -+ -+class AtspiException(Exception): -+ """ -+ Exceptions raised when calls to the AT-SPI C bindings return FALSE to -+ indicate failure. -+ """ -+ def __init__(self, message): -+ self.message = message -+ -+ def __str__(self): -+ return "AtspiException: %s"%self.message -+ -+class SpiException(Exception): -+ """ -+ Exceptions to be raised in response to an installed -+ SPIExceptionHandler, corresponding to a SPIException. These appear to -+ be short-lived structs, so we gather all applicable data immediately -+ """ -+ def __init__(self, is_fatal, sourceType, exceptionCode, description): -+ # print "got to __init__" -+ self.fatal = is_fatal -+ self.sourceType = sourceType -+ self.exceptionCode = exceptionCode -+ self.description = description -+ -+ # print "leaving __init__" -+ # print self.fatal -+ # print self.sourceType -+ # print self.exceptionCode -+ # print self.description -+ -+ def __str__(self): -+ if self.fatal: -+ fatalStr = "Fatal" -+ else: -+ fatalStr = "Non-fatal" -+ result = '%s SPIException: type:%s source:%s "%s"'%(fatalStr, self.sourceType, self.exceptionCode, self.description) -+ return result -+ -+cdef make_exception(cspi.SPIException *err, cspi.SPIBoolean is_fatal): -+ # Don't attempt to use SPIAccessibleException_getSource; this is error -+ # handling code, we don't want to introduce further complications -+ return SpiException(is_fatal, -+ cspi.SPIException_getSourceType (err), -+ cspi.SPIException_getExceptionCode (err), -+ cspi.SPIException_getDescription (err)) -+ -+ -+def event_main(): -+ cspi.SPI_event_main() -+ -+def event_quit(): -+ cspi.SPI_event_quit() -+ -+cdef cspi.SPIBoolean exception_handler (cspi.SPIException *err, cspi.SPIBoolean is_fatal) except *: -+ # print "got exception!!!" -+ e = make_exception(err, is_fatal) -+ raise e -+ -+# at-spi-<version>/cpsi.h contains: -+# typedef SPIBoolean (*SPIExceptionHandler) (SPIException *err, SPIBoolean is_fatal); -+# and -+# SPIBoolean SPI_exceptionHandlerPush (SPIExceptionHandler *handler); -+# There's thus an extra unnecessary level of indirection. -+# We have to jump through the following hoops to get pyrex to deal with this: -+cdef cspi.SPIExceptionHandler exception_handler_as_type -+cdef cspi.SPIExceptionHandler* exception_handler_ptr -+exception_handler_as_type = exception_handler -+exception_handler_ptr = &exception_handler_as_type -+ -+global_exception = None -+ -+cdef class Registry: -+ def __init__ (self): -+ cdef Xlib.Display *display -+ display = Xlib.XOpenDisplay(NULL) -+ if display == NULL: -+ raise X11Exception -+ else: -+ Xlib.XCloseDisplay(display) -+ -+ result = cspi.SPI_init () -+ #if result!=0: -+ # raise AtspiException("SPI_init: exit code %s" % str(result)) -+ -+ result = cspi.SPI_exceptionHandlerPush (exception_handler_ptr) -+ if not result: -+ raise AtspiException("Unable to install SPI exception handler") -+ -+ def __dealloc (self): -+ result = cspi.SPI_exit () -+ if result!=0: -+ raise AtspiException("SPI_init: exit code %s" % str(result)) -+ -+ def getDesktopCount (self): -+ return cspi.SPI_getDesktopCount() -+ -+ def getDesktop (self, index = 0): -+ cdef Desktop desktop -+ desktop = Desktop () -+ if not desktop.__setItem (cspi.SPI_getDesktop (index)): -+ return False -+ return desktop -+ -+ def getDesktopList (self): -+ # Using the bonobo.activation bindings, getDesktopList() returns a -+ # Python list of Desktop objects. The C bindings seem to do it differently, -+ # and Pyrex doesn't like that method. So we're re-implementing the function -+ # using getDesktopCount() and getDesktop() to work around that. -+ # Yay for Zack! -+ # -+ # -Zack -+ cdef Desktop desktop -+ desktops = [] -+ desktop = Desktop () -+ for i in xrange (cspi.SPI_getDesktopCount ()): -+ desktop.__setItem (cspi.SPI_getDesktop (i)) -+ desktops = desktops + [desktop] -+ return desktops -+ -+registry = Registry() -+ -+cdef class Base: -+ """ -+ Wrapper around a cspi.Accessible -+ """ -+ -+ cdef cspi.Accessible *__item -+ -+ def __new__ (self): -+ self.__item = NULL -+ -+ def __dealloc__ (self): -+ if self.__item != NULL: -+ cspi.Accessible_unref (self.__item) -+ -+ cdef bool __setItem (self, cspi.Accessible *obj): -+ if self.__item != NULL: -+ cspi.Accessible_unref (self.__item) -+ if obj != NULL: -+ self.__item = obj -+ cspi.Accessible_ref (self.__item) -+ return True -+ else: -+ return False -+ -+ def __checkSelf (self): -+ assert self.__item != NULL -+ -+# WHY OH WHY won't this work? :( -+# I need to be able to find out of two Accessible classes contain -+# the same cspi.Accessible objects. -+# -+# def isSameAs (self, base): -+# cdef bool foo -+# foo = self.__item == base.__item -+# return foo -+ -+cdef class EventBase: -+ """ -+ Wrapper around a cspi.AccessibleEvent -+ """ -+ cdef cspi.AccessibleEvent *__item -+ -+ def __new__ (self): -+ self.__item = NULL -+ -+ def __dealloc__ (self): -+ if self.__item != NULL: -+ cspi.AccessibleEvent_unref (self.__item) -+ -+ cdef bool __setItem (self, cspi.AccessibleEvent *obj): -+ if self.__item != NULL: -+ cspi.AccessibleEvent_unref (self.__item) -+ if obj != NULL: -+ self.__item = obj -+ cspi.AccessibleEvent_ref (self.__item) -+ return True -+ else: -+ return False -+ -+ def __checkSelf (self): -+ if self.__item == NULL: -+ raise AttributeError, "__item must not be NULL" -+ -+ def __getattr__ (self, attrName): -+ cdef cspi.Accessible* acc -+ cdef Accessible result -+ if attrName == "source": -+ acc = self.__item.source -+ if acc!=NULL: -+ result = Accessible () -+ result.__setItem (acc) -+ return result -+ elif attrName == "detail1": -+ detail1 = self.__item.detail1 -+ return detail1 -+ elif attrName == "detail2": -+ detail1 = self.__item.detail2 -+ return detail1 -+ elif attrName == "type": -+ return self.__item.type -+ -+cdef class StateSet: -+ """ -+ Wrapper around a cspi.AccessibleStateSet -+ """ -+ cdef cspi.AccessibleStateSet *__item -+ -+ def __new__ (self): -+ self.__item = NULL -+ -+ def __dealloc__ (self): -+ if self.__item != NULL: -+ cspi.AccessibleStateSet_unref (self.__item) -+ -+ def __checkSelf (self): -+ if self.__item == NULL: -+ raise AttributeError, "__item must not be NULL" -+ -+ cdef bool __setItem (self, cspi.AccessibleStateSet *obj): -+ if self.__item != NULL: -+ cspi.AccessibleStateSet_unref (self.__item) -+ if obj != NULL: -+ self.__item = obj -+ cspi.AccessibleStateSet_ref (self.__item) -+ return True -+ else: -+ return False -+ -+ cdef bool __contains (self, cspi.AccessibleState s): -+ self.__checkSelf () -+ return cspi.AccessibleStateSet_contains (self.__item, s) -+ -+ def contains (self, state): -+ self.__checkSelf () -+ return self.__contains(state) -+ -+ cdef void __add (self, cspi.AccessibleState s): -+ self.__checkSelf () -+ cspi.AccessibleStateSet_add(self.__item, s) -+ -+ def add (self, state): -+ self.__checkSelf () -+ self.__add (state) -+ -+ cdef void __remove (self, cspi.AccessibleState s): -+ self.__checkSelf () -+ cspi.AccessibleStateSet_remove (self.__item, s) -+ -+ def remove (self, state): -+ self.__checkSelf () -+ self.__remove (state) -+ -+ def __str__ (self): -+ self.__checkSelf () -+ return str(self.states) -+ -+ def __getattr__(self, name): -+ if name == "states": -+ result = [] -+ for state in range(SPI_STATE_INVALID, SPI_STATE_INDETERMINATE): -+ if self.contains(state): -+ result.append(state) -+ return result -+ else: -+ raise AttributeError, name -+ -+cdef class Relation: -+ """ -+ Wrapper around a cspi.AccessibleRelation -+ """ -+ cdef cspi.AccessibleRelation *__item -+ -+ def __new__ (self): -+ self.__item = NULL -+ -+ def __dealloc__ (self): -+ if self.__item != NULL: -+ cspi.AccessibleRelation_unref (self.__item) -+ -+ def __checkSelf (self): -+ if self.__item == NULL: -+ raise AttributeError, "__item must not be NULL" -+ -+ def __str__ (self): -+ self.__checkSelf () -+ return "relation %s -> %s"%(self.getRelationType (), self.getTargets()) -+ -+ def __repr__ (self): -+ self.__checkSelf () -+ return "relation %s -> %s"%(self.getRelationType (), self.getTargets()) -+ -+ cdef bool __setItem (self, cspi.AccessibleRelation *obj): -+ if self.__item != NULL: -+ cspi.AccessibleRelation_unref (self.__item) -+ if obj != NULL: -+ self.__item = obj -+ cspi.AccessibleRelation_ref (self.__item) -+ return True -+ else: -+ return False -+ -+ def getNTargets (self): -+ """ -+ Wrapper around cspi.AccessibleRelation_getNTargets -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleRelation_getNTargets (self.__item) -+ -+ def getTarget (self, i): -+ """ -+ Wrapper around cspi.AccessibleRelation_getTarget -+ """ -+ self.__checkSelf () -+ cdef Accessible target -+ target = Accessible () -+ target.__setItem (cspi.AccessibleRelation_getTarget (self.__item, i)) -+ target.__checkSelf () -+ return target -+ -+ def getTargets (self): -+ """ -+ Gets the targets of this AccessibleRelation as a list of atspi.Accessible -+ """ -+ self.__checkSelf () -+ result = [] -+ count = self.getNTargets() -+ for i in range(count): -+ result.append(self.getTarget(i)) -+ return result -+ -+ def getRelationType (self): -+ """ -+ Wrapper around cspi.AccessibleRelation_getRelationType -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleRelation_getRelationType (self.__item) -+ -+cdef class Accessible (Base): -+ """ -+ Wrapper around cspi.Accessible -+ """ -+ def __getattr__ (self, name): -+ if name == "name": -+ return self.getName () -+ elif name == "role": -+ return self.getRole () -+ elif name == "roleName": -+ return self.getRoleName () -+ elif name == "description": -+ return self.getDescription () -+ elif name == "parent": -+ return self.getParent () -+ elif name == "childCount": -+ return self.getChildCount () -+ elif name == "indexInParent": -+ return self.getIndexInParent () -+ elif name == "stateSet": -+ return self.getStateSet () -+ else: -+ raise AttributeError, name -+ -+ def getName (self): -+ """ -+ Wrapper around cspi.Accessible_getName -+ """ -+ self.__checkSelf() -+ return string(cspi.Accessible_getName(self.__item)) -+ -+ def getDescription (self): -+ """ -+ Wrapper around cspi.Accessible_getDescription -+ """ -+ self.__checkSelf() -+ return string(cspi.Accessible_getDescription(self.__item)) -+ -+ def getParent (self): -+ """ -+ Wrapper around cspi.Accessible_getParent, returning an -+ atspi.Accessible or None -+ """ -+ self.__checkSelf() -+ cdef Accessible parent -+ cdef cspi.Accessible* spiParent -+ -+ spiParent = cspi.Accessible_getParent (self.__item) -+ if spiParent!=NULL: -+ parent = Accessible () -+ parent.__setItem (spiParent) -+ parent.__checkSelf () -+ return parent -+ else: -+ return None -+ -+ def getChildAtIndex (self, index): -+ """ -+ Wrapper around cspi.Accessible_getChildAtIndex, returning an -+ atspi.Accessible, atspi.Application, or None -+ """ -+ self.__checkSelf() -+ cdef int i -+ i = index -+ -+ # This hairiness is due to the fact that Pyrex doesn't allow cdefs -+ # inside if blocks. -+ -+ cdef cspi.Accessible* spiChild -+ spiChild = cspi.Accessible_getChildAtIndex (self.__item, i) -+ # Workaround for GNOME bug #321273 -+ # http://bugzilla.gnome.org/show_bug.cgi?id=321273 -+ if spiChild == NULL: return None -+ -+ cdef object child -+ cdef Application app -+ cdef Accessible acc -+ cdef Text text -+ -+ if cspi.Accessible_isApplication (spiChild): -+ app = Application () -+ app.__setItem (spiChild) -+ child = app -+ else: -+ acc = Accessible () -+ acc.__setItem (spiChild) -+ child = acc -+ -+ return child -+ -+ def getIndexInParent (self): -+ """ -+ Wrapper around cspi.Accessible_getIndexInParent -+ """ -+ self.__checkSelf() -+ return cspi.Accessible_getIndexInParent (self.__item) -+ -+ def getRole (self): -+ """ -+ Wrapper around cspi.Accessible_getRole -+ """ -+ self.__checkSelf() -+ return cspi.Accessible_getRole (self.__item) -+ -+ def getRoleName (self): -+ """ -+ Wrapper around cspi.Accessible_getRoleName -+ """ -+ self.__checkSelf() -+ return string(cspi.Accessible_getRoleName (self.__item)) -+ -+ def getChildCount (self): -+ """ -+ Wrapper around cspi.Accessible_getChildCount -+ """ -+ self.__checkSelf() -+ return cspi.Accessible_getChildCount (self.__item) -+ -+ def getStateSet (self): -+ """ -+ Wrapper around cspi.Accessible_getStateSet, returning an -+ atspi.StateSet -+ """ -+ self.__checkSelf() -+ cdef StateSet set -+ set = StateSet() -+ set.__setItem (cspi.Accessible_getStateSet (self.__item)) -+ return set -+ -+ def getInterface (self, interface): -+ """ -+ This is NOT part of cspi, it is just for compatibility with -+ the bonobo bindings and will probably go away soon. -+ """ -+ self.__checkSelf() -+ return getattr(self, "get%s" % interface) () -+ -+ def getAction (self): -+ """ -+ Wrapper around cspi.Accessible_getAction, returning -+ an atspi.Action or None -+ """ -+ self.__checkSelf() -+ cdef Action action -+ action = Action () -+ action.__setItem (cspi.Accessible_getAction (self.__item)) -+ if action.__item != NULL: -+ return action -+ -+ def getText (self): -+ """ -+ Wrapper around cspi.Accessible_getText, returning an atspi.Text -+ or None -+ """ -+ self.__checkSelf () -+ cdef Text text -+ text = Text () -+ text.__setItem (cspi.Accessible_getText (self.__item)) -+ if text.__item != NULL: -+ return text -+ -+ def getEditableText (self): -+ """ -+ Wrapper around cspi.Accessible_getText, returning an -+ atspi.EditableText or None -+ """ -+ self.__checkSelf () -+ cdef EditableText etext -+ etext = EditableText () -+ etext.__setItem (cspi.Accessible_getEditableText (self.__item)) -+ if etext.__item != NULL: -+ return etext -+ -+ def getHypertext (self): -+ """ -+ Wrapper around cspi.Accessible_getHypertext, returning an -+ atspi.Hypertext or None -+ """ -+ self.__checkSelf () -+ cdef Hypertext hypertext -+ hypertext = Hypertext () -+ hypertext.__setItem (cspi.Accessible_getHypertext (self.__item)) -+ if hypertext.__item != NULL: -+ return hypertext -+ -+ def getImage (self): -+ """ -+ Wrapper around cspi.Accessible_getImage, returning an -+ atspi.Image or None -+ """ -+ self.__checkSelf () -+ cdef Image image -+ image = Image () -+ image.__setItem (cspi.Accessible_getImage (self.__item)) -+ if image.__item != NULL: -+ return image -+ -+ def getValue (self): -+ """ -+ Wrapper around cspi.Accessible_getValue, returning an -+ atspi.Value or None -+ """ -+ self.__checkSelf () -+ cdef Value value -+ value = Value () -+ value.__setItem (cspi.Accessible_getValue (self.__item)) -+ if value.__item != NULL: -+ return value -+ -+ def getSelection (self): -+ """ -+ Wrapper around cspi.Accessible_getSelection, returning an -+ atspi.Selection or None -+ """ -+ self.__checkSelf () -+ cdef Selection selection -+ selection = Selection () -+ selection.__setItem (cspi.Accessible_getSelection (self.__item)) -+ if selection.__item != NULL: -+ return selection -+ -+ def getComponent (self): -+ """ -+ Wrapper around cspi.Accessible_getComponent, returning an -+ atspi.Component or None -+ """ -+ self.__checkSelf () -+ cdef Component component -+ component = Component () -+ component.__setItem (cspi.Accessible_getComponent (self.__item)) -+ if component.__item != NULL: -+ return component -+ -+ def getRelationSet (self): -+ """ -+ Wraps Accessible_getRelationSet, returning a list -+ of atspi.Relation -+ """ -+ # looking at at-poke, result from C API appears to be a NULL-terminated list of pointers, and that we should free the buffer -+ self.__checkSelf () -+ cdef Relation relation -+ -+ relations = [] -+ cdef cspi.AccessibleRelation **relationSet -+ relationSet = cspi.Accessible_getRelationSet (self.__item) -+ -+ i=0 -+ while relationSet[i]: -+ relation = Relation () -+ relation.__setItem (relationSet[i]) -+ relations.append(relation) -+ i=i+1 -+ cspi.free (relationSet) -+ -+ return relations -+ -+ -+cdef class Desktop (Accessible): -+ pass -+ -+ -+cdef class Application (Accessible): -+ """ -+ Wrapper around the low-level cspi.AccessibleApplication_ functions, -+ giving an OO-style API. -+ """ -+ def getToolkit (self): -+ """ -+ Wraps AccessibleApplication_getToolkitName, returning a string -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleApplication_getToolkitName (self.__item) -+ -+ def getVersion (self): -+ """ -+ Wraps AccessibleApplication_getVersion, returning a string -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleApplication_getVersion(self.__item) -+ -+ def getID (self): -+ """ -+ Wraps AccessibleApplication_getID, returning a string -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleApplication_getID (self.__item) -+ -+ def pause (self): -+ """ -+ Wraps AccessibleApplication_pause -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleApplication_pause (self.__item) -+ -+ def resume (self): -+ """ -+ Wraps AccessibleApplication_resume -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleApplication_resume (self.__item) -+ -+cdef class Component (Accessible): -+ """ -+ Wrapper around the low-level cspi.AccessibleComponent_ functions, -+ giving an OO-style API. -+ """ -+ def getExtents (self, type=0): -+ """ -+ Wraps cspi.AccessibleComponent_getExtents, returning an -+ (x,y,w,h) tuple. -+ """ -+ self.__checkSelf () -+ cdef long x, y, w, h -+ cspi.AccessibleComponent_getExtents (self.__item, &x, &y, &w, &h, type) -+ return (x, y, w, h) -+ -+ def getPosition (self, type = 0): -+ """ -+ Wraps cspi.AccessibleComponent_getPosition, returning an -+ (x,y) tuple. -+ """ -+ self.__checkSelf () -+ cdef long x, y -+ cspi.AccessibleComponent_getPosition (self.__item, &x, &y, type) -+ return (x, y) -+ -+ def getSize (self): -+ """ -+ Wraps cspi.AccessibleComponent_getSize, returning a -+ (w,h) tuple. -+ """ -+ self.__checkSelf () -+ cdef long w, h -+ cspi.AccessibleComponent_getSize (self.__item, &w, &h) -+ return (w, h) -+ -+ def getLayer (self): -+ """ -+ Wraps cspi.AccessibleComponent_getLayer, returning an -+ AccessibleComponentLayer. -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleComponent_getLayer (self.__item) -+ -+ def grabFocus (self): -+ """ -+ Wraps cspi.AccessibleComponent_grabFocus, raising AtspiException -+ if it fails -+ """ -+ self.__checkSelf () -+ if not cspi.AccessibleComponent_grabFocus (self.__item): -+ raise AtspiException("AccessibleComponent_grabFocus") -+ -+ def getMDIZOrder (self): -+ """ -+ Wraps cspi.AccessibleComponent_getMDIZOrder, returning an integer. -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleComponent_getMDIZOrder(self.__item) -+ -+cdef class Action (Base): -+ """ -+ Wrapper around the low-level cspi.AccessibleAction_ functions, -+ giving an OO-style API. -+ """ -+ def __getattr__ (self, name): -+ if name == "nActions": -+ return self.getNActions () -+ else: -+ raise AttributeError, name -+ -+ def getNActions (self): -+ """ -+ Wraps cspi.AccessibleAction_getNActions -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleAction_getNActions (self.__item) -+ -+ def doAction (self, index): -+ """ -+ Wraps cspi.AccessibleAction_doAction -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleAction_doAction (self.__item, index) -+ -+ def getKeyBinding (self, index): -+ """ -+ Wraps cspi.AccessibleAction_getKeyBinding -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleAction_getKeyBinding (self.__item, index) -+ -+ def getName (self, index): -+ """ -+ Wraps cspi.AccessibleAction_getName -+ """ -+ self.__checkSelf () -+ return string(cspi.AccessibleAction_getName (self.__item, index)) -+ -+ def getDescription (self, index): -+ """ -+ Wraps cspi.AccessibleAction_getDescription -+ """ -+ self.__checkSelf () -+ return string(cspi.AccessibleAction_getDescription (self.__item, index)) -+ -+ -+cdef class Text (Base): -+ """ -+ Wrapper around the low-level cspi.AccessibleText_ functions, -+ giving an OO-style API. -+ """ -+ def addSelection (self, startOffset, endOffset): -+ """ -+ Wraps cspi.AccessibleText_addSelection -+ """ -+ self.__checkSelf () -+ if not cspi.AccessibleText_addSelection (self.__item, startOffset, endOffset): -+ raise AtspiException("AccessibleText_addSelection") -+ -+ -+ #def getAttributes (self, offset, startOffset, endOffset): -+ # self.__checkSelf () -+ # return cspi.AccessibleText_getAttributes (self.__item, offset, startOffset, endOffset) -+ def getCaretOffset (self): -+ """ -+ Wraps cspi.AccessibleText_getCaretOffset -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleText_getCaretOffset (self.__item) -+ -+ def getCharacterCount (self): -+ """ -+ Wraps cspi.AccessibleText_getCharacterCount -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleText_getCharacterCount (self.__item) -+ -+ def getNSelections (self): -+ """ -+ Wraps cspi.AccessibleText_getNSelections -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleText_getNSelections (self.__item) -+ -+ #def getSelection (self, selectionNum, startOffset, endOffset): -+ # self.__checkSelf () -+ # return cspi.AccessibleText_getSelection (self.__item, selectionNum, startOffset, endOffset) -+ -+ def getText (self, startOffset, endOffset): -+ """ -+ Wraps cspi.AccessibleText_getText -+ """ -+ self.__checkSelf () -+ return string(cspi.AccessibleText_getText (self.__item, startOffset, endOffset)) -+ -+ def removeSelection (self, selectionNum): -+ """ -+ Wraps cspi.AccessibleText_removeSelection, raising AtspiException if it fails -+ """ -+ self.__checkSelf () -+ if not cspi.AccessibleText_removeSelection (self.__item, selectionNum): -+ raise AtspiException("AccessibleText_removeSelection") -+ -+ def setSelection (self, selectionNum, startOffset, endOffset): -+ """ -+ Wraps cspi.AccessibleText_setSelection, raising AtspiException if it fails -+ """ -+ self.__checkSelf () -+ if not cspi.AccessibleText_setSelection (self.__item, selectionNum, startOffset, endOffset): -+ raise AtspiException("AccessibleText_setSelection") -+ -+ def setCaretOffset (self, position): -+ """ -+ Wraps cspi.AccessibleText_setCaretOffset, raising AtspiException if it fails -+ """ -+ self.__checkSelf () -+ if not cspi.AccessibleText_setCaretOffset (self.__item, position): -+ raise AtspiException("AccessibleText_setCaretOffset") -+ -+cdef class EditableText (Text): -+ """ -+ Wrapper around the low-level cspi.AccessibleEditableText_ functions, -+ giving an OO-style API. -+ """ -+ def setTextContents (self, newContents): -+ """ -+ Wraps cspi.AccessibleEditableText_setTextContents, raising AtspiException if it fails -+ """ -+ self.__checkSelf () -+ if not cspi.AccessibleEditableText_setTextContents (self.__item, newContents): -+ raise AtspiException("AccessibleEditableText_setTextContents") -+ -+ def setAttributes (self, attributes, startOffset, endOffset): -+ """ -+ Wraps cspi.AccessibleEditableText_setAttributes, raising AtspiException if it fails -+ """ -+ self.__checkSelf () -+ if not cspi.AccessibleEditableText_setAttributes (self.__item, attributes, startOffset, endOffset): -+ raise AtspiException("AccessibleEditableText_setAttributes") -+ -+ def insertText (self, position, text): -+ """ -+ Wraps cspi.AccessibleEditableText_insertText, raising AtspiException if it fails -+ """ -+ self.__checkSelf () -+ if not cspi.AccessibleEditableText_insertText (self.__item, position, text, cspi.strlen(text)): -+ raise AtspiException("AccessibleEditableText_insertText") -+ -+cdef class Hypertext (Text): -+ """ -+ Wrapper around the low-level cspi.AccessibleHypertext_ functions, -+ giving an OO-style API. -+ """ -+ def getNLinks (self): -+ """ -+ Wraps cspi.AccessibleHypertext_getNLinks, raising AtspiException if it fails -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleHypertext_getNLinks (self.__item) -+ -+ def getLink (self, linkIndex): -+ """ -+ Wraps cspi.AccessibleHypertext_getLink, raising AtspiException if it fails -+ """ -+ self.__checkSelf () -+ cdef Hyperlink hyperlink -+ hyperlink = Hyperlink () -+ hyperlink.__setItem (cspi.AccessibleHypertext_getLink (self.__item, linkIndex)) -+ if hyperlink.__item != NULL: -+ return hyperlink -+ -+ def getLinkIndex (self, characterOffset): -+ """ -+ Wraps cspi.AccessibleHypertext_getLinkIndex, raising AtspiException if it fails -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleHypertext_getLinkIndex (self.__item, characterOffset) -+ -+cdef class Hyperlink (Base): -+ """ -+ Wrapper around the low-level cspi.AccessibleHyperlink_ functions, -+ giving an OO-style API. -+ """ -+ def getNAnchors (self): -+ """ -+ Wraps cspi.AccessibleHyperlink_getNAnchors, raising AtspiException if it fails -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleHyperlink_getNAnchors (self.__item) -+ -+ def getIndexRange (self): -+ """ -+ Wraps cspi.AccessibleHyperlink_getIndexRange, returning [startIndex, endIndex] pair -+ """ -+ self.__checkSelf () -+ cdef long startIndex, endIndex -+ cspi.AccessibleHyperlink_getIndexRange(self.__item, &startIndex, &endIndex) -+ return [startIndex, endIndex] -+ -+ -+ def getObject (self, i): -+ """ -+ Wraps cspi.AccessibleHyperlink_getObject -+ """ -+ self.__checkSelf () -+ cdef Accessible object -+ object = Accessible () -+ object.__setItem (cspi.AccessibleHyperlink_getObject (self.__item, i)) -+ object.__checkSelf () -+ return object -+ -+ def getURI (self, i): -+ """ -+ Wraps cspi.AccessibleHyperlink_getURI, raising AtspiException if it fails -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleHyperlink_getURI (self.__item, i) -+ -+ def isValid (self): -+ """ -+ Wraps cspi.AccessibleHyperlink_isValid, raising AtspiException if it fails -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleHyperlink_isValid (self.__item) -+ -+cdef class Image (Base): -+ """ -+ Wrapper around the low-level cspi.AccessibleImage_ functions, -+ giving an OO-style API. -+ """ -+ def getImageDescription (self): -+ """ -+ Wraps cspi.AccessibleImage_getImageDescription -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleImage_getImageDescription (self.__item) -+ -+ def getImageSize (self): -+ """ -+ Wraps cspi.AccessibleImage_getImageSize, returning a (w,h) pair -+ """ -+ self.__checkSelf () -+ cdef long w, h -+ cspi.AccessibleImage_getImageSize(self.__item, &w, &h); -+ return [w, h] -+ -+ def getImagePosition (self, type=0): -+ """ -+ Wraps cspi.AccessibleImage_getImagePosition, returning a (x,y) -+ pair -+ """ -+ self.__checkSelf () -+ cdef long x, y -+ cspi.AccessibleImage_getImagePosition(self.__item, &x, &y, type) -+ return [x, y] -+ -+ def getImageExtents (self, type=0): -+ """ -+ Wraps cspi.AccessibleImage_getImageExtents, returning a -+ (x,y,w,h) tuple -+ """ -+ self.__checkSelf () -+ cdef long x, y, w, h -+ cspi.AccessibleImage_getImageExtents(self.__item, &x, &y, &w, &h, type) -+ return [x, y, w, h] -+ -+cdef class Value (Base): -+ """ -+ Wrapper around the low-level cspi.AccessibleValue_ functions, -+ giving an OO-style API. -+ """ -+ def getMinimumValue (self): -+ """ -+ Wraps cspi.AccessibleValue_getMinimumValue -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleValue_getMinimumValue(self.__item) -+ -+ def getCurrentValue (self): -+ """ -+ Wraps cspi.AccessibleValue_getMinimumValue -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleValue_getCurrentValue(self.__item) -+ -+ def getMaximumValue (self): -+ """ -+ Wraps cspi.AccessibleValue_getMinimumValue -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleValue_getMaximumValue(self.__item) -+ -+ def setCurrentValue (self, newValue): -+ """ -+ Wraps cspi.AccessibleValue_setCurrentValue -+ """ -+ self.__checkSelf () -+ if not cspi.AccessibleValue_setCurrentValue (self.__item, newValue): -+ raise AtspiException("AccessibleValue_setCurrentValue") -+ -+cdef class Selection (Base): -+ """ -+ Wrapper around the low-level cspi.AccessibleSelection_ functions, -+ giving an OO-style API. -+ """ -+ -+ def getNSelectedChildren (self): -+ """ -+ Wraps cspi.AccessibleSelection_getNSelectedChildren -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleSelection_getNSelectedChildren (self.__item) -+ -+ def getSelectedChild (self, index): -+ """ -+ Wraps cspi.AccessibleSelection_getSelectedChild -+ """ -+ self.__checkSelf () -+ -+ cdef cspi.Accessible* spiChild -+ spiChild = cspi.AccessibleSelection_getSelectedChild (self.__item, index) -+ -+ assert spiChild != NULL -+ -+ cdef object child -+ cdef Application app -+ cdef Accessible acc -+ cdef Text text -+ -+ if cspi.Accessible_isApplication (spiChild): -+ app = Application () -+ app.__setItem (spiChild) -+ child = app -+ else: -+ acc = Accessible () -+ acc.__setItem (spiChild) -+ child = acc -+ -+ return child -+ -+ def selectChild (self, index): -+ """ -+ Wraps cspi.AccessibleSelection_selectChild -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleSelection_selectChild (self.__item, index) -+ -+ def deselectSelectedChild (self, index): -+ """ -+ Wraps cspi.AccessibleSelection_deselectSelectedChild -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleSelection_deselectSelectedChild (self.__item, index) -+ -+ def isChildSelected (self, index): -+ """ -+ Wraps cspi.AccessibleSelection_isChildSelected -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleSelection_isChildSelected (self.__item, index) -+ -+ def selectAll (self): -+ """ -+ Wraps cspi.AccessibleSelection_selectAll -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleSelection_selectAll( self.__item) -+ -+ def clearSelection (self): -+ """ -+ Wraps cspi.AccessibleSelection_clearSelection -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleSelection_clearSelection (self.__item) -+ -+cdef class Table (Base): -+ """ -+ Wrapper around the low-level cspi.AccessibleTable_ functions, -+ giving an OO-style API. -+ """ -+ -+ # def getTableAccessibleAt (self, row, column): -+ # def getTableCaption (self): -+ -+ def getTableColumnAtIndex (self, index): -+ """ -+ Wraps cspi.AccessibleTable_getColumnAtIndex -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_getColumnAtIndex(self.__item, index) -+ -+ def getTableColumnDescription (self, column): -+ """ -+ Wraps cspi.AccessibleTable_getColumnDescription -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_getColumnDescription(self.__item, column) -+ -+ def getTableColumnExtentAt (self, row, column): -+ """ -+ Wraps cspi.AccessibleTable_getColumnExtentAt -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_getColumnExtentAt(self.__item, row, column) -+ -+ # def getTableColumnHeader (self, column): -+ -+ def getTableIndexAt (self, row, column): -+ """ -+ Wraps cspi.AccessibleTable_getIndexAt -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_getIndexAt(self.__item, row, column) -+ -+ def getTableNColumns (self): -+ """ -+ Wraps cspi.AccessibleTable_getNColumns -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_getNColumns(self.__item) -+ -+ def getTableNRows (self): -+ """ -+ Wraps cspi.AccessibleTable_getNRows -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_getNRows(self.__item) -+ -+ def getTableNSelectedColumns (self): -+ """ -+ Wraps cspi.AccessibleTable_getNSelectedColumns -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_getNSelectedColumns(self.__item) -+ -+ def getTableNSelectedRows (self): -+ """ -+x Wraps cspi.AccessibleTable_getNSelectedRows -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_getNSelectedRows(self.__item) -+ -+ def getTableRowAtIndex (self, index): -+ """ -+ Wraps cspi.AccessibleTable_getRowAtIndex -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_getRowAtIndex(self.__item, index) -+ -+ def getTableRowDescription (self, row): -+ """ -+ Wraps cspi.AccessibleTable_getRowDescription -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_getRowDescription(self.__item, row) -+ -+ def getTableRowExtentAt (self, row, column): -+ """ -+ Wraps cspi.AccessibleTable_getRowExtentAt -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_getRowExtentAt(self.__item, row, column) -+ -+ # def getTableRowHeader (self, row): -+ # def getTableSelectedRows (self, **selectedRows): - Not sure if the variable which is a pointer to a pointer is acceptable -+ # def getTableSelectedColumns (self, **selectedColumns): - Same issue as above -+ # def getTableSummary (self): -+ -+ def isTableColumnSelected (self, column): -+ """ -+ Wraps cspi.AccessibleTable_isColumnSelected -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_isColumnSelected(self.__item, column) -+ -+ def isTableRowSelected (self, row): -+ """ -+ Wraps cspi.AccessibleTable_isRowSelected -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_isRowSelected(self.__item, row) -+ -+ def isTableSelected (self, row, column): -+ """ -+ Wraps cspi.AccessibleTable_isSelected -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_isSelected(self.__item, row, column) -+ -+ -+cdef class Event (EventBase): -+ #def AccessibleEventListener* SPI_createAccessibleEventListener (AccessibleEventListenerCB callback, void *user_data) -+ #void AccessibleEventListener_unref (AccessibleEventListener *listener) -+ #SPIBoolean AccessibleEventListener_addCallback (AccessibleEventListener *listener, AccessibleEventListenerCB callback, void *user_data) -+ #SPIBoolean AccessibleEventListener_removeCallback (AccessibleEventListener *listener, AccessibleEventListenerCB callback) -+ -+ #Accessible* AccessibleActiveDescendantChangedEvent_getActiveDescendant (AccessibleEvent *event) -+ #Accessible* AccessibleChildChangedEvent_getChildAccessible (AccessibleEvent *event) -+ -+ def getDescriptionChangedEventDescriptionString (self): -+ self.__checkSelf() -+ return string(cspi.AccessibleDescriptionChangedEvent_getDescriptionString(self.__item)) -+ -+ def getNameChangedEventNameString (self): -+ self.__checkSelf() -+ return string(cspi.AccessibleNameChangedEvent_getNameString(self.__item)) -+ -+ # Accessible* AccessibleParentChangedEvent_getParentAccessible (AccessibleEvent *event) -+ -+ def getTableCaptionChangedEventCaptionString(self): -+ self.__checkSelf() -+ return string(cspi.AccessibleTableCaptionChangedEvent_getCaptionString(self.__item)) -+ -+ def getTableColumnDescriptionChangedEventDescriptionString(self): -+ self.__checkSelf () -+ return string(cspi.AccessibleTableColumnDescriptionChangedEvent_getDescriptionString(self.__item)) -+ -+ # Accessible* AccessibleTableHeaderChangedEvent_getHeaderAccessible (AccessibleEvent *event) -+ -+ def getTableRowDescriptionChangedEventDescriptionString(self): -+ self.__checkSelf () -+ return string(cspi.AccessibleTableRowDescriptionChangedEvent_getDescriptionString(self.__item)) -+ -+ #Accessible* AccessibleTableSummaryChangedEvent_getSummaryAccessible (AccessibleEvent *event) -+ -+ def getTextChangedEventChangeString (self): -+ self.__checkSelf () -+ return string(cspi.AccessibleTextChangedEvent_getChangeString(self.__item)) -+ -+ def getTextSelectionChangedEventSelectionString (self): -+ self.__checkSelf () -+ return string(cspi.AccessibleTextSelectionChangedEvent_getSelectionString(self.__item)) -+ -+ def getWindowEventTitleString (self): -+ self.__checkSelf () -+ return string(cspi.AccessibleWindowEvent_getTitleString(self.__item)) -+ -+class EventGenerator: -+ """ -+ Wrapper layer around SPI_generateKeyboardEvent and -+ SPI_generateMouseEvent, used for generating input events. -+ -+ Use AccessibleAction in preference to this. -+ """ -+ def injectKeyboardString (self, string): -+ """ -+ Inject a string as if it had been typed using an input method. -+ """ -+ # Seems to only work if you do it one character at a time... -+ for char in string: -+ self.__generateKeystringEvent (str(char), cspi.SPI_KEY_STRING) -+ -+ def __keyStringToKeyCode(self, keyString): -+ cdef Xlib.Display *display -+ display = Xlib.XOpenDisplay(NULL) -+ -+ cdef Xlib.KeySym sym -+ sym = Xlib.XStringToKeysym(keyString) -+ cdef Xlib.KeyCode code -+ code = Xlib.XKeysymToKeycode(display, sym) -+ -+ #print str(keyString), str(int(sym)), code -+ -+ Xlib.XCloseDisplay(display) -+ return int(code) -+ -+ def generateKeyCombo (self, keyStrings): -+ modifiers = keyStrings[:-1] -+ finalKey = keyStrings[-1] -+ -+ for modifier in modifiers: -+ code = self.__keyStringToKeyCode(modifier) -+ self.generateKeyboardEvent(code, '', cspi.SPI_KEY_PRESS) -+ -+ code = self.__keyStringToKeyCode(finalKey) -+ self.generateKeyboardEvent(code, '', cspi.SPI_KEY_PRESSRELEASE) -+ -+ for modifier in modifiers: -+ code = self.__keyStringToKeyCode(modifier) -+ self.generateKeyboardEvent(code, '', cspi.SPI_KEY_RELEASE) -+ -+ -+ def __generateKeyvalEvent (self, keyval, synthType): -+ self.generateKeyboardEvent (keyval, None, synthType) -+ -+ def __generateKeystringEvent (self, keystring, synthType): -+ self.generateKeyboardEvent (0, keystring, synthType) -+ -+ def generateKeyboardEvent (self, keyval, keystring, synthType): -+ if not cspi.SPI_generateKeyboardEvent (keyval, keystring, synthType): -+ raise AtspiException("SPI_generateKeyboardEvent") -+ -+ def click (self, x, y, button): -+ """ -+ Synthesize a mouse button click at (x,y) -+ """ -+ self.__generateButtonEvent (x, y, button, "c") -+ -+ def doubleClick (self, x, y, button): -+ """ -+ Synthesize a mouse button double-click at (x,y) -+ """ -+ self.__generateButtonEvent (x, y, button, "d") -+ -+ def press (self, x, y, button): -+ """ -+ Synthesize a mouse button press at (x,y) -+ """ -+ self.__generateButtonEvent (x, y, button, "p") -+ -+ def release (self, x, y, button): -+ """ -+ Synthesize a mouse button release at (x,y) -+ """ -+ self.__generateButtonEvent (x, y, button, "r") -+ -+ def absoluteMotion (self, x, y): -+ """ -+ Synthesize mouse absolute motion to (x,y) -+ """ -+ self.__generateEvent (x, y, "abs") -+ -+ def relativeMotion (self, x, y): -+ """ -+ Synthesize mouse relative motion of (x,y) -+ """ -+ self.__generateEvent (x, y, "rel") -+ -+ def drag (self, fromXY, toXY, button): -+ """ -+ Synthesize a drag (press, move and release) from (x,y) to (x,y). -+ -+ These are absolute screen coordinates -+ """ -+ (x,y) = fromXY -+ self.press (x, y, button) -+ -+ (x,y) = toXY -+ self.absoluteMotion(x,y) -+ -+ self.release (x, y, button) -+ -+ def __generateEvent (self, x, y, name): -+ """ -+ Thin wrapper around SPI_generateMouseEvent. -+ -+ Event names: b1p = button 1 press; b2r = button 2 release; -+ b3c = button 3 click; b2d = button 2 double-click; -+ abs = absolute motion; rel = relative motion. -+ """ -+ if not cspi.SPI_generateMouseEvent (x, y, name): -+ raise AtspiException("Error generating mouse event") -+ -+ def __generateButtonEvent (self, x, y, button, suffix): -+ self.__generateEvent (x, y, self.__generateButtonName(button)+suffix) -+ -+ def __generateButtonName(self, button): -+ if button==1: -+ return "b1" -+ elif button==2: -+ return "b2" -+ elif button==3: -+ return "b3" -+ else: raise ValueError, "Unknown button" -+ -+# We use this C function to marshal a call to a python function. The Python callback -+# function is installed as the userdata of this C callback function. See the -+# "cheesefinder" demo in the Pyrex sources. -+# We ignore the "const"ness of the AccessibleEvent -+cdef void marshalAccessibleEventCallback (cspi.AccessibleEvent *event, void *python_fn) except *: -+ e = Event() -+ EventBase.__setItem(e, event) -+ (<object>python_fn) (e) -+ -+cdef class EventListener: -+ """ -+ Wrapper around the low-level cspi.AccessibleEventListener_ functions, -+ giving an OO-style API. -+ """ -+ cdef cspi.AccessibleEventListener *__item -+ cdef public object eventTypes -+ -+ def __init__ (self, callback, eventTypes): -+ """ -+ Registers a python callback function to be called. -+ The callback is expected to have one input, of type atspi.Event, and no return value. -+ See documentation of SPI_registerGlobalEventListener for the event names -+ """ -+ self.eventTypes = eventTypes -+ self.__item = cspi.SPI_createAccessibleEventListener (marshalAccessibleEventCallback, <void*>callback) -+ for eventType in self.eventTypes: -+ #char *e -+ e = eventType -+ if not cspi.SPI_registerGlobalEventListener (self.__item, e): -+ raise AtspiException("Unable to register event listener") -+ -+ def deregister(self): -+ for eventType in self.eventTypes: -+ cspi.SPI_deregisterGlobalEventListener(self.__item, eventType) -+ -+ def __dealloc__ (self): -+ if self.__item != NULL: -+ self.deregister() -+ cspi.AccessibleEventListener_unref (self.__item) -+ -+ def __checkSelf (self): -+ if self.__item == NULL: -+ raise AttributeError, "__item must not be NULL" -+ -+cdef class DeviceEvent: -+ """ -+ Wrapper around a cspi.AccessibleDeviceEvent -+ """ -+ cdef cspi.AccessibleDeviceEvent *__item -+ cdef public object keyID -+ cdef public object keyCode -+ cdef public object keyString -+ cdef public object timeStamp -+ cdef public object type -+ cdef public object modifiers -+ cdef public object isText -+ -+ def __new__ (self): -+ self.__item = NULL -+ -+ cdef bool __setItem (self, cspi.AccessibleDeviceEvent *obj): -+ if obj != NULL: -+ self.__item = obj -+ self.keyID = self.__item.keyID -+ self.keyCode = self.__item.keycode -+ self.keyString = self.__item.keystring -+ self.timeStamp = self.__item.timestamp -+ self.type = self.__item.type -+ self.modifiers = self.__item.modifiers -+ if self.__item.is_text: self.isText = True -+ else: self.isText = False -+ return True -+ else: -+ return False -+ -+ def __checkSelf (self): -+ if self.__item == NULL: -+ raise AttributeError, "__item must not be NULL" -+ -+# def __dealloc__ (self): -+# if self.__item != NULL: -+# cspi.AccessibleDeviceEvent_unref (self.__item) -+ -+ -+cdef cspi.SPIBoolean marshalAccessibleDeviceEventCallback (cspi.AccessibleDeviceEvent *event, void *python_fn) except 1: -+ k = DeviceEvent() -+ #k.__setItem(event) -+ DeviceEvent.__setItem(k, event) -+ k.__checkSelf() -+ (<object>python_fn) (k) -+ return False -+ -+cdef class DeviceListener: -+ """ -+ Wrapper around the low-level cspi.AccessibleDeviceListener_ functions, -+ giving an OO-style API. -+ """ -+ cdef cspi.AccessibleDeviceListener *__item -+ cdef public object modMasks -+ -+ def __init__ (self, callback, eventMask = cspi.SPI_KEY_PRESSED | cspi.SPI_KEY_RELEASED): -+ """ -+ Registers a python callback function to be called. -+ -+ eventMask may be one of the following: -+ key pressed: 1 -+ key released: 2 -+ key pressed or released (default): 3 -+ """ -+ self.__item = cspi.SPI_createAccessibleDeviceListener (marshalAccessibleDeviceEventCallback, <void*>callback) -+ cdef cspi.AccessibleKeySet *keySet -+ keySet = SPI_KEYSET_ALL_KEYS -+ self.modMasks = [] -+ cdef short int modMask -+ syncType = SPI_KEYLISTENER_SYNCHRONOUS | SPI_KEYLISTENER_CANCONSUME -+ #syncType = SPI_KEYLISTENER_NOSYNC -+ for modMask from 0 <= modMask < (1 << 8): -+ self.modMasks.append(modMask) -+ desc = "keySet "+str(<int> keySet)+" modMask "+str(modMask)+" eventMask "+str(eventMask)+" syncType "+str(syncType) -+ desc = str(desc) -+ if not cspi.SPI_registerAccessibleKeystrokeListener (self.__item, keySet, modMask, eventMask, syncType): -+ raise AtspiException("Unable to register keystroke listener", desc) -+ -+ def deregister(self): -+ if self.__item != NULL: -+ for modMask in self.modMasks: -+ cspi.SPI_deregisterAccessibleKeystrokeListener(self.__item, modMask) -+ -+ def __dealloc__ (self): -+ if self.__item != NULL: -+ self.deregister() -+ cspi.AccessibleDeviceListener_unref (self.__item) -+ -+ def __checkSelf (self): -+ if self.__item == NULL: -+ raise AttributeError, "__item must not be NULL" -+ -+ -+# vim: sw=4 ts=4 sts=4 noet ai diff --git a/staging/python-pysqlite/PKGBUILD b/staging/python-pysqlite/PKGBUILD deleted file mode 100644 index f5985ebca..000000000 --- a/staging/python-pysqlite/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 168723 2012-10-14 21:14:34Z eric $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Aaron Griffin <aaron@archlinux.org> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgbase=python-pysqlite -pkgname=python2-pysqlite -pkgver=2.6.3 -pkgrel=3 -pkgdesc="A Python DB-API 2.0 interface for the SQLite embedded relational database engine" -license=('custom') -arch=('i686' 'x86_64') -url="http://code.google.com/p/pysqlite/" -depends=('python2' 'sqlite') -conflicts=('python-pysqlite<=2.6.3-2') -replaces=('python-pysqlite<=2.6.3-2') -source=(http://pysqlite.googlecode.com/files/pysqlite-${pkgver}.tar.gz \ - setup.cfg) -md5sums=('711afa1062a1d2c4a67acdf02a33d86e' - '86dd356c65afd14a22f2f8f64a26441e') - -check() { - cd "${srcdir}"/pysqlite-${pkgver}/build/lib.*/ - python2 -c "from pysqlite2 import test; test.test()" -} - -build() { - cd "${srcdir}/pysqlite-${pkgver}" - cp "${srcdir}/setup.cfg" . - python2 setup.py build -} - -package_python2-pysqlite() { - cd "${srcdir}/pysqlite-${pkgver}" - python2 setup.py install --root="${pkgdir}" - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - rm -r "${pkgdir}/usr/pysqlite2-doc" -} diff --git a/staging/python-pysqlite/setup.cfg b/staging/python-pysqlite/setup.cfg deleted file mode 100644 index ba6c77075..000000000 --- a/staging/python-pysqlite/setup.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[build_ext] -define= -include_dirs=/usr/include -library_dirs=/usr/lib -libraries=sqlite3 diff --git a/staging/python-urwid/PKGBUILD b/staging/python-urwid/PKGBUILD deleted file mode 100644 index d1804969c..000000000 --- a/staging/python-urwid/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD,v 1.10 2009/03/13 21:14:09 sergej Exp $ -# Maintainer: Daniel Isenmann <daniel@archlinux.org> -# Maintainer: Sergej Pupykin <sergej@aur.archlinux.org> -# Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com> - -pkgname=('python-urwid' 'python2-urwid') -pkgver=1.0.2 -pkgrel=2 -pkgdesc="Urwid is a curses-based user interface library." -license=('LGPL') -arch=('i686' 'x86_64') -makedepends=('python2-distribute' 'python-distribute') -url="http://excess.org/urwid/" -source=(http://excess.org/urwid/urwid-$pkgver.tar.gz) -md5sums=('00542bbd15fae7ea60b02a7570edee2b') - -build() { - cp -r urwid-$pkgver python2-urwid-$pkgver - - cd "$srcdir/urwid-$pkgver" - python setup.py build - - cd "$srcdir/python2-urwid-$pkgver" - sed -i 's#bin/python#bin/python2#' urwid/*.py - - python2 setup.py build -} - -package_python-urwid() { - depends=('python') - - cd "$srcdir/urwid-$pkgver" - python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 -} - -package_python2-urwid() { - depends=('python2') - - cd "$srcdir/python2-urwid-$pkgver" - python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 -} - diff --git a/staging/python-wpactrl/PKGBUILD b/staging/python-wpactrl/PKGBUILD deleted file mode 100644 index 692b3e8c3..000000000 --- a/staging/python-wpactrl/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 168717 2012-10-14 20:27:32Z eric $ -# Maintainer: Daniel Isenmann <daniel@archlinux.org> - -pkgbase=python-wpactrl -pkgname=python2-wpactrl -pkgver=20090609 -pkgrel=4 -pkgdesc="A Python extension for wpa_supplicant/hostapd control interface access" -arch=('i686' 'x86_64') -url="http://projects.otaku42.de/wiki/PythonWpaCtrl" -license=('GPL2') -depends=('python2') -conflicts=('python-wpactrl<=20090609-3') -replaces=('python-wpactrl<=20090609-3') -source=(ftp://ftp.archlinux.org/other/${pkgbase}/python-wpactrl-20090609.tar.gz) -md5sums=('8d45739aa9bfa1110a4570bb5ceda768') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - python2 setup.py build -} - -package_python2-wpactrl() { - cd "${srcdir}/${pkgbase}-${pkgver}" - python2 setup.py install --root="${pkgdir}" -} diff --git a/staging/python/PKGBUILD b/staging/python/PKGBUILD deleted file mode 100644 index ec300968b..000000000 --- a/staging/python/PKGBUILD +++ /dev/null @@ -1,75 +0,0 @@ -# $Id: PKGBUILD 167272 2012-09-29 16:34:59Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Jason Chu <jason@archlinux.org> - -pkgname=python -pkgver=3.3.0 -pkgrel=1 -_pybasever=3.3 -pkgdesc="Next generation of the python high-level scripting language" -arch=('i686' 'x86_64') -license=('custom') -url="http://www.python.org/" -depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib') -makedepends=('tk' 'sqlite' 'valgrind') -optdepends=('tk: for tkinter' 'sqlite') -provides=('python3') -replaces=('python3') -options=('!makeflags') -source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz) -sha1sums=('833d73565e1b665f1878504081dc985a5a06e46a') - -build() { - cd "${srcdir}/Python-${pkgver}" - - # FS#23997 - sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py - - # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), - # rather than copies shipped in the tarball - rm -r Modules/expat - rm -r Modules/zlib - rm -r Modules/_ctypes/{darwin,libffi}* - - ./configure --prefix=/usr \ - --enable-shared \ - --with-threads \ - --with-computed-gotos \ - --enable-ipv6 \ - --with-valgrind \ - --with-system-expat \ - --with-dbmliborder=gdbm:ndbm \ - --with-system-ffi - - make -} - -check() { - cd "${srcdir}/Python-${pkgver}" - LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \ - "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site \ - test_urllib test_uuid test_pydoc -} - -package() { - cd "${srcdir}/Python-${pkgver}" - make DESTDIR="${pkgdir}" install maninstall - - # Why are these not done by default... - ln -sf python3 "${pkgdir}/usr/bin/python" - ln -sf python3-config "${pkgdir}/usr/bin/python-config" - ln -sf idle3 "${pkgdir}/usr/bin/idle" - ln -sf pydoc3 "${pkgdir}/usr/bin/pydoc" - ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python3.1" - - # Fix FS#22552 - ln -sf ../../libpython${_pybasever}m.so \ - "${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}m/libpython${_pybasever}m.so" - - # Clean-up reference to build directory - sed -i "s|$srcdir/Python-${pkgver}:||" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}m/Makefile" - - # License - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/qscintilla/PKGBUILD b/staging/qscintilla/PKGBUILD deleted file mode 100644 index acb9eadfd..000000000 --- a/staging/qscintilla/PKGBUILD +++ /dev/null @@ -1,80 +0,0 @@ -# $Id: PKGBUILD 167919 2012-10-03 20:22:14Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> - -pkgbase=qscintilla -pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' - 'python-qscintilla-common') -pkgver=2.6.2 -pkgrel=3 -license=('GPL') -arch=('i686' 'x86_64') -url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" -makedepends=('python2-pyqt' 'pyqt' 'chrpath') -source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz" - 'configure.py-objdir-support.diff') -md5sums=('6e6641b6f3863c01cc28c2d7bd2495f9' - '8cf9c06252e2f11ab00e62848e322fd3') - -build() { - cd "${srcdir}/QScintilla-gpl-${pkgver}" - patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff" - - cd Qt4Qt5 - qmake qscintilla.pro - make - - cd ../designer-Qt4 - qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 - make - - cd ../ - cp -rf Python Python2 - cd Python - python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4 - make - - cd ../Python2 - python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4 - make -} - -package_qscintilla() { - pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class" - depends=('qt') - - cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5" - make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install - - cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4" - make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install -} - -package_python-qscintilla-common() { - pkgdesc="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla" - depends=('qscintilla') - - cd "${srcdir}/QScintilla-gpl-${pkgver}"/Python - make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install - - # Provided by python-qscintilla - rm "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so" -} - -package_python-qscintilla() { - pkgdesc="Python 3.x bindings for QScintilla2" - depends=('python-qscintilla-common' 'pyqt') - - cd "${srcdir}/QScintilla-gpl-${pkgver}/Python" - install -Dm755 Qsci.so \ - "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so" -} - -package_python2-qscintilla() { - pkgdesc="Python 2.x bindings for QScintilla2" - depends=('python-qscintilla-common' 'python2-pyqt') - - cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2" - install -Dm755 Qsci.so \ - "${pkgdir}/usr/lib/python2.7/site-packages/PyQt4/Qsci.so" -} diff --git a/staging/qscintilla/configure.py-objdir-support.diff b/staging/qscintilla/configure.py-objdir-support.diff deleted file mode 100644 index b595de18c..000000000 --- a/staging/qscintilla/configure.py-objdir-support.diff +++ /dev/null @@ -1,39 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_configure.dpatch by Torsten Marek <shlomme@debian.org> -## -## DP: patch the configure script for the Python bindings to support object dir builds - -@DPATCH@ -Index: qscintilla2-2.4.2/Python/configure.py -=================================================================== ---- qscintilla2-2.4.2.orig/Python/configure.py 2010-01-20 20:56:09.000000000 +0100 -+++ qscintilla2-2.4.2/Python/configure.py 2010-01-27 22:54:35.603870417 +0100 -@@ -33,6 +33,7 @@ - import glob - import optparse - -+src_dir = os.path.dirname(os.path.abspath(__file__)) - - # Import SIP's configuration module so that we have access to the error - # reporting. Then try and import the configuration modules for both PyQt3 and -@@ -162,7 +163,7 @@ - if os.access(sciglobal, os.F_OK): - # Get the QScintilla version string. - _, sciversstr = sipconfig.read_version(sciglobal, "QScintilla", "QSCINTILLA_VERSION", "QSCINTILLA_VERSION_STR") -- -+ return # Debian: do not check for the installed version, we're good this way. - if glob.glob(os.path.join(opts.qscilibdir, "*qscintilla2*")): - # Because we include the Python bindings with the C++ code we can - # reasonably force the same version to be used and not bother about -@@ -232,9 +233,9 @@ - argv.append(buildfile) - - if pyqt.pyqt_version >= 0x040000: -- argv.append("sip/qscimod4.sip") -+ argv.append(os.path.join(src_dir, "sip/qscimod4.sip")) - else: -- argv.append("sip/qscimod3.sip") -+ argv.append(os.path.join(src_dir, "sip/qscimod3.sip")) - - os.system(" ".join(argv)) - diff --git a/staging/sane/PKGBUILD b/staging/sane/PKGBUILD deleted file mode 100644 index f9f2742be..000000000 --- a/staging/sane/PKGBUILD +++ /dev/null @@ -1,72 +0,0 @@ -# $Id: PKGBUILD 161619 2012-06-12 14:13:06Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> -# Contributor: Simo L. <neotuli@yahoo.com> -# Contributor: eric <eric@archlinux.org> - -pkgname=sane -pkgver=1.0.22 -pkgrel=9 -pkgdesc="Scanner Access Now Easy" -url="http://www.sane-project.org/" -arch=('i686' 'x86_64') -license=('GPL') -depends=('libtiff>=4.0.0' 'libgphoto2>=2.4.7-2' 'libjpeg>=8' 'libusb-compat' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp') -makedepends=('texlive-latexextra') -install=$pkgname.install -backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,mustek_usb2.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane) -source=(ftp://ftp2.sane-project.org/pub/sane/$pkgname-backends-$pkgver/$pkgname-backends-$pkgver.tar.gz - 'sane.xinetd' - 'libv4l-0.8.3.patch' - 'xerox_mfp_fix_usb_devices.patch' - 'saned.socket' - 'saned.service') -options=(!libtool) -md5sums=('fadf56a60f4776bfb24491f66b617cf5' - 'da946cc36fb83612162cf9505986d4b2' - 'e645a8921cff9f18ffbdabb2ed885060' - 'cfef73e7db7c28308914d3db6767d852' - 'e57e9e15528f47f5f1b3f1411135ed5d' - 'e44bd4c994a52d6f472463d1eb0a03be') - -build() { - cd "${srcdir}/${pkgname}-backends-${pkgver}" - - patch -p1 -i "${srcdir}"/libv4l-0.8.3.patch - # fix https://bugs.archlinux.org/task/26114 - patch -Np1 -i "${srcdir}"/xerox_mfp_fix_usb_devices.patch - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --with-docdir=/usr/share/doc/sane \ - --enable-avahi \ - --enable-pthread \ - --disable-rpath \ - --disable-locking - make -} - -package () { - cd "${srcdir}/${pkgname}-backends-${pkgver}" - make DESTDIR="${pkgdir}" install - # fix hp officejets - echo "#hpaio" >> "${pkgdir}/etc/sane.d/dll.conf" - # install udev files - install -D -m0644 tools/udev/libsane.rules \ - "${pkgdir}/usr/lib/udev/rules.d/53-sane.rules" - # fix udev rules - sed -i 's|NAME="%k", ||g' "${pkgdir}/usr/lib/udev/rules.d/53-sane.rules" - - # install xinetd file - install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane" - - # Install the pkg-config file - install -D -m644 tools/sane-backends.pc \ - "${pkgdir}/usr/lib/pkgconfig/sane-backends.pc" - # install systemd files - install -D -m644 ${srcdir}/saned.socket \ - "${pkgdir}/usr/lib/systemd/system/saned.socket" - install -D -m644 ${srcdir}/saned.service \ - "${pkgdir}/usr/lib/systemd/system/saned@.service" -} diff --git a/staging/sane/libv4l-0.8.3.patch b/staging/sane/libv4l-0.8.3.patch deleted file mode 100644 index 4e240e0cf..000000000 --- a/staging/sane/libv4l-0.8.3.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001 -From: Nils Philippsen <nils@redhat.com> -Date: Mon, 14 Mar 2011 13:35:05 +0100 -Subject: [PATCH] patch: v4l - -Squashed commit of the following: - -commit 23381932c76846191b42a48e505b37cd74711265 -Author: Julien BLACHE <jb@jblache.org> -Date: Wed Feb 16 19:37:43 2011 +0100 - - Fix v4l build with libv4l 0.8.3+ - - (cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953) - - Conflicts: - - ChangeLog - - Signed-off-by: Nils Philippsen <nils@redhat.com> ---- - backend/v4l.c | 3 +-- - backend/v4l.h | 3 ++- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/backend/v4l.c b/backend/v4l.c -index 6510ef0..38595ed 100644 ---- a/backend/v4l.c -+++ b/backend/v4l.c -@@ -84,9 +84,8 @@ - #include "../include/sane/sanei_config.h" - #define V4L_CONFIG_FILE "v4l.conf" - --#include "v4l.h" -- - #include <libv4l1.h> -+#include "v4l.h" - - static const SANE_Device **devlist = NULL; - static int num_devices; -diff --git a/backend/v4l.h b/backend/v4l.h -index 588b96e..6aee586 100644 ---- a/backend/v4l.h -+++ b/backend/v4l.h -@@ -29,6 +29,7 @@ - #ifndef v4l_h - #define v4l_h - -+#ifndef __LINUX_VIDEODEV_H - /* Kernel interface */ - /* Only the stuff we need. For more features, more defines are needed */ - -@@ -165,7 +166,7 @@ struct video_channel - - - /* end of kernel interface */ -- -+#endif /* !__LINUX_VIDEODEV_H */ - - #include <../include/sane/sane.h> - --- -1.7.4 - diff --git a/staging/sane/sane.install b/staging/sane/sane.install deleted file mode 100644 index 5ec361eea..000000000 --- a/staging/sane/sane.install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { - /bin/cat <<THEEND -NOTE ----- -Add your user to group 'scanner' to use scanner devices. -THEEND -} diff --git a/staging/sane/sane.xinetd b/staging/sane/sane.xinetd deleted file mode 100644 index b035664b4..000000000 --- a/staging/sane/sane.xinetd +++ /dev/null @@ -1,11 +0,0 @@ -service sane-port -{ - port = 6566 - socket_type = stream - wait = no - user = root - group = scanner - server = /usr/sbin/saned - # disabled by default! - disable = yes - } diff --git a/staging/sane/saned.service b/staging/sane/saned.service deleted file mode 100644 index 69e833e7e..000000000 --- a/staging/sane/saned.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Scanner Service - -[Service] -Group=scanner -ExecStart=/usr/sbin/saned -StandardInput=socket -StandardError=syslog diff --git a/staging/sane/saned.socket b/staging/sane/saned.socket deleted file mode 100644 index 66ef9c9c8..000000000 --- a/staging/sane/saned.socket +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=saned incoming socket - -[Socket] -ListenStream=6566 -Accept=yes - -[Install] -WantedBy=sockets.target diff --git a/staging/sane/xerox_mfp_fix_usb_devices.patch b/staging/sane/xerox_mfp_fix_usb_devices.patch deleted file mode 100644 index 5ed29b974..000000000 --- a/staging/sane/xerox_mfp_fix_usb_devices.patch +++ /dev/null @@ -1,67 +0,0 @@ -commit 5ea227caeacd504b64eef301e83fa63e0a25b3f7 -Author: Alex Belkin <abc@telekom.ru> -Date: Tue Mar 8 17:57:19 2011 +0300 - - keep usb device by default (correct for bug introduced by tcp sub-backend - -diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c -index e08b50f..d4672a7 100644 ---- a/backend/xerox_mfp.c -+++ b/backend/xerox_mfp.c -@@ -37,10 +37,10 @@ - static const SANE_Device **devlist = NULL; /* sane_get_devices array */ - static struct device *devices_head = NULL; /* sane_get_devices list */ - --transport available_transports[] = { -+enum { TRANSPORT_USB, TRANSPORT_TCP, TRANSPORTS_MAX }; -+transport available_transports[TRANSPORTS_MAX] = { - { "usb", usb_dev_request, usb_dev_open, usb_dev_close, usb_configure_device }, - { "tcp", tcp_dev_request, tcp_dev_open, tcp_dev_close, tcp_configure_device }, -- { 0 } - }; - - static int resolv_state(int state) -@@ -824,7 +824,13 @@ free_devices (void) - devices_head = NULL; - } - --/* SANE API ignores return code of this callback */ -+static transport *tr_from_devname(SANE_String_Const devname) -+{ -+ if (strncmp("tcp", devname, 3) == 0) -+ return &available_transports[TRANSPORT_TCP]; -+ return &available_transports[TRANSPORT_USB]; -+} -+ - static SANE_Status - list_one_device (SANE_String_Const devname) - { -@@ -839,12 +845,7 @@ list_one_device (SANE_String_Const devname) - return SANE_STATUS_GOOD; - } - -- for (tr = available_transports; tr->ttype; tr++) { -- if (!strncmp (devname, tr->ttype, strlen(tr->ttype))) -- break; -- } -- if (!tr->ttype) -- return SANE_STATUS_INVAL; -+ tr = tr_from_devname(devname); - - dev = calloc (1, sizeof (struct device)); - if (dev == NULL) -@@ -878,13 +879,7 @@ list_one_device (SANE_String_Const devname) - static SANE_Status - list_conf_devices (UNUSED (SANEI_Config * config), const char *devname) - { -- transport *tr; -- -- for (tr = available_transports; tr->ttype; tr++) { -- if (!strncmp (devname, tr->ttype, strlen(tr->ttype))) -- return tr->configure_device(devname, list_one_device); -- } -- return SANE_STATUS_INVAL; -+ return tr_from_devname(devname)->configure_device(devname, list_one_device); - } - - SANE_Status diff --git a/staging/sdl_gfx/PKGBUILD b/staging/sdl_gfx/PKGBUILD deleted file mode 100644 index 03d3302a0..000000000 --- a/staging/sdl_gfx/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 165570 2012-08-25 14:10:16Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=sdl_gfx -pkgver=2.0.24 -pkgrel=1 -pkgdesc="SDL Graphic Primitives" -arch=('i686' 'x86_64') -license=('LGPL') -options=(!libtool) -url="http://www.ferzkopp.net/joomla/software-mainmenu-14/4-ferzkopps-linux-software/19-sdlgfx" -source=(http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-${pkgver}.tar.gz) -depends=('sdl') -md5sums=('838514185ff9a3b6377760aaa52fef8a') - -build() { - cd SDL_gfx-${pkgver} - - if [ "${CARCH}" == "x86_64" ]; then - ./configure --prefix=/usr --disable-mmx - else - ./configure --prefix=/usr - fi - - make -} - -package() { - cd SDL_gfx-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/staging/sip/PKGBUILD b/staging/sip/PKGBUILD deleted file mode 100644 index b03e62351..000000000 --- a/staging/sip/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 167297 2012-09-30 16:56:26Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> -# Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net> - -pkgbase=sip -pkgname=('sip' 'python-sip' 'python2-sip') -pkgver=4.14 -pkgrel=2 -arch=('i686' 'x86_64') -url="http://www.riverbankcomputing.com/software/sip/" -license=('custom:"sip"') -makedepends=('python' 'python2') -source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz") -md5sums=('9a48ad975e04ac824188840ea498ac32') - -build() { - cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver} - - cd ${pkgbase}-${pkgver} - python configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}" - make - - ### Python2 version ### - cd ../python2-${pkgbase}-${pkgver} - python2 configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}" - make -} - -package_sip() { - pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries" - depends=('glibc') - - cd ${pkgbase}-${pkgver} - make DESTDIR="${pkgdir}" install -C sipgen - - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} - -package_python-sip() { - pkgdesc="Python 3.x SIP bindings for C and C++ libraries" - depends=('sip' 'python') - - cd ${pkgbase}-${pkgver} - make DESTDIR="${pkgdir}" install -C siplib - - install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python3.3/site-packages/sipconfig.py - install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python3.3/site-packages/sipdistutils.py - - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} - -package_python2-sip() { - pkgdesc="Python 2.x SIP bindings for C and C++ libraries" - depends=('sip' 'python2') - - cd python2-${pkgbase}-${pkgver} - make DESTDIR="${pkgdir}" install -C siplib - - install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipconfig.py - install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipdistutils.py - - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/slim/PKGBUILD b/staging/slim/PKGBUILD deleted file mode 100644 index a4580b756..000000000 --- a/staging/slim/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $Id: PKGBUILD 168702 2012-10-14 15:17:29Z tomegun $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: Thayer Williams <thayer@archlinux.org> -# Contributor: Alexander Fehr <pizzapunk gmail com> -# Contributor: Hugo Ideler <hugoideler@dse.nl> - -pkgname=slim -pkgver=1.3.4 -pkgrel=4 -pkgdesc='Desktop-independent graphical login manager for X11' -arch=('i686' 'x86_64') -url='http://slim.berlios.de/' -license=('GPL2') -depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft') -makedepends=('cmake' 'freeglut') -backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim') -source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'rc.d' - 'pam.d' - 'logrotate' - 'slim.service' - 'session-name.patch' - 'libpng-1.4+-support.patch' - 'fix-glibc-segfault-1.3.4.patch') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../session-name.patch # FS#26693: fix default session name - patch -Np1 -i ../libpng-1.4+-support.patch # taken from gentoo to build - patch -Np0 -i ../fix-glibc-segfault-1.3.4.patch # FS#30864 - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DUSE_PAM=yes -DUSE_CONSOLEKIT=no - make -} - -package() { - cd ${srcdir}/build/ - make DESTDIR="${pkgdir}" install - - install -D -m755 ../rc.d "${pkgdir}"/etc/rc.d/slim - install -D -m644 ../pam.d "${pkgdir}"/etc/pam.d/slim - install -D -m644 ../logrotate "${pkgdir}"/etc/logrotate.d/slim - - # Provide sane defaults - sed -i 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' "${pkgdir}"/etc/slim.conf - sed -i 's|/var/run/slim.lock|/var/lock/slim.lock|' "${pkgdir}"/etc/slim.conf - # install systemd files - install -D -m644 ${srcdir}/slim.service ${pkgdir}/usr/lib/systemd/system/slim.service -} -md5sums=('51543533e492b41007811f7d880720fa' - 'd8ea9c4dee2811524b67f4f666311a1f' - '37ef35079139544d04b8316c7f66f754' - '43da096480bf72c3ccec8ad8400f34f0' - 'a5d6bde9e63899df7d2081e1585bbe54' - 'ebcb6829028615686de7b64ceeaaf8ed' - '6d19bd7a91592ed2bb902b22b9594565' - '9efc4e0d82d354f0c578be7723870769') diff --git a/staging/slim/fix-glibc-segfault-1.3.4.patch b/staging/slim/fix-glibc-segfault-1.3.4.patch deleted file mode 100644 index b035f8a78..000000000 --- a/staging/slim/fix-glibc-segfault-1.3.4.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: app.cpp -=================================================================== ---- app.cpp (revision 223) -+++ app.cpp (working copy) -@@ -593,7 +593,7 @@ - - n++; - -- child_env = static_cast<char**>(malloc(sizeof(char*)*n)); -+ child_env = static_cast<char**>(malloc(sizeof(char*)*(n+1))); - memcpy(child_env, old_env, sizeof(char*)*n); - child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie()); - child_env[n] = NULL; diff --git a/staging/slim/libpng-1.4+-support.patch b/staging/slim/libpng-1.4+-support.patch deleted file mode 100644 index 57b39272b..000000000 --- a/staging/slim/libpng-1.4+-support.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/image.cpp 2012-06-26 04:20:14.000000000 -0400 -+++ b/image.cpp 2012-06-27 11:41:34.000000000 -0400 -@@ -781,7 +781,11 @@ - (png_infopp) NULL); - } - -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ if (setjmp(png_jmpbuf((png_ptr)))) { -+#else - if (setjmp(png_ptr->jmpbuf)) { -+#endif - goto png_destroy; - } - diff --git a/staging/slim/logrotate b/staging/slim/logrotate deleted file mode 100644 index 26ec3b0f4..000000000 --- a/staging/slim/logrotate +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/slim.log { - compress - rotate 1 - size 1024k - notifempty - missingok - copytruncate - noolddir -} diff --git a/staging/slim/pam.d b/staging/slim/pam.d deleted file mode 100644 index 59db5a8c5..000000000 --- a/staging/slim/pam.d +++ /dev/null @@ -1,10 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so -auth required pam_unix.so -account required pam_unix.so -password required pam_unix.so -session required pam_limits.so -session required pam_unix.so -session optional pam_loginuid.so --session optional pam_systemd.so diff --git a/staging/slim/rc.d b/staging/slim/rc.d deleted file mode 100755 index b0be7ffc5..000000000 --- a/staging/slim/rc.d +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/slim` -case "$1" in - start) - stat_busy "Starting Simple Login Manager" - [ -z "$PID" ] && /usr/bin/slim -d &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon slim - stat_done - fi - ;; - stop) - stat_busy "Stopping Simple Login Manager" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon slim - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/staging/slim/session-name.patch b/staging/slim/session-name.patch deleted file mode 100644 index 8211c4f72..000000000 --- a/staging/slim/session-name.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur slim-1.3.2.old/panel.cpp slim-1.3.2.new/panel.cpp ---- slim-1.3.2.old/panel.cpp 2010-10-24 06:01:15.117000019 +0000 -+++ slim-1.3.2.new/panel.cpp 2010-10-24 17:26:30.987999967 +0000 -@@ -23,7 +23,7 @@ - Root = root; - cfg = config; - -- session = ""; -+ session = cfg->nextSession(session); - - // Init GC - XGCValues gcv; -@@ -188,7 +188,7 @@ - } - - void Panel::ClearPanel() { -- session = ""; -+ session = cfg->nextSession(session); - Reset(); - XClearWindow(Dpy, Root); - XClearWindow(Dpy, Win); diff --git a/staging/slim/slim.service b/staging/slim/slim.service deleted file mode 100644 index b894085a0..000000000 --- a/staging/slim/slim.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=SLiM Simple Login Manager -After=systemd-user-sessions.service - -[Service] -ExecStart=/usr/bin/slim -nodaemon - -[Install] -Alias=display-manager.service diff --git a/staging/slim/tty-slowness.patch b/staging/slim/tty-slowness.patch deleted file mode 100644 index c590fbed8..000000000 --- a/staging/slim/tty-slowness.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -aur slim-1.3.2.a/app.cpp slim-1.3.2.b/app.cpp ---- slim-1.3.2.a/app.cpp 2010-08-21 15:10:13.702755711 +0200 -+++ slim-1.3.2.b/app.cpp 2010-08-21 15:10:48.579631179 +0200 -@@ -280,21 +280,22 @@ - signal(SIGALRM, AlarmSignal); - - #ifndef XNEST_DEBUG -- OpenLog(); -- - if (!force_nodaemon && cfg->getOption("daemon") == "yes") { - daemonmode = true; - } - - // Daemonize - if (daemonmode) { -- if (daemon(0, 1) == -1) { -+ if (daemon(0, 0) == -1) { - cerr << APPNAME << ": " << strerror(errno) << endl; - exit(ERR_EXIT); - } -- UpdatePid(); - } - -+ OpenLog(); -+ -+ if (daemonmode) UpdatePid(); -+ - CreateServerAuth(); - StartServer(); - alarm(2); diff --git a/staging/smartmontools/PKGBUILD b/staging/smartmontools/PKGBUILD deleted file mode 100644 index 3028de4ca..000000000 --- a/staging/smartmontools/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 161354 2012-06-10 07:33:44Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Jeff Mickey <jeff@archlinux.org> -# Contributor: Jani Talikka <jani.talikka@gmail.com> -# Contributor: Ralf Barth <archlinux.org@haggy.org> - -pkgname=smartmontools -pkgver=5.42 -pkgrel=4 -pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives" -url="http://smartmontools.sourceforge.net" -license=('GPL') -arch=('i686' 'x86_64') -depends=('gcc-libs' 'libcap-ng' 'bash') -backup=('etc/smartd.conf' - 'etc/conf.d/smartd') -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'smartd.conf' - 'smartd.rc') -md5sums=('4460bf9a79a1252ff5c00ba52cf76b2a' - '28c1b80c41dac52d433961dcfb4f70e0' - 'fb30e07f87f2c1d99532e018291ad3e8') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --enable-drivedb \ - --with-libcap-ng=yes \ - --with-systemdsystemunitdir=/usr/lib/systemd/system - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i -e "s:sysconfig/smartmontools:conf.d/smartd:g" smartd.service - sed -i -e "s:smartd_opts:SMARTD_ARGS:g" smartd.service - - make DESTDIR="${pkgdir}" install - - rm -rf ${pkgdir}/etc/rc.d - install -Dm755 ${srcdir}/smartd.rc "${pkgdir}/etc/rc.d/smartd" - install -Dm644 ${srcdir}/smartd.conf "${pkgdir}/etc/conf.d/smartd" -} diff --git a/staging/smartmontools/smartd.conf b/staging/smartmontools/smartd.conf deleted file mode 100644 index f14870abf..000000000 --- a/staging/smartmontools/smartd.conf +++ /dev/null @@ -1 +0,0 @@ -SMARTD_ARGS="" diff --git a/staging/smartmontools/smartd.rc b/staging/smartmontools/smartd.rc deleted file mode 100755 index 16920db12..000000000 --- a/staging/smartmontools/smartd.rc +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -# source application-specific settings -SMARTD_ARGS= -[ -f /etc/conf.d/smartd ] && . /etc/conf.d/smartd - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - - start) - stat_busy "Starting smartd" - /usr/sbin/smartd ${SMARTD_ARGS} &>/dev/null - if [ $? -ne 0 ]; then - stat_fail - else - add_daemon smartd - stat_done - fi - ;; - - stop) - stat_busy "Stopping smartd" - kill -9 `pidof /usr/sbin/smartd` &>/dev/null - rm_daemon smartd - stat_done - ;; - - restart) - stat_busy "Restarting smartd ..." - $0 stop - $0 start - stat_done - ;; - - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/staging/sonata/PKGBUILD b/staging/sonata/PKGBUILD deleted file mode 100644 index d2a3d8d71..000000000 --- a/staging/sonata/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 168713 2012-10-14 19:47:10Z eric $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=sonata -pkgver=1.6.2.1 -pkgrel=8 -pkgdesc="Elegant GTK+ music client for MPD" -arch=('i686' 'x86_64') -url="http://sonata.berlios.de/" -license=('GPL3') -depends=('pygtk' 'python2-mpd') -optdepends=('gnome-python-extras: Enhanced system tray support' - 'tagpy: Metadata editing support' - 'python2-dbus: Various extra functionality (e.g. multimedia keys support)') -source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz - info.py.patch) -md5sums=('0b912325e7175abad3bf6c0edc071e05' - '595fcf7615035829b264afecb5a1beeb') - -build() { - cd "$srcdir/${pkgname}-$pkgver" - patch -Np0 -i "$srcdir/info.py.patch" - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' sonata/breadcrumbs.py -} - -package() { - cd "$srcdir/${pkgname}-$pkgver" - python2 setup.py install --prefix=/usr --optimize 1 --root="$pkgdir" -} diff --git a/staging/sonata/info.py.patch b/staging/sonata/info.py.patch deleted file mode 100644 index e95cc3a08..000000000 --- a/staging/sonata/info.py.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- sonata/info.py 2011-07-05 22:32:08.452556016 -0500 -+++ sonata/info.py 2011-07-05 22:45:50.849311466 -0500 -@@ -393,9 +393,9 @@ - if content.startswith("#REDIRECT [["): - addr = "http://lyricwiki.org/index.php?title=%s&action=edit" % urllib.quote(content.split("[[")[1].split("]]")[0]) - content = urllib.urlopen(addr).read() -- lyrics = content.split("<lyrics>")[1].split("</lyrics>")[0] -- if lyrics.strip() != "<!-- PUT LYRICS HERE (and delete this entire line) -->": -- lyrics = misc.unescape_html(lyrics) -+ content = misc.unescape_html(content) -+ lyrics = content.split("<lyrics>")[1].split("</lyrics>")[0].strip() -+ if lyrics.strip() != "<!-- PUT LYRICS HERE (and delete this entire line) -->": - lyrics = misc.wiki_to_html(lyrics) - lyrics = lyrics.decode("utf-8") - # Save lyrics to file: diff --git a/staging/source-highlight/PKGBUILD b/staging/source-highlight/PKGBUILD deleted file mode 100644 index e4c135217..000000000 --- a/staging/source-highlight/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 163141 2012-07-08 09:27:47Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> - -pkgname=source-highlight -pkgver=3.1.7 -pkgrel=2 -pkgdesc="Convert source code to syntax highlighted document" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/src-highlite/" -license=('GPL') -depends=('bash' 'boost-libs') -makedepends=('ctags' 'boost') -options=('!libtool') -install=$pkgname.install -source=("ftp://ftp.gnu.org/gnu/src-highlite/${pkgname}-${pkgver}.tar.gz") -md5sums=('0ff81588d3536b4c4e571122ba940595') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --with-bash-completion=${pkgdir}/usr/share/bash-completion/completions - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make prefix="${pkgdir}/usr" install -} diff --git a/staging/source-highlight/source-highlight.install b/staging/source-highlight/source-highlight.install deleted file mode 100644 index 4fd1b3005..000000000 --- a/staging/source-highlight/source-highlight.install +++ /dev/null @@ -1,18 +0,0 @@ -info_dir=usr/share/info -info_files=(source-highlight.info source-highlight-lib.info) - -post_install() { - for f in ${info_files[@]}; do - install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install -} - -pre_remove() { - for f in ${info_files[@]}; do - install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} diff --git a/staging/sox/PKGBUILD b/staging/sox/PKGBUILD deleted file mode 100644 index 0b370fe65..000000000 --- a/staging/sox/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 161504 2012-06-12 05:34:19Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=sox -pkgver=14.4.0 -pkgrel=3 -pkgdesc="The Swiss Army knife of sound processing tools" -arch=('i686' 'x86_64') -url="http://sox.sourceforge.net/" -license=('GPL' 'LGPL') -depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr' 'gsm') -makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse') -checkdepends=('time') -optdepends=('libao: for ao plugin' - 'ffmpeg: for ffmpeg plugin' - 'libmad: for mp3 plugin' - 'libid3tag: for mp3 plugin' - 'wavpack: for wavpack plugin' - 'libpulse: for pulse plugin') -options=('!libtool') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - sox_default_audio_driver_fallback.patch sox-ffmpeg0.11.patch) -sha1sums=('12dfc57e503ed4e18cedcac292cdae7982281978' - 'ab304f1fc17269262dbc4977aa9b7e97ec805ae4' - '2f92bcaebcaf300782396f106cdd27c72048a851') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 -i "${srcdir}/sox_default_audio_driver_fallback.patch" - patch -p1 -i "${srcdir}/sox-ffmpeg0.11.patch" - sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.in - ./configure --prefix=/usr --sysconfdir=/etc \ - --with-dyn-default --with-distro="Arch Linux" - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make bindir=. installcheck -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/sox/sox-ffmpeg0.11.patch b/staging/sox/sox-ffmpeg0.11.patch deleted file mode 100644 index 901c81582..000000000 --- a/staging/sox/sox-ffmpeg0.11.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff -Naur sox-14.4.0-orig/configure sox-14.4.0/configure ---- sox-14.4.0-orig/configure 2012-06-12 00:35:53.462360803 -0400 -+++ sox-14.4.0/configure 2012-06-12 00:36:08.572361294 -0400 -@@ -15781,9 +15781,9 @@ - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_open_input_file in -lavformat" >&5 --$as_echo_n "checking for av_open_input_file in -lavformat... " >&6; } --if ${ac_cv_lib_avformat_av_open_input_file+:} false; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avformat_open_input in -lavformat" >&5 -+$as_echo_n "checking for avformat_open_input in -lavformat... " >&6; } -+if ${ac_cv_lib_avformat_avformat_open_input+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS -@@ -15797,27 +15797,27 @@ - #ifdef __cplusplus - extern "C" - #endif --char av_open_input_file (); -+char avformat_open_input (); - int - main () - { --return av_open_input_file (); -+return avformat_open_input (); - ; - return 0; - } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_avformat_av_open_input_file=yes -+ ac_cv_lib_avformat_avformat_open_input=yes - else -- ac_cv_lib_avformat_av_open_input_file=no -+ ac_cv_lib_avformat_avformat_open_input=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_av_open_input_file" >&5 --$as_echo "$ac_cv_lib_avformat_av_open_input_file" >&6; } --if test "x$ac_cv_lib_avformat_av_open_input_file" = xyes; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_avformat_open_input" >&5 -+$as_echo "$ac_cv_lib_avformat_avformat_open_input" >&6; } -+if test "x$ac_cv_lib_avformat_avformat_open_input" = xyes; then : - for ac_header in libavcodec/avcodec.h ffmpeg/avcodec.h - do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -diff -Naur sox-14.4.0-orig/src/ffmpeg.c sox-14.4.0/src/ffmpeg.c ---- sox-14.4.0-orig/src/ffmpeg.c 2012-06-12 00:35:53.459027469 -0400 -+++ sox-14.4.0/src/ffmpeg.c 2012-06-12 00:36:26.539028545 -0400 -@@ -93,7 +93,7 @@ - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - enc->error_resilience = 1; - #else -- enc->error_recognition = 1; -+ enc->err_recognition = 1; - #endif - - if (!codec || avcodec_open(enc, codec) < 0) -@@ -157,7 +157,7 @@ - static int startread(sox_format_t * ft) - { - priv_t * ffmpeg = (priv_t *)ft->priv; -- AVFormatParameters params; -+ AVDictionary *params; - int ret; - int i; - -@@ -172,7 +172,7 @@ - - /* Open file and get format */ - memset(¶ms, 0, sizeof(params)); -- if ((ret = av_open_input_file(&ffmpeg->ctxt, ft->filename, NULL, 0, ¶ms)) < 0) { -+ if ((ret = avformat_open_input(&ffmpeg->ctxt, ft->filename, NULL, ¶ms)) < 0) { - lsx_fail("ffmpeg cannot open file for reading: %s (code %d)", ft->filename, ret); - return SOX_EOF; - } -@@ -231,7 +231,7 @@ - /* If input buffer empty, read more data */ - if (ffmpeg->audio_buf_index * 2 >= ffmpeg->audio_buf_size) { - if ((ret = av_read_frame(ffmpeg->ctxt, pkt)) < 0 && -- (ret == AVERROR_EOF || url_ferror(ffmpeg->ctxt->pb))) -+ (ret == AVERROR_EOF || ffmpeg->ctxt->pb->error)) - break; - ffmpeg->audio_buf_size = audio_decode_frame(ffmpeg, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE); - ffmpeg->audio_buf_index = 0; -@@ -373,13 +373,6 @@ - return SOX_EOF; - } - -- /* set the output parameters (must be done even if no -- parameters). */ -- if (av_set_parameters(ffmpeg->ctxt, NULL) < 0) { -- lsx_fail("ffmpeg invalid output format parameters"); -- return SOX_EOF; -- } -- - /* Next line for debugging */ - /* dump_format(ffmpeg->ctxt, 0, ft->filename, 1); */ - -@@ -391,14 +384,14 @@ - - /* open the output file, if needed */ - if (!(ffmpeg->fmt->flags & AVFMT_NOFILE)) { -- if (url_fopen(&ffmpeg->ctxt->pb, ft->filename, URL_WRONLY) < 0) { -+ if (avio_open(&ffmpeg->ctxt->pb, ft->filename, AVIO_FLAG_WRITE) < 0) { - lsx_fail("ffmpeg could not open `%s'", ft->filename); - return SOX_EOF; - } - } - - /* write the stream header, if any */ -- av_write_header(ffmpeg->ctxt); -+ avformat_write_header(ffmpeg->ctxt, NULL); - - return SOX_SUCCESS; - } -@@ -478,7 +471,7 @@ - #if (LIBAVFORMAT_VERSION_INT < 0x340000) - url_fclose(&ffmpeg->ctxt->pb); - #else -- url_fclose(ffmpeg->ctxt->pb); -+ avio_close(ffmpeg->ctxt->pb); - #endif - } - diff --git a/staging/sox/sox_default_audio_driver_fallback.patch b/staging/sox/sox_default_audio_driver_fallback.patch deleted file mode 100644 index 9f9060e17..000000000 --- a/staging/sox/sox_default_audio_driver_fallback.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- src/sox.c.old 2012-05-06 22:45:45.380564154 -0400 -+++ src/sox.c 2012-05-06 22:47:11.948248987 -0400 -@@ -2538,20 +2538,38 @@ - return name? from_env? from_env : name : NULL; - } - -+static char const * try_device(char const * name) -+{ -+ sox_format_handler_t const * handler = sox_find_format(name, sox_false); -+ if (handler) { -+ sox_format_t format, * ft = &format; -+ memset(ft, 0, sizeof(*ft)); -+ ft->filename = (char *)device_name(name); -+ ft->priv = lsx_calloc(1, handler->priv_size); -+ if (handler->startwrite(ft) == SOX_SUCCESS) { -+ handler->stopwrite(ft); -+ free(ft->priv); -+ return name; -+ } -+ free(ft->priv); -+ } -+ return NULL; -+} -+ - static char const * set_default_device(file_t * f) - { - /* Default audio driver type in order of preference: */ - if (!f->filetype) f->filetype = getenv("AUDIODRIVER"); -- if (!f->filetype && sox_find_format("coreaudio", sox_false)) f->filetype = "coreaudio"; -- if (!f->filetype && sox_find_format("pulseaudio" , sox_false)) f->filetype = "pulseaudio"; -- if (!f->filetype && sox_find_format("alsa", sox_false)) f->filetype = "alsa"; -- if (!f->filetype && sox_find_format("waveaudio" , sox_false)) f->filetype = "waveaudio"; -- if (!f->filetype && sox_find_format("sndio", sox_false)) f->filetype = "sndio"; -- if (!f->filetype && sox_find_format("oss" , sox_false)) f->filetype = "oss"; -- if (!f->filetype && sox_find_format("sunau",sox_false)) f->filetype = "sunau"; -- if (!f->filetype && sox_find_format("ao" , sox_false) && file_count) /*!rec*/ -- f->filetype = "ao"; -- -+ if (!f->filetype) f->filetype = try_device("coreaudio"); -+ if (!f->filetype) f->filetype = try_device("pulseaudio"); -+ if (!f->filetype) f->filetype = try_device("alsa"); -+ if (!f->filetype) f->filetype = try_device("waveaudio"); -+ if (!f->filetype) f->filetype = try_device("sndio"); -+ if (!f->filetype) f->filetype = try_device("oss"); -+ if (!f->filetype) f->filetype = try_device("sunau"); -+ if (!f->filetype && file_count) /*!rec*/ -+ f->filetype = try_device("ao"); -+ - if (!f->filetype) { - lsx_fail("Sorry, there is no default audio device configured"); - exit(1); diff --git a/staging/squid/PKGBUILD b/staging/squid/PKGBUILD deleted file mode 100644 index 0741b7bb7..000000000 --- a/staging/squid/PKGBUILD +++ /dev/null @@ -1,94 +0,0 @@ -# $Id: PKGBUILD 161335 2012-06-09 22:30:45Z dreisner $ -# Maintainer: Kevin Piche <kevin@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=squid -pkgver=3.1.20 -pkgrel=2 -pkgdesc="A full-featured Web proxy cache server." -arch=('i686' 'x86_64') -url="http://www.squid-cache.org" -depends=('openssl' 'pam' 'cron' 'perl' 'libltdl') -makedepends=('libcap') -license=('GPL') -backup=('etc/squid/squid.conf' - 'etc/squid/mime.conf' - 'etc/conf.d/squid') -install=squid.install -source=("http://www.squid-cache.org/Versions/v3/3.1/$pkgname-$pkgver.tar.bz2" - 'squid' - 'squid.conf.d' - 'squid.pam' - 'squid.cron' - 'squid.service') -md5sums=('c4d733a383c0508fd0746d64a2d7278a' - '02f7b5bd793f778e40834fd6457d2199' - '2383772ef94efddc7b920628bc7ac5b0' - '270977cdd9b47ef44c0c427ab9034777' - 'b499c2b725aefd7bd60bec2f1a9de392' - '20e00e1aa1198786795f3da32db3c1d8') - -build() { - cd "$pkgname-$pkgver" - - # gcc 4.6 doesn't support -fhuge-objects. - sed '/^ HUGE_OBJECT_FLAG=/ s/"-fhuge-objects"//' -i configure - - # fix cache_dir, cache_dir size, and effective group. - sed '/^DEFAULT_SWAP_DIR/ s@/cache@/cache/squid@' -i src/Makefile.in - sed '/^#cache_dir/ s/100/256/ - /^NAME: cache_effective_group/ {n;n;s/none/proxy/}' -i src/cf.data.pre - - ./configure \ - --prefix=/usr \ - --datadir=/usr/share/squid \ - --sysconfdir=/etc/squid \ - --libexecdir=/usr/lib/squid \ - --localstatedir=/var \ - --with-logdir=/var/log/squid \ - --with-pidfile=/run/squid.pid \ - --enable-auth="basic,digest,ntlm" \ - --enable-removal-policies="lru,heap" \ - --enable-digest-auth-helpers="password" \ - --enable-storeio="aufs,ufs,diskd" \ - --enable-basic-auth-helpers="getpwnam,YP,NCSA,SMB,MSNT,PAM,multi-domain-NTLM" \ - --enable-external-acl-helpers="ip_user,unix_group,wbinfo_group" \ - --enable-ntlm-auth-helpers="smb_lm,fakeauth,no_check" \ - --enable-delay-pools \ - --enable-arp-acl \ - --enable-ssl \ - --enable-snmp \ - --enable-linux-netfilter \ - --enable-ident-lookups \ - --enable-useragent-log \ - --enable-cache-digests \ - --enable-referer-log \ - --enable-arp-acl \ - --enable-htcp \ - --enable-carp \ - --enable-epoll \ - --with-filedescriptors=4096 \ - --with-large-files \ - --enable-arp-acl \ - --with-default-user=proxy \ - --enable-async-io \ - --enable-truncate - - make -} - -package() { - make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install - - install -Dm755 "$srcdir"/squid "$pkgdir"/etc/rc.d/squid - install -Dm755 "$srcdir"/squid.cron "$pkgdir"/etc/cron.weekly/squid - install -Dm644 "$srcdir"/squid.conf.d "$pkgdir"/etc/conf.d/squid - install -Dm644 "$srcdir"/squid.pam "$pkgdir"/etc/pam.d/squid - - install -Dm644 "$srcdir/squid.service" "$pkgdir/usr/lib/systemd/system/squid.service" - - # random unneeded empty dir... - rmdir "$pkgdir/usr/include" -} - -# vim: ts=2 sw=2 et ft=sh diff --git a/staging/squid/squid b/staging/squid/squid deleted file mode 100644 index da5534427..000000000 --- a/staging/squid/squid +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[[ -f /etc/conf.d/squid ]] && . /etc/conf.d/squid - -. /etc/rc.conf -. /etc/rc.d/functions - -pidfile=/run/squid.pid -{ read -r PID </run/squid.pid; } 2>/dev/null -if [[ $pid && ! /proc/$pid/exe -ef /usr/sbin/squid ]]; then - rm /run/squid.pid -fi - -case $1 in - start) - stat_busy "Starting squid" - if [[ $PID ]] || ! squid $SQUID_ARGS; then - stat_fail - else - add_daemon squid - stat_done - fi - ;; - - stop) - stat_busy "Stopping squid" - if [[ -z $PID ]] || ! squid -k shutdown &>/dev/null; then - stat_fail - else - # squid takes forever to shutdown all its listening FDs - while [[ /proc/$PID/exe -ef /usr/sbin/squid ]]; do - stat_append "." - sleep 3 - done - rm_daemon squid - stat_done - fi - ;; - - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/staging/squid/squid.conf.d b/staging/squid/squid.conf.d deleted file mode 100644 index ea248b76c..000000000 --- a/staging/squid/squid.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to squid -# -SQUID_ARGS="-sYC" diff --git a/staging/squid/squid.cron b/staging/squid/squid.cron deleted file mode 100644 index c78e51105..000000000 --- a/staging/squid/squid.cron +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -# exit without error if no pidfile exists -{ read pid </run/squid.pid; } 2>/dev/null || exit 0 - -# make sure found PID really is a squid process -if [ /proc/$pid/exec -ef /usr/sbin/squid ]; then - /usr/sbin/squid -k rotate -fi diff --git a/staging/squid/squid.install b/staging/squid/squid.install deleted file mode 100644 index e7aa5ff68..000000000 --- a/staging/squid/squid.install +++ /dev/null @@ -1,26 +0,0 @@ -post_install() { - if [ -z "$(grep ^proxy: /etc/group)" ]; then - usr/sbin/groupadd -g 15 proxy &>/dev/null - fi - - id proxy &>/dev/null || \ - usr/sbin/useradd -u 15 -g proxy -d /var/empty proxy - - chown proxy.proxy var/{cache,log}/squid - -# cat << EOF -#Release notes: http://www.squid-cache.org/Versions/v3/3.1/RELEASENOTES.html -#EOF -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/userdel proxy &> /dev/null - if [ ! -z "$(grep ^proxy: /etc/group)" ]; then - usr/sbin/groupdel proxy &>/dev/null - fi -} - diff --git a/staging/squid/squid.pam b/staging/squid/squid.pam deleted file mode 100644 index df8a8104f..000000000 --- a/staging/squid/squid.pam +++ /dev/null @@ -1,4 +0,0 @@ -#/etc/pam.d/squid -# -auth required pam_unix.so -account required pam_unix.so diff --git a/staging/squid/squid.service b/staging/squid/squid.service deleted file mode 100644 index 9d41cc243..000000000 --- a/staging/squid/squid.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Web Proxy Cache Server -After=network.target - -[Service] -Type=forking -PIDFile=/run/squid.pid -ExecStart=/usr/sbin/squid -sYC -ExecStop=/usr/sbin/squid -k shutdown -ExecReload=/usr/sbin/squid -k reconfigure - -[Install] -WantedBy=multi-user.target diff --git a/staging/strigi/PKGBUILD b/staging/strigi/PKGBUILD deleted file mode 100644 index 4ae50fa57..000000000 --- a/staging/strigi/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# $Id: PKGBUILD 164313 2012-07-30 07:25:13Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=strigi -pkgver=0.7.7 -pkgrel=2 -pkgdesc="Fast crawling desktop search engine with Qt4 GUI" -arch=('i686' 'x86_64') -url='http://strigi.sourceforge.net/' -license=('GPL2') -depends=('exiv2' 'libxml2' 'boost-libs') -makedepends=('qt' 'cmake' 'pkg-config' 'boost') -optdepends=('kdegraphics-strigi-analyzer: strigi analyzers for various graphics file' - 'kdesdk-strigi-analyzer: strigi analyzer for KDE SDK') -#source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'gcc47.patch') -md5sums=('ca0a0fd5c2b99879f6330837aeede996' - '1acb9b31a4859dc427fc4d387fd8aa2f') - -build() { - pushd ${pkgname}-${pkgver}/strigidaemon - patch -p1 -i "${srcdir}"/gcc47.patch - popd - - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DENABLE_INOTIFY=ON \ - -DENABLE_LOG4CXX=OFF \ - -DENABLE_FAM=OFF \ - -DENABLE_CLUCENE=OFF \ - -DENABLE_CLUCENE_NG=OFF \ - -DENABLE_FFMPEG=OFF - make -} - -package() { - pushd build/libstreams - make DESTDIR="${pkgdir}" install - popd - - pushd build/libstreamanalyzer - make DESTDIR="${pkgdir}" install - popd - - pushd build/strigiclient/lib/searchclient/qtdbus - make DESTDIR="${pkgdir}" install - popd - - pushd build/strigiutils - make DESTDIR="${pkgdir}" install - popd -} diff --git a/staging/strigi/gcc47.patch b/staging/strigi/gcc47.patch deleted file mode 100644 index d99582563..000000000 --- a/staging/strigi/gcc47.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Rex Dieter <rdieter@fedoraproject.org> -Date: Mon, 09 Jan 2012 17:13:25 +0000 -Subject: gcc47 fix, unistd.h header required unconditionally for 'sleep' -X-Git-Url: http://quickgit.kde.org/?p=strigidaemon.git&a=commitdiff&h=a8e97f672325557b3fbc84b987299350ec5ac10b ---- -gcc47 fix, unistd.h header required unconditionally for 'sleep' ---- - - ---- a/bin/daemon/eventlistener/eventlistenerqueue.cpp -+++ b/bin/daemon/eventlistener/eventlistenerqueue.cpp -@@ -27,9 +27,7 @@ - #include <iostream> - #include <stdio.h> - --#if defined(__SUNPRO_CC) - #include <unistd.h> --#endif - - using namespace std; - - diff --git a/staging/systemd/0001-Reinstate-TIMEOUT-handling.patch b/staging/systemd/0001-Reinstate-TIMEOUT-handling.patch deleted file mode 100644 index 766dcb87f..000000000 --- a/staging/systemd/0001-Reinstate-TIMEOUT-handling.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 2127f99fb43d2ef950e95329ce40bdd5da8b015c Mon Sep 17 00:00:00 2001 -From: Dave Reisner <dreisner@archlinux.org> -Date: Fri, 25 May 2012 19:43:24 -0400 -Subject: [PATCH] Reinstate TIMEOUT= handling - -This is mostly to deal with ipw2?00 drivers which have yet to be fixed -in the kernel. ---- - src/libudev/libudev-device.c | 19 +++++++++++++++++++ - src/libudev/libudev-private.h | 1 + - src/udev/udevd.c | 13 ++++++++++--- - 3 files changed, 30 insertions(+), 3 deletions(-) - -diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c -index a8277d1..5966189 100644 ---- a/src/libudev/libudev-device.c -+++ b/src/libudev/libudev-device.c -@@ -68,6 +68,7 @@ struct udev_device { - struct udev_list tags_list; - unsigned long long int seqnum; - unsigned long long int usec_initialized; -+ int timeout; - int devlink_priority; - int refcount; - dev_t devnum; -@@ -89,6 +90,21 @@ struct udev_device { - bool db_persist; - }; - -+int udev_device_get_timeout(struct udev_device *udev_device) -+{ -+ return udev_device->timeout; -+} -+ -+static int udev_device_set_timeout(struct udev_device *udev_device, int timeout) -+{ -+ char num[32]; -+ -+ udev_device->timeout = timeout; -+ snprintf(num, sizeof(num), "%u", timeout); -+ udev_device_add_property(udev_device, "TIMEOUT", num); -+ return 0; -+} -+ - /** - * udev_device_get_seqnum: - * @udev_device: udev device -@@ -362,6 +378,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device, - - util_strscpyl(path, sizeof(path), TEST_PREFIX "/sys", &property[8], NULL); - udev_device_set_syspath(udev_device, path); -+ } else if (strncmp(property, "TIMEOUT=", 8) == 0) { -+ udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10)); - } else if (startswith(property, "SUBSYSTEM=")) { - udev_device_set_subsystem(udev_device, &property[10]); - } else if (startswith(property, "DEVTYPE=")) { -@@ -605,6 +623,7 @@ struct udev_device *udev_device_new(struct udev *udev) - udev_list_init(udev, &udev_device->sysattr_value_list, true); - udev_list_init(udev, &udev_device->sysattr_list, false); - udev_list_init(udev, &udev_device->tags_list, true); -+ udev_device->timeout = -1; - udev_device->watch_handle = -1; - /* copy global properties */ - udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev)) -diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h -index 4eb4a59..99aefeb 100644 ---- a/src/libudev/libudev-private.h -+++ b/src/libudev/libudev-private.h -@@ -70,6 +70,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device); - void udev_device_set_is_initialized(struct udev_device *udev_device); - int udev_device_add_tag(struct udev_device *udev_device, const char *tag); - void udev_device_cleanup_tags_list(struct udev_device *udev_device); -+int udev_device_get_timeout(struct udev_device *udev_device); - unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device); - void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized); - int udev_device_get_devlink_priority(struct udev_device *udev_device); -diff --git a/src/udev/udevd.c b/src/udev/udevd.c -index 0d85960..cd24462 100644 ---- a/src/udev/udevd.c -+++ b/src/udev/udevd.c -@@ -384,7 +384,7 @@ out: - } - } - --static void event_run(struct event *event) -+static void event_run(struct event *event, bool force) - { - struct udev_list_node *loop; - -@@ -410,7 +410,7 @@ static void event_run(struct event *event) - return; - } - -- if (children >= children_max) { -+ if (!force && children >= children_max) { - if (children_max > 1) - log_debug("maximum number (%i) of children reached\n", children); - return; -@@ -444,6 +444,13 @@ static int event_queue_insert(struct udev_device *dev) - - event->state = EVENT_QUEUED; - udev_list_node_append(&event->node, &event_list); -+ -+ /* run all events with a timeout set immediately */ -+ if (udev_device_get_timeout(dev) > 0) { -+ event_run(event, true); -+ return 0; -+ } -+ - return 0; - } - -@@ -549,7 +556,7 @@ static void event_queue_start(struct udev *udev) - if (is_devpath_busy(event)) - continue; - -- event_run(event); -+ event_run(event, false); - } - } - --- -1.7.10.2 - diff --git a/staging/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch b/staging/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch deleted file mode 100644 index 9be6ef28f..000000000 --- a/staging/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 1845fdd967d3a4c06f895413505de3c2429955b0 Mon Sep 17 00:00:00 2001 -From: Dave Reisner <dreisner@archlinux.org> -Date: Thu, 27 Sep 2012 20:48:13 -0400 -Subject: [PATCH] tmpfiles: restore previous behavior for F/f - -d4e9eb91ea changed the behavior for the F and f actions, wrongly sending -them to glob_item(). Restore the old behavior and shortcut straight to -write_one_file(). ---- - src/tmpfiles/tmpfiles.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c -index f10f908..bf900fa 100644 ---- a/src/tmpfiles/tmpfiles.c -+++ b/src/tmpfiles/tmpfiles.c -@@ -673,6 +673,10 @@ static int create_item(Item *i) { - - case CREATE_FILE: - case TRUNCATE_FILE: -+ r = write_one_file(i, i->path); -+ if (r < 0) -+ return r; -+ break; - case WRITE_FILE: - r = glob_item(i, write_one_file); - if (r < 0) --- -1.7.12.1 - diff --git a/staging/systemd/PKGBUILD b/staging/systemd/PKGBUILD deleted file mode 100644 index 18c285073..000000000 --- a/staging/systemd/PKGBUILD +++ /dev/null @@ -1,151 +0,0 @@ -# Maintainer: Dave Reisner <dreisner@archlinux.org> -# Contributor: Tom Gundersen <teg@jklm.no> - -pkgbase=systemd -pkgname=('systemd' 'systemd-sysvcompat') -pkgver=194 -pkgrel=2 -arch=('i686' 'x86_64') -url="http://www.freedesktop.org/wiki/Software/systemd" -license=('GPL2' 'LGPL2.1' 'MIT') -makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf' - 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libxslt' 'linux-api-headers' - 'pam' 'python' 'quota-tools' 'xz') -options=('!libtool') -source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" - 'initcpio-hook-udev' - 'initcpio-install-udev' - 'initcpio-install-timestamp' - '0001-Reinstate-TIMEOUT-handling.patch' - 'use-split-usr-path.patch') -md5sums=('0ebb73aea444693b9b86f7a76f5df23c' - 'e99e9189aa2f6084ac28b8ddf605aeb8' - 'fb37e34ea006c79be1c54cbb0f803414' - 'df69615503ad293c9ddf9d8b7755282d' - '5543be25f205f853a21fa5ee68e03f0d' - 'fd5b5f04ab0a847373d357555129d4c0') - -build() { - cd "$pkgname-$pkgver" - - # still waiting on ipw2x00, et al to get fixed... - patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch" - - # hang onto this until we do the /{,s}bin merge - patch -Np1 <"$srcdir/use-split-usr-path.patch" - - ./configure \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --enable-introspection \ - --enable-gtk-doc \ - --disable-audit \ - --disable-ima \ - --with-distro=arch \ - --with-usb-ids-path=/usr/share/hwdata/usb.ids \ - --with-pci-ids-path=/usr/share/hwdata/pci.ids - - make -} - -check() { - make -C "$pkgname-$pkgver" check -} - -package_systemd() { - pkgdesc="system and service manager" - depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt' - 'pam' 'util-linux' 'xz') - provides=("libsystemd=$pkgver" "systemd-tools=$pkgver" "udev=$pkgver") - replaces=('libsystemd' 'systemd-tools' 'udev') - conflicts=('libsystemd' 'systemd-tools' 'udev') - optdepends=('initscripts: legacy support for /etc/rc.conf' - 'python2-cairo: systemd-analyze' - 'python2-dbus: systemd-analyze' - 'systemd-sysvcompat: symlink package to provide sysvinit binaries' - 'cryptsetup: required for encrypted block devices' - 'quota-tools: kernel-level quota management') - backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf - etc/dbus-1/system.d/org.freedesktop.hostname1.conf - etc/dbus-1/system.d/org.freedesktop.login1.conf - etc/dbus-1/system.d/org.freedesktop.locale1.conf - etc/dbus-1/system.d/org.freedesktop.timedate1.conf - etc/systemd/system.conf - etc/systemd/user.conf - etc/systemd/logind.conf - etc/systemd/journald.conf - etc/udev/udev.conf) - install="systemd.install" - - make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install - - printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf" - - install -dm755 "$pkgdir/bin" - ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd" - - # move bash-completion and symlink for loginctl - install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \ - "$pkgdir/usr/share/bash-completion/completions/systemctl" - ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/loginctl" - rm -rf "$pkgdir/etc/bash_completion.d" - - # don't write units to /etc by default -- we'll enable this on post_install - # as a sane default - rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service" - rmdir "$pkgdir/etc/systemd/system/getty.target.wants" - - # get rid of RPM macros - rm -r "$pkgdir/etc/rpm" - - # can't use py3k yet with systemd-analyze -- the 'plot' verb will not work. - # https://pokersource.info/show_bug.cgi?id=50989 - sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" - - # the path to udevadm is hardcoded in some places - install -d "$pkgdir/sbin" - ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm" - - # udevd is no longer udevd because systemd. why isn't udevadm now udevctl? - ln -s ../lib/systemd/systemd-udevd "$pkgdir/usr/bin/udevd" - - # add back tmpfiles.d/legacy.conf - install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d" - - # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group - sed -i 's#GROUP="dialout"#GROUP="uucp"#g; - s#GROUP="tape"#GROUP="storage"#g; - s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules - - # add mkinitcpio hooks - install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev" - install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev" - install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp" - - # XXX: kill off coredump rule until the journal can recover coredumps - rm "$pkgdir/usr/lib/sysctl.d/coredump.conf" - - ### split out manpages for sysvcompat - rm -rf "$srcdir/_sysvcompat" - install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/ - mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ - "$srcdir"/_sysvcompat/usr/share/man/man8 -} - -package_systemd-sysvcompat() { - pkgdesc="sysvinit compat for systemd" - conflicts=('sysvinit') - depends=('sysvinit-tools') - - mv "$srcdir/_sysvcompat"/* "$pkgdir" - - install -dm755 "$pkgdir/sbin" - for tool in runlevel reboot shutdown poweroff halt telinit; do - ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool" - done - - ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init" -} - -# vim: ft=sh syn=sh et diff --git a/staging/systemd/initcpio-hook-udev b/staging/systemd/initcpio-hook-udev deleted file mode 100644 index 75da7e4a8..000000000 --- a/staging/systemd/initcpio-hook-udev +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/ash - -run_earlyhook() { - udevd --daemon --resolve-names=never - udevd_running=1 -} - -run_hook() { - msg ":: Triggering uevents..." - udevadm trigger --action=add --type=subsystems - udevadm trigger --action=add --type=devices - udevadm settle -} - -run_cleanuphook() { - udevadm control --exit - udevadm info --cleanup-db -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/staging/systemd/initcpio-install-timestamp b/staging/systemd/initcpio-install-timestamp deleted file mode 100644 index 259cc705b..000000000 --- a/staging/systemd/initcpio-install-timestamp +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -build() { - add_binary /usr/lib/systemd/systemd-timestamp /usr/bin/systemd-timestamp -} - -help() { - cat <<HELPEOF -Provides support for RD_TIMESTAMP in early userspace, which can be read by a -program such as systemd-analyze to determine boot time. -HELPEOF -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/staging/systemd/initcpio-install-udev b/staging/systemd/initcpio-install-udev deleted file mode 100644 index 15124b8f7..000000000 --- a/staging/systemd/initcpio-install-udev +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -build() { - local rules tool - - add_file "/etc/udev/udev.conf" - add_binary /usr/lib/systemd/systemd-udevd /usr/bin/udevd - add_binary /usr/bin/udevadm - - for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do - add_file "/usr/lib/udev/rules.d/$rules" - done - for tool in ata_id scsi_id; do - add_file "/usr/lib/udev/$tool" - done - - add_runscript -} - -help() { - cat <<HELPEOF -This hook will use udev to create your root device node and detect the needed -modules for your root device. It is also required for firmware loading in -initramfs. It is recommended to use this hook. -HELPEOF -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/staging/systemd/systemd.install b/staging/systemd/systemd.install deleted file mode 100644 index 784926e17..000000000 --- a/staging/systemd/systemd.install +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -sd_booted() { - [ -e sys/fs/cgroup/systemd ] -} - -post_install() { - # enable getty@tty1 by default, but don't track the file - systemctl enable getty@.service - - systemd-machine-id-setup - - echo ":: Append 'init=/bin/systemd' to your kernel command line in your" - echo " bootloader to replace sysvinit with systemd" -} - -post_upgrade() { - systemd-machine-id-setup - - # getty@tty1.service is no longer enabled by default, but we don't want to break - # existing setups. - if [ "$(vercmp 183 "$2")" -eq 1 ]; then - # systemctl seems to be whiny on sysvinit. this will succeed unless something - # horrific happens, so just mask the error. - systemctl -q enable getty@.service || true - fi -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/systemd/use-split-usr-path.patch b/staging/systemd/use-split-usr-path.patch deleted file mode 100644 index 2fd32998d..000000000 --- a/staging/systemd/use-split-usr-path.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/core/main.c 2012-09-20 23:02:54.000000000 -0400 -+++ b/src/core/main.c 2012-09-20 23:03:13.000000000 -0400 -@@ -1455,11 +1455,7 @@ - - /* Set up PATH unless it is already set */ - setenv("PATH", --#ifdef HAVE_SPLIT_USR - "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", --#else -- "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin", --#endif - arg_running_as == SYSTEMD_SYSTEM); - - if (arg_running_as == SYSTEMD_SYSTEM) { diff --git a/staging/telepathy-kde-common-internals/PKGBUILD b/staging/telepathy-kde-common-internals/PKGBUILD deleted file mode 100644 index 6759bd0ce..000000000 --- a/staging/telepathy-kde-common-internals/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 165596 2012-08-26 19:03:12Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=telepathy-kde-common-internals -_pkgname=ktp-common-internals -pkgver=0.5.0 -pkgrel=1 -pkgdesc="Common components for KDE-Telepathy" -arch=('i686' 'x86_64') -url="http://community.kde.org/Real-Time_Communication_and_Collaboration" -license=('GPL') -depends=('kdelibs' 'telepathy-qt' 'telepathy-mission-control') -makedepends=('cmake' 'automoc4') -groups=('kde-telepathy') -install=${pkgname}.install -source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('34bac58049ede6df4fce1215fbc3b4ffc9671cba') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${_pkgname}-${pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/telepathy-kde-common-internals/telepathy-kde-common-internals.install b/staging/telepathy-kde-common-internals/telepathy-kde-common-internals.install deleted file mode 100644 index 0b9f228a9..000000000 --- a/staging/telepathy-kde-common-internals/telepathy-kde-common-internals.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_update() { - post_install -} - -post_remove() { - post_install -}
\ No newline at end of file diff --git a/staging/telepathy-logger-qt/PKGBUILD b/staging/telepathy-logger-qt/PKGBUILD deleted file mode 100644 index 9a1a1900b..000000000 --- a/staging/telepathy-logger-qt/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 165594 2012-08-26 18:55:38Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: George Brooke <george+arch.aur@george-brooke.co.uk> - -pkgname=telepathy-logger-qt -pkgver=0.5.0 -pkgrel=1 -pkgdesc="Qt bindings for telepathy logger" -arch=('i686' 'x86_64') -url='https://projects.kde.org/projects/extragear/network/telepathy/telepathy-logger-qt' -license=('GPL') -depends=('telepathy-qt' 'telepathy-logger' 'qt-gstreamer' 'boost-libs') -makedepends=('automoc4' 'cmake' 'python2' 'boost' 'doxygen') -source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('09d949e60c5b140b20c61ec1d52830e7b98cd50e') - -build() { - cd "$srcdir" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 - make -} - -package() { - cd "$srcdir/build" - make DESTDIR="$pkgdir" install -} diff --git a/staging/tellico/PKGBUILD b/staging/tellico/PKGBUILD deleted file mode 100644 index c0945ceb4..000000000 --- a/staging/tellico/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 70650 2012-05-13 20:07:17Z jlichtblau $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Maintainer: Ray Rashif <schiv@archlinux.org -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> - -pkgname=tellico -pkgver=2.3.5 -pkgrel=2 -pkgdesc="A collection manager for KDE" -arch=('i686' 'x86_64') -url="http://tellico-project.org/" -license=('GPL') -depends=('kdebase-workspace' 'yaz' 'exempi' 'libksane' 'taglib' 'kdemultimedia-kioslave' 'poppler-qt' 'qjson') -makedepends=('automoc4' 'cmake') -install=$pkgname.install -source=(http://tellico-project.org/files/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('b31db35589cae7f9af56a17e6589f8c5de68e36d9fc5fbaea4154e8238bf041c') - -build() { - cd ${srcdir} - - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd ${srcdir}/build - - make DESTDIR=${pkgdir} install - -# fix python 2.7 path - find ${pkgdir} -iname "*.py" | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -} diff --git a/staging/tellico/tellico.install b/staging/tellico/tellico.install deleted file mode 100644 index 3b3aff7d9..000000000 --- a/staging/tellico/tellico.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/transcode/PKGBUILD b/staging/transcode/PKGBUILD deleted file mode 100644 index da28d1cba..000000000 --- a/staging/transcode/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 169357 2012-10-20 04:01:26Z eric $ -# Maintainer: -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> -# Contributor: roberto <roberto@archlinux.org> - -pkgname=transcode -_sripver=0.3-4 -pkgver=1.1.7 -pkgrel=6 -pkgdesc="A video/DVD ripper and encoder for the terminal/console" -arch=('i686' 'x86_64') -url="http://tcforge.berlios.de/" -license=('GPL') -depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools' - 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec') -makedepends=('nasm') -options=('!libtool') -source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2 - http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz - subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch - ffmpeg-0.11.patch) -sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6' - 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d' - 'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7' - '591943a33235342a66c3df0625a164a1479c09ae' - '3d2dcdc23f14938e87d14cfc03000bb3b649b85e') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i "${srcdir}/ffmpeg-0.11.patch" - ./configure --prefix=/usr \ - --disable-sse --disable-sse2 --disable-altivec --enable-mmx \ - --enable-lame --enable-ogg --enable-vorbis --enable-theora \ - --enable-libdv --enable-libxml2 --enable-v4l \ - --enable-imagemagick --enable-libjpeg --enable-lzo --enable-mjpegtools \ - --enable-sdl --enable-freetype2 --enable-a52 --enable-libpostproc \ - --enable-xvid --enable-x264 --enable-alsa --enable-libmpeg2 --enable-libmpeg2convert - make - - cd "${srcdir}/subtitleripper" - patch -p1 -i "${srcdir}/subtitleripper-0.3.4-linkingorder.patch" - patch -p1 -i "${srcdir}/subtitleripper-0.3.4-respect-ldflags.patch" - sed -e 's|^\(.*lppm.*\)$|#\1|' \ - -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \ - -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \ - -i Makefile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - cd "${srcdir}/subtitleripper" - install -m 755 pgm2txt "${pkgdir}/usr/bin/" - install -m 755 srttool "${pkgdir}/usr/bin/" - install -m 755 subtitle2pgm "${pkgdir}/usr/bin/" - install -m 755 subtitle2vobsub "${pkgdir}/usr/bin/" - install -m 755 vobsub2pgm "${pkgdir}/usr/bin/" -} diff --git a/staging/transcode/ffmpeg-0.11.patch b/staging/transcode/ffmpeg-0.11.patch deleted file mode 100644 index b5601fe2f..000000000 --- a/staging/transcode/ffmpeg-0.11.patch +++ /dev/null @@ -1,141 +0,0 @@ -diff -Naur transcode-1.1.7/export/export_ffmpeg.c fixed-tc/export/export_ffmpeg.c ---- transcode-1.1.7/export/export_ffmpeg.c 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/export/export_ffmpeg.c 2012-07-05 16:22:41.095346080 -0400 -@@ -180,7 +180,7 @@ - - - /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */ --#include <libavcodec/opt.h> -+#include <libavutil/opt.h> - #include <libavutil/avstring.h> - #include <libswscale/swscale.h> - -@@ -470,7 +470,6 @@ - } - - TC_LOCK_LIBAVCODEC; -- avcodec_init(); - avcodec_register_all(); - TC_UNLOCK_LIBAVCODEC; - -@@ -634,7 +633,6 @@ - lavc_param_rc_max_rate = 2516; - lavc_param_rc_buffer_size = 224 * 8; - lavc_param_rc_buffer_aggressivity = 99; -- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET; - - break; - -@@ -674,7 +673,6 @@ - - lavc_param_rc_buffer_size = 224 * 8; - lavc_param_rc_buffer_aggressivity = 99; -- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET; - - break; - -diff -Naur transcode-1.1.7/export/ffmpeg_cfg.c fixed-tc/export/ffmpeg_cfg.c ---- transcode-1.1.7/export/ffmpeg_cfg.c 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/export/ffmpeg_cfg.c 2012-07-05 15:26:29.112103273 -0400 -@@ -160,9 +160,7 @@ - {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, - {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000}, - {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, -- {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART}, - // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0}, -- {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART}, - {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0}, - {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0}, -@@ -211,7 +211,6 @@ - #else - {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED}, - #endif -- {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV}, - {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, - {"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, - {"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, -@@ -223,9 +223,6 @@ - {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, - {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD}, - {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16}, -- {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT}, -- {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_SVCD_SCAN_OFFSET}, -- {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN}, - {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME}, - {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, - {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, -diff -Naur transcode-1.1.7/filter/filter_pp.c fixed-tc/filter/filter_pp.c ---- transcode-1.1.7/filter/filter_pp.c 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/filter/filter_pp.c 2012-07-05 15:26:28.945436613 -0400 -@@ -38,8 +38,8 @@ - - /* FIXME: these use the filter ID as an index--the ID can grow - * arbitrarily large, so this needs to be fixed */ --static pp_mode_t *mode[100]; --static pp_context_t *context[100]; -+static pp_mode *mode[100]; -+static pp_context *context[100]; - static int width[100], height[100]; - static int pre[100]; - -diff -Naur transcode-1.1.7/import/decode_lavc.c fixed-tc/import/decode_lavc.c ---- transcode-1.1.7/import/decode_lavc.c 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/import/decode_lavc.c 2012-07-05 15:26:28.842103278 -0400 -@@ -181,7 +181,7 @@ - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_dec_context->error_resilience = 2; - #else -- lavc_dec_context->error_recognition = 2; -+ lavc_dec_context->err_recognition = 2; - #endif - lavc_dec_context->error_concealment = 3; - lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; -diff -Naur transcode-1.1.7/import/import_ffmpeg.c fixed-tc/import/import_ffmpeg.c ---- transcode-1.1.7/import/import_ffmpeg.c 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/import/import_ffmpeg.c 2012-07-05 15:26:28.848769946 -0400 -@@ -314,7 +314,7 @@ - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_dec_context->error_resilience = 2; - #else -- lavc_dec_context->error_recognition = 2; -+ lavc_dec_context->err_recognition = 2; - #endif - lavc_dec_context->error_concealment = 3; - lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; -diff -Naur transcode-1.1.7/import/probe_ffmpeg.c fixed-tc/import/probe_ffmpeg.c ---- transcode-1.1.7/import/probe_ffmpeg.c 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/import/probe_ffmpeg.c 2012-07-05 15:26:28.838769947 -0400 -@@ -99,8 +99,8 @@ - - TC_INIT_LIBAVCODEC; - -- ret = av_open_input_file(&lavf_dmx_context, ipipe->name, -- NULL, 0, NULL); -+ ret = avformat_open_input(&lavf_dmx_context, ipipe->name, -+ NULL, NULL); - if (ret != 0) { - tc_log_error(__FILE__, "unable to open '%s'" - " (libavformat failure)", -diff -Naur transcode-1.1.7/libtc/tcavcodec.h fixed-tc/libtc/tcavcodec.h ---- transcode-1.1.7/libtc/tcavcodec.h 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/libtc/tcavcodec.h 2012-07-05 15:26:28.828769951 -0400 -@@ -53,7 +53,6 @@ - - #define TC_INIT_LIBAVCODEC do { \ - TC_LOCK_LIBAVCODEC; \ -- avcodec_init(); \ - avcodec_register_all(); \ - TC_UNLOCK_LIBAVCODEC; \ - } while (0) ---- transcode-1.1.7/export/export_ffmpeg.c.orig 2012-10-19 23:25:16.442303175 -0400 -+++ transcode-1.1.7/export/export_ffmpeg.c 2012-10-19 23:26:23.904268733 -0400 -@@ -1249,7 +1249,7 @@ - return TC_EXPORT_ERROR; - } - -- if (lavc_venc_context->codec->encode == NULL) { -+ if (lavc_venc_context->codec->encode2 == NULL) { - tc_log_warn(MOD_NAME, "could not open FFMPEG codec " - "(lavc_venc_context->codec->encode == NULL)"); - return TC_EXPORT_ERROR; diff --git a/staging/transcode/subtitleripper-0.3.4-linkingorder.patch b/staging/transcode/subtitleripper-0.3.4-linkingorder.patch deleted file mode 100644 index 7efe22346..000000000 --- a/staging/transcode/subtitleripper-0.3.4-linkingorder.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: subtitleripper/Makefile -=================================================================== ---- subtitleripper.orig/Makefile -+++ subtitleripper/Makefile -@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud - # Target - subtitle2pgm: subtitle2pgm.o spudec.o - @echo "Linking $@" -- @$(CC) $(LIBS) $^ -o $@ -+ @$(CC) $^ -o $@ $(LIBS) - - subtitle2vobsub: subtitle2vobsub.o vobsub.o - @echo "Linking $@" -- @$(CC) $(LIBS) $^ -o $@ -+ @$(CC) $^ -o $@ $(LIBS) - - srttool: srttool.o - @echo "Linking $@" -- @$(CC) $(LIBS) -g $^ -o $@ -+ @$(CC) -g $^ -o $@ $(LIBS) - - vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o - @echo "Linking $@" -- @$(CC) $(LIBS) -g $^ -o $@ -+ @$(CC) -g $^ -o $@ $(LIBS) - - .PHONY: clean dist rpm - clean: diff --git a/staging/transcode/subtitleripper-0.3.4-respect-ldflags.patch b/staging/transcode/subtitleripper-0.3.4-respect-ldflags.patch deleted file mode 100644 index 2af11d257..000000000 --- a/staging/transcode/subtitleripper-0.3.4-respect-ldflags.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: subtitleripper/Makefile -=================================================================== ---- subtitleripper.orig/Makefile -+++ subtitleripper/Makefile -@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud - # Target - subtitle2pgm: subtitle2pgm.o spudec.o - @echo "Linking $@" -- @$(CC) $^ -o $@ $(LIBS) -+ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) - - subtitle2vobsub: subtitle2vobsub.o vobsub.o - @echo "Linking $@" -- @$(CC) $^ -o $@ $(LIBS) -+ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) - - srttool: srttool.o - @echo "Linking $@" -- @$(CC) -g $^ -o $@ $(LIBS) -+ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) - - vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o - @echo "Linking $@" -- @$(CC) -g $^ -o $@ $(LIBS) -+ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) - - .PHONY: clean dist rpm - clean: diff --git a/staging/twisted/PKGBUILD b/staging/twisted/PKGBUILD deleted file mode 100644 index 35bf73958..000000000 --- a/staging/twisted/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 168774 2012-10-15 21:19:51Z eric $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Juergen Hoetzel <juergen@archlinux.org> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> - -pkgname=twisted -pkgver=12.2.0 -pkgrel=2 -pkgdesc="Asynchronous networking framework written in Python." -arch=('i686' 'x86_64') -url="http://twistedmatrix.com/" -license=('MIT') -depends=('python2-crypto' 'python2-zope-interface') -optdepends=('python2-pyopenssl' - 'python2-soappy: for twisted.web.soap' - 'python2-pyasn1: for using conch' - 'pygtk: for using manhole' - 'tk: for using tkconch') -install=twisted.install -source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2) -sha1sums=('c51834c1270e7a4bb0de9190056e4317413920f9') - -build() { - cd "$srcdir/Twisted-$pkgver" - python2 setup.py build -} - -package() { - cd "$srcdir/Twisted-$pkgver" - python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 - install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' \ - "$pkgdir"/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py \ - "$pkgdir"/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py \ - "$pkgdir"/usr/lib/python2.7/site-packages/twisted/python/test/pullpipe.py -} diff --git a/staging/twisted/twisted.install b/staging/twisted/twisted.install deleted file mode 100644 index 8e93ffd3c..000000000 --- a/staging/twisted/twisted.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - python2 -c 'from twisted.plugin import IPlugin, getPlugins; list(getPlugins(IPlugin))' >/dev/null 2>&1 || return 1 -} - -post_upgrade() { - post_install -} - -post_remove() { - find /usr/lib/python2.7/site-packages/twisted/plugins -name dropin.cache | xargs -r rm -f -} diff --git a/staging/usbmuxd/85-usbmuxd.rules b/staging/usbmuxd/85-usbmuxd.rules deleted file mode 100644 index ec9f72501..000000000 --- a/staging/usbmuxd/85-usbmuxd.rules +++ /dev/null @@ -1,9 +0,0 @@ -# usbmuxd ("Apple Mobile Device" muxer listening on /var/run/usbmuxd) - -# Forces iDevices to the last USB configuration and runs usbmuxd -TEST=="/sys/fs/cgroup/systemd", ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", OWNER="usbmux", TAG+="systemd", ENV{SYSTEMD_WANTS}="usbmuxd.service", GOTO="usbmuxd_systemd_end" -ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", OWNER="usbmux", RUN+="/usr/sbin/usbmuxd -u -U usbmux" -LABEL="usbmuxd_systemd_end" - -# Exit usbmuxd when the last device is removed -ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="/usr/sbin/usbmuxd -x" diff --git a/staging/usbmuxd/PKGBUILD b/staging/usbmuxd/PKGBUILD deleted file mode 100644 index 0b8e9b84b..000000000 --- a/staging/usbmuxd/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 163814 2012-07-20 13:59:21Z tomegun $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Gabriel Martinez < reitaka at gmail dot com > - -pkgname=usbmuxd -pkgver=1.0.8 -pkgrel=1 -pkgdesc="USB Multiplex Daemon" -url="http://marcansoft.com/blog/iphonelinux/usbmuxd/" -arch=('i686' 'x86_64') -license=('GPL2' 'GPL3' 'LGPL2.1') -depends=('libusb' 'libplist') -makedepends=('cmake') -install=usbmuxd.install -source=("http://cgit.sukimashita.com/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.bz2" - 'usbmuxd.service' - '85-usbmuxd.rules') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - echo "${pkgver}" > version.tag - mkdir build - cd build - cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLIB_SUFFIX="" - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}/build" - make DESTDIR="${pkgdir}" install - - # fix udev dir being hardcoded - mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/" - rmdir "${pkgdir}/lib" - # install systemd service file - install -D -m644 ${srcdir}/usbmuxd.service ${pkgdir}/usr/lib/systemd/system/usbmuxd.service - # use udev rule that works with systemd - install -m644 ${srcdir}/85-usbmuxd.rules ${pkgdir}/usr/lib/udev/rules.d/ -} -md5sums=('87fd27773a84e97ac6e2dc28b08d682e' - 'dae0660f972510a6483992b5b81e1b5a' - 'dc4b2893651149eccbf7b2c8467cd288') diff --git a/staging/usbmuxd/usbmuxd.install b/staging/usbmuxd/usbmuxd.install deleted file mode 100644 index 1a4859674..000000000 --- a/staging/usbmuxd/usbmuxd.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - groupadd -g 140 usbmux &>/dev/null - useradd -c 'usbmux user' -u 140 -g usbmux -d / -s /sbin/nologin usbmux &>/dev/null - passwd -l usbmux &>/dev/null -} - -post_upgrade() { - getent group usbmux >/dev/null 2>&1 || groupadd -g 140 usbmux &>/dev/null - getent passwd usbmux >/dev/null 2>&1 || useradd -c 'usbmux user' -u 140 -g usbmux -d / -s /sbin/nologin usbmux &>/dev/null -} - -post_remove() { - if getent passwd usbmux >/dev/null 2>&1; then - userdel usbmux - fi - if getent group usbmux >/dev/null 2>&1; then - groupdel usbmux - fi -} diff --git a/staging/usbmuxd/usbmuxd.service b/staging/usbmuxd/usbmuxd.service deleted file mode 100644 index fbebf65b9..000000000 --- a/staging/usbmuxd/usbmuxd.service +++ /dev/null @@ -1,5 +0,0 @@ -[Unit] -Description=iOS USB Muxer - -[Service] -ExecStart=/usr/sbin/usbmuxd -u -f -U usbmux diff --git a/staging/vde2/PKGBUILD b/staging/vde2/PKGBUILD deleted file mode 100644 index b4646d06e..000000000 --- a/staging/vde2/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 168790 2012-10-16 00:34:59Z allan $ -# Contributor: Sergej Pupykin -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -pkgname=vde2 -pkgver=2.3.2 -pkgrel=2 -pkgdesc="Virtual Distributed Ethernet for emulators like qemu" -url="http://sourceforge.net/projects/vde/" -license=("GPL" "LGPL" "CUSTOM") -arch=('i686' 'x86_64') -depends=('bash' 'libpcap' 'openssl') -makedepends=('python') -backup=(etc/conf.d/vde) -source=(http://downloads.sourceforge.net/vde/$pkgname-$pkgver.tar.bz2 - dhcpd.conf.sample - iptables.rules.sample - vde-config.sample - vde-connection.sample - vde.conf - vde.rc) -install=vde2.install -options=(!libtool !makeflags) - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/vde2 \ - --enable-experimental - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc libexecdir=$pkgdir/usr/lib/vde2 install - install -D -m 755 ../vde.rc $pkgdir/etc/rc.d/vde - install -D -m 644 ../vde.conf $pkgdir/etc/conf.d/vde - install -D -m 644 ../vde-config.sample $pkgdir/etc/vde/vde-config.sample - install -D -m 644 ../vde-connection.sample $pkgdir/etc/vde/vde-connection.sample - install -D -m 644 ../dhcpd.conf.sample $pkgdir/usr/share/vde2/dhcpd.conf.sample - install -D -m 644 ../iptables.rules.sample $pkgdir/usr/share/vde2/iptables.rules.sample - # install slirp license - install -D -m 644 COPYING.slirpvde $pkgdir/usr/share/licenses/vde2/COPYING.slirpvde -} - -md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628' - '7d9bc56d2e561d849e915000d1c0f269' - 'a920123fc620bcedbccb703a8d1bdc55' - 'cb8ace28e8efd4dad128be4be71b3b07' - '63033c33565e2030541c5e05e9d9b063' - 'a22730f051f4840da4a3162a88ff8156' - '6c7dc01bc2f039f0ff1682ee70d3d1da') diff --git a/staging/vde2/dhcpd.conf.sample b/staging/vde2/dhcpd.conf.sample deleted file mode 100644 index 565a78b27..000000000 --- a/staging/vde2/dhcpd.conf.sample +++ /dev/null @@ -1,12 +0,0 @@ -ddns-update-style none; - -subnet 192.168.254.0 netmask 255.255.255.0 { - range 192.168.254.1 192.168.254.253; - option routers 192.168.254.254; - option domain-name "virtual.example.com"; - # find your DNS servers from /etc/resolv.conf - # otherwise only pure IP addresses will work - option domain-name-servers 192.168.254.254; - option broadcast-address 192.168.254.255; - default-lease-time 86400; -} diff --git a/staging/vde2/iptables.rules.sample b/staging/vde2/iptables.rules.sample deleted file mode 100644 index ac712ee21..000000000 --- a/staging/vde2/iptables.rules.sample +++ /dev/null @@ -1,5 +0,0 @@ -*filter --A INPUT -i tun -j ACCEPT --A FORWARD -s 192.168.254.0/255.255.255.0 -j ACCEPT -*nat --A POSTROUTING -s 192.168.254.0/24 -j MASQUERADE diff --git a/staging/vde2/vde-config.sample b/staging/vde2/vde-config.sample deleted file mode 100644 index c5a5b7d88..000000000 --- a/staging/vde2/vde-config.sample +++ /dev/null @@ -1,35 +0,0 @@ -# Set options vde_switch program -# To activate this vde profile add it to /etc/conf.d/vde - -# Global options -VDE_NUMPORTS="32" # Number of ports (default 32) -VDE_HUB="no" # [yes|no] Make the switch act as a hub -VDE_FSTP="no" # [yes|no] Activate the fast spanning tree protocol -VDE_MAC="" # Set the Switch MAC address -VDE_PRIOTIRY="" # Set the priority for FST (MAC extension) -VDE_HASHSIZE="" # Hash table size - -# Options from datasock module -VDE_SOCK="/var/run/vde/sample.sock" # control directory pathname -VDE_SOCK_MODE="660" # Standard access mode for comm sockets (octal) -VDE_SOCK_GROUP="root" # Group owner for comm sockets - -# Options from consmgmt module -VDE_MANAGEMENT_SOCK="/var/run/vde/sample.mgmt" # path of the management UNIX socket -VDE_MANAGEMENT_SOCK_MODE="660" # management UNIX socket access mode (octal) - -# Other options to parse to vde_switch -VDE_OPTIONS="" - -# VDE with internet support -# You can use either tuntap method or slirpvde method. - -# Options from tuntap module -VDE_TAP="" # Enable routing through TAP tap interface (comma separated array eg.:"tap0,tap1"). - -# slirpvde daemon support -SLIRP="no" # [yes|no] enable/disable SLIRP daemon support -SLIRP_DHCP="no" # [yes|no] turn on the DHCP server for the network autoconfiguration of all the units connected to the VDE -SLIRP_NETWORK="" # specify the network address (default 10.0.2.0) -# other options to parse to slirpvde -SLIRP_OPTIONS=""
\ No newline at end of file diff --git a/staging/vde2/vde-connection.sample b/staging/vde2/vde-connection.sample deleted file mode 100644 index 4a75e1f52..000000000 --- a/staging/vde2/vde-connection.sample +++ /dev/null @@ -1,6 +0,0 @@ -# You can add vde switch connections below -# just without the # at the beginning: -# vde_plug /var/run/vde/sample.sock = vde_plug /var/run/vde/sample2.sock -# or if hosts are different use this syntax: -# vde_plug /var/run/vde/sample.sock = ssh host2 vde_plug /var/run/vde/sample.sock - diff --git a/staging/vde2/vde.conf b/staging/vde2/vde.conf deleted file mode 100644 index bc61dceda..000000000 --- a/staging/vde2/vde.conf +++ /dev/null @@ -1,11 +0,0 @@ -# Set options for a vde daemon script -# -# Array for your vde config files, eg.: "internal-net external-net" -# You need a config file in /etc/vde/ with the same name. -# Sample config file provided: /etc/vde/vde-config.sample -VDE_CONFIG="" - -# Array for your dpipe connections, eg.: "connect-switches" -# You need a config file in /etc/vde/ with the same name. -# Sample config file provided: /etc/vde/vde-connection.sample -VDE_CONNECTION=""
\ No newline at end of file diff --git a/staging/vde2/vde.rc b/staging/vde2/vde.rc deleted file mode 100755 index b368f9955..000000000 --- a/staging/vde2/vde.rc +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/vde - -case "$1" in - start) - # bring up all defined profiles - for i in $VDE_CONFIG; do - [ -e /etc/vde/$i ] && . /etc/vde/$i - stat_busy "Starting vde_switch $i" - # get options from profile - [ -n "$VDE_NUMPORTS" ] && OPTIONS="-n $VDE_NUMPORTS" - [ "$VDE_HUB" = "yes" ] && OPTIONS="$OPTIONS -x" - [ "$VDE_FSTP" = "yes" ] && OPTIONS="$OPTIONS -F" - [ -n "$VDE_MAC" ] && OPTIONS="$OPTIONS --macaddr $VDE_MAC" - [ -n "$VDE_PRIORITY" ] && OPTIONS="$OPTIONS --priority $VDE_PRIORITY" - [ -n "$VDE_HASH" ] && OPTIONS="$OPTIONS --hashsize $VDE_HASH" - [ -n "$VDE_SOCK" ] && OPTIONS="$OPTIONS -s $VDE_SOCK" - [ -n "$VDE_SOCK_MODE" ] && OPTIONS="$OPTIONS -m $VDE_SOCK_MODE" - [ -n "$VDE_SOCK_GROUP" ] && OPTIONS="$OPTIONS -g $VDE_SOCK_GROUP" - [ -n "$VDE_MANAGEMENT_SOCK" ] && OPTIONS="$OPTIONS -M $VDE_MANAGEMENT_SOCK" - [ -n "$VDE_MANAGEMENT_SOCK_MODE" ] && OPTIONS="$OPTIONS --mgmtmode $VDE_MANAGEMENT_SOCK_MODE" - [ -n "$VDE_TAP" ] && OPTIONS="$OPTIONS -t $VDE_TAP" - [ -n "$VDE_OPTIONS" ] && OPTIONS="$OPTIONS $VDE_OPTIONS" - vde_switch $OPTIONS -p /var/run/vde-$i.pid -daemon &>/dev/null - [ -n "$VDE_SOCK" -a -n "$VDE_SOCK_GROUP" ] && chgrp "$VDE_SOCK_GROUP" "$VDE_SOCK" - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - if [ "$SLIRP" = "yes" ]; then - stat_busy "Starting slirpvde for $i" - [ "$SLIRP_DHCP" = "yes" ] && SP_OPTIONS="-D" - [ -n "$SLIRP_NETWORK" ] && SP_OPTIONS="$SP_OPTIONS -n $SLIRP_NETWORK" - [ -n "$SLIRP_OPTIONS" ] && SP_OPTIONS="$SP_OPTIONS $SLIRP_OPTIONS" - [ -n "$VDE_SOCK" ] && SP_OPTIONS="$SP_OPTIONS -s $VDE_SOCK" - [ -n "$VDE_SOCK_MODE" ] && SP_OPTIONS="$SP_OPTIONS -m $VDE_SOCK_MODE" - [ -n "$VDE_SOCK_GROUP" ] && SP_OPTIONS="$SP_OPTIONS -g $VDE_SOCK_GROUP" - slirpvde $SP_OPTIONS -p /var/run/slirpvde-$i.pid -daemon &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - unset OPTIONS - unset SP_OPTIONS - fi - done - for i in $VDE_CONNECTION; do - # connect specified vde_switches - if [ "$(grep ^vde_plug /etc/vde/$i)" ]; then - stat_busy "Connecting VDE switches $i together..." - while read j; do - switch="$(echo $j | grep ^vde_plug)" - [ -n "$switch" ] && (dpipe $switch &) - done </etc/vde/$i - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - fi - done - add_daemon vde - ;; - stop) - # kill vde_plug if switches are connected - [ -n "$VDE_CONNECTION" ] && killall vde_plug >/dev/null 2>&1 - for i in $VDE_CONFIG; do - [ -e /etc/vde/$i ] && . /etc/vde/$i - if [ "$SLIRP" = "yes" ]; then - stat_busy "Stopping slirpvde for $i" - kill $(cat /var/run/slirpvde-$i.pid) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - rm /var/run/slirpvde-$i.pid &> /dev/null - fi - stat_busy "Stopping vde_switch $i" - kill $(cat /var/run/vde-$i.pid) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - rm /var/run/vde-$i.pid &> /dev/null - stat_busy "Removing $i vde sockets" - rm -rf $VDE_SOCK $VDE_MANAGEMENT_SOCK - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - done - unset OPTIONS - unset SP_OPTIONS - [ -e /var/run/vde/gmon.out ] && rm /var/run/vde/gmon.out - rm_daemon vde - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/staging/vde2/vde2.install b/staging/vde2/vde2.install deleted file mode 100644 index 74e1710ff..000000000 --- a/staging/vde2/vde2.install +++ /dev/null @@ -1,10 +0,0 @@ -post_install() { - echo "Change /etc/conf.d/vde to your needs." - echo "vde config files should be placed in /etc/vde, sample files are provided." - echo "iptables and dhcpd sample files have been installed to '/usr/share/vde2'." - echo "Merge those examples, if needed to the according config files." -} - -post_upgrade() { - post_install $1 -} diff --git a/staging/vlc/PKGBUILD b/staging/vlc/PKGBUILD deleted file mode 100644 index 00c32155b..000000000 --- a/staging/vlc/PKGBUILD +++ /dev/null @@ -1,89 +0,0 @@ -# $Id: PKGBUILD 162783 2012-06-30 13:21:15Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> -# Contributor: Martin Sandsmark <martin.sandsmark@kde.org> - -pkgname=vlc -pkgver=2.0.2 -pkgrel=2 -pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" -arch=('i686' 'x86_64') -url="http://www.videolan.org/vlc/" -license=('LGPL2.1' 'GPL2') -depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt' 'libproxy' - 'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' - 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' - 'libshout' 'libmad' 'libmpeg2' 'libmodplug' 'libass' - 'xcb-util-keysyms' 'ttf-freefont') -makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs' - 'fluidsynth' 'libdc1394' 'libavc1394' 'lirc-utils' - 'libcaca' 'librsvg' 'portaudio' 'oss' 'libgme' 'xosd' - 'projectm' 'twolame' 'aalib' 'libmtp' 'libdvdcss' - 'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager') -optdepends=('avahi: for service discovery using bonjour protocol' - 'libnotify: for notification plugin' - 'ncurses: for ncurses interface support' - 'libdvdcss: for decoding encrypted DVDs' - 'lirc-utils: for lirc plugin' - 'libavc1394: for devices using the 1394ta AV/C' - 'libdc1394: for IEEE 1394 plugin' - 'kdelibs: KDE Solid hardware integration' - 'vdpau-video: vdpau back-end for nvidia' - 'libva-driver-intel: back-end for intel cards' - 'libbluray: for Blu-Ray support' - 'flac: for Free Lossless Audio Codec plugin' - 'oss: for OSS audio support' - 'portaudio: for portaudio support' - 'twolame: for TwoLAME mpeg2 encoder plugin' - 'projectm: for ProjectM visualisation plugin' - 'libcaca: for colored ASCII art video output' - 'libgme: for libgme plugin' - 'librsvg: for SVG plugin' - 'gnome-vfs: for GNOME Virtual File System support' - 'libgoom2: for libgoom plugin' - 'vcdimager: navigate VCD with libvcdinfo' - 'xosd: for xosd support' - 'aalib: for ASCII art plugin' - 'libmtp: for MTP devices support' - 'fluidsynth: for synthesizer MIDI FluidSynth' - 'smbclient: for SMB access plugin' - 'libcdio: for audio CD playback support') -conflicts=('vlc-plugin') -replaces=('vlc-plugin') -backup=('usr/share/vlc/lua/http/.hosts' - 'usr/share/vlc/lua/http/dialogs/.hosts') -options=('!libtool' '!emptydirs') -install=vlc.install -source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz") -md5sums=('93e729cc970a4535b3213dbef0e69528') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c - - ./configure --prefix=/usr \ - --disable-rpath \ - --enable-oss \ - --enable-faad \ - --enable-nls \ - --enable-lirc \ - --enable-pvr \ - --enable-ncurses \ - --enable-realrtsp \ - --enable-xosd \ - --enable-aa \ - --enable-vcdx - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - for res in 16 32 48 128; do - install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \ - "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png" - done -} diff --git a/staging/vlc/vlc.install b/staging/vlc/vlc.install deleted file mode 100644 index dc4961cae..000000000 --- a/staging/vlc/vlc.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f usr/lib/vlc/plugins/plugins-*.dat -} - -post_remove() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} diff --git a/staging/x264/PKGBUILD b/staging/x264/PKGBUILD deleted file mode 100644 index ace432d9a..000000000 --- a/staging/x264/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 160669 2012-06-03 15:05:06Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: damir <damir@archlinux.org> -# Contributor: Paul Mattal <paul@archlinux.org> - -pkgname=x264 -pkgver=20120602 -pkgrel=1 -pkgdesc="free library for encoding H264/AVC video streams" -arch=('i686' 'x86_64') -url="http://www.videolan.org/developers/x264.html" -license=('GPL') -depends=('glibc') -makedepends=('yasm') -source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245-stable.tar.bz2) -md5sums=('50e6dc7a1031a19c710e912dffb19a7a') - -build() { - cd "$pkgname-snapshot-$pkgver-2245-stable" - - ./configure --enable-shared - - make -} -package() { - cd "$pkgname-snapshot-$pkgver-2245-stable" - - make DESTDIR="$pkgdir" \ - bindir=/usr/bin \ - libdir=/usr/lib \ - includedir=/usr/include \ - install -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/xf86-input-acecad/PKGBUILD b/staging/xf86-input-acecad/PKGBUILD deleted file mode 100644 index 0a20be8da..000000000 --- a/staging/xf86-input-acecad/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 168078 2012-10-05 17:56:18Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-acecad -pkgver=1.5.0 -pkgrel=5 -pkgdesc="X.Org acecad tablet input driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('sysfsutils') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - assign-local-private-after-allocating.patch) -sha1sums=('410cee68e4435dc95774fb389fcefae1b2ffe3d1' - '9301020b0ef3c6f2081e957481a88d2e187a7973') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/assign-local-private-after-allocating.patch" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-input-acecad/assign-local-private-after-allocating.patch b/staging/xf86-input-acecad/assign-local-private-after-allocating.patch deleted file mode 100644 index e3e635a6f..000000000 --- a/staging/xf86-input-acecad/assign-local-private-after-allocating.patch +++ /dev/null @@ -1,24 +0,0 @@ -From ec2c4ead497133ef20d5ef5a9b481b38e1e0f7a2 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Mon, 27 Jun 2011 03:13:54 +0000 -Subject: Assign local->private after allocating. - -It is detrimental to the user experience when the driver tries to derefernce -null pointers. - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- -diff --git a/src/acecad.c b/src/acecad.c -index ad6d793..604fe91 100644 ---- a/src/acecad.c -+++ b/src/acecad.c -@@ -343,6 +343,7 @@ AceCadPreInit(InputDriverPtr drv, InputInfoPtr local, int flags) - return BadAlloc; - - memset(priv, 0, sizeof(AceCadPrivateRec)); -+ local->private = priv; - - local->device_control = DeviceControl; - --- -cgit v0.8.3-6-g21f6 diff --git a/staging/xf86-input-aiptek/PKGBUILD b/staging/xf86-input-aiptek/PKGBUILD deleted file mode 100644 index b0c5ad004..000000000 --- a/staging/xf86-input-aiptek/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 168080 2012-10-05 18:00:48Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-aiptek -pkgver=1.4.1 -pkgrel=5 -pkgdesc="X.Org Aiptek USB Digital Tablet input driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('55ea7d12d3e24fd72eacc966a59262864dce7769') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-input-elographics/PKGBUILD b/staging/xf86-input-elographics/PKGBUILD deleted file mode 100644 index ee6ad8451..000000000 --- a/staging/xf86-input-elographics/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 88566 2010-08-24 08:47:16Z jgc $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-elographics -pkgver=1.4.1 -pkgrel=2 -pkgdesc="X.org Elographics TouchScreen input driver" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('a21af744d57f158e6dff9d60a68aaac46b8d726d602911940cb61f4d6bb2c6a4') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-input-evdev/PKGBUILD b/staging/xf86-input-evdev/PKGBUILD deleted file mode 100644 index b5ad96195..000000000 --- a/staging/xf86-input-evdev/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 168082 2012-10-05 18:10:25Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <Alexander@archlinux.org - -pkgname=xf86-input-evdev -pkgver=2.7.3 -pkgrel=2 -pkgdesc="X.org evdev input driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc' 'systemd-tools' 'mtdev') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') -options=('!libtool' '!makeflags') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('eb389413602c3d28c44bbfab0477c98582f0e2f5be5f41986e58e93a033fa504') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-input-joystick/50-joystick.conf b/staging/xf86-input-joystick/50-joystick.conf deleted file mode 100644 index 95a295ab0..000000000 --- a/staging/xf86-input-joystick/50-joystick.conf +++ /dev/null @@ -1,6 +0,0 @@ -Section "InputClass" - Identifier "joystick catchall" - MatchIsJoystick "on" - MatchDevicePath "/dev/input/event*" - Driver "joystick" -EndSection diff --git a/staging/xf86-input-joystick/PKGBUILD b/staging/xf86-input-joystick/PKGBUILD deleted file mode 100644 index 77a304012..000000000 --- a/staging/xf86-input-joystick/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 168084 2012-10-05 18:31:52Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-joystick -pkgver=1.6.1 -pkgrel=2 -pkgdesc="X.Org Joystick input driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - #git-fixes.patch - 50-joystick.conf) -sha1sums=('0712652ec6cdb2fca6ad888548b232a4de9cf580' - 'e1ff3699a0470c6bb78a53f718df9d8521621e11') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - #patch -Np1 -i "${srcdir}/git-fixes.patch" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d" - install -m644 "${srcdir}/50-joystick.conf" "${pkgdir}/etc/X11/xorg.conf.d/" - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-input-joystick/git-fixes.patch b/staging/xf86-input-joystick/git-fixes.patch deleted file mode 100644 index b3afa06cc..000000000 --- a/staging/xf86-input-joystick/git-fixes.patch +++ /dev/null @@ -1,399 +0,0 @@ -From 204dcb86368b011824fc5006f87b9e394d03a394 Mon Sep 17 00:00:00 2001 -From: Terry Lambert <tlambert@chromium.org> -Date: Sat, 16 Jul 2011 00:23:22 +0000 -Subject: Return proper default for unknown values in pInfo->device_control. - -Signed-off-by: Terry Lambert <tlambert@chromium.org> -Reviewed-by: Stephane Marchesin <marcheu@chromium.org> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- -diff --git a/src/jstk.c b/src/jstk.c -index ec6b79a..6db0e7c 100644 ---- a/src/jstk.c -+++ b/src/jstk.c -@@ -419,8 +419,7 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, - - default: - ErrorF("unsupported mode=%d\n", what); -- return !Success; -- break; -+ return BadValue; - } /* switch (what) */ - return Success; - } -diff --git a/src/jstk_key.c b/src/jstk_key.c -index 3c471ce..d699dcd 100644 ---- a/src/jstk_key.c -+++ b/src/jstk_key.c -@@ -169,6 +169,8 @@ jstkKeyboardDeviceControlProc(DeviceIntPtr dev, - DBG(2, ErrorF("jstkKeyboardDeviceControlProc what=DEVICE_CLOSE\n")); - dev->public.on = FALSE; - break; -+ default: -+ return BadValue; - } - - return Success; --- -cgit v0.9.0.2-2-gbebe -From b3b62328cf3f36c20c54a298f8a921e6eef42c4d Mon Sep 17 00:00:00 2001 -From: Devin J. Pohly <djpohly+xorg@gmail.com> -Date: Sat, 03 Sep 2011 23:00:07 +0000 -Subject: unify capitalization of joystick properties - -the axis keys high/low properties were inconsistently capitalized, -leading to potential confusion as to why one works but not the other. - -Signed-off-by: Devin J. Pohly <djpohly+xorg@gmail.com> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- -diff --git a/include/joystick-properties.h b/include/joystick-properties.h -index 49ef800..36f4082 100644 ---- a/include/joystick-properties.h -+++ b/include/joystick-properties.h -@@ -99,7 +99,7 @@ typedef enum _JSTK_MAPPING { - - /** Scancodes for axis in high position */ - /* 8 bit, 4 per axis */ --#define JSTK_PROP_AXIS_KEYS_HIGH "Axis keys (high)" -+#define JSTK_PROP_AXIS_KEYS_HIGH "Axis Keys (high)" - - /** Set the mapping of each button to - none, x, y, zx, zy, button, key, speed_multiply, --- -cgit v0.9.0.2-2-gbebe -From b607c4ebeea4122694f02ba87f06e4cdb23114f1 Mon Sep 17 00:00:00 2001 -From: Sascha Hlusiak <saschahlusiak@arcor.de> -Date: Sat, 15 Oct 2011 22:47:52 +0000 -Subject: label buttons and axes - -Buttons are labeled "Button %d", starting with 0 and representing the button in X _after_ mapping. -Mapping can be changed while running so the labels will be constant. - -Axes are labeled "Axis %d", starting with 1, representing the _physical_ axis that reports the valuator -data. The raw valuators can't be dynamically mapped, the first two valuators always are labeled "Rel X" -and "Rel Y", representing the aggregated post-calculation data from all axes. - -Signed-off-by: Sascha Hlusiak <saschahlusiak@arcor.de> ---- -diff --git a/man/joystick.man b/man/joystick.man -index da92ceb..b401de5 100644 ---- a/man/joystick.man -+++ b/man/joystick.man -@@ -140,7 +140,11 @@ Neither - .B mode - nor - .B axis --needs to be set to generate extra valuator events. -+needs to be set to generate extra valuator events. The axis will be labelled according to it's physical axis number, beginning with -+.I 1 -+, i.e. -+.I \*qAxis 1\*q -+for the first axis (being the 3rd valuator). - Default: not set. - .TP 7 - .BI "\*qaxis="[<factor>]<axis> \*q -@@ -318,6 +322,28 @@ and the second and fourth axis to the arrow keys - The keys for the first two axes will be generated in an interval according to the value of the axis. The autorepeat speed of the first axis will be half the speed of that of the second axis. - The keys for the third and fourth axis are generated once when the axis moves out of the deadzone and when it moves back into the deadzone. X.Org will autorepeat those keys according to current keyboard settings. - -+.SH "XI2 Events" -+If you only care about raw events instead of using the joystick as a mouse replacement, don't forget to unmap and add valuators to all axes and map the remaining buttons: -+ -+.nf -+.BI " Option \*qMapAxis1\*q \*q" "mode=none valuator" \*q -+.BI " Option \*qMapAxis2\*q \*q" "mode=none valuator" \*q -+.BI " Option \*qMapAxis3\*q \*q" "mode=none valuator" \*q -+.BI " Option \*qMapAxis4\*q \*q" "mode=none valuator" \*q -+\ \ ... -+.BI " Option \*qMapButton1\*q \*q" "button=1" \*q -+.BI " Option \*qMapButton2\*q \*q" "button=2" \*q -+.BI " Option \*qMapButton3\*q \*q" "button=3" \*q -+.BI " Option \*qMapButton4\*q \*q" "button=4" \*q -+.BI " Option \*qMapButton5\*q \*q" "button=5" \*q -+\ \ ... -+.fi -+ -+You might also want to set the device "floating" to stop it from reporting core events: -+.nf -+.BI " Option \*qFloating\*q \*q" "true" \*q -+.fi -+ - .SH "NOTES" - Configuration through - .I InputClass -diff --git a/src/jstk.c b/src/jstk.c -index 6db0e7c..772683f 100644 ---- a/src/jstk.c -+++ b/src/jstk.c -@@ -1,5 +1,5 @@ - /* -- * Copyright 2007-2009 by Sascha Hlusiak. <saschahlusiak@freedesktop.org> -+ * Copyright 2007-2011 by Sascha Hlusiak. <saschahlusiak@freedesktop.org> - * Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org> - * - * Permission to use, copy, modify, distribute, and sell this software and its -@@ -21,7 +21,6 @@ - * PERFORMANCE OF THIS SOFTWARE. - */ - -- - #ifdef HAVE_CONFIG_H - #include "config.h" - #endif -@@ -300,6 +299,7 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, - switch (what) { - case DEVICE_INIT: { - int m; -+ char str[32]; - CARD8 buttonmap[BUTTONMAP_SIZE+1]; - DBG(1, ErrorF("jstkDeviceControlProc what=INIT\n")); - /* Probe device and return if error */ -@@ -312,11 +312,14 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, - } - - for (m=0; m<=BUTTONMAP_SIZE; m++) { -+ sprintf(str, "Button %d", m); -+ - buttonmap[m] = m; -- } -+ btn_labels[m] = MakeAtom(str, strlen(str), TRUE); -+ } -+ -+ - -- -- - if (InitButtonClassDeviceStruct(pJstk, BUTTONMAP_SIZE, - btn_labels, - buttonmap) == FALSE) { -@@ -331,7 +334,9 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, - if (priv->axis[i].valuator != -1) - { - DBG(3, ErrorF("Axis %d will be valuator %d\n", i, m)); -+ sprintf(str, "Axis %d", i + 1); - priv->axis[i].valuator = m++; -+ axes_labels[i] = MakeAtom(str, strlen(str), TRUE); - } - - if (InitValuatorClassDeviceStruct(pJstk, m, axes_labels, -@@ -719,7 +724,6 @@ static XF86ModuleVersionInfo jstkVersionRec = - /* a tool */ - }; - -- - /* - *************************************************************************** - * -@@ -732,3 +736,6 @@ _X_EXPORT XF86ModuleData joystickModuleData = { - jstkDriverPlug, - jstkDriverUnplug - }; -+ -+/* vim: set filetype=c.doxygen ts=4 et: */ -+ --- -cgit v0.9.0.2-2-gbebe -From e0193debf8f5a72b0a06977d5dea3365ad9cafbe Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Mon, 31 Oct 2011 04:27:22 +0000 -Subject: Fix option type for option duplication - -xf86OptionListDuplicate() duplicates an XF86Option list, not an InputOption -list. - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> ---- -diff --git a/src/jstk_key.c b/src/jstk_key.c -index d699dcd..e842941 100644 ---- a/src/jstk_key.c -+++ b/src/jstk_key.c -@@ -253,26 +253,26 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) - int rc; - char name[512] = {0}; - InputAttributes *attrs = NULL; -- InputOption *options; - InputOption *iopts = NULL, *tmp; - DeviceIntPtr dev; -+ XF86OptionPtr opts; - - /* duplicate option list, append to name */ -- options = xf86OptionListDuplicate(pInfo->options); -+ opts = xf86OptionListDuplicate(pInfo->options); - strcpy(name, pInfo->name); - strcat(name, " (keys)"); -- options = xf86ReplaceStrOption(options, "Name", name); -- options = xf86ReplaceStrOption(options, "_source", "_driver/joystick"); -+ opts = xf86ReplaceStrOption(opts, "Name", name); -+ opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick"); - -- while(options) -+ while(opts) - { - tmp = calloc(1, sizeof(InputOption)); - -- tmp->key = xf86OptionName(options); -- tmp->value = xf86OptionValue(options); -+ tmp->key = xf86OptionName(opts); -+ tmp->value = xf86OptionValue(opts); - tmp->next = iopts; - iopts = tmp; -- options = xf86NextOption(options); -+ opts = xf86NextOption(opts); - } - - /* duplicate attribute list */ --- -cgit v0.9.0.2-2-gbebe -From 7ccf3a75292d71104c976bf6afb389cccaac1a7d Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Mon, 31 Oct 2011 04:33:08 +0000 -Subject: Deal with opaque input option types. - -ABI 14 made the InputOption type opaque, move the existing code to ifdefs -and use the new function calls otherwise. - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> -Reviewed-by: Chase Douglas <chase.douglas@canonical.com> ---- -diff --git a/src/jstk_key.c b/src/jstk_key.c -index e842941..a71275a 100644 ---- a/src/jstk_key.c -+++ b/src/jstk_key.c -@@ -247,13 +247,46 @@ int jstkKeyboardPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) - return Success; - } - -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 14 -+static InputOption* -+input_option_new(InputOption* list, char *key, char *value) -+{ -+ InputOption *tmp; -+ -+ tmp = calloc(1, sizeof(*tmp)); -+ tmp->key = key; -+ tmp->value = value; -+ tmp->next = list; -+ -+ return tmp; -+} -+ -+static void -+input_option_free_list(InputOption **list) -+{ -+ InputOption *iopts = *list; -+ -+ while(iopts) -+ { -+ InputOption *tmp = iopts->next; -+ free(iopts->key); -+ free(iopts->value); -+ free(iopts); -+ iopts = tmp; -+ } -+ -+ *list = NULL; -+} -+ -+#endif -+ - InputInfoPtr - jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) - { - int rc; - char name[512] = {0}; - InputAttributes *attrs = NULL; -- InputOption *iopts = NULL, *tmp; -+ InputOption *iopts = NULL; - DeviceIntPtr dev; - XF86OptionPtr opts; - -@@ -266,12 +299,9 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) - - while(opts) - { -- tmp = calloc(1, sizeof(InputOption)); -- -- tmp->key = xf86OptionName(opts); -- tmp->value = xf86OptionValue(opts); -- tmp->next = iopts; -- iopts = tmp; -+ iopts = input_option_new(iopts, -+ xf86OptionName(opts), -+ xf86OptionValue(opts)); - opts = xf86NextOption(opts); - } - -@@ -280,14 +310,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) - - rc = NewInputDeviceRequest(iopts, attrs, &dev); - -- while(iopts) -- { -- tmp = iopts->next; -- free(iopts->key); -- free(iopts->value); -- free(iopts); -- iopts = tmp; -- } -+ input_option_free_list(&iopts); - - FreeInputAttributes(attrs); - --- -cgit v0.9.0.2-2-gbebe -From 411c1838456c055d3f911c54ed58bb11a6bf0da3 Mon Sep 17 00:00:00 2001 -From: Sascha Hlusiak <saschahlusiak@arcor.de> -Date: Sun, 13 Nov 2011 17:04:25 +0000 -Subject: man: valuators are not added automatically - ---- -diff --git a/man/joystick.man b/man/joystick.man -index b401de5..9f38ceb 100644 ---- a/man/joystick.man -+++ b/man/joystick.man -@@ -129,9 +129,6 @@ can be one of: - - .B none, relative, accelerated, absolute - --Every axis which's mode is not --.B none --will be reported as an additional valuator. - .TP 7 - .B \*qvaluator\*q - Send extra valuator events for this axis. The valuators will be numbered ascending, starting with 2 (valuator 0 and 1 are reserved for pointer movement). The range of the valuators is always --- -cgit v0.9.0.2-2-gbebe -From b217fabdef1714ed4898e08de4c2a6b9cc8d4f0f Mon Sep 17 00:00:00 2001 -From: Sascha Hlusiak <saschahlusiak@arcor.de> -Date: Sun, 13 Nov 2011 19:36:07 +0000 -Subject: Copy pInfo->driver to option list to fix hotplugging of keyboard device - -udev does copy the Driver line to the list of options, but when manually -specifying the driver in xorg.conf, the option "Driver" is unset. Because we -do hotplug a sub-device from within the core device, we need the "Driver" -option to be present in the list. - -This should fix archlinux bug #23577: - https://bugs.archlinux.org/task/23577 - -Thanks to Malek for coming up with a fix. - -Signed-off-by: Sascha Hlusiak <contact@saschahlusiak.de> ---- -diff --git a/src/jstk_key.c b/src/jstk_key.c -index a71275a..241b15d 100644 ---- a/src/jstk_key.c -+++ b/src/jstk_key.c -@@ -296,6 +296,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) - strcat(name, " (keys)"); - opts = xf86ReplaceStrOption(opts, "Name", name); - opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick"); -+ opts = xf86AddNewOption(opts, "Driver", pInfo->driver); - - while(opts) - { --- -cgit v0.9.0.2-2-gbebe diff --git a/staging/xf86-input-keyboard/PKGBUILD b/staging/xf86-input-keyboard/PKGBUILD deleted file mode 100644 index 478060eef..000000000 --- a/staging/xf86-input-keyboard/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 168086 2012-10-05 18:41:11Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-keyboard -pkgver=1.6.2 -pkgrel=2 -pkgdesc="X.Org keyboard input driver" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('76651a84f5031f7c6ecf075d55989c04a00689642579df6d1a1bee6d5c2e5f8a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-input-mouse/PKGBUILD b/staging/xf86-input-mouse/PKGBUILD deleted file mode 100644 index 0c075179b..000000000 --- a/staging/xf86-input-mouse/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 168088 2012-10-05 18:46:31Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-mouse -pkgver=1.8.1 -pkgrel=2 -pkgdesc="X.org mouse input driver" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('f5b97aac9aab8fa8b933e960631441ae23b18681c8bf3d5007c00da838f9c9c8') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-input-synaptics/10-synaptics.conf b/staging/xf86-input-synaptics/10-synaptics.conf deleted file mode 100644 index 81a90fb81..000000000 --- a/staging/xf86-input-synaptics/10-synaptics.conf +++ /dev/null @@ -1,9 +0,0 @@ -Section "InputClass" - Identifier "touchpad catchall" - Driver "synaptics" - MatchIsTouchpad "on" - MatchDevicePath "/dev/input/event*" - Option "TapButton1" "1" - Option "TapButton2" "2" - Option "TapButton3" "3" -EndSection diff --git a/staging/xf86-input-synaptics/PKGBUILD b/staging/xf86-input-synaptics/PKGBUILD deleted file mode 100644 index 24a48dcb1..000000000 --- a/staging/xf86-input-synaptics/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 168090 2012-10-05 18:57:54Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Thomas Bächler <thomas@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=xf86-input-synaptics -pkgver=1.6.2 -pkgrel=2 -pkgdesc="Synaptics driver for notebook touchpads" -arch=('i686' 'x86_64') -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('libxtst' 'mtdev') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') -replaces=('synaptics') -provides=('synaptics') -conflicts=('synaptics') -groups=('xorg-drivers' 'xorg') -options=(!libtool) -backup=('etc/X11/xorg.conf.d/10-synaptics.conf') -source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - 10-synaptics.conf) -sha256sums=('c3f7d6a085d480c352f030aeb43db2e5560d1468ed34be24d44a0fc3fda25920' - 'bd506a0545c335faa6da7ec42b3f60f2c09b5ed9e26f03003d6f59be88107ee2') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d" - install -m644 "${srcdir}/10-synaptics.conf" "${pkgdir}/etc/X11/xorg.conf.d/" - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" - - rm -rf "${pkgdir}/usr/share/X11" -} diff --git a/staging/xf86-input-vmmouse/PKGBUILD b/staging/xf86-input-vmmouse/PKGBUILD deleted file mode 100644 index 214429614..000000000 --- a/staging/xf86-input-vmmouse/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 168092 2012-10-05 19:03:25Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-vmmouse -pkgver=12.9.0 -pkgrel=2 -pkgdesc="X.org VMWare Mouse input driver" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('glibc' 'sh') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') -groups=('xorg-drivers' 'xorg') -backup=('etc/X11/xorg.conf.d/50-vmmouse.conf') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('83500beddba2da390389705d482131872fe9be8b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --with-xorg-conf-dir=/etc/X11/xorg.conf.d \ - --with-udev-rules-dir=/usr/lib/udev/rules.d - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" - rm -rfv ${pkgdir}/usr/{lib,share}/hal -} diff --git a/staging/xf86-input-void/PKGBUILD b/staging/xf86-input-void/PKGBUILD deleted file mode 100644 index 0831ca3a0..000000000 --- a/staging/xf86-input-void/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 168094 2012-10-05 19:07:17Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-void -pkgver=1.4.0 -pkgrel=4 -pkgdesc="X.org void input driver" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('49b462d3acb16337eaf78202d4074f19d5e20b29') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-input-wacom/70-wacom.rules b/staging/xf86-input-wacom/70-wacom.rules deleted file mode 100644 index f6aa20835..000000000 --- a/staging/xf86-input-wacom/70-wacom.rules +++ /dev/null @@ -1,12 +0,0 @@ -ACTION!="add|change", GOTO="wacom_end" - -# Match all serial wacom tablets with a serial ID starting with WACf -# Notes: We assign NAME though we shouldn't, but currently the server requires it -# We assign the lot to subsystem pnp too because server reads NAME from -# the parent device. Once all that's fixed, as simple SUBSYSTEM="tty" -# will do and the ENV{NAME} can be removed. -SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}" -SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}" - -LABEL="wacom_end" - diff --git a/staging/xf86-input-wacom/PKGBUILD b/staging/xf86-input-wacom/PKGBUILD deleted file mode 100644 index 3e3a2acd4..000000000 --- a/staging/xf86-input-wacom/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 168096 2012-10-05 19:11:14Z andyrtr $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: M Rawash <mrawash@gmail.com> - -pkgname=xf86-input-wacom -pkgver=0.17.0 -pkgrel=2 -pkgdesc="X.Org Wacom tablet driver" -arch=('i686' 'x86_64') -url="http://linuxwacom.sourceforge.net/" -license=('GPL') -backup=('etc/X11/xorg.conf.d/50-wacom.conf') -depends=('libxi' 'libxrandr' 'libxinerama') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') -options=(!libtool) -source=(http://downloads.sourceforge.net/project/linuxwacom/$pkgname/$pkgname-$pkgver.tar.bz2 - 70-wacom.rules) -md5sums=('92dffefc3bc30523463f2fa4bc753448' - '10db4f8272286690255c1bcc18bfdd92') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - - install -Dm644 ../70-wacom.rules "$pkgdir/usr/lib/udev/rules.d/70-wacom.rules" -} diff --git a/staging/xf86-video-apm/PKGBUILD b/staging/xf86-video-apm/PKGBUILD deleted file mode 100644 index 6dc7c8dfa..000000000 --- a/staging/xf86-video-apm/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 168102 2012-10-05 20:15:38Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-apm -pkgver=1.2.5 -pkgrel=2 -pkgdesc="X.org Alliance ProMotion video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-ark/PKGBUILD b/staging/xf86-video-ark/PKGBUILD deleted file mode 100644 index e4ab12bfe..000000000 --- a/staging/xf86-video-ark/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 168104 2012-10-05 20:26:50Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-ark -pkgver=0.7.5 -pkgrel=2 -pkgdesc="X.org ark video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-ast/PKGBUILD b/staging/xf86-video-ast/PKGBUILD deleted file mode 100644 index 448aa5d54..000000000 --- a/staging/xf86-video-ast/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 168106 2012-10-05 20:30:31Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-ast -pkgver=0.97.0 -pkgrel=2 -pkgdesc="X.org ASPEED AST Graphics video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('28fcd4781676485293f6dcd46e0797866f6219e22e1851c9796b037589998e76') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-ati/PKGBUILD b/staging/xf86-video-ati/PKGBUILD deleted file mode 100644 index 4cafa5c9d..000000000 --- a/staging/xf86-video-ati/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 161625 2012-06-12 15:45:26Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=xf86-video-ati -pkgver=6.14.5 -epoch=1 -pkgrel=1 -pkgdesc="X.org ati video driver" -arch=('i686' 'x86_64') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libdrm>=2.4.35' 'systemd-tools' 'ati-dri') -makedepends=('xorg-server-devel>=1.11.99.902' 'xf86driproto' 'mesa') -conflicts=('xorg-server<1.11.99.902') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('ef879d2845de50cec1aa98e37185271e1d535c0009efd6713ec88206b7197d53') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr #--enable-dri --help - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make "DESTDIR=${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-nouveau/PKGBUILD b/staging/xf86-video-nouveau/PKGBUILD deleted file mode 100644 index c312798ed..000000000 --- a/staging/xf86-video-nouveau/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 161500 2012-06-12 02:04:01Z ibiru $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: buddabrod <buddabrod@gmail.com> - -pkgname=xf86-video-nouveau -_gitdate=20120612 -pkgver=0.0.16_git${_gitdate} # see configure.ac -pkgrel=1 -pkgdesc="Open Source 2D acceleration driver for nVidia cards (experimental)" -arch=('i686' 'x86_64') -url="http://nouveau.freedesktop.org/wiki/" -license=('GPL') #and MIT, not yet a license file, see http://nouveau.freedesktop.org/wiki/FAQ#head-09f75d03eb30011c754038a3893119a70745de4e -depends=('libdrm' 'udev') -optdepends=('nouveau-dri: experimental gallium3d features') -makedepends=('xorg-server-devel' 'xf86driproto') -conflicts=('xorg-server<1.11.99.902') -options=('!libtool') -install=$pkgname.install -source=(ftp://ftp.archlinux.org/other/$pkgname/xf86-video-nouveau-${_gitdate}.tar.bz2) -md5sums=('d72338b96fa4c8356f69f10692dbc6d9') - -# source PKGBUILD && mksource -mksource() { - mkdir /tmp/$pkgname-${_gitdate} - pushd /tmp/$pkgname-${_gitdate} - git clone -v --depth 1 git://anongit.freedesktop.org/nouveau/xf86-video-nouveau - cd xf86-video-nouveau - git archive --prefix=xf86-video-nouveau-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/$pkgname-${_gitdate}/$pkgname-${_gitdate}.tar.bz2 - popd -} - -build() { - cd xf86-video-nouveau-${_gitdate} - ./autogen.sh --prefix=/usr - make -} - -package() { - cd xf86-video-nouveau-${_gitdate} - make DESTDIR="$pkgdir" install -} diff --git a/staging/xf86-video-nouveau/xf86-video-nouveau.install b/staging/xf86-video-nouveau/xf86-video-nouveau.install deleted file mode 100644 index 027154ff3..000000000 --- a/staging/xf86-video-nouveau/xf86-video-nouveau.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install () { - cat << _EOF - ==> make sure you use KernelModeSetting (KMS) - ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more -_EOF -} - -post_upgrade() { - if [ "`vercmp $2 0.0.15_git20100117-1`" -lt 0 ]; then - cat << _EOF - ==> ATTENTION: Usermode support has been dropped - ==> make sure you use KernelModeSetting (KMS) - ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more -_EOF - fi -} diff --git a/staging/xfce4-session/PKGBUILD b/staging/xfce4-session/PKGBUILD deleted file mode 100644 index 1a320ff4a..000000000 --- a/staging/xfce4-session/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 168748 2012-10-15 13:21:21Z foutrelis $ -# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> -# Contributor: tobias <tobias funnychar archlinux.org> - -pkgname=xfce4-session -pkgver=4.10.0 -pkgrel=6 -pkgdesc="A session manager for Xfce" -arch=('i686' 'x86_64') -url="http://www.xfce.org/" -license=('GPL2') -groups=('xfce4') -depends=('libxfce4ui' 'libwnck' 'libsm' 'xorg-iceauth' 'upower' 'xorg-xinit' - 'hicolor-icon-theme') -makedepends=('intltool' 'xfce4-dev-tools') -optdepends=('gnome-keyring: for keyring support when GNOME compatibility is enabled' - 'xscreensaver: for locking screen with xflock4' - 'gnome-screensaver: for locking screen with xflock4' - 'xlockmore: for locking screen with xflock4') -replaces=('xfce-utils') -options=('!libtool') -install=$pkgname.install -source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2 - xfce4-session-4.10.0-add-systemd-support.patch) -sha256sums=('bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce' - 'ffae61c48a4bd0cb51d422cb93f2de9567abaf29085370c455ef349b6a10234b') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # https://bugzilla.xfce.org/show_bug.cgi?id=8729 - patch -Np1 -i "$srcdir/xfce4-session-4.10.0-add-systemd-support.patch" - - xdt-autogen - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/xfce4 \ - --localstatedir=/var \ - --disable-static \ - --disable-debug - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/xfce4-session/xfce4-session-4.10.0-add-systemd-support.patch b/staging/xfce4-session/xfce4-session-4.10.0-add-systemd-support.patch deleted file mode 100644 index 7ab637b26..000000000 --- a/staging/xfce4-session/xfce4-session-4.10.0-add-systemd-support.patch +++ /dev/null @@ -1,388 +0,0 @@ -diff --git a/xfce4-session/xfsm-systemd.c b/xfce4-session/xfsm-systemd.c -index 4076586..90e7873 100644 ---- /dev/null -+++ b/xfce4-session/xfsm-systemd.c -@@ -0,0 +1,123 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- -+ * -+ * Copyright (C) 2012 Christian Hesse -+ * -+ * Licensed under the GNU General Public License Version 2 -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ */ -+ -+#include <config.h> -+ -+#include <gio/gio.h> -+#include <polkit/polkit.h> -+ -+#include "xfsm-systemd.h" -+ -+#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" -+#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" -+#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" -+#define SYSTEMD_REBOOT_ACTION "org.freedesktop.login1.reboot" -+#define SYSTEMD_SHUTDOWN_ACTION "org.freedesktop.login1.power-off" -+ -+struct _SystemdProxy { -+ PolkitAuthority *authority; -+ PolkitSubject *subject; -+}; -+ -+SystemdProxy * -+systemd_proxy_new (void) -+{ -+ SystemdProxy *proxy; -+ -+ proxy = g_new0 (SystemdProxy, 1); -+ -+ proxy->authority = polkit_authority_get_sync (NULL, NULL); -+ proxy->subject = polkit_unix_process_new (getpid()); -+ -+ return proxy; -+} -+ -+void -+systemd_proxy_free (SystemdProxy *proxy) -+{ -+ g_object_unref (proxy->authority); -+ g_object_unref (proxy->subject); -+ -+ g_free (proxy); -+} -+ -+gboolean systemd_proxy_can_method (SystemdProxy *proxy, gboolean *can_method, const gchar *method, GError **error) -+{ -+ PolkitAuthorizationResult *res; -+ GError *local_error = NULL; -+ -+ *can_method = FALSE; -+ res = polkit_authority_check_authorization_sync (proxy->authority, -+ proxy->subject, -+ method, -+ NULL, -+ POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE, -+ NULL, -+ &local_error); -+ if (res == NULL) { -+ g_propagate_error (error, local_error); -+ return FALSE; -+ } -+ -+ *can_method = polkit_authorization_result_get_is_authorized (res) || -+ polkit_authorization_result_get_is_challenge (res); -+ -+ g_object_unref (res); -+ -+ return TRUE; -+} -+ -+gboolean systemd_proxy_can_restart (SystemdProxy *proxy, gboolean *can_restart, GError **error) -+{ -+ return systemd_proxy_can_method(proxy, can_restart, SYSTEMD_REBOOT_ACTION, error); -+} -+ -+gboolean systemd_proxy_can_shutdown (SystemdProxy *proxy, gboolean *can_shutdown, GError **error) -+{ -+ return systemd_proxy_can_method(proxy, can_shutdown, SYSTEMD_SHUTDOWN_ACTION, error); -+} -+ -+gboolean systemd_proxy_method (SystemdProxy *proxy, const gchar *method, GError **error) -+{ -+ GDBusConnection *bus; -+ -+ bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL); -+ g_dbus_connection_call_sync (bus, -+ SYSTEMD_DBUS_NAME, -+ SYSTEMD_DBUS_PATH, -+ SYSTEMD_DBUS_INTERFACE, -+ method, -+ g_variant_new ("(b)", TRUE), -+ NULL, 0, G_MAXINT, NULL, NULL); -+ g_object_unref (bus); -+ -+ return TRUE; -+} -+ -+gboolean systemd_proxy_restart (SystemdProxy *proxy, GError **error) -+{ -+ return systemd_proxy_method(proxy, "Reboot", error); -+} -+ -+gboolean systemd_proxy_shutdown (SystemdProxy *proxy, GError **error) -+{ -+ return systemd_proxy_method(proxy, "PowerOff", error); -+} -diff --git a/xfce4-session/xfsm-systemd.h b/xfce4-session/xfsm-systemd.h -index 3fa8317..2c4d868 100644 ---- /dev/null -+++ b/xfce4-session/xfsm-systemd.h -@@ -0,0 +1,42 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- -+ * -+ * Copyright (C) 2012 Christian Hesse -+ * -+ * Licensed under the GNU General Public License Version 2 -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ */ -+ -+#ifndef __SYSTEMD_PROXY_H__ -+#define __SYSTEMD_PROXY_H__ -+ -+#include <glib.h> -+ -+G_BEGIN_DECLS -+ -+typedef struct _SystemdProxy SystemdProxy; -+ -+SystemdProxy *systemd_proxy_new (void); -+void systemd_proxy_free (SystemdProxy *proxy); -+gboolean systemd_proxy_can_method (SystemdProxy *proxy, gboolean *can_method, const char *method, GError **error); -+gboolean systemd_proxy_can_restart (SystemdProxy *proxy, gboolean *can_restart, GError **error); -+gboolean systemd_proxy_can_shutdown (SystemdProxy *proxy, gboolean *can_shutdown, GError **error); -+gboolean systemd_proxy_method (SystemdProxy *proxy, const char *method, GError **error); -+gboolean systemd_proxy_restart (SystemdProxy *proxy, GError **error); -+gboolean systemd_proxy_shutdown (SystemdProxy *proxy, GError **error); -+ -+G_END_DECLS -+ -+#endif /* __SYSTEMD_PROXY_H__ */ - -commit 518a28c23f110617aad36e64c02cdab6a36adf37 -Author: Christian Hesse <eworm@leda.eworm.de> -Date: Fri Jul 27 14:21:14 2012 +0200 - - ... - -diff --git a/configure.in.in b/configure.in.in -index 9aa4f8f..aa0b8bb 100644 ---- a/configure.in -+++ b/configure.in -@@ -96,6 +96,33 @@ XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.1.0]) - XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.84]) - XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.9.0]) - -+dnl systemd integration -+AC_ARG_ENABLE([systemd], -+ AS_HELP_STRING([--enable-systemd], [Use systemd]), -+ [with_systemd=$enableval], -+ [with_systemd=auto]) -+PKG_CHECK_MODULES(SYSTEMD, -+ [libsystemd-login polkit-gobject-1], -+ [have_systemd=yes], [have_systemd=no]) -+AC_MSG_CHECKING([whether to use systemd]) -+if test x$with_systemd = xauto ; then -+ if test x$have_systemd = xno ; then -+ with_systemd=no -+ else -+ with_systemd=yes -+ fi -+fi -+AC_MSG_RESULT($with_systemd) -+if test x$with_systemd = xyes; then -+ if test x$have_systemd = xno; then -+ AC_MSG_ERROR([Systemd support explicitly required, but systemd not found]) -+ fi -+ AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking]) -+fi -+AC_SUBST(SYSTEMD_CFLAGS) -+AC_SUBST(SYSTEMD_LIBS) -+AM_CONDITIONAL(WITH_SYSTEMD, [test "$with_systemd" = "yes"], [Using systemd]) -+ - dnl Check for debugging support - XDT_FEATURE_DEBUG([xfsm_debug_default]) - - -commit f1279eba9452f027a2037be77388767437161d51 -Author: Christian Hesse <eworm@leda.eworm.de> -Date: Fri Jul 27 14:18:16 2012 +0200 - - ... - -diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c -index 1429abd..077cdf3 100644 ---- a/xfce4-session/xfsm-shutdown.c -+++ b/xfce4-session/xfsm-shutdown.c -@@ -96,7 +96,11 @@ struct _XfsmShutdown - { - GObject __parent__; - -+#ifdef HAVE_SYSTEMD -+ SystemdProxy *systemd_proxy; -+#else - XfsmConsolekit *consolekit; -+#endif - XfsmUPower *upower; - - /* kiosk settings */ -@@ -134,7 +138,11 @@ xfsm_shutdown_init (XfsmShutdown *shutdown) - { - XfceKiosk *kiosk; - -+#ifdef HAVE_SYSTEMD -+ shutdown->systemd_proxy = systemd_proxy_new (); -+#else - shutdown->consolekit = xfsm_consolekit_get (); -+#endif - shutdown->upower = xfsm_upower_get (); - shutdown->helper_state = SUDO_NOT_INITIAZED; - shutdown->helper_require_password = FALSE; -@@ -153,7 +161,11 @@ xfsm_shutdown_finalize (GObject *object) - { - XfsmShutdown *shutdown = XFSM_SHUTDOWN (object); - -+#ifdef HAVE_SYSTEMD -+ systemd_proxy_free (shutdown->systemd_proxy); -+#else - g_object_unref (G_OBJECT (shutdown->consolekit)); -+#endif - g_object_unref (G_OBJECT (shutdown->upower)); - - /* close down helper */ -@@ -644,7 +656,11 @@ xfsm_shutdown_try_restart (XfsmShutdown *shutdown, - if (shutdown->helper_state == SUDO_AVAILABLE) - return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_RESTART, error); - else -+#ifdef HAVE_SYSTEMD -+ return systemd_proxy_restart (shutdown->systemd_proxy, error); -+#else - return xfsm_consolekit_try_restart (shutdown->consolekit, error); -+#endif - } - - -@@ -661,7 +677,11 @@ xfsm_shutdown_try_shutdown (XfsmShutdown *shutdown, - if (shutdown->helper_state == SUDO_AVAILABLE) - return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_SHUTDOWN, error); - else -+#ifdef HAVE_SYSTEMD -+ return systemd_proxy_shutdown (shutdown->systemd_proxy, error); -+#else - return xfsm_consolekit_try_shutdown (shutdown->consolekit, error); -+#endif - } - - -@@ -701,7 +721,11 @@ xfsm_shutdown_can_restart (XfsmShutdown *shutdown, - return TRUE; - } - -+#ifdef HAVE_SYSTEMD -+ if (systemd_proxy_can_restart (shutdown->systemd_proxy, can_restart, error)) -+#else - if (xfsm_consolekit_can_restart (shutdown->consolekit, can_restart, error)) -+#endif - return TRUE; - - if (xfsm_shutdown_sudo_init (shutdown, error)) -@@ -728,7 +752,11 @@ xfsm_shutdown_can_shutdown (XfsmShutdown *shutdown, - return TRUE; - } - -+#ifdef HAVE_SYSTEMD -+ if (systemd_proxy_can_shutdown (shutdown->systemd_proxy, can_shutdown, error)) -+#else - if (xfsm_consolekit_can_shutdown (shutdown->consolekit, can_shutdown, error)) -+#endif - return TRUE; - - if (xfsm_shutdown_sudo_init (shutdown, error)) - -commit 5aea3fb853683246a537a67423cf5b32076b8dfb -Author: Christian Hesse <eworm@leda.eworm.de> -Date: Fri Jul 27 14:03:27 2012 +0200 - - ... - -diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am -index c015154..7e3b311 100644 ---- a/xfce4-session/Makefile.am -+++ b/xfce4-session/Makefile.am -@@ -38,8 +38,6 @@ xfce4_session_SOURCES = \ - xfsm-compat-gnome.h \ - xfsm-compat-kde.c \ - xfsm-compat-kde.h \ -- xfsm-consolekit.c \ -- xfsm-consolekit.h \ - xfsm-dns.c \ - xfsm-dns.h \ - xfsm-error.c \ -@@ -65,6 +63,16 @@ xfce4_session_SOURCES = \ - xfsm-upower.c \ - xfsm-upower.h - -+if WITH_SYSTEMD -+xfce4_session_SOURCES += \ -+ xfsm-systemd.c \ -+ xfsm-systemd.h -+else -+xfce4_session_SOURCES += \ -+ xfsm-consolekit.c \ -+ xfsm-consolekit.h -+endif -+ - xfce4_session_CFLAGS = \ - $(LIBSM_CFLAGS) \ - $(LIBX11_CFLAGS) \ -@@ -72,6 +80,7 @@ xfce4_session_CFLAGS = \ - $(DBUS_CFLAGS) \ - $(DBUS_GLIB_CFLAGS) \ - $(LIBWNCK_CFLAGS) \ -+ $(SYSTEMD_CFLAGS) \ - $(XFCONF_CFLAGS) \ - $(GMODULE_CFLAGS) \ - $(PLATFORM_CFLAGS) -@@ -91,6 +100,7 @@ xfce4_session_LDADD = \ - $(DBUS_LIBS) \ - $(DBUS_GLIB_LIBS) \ - $(LIBWNCK_LIBS) \ -+ $(SYSTEMD_LIBS) \ - $(XFCONF_LIBS) \ - -lm - -diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c -index d8757a8..1429abd 100644 ---- a/xfce4-session/xfsm-shutdown.c -+++ b/xfce4-session/xfsm-shutdown.c -@@ -66,10 +66,13 @@ - #include <xfce4-session/xfsm-fadeout.h> - #include <xfce4-session/xfsm-global.h> - #include <xfce4-session/xfsm-legacy.h> --#include <xfce4-session/xfsm-consolekit.h> - #include <xfce4-session/xfsm-upower.h> - -- -+#ifdef HAVE_SYSTEMD -+#include <xfce4-session/xfsm-systemd.h> -+#else -+#include <xfce4-session/xfsm-consolekit.h> -+#endif - - static void xfsm_shutdown_finalize (GObject *object); - static void xfsm_shutdown_sudo_free (XfsmShutdown *shutdown); diff --git a/staging/xfce4-session/xfce4-session.install b/staging/xfce4-session/xfce4-session.install deleted file mode 100644 index e4f8fd06c..000000000 --- a/staging/xfce4-session/xfce4-session.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/xine-lib/PKGBUILD b/staging/xine-lib/PKGBUILD deleted file mode 100644 index 2a0653191..000000000 --- a/staging/xine-lib/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 169351 2012-10-20 01:35:15Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=xine-lib -pkgver=1.2.2 -pkgrel=3 -pkgdesc="A multimedia playback engine" -arch=('i686' 'x86_64') -url="http://www.xine-project.org" -license=('LGPL' 'GPL') -depends=('libxvmc' 'ffmpeg' 'libxinerama') -makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'mesa' 'libmodplug' - 'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad' - 'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs' 'libvdpau' 'glu') -optdepends=('imagemagick: for using the imagemagick plugin' \ - 'jack: for using the jack plugin' \ - 'vcdimager: for using the vcd plugin' \ - 'glu: for using the opengl plugin' \ - 'wavpack: for using the wavpack plugin' \ - 'faad2: for using the faad plugin' \ - 'libmng: for using the mng plugin' \ - 'aalib: for using the aalib plugin' \ - 'libmodplug: for using the modplug plugin' \ - 'libdca: for using the dca plugin' \ - 'a52dec: for using the a52 plugin' \ - 'libmad: for using the mp3 plugin' \ - 'libmpcdec: for using the musepack plugin' \ - 'libcaca: for using the caca plugin' \ - 'libbluray: for using the bluray plugin' \ - 'gnome-vfs: for using the gnome-vfs plugin' \ - 'libvdpau: for using the VDPAU plugin') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz) -sha1sums=('a349cbb0b72256bb262377796a022dcf63829b4c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --with-wavpack --enable-vdpau --disable-optimizations - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/xine-lib/xine-lib-1.2.1-ffmpeg.patch b/staging/xine-lib/xine-lib-1.2.1-ffmpeg.patch deleted file mode 100644 index c036a0ec9..000000000 --- a/staging/xine-lib/xine-lib-1.2.1-ffmpeg.patch +++ /dev/null @@ -1,75 +0,0 @@ -# HG changeset patch -# User Edgar Hucek <ebsi4711@gmail.com> -# Date 1327873178 -3600 -# Node ID 69983efb1c928e64cc1900579b98142cef0569c4 -# Parent 61f51ebc2659363e308bedb10b9fa4e71a60cedc -fix compile against recent ffmpeg - -diff -r 61f51ebc2659 -r 69983efb1c92 src/combined/ffmpeg/ff_video_decoder.c ---- a/src/combined/ffmpeg/ff_video_decoder.c Sat Feb 04 18:52:01 2012 +0000 -+++ b/src/combined/ffmpeg/ff_video_decoder.c Sun Jan 29 22:39:38 2012 +0100 -@@ -130,7 +130,9 @@ - - yuv_planes_t yuv; - -+#ifdef AVPaletteControl - AVPaletteControl palette_control; -+#endif - - #ifdef LOG - enum PixelFormat debug_fmt; -@@ -218,7 +220,9 @@ - /* We should really keep track of the ages of xine frames (see - * avcodec_default_get_buffer in libavcodec/utils.c) - * For the moment tell ffmpeg that every frame is new (age = bignumber) */ -+#ifdef AVFRAMEAGE - av_frame->age = 256*256*256*64; -+#endif - - av_frame->type= FF_BUFFER_TYPE_USER; - -@@ -1028,7 +1032,9 @@ - memcpy(this->context->extradata, buf->decoder_info_ptr[2], - buf->decoder_info[2]); - -- } else if (buf->decoder_info[1] == BUF_SPECIAL_PALETTE) { -+ } -+#ifdef AVPaletteControl -+ else if (buf->decoder_info[1] == BUF_SPECIAL_PALETTE) { - unsigned int i; - - palette_entry_t *demuxer_palette; -@@ -1047,7 +1053,9 @@ - } - decoder_palette->palette_changed = 1; - -- } else if (buf->decoder_info[1] == BUF_SPECIAL_RV_CHUNK_TABLE) { -+ } -+#endif -+ else if (buf->decoder_info[1] == BUF_SPECIAL_RV_CHUNK_TABLE) { - int i; - - lprintf("BUF_SPECIAL_RV_CHUNK_TABLE\n"); -@@ -1794,7 +1802,9 @@ - this->av_frame = avcodec_alloc_frame(); - this->context = avcodec_alloc_context(); - this->context->opaque = this; -+#ifdef AVPaletteControl - this->context->palctrl = NULL; -+#endif - - this->decoder_ok = 0; - this->decoder_init_mode = 1; -diff -r 61f51ebc2659 -r 69983efb1c92 src/combined/ffmpeg/ffmpeg_compat.h ---- a/src/combined/ffmpeg/ffmpeg_compat.h Sat Feb 04 18:52:01 2012 +0000 -+++ b/src/combined/ffmpeg/ffmpeg_compat.h Sun Jan 29 22:39:38 2012 +0100 -@@ -91,5 +91,9 @@ - # define AVAUDIO 2 - #endif - -+/* AVFrame.age */ -+#if !(LIBAVCODEC_VERSION_MAJOR >= 53 && LIBAVCODEC_VERSION_MAJOR >= 28 && LIBAVCODEC_VERSION_MICRO >= 1) -+# define AVFRAMEAGE 1 -+#endif - - #endif /* XINE_AVCODEC_COMPAT_H */ diff --git a/staging/xorg-server/10-quirks.conf b/staging/xorg-server/10-quirks.conf deleted file mode 100644 index 7afad22dc..000000000 --- a/staging/xorg-server/10-quirks.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Collection of quirks and blacklist/whitelists for specific devices. - - -# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable -# http://bugs.freedesktop.org/show_bug.cgi?id=22442 -Section "InputClass" - Identifier "ThinkPad HDAPS accelerometer blacklist" - MatchProduct "ThinkPad HDAPS accelerometer data" - Option "Ignore" "on" -EndSection diff --git a/staging/xorg-server/PKGBUILD b/staging/xorg-server/PKGBUILD deleted file mode 100644 index 03700888d..000000000 --- a/staging/xorg-server/PKGBUILD +++ /dev/null @@ -1,196 +0,0 @@ -# $Id: PKGBUILD 168024 2012-10-05 12:03:57Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=xorg-server -pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.13.0 -pkgrel=2 -arch=('i686' 'x86_64') -license=('custom') -url="http://xorg.freedesktop.org" -makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' - 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' - 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' - 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt') -options=('!libtool') -source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 - autoconfig-nvidia.patch - autoconfig-sis.patch - xvfb-run - xvfb-run.1 - 10-quirks.conf) -sha256sums=('548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a' - '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' - 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' - 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' - '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' - '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - # Use nouveau/nv/nvidia drivers for nvidia devices - patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch" - - # Use unofficial imedia SiS driver for supported SiS devices - patch -Np0 -i "${srcdir}/autoconfig-sis.patch" - - autoreconf -fi - ./configure --prefix=/usr \ - --enable-ipv6 \ - --enable-dri \ - --enable-dmx \ - --enable-xvfb \ - --enable-xnest \ - --enable-composite \ - --enable-xcsecurity \ - --enable-xorg \ - --enable-xephyr \ - --enable-glx-tls \ - --enable-kdrive \ - --enable-kdrive-evdev \ - --enable-kdrive-kbd \ - --enable-kdrive-mouse \ - --enable-install-setuid \ - --enable-config-udev \ - --disable-config-dbus \ - --enable-record \ - --disable-xfbdev \ - --disable-xfake \ - --disable-static \ - --sysconfdir=/etc/X11 \ - --localstatedir=/var \ - --with-xkb-path=/usr/share/X11/xkb \ - --with-xkb-output=/var/lib/xkb \ - --with-fontrootdir=/usr/share/fonts - make - - # Disable subdirs for make install rule to make splitting easier - sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \ - -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \ - -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \ - -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \ - -i hw/Makefile -} - -package_xorg-server-common() { - pkgdesc="Xorg server common files" - depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc') - - cd "${srcdir}/${pkgbase}-${pkgver}" - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common" - install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common" - - make -C xkb DESTDIR="${pkgdir}" install-data - - install -m755 -d "${pkgdir}/usr/share/man/man1" - install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/" - - install -m755 -d "${pkgdir}/usr/lib/xorg" - install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/" -} - -package_xorg-server() { - pkgdesc="Xorg X server" - depends=(libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev) - backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf') - # see xorg-server-1.13.0/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on - provides=('X-ABI-VIDEODRV_VERSION=13' 'X-ABI-XINPUT_VERSION=18' 'X-ABI-EXTENSION_VERSION=7.0' 'x-server') - groups=('xorg') - conflicts=('nvidia-utils<=290.10') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/etc/X11" - mv "${pkgdir}/usr/share/X11/xorg.conf.d" "${pkgdir}/etc/X11/" - install -m644 "${srcdir}/10-quirks.conf" "${pkgdir}/etc/X11/xorg.conf.d/" - - rmdir "${pkgdir}/usr/share/X11" - - # Needed for non-mesa drivers, libgl will restore it - mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \ - "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg" - - rm -rf "${pkgdir}/var" - - rm -f "${pkgdir}/usr/share/man/man1/Xserver.1" - rm -f "${pkgdir}/usr/lib/xorg/protocol.txt" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING" - - rm -rf "${pkgdir}/usr/lib/pkgconfig" - rm -rf "${pkgdir}/usr/include" - rm -rf "${pkgdir}/usr/share/aclocal" -} - -package_xorg-server-xephyr() { - pkgdesc="A nested X server that runs as an X application" - depends=(libxfont libgl libgcrypt libxv pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/kdrive" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING" -} - -package_xorg-server-xvfb() { - pkgdesc="Virtual framebuffer X server" - depends=(libxfont libxdmcp libxau libgcrypt pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/vfb" - make DESTDIR="${pkgdir}" install - - install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/" - install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING" -} - -package_xorg-server-xnest() { - pkgdesc="A nested X server that runs as an X application" - depends=(libxfont libxext libgcrypt pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/xnest" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING" -} - -package_xorg-server-xdmx() { - pkgdesc="Distributed Multihead X Server and utilities" - depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/dmx" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING" -} - -package_xorg-server-devel() { - pkgdesc="Development files for the X.Org X server" - depends=(# see pkgdir/usr/lib/pkgconfig/xorg-server.pc - xproto randrproto renderproto xextproto inputproto kbproto - fontsproto pixman videoproto xf86driproto glproto - mesa dri2proto xineramaproto libpciaccess - # not technically required but almost every Xorg pkg needs it to build - xorg-util-macros) - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}/usr/bin" - rm -rf "${pkgdir}/usr/share/man" - rm -rf "${pkgdir}/usr/share/doc" - rm -rf "${pkgdir}/usr/share/X11" - rm -rf "${pkgdir}/usr/lib/xorg" - rm -rf "${pkgdir}/var" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING" -} diff --git a/staging/xorg-server/autoconfig-nvidia.patch b/staging/xorg-server/autoconfig-nvidia.patch deleted file mode 100644 index 6d5220ac7..000000000 --- a/staging/xorg-server/autoconfig-nvidia.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c ---- xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c 2012-02-10 10:10:37.583014924 +0000 -+++ xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c 2012-02-10 11:16:07.148971317 +0000 -@@ -1144,7 +1144,23 @@ - int idx = 0; - - #ifdef __linux__ -- driverList[idx++] = "nouveau"; -+ switch (dev->device_id) -+ { -+ /* NV1 */ -+ case 0x0008: -+ case 0x0009: -+ driverList[idx++] = "vesa"; -+ break; -+ /* NV3 */ -+ case 0x0018: -+ case 0x0019: -+ driverList[idx++] = "nouveau"; -+ break; -+ default: -+ driverList[idx++] = "nouveau"; -+ driverList[idx++] = "nvidia"; -+ break; -+ } - #endif - driverList[idx++] = "nv"; - break; diff --git a/staging/xorg-server/autoconfig-sis.patch b/staging/xorg-server/autoconfig-sis.patch deleted file mode 100644 index 0b50049db..000000000 --- a/staging/xorg-server/autoconfig-sis.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- hw/xfree86/common/xf86pciBus.c.orig 2011-09-24 10:53:45.421697668 +0000 -+++ hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000 -@@ -1200,9 +1200,15 @@ - break; - } - break; -- case 0x1039: -- driverList[0] = "sis"; -- break; -+ case 0x1039: -+ switch (dev->device_id) -+ { -+ case 0x6350: case 0x6351: -+ driverList[0] = "sisimedia"; driverList[1] = "sis"; break; -+ default: -+ driverList[0] = "sis"; break; -+ } -+ break; - case 0x126f: - driverList[0] = "siliconmotion"; - break; diff --git a/staging/xorg-server/xvfb-run b/staging/xorg-server/xvfb-run deleted file mode 100644 index 4c2f4e0d3..000000000 --- a/staging/xorg-server/xvfb-run +++ /dev/null @@ -1,180 +0,0 @@ -#!/bin/sh - -# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $ - -# This script starts an instance of Xvfb, the "fake" X server, runs a command -# with that server available, and kills the X server when done. The return -# value of the command becomes the return value of this script. -# -# If anyone is using this to build a Debian package, make sure the package -# Build-Depends on xvfb, xbase-clients, and xfonts-base. - -set -e - -PROGNAME=xvfb-run -SERVERNUM=99 -AUTHFILE= -ERRORFILE=/dev/null -STARTWAIT=3 -XVFBARGS="-screen 0 640x480x8" -LISTENTCP="-nolisten tcp" -XAUTHPROTO=. - -# Query the terminal to establish a default number of columns to use for -# displaying messages to the user. This is used only as a fallback in the event -# the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while the -# script is running, and this cannot, only being calculated once.) -DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true -if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then - DEFCOLUMNS=80 -fi - -# Display a message, wrapping lines at the terminal width. -message () { - echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} -} - -# Display an error message. -error () { - message "error: $*" >&2 -} - -# Display a usage message. -usage () { - if [ -n "$*" ]; then - message "usage error: $*" - fi - cat <<EOF -Usage: $PROGNAME [OPTION ...] COMMAND -Run COMMAND (usually an X client) in a virtual X server environment. -Options: --a --auto-servernum try to get a free server number, starting at - --server-num --e FILE --error-file=FILE file used to store xauth errors and Xvfb - output (default: $ERRORFILE) --f FILE --auth-file=FILE file used to store auth cookie - (default: ./.Xauthority) --h --help display this usage message and exit --n NUM --server-num=NUM server number to use (default: $SERVERNUM) --l --listen-tcp enable TCP port listening in the X server --p PROTO --xauth-protocol=PROTO X authority protocol name to use - (default: xauth command's default) --s ARGS --server-args=ARGS arguments (other than server number and - "-nolisten tcp") to pass to the Xvfb server - (default: "$XVFBARGS") --w DELAY --wait=DELAY delay in seconds to wait for Xvfb to start - before running COMMAND (default: $STARTWAIT) -EOF -} - -# Find a free server number by looking at .X*-lock files in /tmp. -find_free_servernum() { - # Sadly, the "local" keyword is not POSIX. Leave the next line commented in - # the hope Debian Policy eventually changes to allow it in /bin/sh scripts - # anyway. - #local i - - i=$SERVERNUM - while [ -f /tmp/.X$i-lock ]; do - i=$(($i + 1)) - done - echo $i -} - -# Clean up files -clean_up() { - if [ -e "$AUTHFILE" ]; then - XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >>"$ERRORFILE" 2>&1 - fi - if [ -n "$XVFB_RUN_TMPDIR" ]; then - if ! rm -r "$XVFB_RUN_TMPDIR"; then - error "problem while cleaning up temporary directory" - exit 5 - fi - fi -} - -# Parse the command line. -ARGS=$(getopt --options +ae:f:hn:lp:s:w: \ - --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \ - --name "$PROGNAME" -- "$@") -GETOPT_STATUS=$? - -if [ $GETOPT_STATUS -ne 0 ]; then - error "internal error; getopt exited with status $GETOPT_STATUS" - exit 6 -fi - -eval set -- "$ARGS" - -while :; do - case "$1" in - -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;; - -e|--error-file) ERRORFILE="$2"; shift ;; - -f|--auth-file) AUTHFILE="$2"; shift ;; - -h|--help) SHOWHELP="yes" ;; - -n|--server-num) SERVERNUM="$2"; shift ;; - -l|--listen-tcp) LISTENTCP="" ;; - -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;; - -s|--server-args) XVFBARGS="$2"; shift ;; - -w|--wait) STARTWAIT="$2"; shift ;; - --) shift; break ;; - *) error "internal error; getopt permitted \"$1\" unexpectedly" - exit 6 - ;; - esac - shift -done - -if [ "$SHOWHELP" ]; then - usage - exit 0 -fi - -if [ -z "$*" ]; then - usage "need a command to run" >&2 - exit 2 -fi - -if ! which xauth >/dev/null; then - error "xauth command not found" - exit 3 -fi - -# tidy up after ourselves -trap clean_up EXIT - -# If the user did not specify an X authorization file to use, set up a temporary -# directory to house one. -if [ -z "$AUTHFILE" ]; then - XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)" - AUTHFILE="$XVFB_RUN_TMPDIR/Xauthority" -fi - -# Start Xvfb. -MCOOKIE=$(mcookie) -XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1 -add :$SERVERNUM $XAUTHPROTO $MCOOKIE -EOF -XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \ - 2>&1 & -XVFBPID=$! -sleep "$STARTWAIT" -if ! kill -0 $XVFBPID 2>/dev/null; then - echo "Xvfb failed to start" >&2 - exit 1 -fi - -# Start the command and save its exit status. -set +e -DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1 -RETVAL=$? -set -e - -# Kill Xvfb now that the command has exited. -kill $XVFBPID - -# Return the executed command's exit status. -exit $RETVAL - -# vim:set ai et sts=4 sw=4 tw=80: diff --git a/staging/xorg-server/xvfb-run.1 b/staging/xorg-server/xvfb-run.1 deleted file mode 100644 index 137d3a196..000000000 --- a/staging/xorg-server/xvfb-run.1 +++ /dev/null @@ -1,282 +0,0 @@ -.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $ -.\" -.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>. -.\" -.\" This is free software; you may 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, -.\" or (at your option) any later version. -.\" -.\" This is distributed in the hope that it will be useful, but -.\" WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public License with -.\" the Debian operating system, in /usr/share/common-licenses/GPL; if -.\" not, write to the Free Software Foundation, Inc., 59 Temple Place, -.\" Suite 330, Boston, MA 02111-1307 USA -.\" -.\" We need the URL macro from groff's www macro package, but also want -.\" things to work all right for people who don't have it. So we define -.\" our own URL macro and let the www macro package override it if it's -.\" available. -.de URL -\\$2 \(laURL: \\$1 \(ra\\$3 -.. -.if \n[.g] .mso www.tmac -.TH xvfb\-run 1 "2004\-11\-12" "Debian Project" -.SH NAME -xvfb\-run \- run specified X client or command in a virtual X server environment -.SH SYNOPSIS -.B xvfb\-run -[ -.I options -] -.I command -.SH DESCRIPTION -.B xvfb\-run -is a wrapper for the -.BR Xvfb (1x) -command which simplifies the task of running commands (typically an X -client, or a script containing a list of clients to be run) within a virtual -X server environment. -.PP -.B xvfb\-run -sets up an X authority file (or uses an existing user\-specified one), -writes a cookie to it (see -.BR xauth (1x)) -and then starts the -.B Xvfb -X server as a background process. -The process ID of -.B Xvfb -is stored for later use. -The specified -.I command -is then run using the X display corresponding to the -.B Xvfb -server -just started and the X authority file created earlier. -.PP -When the -.I command -exits, its status is saved, the -.B Xvfb -server is killed (using the process ID stored earlier), the X authority -cookie removed, and the authority file deleted (if the user did not specify -one to use). -.B xvfb\-run -then exits with the exit status of -.IR command . -.PP -.B xvfb\-run -requires the -.B xauth -command to function. -.SH OPTIONS -.TP -.B \-a\fR,\fB \-\-auto\-servernum -Try to get a free server number, starting at 99, or the argument to -.BR \-\-server\-num . -.TP -.BI \-e\ file \fR,\fB\ \-\-error\-file= file -Store output from -.B xauth -and -.B Xvfb -in -.IR file . -The default is -.IR /dev/null . -.TP -.BI \-f\ file \fR,\fB\ \-\-auth\-file= file -Store X authentication data in -.IR file . -By default, a temporary directory called -.IR xvfb\-run. PID -(where PID is the process ID of -.B xvfb\-run -itself) is created in the directory specified by the environment variable -.B TMPDIR -(or -.I /tmp -if that variable is null or unset), and the -.BR tempfile (1) -command is used to create a file in that temporary directory called -.IR Xauthority . -.TP -.B \-h\fR,\fB \-\-help -Display a usage message and exit. -.TP -.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber -Use -.I servernumber -as the server number (but see the -.B \-a\fR,\fB \-\-auto\-servernum -option above). -The default is 99. -.TP -.B \-l\fR,\fB \-\-listen\-tcp -Enable TCP port listening in the X server. -For security reasons (to avoid denial\-of\-service attacks or exploits), -TCP port listening is disabled by default. -.TP -.BI \-p\ protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname -Use -.I protocolname -as the X authority protocol to use. -The default is \(oq.\(cq, which -.B xauth -interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1. -.TP -.BI \-s\ arguments \fR,\fB\ \-\-server\-args= arguments -Pass -.I arguments -to the -.B Xvfb -server. -Be careful to quote any whitespace characters that may occur within -.I arguments -to prevent them from regarded as separators for -.BR xvfb\-run 's -own arguments. -Also, note that specification of \(oq\-nolisten tcp\(cq in -.I arguments -may override the function of -.BR xvfb\-run 's -own -.B \-l\fR,\fB \-\-listen\-tcp -option, and that specification of the server number (e.g., \(oq:1\(cq) may -be ignored because of the way the X server parses its argument list. -Use the -.B xvfb\-run -option -.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber -to achieve the latter function. -The default is \(oq\-screen 0 640x480x8\(cq. -.TP -.BI \-w\ delay \fR,\fB\ \-\-wait= delay -Wait -.I delay -seconds after launching -.B Xvfb -before attempting to start the specified command. -The default is 3. -.SH ENVIRONMENT -.TP -.B COLUMNS -indicates the width of the terminal device in character cells. -This value is used for formatting diagnostic messages. -If not set, the terminal is queried using -.BR stty (1) -to determine its width. -If that fails, a value of \(oq80\(cq is assumed. -.TP -.B TMPDIR -specifies the directory in which to place -.BR xvfb\-run 's -temporary directory for storage of the X authority file; only used if the -.B \-f -or -.B \-\-auth\-file -options are not specified. -.SH "OUTPUT FILES" -.PP -Unless the -.B \-f -or -.B \-\-auth\-file -options are specified, a temporary -directory and file within it are created (and deleted) to store the X -authority cookies used by the -.B Xvfb -server and client(s) run under it. -See -.BR tempfile (1). -If \-f or \-\-auth\-file are used, then the specified X authority file is -only written to, not created or deleted (though -.B xauth -creates an authority file itself if told to use use that does not already -exist). -.PP -An error file with a user\-specified name is also created if the -.B \-e -or -.B \-\-error\-file -options are specifed; see above. -.SH "EXIT STATUS" -.B xvfb\-run -uses its exit status as well as output to standard error to communicate -diagnostics. -The exit status of \(oq1\(cq is not used, and should be interpreted as failure -of the specified command. -.TP -0 -.B xvfb\-run -only uses this exit status if the -.B \-h\fR,\fB \-\-help -option is given. -In all other situations, this may be interpreted as success of the specified -command. -.TP -2 -No command to run was specified. -.TP -3 -The -.B xauth -command is not available. -.TP -4 -The temporary directory that was going to be used already exists; since -.B xvfb\-run -produces a uniquely named directory, this may indicate an attempt by another -process on the system to exploit a temporary file race condition. -.TP -5 -A problem was encountered while cleaning up the temporary directory. -.TP -6 -A problem was encountered while using -.BR getopt (1) -to parse the command\-line arguments. -.SH EXAMPLES -.TP -.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo -runs the -.BR xlogo (1x) -demonstration client inside the -.B Xvfb -X server on the first available server number greater than or equal to 1. -.TP -.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces -runs the -.BR ico (1x) -demonstration client (and passes it the -.B \-faces -argument) inside the -.B Xvfb -X server, configured with a root window of 1024 by 768 pixels and a color -depth of 24 bits. -.PP -Note that the demo X clients used in the above examples will not exit on -their own, so they will have to be killed before -.B xvfb\-run -will exit. -.SH BUGS -See -.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" . -If you wish to report a bug in -.BR xvfb\-run , -please use the -.BR reportbug (1) -command. -.SH AUTHOR -.B xfvb\-run -was written by Branden Robinson and Jeff Licquia with sponsorship from -Progeny Linux Systems. -.SH "SEE ALSO" -.BR Xvfb (1x), -.BR xauth (1x) -.\" vim:set et tw=80: diff --git a/staging/xorg-xdm/PKGBUILD b/staging/xorg-xdm/PKGBUILD deleted file mode 100644 index 6da8b604c..000000000 --- a/staging/xorg-xdm/PKGBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: PKGBUILD 168625 2012-10-13 15:55:26Z andyrtr $ -# Maintainer: Alexander Baldeck <alexander@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> -pkgname=xorg-xdm -pkgver=1.1.11 -pkgrel=4 -pkgdesc="X Display Manager" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('pam' 'libxaw' 'libxinerama' 'xorg-xrdb' 'xorg-sessreg' 'libxft' 'systemd') -makedepends=('pkgconfig' 'xorg-util-macros' 'xtrans') -backup=(etc/X11/xdm/Xaccess etc/X11/xdm/Xresources etc/X11/xdm/Xservers etc/X11/xdm/xdm-config etc/pam.d/xdm etc/X11/xdm/Xsetup_0 etc/X11/xdm/Xsession) -options=('!libtool') -source=(${url}/releases/individual/app/xdm-${pkgver}.tar.bz2 - Xsession-loginshell.patch - Xsession-xsm.patch - xdm-1.0.5-sessreg-utmp-fix-bug177890.patch - xdm.pam - git_fixes.diff) -sha256sums=('d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47' - 'fd3e7c20837b42a8ab111369fd6dc9612f9edb91c1f6904cca1d6a1fa3cfa0ff' - '77a1ce9bdf363591b72798db08b4df3589bd4e64737fd32cf9028f9245450edb' - '5f380a2d6f77feb910d77f7f6843fce9b00ff7610c159fc029ee44cc6c23a48a' - '7d6818a1c1a44e9bd38774c035e03b0b831f6646681bc2bf556761aec7baf418' - '781b5577bb070220d018a11832d0d4a65fd16e130730ba26fb055c3aa68156b2') - -build() { - cd "${srcdir}/xdm-${pkgver}" - # upstream commits - Add some missing malloc failure checks 2012-01-07 - patch -Np1 -i "${srcdir}/git_fixes.diff" - - patch -Np0 -i "${srcdir}/Xsession-loginshell.patch" - patch -Np1 -i "${srcdir}/Xsession-xsm.patch" - patch -Np0 -i "${srcdir}/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch" - - autoreconf -fi - ./configure --prefix=/usr \ - --disable-xdm-auth \ - --disable-static \ - --with-xdmconfigdir=/etc/X11/xdm \ - --with-xdmscriptdir=/etc/X11/xdm \ - --with-pixmapdir=/usr/share/xdm/pixmaps - make -} - -package() { - cd "${srcdir}/xdm-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/var/lib/xdm" - install -m755 -d "${pkgdir}/etc/pam.d" - install -m644 "${srcdir}/xdm.pam" "${pkgdir}/etc/pam.d/xdm" - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" - - sed -i -e 's/\/X11R6//g' "${pkgdir}"/etc/X11/xdm/* - - sed -i 's|^Alias=.*|Alias=display-manager.service|' \ - "$pkgdir/usr/lib/systemd/system/xdm.service" -} diff --git a/staging/xorg-xdm/Xsession-loginshell.patch b/staging/xorg-xdm/Xsession-loginshell.patch deleted file mode 100644 index 3710752ef..000000000 --- a/staging/xorg-xdm/Xsession-loginshell.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- config/Xsession.cpp.orig 2008-06-21 13:57:36.000000000 +0000 -+++ config/Xsession.cpp 2008-06-21 14:01:25.000000000 +0000 -@@ -56,11 +56,7 @@ - resources=$HOME/.Xresources - - if [ -s "$startup" ]; then -- if [ -x "$startup" ]; then -- exec "$startup" -- else -- exec /bin/sh "$startup" -- fi -+ exec /bin/sh -ls -c "$startup" - else - if [ -r "$resources" ]; then - BINDIR/xrdb -load "$resources" diff --git a/staging/xorg-xdm/Xsession-xsm.patch b/staging/xorg-xdm/Xsession-xsm.patch deleted file mode 100644 index a2d4d6cc6..000000000 --- a/staging/xorg-xdm/Xsession-xsm.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur xdm-1.1.8-orig/config/Xsession.cpp xdm-1.1.8/config/Xsession.cpp ---- xdm-1.1.8-orig/config/Xsession.cpp 2008-05-21 14:08:45.000000000 -0400 -+++ xdm-1.1.8/config/Xsession.cpp 2009-04-28 02:56:11.000000000 -0400 -@@ -54,6 +54,7 @@ - - startup=$HOME/.xsession - resources=$HOME/.Xresources -+xinitrc=$HOME/.xinitrc - - if [ -s "$startup" ]; then - if [ -x "$startup" ]; then -@@ -83,5 +84,9 @@ - exec `eval $XDESKTOP` - } - #endif -- exec BINDIR/xsm -+ if [ -r "$xinitrc" ]; then -+ exec /bin/sh -ls -c "$xinitrc" -+ else -+ exec /bin/sh -l /etc/X11/xinit/xinitrc -+ fi - fi diff --git a/staging/xorg-xdm/git_fixes.diff b/staging/xorg-xdm/git_fixes.diff deleted file mode 100644 index 69836d488..000000000 --- a/staging/xorg-xdm/git_fixes.diff +++ /dev/null @@ -1,673 +0,0 @@ -From 011a2710a69cd345a8ee3a6b2f15407b4c3b355a Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston <jeremyhu@apple.com> -Date: Sun, 25 Sep 2011 07:56:15 +0000 -Subject: Require xt >= 1.0 for appdefaultdir - -https://bugs.freedesktop.org/show_bug.cgi?id=7237 - -Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> ---- -diff --git a/configure.ac b/configure.ac -index b488f0c..a4222f1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -383,7 +383,7 @@ PKG_CHECK_MODULES(AUTH, xau) - # Greeter - # - --PKG_CHECK_MODULES(XDMGREET, xt x11 xext) -+PKG_CHECK_MODULES(XDMGREET, xt >= 1.0 x11 xext) - - GREETERLIB="${XDMLIBDIR}/libXdmGreet.so" - AX_DEFINE_DIR(DEF_GREETER_LIB, GREETERLIB, [Location of Xdm Greeter library]) --- -cgit v0.9.0.2-2-gbebe -From 618039261b0c7f14eb3b32c8f636464369724407 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Wed, 21 Sep 2011 02:11:20 +0000 -Subject: Mark some chars as const to fix gcc -Wwrite-strings warnings - -Can't fix all the warnings, due to the Xt API, but can fix a bunch. - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> ---- -diff --git a/greeter/greet.c b/greeter/greet.c -index 539ce17..82e2c21 100644 ---- a/greeter/greet.c -+++ b/greeter/greet.c -@@ -110,9 +110,9 @@ void (*__xdm_SessionExit)(struct display *d, int status, int removeAuth) = NU - void (*__xdm_DeleteXloginResources)(struct display *d, Display *dpy) = NULL; - int (*__xdm_source)(char **environ, char *file) = NULL; - char **(*__xdm_defaultEnv)(void) = NULL; --char **(*__xdm_setEnv)(char **e, char *name, char *value) = NULL; -+char **(*__xdm_setEnv)(char **e, const char *name, const char *value) = NULL; - char **(*__xdm_putEnv)(const char *string, char **env) = NULL; --char **(*__xdm_parseArgs)(char **argv, char *string) = NULL; -+char **(*__xdm_parseArgs)(char **argv, const char *string) = NULL; - void (*__xdm_printEnv)(char **e) = NULL; - char **(*__xdm_systemEnv)(struct display *d, char *user, char *home) = NULL; - void (*__xdm_LogOutOfMem)(const char * fmt, ...) = NULL; -diff --git a/greeter/verify.c b/greeter/verify.c -index ea62cd2..5d2ad17 100644 ---- a/greeter/verify.c -+++ b/greeter/verify.c -@@ -61,7 +61,7 @@ from The Open Group. - extern char *crypt(const char *, const char *); - #endif - --static char *envvars[] = { -+static const char *envvars[] = { - "TZ", /* SYSV and SVR4, but never hurts */ - #if defined(sony) && !defined(SYSTYPE_SYSV) && !defined(_SYSTYPE_SYSV) - "bootdev", -@@ -94,8 +94,8 @@ static char ** - userEnv (struct display *d, int useSystemPath, char *user, char *home, char *shell) - { - char **env; -- char **envvar; -- char *str; -+ const char **envvar; -+ const char *str; - - env = defaultEnv (); - env = setEnv (env, "DISPLAY", d->name); -diff --git a/include/dm.h b/include/dm.h -index 316dd46..4085cae 100644 ---- a/include/dm.h -+++ b/include/dm.h -@@ -443,7 +443,7 @@ extern void UnsecureDisplay (struct display *d, Display *dpy); - extern void execute(char **argv, char **environ); - - /* server.c */ --extern char *_SysErrorMsg (int n); -+extern const char *_SysErrorMsg (int n); - extern int StartServer (struct display *d); - extern int WaitForServer (struct display *d); - extern void ResetServer (struct display *d); -@@ -462,10 +462,10 @@ extern int Asprintf(char ** ret, const char *restrict format, ...) - _X_ATTRIBUTE_PRINTF(2,3); - # endif - extern char *localHostname (void); --extern char **parseArgs (char **argv, char *string); --extern char **setEnv (char **e, char *name, char *value); -+extern char **parseArgs (char **argv, const char *string); -+extern char **setEnv (char **e, const char *name, const char *value); - extern char **putEnv(const char *string, char **env); --extern char *getEnv (char **e, char *name); -+extern char *getEnv (char **e, const char *name); - extern void CleanUpChild (void); - extern void freeArgs (char **argv); - extern void freeEnv (char **env); -@@ -478,7 +478,7 @@ extern int Verify (struct display *d, struct greet_info *greet, struct verify_in - extern char *NetworkAddressToHostname (CARD16 connectionType, ARRAY8Ptr connectionAddress); - extern int AnyWellKnownSockets (void); - extern void DestroyWellKnownSockets (void); --extern void SendFailed (struct display *d, char *reason); -+extern void SendFailed (struct display *d, const char *reason); - extern void StopDisplay (struct display *d); - extern void WaitForChild (void); - extern void WaitForSomething (void); -diff --git a/include/greet.h b/include/greet.h -index 6b6689e..0d607ba 100644 ---- a/include/greet.h -+++ b/include/greet.h -@@ -65,9 +65,9 @@ struct dlfuncs { - void (*_DeleteXloginResources)(struct display *d, Display *dpy); - int (*_source)(char **environ, char *file); - char **(*_defaultEnv)(void); -- char **(*_setEnv)(char **e, char *name, char *value); -+ char **(*_setEnv)(char **e, const char *name, const char *value); - char **(*_putEnv)(const char *string, char **env); -- char **(*_parseArgs)(char **argv, char *string); -+ char **(*_parseArgs)(char **argv, const char *string); - void (*_printEnv)(char **e); - char **(*_systemEnv)(struct display *d, char *user, char *home); - void (*_LogOutOfMem)(const char * fmt, ...); -@@ -149,9 +149,9 @@ extern void (*__xdm_SessionExit)(struct display *d, int status, int removeAut - extern void (*__xdm_DeleteXloginResources)(struct display *d, Display *dpy); - extern int (*__xdm_source)(char **environ, char *file); - extern char **(*__xdm_defaultEnv)(void); --extern char **(*__xdm_setEnv)(char **e, char *name, char *value); -+extern char **(*__xdm_setEnv)(char **e, const char *name, const char *value); - extern char **(*__xdm_putEnv)(const char *string, char **env); --extern char **(*__xdm_parseArgs)(char **argv, char *string); -+extern char **(*__xdm_parseArgs)(char **argv, const char *string); - extern void (*__xdm_printEnv)(char **e); - extern char **(*__xdm_systemEnv)(struct display *d, char *user, char *home); - extern void (*__xdm_LogOutOfMem)(const char * fmt, ...); -diff --git a/xdm/access.c b/xdm/access.c -index d0850ad..7035375 100644 ---- a/xdm/access.c -+++ b/xdm/access.c -@@ -667,7 +667,7 @@ scanHostlist ( - /* Returns non-0 iff string is matched by pattern. Does case folding. - */ - static int --patternMatch (char *string, char *pattern) -+patternMatch (const char *string, char *pattern) - { - int p, s; - -diff --git a/xdm/auth.c b/xdm/auth.c -index bbca167..9e5cba2 100644 ---- a/xdm/auth.c -+++ b/xdm/auth.c -@@ -116,7 +116,7 @@ int chown(int a,int b,int c) {} - - struct AuthProtocol { - unsigned short name_length; -- char *name; -+ const char *name; - void (*InitAuth)(unsigned short len, char *name); - Xauth *(*GetAuth)(unsigned short len, char *name); - void (*GetXdmcpAuth)( -diff --git a/xdm/file.c b/xdm/file.c -index 6e929b8..7b7f3d3 100644 ---- a/xdm/file.c -+++ b/xdm/file.c -@@ -225,7 +225,7 @@ ParseDisplay (char *source, DisplayType *acceptableTypes, int numAcceptable) - } - - static struct displayMatch { -- char *name; -+ const char *name; - DisplayType type; - } displayTypes[] = { - { "local", { Local, Permanent, FromFile } }, -diff --git a/xdm/resource.c b/xdm/resource.c -index ece4de3..83901a2 100644 ---- a/xdm/resource.c -+++ b/xdm/resource.c -@@ -145,10 +145,10 @@ int choiceTimeout; /* chooser choice timeout */ - #define DEF_UDP_PORT "177" /* registered XDMCP port, dont change */ - - struct dmResources { -- char *name, *class; -- int type; -- char **dm_value; -- char *default_value; -+ const char *name, *class; -+ int type; -+ char **dm_value; -+ const char *default_value; - } DmResources[] = { - { "servers", "Servers", DM_STRING, &servers, - DEF_SERVER_LINE} , -@@ -203,10 +203,10 @@ struct dmResources { - #define boffset(f) XtOffsetOf(struct display, f) - - struct displayResource { -- char *name, *class; -- int type; -- int offset; -- char *default_value; -+ const char *name, *class; -+ int type; -+ int offset; -+ const char *default_value; - }; - - /* resources for managing the server */ -@@ -289,15 +289,16 @@ XrmDatabase DmResourceDB; - - static void - GetResource ( -- char *name, -- char *class, -- int valueType, -- char **valuep, -- char *default_value) -+ const char *name, -+ const char *class, -+ int valueType, -+ char **valuep, -+ const char *default_value) - { - char *type; - XrmValue value; -- char *string, *new_string; -+ const char *string; -+ char *new_string; - char str_buf[50]; - int len; - -diff --git a/xdm/server.c b/xdm/server.c -index 7fe55e6..1bb8873 100644 ---- a/xdm/server.c -+++ b/xdm/server.c -@@ -62,9 +62,9 @@ CatchUsr1 (int n) - errno = olderrno; - } - --char *_SysErrorMsg (int n) -+const char *_SysErrorMsg (int n) - { -- char *s = strerror(n); -+ const char *s = strerror(n); - return (s ? s : "unknown error"); - } - -diff --git a/xdm/util.c b/xdm/util.c -index 033633a..60aab21 100644 ---- a/xdm/util.c -+++ b/xdm/util.c -@@ -97,7 +97,7 @@ printEnv (char **e) - } - - static char * --makeEnv (char *name, char *value) -+makeEnv (const char *name, const char *value) - { - char *result; - -@@ -111,7 +111,7 @@ makeEnv (char *name, char *value) - } - - char * --getEnv (char **e, char *name) -+getEnv (char **e, const char *name) - { - int l = strlen (name); - -@@ -127,7 +127,7 @@ getEnv (char **e, char *name) - } - - char ** --setEnv (char **e, char *name, char *value) -+setEnv (char **e, const char *name, const char *value) - { - char **new, **old; - char *newe; -@@ -207,9 +207,9 @@ freeEnv (char **env) - #define isblank(c) ((c) == ' ' || c == '\t') - - char ** --parseArgs (char **argv, char *string) -+parseArgs (char **argv, const char *string) - { -- char *word; -+ const char *word; - char *save; - char **newargv; - int i; -diff --git a/xdm/xdmauth.c b/xdm/xdmauth.c -index 4b945cf..66804a4 100644 ---- a/xdm/xdmauth.c -+++ b/xdm/xdmauth.c -@@ -44,7 +44,7 @@ static char auth_name[256]; - static int auth_name_len; - - static void --XdmPrintDataHex (char *s, char *a, int l) -+XdmPrintDataHex (const char *s, const char *a, int l) - { - int i; - -@@ -56,7 +56,7 @@ XdmPrintDataHex (char *s, char *a, int l) - - # ifdef XDMCP - static void --XdmPrintArray8Hex (char *s, ARRAY8Ptr a) -+XdmPrintArray8Hex (const char *s, ARRAY8Ptr a) - { - XdmPrintDataHex (s, (char *) a->data, a->length); - } -diff --git a/xdm/xdmcp.c b/xdm/xdmcp.c -index 5bc4716..1c34e7c 100644 ---- a/xdm/xdmcp.c -+++ b/xdm/xdmcp.c -@@ -74,7 +74,7 @@ static void request_respond (struct sockaddr *from, int fromlen, int length, int - static void send_accept (struct sockaddr *to, int tolen, CARD32 sessionID, ARRAY8Ptr authenticationName, ARRAY8Ptr authenticationData, ARRAY8Ptr authorizationName, ARRAY8Ptr authorizationData, int fd); - static void send_alive (struct sockaddr *from, int fromlen, int length, int fd); - static void send_decline (struct sockaddr *to, int tolen, ARRAY8Ptr authenticationName, ARRAY8Ptr authenticationData, ARRAY8Ptr status, int fd); --static void send_failed (struct sockaddr *from, int fromlen, char *name, CARD32 sessionID, char *reason, int fd); -+static void send_failed (struct sockaddr *from, int fromlen, const char *name, CARD32 sessionID, const char *reason, int fd); - static void send_refuse (struct sockaddr *from, int fromlen, CARD32 sessionID, int fd); - static void send_unwilling (struct sockaddr *from, int fromlen, ARRAY8Ptr authenticationName, ARRAY8Ptr status, int fd); - static void send_willing (struct sockaddr *from, int fromlen, ARRAY8Ptr authenticationName, ARRAY8Ptr status, int fd); -@@ -1300,7 +1300,7 @@ abort: - void - SendFailed ( - struct display *d, -- char *reason) -+ const char *reason) - { - Debug ("Display start failed, sending Failed\n"); - send_failed ((struct sockaddr *)(d->from), d->fromlen, d->name, -@@ -1311,9 +1311,9 @@ static void - send_failed ( - struct sockaddr *from, - int fromlen, -- char *name, -+ const char *name, - CARD32 sessionID, -- char *reason, -+ const char *reason, - int fd) - { - static char buf[256]; -@@ -1416,7 +1416,7 @@ NetworkAddressToHostname ( - # else - char dotted[20]; - # endif -- char *local_name = ""; -+ const char *local_name = ""; - int af_type; - - # if defined(IPv6) && defined(AF_INET6) --- -cgit v0.9.0.2-2-gbebe -From c43eb799774743bc50233eff6643c51a5fbe6899 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Wed, 21 Sep 2011 02:22:48 +0000 -Subject: Fix warnings about printing longs with int type format strings - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> ---- -diff --git a/xdm/dm.c b/xdm/dm.c -index cd0ee25..7bc2605 100644 ---- a/xdm/dm.c -+++ b/xdm/dm.c -@@ -536,7 +536,7 @@ WaitForChild (void) - time(&now); - crash = d->lastReserv && - ((now - d->lastReserv) < XDM_BROKEN_INTERVAL); -- Debug("time %i %i try %i of %i%s\n", now, d->lastReserv, -+ Debug("time %li %li try %i of %i%s\n", now, d->lastReserv, - d->reservTries, d->reservAttempts, - crash ? " crash" : ""); - -diff --git a/xdm/xdmauth.c b/xdm/xdmauth.c -index 66804a4..b3c1c16 100644 ---- a/xdm/xdmauth.c -+++ b/xdm/xdmauth.c -@@ -234,7 +234,7 @@ XdmGetKey(struct protoDisplay *pdpy, ARRAY8Ptr displayID) - if (line[0] == '#' || sscanf (line, "%s %s", id, key) != 2) - continue; - bzero(line, sizeof(line)); -- Debug ("Key entry for \"%s\" %d bytes\n", id, strlen(key)); -+ Debug ("Key entry for \"%s\" %ld bytes\n", id, strlen(key)); - if (strlen (id) == displayID->length && - !strncmp (id, (char *)displayID->data, displayID->length)) - { --- -cgit v0.9.0.2-2-gbebe -From 8eee942be0db913511b4c53f94829e1201dfdf00 Mon Sep 17 00:00:00 2001 -From: Michał Górny <mgorny@gentoo.org> -Date: Wed, 28 Sep 2011 19:25:17 +0000 -Subject: Support systemd startup notification. - -If libsystemd-daemon support is enabled, xdm uses it to announce its -startup as soon as the session is established. This gives the user -opportunity to delay I/O-intensive operations until the X server is -started so that they would not interfere with its loading while keeping -the machine busy when user types in his/her login. - -Reviewed-by: Jamey Sharp <jamey@minilop.net> -Reviewed-by: Gaetan Nadon <memsize@videotron.ca> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> ---- -diff --git a/Makefile.am b/Makefile.am -index e5f9f5c..bb6b51c 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -43,8 +43,13 @@ endif LINT - if HAVE_SYSTEMD - systemdsystemunit_DATA = xdm.service - --xdm.service: xdm.service.in -- $(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < $< > $@ -+xdm.service: xdm.service.in Makefile -+if USE_SYSTEMD_DAEMON -+ $(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < xdm.service.in > $@ -+else !USE_SYSTEMD_DAEMON -+ $(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' -e '/[Nn]otify/d' < xdm.service.in > $@ -+endif !USE_SYSTEMD_DAEMON -+ - endif HAVE_SYSTEMD - CLEANFILES = xdm.service - EXTRA_DIST = xdm.service.in -diff --git a/configure.ac b/configure.ac -index a4222f1..fcb37f8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -146,6 +146,7 @@ if test "x$USE_SELINUX" != "xno" ; then - fi - - # Check whether to install systemd unit files, as suggested in daemon(7). -+# When a full path is specified, this does not require systemd installed. - AC_ARG_WITH([systemdsystemunitdir], AS_HELP_STRING([--with-systemdsystemunitdir=DIR], - [Directory for systemd service files (default from the System and Service Manager)]),, - [with_systemdsystemunitdir=auto]) -@@ -166,6 +167,21 @@ AS_IF([test "x$with_systemdsystemunitdir" != "xno"], [ - ]) - AM_CONDITIONAL(HAVE_SYSTEMD, [test "x$with_systemdsystemunitdir" != "xno"]) - -+# Check whether to enable systemd startup notification. -+# This requires libsystemd-daemon. -+AC_ARG_WITH([systemd-daemon], AS_HELP_STRING([--with-systemd-daemon], -+ [Add support for systemd startup notification (default is autodetected)]), -+ [USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto]) -+AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [ -+ PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon], -+ [AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])], -+ [AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"], -+ [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])] -+ )] -+ ) -+]) -+AM_CONDITIONAL(USE_SYSTEMD_DAEMON, [test "x$USE_SYSTEMD_DAEMON" != "xno"]) -+ - # FIXME: Find better test for which OS'es use su -m - for now, just try to - # mirror the Imakefile setting of: - # if defined(OpenBSDArchitecture) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(DarwinArchitecture) -diff --git a/xdm.service.in b/xdm.service.in -index d15e072..e782dd9 100644 ---- a/xdm.service.in -+++ b/xdm.service.in -@@ -4,6 +4,8 @@ After=systemd-user-sessions.service - - [Service] - ExecStart=BINDIR/xdm -nodaemon -+Type=notify -+NotifyAccess=all - - [Install] - Alias=graphical.target.wants/xdm.service -diff --git a/xdm/Makefile.am b/xdm/Makefile.am -index aa9765c..797b5c5 100644 ---- a/xdm/Makefile.am -+++ b/xdm/Makefile.am -@@ -22,11 +22,11 @@ - bin_PROGRAMS = xdm - - AM_CPPFLAGS = -I$(top_srcdir)/include --AM_CFLAGS = $(CWARNFLAGS) $(XDM_CFLAGS) -+AM_CFLAGS = $(CWARNFLAGS) $(XDM_CFLAGS) $(SYSTEMD_DAEMON_CFLAGS) - - # The xdm binary needs to export symbols so that they can be used from - # libXdmGreet.so loaded through a dlopen call from session.c --AM_LDFLAGS = $(XDM_LIBS) -export-dynamic -+AM_LDFLAGS = $(XDM_LIBS) $(SYSTEMD_DAEMON_LIBS) -export-dynamic - - xdm_SOURCES = \ - access.c \ -diff --git a/xdm/session.c b/xdm/session.c -index 5fd47f0..573747d 100644 ---- a/xdm/session.c -+++ b/xdm/session.c -@@ -81,6 +81,10 @@ extern int key_setnet(struct key_netstarg *arg); - # define RTLD_NOW 1 - # endif - -+#ifdef USE_SYSTEMD_DAEMON -+#include <systemd/sd-daemon.h> -+#endif -+ - #ifdef USE_SELINUX - /* This should be run just before we exec the user session. */ - static int -@@ -349,6 +353,12 @@ ManageSession (struct display *d) - exit(UNMANAGE_DISPLAY); - } - -+#ifdef USE_SYSTEMD_DAEMON -+ /* Subsequent notifications will be ignored by systemd -+ * and calling this function will clean up the env */ -+ sd_notify(1, "READY=1"); -+#endif -+ - /* tell the possibly dynamically loaded greeter function - * what data structure formats to expect. - * These version numbers are registered with The Open Group. */ --- -cgit v0.9.0.2-2-gbebe -From 284532c0884893728b75ca37f5d2a9a33f7bc8db Mon Sep 17 00:00:00 2001 -From: Julien Cristau <jcristau@debian.org> -Date: Sat, 22 Oct 2011 15:14:46 +0000 -Subject: greeter: link against -lXrender if xft is enabled - -XmuCvtStringToXftColor uses XRenderParseColor, so require xrender for -the xft option, and link against it. - -Signed-off-by: Julien Cristau <jcristau@debian.org> -Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> ---- -diff --git a/configure.ac b/configure.ac -index fcb37f8..d20ae28 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -345,10 +345,10 @@ AC_ARG_WITH(xft, - AS_HELP_STRING([--with-xft], - [Use Xft to draw text (default is YES if installed)]), - [USE_XFT="$withval"], -- PKG_CHECK_EXISTS(xft, [USE_XFT="yes"], [USE_XFT="no"])) -+ PKG_CHECK_EXISTS(xft xrender, [USE_XFT="yes"], [USE_XFT="no"])) - - if test "x$USE_XFT" = "xyes" ; then -- PKG_CHECK_MODULES(XFT, xft) -+ PKG_CHECK_MODULES(XFT, xft xrender) - GREETER_CFLAGS="$GREETER_CFLAGS $XFT_CFLAGS" - GREETER_LIBS="$GREETER_LIBS $XFT_LIBS" - AC_DEFINE([USE_XFT], 1, -diff --git a/greeter/Login.c b/greeter/Login.c -index 99a3932..d899376 100644 ---- a/greeter/Login.c -+++ b/greeter/Login.c -@@ -86,6 +86,10 @@ from The Open Group. - # include <X11/extensions/Xinerama.h> - #endif - -+#ifdef USE_XFT -+# include <X11/extensions/Xrender.h> -+#endif -+ - #ifndef DEBUG - # define XDM_ASSERT(a) /* do nothing */ - #else --- -cgit v0.9.0.2-2-gbebe -From a02edebf21aae37f8564d7b9fad01d5d2942ad8d Mon Sep 17 00:00:00 2001 -From: Matthieu Herrb <matthieu.herrb@laas.fr> -Date: Mon, 07 Nov 2011 16:01:44 +0000 -Subject: Fix build outside of source dir. Fixes distcheck too. - -Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr> -Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> ---- -diff --git a/Makefile.am b/Makefile.am -index bb6b51c..e9da40f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -45,9 +45,9 @@ systemdsystemunit_DATA = xdm.service - - xdm.service: xdm.service.in Makefile - if USE_SYSTEMD_DAEMON -- $(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < xdm.service.in > $@ -+ $(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < ${srcdir}/xdm.service.in > $@ - else !USE_SYSTEMD_DAEMON -- $(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' -e '/[Nn]otify/d' < xdm.service.in > $@ -+ $(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' -e '/[Nn]otify/d' < ${srcdir}/xdm.service.in > $@ - endif !USE_SYSTEMD_DAEMON - - endif HAVE_SYSTEMD --- -cgit v0.9.0.2-2-gbebe -From ad7a54288f62c0266540279dac775ebee68f092e Mon Sep 17 00:00:00 2001 -From: Matthieu Herrb <matthieu.herrb@laas.fr> -Date: Thu, 15 Dec 2011 21:14:23 +0000 -Subject: replace <varargs.h> by <stdarg.h>. Spotted my Marco Peereboom with clang. - -Reviewed-by: Mark Kettenis <kettenis@openbsd.org> -Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr> ---- -diff --git a/greeter/verify.c b/greeter/verify.c -index 5d2ad17..1221874 100644 ---- a/greeter/verify.c -+++ b/greeter/verify.c -@@ -48,7 +48,7 @@ from The Open Group. - # include <errno.h> - #elif defined(USE_BSDAUTH) - # include <login_cap.h> --# include <varargs.h> -+# include <stdarg.h> - # include <bsd_auth.h> - #elif defined(USESECUREWARE) - # include <sys/types.h> --- -cgit v0.9.0.2-2-gbebe -From 78403f6a7420798bf24798811c8c6b936c9ccb34 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 07 Jan 2012 03:34:30 +0000 -Subject: Add some missing malloc failure checks - -Flagged by Solaris Studio 12.3 code analyzer - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> ---- -diff --git a/xdm/access.c b/xdm/access.c -index 7035375..b16a066 100644 ---- a/xdm/access.c -+++ b/xdm/access.c -@@ -304,6 +304,11 @@ tryagain: - if (!hostOrAlias) - return NULL; - h = malloc (sizeof (DisplayEntry)); -+ if (!h) -+ { -+ LogOutOfMem ("ReadHostEntry: DisplayEntry\n"); -+ return NULL; -+ } - h->hopCount = 1; - if (*hostOrAlias == ALIAS_CHARACTER) - { -@@ -423,6 +428,11 @@ tryagain: - if (!displayOrAlias) - return NULL; - d = malloc (sizeof (DisplayEntry)); -+ if (!d) -+ { -+ LogOutOfMem ("ReadDisplayEntry: DisplayEntry\n"); -+ return NULL; -+ } - d->notAllowed = 0; - d->notBroadcast = 0; - d->chooser = 0; -diff --git a/xdm/choose.c b/xdm/choose.c -index 6f077eb..e5e003d 100644 ---- a/xdm/choose.c -+++ b/xdm/choose.c -@@ -128,6 +128,11 @@ RememberIndirectClient ( - connectionType == i->connectionType) - return 1; - i = malloc (sizeof (IndirectUsersRec)); -+ if (!i) -+ { -+ LogOutOfMem ("RememberIndirectClient\n"); -+ return 0; -+ } - if (!XdmcpCopyARRAY8 (clientAddress, &i->client)) - { - free (i); --- -cgit v0.9.0.2-2-gbebe diff --git a/staging/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch b/staging/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch deleted file mode 100644 index 195858883..000000000 --- a/staging/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- config/GiveConsole.sessreg-utmp-fix-bug177890 2006-07-24 04:20:10.000000000 -0400 -+++ config/GiveConsole 2006-07-24 04:21:16.000000000 -0400 -@@ -8,3 +8,5 @@ - # causing serious grief. - # - chown $USER /dev/console -+exec /usr/bin/sessreg -a -w "/var/log/wtmp" -u "/run/utmp" \ -+ -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER diff --git a/staging/xorg-xdm/xdm.pam b/staging/xorg-xdm/xdm.pam deleted file mode 100644 index a0b601db6..000000000 --- a/staging/xorg-xdm/xdm.pam +++ /dev/null @@ -1,10 +0,0 @@ -#%PAM-1.0 -auth required pam_unix.so -auth required pam_nologin.so -auth required pam_env.so -account required pam_unix.so -password required pam_unix.so -session required pam_unix.so -session required pam_limits.so -session required pam_loginuid.so --session optional pam_systemd.so diff --git a/staging/xournal/PKGBUILD b/staging/xournal/PKGBUILD deleted file mode 100644 index aa89c0c26..000000000 --- a/staging/xournal/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 162197 2012-06-23 11:44:10Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> - -pkgname=xournal -pkgver=0.4.6 -pkgrel=2 -pkgdesc='Notetaking and sketching application' -url='http://xournal.sourceforge.net/' -license=('GPL') -arch=('i686' 'x86_64') -depends=('libgnomecanvas' 'poppler-glib' 'shared-mime-info' 'desktop-file-utils' 'hicolor-icon-theme') -optdepends=('ghostscript: import PS/PDF files as bitmap backgrounds') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('4ebe79e3df7155d2a09c341537a639ac2332d4c8') - -install=install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr LIBS='-lm -lz' - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install desktop-install -} diff --git a/staging/xournal/install b/staging/xournal/install deleted file mode 100644 index dfcb68374..000000000 --- a/staging/xournal/install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-mime-database usr/share/mime &>/dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/yp-tools/PKGBUILD b/staging/yp-tools/PKGBUILD deleted file mode 100644 index 8fde2326b..000000000 --- a/staging/yp-tools/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 161337 2012-06-10 01:13:12Z tomegun $ -# Mantainer: Tom Gundersen <teg@jklm.no> -# Contributor: Gaetan Bisson <bisson@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=yp-tools -pkgver=2.12 -pkgrel=3 -pkgdesc='Linux NIS Tools' -arch=('i686' 'x86_64') -url='http://www.linux-nis.org/nis/yp-tools/' -license=('GPL2') -depends=('ypbind-mt') -#source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/$pkgname-$pkgver.tar.gz") -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'domainname.service') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -D -m644 ../domainname.service "${pkgdir}/usr/lib/systemd/service/domainname.service" -} -md5sums=('ce1e06d86caa285fa8cd76fdf103f51e' - '8d354b76eb0df9a3b06637bfff87453b') diff --git a/staging/yp-tools/domainname.service b/staging/yp-tools/domainname.service deleted file mode 100644 index 035f767c8..000000000 --- a/staging/yp-tools/domainname.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=NIS Domainname - -[Service] -Type=oneshot -EnvironmentFile=/etc/conf.d/nisdomainname -ExecStart=/usr/bin/nisdomainname $NISDOMAINNAME -RemainAfterExit=true - -[Install] -WantedBy=multi-user.target diff --git a/staging/ypbind-mt/PKGBUILD b/staging/ypbind-mt/PKGBUILD deleted file mode 100644 index 267ab3c3e..000000000 --- a/staging/ypbind-mt/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 161339 2012-06-10 01:25:30Z tomegun $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: Gaetan Bisson <bisson@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=ypbind-mt -pkgver=1.33 -pkgrel=5 -pkgdesc='Linux NIS daemon' -url='http://www.linux-nis.org/nis/ypbind-mt/' -license=('GPL2') -arch=('i686' 'x86_64') -makedepends=('networkmanager') -depends=('rpcbind' 'openslp' 'dbus-glib' 'yp-tools') -backup=('etc/yp.conf' 'etc/conf.d/ypbind' 'etc/conf.d/nisdomainname') -#source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz" -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'nisdomainname.conf' - 'ypbind.conf' - 'ypbind' - 'ypbind.service') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure \ - --prefix=/usr \ - --enable-dbus-nm \ - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -D -m644 etc/yp.conf "${pkgdir}"/etc/yp.conf - install -D -m755 ../ypbind "${pkgdir}"/etc/rc.d/ypbind - install -D -m644 ../ypbind.conf "${pkgdir}"/etc/conf.d/ypbind - install -D -m644 ../nisdomainname.conf "${pkgdir}"/etc/conf.d/nisdomainname - install -D -m644 ../ypbind.service "${pkgdir}"/usr/lib/systemd/system/ypbind.service - install -d -m755 "${pkgdir}"/var/yp/binding -} -md5sums=('692f68ed0476762be4228ce543a5b791' - 'e83a85291ea2ee152a78f2c16b0b1185' - '229309a989abad27703ac2e6d07dc7ae' - '1f7a4c80414d580c9afb3a08267beed0' - '88a721095e334cd442f4649a151ba9be') diff --git a/staging/ypbind-mt/nisdomainname.conf b/staging/ypbind-mt/nisdomainname.conf deleted file mode 100644 index bbbbf8fc7..000000000 --- a/staging/ypbind-mt/nisdomainname.conf +++ /dev/null @@ -1,4 +0,0 @@ -# -# NIS domain to be set in /etc/rc.d/ypbind -# -NISDOMAINNAME="" diff --git a/staging/ypbind-mt/ypbind b/staging/ypbind-mt/ypbind deleted file mode 100755 index 6a5ef11e3..000000000 --- a/staging/ypbind-mt/ypbind +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -. /etc/conf.d/ypbind -. /etc/conf.d/nisdomainname - -name=ypbind -PID=$(pidof -o %PPID /usr/sbin/ypbind) - -case "$1" in -start) - stat_busy "Starting $name daemon" - [[ -n $NISDOMAINNAME ]] && /usr/bin/domainname "$NISDOMAINNAME" &>/dev/null - [[ -z "$PID" ]] && /usr/sbin/ypbind $YPBIND_ARGS &>/dev/null \ - && { add_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -stop) - stat_busy "Stopping $name daemon" - [[ -n "$PID" ]] && kill $PID &>/dev/null \ - && { rm_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -restart) - $0 stop - sleep 1 - $0 start - ;; -*) - echo "usage: $0 {start|stop|restart}" - exit 1 - ;; -esac diff --git a/staging/ypbind-mt/ypbind.conf b/staging/ypbind-mt/ypbind.conf deleted file mode 100644 index fd0ebd491..000000000 --- a/staging/ypbind-mt/ypbind.conf +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to ypbind -# -YPBIND_ARGS="" diff --git a/staging/ypbind-mt/ypbind.service b/staging/ypbind-mt/ypbind.service deleted file mode 100644 index c59231000..000000000 --- a/staging/ypbind-mt/ypbind.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=YP Bind -Requires=rpcbind.service domainname.service -After=rpcbind.service domainname.service network.target -Before=systemd-user-sessions.service - -[Service] -Type=forking -PIDFile=/run/ypbind.pid -ExecStart=/usr/sbin/ypbind - -[Install] -WantedBy=multi-user.target |