xrdb 1.2.0.

debian/changelog

@@ -4,6 +4,7 @@ x11-xserver-utils (7.7+9) UNRELEASED; urgency=medium
   * xhost 1.0.8.
   * xmodmap 1.0.10.
   * xrandr 1.5.1. (Closes: #784324)
+  * xrdb 1.2.0.
 
  -- Timo Aaltonen <tjaalton@debian.org>  Fri, 31 Jan 2020 13:58:50 +0200
 

xrdb/ChangeLog

@@ -1,3 +1,37 @@
+commit c281cadb06657c2a15a52598be6cf9c30fad1b12
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Tue Feb 19 15:43:17 2019 -0800
+
+    xrdb 1.2.0
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 3153fa6c79a2887ee63a58ae6a7d9f17d1615cb8
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Wed Nov 21 17:17:21 2018 -0800
+
+    Update configure.ac bug URL for gitlab migration
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit e0026511c78a1bab57a6087b923bb223edc90282
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Fri Nov 16 22:49:16 2018 -0800
+
+    Update README for gitlab migration
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 4c01ea85005fbc3506e32b88e1db3186538f8b9a
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+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 <alan.coopersmith@oracle.com>
+
 commit 74e8f61bd2f6857b8f242ffd34b3fe0ba1a04aa9
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Fri Mar 9 18:28:18 2018 -0800

xrdb/Makefile.am

@@ -40,4 +40,4 @@ ChangeLog:
 
 dist-hook: ChangeLog INSTALL
 
-
+EXTRA_DIST = README.md

xrdb/Makefile.in

@@ -203,8 +203,8 @@ CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
-	COPYING ChangeLog INSTALL README compile config.guess \
+	COPYING ChangeLog INSTALL compile config.guess config.sub \
-	config.sub depcomp install-sh missing
+	depcomp install-sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -375,6 +375,7 @@ xrdb_SOURCES = \
         xrdb.c
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
+EXTRA_DIST = README.md
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 

xrdb/README.md

@@ -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
+

xrdb/configure

@@ -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 @@ fi
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
     $as_echo "$0: Please tell bug-autoconf@gnu.org 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 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xrdb'
 PACKAGE_TARNAME='xrdb'
-PACKAGE_VERSION='1.1.1'
+PACKAGE_VERSION='1.2.0'
-PACKAGE_STRING='xrdb 1.1.1'
+PACKAGE_STRING='xrdb 1.2.0'
-PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
+PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/xrdb/issues'
 PACKAGE_URL=''
 
 ac_unique_file="Makefile.am"
@@ -1309,7 +1309,7 @@ if test "$ac_init_help" = "long"; then
   # 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 @@ fi
 
 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 @@ Some influential environment variables:
 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 @@ fi
 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: see the Autoconf documentation" >&2;}
 $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 "## ---------------------------------------------------------------------- ##
+( $as_echo "## ------------------------------------------------------------------ ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
+## Report this to https://gitlab.freedesktop.org/xorg/app/xrdb/issues ##
-## ---------------------------------------------------------------------- ##"
+## ------------------------------------------------------------------ ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
@@ -1904,7 +1904,7 @@ cat >config.log <<_ACEOF
 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 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xrdb'
- VERSION='1.1.1'
+ VERSION='1.2.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -11586,7 +11586,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # 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 @@ $config_headers
 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\\"
 

xrdb/configure.ac

@@ -22,8 +22,8 @@ dnl Process this file with autoconf to create configure.
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([xrdb], [1.1.1],
+AC_INIT([xrdb], [1.2.0],
-        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xrdb])
+        [https://gitlab.freedesktop.org/xorg/app/xrdb/issues], [xrdb])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
 AC_USE_SYSTEM_EXTENSIONS

xrdb/man/xrdb.man

@@ -231,6 +231,12 @@ into properties.
 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.

xrdb/xrdb.c

@@ -127,6 +127,7 @@ static const char *cpp_program = NULL;
 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 @@ ReadFile(Buffer *b, FILE *input)
         }
 #endif
         AppendToBuffer(b, buf, bytes);
+        if (show_cpp)
+            fwrite(buf, 1, bytes, stdout);
     }
     AppendToBuffer(b, "", 1);
 }
@@ -779,6 +782,7 @@ Syntax(const char *errmsg)
             " -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 @@ main(int argc, char *argv[])
                 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 @@ Process(int scrno, Bool doScreen, Bool execute)
             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 @@ Process(int scrno, Bool doScreen, Bool execute)
             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 @@ Process(int scrno, Bool doScreen, Bool execute)
                              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 @@ Process(int scrno, Bool doScreen, Bool execute)
                              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);