Use the suggested workaround for qtwayland build arguments instead of patching
This commit is contained in:
		
							parent
							
								
									692adacc2a
								
							
						
					
					
						commit
						c0a81f2428
					
				
					 2 changed files with 6 additions and 2 deletions
				
			
		| 
						 | 
					@ -731,7 +731,9 @@ RUN [ -z "${QT6}" ] || ./configure -prefix "$QT6_PREFIX" \
 | 
				
			||||||
	-dbus-runtime \
 | 
						-dbus-runtime \
 | 
				
			||||||
	-openssl-linked \
 | 
						-openssl-linked \
 | 
				
			||||||
	-nomake examples \
 | 
						-nomake examples \
 | 
				
			||||||
	-nomake tests
 | 
						-nomake tests \
 | 
				
			||||||
 | 
						-- \
 | 
				
			||||||
 | 
						-DINPUT_egl_extension_platform_wayland=no
 | 
				
			||||||
 | 
					
 | 
				
			||||||
RUN [ -z "${QT6}" ] || cmake --build . --parallel
 | 
					RUN [ -z "${QT6}" ] || cmake --build . --parallel
 | 
				
			||||||
RUN [ -z "${QT6}" ] || DESTDIR="$LibrariesPath/qt-cache" cmake --install .
 | 
					RUN [ -z "${QT6}" ] || DESTDIR="$LibrariesPath/qt-cache" cmake --install .
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -376,7 +376,9 @@ parts:
 | 
				
			||||||
        -no-feature-highdpiscaling \
 | 
					        -no-feature-highdpiscaling \
 | 
				
			||||||
        -openssl-linked \
 | 
					        -openssl-linked \
 | 
				
			||||||
        -nomake examples \
 | 
					        -nomake examples \
 | 
				
			||||||
        -nomake tests
 | 
					        -nomake tests \
 | 
				
			||||||
 | 
					        -- \
 | 
				
			||||||
 | 
					        -DINPUT_egl_extension_platform_wayland=no
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      cmake --build . -j$SNAPCRAFT_PARALLEL_BUILD_COUNT
 | 
					      cmake --build . -j$SNAPCRAFT_PARALLEL_BUILD_COUNT
 | 
				
			||||||
      DESTDIR="$SNAPCRAFT_PART_INSTALL" cmake --install .
 | 
					      DESTDIR="$SNAPCRAFT_PART_INSTALL" cmake --install .
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue