From 43c08c6fc73a832445bd37b7592b7601e7dba1e5e2fd3d640f3698ca67ce91a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Li=C5=A1ka?= Date: Sun, 26 Jun 2022 16:14:29 +0000 Subject: [PATCH] Accepting request 985080 from home:1Antoine1:branches:devel:tools - Add rtags-2.38-emacs-28.patch: Fix build with emacs 28. OBS-URL: https://build.opensuse.org/request/show/985080 OBS-URL: https://build.opensuse.org/package/show/devel:tools/rtags?expand=0&rev=23 --- rtags-2.38-emacs-28.patch | 31 +++++++++++++++++++++++++++++++ rtags.changes | 5 +++++ rtags.spec | 8 +++++--- 3 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 rtags-2.38-emacs-28.patch diff --git a/rtags-2.38-emacs-28.patch b/rtags-2.38-emacs-28.patch new file mode 100644 index 0000000..a31f7ab --- /dev/null +++ b/rtags-2.38-emacs-28.patch @@ -0,0 +1,31 @@ +From 63f18acb21e664fd92fbc19465f0b5df085b5e93 Mon Sep 17 00:00:00 2001 +From: Przemyslaw Kryger +Date: Sat, 13 Mar 2021 15:35:18 +0000 +Subject: [PATCH] Add when argument to define-obsolete-function-alias + +The `when` has become mandatory since +https://emba.gnu.org/emacs/emacs/-/commit/32c6732d16385f242b1109517f25e9aefd6caa5c (credit +to @zflat). + +Fortunately the emacs-24.3 (the lowest supported version according to package), +has already support for the `when` parameter. + +I've used `v2.2` as this is the tag that follows commit that added the obsolete +call (dbf1ca3b2518d43f8c1b897d71126cfd132ef30b). +--- + src/rtags.el | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/rtags.el b/src/rtags.el +index 32961934a..0f3cf5a90 100644 +--- a/src/rtags.el ++++ b/src/rtags.el +@@ -4689,7 +4689,7 @@ definition." + (and rtags-autostart-diagnostics (rtags-diagnostics)) + (set-process-query-on-exit-flag rtags-rdm-process nil) + (set-process-sentinel rtags-rdm-process 'rtags-sentinel))))) +-(define-obsolete-function-alias 'rtags-start-process-maybe 'rtags-start-process-unless-running) ++(define-obsolete-function-alias 'rtags-start-process-maybe 'rtags-start-process-unless-running "v2.2") + + (defun rtags-sentinel (process _event) + "Watch the activity of RTags process (rdm)." diff --git a/rtags.changes b/rtags.changes index 39db84b..7f18f7d 100644 --- a/rtags.changes +++ b/rtags.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jun 25 20:49:16 UTC 2022 - Antoine Belvire + +- Add rtags-2.38-emacs-28.patch: Fix build with emacs 28. + ------------------------------------------------------------------- Sat Jan 2 00:59:30 UTC 2021 - Cameron Rapp diff --git a/rtags.spec b/rtags.spec index bc13210..7960984 100644 --- a/rtags.spec +++ b/rtags.spec @@ -1,7 +1,7 @@ # # spec file for package rtags # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,10 +24,12 @@ License: GPL-3.0-or-later Group: Development/Tools/Navigators URL: https://github.com/Andersbakken/rtags Source0: https://github.com/Andersbakken/rtags/releases/download/v%{version}/rtags-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM rtags-2.38-emacs-28.patch -- Fix build with Emacs 28 +Patch0: rtags-2.38-emacs-28.patch +BuildRequires: clang-devel BuildRequires: cmake BuildRequires: emacs-nox BuildRequires: gcc-c++ -BuildRequires: clang-devel BuildRequires: llvm-devel BuildRequires: pkgconfig BuildRequires: pkgconfig(ncurses) @@ -41,7 +43,7 @@ Rtags is Clang based source file indexer supporting C/C++/Objective-C(++) code. %define _scriptdir %{_datadir}/rtags/ %prep -%autosetup +%autosetup -p1 %build %cmake \