wip: pathbuilder: Hide artificial joins

When splitting quads or cubics at cusps, add
a single-point quad to indicate that we want
a round join here.

.clang-format

@@ -1,4 +1,4 @@
-# See https://www.apertis.org/policies/coding_conventions/#code-formatting
+# See https://wiki.apertis.org/Guidelines/Coding_conventions#Code_formatting
 BasedOnStyle: GNU
 AlwaysBreakAfterDefinitionReturnType: All
 BreakBeforeBinaryOperators: None

.gitlab-ci.yml

@@ -26,7 +26,7 @@ variables:
   BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
   FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Dbuild-testsuite=true -Dintrospection=enabled"
   MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v49"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v48"
 
 workflow:
   rules:
@@ -66,8 +66,7 @@ style-check-diff:
       junit:
         - "${CI_PROJECT_DIR}/_build/report-x11.xml"
         - "${CI_PROJECT_DIR}/_build/report-wayland.xml"
-        - "${CI_PROJECT_DIR}/_build/report-wayland_gl.xml"
-        - "${CI_PROJECT_DIR}/_build/report-wayland_gles2.xml"
+        - "${CI_PROJECT_DIR}/_build/report-wayland_gles.xml"
         - "${CI_PROJECT_DIR}/_build/report-broadway.xml"
     name: "gtk-${CI_COMMIT_REF_NAME}"
     paths:
@@ -78,7 +77,6 @@ style-check-diff:
       - "${CI_PROJECT_DIR}/_build/testsuite/reftests/output/*/*.node"
       - "${CI_PROJECT_DIR}/_build/testsuite/tools/output/*/*"
       - "${CI_PROJECT_DIR}/_build/testsuite/gsk/compare/*/*/*.png"
-      - "${CI_PROJECT_DIR}/_build/testsuite/gsk/compare/*/*/*.node"
       - "${CI_PROJECT_DIR}/_build/testsuite/css/output/*/*.syscap"
       - "${CI_PROJECT_DIR}/_build/testsuite/headless/*/*.log"
       - "${CI_PROJECT_DIR}/_build_hello/meson-logs"
@@ -105,9 +103,8 @@ fedora-x86_64:
             ${FEATURE_FLAGS}
             _build
     - meson compile -C _build
-    - .gitlab-ci/run-tests.sh _build x11 gtk
-    # only repeat test runs that are likely affected by test setups
-    - .gitlab-ci/run-tests.sh _build wayland_gl gtk:gdk,gtk:gsk-gl
+    - .gitlab-ci/run-tests.sh _build wayland
+    - .gitlab-ci/run-tests.sh _build wayland_gles
 
 release-build:
   extends: .build-fedora-default
@@ -132,9 +129,7 @@ release-build:
     - meson install -C _build
     - PKG_CONFIG_PATH=${CI_PROJECT_DIR}/_install/lib64/pkgconfig:${CI_PROJECT_DIR}/_install/share/pkgconfig meson setup _build_hello examples/hello
     - LD_LIBRARY_PATH=${CI_PROJECT_DIR}/_install/lib64 meson compile -C _build_hello
-    - .gitlab-ci/run-tests.sh _build wayland gtk
-    # only repeat test runs that are likely affected by test setups
-    - .gitlab-ci/run-tests.sh _build wayland_gles2 gtk:gdk,gtk:gsk-gl
+    - .gitlab-ci/run-tests.sh _build x11
 
 fedora-clang:
   extends: .build-fedora-default
@@ -210,54 +205,44 @@ msys2-mingw64:
     paths:
       - "${CI_PROJECT_DIR}/_build/gtkdll.tar.gz"
 
-macos:
+macos-x86_64:
   rules:
     # Do not run in forks as the runner is not available there.
-    # (except for dehesselle who maintains the runner)
-    - if: $CI_PROJECT_NAMESPACE != "GNOME" && $CI_PROJECT_NAMESPACE != "dehesselle"
-      when: never
-    - if: $RUNNER == "macosintel"
-      variables:
-        SDKROOT: /opt/sdks/MacOSX10.13.4.sdk
-        NINJA_PKG: $CI_API_V4_URL/projects/30745/packages/generic/ninja_macos/v1.11.1.1+9/ninja-1.11.1.1-cp38-cp38-macosx_11_0_x86_64.whl
-      when: manual
-      allow_failure: true
-    - if: $RUNNER == "macosarm"
-      variables:
-        SDKROOT: /opt/sdks/MacOSX11.3.sdk
-        NINJA_PKG: ninja==1.11.1.1
+    - if: $CI_PROJECT_NAMESPACE == "GNOME"
   stage: build
-  parallel:
-    matrix:
-      - RUNNER: [ "macosintel", "macosarm" ]
   tags:
-    - ${RUNNER}
+    - macosintel
   needs: []
   variables:
-    EXTRA_MESON_FLAGS: ""
-    BACKEND_FLAGS: "-Dx11-backend=false -Dbroadway-backend=true"
-    FEATURE_FLAGS: "-Dmedia-gstreamer=disabled -Dintrospection=enabled -Dgobject-introspection:werror=false"
+    MESON_FORCE_BACKTRACKE: 1
     TMPDIR: /Users/Shared/work/tmp
+    SDKROOT: /opt/sdks/MacOSX10.13.4.sdk
+    CCACHE_DIR: /Users/Shared/work/ccache
     PIP_CACHE_DIR: /Users/Shared/build/cache
     PIPENV_CACHE_DIR: $PIP_CACHE_DIR
     PYTHONPYCACHEPREFIX: $PIP_CACHE_DIR
   before_script:
-    - .gitlab-ci/show-info-macos.sh
+    - bash .gitlab-ci/show-info-osx.sh
     - python3 -m venv .venv
-    # Building the introspection feature requires pkg-config and bison.
-    - curl -L $CI_API_V4_URL/projects/30437/packages/generic/pkgconfig/v0.29.2+10/pkg-config-0.29.2+10_$(uname -m).tar.xz | tar -C .venv -xJ
-    - curl -L $CI_API_V4_URL/projects/30438/packages/generic/bison/v3.8.2+3/bison-3.8.2+3_$(uname -m).tar.xz | tar -C .venv -xJ
+    - ln -s /opt/cmake/CMake.app/Contents/bin/cmake .venv/bin
+    - ln -s /opt/ccache/ccache .venv/bin
     - source .venv/bin/activate
-    - pip3 install meson==1.3.2 $NINJA_PKG
-    # We're not setting up ccache here on purpose as it accelerates the build
-    # so much that it triggers race conditions in the gobject-introspection
-    # subproject.
+    - pip3 install meson==1.2.0
+    - pip3 install ninja==1.11.1
   script:
-    - meson setup
-            ${COMMON_MESON_FLAGS}
-            ${EXTRA_MESON_FLAGS}
-            ${BACKEND_FLAGS}
-            ${FEATURE_FLAGS}
+    - meson setup ${COMMON_MESON_FLAGS}
+            -Dx11-backend=false
+            -Dbroadway-backend=true
+            -Dmacos-backend=true
+            -Dmedia-gstreamer=disabled
+            -Dintrospection=disabled
+            -Dcpp_std=c++11
+            -Dpixman:tests=disabled
+            -Dlibjpeg-turbo:simd=disabled
+            -Dbuild-demos=false
+            -Dbuild-tests=false
+            -Dbuild-examples=false
+            -Dbuild-testsuite=false
             _build
     - meson compile -C _build
   artifacts:
@@ -431,7 +416,13 @@ asan-build:
             -Df16c=disabled
             _build
     - ninja -C _build
-    - .gitlab-ci/run-tests.sh _build wayland gtk
+    - .gitlab-ci/run-tests.sh _build wayland
+    - .gitlab-ci/run-tests.sh _build wayland_gles
+    - .gitlab-ci/run-tests.sh _build x11
+  artifacts:
+    when: always
+    paths:
+      - "${CI_PROJECT_DIR}/_build/meson-logs"
 
 reference:
   image: $FEDORA_IMAGE
@@ -445,8 +436,9 @@ reference:
             --force-fallback-for=gdk-pixbuf,pango
             -Dintrospection=enabled
             -Ddocumentation=true
+            -Dgtk_doc=true
             -Dgdk-pixbuf:gtk_doc=true
-            -Dpango:documentation=true
+            -Dpango:gtk_doc=true
             -Dbuild-demos=false
             -Dbuild-examples=false
             -Dbuild-tests=false
@@ -480,4 +472,3 @@ publish-docs:
     - "curl -X POST -F token=${PAGES_TRIGGER_TOKEN} -F ref=docs-gtk-org https://gitlab.gnome.org/api/v4/projects/665/trigger/pipeline"
   rules:
     - if: $CI_COMMIT_REF_NAME == "main"
-

.gitlab-ci/fedora.Dockerfile

@@ -1,7 +1,9 @@
-FROM fedora:39
+FROM fedora:38
 
 RUN dnf -y install \
     adwaita-icon-theme \
+    atk-devel \
+    at-spi2-atk-devel \
     avahi-gobject-devel \
     cairo-devel \
     cairo-gobject-devel \
@@ -16,6 +18,7 @@ RUN dnf -y install \
     dejavu-sans-mono-fonts \
     desktop-file-utils \
     diffutils \
+    docbook-style-xsl \
     elfutils-libelf-devel \
     expat-devel \
     fribidi-devel \

.gitlab-ci/flatpak-build.sh

@@ -24,10 +24,10 @@ flatpak build ${builddir} meson \
                 -Dbuild-examples=false \
                 -Dintrospection=disabled \
                 -Dbuild-demos=true \
-                -Dprofile=devel \
+                -Ddemo-profile=devel \
                 _flatpak_build
 
-flatpak build --env=CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA ${builddir} ninja -C _flatpak_build install
+flatpak build ${builddir} ninja -C _flatpak_build install
 
 flatpak-builder \
         --user --disable-rofiles-fuse \

.gitlab-ci/meson-html-report.py

@@ -324,7 +324,7 @@ for line in args.infile:
     units.append(unit)
 
 report = {}
-report['date'] = datetime.datetime.now(datetime.UTC)
+report['date'] = datetime.datetime.utcnow()
 report['locale_date'] = report['date'].strftime("%c")
 report['project_name'] = args.project_name
 report['backend'] = args.backend

.gitlab-ci/meson-junit-report.py

@@ -44,7 +44,7 @@ outfile = args.output
 testsuites = ET.Element('testsuites')
 testsuites.set('id', '{}/{}'.format(args.job_id, args.branch))
 testsuites.set('package', args.project_name)
-testsuites.set('timestamp', datetime.datetime.now(datetime.UTC).isoformat(timespec='minutes'))
+testsuites.set('timestamp', datetime.datetime.utcnow().isoformat(timespec='minutes'))
 
 suites = {}
 for line in args.infile:

.gitlab-ci/run-tests.sh

@@ -1,31 +1,28 @@
 #!/bin/bash
 
-set -x
+set +x
 set +e
 
 srcdir=$( pwd )
 builddir=$1
-setup=$2
-suite=$3
+backend=$2
 multiplier=${MESON_TEST_TIMEOUT_MULTIPLIER:-1}
 
 # Ignore memory leaks lower in dependencies
 export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0:detect_leaks=0:allocator_may_return_null=1
 export G_SLICE=always-malloc
 
-case "${setup}" in
-  x11*)
+case "${backend}" in
+  x11)
     xvfb-run -a -s "-screen 0 1024x768x24 -noreset" \
           meson test -C ${builddir} \
                 --quiet \
                 --timeout-multiplier "${multiplier}" \
                 --print-errorlogs \
-                --setup=${setup} \
-                --suite=${suite//,/ --suite=} \
+                --setup=${backend} \
+                --suite=gtk \
                 --no-suite=failing \
-                --no-suite=${setup}_failing \
                 --no-suite=flaky \
-                --no-suite=headless \
                 --no-suite=gsk-compare-broadway
 
     # Store the exit code for the CI run, but always
@@ -44,19 +41,18 @@ case "${setup}" in
                 --quiet \
                 --timeout-multiplier "${multiplier}" \
                 --print-errorlogs \
-                --setup=${setup} \
-                --suite=${suite//,/ --suite=} \
+                --setup=${backend} \
+                --suite=gtk \
                 --no-suite=failing \
-                --no-suite=${setup}_failing \
                 --no-suite=flaky \
-                --no-suite=headless \
+                --no-suite=${backend}_failing \
                 --no-suite=gsk-compare-broadway
     exit_code=$?
 
     kill ${compositor}
     ;;
 
-  broadway*)
+  broadway)
     export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
 
     ${builddir}/gdk/broadway/gtk4-broadwayd :5 &
@@ -67,19 +63,17 @@ case "${setup}" in
                 --quiet \
                 --timeout-multiplier "${multiplier}" \
                 --print-errorlogs \
-                --setup=${setup} \
-                --suite=${suite//,/ --suite=} \
+                --setup=${backend} \
+                --suite=gtk \
                 --no-suite=failing \
-                --no-suite=${setup}_failing \
                 --no-suite=flaky \
-                --no-suite=headless \
                 --no-suite=gsk-compare-opengl
 
     kill ${server}
     ;;
 
   *)
-    echo "Failed to add ${setup} to .gitlab-ci/run-tests.sh"
+    echo "Failed to add ${backend} to .gitlab-ci/run-tests.sh"
     exit 1
     ;;
 
@@ -89,17 +83,17 @@ cd ${builddir}
 
 $srcdir/.gitlab-ci/meson-junit-report.py \
             --project-name=gtk \
-            --backend="${setup}" \
+            --backend="${backend}" \
             --job-id="${CI_JOB_NAME}" \
-            --output="report-${setup}.xml" \
-            "meson-logs/testlog-${setup}.json"
+            --output="report-${backend}.xml" \
+            "meson-logs/testlog-${backend}.json"
 
 $srcdir/.gitlab-ci/meson-html-report.py \
             --project-name=gtk \
-            --backend="${setup}" \
+            --backend="${backend}" \
             --job-id="${CI_JOB_NAME}" \
-            --reftest-output-dir="testsuite/reftests/output/${setup}" \
-            --output="report-${setup}.html" \
-            "meson-logs/testlog-${setup}.json"
+            --reftest-output-dir="testsuite/reftests/output/${backend}" \
+            --output="report-${backend}.html" \
+            "meson-logs/testlog-${backend}.json"
 
 exit $exit_code

.gitlab-ci/show-info-osx.sh

@@ -3,11 +3,6 @@
 set -eux -o pipefail
 
 xcodebuild -version || :
-
-if [ -z "$SDKROOT" ]; then
-  xcodebuild -showsdks || :
-else
-  echo "SDKROOT = $SDKROOT"
-fi
+xcodebuild -showsdks || :
 
 system_profiler SPSoftwareDataType || :

.gitlab-ci/test-msvc.bat

@@ -6,7 +6,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliar
 
 :: FIXME: make warnings fatal
 pip3 install --upgrade --user meson~=0.64 || goto :error
-meson setup -Dbackend_max_links=1 -Ddebug=false -Dmedia-gstreamer=disabled -Dvulkan=disabled _build || goto :error
+meson setup -Dbackend_max_links=1 -Ddebug=false -Dmedia-gstreamer=disabled _build || goto :error
 ninja -C _build || goto :error
 
 goto :EOF

.gitlab-ci/test-msys2.sh

@@ -33,9 +33,7 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-gst-plugins-bad-libs \
     mingw-w64-$MSYS2_ARCH-shared-mime-info \
     mingw-w64-$MSYS2_ARCH-python-gobject \
-    mingw-w64-$MSYS2_ARCH-shaderc \
-    mingw-w64-$MSYS2_ARCH-vulkan \
-    mingw-w64-$MSYS2_ARCH-vulkan-headers
+    mingw-w64-$MSYS2_ARCH-shaderc
 
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
@@ -45,10 +43,11 @@ export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
 ccache --zero-stats
 ccache --show-stats
 export CCACHE_DISABLE=true
-meson setup \
+meson \
     -Dx11-backend=false \
     -Dwayland-backend=false \
     -Dwin32-backend=true \
+    -Dvulkan=disabled \
     -Dintrospection=enabled \
     -Dgtk:werror=true \
     _build

CONTRIBUTING.md

@@ -35,7 +35,7 @@ The issue tracker is meant to be used for actionable issues only.
 
 You should not open a new issue for security related questions.
 
-When in doubt, follow the process for [GNOME security issues](https://security.gnome.org/).
+When in doubt, follow [security](https://security.gnome.org/).
 
 ### Bug reports
 
@@ -144,28 +144,33 @@ $ git clone https://gitlab.gnome.org/yourusername/gtk.git
 $ cd gtk
 ```
 
+**Note**: if you plan to push changes to back to the main repository and
+have a GNOME account, you can skip the fork, and use the following instead:
+
+```sh
+$ git clone git@gitlab.gnome.org:GNOME/gtk.git
+$ cd gtk
+```
+
 To compile the Git version of GTK on your system, you will need to
 configure your build using Meson:
 
 ```sh
-$ meson setup _builddir .
-$ meson compile -C _builddir
+$ meson _builddir .
+$ cd _builddir
+$ ninja
 ```
 
 Typically, you should work on your own branch:
 
 ```sh
-$ git switch -C your-branch
+$ git checkout -b your-branch
 ```
 
 Once you've finished working on the bug fix or feature, push the branch
 to the Git repository and open a new merge request, to let the GTK
 maintainers review your contribution.
 
-**Important**: Do **not** attach a diff or a patch file to a GitLab issue.
-Patches cannot be reviewed, and do not not go through the CI pipeline. If
-you wish to submit your changes to GTK, always use a merge request.
-
 ### Code reviews
 
 Each contribution is reviewed by the core developers of the GTK project.
@@ -208,7 +213,7 @@ Closes #1234
  `git commit -a --author "Joe Coder <joe@coder.org>"` and `--signoff`.
 
  - If your commit is addressing an issue, use the
- [GitLab syntax](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
+ [GitLab syntax](https://docs.gitlab.com/ce/user/project/issues/automatic_issue_closing.html)
  to automatically close the issue when merging the commit with the upstream
  repository:
 
@@ -257,4 +262,4 @@ people committing to GTK to follow a few rules:
 
 If you have been contributing to GTK 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://handbook.gnome.org/infrastructure/developer-access.html).
+process](https://wiki.gnome.org/AccountsTeam/NewAccounts).

NEWS

@@ -1,653 +1,4 @@
-Overview of Changes in 4.15.1, xx-xx-xxxx
-=========================================
-
-Overview of Changes in 4.15.0, 21-04-2024
-=========================================
-
-This release changes the default GSK renderer to be Vulkan, on
-Wayland. Other platforms still use ngl.
-
-The intent of this change is to get wider testing and verify that
-Vulkan drivers are good enough for us to rely on. If significant
-problems show up, we will revert this change for 4.16.
-
-You can still override the renderer choice using the GSK_RENDERER
-environment variable.
-
----
-
-This release also changes font rendering settings by introducing
-a new high-level gtk-font-rendering settings which gives GTK more
-freedom to decide on font rendering.
-
-You can still use the low-level font-related settings by changing
-the new property to 'manual'.
-
----
-
-* GtkColumnView:
- - Fix infinite loops in dispose
- - Fix problems with weak ref cycles in GtkExpression
-
-* GtkListView:
-* GtkShortcutManager:
- - Track the propagation phase of added controllers
-
-* GtkGLArea:
- - Produce dmabuf textures, so graphics offload is possible
-
-* GtkTextView:
- - Support text shadows
-
-* GtkGraphicsOffload:
- - Add a black-background property
-
-* Settings:
- - Add a new gtk-font-rendering setting
-
-* Accessibility:
- - Add support for GetRangeExtents to GtkAccessibleText
- - Add support for GetOffsetAtPoint to GtkAccessibleText
- - Implement GtkAccessibleRange for scrollbars
-
-* GDK:
- - Add a callback-based cursor API
-
-* GSK:
--  Use the Vulkan renderer by default
- - Avoid an infinite recursion with offscreens in some cases
- - Optimize graphics offload to make it more likely that compositors
-   can use direct scanout
-
-* X11:
- - Fix some confusing debug messages
- - Drop a no-longer-relevant optimization that was interfering with
-   getting the current window manager capabilities
-
-* macOS:
- - Implement the color picker for macOS 10.15+
-
-* Debugging:
- - Snow monitor resolution in the inspector
-
-* Demos:
- - Use graphics offload in the shadertoy demo
- - Show more reliable fps numbers in the fishbowl demo
-
-* Tools:
- - Support generating pdf in gtk4-rendernode-tool
-
-* Build:
- - Require pango 1.52
- - Require cairo 1.18
- - Add a missing dependency that was causing build failures
- - Drop deprecated build options:
-   gtk_doc -> documentation
-   update_screenshots -> screenshots
-   demo-profile -> profile
-   demos -> build-demos
-
-* Deprecations:
- - gdk_widget_set/get_font_options
- - gdk_wayland/x11_display_set_cursor_theme
-
-* Translation updates:
- Basque
- Brazilian Portuguese
- British English
- Chinese (China)
- Hebrew
- Kabyle
- Persian
- Polish
- Russian
- Slovenian
- Swedish
- Turkish
-
-
-Overview of Changes in 4.14.2, 03-04-2024
-=========================================
-
-* GtkScale:
- - Improve positioning of values in some cases
-
-* Theme:
- - Make progress in entries visible
-
-* Accessibility:
- - Fix text insertion handling
-
-* GDK:
- - dnd: Use the default cursor durion motion
- - dnd: Use a better cursor for indicating the move action
-
-* GSK:
- - gl: Handle offloads in offscreen context better
- - Fix text rendering problems with some fonts
-
-* Wayland:
- - Tighten up some protocol version checks
- - Use the presentation time protocol
- - Fix a crash with subsurfaces
- - Improve settings portal handling
-
-* macOS:
- - Fix up the app menu support
-
-* Windows:
- - Fix problems with minimization
- - Fix build without fontconfig
-
-* Debugging:
- - Add font settings in the inspector
-
-* Demos:
- - Clean up the application demo
- - Update cursor images for the cursor demo
-
-* Translation updates:
- Catalan
- Czech
- French
- Georgian
- Hebrew
- Persian
- Slovenian
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.14.1, 16-03-2024
-=========================================
-
-* GtkTextView:
- - Fix a mixup of cursor and anchor when retrieving surrounding text
-   in input methods
-
-* Printing:
- - Avoid accessing freed printers
-
-* Accessibility:
- - Fix memory leaks
-
-* GDK:
- - Rename the GDK_VULKAN_SKIP environment variable to GDK_VULKAN_DISABLE
- - Add a GDK_GL_DISABLE environment variable
-
-* GSK:
- - Rename the GSK_GPU_SKIP environment variable to GSK_GPU_DISABLE
- - Speed up handling of repeated ops, which should help for text
- - Speed up the inner loop of text node conversion
- - Drop the glyph-align optimization flag
- - ngl: Avoid reusing frames while they are in use
- - Fix flickering thumbnails in nautilus
- - Speed up buffer handling in both ngl and Vulkan
-
-* Demos:
- - Skip demos using gl shaders when we're not using the gl renderer
-
-* Build:
- - Fix some ubsan warnings
- - Avoid zink in ci since it spams stderr
-
-* Translation updates:
- Czech
- German
- Korean
- Russian
-
-
-Overview of Changes in 4.14.0, 12-03-2024
-=========================================
-
-Note: The new renderers and dmabuf support are using graphics drivers
-in different ways than the old gl renderer, and trigger new driver bugs,
-(see for example https://gitlab.gnome.org/GNOME/gtk/-/issues/6418 and
-https://gitlab.gnome.org/GNOME/gtk/-/issues/6388). Therefore, it is
-recommended to use the latest mesa release (24.x) with the new renderers.
-
-* GtkTextView:
- - Don't snapshot children twice
- - Don't blink the cursor when hidden
-
-* GtkEmojiChooser:
- - Fix presentation selector handling
-
-* GtkSnapshot:
- - Fix wrong nodes with transformed shadows
-
-* GtkIMContext:
- - Make gtk_im_context_activate_osk public
-
-* Accessibility:
- - Implement get_contents_at for all our text widgets
- - Add GtkAccessibleText.get_default_attributes
-
-* GSK:
- - Don't fall back to cairo for software rendering. gl+llvmpipe is better
- - Round vertical glyph position to a device pixel position if the font is hinted
- - Fix problems with clip handling
- - Make vulkan and ngl match their font handling
- - Fix some corner-cases with offloading and clips
- - Fix problem with rendering of missing glyphs in hinted fonts
-
-* MacOs:
- - Implement cursor-from-texture
-
-* Translation updates:
- Basque
- British English
- French
- Indonesian
- Kazakh
- Latvian
- Lithuanian
- Norwegian Bokmål
- Slovenian
- Spanish
- Turkish
-
-
-Overview of Changes in 4.13.9, 02-03-2024
-=========================================
-
-* GtkEditable:
- - Fix preconditions to be not too strict
-
-* GtkEmojiChooser:
- - Support search in the locale as well as in English
-
-* GtkIconTheme:
- - Make gtk_icon_paintable_new_for_file support symbolics
-
-* GtkVideo:
- - Fix a problem with cursor handling that could lead to crashes
-
-* Accessibility:
- - Fix GetCharacterAtOffset implementation
- - Add a Terminal role
- - Make TextCaretMoved match gtk3
- - Support multiple levels of GtkEditable delegates
-
-* GSK:
- - Make the node parser more flexible for text nodes
- - Change the way font scaling is handled to avoid clipping
- - Fix handling of missing glyphs in the new renderers
-
-* X11:
- - Don't claim to support shadows without a compositor
-
-* Wayland:
- - Fix handling of output scales
-
-* Tools:
- - Add a compare command to gtk4-rendernode-tool
-
-* Build:
- - Fix some ubsan complaints
-
-* Translation updates:
- Basque
- British English
- Catalan
- Finnish
- Galician
- Georgian
- Hebrew
- Indonesian
- Kazakh
- Latvian
- Lithuanian
- Persian
- Polish
- Russian
- Slovenian
- Spanish
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.13.8, 20-02-2024
-=========================================
-
-* Accessibility:
- - Add a GtkAccessibleText interface for allowing 3rd party
-   text widgets (notably vte) to be accessible
- - Avoid duplicate accessible descriptions
- - Fix GetAccessibleAtPoint
-
-* GSK:
- - Avoid offscreens for disjoint containers
- - Don't use the gpu renderers with llvmpipe
- - Fix various rendering issues found by tests
- - Allow unnormalized node bounds again
- - Fix a broken case of rounded-rect intersection
- - Fix handling of external textures in gpu renderers
- - Make gpu renderers work with WGL on Windows
-
-* build:
- - Allow building without dmabuf support on (old) Linux
-
-* X11:
- - Fix monitor enter/leave signals
-
-* Translation updates:
- Basque
- Brazilian Portuguese
- Catalan
- Czech
- Galician
- Georgian
- Hebrew
- Lithuanian
- Persian
- Russian
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.13.7, 11-02-2024
-=========================================
-
-* GtkFileChooser:
- - Speed up opening
-
-* GtkCalendar:
- - Add some missing setters and getters
-
-* Accessibility:
- - Add socket support for webkit accessibility
- - Implement AT-SPI text for GtkText
- - Implement AT-SPI component generically
- - Add an announce API
-
-* GSK:
- - Make the ngl renderer work on macOS
- - Fix a crash in the vulkan renderer
- - Make nodeparser allow aliases for fonts again
- - Implement cache eviction for glyph and texture caches
- - Fix ngl shaders to work on GL < 4.0
- - Require GL 3.3 for the ngl renderer
- - Fix problems with scaled shadows
- - Fix problems with holes for underlaid subsurfaces
- - Improve handling of scales and glyph cache efficiency
-
-* Media:
- - Support dmabufs in the gstreamer backend. This allows
-   zero-copy video playback on Wayland when paired with
-   hardware video decoding
- - Drop the experimental ffmpeg backend. It hasn't been
-   building for a year
-
-* Wayland:
- - Commit empty frames if and double-buffered state is pending
- - Fix monitor size information when using mutter without
-   the scale-monitor-framebuffer setting
- - Clear the current tablet on tab leave, fixing a crash
-
-* macOS:
- - Propagate unhandled input events back to the OS
-
-* Tools:
- - Make the crash handling in gtk4-node-editor more robust
-
-* Translation updates
- Galician
- Georgian
- Occitan
- Turkish
-
-
-Overview of Changes in 4.13.6, 25-01-2024
-=========================================
-
-This release changes the ngl renderer to be the default renderer.
-
-The intent of this change is to get wider testing and verify that
-the new renderers are production-ready. If significant problems
-show up, we will revert this change for 4.14.
-
-You can still override the renderer choice using the GSK_RENDERER
-environment variable.
-
-Since ngl can handle fractional scaling much better than the old gl
-renderer, we allow fractional scaling by default with gl now. If you
-are using the old gl renderer (e.g. because your system is limited to
-GLES2), you can disable fractional scaling by setting the GDK_DEBUG
-environment variable to include the gl-no-fractional key.
-
-* GtkColumnView:
- - Fix infinite loops in dispose
- - Fix problems with weak ref cycles in GtkExpression
-
-* GtkListView:
- - Fix some corner cases with sections during insertions and deletions
- - Don't double-recycle widgets
-
-* GtkStack:
- - Add automatic cleanup for GtkStackPage
-
-* GDK:
- - Use standard cursor names for drag cursors
- - Enable fractional scaling with gl by default
-
-* GSK:
- - Many fixes and improvements to the unified renderers:
-   - Fix text rendering with the uber shader
-   - Fix rounding issues with fractional scales
-   - Fix some memory leaks
-   - Many text rendering fixes
-   - Implement subpixel positioning for glyphs
-   - Support custom fonts in node files
-   - Add tests for font rendering
-   - Fix drawing of repeat nodes
-   - Implement subpixels positioning
-   - Evict stale textures, glyphs and atlases from the cache
- - Some fixes and improvements to the GL renderer:
-   - Fix problems with GLES on Nvidia
-   - Avoid a crash in the mask demo
-   - Respect opacity of the first child node in containers
- - Some fixes and improvements to the fallback renderer:
-   - Fix drawing of repeat nodes
- - Make ngl the default renderer
-
-* Wayland:
- - Fix problems with tablet cursors
- - Fix problems without seats
-
-* Accessibility:
- - Respect a separate "show-status-shapes setting
- - Fix change notification for accessible names on some widgets
-
-* Inspector:
- - Show the git commit in devel builds
-
-* Tools:
- - Make gtk4-node-editor autosave its contents
- - Add a benchmark command to gtk4-rendernode-tool
-
-* Translation updates:
- French
- Galician
- Georgian
- Occitan
- Persian
- Russian
- Vietnamese
-
-
-Overview of Changes in 4.13.5, 07-01-2024
-=========================================
-
-This release adds two new GSK renderers called vulkan and ngl,
-that are built from the same sources. The new renderers can
-handle many corner cases correctly that the current gl renderer
-does not handle, and they offer advantages such as antialiasing
-and supersampled gradients.
-
-The new renderers are still considered experimental, and GTK
-will only use them if they are explicitly selected using the
-GSK_RENDERER environment variable.
-
-As part of this work, the GSK include files have been rearranged.
-It is no longer necessary to include renderer-specific headers for
-ngl and vulkan (and doing so will trigger deprecation warnings),
-and their constructors are always available.
-
-The previously available experimental GdkVulkanContext APIs and
-the old Vulkan renderer have been removed.
-
-Vulkan is now enabled by default, and Linux distributions should
-build GTK with Vulkan support. This requires the glslc shader
-compiler as a new dependency.
-
-Vulkan is now also used for dmabuf support.
-
-* GtkDropdown:
- - Fix display of initial selection
-
-* GtkShortcutsWindow:
- - Make the window adapt to smaller screen widths
-
-* GtkTextView:
- - Fix a possible NULL dereference in history
-
-* GDK:
- - Make the png loader safer against overflows
-
-* GL:
- - Fix some errors in handling of texture formats and mipmaps
-
-
-Overview of Changes in 4.13.4, 30-12-2023
-=========================================
-
-* GtkFileDialog:
- - Return an error if no file is selected
-
-* GtkFileLauncher:
- - Add a writable property
-
-* GtkFileChooserNative:
- - Make closing portal file dialogs work
-
-* GtkEmojiChooser:
- - Update Emoji data to CLDR v43
-
-* GtkStringList:
- - Add item-type and n-itmes properties
-
-* Input:
- - Respect GTK grabs on DND events
- - Fix crossing event generation for enter/leave
-
-* Wayland:
- - Avoid recreating wl_buffers needlessly
- - Be more careful when loading cursors
-
-* Dmabuf:
- - Add support for all Dmabuf formats
- - Tweak the offload code a bit, allow offloading translucent
-   textures, as long as they are raised. Decline to offload
-   with fractional scales.
-
-* Accessibility:
- - Add a few more accessible roles
-
-* GL:
- - Use GLES by default
- - Tweak GDK_DEBUG values. The new values are
-   gl-disable-gl, gl-disable-gles and gl-prefer-gl.
-   The gl-legacy and nograbs values have been dropped.
-
-* Css:
- - Reduce memory consumption during theme loading
- - Fix opacity handling
-
-* Theme:
- - Refresh some of the included symbolic icons
-
-* MacOs:
- - Silence secure-restore message
-
-* Build:
- - Require Vulkan 1.3
-
-* Translation updates:
- Chinese (China)
- Czech
- Hebrew
- Icelandic
- Polish
- Russian
-
-
-Overview of Changes in 4.13.3, 15-11-2023
-=========================================
-
-* GtkGraphicsOffload: A new widget to support passthrough
-  of dmabuf textures with subsurfaces on Wayland
-
-* GtkListView:
- - reduce tree indentation
-
-* GtkInspector:
- - Show more GL information
- - Add a subsurface overlay
- - Improve the fps overlay
-
-* GDK
- - Allow implicit modifiers for dmabufs
- - Support more dmabuf formats: NV16, NV61, NV24, NV42
-   and 3-plane YUV formats
-
-* GSK
- - Fix padding of icons in the GL atlas
- - Fix handling of texture-scale nodes in cairo
- - Treat texture-scale nodes more faithfully in GL
-
-* Accessibility:
- - Tweak the accessible name computation for corner cases
-
-* The GTK/GDK/GSK_DEBUG environment variables now
-  work in productions as well as in debug builds
-
-* Translation updates
- Catalan
- French
- Russian
-
-
-Overview of Changes in 4.13.2, 22-10-2023
-=========================================
-
-* GtkPrintdialog:
- - New async-style api to replace GtkPrintOperation
-
-* GtkEmojiChooser:
- - Add more languages: Bengali, Hindi, Japanese, Finnish,
-   Thai and Norwegian bokmål
-
-* Accessibility:
- - Fix some utf8 handling issues
-
-* GDK:
- - Add support for dmabuf textures, with GdkDmabufTextureBuilder
- - Add a few more supported memory formats for textures
-
-* GSK:
- - Add a fast-path for masking color
- - Add support for importing dmabuf textures
- - Handle GLES better by using some extensions
-
-* Translation updates:
- Catalan
- Russian
- Turkish
-
-
-Overview of Changes in 4.13.1, 28-09-2023
+Overview of Changes in 4.13.1, xx-xx-xxxx
 =========================================
 
 * GtkTooltip:
@@ -656,32 +7,20 @@ Overview of Changes in 4.13.1, 28-09-2023
 * GtkCenterLayout, GtkEntry, GtkSearchEntry:
  - Fix some issues with baseline handling
 
-* GtkColorButton, GtkFontButton:
- - Propagate focus-on-click
-
 * GtkFileChooser:
  - Make "Visit file" scroll to the file
 
 * GtkSwitch:
  - Respect text direction
 
-* GtkWindow:
- - Don't assume titlebars are GtkHeaderBars
-
-* Printing:
- - Fix some problems with the portal implementation
- - Add a new simple print API: GtkPrintDialog
-
 * Paths:
  - GskPathMeasure performance has been improved
  - Add custom contours for circles, rounded rectangles and rectangles
  - Simplify GskPathPoint handling
  - gsk_path_point_get_closest_point now returns the distance as well
- - Make GskPathBuilder simplify curves
 
 * Input:
  - Handle (some) single-key compose sequences
- - Fix active state tracking with sensitivity changes and grabs
 
 * GSK:
  - Make the repeated gradients match between GL and cairo
@@ -690,13 +29,6 @@ Overview of Changes in 4.13.1, 28-09-2023
  - Restrict an optimization to the cases where it is crrect
  - Fix rendering of shadows with opacity
  - The Vulkan renderer now requires Vulkan 1.2
- - GL: Transition gradients unpremultiplied
- - GL: Fix clipping of shadows
- - GL: Some optimizations
- - Broadway: Fix memory leaks in the renderer
-
-* Wayland:
- - Make activation more reliable
 
 * macOS:
  - Clamp damage regions to the surface size
@@ -711,29 +43,20 @@ Overview of Changes in 4.13.1, 28-09-2023
 * Build:
  - Fix build problems with C++ compilers
 
-* Deprecations:
- - gtk_window_present_with_time
-
 * Translation updates
  Brazilian Portuguese
  British English
  Catalan
- Chinese (China)
  Czech
  Danish
- Dutch
- Esperanto
  Galician
  Georgian
  Italian
  Korean
- Latvian
  Lithuanian
- Persian
  Polish
  Punjabi
  Slovenian
- Turkish
 
 
 Overview of Changes in 4.13.0, 25-08-2023
@@ -998,7 +321,7 @@ Overview of Changes in 4.11.4, 03-07-2023
  - Center newly created transient windows
 
 * Vulkan:
- - Add antialiasing for gradients
+ - Add antialising for gradients
  - Do less work on clipped away nodes
  - Redo image uploading
  - Support different image depths and formats
@@ -1982,7 +1305,7 @@ Overview of Changes in 4.7.0, 07-05-2022
  - Event handling fixes
  - Fix keyboard input on popovers
  - Support OpenGL-based video playback
- - Support fullscreen
+ - Suport fullscreen
  - Improve native filechoooser size allocation
  - Use CALayer and IOSurface for rendering
  - Use a per-monitor CVDisplayLink
@@ -2379,7 +1702,7 @@ Overview of Changes in 4.4.0
  - Activate when moving focus
 
 * GtkLabel:
- - Properly ignore double underscores for mnemonics
+ - Propertly ignore double underscores for mnemonics
 
 * GtkPopoverMenu:
  - Fix focus cycling
@@ -2926,7 +2249,7 @@ Overview of Changes in 4.1.0
  - Set sort arrows in CSS
  - Set menu button arrows in CSS
  - Make scrollbars larger
- - Support circular menubuttons
+ - Supprt circular menubuttons
 
 * CSS:
  - Implement transform-origin

README.md

@@ -125,7 +125,7 @@ version, for example `gtk-4-10`.
 How to report bugs
 ------------------
 
-Bugs should be reported on the [issues page](https://gitlab.gnome.org/GNOME/gtk/issues/).
+Bugs should be reported on the [issues page](https://gitlab.gnome.org/GNOME/gtk/issues/new).
 
 In the bug report please include:
 

build-aux/flatpak/org.gtk.Demo4.json

@@ -185,8 +185,9 @@
             "builddir" : true,
             "config-opts" : [
                 "--libdir=/app/lib",
+                "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
             ],
             "sources" : [
                 {

build-aux/flatpak/org.gtk.IconBrowser4.json

@@ -114,8 +114,9 @@
             "builddir" : true,
             "config-opts" : [
                 "--libdir=/app/lib",
+                "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
             ],
             "sources" : [
                 {

build-aux/flatpak/org.gtk.WidgetFactory4.json

@@ -114,8 +114,9 @@
             "builddir" : true,
             "config-opts" : [
                 "--libdir=/app/lib",
+                "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
             ],
             "sources" : [
                 {
@@ -130,6 +131,7 @@
         "env" : {
             "DBUS_SESSION_BUS_ADDRESS" : "''",
             "GSK_RENDERER" : "opengl",
+            "GDK_DEBUG" : "vulkan-disable",
             "G_ENABLE_DEBUG" : "true"
         }
     }

build-aux/flatpak/org.gtk.gtk4.NodeEditor.json

@@ -114,8 +114,9 @@
             "builddir" : true,
             "config-opts" : [
                 "--libdir=/app/lib",
+                "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
             ],
             "sources" : [
                 {
@@ -130,6 +131,7 @@
         "env" : {
             "DBUS_SESSION_BUS_ADDRESS" : "''",
             "GSK_RENDERER" : "opengl",
+            "GDK_DEBUG" : "vulkan-disable",
             "G_ENABLE_DEBUG" : "true"
         }
     }

build-aux/msvc/msvc_recommended_pragmas.h

@@ -1,41 +0,0 @@
-#ifndef _MSC_VER
-#pragma error "This header is for Microsoft VC or clang-cl only."
-#endif /* _MSC_VER */
-
-/* Make MSVC more pedantic, this is a recommended pragma list
- * from _Win32_Programming_ by Rector and Newcomer.
- */
-#ifndef __clang__
-#pragma warning(error:4002) /* too many actual parameters for macro */
-#pragma warning(error:4003) /* not enough actual parameters for macro */
-#pragma warning(1:4010)     /* single-line comment contains line-continuation character */
-#pragma warning(error:4013) /* 'function' undefined; assuming extern returning int */
-#pragma warning(1:4016)     /* no function return type; using int as default */
-#pragma warning(error:4020) /* too many actual parameters */
-#pragma warning(error:4021) /* too few actual parameters */
-#pragma warning(error:4027) /* function declared without formal parameter list */
-#pragma warning(error:4029) /* declared formal parameter list different from definition */
-#pragma warning(error:4033) /* 'function' must return a value */
-#pragma warning(error:4035) /* 'function' : no return value */
-#pragma warning(error:4045) /* array bounds overflow */
-#pragma warning(error:4047) /* different levels of indirection */
-#pragma warning(error:4049) /* terminating line number emission */
-#pragma warning(error:4053) /* An expression of type void was used as an operand */
-#pragma warning(error:4071) /* no function prototype given */
-#pragma warning(disable:4101) /* unreferenced local variable */
-#pragma warning(error:4150)
-
-/* G_NORETURN */
-#pragma warning(error:4646) /* function declared with __declspec(noreturn) has non-void return type */
-#pragma warning(error:4715) /* 'function': not all control paths return a value */
-#pragma warning(error:4098) /* 'void' function returning a value */
-
-#pragma warning(disable:4244)	/* No possible loss of data warnings */
-#pragma warning(disable:4305)   /* No truncation from int to char warnings */
-
-#pragma warning(error:4819) /* The file contains a character that cannot be represented in the current code page */
-#endif                      /* __clang__ */
-
-/* work around Microsoft's premature attempt to deprecate the C-Library */
-#define _CRT_SECURE_NO_WARNINGS
-#define _CRT_NONSTDC_NO_WARNINGS

demos/gtk-demo/application.c

@@ -35,7 +35,7 @@ show_action_dialog (GSimpleAction *action)
 {
   GtkAlertDialog *dialog;
 
-  dialog = gtk_alert_dialog_new ("You activated action: \"%s\"",
+  dialog = gtk_alert_dialog_new ("You activated action: \"%s\n",
                                  g_action_get_name (G_ACTION (action)));
   gtk_alert_dialog_show (dialog, NULL);
   g_object_unref (dialog);

demos/gtk-demo/bluroverlay.h

@@ -18,7 +18,8 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#pragma once
+#ifndef __BLUR_OVERLAY_H__
+#define __BLUR_OVERLAY_H__
 
 #include <gtk/gtk.h>
 
@@ -59,3 +60,5 @@ void       blur_overlay_set_child   (BlurOverlay *overlay,
                                      GtkWidget   *widget);
 
 G_END_DECLS
+
+#endif /* __BLUR_OVERLAY_H__ */

demos/gtk-demo/cursors.c

@@ -15,54 +15,12 @@ on_destroy (gpointer data)
   window = NULL;
 }
 
-static GdkTexture *
-cursor_callback (GdkCursor *cursor,
-                 int        cursor_size,
-                 double     scale,
-                 int       *width,
-                 int       *height,
-                 int       *hotspot_x,
-                 int       *hotspot_y,
-                 gpointer   data)
-{
-  GdkPixbuf *pixbuf;
-  GdkTexture *texture;
-  GError *error = NULL;
-  int scaled_size;
-
-  scaled_size = ceil (cursor_size * scale);
-
-  pixbuf = gdk_pixbuf_new_from_resource_at_scale ("/cursors/images/gtk-logo.svg",
-                                                  scaled_size, scaled_size,
-                                                  TRUE,
-                                                  &error);
-  if (!pixbuf)
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-      return NULL;
-    }
-
-  texture = gdk_texture_new_for_pixbuf (pixbuf);
-
-  g_object_unref (pixbuf);
-
-  *width = cursor_size;
-  *height = cursor_size;
-  *hotspot_x = 18 * cursor_size / 32.0;
-  *hotspot_y = 2 * cursor_size / 32.0;
-
-  return texture;
-}
-
 GtkWidget *
 do_cursors (GtkWidget *do_widget)
 {
   if (!window)
     {
       GtkBuilder *builder;
-      GtkWidget *logo_callback;
-      GdkCursor *cursor;
 
       builder = gtk_builder_new_from_resource ("/cursors/cursors.ui");
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
@@ -71,10 +29,6 @@ do_cursors (GtkWidget *do_widget)
                               gtk_widget_get_display (do_widget));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (on_destroy), NULL);
-      logo_callback = GTK_WIDGET (gtk_builder_get_object (builder, "logo_callback"));
-      cursor = gdk_cursor_new_from_callback (cursor_callback, NULL, NULL, NULL);
-      gtk_widget_set_cursor (logo_callback, cursor);
-      g_object_unref (cursor);
       g_object_unref (builder);
     }
 

demos/gtk-demo/demo.gresource.xml

@@ -116,7 +116,6 @@
     <file>w_resize_cursor.png</file>
     <file>zoom_in_cursor.png</file>
     <file>zoom_out_cursor.png</file>
-    <file>gtk-logo.svg</file>
   </gresource>
   <gresource prefix="/dnd">
     <file>dnd.css</file>

demos/gtk-demo/demo3widget.c

@@ -75,9 +75,7 @@ query_tooltip (GtkWidget  *widget,
   gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 1, 1);
 
   precision = 1;
-  s = NULL;
   do {
-    g_free (s);
     s = g_strdup_printf ("%.*f", precision, self->scale);
     l = strlen (s) - 1;
     while (s[l] == '0')

demos/gtk-demo/demotaggedentry.h

@@ -18,7 +18,8 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#pragma once
+#ifndef __DEMO_TAGGED_ENTRY_H__
+#define __DEMO_TAGGED_ENTRY_H__
 
 #include <gtk/gtk.h>
 
@@ -56,3 +57,5 @@ void            demo_tagged_entry_tag_set_has_close_button (DemoTaggedEntryTag *
                                                             gboolean            has_close_button);
 
 G_END_DECLS
+
+#endif /* __DEMO_TAGGED_ENTRY_H__ */

demos/gtk-demo/demowidget.c

@@ -34,7 +34,7 @@ transition (GtkWidget     *widget,
 {
   DemoWidget *self = DEMO_WIDGET (widget);
   DemoLayout *demo_layout = DEMO_LAYOUT (gtk_widget_get_layout_manager (widget));
-  gint64 now = gdk_frame_clock_get_frame_time (frame_clock);
+  gint64 now = g_get_monotonic_time ();
 
   gtk_widget_queue_allocate (widget);
 
@@ -66,13 +66,11 @@ clicked (GtkGestureClick *gesture,
          gpointer         data)
 {
   DemoWidget *self = data;
-  GdkFrameClock *frame_clock;
 
   if (self->tick_id != 0)
     return;
 
-  frame_clock = gtk_widget_get_frame_clock (GTK_WIDGET (self));
-  self->start_time = gdk_frame_clock_get_frame_time (frame_clock);
+  self->start_time = g_get_monotonic_time ();
   self->tick_id = gtk_widget_add_tick_callback (GTK_WIDGET (self), transition, NULL, NULL);
 }
 

demos/gtk-demo/fishbowl.c

@@ -74,7 +74,14 @@ create_blurred_button (void)
 static GtkWidget *
 create_font_button (void)
 {
-  return gtk_font_dialog_button_new (gtk_font_dialog_new ());
+  GtkFontDialog *dialog;
+  GtkWidget *button;
+
+  dialog = gtk_font_dialog_new ();
+  button = gtk_font_dialog_button_new (dialog);
+  g_object_unref (dialog);
+
+  return button;
 }
 
 static GtkWidget *
@@ -184,12 +191,6 @@ create_cogs (void)
   return picture;
 }
 
-static gboolean
-check_cogs (GtkFishbowl *fb)
-{
-  return GSK_IS_GL_RENDERER (gtk_native_get_renderer (gtk_widget_get_native (GTK_WIDGET (fb))));
-}
-
 static void
 mapped (GtkWidget *w)
 {
@@ -224,41 +225,36 @@ create_graph (void)
 
 static const struct {
   const char *name;
-  GtkWidget * (* create_func) (void);
-  gboolean    (* check) (GtkFishbowl *fb);
+  GtkWidget * (*create_func) (void);
 } widget_types[] = {
-  { "Icon",       create_icon,           NULL },
-  { "Button",     create_button,         NULL },
-  { "Blurbutton", create_blurred_button, NULL },
-  { "Fontbutton", create_font_button,    NULL },
-  { "Levelbar",   create_level_bar,      NULL },
-  { "Label",      create_label,          NULL },
-  { "Spinner",    create_spinner,        NULL },
-  { "Spinbutton", create_spinbutton,     NULL },
-  { "Video",      create_video,          NULL },
-  { "Gears",      create_gears,          NULL },
-  { "Switch",     create_switch,         NULL },
-  { "Menubutton", create_menu_button,    NULL },
-  { "Shader",     create_cogs,           check_cogs },
-  { "Tiger",      create_tiger,          NULL },
-  { "Graph",      create_graph,          NULL },
+  { "Icon",       create_icon           },
+  { "Button",     create_button         },
+  { "Blurbutton", create_blurred_button },
+  { "Fontbutton", create_font_button    },
+  { "Levelbar",   create_level_bar      },
+  { "Label",      create_label          },
+  { "Spinner",    create_spinner        },
+  { "Spinbutton", create_spinbutton     },
+  { "Video",      create_video          },
+  { "Gears",      create_gears          },
+  { "Switch",     create_switch         },
+  { "Menubutton", create_menu_button    },
+  { "Shader",     create_cogs           },
+  { "Tiger",      create_tiger          },
+  { "Graph",      create_graph          },
 };
 
 static int selected_widget_type = -1;
 static const int N_WIDGET_TYPES = G_N_ELEMENTS (widget_types);
 
-static gboolean
+static void
 set_widget_type (GtkFishbowl *fishbowl,
                  int          widget_type_index)
 {
   GtkWidget *window;
 
   if (widget_type_index == selected_widget_type)
-    return TRUE;
-
-  if (widget_types[widget_type_index].check != NULL &&
-      !widget_types[widget_type_index].check (fishbowl))
-    return FALSE;
+    return;
 
   selected_widget_type = widget_type_index;
 
@@ -268,8 +264,6 @@ set_widget_type (GtkFishbowl *fishbowl,
   window = GTK_WIDGET (gtk_widget_get_root (GTK_WIDGET (fishbowl)));
   gtk_window_set_title (GTK_WINDOW (window),
                         widget_types[selected_widget_type].name);
-
-  return TRUE;
 }
 
 G_MODULE_EXPORT void
@@ -277,17 +271,14 @@ fishbowl_next_button_clicked_cb (GtkButton *source,
                                  gpointer   user_data)
 {
   GtkFishbowl *fishbowl = user_data;
-  int new_index = selected_widget_type;
+  int new_index;
 
-  do
-    {
-      if (new_index + 1 >= N_WIDGET_TYPES)
-        new_index = 0;
-      else
-        new_index = new_index + 1;
+  if (selected_widget_type + 1 >= N_WIDGET_TYPES)
+    new_index = 0;
+  else
+    new_index = selected_widget_type + 1;
 
-    }
-  while (!set_widget_type (fishbowl, new_index));
+  set_widget_type (fishbowl, new_index);
 }
 
 G_MODULE_EXPORT void
@@ -295,18 +286,14 @@ fishbowl_prev_button_clicked_cb (GtkButton *source,
                                  gpointer   user_data)
 {
   GtkFishbowl *fishbowl = user_data;
-  int new_index = selected_widget_type;
+  int new_index;
 
-  do
-    {
-      if (new_index - 1 < 0)
-        new_index = N_WIDGET_TYPES - 1;
-      else
-        new_index = new_index - 1;
+  if (selected_widget_type - 1 < 0)
+    new_index = N_WIDGET_TYPES - 1;
+  else
+    new_index = selected_widget_type - 1;
 
-    }
-
-  while (!set_widget_type (fishbowl, new_index));
+  set_widget_type (fishbowl, new_index);
 }
 
 G_MODULE_EXPORT void

demos/gtk-demo/font_features.c

@@ -600,8 +600,8 @@ update_display (void)
   if (s->len > 0)
     {
       pango_font_description_set_variations (desc, s->str);
+      g_string_free (s, TRUE);
     }
-  g_string_free (s, TRUE);
 
   font_desc = pango_font_description_to_string (desc);
 
@@ -1586,7 +1586,7 @@ update_font_variations (void)
         }
 
       gtk_grid_attach (GTK_GRID (demo->variations_grid), combo, 1, -1, 3, 1);
-      g_signal_connect (combo, "notify::selected", G_CALLBACK (instance_changed), NULL);
+      g_signal_connect (combo, "notify::selecte", G_CALLBACK (instance_changed), NULL);
       demo->instance_combo = combo;
    }
 

demos/gtk-demo/fontify.c

@@ -363,9 +363,7 @@ insert_markup_idle (gpointer data)
 
       if (g_get_monotonic_time () - begin > G_TIME_SPAN_MILLISECOND)
         {
-          guint id;
-          id = g_idle_add (insert_markup_idle, data);
-          g_source_set_name_by_id (id, "[gtk-demo] insert_markup_idle");
+          g_idle_add (insert_markup_idle, data);
           return G_SOURCE_REMOVE;
         }
 
@@ -400,9 +398,7 @@ parse_markup_idle (gpointer data)
   do {
     if (g_get_monotonic_time () - begin > G_TIME_SPAN_MILLISECOND)
       {
-        guint id;
-        id = g_idle_add (parse_markup_idle, data);
-        g_source_set_name_by_id (id, "[gtk-demo] parse_markup_idle");
+        g_idle_add (parse_markup_idle, data);
         return G_SOURCE_REMOVE;
       }
 

demos/gtk-demo/fontplane.h

@@ -15,7 +15,8 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#pragma once
+#ifndef __GTK_FONT_PLANE_H__
+#define __GTK_FONT_PLANE_H__
 
 #include <gtk/gtk.h>
 
@@ -59,3 +60,5 @@ GtkWidget * gtk_font_plane_new      (GtkAdjustment *width_adj,
                                      GtkAdjustment *weight_adj);
 
 G_END_DECLS
+
+#endif /* __GTK_FONT_PLANE_H__ */

demos/gtk-demo/gskshaderpaintable.h

@@ -17,7 +17,8 @@
  * Authors: Matthias Clasen <mclasen@redhat.com>
  */
 
-#pragma once
+#ifndef __GSK_SHADER_PAINTABLE_H__
+#define __GSK_SHADER_PAINTABLE_H__
 
 #include <gdk/gdk.h>
 #include <gsk/gsk.h>
@@ -41,3 +42,5 @@ void             gsk_shader_paintable_update_time      (GskShaderPaintable *self
                                                         int                 time_idx,
                                                         gint64              frame_time);
 G_END_DECLS
+
+#endif /* __GSK_SHADER_PAINTABLE_H__ */

demos/gtk-demo/gtk-logo.svg

@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="128"
-   id="svg6843"
-   sodipodi:version="0.32"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14"
-   version="1.0"
-   sodipodi:docname="gtk-logo.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/ebassi/Pictures/gtk-logo-256.png"
-   inkscape:export-xdpi="192"
-   inkscape:export-ydpi="192">
-  <defs
-     id="defs6845">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="-50 : 600 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="700 : 600 : 1"
-       inkscape:persp3d-origin="300 : 400 : 1"
-       id="perspective13" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="69.874353"
-     inkscape:cy="64.313526"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     width="128px"
-     height="128px"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid7947" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata6848">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <dc:date />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:source />
-        <dc:relation />
-        <dc:language />
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:nodetypes="ccccc"
-       id="path6976"
-       d="M 20.88413,30.82696 L 53.816977,55.527708 L 107.33282,39.060543 L 70.587303,17.177763 L 20.88413,30.82696 z"
-       style="fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.12364459;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-    <path
-       id="path6978"
-       d="M 22.94243,82.287118 L 20.88413,30.82696 L 53.816977,55.527708 L 53.816977,111.10486 L 22.94243,82.287118 z"
-       style="fill:#e40000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.12364459;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-    <path
-       id="path6980"
-       d="M 53.816977,111.10486 L 103.21619,90.5207 L 107.33282,39.060543 L 53.816977,55.527708 L 53.816977,111.10486 z"
-       style="fill:#7fe719;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.12364459;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-    <path
-       sodipodi:nodetypes="ccc"
-       id="path6982"
-       d="M 23.216626,81.319479 L 70.48573,67.361442 L 103.38422,90.444516"
-       style="opacity:1;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cc"
-       id="path6984"
-       d="M 70.434539,17.875593 L 70.434539,66.984877"
-       style="opacity:1;fill:#babdb6;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
-</svg>

demos/gtk-demo/gtkfishbowl.c

@@ -456,33 +456,43 @@ gtk_fishbowl_do_update (GtkFishbowl *fishbowl)
 {
   GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
   GdkFrameClock *frame_clock;
-  GdkFrameTimings *end;
-  gint64 end_counter;
-  double fps, expected_fps;
+  GdkFrameTimings *start, *end;
+  gint64 start_counter, end_counter;
+  gint64 n_frames, expected_frames;
+  gint64 start_timestamp, end_timestamp;
   gint64 interval;
 
   frame_clock = gtk_widget_get_frame_clock (GTK_WIDGET (fishbowl));
   if (frame_clock == NULL)
     return;
 
-  fps = gdk_frame_clock_get_fps (frame_clock);
-  if (fps <= 0.0)
+  start_counter = gdk_frame_clock_get_history_start (frame_clock);
+  end_counter = gdk_frame_clock_get_frame_counter (frame_clock);
+  start = gdk_frame_clock_get_timings (frame_clock, start_counter);
+  for (end = gdk_frame_clock_get_timings (frame_clock, end_counter);
+       end_counter > start_counter && end != NULL && !gdk_frame_timings_get_complete (end);
+       end = gdk_frame_clock_get_timings (frame_clock, end_counter))
+    end_counter--;
+  if (end_counter - start_counter < 4)
     return;
 
-  priv->framerate = fps;
+  start_timestamp = gdk_frame_timings_get_presentation_time (start);
+  end_timestamp = gdk_frame_timings_get_presentation_time (end);
+  if (start_timestamp == 0 || end_timestamp == 0)
+    {
+      start_timestamp = gdk_frame_timings_get_frame_time (start);
+      end_timestamp = gdk_frame_timings_get_frame_time (end);
+    }
+
+  n_frames = end_counter - start_counter;
+  priv->framerate = ((double) n_frames) * G_USEC_PER_SEC / (end_timestamp - start_timestamp);
+  priv->framerate = ((int)(priv->framerate * 100))/100.0;
+
   g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_FRAMERATE]);
 
   if (!priv->benchmark)
     return;
 
-  end_counter = gdk_frame_clock_get_frame_counter (frame_clock);
-  for (end = gdk_frame_clock_get_timings (frame_clock, end_counter);
-       end != NULL && !gdk_frame_timings_get_complete (end);
-       end = gdk_frame_clock_get_timings (frame_clock, end_counter))
-    end_counter--;
-  if (end == NULL)
-    return;
-
   interval = gdk_frame_timings_get_refresh_interval (end);
   if (interval == 0)
     {
@@ -490,16 +500,16 @@ gtk_fishbowl_do_update (GtkFishbowl *fishbowl)
       if (interval == 0)
         return;
     }
-  expected_fps = (double) G_USEC_PER_SEC / interval;
+  expected_frames = round ((double) (end_timestamp - start_timestamp) / interval);
 
-  if (fps > (expected_fps - 1))
+  if (n_frames >= expected_frames)
     {
       if (priv->last_benchmark_change > 0)
         priv->last_benchmark_change *= 2;
       else
         priv->last_benchmark_change = 1;
     }
-  else if (0.95 * fps < expected_fps)
+  else if (n_frames + 1 < expected_frames)
     {
       if (priv->last_benchmark_change < 0)
         priv->last_benchmark_change--;

demos/gtk-demo/gtkfishbowl.h

@@ -15,7 +15,8 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#pragma once
+#ifndef __GTK_FISHBOWL_H__
+#define __GTK_FISHBOWL_H__
 
 #include <gtk/gtk.h>
 
@@ -64,3 +65,5 @@ void       gtk_fishbowl_set_creation_func (GtkFishbowl       *fishbowl,
                                            GtkFishCreationFunc creation_func);
 
 G_END_DECLS
+
+#endif /* __GTK_FISHBOWL_H__ */

demos/gtk-demo/gtkgears.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTK_GEARS_H__
+#define __GTK_GEARS_H__
 
 #include <gtk/gtk.h>
 
@@ -43,3 +44,5 @@ void       gtk_gears_set_fps_label (GtkGears *gears,
 
 
 G_END_DECLS
+
+#endif /* __GTK_GEARS_H__ */

demos/gtk-demo/gtkshaderbin.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTK_SHADER_BIN_H__
+#define __GTK_SHADER_BIN_H__
 
 #include <gtk/gtk.h>
 
@@ -18,3 +19,5 @@ void       gtk_shader_bin_set_child   (GtkShaderBin *self,
 GtkWidget *gtk_shader_bin_get_child   (GtkShaderBin *self);
 
 G_END_DECLS
+
+#endif /* __GTK_SHADER_BIN_H__ */

demos/gtk-demo/gtkshaderstack.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTK_SHADER_STACK_H__
+#define __GTK_SHADER_STACK_H__
 
 #include <gtk/gtk.h>
 
@@ -18,3 +19,5 @@ void        gtk_shader_stack_set_active   (GtkShaderStack *self,
                                            int             index);
 
 G_END_DECLS
+
+#endif /* __GTK_SHADER_STACK_H__ */

demos/gtk-demo/gtkshadertoy.c

@@ -116,9 +116,7 @@ static gboolean gtk_shadertoy_tick          (GtkWidget     *widget,
 GtkWidget *
 gtk_shadertoy_new (void)
 {
-  return g_object_new (gtk_shadertoy_get_type (),
-                       "allowed-apis", GDK_GL_API_GL,
-                       NULL);
+  return g_object_new (gtk_shadertoy_get_type (), NULL);
 }
 
 static void

demos/gtk-demo/gtkshadertoy.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTK_SHADERTOY_H__
+#define __GTK_SHADERTOY_H__
 
 #include <gtk/gtk.h>
 
@@ -29,3 +30,5 @@ void        gtk_shadertoy_set_image_shader (GtkShadertoy *shadertoy,
                                             const char   *shader);
 
 G_END_DECLS
+
+#endif /* __GTK_SHADERTOY_H__ */

demos/gtk-demo/images.c

@@ -354,7 +354,6 @@ do_images (GtkWidget *do_widget)
       gicon = g_themed_icon_new_with_default_fallbacks ("battery-caution-charging-symbolic");
       image = gtk_image_new_from_gicon (gicon);
       gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
-      g_object_unref (gicon);
 
       gtk_frame_set_child (GTK_FRAME (frame), image);
 

demos/gtk-demo/language-names.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef LANGUAGE_NAMES_H
+#define LANGUAGE_NAMES_H
 
 #include <pango/pango.h>
 
@@ -8,3 +9,5 @@ const char * get_language_name (PangoLanguage *language);
 const char * get_language_name_for_tag (guint32 tag);
 
 G_END_DECLS
+
+#endif

demos/gtk-demo/listview_selections.c

@@ -1,5 +1,4 @@
 /* Lists/Selections
- * #Keywords: suggestion, completion
  *
  * The GtkDropDown widget is a modern alternative to GtkComboBox.
  * It uses list models instead of tree models, and the content is

demos/gtk-demo/main.c

@@ -20,12 +20,11 @@
 #include "config.h"
 #include <gtk/gtk.h>
 #include <glib/gstdio.h>
-#include <glib/gi18n.h>
 
 #include "demos.h"
 #include "fontify.h"
 
-#include "profile_conf.h"
+#include "demo_conf.h"
 
 static GtkWidget *info_view;
 static GtkWidget *source_view;
@@ -828,25 +827,13 @@ demo_search_changed_cb (GtkSearchEntry *entry,
   gtk_filter_changed (filter, GTK_FILTER_CHANGE_DIFFERENT);
 }
 
-static gboolean
-demo_can_run (GtkWidget  *window,
-              const char *name)
-{
-  if (name != NULL && strcmp (name, "gltransition") == 0)
-    return GSK_IS_GL_RENDERER (gtk_native_get_renderer (GTK_NATIVE (window)));
-
-  return TRUE;
-}
-
 static GListModel *
-create_demo_model (GtkWidget *window)
+create_demo_model (void)
 {
   GListStore *store = g_list_store_new (GTK_TYPE_DEMO);
   DemoData *demo = gtk_demos;
   GtkDemo *d;
 
-  gtk_widget_realize (window);
-
   d = GTK_DEMO (g_object_new (GTK_TYPE_DEMO, NULL));
   d->name = "main";
   d->title = "GTK Demo";
@@ -858,20 +845,16 @@ create_demo_model (GtkWidget *window)
 
   while (demo->title)
     {
-       DemoData *children = demo->children;
+      d = GTK_DEMO (g_object_new (GTK_TYPE_DEMO, NULL));
+      DemoData *children = demo->children;
 
-      if (demo_can_run (window, demo->name))
-        {
-          d = GTK_DEMO (g_object_new (GTK_TYPE_DEMO, NULL));
+      d->name = demo->name;
+      d->title = demo->title;
+      d->keywords = demo->keywords;
+      d->filename = demo->filename;
+      d->func = demo->func;
 
-          d->name = demo->name;
-          d->title = demo->title;
-          d->keywords = demo->keywords;
-          d->filename = demo->filename;
-          d->func = demo->func;
-
-          g_list_store_append (store, d);
-        }
+      g_list_store_append (store, d);
 
       if (children)
         {
@@ -879,19 +862,15 @@ create_demo_model (GtkWidget *window)
 
           while (children->title)
             {
-              if (demo_can_run (window, children->name))
-                {
-                  GtkDemo *child = GTK_DEMO (g_object_new (GTK_TYPE_DEMO, NULL));
+              GtkDemo *child = GTK_DEMO (g_object_new (GTK_TYPE_DEMO, NULL));
 
-                  child->name = children->name;
-                  child->title = children->title;
-                  child->keywords = children->keywords;
-                  child->filename = children->filename;
-                  child->func = children->func;
-
-                  g_list_store_append (G_LIST_STORE (d->children_model), child);
-                }
+              child->name = children->name;
+              child->title = children->title;
+              child->keywords = children->keywords;
+              child->filename = children->filename;
+              child->func = children->func;
 
+              g_list_store_append (G_LIST_STORE (d->children_model), child);
               children++;
             }
         }
@@ -924,34 +903,6 @@ clear_search (GtkSearchBar *bar)
     }
 }
 
-static void
-search_results_update (GObject    *filter_model,
-                       GParamSpec *pspec,
-                       GtkEntry   *entry)
-{
-  gsize n_items = g_list_model_get_n_items (G_LIST_MODEL (filter_model));
-
-  if (strlen (gtk_editable_get_text (GTK_EDITABLE (entry))) > 0)
-    {
-      char *text;
-
-      if (n_items > 0)
-        text = g_strdup_printf (ngettext ("%ld search result", "%ld search results", n_items), n_items);
-      else
-        text = g_strdup (_("No search results"));
-
-      gtk_accessible_update_property (GTK_ACCESSIBLE (entry),
-                                      GTK_ACCESSIBLE_PROPERTY_DESCRIPTION, text,
-                                      -1);
-
-      g_free (text);
-    }
-  else
-    {
-      gtk_accessible_reset_property (GTK_ACCESSIBLE (entry), GTK_ACCESSIBLE_PROPERTY_DESCRIPTION);
-    }
-}
-
 static void
 activate (GApplication *app)
 {
@@ -985,7 +936,7 @@ activate (GApplication *app)
   search_bar = GTK_WIDGET (gtk_builder_get_object (builder, "searchbar"));
   g_signal_connect (search_bar, "notify::search-mode-enabled", G_CALLBACK (clear_search), NULL);
 
-  listmodel = create_demo_model (window);
+  listmodel = create_demo_model ();
   treemodel = gtk_tree_list_model_new (G_LIST_MODEL (listmodel),
                                        FALSE,
                                        TRUE,
@@ -999,7 +950,6 @@ activate (GApplication *app)
 
   search_entry = GTK_WIDGET (gtk_builder_get_object (builder, "search-entry"));
   g_signal_connect (search_entry, "search-changed", G_CALLBACK (demo_search_changed_cb), filter);
-  g_signal_connect (filter_model, "notify::n-items", G_CALLBACK (search_results_update), search_entry);
 
   selection = gtk_single_selection_new (G_LIST_MODEL (filter_model));
   g_signal_connect (selection, "notify::selected-item", G_CALLBACK (selection_cb), NULL);

demos/gtk-demo/menus.ui

@@ -2,7 +2,7 @@
 <interface>
   <menu id="menubar">
     <submenu>
-      <attribute name="label" translatable="yes">_File</attribute>
+      <attribute name="label" translatable="yes">_Application</attribute>
       <section>
         <item>
           <attribute name="label" translatable="yes">_New</attribute>
@@ -33,7 +33,7 @@
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">_Preferences</attribute>
+      <attribute name="label" translatable="yes">_File</attribute>
       <section>
         <item>
           <attribute name="label" translatable="yes">_Prefer Dark Theme</attribute>

demos/gtk-demo/meson.build

@@ -236,7 +236,7 @@ foreach flag: common_cflags
   endif
 endforeach
 
-gtkdemo_deps += [ profile_conf_h ]
+gtkdemo_deps += [ demo_conf_h ]
 
 executable('gtk4-demo',
   sources: [demos, demos_h, extra_demo_sources, gtkdemo_resources],

demos/gtk-demo/paintable.c

@@ -53,9 +53,7 @@ gtk_nuclear_snapshot (GtkSnapshot   *snapshot,
                       double         rotation)
 {
 #define RADIUS 0.3
-  GskPathBuilder *builder;
-  GskPath *path;
-  GskStroke *stroke;
+  cairo_t *cr;
   double size;
 
   gtk_snapshot_append_color (snapshot,
@@ -63,29 +61,24 @@ gtk_nuclear_snapshot (GtkSnapshot   *snapshot,
                              &GRAPHENE_RECT_INIT (0, 0, width, height));
 
   size = MIN (width, height);
+  cr = gtk_snapshot_append_cairo (snapshot,
+                                  &GRAPHENE_RECT_INIT ((width - size) / 2.0,
+                                                       (height - size) / 2.0,
+                                                       size, size));
+  gdk_cairo_set_source_rgba (cr, foreground);
+  cairo_translate (cr, width / 2.0, height / 2.0);
+  cairo_scale (cr, size, size);
+  cairo_rotate (cr, rotation);
 
-  gtk_snapshot_save (snapshot);
+  cairo_arc (cr, 0, 0, 0.1, - G_PI, G_PI);
+  cairo_fill (cr);
 
-  gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (width / 2.0, height / 2.0));
-  gtk_snapshot_scale (snapshot, size, size);
-  gtk_snapshot_rotate (snapshot, rotation);
+  cairo_set_line_width (cr, RADIUS);
+  cairo_set_dash (cr, (double[1]) { RADIUS * G_PI / 3 }, 1, 0.0);
+  cairo_arc (cr, 0, 0, RADIUS, - G_PI, G_PI);
+  cairo_stroke (cr);
 
-  builder = gsk_path_builder_new ();
-  gsk_path_builder_add_circle (builder, graphene_point_zero (), 0.1);
-  path = gsk_path_builder_free_to_path (builder);
-  gtk_snapshot_append_fill (snapshot, path, GSK_FILL_RULE_WINDING, foreground);
-  gsk_path_unref (path);
-
-  stroke = gsk_stroke_new (RADIUS);
-  gsk_stroke_set_dash (stroke, (float[1]) { RADIUS * G_PI / 3 }, 1);
-  builder = gsk_path_builder_new ();
-  gsk_path_builder_add_circle (builder, graphene_point_zero(), RADIUS);
-  path = gsk_path_builder_free_to_path (builder);
-  gtk_snapshot_append_stroke (snapshot, path, stroke, foreground);
-  gsk_path_unref (path);
-  gsk_stroke_free (stroke);
-
-  gtk_snapshot_restore (snapshot);
+  cairo_destroy (cr);
 }
 
 /* Here, we implement the functionality required by the GdkPaintable interface */

demos/gtk-demo/paintable.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __PAINTABLE_H__
+#define __PAINTABLE_H__
 
 #include <gtk/gtk.h>
 
@@ -12,3 +13,5 @@ void            gtk_nuclear_snapshot           (GtkSnapshot     *snapshot,
 GdkPaintable *  gtk_nuclear_icon_new            (double          rotation);
 GdkPaintable *  gtk_nuclear_animation_new       (gboolean        draw_background);
 GtkMediaStream *gtk_nuclear_media_stream_new    (void);
+
+#endif /* __PAINTABLE_H__ */

demos/gtk-demo/paintable_animated.c

@@ -70,7 +70,7 @@ gtk_nuclear_animation_snapshot (GdkPaintable *paintable,
                           ? &(GdkRGBA) { 0.9, 0.75, 0.15, 1.0 } /* yellow */
                           : &(GdkRGBA) { 0, 0, 0, 0 }, /* transparent */
                         width, height,
-                        360 * nuclear->progress / MAX_PROGRESS);
+                        2 * G_PI * nuclear->progress / MAX_PROGRESS);
 }
 
 static GdkPaintable *
@@ -85,7 +85,7 @@ gtk_nuclear_animation_get_current_image (GdkPaintable *paintable)
    * Luckily we added the rotation property to the nuclear icon
    * object previously, so we can just return an instance of that one.
    */
-  return gtk_nuclear_icon_new (360 * nuclear->progress / MAX_PROGRESS);
+  return gtk_nuclear_icon_new (2 * G_PI * nuclear->progress / MAX_PROGRESS);
 }
 
 static GdkPaintableFlags

demos/gtk-demo/paintable_mediastream.c

@@ -76,7 +76,7 @@ gtk_nuclear_media_stream_snapshot (GdkPaintable *paintable,
                         &(GdkRGBA) { 0, 0, 0, 1 }, /* black */
                         &(GdkRGBA) { 0.9, 0.75, 0.15, 1.0 }, /* yellow */
                         width, height,
-                        360 * nuclear->progress / DURATION);
+                        2 * G_PI * nuclear->progress / DURATION);
 }
 
 static GdkPaintable *
@@ -85,7 +85,7 @@ gtk_nuclear_media_stream_get_current_image (GdkPaintable *paintable)
   GtkNuclearMediaStream *nuclear = GTK_NUCLEAR_MEDIA_STREAM (paintable);
 
   /* Same thing as with the animation */
-  return gtk_nuclear_icon_new (360 * nuclear->progress / DURATION);
+  return gtk_nuclear_icon_new (2 * G_PI * nuclear->progress / DURATION);
 }
 
 static GdkPaintableFlags

demos/gtk-demo/path_fill.c

@@ -2,13 +2,10 @@
  *
  * This demo shows how to use GskPath to draw shapes that are (a bit)
  * more complex than a rounded rectangle.
- *
- * It also demonstrates printing to a stream with GtkPrintDialog.
  */
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <cairo-pdf.h>
 
 #include "paintable.h"
 
@@ -168,89 +165,6 @@ gtk_logo_paintable_new (void)
   return GDK_PAINTABLE (self);
 }
 
-static cairo_status_t
-write_cairo (void                *closure,
-             const unsigned char *data,
-             unsigned int         length)
-{
-  GOutputStream *stream = closure;
-  gsize written;
-  GError *error = NULL;
-
-  if (!g_output_stream_write_all (stream, data, length, &written, NULL, &error))
-    {
-      g_print ("Error writing pdf stream: %s\n", error->message);
-      g_error_free (error);
-      return CAIRO_STATUS_WRITE_ERROR;
-    }
-
-  return CAIRO_STATUS_SUCCESS;
-}
-
-static void
-print_ready (GObject      *source,
-             GAsyncResult *result,
-             gpointer      data)
-{
-  GtkPrintDialog *dialog = GTK_PRINT_DIALOG (source);
-  GError *error = NULL;
-  GOutputStream *stream;
-  GtkSnapshot *snapshot;
-  GdkPaintable *paintable;
-  GskRenderNode *node;
-  cairo_surface_t *surface;
-  cairo_t *cr;
-
-  stream = gtk_print_dialog_print_finish (dialog, result, &error);
-  if (stream == NULL)
-    {
-      g_print ("Failed to get output stream: %s\n", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  snapshot = gtk_snapshot_new ();
-  paintable = gtk_picture_get_paintable (GTK_PICTURE (data));
-  gdk_paintable_snapshot (paintable, snapshot, 100, 100);
-  node = gtk_snapshot_free_to_node (snapshot);
-
-  surface = cairo_pdf_surface_create_for_stream (write_cairo, stream, 100, 100);
-  cr = cairo_create (surface);
-
-  gsk_render_node_draw (node, cr);
-
-  cairo_destroy (cr);
-  cairo_surface_destroy (surface);
-  gsk_render_node_unref (node);
-
-  if (!g_output_stream_close (stream, NULL, &error))
-    {
-      g_print ("Error from close: %s\n", error->message);
-      g_error_free (error);
-    }
-
-  g_object_unref (stream);
-}
-
-static void
-print (GtkButton *button,
-       gpointer   data)
-{
-  GtkWidget *picture = data;
-  GtkPrintDialog *dialog;
-
-  dialog = gtk_print_dialog_new ();
-
-  gtk_print_dialog_print (dialog,
-                          GTK_WINDOW (gtk_widget_get_root (picture)),
-                          NULL,
-                          NULL,
-                          print_ready,
-                          picture);
-
-  g_object_unref (dialog);
-}
-
 GtkWidget *
 do_path_fill (GtkWidget *do_widget)
 {
@@ -258,21 +172,12 @@ do_path_fill (GtkWidget *do_widget)
 
   if (!window)
     {
-      GtkWidget *header, *button, *label;
       GtkWidget *picture;
       GdkPaintable *paintable;
 
       window = gtk_window_new ();
-      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-      gtk_window_set_default_size (GTK_WINDOW (window), 100, 100);
+      gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
       gtk_window_set_title (GTK_WINDOW (window), "Fill and Stroke");
-      header = gtk_header_bar_new ();
-      button = gtk_button_new_from_icon_name ("printer-symbolic");
-      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), button);
-      label = gtk_label_new ("Fill and Stroke");
-      gtk_widget_add_css_class (label, "title");
-      gtk_header_bar_set_title_widget (GTK_HEADER_BAR (header), label);
-      gtk_window_set_titlebar (GTK_WINDOW (window), header);
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       paintable = gtk_logo_paintable_new ();
@@ -281,8 +186,6 @@ do_path_fill (GtkWidget *do_widget)
       gtk_picture_set_can_shrink (GTK_PICTURE (picture), FALSE);
       g_object_unref (paintable);
 
-      g_signal_connect (button, "clicked", G_CALLBACK (print), picture);
-
       gtk_window_set_child (GTK_WINDOW (window), picture);
     }
 

demos/gtk-demo/path_maze.c

@@ -338,7 +338,7 @@ do_path_maze (GtkWidget *do_widget)
       GskPath *path;
 
       window = gtk_window_new ();
-      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+      gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
       gtk_window_set_title (GTK_WINDOW (window), "Follow the maze with the mouse");
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 

demos/gtk-demo/path_spinner.c

@@ -9,8 +9,6 @@
 
 #include "paintable.h"
 
-#undef SHOW_CONTROLS
-
 #define GTK_TYPE_SPINNER_PAINTABLE (gtk_spinner_paintable_get_type ())
 G_DECLARE_FINAL_TYPE (GtkSpinnerPaintable, gtk_spinner_paintable, GTK, SPINNER_PAINTABLE, GObject)
 
@@ -152,7 +150,6 @@ static gboolean
 add_controls (GskPathOperation        op,
               const graphene_point_t *pts,
               gsize                   n_pts,
-              float                   weight,
               gpointer                data)
 {
   GskPathBuilder *builder = data;
@@ -169,7 +166,7 @@ add_controls (GskPathOperation        op,
       break;
 
     case GSK_PATH_QUAD:
-    case GSK_PATH_CONIC:
+    case GSK_PATH_ARC:
       gsk_path_builder_line_to (builder, pts[1].x, pts[1].y);
       gsk_path_builder_line_to (builder, pts[2].x, pts[2].y);
       break;

demos/gtk-demo/pickers.c

@@ -1,9 +1,8 @@
 /* Pickers and Launchers
- * #Keywords: GtkColorDialog, GtkFontDialog, GtkFileDialog, GtkPrintDialog, GtkFileLauncher, GtkUriLauncher
+ * #Keywords: GtkColorDialog, GtkFontDialog, GtkFileDialog, GtkFileLauncher, GtkUriLauncher
  *
  * The dialogs are mainly intended for use in preference dialogs.
- * They allow to select colors, fonts and files. There is also a
- * print dialog.
+ * They allow to select colors, fonts and applications.
  *
  * The launchers let you open files or URIs in applications that
  * can handle them.
@@ -12,13 +11,11 @@
 #include <gtk/gtk.h>
 
 static GtkWidget *app_picker;
-static GtkWidget *print_button;
 
 static void
 set_file (GFile    *file,
           gpointer  data)
 {
-  GFileInfo *info;
   char *name;
 
   if (!file)
@@ -34,13 +31,6 @@ set_file (GFile    *file,
 
   gtk_widget_set_sensitive (app_picker, TRUE);
   g_object_set_data_full (G_OBJECT (app_picker), "file", g_object_ref (file), g_object_unref);
-
-  info = g_file_query_info (file, "standard::content-type", 0, NULL, NULL);
-  if (strcmp (g_file_info_get_content_type (info), "application/pdf") == 0)
-    {
-      gtk_widget_set_sensitive (print_button, TRUE);
-      g_object_set_data_full (G_OBJECT (print_button), "file", g_object_ref (file), g_object_unref);
-    }
 }
 
 static void
@@ -57,10 +47,6 @@ file_opened (GObject *source,
     {
       g_print ("%s\n", error->message);
       g_error_free (error);
-      gtk_widget_set_sensitive (app_picker, FALSE);
-      g_object_set_data (G_OBJECT (app_picker), "file", NULL);
-      gtk_widget_set_sensitive (print_button, FALSE);
-      g_object_set_data (G_OBJECT (print_button), "file", NULL);
     }
 
   set_file (file, data);
@@ -128,53 +114,6 @@ open_app (GtkButton *picker)
   g_object_unref (launcher);
 }
 
-static void
-print_file_done (GObject      *source,
-                 GAsyncResult *result,
-                 gpointer      data)
-{
-  GtkPrintDialog *dialog = GTK_PRINT_DIALOG (source);
-  GError *error = NULL;
-  GCancellable *cancellable;
-  unsigned int id;
-
-  cancellable = g_task_get_cancellable (G_TASK (result));
-  id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (cancellable), "timeout"));
-  if (id)
-    g_source_remove (id);
-
-  if (!gtk_print_dialog_print_file_finish (dialog, result, &error))
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-    }
-}
-
-static void
-print_file (GtkButton *picker)
-{
-  GtkWindow *parent = GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (picker)));
-  GtkPrintDialog *dialog;
-  GCancellable *cancellable;
-  GFile *file;
-  unsigned int id;
-
-  file = G_FILE (g_object_get_data (G_OBJECT (picker), "file"));
-  dialog = gtk_print_dialog_new ();
-
-  cancellable = g_cancellable_new ();
-
-  id = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT,
-                                   20,
-                                   abort_mission, g_object_ref (cancellable), g_object_unref);
-  g_object_set_data (G_OBJECT (cancellable), "timeout", GUINT_TO_POINTER (id));
-
-  gtk_print_dialog_print_file (dialog, parent, NULL, file, cancellable, print_file_done, NULL);
-
-  g_object_unref (cancellable);
-  g_object_unref (dialog);
-}
-
 static void
 open_uri_done (GObject      *source,
                GAsyncResult *result,
@@ -295,15 +234,9 @@ do_pickers (GtkWidget *do_widget)
     gtk_widget_set_sensitive (app_picker, FALSE);
     g_signal_connect (app_picker, "clicked", G_CALLBACK (open_app), NULL);
     gtk_box_append (GTK_BOX (picker), app_picker);
-
-    print_button = gtk_button_new_from_icon_name ("printer-symbolic");
-    gtk_widget_set_tooltip_text (print_button, "Print file");
-    gtk_widget_set_sensitive (print_button, FALSE);
-    g_signal_connect (print_button, "clicked", G_CALLBACK (print_file), NULL);
-    gtk_box_append (GTK_BOX (picker), print_button);
-
     gtk_grid_attach (GTK_GRID (table), picker, 1, 2, 1, 1);
 
+
     label = gtk_label_new ("URI:");
     gtk_widget_set_halign (label, GTK_ALIGN_START);
     gtk_widget_set_valign (label, GTK_ALIGN_CENTER);

demos/gtk-demo/puzzlepiece.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __PUZZLE_PIECE_H__
+#define __PUZZLE_PIECE_H__
 
 #include <gtk/gtk.h>
 
@@ -18,3 +19,5 @@ GdkPaintable *  gtk_puzzle_piece_new            (GdkPaintable           *puzzle,
 GdkPaintable *  gtk_puzzle_piece_get_puzzle     (GtkPuzzlePiece         *self);
 guint           gtk_puzzle_piece_get_x          (GtkPuzzlePiece         *self);
 guint           gtk_puzzle_piece_get_y          (GtkPuzzlePiece         *self);
+
+#endif /* __PUZZLE_PIECE_H__ */

demos/gtk-demo/script-names.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef SCRIPT_NAMES_H
+#define SCRIPT_NAMES_H
 
 #include <glib.h>
 
@@ -8,3 +9,5 @@ const char * get_script_name (GUnicodeScript script);
 const char * get_script_name_for_tag (guint32 tag);
 
 G_END_DECLS
+
+#endif

demos/gtk-demo/shadertoy.c

@@ -120,7 +120,7 @@ create_shadertoy_window (GtkWidget *do_widget)
   gtk_box_append (GTK_BOX (box), aspect);
 
   shadertoy = new_shadertoy ("/shadertoy/alienplanet.glsl");
-  gtk_aspect_frame_set_child (GTK_ASPECT_FRAME (aspect), gtk_graphics_offload_new (shadertoy));
+  gtk_aspect_frame_set_child (GTK_ASPECT_FRAME (aspect), shadertoy);
 
   sw = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (sw), 250);

demos/gtk-demo/video_player.c

@@ -139,7 +139,6 @@ do_video_player (GtkWidget *do_widget)
 
       video = gtk_video_new ();
       gtk_video_set_autoplay (GTK_VIDEO (video), TRUE);
-      gtk_video_set_graphics_offload (GTK_VIDEO (video), GTK_GRAPHICS_OFFLOAD_ENABLED);
       gtk_window_set_child (GTK_WINDOW (window), video);
 
       title = gtk_header_bar_new ();

demos/icon-browser/iconbrowserapp.c

@@ -4,7 +4,7 @@
 #include "iconbrowserapp.h"
 #include "iconbrowserwin.h"
 
-#include "profile_conf.h"
+#include "demo_conf.h"
 
 struct _IconBrowserApp
 {

demos/icon-browser/iconbrowserapp.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __ICON_BROWSER_APP_H
+#define __ICON_BROWSER_APP_H
 
 #include <gtk/gtk.h>
 
@@ -13,3 +14,6 @@ typedef struct _IconBrowserAppClass  IconBrowserAppClass;
 
 GType           icon_browser_app_get_type    (void);
 IconBrowserApp *icon_browser_app_new         (void);
+
+
+#endif /* __ICON_BROWSER_APP_H */

demos/icon-browser/iconbrowserwin.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __ICON_BROWSER_WIN_H
+#define __ICON_BROWSER_WIN_H
 
 #include <gtk/gtk.h>
 #include "iconbrowserapp.h"
@@ -14,3 +15,6 @@ typedef struct _IconBrowserWindowClass    IconBrowserWindowClass;
 
 GType              icon_browser_window_get_type     (void);
 IconBrowserWindow *icon_browser_window_new          (IconBrowserApp    *app);
+
+
+#endif /* __ICON_BROWSER_WIN_H */

demos/icon-browser/meson.build

@@ -14,7 +14,7 @@ iconbrowser_resources = gnome.compile_resources('iconbrowser_resources',
 executable('gtk4-icon-browser',
   sources: [iconbrowser_sources, iconbrowser_resources],
   c_args: common_cflags,
-  dependencies: [ libgtk_dep, profile_conf_h ],
+  dependencies: [ libgtk_dep, demo_conf_h ],
   include_directories: confinc,
   win_subsystem: 'windows',
   link_args: extra_demo_ldflags,

demos/meson.build

@@ -1,3 +1,16 @@
+gen_demo_header = find_program('../build-aux/meson/gen-demo-header.py')
+demo_profile = get_option('demo-profile')
+
+demo_conf_h = declare_dependency(
+  sources: custom_target('demo-header',
+    command: [gen_demo_header, meson.project_source_root(), demo_profile],
+    capture: true,
+    output: 'demo_conf.h',
+    build_by_default: true,
+    build_always_stale: true,
+  )
+)
+
 # appdata
 
 appdata_config = configuration_data()

demos/node-editor/gtkrendererpaintableprivate.h

@@ -17,7 +17,8 @@
  * Authors: Benjamin Otte <otte@gnome.org>
  */
 
-#pragma once
+#ifndef __GTK_RENDERER_PAINTABLE_H__
+#define __GTK_RENDERER_PAINTABLE_H__
 
 #include <gsk/gsk.h>
 
@@ -38,3 +39,5 @@ void            gtk_renderer_paintable_set_paintable      (GtkRendererPaintable
 GdkPaintable *  gtk_renderer_paintable_get_paintable      (GtkRendererPaintable *self) G_GNUC_PURE;
 
 G_END_DECLS
+
+#endif /* __GTK_RENDERER_PAINTABLE_H__ */

demos/node-editor/meson.build

@@ -12,7 +12,7 @@ node_editor_resources = gnome.compile_resources('node_editor_resources',
 
 executable('gtk4-node-editor',
   sources: [node_editor_sources, node_editor_resources],
-  dependencies: [ libgtk_dep, profile_conf_h ],
+  dependencies: [ libgtk_dep, demo_conf_h ],
   include_directories: confinc,
   c_args: common_cflags,
   win_subsystem: 'windows',