Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xclipboard for openSUSE:Factory checked in at 2026-07-21 23:11:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xclipboard (Old) and /work/SRC/openSUSE:Factory/.xclipboard.new.24530 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xclipboard" Tue Jul 21 23:11:21 2026 rev:9 rq:1366931 version:1.1.6 Changes: -------- --- /work/SRC/openSUSE:Factory/xclipboard/xclipboard.changes 2024-08-27 19:39:49.165696570 +0200 +++ /work/SRC/openSUSE:Factory/.xclipboard.new.24530/xclipboard.changes 2026-07-21 23:11:33.072658252 +0200 @@ -1,0 +2,10 @@ +Tue Jul 21 11:00:03 UTC 2026 - Stefan Dirsch <[email protected]> + +- Update to version 1.1.6: + * man pages: fix warnings from `mandoc -T lint` and `groff -rCHECKSTYLE=10` + * gitlab CI: drop the ci-fairy check-mr job + * Strip trailing whitespace from source files + * meson: Add option to build with meson +- Switch to meson build system. + +------------------------------------------------------------------- Old: ---- xclipboard-1.1.5.tar.xz New: ---- xclipboard-1.1.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xclipboard.spec ++++++ --- /var/tmp/diff_new_pack.XSCiyb/_old 2026-07-21 23:11:33.580675623 +0200 +++ /var/tmp/diff_new_pack.XSCiyb/_new 2026-07-21 23:11:33.588675896 +0200 @@ -1,7 +1,7 @@ # # spec file for package xclipboard # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # 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: xclipboard -Version: 1.1.5 +Version: 1.1.6 Release: 0 Summary: X clipboard client License: MIT @@ -26,13 +26,13 @@ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.xz Source1: xclipboard.desktop Source2: xclipboard.png +BuildRequires: meson >= 1.1.0 BuildRequires: pkg-config BuildRequires: update-desktop-files BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xaw7) BuildRequires: pkgconfig(xkbfile) BuildRequires: pkgconfig(xmu) -BuildRequires: pkgconfig(xorg-macros) >= 1.8 BuildRequires: pkgconfig(xproto) >= 7.0.17 BuildRequires: pkgconfig(xt) # This was part of the xorg-x11 package up to version 7.6 @@ -50,11 +50,11 @@ cp %{SOURCE1} . %build -%configure -make %{?_smp_mflags} +%meson +%meson_build %install -%make_install +%meson_install %suse_update_desktop_file -i -u xclipboard Utility DesktopUtility install -m0644 -D %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/xclipboard.png ++++++ xclipboard-1.1.5.tar.xz -> xclipboard-1.1.6.tar.xz ++++++ ++++ 8845 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/xclipboard-1.1.5/ChangeLog new/xclipboard-1.1.6/ChangeLog --- old/xclipboard-1.1.5/ChangeLog 2024-08-27 03:40:50.000000000 +0200 +++ new/xclipboard-1.1.6/ChangeLog 2026-07-19 21:48:34.000000000 +0200 @@ -1,3 +1,95 @@ +commit dfba8f9a9a6fed4ead08217fb0e5f5a0afbe04bb +Author: Alan Coopersmith <[email protected]> +Date: Sun Jul 19 12:31:50 2026 -0700 + + xclipboard 1.1.6 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 8d1a02ee469696689125dd59a348f865477c4674 +Author: Alan Coopersmith <[email protected]> +Date: Sat Mar 28 17:19:42 2026 -0700 + + meson: Add option to build with meson + + Also updates the gitlab CI config to test both build types + and compare the generated output/installed files. + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xclipboard/-/merge_requests/10> + +commit 197de8fa35c351e6dc6339bf2d1e7595988eb045 +Author: Alan Coopersmith <[email protected]> +Date: Sat Mar 28 16:47:48 2026 -0700 + + Strip trailing whitespace from source files + + Performed with: `git ls-files | xargs perl -i -p -e 's{[ \t]+$}{}'` + + `git diff -w` & `git diff -b` show no diffs from this change + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xclipboard/-/merge_requests/10> + +commit a02f2ab7251a2db49d497c6d3a854517d3cadbb0 +Author: Alan Coopersmith <[email protected]> +Date: Sun Jan 11 11:20:41 2026 -0800 + + gitlab CI: drop the ci-fairy check-mr job + + The only thing this checked was the checkbox for allowing maintainers to + edit the MR. Changed permissions checks now fail this job but luckily + the setting it checked has been the default for years anyway so we can + drop it. + + https://gitlab.freedesktop.org/freedesktop/ci-templates/-/issues/81 + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xclipboard/-/merge_requests/10> + +commit 6d2fb3b8886bd9b47cba4930fc5867b7a2b4a537 +Author: Alan Coopersmith <[email protected]> +Date: Sun May 18 17:13:17 2025 -0700 + + man pages: fix warnings from `mandoc -T lint` and `groff -rCHECKSTYLE=10` + + an.tmac:xclipboard.1:138: style: blank line in input + mandoc: xclipboard.1:26:18: WARNING: cannot parse date, using it verbatim: TH xclipboard 1.1.5 + mandoc: xclipboard.1:149:2: WARNING: skipping paragraph macro: PP empty + mandoc: xcutsel.1:26:15: WARNING: cannot parse date, using it verbatim: TH xclipboard 1.1.5 + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xclipboard/-/merge_requests/9> + +commit cec2dbb51183030dfae69d11ff012901ca196eea +Author: Alan Coopersmith <[email protected]> +Date: Sun Mar 30 10:28:23 2025 -0700 + + Improve man page formatting + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xclipboard/-/merge_requests/8> + +commit fca73274dbc7bbd4f53ba1a18aaf8a49f0e955f9 +Author: Alan Coopersmith <[email protected]> +Date: Sun Mar 23 14:10:43 2025 -0700 + + Add -help and -version options + + Accepts --help & --version as aliases + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xclipboard/-/merge_requests/8> + +commit 2046fababcb104df45b3b39825658c39efe45bea +Author: Alan Coopersmith <[email protected]> +Date: Sun Mar 23 13:59:31 2025 -0700 + + Print usage message for unknown arguments + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xclipboard/-/merge_requests/8> + commit 02e7dc1231436274bd84232927bc99201a772b3d Author: Alan Coopersmith <[email protected]> Date: Mon Aug 26 18:36:09 2024 -0700 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/xclipboard-1.1.5/Makefile.am new/xclipboard-1.1.6/Makefile.am --- old/xclipboard-1.1.5/Makefile.am 2024-08-27 03:40:41.000000000 +0200 +++ new/xclipboard-1.1.6/Makefile.am 2026-07-19 21:48:23.000000000 +0200 @@ -1,6 +1,6 @@ -# +# # Copyright 2005 Red Hat, Inc. -# +# # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that @@ -10,7 +10,7 @@ # specific, written prior permission. Red Hat makes no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. -# +# # RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO # EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR @@ -60,4 +60,4 @@ dist-hook: ChangeLog INSTALL -EXTRA_DIST = README.md +EXTRA_DIST = README.md meson.build meson.options 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/xclipboard-1.1.5/compile new/xclipboard-1.1.6/compile --- old/xclipboard-1.1.5/compile 2024-08-27 03:40:45.000000000 +0200 +++ new/xclipboard-1.1.6/compile 2026-07-19 21:48:28.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2024-06-19.01; # UTC +scriptversion=2025-06-18.21; # UTC -# Copyright (C) 1999-2024 Free Software Foundation, Inc. +# Copyright (C) 1999-2025 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -37,11 +37,11 @@ file_conv= -# func_file_conv build_file lazy +# func_file_conv build_file unneeded_conversions # Convert a $build file to $host form and store it in $file # Currently only supports Windows hosts. If the determined conversion -# type is listed in (the comma separated) LAZY, no conversion will -# take place. +# type is listed in (the comma separated) UNNEEDED_CONVERSIONS, no +# conversion will take place. func_file_conv () { file=$1 @@ -51,9 +51,20 @@ # lazily determine how to convert abs files case `uname -s` in MINGW*) - file_conv=mingw + if test -n "$MSYSTEM" && (cygpath --version) >/dev/null 2>&1; then + # MSYS2 environment. + file_conv=cygwin + else + # Original MinGW environment. + file_conv=mingw + fi ;; - CYGWIN* | MSYS*) + MSYS*) + # Old MSYS environment, or MSYS2 with 32-bit MSYS2 shell. + file_conv=cygwin + ;; + CYGWIN*) + # Cygwin environment. file_conv=cygwin ;; *) @@ -63,12 +74,14 @@ fi case $file_conv/,$2, in *,$file_conv,*) + # This is the optimization mentioned above: + # If UNNEEDED_CONVERSIONS contains $file_conv, don't convert. ;; mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/* | msys/*) - file=`cygpath -m "$file" || echo "$file"` + cygwin/*) + file=`cygpath -w "$file" || echo "$file"` ;; wine/*) file=`winepath -w "$file" || echo "$file"` @@ -343,9 +356,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp nil t) # time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-format: "%Y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: 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/xclipboard-1.1.5/configure.ac new/xclipboard-1.1.6/configure.ac --- old/xclipboard-1.1.5/configure.ac 2024-08-27 03:40:41.000000000 +0200 +++ new/xclipboard-1.1.6/configure.ac 2026-07-19 21:48:23.000000000 +0200 @@ -1,6 +1,6 @@ dnl Copyright 2005 Red Hat, Inc. -dnl +dnl dnl Permission to use, copy, modify, distribute, and sell this software and its dnl documentation for any purpose is hereby granted without fee, provided that dnl the above copyright notice appear in all copies and that both that @@ -10,7 +10,7 @@ dnl specific, written prior permission. Red Hat makes no dnl representations about the suitability of this software for any purpose. It dnl is provided "as is" without express or implied warranty. -dnl +dnl dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR @@ -22,8 +22,8 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.60]) -AC_INIT([xclipboard], [1.1.5], - [https://gitlab.freedesktop.org/xorg/app/xclipboard/-/issue], +AC_INIT([xclipboard], [1.1.6], + [https://gitlab.freedesktop.org/xorg/app/xclipboard/-/issues], [xclipboard], [https://gitlab.freedesktop.org/xorg/app/xclipboard/]) AC_CONFIG_SRCDIR([Makefile.am]) 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/xclipboard-1.1.5/man/xclipboard.man new/xclipboard-1.1.6/man/xclipboard.man --- old/xclipboard-1.1.5/man/xclipboard.man 2024-08-27 03:40:41.000000000 +0200 +++ new/xclipboard-1.1.6/man/xclipboard.man 2026-07-19 21:48:23.000000000 +0200 @@ -23,40 +23,45 @@ .\" from The Open Group. .\" .\" -.TH XCLIPBOARD 1 __xorgversion__ +.TH XCLIPBOARD 1 2025-03-23 __xorgversion__ .SH NAME xclipboard \- X clipboard client .SH SYNOPSIS \fBxclipboard\fP [ \fI\-toolkitoption\fP ... ] [ \fB\-w\fP ] [ \fB\-nw\fP ] +.LP +\fBxclipboard\fP \fB\-help\fP | \fB\-version\fP .SH DESCRIPTION -The \fIxclipboard\fP program is used to collect and display text selections -that are sent to the CLIPBOARD by other clients. It is typically used to -save CLIPBOARD selections for later use. It stores each CLIPBOARD selection -as a separate string, each of which can be selected. Each time CLIPBOARD -is asserted by another application, \fIxclipboard\fP transfers the contents +The \fBxclipboard\fP program is used to collect and display text selections +that are sent to the CLIPBOARD by other clients. +It is typically used to save CLIPBOARD selections for later use. +It stores each CLIPBOARD selection as a separate string, +each of which can be selected. +Each time CLIPBOARD is asserted by another application, +\fBxclipboard\fP transfers the contents of that selection to a new buffer and displays it in the text window. Buffers are never automatically deleted, so you'll want to use the delete button to get rid of useless items. .PP -Since \fIxclipboard\fP uses a Text Widget to display the contents of the +Since \fBxclipboard\fP uses a Text Widget to display the contents of the clipboard, text sent to the CLIPBOARD may be re-selected for use in other -applications. \fIxclipboard\fP also responds to requests for the CLIPBOARD -selection from other clients by sending the entire contents of the currently +applications. +\fBxclipboard\fP also responds to requests for the CLIPBOARD selection +from other clients by sending the entire contents of the currently displayed buffer. .PP -An \fIxclipboard\fP window has the following buttons across the top: +An \fBxclipboard\fP window has the following buttons across the top: .TP 8 .I quit -When this button is pressed, \fIxclipboard\fP exits. +When this button is pressed, \fBxclipboard\fP exits. .TP 8 .I delete When this button is pressed, the current buffer is deleted and the next one displayed. .TP 8 .I new -Creates a new buffer with no contents. Useful in constructing a new -CLIPBOARD selection by hand. +Creates a new buffer with no contents. +Useful in constructing a new CLIPBOARD selection by hand. .TP 8 .I save Displays a File Save dialog box. @@ -69,7 +74,7 @@ .I previous Displays the previous buffer. .SH OPTIONS -The \fIxclipboard\fP program accepts all of the standard X Toolkit command +The \fBxclipboard\fP program accepts all of the standard X Toolkit command line options as well as the following: .TP 8 .B \-w @@ -77,13 +82,19 @@ one line in the clipboard should wrap around to the following lines. .TP 8 .B \-nw -This option indicates that long lines of text should not wrap around. This -is the default behavior. +This option indicates that long lines of text should not wrap around. +This is the default behavior. +.TP 8 +.B \-help +Prints a usage message and exits. +.TP 8 +.B \-version +Prints version info and exits. .SH WIDGETS In order to specify resources, it is useful to know the hierarchy of -the widgets which compose \fIxclipboard\fR. In the notation below, -indentation indicates hierarchical structure. The widget class name -is given first, followed by the widget instance name. +the widgets which compose \fBxclipboard\fR. +In the notation below, indentation indicates hierarchical structure. +The widget class name is given first, followed by the widget instance name. .sp .nf .ft CW @@ -112,10 +123,11 @@ .sp .SH SENDING/RETRIEVING CLIPBOARD CONTENTS Text is copied to the clipboard whenever a client asserts ownership of the -\fBCLIPBOARD\fP selection. Text is copied from the clipboard whenever a -client requests the contents of the \fBCLIPBOARD\fP selection. Examples of -event bindings that a user may wish to include in a resource configuration -file to use the clipboard are: +\fBCLIPBOARD\fP selection. +Text is copied from the clipboard whenever a client requests +the contents of the \fBCLIPBOARD\fP selection. +Examples of event bindings that a user may wish to include in a +resource configuration file to use the clipboard are: .sp .nf .ft CW @@ -123,15 +135,16 @@ <Btn3Up>: select-end(CLIPBOARD) \\n\\ <Btn2Up>: insert-selection(PRIMARY,CLIPBOARD) \\n\\ <Btn2Down>: ignore () - .ft .fi .sp .SH "SEE ALSO" -X(__miscmansuffix__), xcutsel(__appmansuffix__), xterm(__appmansuffix__), individual client documentation for how to make a +.BR X (__miscmansuffix__), +.BR xcutsel (__appmansuffix__), +.BR xterm (__appmansuffix__), +individual client documentation for how to make a selection and send it to the CLIPBOARD. .SH ENVIRONMENT -.PP .TP 8 .B DISPLAY to get the default host and display number. 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/xclipboard-1.1.5/man/xcutsel.man new/xclipboard-1.1.6/man/xcutsel.man --- old/xclipboard-1.1.5/man/xcutsel.man 2024-08-27 03:40:41.000000000 +0200 +++ new/xclipboard-1.1.6/man/xcutsel.man 2026-07-19 21:48:23.000000000 +0200 @@ -23,42 +23,47 @@ .\" from The Open Group. .\" .\" -.TH XCUTSEL 1 __xorgversion__ +.TH XCUTSEL 1 2025-03-23 __xorgversion__ .SH NAME xcutsel - interchange between cut buffer and selection .SH SYNOPSIS -\fBxcutsel\fP [ \fI-toolkitoption\fP ...] [-selection \fIselection\fP] [-cutbuffer \fInumber\fP] +\fBxcutsel\fP [\fI-toolkitoption\fP ...] [\fB-selection\fP \fIselection\fP] [\fB-cutbuffer\fP \fInumber\fP] +.LP +\fBxcutsel\fP \fB\-help\fP | \fB\-version\fP .SH DESCRIPTION -The \fIxcutsel\fP program is used to copy the current selection into a +The \fBxcutsel\fP program is used to copy the current selection into a cut buffer and to make a selection that contains the current contents of -the cut buffer. It acts as a bridge between applications that don't support -selections and those that do. +the cut buffer. +It acts as a bridge between applications that don't support selections +and those that do. .PP -By default, \fIxcutsel\fP will use the selection named PRIMARY and the cut -buffer CUT_BUFFER0. Either or both of these can be overridden by command -line arguments or by resources. +By default, \fBxcutsel\fP will use the selection named PRIMARY and the cut +buffer CUT_BUFFER0. +Either or both of these can be overridden by command line arguments +or by resources. .PP -An \fIxcutsel\fP window has the following buttons: +An \fBxcutsel\fP window has the following buttons: .TP 8 .I " quit" -When this button is pressed, \fIxcutsel\fP exits. Any selections held by -\fIxcutsel\fP are automatically released. +When this button is pressed, \fBxcutsel\fP exits. +Any selections held by \fBxcutsel\fP are automatically released. .TP 8 .I " copy PRIMARY to 0" -When this button is pressed, \fIxcutsel\fP copies the current selection into +When this button is pressed, \fBxcutsel\fP copies the current selection into the cut buffer. .TP 8 .I " copy 0 to PRIMARY" -When this button is pressed, \fIxcutsel\fP converts the current contents of +When this button is pressed, \fBxcutsel\fP converts the current contents of the cut buffer into the selection. .PP The button labels reflect the selection and cutbuffer selected by command line options or through the resource database. .PP When the ``copy 0 to PRIMARY'' button is activated, the button will -remain inverted as long as \fIxcutsel\fP remains the owner of the -selection. This serves to remind you which client owns the current -selection. Note that the value of the selection remains constant; +remain inverted as long as \fBxcutsel\fP remains the owner of the +selection. +This serves to remind you which client owns the current selection. +Note that the value of the selection remains constant; if the cutbuffer is changed, you must again activate the copy button to retrieve the new value when desired. .SH OPTIONS @@ -67,23 +72,32 @@ following: .TP 8 .B \-selection \fIname\fP -This option specifies the name of the selection to use. The default is -PRIMARY. The only supported abbreviations for this option are ``-select'', -``-sel'' and ``-s'', as the standard toolkit option ``-selectionTimeout'' has a -similar name. +This option specifies the name of the selection to use. +The default is PRIMARY. +The only supported abbreviations for this option are +``-select'', ``-sel'', and ``-s'', +as the standard toolkit option ``-selectionTimeout'' has a similar name. .TP 8 .B \-cutbuffer \fInumber\fP -This option specifies the cut buffer to use. The default is cut buffer 0. +This option specifies the cut buffer to use. +The default is cut buffer 0. +.TP 8 +.B \-help +Prints a usage message and exits. +.TP 8 +.B \-version +Prints version info and exits. .SH X DEFAULTS This program accepts all of the standard X Toolkit resource names and classes as well as: .TP 8 .B "selection (\fPclass\fB Selection)" -This resource specifies the name of the selection to use. The default is -PRIMARY. +This resource specifies the name of the selection to use. +The default is PRIMARY. .TP 8 .B "cutBuffer (\fPclass\fB CutBuffer)" -This resource specifies the number of the cut buffer to use. The default is 0. +This resource specifies the number of the cut buffer to use. +The default is 0. .SH WIDGET NAMES The following instance names may be used when user configuration of the labels in them is desired: @@ -97,8 +111,10 @@ .B "quit (\fPclass\fB Command)" This is the ``quit'' button. .SH "SEE ALSO" -X(__miscmansuffix__), xclipboard(__appmansuffix__), xterm(__appmansuffix__), text widget documentation, individual client -documentation for how to make a selection. +.BR xclipboard (__appmansuffix__), +.BR X (__miscmansuffix__), +text widget documentation, +individual client documentation for how to make a selection. .SH BUGS There is no way to change the name of the selection or the number of the cut buffer while the program is running. 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/xclipboard-1.1.5/meson.build new/xclipboard-1.1.6/meson.build --- old/xclipboard-1.1.5/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/xclipboard-1.1.6/meson.build 2026-07-19 21:48:23.000000000 +0200 @@ -0,0 +1,115 @@ +# SPDX-License-Identifier: MIT +# +# Copyright (c) 2026, Oracle and/or its affiliates. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. +# + +project( + 'xclipboard', + 'c', + version: '1.1.6', + license: 'MIT-open-group', + license_files: 'COPYING', + meson_version: '>= 1.1.0', +) + +conf = configuration_data() +package_string = ' '.join(meson.project_name(), meson.project_version()) +conf.set_quoted('PACKAGE_STRING', package_string) + +cc = meson.get_compiler('c') + +# Replacement for XORG_DEFAULT_OPTIONS +if cc.has_argument('-fno-strict-aliasing') + add_project_arguments('-fno-strict-aliasing', language: 'c') +endif + +# Checks for pkg-config packages +dep_libxaw = dependency('xaw7', required: true) +dep_libxmu = dependency('xmu', required: true) +dep_libxt = dependency('xt', required: true, version: '>= 1.1') +dep_libx11 = dependency('x11', required: true) +dep_xproto = dependency('xproto', required: true, version: '>= 7.0.17') +deps = [dep_libxaw, dep_libxmu, dep_libxt, dep_libx11, dep_xproto] + +# Optional dependencies +if get_option('xkb').enabled() + dep_libxkbfile = dependency('xkbfile', required: true) + deps += dep_libxkbfile +endif +conf.set('XKB', get_option('xkb').enabled() ? 1 : false, + description: 'Define to use XkbStdBell') +summary('xkb', get_option('xkb').enabled()) + +config_h = configure_file(output: 'config.h', configuration: conf) +add_project_arguments('-DHAVE_CONFIG_H', language: ['c']) + +add_project_arguments('-D_CONST_X_STRING', language: ['c']) + +executable( + 'xclipboard', + [config_h, 'xclipboard.c'], + dependencies: deps, + install: true +) + +executable( + 'xcutsel', + [config_h, 'xcutsel.c'], + dependencies: deps, + install: true +) + +# Find directory for installing app-defaults files +appdefaultdir = get_option('appdefaultdir') +if appdefaultdir == '' + appdefaultdir = dep_libxt.get_variable('appdefaultdir') +endif +summary('appdefaultdir', appdefaultdir) + +# App default files (*.ad) +install_data( + 'app-defaults/XClipboard', + install_dir: appdefaultdir, + install_tag: 'runtime', +) + +# Man pages +prog_sed = find_program('sed') +foreach p : ['xclipboard', 'xcutsel'] + custom_target( + f'@[email protected]', + input: f'man/@[email protected]', + output: f'@[email protected]', + command: [ + prog_sed, + '-e', f's/__xorgversion__/"@package_string@" "X Version 11"/', + '-e', 's/__appmansuffix__/1/g', + '-e', 's/__miscmansuffix__/7/g', + '-e', f's|__apploaddir__|@appdefaultdir@|g', + '@INPUT@', + ], + capture: true, + install: true, + install_dir: get_option('mandir') / 'man1', + install_tag: 'man', + ) +endforeach 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/xclipboard-1.1.5/meson.options new/xclipboard-1.1.6/meson.options --- old/xclipboard-1.1.5/meson.options 1970-01-01 01:00:00.000000000 +0100 +++ new/xclipboard-1.1.6/meson.options 2026-07-19 21:48:23.000000000 +0200 @@ -0,0 +1,12 @@ +option( + 'appdefaultdir', + type: 'string', + description: 'directory for app-defaults files (default is autodetected)', +) + +option( + 'xkb', + type: 'feature', + value : 'enabled', + description: 'Use XKB to sound bells (default is enabled)', +) 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/xclipboard-1.1.5/missing new/xclipboard-1.1.6/missing --- old/xclipboard-1.1.5/missing 2024-08-27 03:40:45.000000000 +0200 +++ new/xclipboard-1.1.6/missing 2026-07-19 21:48:28.000000000 +0200 @@ -1,11 +1,11 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU and other programs. -scriptversion=2024-06-07.14; # UTC +scriptversion=2025-06-18.21; # UTC # shellcheck disable=SC2006,SC2268 # we must support pre-POSIX shells -# Copyright (C) 1996-2024 Free Software Foundation, Inc. +# Copyright (C) 1996-2025 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -228,9 +228,9 @@ exit $st # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp nil t) # time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-format: "%Y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: 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/xclipboard-1.1.5/xclipboard.c new/xclipboard-1.1.6/xclipboard.c --- old/xclipboard-1.1.5/xclipboard.c 2024-08-27 03:40:41.000000000 +0200 +++ new/xclipboard-1.1.6/xclipboard.c 2026-07-19 21:48:23.000000000 +0200 @@ -81,6 +81,15 @@ NULL }; +static const char * const usage = + "Usage: xclipboard [-options ...]\n" + "\n" + "where options include all standard toolkit options plus:\n" + " -w Wrap long lines\n" + " -nw No Wrapping for long lines\n" + " -help Print usage message and exit\n" + " -version Print version and exit\n"; + static long TextLength(Widget w) { @@ -684,8 +693,34 @@ XtSetLanguageProc(NULL, NULL, NULL); + /* Handle args that don't require opening a display */ + for (int a = 1; a < argc; a++) { + const char *argn = argv[a]; + /* accept single or double dash for -help & -version */ + if (argn[0] == '-' && argn[1] == '-') { + argn++; + } + if (strcmp(argn, "-help") == 0) { + fputs(usage, stdout); + exit(EXIT_SUCCESS); + } + if (strcmp(argn, "-version") == 0) { + puts(PACKAGE_STRING); + exit(EXIT_SUCCESS); + } + } + top = XtAppInitialize( &xtcontext, "XClipboard", table, XtNumber(table), &argc, argv, fallback_resources, NULL, 0); + if (argc > 1) { + fputs("Unrecognized argument(s):", stderr); + for (int a = 1; a < argc; a++) { + fprintf(stderr, " %s", argv[a]); + } + fputs("\n\n", stderr); + fputs(usage, stderr); + exit(EXIT_FAILURE); + } XtGetApplicationResources(top, (XtPointer)&userOptions, resources, XtNumber(resources), NULL, 0); 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/xclipboard-1.1.5/xcutsel.c new/xclipboard-1.1.6/xcutsel.c --- old/xclipboard-1.1.5/xcutsel.c 2024-08-27 03:40:41.000000000 +0200 +++ new/xclipboard-1.1.6/xcutsel.c 2026-07-19 21:48:23.000000000 +0200 @@ -84,11 +84,12 @@ static ButtonState state; static void -Syntax(char *call) +Syntax(const char *call, int exitstatus) { fprintf (stderr, "usage: %s [-selection name] [-cutbuffer number]\n", call); - exit (1); + fprintf (stderr, "usage: %s -help | -version\n", call); + exit (exitstatus); } @@ -266,12 +267,35 @@ XtSetLanguageProc(NULL, NULL, NULL); + /* Handle args that don't require opening a display */ + for (int a = 1; a < argc; a++) { + const char *argn = argv[a]; + /* accept single or double dash for -help & -version */ + if (argn[0] == '-' && argn[1] == '-') { + argn++; + } + if (strcmp(argn, "-help") == 0) { + Syntax(argv[0], EXIT_SUCCESS); + } + if (strcmp(argn, "-version") == 0) { + puts(PACKAGE_STRING); + exit(EXIT_SUCCESS); + } + } + shell = XtAppInitialize( &appcon, "XCutsel", optionDesc, XtNumber(optionDesc), &argc, argv, NULL, NULL, 0 ); rdb = XtDatabase(XtDisplay(shell)); - if (argc != 1) Syntax(argv[0]); + if (argc > 1) { + fputs("Unrecognized argument(s):", stderr); + for (int a = 1; a < argc; a++) { + fprintf(stderr, " %s", argv[a]); + } + fputs("\n\n", stderr); + Syntax(argv[0], EXIT_FAILURE); + } XtGetApplicationResources( shell, (XtPointer)&options, resources, XtNumber(resources),
