diff options
| -rwxr-xr-x | .github/workflows/builds.sh | 2 | ||||
| -rw-r--r-- | NEWS | 12 | ||||
| -rw-r--r-- | meson.build | 10 |
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)" @@ -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 |