summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorM. Scholz2019-09-23 10:43:50 +0200
committerM. Scholz2019-09-23 10:43:50 +0200
commitddbe9ab84552303e75bea22e94babdca2fd2d734 (patch)
treecc511c66df2fc20e103b26c14adc146c0da874ac
parentb98003b1ce3540c8c8798c427d3d93899a1e56c4 (diff)
downloadaur-ddbe9ab84552303e75bea22e94babdca2fd2d734.tar.gz
update to upstream
-rw-r--r--.SRCINFO8
-rw-r--r--00_qlist_missing.patch68
-rw-r--r--PKGBUILD12
3 files changed, 7 insertions, 81 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0d649851083b..bdc44a3a6007 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,16 @@
pkgbase = qwt5-qt5
pkgdesc = Qwt library (version 5.2.3) updated to work with Qt5.
- pkgver = 5.2.3.0
+ pkgver = 5.2.3.1
pkgrel = 1
url = https://github.com/gbm19/qwt5-qt5
arch = x86_64
license = custom
depends = qt5-base
depends = qt5-svg
- source = qwt5-qt5-5.2.3.0.zip::https://github.com/gbm19/qwt5-qt5/archive/2819734e280ab2fce39338ccecf21124eb787004.zip
+ source = qwt5-qt5-5.2.3.1.zip::https://github.com/gbm19/qwt5-qt5/archive/eeacc4497738de159ca6f352d0c8ada353831b53.zip
source = qwtconfig-archlinux.pri
- source = 00_qlist_missing.patch
- sha1sums = 75001ab1862ba448a7883e87a32a0956ac374053
+ sha1sums = 74adb1f1eb56895e7a40bbdcb8b4a205d7e9f16f
sha1sums = 23209de530c9604a0b2fa6df32b6beabe28a9e58
- sha1sums = 94ed795c9457d187d1e31489f8377e2570919bb1
pkgname = qwt5-qt5
diff --git a/00_qlist_missing.patch b/00_qlist_missing.patch
deleted file mode 100644
index 33355d945698..000000000000
--- a/00_qlist_missing.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1: .qmake.stash
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1: Makefile
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/designer: Makefile
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/designer: moc
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/designer: obj
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/designer: plugins
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/designer: resources
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples: Makefile
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples: bin
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/bode: Makefile
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/bode: moc
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/bode: obj
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/cpuplot: Makefile
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/cpuplot: moc
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/cpuplot: obj
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/curvdemo1: Makefile
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/curvdemo1: moc
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/curvdemo1: obj
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/curvdemo2: Makefile
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/curvdemo2: moc
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/curvdemo2: obj
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/data_plot: Makefile
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/data_plot: moc
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/data_plot: obj
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/event_filter: Makefile
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/event_filter: moc
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/event_filter: obj
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/histogram: Makefile
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/histogram: moc
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/histogram: obj
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/realtime_plot: Makefile
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/realtime_plot: moc
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/realtime_plot: obj
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/simple_plot: Makefile
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/simple_plot: moc
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/simple_plot: obj
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/spectrogram: Makefile
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/spectrogram: moc
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/examples/spectrogram: obj
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1: lib
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/src: Makefile
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/src: moc
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/src: obj
-diff -r -u10 qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004/src/qwt_clipper.cpp qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/src/qwt_clipper.cpp
---- qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004/src/qwt_clipper.cpp 2018-11-29 18:52:06.000000000 +0100
-+++ qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/src/qwt_clipper.cpp 2019-07-05 12:48:12.739158087 +0200
-@@ -1,19 +1,20 @@
- /* -*- mode: C++ ; c-file-style: "stroustrup" -*- *****************************
- * Qwt Widget Library
- * Copyright (C) 1997 Josef Wilgen
- * Copyright (C) 2002 Uwe Rathmann
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the Qwt License, Version 1.0
- *****************************************************************************/
-
-+#include <QList>
- #include <qrect.h>
- #include "qwt_math.h"
- #include "qwt_clipper.h"
-
- static inline QwtDoubleRect boundingRect(const QwtPolygonF &polygon)
- {
- #if QT_VERSION < 0x040000
- if (polygon.isEmpty())
- return QwtDoubleRect(0, 0, 0, 0);
-
-Only in qwt5-qt5-2819734e280ab2fce39338ccecf21124eb787004.1/textengines: Makefile
diff --git a/PKGBUILD b/PKGBUILD
index 04205fe18b49..bd78d13ef7f5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Mirko Scholz
pkgname=qwt5-qt5
-_commit=2819734e280ab2fce39338ccecf21124eb787004
-pkgver=5.2.3.0
+_commit=eeacc4497738de159ca6f352d0c8ada353831b53
+pkgver=5.2.3.1
pkgrel=1
pkgdesc='Qwt library (version 5.2.3) updated to work with Qt5.'
arch=('x86_64')
@@ -11,16 +11,12 @@ url='https://github.com/gbm19/qwt5-qt5'
source=(
"qwt5-qt5-${pkgver}.zip::https://github.com/gbm19/qwt5-qt5/archive/${_commit}.zip"
"qwtconfig-archlinux.pri"
-"00_qlist_missing.patch"
)
-sha1sums=('75001ab1862ba448a7883e87a32a0956ac374053'
- '23209de530c9604a0b2fa6df32b6beabe28a9e58'
- '94ed795c9457d187d1e31489f8377e2570919bb1')
+sha1sums=('74adb1f1eb56895e7a40bbdcb8b4a205d7e9f16f'
+ '23209de530c9604a0b2fa6df32b6beabe28a9e58')
prepare() {
install -Dm644 "qwtconfig-archlinux.pri" "${srcdir}/qwt5-qt5-${_commit}/qwtconfig.pri"
- cd "${srcdir}/qwt5-qt5-${_commit}"
- patch --forward --strip=1 --input="${srcdir}/00_qlist_missing.patch"
}
build() {