From 21cb2308ced14e1990e4a65c5951c3d2a620e979 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dan.cermak@cgc-instruments.com>
Date: Mon, 25 Mar 2024 12:23:19 +0100
Subject: [PATCH] New upstream release 29.3, fixes rhbz#2271287

Drop 0001-configure-Remove-obsolete-check-for-b-i486-linuxaout.patch, it does
not appear to be necessary anymore
---
 .gitignore                                    |  2 +
 ...-obsolete-check-for-b-i486-linuxaout.patch | 62 -------------------
 emacs.spec                                    |  5 +-
 sources                                       |  4 +-
 4 files changed, 6 insertions(+), 67 deletions(-)
 delete mode 100644 0001-configure-Remove-obsolete-check-for-b-i486-linuxaout.patch

diff --git a/.gitignore b/.gitignore
index bd11d19..1d9aa7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,5 @@
 /emacs-28.2.tar.xz.sig
 /emacs-29.1.tar.xz
 /emacs-29.1.tar.xz.sig
+/emacs-29.3.tar.xz
+/emacs-29.3.tar.xz.sig
diff --git a/0001-configure-Remove-obsolete-check-for-b-i486-linuxaout.patch b/0001-configure-Remove-obsolete-check-for-b-i486-linuxaout.patch
deleted file mode 100644
index 4e488ea..0000000
--- a/0001-configure-Remove-obsolete-check-for-b-i486-linuxaout.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 123ece3c3313101048d43a5ef2f9bd66c4e97fb7 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Fri, 23 Dec 2022 18:49:25 +0100
-Subject: [PATCH] configure: Remove obsolete check for -b i486-linuxaout
-
-If there are still a.out system arounds, they shouldn't need this
-anymore because the toolchain has been fixed.
-
-* configure.ac (emacs_cv_b_link): Remove obsolete check.
-
-(cherry picked from commit 6c1413d5ef0d1fea639b0d8c83a0c0065d99359b)
----
- configure.ac | 33 ---------------------------------
- 1 file changed, 33 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5dd182ae6e5..8a20caa8c4e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2695,39 +2695,6 @@ if test "${HAVE_X11}" = "yes"; then
-     export LD_RUN_PATH
-   fi
- 
--  if test "${opsys}" = "gnu-linux"; then
--    AC_CACHE_CHECK([whether X on GNU/Linux needs -b to link], [emacs_cv_b_link],
--    [AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
--     [[XOpenDisplay ("foo");]])],
--     [xgnu_linux_first_failure=no],
--     [xgnu_linux_first_failure=yes])
--    if test "${xgnu_linux_first_failure}" = "yes"; then
--      OLD_CPPFLAGS="$CPPFLAGS"
--      OLD_LIBS="$LIBS"
--      CPPFLAGS="$CPPFLAGS -b i486-linuxaout"
--      LIBS="$LIBS -b i486-linuxaout"
--      AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
--       [[XOpenDisplay ("foo");]])],
--       [xgnu_linux_second_failure=no],
--       [xgnu_linux_second_failure=yes])
--      if test "${xgnu_linux_second_failure}" = "yes"; then
--	# If we get the same failure with -b, there is no use adding -b.
--	# So leave it out.  This plays safe.
--        emacs_cv_b_link=no
--      else
--        emacs_cv_b_link=yes
--      fi
--      CPPFLAGS=$OLD_CPPFLAGS
--      LIBS=$OLD_LIBS
--    else
--      emacs_cv_b_link=no
--    fi])
--    if test "x$emacs_cv_b_link" = xyes ; then
--      LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -b i486-linuxaout"
--      C_SWITCH_X_SITE="$C_SWITCH_X_SITE -b i486-linuxaout"
--    fi
--  fi
--
-   # Reportedly, some broken Solaris systems have XKBlib.h but are missing
-   # header files included from there.
-   AC_CACHE_CHECK([for Xkb], [emacs_cv_xkb],
--- 
-2.41.0
-
diff --git a/emacs.spec b/emacs.spec
index e0858b9..1914416 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -7,7 +7,7 @@
 Summary:       GNU Emacs text editor
 Name:          emacs
 Epoch:         1
-Version:       29.2
+Version:       29.3
 Release:       %autorelease
 License:       GPL-3.0-or-later AND CC0-1.0
 URL:           http://www.gnu.org/software/emacs/
@@ -30,8 +30,7 @@ Patch2:        emacs-system-crypto-policies.patch
 Patch3:        emacs-libdir-vs-systemd.patch
 # Avoid using the pure GTK build on X11 where it is unsupported:
 Patch4:        emacs-desktop.patch
-Patch5:        0001-configure-Remove-obsolete-check-for-b-i486-linuxaout.patch
-Patch6:        emacs-pgtk-on-x-error-message.patch
+Patch5:        emacs-pgtk-on-x-error-message.patch
 
 BuildRequires: gcc
 BuildRequires: atk-devel
diff --git a/sources b/sources
index 7e4d130..a02f31c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (emacs-29.2.tar.xz) = 293fdc2387d58dfa506ae1960b05ccdb4c16ec53c4f55a1a6b665a4fe2815cabfad6257f2b62231040889ab3843d56a01ef62fc9efc1118bf833d7773c64820a
-SHA512 (emacs-29.2.tar.xz.sig) = eae72dbfa79c5f9410f2d03d2b96eb3a0b1fd30aaf5888932cfee861c743d01b4bf9a41d8e9381a4b93f075f2e3cad056e3c8fb3915b15942ce687d6c67c962e
+SHA512 (emacs-29.3.tar.xz) = efaecfc46a0b88f61de477d92c08ee592b8838e6c34724151a3b1502efa7ebd4d4837733c694807e6de1ba4b8d37d2ec382c6bb2ed000b67ad8f0e11c7df2a6b
+SHA512 (emacs-29.3.tar.xz.sig) = 369cd1b2f39c57be4f343c950389a20d48f87f830b39183c8e0fbaf4f1929c5915ac82ceab5c4889dfa5ce95408857a06ff7ab877da346046a73e30d873c807c