diff --git a/libQuotient-0.8.2.tar.gz b/libQuotient-0.8.2.tar.gz deleted file mode 100644 index 1124f2a..0000000 --- a/libQuotient-0.8.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12ff2fa8b80a934b9dd88fa3416a4b88e94bc0e18a8df0dcebfc90614dd2f5c9 -size 744095 diff --git a/libQuotient-0.9.0.tar.gz b/libQuotient-0.9.0.tar.gz new file mode 100644 index 0000000..211ac2b --- /dev/null +++ b/libQuotient-0.9.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e607eb978a5daa82e2186cd92f0d964cb820c72cfad95ed2adda4525ed923b5 +size 771510 diff --git a/libQuotient.changes b/libQuotient.changes index aaf266e..4fb76a3 100644 --- a/libQuotient.changes +++ b/libQuotient.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Mon Oct 28 09:02:30 UTC 2024 - Christophe Marin + +- Fix dependencies + +------------------------------------------------------------------- +Mon Oct 28 07:11:46 UTC 2024 - Christophe Marin + +- Update to 0.9.0 + * Qt 6 only + * cross-signing support (requires UI to match on the client + side; NeoChat already has it) + * Matrix 1.12 API + * completed separation of room member functionality previously + delivered by the User class, to a dedicated RoomMember class + * introduction of futures to replace signals for one-off + asynchronous calls, especially relevant for calls returning + job pointers + * refactoring of the event content API to make transition to + extensible events easier in the future +- Remove the default build flavor but keep the _multibuild setup +- Remove obsolete build options + ------------------------------------------------------------------- Wed Apr 24 08:40:39 UTC 2024 - Christopher Hock diff --git a/libQuotient.spec b/libQuotient.spec index 6fbb092..754679c 100644 --- a/libQuotient.spec +++ b/libQuotient.spec @@ -21,54 +21,38 @@ %define qt6 1 %define pkg_suffix -qt6 %define lib_suffix Qt6 +%define qt6_version 6.4 +%else +ExclusiveArch: do_not_build %endif -%define soversion 0_8 -%define sonum 0.8 +%define soversion 0_9 +%define sonum 0.9 %define rname libQuotient -%bcond_without e2ee Name: libQuotient%{?pkg_suffix} -Version: 0.8.2 +Version: 0.9.0 Release: 0 Summary: Library for Qt Matrix Clients License: LGPL-2.1-only Group: Development/Libraries/C and C++ URL: https://github.com/quotient-im/libQuotient Source0: https://github.com/quotient-im/%{rname}/archive/%{version}/%{rname}-%{version}.tar.gz -BuildRequires: cmake -# c++-20 required -%if 0%{?suse_version} < 1550 -BuildRequires: gcc12-PIE -BuildRequires: gcc12-c++ -%endif +BuildRequires: cmake >= 3.26 BuildRequires: pkgconfig %if 0%{?qt6} -BuildRequires: qt6-sql-sqlite -BuildRequires: cmake(Qt6Concurrent) -BuildRequires: cmake(Qt6Core) -BuildRequires: cmake(Qt6Gui) +BuildRequires: qt6-core-private-devel >= %{qt6_version} +BuildRequires: qt6-sql-sqlite >= %{qt6_version} +BuildRequires: cmake(Qt6Concurrent) >= %{qt6_version} +BuildRequires: cmake(Qt6Core) >= %{qt6_version} +BuildRequires: cmake(Qt6Gui) >= %{qt6_version} BuildRequires: cmake(Qt6Keychain) -BuildRequires: cmake(Qt6Network) -BuildRequires: cmake(Qt6Test) -%else -BuildRequires: cmake(Qt5Concurrent) -BuildRequires: cmake(Qt5Core) >= 5.5 -BuildRequires: cmake(Qt5DBus) -BuildRequires: cmake(Qt5Gui) -BuildRequires: cmake(Qt5Keychain) -BuildRequires: cmake(Qt5Multimedia) -BuildRequires: cmake(Qt5Network) -BuildRequires: cmake(Qt5Test) +BuildRequires: cmake(Qt6Network) >= %{qt6_version} +BuildRequires: cmake(Qt6Test) >= %{qt6_version} %endif -%if %{with e2ee} BuildRequires: cmake(Olm) >= 3.2.5 BuildRequires: pkgconfig(openssl) %if 0%{?qt6} -BuildRequires: cmake(Qt6Sql) -Requires: qt6-sql-sqlite -%else -BuildRequires: cmake(Qt5Sql) -Requires: libQt5Sql5-sqlite -%endif +BuildRequires: cmake(Qt6Sql) >= %{qt6_version} +Requires: qt6-sql-sqlite >= %{qt6_version} %endif %description @@ -88,20 +72,10 @@ Summary: Development files for libQuotient Group: Development/Libraries/C and C++ Requires: libQuotient%{?qt6:%{lib_suffix}-}%{soversion} = %{version} %if 0%{?qt6} -Requires: cmake(Qt6Gui) -Requires: cmake(Qt6Network) -%if %{with e2ee} -Requires: cmake(Qt6Sql) -%endif +Requires: cmake(Qt6Gui) >= %{qt6_version} +Requires: cmake(Qt6Network) >= %{qt6_version} +Requires: cmake(Qt6Sql) >= %{qt6_version} Requires: cmake(Qt6Keychain) -%else -Requires: cmake(Qt5Gui) -Requires: cmake(Qt5Multimedia) -Requires: cmake(Qt5Network) -%if %{with e2ee} -Requires: cmake(Qt5Sql) -%endif -Requires: cmake(Qt5Keychain) %endif Requires: cmake(Olm) Requires: pkgconfig(openssl) @@ -118,39 +92,19 @@ developing applications that use libQuotient. %autosetup -p1 -n %{rname}-%{version} %build -%if 0%{?suse_version} < 1550 - export CXX=g++-12 -%endif - %if 0%{?qt6} %cmake_qt6 \ - -DBUILD_WITH_QT6=ON \ -DBUILD_SHARED_LIBS=ON \ -%if 0%{?suse_version} < 1550 - -DCMAKE_C_COMPILER:STRING=gcc-12 \ - -DCMAKE_CXX_COMPILER:STRING=g++-12 \ -%endif -%else -%cmake \ -%endif - -DQuotient_INSTALL_TESTS=OFF \ -%if %{with e2ee} - -DQuotient_ENABLE_E2EE=ON -%else - -DQuotient_ENABLE_E2EE=OFF %endif + -DQuotient_INSTALL_TESTS=OFF %if 0%{?qt6} %qt6_build -%else -%cmake_build %endif %install %if 0%{?qt6} %qt6_install -%else -%cmake_install %endif # Not useful