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

x11-wm/wayfire-plugins-extra: update to 0.8.0

Browse Source 
Changes:	https://github.com/WayfireWM/wayfire-plugins-extra/releases/tag/v0.8.0
Reported by:	GitHub (watch releases)
This commit is contained in:
Jan Beich 2023-10-07 11:36:17 +02:00
parent e2adbb0f90
commit 35cba8ebfe
7 changed files with 44 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
x11-wm/wayfire-plugins-extra/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= wayfire-plugins-extra
DISTVERSIONPREFIX= v
DISTVERSION= 0.7.5
DISTVERSION= 0.8.0
CATEGORIES= x11-wm wayland
MAINTAINER= jbeich@FreeBSD.org
@ -10,42 +10,34 @@ WWW= https://wayfire.org/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN= fails to build after https://github.com/WayfireWM/wayfire/commit/ea80ae3bcb01
BUILD_DEPENDS= wayland-scanner:graphics/wayland \
BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
wayland-scanner:graphics/wayland \
wayland-protocols>0:graphics/wayland-protocols \
wayfire>0:x11-wm/wayfire
LIB_DEPENDS= libwf-config.so:devel/wf-config \
libwayland-server.so:graphics/wayland \
libwlroots.so:x11-toolkits/wlroots
USES= compiler:c++17-lang gnome meson pkgconfig shebangfix
USES= compiler:c++17-lang gnome meson pkgconfig
USE_GITHUB= yes
USE_GITLAB= nodefault
USE_GNOME= cairo glibmm
GH_ACCOUNT= WayfireWM
GH_TUPLE= damianatorrpm:wayfire-plugin_dbus_interface:c705bf1:dbus/subprojects/dbus
GL_TUPLE= wayfireplugins:windecor:6ad31bf:windecor/subprojects/windecor
SHEBANG_FILES= subprojects/dbus/compile-schemas.sh
bash_CMD= ${SH}
GH_TUPLE= timgott:wayfire-shadows:de32395:wayfire_shadows/subprojects/wayfire-shadows
GL_TUPLE= wayfireplugins:focus-request:bc41d54:focus_request/subprojects/focus-request \
wayfireplugins:windecor:f609ac0:windecor/subprojects/windecor
MESON_ARGS= -Denable_focus_request=true -Denable_wayfire_shadows=true
OPTIONS_DEFINE= DBUS LIBRSVG2
OPTIONS_DEFAULT=DBUS LIBRSVG2
OPTIONS_DEFINE= LIBRSVG2
OPTIONS_DEFAULT=LIBRSVG2
OPTIONS_SUB= yes
DBUS_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto
DBUS_USES= xorg
DBUS_USE= XORG=xcb
DBUS_MESON_TRUE= enable_dbus
DBUS_VARS= GLIB_SCHEMAS+=org.wayland.compositor.dbus.gschema.xml
LIBRSVG2_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto
LIBRSVG2_USES= xorg
LIBRSVG2_USE= GNOME=librsvg2 XORG=pixman
LIBRSVG2_USE= GNOME=librsvg2
LIBRSVG2_MESON_TRUE= enable_windecor
post-patch:
# Respect PREFIX for icons
@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
${WRKSRC}/subprojects/windecor/deco-theme.cpp
${WRKSRC}/subprojects/windecor/deco-icontheme.cpp
.include <bsd.port.mk>

16
x11-wm/wayfire-plugins-extra/distinfo
View File

@ -1,7 +1,9 @@
TIMESTAMP = 1669908612
SHA256 (WayfireWM-wayfire-plugins-extra-v0.7.5_GH0.tar.gz) = 70418f29ecf9e3cb9c5313302ded125048d1493d57e4e5146f30363c5c954840
SIZE (WayfireWM-wayfire-plugins-extra-v0.7.5_GH0.tar.gz) = 50246
SHA256 (damianatorrpm-wayfire-plugin_dbus_interface-c705bf1_GH0.tar.gz) = 1eef146ea1077b69aa2ec1afdf51dc1a7831d7661c43b9b10ea68a39b7c50ac3
SIZE (damianatorrpm-wayfire-plugin_dbus_interface-c705bf1_GH0.tar.gz) = 30095
SHA256 (windecor-6ad31bf.tar.bz2) = d6b9c1687c78b8bc2250ceb36b4f07425517972cde6a75d71849c53475036bf0
SIZE (windecor-6ad31bf.tar.bz2) = 15525
TIMESTAMP = 1696671377
SHA256 (WayfireWM-wayfire-plugins-extra-v0.8.0_GH0.tar.gz) = 6871f19c79dc9d9c965229f958da79eebbc7ff54ebc8ba0b97c514aaaf36cd3b
SIZE (WayfireWM-wayfire-plugins-extra-v0.8.0_GH0.tar.gz) = 45089
SHA256 (timgott-wayfire-shadows-de32395_GH0.tar.gz) = 2d6f0c4fc8524d2b4a926955d3f6856c090d08d37b8908979039e6e1291779c8
SIZE (timgott-wayfire-shadows-de32395_GH0.tar.gz) = 11260
SHA256 (focus-request-bc41d54.tar.bz2) = da114547ed0b3ccca593d44e4a01f6d86a45ff284e15610e8e465696e9446da9
SIZE (focus-request-bc41d54.tar.bz2) = 1740
SHA256 (windecor-f609ac0.tar.bz2) = 2b10209bb6e787af69b6115291330c37dfc8f1c39fb9f91a650cf3ad1c586c10
SIZE (windecor-f609ac0.tar.bz2) = 32244

21
x11-wm/wayfire-plugins-extra/files/patch-clang
View File

@ -1,21 +0,0 @@
https://github.com/damianatorrpm/wayfire-plugin_dbus_interface/issues/47
In file included from ../subprojects/dbus/dbus_interface.cpp:45:
../subprojects/dbus/dbus_interface_backend.cpp:1131:34: error: 'core' cannot be captured because it does not have automatic storage duration
idle_call->run_once([core, idle_call] ()
^
../subprojects/dbus/dbus_interface_backend.cpp:59:24: note: 'core' declared here
wf::compositor_core_t& core = wf::get_core();
^
--- subprojects/dbus/dbus_interface_backend.cpp.orig 2020-12-25 14:04:08 UTC
+++ subprojects/dbus/dbus_interface_backend.cpp
@@ -1128,7 +1128,7 @@ handle_method_call (GDBusConnection* connection,
}
wf::wl_idle_call* idle_call = new wf::wl_idle_call;
- idle_call->run_once([core, idle_call] ()
+ idle_call->run_once([idle_call] ()
{
core.set_cursor("crosshair");
delete idle_call;

64
x11-wm/wayfire-plugins-extra/files/patch-glib-2.68
View File

@ -1,64 +0,0 @@
https://github.com/damianatorrpm/wayfire-plugin_dbus_interface/commit/c7cc8e11e7f8
In file included from ../subprojects/dbus/dbus_interface.cpp:12:
In file included from /usr/local/include/glib-2.0/gio/gio.h:26:
In file included from /usr/local/include/glib-2.0/gio/giotypes.h:28:
In file included from /usr/local/include/glib-2.0/gio/gioenums.h:28:
In file included from /usr/local/include/glib-2.0/glib-object.h:22:
In file included from /usr/local/include/glib-2.0/gobject/gbinding.h:28:
In file included from /usr/local/include/glib-2.0/glib.h:32:
In file included from /usr/local/include/glib-2.0/glib/gasyncqueue.h:32:
In file included from /usr/local/include/glib-2.0/glib/gthread.h:32:
In file included from /usr/local/include/glib-2.0/glib/gatomic.h:28:
In file included from /usr/local/include/glib-2.0/glib/glib-typeof.h:39:
In file included from /usr/include/c++/v1/type_traits:420:
/usr/include/c++/v1/cstddef:56:1: error: templates must have C++ linkage
template <class _Tp> struct __libcpp_is_integral { enum { value = 0 }; };
^~~~~~~~~~~~~~~~~~~~
../subprojects/dbus/dbus_interface.cpp:10:1: note: extern "C" language linkage specification begins here
extern "C"
^
--- subprojects/dbus/dbus_interface.cpp.orig 2020-12-25 14:04:08 UTC
+++ subprojects/dbus/dbus_interface.cpp
@@ -9,11 +9,11 @@
extern "C"
{
-#include <gio/gio.h>
#include <sys/socket.h>
#include <sys/types.h>
};
+#include <gio/gio.h>
#include <iostream>
#include <string>
#include <charconv>
--- subprojects/dbus/dbus_interface_backend.cpp.orig 2020-12-25 14:04:08 UTC
+++ subprojects/dbus/dbus_interface_backend.cpp
@@ -16,11 +16,11 @@ extern "C"
// #include <xwayland/xwm.h>
#undef static
#undef class
-#include <gio/gio.h>
#include <sys/socket.h>
#include <wlr/types/wlr_idle.h>
};
+#include <gio/gio.h>
#include <ctime>
#include <iostream>
#include <set>
--- subprojects/dbus/wf-prop.cpp.orig 2020-12-25 14:04:08 UTC
+++ subprojects/dbus/wf-prop.cpp
@@ -6,10 +6,7 @@
#define DBUS_ID "org.wayland.compositor"
#define DBUS_PATH "/org/wayland/compositor"
-extern "C" {
#include <gio/gio.h>
-};
-
#include <giomm/application.h>
#include <giomm/dbusconnection.h>
#include <giomm/dbusproxy.h>

16
x11-wm/wayfire-plugins-extra/files/patch-libc++
View File

@ -1,14 +1,14 @@
../subprojects/windecor/deco-theme.cpp:11:9: fatal error: 'bits/stdc++.h' file not found
#include<bits/stdc++.h>
^~~~~~~~~~~~~~~
../subprojects/windecor/deco-theme.cpp:14:10: fatal error: 'bits/stdc++.h' file not found
#include <bits/stdc++.h>
^~~~~~~~~~~~~~~
--- subprojects/windecor/deco-theme.cpp.orig 2020-12-14 07:51:43 UTC
--- subprojects/windecor/deco-theme.cpp.orig 2023-09-30 05:08:04 UTC
+++ subprojects/windecor/deco-theme.cpp
@@ -8,7 +8,6 @@
@@ -11,7 +11,6 @@
#include <sys/stat.h>
#include <unistd.h>
#include <fstream>
-#include<bits/stdc++.h>
#include "INIReader.h"
-#include <bits/stdc++.h>
typedef struct {
double x;

24
x11-wm/wayfire-plugins-extra/files/patch-wlroots-0.16
View File

@ -1,24 +0,0 @@
https://github.com/damianatorrpm/wayfire-plugin_dbus_interface/issues/50
--- subprojects/dbus/dbus_interface.cpp.orig 2020-12-25 14:04:08 UTC
+++ subprojects/dbus/dbus_interface.cpp
@@ -198,15 +198,15 @@ class dbus_interface_t
#endif
wf::pointf_t cursor_position;
GVariant* signal_data;
- wf::input_event_signal<wlr_event_pointer_button>* wf_ev;
- wlr_event_pointer_button* wlr_signal;
+ wf::input_event_signal<wlr_pointer_button_event>* wf_ev;
+ wlr_pointer_button_event* wlr_signal;
wlr_button_state button_state;
bool button_released;
uint32_t button;
cursor_position = core.get_cursor_position();
- wf_ev = static_cast<wf::input_event_signal<wlr_event_pointer_button>*> (data);
- wlr_signal = static_cast<wlr_event_pointer_button*> (wf_ev->event);
+ wf_ev = static_cast<wf::input_event_signal<wlr_pointer_button_event>*> (data);
+ wlr_signal = static_cast<wlr_pointer_button_event*> (wf_ev->event);
button_state = wlr_signal->state;
button = wlr_signal->button;
button_released = (button_state == WLR_BUTTON_RELEASED);

17
x11-wm/wayfire-plugins-extra/pkg-plist
View File

@ -1,34 +1,45 @@
%%DBUS%%bin/wf-prop
lib/wayfire/libannotate.so
lib/wayfire/libautorotate-iio.so
lib/wayfire/libbackground-view.so
lib/wayfire/libbench.so
lib/wayfire/libcrosshair.so
%%DBUS%%lib/wayfire/libdbus_interface.so
lib/wayfire/libfocus-request.so
lib/wayfire/libfocus-steal-prevent.so
lib/wayfire/libfollow-focus.so
lib/wayfire/libforce-fullscreen.so
lib/wayfire/libglib-main-loop.so
lib/wayfire/libhide-cursor.so
lib/wayfire/libhinge.so
lib/wayfire/libjoin-views.so
lib/wayfire/libkeycolor.so
lib/wayfire/libmag.so
lib/wayfire/libshowrepaint.so
lib/wayfire/libview-shot.so
lib/wayfire/libwater.so
%%LIBRSVG2%%lib/wayfire/libwindecor.so
lib/wayfire/libwinshadows.so
lib/wayfire/libwinzoom.so
lib/wayfire/libworkspace-names.so
%%LIBRSVG2%%share/wayfire/icons/plugin-windecor.svg
share/wayfire/metadata/annotate.xml
share/wayfire/metadata/autorotate-iio.xml
share/wayfire/metadata/background-view.xml
share/wayfire/metadata/bench.xml
share/wayfire/metadata/crosshair.xml
%%DBUS%%share/wayfire/metadata/dbus_interface.xml
share/wayfire/metadata/focus-request.xml
share/wayfire/metadata/focus-steal-prevent.xml
share/wayfire/metadata/follow-focus.xml
share/wayfire/metadata/force-fullscreen.xml
share/wayfire/metadata/hide-cursor.xml
share/wayfire/metadata/hinge.xml
share/wayfire/metadata/join-views.xml
share/wayfire/metadata/keycolor.xml
share/wayfire/metadata/mag.xml
share/wayfire/metadata/showrepaint.xml
share/wayfire/metadata/view-shot.xml
share/wayfire/metadata/water.xml
%%LIBRSVG2%%share/wayfire/metadata/windecor.xml
share/wayfire/metadata/window-zoom.xml
share/wayfire/metadata/winshadows.xml
share/wayfire/metadata/workspace-names.xml
%%LIBRSVG2%%share/wayfire/windecor/executable.svg