Skip to content

Commit 92f1d8e

Browse files
raveit65vkareh
andauthored
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 <vkareh@redhat.com>
1 parent f7f056b commit 92f1d8e

3 files changed

Lines changed: 22 additions & 2 deletions

File tree

.github/workflows/builds.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ infoend() {
1919
if [[ -f meson.build && $1 == "meson" ]]; then
2020

2121
infobegin "Configure (meson)"
22-
meson setup _build --prefix=/usr
22+
meson setup _build -Dprefix=/usr -Dgdk-pixbuf-thumbnailer=false
2323
infoend
2424

2525
infobegin "Build (meson)"

NEWS

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
### eom 1.28.1
2+
3+
* Release 1.28.1
4+
* Update translations
5+
* plugins: Support building against newer libpeas1 versions
6+
* eom-window: Add additional key codes for image switching using mouse buttons
7+
* Eom*: Use fast content type as fallback
8+
* EomUtil: Add helper to get content type from GFileInfos
9+
* Add 'preserve-order' flag to allow viewing order specified on cmd line (#354)
10+
* CI: drop travis CI
11+
* CI: use github action
12+
113
### eom 1.28.0
214

315
* Translations update

meson.build

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,17 @@ endif
178178
if gobject_introspection.found()
179179
conf.set('HAVE_INTROSPECTION', 1)
180180
# Check for girepository-2.0 API (moved to glib in version 1.80+)
181+
# We can only use girepository-2.0 if libpeas also uses it, otherwise we get conflicts
181182
girepository2 = dependency('girepository-2.0', required: false)
182183
if girepository2.found()
183-
conf.set('HAVE_GIREPOSITORY_2', 1)
184+
# Check if libpeas requires girepository-2.0
185+
pkgconfig = find_program('pkg-config', required: false)
186+
if pkgconfig.found()
187+
libpeas_requires = run_command(pkgconfig, '--print-requires', 'libpeas-1.0', check: false)
188+
if libpeas_requires.returncode() == 0 and libpeas_requires.stdout().contains('girepository-2.0')
189+
conf.set('HAVE_GIREPOSITORY_2', 1)
190+
endif
191+
endif
184192
endif
185193
endif
186194

0 commit comments

Comments
 (0)