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

[Git][xorg-team/lib/libxcomposite][upstream-unstable] 9 commits: configure: Remove AM_MAINTAINER_MODE



Title: GitLab

Timo Aaltonen pushed to branch upstream-unstable at X Strike Force / lib / libxcomposite

Commits:

5 changed files:

Changes:

  • Makefile.am
    ... ... @@ -36,3 +36,4 @@ ChangeLog:
    36 36
     
    
    37 37
     dist-hook: ChangeLog INSTALL
    
    38 38
     
    
    39
    +EXTRA_DIST = README.md

  • READMEREADME.md
    1 1
     libXcomposite - client library for the Composite extension to the X11 protocol
    
    2
    +------------------------------------------------------------------------------
    
    2 3
     
    
    3 4
     All questions regarding this software should be directed at the
    
    4 5
     Xorg mailing list:
    
    5 6
     
    
    6
    -        http://lists.freedesktop.org/mailman/listinfo/xorg
    
    7
    -
    
    8
    -Please submit bug reports to the Xorg bugzilla:
    
    9
    -
    
    10
    -        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
    
    7
    +  https://lists.x.org/mailman/listinfo/xorg
    
    11 8
     
    
    12 9
     The master development code repository can be found at:
    
    13 10
     
    
    14
    -        git://anongit.freedesktop.org/git/xorg/lib/libXcomposite
    
    11
    +  https://gitlab.freedesktop.org/xorg/lib/libXcomposite
    
    15 12
     
    
    16
    -        http://cgit.freedesktop.org/xorg/lib/libXcomposite
    
    13
    +Please submit bug reports and requests to merge patches there.
    
    17 14
     
    
    18 15
     For patch submission instructions, see:
    
    19 16
     
    
    20
    -	http://www.x.org/wiki/Development/Documentation/SubmittingPatches
    
    21
    -
    
    22
    -For more information on the git code manager, see:
    
    23
    -
    
    24
    -        http://wiki.x.org/wiki/GitPage
    
    17
    +  https://www.x.org/wiki/Development/Documentation/SubmittingPatches
    
    25 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 11
     
    
    12
    -$srcdir/configure --enable-maintainer-mode "$@"
    12
    +git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
    
    13
    +    git config --local format.subjectPrefix "PATCH libXcomposite"
    
    14
    +
    
    15
    +if test -z "$NOCONFIGURE"; then
    
    16
    +    exec "$srcdir"/configure "$@"
    
    17
    +fi

  • configure.ac
    ... ... @@ -31,14 +31,13 @@ AC_PREREQ([2.60])
    31 31
     # that 'revision' number appears in Xcomposite.h and has to be manually
    
    32 32
     # synchronized.
    
    33 33
     #
    
    34
    -AC_INIT(libXcomposite, [0.4.4],
    
    35
    -	[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXcomposite])
    
    34
    +AC_INIT(libXcomposite, [0.4.5],
    
    35
    +	[https://gitlab.freedesktop.org/xorg/lib/libXcomposite/issues], [libXcomposite])
    
    36 36
     AC_CONFIG_SRCDIR([Makefile.am])
    
    37 37
     AC_CONFIG_HEADERS([config.h])
    
    38 38
     
    
    39 39
     # Initialize Automake
    
    40 40
     AM_INIT_AUTOMAKE([foreign dist-bzip2])
    
    41
    -AM_MAINTAINER_MODE
    
    42 41
     
    
    43 42
     # Initialize libtool
    
    44 43
     AC_PROG_LIBTOOL
    

  • src/Xcomposite.c
    ... ... @@ -147,7 +147,7 @@ XCompositeExtAddDisplay (XCompositeExtInfo *extinfo,
    147 147
     	 */
    
    148 148
     	XExtCodes *codes = XAddExtension(dpy);
    
    149 149
     	if (!codes) {
    
    150
    -	    XFree(info);
    
    150
    +	    Xfree(info);
    
    151 151
     	    return NULL;
    
    152 152
     	}
    
    153 153
             XESetCloseDisplay (dpy, codes->extension, XCompositeCloseDisplay);
    


  • Reply to: