[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][xorg-team/lib/libxfixes][debian-unstable] 12 commits: autogen.sh: use exec instead of waiting for configure to finish

Title: GitLab

Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / libxfixes

Commits:

11 changed files:

Changes:

  • Makefile.am
    ... ... @@ -35,3 +35,5 @@ ChangeLog:
    35 35 
     	$(CHANGELOG_CMD)
    36 36
    37 37 
     dist-hook: ChangeLog INSTALL
    38 
    +
    39 
    +EXTRA_DIST = README.md

  • README deleted
    1 
    -		Xfixes
    2 
    -	   XFIXES Extension
    3 
    -	    Version 2.0.1
    4 
    -	      2002-10-4
    5 
    -
    6 
    -This package contains header files and documentation for the XFIXES
    7 
    -extension.  Library and server implementations are separate.
    8 
    -
    9 
    -Keith Packard
    10 
    -keithp@keithp.com
    11 
    -
    12 
    -All questions regarding this software should be directed at the
    13 
    -Xorg mailing list:
    14 
    -
    15 
    -        http://lists.freedesktop.org/mailman/listinfo/xorg
    16 
    -
    17 
    -Please submit bug reports to the Xorg bugzilla:
    18 
    -
    19 
    -        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
    20 
    -
    21 
    -The master development code repository can be found at:
    22 
    -
    23 
    -        git://anongit.freedesktop.org/git/xorg/lib/libXfixes
    24 
    -
    25 
    -        http://cgit.freedesktop.org/xorg/lib/libXfixes
    26 
    -
    27 
    -For patch submission instructions, see:
    28 
    -
    29 
    -	http://www.x.org/wiki/Development/Documentation/SubmittingPatches
    30 
    -
    31 
    -For more information on the git code manager, see:
    32 
    -
    33 
    -        http://wiki.x.org/wiki/GitPage
    34 
    -

  • README.md
    1 
    +libXfixes - XFIXES Extension library
    2 
    +------------------------------------
    3 
    +
    4 
    +All questions regarding this software should be directed at the
    5 
    +Xorg mailing list:
    6 
    +
    7 
    +  https://lists.x.org/mailman/listinfo/xorg
    8 
    +
    9 
    +The master development code repository can be found at:
    10 
    +
    11 
    +  https://gitlab.freedesktop.org/xorg/lib/libXfixes
    12 
    +
    13 
    +Please submit bug reports and requests to merge patches there.
    14 
    +
    15 
    +For patch submission instructions, see:
    16 
    +
    17 
    +  https://www.x.org/wiki/Development/Documentation/SubmittingPatches
    18 
    +

  • autogen.sh
    1 1 
     #! /bin/sh
    2 2
    3 
    -srcdir=`dirname $0`
    3 
    +srcdir=`dirname "$0"`
    4 4 
     test -z "$srcdir" && srcdir=.
    5 5
    6 6 
     ORIGDIR=`pwd`
    7 
    -cd $srcdir
    7 
    +cd "$srcdir"
    8 8
    9 9 
     autoreconf -v --install || exit 1
    10 
    -cd $ORIGDIR || exit $?
    10 
    +cd "$ORIGDIR" || exit $?
    11 
    +
    12 
    +git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
    13 
    +    git config --local format.subjectPrefix "PATCH libXfixes"
    11 14
    12 15 
     if test -z "$NOCONFIGURE"; then
    13 
    -    $srcdir/configure "$@"
    16 
    +    exec "$srcdir"/configure "$@"
    14 17 
     fi

  • configure.ac
    ... ... @@ -32,8 +32,8 @@ AC_PREREQ([2.60])
    32 32 
     # that 'revision' number appears in Xfixes.h and has to be manually
    33 33 
     # synchronized.
    34 34 
     #
    35 
    -AC_INIT(libXfixes, [5.0.3],
    36 
    -	[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXfixes])
    35 
    +AC_INIT(libXfixes, [6.0.0],
    36 
    +	[https://gitlab.freedesktop.org/xorg/lib/libXfixes/issues], [libXfixes])
    37 37 
     AC_CONFIG_SRCDIR([Makefile.am])
    38 38 
     AC_CONFIG_HEADERS([config.h])
    39 39

  • debian/changelog
    1 
    +libxfixes (1:6.0.0-1) unstable; urgency=medium
    2 
    +
    3 
    +  * New upstream release. (Closes: #994957)(LP: #1959363)
    4 
    +  * Update signing-key.asc.
    5 
    +  * symbols: Updated.
    6 
    +
    7 
    + -- Timo Aaltonen <tjaalton@debian.org>  Wed, 02 Feb 2022 14:36:11 +0200
    8 
    +
    1 9 
     libxfixes (1:5.0.3-2) unstable; urgency=medium
    2 10
    3 11 
       * control: Migrate to x11proto-dev.

  • debian/libxfixes3.symbols
    ... ... @@ -17,6 +17,7 @@ libXfixes.so.3 libxfixes3 #MINVER#
    17 17 
      XFixesFetchRegion@Base 0
    18 18 
      XFixesFetchRegionAndBounds@Base 0
    19 19 
      XFixesFindDisplay@Base 0
    20 
    + XFixesGetClientDisconnectMode@Base 1:6.0.0
    20 21 
      XFixesGetCursorImage@Base 0
    21 22 
      XFixesGetCursorName@Base 0
    22 23 
      XFixesHideCursor@Base 1:4.0.1
    ... ... @@ -27,6 +28,7 @@ libXfixes.so.3 libxfixes3 #MINVER#
    27 28 
      XFixesRegionExtents@Base 0
    28 29 
      XFixesSelectCursorInput@Base 0
    29 30 
      XFixesSelectSelectionInput@Base 0
    31 
    + XFixesSetClientDisconnectMode@Base 1:6.0.0
    30 32 
      XFixesSetCursorName@Base 0
    31 33 
      XFixesSetGCClipRegion@Base 0
    32 34 
      XFixesSetPictureClipRegion@Base 0

  • debian/upstream/signing-key.asc
    ... ... @@ -164,3 +164,26 @@ Ka2m4qiiuGYivPIAVapSEA4DYc+krVqVXV/yDd3T7XcNtnClVo+rmOn5WiGq24am
    164 164 
     79+hF4bWyw==
    165 165 
     =WW1Z
    166 166 
     -----END PGP PUBLIC KEY BLOCK-----
    167 
    +-----BEGIN PGP PUBLIC KEY BLOCK-----
    168 
    +
    169 
    +mQGiBD8b0wYRBACph9kRJmP+4+JGsCgFlFoy4vFO0DCG+jmkQN0n1wdInt/N/UtA
    170 
    +sZToO72AUmfmYizA+IEbzBrx0UnUo3w3BDmHxUWf/akZiPUz9AA/YFY4xC3MY2OK
    171 
    +VN2Jz6YSce4zJ5jd2ZRobHm4HuIf/8yqSCcsv7FNfrLaTNIFRs5gYYsqZwCgwmkp
    172 
    +RSLRc8WAnHrTWNQDaEFM2rUEAKTjrTjMN8+KGd0BxNX7HiTSqQP++nXNwAYs1oWB
    173 
    +Yt82YHj9SvRCqCzD1pzJQivYnlNoWDza1VeMnfdAvkdia8z4lYbO/RunXZJvra3Z
    174 
    +VDm+izq+uwUAyvFuEYnNz09VSqwXKT6+XW0Xtz2vHq52r6DS6mK8cGJHZ5OhrRjq
    175 
    +UEYxA/9STh+QfA98xtNoRcf52E/46r7IpCj440oRVc9lMfxQZrLGQNqp7sPdIhGQ
    176 
    +CCo2NUII5hkhdAG71kpbfSXU4Sh32p1cU1KYCAkDFfb49bKuAs+Pff8v6FGZxTdd
    177 
    +AinPZr4BbsYJatk818aTCnu0+s7L8jL5GPfeyuyEMKwzVBx2mLQpUGV0ZXIgSHV0
    178 
    +dGVyZXIgKFdoby1UKSA8b2ZmaWNlQHdoby10Lm5ldD6IWQQTEQIAGQUCPxvTBgQL
    179 
    +BwMCAxUCAwMWAgECHgECF4AACgkQ4jt+cLRn8L/0RACfWo3KTMUg+uPRqA6RXxk0
    180 
    +4CWjXaMAoJeIxOpZLB3RBltPnSi7PyVQIkHFuQENBD8b0wgQBACTnqOYOWYVR8O1
    181 
    +D73J6nbdAeZCbXrUkyXIuyqBOdKmX/0QJmSs7Wfsa+hPfDhj6ai0Gs2C8Qg/0Pzk
    182 
    +86b4p9DLkf0M6RaYjUtCJBpS59xrsV6nz6xZzQa4RRdf1YJmw2tia1MMXzxbwQU2
    183 
    +bKpYEm8NsGaBURMGd02EvsMN2wI2uwADBQP/e9MjVr/85XDzAlUBN8HwYW5szTyP
    184 
    +8ZVcQOqOmNebkTWGLvkPrBdXmxpzrWjxPolO1WcWQjUL0bN/rbdqefT65iVHJHJZ
    185 
    +/cpTtgGlCPhL5JTA50ltd0I13CABYWLFmswonXES/6tcglf4rr3Nri2sOrY5HggP
    186 
    +ipEzOo5vdKOow/qIRgQYEQIABgUCPxvTCAAKCRDiO35wtGfwv68jAKCDvL2gkrg1
    187 
    +4NfV7rNc057K1nL2GgCeKApWRgGVzaOkAp0P5tQulaDD6zM=
    188 
    +=7uBX
    189 
    +-----END PGP PUBLIC KEY BLOCK-----

  • include/X11/extensions/Xfixes.h
    1 1 
     /*
    2 2 
      * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
    3 
    - * Copyright 2011 Red Hat, Inc.
    3 
    + * Copyright 2011, 2021 Red Hat, Inc.
    4 4 
      *
    5 5 
      * Permission is hereby granted, free of charge, to any person obtaining a
    6 6 
      * copy of this software and associated documentation files (the "Software"),
    ... ... @@ -264,6 +264,16 @@ XFixesDestroyPointerBarrier(Display *dpy, PointerBarrier b);
    264 264
    265 265 
     #endif /* XFIXES_MAJOR >= 5 */
    266 266
    267 
    +#if XFIXES_MAJOR >= 6
    268 
    +
    269 
    +void
    270 
    +XFixesSetClientDisconnectMode(Display *dpy, int disconnect_mode);
    271 
    +
    272 
    +int
    273 
    +XFixesGetClientDisconnectMode(Display *dpy);
    274 
    +
    275 
    +#endif /* XFIXES_MAJOR >= 6 */
    276 
    +
    267 277 
     _XFUNCPROTOEND
    268 278
    269 279 
     #endif /* _XFIXES_H_ */

  • src/Disconnect.c
    1 
    +/*
    2 
    + * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
    3 
    + * Copyright 2021 Red Hat, Inc.
    4 
    + *
    5 
    + * Permission is hereby granted, free of charge, to any person obtaining a
    6 
    + * copy of this software and associated documentation files (the "Software"),
    7 
    + * to deal in the Software without restriction, including without limitation
    8 
    + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
    9 
    + * and/or sell copies of the Software, and to permit persons to whom the
    10 
    + * Software is furnished to do so, subject to the following conditions:
    11 
    + *
    12 
    + * The above copyright notice and this permission notice (including the next
    13 
    + * paragraph) shall be included in all copies or substantial portions of the
    14 
    + * Software.
    15 
    + *
    16 
    + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    17 
    + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    18 
    + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
    19 
    + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    20 
    + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    21 
    + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
    22 
    + * DEALINGS IN THE SOFTWARE.
    23 
    + */
    24 
    +/*
    25 
    + * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
    26 
    + *
    27 
    + * Permission to use, copy, modify, distribute, and sell this software and its
    28 
    + * documentation for any purpose is hereby granted without fee, provided that
    29 
    + * the above copyright notice appear in all copies and that both that
    30 
    + * copyright notice and this permission notice appear in supporting
    31 
    + * documentation, and that the name of Keith Packard not be used in
    32 
    + * advertising or publicity pertaining to distribution of the software without
    33 
    + * specific, written prior permission.  Keith Packard makes no
    34 
    + * representations about the suitability of this software for any purpose.  It
    35 
    + * is provided "as is" without express or implied warranty.
    36 
    + *
    37 
    + * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
    38 
    + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
    39 
    + * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
    40 
    + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
    41 
    + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
    42 
    + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
    43 
    + * PERFORMANCE OF THIS SOFTWARE.
    44 
    + */
    45 
    +
    46 
    +#ifdef HAVE_CONFIG_H
    47 
    +#include <config.h>
    48 
    +#endif
    49 
    +#include "Xfixesint.h"
    50 
    +#include <limits.h>
    51 
    +
    52 
    +void
    53 
    +XFixesSetClientDisconnectMode(Display *dpy, int disconnect_mode)
    54 
    +{
    55 
    +    XFixesExtDisplayInfo *info = XFixesFindDisplay(dpy);
    56 
    +    xXFixesSetClientDisconnectModeReq *req;
    57 
    +
    58 
    +    XFixesSimpleCheckExtension(dpy, info);
    59 
    +    if (info->major_version < 6)
    60 
    +	return;
    61 
    +
    62 
    +    LockDisplay(dpy);
    63 
    +    GetReq(XFixesSetClientDisconnectMode, req);
    64 
    +    req->reqType = info->codes->major_opcode;
    65 
    +    req->xfixesReqType = X_XFixesSetClientDisconnectMode;
    66 
    +    req->disconnect_mode = disconnect_mode;
    67 
    +    UnlockDisplay(dpy);
    68 
    +    SyncHandle();
    69 
    +}
    70 
    +
    71 
    +int
    72 
    +XFixesGetClientDisconnectMode(Display *dpy)
    73 
    +{
    74 
    +    XFixesExtDisplayInfo *info = XFixesFindDisplay(dpy);
    75 
    +    xXFixesGetClientDisconnectModeReq *req;
    76 
    +    xXFixesGetClientDisconnectModeReply rep;
    77 
    +    int disconnect_mode;
    78 
    +
    79 
    +    XFixesCheckExtension(dpy, info, 0);
    80 
    +    if (info->major_version < 6)
    81 
    +	return XFixesClientDisconnectFlagDefault;
    82 
    +
    83 
    +    LockDisplay(dpy);
    84 
    +    GetReq(XFixesGetClientDisconnectMode, req);
    85 
    +    req->reqType = info->codes->major_opcode;
    86 
    +    req->xfixesReqType = X_XFixesGetClientDisconnectMode;
    87 
    +
    88 
    +    if (!_XReply(dpy, (xReply *) &rep, 0, xFalse))
    89 
    +    {
    90 
    +	UnlockDisplay(dpy);
    91 
    +	SyncHandle();
    92 
    +	return XFixesClientDisconnectFlagDefault;
    93 
    +    }
    94 
    +
    95 
    +    disconnect_mode = rep.disconnect_mode;
    96 
    +    UnlockDisplay(dpy);
    97 
    +    SyncHandle();
    98 
    +
    99 
    +    return disconnect_mode;
    100 
    +}

  • src/Makefile.am
    ... ... @@ -2,6 +2,7 @@ lib_LTLIBRARIES = libXfixes.la
    2 2
    3 3 
     libXfixes_la_SOURCES = 	\
    4 4 
     	Cursor.c	\
    5 
    +	Disconnect.c	\
    5 6 
     	Region.c	\
    6 7 
     	SaveSet.c	\
    7 8 
     	Selection.c	\

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.

    Reply to: