[packages/gama-qt] - new - added patch to use system expat
qboosh
qboosh at pld-linux.org
Sun Dec 6 07:07:27 CET 2020
commit 66f2c3fdcb69150f336cb138a4e32c70539f7117
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Dec 6 07:07:41 2020 +0100
- new
- added patch to use system expat
gama-qt-system-expat.patch | 123 +++++++++++++++++++++++++++++++++++++++++++++
gama-qt.spec | 80 +++++++++++++++++++++++++++++
2 files changed, 203 insertions(+)
---
diff --git a/gama-qt.spec b/gama-qt.spec
new file mode 100644
index 0000000..171845c
--- /dev/null
+++ b/gama-qt.spec
@@ -0,0 +1,80 @@
+Summary: Qt based GUI for GNU Gama project
+Summary(pl.UTF-8): Oparty na Qt graficzny interfejs do projektu GNU Gama
+Name: gama-qt
+Version: 1.02
+%define fver %(echo %{version} | tr . -)
+%define gama_ver 2.09
+Release: 1
+License: GPL v3+
+Group: Applications/Science
+Source0: https://ftp.gnu.org/gnu/gama/gama-qt/qt-gama-qt-%{fver}.tar.gz
+# Source0-md5: 8f34ab7af1845efcfc97b7f8ced4c081
+Source1: https://ftp.gnu.org/gnu/gama/gama-%{gama_ver}.tar.gz
+# Source1-md5: 87a3ce7c19bb475b7a70f4bae7c4be61
+Patch0: %{name}-system-expat.patch
+URL: http://www.gnu.org/software/gama/
+BuildRequires: Qt5Core-devel >= 5
+BuildRequires: Qt5Gui-devel >= 5
+BuildRequires: Qt5PrintSupport-devel >= 5
+BuildRequires: Qt5Sql-devel >= 5
+BuildRequires: Qt5Svg-devel >= 5
+BuildRequires: Qt5Widgets-devel >= 5
+BuildRequires: cmake >= 3.5
+BuildRequires: expat-devel
+BuildRequires: libstdc++-devel >= 6:5
+BuildRequires: qt5-build >= 5
+BuildRequires: sed >= 4.0
+BuildRequires: sqlite3-devel >= 3
+BuildRequires: yaml-cpp-devel
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+GNU Gama package is dedicated to adjustment of geodetic networks. It
+is intended for use with traditional geodetic surveyings which are
+still used and needed in special measurements (e.g., underground or
+high precision engineering measurements) where the Global Positioning
+System (GPS) cannot be used.
+
+%description -l pl.UTF-8
+Pakiet GNU Gama służy do wyrównywania sieci geodezyjnych. Jest
+przeznaczony do użycia w tradycyjnych badaniach geodezyjnych, które są
+nadal używane w specjalnych pomiarach (np. podziemnych lub
+precyzyjnych pomiarach inżynierskich), gdzie nie można użyć GPS-a
+(Global Positioning System).
+
+%prep
+%setup -q -n qt-gama-qt-%{fver} -a1
+ln -s gama-%{gama_ver} gama
+%patch0 -p1
+
+%define qt5_ver %(rpm -q Qt5Core-devel)
+%if "%{_ver_lt '%{qt5_ver}' '5.15'}" == "1"
+%{__sed} -i -e 's/Qt::SkipEmptyParts/QString::SkipEmptyParts/' gama-q2/{gamaq2controlpanel,networkadjustmentpanel}.cpp
+%endif
+
+%build
+install -d build
+cd build
+%cmake ..
+
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} -C build install \
+ DESTDIR=$RPM_BUILD_ROOT
+
+# already in gama
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/gama-{g3,local}
+
+# missing in make install
+install build/gama-q2 $RPM_BUILD_ROOT%{_bindir}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+%doc QuickStart.txt
+%attr(755,root,root) %{_bindir}/gama-q2
diff --git a/gama-qt-system-expat.patch b/gama-qt-system-expat.patch
new file mode 100644
index 0000000..790d60b
--- /dev/null
+++ b/gama-qt-system-expat.patch
@@ -0,0 +1,123 @@
+--- qt-gama-qt-1-02/CMakeLists.txt.orig 2020-06-27 14:59:28.000000000 +0200
++++ qt-gama-qt-1-02/CMakeLists.txt 2020-12-05 21:41:09.470005020 +0100
+@@ -29,7 +29,6 @@
+ # endif()
+ #endif()
+
+-add_definitions(-DGNU_gama_expat_1_1) # if we use local copy of expat sources
+ include_directories(gama/lib gama-q2)
+
+ find_package(Qt5 COMPONENTS Core Gui Svg Sql Widgets PrintSupport REQUIRED)
+@@ -101,6 +100,6 @@
+ )
+ endif()
+
+-target_link_libraries(gama-q2 PRIVATE Qt5::Widgets Qt5::Sql Qt5::Svg Qt5::PrintSupport)
++target_link_libraries(gama-q2 PRIVATE Qt5::Widgets Qt5::Sql Qt5::Svg Qt5::PrintSupport expat)
+
+ add_subdirectory(gama)
+--- qt-gama-qt-1-02/gama/CMakeLists.txt.orig 2020-06-28 19:38:30.000000000 +0200
++++ qt-gama-qt-1-02/gama/CMakeLists.txt 2020-12-06 06:32:31.737283954 +0100
+@@ -5,7 +5,6 @@
+ set(CMAKE_CXX_STANDARD 14)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+-add_definitions(-DGNU_gama_expat_1_1)
+ #add_definitions(-DDEBUG_ACORD2)
+ #add_definitions(-DA2G_DEBUG)
+
+@@ -223,21 +222,16 @@
+ lib/matvec/vec.h
+ )
+
+-set(SRC_EXPAT
+- lib/expat/xmltok/xmltok.c
+- lib/expat/xmltok/xmlrole.c
+- lib/expat/xmlwf/codepage.c
+- lib/expat/xmlparse/xmlparse.c
+- lib/expat/xmlparse/hashtable.c
+-)
+-
+-include_directories(lib lib/expat/xmlparse lib/expat/xmltok)
++include_directories(lib)
+
+-add_library(libgama OBJECT ${SRC_GAMA} ${SRC_EXPAT})
++add_library(libgama OBJECT ${SRC_GAMA})
++target_link_libraries(libgama expat)
+
+ # Binaries
+ add_executable(gama-local bin/gama-local.cpp $<TARGET_OBJECTS:libgama>)
++target_link_libraries(gama-local expat)
+ add_executable(gama-g3 bin/gama-g3.cpp $<TARGET_OBJECTS:libgama>)
++target_link_libraries(gama-g3 expat)
+
+ # Installation
+ install(TARGETS gama-local gama-g3 DESTINATION bin)
+--- qt-gama-qt-1-02/gama/tests/gama-local/CMakeLists.txt.orig 2020-01-14 17:43:38.000000000 +0100
++++ qt-gama-qt-1-02/gama/tests/gama-local/CMakeLists.txt 2020-12-06 06:51:24.374481265 +0100
+@@ -40,6 +40,7 @@
+ #
+ add_executable(check_version scripts/check_version.cpp
+ $<TARGET_OBJECTS:libgama>)
++target_link_libraries(check_version expat)
+ add_test(NAME check_version COMMAND check_version
+ ${PROJECT_SOURCE_DIR}/configure.ac ${PROJECT_SOURCE_DIR}/CMakeLists.txt)
+
+@@ -73,6 +74,7 @@
+ #
+ add_executable(check_algorithms scripts/check_xyz.h scripts/check_xyz.cpp
+ scripts/check_algorithms.cpp $<TARGET_OBJECTS:libgama>)
++target_link_libraries(check_algorithms expat)
+
+ foreach(test ${INPUT_FILES})
+ add_test(NAME check_algorithms_${test}
+@@ -89,6 +91,7 @@
+ add_executable(check_xml_xml scripts/check_xml_xml.cpp
+ scripts/compare_xml_adjustment.h scripts/compare_xml_adjustment.cpp
+ $<TARGET_OBJECTS:libgama>)
++target_link_libraries(check_xml_xml expat)
+
+ set(RES ${RESULT_DIR}/gama-local-adjustment)
+
+@@ -113,6 +116,7 @@
+ add_executable(check_equivalents scripts/check_xyz.h
+ scripts/check_xyz.cpp scripts/check_equivalents.cpp
+ $<TARGET_OBJECTS:libgama>)
++target_link_libraries(check_equivalents expat)
+
+ set(EQUIVALENTS_TESTS
+ # CMake is weird with 2D arrays, so we apply this hack
+@@ -145,6 +149,7 @@
+ #
+ add_executable(check_xml_results scripts/check_xml_results.cpp
+ scripts/check_xyz.h scripts/check_xyz.cpp $<TARGET_OBJECTS:libgama>)
++target_link_libraries(check_xml_results expat)
+ foreach(test ${INPUT_FILES})
+ add_test(
+ NAME check_xml_results_${test}
+@@ -161,6 +166,7 @@
+ #
+ add_executable(check_externs scripts/check_externs.cpp
+ $<TARGET_OBJECTS:libgama>)
++target_link_libraries(check_externs expat)
+ add_test(NAME check_externs COMMAND check_externs
+ ${INPUT_DIR} ${RESULT_DIR}/gama-local-adjustment ${INPUT_FILES})
+
+--- qt-gama-qt-1-02/gama/tests/acord2/CMakeLists.txt.orig 2020-01-15 18:38:27.000000000 +0100
++++ qt-gama-qt-1-02/gama/tests/acord2/CMakeLists.txt 2020-12-06 06:59:21.418563562 +0100
+@@ -5,6 +5,7 @@
+ file(MAKE_DIRECTORY ${RESULT_DIR})
+
+ add_executable(a2g a2g-main.cpp a2g.cpp a2g.h $<TARGET_OBJECTS:libgama>)
++target_link_libraries(a2g expat)
+
+ set(A2G_FILES
+ angle-01.a2g
+@@ -25,6 +26,7 @@
+
+
+ add_executable(a2diff a2diff-main.cpp acord.cpp $<TARGET_OBJECTS:libgama>)
++target_link_libraries(a2diff expat)
+
+ set(A2DIFF_FILES
+ traverse-01-en-right.gkf
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gama-qt.git/commitdiff/66f2c3fdcb69150f336cb138a4e32c70539f7117
More information about the pld-cvs-commit
mailing list