luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-26 12:12:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2348-rename-master' into 'master'

Browse Source 
Rename default development branch to main

Closes #2348

See merge request GNOME/glib!2140
This commit is contained in:
Philip Withnall 2021-06-07 13:22:34 +00:00
commit 6e92c2c233
23 changed files with 48 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -170,7 +170,7 @@ installed-tests:
# FIXME install newer gobject-introspection # FIXME install newer gobject-introspection
# with GMemoryMonitor support, see: # with GMemoryMonitor support, see:
# https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/193 # https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/193
- git clone --branch master --depth 1 --no-tags https://gitlab.gnome.org/GNOME/gobject-introspection.git - git clone --single-branch --depth 1 --no-tags https://gitlab.gnome.org/GNOME/gobject-introspection.git
- cd gobject-introspection - cd gobject-introspection
- /usr/bin/meson _build --prefix=/usr --libdir=/usr/lib64 - /usr/bin/meson _build --prefix=/usr --libdir=/usr/lib64
- ninja -C _build - ninja -C _build
@ -513,7 +513,7 @@ coverity:
pages: pages:
stage: deploy stage: deploy
only: only:
- master - main
needs: ['coverage', 'style-check-diff'] needs: ['coverage', 'style-check-diff']
script: script:
- mv _coverage/ public/ - mv _coverage/ public/

2
.gitlab-ci/meson-junit-report.py
View File

@ -27,7 +27,7 @@ aparser.add_argument(
"--branch", "--branch",
metavar="NAME", metavar="NAME",
help="Branch of the project being tested", help="Branch of the project being tested",
default="master", default="main",
) )
aparser.add_argument( aparser.add_argument(
"--output", "--output",

2
.gitlab-ci/run-style-check-diff.sh
View File

@ -25,7 +25,7 @@ exit_status=$?
# style with the changes they’re making.) # style with the changes they’re making.)
echo "" echo ""
echo "Note that clang-format output is advisory and cannot always match the GLib coding style, documented at" echo "Note that clang-format output is advisory and cannot always match the GLib coding style, documented at"
echo " https://gitlab.gnome.org/GNOME/gtk/blob/master/docs/CODING-STYLE" echo " https://gitlab.gnome.org/GNOME/gtk/blob/HEAD/docs/CODING-STYLE.md"
echo "Warnings from this tool can be ignored in favour of the documented coding style," echo "Warnings from this tool can be ignored in favour of the documented coding style,"
echo "or in favour of matching the style of existing surrounding code." echo "or in favour of matching the style of existing surrounding code."

8
.gitlab-ci/search-common-ancestor.sh
View File

@ -9,7 +9,7 @@ ancestor_horizon=28 # days (4 weeks)
# branches. # branches.
# #
# Limit the fetch to a certain date horizon to limit the amount of data we get. # Limit the fetch to a certain date horizon to limit the amount of data we get.
# If the branch was forked from origin/master before this horizon, it should # If the branch was forked from origin/main before this horizon, it should
# probably be rebased. # probably be rebased.
if ! git ls-remote --exit-code upstream >/dev/null 2>&1 ; then if ! git ls-remote --exit-code upstream >/dev/null 2>&1 ; then
git remote add upstream https://gitlab.gnome.org/GNOME/glib.git git remote add upstream https://gitlab.gnome.org/GNOME/glib.git
@ -18,7 +18,7 @@ git fetch --shallow-since="$(date --date="${ancestor_horizon} days ago" +%Y-%m-%
# Work out the newest common ancestor between the detached HEAD that this CI job # Work out the newest common ancestor between the detached HEAD that this CI job
# has checked out, and the upstream target branch (which will typically be # has checked out, and the upstream target branch (which will typically be
# `upstream/master` or `upstream/glib-2-62`). # `upstream/main` or `upstream/glib-2-62`).
# `${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}` or `${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}` # `${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}` or `${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}`
# are only defined if we’re running in a merge request pipeline, # are only defined if we’re running in a merge request pipeline,
# fall back to `${CI_DEFAULT_BRANCH}` or `${CI_COMMIT_BRANCH}` respectively # fall back to `${CI_DEFAULT_BRANCH}` or `${CI_COMMIT_BRANCH}` respectively
@ -29,8 +29,8 @@ git fetch --shallow-since="$(date --date="${ancestor_horizon} days ago" +%Y-%m-%
newest_common_ancestor_sha=$(diff --old-line-format='' --new-line-format='' <(git rev-list --first-parent "upstream/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_DEFAULT_BRANCH}}") <(git rev-list --first-parent "origin/${source_branch}") | head -1) newest_common_ancestor_sha=$(diff --old-line-format='' --new-line-format='' <(git rev-list --first-parent "upstream/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_DEFAULT_BRANCH}}") <(git rev-list --first-parent "origin/${source_branch}") | head -1)
if [ -z "${newest_common_ancestor_sha}" ]; then if [ -z "${newest_common_ancestor_sha}" ]; then
echo "Couldn’t find common ancestor with upstream master. This typically" echo "Couldn’t find common ancestor with upstream main branch. This typically"
echo "happens if you branched from master a long time ago. Please update" echo "happens if you branched from main a long time ago. Please update"
echo "your clone, rebase, and re-push your branch." echo "your clone, rebase, and re-push your branch."
exit 1 exit 1
fi fi

2
CONTRIBUTING.md
View File

@ -256,7 +256,7 @@ to avoid unnecessary breakage, and to take advantage of the knowledge about GLib
that has been built up over the years, we’d like to ask people contributing to that has been built up over the years, we’d like to ask people contributing to
GLib to follow a few rules: GLib to follow a few rules:
0. Never push to the `master` branch, or any stable branches, directly; you 0. Never push to the `main` branch, or any stable branches, directly; you
should always go through a merge request, to ensure that the code is should always go through a merge request, to ensure that the code is
tested on the CI infrastructure at the very least. A merge request is tested on the CI infrastructure at the very least. A merge request is
also the proper place to get a comprehensive code review from the core also the proper place to get a comprehensive code review from the core

13
README.md
View File

@ -47,3 +47,16 @@ Closes: #123
Otherwise, create a new merge request that introduces the change, filing a Otherwise, create a new merge request that introduces the change, filing a
separate issue is not required. separate issue is not required.
## Default branch renamed to `main`
The default development branch of GLib has been renamed to `main`. To update
your local checkout, use:
```sh
git checkout master
git branch -m master main
git fetch
git branch --unset-upstream
git branch -u origin/main
git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main
```

4
SECURITY.md
View File

@ -63,5 +63,5 @@ additionally be made via
## Acknowledgements ## Acknowledgements
This text was partially based on the This text was partially based on the
[github.com/containers security policy](https://github.com/containers/common/blob/master/SECURITY.md), [github.com/containers security policy](https://github.com/containers/common/blob/HEAD/SECURITY.md),
and partially based on the [flatpak security policy](https://github.com/flatpak/flatpak/blob/master/SECURITY.md). and partially based on the [flatpak security policy](https://github.com/flatpak/flatpak/blob/HEAD/SECURITY.md).

2
fuzzing/README.md
View File

@ -40,7 +40,7 @@ $ DIR/fuzzing/fuzz_target_name FILE
Correct MSAN instrumentation is [difficult to achieve](https://clang.llvm.org/docs/MemorySanitizer.html#handling-external-code) locally, so false positives are very likely to mask the actual bug. Correct MSAN instrumentation is [difficult to achieve](https://clang.llvm.org/docs/MemorySanitizer.html#handling-external-code) locally, so false positives are very likely to mask the actual bug.
If need be, [you can still reproduce](https://github.com/google/oss-fuzz/blob/master/docs/reproducing.md#building-using-docker) those bugs with the oss-fuzz provided docker images. If need be, [you can still reproduce](https://google.github.io/oss-fuzz/advanced-topics/reproducing/#building-using-docker) those bugs with the oss-fuzz provided docker images.
###### There are no file/function names in the stack trace. ###### There are no file/function names in the stack trace.

2
fuzzing/meson.build
View File

@ -24,7 +24,7 @@ extra_sources = []
extra_c_args = cc.get_supported_arguments('-Werror=unused-function') extra_c_args = cc.get_supported_arguments('-Werror=unused-function')
# Links in a static library provided by oss-fuzz, else a standalone driver. # Links in a static library provided by oss-fuzz, else a standalone driver.
# https://github.com/google/oss-fuzz/blob/master/docs/new_project_guide.md#buildsh-script-environment # https://google.github.io/oss-fuzz/getting-started/new-project-guide/#buildsh-script-environment
fuzzing_engine = cxx.find_library('FuzzingEngine', required : get_option('oss_fuzz')) fuzzing_engine = cxx.find_library('FuzzingEngine', required : get_option('oss_fuzz'))
if fuzzing_engine.found() if fuzzing_engine.found()
deps += fuzzing_engine deps += fuzzing_engine

8
gio/gapplication.c
View File

@ -155,13 +155,13 @@
* respectively. * respectively.
* *
* For an example of opening files with a GApplication, see * For an example of opening files with a GApplication, see
* [gapplication-example-open.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gapplication-example-open.c). * [gapplication-example-open.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gapplication-example-open.c).
* *
* For an example of using actions with GApplication, see * For an example of using actions with GApplication, see
* [gapplication-example-actions.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gapplication-example-actions.c). * [gapplication-example-actions.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gapplication-example-actions.c).
* *
* For an example of using extra D-Bus hooks with GApplication, see * For an example of using extra D-Bus hooks with GApplication, see
* [gapplication-example-dbushooks.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gapplication-example-dbushooks.c). * [gapplication-example-dbushooks.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gapplication-example-dbushooks.c).
*/ */
/** /**
@ -2399,7 +2399,7 @@ g_application_open (GApplication *application,
* and override local_command_line(). In this case, you most likely want * and override local_command_line(). In this case, you most likely want
* to return %TRUE from your local_command_line() implementation to * to return %TRUE from your local_command_line() implementation to
* suppress the default handling. See * suppress the default handling. See
* [gapplication-example-cmdline2.c][https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gapplication-example-cmdline2.c] * [gapplication-example-cmdline2.c][https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gapplication-example-cmdline2.c]
* for an example. * for an example.
* *
* If, after the above is done, the use count of the application is zero * If, after the above is done, the use count of the application is zero

6
gio/gapplicationcommandline.c
View File

@ -104,7 +104,7 @@
* } * }
* ]| * ]|
* The complete example can be found here: * The complete example can be found here:
* [gapplication-example-cmdline.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gapplication-example-cmdline.c) * [gapplication-example-cmdline.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gapplication-example-cmdline.c)
* *
* In more complicated cases, the handling of the comandline can be * In more complicated cases, the handling of the comandline can be
* split between the launcher and the primary instance. * split between the launcher and the primary instance.
@ -155,7 +155,7 @@
* instance. * instance.
* *
* The complete example can be found here: * The complete example can be found here:
* [gapplication-example-cmdline2.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gapplication-example-cmdline2.c) * [gapplication-example-cmdline2.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gapplication-example-cmdline2.c)
* *
* If handling the commandline requires a lot of work, it may * If handling the commandline requires a lot of work, it may
* be better to defer it. * be better to defer it.
@ -197,7 +197,7 @@
* hold the application until you are done with the commandline. * hold the application until you are done with the commandline.
* *
* The complete example can be found here: * The complete example can be found here:
* [gapplication-example-cmdline3.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gapplication-example-cmdline3.c) * [gapplication-example-cmdline3.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gapplication-example-cmdline3.c)
*/ */
/** /**

8
gio/gdbusconnection.c
View File

@ -166,22 +166,22 @@
* ## An example D-Bus server # {#gdbus-server} * ## An example D-Bus server # {#gdbus-server}
* *
* Here is an example for a D-Bus server: * Here is an example for a D-Bus server:
* [gdbus-example-server.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gdbus-example-server.c) * [gdbus-example-server.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gdbus-example-server.c)
* *
* ## An example for exporting a subtree # {#gdbus-subtree-server} * ## An example for exporting a subtree # {#gdbus-subtree-server}
* *
* Here is an example for exporting a subtree: * Here is an example for exporting a subtree:
* [gdbus-example-subtree.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gdbus-example-subtree.c) * [gdbus-example-subtree.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gdbus-example-subtree.c)
* *
* ## An example for file descriptor passing # {#gdbus-unix-fd-client} * ## An example for file descriptor passing # {#gdbus-unix-fd-client}
* *
* Here is an example for passing UNIX file descriptors: * Here is an example for passing UNIX file descriptors:
* [gdbus-unix-fd-client.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gdbus-example-unix-fd-client.c) * [gdbus-unix-fd-client.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gdbus-example-unix-fd-client.c)
* *
* ## An example for exporting a GObject # {#gdbus-export} * ## An example for exporting a GObject # {#gdbus-export}
* *
* Here is an example for exporting a #GObject: * Here is an example for exporting a #GObject:
* [gdbus-example-export.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gdbus-example-export.c) * [gdbus-example-export.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gdbus-example-export.c)
*/ */
/* ---------------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------------- */

2
gio/gdbusnameowning.c
View File

@ -39,7 +39,7 @@
* Convenience API for owning bus names. * Convenience API for owning bus names.
* *
* A simple example for owning a name can be found in * A simple example for owning a name can be found in
* [gdbus-example-own-name.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gdbus-example-own-name.c) * [gdbus-example-own-name.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gdbus-example-own-name.c)
*/ */
G_LOCK_DEFINE_STATIC (lock); G_LOCK_DEFINE_STATIC (lock);

2
gio/gdbusnamewatching.c
View File

@ -40,7 +40,7 @@
* Convenience API for watching bus names. * Convenience API for watching bus names.
* *
* A simple example for watching a name can be found in * A simple example for watching a name can be found in
* [gdbus-example-watch-name.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gdbus-example-watch-name.c) * [gdbus-example-watch-name.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gdbus-example-watch-name.c)
*/ */
G_LOCK_DEFINE_STATIC (lock); G_LOCK_DEFINE_STATIC (lock);

2
gio/gdbusproxy.c
View File

@ -92,7 +92,7 @@
* of the thread where the instance was constructed. * of the thread where the instance was constructed.
* *
* An example using a proxy for a well-known name can be found in * An example using a proxy for a well-known name can be found in
* [gdbus-example-watch-proxy.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gdbus-example-watch-proxy.c) * [gdbus-example-watch-proxy.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gdbus-example-watch-proxy.c)
*/ */
/* lock protecting the mutable properties: name_owner, timeout_msec, /* lock protecting the mutable properties: name_owner, timeout_msec,

2
gio/gdbusserver.c
View File

@ -77,7 +77,7 @@
* session or system bus, you should instead use g_bus_own_name(). * session or system bus, you should instead use g_bus_own_name().
* *
* An example of peer-to-peer communication with GDBus can be found * An example of peer-to-peer communication with GDBus can be found
* in [gdbus-example-peer.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gdbus-example-peer.c). * in [gdbus-example-peer.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gdbus-example-peer.c).
* *
* Note that a minimal #GDBusServer will accept connections from any * Note that a minimal #GDBusServer will accept connections from any
* peer. In many use-cases it will be necessary to add a #GDBusAuthObserver * peer. In many use-cases it will be necessary to add a #GDBusAuthObserver

2
gio/gsettings.c
View File

@ -121,7 +121,7 @@
* utility. The input is a schema description in an XML format. * utility. The input is a schema description in an XML format.
* *
* A DTD for the gschema XML format can be found here: * A DTD for the gschema XML format can be found here:
* [gschema.dtd](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/gschema.dtd) * [gschema.dtd](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/gschema.dtd)
* *
* The [glib-compile-schemas][glib-compile-schemas] tool expects schema * The [glib-compile-schemas][glib-compile-schemas] tool expects schema
* files to have the extension `.gschema.xml`. * files to have the extension `.gschema.xml`.

2
gio/gtestdbus.c
View File

@ -380,7 +380,7 @@ _g_test_watcher_remove_pid (GPid pid)
* *
* An example of a test fixture for D-Bus services can be found * An example of a test fixture for D-Bus services can be found
* here: * here:
* [gdbus-test-fixture.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gdbus-test-fixture.c) * [gdbus-test-fixture.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gdbus-test-fixture.c)
* *
* Note that these examples only deal with isolating the D-Bus aspect of your * Note that these examples only deal with isolating the D-Bus aspect of your
* service. To successfully run isolated unit tests on your service you may need * service. To successfully run isolated unit tests on your service you may need

2
glib.doap
View File

@ -56,7 +56,7 @@
<repository> <repository>
<GitRepository> <GitRepository>
<browse rdf:resource="https://gitlab.gnome.org/GNOME/glib/tree/master"/> <browse rdf:resource="https://gitlab.gnome.org/GNOME/glib/"/>
<location rdf:resource="https://gitlab.gnome.org/GNOME/glib.git"/> <location rdf:resource="https://gitlab.gnome.org/GNOME/glib.git"/>
</GitRepository> </GitRepository>
</repository> </repository>

2
glib.supp
View File

@ -700,7 +700,7 @@
fun:g_inet_address_get_type fun:g_inet_address_get_type
} }
# From: https://github.com/fredericgermain/valgrind/blob/master/glibc-2.X-drd.supp # From: https://github.com/fredericgermain/valgrind/blob/HEAD/glibc-2.X-drd.supp
{ {
drd-libc-stdio drd-libc-stdio
drd:ConflictingAccess drd:ConflictingAccess

2
glib/gbookmarkfile.c
View File

@ -80,7 +80,7 @@
* displaying the bookmark inside a GUI. * displaying the bookmark inside a GUI.
* *
* Here is an example of a bookmark file: * Here is an example of a bookmark file:
* [bookmarks.xbel](https://gitlab.gnome.org/GNOME/glib/-/blob/master/glib/tests/bookmarks.xbel) * [bookmarks.xbel](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/glib/tests/bookmarks.xbel)
* *
* A bookmark file might contain more than one bookmark; each bookmark * A bookmark file might contain more than one bookmark; each bookmark
* is accessed through its URI. * is accessed through its URI.

2
gmodule/gmodule-dl.c
View File

@ -81,7 +81,7 @@
* *
* However, some libc implementations, such as glibc, implement dlerror() using * However, some libc implementations, such as glibc, implement dlerror() using
* thread-local storage, so are thread-safe. As of early 2021: * thread-local storage, so are thread-safe. As of early 2021:
* - glibc is thread-safe: https://github.com/bminor/glibc/blob/master/dlfcn/libc_dlerror_result.c * - glibc is thread-safe: https://github.com/bminor/glibc/blob/HEAD/dlfcn/libc_dlerror_result.c
* - uclibc-ng is not thread-safe: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/ldso/libdl/libdl.c?id=132decd2a043d0ccf799f42bf89f3ae0c11e95d5#n1075 * - uclibc-ng is not thread-safe: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/ldso/libdl/libdl.c?id=132decd2a043d0ccf799f42bf89f3ae0c11e95d5#n1075
* - Other libc implementations have not been checked, and no problems have * - Other libc implementations have not been checked, and no problems have
* been reported with them in 10 years, so default to assuming that they * been reported with them in 10 years, so default to assuming that they

2
subprojects/gtk-doc.wrap
View File

@ -1,5 +1,5 @@
[wrap-git] [wrap-git]
directory=gtk-doc directory=gtk-doc
url=https://gitlab.gnome.org/GNOME/gtk-doc.git url=https://gitlab.gnome.org/GNOME/gtk-doc.git
revision=master revision=1.33.2
depth=1 depth=1