From: ndowens <ndowens@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: neochat-1.0
Date: Fri, 25 Dec 2020 02:18:15 +0100 [thread overview]
Message-ID: <20201225011815.GkXlz-D4RSFuQI8KY6Zt9jwSmD1G0pEfkCs78SZX6Y4@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27385@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 546 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages neochat
https://github.com/void-linux/void-packages/pull/27385
New package: neochat-1.0
libQuotient was renamed from libqmatrixclient. The current version of Quaternion looks for libqmatrixclient. Once new version of Quaternion is released we can remove libqmatrixclient. So add conflict with libqmatrixclient until then
A patch file from https://github.com/void-linux/void-packages/pull/27385.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-neochat-27385.patch --]
[-- Type: text/x-diff, Size: 6439 bytes --]
From 1d5960a9ec1bb7af30360a73357852937237dc15 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Wed, 23 Dec 2020 13:59:52 -0600
Subject: [PATCH 1/3] 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 <ndowens@artixlinux.org>"
+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 <ndowens@artixlinux.org>
Date: Wed, 23 Dec 2020 14:06:44 -0600
Subject: [PATCH 2/3] 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 <ndowens@artixlinux.org>"
+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 8051b8a7ae6b4bcf170c541dc8e8c0f6f201d67b Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Wed, 23 Dec 2020 14:23:07 -0600
Subject: [PATCH 3/3] New package: libQuotient-0.6.2
---
common/shlibs | 1 +
srcpkgs/libQuotient-devel | 1 +
srcpkgs/libQuotient/template | 29 +++++++++++++++++++++++++++++
3 files changed, 31 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..c719ad46f9a
--- /dev/null
+++ b/srcpkgs/libQuotient/template
@@ -0,0 +1,29 @@
+# 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 <ndowens@artixlinux.org>"
+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
+# libqmatrixclient was the old name,
+# until we can fully remove after
+# Quaternion has a new release
+conflicts="libqmatrixclient>=0"
+
+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
+ }
+}
next prev parent reply other threads:[~2020-12-25 1:18 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-23 20:59 [PR PATCH] " ndowens
2020-12-23 21:42 ` ndowens
2020-12-23 21:46 ` ndowens
2020-12-23 22:00 ` [PR PATCH] [Updated] " ndowens
2020-12-23 22:00 ` ndowens
2020-12-23 22:09 ` [PR PATCH] [Updated] " ndowens
2020-12-23 23:08 ` ndowens
2020-12-23 23:20 ` ndowens
2020-12-24 22:55 ` ndowens
2020-12-24 23:18 ` ndowens
2020-12-25 1:16 ` ndowens
2020-12-25 1:18 ` ndowens [this message]
2021-04-01 16:29 ` Justinizer
2021-04-01 16:32 ` Justinizer
2021-04-01 16:35 ` Justinizer
2021-04-01 17:18 ` Justinizer
2021-04-02 7:42 ` Justinizer
2021-04-02 7:42 ` Justinizer
2021-04-11 19:26 ` ndowens
2021-04-11 19:26 ` [PR PATCH] [Closed]: " ndowens
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201225011815.GkXlz-D4RSFuQI8KY6Zt9jwSmD1G0pEfkCs78SZX6Y4@z \
--to=ndowens@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).