extra/analitza patch fix

extra/analitza/PKGBUILD

@@ -3,7 +3,7 @@
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
-#  - patch and cmake define to disable opengl for ARM
+#  - patch to disable opengl for ARM
 
 pkgname=analitza
 pkgver=14.12.1
@@ -17,15 +17,16 @@ 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-4.10.1-opengl_optional.patch')
+        'analitza-disable-opengl.patch')
 sha1sums=('363c4c8df73eb52b66c24fd263916bc6093f85cc'
+          'db4b031c52e10272af54542eebef5b68d8bd0c45')
           '1b3a522acf87ed3dee51af4290a841645bf98a32')
 
 prepare() {
   mkdir build
 
   cd "${srcdir}/analitza-${pkgver}"
-  patch -p1 -i ../analitza-4.10.1-opengl_optional.patch
+  patch -p1 -i ../analitza-disable-opengl.patch
 }
 
 build() {
@@ -35,8 +36,7 @@ build() {
     -DBUILD_TESTING=OFF \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
-    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-    -DSHOULD_BUILD_OPENGL=OFF
+    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
   make
 }
 

extra/analitza/analitza-4.10.1-opengl_optional.patch

@@ -1,17 +0,0 @@
-diff -up analitza-4.10.1/CMakeLists.txt.opengl_optional analitza-4.10.1/CMakeLists.txt
---- analitza-4.10.1/CMakeLists.txt.opengl_optional	2013-03-01 00:39:17.251723086 -0600
-+++ analitza-4.10.1/CMakeLists.txt	2013-03-06 21:48:38.705252164 -0600
-@@ -13,8 +13,11 @@ macro_bool_to_01(READLINE_FOUND HAVE_REA
- macro_log_feature(READLINE_FOUND "GNU Readline" "Allows KAlgebra to provide a console interface." "http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" FALSE "" "")
- 
- macro_optional_find_package(OpenGL)
--macro_bool_to_01(OPENGL_FOUND HAVE_OPENGL)
--macro_log_feature(OPENGL_FOUND "OpenGL" "Support for 3D graphs in Analitza" "http://opengl.org" FALSE "" "")
-+option(SHOULD_BUILD_OPENGL "Build OpenGL support" ON)
-+if(SHOULD_BUILD_OPENGL)
-+  macro_bool_to_01(OPENGL_FOUND HAVE_OPENGL)
-+endif(SHOULD_BUILD_OPENGL)
-+macro_log_feature(HAVE_OPENGL "OpenGL" "Support for 3D graphs in Analitza" "http://opengl.org" FALSE "" "")
- 
- include_directories(.)
- add_definitions (-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)

extra/analitza/analitza-disable-opengl.patch

@@ -0,0 +1,19 @@
+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})