Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package makedepend for openSUSE:Factory checked in at 2023-02-01 16:38:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/makedepend (Old) and /work/SRC/openSUSE:Factory/.makedepend.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "makedepend" Wed Feb 1 16:38:25 2023 rev:13 rq:1062231 version:1.0.8 Changes: -------- --- /work/SRC/openSUSE:Factory/makedepend/makedepend.changes 2023-01-02 15:01:36.057159619 +0100 +++ /work/SRC/openSUSE:Factory/.makedepend.new.32243/makedepend.changes 2023-02-01 16:47:59.256818595 +0100 @@ -1,0 +2,13 @@ +Tue Jan 31 12:42:13 UTC 2023 - Stefan Dirsch <[email protected]> + +- 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 <[email protected]> + +- Add patch to avoid the xproto (+pkgconfig) dependency, + useful for boo#1207721: + * 0001-Avoid-depending-on-xproto.patch + +------------------------------------------------------------------- New: ---- u_Avoid-depending-on-xproto.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ makedepend.spec ++++++ --- /var/tmp/diff_new_pack.MJ34aV/_old 2023-02-01 16:47:59.892822435 +0100 +++ /var/tmp/diff_new_pack.MJ34aV/_new 2023-02-01 16:47:59.900822484 +0100 @@ -1,7 +1,7 @@ # # spec file for package makedepend # -# Copyright (c) 2022 SUSE LLC +# 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 @@ -24,8 +24,12 @@ Group: Development/Tools/Building URL: https://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/util/%{name}-%{version}.tar.xz -BuildRequires: pkgconfig -BuildRequires: pkgconfig(xproto) >= 7.0.17 +# 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 @@ -42,6 +46,7 @@ %autosetup -p1 %build +NOCONFIGURE=1 ./autogen.sh %configure %make_build ++++++ u_Avoid-depending-on-xproto.patch ++++++ >From 1c75b54c0f05da2a979347712eae6f07d9d2ab1b Mon Sep 17 00:00:00 2001 From: Fabian Vogt <[email protected]> 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>
