hi,
little update to wayfire 0.8.1, simplifies a bit the port since we can
now build from a release. have a local problem on my wayland testing
laptop so havent been able to run it, but tests are welcome.
Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/wayland/wayfire/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile 11 Jan 2024 09:48:05 -0000 1.6
+++ Makefile 31 Mar 2024 10:12:47 -0000
@@ -1,15 +1,7 @@
COMMENT = modular and extensible wayland compositor
-V = 0.8.0pl17
+V = 0.8.1
DISTNAME = wayfire-${V}
-GH_ACCOUNT = WayfireWM
-GH_PROJECT = wayfire
-GH_COMMIT = c48194e055219dcb3a603b59ca37f330a64cac12
-REVISION = 1
-
-# git submodules when not building a release
-DIST_TUPLE += github ${GH_ACCOUNT} wf-utils
15f8e16721585ae3eaf278ba71d7064237eb23f5 subprojects/wf-utils
-DIST_TUPLE += github ${GH_ACCOUNT} wf-touch
8974eb0f6a65464b63dd03b842795cb441fb6403 subprojects/wf-touch
SHARED_LIBS += wf-utils 0.0 # 0.0
CATEGORIES = wayland
@@ -18,11 +10,8 @@
# MIT
PERMIT_PACKAGE = Yes
-# we need to use a git branch because last release doesnt support wlroots 0.17
yet
-# https://github.com/WayfireWM/wayfire/issues/1781
-# https://github.com/WayfireWM/wayfire/pull/2024
-#SITES =
https://github.com/WayfireWM/wayfire/releases/download/v${V}/
-#EXTRACT_SUFX = .tar.xz
+SITES =
https://github.com/WayfireWM/wayfire/releases/download/v${V}/
+EXTRACT_SUFX = .tar.xz
HOMEPAGE = https://wayfire.org
MODULES = devel/meson
Index: distinfo
===================================================================
RCS file: /cvs/ports/wayland/wayfire/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo 21 Dec 2023 16:22:14 -0000 1.1.1.1
+++ distinfo 31 Mar 2024 10:12:47 -0000
@@ -1,6 +1,2 @@
-SHA256 (WayfireWM-wf-touch-8974eb0f6a65464b63dd03b842795cb441fb6403.tar.gz) =
CQYcik09lk6Nz9GnuX99xD0PwwdDsJk1hUOcaSPOQi8=
-SHA256 (WayfireWM-wf-utils-15f8e16721585ae3eaf278ba71d7064237eb23f5.tar.gz) =
XwoPUjspvXPg8R1jB5MV06Cjw8rmzptVfgQz4ltaDZI=
-SHA256 (wayfire-0.8.0pl17-c48194e0.tar.gz) =
Rdw3AIQIij/t0VNd8oDa15eIOO8jS1vIVmGb97vwus8=
-SIZE (WayfireWM-wf-touch-8974eb0f6a65464b63dd03b842795cb441fb6403.tar.gz) =
9874
-SIZE (WayfireWM-wf-utils-15f8e16721585ae3eaf278ba71d7064237eb23f5.tar.gz) =
48535
-SIZE (wayfire-0.8.0pl17-c48194e0.tar.gz) = 437555
+SHA256 (wayfire-0.8.1.tar.xz) = isGUe2iKnsbE2e4tdzEbs1eo6tJWZbgADtqWlSMoKQ0=
+SIZE (wayfire-0.8.1.tar.xz) = 856364
Index: patches/patch-meson_build
===================================================================
RCS file: /cvs/ports/wayland/wayfire/patches/patch-meson_build,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-meson_build
--- patches/patch-meson_build 21 Dec 2023 16:22:14 -0000 1.1.1.1
+++ patches/patch-meson_build 31 Mar 2024 10:12:47 -0000
@@ -1,7 +1,7 @@
Index: meson.build
--- meson.build.orig
+++ meson.build
-@@ -30,7 +30,6 @@ libinput = dependency('libinput', version: '>=1.
+@@ -33,7 +33,6 @@ libinput = dependency('libinput', version: '>=1.
pixman = dependency('pixman-1')
threads = dependency('threads')
xkbcommon = dependency('xkbcommon')
@@ -9,16 +9,7 @@
# We're not to use system wlroots: So we'll use the subproject
if get_option('use_system_wlroots').disabled()
-@@ -58,7 +57,7 @@ if get_option('use_system_wfconfig').disabled()
-
- elif get_option('use_system_wfconfig').enabled()
- use_system_wfconfig = true
-- wfconfig = dependency('wf-config', version: ['>=0.9.0', '<0.10.0'],
required: true)
-+ wfconfig = dependency('wf-config', version: ['>=0.8.0', '<0.10.0'],
required: true)
-
- elif get_option('use_system_wfconfig').auto()
- wfconfig = dependency('wf-config', version: ['>=0.9.0', '<0.10.0'],
required: false)
-@@ -72,7 +71,7 @@ endif
+@@ -75,7 +74,7 @@ endif
wfutils = subproject('wf-utils').get_variable('wfutils')
wftouch = subproject('wf-touch').get_variable('wftouch')
@@ -27,22 +18,3 @@
libinotify = dependency('libinotify', required: needs_libinotify)
jpeg = dependency('libjpeg', required: false)
-@@ -84,18 +83,6 @@ backtrace = meson.get_compiler('cpp').find_library('ex
- conf_data = configuration_data()
-
- version = '"@0@"'.format(meson.project_version())
--git = find_program('git', native: true, required: false)
--if git.found()
-- git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'], check:
false)
-- git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'],
check: false)
-- if git_commit.returncode() == 0 and git_branch.returncode() == 0
-- version = '"@0@-@1@ (" __DATE__ ", branch \'@2@\')"'.format(
-- meson.project_version(),
-- git_commit.stdout().strip(),
-- git_branch.stdout().strip(),
-- )
-- endif
--endif
- add_project_arguments('-DWAYFIRE_VERSION=@0@'.format(version), language:
'cpp')
- conf_data.set('WAYFIRE_VERSION', '-DWAYFIRE_VERSION=@0@'.format(version))
-
Index: patches/patch-src_meson_build
===================================================================
RCS file: /cvs/ports/wayland/wayfire/patches/patch-src_meson_build,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-src_meson_build
--- patches/patch-src_meson_build 21 Dec 2023 16:22:14 -0000 1.1.1.1
+++ patches/patch-src_meson_build 31 Mar 2024 10:12:47 -0000
@@ -3,7 +3,7 @@
Index: src/meson.build
--- src/meson.build.orig
+++ src/meson.build
-@@ -62,7 +62,7 @@ wayfire_sources = ['geometry.cpp',
+@@ -63,7 +63,7 @@ wayfire_sources = ['geometry.cpp',
'output/workspace-impl.cpp']
wayfire_dependencies = [wayland_server, wlroots, xkbcommon, libinput,
@@ -12,7 +12,7 @@
wfconfig, libinotify, backtrace, wfutils, xcb, wftouch]
if conf_data.get('BUILD_WITH_IMAGEIO')
-@@ -114,6 +114,7 @@ shared_module('default-config-backend', 'default-confi
+@@ -131,6 +131,7 @@ shared_module('default-config-backend', 'default-confi
dependencies: wayfire_dependencies,
include_directories: [wayfire_conf_inc, wayfire_api_inc],
cpp_args: debug_arguments,
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/wayland/wayfire/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST 21 Dec 2023 16:22:14 -0000 1.1.1.1
+++ pkg/PLIST 31 Mar 2024 10:12:47 -0000
@@ -64,7 +64,6 @@
include/wayfire/plugins/ipc/ipc-activator.hpp
include/wayfire/plugins/ipc/ipc-helpers.hpp
include/wayfire/plugins/ipc/ipc-method-repository.hpp
-include/wayfire/plugins/ipc/ipc.hpp
include/wayfire/plugins/scale-signal.hpp
include/wayfire/plugins/vswitch.hpp
include/wayfire/plugins/wm-actions-signals.hpp
@@ -93,6 +92,7 @@
include/wayfire/unstable/
include/wayfire/unstable/translation-node.hpp
include/wayfire/unstable/wlr-surface-node.hpp
+include/wayfire/unstable/wlr-text-input-v3-popup.hpp
include/wayfire/unstable/wlr-view-events.hpp
include/wayfire/unstable/wlr-view-keyboard-interaction.hpp
include/wayfire/unstable/xdg-toplevel-base.hpp
@@ -131,6 +131,7 @@
@so lib/wayfire/libgrid.so
@so lib/wayfire/libgtk-shell.so
@so lib/wayfire/libidle.so
+@so lib/wayfire/libinput-method-v1.so
@so lib/wayfire/libinvert.so
@so lib/wayfire/libipc-rules.so
@so lib/wayfire/libipc.so
@@ -177,6 +178,7 @@
share/wayfire/metadata/gtk-shell.xml
share/wayfire/metadata/idle.xml
share/wayfire/metadata/input-device.xml
+share/wayfire/metadata/input-method-v1.xml
share/wayfire/metadata/input.xml
share/wayfire/metadata/invert.xml
share/wayfire/metadata/ipc-rules.xml
