diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-07 15:10:29 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-07 15:10:29 +0100 |
commit | 4c4400925b792b694511bbbf2f645fb34495d5cf (patch) | |
tree | 86a3b3c62e75fdf9c536306d195bbbcbc7ac974c /extra/qtiplot | |
parent | 08adec2ac14efea1ef452e79ff86f024b9becaf3 (diff) | |
parent | 1fa6edfba8d1e31ca1c0d59e8202cd3c62ccf393 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bwbar/PKGBUILD
community/directfb/PKGBUILD
community/extremetuxracer/PKGBUILD
community/freedroidrpg/PKGBUILD
community/gnash/PKGBUILD
community/guake/PKGBUILD
community/pidgin-libnotify/PKGBUILD
community/png2ico/PKGBUILD
community/ruby-gtk2/PKGBUILD
community/torcs/PKGBUILD
community/virtualbox/PKGBUILD
extra/abiword/PKGBUILD
extra/alsaplayer/PKGBUILD
extra/automoc4/PKGBUILD
extra/cagibi/PKGBUILD
extra/fltk/PKGBUILD
extra/gnome-desktop2/PKGBUILD
extra/gnome-python/PKGBUILD
extra/gnome-sharp/PKGBUILD
extra/gnugo/PKGBUILD
extra/gstreamer0.10-good/PKGBUILD
extra/gtk2/PKGBUILD
extra/gtkmm/PKGBUILD
extra/imlib2/PKGBUILD
extra/koffice/PKGBUILD
extra/lcms/PKGBUILD
extra/libao/PKGBUILD
extra/libcue/PKGBUILD
extra/libdaemon/PKGBUILD
extra/libgnome-media-profiles/PKGBUILD
extra/libotf/PKGBUILD
extra/libotr/PKGBUILD
extra/libots/PKGBUILD
extra/libreoffice/PKGBUILD
extra/libtiff/PKGBUILD
extra/libwebkit/PKGBUILD
extra/libwmf/PKGBUILD
extra/libxfcegui4/PKGBUILD
extra/mjpegtools/PKGBUILD
extra/netpbm/PKGBUILD
extra/php/PKGBUILD
extra/plotutils/PKGBUILD
extra/poppler/PKGBUILD
extra/qrencode/PKGBUILD
extra/qt/PKGBUILD
extra/qtiplot/PKGBUILD
extra/rssh/PKGBUILD
extra/scim-chewing/PKGBUILD
extra/scim-m17n/PKGBUILD
extra/scim-pinyin/PKGBUILD
extra/scim-tables/PKGBUILD
extra/scim-uim/PKGBUILD
extra/tsocks/PKGBUILD
extra/vigra/PKGBUILD
extra/w3m/PKGBUILD
extra/wv/PKGBUILD
extra/xclip/PKGBUILD
extra/xfce4-datetime-plugin/PKGBUILD
extra/xfce4-notes-plugin/PKGBUILD
extra/xfce4-quicklauncher-plugin/PKGBUILD
extra/xfce4-sensors-plugin/PKGBUILD
extra/xorg-font-util/PKGBUILD
extra/xorg-setxkbmap/PKGBUILD
extra/xorg-xev/PKGBUILD
extra/xsane/PKGBUILD
extra/yakuake/PKGBUILD
extra/zvbi/PKGBUILD
multilib/lib32-cairo/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-libcanberra/PKGBUILD
multilib/lib32-libcups/PKGBUILD
multilib/lib32-libglade/PKGBUILD
multilib/lib32-libpng/PKGBUILD
multilib/lib32-libtiff/PKGBUILD
multilib/lib32-pango/PKGBUILD
multilib/lib32-qt/PKGBUILD
multilib/lib32-sdl_image/PKGBUILD
multilib/wine/PKGBUILD
testing/vlc/PKGBUILD
testing/xulrunner/PKGBUILD
Diffstat (limited to 'extra/qtiplot')
-rw-r--r-- | extra/qtiplot/PKGBUILD | 16 | ||||
-rw-r--r-- | extra/qtiplot/build.conf.archlinux | 3 | ||||
-rw-r--r-- | extra/qtiplot/qwtplot3d-libpng15.patch | 10 | ||||
-rw-r--r-- | extra/qtiplot/qwtplot3d-qt-4.8.0.patch | 34 |
4 files changed, 57 insertions, 6 deletions
diff --git a/extra/qtiplot/PKGBUILD b/extra/qtiplot/PKGBUILD index 1bb6ad272..ad78db3df 100644 --- a/extra/qtiplot/PKGBUILD +++ b/extra/qtiplot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 136909 2011-09-02 18:19:47Z ronald $ +# $Id: PKGBUILD 148908 2012-02-05 11:55:28Z ibiru $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir.archlinux.org> # Contributor: Gergely Imreh <imrehg@gmail.com> pkgname=qtiplot pkgver=0.9.8.8 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://soft.proindependent.com/qtiplot.html" pkgdesc="Data analysis and scientific plotting - free clone of Origin" @@ -24,16 +24,20 @@ source=(http://download.berlios.de/qtiplot/qtiplot-${pkgver}.tar.bz2 qtiplot.xml qtiplot-0.9.8.6-gold.patch qtiplot-0.9.8.6-kde.patch - qtiplot-0.9.8.6-tamuanova.patch) + qtiplot-0.9.8.6-tamuanova.patch + qwtplot3d-qt-4.8.0.patch + qwtplot3d-libpng15.patch) sha1sums=('02801cdf31b543c0f5d7ef1b1f358f0738d93d48' '4d5d7cf3965a0a1b1aa9cafc34e70ee207700bc8' '4301cb2a36024a10108b689990d28c4fe5c7416e' - 'b3af6c866b3e63b537b418b6d00e57ef468f8f2b' + '326ee6bc623a637d058ab7ee9f65fede40a23a09' '301bf6f70e8c1bb9ffd55eb49eedde7b29a12909' '285f57d865956d93250ec548288c5bface096b6b' 'b534a609f317cf3117d6495909854cdacea20124' 'a1d4bec744c9b8fe29bf177851e66c97cdd9d975' - '830b518e3ef63625df84363a8047417124f243b0') + '830b518e3ef63625df84363a8047417124f243b0' + '3d4c471dda29a04d432f8e0a4c5b977068cdae72' + '4a45ee21f028f34da75d83c0d3e1d08c5f928892') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -58,6 +62,8 @@ build() { # Make qwtplot3d cd ../qwtplot3d + patch -Np3 -i "${srcdir}/qwtplot3d-qt-4.8.0.patch" + patch -Np0 -i "${srcdir}/qwtplot3d-libpng15.patch" qmake make diff --git a/extra/qtiplot/build.conf.archlinux b/extra/qtiplot/build.conf.archlinux index 342377578..7ccded7fa 100644 --- a/extra/qtiplot/build.conf.archlinux +++ b/extra/qtiplot/build.conf.archlinux @@ -3,7 +3,7 @@ isEmpty( QTI_ROOT ) { } SYS_INCLUDEPATH = /usr/include -SYS_LIBS = -L/usr/lib +SYS_LIBS = -L/usr/lib -lGLU MUPARSER_LIBS = -lmuparser GSL_LIBS = -lgsl -lgslcblas @@ -18,6 +18,7 @@ LIB_ORIGIN_LIBS = -lorigin2 QTEXENGINE_LIBS = $$QTI_ROOT/3rdparty/QTeXEngine TAMUANOVA_LIBS = -ltamuanova TAMUANOVA_INCLUDEPATH = /usr/include/tamu_anova +LIBPNG_LIBS = -lpng PYTHON = python2 LUPDATE = lupdate diff --git a/extra/qtiplot/qwtplot3d-libpng15.patch b/extra/qtiplot/qwtplot3d-libpng15.patch new file mode 100644 index 000000000..828f0c6d8 --- /dev/null +++ b/extra/qtiplot/qwtplot3d-libpng15.patch @@ -0,0 +1,10 @@ +--- 3rdparty/gl2ps/gl2ps.c.orig 2012-01-29 18:15:34.000000000 -0500 ++++ 3rdparty/gl2ps/gl2ps.c 2012-01-29 18:16:08.000000000 -0500 +@@ -47,6 +47,7 @@ + #endif + + #if defined(GL2PS_HAVE_LIBPNG) ++#include <zlib.h> + #include <png.h> + #endif + diff --git a/extra/qtiplot/qwtplot3d-qt-4.8.0.patch b/extra/qtiplot/qwtplot3d-qt-4.8.0.patch new file mode 100644 index 000000000..9d30f6b7b --- /dev/null +++ b/extra/qtiplot/qwtplot3d-qt-4.8.0.patch @@ -0,0 +1,34 @@ +diff -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h +--- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h 2012-01-29 17:42:01.000000000 -0500 ++++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h 2012-01-29 17:58:30.000000000 -0500 +@@ -2,12 +2,7 @@ + #define qwt3d_io_gl2ps_h__2004_05_07_01_16_begin_guarded_code + + #include <time.h> +- +-#if QT_VERSION < 0x040000 +-#include <qgl.h> +-#else +-#include <QtOpenGL/qgl.h> +-#endif ++#include <QtOpenGL> + + #include "qwt3d_types.h" + #include "qwt3d_io.h" +diff -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h +--- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h 2012-01-29 17:42:01.000000000 -0500 ++++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h 2012-01-29 17:57:21.000000000 -0500 +@@ -2,11 +2,8 @@ + #define __openglhelper_2003_06_06_15_49__ + + #include "qglobal.h" +-#if QT_VERSION < 0x040000 +-#include <qgl.h> +-#else +-#include <QtOpenGL/qgl.h> +-#endif ++#include <QtOpenGL> ++#include <GL/glu.h> + + namespace Qwt3D + { |