aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanct12 <danct12@disroot.org>2020-08-28 00:41:39 +0700
committerLeo <thinkabit.ukim@gmail.com>2020-08-29 18:31:09 +0000
commit1a488ab8dac9dbcb436b6e93ce4c0a89574789a5 (patch)
treeb580ea89707f6c084958cd0e2ef3c794ab4883fc
parentfe08b1b8ac5b01f4345ddb4934c46b0c5354c63a (diff)
downloadaports-1a488ab8dac9dbcb436b6e93ce4c0a89574789a5.tar.gz
aports-1a488ab8dac9dbcb436b6e93ce4c0a89574789a5.tar.bz2
aports-1a488ab8dac9dbcb436b6e93ce4c0a89574789a5.tar.xz
testing/wayfire: upgrade to 0.5.0
Signed-off-by: Danct12 <danct12@disroot.org>
-rw-r--r--testing/wayfire/APKBUILD11
-rw-r--r--testing/wayfire/wlroots_0.11.0.patch149
2 files changed, 4 insertions, 156 deletions
diff --git a/testing/wayfire/APKBUILD b/testing/wayfire/APKBUILD
index 014511b8f3..bf0b6df2c1 100644
--- a/testing/wayfire/APKBUILD
+++ b/testing/wayfire/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Danct12 <danct12@disroot.org>
# Maintainer: Danct12 <danct12@disroot.org>
pkgname=wayfire
-pkgver=0.4.0
-pkgrel=1
+pkgver=0.5.0
+pkgrel=0
pkgdesc="Compiz-clone Wayland compositor"
url="https://wayfire.org"
arch="all"
@@ -19,9 +19,7 @@ makedepends="
"
options="!check" # no testsuite
subpackages="$pkgname-dev"
-source="https://github.com/WayfireWM/wayfire/releases/download/$pkgver/wayfire-$pkgver.tar.xz
- wlroots_0.11.0.patch
- "
+source="https://github.com/WayfireWM/wayfire/releases/download/$pkgver/wayfire-$pkgver.tar.xz"
build() {
abuild-meson \
@@ -38,5 +36,4 @@ package() {
install -Dm644 wayfire.desktop "$pkgdir"/usr/share/wayland-sessions/wayfire.desktop
}
-sha512sums="e96cdb90ce36c005476e08608683983aa167e58aea80fcfd3b24ab0836ec4aa50fb5a7eeb0872a1b1014e3073ed826e1c83d3146b39d3cdb2a8b3a0895155649 wayfire-0.4.0.tar.xz
-9f6682e14495398f02faf72070820e818b14138d9c6d810454d76209c4582f3edaa7c238448fb2c03f5f51a688311d8e7e338f384f7f51caf7f287dde23c093d wlroots_0.11.0.patch"
+sha512sums="9c2d116a5d6e77e37b0e4eef26624d43d6ab3a80e56e19a2de1fdd28a2a522c24b9e346eb4529848f3b2c3668460a51f428a0c196286ec8300e4823250eae811 wayfire-0.5.0.tar.xz"
diff --git a/testing/wayfire/wlroots_0.11.0.patch b/testing/wayfire/wlroots_0.11.0.patch
deleted file mode 100644
index 3bb3e9c199..0000000000
--- a/testing/wayfire/wlroots_0.11.0.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-Thanks to jbeich and FreeBSD:
-https://github.com/freebsd/freebsd-ports/commit/c920e5595b69a5a550bd452015634630a5374822
-
-https://github.com/WayfireWM/wayfire/commit/0d6cecd27799
-https://github.com/WayfireWM/wayfire/commit/187b525c16d1
-https://github.com/WayfireWM/wayfire/commit/29dcd1387700
-https://github.com/WayfireWM/wayfire/commit/0e4e29acb3e9
-
---- a/meson.build.orig 2020-03-21 19:10:27 UTC
-+++ b/meson.build
-@@ -29,7 +29,7 @@ libinput = dependency('libinput', version: '>=1.
- pixman = dependency('pixman-1')
- threads = dependency('threads')
- xkbcommon = dependency('xkbcommon')
--wlroots = dependency('wlroots', version: ['>=0.9.0', '<0.11.0'], required: get_option('use_system_wlroots'))
-+wlroots = dependency('wlroots', version: ['>=0.11.0', '<0.12.0'], required: get_option('use_system_wlroots'))
- wfconfig = dependency('wf-config', version: ['>=0.4.0', '<0.5.0'], required: get_option('use_system_wfconfig'))
-
- use_system_wlroots = not get_option('use_system_wlroots').disabled() and wlroots.found()
---- a/src/api/wayfire/core.hpp.orig 2020-03-21 19:10:27 UTC
-+++ b/src/api/wayfire/core.hpp
-@@ -226,11 +226,12 @@ class compositor_core_t : public wf::object_base_t
- std::string wayland_display;
-
- /**
-- * Return the xwayland display number.
-+ * Return the xwayland display name.
- *
-- * This returns -1 if xwayland is not available
-+ * @return The xwayland display name, or empty string if xwayland is not
-+ * available.
- */
-- virtual int get_xwayland_display() = 0;
-+ virtual std::string get_xwayland_display() = 0;
-
- /**
- * Execute the given command in a bash shell.
---- a/src/core/core-impl.hpp.orig 2020-03-21 19:10:27 UTC
-+++ b/src/core/core-impl.hpp
-@@ -75,7 +75,7 @@ class compositor_core_impl_t : public compositor_core_
- int focus_layer(uint32_t layer, int request) override;
- void unfocus_layer(int request) override;
- uint32_t get_focused_layer() override;
-- int get_xwayland_display() override;
-+ std::string get_xwayland_display() override;
- void run(std::string command) override;
-
- private:
---- a/src/core/core.cpp.orig 2020-03-21 19:10:27 UTC
-+++ b/src/core/core.cpp
-@@ -548,9 +548,8 @@ void wf::compositor_core_impl_t::run(std::string comma
- setenv("_JAVA_AWT_WM_NONREPARENTING", "1", 1);
- setenv("WAYLAND_DISPLAY", wayland_display.c_str(), 1);
- #if WLR_HAS_XWAYLAND
-- if (xwayland_get_display() >= 0) {
-- auto xdisp = ":" + std::to_string(xwayland_get_display());
-- setenv("DISPLAY", xdisp.c_str(), 1);
-+ if (!xwayland_get_display().empty()) {
-+ setenv("DISPLAY", xwayland_get_display().c_str(), 1);
- }
- #endif
- int dev_null = open("/dev/null", O_WRONLY);
-@@ -567,7 +566,7 @@ void wf::compositor_core_impl_t::run(std::string comma
- }
- }
-
--int wf::compositor_core_impl_t::get_xwayland_display()
-+std::string wf::compositor_core_impl_t::get_xwayland_display()
- {
- return xwayland_get_display();
- }
---- a/src/core/seat/keyboard.cpp.orig 2020-03-21 19:10:27 UTC
-+++ b/src/core/seat/keyboard.cpp
-@@ -113,15 +113,20 @@ void input_manager::set_keyboard_focus(wayfire_view vi
- if (!active_grab)
- {
- auto kbd = wlr_seat_get_keyboard(seat);
-- wlr_seat_keyboard_notify_enter(seat, surface,
-- kbd ? kbd->keycodes : NULL,
-- kbd ? kbd->num_keycodes : 0,
-- kbd ? &kbd->modifiers : NULL);
-+ if (surface)
-+ {
-+ wlr_seat_keyboard_notify_enter(seat, surface,
-+ kbd ? kbd->keycodes : NULL,
-+ kbd ? kbd->num_keycodes : 0,
-+ kbd ? &kbd->modifiers : NULL);
-+ } else {
-+ wlr_seat_keyboard_clear_focus(seat);
-+ }
- keyboard_focus = view;
- }
- else
- {
-- wlr_seat_keyboard_notify_enter(seat, NULL, NULL, 0, NULL);
-+ wlr_seat_keyboard_clear_focus(seat);
- keyboard_focus = nullptr;
- }
- }
---- a/src/core/seat/pointer.cpp.orig 2020-03-21 19:10:27 UTC
-+++ b/src/core/seat/pointer.cpp
-@@ -116,7 +116,7 @@ void wf::LogicalPointer::update_cursor_focus(wf::surfa
-
- cursor_focus = focus;
- wlr_surface *next_focus_wlr_surface = nullptr;
-- if (focus && !compositor_surface_from_surface(focus))
-+ if (focus && focus->get_wlr_surface())
- {
- next_focus_wlr_surface = focus->get_wlr_surface();
- wlr_seat_pointer_notify_enter(input->seat, next_focus_wlr_surface,
---- a/src/view/surface.cpp.orig 2020-03-21 19:10:27 UTC
-+++ b/src/view/surface.cpp
-@@ -322,7 +322,7 @@ void wf::wlr_surface_base_t::unmap()
- wlr_buffer* wf::wlr_surface_base_t::get_buffer()
- {
- if (surface && wlr_surface_has_buffer(surface))
-- return surface->buffer;
-+ return &surface->buffer->base;
-
- return nullptr;
- }
---- a/src/view/view-impl.hpp.orig 2020-03-21 19:10:27 UTC
-+++ b/src/view/view-impl.hpp
-@@ -204,7 +204,7 @@ void init_xwayland();
- void init_layer_shell();
-
- void xwayland_set_seat(wlr_seat *seat);
--int xwayland_get_display();
-+std::string xwayland_get_display();
-
- void init_desktop_apis();
- }
---- a/src/view/xwayland.cpp.orig 2020-03-21 19:10:27 UTC
-+++ b/src/view/xwayland.cpp
-@@ -567,11 +567,11 @@ void wf::xwayland_set_seat(wlr_seat *seat)
- #endif
- }
-
--int wf::xwayland_get_display()
-+std::string wf::xwayland_get_display()
- {
- #if WLR_HAS_XWAYLAND
-- return xwayland_handle ? xwayland_handle->display : -1;
-+ return xwayland_handle ? nonull(xwayland_handle->display_name) : "";
- #else
-- return -1;
-+ return "";
- #endif
- }