Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xmag for openSUSE:Factory checked in at 2026-11-16 09:08:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmag (Old) and /work/SRC/openSUSE:Factory/.xmag.new.1251 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmag" Mon Nov 16 09:08:43 2026 rev:12 rq:1397643 version:1.0.9 Changes: -------- --- /work/SRC/openSUSE:Factory/xmag/xmag.changes 2024-10-14 13:07:28.781390298 +0200 +++ /work/SRC/openSUSE:Factory/.xmag.new.1251/xmag.changes 2026-11-16 09:14:29.646951225 +0100 @@ -1,0 +2,11 @@ +Sun Nov 15 04:55:31 UTC 2026 - Stefan Dirsch <[email protected]> + +- Update to version 1.0.9 + * Improve man page formatting + * man page: 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 + +------------------------------------------------------------------- Old: ---- xmag-1.0.8.tar.xz New: ---- xmag-1.0.9.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmag.spec ++++++ --- /var/tmp/diff_new_pack.76xZaZ/_old 2026-11-16 09:14:31.023008916 +0100 +++ /var/tmp/diff_new_pack.76xZaZ/_new 2026-11-16 09:14:31.024008958 +0100 @@ -1,7 +1,7 @@ # # spec file for package xmag # -# 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,21 +17,23 @@ Name: xmag -Version: 1.0.8 +Version: 1.0.9 Release: 0 Summary: Screen magnifier License: X11 Group: System/X11/Utilities URL: https://xorg.freedesktop.org/ -Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.xz +Source0: https://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.xz Source1: xmag.desktop Source2: xmag.png +BuildRequires: meson BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xaw7) BuildRequires: pkgconfig(xmu) BuildRequires: pkgconfig(xorg-macros) >= 1.8 +BuildRequires: pkgconfig(xproto) >= 7.0.22 BuildRequires: pkgconfig(xt) # This was part of the xorg-x11 package up to version 7.6 Conflicts: xorg-x11 <= 7.6 @@ -43,11 +45,11 @@ %setup -q %build -%configure -%make_build +%meson +%meson_build %install -%make_install +%meson_install %suse_update_desktop_file -i -u xmag Utility Accessibility DesktopUtility install -m0644 -D %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/xmag.png ++++++ xmag-1.0.8.tar.xz -> xmag-1.0.9.tar.xz ++++++ ++++ 9376 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/xmag-1.0.8/ChangeLog new/xmag-1.0.9/ChangeLog --- old/xmag-1.0.8/ChangeLog 2024-10-12 20:24:29.000000000 +0200 +++ new/xmag-1.0.9/ChangeLog 2026-11-15 01:09:39.000000000 +0100 @@ -1,3 +1,76 @@ +commit 0dd9ebd2694fe006a0b2a51844530d5b5e22fa86 +Author: Alan Coopersmith <[email protected]> +Date: Sat Nov 14 16:03:30 2026 -0800 + + xmag 1.0.9 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 8913e62dc36664ab20d23b8754e23e4102323a20 +Author: Alan Coopersmith <[email protected]> +Date: Sun May 24 14:32:53 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/xmag/-/merge_requests/9> + +commit 668974fc19c0414122c3eb3b5319adef05c3e0e0 +Author: Alan Coopersmith <[email protected]> +Date: Sun May 24 12:08:50 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/xmag/-/merge_requests/9> + +commit 45473b8575ae721c0680455fe1ae5eb636a72051 +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/xmag/-/merge_requests/9> + +commit 6bf4b3b5b294898da9df2ff7e5170be3560d452f +Author: Alan Coopersmith <[email protected]> +Date: Sat May 31 09:55:37 2025 -0700 + + man page: fix warnings from `mandoc -T lint` and `groff -rCHECKSTYLE=10` + + mandoc: xmag.1:26:12: WARNING: cannot parse date, using it verbatim: TH xmag 1.0.8 + an.tmac:xmag.1:95: style: blank line in input + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xmag/-/merge_requests/8> + +commit 2a792c83ea1dce3532addd58004143987c1cb093 +Author: Alan Coopersmith <[email protected]> +Date: Sat Apr 5 14:59:18 2025 -0700 + + Improve man page formatting + + More closely follow common style as described on + https://man7.org/linux/man-pages/man7/man-pages.7.html + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xmag/-/merge_requests/7> + commit a19a7428e7786e73f252e3534f4e5d8a3c878be4 Author: Alan Coopersmith <[email protected]> Date: Sat Oct 12 11:20:44 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/xmag-1.0.8/Makefile.am new/xmag-1.0.9/Makefile.am --- old/xmag-1.0.8/Makefile.am 2024-10-12 20:24:18.000000000 +0200 +++ new/xmag-1.0.9/Makefile.am 2026-11-15 01:09:29.000000000 +0100 @@ -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 @@ -47,7 +47,7 @@ app-defaults/Xmag # Developer documentation for Scale widget in Scale.c -EXTRA_DIST = Scale.txt xmag.icon README.md +EXTRA_DIST = Scale.txt xmag.icon README.md meson.build meson.options MAINTAINERCLEANFILES = ChangeLog INSTALL 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/xmag-1.0.8/Scale.txt new/xmag-1.0.9/Scale.txt --- old/xmag-1.0.8/Scale.txt 2024-10-12 20:24:18.000000000 +0200 +++ new/xmag-1.0.9/Scale.txt 2026-11-15 01:09:29.000000000 +0100 @@ -7,9 +7,9 @@ Superclass Simple The Scale widget is an immutable image displayed within a rectangular -region of the screen. When the widget is selected, it is highlighted, +region of the screen. When the widget is selected, it is highlighted, and an application callback routine is invoked. When the -widget is resized the image can be autoscaled to fit new size of the +widget is resized the image can be autoscaled to fit new size of the widget window. The widget can also cut and paste its contents. When creating a Scale widget instance, the following resources are @@ -38,8 +38,8 @@ aspectRatio This resource specifies the aspect ratio of the scaled image in the x / y * aspectRatio = 1 form. It is effective within - the precision resource only if proportional resource is set - to true. AspectRatio resource can be any positive number + the precision resource only if proportional resource is set + to true. AspectRatio resource can be any positive number greater than zero. autoscale If this resource is set to True then the image will be @@ -49,7 +49,7 @@ according to the gravity resource value. bufferSize This resource specifies the buffer size in XRectangle's for - buffering the XFillRectangle calls. It is effective only + buffering the XFillRectangle calls. It is effective only for XYBitmap image type. background This resource has the same meaning as for the Simple widget. @@ -61,36 +61,36 @@ If the image is XYPixmap or ZPixmap format, the foreground resource has no effect. - gravity This resource will determine where to put the image if it does + gravity This resource will determine where to put the image if it does not fit the window size minus internal width and height. The widget will try to preserve gravity rather than internal width and height resources. image This is the image to be displayed in the widget window. - If no image is desired, the NULL value can be passed. + If no image is desired, the NULL value can be passed. The passed image is copied and set to the resource value. Applications should destroy the passed image argument if they do not intend to use it at some later time. - internalHeight - internalWidth These resources specify the minimum distance from the boarder - of the widget window to be maintanied when manipulating the - image. If image is too big or small to satisfy given - conditions, the widget will position the image to preserve + internalHeight + internalWidth These resources specify the minimum distance from the boarder + of the widget window to be maintanied when manipulating the + image. If image is too big or small to satisfy given + conditions, the widget will position the image to preserve gravity rather than internalWidth or internalHeight. pasteBuffer If this resource is true then the widget owns the paste selection buffer. This resource can only be queried. precision This resource specifies the precision of the scale factors - when scaling the image. The precision resource can be any + when scaling the image. The precision resource can be any positive number greater than zero. (For example, if precision is 1.0 then the image will be scaled only by integer values.) - proportional If this resource is set to true it will make sure that the + proportional If this resource is set to true it will make sure that the image proportions, as specified by aspectRatio resource, - are being kept whenever it is scaled. - + are being kept whenever it is scaled. + resize If this resource is true the widget will try to resize when addopting a new image thus preserveing the scale values. If it is false the scale values will not be preserved unless 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/xmag-1.0.8/compile new/xmag-1.0.9/compile --- old/xmag-1.0.8/compile 2024-10-12 20:24:23.000000000 +0200 +++ new/xmag-1.0.9/compile 2026-11-15 01:09:33.000000000 +0100 @@ -1,14 +1,14 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2024-06-19.01; # UTC +scriptversion=2026-05-29.23; # UTC -# Copyright (C) 1999-2024 Free Software Foundation, Inc. +# Copyright (C) 1999-2026 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) +# the Free Software Foundation; either version 3, or (at your option) # any later version. # # This program is distributed in the hope that it will be useful, @@ -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"` @@ -325,7 +338,10 @@ sleep 1 done # FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 +cleanup () { + rmdir "$lockdir" +} +trap "cleanup; exit 1" 1 2 15 # Run the compile. "$@" @@ -343,9 +359,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/xmag-1.0.8/configure.ac new/xmag-1.0.9/configure.ac --- old/xmag-1.0.8/configure.ac 2024-10-12 20:24:18.000000000 +0200 +++ new/xmag-1.0.9/configure.ac 2026-11-15 01:09:29.000000000 +0100 @@ -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 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xmag], [1.0.8], +AC_INIT([xmag], [1.0.9], [https://gitlab.freedesktop.org/xorg/app/xmag/-/issues], [xmag]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) 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/xmag-1.0.8/man/xmag.man new/xmag-1.0.9/man/xmag.man --- old/xmag-1.0.8/man/xmag.man 2024-10-12 20:24:18.000000000 +0200 +++ new/xmag-1.0.9/man/xmag.man 2026-11-15 01:09:29.000000000 +0100 @@ -23,7 +23,7 @@ .\" from The Open Group. .\" .\" -.TH XMAG 1 __xorgversion__ +.TH XMAG 1 2023-02-11 __xorgversion__ .SH NAME xmag \- magnify parts of the screen .SH SYNOPSIS @@ -45,35 +45,36 @@ .B \-version ] .SH DESCRIPTION -The \fIxmag\fP program allows you to magnify portions of an X screen. If no -explicit region is specified, a square with the pointer in the upper left -corner is displayed indicating the area to be enlarged. The area can be -dragged out to the desired size by pressing Button 2. Once a region has -been selected, a window is popped up showing a blown up version of the region -in which each pixel in the source image is represented by a small square of -the same color. Pressing Button1 in the enlargement window -shows the position and RGB value -of the pixel under the pointer until the button is released. Typing ``Q'' -or ``^C'' in the enlargement window exits the program. The application has -5 buttons across its top. +The \fBxmag\fP program allows you to magnify portions of an X screen. +If no explicit region is specified, a square with the pointer in the upper left +corner is displayed indicating the area to be enlarged. +The area can be dragged out to the desired size by pressing Button 2. +Once a region has been selected, +a window is popped up showing a blown up version of the region in which each +pixel in the source image is represented by a small square of the same color. +Pressing Button 1 in the enlargement window shows the position and RGB value +of the pixel under the pointer until the button is released. +Typing ``Q'' or ``^C'' in the enlargement window exits the program. +.PP +The application has 5 buttons across its top. \fIClose\fP deletes this particular magnification instance. \fIReplace\fP brings up the rubber band selector again to select another region for this magnification instance. \fINew\fP brings up the rubber band selector to create a new magnification instance. \fISelect\fP puts the magnification image into the primary selection. -\fIPaste\fP copies the primary selection buffer into \fIxmag\fP. -Note that you can cut and paste between \fIxmag\fP and the \fIbitmap\fP -program. Resizing \fIxmag\fP resizes the magnification area. -\fIxmag\fP preserves -the colormap, visual, and window depth of the source. +\fIPaste\fP copies the primary selection buffer into \fBxmag\fP. +Note that you can cut and paste between \fBxmag\fP and the \fBbitmap\fP(1) +program. +Resizing \fBxmag\fP resizes the magnification area. +\fBxmag\fP preserves the colormap, visual, and window depth of the source. .SH WIDGETS -\fIxmag\fP uses the X Toolkit and the Athena Widget Set. +\fBxmag\fP uses the X Toolkit and the Athena Widget Set. The magnified image is displayed in the Scale widget. For more information, see the Athena Widget Set documentation. -Below is the widget structure of the \fIxmag\fP application. -Indentation indicates hierarchical structure. The widget class -name is given first, followed by the widget instance name. +Below is the widget structure of the \fBxmag\fP application. +Indentation indicates hierarchical structure. +The widget class name is given first, followed by the widget instance name. .sp .nf Xmag xmag @@ -91,22 +92,23 @@ Scale scale OverrideShell pixShell Label pixLabel - .fi .SH OPTIONS .TP 15 .B \-source\fI geom\fP This option specifies the size and/or location of the source region -on the screen. By default, a 64x64 square is provided for the user to select +on the screen. +By default, a 64x64 square is provided for the user to select an area of the screen. .TP 15 .B \-mag\fI integer\fP -This option indicates the magnification to be used. 5 is the default. +This option indicates the magnification to be used. +5 is the default. .TP 15 .B \-help -This option indicates that \fIxmag\fP should print a usage message and exit. +This option indicates that \fBxmag\fP should print a usage message and exit. .TP 15 .B \-version -This option indicates that \fIxmag\fP should print version info and exit. +This option indicates that \fBxmag\fP should print version info and exit. .SH AUTHORS Dave Sternlicht and Davor Matic, 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/xmag-1.0.8/meson.build new/xmag-1.0.9/meson.build --- old/xmag-1.0.8/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/xmag-1.0.9/meson.build 2026-11-15 01:09:29.000000000 +0100 @@ -0,0 +1,147 @@ +# 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( + 'xmag', + 'c', + version: '1.0.9', + license: 'MIT-open-group AND X11', + 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) +dep_libx11 = dependency('x11', required: true) +dep_xproto = dependency('xproto', required: true, version: '>= 7.0.22') +deps = [dep_libxaw, dep_libxmu, dep_libxt, dep_libx11, dep_xproto] + +funcs_to_check_in_libs = { + 'nanosleep' : [], + 'poll' : [], + 'select' : [], + +# Math libraries & functions +# - some compilers use builtin inlines for floor + 'floor' : ['m'], +# - lrint() is a C99 addition not found on some older systems + 'lrint' : ['m'], +} + +libs = [] +prefix = [ + '#include <math.h>', + '#include <time.h>', +] +if cc.has_header('poll.h') + prefix += '#include <poll.h>' +endif +foreach f, libs_to_check: funcs_to_check_in_libs + has_func = cc.has_function(f, dependencies: libs, prefix: prefix) + if not has_func + foreach l: libs_to_check + lib = cc.find_library(l, required: false) + if lib.found() + has_func = cc.has_function(f, dependencies: [libs, lib], prefix: prefix) + if has_func + libs += lib + break + endif + endif + endforeach + endif + have_f_name = 'HAVE_' + f.to_upper().underscorify() + conf.set(have_f_name, has_func ? '1' : false, + description: f'Define to 1 if you have the \'@f@\' function.') + set_variable(have_f_name, has_func) +endforeach +deps += libs + +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']) + +xmag_sources = [ + config_h, + 'CutPaste.c', + 'CutPaste.h', + 'RootWin.c', + 'RootWin.h', + 'RootWinP.h', + 'Scale.c', + 'Scale.h', + 'ScaleP.h', + 'xmag.c', +] + +executable( + 'xmag', + xmag_sources, + 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/Xmag', + install_dir: appdefaultdir, +) + +# Man page +prog_sed = find_program('sed') + +custom_target( + 'xmag.man', + input: 'man/xmag.man', + output: 'xmag.1', + command: [ + prog_sed, + '-e', f's/__xorgversion__/"@package_string@" "X Version 11"/', + '@INPUT@', + ], + capture: true, + install: true, + install_dir: get_option('mandir') / 'man1', +) 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/xmag-1.0.8/meson.options new/xmag-1.0.9/meson.options --- old/xmag-1.0.8/meson.options 1970-01-01 01:00:00.000000000 +0100 +++ new/xmag-1.0.9/meson.options 2026-11-15 01:09:29.000000000 +0100 @@ -0,0 +1,5 @@ +option( + 'appdefaultdir', + type: 'string', + description: 'directory for app-defaults files (default is autodetected)', +) 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/xmag-1.0.8/missing new/xmag-1.0.9/missing --- old/xmag-1.0.8/missing 2024-10-12 20:24:23.000000000 +0200 +++ new/xmag-1.0.9/missing 2026-11-15 01:09:33.000000000 +0100 @@ -1,16 +1,16 @@ #! /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-2026 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 # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) +# the Free Software Foundation; either version 3, or (at your option) # any later version. # This program is distributed in the hope that it will be useful, @@ -199,7 +199,7 @@ echo "You might want to install the Texinfo package:" echo "<$gnu_software_URL/texinfo/>" echo "The spurious makeinfo call might also be the consequence of" - echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "using a buggy non-GNU 'make', in which case you might" echo "want to install GNU make:" echo "<$gnu_software_URL/make/>" ;; @@ -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:
