rdieter pushed to kalgebra (f22). "drop unecessary patch"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Apr 9 19:50:07 UTC 2015
>From 5e9febb0bb2205d03971446ccbded343da9949c1 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 9 Apr 2015 14:14:11 -0500
Subject: drop unecessary patch
diff --git a/kalgebra-15.03.97-opengl_optional.patch b/kalgebra-15.03.97-opengl_optional.patch
deleted file mode 100644
index 28ef3eb..0000000
--- a/kalgebra-15.03.97-opengl_optional.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up kalgebra-15.03.97/CMakeLists.txt.opengl kalgebra-15.03.97/CMakeLists.txt
---- kalgebra-15.03.97/CMakeLists.txt.opengl 2015-03-15 06:31:58.000000000 -0500
-+++ kalgebra-15.03.97/CMakeLists.txt 2015-04-09 13:38:57.352339792 -0500
-@@ -18,7 +18,10 @@ set(MOBILE_BACKEND "kde" CACHE STRING "B
- include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
-
- find_package(OpenGL)
-+option(SHOULD_BUILD_OPENGL "Build OpenGL support" ON)
-+if(SHOULD_BUILD_OPENGL)
- set(HAVE_OPENGL ${OPENGL_FOUND})
-+endif(SHOULD_BUILD_OPENGL)
- set_package_properties(OpenGL PROPERTIES TYPE OPTIONAL
- PURPOSE "Support for 3D graphs in KAlgebra"
- URL "http://opengl.org")
diff --git a/kalgebra.spec b/kalgebra.spec
index 9b6a201..255c4c4 100644
--- a/kalgebra.spec
+++ b/kalgebra.spec
@@ -1,8 +1,4 @@
-%ifnarch %{arm}
-%global opengl 1
-%endif
-
Name: kalgebra
Summary: 2D and 3D Graph Calculator
Version: 15.03.97
@@ -18,12 +14,6 @@ URL: https://projects.kde.org/projects/kde/kdeedu/%{name}
%endif
Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
-# add SHOULD_BUILD_OPENGL option, to be able to disable support
-# on arm because plotter3d assumes qreal=double all over the place
-Patch1: kalgebra-15.03.97-opengl_optional.patch
-
-## upstream patches
-
BuildRequires: analitza-devel >= 14.12
BuildRequires: desktop-file-utils
BuildRequires: extra-cmake-modules >= 1.3
@@ -44,15 +34,11 @@ BuildRequires: kf5-ki18n-devel kf5-kconfigwidgets-devel kf5-kwidgetsaddons-devel
%prep
%setup -q
-%patch1 -p1 -b .opengl_optional
-
%build
mkdir %{_target_platform}
pushd %{_target_platform}
-%{cmake_kf5} \
- %{!?opengl:-DSHOULD_BUILD_OPENGL:BOOL=OFF} \
- ..
+%{cmake_kf5} ..
popd
make %{?_smp_mflags} -C %{_target_platform}
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/kalgebra.git/commit/?h=f22&id=5e9febb0bb2205d03971446ccbded343da9949c1
More information about the scm-commits
mailing list