开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 6

libx11_1.7.2-2.diff.gz Deleted

@@ -1,6121 +0,0 @@
---- libx11-1.7.2.orig/.gitlab-ci.yml
-+++ libx11-1.7.2/.gitlab-ci.yml
-@@ -0,0 +1,102 @@
-+# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0 filetype=yaml:
-+#
-+# This CI uses the freedesktop.org ci-templates.
-+# Please see the ci-templates documentation for details:
-+# https://freedesktop.pages.freedesktop.org/ci-templates/
-+
-+.templates_sha: &template_sha c7702b1ae8507c5d5f34edcbf280f287ab541e8e # see https://docs.gitlab.com/ee/ci/yaml/#includefile
-+
-+
-+include:
-+  # Arch container builder template
-+  - project: 'freedesktop/ci-templates'
-+    ref: *template_sha
-+    file: '/templates/arch.yml'
-+
-+
-+stages:
-+  - prep             # prep work like rebuilding the container images if there is a change
-+  - build            # for actually building and testing things in a container
-+  - deploy
-+
-+
-+variables:
-+  FDO_UPSTREAM_REPO: 'xorg/lib/libX11'
-+  # The tag should be updated each time the list of packages is updated.
-+  # Changing a tag forces the associated image to be rebuilt.
-+  # Note: the tag has no meaning, we use a date format purely for readability
-+  FDO_DISTRIBUTION_TAG:  '2020-11-16.0'
-+  FDO_DISTRIBUTION_PACKAGES:  'git gcc pkgconf autoconf automake make xorg-util-macros xtrans xorgproto libxcb'
-+
-+
-+#
-+# Template for an image with ci-fairy installed
-+#
-+.ci_fairy_image:
-+  image: python:alpine
-+  before_script:
-+    - apk add git
-+    - pip install git+http://gitlab.freedesktop.org/freedesktop/ci-templates
-+
-+#
-+# Verify that commit messages are as expected, signed-off, etc.
-+#
-+check-commits:
-+  extends:
-+    - .ci_fairy_image
-+  stage: prep
-+  script:
-+    - ci-fairy check-commits --signed-off-by --junit-xml=results.xml
-+  except:
-+    - master@xorg/lib/libX11
-+  variables:
-+    GIT_DEPTH: 100
-+  artifacts:
-+    reports:
-+      junit: results.xml
-+
-+#
-+# Verify that the merge request has the allow-collaboration checkbox ticked
-+#
-+check-merge-request:
-+  extends:
-+    - .ci_fairy_image
-+  stage: deploy
-+  script:
-+    - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
-+  artifacts:
-+    when: on_failure
-+    reports:
-+      junit: results.xml
-+  allow_failure: true
-+
-+
-+#
-+# Build a container with the given tag and the packages pre-installed.
-+# This only happens if when the tag changes, otherwise the existing image is
-+# re-used.
-+#
-+container-prep:
-+  extends:
-+    - .fdo.container-build@arch
-+  stage: prep
-+  variables:
-+    GIT_STRATEGY: none
-+
-+
-+#
-+# The default build, runs on the image built above.
-+#
-+build:
-+  stage: build
-+  extends:
-+    - .fdo.distribution-image@arch
-+  script:
-+    - autoreconf -ivf
-+    - mkdir _builddir
-+    - pushd _builddir > /dev/null
-+    - ../configure --disable-silent-rules
-+    - make
-+    - make check
-+    - make distcheck
-+    - popd > /dev/null
---- libx11-1.7.2.orig/0001-makekeys-handle-the-new-_EVDEVK-xorgproto-symbols.patch
-+++ libx11-1.7.2/0001-makekeys-handle-the-new-_EVDEVK-xorgproto-symbols.patch
-@@ -0,0 +1,43 @@
-+From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
-+From: Peter Hutterer <peter.hutterer@who-t.net>
-+Date: Tue, 27 Jul 2021 11:46:19 +1000
-+Subject: PATCH makekeys: handle the new _EVDEVK xorgproto symbols
-+
-+These keys are all defined through a macro in the form:
-+   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
-+
-+The _EVDEVK macro is simply an offset of 0x10081000.
-+Let's parse these lines correctly so those keysyms end up in our
-+hashtables.
-+
-+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-+---
-+ src/util/makekeys.c | 12 ++++++++++++
-+ 1 file changed, 12 insertions(+)
-+
-+diff --git a/src/util/makekeys.c b/src/util/makekeys.c
-+index e847ef4c..4896cc53 100644
-+--- a/src/util/makekeys.c
-++++ b/src/util/makekeys.c
-+@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
-+         return 1;
-+     }
-+ 
-++    /* See if we can parse one of the _EVDEVK symbols */
-++    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
-++    if (i == 2 && (tmp = strstr(key, "XK_"))) {
-++        memcpy(prefix, key, (size_t)(tmp - key));
-++        prefixtmp - key = '\0';
-++        tmp += 3;
-++        memmove(key, tmp, strlen(tmp) + 1);
-++
-++        *val += 0x10081000;
-++        return 1;
-++    }
-++
-+     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
-+      * immediately: if the target is in the form XF86XK_foo, we need to
-+      * canonicalise this to XF86foo before we do the lookup. */
-+-- 
-+2.32.0
-+
---- libx11-1.7.2.orig/ChangeLog
-+++ libx11-1.7.2/ChangeLog
-@@ -1,866 +1,3 @@
--commit f906fe8e9769e4313294b68e61c402610ade69da
--Author: Alan Coopersmith <alan.coopersmith@oracle.com>
--Date:   Sat Jun 5 09:12:13 2021 -0700
--
--    libX11 1.7.2
--    
--    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
--
--commit 51b73ac0acda65005c8a9f17ca4ea7281b00ca84
--Author: Tobias Stoeckmann <tobias@stoeckmann.org>
--Date:   Sun May 23 15:05:17 2021 +0200
--
--    Protect against overly long strings
--    
--    Checking against upper limit of USHRT_MAX must happen before truncating
--    size_t to int. On 64 bit systems with strings larger than 2 GB this
--    could otherwise lead to negative ints or ints smaller than USHRT_MAX.
--    
--    In XParseColor this could lead to out of boundary access with strings
--    starting with a # (color sequence). A modulo 12 operation is performed
--    to validate the string length, but with an overflown length, the for
--    loop would eventually read behind terminating '\0' character.
--    
--    Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
--
--commit ab2f59530b16bdfbf023b8e025c7c8aba3b6fd0c
--Author: Matthieu Herrb <matthieu@herrb.eu>
--Date:   Sun May 30 16:33:48 2021 +0200
--
--    Check for NULL strings before getting their lengths
--    
--    Problem reported by Karsten Trulsen
--    
--    Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
--
--commit a8216e8653a246db664e1443ecf707b27de65067
--Author: Matthieu Herrb <matthieu@herrb.eu>
--Date:   Sat May 22 17:35:47 2021 +0200
--
--    include <limits.h> always, not if HAVE_CONFIG_H is set.
--    
--    via Matthew Green from the NetBSD project
--    
--    Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
--