Compare commits
22 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c98af82a8d | ||
|
|
31f0d25b1a | ||
|
|
b8a0c7ae36 | ||
|
|
d5f4ad0181 | ||
|
|
65eb027f2d | ||
|
|
428d99245b | ||
|
|
725c3b7183 | ||
|
|
0768ff2a0a | ||
|
|
f09a1e35d5 | ||
|
|
e54f724bad | ||
|
|
eee6bd9b2d | ||
|
|
84c00783f7 | ||
|
|
aff3e7645b | ||
|
|
dc8cae1df0 | ||
|
|
3dc0c18e0c | ||
|
|
377d6ba9a8 | ||
|
|
7bec87796e | ||
|
|
0c6f0c7163 | ||
|
|
7b793f1aca | ||
|
|
71a620498b | ||
|
|
7a0c964333 | ||
|
|
053ca76509 |
4 changed files with 78 additions and 64 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -1,2 +1,5 @@
|
|||
/wdisplays-0.9.tar.gz
|
||||
/wdisplays-1.0.tar.gz
|
||||
/wdisplays-1.1.tar.gz
|
||||
/wdisplays-1.1.1.tar.gz
|
||||
/wdisplays-1.1.3.tar.gz
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (wdisplays-1.0.tar.gz) = 876e883747331cf67d351b7afec963d6d52b6fa3870a57ed147acf898a662fb41407b3e835acc167d32de969d4001dbe8429340849ad09a7f7b8bfdabee61e3e
|
||||
SHA512 (wdisplays-1.1.3.tar.gz) = 7260deddb5871359ae9b0133cc9fa2f0b43e43664ff84cd37ad10385c4c2618a3b3303536be060097b982c7d2ab3890392ba9775e01b44281c1b3419256398a8
|
||||
|
|
|
|||
|
|
@ -1,48 +0,0 @@
|
|||
From 657e2966e556c78f121075c69fe1ba8d2b4dcb73 Mon Sep 17 00:00:00 2001
|
||||
From: Simon Ser <contact@emersion.fr>
|
||||
Date: Wed, 8 Jul 2020 11:57:35 +0200
|
||||
Subject: [PATCH] Use correct versions when binding globals
|
||||
|
||||
Changes to protocols aren't forward-compatible. It's not possible to use
|
||||
version n+1 when a client has been designed to work with version n. For
|
||||
instance in wlr-screencopy v5 a new event has been added. Binding to
|
||||
version 5 without upgrading the client leads to libwayland errors
|
||||
because libwayland doesn't know how to handle the event.
|
||||
|
||||
The client needs to maintain its own version requirements.
|
||||
|
||||
Closes: https://github.com/cyclopsian/wdisplays/issues/18
|
||||
---
|
||||
src/outputs.c | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/outputs.c b/src/outputs.c
|
||||
index 9ebf7e5..40410ec 100644
|
||||
--- a/src/outputs.c
|
||||
+++ b/src/outputs.c
|
||||
@@ -534,20 +534,20 @@ static void registry_handle_global(void *data, struct wl_registry *registry,
|
||||
|
||||
if (strcmp(interface, zwlr_output_manager_v1_interface.name) == 0) {
|
||||
state->output_manager = wl_registry_bind(registry, name,
|
||||
- &zwlr_output_manager_v1_interface, version);
|
||||
+ &zwlr_output_manager_v1_interface, 1);
|
||||
zwlr_output_manager_v1_add_listener(state->output_manager,
|
||||
&output_manager_listener, state);
|
||||
} else if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0) {
|
||||
state->xdg_output_manager = wl_registry_bind(registry, name,
|
||||
- &zxdg_output_manager_v1_interface, version);
|
||||
+ &zxdg_output_manager_v1_interface, 3);
|
||||
} else if(strcmp(interface, zwlr_screencopy_manager_v1_interface.name) == 0) {
|
||||
state->copy_manager = wl_registry_bind(registry, name,
|
||||
- &zwlr_screencopy_manager_v1_interface, version);
|
||||
+ &zwlr_screencopy_manager_v1_interface, 1);
|
||||
} else if(strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) {
|
||||
state->layer_shell = wl_registry_bind(registry, name,
|
||||
- &zwlr_layer_shell_v1_interface, version);
|
||||
+ &zwlr_layer_shell_v1_interface, 1);
|
||||
} else if(strcmp(interface, wl_shm_interface.name) == 0) {
|
||||
- state->shm = wl_registry_bind(registry, name, &wl_shm_interface, version);
|
||||
+ state->shm = wl_registry_bind(registry, name, &wl_shm_interface, 1);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1,20 +1,23 @@
|
|||
# -*-Mode: rpm-spec -*-
|
||||
%global app_id network.cycles.wdisplays
|
||||
|
||||
Name: wdisplays
|
||||
Version: 1.0
|
||||
Release: 2%{?dist}
|
||||
Version: 1.1.3
|
||||
Release: 3%{?dist}
|
||||
Summary: GUI display configurator for wlroots compositors
|
||||
License: MIT and GPLv3+ and CC0 and CC-BY-SA
|
||||
URL: https://github.com/cyclopsian/wdisplays
|
||||
# Automatically converted from old format: GPLv3+ - review is highly recommended.
|
||||
License: GPL-3.0-or-later
|
||||
URL: https://github.com/artizirk/wdisplays
|
||||
|
||||
Source: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
Patch: %{url}/pull/20.patch#/use-correct-versions-when-binding-globals.patch
|
||||
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gtk3-devel
|
||||
BuildRequires: meson
|
||||
BuildRequires: wayland-devel
|
||||
BuildRequires: pkgconfig(epoxy)
|
||||
BuildRequires: pkgconfig(gtk+-3.0) >= 3.24
|
||||
BuildRequires: pkgconfig(wayland-client)
|
||||
BuildRequires: pkgconfig(wayland-protocols) >= 1.17
|
||||
|
||||
Conflicts: wlroots < 0.7.0
|
||||
Requires: hicolor-icon-theme
|
||||
|
|
@ -37,23 +40,79 @@ kiosks, digital signage, and other elaborate multi-monitor setups.
|
|||
|
||||
%install
|
||||
%meson_install
|
||||
desktop-file-install --dir %{buildroot}/%{_datadir}/applications \
|
||||
--set-icon %{name} \
|
||||
--set-key=Terminal --set-value=false \
|
||||
--remove-key=Version \
|
||||
--add-category=Settings --add-category=HardwareSettings \
|
||||
%{_target_platform}/resources/network.cycles.%{name}.desktop
|
||||
find %{buildroot}
|
||||
|
||||
desktop-file-validate %{buildroot}%{_datadir}/applications/%{app_id}.desktop
|
||||
|
||||
%files
|
||||
%{_bindir}/%{name}
|
||||
%{_datadir}/applications/*
|
||||
%{_datadir}/icons/*
|
||||
%{_datadir}/applications/%{app_id}.desktop
|
||||
%{_datadir}/icons/hicolor/scalable/apps/%{app_id}.svg
|
||||
|
||||
%doc README.md
|
||||
|
||||
%license LICENSES/*
|
||||
|
||||
%clean
|
||||
|
||||
%changelog
|
||||
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
|
||||
|
||||
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Wed Dec 24 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 1.1.3-1
|
||||
- Update to 1.1.3
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Thu Jul 25 2024 Miroslav Suchý <msuchy@redhat.com> - 1.1.1-5
|
||||
- convert license to SPDX
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Mon Jul 03 2023 Bob Hepple <bob.hepple@gmail.com> - 1.1.1-1
|
||||
- new version
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Fri Jan 28 2022 Bob Hepple <bob.hepple@gmail.com> - 1.1-5
|
||||
- rebuilt to fix FTBFS #2047112
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Thu Jul 29 2021 Bob Hepple <bob.hepple@gmail.com> - 1.1-3
|
||||
- fixed install of .desktop file
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue Apr 20 2021 Bob Hepple <bob.hepple@gmail.com> - 1.1-1
|
||||
- new version, new repo, new license
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jul 15 2020 Aleksei Bavshin <alebastr89@gmail.com> - 1.0-2
|
||||
- Add patch for sway 1.5 compatibility
|
||||
- Remove unnecessary BR: wlroots-devel
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue