Add focus fix patch and update gamescope.spec to apply it

ValveSoftware/gamescope#1611 (comment)

Author: ProjectSynchro

001-focus-fix.patch

@@ -0,0 +1,64 @@
+diff --git a/src/Backends/WaylandBackend.cpp b/src/Backends/WaylandBackend.cpp
+index e924ac8..7aed647 100644
+--- a/src/Backends/WaylandBackend.cpp
++++ b/src/Backends/WaylandBackend.cpp
+@@ -73,13 +73,13 @@ static inline uint32_t WaylandScaleToPhysical( uint32_t pValue, uint32_t pFactor
+ }
+ static inline uint32_t WaylandScaleToLogical( uint32_t pValue, uint32_t pFactor ) {
+     return div_roundup( pValue * WL_FRACTIONAL_SCALE_DENOMINATOR, pFactor );
+ }
+ 
+ static bool IsSurfacePlane( wl_surface *pSurface ) {
+-    return wl_proxy_get_tag( (wl_proxy *)pSurface ) == &GAMESCOPE_plane_tag;
++    return pSurface && (wl_proxy_get_tag( (wl_proxy *)pSurface ) == &GAMESCOPE_plane_tag);
+ }
+ 
+ #define WAYLAND_NULL() []<typename... Args> ( void *pData, Args... args ) { }
+ #define WAYLAND_USERDATA_TO_THIS(type, name) []<typename... Args> ( void *pData, Args... args ) { type *pThing = (type *)pData; pThing->name( std::forward<Args>(args)... ); }
+ 
+ // Libdecor puts its userdata ptr at the end... how fun! I shouldn't have spent so long writing this total atrocity to mankind.
+@@ -717,13 +717,13 @@ namespace gamescope
+         zwp_pointer_constraints_v1 *m_pPointerConstraints = nullptr;
+         zwp_relative_pointer_manager_v1 *m_pRelativePointerManager = nullptr;
+         wp_fractional_scale_manager_v1 *m_pFractionalScaleManager = nullptr;
+         xdg_toplevel_icon_manager_v1 *m_pToplevelIconManager = nullptr;
+ 
+         // TODO: Restructure and remove the need for this.
+-        std::shared_ptr<CWaylandConnector> m_pFocusConnector;
++        std::weak_ptr<CWaylandConnector> m_pFocusConnector;
+ 
+         wl_data_device_manager *m_pDataDeviceManager = nullptr;
+         wl_data_device *m_pDataDevice = nullptr;
+         std::shared_ptr<std::string> m_pClipboard = nullptr;
+ 
+         zwp_primary_selection_device_manager_v1 *m_pPrimarySelectionDeviceManager = nullptr;
+@@ -2038,13 +2038,13 @@ namespace gamescope
+ 
+         return std::span<const uint64_t>{ iter->second.begin(), iter->second.end() };
+     }
+ 
+     IBackendConnector *CWaylandBackend::GetCurrentConnector()
+     {
+-        return m_pFocusConnector.get();
++        return m_pFocusConnector.lock().get();
+     }
+     IBackendConnector *CWaylandBackend::GetConnector( GamescopeScreenType eScreenType )
+     {
+         if ( eScreenType == GAMESCOPE_SCREEN_TYPE_INTERNAL )
+             return GetCurrentConnector();
+ 
+@@ -2110,13 +2110,13 @@ namespace gamescope
+     {
+         return true;
+     }
+     std::shared_ptr<IBackendConnector> CWaylandBackend::CreateVirtualConnector( uint64_t ulVirtualConnectorKey )
+     {
+         std::shared_ptr<CWaylandConnector> pConnector = std::make_shared<CWaylandConnector>( this, ulVirtualConnectorKey );
+-        if ( !m_pFocusConnector )
++        if ( m_pFocusConnector.expired() )
+             m_pFocusConnector = pConnector;
+ 
+         if ( !pConnector->Init() )
+         {
+             return nullptr;
+         }

gamescope.spec

@@ -14,6 +14,7 @@ License:        BSD
 URL:            https://github.com/ValveSoftware/gamescope
 # Create stb.pc to satisfy dependency('stb')
 Source0:        stb.pc
+Patch1:        001-focus-fix.patch
 
 BuildRequires:  meson >= 0.54.0
 BuildRequires:  ninja-build
@@ -105,7 +106,7 @@ cd gamescope
 git checkout %{commit}
 git submodule update --init --recursive
 
-#%autopatch -p1
+%autopatch -p1
 
 # Apply additional manual changes after patches
 mkdir -p pkgconfig