diff options
Diffstat (limited to 'staging')
527 files changed, 0 insertions, 24444 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 1fd447b0a..000000000 --- a/staging/bzflag/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 164239 2012-07-28 04:20:09Z bisson $ -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> -# Contributor: Kevin Piche <kevin@archlinux.org> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> - -pkgname=bzflag -pkgver=2.4.0 -pkgrel=4 -pkgdesc='Multiplayer 3D tank battle game' -url='http://bzflag.org/' -license=('LGPL') -options=('!libtool') -arch=('i686' 'x86_64') -depends=('curl' 'glew' 'mesa' 'sdl') -source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2") -sha1sums=('af469d63af7143479176ea0ac91ce2eaa6e4561f') - -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/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 1e3b24895..000000000 --- a/staging/calligra/PKGBUILD +++ /dev/null @@ -1,253 +0,0 @@ -# $Id: PKGBUILD 165221 2012-08-13 14:35:45Z andrea $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgbase=calligra -pkgname=('calligra-filters' - 'calligra-interfaces' - 'calligra-libs' - 'calligra-plugins' - 'calligra-pics' - 'calligra-servicetypes' - 'calligra-templates' - '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.0 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.calligra-suite.org/' -license=('FDL1.2' 'GPL2' 'LGPL') -makedepends=('cmake' 'automoc4' 'boost ' 'eigen2' - 'kdepimlibs' 'libpqxx' 'freetds' 'xbase' - 'kdegraphics-okular' 'gsl' 'kdeedu-marble' - 'libwps' 'libwpg' 'pstoedit' 'glew' - 'fftw' 'opengtl' 'lcms2' 'libkdcraw') -groups=('calligra') -source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('bea9b5e9d95691caaba385ef5522a60d') - -build() { - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_active=OFF \ - -DBUILD_mobile=OFF \ - -DIHAVEPATCHEDQT=1 - 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-interfaces() { - pkgdesc="Interfaces for the Calligra office suite" - depends=('calligra-libs') - conflicts=('koffice-interfaces') - replaces=('koffice-interfaces') - - cd "${srcdir}"/build/interfaces - make DESTDIR="${pkgdir}" install -} - -package_calligra-libs() { - pkgdesc="Libraries for the Calligra office suite" - depends=('kdepimlibs' 'lcms2' 'calligra-servicetypes') - conflicts=('koffice-libs') - replaces=('koffice-libs') - - cd "${srcdir}"/build/libs - make DESTDIR="${pkgdir}" install -} - -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-pics() { - pkgdesc="Icons for the Calligra office suite" - conflicts=('koffice-pics') - replaces=('koffice-pics') - install=calligra.install - - cd "${srcdir}"/build/pics - make DESTDIR="${pkgdir}" install -} - -package_calligra-servicetypes() { - pkgdesc="Servicetypes for the Calligra office suite" - conflicts=('koffice-servicetypes') - replaces=('koffice-servicetypes') - install=calligra.install - - cd "${srcdir}"/build/servicetypes - make DESTDIR="${pkgdir}" install -} - -package_calligra-templates() { - pkgdesc="Templates for the Calligra office suite" - conflicts=('koffice-templates') - replaces=('koffice-templates') - - cd "${srcdir}"/build/templates - 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' 'calligra-templates' 'kdebase-runtime') - 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' 'calligra-templates') - 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 -} - -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' 'calligra-templates' '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 -} - -package_calligra-krita() { - pkgdesc="Edit and paint images" - depends=('calligra-templates' 'calligra-plugins' 'kdebase-runtime' - 'qimageblitz' 'poppler-qt' 'opengtl' 'glew' 'libkdcraw' 'fftw') - 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-templates' '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 -} - -package_calligra-words() { - pkgdesc="Word Processor" - depends=('calligra-templates' 'calligra-pics' 'calligra-kounavail' - 'calligra-plugins' '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') - - 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' 'kdebase-runtime') - 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/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/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/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/enblend-enfuse/PKGBUILD b/staging/enblend-enfuse/PKGBUILD deleted file mode 100644 index 0aaea085a..000000000 --- a/staging/enblend-enfuse/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 164241 2012-07-28 04:44:32Z eric $ -# Maintainer: tobias <tobias@archlinux.org> -# Contributor: Dominik Ryba <domryba@post.pl> - -pkgname=enblend-enfuse -pkgver=4.0 -pkgrel=6 -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') -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/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 33d5ac0a6..000000000 --- a/staging/gegl/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 161069 2012-06-07 21:32:43Z daniel $ -# Maintainer: Daniel Isenmann <daniel@archlinux.org> - -pkgname=gegl -pkgver=0.2.0 -pkgrel=2 -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) -sha1sums=('764cc66cb3c7b261b8fc18a6268a0e264a91d573') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./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/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 c71ce3a24..000000000 --- a/staging/glew/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 164235 2012-07-28 03:12:10Z eric $ -# Maintainer: StĂ©phane Gaudreault <stephane@archlinux.org> -# Contributor: SleepyDog - -pkgname=glew -pkgver=1.8.0 -pkgrel=1 -pkgdesc="The OpenGL Extension Wrangler Library" -arch=('i686' 'x86_64') -url="http://glew.sourceforge.net" -license=('BSD' 'MIT' 'GPL') -depends=('libxmu' 'libxi' 'mesa') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz) -sha1sums=('641c6bb3f924ec786e1e6cf2b1b230f594e0f0e4') - -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/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 fe88d48b1..000000000 --- a/staging/hugin/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 164307 2012-07-30 00:51:11Z 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=5 -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') -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/inkscape/PKGBUILD b/staging/inkscape/PKGBUILD deleted file mode 100644 index 37c272b22..000000000 --- a/staging/inkscape/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 165206 2012-08-13 03:26:48Z 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=5 -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 bab0e357a..000000000 --- a/staging/kdebase-workspace/PKGBUILD +++ /dev/null @@ -1,82 +0,0 @@ -# $Id: PKGBUILD 161959 2012-06-17 08:29:22Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgname=kdebase-workspace -_pkgname=kde-workspace -pkgver=4.8.4 -pkgrel=2 -pkgdesc="KDE Base Workspace" -arch=('i686' 'x86_64') -url='http://www.kde.org' -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' 'consolekit' 'xorg-xprop' 'libxdamage' - 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama' - 'xorg-xrdb' 'libgles' 'libegl' 'kactivities' 'libxres' 'libxtst' - 'xorg-xrandr' 'xorg-xmessage' 'libusb-compat') -makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager') -optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces') -install="${pkgname}.install" -backup=('usr/share/config/kdm/kdmrc' - 'etc/pam.d/kde' - 'etc/pam.d/kde-np' - 'etc/pam.d/kscreensaver') -options=('emptydirs') -source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" - 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' - 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') -sha1sums=('a732ceacf34dfb79c8ab243f17cd5a70b9183212' - '5db3a245201bd4a50e65aa2ef583cf5490e4f646' - '712a90999bd429883dcef5dcaf288aace332ced8' - 'b321b5e613b60231330e606fdf1e124646148388' - '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' - '758203a76b58d62786a1013f6f8682e48844138a' - 'd7b5883f7e65c6839b1f65f94d58026673dd0226' - 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - 'd509dac592bd8b310df27991b208c95b6d907514') - -build() { - cd "${srcdir}"/${_pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/kdm-xinitrd.patch - patch -p0 -i "${srcdir}"/fixpath.patch - patch -p0 -i "${srcdir}"/terminate-server.patch - - cd "${srcdir}" - 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 \ - -DWITH_OpenGLES=ON \ - -DKWIN_BUILD_WITH_OPENGLES=ON \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 - make -} - -package() { - cd "${srcdir}"/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 -Dm644 "${srcdir}"/kdm.service \ - "${pkgdir}"/usr/lib/systemd/system/kdm.service -} 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 7d60cc35c..000000000 --- a/staging/kdebase-workspace/kde-np.pam +++ /dev/null @@ -1,9 +0,0 @@ -#%PAM-1.0 -auth required pam_nologin.so -auth required pam_permit.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 optional pam_systemd.so diff --git a/staging/kdebase-workspace/kde.pam b/staging/kdebase-workspace/kde.pam deleted file mode 100644 index ec1d8277f..000000000 --- a/staging/kdebase-workspace/kde.pam +++ /dev/null @@ -1,9 +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 optional pam_systemd.so 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.service b/staging/kdebase-workspace/kdm.service deleted file mode 100644 index 15ff75ff2..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] -WantedBy=graphical.target 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/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-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/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/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 0f7f416ae..000000000 --- a/staging/libreoffice/PKGBUILD +++ /dev/null @@ -1,718 +0,0 @@ -# $Id: PKGBUILD 165186 2012-08-12 18:50:04Z 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.5.5.3 -pkgver=3.5.5 -pkgrel=2 -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.3' 'kdelibs' 'gconf' 'cppunit' - 'beanshell' 'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' - 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' - #'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" -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}/e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 - ${_additional_source_url}/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz - http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll - gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e - smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810 - fix_broken_hebrew_wordwrapping.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 - e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 - 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.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 - ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) -md5sums=('ccb80344ae1ac546b3a6b6d85f3ae26a' - '09153713133bddc49af99bd76129e929' - 'c2e66522b8adf0b3fb5789e295129ba9' - '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' - 'e1c178b18f130b40494561f02bc1a948' - '7c2549f6b0a8bb604e6c4c729ffdcfe6' - '185d60944ea767075d27247c3162b3bc' - '60ce5dc9bd098f95c2e621a930c98dd9' - '661a52a02a31b3afbe4b3b3146061afd' - '025d9b17d9eb90dc282c5c1289a666aa' - '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 - # one late fix to solve make distro-pack-install issue - patch -Np1 -i ${srcdir}/gmake_install.diff - patch -Np1 -i ${srcdir}/smp_buildfix.diff - # https://bugs.archlinux.org/task/29854 based on 3.6/master patch http://cgit.freedesktop.org/libreoffice/core/patch/?id=20c24114143d6d38774b56a142fd4ae05094308e - patch -Np1 -i ${srcdir}/fix_broken_hebrew_wordwrapping.diff - - # unset C(XX)FLAGS - # http://www.openoffice.org/issues/show_bug.cgi?id=103205 -# unset CFLAGS -# unset CXXFLAGS - - #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" \ -# touch autogen.lastrun - ./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-mdds\ - --without-myspell-dicts \ - --without-system-libvisio \ - --without-system-libcmis \ - --without-system-sampleicc \ - --without-system-libexttextcat \ - --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/java/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-lucene\ - --with-lucene-core-jar=/usr/share/java/lucene-core.jar\ - --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\ - --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' - 'lucene: full-text search engine library for Java 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 -} - -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/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}/fakeinstall/usr/lib/libreoffice/program/classes/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/ - mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/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 af31d4432..000000000 --- a/staging/libreoffice/libreoffice-common.csh +++ /dev/null @@ -1 +0,0 @@ -#setenv PYTHONPATH ${PYTHONPATH}:/usr/lib/libreoffice/program 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 ee405b1aa..000000000 --- a/staging/libreoffice/libreoffice-common.sh +++ /dev/null @@ -1 +0,0 @@ -#export PYTHONPATH="$PYTHONPATH:/usr/lib/libreoffice/program" 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/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/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/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/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 5d569a314..000000000 --- a/staging/opencv/PKGBUILD +++ /dev/null @@ -1,118 +0,0 @@ -# $Id: PKGBUILD 161376 2012-06-10 12:41:40Z 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.1 -pkgrel=2 -pkgdesc="Open Source Computer Vision Library" -arch=('i686' 'x86_64') -license=('BSD') -url="http://opencv.willowgarage.com/" -depends=('jasper' 'gstreamer0.10-base' 'openexr' - 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils') -makedepends=('pkg-config' '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=('144aafa12260150490ce77d8debc1a23') - -_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" - - # prepare FSH-friendly dirs - if [ -d OpenCV ]; then - mv opencv/samples OpenCV/ - rm -r opencv - mv OpenCV opencv - fi - - # separate docs package; also be -R friendly - [ -d opencv/doc ] && mv opencv/doc "$srcdir/opencv-doc" - - # separate samples package - [ -d opencv/samples ] && mv opencv/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/opencv" - - # 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/opencv" - cp -r opencv-samples "$pkgdir/usr/share/opencv/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/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/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 bc60416ee..000000000 --- a/staging/poppler/PKGBUILD +++ /dev/null @@ -1,80 +0,0 @@ -# $Id: PKGBUILD 165183 2012-08-12 16:28:46Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=poppler -pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.20.3 -pkgrel=1 -arch=(i686 x86_64) -license=('GPL') -makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection') -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=('28c40266f374e1960a7bcead17d39f96' - '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 -} - -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/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/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/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/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/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/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/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/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/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-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/xine-lib/PKGBUILD b/staging/xine-lib/PKGBUILD deleted file mode 100644 index 08f2aea37..000000000 --- a/staging/xine-lib/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 161814 2012-06-15 00:59:07Z eric $ -# Maintainer: Eric BĂ©langer <eric@archlinux.org> - -pkgname=xine-lib -pkgver=1.2.2 -pkgrel=1 -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') -optdepends=('imagemagick: for using the imagemagick plugin' \ - 'jack: for using the jack plugin' \ - 'vcdimager: for using the vcd plugin' \ - 'mesa: for using the opengl plugin' \ - '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/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 |