svn commit: r528912 - in head: devel/wf-config x11-wm/wayfire x11-wm/wayfire/files x11/wcm x11/wf-shell x11/wf-shell/files
Jan Beich
jbeich at FreeBSD.org
Sun Mar 22 10:45:14 UTC 2020
Author: jbeich
Date: Sun Mar 22 10:45:10 2020
New Revision: 528912
URL: https://svnweb.freebsd.org/changeset/ports/528912
Log:
x11-wm/wayfire: update to 0.4.0
Changes: https://github.com/WayfireWM/wayfire/compare/0.3.1...0.4.0
Changes: https://github.com/WayfireWM/wf-shell/compare/0.3...0.4.0
Changes: https://github.com/WayfireWM/wf-config/compare/0.3...0.4.0
Changes: https://github.com/WayfireWM/wcm/compare/v0.3.1...v0.4.0
Reported by: GitHub (watch releases), portscout
Added:
head/x11/wf-shell/files/
head/x11/wf-shell/files/patch-gtkmm-3.22 (contents, props changed)
Deleted:
head/x11-wm/wayfire/files/
Modified:
head/devel/wf-config/Makefile (contents, props changed)
head/devel/wf-config/distinfo (contents, props changed)
head/devel/wf-config/pkg-plist (contents, props changed)
head/x11-wm/wayfire/Makefile (contents, props changed)
head/x11-wm/wayfire/distinfo (contents, props changed)
head/x11-wm/wayfire/pkg-plist (contents, props changed)
head/x11/wcm/Makefile (contents, props changed)
head/x11/wcm/distinfo (contents, props changed)
head/x11/wcm/pkg-plist (contents, props changed)
head/x11/wf-shell/Makefile (contents, props changed)
head/x11/wf-shell/distinfo (contents, props changed)
head/x11/wf-shell/pkg-plist (contents, props changed)
Modified: head/devel/wf-config/Makefile
==============================================================================
--- head/devel/wf-config/Makefile Sun Mar 22 10:43:44 2020 (r528911)
+++ head/devel/wf-config/Makefile Sun Mar 22 10:45:10 2020 (r528912)
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= wf-config
-DISTVERSION= 0.3
-PORTREVISION= 2
+DISTVERSION= 0.4.0
CATEGORIES= devel
MAINTAINER= jbeich at FreeBSD.org
@@ -12,12 +11,14 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
- wayland-protocols>0:graphics/wayland-protocols
-LIB_DEPENDS= libevdev.so:devel/libevdev \
- libwlroots.so:x11-toolkits/wlroots
+ wayland-protocols>0:graphics/wayland-protocols \
+ glm>0:math/glm
+LIB_DEPENDS= libevdev.so:devel/libevdev
+RUN_DEPENDS= glm>0:math/glm
-USES= compiler:c++11-lib meson pkgconfig
+USES= compiler:c++17-lang gnome meson pkgconfig
USE_GITHUB= yes
+USE_GNOME= libxml2
USE_LDCONFIG= yes
GH_ACCOUNT= WayfireWM
Modified: head/devel/wf-config/distinfo
==============================================================================
--- head/devel/wf-config/distinfo Sun Mar 22 10:43:44 2020 (r528911)
+++ head/devel/wf-config/distinfo Sun Mar 22 10:45:10 2020 (r528912)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1570482362
-SHA256 (WayfireWM-wf-config-0.3_GH0.tar.gz) = 5d1a5038b11a177174b392f3b383d787f568265ce483a5be9178698f548f7c66
-SIZE (WayfireWM-wf-config-0.3_GH0.tar.gz) = 9308
+TIMESTAMP = 1584817349
+SHA256 (WayfireWM-wf-config-0.4.0_GH0.tar.gz) = 78a922074138c2324ed242e8bf5791a599dfc96bbb2ee677685ae43657629333
+SIZE (WayfireWM-wf-config-0.4.0_GH0.tar.gz) = 78813
Modified: head/devel/wf-config/pkg-plist
==============================================================================
--- head/devel/wf-config/pkg-plist Sun Mar 22 10:43:44 2020 (r528911)
+++ head/devel/wf-config/pkg-plist Sun Mar 22 10:45:10 2020 (r528912)
@@ -1,6 +1,16 @@
-include/wayfire/animation.hpp
-include/wayfire/config.hpp
+include/wayfire/config/config-manager.hpp
+include/wayfire/config/file.hpp
+include/wayfire/config/option-types.hpp
+include/wayfire/config/option-wrapper.hpp
+include/wayfire/config/option.hpp
+include/wayfire/config/section.hpp
+include/wayfire/config/types.hpp
+include/wayfire/config/xml.hpp
+include/wayfire/nonstd/optional.hpp
+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.3
+lib/libwf-config.so.0.4.0
libdata/pkgconfig/wf-config.pc
Modified: head/x11-wm/wayfire/Makefile
==============================================================================
--- head/x11-wm/wayfire/Makefile Sun Mar 22 10:43:44 2020 (r528911)
+++ head/x11-wm/wayfire/Makefile Sun Mar 22 10:45:10 2020 (r528912)
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= wayfire
-DISTVERSION= 0.3.1
-PORTREVISION= 1
+DISTVERSION= 0.4.0
CATEGORIES= x11-wm
MAINTAINER= jbeich at FreeBSD.org
@@ -12,6 +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 \
${LOCALBASE}/include/xf86drmMode.h:graphics/libdrm \
wayland-protocols>=1.12:graphics/wayland-protocols \
glm>=0.9.8:math/glm \
@@ -24,7 +24,7 @@ LIB_DEPENDS= libinotify.so:devel/libinotify \
libinput.so:x11/libinput \
libxkbcommon.so:x11/libxkbcommon
-USES= compiler:c++11-lib gl gnome jpeg meson pkgconfig xorg
+USES= compiler:c++17-lang gl gnome jpeg meson pkgconfig xorg
USE_GITHUB= yes
USE_GL= egl glesv2
USE_GNOME= cairo
Modified: head/x11-wm/wayfire/distinfo
==============================================================================
--- head/x11-wm/wayfire/distinfo Sun Mar 22 10:43:44 2020 (r528911)
+++ head/x11-wm/wayfire/distinfo Sun Mar 22 10:45:10 2020 (r528912)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1578035090
-SHA256 (WayfireWM-wayfire-0.3.1_GH0.tar.gz) = e3bf727696f7f089b3474e8f4161e59adaeaa019de191b3e47a4f4663044cd00
-SIZE (WayfireWM-wayfire-0.3.1_GH0.tar.gz) = 238890
+TIMESTAMP = 1584817827
+SHA256 (WayfireWM-wayfire-0.4.0_GH0.tar.gz) = 9c009c01bccce97149d0695b5429cf44787fdc1423c58425ba8e8de601019e97
+SIZE (WayfireWM-wayfire-0.4.0_GH0.tar.gz) = 265360
Modified: head/x11-wm/wayfire/pkg-plist
==============================================================================
--- head/x11-wm/wayfire/pkg-plist Sun Mar 22 10:43:44 2020 (r528911)
+++ head/x11-wm/wayfire/pkg-plist Sun Mar 22 10:45:10 2020 (r528912)
@@ -14,6 +14,7 @@ include/wayfire/nonstd/reverse.hpp
include/wayfire/nonstd/safe-list.hpp
include/wayfire/object.hpp
include/wayfire/opengl.hpp
+include/wayfire/option-wrapper.hpp
include/wayfire/output-layout.hpp
include/wayfire/output.hpp
include/wayfire/plugin.hpp
@@ -53,14 +54,35 @@ lib/wayfire/libwobbly.so
lib/wayfire/libwrot.so
lib/wayfire/libzoom.so
libdata/pkgconfig/wayfire.pc
-%%DATADIR%%/cube/shaders_2.0/frag.glsl
-%%DATADIR%%/cube/shaders_2.0/frag_cubemap.glsl
-%%DATADIR%%/cube/shaders_2.0/vertex.glsl
-%%DATADIR%%/cube/shaders_2.0/vertex_cubemap.glsl
-%%DATADIR%%/cube/shaders_3.2/frag.glsl
-%%DATADIR%%/cube/shaders_3.2/geom.glsl
-%%DATADIR%%/cube/shaders_3.2/tcs.glsl
-%%DATADIR%%/cube/shaders_3.2/tes.glsl
-%%DATADIR%%/cube/shaders_3.2/vertex.glsl
-%%DATADIR%%/shaders/frag.glsl
-%%DATADIR%%/shaders/vertex.glsl
+%%DATADIR%%/decoration/resources/close.png
+%%DATADIR%%/decoration/resources/maximize.png
+%%DATADIR%%/decoration/resources/minimize.png
+%%DATADIR%%/metadata/alpha.xml
+%%DATADIR%%/metadata/animate.xml
+%%DATADIR%%/metadata/autostart.xml
+%%DATADIR%%/metadata/blur.xml
+%%DATADIR%%/metadata/command.xml
+%%DATADIR%%/metadata/core.xml
+%%DATADIR%%/metadata/cube.xml
+%%DATADIR%%/metadata/decoration.xml
+%%DATADIR%%/metadata/expo.xml
+%%DATADIR%%/metadata/fast-switcher.xml
+%%DATADIR%%/metadata/fisheye.xml
+%%DATADIR%%/metadata/grid.xml
+%%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
+%%DATADIR%%/metadata/resize.xml
+%%DATADIR%%/metadata/simple-tile.xml
+%%DATADIR%%/metadata/switcher.xml
+%%DATADIR%%/metadata/vswipe.xml
+%%DATADIR%%/metadata/vswitch.xml
+%%DATADIR%%/metadata/window-rules.xml
+%%DATADIR%%/metadata/wobbly.xml
+%%DATADIR%%/metadata/workarounds.xml
+%%DATADIR%%/metadata/wrot.xml
+%%DATADIR%%/metadata/zoom.xml
Modified: head/x11/wcm/Makefile
==============================================================================
--- head/x11/wcm/Makefile Sun Mar 22 10:43:44 2020 (r528911)
+++ head/x11/wcm/Makefile Sun Mar 22 10:45:10 2020 (r528912)
@@ -2,7 +2,7 @@
PORTNAME= wcm
DISTVERSIONPREFIX= v
-DISTVERSION= 0.3.1
+DISTVERSION= 0.4.0
CATEGORIES= x11
MAINTAINER= jbeich at FreeBSD.org
@@ -11,13 +11,14 @@ COMMENT= Wayfire Config Manager
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto
+BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
+ wayfire>0:x11-wm/wayfire
LIB_DEPENDS= libevdev.so:devel/libevdev \
libwf-config.so:devel/wf-config
CONFLICTS_INSTALL= wcmcommander # bin/wcm
-USES= compiler:c++11-lib gnome meson pkgconfig
+USES= compiler:c++17-lang gnome meson pkgconfig
USE_GITHUB= yes
USE_GNOME= gtk30 libxml2
GH_ACCOUNT= WayfireWM
Modified: head/x11/wcm/distinfo
==============================================================================
--- head/x11/wcm/distinfo Sun Mar 22 10:43:44 2020 (r528911)
+++ head/x11/wcm/distinfo Sun Mar 22 10:45:10 2020 (r528912)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1578041787
-SHA256 (WayfireWM-wcm-v0.3.1_GH0.tar.gz) = 4f0d234cb428d6c412ff6ad1c0df0efd54139f61df01b42573705aea33daa28e
-SIZE (WayfireWM-wcm-v0.3.1_GH0.tar.gz) = 258919
+TIMESTAMP = 1584642513
+SHA256 (WayfireWM-wcm-v0.4.0_GH0.tar.gz) = 8b03dbc9fad184c8e3277e8f5da68707148b3df9df6e042d848b80ee1c53b701
+SIZE (WayfireWM-wcm-v0.4.0_GH0.tar.gz) = 263841
Modified: head/x11/wcm/pkg-plist
==============================================================================
--- head/x11/wcm/pkg-plist Sun Mar 22 10:43:44 2020 (r528911)
+++ head/x11/wcm/pkg-plist Sun Mar 22 10:45:10 2020 (r528912)
@@ -37,37 +37,7 @@ share/icons/hicolor/96x96/apps/wcm.png
%%DATADIR%%/icons/plugin-vswipe.svg
%%DATADIR%%/icons/plugin-vswitch.svg
%%DATADIR%%/icons/plugin-wobbly.svg
+%%DATADIR%%/icons/plugin-workarounds.svg
%%DATADIR%%/icons/plugin-wrot.svg
%%DATADIR%%/icons/plugin-zoom.svg
%%DATADIR%%/icons/wcm.png
-%%DATADIR%%/metadata/alpha.xml
-%%DATADIR%%/metadata/animate.xml
-%%DATADIR%%/metadata/autorotate-iio.xml
-%%DATADIR%%/metadata/autostart.xml
-%%DATADIR%%/metadata/background.xml
-%%DATADIR%%/metadata/blur.xml
-%%DATADIR%%/metadata/command.xml
-%%DATADIR%%/metadata/core.xml
-%%DATADIR%%/metadata/cube.xml
-%%DATADIR%%/metadata/decoration.xml
-%%DATADIR%%/metadata/dock.xml
-%%DATADIR%%/metadata/expo.xml
-%%DATADIR%%/metadata/fast-switcher.xml
-%%DATADIR%%/metadata/fisheye.xml
-%%DATADIR%%/metadata/grid.xml
-%%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/panel.xml
-%%DATADIR%%/metadata/place.xml
-%%DATADIR%%/metadata/resize.xml
-%%DATADIR%%/metadata/simple-tile.xml
-%%DATADIR%%/metadata/switcher.xml
-%%DATADIR%%/metadata/vswipe.xml
-%%DATADIR%%/metadata/vswitch.xml
-%%DATADIR%%/metadata/wobbly.xml
-%%DATADIR%%/metadata/wrot.xml
-%%DATADIR%%/metadata/zoom.xml
Modified: head/x11/wf-shell/Makefile
==============================================================================
--- head/x11/wf-shell/Makefile Sun Mar 22 10:43:44 2020 (r528911)
+++ head/x11/wf-shell/Makefile Sun Mar 22 10:45:10 2020 (r528912)
@@ -1,28 +1,38 @@
# $FreeBSD$
PORTNAME= wf-shell
-DISTVERSION= 0.3
+DISTVERSION= 0.4.0
CATEGORIES= x11
+PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+= d86538344ade1.patch:-p1
+
MAINTAINER= jbeich at FreeBSD.org
COMMENT= GTK3-based panel for wayfire
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols
-LIB_DEPENDS= libpulse.so:audio/pulseaudio \
- libinotify.so:devel/libinotify \
+BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols \
+ wf-config>=0.4.0:devel/wf-config \
+ wayfire>0:x11-wm/wayfire
+LIB_DEPENDS= libinotify.so:devel/libinotify \
libwf-config.so:devel/wf-config \
libwayland-client.so:graphics/wayland \
libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell
-USES= compiler:c++14-lang gnome meson pkgconfig
+USES= compiler:c++17-lang gnome meson pkgconfig
USE_GITHUB= yes
USE_GNOME= gtkmm30
GH_ACCOUNT= WayfireWM
GH_TUPLE= GNOME:libgnome-volume-control:468022b:gvc/subprojects/gvc
MESON_ARGS= -Dgvc:alsa=false
DATADIR= ${PREFIX}/share/wayfire
+
+OPTIONS_DEFINE= PULSEAUDIO
+OPTIONS_DEFAULT=PULSEAUDIO
+
+PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
+PULSEAUDIO_MESON_ENABLED= pulse
.include <bsd.port.mk>
Modified: head/x11/wf-shell/distinfo
==============================================================================
--- head/x11/wf-shell/distinfo Sun Mar 22 10:43:44 2020 (r528911)
+++ head/x11/wf-shell/distinfo Sun Mar 22 10:45:10 2020 (r528912)
@@ -1,5 +1,7 @@
-TIMESTAMP = 1570475746
-SHA256 (WayfireWM-wf-shell-0.3_GH0.tar.gz) = 326c732415a10215997c0915741fd561a306412327fae123eab67f1af9ee41de
-SIZE (WayfireWM-wf-shell-0.3_GH0.tar.gz) = 2973206
+TIMESTAMP = 1584818331
+SHA256 (WayfireWM-wf-shell-0.4.0_GH0.tar.gz) = e86ed5e6c01abeec30755423096f094c62e24408ec4bd9c577383c7e01ce8126
+SIZE (WayfireWM-wf-shell-0.4.0_GH0.tar.gz) = 8948473
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
Added: head/x11/wf-shell/files/patch-gtkmm-3.22
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/wf-shell/files/patch-gtkmm-3.22 Sun Mar 22 10:45:10 2020 (r528912)
@@ -0,0 +1,75 @@
+Revert https://github.com/WayfireWM/wf-shell/commit/6e3ac5da8d24
+until x11-toolkits/gtkmm30 is updated to 3.24 or later.
+
+--- src/background/background.cpp.orig 2020-03-21 19:18:51 UTC
++++ src/background/background.cpp
+@@ -21,19 +21,17 @@ void BackgroundDrawingArea::show_image(Glib::RefPtr<Gd
+ {
+ if (!image)
+ {
+- to_image.source.clear();
+- from_image.source.clear();
++ to_image.pbuf.clear();
++ from_image.pbuf.clear();
+ return;
+ }
+
+ from_image = to_image;
+- to_image.source = Gdk::Cairo::create_surface_from_pixbuf(image,
+- this->get_scale_factor());
++ to_image.pbuf = image;
++ to_image.x = offset_x;
++ to_image.y = offset_y;
++ fade.animate(from_image.pbuf ? 0.0 : 1.0, 1.0);
+
+- to_image.x = offset_x / this->get_scale_factor();
+- to_image.y = offset_y / this->get_scale_factor();
+- fade.animate(from_image.source ? 0.0 : 1.0, 1.0);
+-
+ Glib::signal_idle().connect_once([=] () {
+ this->queue_draw();
+ });
+@@ -41,19 +39,25 @@ void BackgroundDrawingArea::show_image(Glib::RefPtr<Gd
+
+ bool BackgroundDrawingArea::on_draw(const Cairo::RefPtr<Cairo::Context>& cr)
+ {
+- if (!to_image.source)
++ if (!to_image.pbuf)
+ return false;
+
+ if (fade.running())
+ queue_draw();
+
+- cr->set_source(to_image.source, to_image.x, to_image.y);
++ Gdk::Cairo::set_source_pixbuf(cr, to_image.pbuf, to_image.x, to_image.y);
++ cr->rectangle(0, 0, to_image.pbuf->get_width(), to_image.pbuf->get_height());
+ cr->paint_with_alpha(fade);
+- if (!from_image.source)
++
++ if (!from_image.pbuf)
+ return false;
+
+- cr->set_source(from_image.source, from_image.x, from_image.y);
++ Gdk::Cairo::set_source_pixbuf(cr, from_image.pbuf,
++ from_image.x, from_image.y);
++ cr->rectangle(0, 0, from_image.pbuf->get_width(),
++ from_image.pbuf->get_height());
+ cr->paint_with_alpha(1.0 - fade);
++
+ return false;
+ }
+
+--- src/background/background.hpp.orig 2020-03-21 19:18:51 UTC
++++ src/background/background.hpp
+@@ -11,9 +11,9 @@ class WayfireBackground;
+
+ class BackgroundImage
+ {
+- public:
++ public:
+ double x, y;
+- Cairo::RefPtr<Cairo::Surface> source;
++ Glib::RefPtr<Gdk::Pixbuf> pbuf;
+ };
+
+ class BackgroundDrawingArea : public Gtk::DrawingArea
Modified: head/x11/wf-shell/pkg-plist
==============================================================================
--- head/x11/wf-shell/pkg-plist Sun Mar 22 10:43:44 2020 (r528911)
+++ head/x11/wf-shell/pkg-plist Sun Mar 22 10:45:10 2020 (r528912)
@@ -2,3 +2,7 @@ bin/wf-background
bin/wf-dock
bin/wf-panel
%%DATADIR%%/icons/wayfire.png
+%%DATADIR%%/metadata/wf-shell/background.xml
+%%DATADIR%%/metadata/wf-shell/dock.xml
+%%DATADIR%%/metadata/wf-shell/panel.xml
+%%DATADIR%%/wallpaper.jpg
More information about the svn-ports-all
mailing list