* [PR PATCH] jreen: switch to qt5 and drop jreen-qt5 package
@ 2019-09-17 13:22 voidlinux-github
2019-09-17 13:23 ` [PR PATCH] [Updated] " voidlinux-github
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: voidlinux-github @ 2019-09-17 13:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 342 bytes --]
There is a new pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages jreen
https://github.com/void-linux/void-packages/pull/14521
jreen: switch to qt5 and drop jreen-qt5 package
None
A patch file from https://github.com/void-linux/void-packages/pull/14521.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-jreen-14521.patch --]
[-- Type: text/x-diff, Size: 4540 bytes --]
From 325773d5178db3c901d2ef2b832bbf3a7b33369d Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 15:20:46 +0200
Subject: [PATCH] jreen: switch to qt5 and drop jreen-qt5 package
---
common/shlibs | 3 +--
srcpkgs/jreen-qt5 | 1 +
srcpkgs/jreen-qt5-devel | 2 +-
srcpkgs/jreen-qt5/template | 28 ----------------------------
srcpkgs/jreen/template | 35 +++++++++++++++++++++++++----------
5 files changed, 28 insertions(+), 41 deletions(-)
create mode 120000 srcpkgs/jreen-qt5
delete mode 100644 srcpkgs/jreen-qt5/template
diff --git a/common/shlibs b/common/shlibs
index d15941dce29..20525edd15e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1997,7 +1997,6 @@ libasignify.so.1 asignify-1.0_1
libvte2_90.so.9 vte290-0.36.3_1
libd0_blind_id.so.0 xonotic-0.8.0_1
libechonest.so.2.3 libechonest-2.3.1_1
-libjreen.so.1 jreen-1.2.1_1
libuecc.so.0 libuecc-5_1
libKF5WindowSystem.so.5 kwindowsystem-5.6.0_1
libKF5GuiAddons.so.5 kguiaddons-5.6.0_1
@@ -2078,7 +2077,7 @@ libechonest5.so.2.3 libechonest-qt5-2.3.0_1
liblastfm_fingerprint5.so.1 liblastfm-qt5-1.0.9_1
liblastfm5.so.1 liblastfm-qt5-1.0.9_1
libquazip5.so.1 quazip-0.7.3_2
-libjreen-qt5.so.1 jreen-qt5-1.2.0_1
+libjreen-qt5.so.1 jreen-1.3.0_1
libzen.so.0 libzen-0.4.31_1
libmediainfo.so.0 libmediainfo-0.7.75_1
libnghttp2.so.14 nghttp2-1.0.2_1
diff --git a/srcpkgs/jreen-qt5 b/srcpkgs/jreen-qt5
new file mode 120000
index 00000000000..adda684e0c9
--- /dev/null
+++ b/srcpkgs/jreen-qt5
@@ -0,0 +1 @@
+jreen
\ No newline at end of file
diff --git a/srcpkgs/jreen-qt5-devel b/srcpkgs/jreen-qt5-devel
index 9aff5c71925..adda684e0c9 120000
--- a/srcpkgs/jreen-qt5-devel
+++ b/srcpkgs/jreen-qt5-devel
@@ -1 +1 @@
-jreen-qt5
\ No newline at end of file
+jreen
\ No newline at end of file
diff --git a/srcpkgs/jreen-qt5/template b/srcpkgs/jreen-qt5/template
deleted file mode 100644
index 92f3aa73b09..00000000000
--- a/srcpkgs/jreen-qt5/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'jreen'
-pkgname=jreen-qt5
-version=1.3.0
-revision=1
-wrksrc="${pkgname%-*}-${version}"
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="gsasl-devel speex-devel qt5-devel zlib-devel"
-short_desc="Qt5 Jabber/XMPP extensible library"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="LGPL-3"
-homepage="https://github.com/euroelessar/jreen"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f93c3d338c011c0945dacb14eb9da3be9541028c9eaa6f2024e688eb8a49b07e
-
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
-
-jreen-qt5-devel_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/*.so
- vmove usr/lib/pkgconfig
- }
-}
diff --git a/srcpkgs/jreen/template b/srcpkgs/jreen/template
index 61fbb204312..84448cca4ed 100644
--- a/srcpkgs/jreen/template
+++ b/srcpkgs/jreen/template
@@ -1,20 +1,23 @@
# Template file for 'jreen'
pkgname=jreen
-version=1.2.1
+version=1.3.0
revision=1
build_style=cmake
-configure_args="-DJREEN_FORCE_QT4=yes"
hostmakedepends="pkg-config"
-makedepends="gsasl-devel speex-devel qt-devel zlib-devel"
-short_desc="Extensible XMPP library written in C++ using Qt"
-maintainer="Duncan Overbruck <mail@duncano.de>"
-license="GPL-2"
-homepage="http://qutim.org/jreen"
-distfiles="http://github.com/euroelessar/${pkgname}/archive/v${version}.tar.gz"
-checksum=be5de04b6f54e47bdec92707600441a39e46add958181ad2b5b2d1bf92693fbd
+makedepends="gsasl-devel speex-devel qt5-devel zlib-devel"
+short_desc="Qt5 Jabber/XMPP extensible library"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/euroelessar/jreen"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=f93c3d338c011c0945dacb14eb9da3be9541028c9eaa6f2024e688eb8a49b07e
+
+if [ -n "$CROSS_BUILD" ]; then
+ hostmakedepends+=" qt5-host-tools qt5-devel"
+fi
jreen-devel_package() {
- depends="jreen>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -22,3 +25,15 @@ jreen-devel_package() {
vmove usr/lib/pkgconfig
}
}
+
+jreen-qt5_package() {
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+ depends="${sourcepkg}>=${version}_${revision}"
+}
+
+jreen-qt5-devel_package() {
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+ depends="jreen-devel>=${version}_${revision}"
+}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] jreen: switch to qt5 and drop jreen-qt5 package
2019-09-17 13:22 [PR PATCH] jreen: switch to qt5 and drop jreen-qt5 package voidlinux-github
2019-09-17 13:23 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-09-17 13:23 ` voidlinux-github
2019-09-17 13:31 ` voidlinux-github
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-09-17 13:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 347 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages jreen
https://github.com/void-linux/void-packages/pull/14521
jreen: switch to qt5 and drop jreen-qt5 package
None
A patch file from https://github.com/void-linux/void-packages/pull/14521.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-jreen-14521.patch --]
[-- Type: text/x-diff, Size: 4554 bytes --]
From 491586b9d09f7d5eccb5a3f4e22c25af4ca3bc70 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 15:20:46 +0200
Subject: [PATCH] jreen: switch to qt5 and drop jreen-qt5 package
---
common/shlibs | 3 +--
srcpkgs/jreen-qt5 | 1 +
srcpkgs/jreen-qt5-devel | 2 +-
srcpkgs/jreen-qt5/template | 28 ----------------------------
srcpkgs/jreen/template | 37 ++++++++++++++++++++++++++-----------
5 files changed, 29 insertions(+), 42 deletions(-)
create mode 120000 srcpkgs/jreen-qt5
delete mode 100644 srcpkgs/jreen-qt5/template
diff --git a/common/shlibs b/common/shlibs
index d15941dce29..20525edd15e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1997,7 +1997,6 @@ libasignify.so.1 asignify-1.0_1
libvte2_90.so.9 vte290-0.36.3_1
libd0_blind_id.so.0 xonotic-0.8.0_1
libechonest.so.2.3 libechonest-2.3.1_1
-libjreen.so.1 jreen-1.2.1_1
libuecc.so.0 libuecc-5_1
libKF5WindowSystem.so.5 kwindowsystem-5.6.0_1
libKF5GuiAddons.so.5 kguiaddons-5.6.0_1
@@ -2078,7 +2077,7 @@ libechonest5.so.2.3 libechonest-qt5-2.3.0_1
liblastfm_fingerprint5.so.1 liblastfm-qt5-1.0.9_1
liblastfm5.so.1 liblastfm-qt5-1.0.9_1
libquazip5.so.1 quazip-0.7.3_2
-libjreen-qt5.so.1 jreen-qt5-1.2.0_1
+libjreen-qt5.so.1 jreen-1.3.0_1
libzen.so.0 libzen-0.4.31_1
libmediainfo.so.0 libmediainfo-0.7.75_1
libnghttp2.so.14 nghttp2-1.0.2_1
diff --git a/srcpkgs/jreen-qt5 b/srcpkgs/jreen-qt5
new file mode 120000
index 00000000000..adda684e0c9
--- /dev/null
+++ b/srcpkgs/jreen-qt5
@@ -0,0 +1 @@
+jreen
\ No newline at end of file
diff --git a/srcpkgs/jreen-qt5-devel b/srcpkgs/jreen-qt5-devel
index 9aff5c71925..adda684e0c9 120000
--- a/srcpkgs/jreen-qt5-devel
+++ b/srcpkgs/jreen-qt5-devel
@@ -1 +1 @@
-jreen-qt5
\ No newline at end of file
+jreen
\ No newline at end of file
diff --git a/srcpkgs/jreen-qt5/template b/srcpkgs/jreen-qt5/template
deleted file mode 100644
index 92f3aa73b09..00000000000
--- a/srcpkgs/jreen-qt5/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'jreen'
-pkgname=jreen-qt5
-version=1.3.0
-revision=1
-wrksrc="${pkgname%-*}-${version}"
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="gsasl-devel speex-devel qt5-devel zlib-devel"
-short_desc="Qt5 Jabber/XMPP extensible library"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="LGPL-3"
-homepage="https://github.com/euroelessar/jreen"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f93c3d338c011c0945dacb14eb9da3be9541028c9eaa6f2024e688eb8a49b07e
-
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
-
-jreen-qt5-devel_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/*.so
- vmove usr/lib/pkgconfig
- }
-}
diff --git a/srcpkgs/jreen/template b/srcpkgs/jreen/template
index 61fbb204312..f23ba291354 100644
--- a/srcpkgs/jreen/template
+++ b/srcpkgs/jreen/template
@@ -1,20 +1,23 @@
# Template file for 'jreen'
pkgname=jreen
-version=1.2.1
-revision=1
+version=1.3.0
+revision=2
build_style=cmake
-configure_args="-DJREEN_FORCE_QT4=yes"
hostmakedepends="pkg-config"
-makedepends="gsasl-devel speex-devel qt-devel zlib-devel"
-short_desc="Extensible XMPP library written in C++ using Qt"
-maintainer="Duncan Overbruck <mail@duncano.de>"
-license="GPL-2"
-homepage="http://qutim.org/jreen"
-distfiles="http://github.com/euroelessar/${pkgname}/archive/v${version}.tar.gz"
-checksum=be5de04b6f54e47bdec92707600441a39e46add958181ad2b5b2d1bf92693fbd
+makedepends="gsasl-devel speex-devel qt5-devel zlib-devel"
+short_desc="Qt5 Jabber/XMPP extensible library"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/euroelessar/jreen"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=f93c3d338c011c0945dacb14eb9da3be9541028c9eaa6f2024e688eb8a49b07e
+
+if [ -n "$CROSS_BUILD" ]; then
+ hostmakedepends+=" qt5-host-tools qt5-devel"
+fi
jreen-devel_package() {
- depends="jreen>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -22,3 +25,15 @@ jreen-devel_package() {
vmove usr/lib/pkgconfig
}
}
+
+jreen-qt5_package() {
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+ depends="${sourcepkg}>=${version}_${revision}"
+}
+
+jreen-qt5-devel_package() {
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+ depends="jreen-devel>=${version}_${revision}"
+}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] jreen: switch to qt5 and drop jreen-qt5 package
2019-09-17 13:22 [PR PATCH] jreen: switch to qt5 and drop jreen-qt5 package voidlinux-github
@ 2019-09-17 13:23 ` voidlinux-github
2019-09-17 13:23 ` voidlinux-github
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-09-17 13:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 347 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages jreen
https://github.com/void-linux/void-packages/pull/14521
jreen: switch to qt5 and drop jreen-qt5 package
None
A patch file from https://github.com/void-linux/void-packages/pull/14521.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-jreen-14521.patch --]
[-- Type: text/x-diff, Size: 4554 bytes --]
From 491586b9d09f7d5eccb5a3f4e22c25af4ca3bc70 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 15:20:46 +0200
Subject: [PATCH] jreen: switch to qt5 and drop jreen-qt5 package
---
common/shlibs | 3 +--
srcpkgs/jreen-qt5 | 1 +
srcpkgs/jreen-qt5-devel | 2 +-
srcpkgs/jreen-qt5/template | 28 ----------------------------
srcpkgs/jreen/template | 37 ++++++++++++++++++++++++++-----------
5 files changed, 29 insertions(+), 42 deletions(-)
create mode 120000 srcpkgs/jreen-qt5
delete mode 100644 srcpkgs/jreen-qt5/template
diff --git a/common/shlibs b/common/shlibs
index d15941dce29..20525edd15e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1997,7 +1997,6 @@ libasignify.so.1 asignify-1.0_1
libvte2_90.so.9 vte290-0.36.3_1
libd0_blind_id.so.0 xonotic-0.8.0_1
libechonest.so.2.3 libechonest-2.3.1_1
-libjreen.so.1 jreen-1.2.1_1
libuecc.so.0 libuecc-5_1
libKF5WindowSystem.so.5 kwindowsystem-5.6.0_1
libKF5GuiAddons.so.5 kguiaddons-5.6.0_1
@@ -2078,7 +2077,7 @@ libechonest5.so.2.3 libechonest-qt5-2.3.0_1
liblastfm_fingerprint5.so.1 liblastfm-qt5-1.0.9_1
liblastfm5.so.1 liblastfm-qt5-1.0.9_1
libquazip5.so.1 quazip-0.7.3_2
-libjreen-qt5.so.1 jreen-qt5-1.2.0_1
+libjreen-qt5.so.1 jreen-1.3.0_1
libzen.so.0 libzen-0.4.31_1
libmediainfo.so.0 libmediainfo-0.7.75_1
libnghttp2.so.14 nghttp2-1.0.2_1
diff --git a/srcpkgs/jreen-qt5 b/srcpkgs/jreen-qt5
new file mode 120000
index 00000000000..adda684e0c9
--- /dev/null
+++ b/srcpkgs/jreen-qt5
@@ -0,0 +1 @@
+jreen
\ No newline at end of file
diff --git a/srcpkgs/jreen-qt5-devel b/srcpkgs/jreen-qt5-devel
index 9aff5c71925..adda684e0c9 120000
--- a/srcpkgs/jreen-qt5-devel
+++ b/srcpkgs/jreen-qt5-devel
@@ -1 +1 @@
-jreen-qt5
\ No newline at end of file
+jreen
\ No newline at end of file
diff --git a/srcpkgs/jreen-qt5/template b/srcpkgs/jreen-qt5/template
deleted file mode 100644
index 92f3aa73b09..00000000000
--- a/srcpkgs/jreen-qt5/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'jreen'
-pkgname=jreen-qt5
-version=1.3.0
-revision=1
-wrksrc="${pkgname%-*}-${version}"
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="gsasl-devel speex-devel qt5-devel zlib-devel"
-short_desc="Qt5 Jabber/XMPP extensible library"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="LGPL-3"
-homepage="https://github.com/euroelessar/jreen"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f93c3d338c011c0945dacb14eb9da3be9541028c9eaa6f2024e688eb8a49b07e
-
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
-
-jreen-qt5-devel_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/*.so
- vmove usr/lib/pkgconfig
- }
-}
diff --git a/srcpkgs/jreen/template b/srcpkgs/jreen/template
index 61fbb204312..f23ba291354 100644
--- a/srcpkgs/jreen/template
+++ b/srcpkgs/jreen/template
@@ -1,20 +1,23 @@
# Template file for 'jreen'
pkgname=jreen
-version=1.2.1
-revision=1
+version=1.3.0
+revision=2
build_style=cmake
-configure_args="-DJREEN_FORCE_QT4=yes"
hostmakedepends="pkg-config"
-makedepends="gsasl-devel speex-devel qt-devel zlib-devel"
-short_desc="Extensible XMPP library written in C++ using Qt"
-maintainer="Duncan Overbruck <mail@duncano.de>"
-license="GPL-2"
-homepage="http://qutim.org/jreen"
-distfiles="http://github.com/euroelessar/${pkgname}/archive/v${version}.tar.gz"
-checksum=be5de04b6f54e47bdec92707600441a39e46add958181ad2b5b2d1bf92693fbd
+makedepends="gsasl-devel speex-devel qt5-devel zlib-devel"
+short_desc="Qt5 Jabber/XMPP extensible library"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/euroelessar/jreen"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=f93c3d338c011c0945dacb14eb9da3be9541028c9eaa6f2024e688eb8a49b07e
+
+if [ -n "$CROSS_BUILD" ]; then
+ hostmakedepends+=" qt5-host-tools qt5-devel"
+fi
jreen-devel_package() {
- depends="jreen>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -22,3 +25,15 @@ jreen-devel_package() {
vmove usr/lib/pkgconfig
}
}
+
+jreen-qt5_package() {
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+ depends="${sourcepkg}>=${version}_${revision}"
+}
+
+jreen-qt5-devel_package() {
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+ depends="jreen-devel>=${version}_${revision}"
+}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] jreen: switch to qt5 and drop jreen-qt5 package
2019-09-17 13:22 [PR PATCH] jreen: switch to qt5 and drop jreen-qt5 package voidlinux-github
2019-09-17 13:23 ` [PR PATCH] [Updated] " voidlinux-github
2019-09-17 13:23 ` voidlinux-github
@ 2019-09-17 13:31 ` voidlinux-github
2019-09-17 13:31 ` voidlinux-github
2019-09-17 16:49 ` [PR PATCH] [Merged]: " voidlinux-github
4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-09-17 13:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 347 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages jreen
https://github.com/void-linux/void-packages/pull/14521
jreen: switch to qt5 and drop jreen-qt5 package
None
A patch file from https://github.com/void-linux/void-packages/pull/14521.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-jreen-14521.patch --]
[-- Type: text/x-diff, Size: 5811 bytes --]
From 491586b9d09f7d5eccb5a3f4e22c25af4ca3bc70 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 15:20:46 +0200
Subject: [PATCH 1/2] jreen: switch to qt5 and drop jreen-qt5 package
---
common/shlibs | 3 +--
srcpkgs/jreen-qt5 | 1 +
srcpkgs/jreen-qt5-devel | 2 +-
srcpkgs/jreen-qt5/template | 28 ----------------------------
srcpkgs/jreen/template | 37 ++++++++++++++++++++++++++-----------
5 files changed, 29 insertions(+), 42 deletions(-)
create mode 120000 srcpkgs/jreen-qt5
delete mode 100644 srcpkgs/jreen-qt5/template
diff --git a/common/shlibs b/common/shlibs
index d15941dce29..20525edd15e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1997,7 +1997,6 @@ libasignify.so.1 asignify-1.0_1
libvte2_90.so.9 vte290-0.36.3_1
libd0_blind_id.so.0 xonotic-0.8.0_1
libechonest.so.2.3 libechonest-2.3.1_1
-libjreen.so.1 jreen-1.2.1_1
libuecc.so.0 libuecc-5_1
libKF5WindowSystem.so.5 kwindowsystem-5.6.0_1
libKF5GuiAddons.so.5 kguiaddons-5.6.0_1
@@ -2078,7 +2077,7 @@ libechonest5.so.2.3 libechonest-qt5-2.3.0_1
liblastfm_fingerprint5.so.1 liblastfm-qt5-1.0.9_1
liblastfm5.so.1 liblastfm-qt5-1.0.9_1
libquazip5.so.1 quazip-0.7.3_2
-libjreen-qt5.so.1 jreen-qt5-1.2.0_1
+libjreen-qt5.so.1 jreen-1.3.0_1
libzen.so.0 libzen-0.4.31_1
libmediainfo.so.0 libmediainfo-0.7.75_1
libnghttp2.so.14 nghttp2-1.0.2_1
diff --git a/srcpkgs/jreen-qt5 b/srcpkgs/jreen-qt5
new file mode 120000
index 00000000000..adda684e0c9
--- /dev/null
+++ b/srcpkgs/jreen-qt5
@@ -0,0 +1 @@
+jreen
\ No newline at end of file
diff --git a/srcpkgs/jreen-qt5-devel b/srcpkgs/jreen-qt5-devel
index 9aff5c71925..adda684e0c9 120000
--- a/srcpkgs/jreen-qt5-devel
+++ b/srcpkgs/jreen-qt5-devel
@@ -1 +1 @@
-jreen-qt5
\ No newline at end of file
+jreen
\ No newline at end of file
diff --git a/srcpkgs/jreen-qt5/template b/srcpkgs/jreen-qt5/template
deleted file mode 100644
index 92f3aa73b09..00000000000
--- a/srcpkgs/jreen-qt5/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'jreen'
-pkgname=jreen-qt5
-version=1.3.0
-revision=1
-wrksrc="${pkgname%-*}-${version}"
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="gsasl-devel speex-devel qt5-devel zlib-devel"
-short_desc="Qt5 Jabber/XMPP extensible library"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="LGPL-3"
-homepage="https://github.com/euroelessar/jreen"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f93c3d338c011c0945dacb14eb9da3be9541028c9eaa6f2024e688eb8a49b07e
-
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
-
-jreen-qt5-devel_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/*.so
- vmove usr/lib/pkgconfig
- }
-}
diff --git a/srcpkgs/jreen/template b/srcpkgs/jreen/template
index 61fbb204312..f23ba291354 100644
--- a/srcpkgs/jreen/template
+++ b/srcpkgs/jreen/template
@@ -1,20 +1,23 @@
# Template file for 'jreen'
pkgname=jreen
-version=1.2.1
-revision=1
+version=1.3.0
+revision=2
build_style=cmake
-configure_args="-DJREEN_FORCE_QT4=yes"
hostmakedepends="pkg-config"
-makedepends="gsasl-devel speex-devel qt-devel zlib-devel"
-short_desc="Extensible XMPP library written in C++ using Qt"
-maintainer="Duncan Overbruck <mail@duncano.de>"
-license="GPL-2"
-homepage="http://qutim.org/jreen"
-distfiles="http://github.com/euroelessar/${pkgname}/archive/v${version}.tar.gz"
-checksum=be5de04b6f54e47bdec92707600441a39e46add958181ad2b5b2d1bf92693fbd
+makedepends="gsasl-devel speex-devel qt5-devel zlib-devel"
+short_desc="Qt5 Jabber/XMPP extensible library"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/euroelessar/jreen"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=f93c3d338c011c0945dacb14eb9da3be9541028c9eaa6f2024e688eb8a49b07e
+
+if [ -n "$CROSS_BUILD" ]; then
+ hostmakedepends+=" qt5-host-tools qt5-devel"
+fi
jreen-devel_package() {
- depends="jreen>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -22,3 +25,15 @@ jreen-devel_package() {
vmove usr/lib/pkgconfig
}
}
+
+jreen-qt5_package() {
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+ depends="${sourcepkg}>=${version}_${revision}"
+}
+
+jreen-qt5-devel_package() {
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+ depends="jreen-devel>=${version}_${revision}"
+}
From 389cb7bb1c7b8e370a88eb3ff33421db48778e31 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 15:30:54 +0200
Subject: [PATCH 2/2] tomahawk: rebuild against jreen
---
srcpkgs/tomahawk/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template
index 9dd3b936fb6..ed921b1f256 100644
--- a/srcpkgs/tomahawk/template
+++ b/srcpkgs/tomahawk/template
@@ -1,7 +1,7 @@
# Template file for 'tomahawk'
pkgname=tomahawk
version=0.8.4
-revision=18
+revision=19
wrksrc=${pkgname}-${_commit}
_commit=00f602e10203b76fc28b4615868c567e6bd4ced4
build_style=cmake
@@ -22,7 +22,7 @@ makedepends="Lucene++-devel attica-qt5-devel boost-devel gnutls-devel
libechonest-qt5-devel liblastfm-qt5-devel phonon-qt5-devel qca-qt5-devel
qt5-svg-devel qt5-tools-devel qt5-webkit-devel qtkeychain-qt5-devel
quazip-devel sparsehash taglib-devel vlc-devel libsecret-devel
- $(vopt_if hatchet websocketpp) $(vopt_if xmpp jreen-qt5-devel)
+ $(vopt_if hatchet websocketpp) $(vopt_if xmpp jreen-devel)
$(vopt_if kde telepathy-qt5-devel)"
depends="virtual?phonon-qt5-backend qt5-plugin-sqlite $(vopt_if xmpp qca-qt5-ossl)"
short_desc="Multi-source social music player"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] jreen: switch to qt5 and drop jreen-qt5 package
2019-09-17 13:22 [PR PATCH] jreen: switch to qt5 and drop jreen-qt5 package voidlinux-github
` (2 preceding siblings ...)
2019-09-17 13:31 ` voidlinux-github
@ 2019-09-17 13:31 ` voidlinux-github
2019-09-17 16:49 ` [PR PATCH] [Merged]: " voidlinux-github
4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-09-17 13:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 347 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages jreen
https://github.com/void-linux/void-packages/pull/14521
jreen: switch to qt5 and drop jreen-qt5 package
None
A patch file from https://github.com/void-linux/void-packages/pull/14521.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-jreen-14521.patch --]
[-- Type: text/x-diff, Size: 5811 bytes --]
From 491586b9d09f7d5eccb5a3f4e22c25af4ca3bc70 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 15:20:46 +0200
Subject: [PATCH 1/2] jreen: switch to qt5 and drop jreen-qt5 package
---
common/shlibs | 3 +--
srcpkgs/jreen-qt5 | 1 +
srcpkgs/jreen-qt5-devel | 2 +-
srcpkgs/jreen-qt5/template | 28 ----------------------------
srcpkgs/jreen/template | 37 ++++++++++++++++++++++++++-----------
5 files changed, 29 insertions(+), 42 deletions(-)
create mode 120000 srcpkgs/jreen-qt5
delete mode 100644 srcpkgs/jreen-qt5/template
diff --git a/common/shlibs b/common/shlibs
index d15941dce29..20525edd15e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1997,7 +1997,6 @@ libasignify.so.1 asignify-1.0_1
libvte2_90.so.9 vte290-0.36.3_1
libd0_blind_id.so.0 xonotic-0.8.0_1
libechonest.so.2.3 libechonest-2.3.1_1
-libjreen.so.1 jreen-1.2.1_1
libuecc.so.0 libuecc-5_1
libKF5WindowSystem.so.5 kwindowsystem-5.6.0_1
libKF5GuiAddons.so.5 kguiaddons-5.6.0_1
@@ -2078,7 +2077,7 @@ libechonest5.so.2.3 libechonest-qt5-2.3.0_1
liblastfm_fingerprint5.so.1 liblastfm-qt5-1.0.9_1
liblastfm5.so.1 liblastfm-qt5-1.0.9_1
libquazip5.so.1 quazip-0.7.3_2
-libjreen-qt5.so.1 jreen-qt5-1.2.0_1
+libjreen-qt5.so.1 jreen-1.3.0_1
libzen.so.0 libzen-0.4.31_1
libmediainfo.so.0 libmediainfo-0.7.75_1
libnghttp2.so.14 nghttp2-1.0.2_1
diff --git a/srcpkgs/jreen-qt5 b/srcpkgs/jreen-qt5
new file mode 120000
index 00000000000..adda684e0c9
--- /dev/null
+++ b/srcpkgs/jreen-qt5
@@ -0,0 +1 @@
+jreen
\ No newline at end of file
diff --git a/srcpkgs/jreen-qt5-devel b/srcpkgs/jreen-qt5-devel
index 9aff5c71925..adda684e0c9 120000
--- a/srcpkgs/jreen-qt5-devel
+++ b/srcpkgs/jreen-qt5-devel
@@ -1 +1 @@
-jreen-qt5
\ No newline at end of file
+jreen
\ No newline at end of file
diff --git a/srcpkgs/jreen-qt5/template b/srcpkgs/jreen-qt5/template
deleted file mode 100644
index 92f3aa73b09..00000000000
--- a/srcpkgs/jreen-qt5/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'jreen'
-pkgname=jreen-qt5
-version=1.3.0
-revision=1
-wrksrc="${pkgname%-*}-${version}"
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="gsasl-devel speex-devel qt5-devel zlib-devel"
-short_desc="Qt5 Jabber/XMPP extensible library"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="LGPL-3"
-homepage="https://github.com/euroelessar/jreen"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f93c3d338c011c0945dacb14eb9da3be9541028c9eaa6f2024e688eb8a49b07e
-
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
-
-jreen-qt5-devel_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/*.so
- vmove usr/lib/pkgconfig
- }
-}
diff --git a/srcpkgs/jreen/template b/srcpkgs/jreen/template
index 61fbb204312..f23ba291354 100644
--- a/srcpkgs/jreen/template
+++ b/srcpkgs/jreen/template
@@ -1,20 +1,23 @@
# Template file for 'jreen'
pkgname=jreen
-version=1.2.1
-revision=1
+version=1.3.0
+revision=2
build_style=cmake
-configure_args="-DJREEN_FORCE_QT4=yes"
hostmakedepends="pkg-config"
-makedepends="gsasl-devel speex-devel qt-devel zlib-devel"
-short_desc="Extensible XMPP library written in C++ using Qt"
-maintainer="Duncan Overbruck <mail@duncano.de>"
-license="GPL-2"
-homepage="http://qutim.org/jreen"
-distfiles="http://github.com/euroelessar/${pkgname}/archive/v${version}.tar.gz"
-checksum=be5de04b6f54e47bdec92707600441a39e46add958181ad2b5b2d1bf92693fbd
+makedepends="gsasl-devel speex-devel qt5-devel zlib-devel"
+short_desc="Qt5 Jabber/XMPP extensible library"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/euroelessar/jreen"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=f93c3d338c011c0945dacb14eb9da3be9541028c9eaa6f2024e688eb8a49b07e
+
+if [ -n "$CROSS_BUILD" ]; then
+ hostmakedepends+=" qt5-host-tools qt5-devel"
+fi
jreen-devel_package() {
- depends="jreen>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -22,3 +25,15 @@ jreen-devel_package() {
vmove usr/lib/pkgconfig
}
}
+
+jreen-qt5_package() {
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+ depends="${sourcepkg}>=${version}_${revision}"
+}
+
+jreen-qt5-devel_package() {
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+ depends="jreen-devel>=${version}_${revision}"
+}
From 389cb7bb1c7b8e370a88eb3ff33421db48778e31 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 15:30:54 +0200
Subject: [PATCH 2/2] tomahawk: rebuild against jreen
---
srcpkgs/tomahawk/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template
index 9dd3b936fb6..ed921b1f256 100644
--- a/srcpkgs/tomahawk/template
+++ b/srcpkgs/tomahawk/template
@@ -1,7 +1,7 @@
# Template file for 'tomahawk'
pkgname=tomahawk
version=0.8.4
-revision=18
+revision=19
wrksrc=${pkgname}-${_commit}
_commit=00f602e10203b76fc28b4615868c567e6bd4ced4
build_style=cmake
@@ -22,7 +22,7 @@ makedepends="Lucene++-devel attica-qt5-devel boost-devel gnutls-devel
libechonest-qt5-devel liblastfm-qt5-devel phonon-qt5-devel qca-qt5-devel
qt5-svg-devel qt5-tools-devel qt5-webkit-devel qtkeychain-qt5-devel
quazip-devel sparsehash taglib-devel vlc-devel libsecret-devel
- $(vopt_if hatchet websocketpp) $(vopt_if xmpp jreen-qt5-devel)
+ $(vopt_if hatchet websocketpp) $(vopt_if xmpp jreen-devel)
$(vopt_if kde telepathy-qt5-devel)"
depends="virtual?phonon-qt5-backend qt5-plugin-sqlite $(vopt_if xmpp qca-qt5-ossl)"
short_desc="Multi-source social music player"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: jreen: switch to qt5 and drop jreen-qt5 package
2019-09-17 13:22 [PR PATCH] jreen: switch to qt5 and drop jreen-qt5 package voidlinux-github
` (3 preceding siblings ...)
2019-09-17 13:31 ` voidlinux-github
@ 2019-09-17 16:49 ` voidlinux-github
4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-09-17 16:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 185 bytes --]
There's a merged pull request on the void-packages repository
jreen: switch to qt5 and drop jreen-qt5 package
https://github.com/void-linux/void-packages/pull/14521
Description:
None
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-09-17 16:49 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-17 13:22 [PR PATCH] jreen: switch to qt5 and drop jreen-qt5 package voidlinux-github
2019-09-17 13:23 ` [PR PATCH] [Updated] " voidlinux-github
2019-09-17 13:23 ` voidlinux-github
2019-09-17 13:31 ` voidlinux-github
2019-09-17 13:31 ` voidlinux-github
2019-09-17 16:49 ` [PR PATCH] [Merged]: " voidlinux-github
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).