[ghex/gtk4-port: 1/91] Start gtk4 port. Bump deps to gtk4 minimums.
- From: Logan Rathbone <larathbone src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ghex/gtk4-port: 1/91] Start gtk4 port. Bump deps to gtk4 minimums.
- Date: Thu, 12 Aug 2021 23:35:08 +0000 (UTC)
commit fb0f4b1f0df9773ef46caa1715b5fbe98b6c1f41
Author: Logan Rathbone <poprocks gmail com>
Date: Sat Jan 2 21:08:15 2021 -0500
Start gtk4 port. Bump deps to gtk4 minimums.
data/{gtkhex-3.pc.in => gtkhex-4.pc.in} | 6 +++---
data/meson.build | 4 ++--
meson.build | 8 +++++---
3 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/data/gtkhex-3.pc.in b/data/gtkhex-4.pc.in
similarity index 69%
rename from data/gtkhex-3.pc.in
rename to data/gtkhex-4.pc.in
index 44ccb511..569aea74 100644
--- a/data/gtkhex-3.pc.in
+++ b/data/gtkhex-4.pc.in
@@ -6,8 +6,8 @@ includedir=@includedir@
Name: gtkhex
Description: GtkHex - A hex display widget.
Version: @VERSION@
-Requires: gtk+-3.0
+Requires: gtk4
Requires.private: gail-3.0
-Libs: -L${libdir} -lgtkhex-3
-Cflags: -I${includedir}/gtkhex-3
+Libs: -L${libdir} -lgtkhex-4
+Cflags: -I${includedir}/gtkhex-4
diff --git a/data/meson.build b/data/meson.build
index 36447250..9135a87a 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -34,8 +34,8 @@ pkg_conf.set('includedir', ghex_includedir)
pkg_conf.set('VERSION', meson.project_version())
configure_file(
- input: 'gtkhex-3.pc.in',
- output: 'gtkhex-3.pc',
+ input: 'gtkhex-4.pc.in',
+ output: 'gtkhex-4.pc',
configuration: pkg_conf,
install_dir: ghex_pkgconfigdir,
install: true
diff --git a/meson.build b/meson.build
index 03f657ad..1d86f0ad 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
project(
'ghex', 'c',
- version: '3.18.4',
+ version: '4.alpha.0',
meson_version: '>=0.37.0',
license: 'GPL2'
)
@@ -77,11 +77,13 @@ foreach f : check_functions
endif
endforeach
+# FIXME - REMOVE
atk_dep = dependency('atk', version: '>= 1.0.0')
-gio_dep = dependency('gio-2.0', version: '>= 2.31.10')
-gtk_dep = dependency('gtk+-3.0', version: '>= 3.3.8')
gail_dep = dependency('gail-3.0', version: '>= 1.0.0')
+gio_dep = dependency('gio-2.0', version: '>= 2.66.0')
+gtk_dep = dependency('gtk4', version: '>= 4.0.0')
+
configure_file(
output: 'config.h',
configuration: ghex_conf
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]