[epiphany/wip/exalm/gtk4: 6/7] Bootstrap GTK4 port




commit c012764c22d64e4da3e1e71899dbda97642ea222
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Mon Nov 29 12:20:58 2021 +0500

    Bootstrap GTK4 port
    
    Comment everything out. We'll uncomment files one by one and port them.

 embed/meson.build       |  3 +-
 lib/meson.build         | 77 ++++++++++++++++++++++++-------------------------
 lib/widgets/meson.build |  2 --
 meson.build             | 27 +++++++----------
 src/meson.build         |  2 +-
 5 files changed, 50 insertions(+), 61 deletions(-)
---
diff --git a/embed/meson.build b/embed/meson.build
index 28b95859c..68d6ec447 100644
--- a/embed/meson.build
+++ b/embed/meson.build
@@ -34,12 +34,11 @@ libephyembed_sources = [
 
 libephyembed_deps = [
   config_h,
-  libdazzle_dep,
   ephymisc_dep,
   gio_dep,
   glib_dep,
   gtk_dep,
-  libhandy_dep,
+  libadwaita_dep,
   libsecret_dep,
   libsoup_dep,
   m_dep,
diff --git a/lib/meson.build b/lib/meson.build
index 894589a1a..015227f14 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -10,42 +10,42 @@ enums = gnome.mkenums_simple('ephy-lib-type-builtins',
 )
 
 libephymisc_sources = [
-  'contrib/gnome-languages.c',
-  'ephy-debug.c',
-  'ephy-dnd.c',
-  'ephy-favicon-helpers.c',
-  'ephy-file-helpers.c',
-  'ephy-flatpak-utils.c',
-  'ephy-gui.c',
-  'ephy-langs.c',
-  'ephy-notification.c',
-  'ephy-notification-container.c',
-  'ephy-permissions-manager.c',
-  'ephy-profile-utils.c',
-  'ephy-search-engine-manager.c',
-  'ephy-security-levels.c',
-  'ephy-settings.c',
-  'ephy-signal-accumulator.c',
-  'ephy-smaps.c',
-  'ephy-snapshot-service.c',
-  'ephy-sqlite-connection.c',
-  'ephy-sqlite-statement.c',
-  'ephy-string.c',
-  'ephy-suggestion.c',
-  'ephy-sync-utils.c',
-  'ephy-time-helpers.c',
-  'ephy-uri-helpers.c',
-  'ephy-user-agent.c',
-  'ephy-web-app-utils.c',
-  'ephy-zoom.c',
-  'history/ephy-history-service.c',
-  'history/ephy-history-service-hosts-table.c',
-  'history/ephy-history-service-urls-table.c',
-  'history/ephy-history-service-visits-table.c',
-  'history/ephy-history-types.c',
-  'safe-browsing/ephy-gsb-service.c',
-  'safe-browsing/ephy-gsb-storage.c',
-  'safe-browsing/ephy-gsb-utils.c',
+#  'contrib/gnome-languages.c',
+#  'ephy-debug.c',
+#  'ephy-dnd.c',
+#  'ephy-favicon-helpers.c',
+#  'ephy-file-helpers.c',
+#  'ephy-flatpak-utils.c',
+#  'ephy-gui.c',
+#  'ephy-langs.c',
+#  'ephy-notification.c',
+#  'ephy-notification-container.c',
+#  'ephy-permissions-manager.c',
+#  'ephy-profile-utils.c',
+#  'ephy-search-engine-manager.c',
+#  'ephy-security-levels.c',
+#  'ephy-settings.c',
+#  'ephy-signal-accumulator.c',
+#  'ephy-smaps.c',
+#  'ephy-snapshot-service.c',
+#  'ephy-sqlite-connection.c',
+#  'ephy-sqlite-statement.c',
+#  'ephy-string.c',
+#  'ephy-suggestion.c',
+#  'ephy-sync-utils.c',
+#  'ephy-time-helpers.c',
+#  'ephy-uri-helpers.c',
+#  'ephy-user-agent.c',
+#  'ephy-web-app-utils.c',
+#  'ephy-zoom.c',
+#  'history/ephy-history-service.c',
+#  'history/ephy-history-service-hosts-table.c',
+#  'history/ephy-history-service-urls-table.c',
+#  'history/ephy-history-service-visits-table.c',
+#  'history/ephy-history-types.c',
+#  'safe-browsing/ephy-gsb-service.c',
+#  'safe-browsing/ephy-gsb-storage.c',
+#  'safe-browsing/ephy-gsb-utils.c',
   enums
 ]
 
@@ -59,7 +59,6 @@ libephymisc_deps = [
   gsettings_desktop_schemas,
   gtk_dep,
   json_glib_dep,
-  libdazzle_dep,
   libsecret_dep,
   libsoup_dep,
   libxml_dep,
@@ -93,5 +92,5 @@ ephymisc_dep = declare_dependency(
   sources: enums
 )
 
-subdir('sync')
-subdir('widgets')
+#subdir('sync')
+#subdir('widgets')
diff --git a/lib/widgets/meson.build b/lib/widgets/meson.build
index 453bc2d7f..5532e8c54 100644
--- a/lib/widgets/meson.build
+++ b/lib/widgets/meson.build
@@ -21,14 +21,12 @@ libephywidgets_sources = [
 ]
 
 libephywidgets_deps = [
-  libdazzle_dep,
   ephymisc_dep,
   gcr_dep,
   gdk_pixbuf_dep,
   gio_dep,
   glib_dep,
   gtk_dep,
-  libdazzle_dep,
   libsoup_dep,
   webkit2gtk_dep,
 ]
diff --git a/meson.build b/meson.build
index 0b9f862b2..e7881d018 100644
--- a/meson.build
+++ b/meson.build
@@ -73,7 +73,7 @@ conf.set_quoted('GSB_API_KEY', gsb_api_key)
 conf.set10('ENABLE_GSB', gsb_api_key != '')
 
 glib_requirement = '>= 2.67.1'
-gtk_requirement = '>= 3.24.0'
+gtk_requirement = '>= 4.5.0'
 nettle_requirement = '>= 3.4'
 webkitgtk_requirement = '>= 2.33.2'
 
@@ -84,29 +84,22 @@ gio_dep = dependency('gio-2.0', version: glib_requirement)
 gio_unix_dep = dependency('gio-unix-2.0', version: glib_requirement)
 glib_dep = dependency('glib-2.0', version: glib_requirement)
 gsettings_desktop_schemas = dependency('gsettings-desktop-schemas')
-gtk_dep = dependency('gtk+-3.0', version: gtk_requirement)
-gtk_unix_print_dep = dependency('gtk+-unix-print-3.0', version: gtk_requirement)
+gtk_dep = dependency('gtk4', version: gtk_requirement)
+gtk_unix_print_dep = dependency('gtk4-unix-print', version: gtk_requirement)
 hogweed_dep = dependency('hogweed', version: nettle_requirement)
 iso_codes_dep = dependency('iso-codes', version: '>= 0.35')
 json_glib_dep = dependency('json-glib-1.0', version: '>= 1.6')
 libarchive_dep = dependency('libarchive')
-libdazzle_dep = dependency('libdazzle-1.0', version: '>= 3.37.1')
-libhandy_dep = dependency('libhandy-1', version: '>= 1.5.0')
+libadwaita_dep = dependency('libadwaita-1', version: '>= 1.0.0')
 libsecret_dep = dependency('libsecret-1', version: '>= 0.19.0')
 libxml_dep = dependency('libxml-2.0', version: '>= 2.6.12')
 nettle_dep = dependency('nettle', version: nettle_requirement)
 portal_dep = dependency('libportal', version: '>= 0.0.2', required: get_option('libportal'))
 sqlite3_dep = dependency('sqlite3', version: '>= 3.22')
 
-if get_option('soup2').enabled()
-  libsoup_dep = dependency('libsoup-2.4', version: '>= 2.48.0')
-  webkit2gtk_dep = dependency('webkit2gtk-4.0', version: webkitgtk_requirement)
-  webkit2gtk_web_extension_dep = dependency('webkit2gtk-web-extension-4.0', version: webkitgtk_requirement)
-else
-  libsoup_dep = dependency('libsoup-3.0', version: '>= 2.99.4')
-  webkit2gtk_dep = dependency('webkit2gtk-4.1', version: webkitgtk_requirement)
-  webkit2gtk_web_extension_dep = dependency('webkit2gtk-web-extension-4.1', version: webkitgtk_requirement)
-endif
+libsoup_dep = dependency('libsoup-3.0', version: '>= 2.99.4')
+webkit2gtk_dep = dependency('webkit2gtk-5.0', version: webkitgtk_requirement)
+webkit2gtk_web_extension_dep = dependency('webkit2gtk-web-extension-5.0', version: webkitgtk_requirement)
 
 conf.set10('USE_LIBPORTAL', portal_dep.found())
 
@@ -146,9 +139,9 @@ subdir('help')
 subdir('po')
 subdir('third-party')
 subdir('lib')
-subdir('embed')
-subdir('src')
-subdir('tests')
+#subdir('embed')
+#subdir('src')
+#subdir('tests')
 
 meson.add_install_script('post_install.py')
 
diff --git a/src/meson.build b/src/meson.build
index eaee92180..30248f58c 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -73,7 +73,7 @@ libephymain_deps = [
   ephywidgets_dep,
   gvdb_dep,
   libarchive_dep,
-  libhandy_dep
+  libadwaita_dep
 ]
 
 libephymain_includes = include_directories(


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]