diff options
| -rw-r--r-- | CONTRIBUTING.md | 6 | ||||
| -rw-r--r-- | docs/CODEOWNERS | 6 | ||||
| -rw-r--r-- | docs/reference/gio/gdbus-codegen.xml | 2 | ||||
| -rw-r--r-- | docs/reference/glib/building.xml | 2 | ||||
| -rw-r--r-- | docs/supported-platforms.md | 16 | ||||
| -rw-r--r-- | gio/tests/meson.build | 4 | ||||
| -rw-r--r-- | gio/tests/socket-common.c | 2 | ||||
| -rw-r--r-- | gio/tests/socket-testclient.c (renamed from gio/tests/socket-client.c) | 0 | ||||
| -rw-r--r-- | gio/tests/socket-testserver.c (renamed from gio/tests/socket-server.c) | 0 | ||||
| -rw-r--r-- | meson.build | 2 |
10 files changed, 20 insertions, 20 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index efeea85c2..5e28db343 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -114,7 +114,7 @@ development tools appropriate for your operating system, including: - Meson - Ninja - Gettext (19.7 or newer) - - a [C99 compatible compiler](https://wiki.gnome.org/Projects/GLib/CompilerRequirements) + - a [C99 compatible compiler](./docs/toolchain-requirements.md) Up-to-date instructions about developing GNOME applications and libraries can be found on [the GNOME Developer Center](https://developer.gnome.org). @@ -187,7 +187,7 @@ With each code review, we intend to: adequately tested, either through requiring tests to be submitted at the same time, or as a follow-up. 0. Ensure that all new APIs are documented and have [introspection - annotations](https://wiki.gnome.org/Projects/GObjectIntrospection/Annotations). + annotations](https://gi.readthedocs.io/en/latest/annotations/giannotations.html). 0. Check that the contribution is split into logically separate commits, each with a good commit message. 0. Encourage further high quality contributions. @@ -272,4 +272,4 @@ GLib to follow a few rules: If you have been contributing to GLib for a while and you don’t have commit access to the repository, you may ask to obtain it following the [GNOME account -process](https://wiki.gnome.org/AccountsTeam/NewAccounts). +process](https://wiki.gnome.org/Infrastructure/NewAccounts). diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS index 41e657dfb..cd4ef7391 100644 --- a/docs/CODEOWNERS +++ b/docs/CODEOWNERS @@ -38,13 +38,13 @@ subprojects/ @xclaesse @nirbheek @pwithnall *.m @jralls @pwithnall @sdroege # Windows support -*win32* @lrn @creiter @fanc999 @pwithnall @sdroege @nirbheek +*win32* @lrn @creiter @fanc999 @pwithnall @sdroege @nirbheek @lb90 # Windows support (MSVC-specific) -*msvc* @fanc999 @creiter @pwithnall @sdroege @nirbheek +*msvc* @fanc999 @creiter @pwithnall @sdroege @nirbheek @lb90 # Windows support (UWP-specific) -*uwp* @nirbheek +*uwp* @nirbheek @lb90 # Android support *android* @xclaesse @pwithnall @sdroege diff --git a/docs/reference/gio/gdbus-codegen.xml b/docs/reference/gio/gdbus-codegen.xml index 5860fed97..7feed9124 100644 --- a/docs/reference/gio/gdbus-codegen.xml +++ b/docs/reference/gio/gdbus-codegen.xml @@ -1156,7 +1156,7 @@ on_handle_hello_world (MyAppFrobber *interface, <para> The generated C code currently happens to be annotated with <ulink url="http://www.gtk.org/gtk-doc/">gtk-doc</ulink> / <ulink - url="https://wiki.gnome.org/Projects/GObjectIntrospection">GObject + url="https://gi.readthedocs.io/en/latest/">GObject Introspection</ulink> comments / annotations. The layout and contents might change in the future so no guarantees about e.g. <literal>SECTION</literal> usage etc. is given. diff --git a/docs/reference/glib/building.xml b/docs/reference/glib/building.xml index dd1a4495b..e30cd66c4 100644 --- a/docs/reference/glib/building.xml +++ b/docs/reference/glib/building.xml @@ -60,7 +60,7 @@ Before you can compile the GLib library, you need to have various other tools and libraries installed on your system. If you are building from a release archive, you will need - <ulink url="https://wiki.gnome.org/Projects/GLib/CompilerRequirements">a compliant C toolchain</ulink>, + <ulink url="https://gitlab.gnome.org/GNOME/glib/-/blob/main/docs/toolchain-requirements.md">a compliant C toolchain</ulink>, <application>Meson</application>, and <application>pkg-config</application>; the requirements are the same when building from a Git repository clone of GLib. diff --git a/docs/supported-platforms.md b/docs/supported-platforms.md index fbda4266c..43b652d8f 100644 --- a/docs/supported-platforms.md +++ b/docs/supported-platforms.md @@ -32,14 +32,14 @@ GLib is regularly built on at least the following systems: * FreeBSD: https://wiki.gnome.org/Projects/Jhbuild/FreeBSD * openSUSE: https://build.opensuse.org/package/show/GNOME:Factory/glib2 * CI runners, https://gitlab.gnome.org/GNOME/glib/blob/main/.gitlab-ci.yml: - * Fedora (34, https://gitlab.gnome.org/GNOME/glib/-/blob/main/.gitlab-ci/fedora.Dockerfile) - * Debian (Bullseye, https://gitlab.gnome.org/GNOME/glib/-/blob/main/.gitlab-ci/debian-stable.Dockerfile) - * Windows (MinGW64) - * Windows (msys2-mingw32) - * Windows (Visual Studio 2017, and a static linking version) - * Android (NDK r23b, API 31, arm64, https://gitlab.gnome.org/GNOME/glib/-/blob/main/.gitlab-ci/android-ndk.sh) - * FreeBSD (12 and 13) - * macOS + - Fedora (34, https://gitlab.gnome.org/GNOME/glib/-/blob/main/.gitlab-ci/fedora.Dockerfile) + - Debian (Bullseye, https://gitlab.gnome.org/GNOME/glib/-/blob/main/.gitlab-ci/debian-stable.Dockerfile) + - Windows (MinGW64) + - Windows (msys2-mingw32) + - Windows (Visual Studio 2017, and a static linking version) + - Android (NDK r23b, API 31, arm64, https://gitlab.gnome.org/GNOME/glib/-/blob/main/.gitlab-ci/android-ndk.sh) + - FreeBSD (12 and 13) + - macOS If other platforms are to be supported, we need to set up regular CI testing for them. Please contact us if you want to help. diff --git a/gio/tests/meson.build b/gio/tests/meson.build index 8da884001..2ff34a5d0 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build @@ -590,8 +590,8 @@ test_extra_programs += { 'proxy' : {'install' : false}, 'resolver' : {'install' : false}, 'send-data' : {'install' : false}, - 'socket-server' : {'install' : false}, - 'socket-client' : { + 'socket-testserver' : {'install' : false}, + 'socket-testclient' : { 'extra_sources' : ['gtlsconsoleinteraction.c'], 'install' : false, }, diff --git a/gio/tests/socket-common.c b/gio/tests/socket-common.c index 18d083a30..b740f68e7 100644 --- a/gio/tests/socket-common.c +++ b/gio/tests/socket-common.c @@ -1,4 +1,4 @@ -/* #included into both socket-client.c and socket-server.c */ +/* #included into both socket-testclient.c and socket-testserver.c */ #ifdef G_OS_UNIX static const char *unix_socket_address_types[] = { diff --git a/gio/tests/socket-client.c b/gio/tests/socket-testclient.c index 025632767..025632767 100644 --- a/gio/tests/socket-client.c +++ b/gio/tests/socket-testclient.c diff --git a/gio/tests/socket-server.c b/gio/tests/socket-testserver.c index 61715b02d..61715b02d 100644 --- a/gio/tests/socket-server.c +++ b/gio/tests/socket-testserver.c diff --git a/meson.build b/meson.build index 3cb72aae4..f275a3475 100644 --- a/meson.build +++ b/meson.build @@ -509,7 +509,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' # building with -Wbad-function-cast. '-Wno-cast-function-type', # Due to function casts through (void*) we cannot support -Wpedantic: - # https://wiki.gnome.org/Projects/GLib/CompilerRequirements#Function_pointer_conversions. + # ./docs/toolchain-requirements.md#Function_pointer_conversions. '-Wno-pedantic', # A zero-length format string shouldn't be considered an issue. '-Wno-format-zero-length', |