Accepting request 985161 from devel:tools

OBS-URL: https://build.opensuse.org/request/show/985161
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rtags?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2022-06-27 09:25:33 +00:00 committed by Git OBS Bridge
commit 6ba47d5808
3 changed files with 41 additions and 3 deletions

31
rtags-2.38-emacs-28.patch Normal file
View File

@ -0,0 +1,31 @@
From 63f18acb21e664fd92fbc19465f0b5df085b5e93 Mon Sep 17 00:00:00 2001
From: Przemyslaw Kryger <pkryger@gmail.com>
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)."

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Jun 25 20:49:16 UTC 2022 - Antoine Belvire <antoine.belvire@opensuse.org>
- Add rtags-2.38-emacs-28.patch: Fix build with emacs 28.
-------------------------------------------------------------------
Sat Jan 2 00:59:30 UTC 2021 - Cameron Rapp <camspam@redhyena.net>

View File

@ -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 \