From 1d5960a9ec1bb7af30360a73357852937237dc15 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Wed, 23 Dec 2020 13:59:52 -0600 Subject: [PATCH 1/5] New package: neochat-1.0 --- srcpkgs/neochat/template | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 srcpkgs/neochat/template diff --git a/srcpkgs/neochat/template b/srcpkgs/neochat/template new file mode 100644 index 00000000000..359f85b26f5 --- /dev/null +++ b/srcpkgs/neochat/template @@ -0,0 +1,21 @@ +# Template file for 'neochat' +pkgname=neochat +version=1.0 +revision=1 +build_style=cmake +hostmakedepends="extra-cmake-modules gettext pkg-config qt5-qmake + qt5-host-tools kcoreaddons kconfig" +makedepends="cmark-devel qt5-declarative-devel qt5-devel qt5-multimedia-devel + qt5-quickcontrols2-devel qt5-svg-devel ki18n-devel kirigami2-devel + knotifications-devel kconfig-devel kcoreaddons-devel qtkeychain-qt5-devel + kdbusaddons-devel kquickimageeditor-devel libQuotient-devel" +short_desc="Client for matrix from KDE" +maintainer="Nathan Owens " +license="GPL-3.0-only, GPL-3.0-or-later, GPL-2.0-or-later, BSD-2-Clause" +homepage="https://apps.kde.org/en/neochat" +distfiles="${KDE_SITE}/neochat/$version/neochat-$version.tar.xz" +checksum=45231249f5af93d3cb56763a9aab1211f26916eedd7af732f9c945c58f8289c4 + +post_install() { + vlicense LICENSES/BSD-2-Clause.txt +} From 9ebd661d8686a0c408138d7cb6c5c8c7582fd775 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Wed, 23 Dec 2020 14:06:44 -0600 Subject: [PATCH 2/5] New package: kquickimageeditor-0.1.2 --- srcpkgs/kquickimageeditor-devel | 1 + .../patches/Remove-werror.patch | 20 ++++++++++++++ srcpkgs/kquickimageeditor/template | 26 +++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 120000 srcpkgs/kquickimageeditor-devel create mode 100644 srcpkgs/kquickimageeditor/patches/Remove-werror.patch create mode 100644 srcpkgs/kquickimageeditor/template diff --git a/srcpkgs/kquickimageeditor-devel b/srcpkgs/kquickimageeditor-devel new file mode 120000 index 00000000000..acc5eacd1d7 --- /dev/null +++ b/srcpkgs/kquickimageeditor-devel @@ -0,0 +1 @@ +kquickimageeditor \ No newline at end of file diff --git a/srcpkgs/kquickimageeditor/patches/Remove-werror.patch b/srcpkgs/kquickimageeditor/patches/Remove-werror.patch new file mode 100644 index 00000000000..05a658fb0ff --- /dev/null +++ b/srcpkgs/kquickimageeditor/patches/Remove-werror.patch @@ -0,0 +1,20 @@ +diff --git src/CMakeLists.txt src/CMakeLists.txt +Source: https://invent.kde.org/libraries/kquickimageeditor/-/commit/c79657496326c10f81cf80a8c9a0e55bc2ba2798 +Issue: https://invent.kde.org/libraries/kquickimageeditor/-/issues/1 +--- +index 301c05e5efe557970b528b14f9d9c46911b0f684..99b0a8731b5cdc32ee2ccc7b9490152a815ebaed 100644 +--- src/CMakeLists.txt ++++ src/CMakeLists.txt +@@ -33,12 +33,6 @@ add_library( + ${sources} ${pluginData} + ) + +-target_compile_options( +- kquickimageeditorplugin +- PRIVATE +- -Werror +-) +- + target_link_libraries( + kquickimageeditorplugin + PRIVATE diff --git a/srcpkgs/kquickimageeditor/template b/srcpkgs/kquickimageeditor/template new file mode 100644 index 00000000000..5e5e220badc --- /dev/null +++ b/srcpkgs/kquickimageeditor/template @@ -0,0 +1,26 @@ +# Template file for 'kquickimageeditor' +pkgname=kquickimageeditor +version=0.1.2 +revision=1 +build_style=cmake +hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools" +makedepends="qt5-declarative-devel" +short_desc="QML image editing components" +maintainer="Nathan Owens " +license="LGPL-2.1-or-later, BSD-2-Clause, CC0-1.0" +homepage="https://invent.kde.org/libraries/kquickimageeditor" +distfiles="${KDE_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=37d54981a1c7dbb48ca45a7df37b8871bf1751e4c0484eeaddc548804ee18a04 + +post_install() { + vlicense LICENSES/BSD-2-Clause.txt +} + +kquickimageeditor-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/lib/qt5/mkspecs + vmove usr/lib/cmake + } +} From c4d0792b4a70a6d1409a8e02cf4bb409f91560c0 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Wed, 23 Dec 2020 14:23:07 -0600 Subject: [PATCH 3/5] New package: libQuotient-0.6.2 --- common/shlibs | 1 + srcpkgs/libQuotient-devel | 1 + srcpkgs/libQuotient/template | 26 ++++++++++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 120000 srcpkgs/libQuotient-devel create mode 100644 srcpkgs/libQuotient/template diff --git a/common/shlibs b/common/shlibs index 1b69c8455fc..2d1b6344afd 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4040,3 +4040,4 @@ libndr-samba4.so samba-libs-4.13.2_1 libsmb-transport-samba4.so samba-libs-4.13.2_1 libutil-cmdline-samba4.so samba-libs-4.13.2_1 libwinbind-client-samba4.so samba-libs-4.13.2_1 +libQuotient.so.0.6 libQuotient-0.6.2_1 diff --git a/srcpkgs/libQuotient-devel b/srcpkgs/libQuotient-devel new file mode 120000 index 00000000000..b4566ff0d5b --- /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 00000000000..1862bcb8924 --- /dev/null +++ b/srcpkgs/libQuotient/template @@ -0,0 +1,26 @@ +# Template file for 'libQuotient' +pkgname=libQuotient +version=0.6.2 +revision=1 +build_style=cmake +configure_args="-DBUILD_SHARED_LIBS=1" +hostmakedepends="qt5-qmake qt5-host-tools" +makedepends="qt5-multimedia-devel" +short_desc="Qt library to write cross-platform Matrix clients" +maintainer="Nathan Owens " +license="LGPL-2.1-or-later" +homepage="https://matrix.org/docs/projects/sdk/quotient" +distfiles="https://github.com/quotient-im/libQuotient/archive/$version/$pkgname-$version.tar.gz" +checksum=afa9ee64327b9fdbf1d8514ec9b1374b797560b43315911211f723acf01ff317 +replaces="libqmatrixclient>=0.5.3.2_1" + +libQuotient-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + vmove usr/lib/cmake + vmove usr/lib/pkgconfig + } +} From 172b782f1297110f2e1f5f1b55b5cc68f02f724a Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Thu, 24 Dec 2020 16:54:13 -0600 Subject: [PATCH 4/5] libqmatrixclient: Remove should be named libQuotient --- srcpkgs/libqmatrixclient-devel | 1 - srcpkgs/libqmatrixclient/template | 26 -------------------------- 2 files changed, 27 deletions(-) delete mode 120000 srcpkgs/libqmatrixclient-devel delete mode 100644 srcpkgs/libqmatrixclient/template diff --git a/srcpkgs/libqmatrixclient-devel b/srcpkgs/libqmatrixclient-devel deleted file mode 120000 index 101819602ce..00000000000 --- 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 8e6d8e4d7c8..00000000000 --- 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" - } -} From 34b3a8a4406f307e02ccc69f822769ca9f876445 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Thu, 24 Dec 2020 16:56:21 -0600 Subject: [PATCH 5/5] Quaternion: change libqmatrixclient-devel to libQuotient-devel --- srcpkgs/Quaternion/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Quaternion/template b/srcpkgs/Quaternion/template index 47f72d33f24..24d81df771f 100644 --- a/srcpkgs/Quaternion/template +++ b/srcpkgs/Quaternion/template @@ -5,7 +5,7 @@ revision=1 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 libQuotient-devel $(vopt_if qtkeychain qtkeychain-qt5-devel)" depends="qt5-quickcontrols" short_desc="Qt5-based IM client for the Matrix protocol"