Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package appres for openSUSE:Factory checked in at 2024-06-17 19:30:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/appres (Old) and /work/SRC/openSUSE:Factory/.appres.new.19518 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "appres" Mon Jun 17 19:30:06 2024 rev:10 rq:1181188 version:1.0.7 Changes: -------- --- /work/SRC/openSUSE:Factory/appres/appres.changes 2022-04-03 21:36:26.556256071 +0200 +++ /work/SRC/openSUSE:Factory/.appres.new.19518/appres.changes 2024-06-17 19:30:30.320472881 +0200 @@ -1,0 +2,11 @@ +Sun Jun 16 18:21:07 UTC 2024 - Stefan Dirsch <sndir...@suse.com> + +- Update to version 1.0.7 + * This release includes support for building with meson as well as autoconf. + Please test building with meson and report any issues you hit to our + gitlab issue tracker at: + https://gitlab.freedesktop.org/xorg/app/appres/-/issues + as we plan on removing the autoconf build support in a future release. +- switched to meson build + +------------------------------------------------------------------- Old: ---- appres-1.0.6.tar.xz New: ---- appres-1.0.7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ appres.spec ++++++ --- /var/tmp/diff_new_pack.BU8irG/_old 2024-06-17 19:30:30.832491620 +0200 +++ /var/tmp/diff_new_pack.BU8irG/_new 2024-06-17 19:30:30.836491767 +0200 @@ -1,7 +1,7 @@ # # spec file for package appres # -# Copyright (c) 2022 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,13 +17,14 @@ Name: appres -Version: 1.0.6 +Version: 1.0.7 Release: 0 Summary: Utility to list the resource database of an X application License: X11 Group: System/X11/Utilities URL: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.xz +BuildRequires: meson BuildRequires: pkg-config BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xorg-macros) >= 1.8 @@ -43,11 +44,11 @@ %setup -q %build -%configure -make %{?_smp_mflags} +%{meson} +%{meson_build} %install -%make_install +%{meson_install} %files %defattr(-,root,root) ++++++ appres-1.0.6.tar.xz -> appres-1.0.7.tar.xz ++++++ ++++ 6778 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/appres-1.0.6/ChangeLog new/appres-1.0.7/ChangeLog --- old/appres-1.0.6/ChangeLog 2022-04-03 20:57:35.000000000 +0200 +++ new/appres-1.0.7/ChangeLog 2024-06-16 19:38:23.000000000 +0200 @@ -1,3 +1,49 @@ +commit 07075bda9cd863fa10f47993271dbe7e6e256d71 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sun Jun 16 10:32:47 2024 -0700 + + appres 1.0.7 + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Part-of: <https://gitlab.freedesktop.org/xorg/app/appres/-/merge_requests/5> + +commit b297a7738a02b3fb7a8842e054c4068195038c38 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sun Apr 7 13:58:13 2024 -0700 + + meson: Add a meson build system + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Part-of: <https://gitlab.freedesktop.org/xorg/app/appres/-/merge_requests/4> + +commit 2b5316265c5ce6c7dbd8f726826d5d5a7385febd +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sun Apr 7 12:53:58 2024 -0700 + + configure: use @-style substitutions for man pages instead of __-style + + Moves substitution of variables from Makefile.am to configure.ac + in preparation for allowing meson.build to do the same. + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Part-of: <https://gitlab.freedesktop.org/xorg/app/appres/-/merge_requests/4> + +commit 888aece87c0af4e0b326d4d92fcc079f249a7f73 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Thu Feb 9 12:25:47 2023 -0800 + + Accept -help, -version, & -V without requiring display to open + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 163ba88d2d98369df78c2700b634cf62012f8c31 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Thu Jul 28 17:30:21 2022 -0700 + + gitlab CI: stop requiring Signed-off-by in commits + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + commit 55db329c8363e6ca969c27652f0da714364065bd Author: Alan Coopersmith <alan.coopersm...@oracle.com> Date: Sun Apr 3 11:54:44 2022 -0700 @@ -467,7 +513,7 @@ Use sed to fill in variables in man page commit 61d84d9c527921b252706b251ce29caac4eb5ad4 -Author: Kristian Høgsberg <k...@redhat.com> +Author: Kristian Høgsberg <k...@redhat.com> Date: Fri Sep 23 20:34:52 2005 +0000 Add some content to these. @@ -513,7 +559,7 @@ More freedestkop->freedesktop typo fixes commit e6418cf03e9a7f835a7ee7d958ea6a1d4318f7b5 -Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk> +Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk> Date: Wed Jun 22 23:52:44 2005 +0000 - Add script that can generate the build system for applications diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/appres-1.0.6/Makefile.am new/appres-1.0.7/Makefile.am --- old/appres-1.0.6/Makefile.am 2022-04-03 20:57:26.000000000 +0200 +++ new/appres-1.0.7/Makefile.am 2024-06-16 19:38:13.000000000 +0200 @@ -40,4 +40,4 @@ dist-hook: ChangeLog INSTALL -EXTRA_DIST = README.md +EXTRA_DIST = README.md meson.build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/appres-1.0.6/appres.c new/appres-1.0.7/appres.c --- old/appres-1.0.6/appres.c 2022-04-03 20:57:26.000000000 +0200 +++ new/appres-1.0.7/appres.c 2024-06-16 19:38:13.000000000 +0200 @@ -42,7 +42,7 @@ static XrmQuark XrmQString; static void _X_NORETURN -usage (void) +usage (int exitval) { fprintf (stderr, "usage: %s [class [instance]] [-1] [-V] [toolkitoptions]\n" @@ -50,7 +50,7 @@ "-V print command version and exit\n" "The number of class and instance elements must be equal.\n", ProgramName); - exit (1); + exit (exitval); } /* stolen from Xlib Xrm.c */ @@ -133,6 +133,23 @@ int mode = XrmEnumAllLevels; ProgramName = argv[0]; + + /* Handle args that don't require opening a display */ + for (int n = 1; n < argc; n++) { + const char *argn = argv[n]; + /* accept single or double dash for -help & -version, but not -V */ + if (argn[0] == '-' && argn[1] == '-') { + argn++; + } + if (strcmp(argn, "-help") == 0) { + usage(0); + } + if ((strcmp(argn, "-version") == 0) || (strcmp(argv[n], "-V") == 0)) { + puts(PACKAGE_STRING); + exit(0); + } + } + if (argc > 1 && argv[1][0] != '-') { cname = argv[1]; if (argc > 2 && argv[2][0] != '-') @@ -143,7 +160,8 @@ XrmStringToNameList(iname, names); for (i = 0; names[i]; i++) ; - if (!i || classes[i] || !classes[i-1]) usage (); + if (!i || classes[i] || !classes[i-1]) + usage(1); argv[0] = XrmNameToString(names[0]); toplevel = XtAppInitialize(&xtcontext, XrmClassToString(classes[0]), @@ -154,21 +172,17 @@ for (i = 1; i < argc; i++) { if (!strcmp(argv[i], "-1")) mode = XrmEnumOneLevel; - else if (!strcmp(argv[i], "-V")) { - printf("%s\n", PACKAGE_STRING); - exit(0); - } else if (argv[i][0] == '-') { fprintf(stderr, "%s: unrecognized option '%s'\n", ProgramName, argv[i]); - usage(); + usage(1); } else if (!cname) cname = argv[i]; else if (!iname) iname = argv[i]; else - usage(); + usage(1); } if (!iname) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/appres-1.0.6/config.h.in new/appres-1.0.7/config.h.in --- old/appres-1.0.6/config.h.in 2022-04-03 20:57:29.000000000 +0200 +++ new/appres-1.0.7/config.h.in 2024-06-16 19:38:18.000000000 +0200 @@ -57,7 +57,7 @@ /* Patch version of this package */ #undef PACKAGE_VERSION_PATCHLEVEL -/* Define to 1 if all of the C90 standard headers exist (not just the ones +/* Define to 1 if all of the C89 standard headers exist (not just the ones required in a freestanding environment). This macro is provided for backward compatibility; new code need not use it. */ #undef STDC_HEADERS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/appres-1.0.6/configure.ac new/appres-1.0.7/configure.ac --- old/appres-1.0.6/configure.ac 2022-04-03 20:57:26.000000000 +0200 +++ new/appres-1.0.7/configure.ac 2024-06-16 19:38:13.000000000 +0200 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([appres], [1.0.6], +AC_INIT([appres], [1.0.7], [https://gitlab.freedesktop.org/xorg/app/appres/issues], [appres]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) @@ -40,6 +40,9 @@ # Checks for pkg-config packages PKG_CHECK_MODULES(APPRES, [x11 xt xproto >= 7.0.17]) +# Substitute config variables in man pages +AC_CONFIG_FILES([man/appres.1:man/appres.man]) + AC_CONFIG_FILES([ Makefile man/Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/appres-1.0.6/man/Makefile.am new/appres-1.0.7/man/Makefile.am --- old/appres-1.0.6/man/Makefile.am 2022-04-03 20:57:26.000000000 +0200 +++ new/appres-1.0.7/man/Makefile.am 2024-06-16 19:38:13.000000000 +0200 @@ -5,8 +5,3 @@ EXTRA_DIST = $(appman_PRE) CLEANFILES = $(appman_DATA) -SUFFIXES = .$(APP_MAN_SUFFIX) .man - -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/appres-1.0.6/man/appres.man new/appres-1.0.7/man/appres.man --- old/appres-1.0.6/man/appres.man 2022-04-03 20:57:26.000000000 +0200 +++ new/appres-1.0.7/man/appres.man 2024-06-16 19:38:13.000000000 +0200 @@ -22,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.TH APPRES 1 __xorgversion__ +.TH APPRES 1 "@PACKAGE_STRING@" "@XORG_MAN_PAGE@" .SH NAME appres \- list X application resource database .SH SYNOPSIS @@ -86,6 +86,6 @@ The -V option prints the appres command version and exits. .SH "SEE ALSO" .PP -X(__miscmansuffix__), xrdb(__appmansuffix__), listres(__appmansuffix__) +X(@MISC_MAN_SUFFIX@), xrdb(@APP_MAN_SUFFIX@), listres(@APP_MAN_SUFFIX@) .SH AUTHOR Jim Fulton, MIT X Consortium diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/appres-1.0.6/meson.build new/appres-1.0.7/meson.build --- old/appres-1.0.6/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/appres-1.0.7/meson.build 2024-06-16 19:38:13.000000000 +0200 @@ -0,0 +1,40 @@ +project('appres', 'c', + version : '1.0.7', + license : 'MIT', + default_options: ['warning_level=3'], +) + +cc = meson.get_compiler('c') + +prefix = get_option('prefix') + +package_string = '@0@ @1@'.format(meson.project_name(), meson.project_version()) + +conf_data = configuration_data() +conf_data.set('PACKAGE_STRING', '"@0@"'.format(package_string)) +configure_file(output : 'config.h', configuration : conf_data) +add_global_arguments('-DHAVE_CONFIG_H', language : 'c') + +x11_dep = dependency('x11', required: true) +xmuu_dep = dependency('xt', required: true) +xproto_dep = dependency('xproto', required: true, version: '>= 7.0.17') + +sources = ['appres.c'] +executable('appres', sources, + dependencies: [x11_dep, xmuu_dep, xproto_dep], + install: true) + +man = join_paths(prefix, get_option('mandir')) + +man_conf = configuration_data() +man_conf.set('PACKAGE_STRING', package_string) +man_conf.set('APP_MAN_SUFFIX', '1') +man_conf.set('MISC_MAN_SUFFIX', '7') +man_conf.set('XORG_MAN_PAGE', 'X Version 11') + +install_man(configure_file( + input: 'man/appres.man', + output: 'appres.1', + install_dir: join_paths(man, 'man1'), + configuration: man_conf +))
