From 9ce07a620bd38621ac3037229fa55f3f0661e91c Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 20 Dec 2015 15:06:22 +0000 Subject: [PATCH] extra/analitza: drop patch --- extra/analitza/PKGBUILD | 14 +++----------- extra/analitza/analitza-disable-opengl.patch | 19 ------------------- 2 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 extra/analitza/analitza-disable-opengl.patch diff --git a/extra/analitza/PKGBUILD b/extra/analitza/PKGBUILD index d5ad83759..096d874f9 100644 --- a/extra/analitza/PKGBUILD +++ b/extra/analitza/PKGBUILD @@ -2,8 +2,7 @@ # Maintainer: Felix Yan # Contributor: Andrea Scarpino -# ALARM: Kevin Mihelich -# - patch to disable opengl for ARM +# remove when bumped upstream pkgname=analitza pkgver=15.12.0 @@ -16,18 +15,11 @@ depends=('qt5-svg' 'qt5-declarative') makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'eigen') replaces=('kdebase-analitza') conflicts=('kdebase-analitza') -source=("http://download.kde.org/stable/applications/${pkgver}/src/analitza-${pkgver}.tar.xz" - 'analitza-disable-opengl.patch') -sha1sums=('a579cf0f2ab409e4190ba7e6c1832059fbfe9d3e' - 'db4b031c52e10272af54542eebef5b68d8bd0c45') +source=("http://download.kde.org/stable/applications/${pkgver}/src/analitza-${pkgver}.tar.xz") +sha1sums=('a579cf0f2ab409e4190ba7e6c1832059fbfe9d3e') prepare() { mkdir -p build - - cd "${srcdir}/analitza-${pkgver}" - if [[ $CARCH != "aarch64" ]]; then - patch -p1 -i ../analitza-disable-opengl.patch - fi } build() { diff --git a/extra/analitza/analitza-disable-opengl.patch b/extra/analitza/analitza-disable-opengl.patch deleted file mode 100644 index dfe452ce9..000000000 --- a/extra/analitza/analitza-disable-opengl.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -urN a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2015-01-05 13:24:31.000000000 -0700 -+++ b/CMakeLists.txt 2015-01-24 10:23:32.169332291 -0700 -@@ -29,14 +29,7 @@ - VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/analitza_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/Analitza5ConfigVersion.cmake") - --find_package(OpenGL) --set_package_properties(OpenGL PROPERTIES TYPE OPTIONAL -- PURPOSE "Support for 3D graphs in Analitza" -- URL "http://opengl.org") --if(OPENGL_FOUND) -- find_package(Qt5OpenGL ${QT_REQUIRED_VERSION} REQUIRED NO_MODULE) --endif() --set(HAVE_OPENGL ${Qt5OpenGL_FOUND}) -+set(HAVE_OPENGL FALSE) - - find_package(Eigen3) # find and setup Eigen3 if available - set(HAVE_EIGEN3 ${EIGEN3_FOUND})