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

[Git][xorg-team/lib/libxcomposite][upstream-unstable] 9 commits: Build xz tarballs instead of bzip2

Title: GitLab

Julien Cristau pushed to branch upstream-unstable at X Strike Force / lib / libxcomposite

Commits:

  • f173c3b9
    by Alan Coopersmith at 2022-07-17T11:19:10-07:00 
    Build xz tarballs instead of bzip2

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • b134b362
    by Alan Coopersmith at 2022-07-17T11:19:45-07:00 
    Fix spelling/wording issues

Found by using:
    codespell --builtin clear,rare,usage,informal,code,names

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • d2d1e38e
    by Alan Coopersmith at 2022-07-17T11:40:49-07:00 
    gitlab CI: add a basic build test

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • c0c02375
    by Alan Coopersmith at 2022-11-21T11:26:44-08:00 
    Mark two dpy parameters const as suggested by cppcheck

Xcomposite.c:56:66: style: Parameter 'dpy' can be declared with const
  [constParameter]
XCompositeExtRemoveDisplay (XCompositeExtInfo *extinfo, Display *dpy)
                                                                 ^
Xcomposite.c:175:22: style: Parameter 'dpy' can be declared with const
  [constParameter]
        Display     *dpy)
                     ^

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • 8a10ff64
    by Alan Coopersmith at 2022-11-21T11:29:44-08:00 
    Remove unnecessary casts from malloc() and free() calls

Not needed in C89 and later

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • 253561cf
    by Alan Coopersmith at 2022-11-21T11:33:26-08:00 
    Wrap XComposite*CheckExtension() in do { ... } while(0)

Makes macro expansion safer and eliminates -Wextra-semi-stmt warnings
from clang every time it is called due to semicolon after bracket.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • 54439205
    by Alan Coopersmith at 2022-11-21T11:50:04-08:00 
    Handle implicit conversion warnings from clang

Clears 13 -Wimplicit-int-conversion, 10 -Wshorten-64-to-32, and
2 -Wsign-conversion warnings.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • 352885a4
    by Alan Coopersmith at 2022-11-21T11:54:58-08:00 
    XCompositeCloseDisplay: Mark codes as unused

Quiets clang warning:

Xcomposite.c:91:50: warning: unused parameter 'codes' [-Wunused-parameter]
XCompositeCloseDisplay (Display *dpy, XExtCodes *codes)
                                                 ^

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • cecff847
    by Alan Coopersmith at 2022-12-04T14:04:06-08:00 
    libXcomposite 0.4.6

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

5 changed files:

Changes:

  • .gitlab-ci.yml
    1 
    +# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0 filetype=yaml:
    2 
    +#
    3 
    +# This CI uses the freedesktop.org ci-templates.
    4 
    +# Please see the ci-templates documentation for details:
    5 
    +# https://freedesktop.pages.freedesktop.org/ci-templates/
    6 
    +
    7 
    +.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
    8 
    +
    9 
    +
    10 
    +include:
    11 
    +  # Arch container builder template
    12 
    +  - project: 'freedesktop/ci-templates'
    13 
    +    ref: *template_sha
    14 
    +    file: '/templates/arch.yml'
    15 
    +  - project: 'freedesktop/ci-templates'
    16 
    +    ref: *template_sha
    17 
    +    file: '/templates/ci-fairy.yml'
    18 
    +  - template: Security/SAST.gitlab-ci.yml
    19 
    +
    20 
    +
    21 
    +stages:
    22 
    +  - prep             # prep work like rebuilding the container images if there is a change
    23 
    +  - build            # for actually building and testing things in a container
    24 
    +  - test
    25 
    +  - deploy
    26 
    +
    27 
    +
    28 
    +variables:
    29 
    +  FDO_UPSTREAM_REPO: 'xorg/lib/libXcomposite'
    30 
    +  # The tag should be updated each time the list of packages is updated.
    31 
    +  # Changing a tag forces the associated image to be rebuilt.
    32 
    +  # Note: the tag has no meaning, we use a date format purely for readability
    33 
    +  FDO_DISTRIBUTION_TAG:  '2022-07-17.2'
    34 
    +  FDO_DISTRIBUTION_PACKAGES:  'git gcc pkgconf autoconf automake libtool make xorg-util-macros xorgproto libx11 libxfixes xmlto docbook-xml docbook-xsl'
    35 
    +
    36 
    +
    37 
    +#
    38 
    +# Verify that commit messages are as expected
    39 
    +#
    40 
    +check-commits:
    41 
    +  extends:
    42 
    +    - .fdo.ci-fairy
    43 
    +  stage: prep
    44 
    +  script:
    45 
    +    - ci-fairy check-commits --junit-xml=results.xml
    46 
    +  except:
    47 
    +    - master@xorg/lib/libXcomposite
    48 
    +  variables:
    49 
    +    GIT_DEPTH: 100
    50 
    +  artifacts:
    51 
    +    reports:
    52 
    +      junit: results.xml
    53 
    +
    54 
    +#
    55 
    +# Verify that the merge request has the allow-collaboration checkbox ticked
    56 
    +#
    57 
    +check-merge-request:
    58 
    +  extends:
    59 
    +    - .fdo.ci-fairy
    60 
    +  stage: deploy
    61 
    +  script:
    62 
    +    - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
    63 
    +  artifacts:
    64 
    +    when: on_failure
    65 
    +    reports:
    66 
    +      junit: results.xml
    67 
    +  allow_failure: true
    68 
    +
    69 
    +
    70 
    +#
    71 
    +# Build a container with the given tag and the packages pre-installed.
    72 
    +# This only happens if/when the tag changes, otherwise the existing image is
    73 
    +# re-used.
    74 
    +#
    75 
    +container-prep:
    76 
    +  extends:
    77 
    +    - .fdo.container-build@arch
    78 
    +  stage: prep
    79 
    +  variables:
    80 
    +    GIT_STRATEGY: none
    81 
    +
    82 
    +
    83 
    +#
    84 
    +# The default build, runs on the image built above.
    85 
    +#
    86 
    +build:
    87 
    +  stage: build
    88 
    +  extends:
    89 
    +    - .fdo.distribution-image@arch
    90 
    +  script:
    91 
    +    - autoreconf -ivf
    92 
    +    - mkdir _builddir
    93 
    +    - pushd _builddir > /dev/null
    94 
    +    - ../configure --disable-silent-rules
    95 
    +    - make
    96 
    +    - make check
    97 
    +    - make distcheck
    98 
    +    - popd > /dev/null

  • README.md
    ... ... @@ -6,7 +6,7 @@ Xorg mailing list:
    6 6
    7 7 
       https://lists.x.org/mailman/listinfo/xorg
    8 8
    9 
    -The master development code repository can be found at:
    9 
    +The primary development code repository can be found at:
    10 10
    11 11 
       https://gitlab.freedesktop.org/xorg/lib/libXcomposite
    12 12

  • configure.ac
    ... ... @@ -31,13 +31,14 @@ 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.5],
    35 
    -	[https://gitlab.freedesktop.org/xorg/lib/libXcomposite/issues], [libXcomposite])
    34 
    +AC_INIT(libXcomposite, [0.4.6],
    35 
    +	[https://gitlab.freedesktop.org/xorg/lib/libxcomposite/-/issues],
    36 
    +	[libXcomposite])
    36 37 
     AC_CONFIG_SRCDIR([Makefile.am])
    37 38 
     AC_CONFIG_HEADERS([config.h])
    38 39
    39 40 
     # Initialize Automake
    40 
    -AM_INIT_AUTOMAKE([foreign dist-bzip2])
    41 
    +AM_INIT_AUTOMAKE([foreign dist-xz])
    41 42
    42 43 
     # Initialize libtool
    43 44 
     AC_PROG_LIBTOOL
    ... ... @@ -62,8 +63,9 @@ fi
    62 63 
     COMPOSITEEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
    63 64 
     AC_SUBST(COMPOSITEEXT_VERSION)
    64 65
    65 
    -# Obtain compiler/linker options for depedencies
    66 
    -PKG_CHECK_MODULES(XCOMPOSITE, [compositeproto >= $COMPOSITEEXT_VERSION] x11)
    66 
    +# Obtain compiler/linker options for dependencies
    67 
    +PKG_CHECK_MODULES(XCOMPOSITE,
    68 
    +        [compositeproto >= $COMPOSITEEXT_VERSION xproto >= 7.0.22 x11])
    67 69 
     PKG_CHECK_MODULES(XFIXES, xfixes)
    68 70
    69 71 
     AC_CONFIG_FILES([Makefile

  • src/Xcomposite.c
    ... ... @@ -53,7 +53,7 @@ const char XCompositeExtensionName[] = COMPOSITE_NAME;
    53 53 
      * extension object. (Replaces XextRemoveDisplay.)
    54 54 
      */
    55 55 
     static int
    56 
    -XCompositeExtRemoveDisplay (XCompositeExtInfo *extinfo, Display *dpy)
    56 
    +XCompositeExtRemoveDisplay (XCompositeExtInfo *extinfo, const Display *dpy)
    57 57 
     {
    58 58 
         XCompositeExtDisplayInfo *info, *prev;
    59 59
    ... ... @@ -83,12 +83,12 @@ XCompositeExtRemoveDisplay (XCompositeExtInfo *extinfo, Display *dpy)
    83 83 
         if (info == extinfo->cur) extinfo->cur = NULL;  /* flush cache */
    84 84 
         _XUnlockMutex(_Xglobal_lock);
    85 85
    86 
    -    Xfree ((char *) info);
    86 
    +    Xfree (info);
    87 87 
         return 1;
    88 88 
     }
    89 89
    90 90 
     static int
    91 
    -XCompositeCloseDisplay (Display *dpy, XExtCodes *codes)
    91 
    +XCompositeCloseDisplay (Display *dpy, _X_UNUSED XExtCodes *codes)
    92 92 
     {
    93 93 
         return XCompositeExtRemoveDisplay (&XCompositeExtensionInfo, dpy);
    94 94 
     }
    ... ... @@ -104,7 +104,7 @@ XCompositeExtAddDisplay (XCompositeExtInfo *extinfo,
    104 104 
     {
    105 105 
         XCompositeExtDisplayInfo    *info;
    106 106
    107 
    -    info = (XCompositeExtDisplayInfo *) Xmalloc (sizeof (XCompositeExtDisplayInfo));
    107 
    +    info = Xmalloc (sizeof (XCompositeExtDisplayInfo));
    108 108 
         if (!info) return NULL;
    109 109 
         info->display = dpy;
    110 110
    ... ... @@ -124,7 +124,7 @@ XCompositeExtAddDisplay (XCompositeExtInfo *extinfo,
    124 124 
     	 */
    125 125 
     	LockDisplay (dpy);
    126 126 
     	GetReq (CompositeQueryVersion, req);
    127 
    -	req->reqType = info->codes->major_opcode;
    127 
    +	req->reqType = (CARD8) info->codes->major_opcode;
    128 128 
     	req->compositeReqType = X_CompositeQueryVersion;
    129 129 
     	req->majorVersion = COMPOSITE_MAJOR;
    130 130 
     	req->minorVersion = COMPOSITE_MINOR;
    ... ... @@ -135,8 +135,8 @@ XCompositeExtAddDisplay (XCompositeExtInfo *extinfo,
    135 135 
     	    Xfree(info);
    136 136 
     	    return NULL;
    137 137 
     	}
    138 
    -	info->major_version = rep.majorVersion;
    139 
    -	info->minor_version = rep.minorVersion;
    138 
    +	info->major_version = (int) rep.majorVersion;
    139 
    +	info->minor_version = (int) rep.minorVersion;
    140 140 
     	UnlockDisplay (dpy);
    141 141 
     	SyncHandle ();
    142 142 
         } else {
    ... ... @@ -172,7 +172,7 @@ XCompositeExtAddDisplay (XCompositeExtInfo *extinfo,
    172 172 
      */
    173 173 
     static XCompositeExtDisplayInfo *
    174 174 
     XCompositeExtFindDisplay (XCompositeExtInfo *extinfo,
    175 
    -		      Display	    *dpy)
    175 
    +			  const Display	    *dpy)
    176 176 
     {
    177 177 
         XCompositeExtDisplayInfo *info;
    178 178
    ... ... @@ -256,10 +256,10 @@ XCompositeRedirectWindow (Display *dpy, Window window, int update)
    256 256 
         XCompositeSimpleCheckExtension (dpy, info);
    257 257 
         LockDisplay (dpy);
    258 258 
         GetReq (CompositeRedirectWindow, req);
    259 
    -    req->reqType = info->codes->major_opcode;
    259 
    +    req->reqType = (CARD8) info->codes->major_opcode;
    260 260 
         req->compositeReqType = X_CompositeRedirectWindow;
    261 
    -    req->window = window;
    262 
    -    req->update = update;
    261 
    +    req->window = (CARD32) window;
    262 
    +    req->update = (CARD8) update;
    263 263 
         UnlockDisplay (dpy);
    264 264 
         SyncHandle ();
    265 265 
     }
    ... ... @@ -273,10 +273,10 @@ XCompositeRedirectSubwindows (Display *dpy, Window window, int update)
    273 273 
         XCompositeSimpleCheckExtension (dpy, info);
    274 274 
         LockDisplay (dpy);
    275 275 
         GetReq (CompositeRedirectSubwindows, req);
    276 
    -    req->reqType = info->codes->major_opcode;
    276 
    +    req->reqType = (CARD8) info->codes->major_opcode;
    277 277 
         req->compositeReqType = X_CompositeRedirectSubwindows;
    278 
    -    req->window = window;
    279 
    -    req->update = update;
    278 
    +    req->window = (CARD32) window;
    279 
    +    req->update = (CARD8) update;
    280 280 
         UnlockDisplay (dpy);
    281 281 
         SyncHandle ();
    282 282 
     }
    ... ... @@ -290,10 +290,10 @@ XCompositeUnredirectWindow (Display *dpy, Window window, int update)
    290 290 
         XCompositeSimpleCheckExtension (dpy, info);
    291 291 
         LockDisplay (dpy);
    292 292 
         GetReq (CompositeUnredirectWindow, req);
    293 
    -    req->reqType = info->codes->major_opcode;
    293 
    +    req->reqType = (CARD8) info->codes->major_opcode;
    294 294 
         req->compositeReqType = X_CompositeUnredirectWindow;
    295 
    -    req->window = window;
    296 
    -    req->update = update;
    295 
    +    req->window = (CARD32) window;
    296 
    +    req->update = (CARD8) update;
    297 297 
         UnlockDisplay (dpy);
    298 298 
         SyncHandle ();
    299 299 
     }
    ... ... @@ -307,10 +307,10 @@ XCompositeUnredirectSubwindows (Display *dpy, Window window, int update)
    307 307 
         XCompositeSimpleCheckExtension (dpy, info);
    308 308 
         LockDisplay (dpy);
    309 309 
         GetReq (CompositeUnredirectSubwindows, req);
    310 
    -    req->reqType = info->codes->major_opcode;
    310 
    +    req->reqType = (CARD8) info->codes->major_opcode;
    311 311 
         req->compositeReqType = X_CompositeUnredirectSubwindows;
    312 
    -    req->window = window;
    313 
    -    req->update = update;
    312 
    +    req->window = (CARD32) window;
    313 
    +    req->update = (CARD8) update;
    314 314 
         UnlockDisplay (dpy);
    315 315 
         SyncHandle ();
    316 316 
     }
    ... ... @@ -325,10 +325,11 @@ XCompositeCreateRegionFromBorderClip (Display *dpy, Window window)
    325 325 
         XCompositeCheckExtension (dpy, info, 0);
    326 326 
         LockDisplay (dpy);
    327 327 
         GetReq (CompositeCreateRegionFromBorderClip, req);
    328 
    -    req->reqType = info->codes->major_opcode;
    328 
    +    req->reqType = (CARD8) info->codes->major_opcode;
    329 329 
         req->compositeReqType = X_CompositeCreateRegionFromBorderClip;
    330 
    -    req->window = window;
    331 
    -    region = req->region = XAllocID (dpy);
    330 
    +    req->window = (CARD32) window;
    331 
    +    region = XAllocID (dpy);
    332 
    +    req->region = (CARD32) region;
    332 333 
         UnlockDisplay (dpy);
    333 334 
         SyncHandle ();
    334 335 
         return region;
    ... ... @@ -344,10 +345,11 @@ XCompositeNameWindowPixmap (Display *dpy, Window window)
    344 345 
         XCompositeCheckExtension (dpy, info, 0);
    345 346 
         LockDisplay (dpy);
    346 347 
         GetReq (CompositeNameWindowPixmap, req);
    347 
    -    req->reqType = info->codes->major_opcode;
    348 
    +    req->reqType = (CARD8) info->codes->major_opcode;
    348 349 
         req->compositeReqType = X_CompositeNameWindowPixmap;
    349 
    -    req->window = window;
    350 
    -    pixmap = req->pixmap = XAllocID (dpy);
    350 
    +    req->window = (CARD32) window;
    351 
    +    pixmap = XAllocID (dpy);
    352 
    +    req->pixmap = (CARD32) pixmap;
    351 353 
         UnlockDisplay (dpy);
    352 354 
         SyncHandle ();
    353 355 
         return pixmap;
    ... ... @@ -363,9 +365,9 @@ XCompositeGetOverlayWindow (Display *dpy, Window window)
    363 365 
         XCompositeCheckExtension (dpy, info, 0);
    364 366 
         LockDisplay (dpy);
    365 367 
         GetReq (CompositeGetOverlayWindow, req);
    366 
    -    req->reqType = info->codes->major_opcode;
    368 
    +    req->reqType = (CARD8) info->codes->major_opcode;
    367 369 
         req->compositeReqType = X_CompositeGetOverlayWindow;
    368 
    -    req->window = window;
    370 
    +    req->window = (CARD32) window;
    369 371 
         if (!_XReply (dpy, (xReply *) &rep, 0, xFalse))
    370 372 
         {
    371 373 
     	UnlockDisplay (dpy);
    ... ... @@ -388,9 +390,9 @@ XCompositeReleaseOverlayWindow (Display *dpy, Window window)
    388 390 
         XCompositeSimpleCheckExtension (dpy, info);
    389 391 
         LockDisplay (dpy);
    390 392 
         GetReq (CompositeReleaseOverlayWindow, req);
    391 
    -    req->reqType = info->codes->major_opcode;
    393 
    +    req->reqType = (CARD8) info->codes->major_opcode;
    392 394 
         req->compositeReqType = X_CompositeReleaseOverlayWindow;
    393 
    -    req->window = window;
    395 
    +    req->window = (CARD32) window;
    394 396 
         UnlockDisplay (dpy);
    395 397 
         SyncHandle ();
    396 398 
     }

  • src/xcompositeint.h
    ... ... @@ -46,6 +46,7 @@
    46 46 
     #define _XCOMPOSITEINT_H_
    47 47
    48 48 
     #include <stdio.h>
    49 
    +#include <X11/Xfuncproto.h>
    49 50 
     #include <X11/Xlib.h>
    50 51 
     #include <X11/Xlibint.h>
    51 52 
     #include <X11/Xutil.h>
    ... ... @@ -76,9 +77,9 @@ XCompositeFindDisplay (Display *dpy);
    76 77 
     #define XCompositeHasExtension(i) ((i) && ((i)->codes))
    77 78
    78 79 
     #define XCompositeCheckExtension(dpy,i,val) \
    79 
    -  if (!XCompositeHasExtension(i)) { return val; }
    80 
    +    do { if (!XCompositeHasExtension(i)) { return val; } } while (0)
    80 81
    81 82 
     #define XCompositeSimpleCheckExtension(dpy,i) \
    82 
    -  if (!XCompositeHasExtension(i)) { return; }
    83 
    +    do { if (!XCompositeHasExtension(i)) { return; } } while (0)
    83 84
    84 85 
     #endif /* _XCOMPOSITEINT_H_ */

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help

    Reply to: