[arch-commits] Commit in qwtplot3d/repos (12 files)

Antonio Rojas arojas at archlinux.org
Mon Feb 20 20:20:01 UTC 2017


    Date: Monday, February 20, 2017 @ 20:20:00
  Author: arojas
Revision: 289328

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  qwtplot3d/repos/extra-i686/PKGBUILD
    (from rev 289327, qwtplot3d/trunk/PKGBUILD)
  qwtplot3d/repos/extra-i686/qwtplot3d-gcc44.patch
    (from rev 289327, qwtplot3d/trunk/qwtplot3d-gcc44.patch)
  qwtplot3d/repos/extra-i686/qwtplot3d-qt-4.8.0.patch
    (from rev 289327, qwtplot3d/trunk/qwtplot3d-qt-4.8.0.patch)
  qwtplot3d/repos/extra-x86_64/PKGBUILD
    (from rev 289327, qwtplot3d/trunk/PKGBUILD)
  qwtplot3d/repos/extra-x86_64/qwtplot3d-gcc44.patch
    (from rev 289327, qwtplot3d/trunk/qwtplot3d-gcc44.patch)
  qwtplot3d/repos/extra-x86_64/qwtplot3d-qt-4.8.0.patch
    (from rev 289327, qwtplot3d/trunk/qwtplot3d-qt-4.8.0.patch)
Deleted:
  qwtplot3d/repos/extra-i686/PKGBUILD
  qwtplot3d/repos/extra-i686/qwtplot3d-gcc44.patch
  qwtplot3d/repos/extra-i686/qwtplot3d-qt-4.8.0.patch
  qwtplot3d/repos/extra-x86_64/PKGBUILD
  qwtplot3d/repos/extra-x86_64/qwtplot3d-gcc44.patch
  qwtplot3d/repos/extra-x86_64/qwtplot3d-qt-4.8.0.patch

---------------------------------------+
 /PKGBUILD                             |  100 ++++++++++++++++++++++++++++++++
 /qwtplot3d-gcc44.patch                |   24 +++++++
 /qwtplot3d-qt-4.8.0.patch             |   68 +++++++++++++++++++++
 extra-i686/PKGBUILD                   |   50 ----------------
 extra-i686/qwtplot3d-gcc44.patch      |   12 ---
 extra-i686/qwtplot3d-qt-4.8.0.patch   |   34 ----------
 extra-x86_64/PKGBUILD                 |   50 ----------------
 extra-x86_64/qwtplot3d-gcc44.patch    |   12 ---
 extra-x86_64/qwtplot3d-qt-4.8.0.patch |   34 ----------
 9 files changed, 192 insertions(+), 192 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-02-20 20:19:23 UTC (rev 289327)
+++ extra-i686/PKGBUILD	2017-02-20 20:20:00 UTC (rev 289328)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald at archlinux.org>
-# Contributor: damir <damir at archlinux.org>
-
-pkgname=qwtplot3d
-pkgver=0.2.7
-pkgrel=8
-pkgdesc="Qt/OpenGL-based C++ programming library containing 3d-widgets"
-arch=("i686" "x86_64")
-license=('custom:zlib')
-url="http://qwtplot3d.sourceforge.net/"
-depends=('qt4' 'qwt')
-makedepends=('mesa' 'glu')
-source=("http://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$pkgver.tgz"
-        qwtplot3d-gcc44.patch qwtplot3d-qt-4.8.0.patch)
-sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea'
-          '52fa169b651a98550f8a8391ddf52e0eaeb2c215'
-          '8dcafdc9753b0f2eeea2f1e96efa6e8d3d956005')
-
-prepare() {
-    cd ${pkgname}
-    patch -p1 -i "${srcdir}"/qwtplot3d-gcc44.patch
-    patch -p1 -i "${srcdir}"/qwtplot3d-qt-4.8.0.patch
-}
-
-build() {
-    cd ${pkgname}
-    # build qwt:
-    qmake-qt4 qwtplot3d.pro
-    make
-}
-
-package() {
-    cd ${pkgname}
-
-    # install qwtplot3d: (by hand, because the Makefile do not provide a "install:")
-    install -d "${pkgdir}"/usr/{include/qwtplot3d,lib}
-
-    for n in include/* ; do
-     cp -d $n "${pkgdir}"/usr/include/qwtplot3d
-    done
-
-    for n in lib/libqwtplot3d.so* ; do
-     cp -d $n "${pkgdir}"/usr/lib
-    done
-
-    # install custom license
-    install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
-

Copied: qwtplot3d/repos/extra-i686/PKGBUILD (from rev 289327, qwtplot3d/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-02-20 20:20:00 UTC (rev 289328)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+
+pkgname=qwtplot3d
+pkgver=0.2.7
+pkgrel=9
+pkgdesc="Qt/OpenGL-based C++ programming library containing 3d-widgets"
+arch=("i686" "x86_64")
+license=('custom:zlib')
+url="http://qwtplot3d.sourceforge.net/"
+depends=('qt4')
+makedepends=('mesa' 'glu')
+source=("http://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$pkgver.tgz"
+        qwtplot3d-gcc44.patch qwtplot3d-qt-4.8.0.patch)
+sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea'
+          '52fa169b651a98550f8a8391ddf52e0eaeb2c215'
+          '8dcafdc9753b0f2eeea2f1e96efa6e8d3d956005')
+
+prepare() {
+    cd ${pkgname}
+    patch -p1 -i "${srcdir}"/qwtplot3d-gcc44.patch
+    patch -p1 -i "${srcdir}"/qwtplot3d-qt-4.8.0.patch
+}
+
+build() {
+    cd ${pkgname}
+    # build qwt:
+    qmake-qt4 qwtplot3d.pro
+    make
+}
+
+package() {
+    cd ${pkgname}
+
+    # install qwtplot3d: (by hand, because the Makefile do not provide a "install:")
+    install -d "${pkgdir}"/usr/{include/qwtplot3d,lib}
+
+    for n in include/* ; do
+     cp -d $n "${pkgdir}"/usr/include/qwtplot3d
+    done
+
+    for n in lib/libqwtplot3d.so* ; do
+     cp -d $n "${pkgdir}"/usr/lib
+    done
+
+    # install custom license
+    install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
+

Deleted: extra-i686/qwtplot3d-gcc44.patch
===================================================================
--- extra-i686/qwtplot3d-gcc44.patch	2017-02-20 20:19:23 UTC (rev 289327)
+++ extra-i686/qwtplot3d-gcc44.patch	2017-02-20 20:20:00 UTC (rev 289328)
@@ -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

Copied: qwtplot3d/repos/extra-i686/qwtplot3d-gcc44.patch (from rev 289327, qwtplot3d/trunk/qwtplot3d-gcc44.patch)
===================================================================
--- extra-i686/qwtplot3d-gcc44.patch	                        (rev 0)
+++ extra-i686/qwtplot3d-gcc44.patch	2017-02-20 20:20:00 UTC (rev 289328)
@@ -0,0 +1,12 @@
+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

Deleted: extra-i686/qwtplot3d-qt-4.8.0.patch
===================================================================
--- extra-i686/qwtplot3d-qt-4.8.0.patch	2017-02-20 20:19:23 UTC (rev 289327)
+++ extra-i686/qwtplot3d-qt-4.8.0.patch	2017-02-20 20:20:00 UTC (rev 289328)
@@ -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
- {

Copied: qwtplot3d/repos/extra-i686/qwtplot3d-qt-4.8.0.patch (from rev 289327, qwtplot3d/trunk/qwtplot3d-qt-4.8.0.patch)
===================================================================
--- extra-i686/qwtplot3d-qt-4.8.0.patch	                        (rev 0)
+++ extra-i686/qwtplot3d-qt-4.8.0.patch	2017-02-20 20:20:00 UTC (rev 289328)
@@ -0,0 +1,34 @@
+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
+ {

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2017-02-20 20:19:23 UTC (rev 289327)
+++ extra-x86_64/PKGBUILD	2017-02-20 20:20:00 UTC (rev 289328)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald at archlinux.org>
-# Contributor: damir <damir at archlinux.org>
-
-pkgname=qwtplot3d
-pkgver=0.2.7
-pkgrel=8
-pkgdesc="Qt/OpenGL-based C++ programming library containing 3d-widgets"
-arch=("i686" "x86_64")
-license=('custom:zlib')
-url="http://qwtplot3d.sourceforge.net/"
-depends=('qt4' 'qwt')
-makedepends=('mesa' 'glu')
-source=("http://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$pkgver.tgz"
-        qwtplot3d-gcc44.patch qwtplot3d-qt-4.8.0.patch)
-sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea'
-          '52fa169b651a98550f8a8391ddf52e0eaeb2c215'
-          '8dcafdc9753b0f2eeea2f1e96efa6e8d3d956005')
-
-prepare() {
-    cd ${pkgname}
-    patch -p1 -i "${srcdir}"/qwtplot3d-gcc44.patch
-    patch -p1 -i "${srcdir}"/qwtplot3d-qt-4.8.0.patch
-}
-
-build() {
-    cd ${pkgname}
-    # build qwt:
-    qmake-qt4 qwtplot3d.pro
-    make
-}
-
-package() {
-    cd ${pkgname}
-
-    # install qwtplot3d: (by hand, because the Makefile do not provide a "install:")
-    install -d "${pkgdir}"/usr/{include/qwtplot3d,lib}
-
-    for n in include/* ; do
-     cp -d $n "${pkgdir}"/usr/include/qwtplot3d
-    done
-
-    for n in lib/libqwtplot3d.so* ; do
-     cp -d $n "${pkgdir}"/usr/lib
-    done
-
-    # install custom license
-    install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
-

Copied: qwtplot3d/repos/extra-x86_64/PKGBUILD (from rev 289327, qwtplot3d/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-02-20 20:20:00 UTC (rev 289328)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+
+pkgname=qwtplot3d
+pkgver=0.2.7
+pkgrel=9
+pkgdesc="Qt/OpenGL-based C++ programming library containing 3d-widgets"
+arch=("i686" "x86_64")
+license=('custom:zlib')
+url="http://qwtplot3d.sourceforge.net/"
+depends=('qt4')
+makedepends=('mesa' 'glu')
+source=("http://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$pkgver.tgz"
+        qwtplot3d-gcc44.patch qwtplot3d-qt-4.8.0.patch)
+sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea'
+          '52fa169b651a98550f8a8391ddf52e0eaeb2c215'
+          '8dcafdc9753b0f2eeea2f1e96efa6e8d3d956005')
+
+prepare() {
+    cd ${pkgname}
+    patch -p1 -i "${srcdir}"/qwtplot3d-gcc44.patch
+    patch -p1 -i "${srcdir}"/qwtplot3d-qt-4.8.0.patch
+}
+
+build() {
+    cd ${pkgname}
+    # build qwt:
+    qmake-qt4 qwtplot3d.pro
+    make
+}
+
+package() {
+    cd ${pkgname}
+
+    # install qwtplot3d: (by hand, because the Makefile do not provide a "install:")
+    install -d "${pkgdir}"/usr/{include/qwtplot3d,lib}
+
+    for n in include/* ; do
+     cp -d $n "${pkgdir}"/usr/include/qwtplot3d
+    done
+
+    for n in lib/libqwtplot3d.so* ; do
+     cp -d $n "${pkgdir}"/usr/lib
+    done
+
+    # install custom license
+    install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
+

Deleted: extra-x86_64/qwtplot3d-gcc44.patch
===================================================================
--- extra-x86_64/qwtplot3d-gcc44.patch	2017-02-20 20:19:23 UTC (rev 289327)
+++ extra-x86_64/qwtplot3d-gcc44.patch	2017-02-20 20:20:00 UTC (rev 289328)
@@ -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

Copied: qwtplot3d/repos/extra-x86_64/qwtplot3d-gcc44.patch (from rev 289327, qwtplot3d/trunk/qwtplot3d-gcc44.patch)
===================================================================
--- extra-x86_64/qwtplot3d-gcc44.patch	                        (rev 0)
+++ extra-x86_64/qwtplot3d-gcc44.patch	2017-02-20 20:20:00 UTC (rev 289328)
@@ -0,0 +1,12 @@
+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

Deleted: extra-x86_64/qwtplot3d-qt-4.8.0.patch
===================================================================
--- extra-x86_64/qwtplot3d-qt-4.8.0.patch	2017-02-20 20:19:23 UTC (rev 289327)
+++ extra-x86_64/qwtplot3d-qt-4.8.0.patch	2017-02-20 20:20:00 UTC (rev 289328)
@@ -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
- {

Copied: qwtplot3d/repos/extra-x86_64/qwtplot3d-qt-4.8.0.patch (from rev 289327, qwtplot3d/trunk/qwtplot3d-qt-4.8.0.patch)
===================================================================
--- extra-x86_64/qwtplot3d-qt-4.8.0.patch	                        (rev 0)
+++ extra-x86_64/qwtplot3d-qt-4.8.0.patch	2017-02-20 20:20:00 UTC (rev 289328)
@@ -0,0 +1,34 @@
+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
+ {



More information about the arch-commits mailing list