From ffd004c8ff5a9cbf422466544dc597f91fb1c082 Mon Sep 17 00:00:00 2001 From: Karol Kosek Date: Fri, 26 Feb 2021 21:06:21 +0100 Subject: [PATCH 1/3] New package: libQuotient-0.6.6 --- common/shlibs | 1 + srcpkgs/libQuotient-devel | 1 + srcpkgs/libQuotient/template | 25 +++++++++++++++++++++++++ 3 files changed, 27 insertions(+) create mode 120000 srcpkgs/libQuotient-devel create mode 100644 srcpkgs/libQuotient/template diff --git a/common/shlibs b/common/shlibs index 6815daac2265..b3a7f3ac5c82 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3551,6 +3551,7 @@ libgaminggearwidget.so.0 libgaminggear-0.15.1_1 libopkg.so.1 libopkg-0.4.4_2 libkodiplatform.so.19.0 kodi-platform-20180302_1 libQMatrixClient.so.0.5.3 libqmatrixclient-0.5.3.2_1 +libQuotient.so.0.6 libQuotient-0.6.6_1 libipset.so.13 libipset-7.9_1 libmp3splt.so.0 libmp3splt-0.9.2_1 libliquid.so.1 liquid-dsp-1.3.1_1 diff --git a/srcpkgs/libQuotient-devel b/srcpkgs/libQuotient-devel new file mode 120000 index 000000000000..b4566ff0d5b9 --- /dev/null +++ b/srcpkgs/libQuotient-devel @@ -0,0 +1 @@ +libQuotient \ No newline at end of file diff --git a/srcpkgs/libQuotient/template b/srcpkgs/libQuotient/template new file mode 100644 index 000000000000..effd8dca3de2 --- /dev/null +++ b/srcpkgs/libQuotient/template @@ -0,0 +1,25 @@ +# Template file for 'libQuotient' +pkgname=libQuotient +version=0.6.6 +revision=1 +build_style=cmake +configure_args="-DBUILD_SHARED_LIBS=1 -DQuotient_INSTALL_TESTS=0" +hostmakedepends="qt5-qmake qt5-host-tools" +makedepends="qt5-devel qt5-multimedia-devel" +short_desc="Qt5 library to write cross-platform clients for Matrix" +maintainer="Karol Kosek " +license="LGPL-2.1-or-later" +homepage="https://matrix.org/docs/projects/sdk/quotient" +distfiles="https://github.com/quotient-im/libQuotient/archive/${version}.tar.gz" +checksum=33d3da5a7045bbe2611dd73104279986dd8356b24de339dd10874c1a9417bba7 + +libQuotient-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/lib/cmake + vmove "usr/lib/*.so" + } +} From 5e3c206463f2cbab50eb9f2e17e98ce1cb5d61f6 Mon Sep 17 00:00:00 2001 From: Karol Kosek Date: Fri, 26 Feb 2021 21:07:41 +0100 Subject: [PATCH 2/3] Quaternion: update to 0.0.95.beta5. --- srcpkgs/Quaternion/template | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/srcpkgs/Quaternion/template b/srcpkgs/Quaternion/template index 47f72d33f243..e77415eec606 100644 --- a/srcpkgs/Quaternion/template +++ b/srcpkgs/Quaternion/template @@ -1,19 +1,21 @@ # Template file for 'Quaternion' pkgname=Quaternion -version=0.0.9.4e +version=0.0.95.beta5 revision=1 +_gitversion=0.0.95-beta5 +wrksrc="Quaternion-${_gitversion}" build_style=cmake hostmakedepends="qt5-qmake qt5-host-tools" makedepends="qt5-declarative-devel qt5-quickcontrols qt5-tools-devel - qt5-multimedia-devel libqmatrixclient-devel + qt5-multimedia-devel qt5-quickcontrols2-devel libQuotient-devel $(vopt_if qtkeychain qtkeychain-qt5-devel)" -depends="qt5-quickcontrols" +depends="qt5-quickcontrols qt5-graphicaleffects" short_desc="Qt5-based IM client for the Matrix protocol" maintainer="Julio Galvan " license="GPL-3.0-or-later" homepage="https://github.com/quotient-im/Quaternion" -distfiles="https://github.com/quotient-im/Quaternion/archive/${version}.tar.gz" -checksum=7c04f62f6420af87c1df9e5e7f01250a1f4da33c9627e5f6e7f772e2f62864f0 +distfiles="https://github.com/quotient-im/Quaternion/archive/${_gitversion}.tar.gz" +checksum=8a8e469df29622af7c61fe501068dd6ff26bd02bf8a12096d3f9ebbb0179e82b build_options="qtkeychain" build_options_default="qtkeychain" From b86d6a6aeaacb350d3746d943acebc01116aef09 Mon Sep 17 00:00:00 2001 From: Karol Kosek Date: Fri, 26 Feb 2021 21:14:13 +0100 Subject: [PATCH 3/3] libqmatrixclient: remove package. The package was only used for Quaternion<=0.0.9.4, but since the newer versions use an API under a new name -- libQuotient, it can be removed. --- common/shlibs | 1 - srcpkgs/libqmatrixclient-devel | 1 - srcpkgs/libqmatrixclient/template | 26 -------------------------- 3 files changed, 28 deletions(-) delete mode 120000 srcpkgs/libqmatrixclient-devel delete mode 100644 srcpkgs/libqmatrixclient/template diff --git a/common/shlibs b/common/shlibs index b3a7f3ac5c82..9279e2c2585c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3550,7 +3550,6 @@ libgaminggearfx.so.0 libgaminggear-0.15.1_1 libgaminggearwidget.so.0 libgaminggear-0.15.1_1 libopkg.so.1 libopkg-0.4.4_2 libkodiplatform.so.19.0 kodi-platform-20180302_1 -libQMatrixClient.so.0.5.3 libqmatrixclient-0.5.3.2_1 libQuotient.so.0.6 libQuotient-0.6.6_1 libipset.so.13 libipset-7.9_1 libmp3splt.so.0 libmp3splt-0.9.2_1 diff --git a/srcpkgs/libqmatrixclient-devel b/srcpkgs/libqmatrixclient-devel deleted file mode 120000 index 101819602ce8..000000000000 --- a/srcpkgs/libqmatrixclient-devel +++ /dev/null @@ -1 +0,0 @@ -libqmatrixclient \ No newline at end of file diff --git a/srcpkgs/libqmatrixclient/template b/srcpkgs/libqmatrixclient/template deleted file mode 100644 index 8e6d8e4d7c86..000000000000 --- a/srcpkgs/libqmatrixclient/template +++ /dev/null @@ -1,26 +0,0 @@ -# Template file for 'libqmatrixclient' -pkgname=libqmatrixclient -version=0.5.3.2 -revision=1 -wrksrc="libQuotient-${version}" -build_style=cmake -configure_args="-DBUILD_SHARED_LIBS=1 -DQMATRIXCLIENT_INSTALL_EXAMPLE=0" -hostmakedepends="qt5-qmake qt5-host-tools" -makedepends="qt5-devel qt5-multimedia-devel" -short_desc="Qt5 library to write cross-platform clients for Matrix" -maintainer="Karol Kosek " -license="LGPL-2.1-or-later" -homepage="https://matrix.org/docs/projects/sdk/quotient" -distfiles="https://github.com/quotient-im/libQuotient/archive/${version}.tar.gz" -checksum=80f7dac61a38c7d3441b6af693d40373fd817974b970c9b0edcb761aca2bf7d9 - -libqmatrixclient-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove usr/lib/cmake - vmove "usr/lib/*.so" - } -}