Hello community, here is the log from the commit of package xrdb for openSUSE:Factory checked in at 2019-02-24 18:37:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xrdb (Old) and /work/SRC/openSUSE:Factory/.xrdb.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xrdb" Sun Feb 24 18:37:39 2019 rev:8 rq:677969 version:1.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/xrdb/xrdb.changes 2018-04-07 20:50:04.093567624 +0200 +++ /work/SRC/openSUSE:Factory/.xrdb.new.28833/xrdb.changes 2019-02-24 18:37:42.319356825 +0100 @@ -1,0 +2,13 @@ +Thu Feb 21 11:16:51 UTC 2019 - [email protected] + +- Update to version 1.2.0 + * This release adds a -E flag to see the preprocessor command + issued and the output of the preprocessor, to aid in debugging. + +------------------------------------------------------------------- +Thu Jan 10 13:21:14 UTC 2019 - [email protected] + +- run cpp with "-x assembler-with-cpp" in order to get rid of + warnings when parsing valid comments (bsc#1120004) + +------------------------------------------------------------------- Old: ---- xrdb-1.1.1.tar.bz2 New: ---- xrdb-1.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xrdb.spec ++++++ --- /var/tmp/diff_new_pack.PYJgRO/_old 2019-02-24 18:37:43.271356538 +0100 +++ /var/tmp/diff_new_pack.PYJgRO/_new 2019-02-24 18:37:43.271356538 +0100 @@ -1,7 +1,7 @@ # # spec file for package xrdb # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # 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: xrdb -Version: 1.1.1 +Version: 1.2.0 Release: 0 Summary: X server resource database utility License: MIT @@ -43,7 +43,9 @@ %setup -q %build -%configure --with-cpp=%{_bindir}/cpp +# Run cpp with "-x assembler-with-cpp" in order to get rid of +# warnings when parsing valid comments (bsc#1120004) +%configure --with-cpp="%{_bindir}/cpp -x assembler-with-cpp, /lib/cpp" make %{?_smp_mflags} %install @@ -51,7 +53,7 @@ %files %defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING README +%doc AUTHORS ChangeLog COPYING README.md %{_bindir}/xrdb %{_mandir}/man1/xrdb.1%{?ext_man} ++++++ xrdb-1.1.1.tar.bz2 -> xrdb-1.2.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xrdb-1.1.1/ChangeLog new/xrdb-1.2.0/ChangeLog --- old/xrdb-1.1.1/ChangeLog 2018-03-10 03:29:19.000000000 +0100 +++ new/xrdb-1.2.0/ChangeLog 2019-02-20 00:44:57.000000000 +0100 @@ -1,3 +1,37 @@ +commit c281cadb06657c2a15a52598be6cf9c30fad1b12 +Author: Alan Coopersmith <[email protected]> +Date: Tue Feb 19 15:43:17 2019 -0800 + + xrdb 1.2.0 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 3153fa6c79a2887ee63a58ae6a7d9f17d1615cb8 +Author: Alan Coopersmith <[email protected]> +Date: Wed Nov 21 17:17:21 2018 -0800 + + Update configure.ac bug URL for gitlab migration + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit e0026511c78a1bab57a6087b923bb223edc90282 +Author: Alan Coopersmith <[email protected]> +Date: Fri Nov 16 22:49:16 2018 -0800 + + Update README for gitlab migration + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 4c01ea85005fbc3506e32b88e1db3186538f8b9a +Author: Alan Coopersmith <[email protected]> +Date: Sat Mar 24 23:24:46 2018 -0700 + + Add -E flag to show cpp command line & processed input file + + https://bugs.freedesktop.org/show_bug.cgi?id=98300 + + Signed-off-by: Alan Coopersmith <[email protected]> + commit 74e8f61bd2f6857b8f242ffd34b3fe0ba1a04aa9 Author: Alan Coopersmith <[email protected]> Date: Fri Mar 9 18:28:18 2018 -0800 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xrdb-1.1.1/Makefile.am new/xrdb-1.2.0/Makefile.am --- old/xrdb-1.1.1/Makefile.am 2018-03-10 03:29:09.000000000 +0100 +++ new/xrdb-1.2.0/Makefile.am 2019-02-20 00:44:47.000000000 +0100 @@ -40,4 +40,4 @@ dist-hook: ChangeLog INSTALL - +EXTRA_DIST = README.md diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xrdb-1.1.1/Makefile.in new/xrdb-1.2.0/Makefile.in --- old/xrdb-1.1.1/Makefile.in 2018-03-10 03:29:13.000000000 +0100 +++ new/xrdb-1.2.0/Makefile.in 2019-02-20 00:44:51.000000000 +0100 @@ -203,8 +203,8 @@ CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \ - COPYING ChangeLog INSTALL README compile config.guess \ - config.sub depcomp install-sh missing + COPYING ChangeLog INSTALL compile config.guess config.sub \ + depcomp install-sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -375,6 +375,7 @@ xrdb.c MAINTAINERCLEANFILES = ChangeLog INSTALL +EXTRA_DIST = README.md all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xrdb-1.1.1/README new/xrdb-1.2.0/README --- old/xrdb-1.1.1/README 2018-03-10 03:29:09.000000000 +0100 +++ new/xrdb-1.2.0/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -xrdb - X server resource database utility - -All questions regarding this software should be directed at the -Xorg mailing list: - - http://lists.freedesktop.org/mailman/listinfo/xorg - -Please submit bug reports to the Xorg bugzilla: - - https://bugs.freedesktop.org/enter_bug.cgi?product=xorg - -The master development code repository can be found at: - - git://anongit.freedesktop.org/git/xorg/app/xrdb - - http://cgit.freedesktop.org/xorg/app/xrdb - -For patch submission instructions, see: - - http://www.x.org/wiki/Development/Documentation/SubmittingPatches - -For more information on the git code manager, see: - - http://wiki.x.org/wiki/GitPage - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xrdb-1.1.1/README.md new/xrdb-1.2.0/README.md --- old/xrdb-1.1.1/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/xrdb-1.2.0/README.md 2019-02-20 00:44:47.000000000 +0100 @@ -0,0 +1,18 @@ +xrdb - X server resource database utility +----------------------------------------- + +All questions regarding this software should be directed at the +Xorg mailing list: + + https://lists.x.org/mailman/listinfo/xorg + +The master development code repository can be found at: + + https://gitlab.freedesktop.org/xorg/app/xrdb + +Please submit bug reports and requests to merge patches there. + +For patch submission instructions, see: + + https://www.x.org/wiki/Development/Documentation/SubmittingPatches + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xrdb-1.1.1/configure new/xrdb-1.2.0/configure --- old/xrdb-1.1.1/configure 2018-03-10 03:29:12.000000000 +0100 +++ new/xrdb-1.2.0/configure 2019-02-20 00:44:50.000000000 +0100 @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xrdb 1.1.1. +# Generated by GNU Autoconf 2.69 for xrdb 1.2.0. # -# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. +# Report bugs to <https://gitlab.freedesktop.org/xorg/app/xrdb/issues>. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -267,7 +267,7 @@ $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell [email protected] and -$0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +$0: https://gitlab.freedesktop.org/xorg/app/xrdb/issues $0: about your system, including any error possibly output $0: before this message. Then install a modern shell, or $0: manually run the script under such a shell if you do @@ -581,9 +581,9 @@ # Identity of this package. PACKAGE_NAME='xrdb' PACKAGE_TARNAME='xrdb' -PACKAGE_VERSION='1.1.1' -PACKAGE_STRING='xrdb 1.1.1' -PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' +PACKAGE_VERSION='1.2.0' +PACKAGE_STRING='xrdb 1.2.0' +PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/xrdb/issues' PACKAGE_URL='' ac_unique_file="Makefile.am" @@ -1309,7 +1309,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xrdb 1.1.1 to adapt to many kinds of systems. +\`configure' configures xrdb 1.2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1379,7 +1379,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xrdb 1.1.1:";; + short | recursive ) echo "Configuration of xrdb 1.2.0:";; esac cat <<\_ACEOF @@ -1426,7 +1426,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. +Report bugs to <https://gitlab.freedesktop.org/xorg/app/xrdb/issues>. _ACEOF ac_status=$? fi @@ -1489,7 +1489,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xrdb configure 1.1.1 +xrdb configure 1.2.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1648,9 +1648,9 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ---------------------------------------------------------------------- ## -## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ##" +( $as_echo "## ------------------------------------------------------------------ ## +## Report this to https://gitlab.freedesktop.org/xorg/app/xrdb/issues ## +## ------------------------------------------------------------------ ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -1904,7 +1904,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xrdb $as_me 1.1.1, which was +It was created by xrdb $as_me 1.2.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4142,7 +4142,7 @@ # Define the identity of the package. PACKAGE='xrdb' - VERSION='1.1.1' + VERSION='1.2.0' cat >>confdefs.h <<_ACEOF @@ -11586,7 +11586,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xrdb $as_me 1.1.1, which was +This file was extended by xrdb $as_me 1.2.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11646,13 +11646,13 @@ Configuration commands: $config_commands -Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>." +Report bugs to <https://gitlab.freedesktop.org/xorg/app/xrdb/issues>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xrdb config.status 1.1.1 +xrdb config.status 1.2.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xrdb-1.1.1/configure.ac new/xrdb-1.2.0/configure.ac --- old/xrdb-1.1.1/configure.ac 2018-03-10 03:29:09.000000000 +0100 +++ new/xrdb-1.2.0/configure.ac 2019-02-20 00:44:47.000000000 +0100 @@ -22,8 +22,8 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xrdb], [1.1.1], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xrdb]) +AC_INIT([xrdb], [1.2.0], + [https://gitlab.freedesktop.org/xorg/app/xrdb/issues], [xrdb]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) AC_USE_SYSTEM_EXTENSIONS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xrdb-1.1.1/man/xrdb.man new/xrdb-1.2.0/man/xrdb.man --- old/xrdb-1.1.1/man/xrdb.man 2018-03-10 03:29:09.000000000 +0100 +++ new/xrdb-1.2.0/man/xrdb.man 2019-02-20 00:44:47.000000000 +0100 @@ -231,6 +231,12 @@ This option is passed to the C preprocessor if used. It prevents it from predefining any system specific macros. .TP 8 +.B \-E +This option indicates that any cpp command run and the output from it should +be shown on standard output. If \fB\-nocpp\fP was also specified, the input +file will be shown as read. The specified changes will also be performed +unless the \fB\-n\fP option is also specified. +.TP 8 .B \-symbols This option indicates that the symbols that are defined for the preprocessor should be printed onto the standard output. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xrdb-1.1.1/xrdb.c new/xrdb-1.2.0/xrdb.c --- old/xrdb-1.1.1/xrdb.c 2018-03-10 03:29:09.000000000 +0100 +++ new/xrdb-1.2.0/xrdb.c 2019-02-20 00:44:47.000000000 +0100 @@ -127,6 +127,7 @@ static const char * const cpp_locations[] = { CPP }; static const char *backup_suffix = BACKUP_SUFFIX; static Bool dont_execute = False; +static Bool show_cpp = False; static String defines; static size_t defines_base; #define MAX_CMD_DEFINES 512 @@ -428,6 +429,8 @@ } #endif AppendToBuffer(b, buf, bytes); + if (show_cpp) + fwrite(buf, 1, bytes, stdout); } AppendToBuffer(b, "", 1); } @@ -779,6 +782,7 @@ " -n show but don't do changes\n" " -cpp filename preprocessor to use [%s]\n" " -nocpp do not use a preprocessor\n" + " -E show preprocessor command & processed input file\n" " -query query resources\n" " -load load resources from file [default]\n" " -override add in resources from file\n" @@ -962,6 +966,10 @@ cpp_program = argv[i]; continue; } + else if (!strcmp("-E", arg)) { + show_cpp = True; + continue; + } else if (!strcmp("-n", arg)) { dont_execute = True; continue; @@ -1349,6 +1357,8 @@ if (asprintf(&cmd, "%s %s %s %s > %s", cpp_program, cpp_addflags, includes.val, tmpname2, tmpname3) == -1) fatal("%s: Out of memory\n", ProgramName); + if (show_cpp) + puts(cmd); if (system(cmd) < 0) fatal("%s: cannot run '%s'\n", ProgramName, cmd); free(cmd); @@ -1364,6 +1374,8 @@ if (asprintf(&cmd, "%s %s %s", cpp_program, cpp_addflags, includes.val) == -1) fatal("%s: Out of memory\n", ProgramName); + if (show_cpp) + puts(cmd); if (!(input = popen(cmd, "r"))) fatal("%s: cannot run '%s'\n", ProgramName, cmd); free(cmd); @@ -1382,6 +1394,8 @@ cpp_addflags, includes.val, defines.val, filename ? filename : "", tmpname3) == -1) fatal("%s: Out of memory\n", ProgramName); + if (show_cpp) + puts(cmd); if (system(cmd) < 0) fatal("%s: cannot run '%s'\n", ProgramName, cmd); free(cmd); @@ -1392,6 +1406,8 @@ cpp_addflags, includes.val, defines.val, filename ? filename : "") == -1) fatal("%s: Out of memory\n", ProgramName); + if (show_cpp) + puts(cmd); if (!(input = popen(cmd, "r"))) fatal("%s: cannot run '%s'\n", ProgramName, cmd); free(cmd);
