Drop libxklavier

Resolves: RHEL-38399 Resolves: RHBZ#1955025 (cherry picked from commit ce6cc95)
jkonecny12 · Aug 14, 2024 · 3003c89 · 3003c89
1 parent 529075e
commit 3003c89
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/anaconda.spec.in b/anaconda.spec.in
@@ -35,7 +35,6 @@ Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{vers
 %define libarchivever 3.0.4
 %define libblockdevver 2.1
 %define libreportanacondaver 2.0.21-1
-%define libxklavierver 5.4
 %define mehver 0.23-1
 %define nmver 1.0
 %define pykickstartver 3.52-1
@@ -57,7 +56,6 @@ BuildRequires: gobject-introspection-devel
 %if %{with glade}
 BuildRequires: glade-devel
 %endif
-BuildRequires: libxklavier-devel >= %{libxklavierver}
 BuildRequires: make
 BuildRequires: pango-devel
 BuildRequires: python3-devel
@@ -290,7 +288,6 @@ Requires: python3-xkbregistry
 Requires: adwaita-icon-theme
 Requires: tecla
 Requires: tigervnc-server-minimal
-Requires: libxklavier >= %{libxklavierver}
 Requires: nm-connection-editor
 %ifnarch s390 s390x
 Requires: NetworkManager-wifi

diff --git a/widgets/configure.ac b/widgets/configure.ac
@@ -72,7 +72,6 @@ AS_IF([test "x$enable_glade" != "xno"],
  [AC_SUBST(GLADE_SUBDIR, "")])
 
 ANACONDA_PKG_CHECK_MODULES([GTK], [gtk+-x11-3.0 >= 3.11.3])
-ANACONDA_PKG_CHECK_MODULES([LIBXKLAVIER], [libxklavier >= 5.2.1])
 ANACONDA_PKG_CHECK_EXISTS([gobject-introspection-1.0 >= 1.30])
 
 # Use AM_PATH_GLIB_2_0 to define some extra glib-related variables

diff --git a/widgets/src/Makefile.am b/widgets/src/Makefile.am
@@ -60,9 +60,9 @@ WIDGETSDATA = '"$(datadir)/anaconda"'
 noinst_HEADERS = gettext.h intl.h
 
 lib_LTLIBRARIES = libAnacondaWidgets.la
-libAnacondaWidgets_la_CFLAGS = $(GTK_CFLAGS) $(LIBXKLAVIER_CFLAGS) -Wall -g\
+libAnacondaWidgets_la_CFLAGS = $(GTK_CFLAGS) -Wall -g\
  -DWIDGETS_DATADIR=$(WIDGETSDATA)
-libAnacondaWidgets_la_LIBADD = $(GTK_LIBS) $(LIBXKLAVIER_LIBS)
+libAnacondaWidgets_la_LIBADD = $(GTK_LIBS)
 libAnacondaWidgets_la_LDFLAGS = $(LTLIBINTL) -version-info 4:0:0
 libAnacondaWidgets_la_SOURCES = $(SOURCES) $(HDRS)
 
@@ -124,7 +124,7 @@ AnacondaWidgets-3.4.gir: libAnacondaWidgets.la
 AnacondaWidgets_3_4_gir_FILES = $(GISOURCES) $(GIHDRS)
 AnacondaWidgets_3_4_gir_LIBS = libAnacondaWidgets.la
 AnacondaWidgets_3_4_gir_SCANNERFLAGS = --warn-all --identifier-prefix=Anaconda --symbol-prefix=anaconda
-AnacondaWidgets_3_4_gir_INCLUDES = Gtk-3.0 Xkl-1.0
+AnacondaWidgets_3_4_gir_INCLUDES = Gtk-3.0
 
 INTROSPECTION_GIRS = AnacondaWidgets-3.4.gir