diff options
-rw-r--r-- | extra/akonadi/PKGBUILD | 1 | ||||
-rw-r--r-- | extra/boost/PKGBUILD | 2 | ||||
-rw-r--r-- | extra/cmake/PKGBUILD | 2 | ||||
-rw-r--r-- | extra/ebook-tools/PKGBUILD | 1 | ||||
-rw-r--r-- | extra/fftw/PKGBUILD | 3 | ||||
-rw-r--r-- | extra/gstreamer0.10-base/PKGBUILD | 2 | ||||
-rw-r--r-- | extra/kdebase-runtime/PKGBUILD | 1 | ||||
-rw-r--r-- | extra/kdegraphics/PKGBUILD | 1 | ||||
-rw-r--r-- | extra/kdelibs/PKGBUILD | 9 | ||||
-rw-r--r-- | extra/kdelibs/archlinux-menu.patch | 22 | ||||
-rw-r--r-- | extra/kdepimlibs/PKGBUILD | 1 | ||||
-rw-r--r-- | extra/libieee1284/PKGBUILD | 2 | ||||
-rw-r--r-- | extra/poppler/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/qt/PKGBUILD | 9 | ||||
-rw-r--r-- | extra/soprano/PKGBUILD | 3 | ||||
-rw-r--r-- | extra/wipe/PKGBUILD | 3 |
16 files changed, 29 insertions, 41 deletions
diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD index 1e5037778..aff2a41ba 100644 --- a/extra/akonadi/PKGBUILD +++ b/extra/akonadi/PKGBUILD @@ -19,6 +19,7 @@ build() { cd "${srcdir}" mkdir build cd build + CXX="g++" \ cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD index 1509bdc33..37a46a5b5 100644 --- a/extra/boost/PKGBUILD +++ b/extra/boost/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('boost-libs' 'boost') pkgver=1.46.1 _boostver=${pkgver//./_} pkgrel=3 -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.boost.org/" makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index 8184369b9..0312bf46a 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -6,7 +6,7 @@ pkgname=cmake pkgver=2.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64' 'mips64el') license=('custom') diff --git a/extra/ebook-tools/PKGBUILD b/extra/ebook-tools/PKGBUILD index d896ab734..10f851255 100644 --- a/extra/ebook-tools/PKGBUILD +++ b/extra/ebook-tools/PKGBUILD @@ -17,6 +17,7 @@ build() { cd "${srcdir}" mkdir build cd build + CXX="g++" \ cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr diff --git a/extra/fftw/PKGBUILD b/extra/fftw/PKGBUILD index 52bbe911e..d2a0d5832 100644 --- a/extra/fftw/PKGBUILD +++ b/extra/fftw/PKGBUILD @@ -26,7 +26,8 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} # use upstream default CFLAGS while keeping our -march/-mtune - CFLAGS+=" -O3 -fomit-frame-pointer -malign-double -fstrict-aliasing -ffast-math" + [ "$CARCH" = "mips64el" ] || CFLAGS+=" -O3 -fomit-frame-pointer -malign-double -fstrict-aliasing -ffast-math" + [ "$CARCH" = "mips64el" ] && CFLAGS+=" -O3 -fomit-frame-pointer -fstrict-aliasing -ffast-math" CONFIGURE="./configure F77=gfortran --prefix=/usr \ --enable-shared --enable-threads" diff --git a/extra/gstreamer0.10-base/PKGBUILD b/extra/gstreamer0.10-base/PKGBUILD index f1bb35503..093203eb2 100644 --- a/extra/gstreamer0.10-base/PKGBUILD +++ b/extra/gstreamer0.10-base/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=('gstreamer0.10-base') pkgname=('gstreamer0.10-base' 'gstreamer0.10-base-plugins') pkgver=0.10.34 pkgrel=1 -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') license=('LGPL') makedepends=('pkgconfig' 'gstreamer0.10>=0.10.34' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection') options=(!libtool !emptydirs) diff --git a/extra/kdebase-runtime/PKGBUILD b/extra/kdebase-runtime/PKGBUILD index 453768f5c..949de45e5 100644 --- a/extra/kdebase-runtime/PKGBUILD +++ b/extra/kdebase-runtime/PKGBUILD @@ -23,6 +23,7 @@ build() { cd "${srcdir}" mkdir build cd build + CXX="g++" \ cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ diff --git a/extra/kdegraphics/PKGBUILD b/extra/kdegraphics/PKGBUILD index 92daea8ae..127598cd8 100644 --- a/extra/kdegraphics/PKGBUILD +++ b/extra/kdegraphics/PKGBUILD @@ -28,6 +28,7 @@ build() { cd ${srcdir} mkdir build cd build + CXX="g++" \ cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD index 428e753e8..1344a9af6 100644 --- a/extra/kdelibs/PKGBUILD +++ b/extra/kdelibs/PKGBUILD @@ -19,11 +19,10 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' replaces=('arts' 'kdelibs-experimental') install='kdelibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - 'kde-applications-menu.patch' 'archlinux-menu.patch' + 'kde-applications-menu.patch' 'abs-syntax-highlight.patch' 'fix-double-POST-action.patch') sha1sums=('c7fb089c9d52a6b1d9188b9e788753373a3288e4' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - '63a850ab4196b9d06934f2b4a13acd9f7739bc67' 'd994f262356af5b9e4e9619646e471bd98c91efb' 'c8ef05943e71a28c4604217d31fc6ca83e48476c') @@ -32,8 +31,6 @@ build() { # avoid file conflict with gnome-menu patch -p1 -i $srcdir/kde-applications-menu.patch - # add Archlinux menu entry - patch -p1 -i $srcdir/archlinux-menu.patch # add syntax highlightning for PKGBUILD and .install files patch -p1 -i $srcdir/abs-syntax-highlight.patch @@ -43,10 +40,12 @@ build() { cd ${srcdir} mkdir build cd build +# Fix for distcc + CXX="g++" \ cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ - -DKDE_DISTRIBUTION_TEXT='Arch Linux' \ + -DKDE_DISTRIBUTION_TEXT='Parabola GNU/LinuxLibre' \ -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONF_INSTALL_DIR=/etc \ -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \ diff --git a/extra/kdelibs/archlinux-menu.patch b/extra/kdelibs/archlinux-menu.patch deleted file mode 100644 index 546784fa2..000000000 --- a/extra/kdelibs/archlinux-menu.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- kdelibs-4.3.98/kded/applications.menu 2010-01-31 19:28:11.000000000 +0000 -+++ kdelibs-4.3.98/kded/applications.menu 2010-01-31 22:25:53.556043077 +0000 -@@ -16,11 +16,19 @@ - </DefaultLayout> - <Layout> - <Merge type="menus"/> -+ <Menuname>Arch Linux</Menuname> - <Menuname>Applications</Menuname> - <Merge type="files"/> - </Layout> - - <Menu> -+ <Name>Arch Linux</Name> -+ <Directory>Archlinux.directory</Directory> -+ <Include> -+ <Category>Archlinux</Category> -+ </Include> -+ </Menu> -+ <Menu> - <Name>Applications</Name> - <Directory>kde-unknown.directory</Directory> - <OnlyUnallocated/> diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD index 04520de5d..e285528bc 100644 --- a/extra/kdepimlibs/PKGBUILD +++ b/extra/kdepimlibs/PKGBUILD @@ -19,6 +19,7 @@ build() { cd ${srcdir} mkdir build cd build + CXX="g++" \ cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ diff --git a/extra/libieee1284/PKGBUILD b/extra/libieee1284/PKGBUILD index bfd5e8d94..58c0d95a0 100644 --- a/extra/libieee1284/PKGBUILD +++ b/extra/libieee1284/PKGBUILD @@ -16,7 +16,7 @@ md5sums=('b8fff9f3d121531bc17430e3f4ea6ed0') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man + ./configure --prefix=/usr --mandir=/usr/share/man PYTHON=/usr/bin/python2 make } diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 91ba866f1..7a271e80b 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -2,12 +2,12 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler -pkgname=('poppler' 'poppler-glib') +pkgname=('poppler' 'poppler-glib' 'poppler-qt') pkgver=0.16.5 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64 'mips64el') license=('GPL') -makedepends=('libjpeg' 'gcc-libs' 'cairo' 'libxml2' 'fontconfig' 'openjpeg' 'gtk2' 'pkgconfig' 'lcms' 'gobject-introspection') +makedepends=('libjpeg' 'gcc-libs' 'cairo' 'libxml2' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection') options=('!libtool') url="http://poppler.freedesktop.org/" source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz) @@ -22,7 +22,7 @@ build() { --enable-cairo-output \ --enable-xpdf-headers \ --enable-libjpeg --enable-zlib \ - --disable-poppler-qt4 \ + --enable-poppler-qt4 \ --enable-poppler-glib make } diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index 1c77f0076..413b9c324 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -32,10 +32,11 @@ build() { export PATH=${QT4DIR}/bin:${PATH} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} - if [ "$CARCH" = "mips64el" ] ; then - export CFLAGS="$CFLAGS -fpermissive" +# Disable precompiled headers for mips64el + [ "$CARCH" = "mips64el" ] && { export CXXFLAGS="$CXXFLAGS -fpermissive" - fi + extra="-no-pch" + } # FS#24601 export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" @@ -87,7 +88,7 @@ build() { -gtkstyle \ -opengl \ -no-openvg \ - -glib + -glib $extra make } diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD index c7d5e19a1..2433b9e9c 100644 --- a/extra/soprano/PKGBUILD +++ b/extra/soprano/PKGBUILD @@ -11,6 +11,7 @@ url='http://soprano.sourceforge.net/' license=('GPL' 'LGPL') depends=('qt' 'clucene' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso') makedepends=('cmake' 'openjdk6' 'doxygen') +[ "$CARCH" = "mips64el" ] && makedepends=('cmake' 'doxygen') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('03ae49e87c6ec99e57d0433c2650846f') @@ -18,6 +19,8 @@ build() { cd ${srcdir} mkdir build cd build + + [ "$CARCH" = "mips64el" ] || \ . /etc/profile.d/openjdk6.sh # we need the rpath cmake ../${pkgname}-${pkgver} \ diff --git a/extra/wipe/PKGBUILD b/extra/wipe/PKGBUILD index 505bef1b1..c51bcfa2e 100644 --- a/extra/wipe/PKGBUILD +++ b/extra/wipe/PKGBUILD @@ -17,8 +17,9 @@ md5sums=('3aed00711e0490edbec115bc283b8544') build() { cd $srcdir/$pkgname-$pkgver + [ "$CARCH" = "mips64el" ] && extra="--build=$CHOST --host=$CHOST --target=$CHOST" ./configure --prefix=/usr \ - --mandir=/usr/share/man + --mandir=/usr/share/man $extra make } |