diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2023-12-09 11:37:56 +0000 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2023-12-09 13:13:20 +0000 |
commit | 6157d44301090840a16057fc6117950c6e33a1a7 (patch) | |
tree | 4cd5b82cfe331c667a5b3e229f55b865ac1b6df8 | |
parent | 923d341f7ee9de16277ff725a7995c0e5eaa8413 (diff) | |
download | ports-6157d44301090840a16057fc6117950c6e33a1a7.tar.gz ports-6157d44301090840a16057fc6117950c6e33a1a7.zip |
x11-wm/wayfire: pass --skip-subprojects from within ninja
-rw-r--r-- | x11-wm/wayfire/Makefile | 8 | ||||
-rw-r--r-- | x11-wm/wayfire/files/patch-private-libs | 79 |
2 files changed, 7 insertions, 80 deletions
diff --git a/x11-wm/wayfire/Makefile b/x11-wm/wayfire/Makefile index 34993c4b05e6..187dc2614d3e 100644 --- a/x11-wm/wayfire/Makefile +++ b/x11-wm/wayfire/Makefile @@ -40,7 +40,7 @@ USE_XORG= pixman GH_ACCOUNT= WayfireWM GH_TUPLE= WayfireWM:wf-touch:8974eb0:wftouch/subprojects/wf-touch \ WayfireWM:wf-utils:15f8e16:wfutils/subprojects/wf-utils -MESON_ARGS= -Dtests=disabled +MESON_ARGS= -Dtests=disabled -Dwf-touch:tests=disabled OPTIONS_DEFINE= X11 OPTIONS_DEFAULT=X11 @@ -54,6 +54,12 @@ post-patch: -e '/project_version/s/@0@/${DISTVERSIONFULL}/' \ ${WRKSRC}/meson.build +.ifdef GH_TUPLE +post-configure: + @${REINPLACE_CMD} 's/meson install/& \ + --skip-subprojects/' ${BUILD_WRKSRC}/build.ninja +.endif + post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.ini ${STAGEDIR}${EXAMPLESDIR} diff --git a/x11-wm/wayfire/files/patch-private-libs b/x11-wm/wayfire/files/patch-private-libs deleted file mode 100644 index fe4665abebbf..000000000000 --- a/x11-wm/wayfire/files/patch-private-libs +++ /dev/null @@ -1,79 +0,0 @@ -wf-touch and wf-utils are untagged and have no other consumers. Keep -it private to wayfire package for now. - ---- meson.build.orig 2023-10-07 08:36:28 UTC -+++ meson.build -@@ -69,8 +69,8 @@ endif - endif - endif - --wfutils = subproject('wf-utils').get_variable('wfutils') --wftouch = subproject('wf-touch').get_variable('wftouch') -+wfutils = subproject('wf-utils', default_options: ['default_library=static']).get_variable('wfutils') -+wftouch = subproject('wf-touch', default_options: ['default_library=static']).get_variable('wftouch') - - 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 ---- subprojects/wf-touch/meson.build.orig 2021-03-19 14:56:39 UTC -+++ subprojects/wf-touch/meson.build -@@ -6,18 +6,22 @@ project('wf-touch', ['cpp'], - glm = dependency('glm') - - wf_touch_inc_dirs = include_directories('.') -+if not meson.is_subproject() - install_headers([ - 'wayfire/touch/touch.hpp'], - subdir: 'wayfire/touch') -+endif - - wftouch_lib = static_library('wftouch', ['src/touch.cpp', 'src/actions.cpp', 'src/math.cpp'], -- dependencies: glm, install: true) -+ dependencies: glm, install: not meson.is_subproject()) - - wftouch = declare_dependency(link_with: wftouch_lib, - include_directories: wf_touch_inc_dirs, dependencies: glm) - -+if not meson.is_subproject() - doctest = dependency('doctest', required: get_option('tests')) - - if doctest.found() - subdir('test') -+endif - endif |