From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 10 May 2023 01:39:20 +0000 (-0400)
Subject: build: Rename another option
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~281^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ba6a618d44720cfaca7d80cad77431ac756a8b2f;p=gtk4.git

build: Rename another option
---

diff --git a/build-aux/flatpak/org.gtk.Demo4.json b/build-aux/flatpak/org.gtk.Demo4.json
index 457dfd64b8..5c75ece589 100644
--- a/build-aux/flatpak/org.gtk.Demo4.json
+++ b/build-aux/flatpak/org.gtk.Demo4.json
@@ -187,7 +187,7 @@
                 "--libdir=/app/lib",
                 "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
             ],
             "sources" : [
                 {
diff --git a/build-aux/flatpak/org.gtk.IconBrowser4.json b/build-aux/flatpak/org.gtk.IconBrowser4.json
index 00cdf9f110..b563dbb285 100644
--- a/build-aux/flatpak/org.gtk.IconBrowser4.json
+++ b/build-aux/flatpak/org.gtk.IconBrowser4.json
@@ -116,7 +116,7 @@
                 "--libdir=/app/lib",
                 "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
             ],
             "sources" : [
                 {
diff --git a/build-aux/flatpak/org.gtk.WidgetFactory4.json b/build-aux/flatpak/org.gtk.WidgetFactory4.json
index cdca2010ee..390da50cac 100644
--- a/build-aux/flatpak/org.gtk.WidgetFactory4.json
+++ b/build-aux/flatpak/org.gtk.WidgetFactory4.json
@@ -116,7 +116,7 @@
                 "--libdir=/app/lib",
                 "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
             ],
             "sources" : [
                 {
diff --git a/build-aux/flatpak/org.gtk.gtk4.NodeEditor.json b/build-aux/flatpak/org.gtk.gtk4.NodeEditor.json
index bff6b20be3..ef60c66084 100644
--- a/build-aux/flatpak/org.gtk.gtk4.NodeEditor.json
+++ b/build-aux/flatpak/org.gtk.gtk4.NodeEditor.json
@@ -116,7 +116,7 @@
                 "--libdir=/app/lib",
                 "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
             ],
             "sources" : [
                 {
diff --git a/demos/meson.build b/demos/meson.build
index 91eb3c465c..d4c04d2b8b 100644
--- a/demos/meson.build
+++ b/demos/meson.build
@@ -1,5 +1,5 @@
 gen_demo_header = find_program('../build-aux/meson/gen-demo-header.py')
-demo_profile = get_option('profile')
+demo_profile = get_option('demo-profile')
 
 demo_conf_h = declare_dependency(
   sources: custom_target('demo-header',
diff --git a/meson_options.txt b/meson_options.txt
index 1526a351bc..f4399d39df 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -108,7 +108,7 @@ option('introspection',
 
 # Demos, examples and tests
 
-option('profile',
+option('demo-profile',
        type: 'combo',
        choices: [ 'default', 'devel' ],
        value: 'default',
@@ -119,6 +119,12 @@ option('build-demos',
        value: true,
        description : 'Build demo programs')
 
+option('profile',
+       type: 'combo',
+       choices: [ 'default', 'devel' ],
+       value: 'default',
+       deprecated: 'demo-profile')
+
 option('demos',
        type: 'boolean',
        value: true,