[vte] app: Fork UI files for gtk3

[Christian Persch <chpe src gnome org>]

commit d2d7d0e6e9bd92347d5e38e3c25a5979922f2f33
Author: Christian Persch <chpe src gnome org>
Date:   Sun Oct 25 22:25:30 2020 +0100

    app: Fork UI files for gtk3
    
    Unfortunately, gtk4-build-tool 3to4 doesn't actually produce a working
    UI file for gtk4, so it'll be necessary to adjust them by hand. Fork
    the UI files so that they have different names for gtk3 (and later gtk4).
    
    [gtk4 preparation]

 src/app/{app.gresource.xml => app-gtk3.gresource.xml} |  6 +++---
 src/app/{appmenu.ui => appmenu-gtk3.ui}               |  0
 src/app/meson.build                                   | 18 +++++++++---------
 src/app/{search-popover.ui => search-popover-gtk3.ui} |  0
 src/app/{window.ui => window-gtk3.ui}                 |  0
 5 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/src/app/app.gresource.xml b/src/app/app-gtk3.gresource.xml
similarity index 88%
rename from src/app/app.gresource.xml
rename to src/app/app-gtk3.gresource.xml
index 4b69e565..d743e295 100644
--- a/src/app/app.gresource.xml
+++ b/src/app/app-gtk3.gresource.xml
@@ -17,8 +17,8 @@
 -->
 <gresources>
   <gresource prefix="/org/gnome/vte/app">
-    <file alias="ui/search-popover.ui" compressed="true" 
preprocess="xml-stripblanks">search-popover.ui</file>
-    <file alias="ui/window.ui" compressed="true" preprocess="xml-stripblanks">window.ui</file>
-    <file alias="gtk/menus.ui" compressed="true" preprocess="xml-stripblanks">appmenu.ui</file>
+    <file alias="ui/search-popover.ui" compressed="true" 
preprocess="xml-stripblanks">search-popover-gtk3.ui</file>
+    <file alias="ui/window.ui" compressed="true" preprocess="xml-stripblanks">window-gtk3.ui</file>
+    <file alias="gtk/menus.ui" compressed="true" preprocess="xml-stripblanks">appmenu-gtk3.ui</file>
   </gresource>
 </gresources>
diff --git a/src/app/appmenu.ui b/src/app/appmenu-gtk3.ui
similarity index 100%
rename from src/app/appmenu.ui
rename to src/app/appmenu-gtk3.ui
diff --git a/src/app/meson.build b/src/app/meson.build
index 8ecd239c..41923442 100644
--- a/src/app/meson.build
+++ b/src/app/meson.build
@@ -18,12 +18,6 @@ app_sources = config_sources + glib_glue_sources + libc_glue_sources + pango_glu
   'app.cc',
 )
 
-app_resource_data = files(
-  'appmenu.ui',
-  'search-popover.ui',
-  'window.ui',
-)
-
 app_common_cppflags = [
   '-DG_LOG_DOMAIN="VTE"',
   '-DLOCALEDIR="@0@"'.format(vte_prefix / vte_localedir),
@@ -36,11 +30,17 @@ app_common_deps = [
 
 if get_option('gtk3')
 
+  app_gtk3_resource_data = files(
+    'appmenu-gtk3.ui',
+    'search-popover-gtk3.ui',
+    'window-gtk3.ui',
+  )
+
   app_gtk3_resource_sources = gnome.compile_resources(
-    'resources.cc',
-    'app.gresource.xml',
+    'resources-gtk3.cc',
+    'app-gtk3.gresource.xml',
     c_name: 'app',
-    dependencies: app_resource_data,
+    dependencies: app_gtk3_resource_data,
   )
 
   app_gtk3_sources = app_sources + app_gtk3_resource_sources
diff --git a/src/app/search-popover.ui b/src/app/search-popover-gtk3.ui
similarity index 100%
rename from src/app/search-popover.ui
rename to src/app/search-popover-gtk3.ui
diff --git a/src/app/window.ui b/src/app/window-gtk3.ui
similarity index 100%
rename from src/app/window.ui
rename to src/app/window-gtk3.ui