From 281ce68fc7935ba0d77bee132fba816dded4061b Mon Sep 17 00:00:00 2001
From: Alan Griffiths <alan@octopull.co.uk>
Date: Mon, 4 Dec 2023 12:18:36 +0000
Subject: [PATCH 2/3] Drop unused dependency on gflags

---
 CMakeLists.txt                           |  1 -
 doc/sphinx/.readthedocs.yaml             |  1 -
 examples/mir_demo_server/CMakeLists.txt  |  1 -
 examples/mir_demo_server/glog_logger.cpp | 10 ----------
 snap/snapcraft.yaml                      |  1 -
 spread/build/fedora/task.yaml            |  1 -
 6 files changed, 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 995c653154..62873f9936 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -262,7 +262,6 @@ if(NOT GLM_FOUND)
 endif()
 pkg_check_modules(DRM REQUIRED IMPORTED_TARGET libdrm)
 pkg_check_modules(EGL REQUIRED IMPORTED_TARGET egl)
-pkg_check_modules(GFlags REQUIRED IMPORTED_TARGET gflags)
 pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0 gio-unix-2.0)
 pkg_check_modules(GLESv2 REQUIRED IMPORTED_TARGET glesv2)
 pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0)
diff --git a/doc/sphinx/.readthedocs.yaml b/doc/sphinx/.readthedocs.yaml
index cb0bd3d2f8..b245ffc26e 100644
--- a/doc/sphinx/.readthedocs.yaml
+++ b/doc/sphinx/.readthedocs.yaml
@@ -24,7 +24,6 @@ build:
   - libglib2.0-dev
   - libgles2-mesa-dev
   - libglm-dev
-  - libgflags-dev
   - libgoogle-glog-dev
   - libinput-dev
   - liblttng-ust-dev
diff --git a/examples/mir_demo_server/CMakeLists.txt b/examples/mir_demo_server/CMakeLists.txt
index 2a05b525f1..38df174421 100644
--- a/examples/mir_demo_server/CMakeLists.txt
+++ b/examples/mir_demo_server/CMakeLists.txt
@@ -28,6 +28,5 @@ target_link_libraries(mir_demo_server
   example-shell-lib
   exampleserverconfig
   PkgConfig::GLog
-  PkgConfig::GFlags
   Boost::system
 )
diff --git a/examples/mir_demo_server/glog_logger.cpp b/examples/mir_demo_server/glog_logger.cpp
index 092c629027..dfd817c4e9 100644
--- a/examples/mir_demo_server/glog_logger.cpp
+++ b/examples/mir_demo_server/glog_logger.cpp
@@ -17,7 +17,6 @@
 #include "glog_logger.h"
 
 #include <glog/logging.h>
-#include <gflags/gflags.h>
 
 #include <mutex>
 
@@ -27,7 +26,6 @@ namespace
 {
 std::once_flag init_flag;
 std::once_flag shutdown_flag;
-std::once_flag shutdown_flag_gflags;
 
 struct google_glog_guard_t
 {
@@ -41,14 +39,6 @@ struct google_glog_guard_t
         std::call_once(shutdown_flag, google::ShutdownGoogleLogging);
     }
 };
-
-struct google_gflag_guard_t
-{
-    ~google_gflag_guard_t()
-    {
-        std::call_once(shutdown_flag_gflags, google::ShutDownCommandLineFlags);
-    }
-} google_gflag_guard;
 }
 
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index aec98e8419..e1955c4583 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -62,7 +62,6 @@ parts:
     - libevdev2
     - libfreetype6
     - libgbm1
-    - libgflags2.2
     - libgles2
     - libglibmm-2.4-1v5
     - libglvnd0
-- 
2.45.2