[packages/kde4-rocs] - fix cmake syntax - requires g++98 to build - rel 3
baggins
baggins at pld-linux.org
Fri Oct 4 10:15:28 CEST 2019
commit f297e4da438da9ac7d2b933c23f62b2e4c93c8d3
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri Oct 4 10:14:14 2019 +0200
- fix cmake syntax
- requires g++98 to build
- rel 3
cmake.patch | 46 ++++++++++++++++++++++++++++++++++++++++++++++
kde4-rocs.spec | 6 +++++-
2 files changed, 51 insertions(+), 1 deletion(-)
---
diff --git a/kde4-rocs.spec b/kde4-rocs.spec
index b5e93bc..a003179 100644
--- a/kde4-rocs.spec
+++ b/kde4-rocs.spec
@@ -5,14 +5,16 @@ Summary: K Desktop Environment - Rocs Graph Theory
Summary(pl.UTF-8): K Desktop Environment - Rocs - teoria grafów
Name: kde4-rocs
Version: 4.14.3
-Release: 2
+Release: 3
License: GPL
Group: X11/Applications/Science
Source0: http://download.kde.org/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
# Source0-md5: e8f37a32c800cc07f263c3e411589cbf
+Patch0: cmake.patch
URL: http://www.kde.org/
BuildRequires: QtScriptTools-devel
BuildRequires: boost-devel
+BuildRequires: grantlee-devel
BuildRequires: kde4-kdelibs-devel >= %{version}
Obsoletes: kde4-kdeedu-rocs < 4.7.0
Obsoletes: rocs <= 4.8.0
@@ -40,8 +42,10 @@ Pliki nagłówkowe biblioteki %{name}.
%prep
%setup -q -n %{orgname}-%{version}
+%patch0 -p1
%build
+export CXXFLAGS="%{rpmcxxflags} -std=gnu++98"
install -d build
cd build
%cmake \
diff --git a/cmake.patch b/cmake.patch
new file mode 100644
index 0000000..742c352
--- /dev/null
+++ b/cmake.patch
@@ -0,0 +1,46 @@
+diff -ur rocs-4.14.3/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt rocs-4.14.3.cmake/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt
+--- rocs-4.14.3/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt 2014-10-09 07:21:27.000000000 +0200
++++ rocs-4.14.3.cmake/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt 2019-10-04 08:21:49.175773652 +0200
+@@ -33,4 +33,4 @@
+ ${QT_QTTEST_LIBRARY}
+ ${KDE4_KDECORE_LIBS}
+ )
+-add_test(TestDotFileFormatPlugin TestDotFileFormatPlugin)
++add_test(Test TestDotFileFormatPlugin)
+diff -ur rocs-4.14.3/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt rocs-4.14.3.cmake/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt
+--- rocs-4.14.3/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt 2014-10-09 07:21:27.000000000 +0200
++++ rocs-4.14.3.cmake/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt 2019-10-04 10:10:37.268893297 +0200
+@@ -32,4 +32,4 @@
+ ${QT_QTTEST_LIBRARY}
+ ${KDE4_KDECORE_LIBS}
+ )
+-add_test(TestGmlFileFormatPlugin TestGmlFileFormatPlugin)
++add_test(Test TestGmlFileFormatPlugin)
+diff -ur rocs-4.14.3/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt rocs-4.14.3.cmake/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt
+--- rocs-4.14.3/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt 2014-10-09 07:21:27.000000000 +0200
++++ rocs-4.14.3.cmake/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt 2019-10-04 10:10:45.718893014 +0200
+@@ -30,4 +30,4 @@
+ ${QT_QTTEST_LIBRARY}
+ ${KDE4_KDECORE_LIBS}
+ )
+-add_test(TestKmlFileFormatPlugin TestKmlFileFormatPlugin)
++add_test(Test TestKmlFileFormatPlugin)
+diff -ur rocs-4.14.3/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt rocs-4.14.3.cmake/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt
+--- rocs-4.14.3/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt 2014-10-09 07:21:27.000000000 +0200
++++ rocs-4.14.3.cmake/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt 2019-10-04 10:10:53.448892754 +0200
+@@ -35,4 +35,4 @@
+ ${QT_QTTEST_LIBRARY}
+ ${KDE4_KDECORE_LIBS}
+ )
+-add_test(TestTgfFileFormatPlugin TestTgfFileFormatPlugin)
++add_test(Test TestTgfFileFormatPlugin)
+diff -ur rocs-4.14.3/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt rocs-4.14.3.cmake/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt
+--- rocs-4.14.3/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt 2014-10-09 07:21:27.000000000 +0200
++++ rocs-4.14.3.cmake/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt 2019-10-04 10:11:01.108892494 +0200
+@@ -29,5 +29,5 @@
+ ${QT_QTTEST_LIBRARY}
+ ${KDE4_KDECORE_LIBS}
+ )
+-add_test(TestTikzFileFormatPlugin TestTikzFileFormatPlugin)
++add_test(Test TestTikzFileFormatPlugin)
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kde4-rocs.git/commitdiff/f297e4da438da9ac7d2b933c23f62b2e4c93c8d3
More information about the pld-cvs-commit
mailing list