diff options
| -rw-r--r-- | qwtplot3d/PKGBUILD | 10 | ||||
| -rw-r--r-- | qwtplot3d/qwtplot3d-gcc44.patch | 12 | ||||
| -rw-r--r-- | qwtplot3d/qwtplot3d-gcc44.patch.gz | bin | 0 -> 265 bytes | |||
| -rw-r--r-- | qwtplot3d/qwtplot3d-qt-4.8.0.patch | 34 | ||||
| -rw-r--r-- | qwtplot3d/qwtplot3d-qt-4.8.0.patch.gz | bin | 0 -> 414 bytes |
5 files changed, 5 insertions, 51 deletions
diff --git a/qwtplot3d/PKGBUILD b/qwtplot3d/PKGBUILD index dec00b143..0c7e3d6a9 100644 --- a/qwtplot3d/PKGBUILD +++ b/qwtplot3d/PKGBUILD @@ -12,15 +12,15 @@ url="http://qwtplot3d.sourceforge.net/" depends=('qt5-base') makedepends=('mesa' 'glu') source=("https://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$pkgver.tgz" - qwtplot3d-gcc44.patch qwtplot3d-qt-4.8.0.patch) + qwtplot3d-gcc44.patch.gz qwtplot3d-qt-4.8.0.patch.gz) sha512sums=('88e6d270695931775f3c1c0e718118e31118dbfe9f5f582834de09ab515fdf9e8a0f90d424f276653fdf1cf0b39e2060282385701a4ab48843420fe55a1dcf0c' - '7524277d653dc723537ca71a335eb4109d94c18f5ee2447417e13aa639aafda0b85733fa86305759458f23f189b7a8476bc5db48abfd86607b1f69f9a74431b6' - 'fccdb603f8c0075353a817eb47851aa6929f70d066f37a1d1e314253ed38a730bd821d748852a2df271c81c235003bdf7cc8c03edff8ac211a21fd1dbb41fbe0') + '76100928088662adc0cc9258844750cacac28b318262affae3f498183e4784fc94254c68bd25331addc90d537d3f6ee42938febae6b017acebdf7a7be7a3e81a' + '0f2f15acee7fe408e976fa61663e68be0dfd1a6521aaf22863c17a3b3c5c4cc2c5bf0c1177bf0d0e32e0e0c4386b22d1dac8c35dbc312a23f021e9204b03a1d2') prepare() { cd ${pkgname} - patch -p1 -i "${srcdir}"/qwtplot3d-gcc44.patch - patch -p1 -i "${srcdir}"/qwtplot3d-qt-4.8.0.patch + zcat "${srcdir}"/qwtplot3d-gcc44.patch.gz | patch -p1 + zcat "${srcdir}"/qwtplot3d-qt-4.8.0.patch.gz | patch -p1 } build() { diff --git a/qwtplot3d/qwtplot3d-gcc44.patch b/qwtplot3d/qwtplot3d-gcc44.patch deleted file mode 100644 index a9979e19d..000000000 --- a/qwtplot3d/qwtplot3d-gcc44.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur qwtplot3d-orig/include/qwt3d_function.h qwtplot3d/include/qwt3d_function.h ---- qwtplot3d-orig/include/qwt3d_function.h 2009-07-25 18:18:58.000000000 -0400 -+++ qwtplot3d/include/qwt3d_function.h 2009-07-25 18:19:19.000000000 -0400 -@@ -2,6 +2,7 @@ - #define qwt3d_function_h__2004_03_05_13_51_begin_guarded_code - - #include "qwt3d_gridmapping.h" -+#include <cstdio> - - namespace Qwt3D - { -Only in qwtplot3d/tmp: qwt3d_function.o diff --git a/qwtplot3d/qwtplot3d-gcc44.patch.gz b/qwtplot3d/qwtplot3d-gcc44.patch.gz Binary files differnew file mode 100644 index 000000000..4b8828d9e --- /dev/null +++ b/qwtplot3d/qwtplot3d-gcc44.patch.gz diff --git a/qwtplot3d/qwtplot3d-qt-4.8.0.patch b/qwtplot3d/qwtplot3d-qt-4.8.0.patch deleted file mode 100644 index f675b9527..000000000 --- a/qwtplot3d/qwtplot3d-qt-4.8.0.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -urbN qwtplot3d/include/qwt3d_io_gl2ps.h qwtplot3d.patched/include/qwt3d_io_gl2ps.h ---- qwtplot3d/include/qwt3d_io_gl2ps.h 2005-07-10 16:54:52.000000000 +0300 -+++ qwtplot3d.patched/include/qwt3d_io_gl2ps.h 2012-01-21 22:15:20.000000000 +0200 -@@ -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 -urbN qwtplot3d/include/qwt3d_openglhelper.h qwtplot3d.patched/include/qwt3d_openglhelper.h ---- qwtplot3d/include/qwt3d_openglhelper.h 2005-07-19 17:40:28.000000000 +0300 -+++ qwtplot3d.patched/include/qwt3d_openglhelper.h 2012-01-21 22:29:56.000000000 +0200 -@@ -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 - { diff --git a/qwtplot3d/qwtplot3d-qt-4.8.0.patch.gz b/qwtplot3d/qwtplot3d-qt-4.8.0.patch.gz Binary files differnew file mode 100644 index 000000000..3495f0865 --- /dev/null +++ b/qwtplot3d/qwtplot3d-qt-4.8.0.patch.gz |