commit 19f0d6ea52cc4a894bde9ff8a9cfdbebb319f3eb Author: Tim Biermann <tbier@posteo.de> Date: Sat Nov 26 12:17:12 2022 +0000 gtk3: fix build on wayland systems diff --git a/gtk3/.signature b/gtk3/.signature index edea8e5f1..27c72fbaa 100644 --- a/gtk3/.signature +++ b/gtk3/.signature @@ -1,7 +1,8 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/aTQYEgk7wHyuv+ZRzPT21H9IqGXPmqokQoTUYgOtgKwr5uHa0z0fV5B9zJ1QpHYOPoqNljU7SYBshltPo79zgU= -SHA256 (Pkgfile) = fc25602bc67976f124e461ee7e54206a028bc8544120addaa4e075de4300421c +RWSE3ohX2g5d/SGjyOcKY6RYBtVRWU5ZFvbaNHl7MoBxqYRd4dSQdhfP/AnuqR2YzCNZpbeSqFM5H6w9yIcK92XG5nqaesz+AAg= +SHA256 (Pkgfile) = 94463eabbcc4e190148737082bbd8f3fae28f7cbc1bf75e24bcde73107e37ef5 SHA256 (.footprint) = ef2135337f13bc735c2467c6ae11143f34f7d7b082b98448af1ca2e72c7f20c9 SHA256 (gtk+-3.24.35.tar.xz) = ec10fe6d712ef0b3c63b5f932639c9d1ae99fce94f500f6f06965629fef60bd1 SHA256 (gtk-register-3.sh) = ee9fab456cb6bc816e55ebaa61d095ead47eb1ed6a25eee85f21509fa4e40374 SHA256 (gtk.immodules) = 1d7ed9a4110e57e6c0caf3daa376007cb4926d205e8165fa3de7c2fa83243f67 +SHA256 (meson.build) = 3107e42a813befd159331f182e7314bb77842cc4f4b1d90314c21cacb9aac534 diff --git a/gtk3/Pkgfile b/gtk3/Pkgfile index 16beba8d6..0611e6c17 100644 --- a/gtk3/Pkgfile +++ b/gtk3/Pkgfile @@ -8,11 +8,15 @@ name=gtk3 version=3.24.35 release=1 source=(https://download.gnome.org/sources/gtk+/${version:0:4}/gtk+-$version.tar.xz - gtk-register-3.sh gtk.immodules) + gtk-register-3.sh gtk.immodules + meson.build) build () { prt-get isinst colord || PKGMK_GTK3+=' -Dcolord=no' prt-get isinst libxkbcommon wayland-protocols && PKGMK_GTK3+=' -D wayland_backend=true' || PKGMK_GTK3+=' -Dwayland_backend=false' + # it seems like upstream forgot to include this meson.build file + # the build fails without it + prt-get isinst libxkbcommon wayland-protocols && mv $SRC/meson.build gtk+-$version/gdk/wayland/cursor/meson.build CFLAGS+=" -DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS" meson setup gtk+-$version build $PKGMK_GTK3 \ diff --git a/gtk3/meson.build b/gtk3/meson.build new file mode 100644 index 000000000..02d5f2bed --- /dev/null +++ b/gtk3/meson.build @@ -0,0 +1,12 @@ +wayland_cursor_sources = files([ + 'wayland-cursor.c', + 'xcursor.c', + 'os-compatibility.c' +]) + +libwayland_cursor = static_library('wayland+cursor', + sources: wayland_cursor_sources, + include_directories: [ confinc, ], + dependencies: [ glib_dep, wlclientdep, ], + c_args: common_cflags, +)