mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-19 00:13:33 +00:00
Code Issues Releases Activity

x11-wm/wayfire: update to 0.5.0

Browse Source 
Changes:	https://github.com/WayfireWM/wayfire/compare/0.4.0...0.5.0
Changes:	https://github.com/WayfireWM/wf-config/compare/0.4.1...0.5.0
Changes:	https://github.com/WayfireWM/wf-shell/compare/0.4.0...0.5.0
Changes:	https://github.com/WayfireWM/wcm/compare/v0.4.0...v0.5.0
Reported by:	GitHub (watch releases)
This commit is contained in:
Jan Beich 2020-08-04 20:35:09 +00:00
parent a723e92f56
commit 4f24e7e3ed
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=544185
14 changed files with 107 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devel/wf-config/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= wf-config
DISTVERSION= 0.4.1
DISTVERSION= 0.5.0
CATEGORIES= devel
MAINTAINER= jbeich@FreeBSD.org

6
devel/wf-config/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1592750775
SHA256 (WayfireWM-wf-config-0.4.1_GH0.tar.gz) = 32a08c9b9043581cdbd7e85c43d30f893d149bb5054e143ee772f1b041201129
SIZE (WayfireWM-wf-config-0.4.1_GH0.tar.gz) = 78849
TIMESTAMP = 1596262861
SHA256 (WayfireWM-wf-config-0.5.0_GH0.tar.gz) = bf690477ff0d8928ddeca6a278b9153a39ade1e13fd32cc6d04552db4d65cbf0
SIZE (WayfireWM-wf-config-0.5.0_GH0.tar.gz) = 78958

4
devel/wf-config/pkg-plist
View File

@ -11,6 +11,6 @@ include/wayfire/util/duration.hpp
include/wayfire/util/log.hpp
include/wayfire/util/stringify.hpp
lib/libwf-config.so
lib/libwf-config.so.0
lib/libwf-config.so.0.4.1
lib/libwf-config.so.1
lib/libwf-config.so.0.5.0
libdata/pkgconfig/wf-config.pc

22
x11-wm/wayfire/Makefile
View File

@ -1,13 +1,9 @@
# $FreeBSD$
PORTNAME= wayfire
DISTVERSION= 0.4.0
PORTREVISION= 2
DISTVERSION= 0.5.0
CATEGORIES= x11-wm
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES+= e5b6f1245709.patch:-p1 # https://github.com/WayfireWM/wayfire/pull/472
MAINTAINER= jbeich@FreeBSD.org
COMMENT= 3D Wayland compositor
@ -15,7 +11,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
wf-config>=0.4.0<0.5.0:devel/wf-config \
wf-config>=0.5.0<0.6.0:devel/wf-config \
${LOCALBASE}/include/xf86drmMode.h:graphics/libdrm \
wayland-protocols>=1.12:graphics/wayland-protocols \
glm>=0.9.8:math/glm \
@ -34,12 +30,22 @@ USE_GL= egl glesv2
USE_GNOME= cairo
USE_XORG= pixman
GH_ACCOUNT= WayfireWM
GH_TUPLE= WayfireWM:wf-utils:f9b5eba:wfutils/subprojects/wf-utils
OPTIONS_DEFINE= SUID
OPTIONS_DEFAULT=SUID
OPTIONS_DEFINE= SUID X11
OPTIONS_DEFAULT=SUID X11
SUID_DESC= setuid bit on "${PORTNAME}" binary (required for DRM session)
SUID_PLIST_SUB= MAYBE_SUID="@(,,4755) "
SUID_PLIST_SUB_OFF= MAYBE_SUID=""
X11_USE= XORG=xcb
X11_MESON_ENABLED= xwayland
post-patch:
# Extract (snapshot) version from the port instead of meson.build
@${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \
-e '/project_version/s/@0@/${DISTVERSIONFULL}/' \
${WRKSRC}/meson.build
.include <bsd.port.mk>

10
x11-wm/wayfire/distinfo
View File

@ -1,5 +1,5 @@
TIMESTAMP = 1584817827
SHA256 (WayfireWM-wayfire-0.4.0_GH0.tar.gz) = 9c009c01bccce97149d0695b5429cf44787fdc1423c58425ba8e8de601019e97
SIZE (WayfireWM-wayfire-0.4.0_GH0.tar.gz) = 265360
SHA256 (e5b6f1245709.patch) = 2c0f2c892ba299f84b47c64c96b2bb9704448808f6a8e536050cceb606653203
SIZE (e5b6f1245709.patch) = 1249
TIMESTAMP = 1596567377
SHA256 (WayfireWM-wayfire-0.5.0_GH0.tar.gz) = 24c1a2c963dac5af762f87cd024bc3dd736ec9a28a6735d357a05e8f6502e8aa
SIZE (WayfireWM-wayfire-0.5.0_GH0.tar.gz) = 293982
SHA256 (WayfireWM-wf-utils-f9b5eba_GH0.tar.gz) = 3f11c0335b689508f30d539a60d3c702a7f43c40e4cadcbfccd92970f685fba5
SIZE (WayfireWM-wf-utils-f9b5eba_GH0.tar.gz) = 47279

51
x11-wm/wayfire/files/patch-private-wfutils Normal file
View File

@ -0,0 +1,51 @@
wf-utils is untagged and has no other consumers. Keep it private to
wayfire package for now.
--- meson.build.orig 2020-08-04 18:56:17 UTC
+++ meson.build
@@ -41,7 +41,7 @@ if not use_system_wfconfig
wfconfig = subproject('wf-config').get_variable('wfconfig')
endif
-wfutils = subproject('wf-utils').get_variable('wfutils')
+wfutils = subproject('wf-utils', default_options: ['default_library=static']).get_variable('wfutils')
needs_libinotify = ['freebsd', 'dragonfly'].contains(host_machine.system())
libinotify = dependency('libinotify', required: needs_libinotify)
--- subprojects/wf-utils/meson.build.orig 2020-05-11 09:28:45 UTC
+++ subprojects/wf-utils/meson.build
@@ -34,9 +34,10 @@ lib_wfutils = library('wf-utils',
sources,
dependencies: [],
include_directories: wfutils_inc,
- install: true,
+ install: not meson.is_subproject(),
version: meson.project_version())
+if not meson.is_subproject()
pkgconfig = import('pkgconfig')
pkgconfig.generate(
libraries: lib_wfutils,
@@ -44,6 +45,7 @@ pkgconfig.generate(
filebase: meson.project_name(),
name: meson.project_name(),
description: 'Utilities library for Wayfire')
+endif
install_headers([], subdir: 'wayfire/utils')
@@ -85,12 +87,14 @@ headers_root = [
'wayfire/variant.hpp',
]
+if not meson.is_subproject()
install_headers(headers_action, subdir: 'wayfire/action')
install_headers(headers_condition, subdir: 'wayfire/condition')
install_headers(headers_lexer, subdir: 'wayfire/lexer')
install_headers(headers_parser, subdir: 'wayfire/parser')
install_headers(headers_rule, subdir: 'wayfire/rule')
install_headers(headers_root, subdir: 'wayfire')
+endif
# -------------------------------------------------------------------------------------------------
# Unit tests

147
x11-wm/wayfire/files/patch-wlroots-0.11
View File

@ -1,147 +0,0 @@
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
https://github.com/WayfireWM/wayfire/commit/24c0d2467ce2
--- meson.build.orig 2020-03-21 19:10:27 UTC
+++ 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()
--- src/api/wayfire/core.hpp.orig 2020-03-21 19:10:27 UTC
+++ 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.
--- src/core/core-impl.hpp.orig 2020-03-21 19:10:27 UTC
+++ 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:
--- src/core/core.cpp.orig 2020-03-21 19:10:27 UTC
+++ 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();
}
--- src/core/seat/keyboard.cpp.orig 2020-03-21 19:10:27 UTC
+++ 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;
}
}
--- src/core/seat/pointer.cpp.orig 2020-03-21 19:10:27 UTC
+++ 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,
--- src/view/surface.cpp.orig 2020-03-21 19:10:27 UTC
+++ 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;
}
--- src/view/view-impl.hpp.orig 2020-03-21 19:10:27 UTC
+++ 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();
}
--- src/view/xwayland.cpp.orig 2020-03-21 19:10:27 UTC
+++ 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
}

14
x11-wm/wayfire/pkg-plist
View File

@ -2,12 +2,14 @@
include/wayfire/bindings.hpp
include/wayfire/compositor-surface.hpp
include/wayfire/compositor-view.hpp
include/wayfire/config.h
include/wayfire/core.hpp
include/wayfire/debug.hpp
include/wayfire/decorator.hpp
include/wayfire/geometry.hpp
include/wayfire/img.hpp
include/wayfire/input-device.hpp
include/wayfire/matcher.hpp
include/wayfire/nonstd/noncopyable.hpp
include/wayfire/nonstd/observer_ptr.h
include/wayfire/nonstd/reverse.hpp
@ -18,11 +20,18 @@ include/wayfire/option-wrapper.hpp
include/wayfire/output-layout.hpp
include/wayfire/output.hpp
include/wayfire/plugin.hpp
include/wayfire/plugins/common/cairo-util.hpp
include/wayfire/plugins/common/geometry-animation.hpp
include/wayfire/plugins/common/preview-indication.hpp
include/wayfire/plugins/common/simple-texture.hpp
include/wayfire/plugins/common/view-change-viewport-signal.hpp
include/wayfire/plugins/common/workspace-wall.hpp
include/wayfire/render-manager.hpp
include/wayfire/signal-definitions.hpp
include/wayfire/singleton-plugin.hpp
include/wayfire/surface.hpp
include/wayfire/util.hpp
include/wayfire/view-access-interface.hpp
include/wayfire/view-transform.hpp
include/wayfire/view.hpp
include/wayfire/workspace-manager.hpp
@ -40,7 +49,6 @@ lib/wayfire/libfisheye.so
lib/wayfire/libgrid.so
lib/wayfire/libidle.so
lib/wayfire/libinvert.so
lib/wayfire/libmatcher.so
lib/wayfire/libmove.so
lib/wayfire/liboswitch.so
lib/wayfire/libplace.so
@ -50,6 +58,7 @@ lib/wayfire/libswitcher.so
lib/wayfire/libvswipe.so
lib/wayfire/libvswitch.so
lib/wayfire/libwindow-rules.so
lib/wayfire/libwm-actions.so
lib/wayfire/libwobbly.so
lib/wayfire/libwrot.so
lib/wayfire/libzoom.so
@ -72,7 +81,6 @@ libdata/pkgconfig/wayfire.pc
%%DATADIR%%/metadata/idle.xml
%%DATADIR%%/metadata/input.xml
%%DATADIR%%/metadata/invert.xml
%%DATADIR%%/metadata/matcher.xml
%%DATADIR%%/metadata/move.xml
%%DATADIR%%/metadata/oswitch.xml
%%DATADIR%%/metadata/place.xml
@ -82,7 +90,9 @@ libdata/pkgconfig/wayfire.pc
%%DATADIR%%/metadata/vswipe.xml
%%DATADIR%%/metadata/vswitch.xml
%%DATADIR%%/metadata/window-rules.xml
%%DATADIR%%/metadata/wm-actions.xml
%%DATADIR%%/metadata/wobbly.xml
%%DATADIR%%/metadata/workarounds.xml
%%DATADIR%%/metadata/wrot.xml
%%DATADIR%%/metadata/zoom.xml
%%DATADIR%%/protocols/unstable/wayfire-shell-unstable-v2.xml

6
x11/wcm/Makefile
View File

@ -2,8 +2,7 @@
PORTNAME= wcm
DISTVERSIONPREFIX= v
DISTVERSION= 0.4.0
PORTREVISION= 1
DISTVERSION= 0.5.0
CATEGORIES= x11
MAINTAINER= jbeich@FreeBSD.org
@ -13,7 +12,8 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
wayfire>0:x11-wm/wayfire
wayfire>0:x11-wm/wayfire \
wf-shell>0:x11/wf-shell
LIB_DEPENDS= libevdev.so:devel/libevdev \
libwf-config.so:devel/wf-config \
libwayland-client.so:graphics/wayland

6
x11/wcm/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1584642513
SHA256 (WayfireWM-wcm-v0.4.0_GH0.tar.gz) = 8b03dbc9fad184c8e3277e8f5da68707148b3df9df6e042d848b80ee1c53b701
SIZE (WayfireWM-wcm-v0.4.0_GH0.tar.gz) = 263841
TIMESTAMP = 1596569376
SHA256 (WayfireWM-wcm-v0.5.0_GH0.tar.gz) = 9cfcceefc838c8a0d547f5e40206901b282680da02a96490f756f7ad7da79341
SIZE (WayfireWM-wcm-v0.5.0_GH0.tar.gz) = 253120

9
x11/wcm/pkg-plist
View File

@ -9,16 +9,18 @@ share/icons/hicolor/72x72/apps/wcm.png
share/icons/hicolor/96x96/apps/wcm.png
%%DATADIR%%/icons/plugin-alpha.svg
%%DATADIR%%/icons/plugin-animate.svg
%%DATADIR%%/icons/plugin-annotate.svg
%%DATADIR%%/icons/plugin-autorotate-iio.svg
%%DATADIR%%/icons/plugin-autostart.svg
%%DATADIR%%/icons/plugin-background-view.svg
%%DATADIR%%/icons/plugin-background.svg
%%DATADIR%%/icons/plugin-bench.svg
%%DATADIR%%/icons/plugin-blur.svg
%%DATADIR%%/icons/plugin-command.svg
%%DATADIR%%/icons/plugin-core.svg
%%DATADIR%%/icons/plugin-cube.svg
%%DATADIR%%/icons/plugin-decoration.svg
%%DATADIR%%/icons/plugin-dock.svg
%%DATADIR%%/icons/plugin-example.svg
%%DATADIR%%/icons/plugin-expo.svg
%%DATADIR%%/icons/plugin-fast-switcher.svg
%%DATADIR%%/icons/plugin-fisheye.svg
@ -26,7 +28,8 @@ share/icons/hicolor/96x96/apps/wcm.png
%%DATADIR%%/icons/plugin-idle.svg
%%DATADIR%%/icons/plugin-input.svg
%%DATADIR%%/icons/plugin-invert.svg
%%DATADIR%%/icons/plugin-matcher.svg
%%DATADIR%%/icons/plugin-keycolor.svg
%%DATADIR%%/icons/plugin-mag.svg
%%DATADIR%%/icons/plugin-move.svg
%%DATADIR%%/icons/plugin-oswitch.svg
%%DATADIR%%/icons/plugin-panel.svg
@ -36,8 +39,10 @@ share/icons/hicolor/96x96/apps/wcm.png
%%DATADIR%%/icons/plugin-switcher.svg
%%DATADIR%%/icons/plugin-vswipe.svg
%%DATADIR%%/icons/plugin-vswitch.svg
%%DATADIR%%/icons/plugin-water.svg
%%DATADIR%%/icons/plugin-wobbly.svg
%%DATADIR%%/icons/plugin-workarounds.svg
%%DATADIR%%/icons/plugin-workspace-names.svg
%%DATADIR%%/icons/plugin-wrot.svg
%%DATADIR%%/icons/plugin-zoom.svg
%%DATADIR%%/icons/wcm.png

7
x11/wf-shell/Makefile
View File

@ -1,12 +1,9 @@
# $FreeBSD$
PORTNAME= wf-shell
DISTVERSION= 0.4.0
DISTVERSION= 0.5.0
CATEGORIES= x11
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES+= d86538344ade1.patch:-p1
MAINTAINER= jbeich@FreeBSD.org
COMMENT= GTK3-based panel for wayfire
@ -14,7 +11,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols \
wf-config>=0.4.0:devel/wf-config \
wf-config>=0.5.0:devel/wf-config \
wayfire>0:x11-wm/wayfire
LIB_DEPENDS= libinotify.so:devel/libinotify \
libwf-config.so:devel/wf-config \

8
x11/wf-shell/distinfo
View File

@ -1,7 +1,5 @@
TIMESTAMP = 1584818331
SHA256 (WayfireWM-wf-shell-0.4.0_GH0.tar.gz) = e86ed5e6c01abeec30755423096f094c62e24408ec4bd9c577383c7e01ce8126
SIZE (WayfireWM-wf-shell-0.4.0_GH0.tar.gz) = 8948473
TIMESTAMP = 1596263008
SHA256 (WayfireWM-wf-shell-0.5.0_GH0.tar.gz) = 7e274d46009193129e763e383d2e91b579f4bd1468ed89386a3249f01410b40f
SIZE (WayfireWM-wf-shell-0.5.0_GH0.tar.gz) = 8948762
SHA256 (GNOME-libgnome-volume-control-468022b_GH0.tar.gz) = 1c1d806ad1f57d7f644381b67ee87ef3e7e10f3a2da1432beef535ca50c0040f
SIZE (GNOME-libgnome-volume-control-468022b_GH0.tar.gz) = 45503
SHA256 (d86538344ade1.patch) = 7b75fc65fba06beadc01c691546a79f35286559072fca46981e3b4e7feee8bf7
SIZE (d86538344ade1.patch) = 1074

1
x11/wf-shell/pkg-plist
View File

@ -1,6 +1,7 @@
bin/wf-background
bin/wf-dock
bin/wf-panel
libdata/pkgconfig/wf-shell.pc
%%DATADIR%%/icons/wayfire.png
%%DATADIR%%/metadata/wf-shell/background.xml
%%DATADIR%%/metadata/wf-shell/dock.xml