* [PR PATCH] fragments: update to 2.1
@ 2023-01-05 2:07 cinerea0
2023-01-11 22:57 ` paper42
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: cinerea0 @ 2023-01-05 2:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 378 bytes --]
There is a new pull request by cinerea0 against master on the void-packages repository
https://github.com/cinerea0/void-packages frag
https://github.com/void-linux/void-packages/pull/41459
fragments: update to 2.1
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/41459.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-frag-41459.patch --]
[-- Type: text/x-diff, Size: 2431 bytes --]
From b2aa7d47149e28dc5830c26d6310d76d9c771ceb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 4 Jan 2023 21:05:34 -0500
Subject: [PATCH] fragments: update to 2.1
---
srcpkgs/fragments/patches/no-git.patch | 14 ++++++++------
srcpkgs/fragments/template | 6 +++---
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/fragments/patches/no-git.patch b/srcpkgs/fragments/patches/no-git.patch
index 2fdc1521e03d..ecabe0e7804b 100644
--- a/srcpkgs/fragments/patches/no-git.patch
+++ b/srcpkgs/fragments/patches/no-git.patch
@@ -1,11 +1,13 @@
+diff --git a/meson.build b/meson.build
+index 0cb46023cc..eec7e4f694 100644
--- a/meson.build
+++ b/meson.build
-@@ -17,7 +17,7 @@
- name = 'Fragments'
- app_id = 'de.haeckerfelix.Fragments'
- profile = get_option('profile')
+@@ -20,7 +20,7 @@ name = 'Fragments'
+ base_id = 'de.haeckerfelix.Fragments'
+ path_id = '/de/haeckerfelix/Fragments'
+ app_id = base_id
-vcs_tag = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip()
+vcs_tag = 'none'
+ profile = get_option('profile')
+ datadir = join_paths(get_option('prefix'), get_option('datadir'))
localedir = join_paths(get_option('prefix'), get_option('localedir'))
- datadir = get_option('datadir')
- pkgdatadir = join_paths(get_option('prefix'), datadir, meson.project_name())
diff --git a/srcpkgs/fragments/template b/srcpkgs/fragments/template
index ec3a4f9bd315..f07a9fbb35d1 100644
--- a/srcpkgs/fragments/template
+++ b/srcpkgs/fragments/template
@@ -1,10 +1,10 @@
# Template file for 'fragments'
pkgname=fragments
-version=2.0.2
+version=2.1
revision=1
build_style=meson
build_helper="rust"
-hostmakedepends="cargo pkg-config gettext glib-devel"
+hostmakedepends="desktop-file-utils cargo pkg-config gettext glib-devel"
makedepends="sqlite-devel gtk4-devel libadwaita-devel libglib-devel dbus-devel
openssl-devel rust-std"
short_desc="BitTorrent Client"
@@ -12,7 +12,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/World/Fragments"
distfiles="https://gitlab.gnome.org/World/Fragments/-/archive/$version/Fragments-$version.tar.gz"
-checksum=a3f32771e82aaac33ce1fbe40f83204fb6fade20d5cbffbd862b30ce9d8dedcf
+checksum=26e20d8cca8b7a2542b2d0e808d10dda082de52037dd8826ec6b00f0437f4564
post_patch() {
if [ "$CROSS_BUILD" ]; then
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: fragments: update to 2.1
2023-01-05 2:07 [PR PATCH] fragments: update to 2.1 cinerea0
@ 2023-01-11 22:57 ` paper42
2023-01-31 2:27 ` [PR PATCH] [Updated] " cinerea0
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: paper42 @ 2023-01-11 22:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 483 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41459#issuecomment-1379588064
Comment:
The post_patch fix doesn't work anymore, but the fix is still needed. The issue is that cargo puts the files to a target specific directory on cross and then the build system tries to access it in a different place. Either we should find the right build script to patch or I think we could move the files to the right location in post_build.
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PR PATCH] [Updated] fragments: update to 2.1
2023-01-05 2:07 [PR PATCH] fragments: update to 2.1 cinerea0
2023-01-11 22:57 ` paper42
@ 2023-01-31 2:27 ` cinerea0
2023-01-31 2:46 ` cinerea0
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: cinerea0 @ 2023-01-31 2:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 383 bytes --]
There is an updated pull request by cinerea0 against master on the void-packages repository
https://github.com/cinerea0/void-packages frag
https://github.com/void-linux/void-packages/pull/41459
fragments: update to 2.1
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/41459.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-frag-41459.patch --]
[-- Type: text/x-diff, Size: 2644 bytes --]
From 81f6c65fb08cbf72012e959df1cebb1ad2119bbc Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 30 Jan 2023 21:26:53 -0500
Subject: [PATCH] fragments: update to 2.1
---
srcpkgs/fragments/patches/no-git.patch | 14 ++++++++------
srcpkgs/fragments/template | 11 +++++------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/fragments/patches/no-git.patch b/srcpkgs/fragments/patches/no-git.patch
index 2fdc1521e03d..ecabe0e7804b 100644
--- a/srcpkgs/fragments/patches/no-git.patch
+++ b/srcpkgs/fragments/patches/no-git.patch
@@ -1,11 +1,13 @@
+diff --git a/meson.build b/meson.build
+index 0cb46023cc..eec7e4f694 100644
--- a/meson.build
+++ b/meson.build
-@@ -17,7 +17,7 @@
- name = 'Fragments'
- app_id = 'de.haeckerfelix.Fragments'
- profile = get_option('profile')
+@@ -20,7 +20,7 @@ name = 'Fragments'
+ base_id = 'de.haeckerfelix.Fragments'
+ path_id = '/de/haeckerfelix/Fragments'
+ app_id = base_id
-vcs_tag = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip()
+vcs_tag = 'none'
+ profile = get_option('profile')
+ datadir = join_paths(get_option('prefix'), get_option('datadir'))
localedir = join_paths(get_option('prefix'), get_option('localedir'))
- datadir = get_option('datadir')
- pkgdatadir = join_paths(get_option('prefix'), datadir, meson.project_name())
diff --git a/srcpkgs/fragments/template b/srcpkgs/fragments/template
index ec3a4f9bd315..f0999c7d6fc3 100644
--- a/srcpkgs/fragments/template
+++ b/srcpkgs/fragments/template
@@ -1,10 +1,10 @@
# Template file for 'fragments'
pkgname=fragments
-version=2.0.2
+version=2.1
revision=1
build_style=meson
build_helper="rust"
-hostmakedepends="cargo pkg-config gettext glib-devel"
+hostmakedepends="desktop-file-utils cargo pkg-config gettext glib-devel"
makedepends="sqlite-devel gtk4-devel libadwaita-devel libglib-devel dbus-devel
openssl-devel rust-std"
short_desc="BitTorrent Client"
@@ -12,12 +12,11 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/World/Fragments"
distfiles="https://gitlab.gnome.org/World/Fragments/-/archive/$version/Fragments-$version.tar.gz"
-checksum=a3f32771e82aaac33ce1fbe40f83204fb6fade20d5cbffbd862b30ce9d8dedcf
+checksum=26e20d8cca8b7a2542b2d0e808d10dda082de52037dd8826ec6b00f0437f4564
post_patch() {
if [ "$CROSS_BUILD" ]; then
- vsed -i build-aux/cargo.sh \
- -e 's%"$CARGO_TARGET_DIR"/%&${RUST_TARGET}/%' \
- -e '/CARGO_HOME/d'
+ vsed -i src/meson.build \
+ -e "s%rust_target /%'${RUST_TARGET}' / rust_target /%"
fi
}
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PR PATCH] [Updated] fragments: update to 2.1
2023-01-05 2:07 [PR PATCH] fragments: update to 2.1 cinerea0
2023-01-11 22:57 ` paper42
2023-01-31 2:27 ` [PR PATCH] [Updated] " cinerea0
@ 2023-01-31 2:46 ` cinerea0
2023-01-31 3:32 ` cinerea0
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: cinerea0 @ 2023-01-31 2:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 383 bytes --]
There is an updated pull request by cinerea0 against master on the void-packages repository
https://github.com/cinerea0/void-packages frag
https://github.com/void-linux/void-packages/pull/41459
fragments: update to 2.1
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/41459.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-frag-41459.patch --]
[-- Type: text/x-diff, Size: 2670 bytes --]
From 957f1048ebe457afb5a9684efc227bff8bdb7518 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 30 Jan 2023 21:46:24 -0500
Subject: [PATCH] fragments: update to 2.1
---
srcpkgs/fragments/patches/no-git.patch | 14 ++++++++------
srcpkgs/fragments/template | 12 ++++++------
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/fragments/patches/no-git.patch b/srcpkgs/fragments/patches/no-git.patch
index 2fdc1521e03d..ecabe0e7804b 100644
--- a/srcpkgs/fragments/patches/no-git.patch
+++ b/srcpkgs/fragments/patches/no-git.patch
@@ -1,11 +1,13 @@
+diff --git a/meson.build b/meson.build
+index 0cb46023cc..eec7e4f694 100644
--- a/meson.build
+++ b/meson.build
-@@ -17,7 +17,7 @@
- name = 'Fragments'
- app_id = 'de.haeckerfelix.Fragments'
- profile = get_option('profile')
+@@ -20,7 +20,7 @@ name = 'Fragments'
+ base_id = 'de.haeckerfelix.Fragments'
+ path_id = '/de/haeckerfelix/Fragments'
+ app_id = base_id
-vcs_tag = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip()
+vcs_tag = 'none'
+ profile = get_option('profile')
+ datadir = join_paths(get_option('prefix'), get_option('datadir'))
localedir = join_paths(get_option('prefix'), get_option('localedir'))
- datadir = get_option('datadir')
- pkgdatadir = join_paths(get_option('prefix'), datadir, meson.project_name())
diff --git a/srcpkgs/fragments/template b/srcpkgs/fragments/template
index ec3a4f9bd315..f26e0aa4585e 100644
--- a/srcpkgs/fragments/template
+++ b/srcpkgs/fragments/template
@@ -1,10 +1,11 @@
# Template file for 'fragments'
pkgname=fragments
-version=2.0.2
+version=2.1
revision=1
build_style=meson
build_helper="rust"
-hostmakedepends="cargo pkg-config gettext glib-devel"
+hostmakedepends="desktop-file-utils cargo pkg-config gettext glib-devel
+ gtk4-update-icon-cache"
makedepends="sqlite-devel gtk4-devel libadwaita-devel libglib-devel dbus-devel
openssl-devel rust-std"
short_desc="BitTorrent Client"
@@ -12,12 +13,11 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/World/Fragments"
distfiles="https://gitlab.gnome.org/World/Fragments/-/archive/$version/Fragments-$version.tar.gz"
-checksum=a3f32771e82aaac33ce1fbe40f83204fb6fade20d5cbffbd862b30ce9d8dedcf
+checksum=26e20d8cca8b7a2542b2d0e808d10dda082de52037dd8826ec6b00f0437f4564
post_patch() {
if [ "$CROSS_BUILD" ]; then
- vsed -i build-aux/cargo.sh \
- -e 's%"$CARGO_TARGET_DIR"/%&${RUST_TARGET}/%' \
- -e '/CARGO_HOME/d'
+ vsed -i src/meson.build \
+ -e "s%rust_target /%'${RUST_TARGET}' / rust_target /%"
fi
}
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: fragments: update to 2.1
2023-01-05 2:07 [PR PATCH] fragments: update to 2.1 cinerea0
` (2 preceding siblings ...)
2023-01-31 2:46 ` cinerea0
@ 2023-01-31 3:32 ` cinerea0
2023-01-31 23:00 ` paper42
2023-01-31 23:01 ` [PR PATCH] [Merged]: " paper42
5 siblings, 0 replies; 7+ messages in thread
From: cinerea0 @ 2023-01-31 3:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 271 bytes --]
New comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/41459#issuecomment-1409700647
Comment:
That fixed it! The solution here appears to apply to all rust programs using meson that are hosted on the Gnome GitLab instance.
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: fragments: update to 2.1
2023-01-05 2:07 [PR PATCH] fragments: update to 2.1 cinerea0
` (3 preceding siblings ...)
2023-01-31 3:32 ` cinerea0
@ 2023-01-31 23:00 ` paper42
2023-01-31 23:01 ` [PR PATCH] [Merged]: " paper42
5 siblings, 0 replies; 7+ messages in thread
From: paper42 @ 2023-01-31 23:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 341 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41459#issuecomment-1411186444
Comment:
> That fixed it! The solution here appears to apply to all rust programs using meson that are hosted on the Gnome GitLab instance.
Thanks! That solution will also be helpful for other rust packages
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PR PATCH] [Merged]: fragments: update to 2.1
2023-01-05 2:07 [PR PATCH] fragments: update to 2.1 cinerea0
` (4 preceding siblings ...)
2023-01-31 23:00 ` paper42
@ 2023-01-31 23:01 ` paper42
5 siblings, 0 replies; 7+ messages in thread
From: paper42 @ 2023-01-31 23:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 228 bytes --]
There's a merged pull request on the void-packages repository
fragments: update to 2.1
https://github.com/void-linux/void-packages/pull/41459
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-01-31 23:01 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-05 2:07 [PR PATCH] fragments: update to 2.1 cinerea0
2023-01-11 22:57 ` paper42
2023-01-31 2:27 ` [PR PATCH] [Updated] " cinerea0
2023-01-31 2:46 ` cinerea0
2023-01-31 3:32 ` cinerea0
2023-01-31 23:00 ` paper42
2023-01-31 23:01 ` [PR PATCH] [Merged]: " paper42
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).