Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: Shortwave-2.0.1
@ 2021-08-09 13:42 mobinmob
  2021-08-09 13:45 ` mobinmob
                   ` (2 more replies)
  0 siblings, 3 replies; 12+ messages in thread
From: mobinmob @ 2021-08-09 13:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1438 bytes --]

There is a new pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages Shortwave
https://github.com/void-linux/void-packages/pull/32425

New package: Shortwave-2.0.1
<!-- Mark items with [x] where applicable -->

#### General
- [X] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (x86_64-glibc)


A patch file from https://github.com/void-linux/void-packages/pull/32425.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-Shortwave-32425.patch --]
[-- Type: text/x-diff, Size: 1164 bytes --]

From 7e7b15254a8fb6f63085157f743d2c1dd1273a59 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 9 Aug 2021 16:41:06 +0300
Subject: [PATCH] New package: Shortwave-2.0.1

---
 srcpkgs/Shortwave/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/Shortwave/template

diff --git a/srcpkgs/Shortwave/template b/srcpkgs/Shortwave/template
new file mode 100644
index 000000000000..f42d5801d5f9
--- /dev/null
+++ b/srcpkgs/Shortwave/template
@@ -0,0 +1,15 @@
+# Template file for 'Shortwave'
+pkgname=Shortwave
+version=2.0.1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config git rust cargo"
+makedepends="sqlite-devel gtk4-devel gstreamer1-devel openssl-devel libadwaita-devel
+ gettext"
+short_desc="Internet radio player"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/World/Shortwave"
+distfiles="https://gitlab.gnome.org/World/Shortwave/-/archive/${version}/Shortwave-${version}.tar.bz2"
+checksum=78d0af38be3cc915b0e9814b7c5944f00d64b835bffc4d1e3e7ac3c30a3ed772
+nocross=yes # weird issues, the build system uses meson and cargo

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [PR PATCH] New package: shortwave-1.1.1
@ 2021-03-01 12:55 oynqr
  2021-08-09  7:26 ` New package: shortwave-2.0.1 oynqr
                   ` (7 more replies)
  0 siblings, 8 replies; 12+ messages in thread
From: oynqr @ 2021-03-01 12:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1711 bytes --]

There is a new pull request by oynqr against master on the void-packages repository

https://github.com/oynqr/void-packages shortwave
https://github.com/void-linux/void-packages/pull/29157

New package: shortwave-1.1.1
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

I did not find what causes the x86_64-musl builds to fail, any help with that would be appreciated.
Would close #28886

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29157.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-shortwave-29157.patch --]
[-- Type: text/x-diff, Size: 4547 bytes --]

From 11099057248a575b0a7a19082b9b36b42c995c80 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Mon, 1 Mar 2021 08:07:55 +0100
Subject: [PATCH] New package: shortwave-1.1.1

---
 .../patches/fix-build-from-tar.patch          | 83 +++++++++++++++++++
 srcpkgs/shortwave/template                    | 30 +++++++
 2 files changed, 113 insertions(+)
 create mode 100644 srcpkgs/shortwave/patches/fix-build-from-tar.patch
 create mode 100644 srcpkgs/shortwave/template

diff --git a/srcpkgs/shortwave/patches/fix-build-from-tar.patch b/srcpkgs/shortwave/patches/fix-build-from-tar.patch
new file mode 100644
index 00000000000..5403e0314ff
--- /dev/null
+++ b/srcpkgs/shortwave/patches/fix-build-from-tar.patch
@@ -0,0 +1,83 @@
+--- .cargo/config
++++ .cargo/config
+@@ -1,6 +1,3 @@
+-[source.crates-io]
+-replace-with = "vendored-sources"
+-
+ [source."https://gitlab.gnome.org/haecker-felix/libhandy-rs.git"]
+ git = "https://gitlab.gnome.org/haecker-felix/libhandy-rs.git"
+ branch = "update_cargo_version"
+--- build-aux/cargo.sh
++++ build-aux/cargo.sh
+@@ -5,9 +5,15 @@ export MESON_SOURCE_ROOT="$2"
+ export APP_OUTPUT="$3"
+ export APP_LOCALEDIR="$4"
+ export APP_PROFILE="$5"
++export XBPS_RUST_TARGET="$6"
+ 
+ export CARGO_TARGET_DIR="$MESON_BUILD_ROOT"/target
+-export CARGO_HOME="$CARGO_TARGET_DIR"/cargo-home
++
++export CARGO_OUTPUT_DIR="$CARGO_TARGET_DIR"
++if ! test -z "$XBPS_RUST_TARGET"
++then
++    export CARGO_OUTPUT_DIR="${CARGO_OUTPUT_DIR}/${XBPS_RUST_TARGET}"
++fi
+ 
+ echo "** RUST VERSION **"
+ rustc --version
+@@ -17,10 +23,10 @@ then
+     echo "** DEBUG MODE **"
+     cargo build --manifest-path \
+         "$MESON_SOURCE_ROOT"/Cargo.toml --message-format=short && \
+-        cp "$CARGO_TARGET_DIR"/debug/shortwave $APP_OUTPUT
++        cp "$CARGO_OUTPUT_DIR"/debug/shortwave $APP_OUTPUT
+ else
+     echo "** RELEASE MODE **"
+     cargo build --manifest-path \
+         "$MESON_SOURCE_ROOT"/Cargo.toml --message-format=short --release && \
+-        cp "$CARGO_TARGET_DIR"/release/shortwave $APP_OUTPUT
++        cp "$CARGO_OUTPUT_DIR"/release/shortwave $APP_OUTPUT
+ fi
+--- meson.build
++++ meson.build
+@@ -26,10 +26,11 @@ dependency('gstreamer-bad-audio-1.0', version: '>= 1.16')
+ name       = 'Shortwave'
+ app_id     = 'de.haeckerfelix.Shortwave'
+ profile    = get_option('profile')
+-vcs_tag    = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip()
++vcs_tag    = get_option('tag')
+ localedir  = join_paths(get_option('prefix'), get_option('localedir'))
+ datadir    = get_option('datadir')
+ pkgdatadir = join_paths(get_option('prefix'), datadir, meson.project_name())
++xbps_rust_target = get_option('xbps_rust_target')
+ 
+ # Change app id for development builds
+ if profile == 'development'
+--- meson_options.txt
++++ meson_options.txt
+@@ -8,3 +8,13 @@ option (
+   ],
+   value: 'default'
+ )
++option (
++  'tag',
++  type: 'string',
++  value: 'none'
++)
++option (
++  'xbps_rust_target',
++  type: 'string',
++  value: ''
++)
+--- src/meson.build
++++ src/meson.build
+@@ -106,6 +106,7 @@ cargo_release = custom_target(
+     meson.source_root(),
+     '@OUTPUT@',
+     localedir,
+-    profile
++    profile,
++    xbps_rust_target
+   ]
+ )
diff --git a/srcpkgs/shortwave/template b/srcpkgs/shortwave/template
new file mode 100644
index 00000000000..f8f7f516661
--- /dev/null
+++ b/srcpkgs/shortwave/template
@@ -0,0 +1,30 @@
+# Template file for 'shortwave'
+pkgname=shortwave
+version=1.1.1
+revision=1
+_short_rev="f67468a"
+build_style=meson
+build_helper=rust
+configure_args=" -Dtag=${_short_rev}"
+hostmakedepends="cargo gettext glib-devel pkg-config rust sqlite-devel"
+makedepends="gstreamer1-devel gst-plugins-bad1-devel libhandy-devel libressl-devel rust-std sqlite-devel"
+depends="gst-plugins-good1"
+short_desc="GTK internet radio player, written in Rust"
+maintainer="Philipp David <pd@3b.pm>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/World/Shortwave"
+distfiles="https://gitlab.gnome.org/World/Shortwave/uploads/df12909bb42afbff933e45da0f220eb4/shortwave-${version}.tar.xz"
+checksum=dfac0dbc5f0026ec94a83bf3af3f44a02a234c93eedb5943963290536f22be47
+
+case $XBPS_TARGET_MACHINE in
+	x86_64-musl) broken="compiling diesel_migrations fails with: /usr/lib/libc.so: invalid ELF header" ;;
+esac
+
+if ! [ -z "$CROSS_BUILD" ]; then
+	configure_args+=" -Dxbps_rust_target=${XBPS_CROSS_RUST_TARGET}"
+fi
+
+pre_build() {
+	cargo update --package openssl-sys --precise 0.9.60
+	cargo update --package openssl --precise 0.10.32
+}

^ permalink raw reply	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2022-04-05  7:59 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-09 13:42 [PR PATCH] New package: Shortwave-2.0.1 mobinmob
2021-08-09 13:45 ` mobinmob
2021-08-09 14:08 ` ericonr
2021-08-09 14:11 ` [PR PATCH] [Closed]: " mobinmob
  -- strict thread matches above, loose matches on Subject: below --
2021-03-01 12:55 [PR PATCH] New package: shortwave-1.1.1 oynqr
2021-08-09  7:26 ` New package: shortwave-2.0.1 oynqr
2021-08-10 19:32 ` New package: Shortwave-2.0.1 paper42
2021-08-10 19:32 ` paper42
2021-08-10 19:52 ` paper42
2021-08-10 20:32 ` paper42
2022-02-28  1:04 ` MPC7500
2022-02-28  1:07 ` MPC7500
2022-04-05  7:59 ` oynqr

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).