Add back dropped function from previous commit to maintain ABI

Related: #2076472

0001-Use-connector_type-from-mutter-to-fix-detection-of-b.patch

@@ -1,4 +1,4 @@
-From 6b9917479e92adb3bdab99624901fef2f8c0aa4a Mon Sep 17 00:00:00 2001
+From fd54e06bb9ac519fc562f3d309a6befd47f9abf6 Mon Sep 17 00:00:00 2001
 From: Jeremy Soller <jeremy@system76.com>
 Date: Tue, 11 Jun 2019 15:25:26 -0600
 Subject: [PATCH] Use connector_type from mutter to fix detection of builtin
@@ -7,9 +7,9 @@ Subject: [PATCH] Use connector_type from mutter to fix detection of builtin
 ---
  libgnome-desktop/gnome-rr-config.c      |  6 +++---
  libgnome-desktop/gnome-rr-output-info.c |  2 ++
- libgnome-desktop/gnome-rr-private.h     |  5 +++--
+ libgnome-desktop/gnome-rr-private.h     |  4 +++-
- libgnome-desktop/gnome-rr.c             | 27 ++++++++++++++++---------
+ libgnome-desktop/gnome-rr.c             | 28 ++++++++++++++++++++++++-
- 4 files changed, 26 insertions(+), 14 deletions(-)
+ 4 files changed, 35 insertions(+), 5 deletions(-)
 
 diff --git a/libgnome-desktop/gnome-rr-config.c b/libgnome-desktop/gnome-rr-config.c
 index 707df697..396f1f4d 100644
@@ -281,10 +281,10 @@ index 7f97ecc1..08e9b45e 100644
  
  /**
 diff --git a/libgnome-desktop/gnome-rr-private.h b/libgnome-desktop/gnome-rr-private.h
-index e721e39c..36ad7767 100644
+index e721e39c..5a852010 100644
 --- a/libgnome-desktop/gnome-rr-private.h
 +++ b/libgnome-desktop/gnome-rr-private.h
-@@ -59,65 +59,66 @@ struct GnomeRRTile {
+@@ -59,65 +59,67 @@ struct GnomeRRTile {
    guint max_vert_tiles;
    guint loc_horiz;
    guint loc_vert;
@@ -335,7 +335,7 @@ index e721e39c..36ad7767 100644
    GnomeRROutputInfo **outputs;
  };
  
--gboolean _gnome_rr_output_name_is_builtin_display (const char *name);
+ gboolean _gnome_rr_output_name_is_builtin_display (const char *name);
 +gboolean _gnome_rr_output_connector_type_is_builtin_display (const char *connector_type);
  
  gboolean _gnome_rr_screen_apply_configuration (GnomeRRScreen  *screen,
@@ -354,7 +354,7 @@ index e721e39c..36ad7767 100644
  
  #endif
 diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
-index dca50694..6a7bcfbb 100644
+index dca50694..bfbd785d 100644
 --- a/libgnome-desktop/gnome-rr.c
 +++ b/libgnome-desktop/gnome-rr.c
 @@ -37,60 +37,61 @@
@@ -576,23 +576,7 @@ index dca50694..6a7bcfbb 100644
        if (mmap)
  	{
  	  output->edid = g_mapped_file_get_bytes (mmap);
-@@ -1651,82 +1655,79 @@ gnome_rr_screen_get_output_by_name (GnomeRRScreen *screen,
+@@ -1667,66 +1671,80 @@ gnome_rr_output_get_crtc (GnomeRROutput *output)
-     return NULL;
- }
- 
- /**
-  * gnome_rr_output_get_crtc:
-  * @output: a #GnomeRROutput
-  * Returns: (transfer none):
-  */
- GnomeRRCrtc *
- gnome_rr_output_get_crtc (GnomeRROutput *output)
- {
-     g_return_val_if_fail (output != NULL, NULL);
-     
-     return output->current_crtc;
- }
- 
  /**
   * gnome_rr_output_get_possible_crtcs:
   * @output: a #GnomeRROutput
@@ -607,27 +591,36 @@ index dca50694..6a7bcfbb 100644
  }
  
  gboolean
--_gnome_rr_output_name_is_builtin_display (const char *name)
+ _gnome_rr_output_name_is_builtin_display (const char *name)
-+_gnome_rr_output_connector_type_is_builtin_display (const char *connector_type)
  {
--    if (!name)
+     if (!name)
-+    if (!connector_type)
          return FALSE;
  
--    if (strstr (name, "lvds") ||  /* Most drivers use an "LVDS" prefix... */
+     if (strstr (name, "lvds") ||  /* Most drivers use an "LVDS" prefix... */
--	strstr (name, "LVDS") ||
+ 	strstr (name, "LVDS") ||
--	strstr (name, "Lvds") ||
+ 	strstr (name, "Lvds") ||
--	strstr (name, "LCD")  ||  /* ... but fglrx uses "LCD" in some versions.  Shoot me now, kthxbye. */
+ 	strstr (name, "LCD")  ||  /* ... but fglrx uses "LCD" in some versions.  Shoot me now, kthxbye. */
--	strstr (name, "eDP")  ||    /* eDP is for internal built-in panel connections */
+ 	strstr (name, "eDP")  ||    /* eDP is for internal built-in panel connections */
--	strstr (name, "DSI"))
+ 	strstr (name, "DSI"))
-+    if (strcmp (connector_type, "LVDS") == 0 ||
-+	strcmp (connector_type, "eDP") == 0  ||
-+	strcmp (connector_type, "DSI") == 0)
          return TRUE;
  
      return FALSE;
  }
  
++gboolean
++_gnome_rr_output_connector_type_is_builtin_display (const char *connector_type)
++{
++    if (!connector_type)
++        return FALSE;
++
++    if (strcmp (connector_type, "LVDS") == 0 ||
++	strcmp (connector_type, "eDP") == 0  ||
++	strcmp (connector_type, "DSI") == 0)
++        return TRUE;
++
++    return FALSE;
++}
++
  gboolean
  gnome_rr_output_is_builtin_display (GnomeRROutput *output)
  {
@@ -665,7 +658,7 @@ index dca50694..6a7bcfbb 100644
  	return gnome_rr_crtc_get_current_mode (crtc);
      }
      return NULL;
-@@ -2217,60 +2218,68 @@ gnome_rr_crtc_get_gamma (GnomeRRCrtc     *crtc,
+@@ -2217,60 +2235,68 @@ gnome_rr_crtc_get_gamma (GnomeRRCrtc     *crtc,
    if (red)
      *red = g_bytes_unref_to_data (red_bytes, &dummy);
    else

gnome-desktop3.spec

@@ -7,7 +7,7 @@
 
 Name: gnome-desktop3
 Version: 3.32.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 
 License: GPLv2+ and LGPLv2+
@@ -107,6 +107,10 @@ the functionality of the installed %{name} package.
 %{_datadir}/installed-tests
 
 %changelog
+* Tue Apr 18 2023 Ray Strode <rstrode@redhat.com> - 3.32.2-3
+- Add back dropped function from previous commit to maintain ABI
+  Related: #2076472
+
 * Thu Mar 16 2023 Jonas Ådahl <jadahl@redhat.com> - 3.32.2-2
 - Backport GnomeRR fix for detecting built in panels
   Resolves: #2076472