Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] xsnow: update to 3.4.2
@ 2021-12-26 20:11 kawaiiamber
  2021-12-26 20:28 ` kawaiiamber
                   ` (16 more replies)
  0 siblings, 17 replies; 18+ messages in thread
From: kawaiiamber @ 2021-12-26 20:11 UTC (permalink / raw)
  To: ml

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

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

https://github.com/kawaiiamber/void-packages xsnow
https://github.com/void-linux/void-packages/pull/34709

xsnow: update to 3.4.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC) **YES**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

xsnow is now on version 3.4.2 and GPL licensed. It should be able to cross-build now.

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

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

From 06b1afd15c0c919aa25adb377d5c54b0e590bc5d Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Sun, 26 Dec 2021 13:10:29 -0700
Subject: [PATCH] xsnow: update to 3.4.2

---
 srcpkgs/xsnow/template | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/xsnow/template b/srcpkgs/xsnow/template
index 965986d92842..f0608fe3391d 100644
--- a/srcpkgs/xsnow/template
+++ b/srcpkgs/xsnow/template
@@ -1,23 +1,13 @@
 # Template file for 'xsnow'
 pkgname=xsnow
-version=1.42
-revision=3
-hostmakedepends="imake xorg-cf-files"
-makedepends="libXext-devel libXpm-devel libXt-devel"
+version=3.4.2
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="libXext-devel libXpm-devel libXt-devel libX11-devel gtk+3-devel"
 short_desc="Snow for your X11 sessions"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="custom:xsnow"
-homepage="https://janswaal.home.xs4all.nl/Xsnow"
-distfiles="https://janswaal.home.xs4all.nl/Xsnow/${pkgname}-${version}.tar.gz"
-checksum=d0d7c8f1fb91ca096995b1c30797e8f443c2e97d6f1e5f574b31318ed05d561a
-repository=nonfree
-nocross=yes  # imake
-
-do_build() {
-	xmkmf
-	make CC=$CC CDEBUGFLAGS="-D_DEFAULT_SOURCE ${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}"
-}
-do_install() {
-	make MANSUFFIX=1 DESTDIR=${DESTDIR} install install.man
-	vlicense README
-}
+license="GPL-3.0-or-later"
+homepage="https://ratrabbit.nl/ratrabbit/xsnow/index.html"
+distfiles="https://ratrabbit.nl/downloads/xsnow/${pkgname}-${version}.tar.gz"
+checksum=c618d7a73cef7070755f38ddc3665487afa8c71a9c82ae9055723e594a62fd9e

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: xsnow: update to 3.4.2
  2021-12-26 20:11 [PR PATCH] xsnow: update to 3.4.2 kawaiiamber
@ 2021-12-26 20:28 ` kawaiiamber
  2021-12-26 20:34 ` kawaiiamber
                   ` (15 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: kawaiiamber @ 2021-12-26 20:28 UTC (permalink / raw)
  To: ml

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

New comment by kawaiiamber on void-packages repository

https://github.com/void-linux/void-packages/pull/34709#issuecomment-1001238585

Comment:
![1640550499](https://user-images.githubusercontent.com/30329373/147419257-8503c46a-41f2-47d3-958b-fc1d6e545603.png)
On this dwm build, I notice it acts on its own window? Not sure how to describe it, so here's a screenshot of the program that gets run after `xbps-install -R ./hostdir/binpkgs/xsnow xsnow`. It puts the program is `/usr/games/xsnow`. I guess one could either append `/usr/games` to the system path or do a custom `do_install` that just `vbin xsnow` and `vman xsnow.6`.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: xsnow: update to 3.4.2
  2021-12-26 20:11 [PR PATCH] xsnow: update to 3.4.2 kawaiiamber
  2021-12-26 20:28 ` kawaiiamber
@ 2021-12-26 20:34 ` kawaiiamber
  2021-12-26 20:42 ` kawaiiamber
                   ` (14 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: kawaiiamber @ 2021-12-26 20:34 UTC (permalink / raw)
  To: ml

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

New comment by kawaiiamber on void-packages repository

https://github.com/void-linux/void-packages/pull/34709#issuecomment-1001238585

Comment:
![1640550499](https://user-images.githubusercontent.com/30329373/147419257-8503c46a-41f2-47d3-958b-fc1d6e545603.png)
Here's a screenshot of the program that gets run after `xbps-install -R ./hostdir/binpkgs/xsnow xsnow`. It puts the program is `/usr/games/xsnow`. I guess one could either append `/usr/games` to the system path or do a custom `do_install` that just `vbin xsnow` and `vman xsnow.6`.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: xsnow: update to 3.4.2
  2021-12-26 20:11 [PR PATCH] xsnow: update to 3.4.2 kawaiiamber
  2021-12-26 20:28 ` kawaiiamber
  2021-12-26 20:34 ` kawaiiamber
@ 2021-12-26 20:42 ` kawaiiamber
  2021-12-26 20:44 ` kawaiiamber
                   ` (13 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: kawaiiamber @ 2021-12-26 20:42 UTC (permalink / raw)
  To: ml

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

New comment by kawaiiamber on void-packages repository

https://github.com/void-linux/void-packages/pull/34709#issuecomment-1001238585

Comment:

![1640551554](https://user-images.githubusercontent.com/30329373/147419576-75d02606-be05-4857-acfc-8aa169f781d0.png)
Here's a screenshot of the program that gets run after `xbps-install -R ./hostdir/binpkgs/xsnow xsnow`. It puts the program is `/usr/games/xsnow`. I guess one could either append `/usr/games` to the system path or do a custom `do_install` that just `vbin xsnow` and `vman xsnow.6`.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: xsnow: update to 3.4.2
  2021-12-26 20:11 [PR PATCH] xsnow: update to 3.4.2 kawaiiamber
                   ` (2 preceding siblings ...)
  2021-12-26 20:42 ` kawaiiamber
@ 2021-12-26 20:44 ` kawaiiamber
  2021-12-26 20:50 ` [PR PATCH] [Updated] " kawaiiamber
                   ` (12 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: kawaiiamber @ 2021-12-26 20:44 UTC (permalink / raw)
  To: ml

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

New comment by kawaiiamber on void-packages repository

https://github.com/void-linux/void-packages/pull/34709#issuecomment-1001238585

Comment:

![1640551651](https://user-images.githubusercontent.com/30329373/147419608-04820690-ced7-4510-a853-e27421725e81.png)
Here's a screenshot of the program that gets run after `xbps-install -R ./hostdir/binpkgs/xsnow xsnow`. It puts the program is `/usr/games/xsnow`. I guess one could either append `/usr/games` to the system path or do a custom `do_install` that just `vbin xsnow` and `vman xsnow.6`.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] xsnow: update to 3.4.2
  2021-12-26 20:11 [PR PATCH] xsnow: update to 3.4.2 kawaiiamber
                   ` (3 preceding siblings ...)
  2021-12-26 20:44 ` kawaiiamber
@ 2021-12-26 20:50 ` kawaiiamber
  2021-12-27  4:55 ` [PR REVIEW] " abenson
                   ` (11 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: kawaiiamber @ 2021-12-26 20:50 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by kawaiiamber against master on the void-packages repository

https://github.com/kawaiiamber/void-packages xsnow
https://github.com/void-linux/void-packages/pull/34709

xsnow: update to 3.4.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl) **YES**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl

xsnow is now on version 3.4.2 and GPL licensed.

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

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

From fe1d664f506978810667cd0297849623c8b5c418 Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Sun, 26 Dec 2021 13:10:29 -0700
Subject: [PATCH] xsnow: update to 3.4.2

---
 srcpkgs/xsnow/template | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/xsnow/template b/srcpkgs/xsnow/template
index 965986d92842..83ed8f923794 100644
--- a/srcpkgs/xsnow/template
+++ b/srcpkgs/xsnow/template
@@ -1,23 +1,14 @@
 # Template file for 'xsnow'
 pkgname=xsnow
-version=1.42
-revision=3
-hostmakedepends="imake xorg-cf-files"
-makedepends="libXext-devel libXpm-devel libXt-devel"
+version=3.4.2
+revision=1
+archs="i686 x86_64*"
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="libXext-devel libXpm-devel libXt-devel libX11-devel gtk+3-devel"
 short_desc="Snow for your X11 sessions"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="custom:xsnow"
-homepage="https://janswaal.home.xs4all.nl/Xsnow"
-distfiles="https://janswaal.home.xs4all.nl/Xsnow/${pkgname}-${version}.tar.gz"
-checksum=d0d7c8f1fb91ca096995b1c30797e8f443c2e97d6f1e5f574b31318ed05d561a
-repository=nonfree
-nocross=yes  # imake
-
-do_build() {
-	xmkmf
-	make CC=$CC CDEBUGFLAGS="-D_DEFAULT_SOURCE ${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}"
-}
-do_install() {
-	make MANSUFFIX=1 DESTDIR=${DESTDIR} install install.man
-	vlicense README
-}
+license="GPL-3.0-or-later"
+homepage="https://ratrabbit.nl/ratrabbit/xsnow/index.html"
+distfiles="https://ratrabbit.nl/downloads/xsnow/${pkgname}-${version}.tar.gz"
+checksum=c618d7a73cef7070755f38ddc3665487afa8c71a9c82ae9055723e594a62fd9e

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR REVIEW] xsnow: update to 3.4.2
  2021-12-26 20:11 [PR PATCH] xsnow: update to 3.4.2 kawaiiamber
                   ` (4 preceding siblings ...)
  2021-12-26 20:50 ` [PR PATCH] [Updated] " kawaiiamber
@ 2021-12-27  4:55 ` abenson
  2021-12-27  5:21 ` kawaiiamber
                   ` (10 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: abenson @ 2021-12-27  4:55 UTC (permalink / raw)
  To: ml

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34709#discussion_r775336530

Comment:
Why are arches limited?

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR REVIEW] xsnow: update to 3.4.2
  2021-12-26 20:11 [PR PATCH] xsnow: update to 3.4.2 kawaiiamber
                   ` (5 preceding siblings ...)
  2021-12-27  4:55 ` [PR REVIEW] " abenson
@ 2021-12-27  5:21 ` kawaiiamber
  2021-12-30 14:29 ` leahneukirchen
                   ` (9 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: kawaiiamber @ 2021-12-27  5:21 UTC (permalink / raw)
  To: ml

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

New review comment by kawaiiamber on void-packages repository

https://github.com/void-linux/void-packages/pull/34709#discussion_r775341573

Comment:
Builds fail on other archs.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR REVIEW] xsnow: update to 3.4.2
  2021-12-26 20:11 [PR PATCH] xsnow: update to 3.4.2 kawaiiamber
                   ` (6 preceding siblings ...)
  2021-12-27  5:21 ` kawaiiamber
@ 2021-12-30 14:29 ` leahneukirchen
  2021-12-30 15:58 ` Chocimier
                   ` (8 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: leahneukirchen @ 2021-12-30 14:29 UTC (permalink / raw)
  To: ml

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

New review comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/34709#discussion_r776749228

Comment:
Set nocross=yes instead.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR REVIEW] xsnow: update to 3.4.2
  2021-12-26 20:11 [PR PATCH] xsnow: update to 3.4.2 kawaiiamber
                   ` (7 preceding siblings ...)
  2021-12-30 14:29 ` leahneukirchen
@ 2021-12-30 15:58 ` Chocimier
  2021-12-30 23:14 ` kawaiiamber
                   ` (7 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: Chocimier @ 2021-12-30 15:58 UTC (permalink / raw)
  To: ml

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

New review comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/34709#discussion_r776783482

Comment:
```diff
diff --git a/srcpkgs/xsnow/template b/srcpkgs/xsnow/template
index 83ed8f9237..4a60cb0a50 100644
--- a/srcpkgs/xsnow/template
+++ b/srcpkgs/xsnow/template
@@ -2,8 +2,8 @@
 pkgname=xsnow
 version=3.4.2
 revision=1
-archs="i686 x86_64*"
 build_style=gnu-configure
+build_helper=qemu
 hostmakedepends="pkg-config"
 makedepends="libXext-devel libXpm-devel libXt-devel libX11-devel gtk+3-devel"
 short_desc="Snow for your X11 sessions"
@@ -12,3 +12,9 @@ license="GPL-3.0-or-later"
 homepage="https://ratrabbit.nl/ratrabbit/xsnow/index.html"
 distfiles="https://ratrabbit.nl/downloads/xsnow/${pkgname}-${version}.tar.gz"
 checksum=c618d7a73cef7070755f38ddc3665487afa8c71a9c82ae9055723e594a62fd9e
+
+post_patch() {
+       if [ "$CROSS_BUILD" ]; then
+               vsed -e "s:./xsnow -manpage:/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static &:" -i src/Makefile.am src/Makefile.in
+       fi
+}
```

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR REVIEW] xsnow: update to 3.4.2
  2021-12-26 20:11 [PR PATCH] xsnow: update to 3.4.2 kawaiiamber
                   ` (8 preceding siblings ...)
  2021-12-30 15:58 ` Chocimier
@ 2021-12-30 23:14 ` kawaiiamber
  2021-12-31  0:03 ` [PR PATCH] [Updated] " kawaiiamber
                   ` (6 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: kawaiiamber @ 2021-12-30 23:14 UTC (permalink / raw)
  To: ml

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

New review comment by kawaiiamber on void-packages repository

https://github.com/void-linux/void-packages/pull/34709#discussion_r776888873

Comment:
> Set nocross=yes instead.

This will make it not available on musl arch

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] xsnow: update to 3.4.2
  2021-12-26 20:11 [PR PATCH] xsnow: update to 3.4.2 kawaiiamber
                   ` (9 preceding siblings ...)
  2021-12-30 23:14 ` kawaiiamber
@ 2021-12-31  0:03 ` kawaiiamber
  2021-12-31  0:06 ` [PR REVIEW] " kawaiiamber
                   ` (5 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: kawaiiamber @ 2021-12-31  0:03 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by kawaiiamber against master on the void-packages repository

https://github.com/kawaiiamber/void-packages xsnow
https://github.com/void-linux/void-packages/pull/34709

xsnow: update to 3.4.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl) **YES**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl

This repo is actively maintained and GPL-licensed.

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

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

From 8fe1e9204f77f2ca281e15682246fde1a60a424a Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Sun, 26 Dec 2021 13:10:29 -0700
Subject: [PATCH] xsnow: update to 3.4.2

---
 srcpkgs/xsnow/template | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/xsnow/template b/srcpkgs/xsnow/template
index 965986d92842..879019e0f60c 100644
--- a/srcpkgs/xsnow/template
+++ b/srcpkgs/xsnow/template
@@ -1,23 +1,21 @@
 # Template file for 'xsnow'
 pkgname=xsnow
-version=1.42
-revision=3
-hostmakedepends="imake xorg-cf-files"
-makedepends="libXext-devel libXpm-devel libXt-devel"
+version=3.4.2
+revision=1
+build_style=gnu-configure
+build_helper=qemu
+hostmakedepends="pkg-config"
+makedepends="libXext-devel libXpm-devel libXt-devel libX11-devel gtk+3-devel"
 short_desc="Snow for your X11 sessions"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="custom:xsnow"
-homepage="https://janswaal.home.xs4all.nl/Xsnow"
-distfiles="https://janswaal.home.xs4all.nl/Xsnow/${pkgname}-${version}.tar.gz"
-checksum=d0d7c8f1fb91ca096995b1c30797e8f443c2e97d6f1e5f574b31318ed05d561a
-repository=nonfree
-nocross=yes  # imake
+license="GPL-3.0-or-later"
+homepage="https://ratrabbit.nl/ratrabbit/xsnow/index.html"
+distfiles="https://ratrabbit.nl/downloads/xsnow/${pkgname}-${version}.tar.gz"
+checksum=c618d7a73cef7070755f38ddc3665487afa8c71a9c82ae9055723e594a62fd9e
 
-do_build() {
-	xmkmf
-	make CC=$CC CDEBUGFLAGS="-D_DEFAULT_SOURCE ${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}"
-}
 do_install() {
-	make MANSUFFIX=1 DESTDIR=${DESTDIR} install install.man
-	vlicense README
+	vbin src/xsnow
+	vman src/xsnow.6
+	vinstall src/Pixmaps/xsnow.svg 644 /usr/share/pixmaps
+	vinstall data/xsnow.desktop 644 /usr/share/applications
 }

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR REVIEW] xsnow: update to 3.4.2
  2021-12-26 20:11 [PR PATCH] xsnow: update to 3.4.2 kawaiiamber
                   ` (10 preceding siblings ...)
  2021-12-31  0:03 ` [PR PATCH] [Updated] " kawaiiamber
@ 2021-12-31  0:06 ` kawaiiamber
  2021-12-31  0:12 ` kawaiiamber
                   ` (4 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: kawaiiamber @ 2021-12-31  0:06 UTC (permalink / raw)
  To: ml

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

New review comment by kawaiiamber on void-packages repository

https://github.com/void-linux/void-packages/pull/34709#discussion_r776895358

Comment:
Since the ONLY thing in `/usr/games` is xsnow, I updated with a `do_install` to just install things in sane places. I don't quite get the post_patch menthod posted above.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR REVIEW] xsnow: update to 3.4.2
  2021-12-26 20:11 [PR PATCH] xsnow: update to 3.4.2 kawaiiamber
                   ` (11 preceding siblings ...)
  2021-12-31  0:06 ` [PR REVIEW] " kawaiiamber
@ 2021-12-31  0:12 ` kawaiiamber
  2021-12-31  0:16 ` [PR PATCH] [Updated] " kawaiiamber
                   ` (3 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: kawaiiamber @ 2021-12-31  0:12 UTC (permalink / raw)
  To: ml

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

New review comment by kawaiiamber on void-packages repository

https://github.com/void-linux/void-packages/pull/34709#discussion_r776888873

Comment:
> Set nocross=yes instead.

Would this make it unavailable to musl machines? The Manual.md doesn't seem to state if musl is included in crossbuild so idk.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] xsnow: update to 3.4.2
  2021-12-26 20:11 [PR PATCH] xsnow: update to 3.4.2 kawaiiamber
                   ` (12 preceding siblings ...)
  2021-12-31  0:12 ` kawaiiamber
@ 2021-12-31  0:16 ` kawaiiamber
  2021-12-31  0:17 ` kawaiiamber
                   ` (2 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: kawaiiamber @ 2021-12-31  0:16 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by kawaiiamber against master on the void-packages repository

https://github.com/kawaiiamber/void-packages xsnow
https://github.com/void-linux/void-packages/pull/34709

xsnow: update to 3.4.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl) **YES**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl

This repo is actively maintained and GPL-licensed.

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

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

From 17c0e52f208717ab0494d63d2d66e8e9800f190a Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Sun, 26 Dec 2021 13:10:29 -0700
Subject: [PATCH] xsnow: update to 3.4.2

---
 srcpkgs/xsnow/template | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/xsnow/template b/srcpkgs/xsnow/template
index 965986d92842..bfd453683ebb 100644
--- a/srcpkgs/xsnow/template
+++ b/srcpkgs/xsnow/template
@@ -1,23 +1,27 @@
 # Template file for 'xsnow'
 pkgname=xsnow
-version=1.42
-revision=3
-hostmakedepends="imake xorg-cf-files"
-makedepends="libXext-devel libXpm-devel libXt-devel"
+version=3.4.2
+revision=1
+build_style=gnu-configure
+build_helper=qemu
+hostmakedepends="pkg-config"
+makedepends="libXext-devel libXpm-devel libXt-devel libX11-devel gtk+3-devel"
 short_desc="Snow for your X11 sessions"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="custom:xsnow"
-homepage="https://janswaal.home.xs4all.nl/Xsnow"
-distfiles="https://janswaal.home.xs4all.nl/Xsnow/${pkgname}-${version}.tar.gz"
-checksum=d0d7c8f1fb91ca096995b1c30797e8f443c2e97d6f1e5f574b31318ed05d561a
-repository=nonfree
-nocross=yes  # imake
+license="GPL-3.0-or-later"
+homepage="https://ratrabbit.nl/ratrabbit/xsnow/index.html"
+distfiles="https://ratrabbit.nl/downloads/xsnow/${pkgname}-${version}.tar.gz"
+checksum=c618d7a73cef7070755f38ddc3665487afa8c71a9c82ae9055723e594a62fd9e
 
-do_build() {
-	xmkmf
-	make CC=$CC CDEBUGFLAGS="-D_DEFAULT_SOURCE ${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}"
+pre_build() {
+       if [ "$CROSS_BUILD" ]; then
+               vsed -e "s:./xsnow -manpage:/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static &:" -i src/Makefile.am src/Makefile.in
+       fi
 }
+
 do_install() {
-	make MANSUFFIX=1 DESTDIR=${DESTDIR} install install.man
-	vlicense README
+	vbin src/xsnow
+	vman src/xsnow.6
+	vinstall src/Pixmaps/xsnow.svg 644 /usr/share/pixmaps
+	vinstall data/xsnow.desktop 644 /usr/share/applications
 }

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] xsnow: update to 3.4.2
  2021-12-26 20:11 [PR PATCH] xsnow: update to 3.4.2 kawaiiamber
                   ` (13 preceding siblings ...)
  2021-12-31  0:16 ` [PR PATCH] [Updated] " kawaiiamber
@ 2021-12-31  0:17 ` kawaiiamber
  2021-12-31  0:18 ` [PR REVIEW] " kawaiiamber
  2022-01-01 17:37 ` [PR PATCH] [Merged]: " leahneukirchen
  16 siblings, 0 replies; 18+ messages in thread
From: kawaiiamber @ 2021-12-31  0:17 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by kawaiiamber against master on the void-packages repository

https://github.com/kawaiiamber/void-packages xsnow
https://github.com/void-linux/void-packages/pull/34709

xsnow: update to 3.4.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl) **YES**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl

This repo is actively maintained and GPL-licensed.

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

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

From 913c79719c2d83fb6f3dacad01da1ea750c34bb0 Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Sun, 26 Dec 2021 13:10:29 -0700
Subject: [PATCH] xsnow: update to 3.4.2

---
 srcpkgs/xsnow/template | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/xsnow/template b/srcpkgs/xsnow/template
index 965986d92842..aa5ed301a29c 100644
--- a/srcpkgs/xsnow/template
+++ b/srcpkgs/xsnow/template
@@ -1,23 +1,27 @@
 # Template file for 'xsnow'
 pkgname=xsnow
-version=1.42
-revision=3
-hostmakedepends="imake xorg-cf-files"
-makedepends="libXext-devel libXpm-devel libXt-devel"
+version=3.4.2
+revision=1
+build_style=gnu-configure
+build_helper=qemu
+hostmakedepends="pkg-config"
+makedepends="libXext-devel libXpm-devel libXt-devel libX11-devel gtk+3-devel"
 short_desc="Snow for your X11 sessions"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="custom:xsnow"
-homepage="https://janswaal.home.xs4all.nl/Xsnow"
-distfiles="https://janswaal.home.xs4all.nl/Xsnow/${pkgname}-${version}.tar.gz"
-checksum=d0d7c8f1fb91ca096995b1c30797e8f443c2e97d6f1e5f574b31318ed05d561a
-repository=nonfree
-nocross=yes  # imake
+license="GPL-3.0-or-later"
+homepage="https://ratrabbit.nl/ratrabbit/xsnow/index.html"
+distfiles="https://ratrabbit.nl/downloads/xsnow/${pkgname}-${version}.tar.gz"
+checksum=c618d7a73cef7070755f38ddc3665487afa8c71a9c82ae9055723e594a62fd9e
 
-do_build() {
-	xmkmf
-	make CC=$CC CDEBUGFLAGS="-D_DEFAULT_SOURCE ${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}"
+pre_build() {
+	if [ "$CROSS_BUILD" ]; then
+		vsed -e "s:./xsnow -manpage:/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static &:" -i src/Makefile.am src/Makefile.in
+	fi
 }
+
 do_install() {
-	make MANSUFFIX=1 DESTDIR=${DESTDIR} install install.man
-	vlicense README
+	vbin src/xsnow
+	vman src/xsnow.6
+	vinstall src/Pixmaps/xsnow.svg 644 /usr/share/pixmaps
+	vinstall data/xsnow.desktop 644 /usr/share/applications
 }

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR REVIEW] xsnow: update to 3.4.2
  2021-12-26 20:11 [PR PATCH] xsnow: update to 3.4.2 kawaiiamber
                   ` (14 preceding siblings ...)
  2021-12-31  0:17 ` kawaiiamber
@ 2021-12-31  0:18 ` kawaiiamber
  2022-01-01 17:37 ` [PR PATCH] [Merged]: " leahneukirchen
  16 siblings, 0 replies; 18+ messages in thread
From: kawaiiamber @ 2021-12-31  0:18 UTC (permalink / raw)
  To: ml

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

New review comment by kawaiiamber on void-packages repository

https://github.com/void-linux/void-packages/pull/34709#discussion_r776896763

Comment:
I feel like it might make more sense for the cross-build `vsed` to be ran in `pre_build`.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Merged]: xsnow: update to 3.4.2
  2021-12-26 20:11 [PR PATCH] xsnow: update to 3.4.2 kawaiiamber
                   ` (15 preceding siblings ...)
  2021-12-31  0:18 ` [PR REVIEW] " kawaiiamber
@ 2022-01-01 17:37 ` leahneukirchen
  16 siblings, 0 replies; 18+ messages in thread
From: leahneukirchen @ 2022-01-01 17:37 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

xsnow: update to 3.4.2
https://github.com/void-linux/void-packages/pull/34709

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl) **YES**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl

This repo is actively maintained and GPL-licensed.

^ permalink raw reply	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2022-01-01 17:37 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-26 20:11 [PR PATCH] xsnow: update to 3.4.2 kawaiiamber
2021-12-26 20:28 ` kawaiiamber
2021-12-26 20:34 ` kawaiiamber
2021-12-26 20:42 ` kawaiiamber
2021-12-26 20:44 ` kawaiiamber
2021-12-26 20:50 ` [PR PATCH] [Updated] " kawaiiamber
2021-12-27  4:55 ` [PR REVIEW] " abenson
2021-12-27  5:21 ` kawaiiamber
2021-12-30 14:29 ` leahneukirchen
2021-12-30 15:58 ` Chocimier
2021-12-30 23:14 ` kawaiiamber
2021-12-31  0:03 ` [PR PATCH] [Updated] " kawaiiamber
2021-12-31  0:06 ` [PR REVIEW] " kawaiiamber
2021-12-31  0:12 ` kawaiiamber
2021-12-31  0:16 ` [PR PATCH] [Updated] " kawaiiamber
2021-12-31  0:17 ` kawaiiamber
2021-12-31  0:18 ` [PR REVIEW] " kawaiiamber
2022-01-01 17:37 ` [PR PATCH] [Merged]: " leahneukirchen

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