libXmu: Branch 'master' - 3 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sun Jul 17 23:15:03 UTC 2022
.gitlab-ci.yml | 99 +++++++++++++++++++++++++++++++++++++++++++++
README.md | 2
configure.ac | 4 -
include/X11/Xmu/EditresP.h | 8 +--
src/Clip.c | 8 +--
src/CloseHook.c | 4 -
src/CrCmap.c | 4 -
src/DefErrMsg.c | 2
src/EditresCom.c | 40 +++++++++---------
src/RdBitF.c | 2
src/WidgetNode.c | 2
11 files changed, 137 insertions(+), 38 deletions(-)
New commits:
commit ba043b0cac8b675f72825606702ccdc97b5beaa5
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sun Jul 17 15:59:53 2022 -0700
gitlab CI: add a basic build test
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..f5bbb0b
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,99 @@
+# 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 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+
+
+include:
+ # Debian container builder template
+ - project: 'freedesktop/ci-templates'
+ ref: *template_sha
+ file: '/templates/debian.yml'
+ - project: 'freedesktop/ci-templates'
+ ref: *template_sha
+ file: '/templates/ci-fairy.yml'
+ - template: Security/SAST.gitlab-ci.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
+ - test
+ - deploy
+
+
+variables:
+ FDO_UPSTREAM_REPO: 'xorg/lib/libXmu'
+ FDO_DISTRIBUTION_VERSION: 'stable'
+ # 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: '2022-07-17.0'
+ FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake libtool make xutils-dev x11proto-dev libx11-dev libxext-dev libxt-dev xmlto xorg-sgml-doctools w3m xsltproc fop'
+
+
+#
+# Verify that commit messages are as expected
+#
+check-commits:
+ extends:
+ - .fdo.ci-fairy
+ stage: prep
+ script:
+ - ci-fairy check-commits --junit-xml=results.xml
+ except:
+ - master at xorg/lib/libXmu
+ variables:
+ GIT_DEPTH: 100
+ artifacts:
+ reports:
+ junit: results.xml
+
+#
+# Verify that the merge request has the allow-collaboration checkbox ticked
+#
+check-merge-request:
+ extends:
+ - .fdo.ci-fairy
+ 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 at debian
+ stage: prep
+ variables:
+ GIT_STRATEGY: none
+
+
+#
+# The default build, runs on the image built above.
+#
+build:
+ stage: build
+ extends:
+ - .fdo.distribution-image at debian
+ script:
+ - autoreconf -ivf
+ - mkdir _builddir
+ - pushd _builddir > /dev/null
+ - ../configure --disable-silent-rules --enable-docs
+ - make
+ - make check
+ - make distcheck
+ - popd > /dev/null
commit 25053af7cc9307090fa1a444d9679ad729ce6f50
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sun Jul 17 15:56:49 2022 -0700
Fix spelling/wording issues
Found by using:
codespell --builtin clear,rare,usage,informal,code,names
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/README.md b/README.md
index 9aa45b6..9a3216d 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Xorg mailing list:
https://lists.x.org/mailman/listinfo/xorg
-The master development code repository can be found at:
+The primary development code repository can be found at:
https://gitlab.freedesktop.org/xorg/lib/libXmu
diff --git a/configure.ac b/configure.ac
index 61bec12..50ac183 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ XORG_WITH_FOP
XORG_WITH_XSLTPROC
XORG_CHECK_SGML_DOCTOOLS(1.8)
-# Obtain compiler/linker options for depedencies
+# Obtain compiler/linker options for dependencies
PKG_CHECK_MODULES(XMU, xt xext x11 xextproto)
PKG_CHECK_MODULES(XMUU, x11)
diff --git a/include/X11/Xmu/EditresP.h b/include/X11/Xmu/EditresP.h
index ed9dd41..c606f81 100644
--- a/include/X11/Xmu/EditresP.h
+++ b/include/X11/Xmu/EditresP.h
@@ -130,7 +130,7 @@ in this Software without prior written authorization from The Open Group.
Send Widget Tree returns the toolkit type, and a fuly specified list
of widgets for each widget in the tree. This is enough information
- to completely reconstruct the entire widget heirarchy.
+ to completely reconstruct the entire widget hierarchy.
The window return value contains the Xid of the window currently
used by this widget. If the widget is unrealized then 0 is returned,
@@ -195,7 +195,7 @@ in this Software without prior written authorization from The Open Group.
Type: String8 ]
GetResource retrieves the kind, name, class and type for every
- widget passed to it. If an error occured with the resource fetch
+ widget passed to it. If an error occurred with the resource fetch
Error will be set to True for the given widget and a message
is returned rather than the resource info.
@@ -220,8 +220,8 @@ in this Software without prior written authorization from The Open Group.
Height: Card16
BorderWidth: Card16 ]
- GetGeometry retreives the mapping state, x, y, width, height
- and border width for each widget specified. If an error occured
+ GetGeometry retrieves the mapping state, x, y, width, height
+ and border width for each widget specified. If an error occurred
with the geometry fetch "Error" will be set to True for the given
widget and a message is returned rather than the geometry info.
X an Y corrospond to the root coordinates of the upper left corner
diff --git a/src/Clip.c b/src/Clip.c
index 232e4c5..4797562 100644
--- a/src/Clip.c
+++ b/src/Clip.c
@@ -98,7 +98,7 @@ XmuAreaDup(XmuArea *area)
* src - source area
*
* Description:
- * Minimizes memory alocation, trying to use already alocated memory
+ * Minimizes memory allocation, trying to use already allocated memory
* in dst, freeing what is not required anymore.
*/
XmuArea *
@@ -855,7 +855,7 @@ XmuScanlineNot(XmuScanline *scanline, int minx, int maxx)
* XmuScanlineOrSegment
*
* Parameters:
- * dst - destionation scanline
+ * dst - destination scanline
* src - source segment
*
* Description:
@@ -1014,7 +1014,7 @@ XmuScanlineAndSegment(XmuScanline *dst, XmuSegment *src)
* XmuScanlineXorSegment
*
* Parameters:
- * dst - destionation scanline
+ * dst - destination scanline
* src - source segment
*
* Descriptipn:
@@ -1123,7 +1123,7 @@ XmuScanlineXorSegment(XmuScanline *dst, XmuSegment *src)
* ScanlineOr
*
* Parameters:
- * dst - destionation scanline
+ * dst - destination scanline
* src - source scanline
*
* Description:
diff --git a/src/CloseHook.c b/src/CloseHook.c
index 01a1beb..3eb06ac 100644
--- a/src/CloseHook.c
+++ b/src/CloseHook.c
@@ -135,7 +135,7 @@ XmuAddCloseDisplayHook(Display *dpy, XmuCloseHookProc func, XPointer arg)
elist = de;
}
- /* add to end of list of callback recordss */
+ /* add to end of list of callback records */
cb->func = func;
cb->arg = arg;
cb->next = NULL;
@@ -221,7 +221,7 @@ XmuLookupCloseDisplayHook(Display *dpy, CloseHook handle,
/*
* Find the specified display on the linked list of displays. Also return
- * the preceeding link so that the display can be unlinked without having
+ * the preceding link so that the display can be unlinked without having
* back pointers.
*/
static DisplayEntry *
diff --git a/src/CrCmap.c b/src/CrCmap.c
index 4414b1f..b92601d 100644
--- a/src/CrCmap.c
+++ b/src/CrCmap.c
@@ -314,7 +314,7 @@ readwrite_map(Display *dpy, XVisualInfo *vinfo, XStandardColormap *colormap)
#undef calc
}
/* We have a read-only map defined. Now free unused cells,
- * first those occuring before the contiguous sequence begins,
+ * first those occurring before the contiguous sequence begins,
* then any following the contiguous sequence.
*/
@@ -457,7 +457,7 @@ free_cells(Display *dpy, Colormap cmap, unsigned long pixels[],
{
/* One of the npixels allocated has already been freed.
* p is the index of the freed pixel.
- * First free the pixels preceeding p, and there are p of them;
+ * First free the pixels preceding p, and there are p of them;
* then free the pixels following p, there are npixels - p - 1 of them.
*/
XFreeColors(dpy, cmap, pixels, p, (unsigned long) 0);
diff --git a/src/DefErrMsg.c b/src/DefErrMsg.c
index 3cb914a..77661dd 100644
--- a/src/DefErrMsg.c
+++ b/src/DefErrMsg.c
@@ -35,7 +35,7 @@ in this Software without prior written authorization from The Open Group.
/*
* XmuPrintDefaultErrorMessage - print a nice error that looks like the usual
- * message. Returns 1 if the caller should consider exitting else 0.
+ * message. Returns 1 if the caller should consider exiting else 0.
*/
int
XmuPrintDefaultErrorMessage(Display *dpy, XErrorEvent *event, FILE *fp)
diff --git a/src/EditresCom.c b/src/EditresCom.c
index 716a2b3..1d1625f 100644
--- a/src/EditresCom.c
+++ b/src/EditresCom.c
@@ -547,14 +547,14 @@ ExecuteCommand(Widget w, Atom sel, ResIdent ident, EditresEvent *event)
* target - target type for this selection
* type_ret - type of the selection
* value_ret - selection value
- * length_ret - lenght of this selection
+ * length_ret - length of this selection
* format_ret - the format the selection is in
*
* Description:
* Converts a selection
*
* Returns:
- * True if conversion was sucessful
+ * True if conversion was successful
*/
/*ARGSUSED*/
static Boolean
@@ -592,14 +592,14 @@ ConvertReturnCommand(Widget w, Atom *selection, Atom *target, Atom *type_ret,
static void
CommandDone(Widget widget, Atom *selection, Atom *target)
{
- /* Keep the toolkit from automaticaly freeing the selection value */
+ /* Keep the toolkit from automatically freeing the selection value */
}
/*
* Function:
* SendFailure
*
- * Paramters:
+ * Parameters:
* w - widget to own the selection
* sel - selection to assert
* ident - identifier
@@ -712,7 +712,7 @@ qcmp_widget_list(register _Xconst void *left, register _Xconst void *right)
* extra - return extra children
*
* Description:
- * Retuns all children (popup, normal and otherwise) of this widget
+ * Returns all children (popup, normal and otherwise) of this widget
*
* Returns:
* number of children
@@ -1071,7 +1071,7 @@ ExecuteSetValues(Widget w, SetValuesEvent *sv_event, WidgetInfo *entry,
*
* Description:
* Given a widget it builds a protocol packet containing the entire
- * widget heirarchy.
+ * widget hierarchy.
*
* Returns:
* NULL
@@ -1219,7 +1219,7 @@ DoGetGeometry(Widget w, EditresEvent *event, ProtocolStream *stream)
if ((str = VerifyWidget(w, &geom_event->widgets[i])) != NULL)
{
- _XEditResPutBool(stream, True); /* an error occured */
+ _XEditResPutBool(stream, True); /* an error occurred */
_XEditResPutString8(stream, str); /* set message */
}
else
@@ -1241,7 +1241,7 @@ DoGetGeometry(Widget w, EditresEvent *event, ProtocolStream *stream)
* Gets the geometry for each widget specified.
*
* Returns:
- * True if no error occured.
+ * True if no error occurred.
*/
static void
ExecuteGetGeometry(Widget w, ProtocolStream *stream)
@@ -1256,7 +1256,7 @@ ExecuteGetGeometry(Widget w, ProtocolStream *stream)
if (!XtIsRectObj(w) || (XtIsWidget(w) && !XtIsRealized(w)))
{
_XEditResPutBool(stream, False); /* no error */
- _XEditResPutBool(stream, False); /* not visable */
+ _XEditResPutBool(stream, False); /* not visible */
for (i = 0; i < 5; i++) /* fill in extra space with 0's */
_XEditResPut16(stream, 0);
return;
@@ -1282,7 +1282,7 @@ ExecuteGetGeometry(Widget w, ProtocolStream *stream)
if (attrs.map_state != IsViewable)
{
_XEditResPutBool(stream, False); /* no error */
- _XEditResPutBool(stream, False); /* not visable */
+ _XEditResPutBool(stream, False); /* not visible */
for (i = 0; i < 5; i++) /* fill in extra space with 0's */
_XEditResPut16(stream, 0);
return;
@@ -1290,7 +1290,7 @@ ExecuteGetGeometry(Widget w, ProtocolStream *stream)
}
else
{
- _XEditResPut8(stream, True); /* Error occured. */
+ _XEditResPut8(stream, True); /* Error occurred. */
_XEditResPutString8(stream, "XGetWindowAttributes failed.");
return;
}
@@ -1299,7 +1299,7 @@ ExecuteGetGeometry(Widget w, ProtocolStream *stream)
XtTranslateCoords(w, -((int) border_width), -((int) border_width), &x, &y);
_XEditResPutBool(stream, False); /* no error */
- _XEditResPutBool(stream, True); /* Visable */
+ _XEditResPutBool(stream, True); /* Visible */
_XEditResPut16(stream, x);
_XEditResPut16(stream, y);
_XEditResPut16(stream, width);
@@ -1463,7 +1463,7 @@ DoGetResources(Widget w, EditresEvent *event, ProtocolStream *stream)
_Xconst char *str;
GetResEvent *res_event = (GetResEvent *)event;
- _XEditResPut16(stream, res_event->num_entries); /* number of replys */
+ _XEditResPut16(stream, res_event->num_entries); /* number of replies */
for (i = 0; i < res_event->num_entries; i++)
{
@@ -1473,12 +1473,12 @@ DoGetResources(Widget w, EditresEvent *event, ProtocolStream *stream)
_XEditResPutWidgetInfo(stream, &res_event->widgets[i]);
if ((str = VerifyWidget(w, &res_event->widgets[i])) != NULL)
{
- _XEditResPutBool(stream, True); /* an error occured */
+ _XEditResPutBool(stream, True); /* an error occurred */
_XEditResPutString8(stream, str); /* set message */
}
else
{
- _XEditResPutBool(stream, False); /* no error occured */
+ _XEditResPutBool(stream, False); /* no error occurred */
ExecuteGetResources(res_event->widgets[i].real_widget, stream);
}
}
@@ -1790,7 +1790,7 @@ _XEditResResetStream(ProtocolStream *stream)
* Retrieves an unsigned 8 bit value from the protocol stream.
*
* Returns:
- * True if sucessful
+ * True if successful
*/
Bool
_XEditResGet8(ProtocolStream *stream, unsigned char *value)
@@ -1814,7 +1814,7 @@ _XEditResGet8(ProtocolStream *stream, unsigned char *value)
* Retrieves an unsigned 16 bit value from the protocol stream.
*
* Returns:
- * True if sucessful
+ * True if successful
*/
Bool
_XEditResGet16(ProtocolStream *stream, unsigned short *value)
@@ -1840,7 +1840,7 @@ _XEditResGet16(ProtocolStream *stream, unsigned short *value)
* Retrieves an signed 16 bit value from the protocol stream.
*
* Returns:
- * True if sucessful
+ * True if successful
*/
Bool
_XEditResGetSigned16(ProtocolStream *stream, short *value)
@@ -1874,7 +1874,7 @@ _XEditResGetSigned16(ProtocolStream *stream, short *value)
* Retrieves an unsigned 32 bit value from the protocol stream.
*
* Returns:
- * True if sucessful
+ * True if successful
*/
Bool
_XEditResGet32(ProtocolStream *stream, unsigned long *value)
@@ -1985,7 +1985,7 @@ _XEditResGetWidgetInfo(ProtocolStream *stream, WidgetInfo *info)
* Converts a string to an editres block value.
*
* Returns:
- * True if conversion was sucessful
+ * True if conversion was successful
*/
/*ARGSUSED*/
static Boolean
diff --git a/src/RdBitF.c b/src/RdBitF.c
index 240c4c8..dbea542 100644
--- a/src/RdBitF.c
+++ b/src/RdBitF.c
@@ -41,7 +41,7 @@ in this Software without prior written authorization from The Open Group.
/*
- * Based on an optimized version provided by Jim Becker, Auguest 5, 1988.
+ * Based on an optimized version provided by Jim Becker, August 5, 1988.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/WidgetNode.c b/src/WidgetNode.c
index 037eb0c..5c4fcc8 100644
--- a/src/WidgetNode.c
+++ b/src/WidgetNode.c
@@ -221,7 +221,7 @@ XmuWnFetchResources(XmuWidgetNode *node, Widget toplevel,
/*
- * walk up tree geting resources; since we've instantiated the widget,
+ * walk up tree getting resources; since we've instantiated the widget,
* we know that all of our superclasses have been initialized
*/
for (wn = node; wn && !wn->have_resources; wn = wn->superclass) {
commit fa9b4d7d144c6ddd989b40c826c4bee9808f6cba
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sun Jul 17 15:52:16 2022 -0700
Build xz tarballs instead of bzip2
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/configure.ac b/configure.ac
index c036b42..61bec12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
# Initialize Automake
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-xz])
# Initialize libtool
AC_PROG_LIBTOOL
More information about the xorg-commit
mailing list