Mercurial > minori

changeset 219:2f6d27fcdf7d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dep/animia: wayland: fixup wlroots code
author Paper <paper@paper.us.eu.org>
date Sun, 07 Jan 2024 13:37:50 -0500
parents c39ad2a8587d
children 79a87a6dd39d
files .builds/macos.yml dep/animia/src/win/wayland.cc
diffstat 2 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.builds/macos.yml	Sun Jan 07 13:28:00 2024 -0500
+++ b/.builds/macos.yml	Sun Jan 07 13:37:50 2024 -0500
@@ -21,20 +21,26 @@
   - zlib1g-dev
 sources:
   - https://hg.sr.ht/~mrpapersonic/minori
-  - https://github.com/tpoechtrager/osxcross
+  - https://github.com/efa/osxcross # use fork until #409 is pulled
 environment:
   BUILD_SUBMITTER: hg.sr.ht
   MACOSX_DEPLOYMENT_TARGET: 10.9
+  UNATTENDED: 1
 tasks:
   - build: |
+      # set up osxcross
       cd osxcross/tarballs
       wget "https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.9.sdk.tar.xz"
       cd ..
       export TARGET_DIR="$PWD/target"
-      UNATTENDED=1 ./build.sh
+      ./build.sh
       export PATH="$TARGET_DIR/bin:$PATH"
       cd ..
+
+      # deps
       osxcross-macports install qt5-qtbase qt5-qttools
+
+      # actually build the damn thing
       CC="o64-clang" CXX="o64-clang++" CXXFLAGS="-stdlib=libc++" cmake .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER= -DCMAKE_CXX_COMPILER=o64-clang++
       make
 triggers:
--- a/dep/animia/src/win/wayland.cc	Sun Jan 07 13:28:00 2024 -0500
+++ b/dep/animia/src/win/wayland.cc	Sun Jan 07 13:37:50 2024 -0500
@@ -136,7 +136,7 @@
 	struct global_data* global = reinterpret_cast<struct global_data*>(data);
 
 	if (!std::strcmp(interface, ext_foreign_toplevel_list_v1_interface.name)) {
-		if (!global->zwlr_toplevel_mgr || version < 3)
+		if (global->zwlr_toplevel_mgr)
 			return; // we don't need this then
 
 		global->ext_toplevel_list = reinterpret_cast<struct ext_foreign_toplevel_list_v1*>(
@@ -145,7 +145,7 @@
 		ext_foreign_toplevel_list_v1_add_listener(global->ext_toplevel_list, &ext_toplevel_list_listener,
 		                                          &global->windows);
 	} else if (!std::strcmp(interface, zwlr_foreign_toplevel_manager_v1_interface.name)) {
-		if (!global->ext_toplevel_list)
+		if (global->ext_toplevel_list || version < 3)
 			return; // we don't need this then
 
 		global->zwlr_toplevel_mgr = reinterpret_cast<struct zwlr_foreign_toplevel_manager_v1*>(
@@ -185,7 +185,7 @@
 	sync->callback = nullptr;
 
 	if (sync->sync == 0) {
-		if (!sync->global.ext_toplevel_list || !sync->global.zwlr_toplevel_mgr) {
+		if (!sync->global.ext_toplevel_list && !sync->global.zwlr_toplevel_mgr) {
 			std::cerr << "animia/wayland: Wayland server doesn't support ext-foreign-toplevel-list-v1 nor "
 			             "wlr-foreign-toplevel-management-unstable-v1!"
 			          << std::endl;