forked from pool/waybar
Accepting request 1040461 from X11:Wayland
OBS-URL: https://build.opensuse.org/request/show/1040461 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/waybar?expand=0&rev=40
This commit is contained in:
commit
f44e63c7e3
28
0000-replace-gethostbyname-getaddrinfo.patch
Normal file
28
0000-replace-gethostbyname-getaddrinfo.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
diff --git a/src/modules/hyprland/backend.cpp b/src/modules/hyprland/backend.cpp
|
||||||
|
index 76c071c..33212c7 100644
|
||||||
|
--- a/src/modules/hyprland/backend.cpp
|
||||||
|
+++ b/src/modules/hyprland/backend.cpp
|
||||||
|
@@ -132,15 +132,20 @@ void IPC::unregisterForIPC(EventHandler* ev_handler) {
|
||||||
|
|
||||||
|
std::string IPC::getSocket1Reply(const std::string& rq) {
|
||||||
|
// basically hyprctl
|
||||||
|
-
|
||||||
|
+
|
||||||
|
+ struct addrinfo ai_hints;
|
||||||
|
+ struct addrinfo *ai_res = NULL;
|
||||||
|
const auto SERVERSOCKET = socket(AF_UNIX, SOCK_STREAM, 0);
|
||||||
|
|
||||||
|
if (SERVERSOCKET < 0) {
|
||||||
|
spdlog::error("Hyprland IPC: Couldn't open a socket (1)");
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
-
|
||||||
|
- const auto SERVER = gethostbyname("localhost");
|
||||||
|
+
|
||||||
|
+ memset(&ai_hints, 0, sizeof(struct addrinfo));
|
||||||
|
+ ai_hints.ai_family = AF_UNSPEC;
|
||||||
|
+ ai_hints.ai_socktype = SOCK_STREAM;
|
||||||
|
+ const auto SERVER = getaddrinfo("localhost", NULL, &ai_hints, &ai_res);
|
||||||
|
|
||||||
|
if (!SERVER) {
|
||||||
|
spdlog::error("Hyprland IPC: Couldn't get host (2)");
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:818b4469e6a5e19fc27f40a4aee555289c2d89e6dd4f6f0571039f0469b44981
|
|
||||||
size 845836
|
|
3
_service
3
_service
@ -6,11 +6,12 @@
|
|||||||
<param name="versionformat">@PARENT_TAG@</param>
|
<param name="versionformat">@PARENT_TAG@</param>
|
||||||
<param name="versionrewrite-pattern">(.*)</param>
|
<param name="versionrewrite-pattern">(.*)</param>
|
||||||
<param name="changesgenerate">enable</param>
|
<param name="changesgenerate">enable</param>
|
||||||
|
<param name="filename">waybar</param>
|
||||||
</service>
|
</service>
|
||||||
<service name="tar" mode="buildtime"/>
|
<service name="tar" mode="buildtime"/>
|
||||||
<service name="recompress" mode="buildtime">
|
<service name="recompress" mode="buildtime">
|
||||||
<param name="file">*.tar</param>
|
<param name="file">*.tar</param>
|
||||||
<param name="compression">xz</param>
|
<param name="compression">gz</param>
|
||||||
</service>
|
</service>
|
||||||
<service name="set_version" mode="manual"/>
|
<service name="set_version" mode="manual"/>
|
||||||
</services>
|
</services>
|
||||||
|
3
waybar-0.9.16.obscpio
Normal file
3
waybar-0.9.16.obscpio
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:5e62ce31638c135c779173b2e448dd390296c1ce03da6772360be179ba5d9e2b
|
||||||
|
size 845836
|
@ -1,3 +1,30 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Dec 5 19:10:20 UTC 2022 - Filippo Bonazzi <filippo.bonazzi@suse.com>
|
||||||
|
|
||||||
|
- Fix: do not require versioned branding (bsc#1205950)
|
||||||
|
- Add dependency to hhdate library now in Factory
|
||||||
|
- Add _service file back now that we don't need to modify the source tarball
|
||||||
|
- Move to obscpio archive to save space
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Dec 2 13:52:41 UTC 2022 - Soc Virnyl Estela <socvirnyl.estela@gmail.com>
|
||||||
|
|
||||||
|
- Add 0000-replace-gethostbyname-getaddrinfo.patch
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Dec 2 07:54:45 UTC 2022 - Soc Virnyl Estela <socvirnyl.estela@gmail.com>
|
||||||
|
|
||||||
|
- Update specfile and remove deprecated functions.
|
||||||
|
- Improve description to remove rpmlint warnings.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Dec 1 22:42:29 UTC 2022 - Soc Virnyl Estela <socvirnyl.estela@gmail.com>
|
||||||
|
|
||||||
|
- Fix sources on spec file.
|
||||||
|
- Remove service file that was overlooked
|
||||||
|
- Add back the tarball containing the downloaded subprojects
|
||||||
|
- Add wireplumber dependency
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Nov 29 19:15:28 UTC 2022 - Filippo Bonazzi <filippo.bonazzi@suse.com>
|
Tue Nov 29 19:15:28 UTC 2022 - Filippo Bonazzi <filippo.bonazzi@suse.com>
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
name: Waybar
|
name: waybar
|
||||||
version: 0.9.16
|
version: 0.9.16
|
||||||
mtime: 1669318452
|
mtime: 1669318452
|
||||||
commit: 9eb6c4e296d5736565c0434514b709d2bbb3bebe
|
commit: 9eb6c4e296d5736565c0434514b709d2bbb3bebe
|
14
waybar.spec
14
waybar.spec
@ -23,7 +23,8 @@ Summary: Customizable Wayland bar for Sway and Wlroots based compositors
|
|||||||
License: MIT
|
License: MIT
|
||||||
Group: System/GUI/Other
|
Group: System/GUI/Other
|
||||||
URL: https://github.com/Alexays/Waybar
|
URL: https://github.com/Alexays/Waybar
|
||||||
Source: Waybar-%{version}.tar.xz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
|
Patch0: 0000-replace-gethostbyname-getaddrinfo.patch
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
%if 0%{?sle_version} >= 150400
|
%if 0%{?sle_version} >= 150400
|
||||||
BuildRequires: gcc11-c++
|
BuildRequires: gcc11-c++
|
||||||
@ -37,6 +38,8 @@ BuildRequires: pkgconfig
|
|||||||
# test dependency
|
# test dependency
|
||||||
BuildRequires: pkgconfig(catch2) >= 3.0
|
BuildRequires: pkgconfig(catch2) >= 3.0
|
||||||
BuildRequires: sndio-devel >= 1.7.0
|
BuildRequires: sndio-devel >= 1.7.0
|
||||||
|
# date module
|
||||||
|
BuildRequires: hhdate-devel
|
||||||
# optional: man pages
|
# optional: man pages
|
||||||
BuildRequires: scdoc
|
BuildRequires: scdoc
|
||||||
# optional: tray module
|
# optional: tray module
|
||||||
@ -66,12 +69,15 @@ BuildRequires: pkgconfig(wayland-protocols)
|
|||||||
BuildRequires: pkgconfig(wireplumber-0.4)
|
BuildRequires: pkgconfig(wireplumber-0.4)
|
||||||
BuildRequires: pkgconfig(xkbregistry)
|
BuildRequires: pkgconfig(xkbregistry)
|
||||||
# requires branding
|
# requires branding
|
||||||
Requires: %{name}-branding = %{version}
|
# NOTE: unversioned branding is required to avoid issues like bsc#1205950
|
||||||
|
Requires: %{name}-branding
|
||||||
# optional: sway integration
|
# optional: sway integration
|
||||||
Recommends: sway
|
Recommends: sway
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Customizable Wayland bar for Sway and Wlroots based compositors.
|
A customizable Wayland bar for Sway and Wlroots based compositors.
|
||||||
|
It comes with modules for pipewire, alsa, backlight, and bluetooth.
|
||||||
|
Other modules can be found in the manpages of Waybar.
|
||||||
|
|
||||||
%package branding-upstream
|
%package branding-upstream
|
||||||
Summary: Upstream branding of %{name}
|
Summary: Upstream branding of %{name}
|
||||||
@ -88,7 +94,7 @@ BuildArch: noarch
|
|||||||
This package provides the upstream look and feel for sway.
|
This package provides the upstream look and feel for sway.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -n Waybar-%{version}
|
%autosetup -p1 -n waybar-%{version}
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if 0%{?sle_version} >= 150400
|
%if 0%{?sle_version} >= 150400
|
||||||
|
Loading…
Reference in New Issue
Block a user