Sync from SUSE:SLFO:Main makedepend revision ca1ffecbe3daf4569f6c9400c32aac43
This commit is contained in:
commit
961efca127
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
BIN
makedepend-1.0.8.tar.xz
(Stored with Git LFS)
Normal file
BIN
makedepend-1.0.8.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
94
makedepend.changes
Normal file
94
makedepend.changes
Normal file
@ -0,0 +1,94 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 31 12:42:13 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- renamed 0001-Avoid-depending-on-xproto.patch to
|
||||
u_Avoid-depending-on-xproto.patch, i.e. patch is to be upstreamed
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 31 09:27:16 UTC 2023 - Fabian Vogt <fvogt@suse.com>
|
||||
|
||||
- Add patch to avoid the xproto (+pkgconfig) dependency,
|
||||
useful for boo#1207721:
|
||||
* 0001-Avoid-depending-on-xproto.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 20 12:09:34 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Update to version 1.0.8:
|
||||
+ Bug #2: fix regression introduced by fix for bug #1
|
||||
- Obsoletes issue2-mr7.patch
|
||||
+ man page: add line breaks in Synopsis section
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 6 11:04:15 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- issue2-mr7.patch
|
||||
* Bug #2: fix regression introduced by fix for bug #1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Oct 29 17:18:03 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- Update to version 1.0.7
|
||||
* gitlab CI: add a basic build test
|
||||
* Close fd for reading old Makefile when done, instead of leaking it
|
||||
* gitlab CI: stop requiring Signed-off-by in commits
|
||||
* Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters
|
||||
* Thibault DUPONCHELLE (1):
|
||||
* Add test case for bug #1 + proposed fix.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 6 14:50:16 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Drop pkgconfig(xorg-macros) BuildRequires: this is only needed if
|
||||
configure.ac/Makefile.am files are being modified and autoreconf
|
||||
needs to be started. When using the pristine tarball, upstream
|
||||
ran make dist.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 22 11:47:42 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- Update to version 1.0.6
|
||||
* This minor maintenance release fixes some bugs, lifts a limit,
|
||||
clears some compiler warnings, boosts performance, and includes
|
||||
other janitorial cleanups.
|
||||
- supersedes u_Escape-special-characters-in-paths.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 18 05:52:22 UTC 2016 - eich@suse.com
|
||||
|
||||
- u_Escape-special-characters-in-paths.patch
|
||||
Make gets confused by certain special characters in Makefiles.
|
||||
Escape them. This is a problem particularly with ':' in OBS
|
||||
paths.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Aug 17 21:53:12 UTC 2013 - zaitor@opensuse.org
|
||||
|
||||
- Update to version 1.0.5:
|
||||
+ Don't crash if an option's argument is missing.
|
||||
+ Assume signal handlers return void, as C89 requires.
|
||||
+ Unsafe use of strcpy() in makedepend (fdo#56091).
|
||||
+ Store len in a size_t instead of an int in redirect().
|
||||
+ Mark fatalerr & catch as _X_NORETURN.
|
||||
+ Replace deprecated Automake INCLUDES variable with AM_CPPFLAGS.
|
||||
+ Makedepend rename fails on CIFS mounted shares (fdo#52099).
|
||||
+ autogen.sh: Implement GNOME Build API.
|
||||
+ configure: Drop AM_MAINTAINER_MODE.
|
||||
+ Fix a comment typo.
|
||||
+ Convert more sprintf calls to snprintf.
|
||||
+ Remove unnecessary casts from malloc/realloc calls.
|
||||
+ Remove fallbacks for Imake configuration, assume autoconf.
|
||||
+ Move i_listlen in struct inclist for better packing in 64-bit
|
||||
builds.
|
||||
+ config: Remove unnecessary calls from configure.ac.
|
||||
+ Update configure.ac initialization to X.Org standard form.
|
||||
+ unifdef -U__UNIXOS2__.
|
||||
+ makedepend: Build with automake-1.13 broken (fdo#59005).
|
||||
+ configure.ac: use AM_MAINTAINER_MODE.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 13 08:46:08 UTC 2012 - vuntz@opensuse.org
|
||||
|
||||
- Split makedepend from xorg-x11-util-devel.
|
||||
Initial version: 1.0.4.
|
||||
|
||||
62
makedepend.spec
Normal file
62
makedepend.spec
Normal file
@ -0,0 +1,62 @@
|
||||
#
|
||||
# spec file for package makedepend
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: makedepend
|
||||
Version: 1.0.8
|
||||
Release: 0
|
||||
Summary: Utility to create dependencies in makefiles
|
||||
License: MIT
|
||||
Group: Development/Tools/Building
|
||||
URL: https://xorg.freedesktop.org/
|
||||
Source0: http://xorg.freedesktop.org/releases/individual/util/%{name}-%{version}.tar.xz
|
||||
# PATCH-FIX-UPSTREAM https://gitlab.freedesktop.org/xorg/util/makedepend/-/merge_requests/10
|
||||
Patch1: u_Avoid-depending-on-xproto.patch
|
||||
# For autogen.sh
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: pkgconfig(xorg-macros) >= 1.8
|
||||
# This was part of the xorg-x11-util-devel package up to version 7.6
|
||||
Conflicts: xorg-x11-util-devel <= 7.6
|
||||
|
||||
%description
|
||||
The makedepend program reads each sourcefile in sequence and parses it
|
||||
like a C-preprocessor so that it can correctly tell which #include
|
||||
directives would be used in a compilation.
|
||||
|
||||
These dependencies are then written to a makefile in such a way that
|
||||
make will know which object files must be recompiled when a dependency
|
||||
has changed.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
%configure
|
||||
%make_build
|
||||
|
||||
%install
|
||||
%make_install
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
%doc AUTHORS ChangeLog README.md
|
||||
%{_bindir}/makedepend
|
||||
%{_mandir}/man1/makedepend.1%{?ext_man}
|
||||
|
||||
%changelog
|
||||
80
u_Avoid-depending-on-xproto.patch
Normal file
80
u_Avoid-depending-on-xproto.patch
Normal file
@ -0,0 +1,80 @@
|
||||
From 1c75b54c0f05da2a979347712eae6f07d9d2ab1b Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Vogt <fvogt@suse.de>
|
||||
Date: Tue, 31 Jan 2023 10:22:52 +0100
|
||||
Subject: [PATCH] Avoid depending on xproto
|
||||
|
||||
makedepend is rather early in the distro bootstrap chain, so it shouldn't pull
|
||||
in anything it doesn't really need.
|
||||
|
||||
xproto is only pulled in for two macros which we can just as easily provide
|
||||
ourselves.
|
||||
---
|
||||
configure.ac | 3 ---
|
||||
def.h | 21 +++++++++++++++++++--
|
||||
main.c | 1 +
|
||||
3 files changed, 20 insertions(+), 5 deletions(-)
|
||||
|
||||
Index: makedepend-1.0.8/configure.ac
|
||||
===================================================================
|
||||
--- makedepend-1.0.8.orig/configure.ac
|
||||
+++ makedepend-1.0.8/configure.ac
|
||||
@@ -26,8 +26,5 @@ AC_CHECK_FUNCS([rename fchmod])
|
||||
dnl Use 64-bit file operations on 32-bit systems that support them
|
||||
AC_SYS_LARGEFILE
|
||||
|
||||
-dnl Check for pkg-config packages
|
||||
-PKG_CHECK_MODULES(X, [xproto >= 7.0.17])
|
||||
-
|
||||
AC_CONFIG_FILES([Makefile])
|
||||
AC_OUTPUT
|
||||
Index: makedepend-1.0.8/def.h
|
||||
===================================================================
|
||||
--- makedepend-1.0.8.orig/def.h
|
||||
+++ makedepend-1.0.8/def.h
|
||||
@@ -28,8 +28,6 @@ in this Software without prior written a
|
||||
# include "makedepend-config.h"
|
||||
#endif
|
||||
|
||||
-#include <X11/Xos.h>
|
||||
-#include <X11/Xfuncproto.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
@@ -38,6 +36,25 @@ in this Software without prior written a
|
||||
#include <fcntl.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
+#ifndef _X_ATTRIBUTE_PRINTF
|
||||
+#if __has_attribute(__format__) \
|
||||
+ || defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 203)
|
||||
+# define _X_ATTRIBUTE_PRINTF(x,y) __attribute__((__format__(__printf__,x,y)))
|
||||
+#else /* not gcc >= 2.3 */
|
||||
+# define _X_ATTRIBUTE_PRINTF(x,y)
|
||||
+#endif
|
||||
+#endif
|
||||
+
|
||||
+#ifndef _X_NORETURN
|
||||
+#if __has_attribute(noreturn) \
|
||||
+ || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \
|
||||
+ || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
|
||||
+# define _X_NORETURN __attribute((noreturn))
|
||||
+#else
|
||||
+# define _X_NORETURN
|
||||
+#endif /* GNUC */
|
||||
+#endif
|
||||
+
|
||||
#define MAXDEFINES 512
|
||||
#define MAXFILES 2048
|
||||
#define MAXINCFILES 128 /* "-include" files */
|
||||
Index: makedepend-1.0.8/main.c
|
||||
===================================================================
|
||||
--- makedepend-1.0.8.orig/main.c
|
||||
+++ makedepend-1.0.8/main.c
|
||||
@@ -44,6 +44,7 @@ in this Software without prior written a
|
||||
#endif
|
||||
|
||||
#include <stdarg.h>
|
||||
+#include <unistd.h>
|
||||
|
||||
#ifdef __sun
|
||||
# include <sys/utsname.h>
|
||||
Loading…
Reference in New Issue
Block a user