summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Griffis <pgriffis@igalia.com>2023-05-02 19:18:46 +0000
committerPatrick Griffis <pgriffis@igalia.com>2023-05-02 19:18:46 +0000
commit8725d6ef4c356abd035472f0adb96cc8b591c8b7 (patch)
tree8788b05c39d3dfeac24c4315e12c52f5bc534bb9
parentcad4f85be904af61da62a45a98f9944f8bd5cfa3 (diff)
parentff315e84075d69810bcd3f845c357fd0954ffca9 (diff)
downloadglib-8725d6ef4c356abd035472f0adb96cc8b591c8b7.tar.gz
Merge branch 'wiki-links' into 'main'
docs: Update various broken/redirected links and fix list formatting See merge request GNOME/glib!3419
-rw-r--r--CONTRIBUTING.md6
-rw-r--r--docs/reference/gio/gdbus-codegen.xml2
-rw-r--r--docs/reference/glib/building.xml2
-rw-r--r--docs/supported-platforms.md16
-rw-r--r--meson.build2
5 files changed, 14 insertions, 14 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/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/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',