Merge branch 'dont-hardcode-shared-library-3.24' into 'gtk-3-24'

Dont hardcode shared library (gtk3)

See merge request GNOME/gtk!1196

.gitlab-ci.yml

@@ -20,7 +20,7 @@ fedora-distcheck:
   script:
    - bash -x ./.gitlab-ci/test-docker-autotools.sh
 
-fedora-meson:
+fedora-meson: &fedora-meson-defaults
   stage: build
   script:
    - bash -x ./.gitlab-ci/test-docker-meson.sh
@@ -31,6 +31,11 @@ fedora-meson:
       - "_build/meson-logs"
       - "_build/testsuite/reftests/output"
 
+fedora-meson-staticlibs:
+  variables:
+    EXTRA_MESON_FLAGS: "-Ddefault_library=both"
+  <<: *fedora-meson-defaults
+
 msys2-mingw32-meson:
   variables:
     MSYSTEM: "MINGW32"

.gitlab-ci/test-docker-meson.sh

@@ -16,6 +16,7 @@ meson \
     -Dbroadway_backend=true \
     -Dxinerama=yes \
     -Dprint_backends="file,lpr,test,cloudprint,cups" \
+    ${EXTRA_MESON_FLAGS:-} \
     _build
 
 cd _build

gdk/meson.build

@@ -286,7 +286,7 @@ if cc.get_id() == 'msvc'
   gdk_link_args += [ '-export:gdk_win32_display_manager_get_type' ]
 endif
 
-libgdk = shared_library('gdk-3',
+libgdk = library('gdk-3',
                  soversion: gtk_soversion,
                  version: gtk_library_version,
                  sources: [gdk_sources, gdk_backends_gen_headers, gdkconfig],

gtk/meson.build

@@ -964,7 +964,7 @@ foreach l: immodules
 endforeach
 
 # Library
-libgtk = shared_library('gtk-3',
+libgtk = library('gtk-3',
                  soversion: gtk_soversion,
                  version: gtk_library_version,
                  sources: [typefuncs, gtk_sources, gtkmarshal_h, gtkprivatetypebuiltins_h],

libgail-util/meson.build

@@ -17,7 +17,7 @@ if cc.get_id() == 'msvc'
   gailutil_link_args += '-def:@0@/gailutil.def'.format(meson.current_source_dir())
 endif
 
-libgailutil = shared_library('gailutil-3',
+libgailutil = library('gailutil-3',
                       soversion: gtk_soversion,
                       version: gail_library_version,
                       darwin_versions: ['1', '1.0'],

testsuite/reftests/meson.build

@@ -1,6 +1,6 @@
 testexecdir = join_paths(installed_test_bindir, 'reftests')
 
-libgtkreftestprivate = shared_library('gtkreftestprivate', [
+libgtkreftestprivate = library('gtkreftestprivate', [
   'reftest-compare.c',
   'reftest-module.c',
   'reftest-snapshot.c'],