summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2026-01-28 11:21:21 +0100
committerGitHub <[email protected]>2026-01-28 11:21:21 +0100
commit92f1d8e710749f43d5bf80afe6955da8785bd63d (patch)
treedb4a6c5682b3d54757c909262c4ecb650326d257
parentf7f056b21b3aec5b6e80d2eaeb34726377c7bba3 (diff)
downloadeom-92f1d8e710749f43d5bf80afe6955da8785bd63d.tar.bz2
eom-92f1d8e710749f43d5bf80afe6955da8785bd63d.tar.xz
CI: fix some workflow issues (#371)
* CI: update NEWS which caused some workflow issues * CI: disable gdk-pixbuf-thumbnailer for meson workflows - gdk-pixbuf-thumbnailer is obsolete and should be replaced with glycin-thumbnailer * meson: Only use girepository-2.0 if libpeas uses it too Fixes header conflicts on systems where glib has girepository-2.0 but libpeas still uses the old gobject-introspection-1.0 headers. --------- Co-authored-by: Victor Kareh <[email protected]>
-rwxr-xr-x.github/workflows/builds.sh2
-rw-r--r--NEWS12
-rw-r--r--meson.build10
3 files changed, 22 insertions, 2 deletions
diff --git a/.github/workflows/builds.sh b/.github/workflows/builds.sh
index c80e76a..ee3ed8b 100755
--- a/.github/workflows/builds.sh
+++ b/.github/workflows/builds.sh
@@ -19,7 +19,7 @@ infoend() {
if [[ -f meson.build && $1 == "meson" ]]; then
infobegin "Configure (meson)"
- meson setup _build --prefix=/usr
+ meson setup _build -Dprefix=/usr -Dgdk-pixbuf-thumbnailer=false
infoend
infobegin "Build (meson)"
diff --git a/NEWS b/NEWS
index 29f93d6..71bd061 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+### eom 1.28.1
+
+ * Release 1.28.1
+ * Update translations
+ * plugins: Support building against newer libpeas1 versions
+ * eom-window: Add additional key codes for image switching using mouse buttons
+ * Eom*: Use fast content type as fallback
+ * EomUtil: Add helper to get content type from GFileInfos
+ * Add 'preserve-order' flag to allow viewing order specified on cmd line (#354)
+ * CI: drop travis CI
+ * CI: use github action
+
### eom 1.28.0
* Translations update
diff --git a/meson.build b/meson.build
index a22ddc9..9df0dff 100644
--- a/meson.build
+++ b/meson.build
@@ -178,9 +178,17 @@ endif
if gobject_introspection.found()
conf.set('HAVE_INTROSPECTION', 1)
# Check for girepository-2.0 API (moved to glib in version 1.80+)
+ # We can only use girepository-2.0 if libpeas also uses it, otherwise we get conflicts
girepository2 = dependency('girepository-2.0', required: false)
if girepository2.found()
- conf.set('HAVE_GIREPOSITORY_2', 1)
+ # Check if libpeas requires girepository-2.0
+ pkgconfig = find_program('pkg-config', required: false)
+ if pkgconfig.found()
+ libpeas_requires = run_command(pkgconfig, '--print-requires', 'libpeas-1.0', check: false)
+ if libpeas_requires.returncode() == 0 and libpeas_requires.stdout().contains('girepository-2.0')
+ conf.set('HAVE_GIREPOSITORY_2', 1)
+ endif
+ endif
endif
endif