summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/brltty/PKGBUILD4
-rw-r--r--extra/chmlib/PKGBUILD4
-rw-r--r--extra/clisp/PKGBUILD4
-rw-r--r--extra/crypto++/PKGBUILD9
-rw-r--r--extra/dhcp/PKGBUILD4
-rw-r--r--extra/ecl/PKGBUILD4
-rw-r--r--extra/ffcall/PKGBUILD6
-rw-r--r--extra/gmetadom/PKGBUILD4
-rw-r--r--extra/poppler/PKGBUILD44
-rw-r--r--extra/poppler/poppler-0.24.2-mocversiongrep.patch28
-rw-r--r--extra/qt5/PKGBUILD9
11 files changed, 72 insertions, 48 deletions
diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD
index 1fbf355dd..e3e101a2e 100644
--- a/extra/brltty/PKGBUILD
+++ b/extra/brltty/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 196739 2013-10-17 14:02:42Z andyrtr $
+# $Id: PKGBUILD 203074 2014-01-03 11:03:11Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
pkgname=brltty
pkgver=4.5
-pkgrel=5
+pkgrel=6
pkgdesc="Braille display driver for Linux/Unix"
arch=(i686 x86_64)
url="http://mielke.cc/brltty"
diff --git a/extra/chmlib/PKGBUILD b/extra/chmlib/PKGBUILD
index 0925c336b..245fa59c5 100644
--- a/extra/chmlib/PKGBUILD
+++ b/extra/chmlib/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 197891 2013-10-30 11:30:33Z allan $
+# $Id: PKGBUILD 203057 2014-01-03 08:38:57Z bpiotrowski $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Alexander 'dma147' Mieland <dma147@linux-stats.org>
# Contributor: Simon Morgan <simon@16hz.net>
pkgname=chmlib
pkgver=0.40
-pkgrel=3
+pkgrel=4
pkgdesc="Library for dealing with Microsoft ITSS/CHM format files"
arch=('i686' 'x86_64')
url="http://morte.jedrea.com/~jedwin/projects/chmlib/"
diff --git a/extra/clisp/PKGBUILD b/extra/clisp/PKGBUILD
index 6e371fce6..f27d387c6 100644
--- a/extra/clisp/PKGBUILD
+++ b/extra/clisp/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 154935 2012-03-31 09:53:13Z ronald $
+# $Id: PKGBUILD 203061 2014-01-03 09:08:54Z bpiotrowski $
# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
pkgname=clisp
pkgver=2.49
-pkgrel=3
+pkgrel=4
pkgdesc="ANSI Common Lisp interpreter, compiler and debugger"
arch=('i686' 'x86_64')
license=('GPL')
diff --git a/extra/crypto++/PKGBUILD b/extra/crypto++/PKGBUILD
index be0823a13..cdc6f311d 100644
--- a/extra/crypto++/PKGBUILD
+++ b/extra/crypto++/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179501 2013-03-05 17:32:57Z giovanni $
+# $Id: PKGBUILD 203063 2014-01-03 09:15:09Z bpiotrowski $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -8,7 +8,7 @@
pkgname=crypto++
pkgver=5.6.2
_srcver=562
-pkgrel=1
+pkgrel=2
pkgdesc="A free C++ class library of cryptographic schemes"
arch=('i686' 'x86_64')
url="http://www.cryptopp.com/"
@@ -21,8 +21,6 @@ md5sums=('7ed022585698df48e65ce9218f6c6a67'
'46de3847c59ad16456fa863eb33e73b2')
build() {
- cd ${srcdir}
-
sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC"
make -f GNUmakefile
@@ -30,11 +28,8 @@ build() {
}
package() {
- cd ${srcdir}
-
install -d ${pkgdir}/usr/{lib/pkgconfig,include/cryptopp}
install -m644 *.h ${pkgdir}/usr/include/cryptopp/
- install -m644 libcryptopp.a "${pkgdir}/usr/lib/libcryptopp.a"
install -m644 libcryptopp.so "${pkgdir}/usr/lib/libcryptopp.so"
install -m644 ${srcdir}/libcrypto++.pc "${pkgdir}/usr/lib/pkgconfig/libcrypto++.pc"
install -D -m644 License.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
diff --git a/extra/dhcp/PKGBUILD b/extra/dhcp/PKGBUILD
index 10a547001..acd817025 100644
--- a/extra/dhcp/PKGBUILD
+++ b/extra/dhcp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 187056 2013-06-03 11:16:27Z allan $
+# $Id: PKGBUILD 203066 2014-01-03 09:19:21Z bpiotrowski $
# Maintainer: Daniel Isenmann <daniel @archlinux.org>
pkgbase=dhcp
@@ -7,7 +7,7 @@ pkgname=('dhcp' 'dhclient')
# separate patch levels with a period to maintain proper versioning.
pkgver=4.2.5.p1
_pkgver=4.2.5-P1
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
license=('custom:isc-dhcp')
url="https://www.isc.org/software/dhcp"
diff --git a/extra/ecl/PKGBUILD b/extra/ecl/PKGBUILD
index d892592b8..86c7b5a67 100644
--- a/extra/ecl/PKGBUILD
+++ b/extra/ecl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 192491 2013-08-13 08:44:20Z juergen $
+# $Id: PKGBUILD 203068 2014-01-03 09:30:10Z bpiotrowski $
# Contributor: John Proctor <jproctor@prium.net>
# Maintainer: juergen <juergen@archlinux.org>
pkgname=ecl
pkgver=13.5.1
-pkgrel=1
+pkgrel=2
pkgdesc="Embeddable Common Lisp"
arch=('i686' 'x86_64')
url="http://sourceforge.net/projects/ecls/"
diff --git a/extra/ffcall/PKGBUILD b/extra/ffcall/PKGBUILD
index 6652abce5..147e47af2 100644
--- a/extra/ffcall/PKGBUILD
+++ b/extra/ffcall/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 197949 2013-10-30 11:51:49Z allan $
+# $Id: PKGBUILD 203079 2014-01-03 18:03:13Z bpiotrowski $
# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
# Contributor: Michael Baehr <usemike@spamblocked.com>
pkgname=ffcall
pkgver=1.10
-pkgrel=4
+pkgrel=6
pkgdesc="C library for implementing foreign function calls in embedded interpreters"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/libffcall/"
license=('GPL2')
-options=('!makeflags')
+options=('!makeflags' 'staticlibs')
source=(http://www.haible.de/bruno/gnu/${pkgname}-${pkgver}.tar.gz)
md5sums=('2db95007e901f3bc2ae7e5a9fe9ebea4')
diff --git a/extra/gmetadom/PKGBUILD b/extra/gmetadom/PKGBUILD
index 22cb3d794..f8185e918 100644
--- a/extra/gmetadom/PKGBUILD
+++ b/extra/gmetadom/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197998 2013-10-30 12:10:28Z allan $
+# $Id: PKGBUILD 203072 2014-01-03 09:38:06Z bpiotrowski $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=gmetadom
pkgver=0.2.6
-pkgrel=3
+pkgrel=4
pkgdesc="C++ bindings for GDome2 DOM implementation"
arch=('i686' 'x86_64')
url="http://gmetadom.sourceforge.net/"
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index c61cd1028..1c711adc0 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 200652 2013-12-01 09:50:16Z andyrtr $
+# $Id: PKGBUILD 203081 2014-01-03 20:06:57Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=poppler
pkgname=('poppler' 'poppler-glib' 'poppler-qt4' 'poppler-qt5')
-pkgver=0.24.4
+pkgver=0.24.5
pkgrel=1
arch=(i686 x86_64)
license=('GPL')
@@ -12,21 +12,24 @@ options=('!emptydirs')
url="http://poppler.freedesktop.org/"
_testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.xz
- http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2)
-md5sums=('2da22b966cf7a2f8da5bf021e68188ce'
- '9dc64c254a31e570507bdd4ad4ba629a')
+ http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2
+ poppler-0.24.2-mocversiongrep.patch)
+md5sums=('334f2ac95cc8039f2a57fe63e4a81c69'
+ '9dc64c254a31e570507bdd4ad4ba629a'
+ 'd5280e4eb6d02660971bdaa45065933f')
prepare() {
ln -sf test-${_testtag} test
cd ${pkgbase}-${pkgver}
-
+ # fix build with recent qt versions, patch taken from FC
+ patch -Np1 -i ${srcdir}/poppler-0.24.2-mocversiongrep.patch
sed -i -e '/AC_PATH_XTRA/d' configure.ac
sed -i "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:" configure.ac
+ autoreconf -fi
}
build() {
cd ${pkgbase}-${pkgver}
- autoreconf -fi
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-static \
--enable-cairo-output \
@@ -62,12 +65,11 @@ 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
+ cd "${pkgbase}-${pkgver}"
+ make -C poppler DESTDIR="${pkgdir}" install-libLTLIBRARIES
+ make -C glib DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
- install -m644 ../poppler-glib.pc "${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"
}
@@ -79,12 +81,11 @@ package_poppler-qt4() {
conflicts=('poppler-qt')
depends=("poppler=${pkgver}" 'qt4')
- cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
- make DESTDIR="${pkgdir}" install-libLTLIBRARIES
- cd "${srcdir}/${pkgbase}-${pkgver}/qt4"
- make DESTDIR="${pkgdir}" install
+ cd "${pkgbase}-${pkgver}"
+ make -C poppler DESTDIR="${pkgdir}" install-libLTLIBRARIES
+ make -C qt4 DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
- install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/"
+ install -m644 poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/"
rm -f "${pkgdir}"/usr/lib/libpoppler.*
}
@@ -92,11 +93,10 @@ package_poppler-qt5() {
pkgdesc="Poppler Qt5 bindings"
depends=("poppler=${pkgver}" 'qt5-base')
- cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
- make DESTDIR="${pkgdir}" install-libLTLIBRARIES
- cd "${srcdir}/${pkgbase}-${pkgver}/qt5"
- make DESTDIR="${pkgdir}" install
+ cd "${pkgbase}-${pkgver}"
+ make -C poppler DESTDIR="${pkgdir}" install-libLTLIBRARIES
+ make -C qt5 DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
- install -m644 ../poppler-qt5.pc "${pkgdir}/usr/lib/pkgconfig/"
+ install -m644 poppler-qt5.pc "${pkgdir}/usr/lib/pkgconfig/"
rm -f "${pkgdir}"/usr/lib/libpoppler.*
}
diff --git a/extra/poppler/poppler-0.24.2-mocversiongrep.patch b/extra/poppler/poppler-0.24.2-mocversiongrep.patch
new file mode 100644
index 000000000..1343f8f9c
--- /dev/null
+++ b/extra/poppler/poppler-0.24.2-mocversiongrep.patch
@@ -0,0 +1,28 @@
+diff -up poppler-0.24.2/configure.ac.mocversiongrep poppler-0.24.2/configure.ac
+--- poppler-0.24.2/configure.ac.mocversiongrep 2013-10-18 09:51:24.223114884 -0500
++++ poppler-0.24.2/configure.ac 2013-10-18 09:54:33.408681067 -0500
+@@ -661,20 +661,20 @@ if test x$enable_poppler_qt5 = xyes; the
+ AC_CHECK_TOOL(MOCQT5, moc)
+ AC_MSG_CHECKING([for Qt5 moc])
+ mocversion=`$MOCQT5 -v 2>&1`
+- mocversiongrep=`echo $mocversion | grep "Qt 5"`
++ mocversiongrep=`echo $mocversion | grep " 5\."`
+ if test x"$mocversiongrep" != x"$mocversion"; then
+ AC_MSG_RESULT([no])
+ # moc was not the qt5 one, try with moc-qt5
+ AC_CHECK_TOOL(MOCQT52, moc-qt5)
+ AC_MSG_CHECKING([for Qt5 moc-qt5])
+ mocversion=`$MOCQT52 -v 2>&1`
+- mocversiongrep=`echo $mocversion | grep "Qt 5"`
++ mocversiongrep=`echo $mocversion | grep " 5\."`
+ if test x"$mocversiongrep" != x"$mocversion"; then
+ AC_CHECK_TOOL(QTCHOOSER, qtchooser)
+ AC_MSG_CHECKING([for qtchooser])
+ qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2`
+ mocversion=`$qt5tooldir/moc -v 2>&1`
+- mocversiongrep=`echo $mocversion | grep "Qt 5"`
++ mocversiongrep=`echo $mocversion | grep " 5\."`
+ if test x"$mocversiongrep" != x"$mocversion"; then
+ # no valid moc found
+ enable_poppler_qt5=no;
+
diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD
index fdaff2177..497457f6d 100644
--- a/extra/qt5/PKGBUILD
+++ b/extra/qt5/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 202711 2013-12-25 21:25:46Z andyrtr $
+# $Id: PKGBUILD 203076 2014-01-03 12:12:14Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgbase=qt5
@@ -22,7 +22,7 @@ pkgname=('qt5-base'
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.2.0
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -31,7 +31,7 @@ makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb
'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme' 'desktop-file-utils'
'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc' 'libfbclient'
'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
- 'openal' 'gtk2' 'libxkbcommon' 'python')
+ 'openal' 'gtk2' 'libxkbcommon' 'python' 'harfbuzz')
groups=('qt' 'qt5')
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
source=("http://download.qt-project.org/official_releases/qt/5.2/${pkgver}/single/${_pkgfqn}.tar.xz"
@@ -75,6 +75,7 @@ build() {
-sysconfdir /etc/xdg \
-examplesdir /usr/share/doc/qt/examples \
-plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
+ -system-harfbuzz \
-system-sqlite \
-openssl-linked \
-nomake examples \
@@ -99,7 +100,7 @@ package_qt5-base() {
pkgdesc='A cross-platform application and UI framework'
depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig' 'systemd'
'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu'
- 'qtchooser' 'libxkbcommon')
+ 'qtchooser' 'libxkbcommon' 'harfbuzz')
optdepends=('postgresql-libs: PostgreSQL driver'
'libmariadbclient: MariaDB driver'
'unixodbc: ODBC driver'