Date: Thursday, April 28, 2016 @ 17:23:42
Author: fyan
Revision: 266501
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
kmplot/repos/extra-i686/PKGBUILD
(from rev 266500, kmplot/trunk/PKGBUILD)
kmplot/repos/extra-i686/kmplot-isnan.patch
(from rev 266500, kmplot/trunk/kmplot-isnan.patch)
kmplot/repos/extra-x86_64/PKGBUILD
(from rev 266500, kmplot/trunk/PKGBUILD)
kmplot/repos/extra-x86_64/kmplot-isnan.patch
(from rev 266500, kmplot/trunk/kmplot-isnan.patch)
Deleted:
kmplot/repos/extra-i686/PKGBUILD
kmplot/repos/extra-i686/kmplot-isnan.patch
kmplot/repos/extra-i686/kmplot.install
kmplot/repos/extra-x86_64/PKGBUILD
kmplot/repos/extra-x86_64/kmplot-isnan.patch
kmplot/repos/extra-x86_64/kmplot.install
---------------------------------+
/PKGBUILD | 74 +++++++++++++++++++++++++++++++++
/kmplot-isnan.patch | 84 ++++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 38 -----------------
extra-i686/kmplot-isnan.patch | 42 -------------------
extra-i686/kmplot.install | 12 -----
extra-x86_64/PKGBUILD | 38 -----------------
extra-x86_64/kmplot-isnan.patch | 42 -------------------
extra-x86_64/kmplot.install | 12 -----
8 files changed, 158 insertions(+), 184 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-04-28 15:22:50 UTC (rev 266500)
+++ extra-i686/PKGBUILD 2016-04-28 15:23:42 UTC (rev 266501)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <[email protected]>
-# Contributor: Andrea Scarpino <[email protected]>
-
-pkgname=kmplot
-pkgver=16.04.0
-pkgrel=1
-pkgdesc="Mathematical Function Plotter"
-url="http://kde.org/applications/education/kmplot/";
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde-applications' 'kdeedu')
-depends=('kdelibs4support' 'hicolor-icon-theme')
-makedepends=('extra-cmake-modules' 'python' 'kdoctools')
-install=${pkgname}.install
-replaces=('kdeedu-kmplot')
-conflicts=('kdeedu-kmplot')
-source=("http://download.kde.org/stable/applications/${pkgver}/src/kmplot-${pkgver}.tar.xz";)
-sha1sums=('73dd6089fc4e09a02767b96e69fe6e1c94c0da1f')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../$pkgname-$pkgver \
- -DCMAKE_BUILD_TYPE=Release \
- -DBUILD_TESTING=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: kmplot/repos/extra-i686/PKGBUILD (from rev 266500,
kmplot/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-04-28 15:23:42 UTC (rev 266501)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Felix Yan <[email protected]>
+# Contributor: Andrea Scarpino <[email protected]>
+
+pkgname=kmplot
+pkgver=16.04.0
+pkgrel=2
+pkgdesc="Mathematical Function Plotter"
+url="http://kde.org/applications/education/kmplot/";
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde-applications' 'kdeedu')
+depends=('kdelibs4support' 'hicolor-icon-theme')
+makedepends=('extra-cmake-modules' 'python' 'kdoctools')
+replaces=('kdeedu-kmplot')
+conflicts=('kdeedu-kmplot')
+source=("http://download.kde.org/stable/applications/${pkgver}/src/kmplot-${pkgver}.tar.xz";)
+sha1sums=('73dd6089fc4e09a02767b96e69fe6e1c94c0da1f')
+
+prepare() {
+ mkdir -p build
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DBUILD_TESTING=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Deleted: extra-i686/kmplot-isnan.patch
===================================================================
--- extra-i686/kmplot-isnan.patch 2016-04-28 15:22:50 UTC (rev 266500)
+++ extra-i686/kmplot-isnan.patch 2016-04-28 15:23:42 UTC (rev 266501)
@@ -1,42 +0,0 @@
---- kmplot-15.12.3/kmplot/view.cpp.0 2016-03-11 21:19:48.011194225 +0000
-+++ kmplot-15.12.3/kmplot/view.cpp 2016-03-11 21:20:37.341056493 +0000
-@@ -476,7 +476,7 @@
- double x = pixel.x();
- double y = pixel.y();
-
-- if ( isnan(x) )
-+ if ( std::isnan(x) )
- {
- xclipflg = true;
- x = pixelIfNaN.x();
-@@ -496,14 +496,14 @@
- }
- else
- {
-- if ( isinf(x) == -1 )
-+ if ( std::isinf(x) == -1 )
- x = 0;
-
-- else if ( isinf(x) == 1 )
-+ else if ( std::isinf(x) == 1 )
- x = m_clipRect.right();
- }
-
-- if ( isnan(y) )
-+ if ( std::isnan(y) )
- {
- yclipflg = true;
- y = pixelIfNaN.y();
-@@ -523,10 +523,10 @@
- }
- else
- {
-- if ( isinf(y) == -1 )
-+ if ( std::isinf(y) == -1 )
- y = 0;
-
-- else if ( isinf(y) == 1 )
-+ else if ( std::isinf(y) == 1 )
- y = m_clipRect.bottom();
- }
-
Copied: kmplot/repos/extra-i686/kmplot-isnan.patch (from rev 266500,
kmplot/trunk/kmplot-isnan.patch)
===================================================================
--- extra-i686/kmplot-isnan.patch (rev 0)
+++ extra-i686/kmplot-isnan.patch 2016-04-28 15:23:42 UTC (rev 266501)
@@ -0,0 +1,42 @@
+--- kmplot-15.12.3/kmplot/view.cpp.0 2016-03-11 21:19:48.011194225 +0000
++++ kmplot-15.12.3/kmplot/view.cpp 2016-03-11 21:20:37.341056493 +0000
+@@ -476,7 +476,7 @@
+ double x = pixel.x();
+ double y = pixel.y();
+
+- if ( isnan(x) )
++ if ( std::isnan(x) )
+ {
+ xclipflg = true;
+ x = pixelIfNaN.x();
+@@ -496,14 +496,14 @@
+ }
+ else
+ {
+- if ( isinf(x) == -1 )
++ if ( std::isinf(x) == -1 )
+ x = 0;
+
+- else if ( isinf(x) == 1 )
++ else if ( std::isinf(x) == 1 )
+ x = m_clipRect.right();
+ }
+
+- if ( isnan(y) )
++ if ( std::isnan(y) )
+ {
+ yclipflg = true;
+ y = pixelIfNaN.y();
+@@ -523,10 +523,10 @@
+ }
+ else
+ {
+- if ( isinf(y) == -1 )
++ if ( std::isinf(y) == -1 )
+ y = 0;
+
+- else if ( isinf(y) == 1 )
++ else if ( std::isinf(y) == 1 )
+ y = m_clipRect.bottom();
+ }
+
Deleted: extra-i686/kmplot.install
===================================================================
--- extra-i686/kmplot.install 2016-04-28 15:22:50 UTC (rev 266500)
+++ extra-i686/kmplot.install 2016-04-28 15:23:42 UTC (rev 266501)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-04-28 15:22:50 UTC (rev 266500)
+++ extra-x86_64/PKGBUILD 2016-04-28 15:23:42 UTC (rev 266501)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <[email protected]>
-# Contributor: Andrea Scarpino <[email protected]>
-
-pkgname=kmplot
-pkgver=16.04.0
-pkgrel=1
-pkgdesc="Mathematical Function Plotter"
-url="http://kde.org/applications/education/kmplot/";
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde-applications' 'kdeedu')
-depends=('kdelibs4support' 'hicolor-icon-theme')
-makedepends=('extra-cmake-modules' 'python' 'kdoctools')
-install=${pkgname}.install
-replaces=('kdeedu-kmplot')
-conflicts=('kdeedu-kmplot')
-source=("http://download.kde.org/stable/applications/${pkgver}/src/kmplot-${pkgver}.tar.xz";)
-sha1sums=('73dd6089fc4e09a02767b96e69fe6e1c94c0da1f')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../$pkgname-$pkgver \
- -DCMAKE_BUILD_TYPE=Release \
- -DBUILD_TESTING=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: kmplot/repos/extra-x86_64/PKGBUILD (from rev 266500,
kmplot/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-04-28 15:23:42 UTC (rev 266501)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Felix Yan <[email protected]>
+# Contributor: Andrea Scarpino <[email protected]>
+
+pkgname=kmplot
+pkgver=16.04.0
+pkgrel=2
+pkgdesc="Mathematical Function Plotter"
+url="http://kde.org/applications/education/kmplot/";
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde-applications' 'kdeedu')
+depends=('kdelibs4support' 'hicolor-icon-theme')
+makedepends=('extra-cmake-modules' 'python' 'kdoctools')
+replaces=('kdeedu-kmplot')
+conflicts=('kdeedu-kmplot')
+source=("http://download.kde.org/stable/applications/${pkgver}/src/kmplot-${pkgver}.tar.xz";)
+sha1sums=('73dd6089fc4e09a02767b96e69fe6e1c94c0da1f')
+
+prepare() {
+ mkdir -p build
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DBUILD_TESTING=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Deleted: extra-x86_64/kmplot-isnan.patch
===================================================================
--- extra-x86_64/kmplot-isnan.patch 2016-04-28 15:22:50 UTC (rev 266500)
+++ extra-x86_64/kmplot-isnan.patch 2016-04-28 15:23:42 UTC (rev 266501)
@@ -1,42 +0,0 @@
---- kmplot-15.12.3/kmplot/view.cpp.0 2016-03-11 21:19:48.011194225 +0000
-+++ kmplot-15.12.3/kmplot/view.cpp 2016-03-11 21:20:37.341056493 +0000
-@@ -476,7 +476,7 @@
- double x = pixel.x();
- double y = pixel.y();
-
-- if ( isnan(x) )
-+ if ( std::isnan(x) )
- {
- xclipflg = true;
- x = pixelIfNaN.x();
-@@ -496,14 +496,14 @@
- }
- else
- {
-- if ( isinf(x) == -1 )
-+ if ( std::isinf(x) == -1 )
- x = 0;
-
-- else if ( isinf(x) == 1 )
-+ else if ( std::isinf(x) == 1 )
- x = m_clipRect.right();
- }
-
-- if ( isnan(y) )
-+ if ( std::isnan(y) )
- {
- yclipflg = true;
- y = pixelIfNaN.y();
-@@ -523,10 +523,10 @@
- }
- else
- {
-- if ( isinf(y) == -1 )
-+ if ( std::isinf(y) == -1 )
- y = 0;
-
-- else if ( isinf(y) == 1 )
-+ else if ( std::isinf(y) == 1 )
- y = m_clipRect.bottom();
- }
-
Copied: kmplot/repos/extra-x86_64/kmplot-isnan.patch (from rev 266500,
kmplot/trunk/kmplot-isnan.patch)
===================================================================
--- extra-x86_64/kmplot-isnan.patch (rev 0)
+++ extra-x86_64/kmplot-isnan.patch 2016-04-28 15:23:42 UTC (rev 266501)
@@ -0,0 +1,42 @@
+--- kmplot-15.12.3/kmplot/view.cpp.0 2016-03-11 21:19:48.011194225 +0000
++++ kmplot-15.12.3/kmplot/view.cpp 2016-03-11 21:20:37.341056493 +0000
+@@ -476,7 +476,7 @@
+ double x = pixel.x();
+ double y = pixel.y();
+
+- if ( isnan(x) )
++ if ( std::isnan(x) )
+ {
+ xclipflg = true;
+ x = pixelIfNaN.x();
+@@ -496,14 +496,14 @@
+ }
+ else
+ {
+- if ( isinf(x) == -1 )
++ if ( std::isinf(x) == -1 )
+ x = 0;
+
+- else if ( isinf(x) == 1 )
++ else if ( std::isinf(x) == 1 )
+ x = m_clipRect.right();
+ }
+
+- if ( isnan(y) )
++ if ( std::isnan(y) )
+ {
+ yclipflg = true;
+ y = pixelIfNaN.y();
+@@ -523,10 +523,10 @@
+ }
+ else
+ {
+- if ( isinf(y) == -1 )
++ if ( std::isinf(y) == -1 )
+ y = 0;
+
+- else if ( isinf(y) == 1 )
++ else if ( std::isinf(y) == 1 )
+ y = m_clipRect.bottom();
+ }
+
Deleted: extra-x86_64/kmplot.install
===================================================================
--- extra-x86_64/kmplot.install 2016-04-28 15:22:50 UTC (rev 266500)
+++ extra-x86_64/kmplot.install 2016-04-28 15:23:42 UTC (rev 266501)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
