diff --git a/PKGBUILD b/PKGBUILD index 1fad33e..72bfe99 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ pkgname=gnuplot pkgver=5.0.0 -pkgrel=3 +pkgrel=4 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" arch=('i686' 'x86_64') url="http://www.gnuplot.info" @@ -15,9 +15,11 @@ makedepends=('texinfo' 'texlive-core' 'emacs' 'texlive-latexextra') options=('!makeflags') install=gnuplot.install source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" - "lua53_compat.patch") + "lua53_compat.patch" + "fix-qt-build.patch") sha1sums=('ca5163e3cb466b4aeb878f1173b0fe624367f08a' - '9005fa9e4da91ceedb8ccd1d761866e7b064f8b1') + '9005fa9e4da91ceedb8ccd1d761866e7b064f8b1' + '6ed9c11377ad2829ab923a607c642d9ff6ff4502') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -30,6 +32,7 @@ prepare() { src/variable.c patch -p1 < "$srcdir"/lua53_compat.patch + patch -p1 < "$srcdir"/fix-qt-build.patch } build() { @@ -38,7 +41,7 @@ build() { WX_CONFIG=/usr/bin/wx-config ./configure --prefix=/usr \ --libexecdir=/usr/bin \ --with-gihdir=/usr/share/gnuplot \ - --with-readline=gnu --enable-qt + --with-readline=gnu --with-qt=qt5 make pkglibexecdir=/usr/bin } diff --git a/fix-qt-build.patch b/fix-qt-build.patch new file mode 100644 index 0000000..be147db --- /dev/null +++ b/fix-qt-build.patch @@ -0,0 +1,26 @@ +diff --git a/configure.in b/configure.new +index 0541aec..2001b33 100755 +--- a/configure.in ++++ b/configure.in +@@ -1206,7 +1206,7 @@ if test "${enable_qt}" = yes ; then + MOC=${QT5LOC}/bin/moc + RCC=${QT5LOC}/bin/rcc + LRELEASE=${QT5LOC}/bin/lrelease +- CXXFLAGS="$CXXFLAGS -fPIE" ++ CXXFLAGS="$CXXFLAGS -fPIC" + fi + fi + +diff --git a/configure b/configure.new +index a03a426..1a77962 100755 +--- a/configure ++++ b/configure +@@ -14236,7 +14236,7 @@ fi + MOC=${QT5LOC}/bin/moc + RCC=${QT5LOC}/bin/rcc + LRELEASE=${QT5LOC}/bin/lrelease +- CXXFLAGS="$CXXFLAGS -fPIE" ++ CXXFLAGS="$CXXFLAGS -fPIC" + fi + fi +