commit 1f7af539ad561d7b1fd0df22a5ce7dbf2b9eab97
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Sat Dec 28 18:17:40 2024 +0100
- gama-qt updated to 2.08 for qt6, now as qgama
gama-cmake.patch | 11 ++++
gama-qt-system-expat.patch | 149 ---------------------------------------------
qgama-system-expat.patch | 19 ++++++
gama-qt.spec => qgama.spec | 65 +++++++++-----------
4 files changed, 60 insertions(+), 184 deletions(-)
---
diff --git a/gama-qt.spec b/qgama.spec
similarity index 53%
rename from gama-qt.spec
rename to qgama.spec
index 74d27ee..dbc2122 100644
--- a/gama-qt.spec
+++ b/qgama.spec
@@ -1,31 +1,30 @@
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.03
-%define fver %(echo %{version} | tr . -)
-%define gama_ver 2.13
-Release: 2
+Name: qgama
+Version: 2.08
+%define gama_ver 2.32
+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: 0bc18d72824037717582a75863965f66
+Source0: https://ftp.gnu.org/gnu/gama/qgama/%{name}-%{version}.tar.gz
+# Source0-md5: 79048fab55bcfabd6e55ff8a7266f253
Source1: https://ftp.gnu.org/gnu/gama/gama-%{gama_ver}.tar.gz
-# Source1-md5: bc0f6c70c10bd14663c7033d0a10085b
+# Source1-md5: 93c0b0b13ad802a71a40958f812b0e97
Patch0: %{name}-system-expat.patch
+Patch1: gama-cmake.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: Qt6Core-devel >= 6
+BuildRequires: Qt6Gui-devel >= 6
+BuildRequires: Qt6PrintSupport-devel >= 6
+BuildRequires: Qt6Sql-devel >= 6
+BuildRequires: Qt6Widgets-devel >= 6
+BuildRequires: cmake >= 3.18
BuildRequires: expat-devel
-BuildRequires: libstdc++-devel >= 6:5
-BuildRequires: qt5-build >= 5
-BuildRequires: sed >= 4.0
+BuildRequires: libstdc++-devel >= 6:7
+BuildRequires: qt6-build >= 6
BuildRequires: sqlite3-devel >= 3
-BuildRequires: yaml-cpp-devel
+# vendored in gama 2.32
+#BuildRequires: yaml-cpp-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -43,21 +42,16 @@ precyzyjnych pomiarach inżynierskich), gdzie nie można użyć
GPS-a
(Global Positioning System).
%prep
-%setup -q -n qt-gama-qt-%{fver} -a1
+%setup -q -n qt-qgama-%{version} -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
+%patch -P0 -p1
+%patch -P1 -p0
%build
-install -d build
-cd build
-%cmake ..
+%cmake -B build \
+ -DENABLE_EXPAT_1_1=OFF
-%{__make}
+%{__make} -C build
%install
rm -rf $RPM_BUILD_ROOT
@@ -66,15 +60,16 @@ rm -rf $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT
# already in gama
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/gama-{g3,local}
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/{compare-xyz,krumm2gama-local}
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/gama-{g3,local,local-gkf2yaml}
-# missing in make install
-install build/gama-q2 $RPM_BUILD_ROOT%{_bindir}
+# make install is broken
+install build/qgama $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
+%doc ChangeLog.md QuickStart.md README.md
+%attr(755,root,root) %{_bindir}/qgama
diff --git a/gama-cmake.patch b/gama-cmake.patch
new file mode 100644
index 0000000..91ca9af
--- /dev/null
+++ b/gama-cmake.patch
@@ -0,0 +1,11 @@
+--- gama/tests/CMakeLists.txt.orig 2024-12-28 15:10:45.278822339 +0100
++++ gama/tests/CMakeLists.txt 2024-12-28 15:10:48.092140432 +0100
+@@ -1,7 +1,7 @@
+ add_subdirectory(gama-local)
+ add_subdirectory(gama-local-deformation)
+
+-add_subdirectory(gama-g3)
++# add_subdirectory(gama-g3) missing CMakeLists.txt in dist
+ add_subdirectory(acord2)
+ add_subdirectory(krumm)
+
diff --git a/gama-qt-system-expat.patch b/gama-qt-system-expat.patch
deleted file mode 100644
index bb63514..0000000
--- a/gama-qt-system-expat.patch
+++ /dev/null
@@ -1,149 +0,0 @@
---- qt-gama-qt-1-03/CMakeLists.txt.orig 2021-01-17 12:19:55.000000000
+0100
-+++ qt-gama-qt-1-03/CMakeLists.txt 2021-03-05 20:50:53.175869592 +0100
-@@ -39,7 +39,6 @@
- #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)
-@@ -113,6 +112,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-03/gama-2.13/CMakeLists.txt.orig 2021-01-12
17:34:01.000000000 +0100
-+++ qt-gama-qt-1-03/gama-2.13/CMakeLists.txt 2021-03-05 17:47:27.810728864
+0100
-@@ -5,7 +5,6 @@
- set(CMAKE_CXX_STANDARD 17)
- set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
--add_definitions(-DGNU_gama_expat_1_1)
- #add_definitions(-DDEBUG_ACORD2)
- #add_definitions(-DA2G_DEBUG)
-
-@@ -223,14 +222,6 @@
- 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
--)
--
- set(SRC_YAMLCPP
- lib/yaml-cpp/src/binary.cpp
- lib/yaml-cpp/src/collectionstack.h
-@@ -284,16 +275,20 @@
- lib/yaml-cpp/src/token.h
- )
-
--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>)
--add_executable(gama-g3 bin/gama-g3.cpp $<TARGET_OBJECTS:libgama>)
-+add_executable(gama-local bin/gama-local.cpp)
-+target_link_libraries(gama-local libgama)
-+add_executable(gama-g3 bin/gama-g3.cpp)
-+target_link_libraries(gama-g3 libgama)
-
- add_executable(gama-local-gkf2yaml bin/gama-local-gkf2yaml.cpp
-- lib/gnu_gama/local/gkf2yaml.cpp $<TARGET_OBJECTS:libgama>)
-+ lib/gnu_gama/local/gkf2yaml.cpp)
-+target_link_libraries(gama-local-gkf2yaml libgama)
-
- if (EXISTS ${CMAKE_SOURCE_DIR}/lib/yaml-cpp)
- include_directories(lib/yaml-cpp/include)
---- qt-gama-qt-1-03/gama/tests/gama-local/CMakeLists.txt.orig 2020-12-28
15:47:59.000000000 +0100
-+++ qt-gama-qt-1-03/gama/tests/gama-local/CMakeLists.txt 2021-03-05
18:02:49.479069092 +0100
-@@ -40,7 +40,8 @@
- # check version
- #
- add_executable(check_version src/check_version.cpp
-- $<TARGET_OBJECTS:libgama>)
-+)
-+target_link_libraries(check_version libgama)
- add_test(NAME check_version COMMAND check_version
- ${PROJECT_SOURCE_DIR}/configure.ac ${PROJECT_SOURCE_DIR}/CMakeLists.txt)
-
-@@ -74,7 +74,8 @@
- # check_algorithms
- #
- add_executable(check_algorithms src/check_xyz.h src/check_xyz.cpp
-- src/check_algorithms.cpp $<TARGET_OBJECTS:libgama>)
-+ src/check_algorithms.cpp)
-+target_link_libraries(check_algorithms libgama)
-
- foreach(test ${INPUT_FILES})
- add_test(NAME check_algorithms_${test}
-@@ -91,7 +91,8 @@
- #
- add_executable(check_xml_xml src/check_xml_xml.cpp
- src/compare_xml_adjustment.h src/compare_xml_adjustment.cpp
-- $<TARGET_OBJECTS:libgama>)
-+)
-+target_link_libraries(check_xml_xml libgama)
-
- set(RES ${RESULT_DIR}/gama-local-adjustment)
-
-@@ -116,7 +116,8 @@
- #
- add_executable(check_equivalents src/check_xyz.h
- src/check_xyz.cpp src/check_equivalents.cpp
-- $<TARGET_OBJECTS:libgama>)
-+)
-+target_link_libraries(check_equivalents libgama)
-
- set(EQUIVALENTS_TESTS
- # CMake is weird with 2D arrays, so we apply this hack
-@@ -149,7 +149,8 @@
- # check_xml_results
- #
- add_executable(check_xml_results src/check_xml_results.cpp
-- src/check_xyz.h src/check_xyz.cpp $<TARGET_OBJECTS:libgama>)
-+ src/check_xyz.h src/check_xyz.cpp)
-+target_link_libraries(check_xml_results libgama)
- foreach(test ${INPUT_FILES})
- add_test(
- NAME check_xml_results_${test}
-@@ -166,7 +166,8 @@
- # check externs
- #
- add_executable(check_externs src/check_externs.cpp
-- $<TARGET_OBJECTS:libgama>)
-+)
-+target_link_libraries(check_externs libgama)
- 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
diff --git a/qgama-system-expat.patch b/qgama-system-expat.patch
new file mode 100644
index 0000000..abf52a2
--- /dev/null
+++ b/qgama-system-expat.patch
@@ -0,0 +1,19 @@
+--- qt-qgama-2.08/CMakeLists.txt.orig 2024-11-15 12:18:06.000000000 +0100
++++ qt-qgama-2.08/CMakeLists.txt 2024-12-28 15:05:13.670618815 +0100
+@@ -107,7 +107,6 @@ endif() # end of CMAKE_PREFIX_PATH sett
+ message(" -- Qgama cmake build CMAKE_PREFIX_PATH: " ${CMAKE_PREFIX_PATH})
+
+
+-add_definitions(-DGNU_gama_expat_1_1) # if we use local copy of expat sources
+ include_directories(gama/lib qgama)
+
+ find_package(Qt6 COMPONENTS
+@@ -189,7 +188,7 @@ if (WIN32)
+ endif (WIN32)
+
+ target_link_libraries(qgama PRIVATE
+- Qt6::Widgets Qt6::Sql Qt6::PrintSupport Qt6::SvgWidgets)
++ Qt6::Widgets Qt6::Sql Qt6::PrintSupport Qt6::SvgWidgets expat)
+
+ # Building with plugins by default. If you don't want to build plugins,
+ # use the following option to disable them
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qgama.git/commitdiff/1f7af539ad561d7b1fd0df22a5ce7dbf2b9eab97
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
