pool/makedepend
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1144238 from X11:XOrg

Browse Source 
- Update to version 1.0.9
  * This release includes code cleanups and other changes,
    including removing the build time dependency on the xorgproto
    package.
- supersedes u_Avoid-depending-on-xproto.patch

OBS-URL: https://build.opensuse.org/request/show/1144238
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/makedepend?expand=0&rev=14
This commit is contained in:
Ana Guerrero 2024-02-06 15:34:00 +00:00 committed by Git OBS Bridge
commit a315aec29e
5 changed files with 14 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
makedepend-1.0.8.tar.xz (Stored with Git LFS)
View File

Binary file not shown.

3
makedepend-1.0.9.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:92d0deb659fff6d8ddbc1d27fc4ca8ceb2b6dbe15d73f0a04edc09f1c5782dd4
size 145080

9
makedepend.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Feb 5 12:31:54 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
- Update to version 1.0.9
* This release includes code cleanups and other changes,
including removing the build time dependency on the xorgproto
package.
- supersedes u_Avoid-depending-on-xproto.patch
-------------------------------------------------------------------
Tue Jan 31 12:42:13 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>

5
makedepend.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package makedepend
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
Name: makedepend
Version: 1.0.8
Version: 1.0.9
Release: 0
Summary: Utility to create dependencies in makefiles
License: MIT
@ -25,7 +25,6 @@ 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

80
u_Avoid-depending-on-xproto.patch
View File

@ -1,80 +0,0 @@
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>