From: martnnw <martnnw@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: news_flash_gtk-1.0.5
Date: Wed, 26 Aug 2020 10:27:12 +0200 [thread overview]
Message-ID: <20200826082712.yCfDlp_GlsQlIsEvg4QmnA9-NimsXuybJNtuIIXQl9o@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24218@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 465 bytes --]
There is an updated pull request by martnnw against master on the void-packages repository
https://github.com/martnnw/void-packages newsflash-pr
https://github.com/void-linux/void-packages/pull/24218
New package: news_flash_gtk-1.0.5
see: https://github.com/void-linux/void-packages/issues/24204
I'm new to xbps-src and I’m terribly sorry all the mess down there...
A patch file from https://github.com/void-linux/void-packages/pull/24218.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-newsflash-pr-24218.patch --]
[-- Type: text/x-diff, Size: 12269 bytes --]
From 59a593211cf882884bf26700a6f5c9e7b4548941 Mon Sep 17 00:00:00 2001
From: Martin <58121201+martnnw@users.noreply.github.com>
Date: Tue, 11 Aug 2020 12:05:10 +0200
Subject: [PATCH 01/11] Create template
---
srcpkgs/news_flash_gtk/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/news_flash_gtk/template
diff --git a/srcpkgs/news_flash_gtk/template b/srcpkgs/news_flash_gtk/template
new file mode 100644
index 00000000000..4926128b90f
--- /dev/null
+++ b/srcpkgs/news_flash_gtk/template
@@ -0,0 +1,16 @@
+# Template file for news-flash-gtk
+pkgname=news_flash_gtk
+version=1.0+rc1
+_ver="${version/+/-}"
+revision=1
+wrksrc="${pkgname}-${_ver}"
+build_style=meson
+build_helper=rust
+short_desc="A modern gtk feed-reader written in rust"
+hostmakedepends="pkg-config glib-devel cargo"
+makedepends="gtk+-devel webkit2gtk-devel libhandy-devel sqlite-devel gettext-devel libressl-devel rust-std"
+license="GPL-3.0-or-later"
+maintainer="Axel Winklbauer <winklbauer_m@zoho.eu>"
+homepage="https://gitlab.com/news-flash/news_flash_gtk"
+distfiles="${homepage}/-/archive/${_ver}/${pkgname}-${_ver}.tar.gz"
+checksum="9c5d65699c9aba582e0c7b453d28e5bf430f449b4e7369958970947164f99ccb"
From fef556b8afcb8af7428fbed6c47b264f011e44b8 Mon Sep 17 00:00:00 2001
From: Martin <58121201+martnnw@users.noreply.github.com>
Date: Tue, 11 Aug 2020 12:11:18 +0200
Subject: [PATCH 02/11] Update template
---
srcpkgs/news_flash_gtk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/news_flash_gtk/template b/srcpkgs/news_flash_gtk/template
index 4926128b90f..141da8a9354 100644
--- a/srcpkgs/news_flash_gtk/template
+++ b/srcpkgs/news_flash_gtk/template
@@ -9,7 +9,7 @@ build_helper=rust
short_desc="A modern gtk feed-reader written in rust"
hostmakedepends="pkg-config glib-devel cargo"
makedepends="gtk+-devel webkit2gtk-devel libhandy-devel sqlite-devel gettext-devel libressl-devel rust-std"
-license="GPL-3.0-or-later"
+license="GPL-3.0-only"
maintainer="Axel Winklbauer <winklbauer_m@zoho.eu>"
homepage="https://gitlab.com/news-flash/news_flash_gtk"
distfiles="${homepage}/-/archive/${_ver}/${pkgname}-${_ver}.tar.gz"
From ea6aff2f5e3e933b2a7a023268d1bee279a2f5d2 Mon Sep 17 00:00:00 2001
From: Martin <58121201+martnnw@users.noreply.github.com>
Date: Mon, 17 Aug 2020 10:52:51 +0200
Subject: [PATCH 03/11] Update template
1.0.5 instead of 1.0.1rc (release canidate)
---
srcpkgs/news_flash_gtk/template | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/news_flash_gtk/template b/srcpkgs/news_flash_gtk/template
index 141da8a9354..c9572c0aa77 100644
--- a/srcpkgs/news_flash_gtk/template
+++ b/srcpkgs/news_flash_gtk/template
@@ -1,16 +1,14 @@
# Template file for news-flash-gtk
pkgname=news_flash_gtk
-version=1.0+rc1
-_ver="${version/+/-}"
+version=1.0.5
revision=1
-wrksrc="${pkgname}-${_ver}"
build_style=meson
build_helper=rust
short_desc="A modern gtk feed-reader written in rust"
hostmakedepends="pkg-config glib-devel cargo"
-makedepends="gtk+-devel webkit2gtk-devel libhandy-devel sqlite-devel gettext-devel libressl-devel rust-std"
+makedepends="gtk+-devel webkit2gtk-devel libhandy-devel sqlite-devel gettext libressl-devel rust-std"
license="GPL-3.0-only"
maintainer="Axel Winklbauer <winklbauer_m@zoho.eu>"
homepage="https://gitlab.com/news-flash/news_flash_gtk"
-distfiles="${homepage}/-/archive/${_ver}/${pkgname}-${_ver}.tar.gz"
-checksum="9c5d65699c9aba582e0c7b453d28e5bf430f449b4e7369958970947164f99ccb"
+distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum="ff0b35f6f6d52ecbd43852a9dc8610b101aa66675ae9b3c7981b58be5e10b62f"
From 4d17003da1abc121106678878196a48edc1be4e0 Mon Sep 17 00:00:00 2001
From: Martin <58121201+martnnw@users.noreply.github.com>
Date: Mon, 17 Aug 2020 11:14:03 +0200
Subject: [PATCH 04/11] corrected formal errors
---
srcpkgs/news_flash_gtk/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/news_flash_gtk/template b/srcpkgs/news_flash_gtk/template
index c9572c0aa77..d6b532e3563 100644
--- a/srcpkgs/news_flash_gtk/template
+++ b/srcpkgs/news_flash_gtk/template
@@ -1,14 +1,14 @@
-# Template file for news-flash-gtk
+# Template file for 'news_flash_gtk'
pkgname=news_flash_gtk
version=1.0.5
revision=1
build_style=meson
build_helper=rust
-short_desc="A modern gtk feed-reader written in rust"
hostmakedepends="pkg-config glib-devel cargo"
makedepends="gtk+-devel webkit2gtk-devel libhandy-devel sqlite-devel gettext libressl-devel rust-std"
-license="GPL-3.0-only"
+short_desc="Modern gtk feed-reader written in rust"
maintainer="Axel Winklbauer <winklbauer_m@zoho.eu>"
+license="GPL-3.0-only"
homepage="https://gitlab.com/news-flash/news_flash_gtk"
distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
checksum="ff0b35f6f6d52ecbd43852a9dc8610b101aa66675ae9b3c7981b58be5e10b62f"
From ee0eb7d2be06d85f0db72413219cd096cf8c7060 Mon Sep 17 00:00:00 2001
From: Martin <58121201+martnnw@users.noreply.github.com>
Date: Mon, 17 Aug 2020 21:39:54 +0200
Subject: [PATCH 05/11] hopefully the last change...
removed rust-std and libressl-devel
hostdep + gettext
makedep + gettext-devel
---
srcpkgs/news_flash_gtk/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/news_flash_gtk/template b/srcpkgs/news_flash_gtk/template
index d6b532e3563..a4931d4d74a 100644
--- a/srcpkgs/news_flash_gtk/template
+++ b/srcpkgs/news_flash_gtk/template
@@ -4,8 +4,8 @@ version=1.0.5
revision=1
build_style=meson
build_helper=rust
-hostmakedepends="pkg-config glib-devel cargo"
-makedepends="gtk+-devel webkit2gtk-devel libhandy-devel sqlite-devel gettext libressl-devel rust-std"
+hostmakedepends="pkg-config glib-devel cargo gettext"
+makedepends="gtk+-devel webkit2gtk-devel libhandy-devel sqlite-devel gettext-devel"
short_desc="Modern gtk feed-reader written in rust"
maintainer="Axel Winklbauer <winklbauer_m@zoho.eu>"
license="GPL-3.0-only"
From 25427be61f533f8f0c1af905190d266e22705db7 Mon Sep 17 00:00:00 2001
From: Martin <58121201+martnnw@users.noreply.github.com>
Date: Mon, 17 Aug 2020 22:21:59 +0200
Subject: [PATCH 06/11] reverting some changes
I am so sorry...
---
srcpkgs/news_flash_gtk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/news_flash_gtk/template b/srcpkgs/news_flash_gtk/template
index a4931d4d74a..b05d95d2f1f 100644
--- a/srcpkgs/news_flash_gtk/template
+++ b/srcpkgs/news_flash_gtk/template
@@ -5,7 +5,7 @@ revision=1
build_style=meson
build_helper=rust
hostmakedepends="pkg-config glib-devel cargo gettext"
-makedepends="gtk+-devel webkit2gtk-devel libhandy-devel sqlite-devel gettext-devel"
+makedepends="gtk+-devel webkit2gtk-devel libhandy-devel sqlite-devel gettext-devel libressl-devel rust-std"
short_desc="Modern gtk feed-reader written in rust"
maintainer="Axel Winklbauer <winklbauer_m@zoho.eu>"
license="GPL-3.0-only"
From 720561d1dc04c1c476598f4a2188cb6db6c4bed4 Mon Sep 17 00:00:00 2001
From: Martin <58121201+martnnw@users.noreply.github.com>
Date: Tue, 18 Aug 2020 14:41:51 +0200
Subject: [PATCH 07/11] build style: cargo instead of meson
as seen in
https://github.com/void-linux/void-packages/pull/2925#issuecomment-430848349
due to cross compiling errors. This will be my last atempt.
---
srcpkgs/news_flash_gtk/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/news_flash_gtk/template b/srcpkgs/news_flash_gtk/template
index b05d95d2f1f..d916a4238da 100644
--- a/srcpkgs/news_flash_gtk/template
+++ b/srcpkgs/news_flash_gtk/template
@@ -2,9 +2,9 @@
pkgname=news_flash_gtk
version=1.0.5
revision=1
-build_style=meson
+build_style=cargo
build_helper=rust
-hostmakedepends="pkg-config glib-devel cargo gettext"
+hostmakedepends="pkg-config glib-devel gettext"
makedepends="gtk+-devel webkit2gtk-devel libhandy-devel sqlite-devel gettext-devel libressl-devel rust-std"
short_desc="Modern gtk feed-reader written in rust"
maintainer="Axel Winklbauer <winklbauer_m@zoho.eu>"
From 12ceb99f2cda5f28abf8d582e269ab06ef0e6a9c Mon Sep 17 00:00:00 2001
From: Martin <58121201+martnnw@users.noreply.github.com>
Date: Tue, 18 Aug 2020 20:32:18 +0200
Subject: [PATCH 08/11] post patch + reverting some changes
Added crossbuild as in fractal or gnome-podcasts
---
srcpkgs/news_flash_gtk/template | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/news_flash_gtk/template b/srcpkgs/news_flash_gtk/template
index d916a4238da..7aa6088abe3 100644
--- a/srcpkgs/news_flash_gtk/template
+++ b/srcpkgs/news_flash_gtk/template
@@ -2,9 +2,9 @@
pkgname=news_flash_gtk
version=1.0.5
revision=1
-build_style=cargo
+build_style=meson
build_helper=rust
-hostmakedepends="pkg-config glib-devel gettext"
+hostmakedepends="pkg-config cargo glib-devel gettext sqlite"
makedepends="gtk+-devel webkit2gtk-devel libhandy-devel sqlite-devel gettext-devel libressl-devel rust-std"
short_desc="Modern gtk feed-reader written in rust"
maintainer="Axel Winklbauer <winklbauer_m@zoho.eu>"
@@ -12,3 +12,10 @@ license="GPL-3.0-only"
homepage="https://gitlab.com/news-flash/news_flash_gtk"
distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
checksum="ff0b35f6f6d52ecbd43852a9dc8610b101aa66675ae9b3c7981b58be5e10b62f"
+
+post_patch() {
+ [ -z "$CROSS_BUILD" ] && return 0
+ vsed -i scripts/cargo.sh \
+ -e 's%"$CARGO_TARGET_DIR"/%&${RUST_TARGET}/%' \
+ -e '/CARGO_HOME/d'
+}
From c6f3c5ea0b46030437e0cef20d67d990fdeb0cc7 Mon Sep 17 00:00:00 2001
From: Martin <58121201+martnnw@users.noreply.github.com>
Date: Wed, 19 Aug 2020 09:32:36 +0200
Subject: [PATCH 09/11] reverse change
---
srcpkgs/news_flash_gtk/template | 7 -------
1 file changed, 7 deletions(-)
diff --git a/srcpkgs/news_flash_gtk/template b/srcpkgs/news_flash_gtk/template
index 7aa6088abe3..1b30cec730e 100644
--- a/srcpkgs/news_flash_gtk/template
+++ b/srcpkgs/news_flash_gtk/template
@@ -12,10 +12,3 @@ license="GPL-3.0-only"
homepage="https://gitlab.com/news-flash/news_flash_gtk"
distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
checksum="ff0b35f6f6d52ecbd43852a9dc8610b101aa66675ae9b3c7981b58be5e10b62f"
-
-post_patch() {
- [ -z "$CROSS_BUILD" ] && return 0
- vsed -i scripts/cargo.sh \
- -e 's%"$CARGO_TARGET_DIR"/%&${RUST_TARGET}/%' \
- -e '/CARGO_HOME/d'
-}
From eef3954652fc1e0cf0ed359395a6a0098710f0c8 Mon Sep 17 00:00:00 2001
From: Martin <58121201+martnnw@users.noreply.github.com>
Date: Thu, 20 Aug 2020 11:54:44 +0200
Subject: [PATCH 10/11] Update template
---
srcpkgs/news_flash_gtk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/news_flash_gtk/template b/srcpkgs/news_flash_gtk/template
index 1b30cec730e..dd29fc8fd6a 100644
--- a/srcpkgs/news_flash_gtk/template
+++ b/srcpkgs/news_flash_gtk/template
@@ -4,7 +4,7 @@ version=1.0.5
revision=1
build_style=meson
build_helper=rust
-hostmakedepends="pkg-config cargo glib-devel gettext sqlite"
+hostmakedepends="pkg-config cargo glib-devel gettext sqlite-devel"
makedepends="gtk+-devel webkit2gtk-devel libhandy-devel sqlite-devel gettext-devel libressl-devel rust-std"
short_desc="Modern gtk feed-reader written in rust"
maintainer="Axel Winklbauer <winklbauer_m@zoho.eu>"
From c20926cb255067f2003de7d2403ab58bb88b6e57 Mon Sep 17 00:00:00 2001
From: Martin <58121201+martnnw@users.noreply.github.com>
Date: Mon, 24 Aug 2020 19:41:18 +0200
Subject: [PATCH 11/11] added post patch for building on non x86
---
srcpkgs/news_flash_gtk/template | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/srcpkgs/news_flash_gtk/template b/srcpkgs/news_flash_gtk/template
index dd29fc8fd6a..6ae818cadb4 100644
--- a/srcpkgs/news_flash_gtk/template
+++ b/srcpkgs/news_flash_gtk/template
@@ -12,3 +12,10 @@ license="GPL-3.0-only"
homepage="https://gitlab.com/news-flash/news_flash_gtk"
distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
checksum="ff0b35f6f6d52ecbd43852a9dc8610b101aa66675ae9b3c7981b58be5e10b62f"
+
+post_patch() {
+ [ -z "$CROSS_BUILD" ] && return 0
+ vsed -i build-aux/cargo.sh \
+ -e 's%"$CARGO_TARGET_DIR"/%&${RUST_TARGET}/%' \
+ -e '/CARGO_HOME/d'
+}
next prev parent reply other threads:[~2020-08-26 8:27 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-11 10:16 [PR PATCH] [WIP] [Package Request] news_flash_gtk martnnw
2020-08-11 10:23 ` [PR REVIEW] New package: news_flash_gtk-1.0+rc1 [wip] martnnw
2020-08-11 10:25 ` martnnw
2020-08-17 8:52 ` [PR PATCH] [Updated] " martnnw
2020-08-17 9:14 ` [PR PATCH] [Updated] New package: news_flash_gtk-1.0.5 martnnw
2020-08-17 10:03 ` [PR REVIEW] " martnnw
2020-08-17 10:09 ` martnnw
2020-08-17 10:10 ` martnnw
2020-08-17 10:11 ` martnnw
2020-08-17 19:39 ` [PR PATCH] [Updated] " martnnw
2020-08-17 20:22 ` martnnw
2020-08-17 21:02 ` martnnw
2020-08-17 21:36 ` martnnw
2020-08-18 12:41 ` [PR PATCH] [Updated] " martnnw
2020-08-18 18:32 ` martnnw
2020-08-19 7:32 ` martnnw
2020-08-20 9:54 ` martnnw
2020-08-20 10:22 ` martnnw
2020-08-20 10:28 ` [PR PATCH] [Closed]: " martnnw
2020-08-20 19:50 ` martnnw
2020-08-22 12:50 ` ericonr
2020-08-24 17:41 ` [PR PATCH] [Updated] " martnnw
2020-08-24 20:06 ` martnnw
2020-08-24 20:28 ` martnnw
2020-08-24 20:35 ` martnnw
2020-08-25 7:20 ` martnnw
2020-08-25 7:25 ` martnnw
2020-08-25 7:28 ` martnnw
2020-08-25 16:15 ` martnnw
2020-08-26 8:27 ` martnnw [this message]
2020-08-26 18:53 ` martnnw
2020-09-19 18:53 ` martnnw
2021-07-04 2:56 ` ericonr
2021-07-04 2:56 ` [PR PATCH] [Closed]: " ericonr
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=20200826082712.yCfDlp_GlsQlIsEvg4QmnA9-NimsXuybJNtuIIXQl9o@z \
--to=martnnw@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).