[PR PATCH] wf-shell: update to 0.4.0.

[PR PATCH] wf-shell: update to 0.4.0.

[mobinmob]

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

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

https://github.com/mobinmob/void-packages wf-shell
https://github.com/void-linux/void-packages/pull/20592

wf-shell: update to 0.4.0.


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

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

From 10e9b87cab1b6f000f2f519a390867c2de0e106b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 3 Apr 2020 13:43:12 +0300
Subject: [PATCH] wf-shell: update to 0.4.0.

---
 srcpkgs/wf-shell/template | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/wf-shell/template b/srcpkgs/wf-shell/template
index d293f9dfe16..c4ef1bbbad0 100644
--- a/srcpkgs/wf-shell/template
+++ b/srcpkgs/wf-shell/template
@@ -1,35 +1,19 @@
 # Template file for 'wf-shell'
 pkgname=wf-shell
-version=0.3
+version=0.4.0
 revision=1
-_gtklayershell_hash="d1f9d94be32f8cc61c0a53af7558146570f0fa9f"
-_gvc_hash="468022b708fc1a56154f3b0cc5af3b938fb3e9fb"
-create_wrksrc=yes
-build_wrksrc=${pkgname}-${version}
 build_style=meson
 build_helper="gir"
 hostmakedepends="gobject-introspection pkg-config wayland-devel"
 makedepends="alsa-lib-devel pulseaudio-devel gtkmm-devel
  gtk+3-devel libevdev-devel wlroots-devel wf-config-devel
- xcb-util-errors-devel xcb-util-wm-devel"
+ xcb-util-errors-devel xcb-util-wm-devel glm wayfire"
 short_desc="Wayfire shell with GTK-based panel and background client"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="MIT"
 homepage="https://wayfire.org"
-distfiles="https://github.com/WayfireWM/wf-shell/archive/${version}.tar.gz
- https://github.com/wmww/gtk-layer-shell/archive/${_gtklayershell_hash}.tar.gz
- https://github.com/GNOME/libgnome-volume-control/archive/${_gvc_hash}.tar.gz"
-checksum="326c732415a10215997c0915741fd561a306412327fae123eab67f1af9ee41de
- 0b66a943375e3c8f597ca293f8e0ca0cfa585163ed5a7dfb7956c02147c40c17
- 3ab63b0073bf21cab80b3974c9f6aa969ff1a4c4911aae6a09681c7d1b2b785f"
-
-post_extract() {
-	_gtklayershell_dir="${build_wrksrc}/subprojects/gtk-layer-shell"
-	_gvc_dir="${build_wrksrc}/subprojects/gvc"
-	rmdir ${_gtklayershell_dir} ${_gvc_dir}
-	mv gtk-layer-shell-${_gtklayershell_hash} ${_gtklayershell_dir}
-	mv libgnome-volume-control-${_gvc_hash} ${_gvc_dir}
-}
+distfiles="https://github.com/WayfireWM/wf-shell/releases/download/${version}/wf-shell-${version}.tar.xz"
+checksum="bc03e5232d72f69bf6ba634f688f5e896715d846b7b6344136e9eb88dd6a9aa0"
 
 post_install() {
 	vlicense LICENSE

Re: wf-shell: update to 0.4.0.

[travankor]

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

New comment by travankor on void-packages repository

https://github.com/void-linux/void-packages/pull/20592#issuecomment-608958427

Comment:
You should remove the shlib entry for wf-shell.

Re: wf-shell: update to 0.4.0.

[travankor]

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

New comment by travankor on void-packages repository

https://github.com/void-linux/void-packages/pull/20592#issuecomment-608958427

Comment:
You should remove the shlib entry for wf-shell, too.

Re: [PR PATCH] [Updated] wf-shell: update to 0.4.0.

[mobinmob]

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

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

https://github.com/mobinmob/void-packages wf-shell
https://github.com/void-linux/void-packages/pull/20592

wf-shell: update to 0.4.0.


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

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

From ada2aa4e5275fb905937151a32c65f9b67f01459 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 3 Apr 2020 13:43:12 +0300
Subject: [PATCH] wf-shell: update to 0.4.0.

---
 common/shlibs             |  1 -
 srcpkgs/wf-shell/template | 24 ++++--------------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 14e6c812fe2..63261060470 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3830,7 +3830,6 @@ libjsonnet.so.0 jsonnet-0.14.0_2
 libjsonnet++.so.0 jsonnet-0.14.0_2
 libigdgmm.so.11 intel-gmmlib-19.4.1_1
 libgtk-layer-shell.so.0 gtk-layer-shell-0.1.0_1
-libgtk-layer-shell.so.0 wf-shell-0.3_1
 librdkafka.so.1 librdkafka-1.3.0_1
 librdkafka++.so.1 librdkafka-1.3.0_1
 libco.so.0 libco-20_1
diff --git a/srcpkgs/wf-shell/template b/srcpkgs/wf-shell/template
index d293f9dfe16..c4ef1bbbad0 100644
--- a/srcpkgs/wf-shell/template
+++ b/srcpkgs/wf-shell/template
@@ -1,35 +1,19 @@
 # Template file for 'wf-shell'
 pkgname=wf-shell
-version=0.3
+version=0.4.0
 revision=1
-_gtklayershell_hash="d1f9d94be32f8cc61c0a53af7558146570f0fa9f"
-_gvc_hash="468022b708fc1a56154f3b0cc5af3b938fb3e9fb"
-create_wrksrc=yes
-build_wrksrc=${pkgname}-${version}
 build_style=meson
 build_helper="gir"
 hostmakedepends="gobject-introspection pkg-config wayland-devel"
 makedepends="alsa-lib-devel pulseaudio-devel gtkmm-devel
  gtk+3-devel libevdev-devel wlroots-devel wf-config-devel
- xcb-util-errors-devel xcb-util-wm-devel"
+ xcb-util-errors-devel xcb-util-wm-devel glm wayfire"
 short_desc="Wayfire shell with GTK-based panel and background client"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="MIT"
 homepage="https://wayfire.org"
-distfiles="https://github.com/WayfireWM/wf-shell/archive/${version}.tar.gz
- https://github.com/wmww/gtk-layer-shell/archive/${_gtklayershell_hash}.tar.gz
- https://github.com/GNOME/libgnome-volume-control/archive/${_gvc_hash}.tar.gz"
-checksum="326c732415a10215997c0915741fd561a306412327fae123eab67f1af9ee41de
- 0b66a943375e3c8f597ca293f8e0ca0cfa585163ed5a7dfb7956c02147c40c17
- 3ab63b0073bf21cab80b3974c9f6aa969ff1a4c4911aae6a09681c7d1b2b785f"
-
-post_extract() {
-	_gtklayershell_dir="${build_wrksrc}/subprojects/gtk-layer-shell"
-	_gvc_dir="${build_wrksrc}/subprojects/gvc"
-	rmdir ${_gtklayershell_dir} ${_gvc_dir}
-	mv gtk-layer-shell-${_gtklayershell_hash} ${_gtklayershell_dir}
-	mv libgnome-volume-control-${_gvc_hash} ${_gvc_dir}
-}
+distfiles="https://github.com/WayfireWM/wf-shell/releases/download/${version}/wf-shell-${version}.tar.xz"
+checksum="bc03e5232d72f69bf6ba634f688f5e896715d846b7b6344136e9eb88dd6a9aa0"
 
 post_install() {
 	vlicense LICENSE

Re: [PR PATCH] [Merged]: wf-shell: update to 0.4.0.

[xtraeme]

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

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

wf-shell: update to 0.4.0.
https://github.com/void-linux/void-packages/pull/20592

Description:

Re: wf-shell: update to 0.4.0.

[maciozo]

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

New comment by maciozo on void-packages repository

https://github.com/void-linux/void-packages/pull/20592#issuecomment-609994703

Comment:
`wf-shell` wouldn't update for me without installing `gtk-layer-shell`

Re: wf-shell: update to 0.4.0.

[xtraeme]

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/20592#issuecomment-609997724

Comment:
provide logs

Re: wf-shell: update to 0.4.0.

[xtraeme]

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/20592#issuecomment-609997905

Comment:
```
[juan@leysa void-packages]$ xbps-install -n wf-shell
gtk-layer-shell-0.1.0_1 install x86_64-musl https://alpha.de.repo.voidlinux.org/current/musl 46502 17049
wf-config-0.4.0_2 install x86_64-musl https://alpha.de.repo.voidlinux.org/current/musl 203997 77553
wf-shell-0.4.0_1 install x86_64-musl https://alpha.de.repo.voidlinux.org/current/musl 6749957 6200630
[juan@leysa void-packages]$
```

Re: wf-shell: update to 0.4.0.

[maciozo]

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

New comment by maciozo on void-packages repository

https://github.com/void-linux/void-packages/pull/20592#issuecomment-609999956

Comment:
```
xi -Su
[...]
wf-shell-0.4.0_1: collecting files...
ERROR: wf-shell-0.4.0_1: file `/usr/lib/girepository-1.0/GtkLayerShell-0.1.typelib' already installed by package gtk-layer-shell-0.1.0_1.
ERROR: wf-shell-0.4.0_1: file `/usr/lib/libgtk-layer-shell.so.0.1.0' already installed by package gtk-layer-shell-0.1.0_1.
ERROR: wf-shell-0.4.0_1: file `/usr/lib/libgtk-layer-shell.so.0' already installed by package gtk-layer-shell-0.1.0_1.
Transaction failed! see above for errors.

~
❯ sudo xbps-remove -R gtk-layer-shell
Package `gtk-layer-shell' is not currently installed.
```

```
❯ xi gtk-layer-shell
[...]
gtk-layer-shell-0.1.0_1: configuring ...
gtk-layer-shell-0.1.0_1: installed successfully.
```

```
❯ xi -Su
[...]
weechat-python-2.8_2: updated successfully.
wf-shell-0.4.0_1: configuring ...
wf-shell-0.4.0_1: updated successfully.
xxd-8.2.0496_1: configuring ...
xxd-8.2.0496_1: updated successfully.

0 downloaded, 0 installed, 14 updated, 14 configured, 0 removed.
```

Re: wf-shell: update to 0.4.0.

[xtraeme]

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/20592#issuecomment-610000720

Comment:
open a proper issue