Message ID | 20211104003607.2022984-2-aduskett@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | package/midori: bump to version 9.0 | expand |
On 04/11/2021 01:36, Adam Duskett wrote: > gcr has supported wayland since commit > 685e1da9642b7a3fb0dbe1afda482f7bd5b05f33. > > Signed-off-by: Adam Duskett <aduskett@gmail.com> Applied to next, thanks. Regards, Arnout > --- > package/gcr/gcr.mk | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/package/gcr/gcr.mk b/package/gcr/gcr.mk > index d51e853f3f..ef253b4ef9 100644 > --- a/package/gcr/gcr.mk > +++ b/package/gcr/gcr.mk > @@ -30,10 +30,12 @@ else > GCR_CONF_OPTS += -Dintrospection=false > endif > > -# Only the X11 backend is supported for the simple GUI > ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) > GCR_DEPENDENCIES += libgtk3 > GCR_CONF_OPTS += -Dgtk=true > +else ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) > +GCR_DEPENDENCIES += libgtk3 > +GCR_CONF_OPTS += -Dgtk=true > else > GCR_CONF_OPTS += -Dgtk=false > endif >
diff --git a/package/gcr/gcr.mk b/package/gcr/gcr.mk index d51e853f3f..ef253b4ef9 100644 --- a/package/gcr/gcr.mk +++ b/package/gcr/gcr.mk @@ -30,10 +30,12 @@ else GCR_CONF_OPTS += -Dintrospection=false endif -# Only the X11 backend is supported for the simple GUI ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) GCR_DEPENDENCIES += libgtk3 GCR_CONF_OPTS += -Dgtk=true +else ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) +GCR_DEPENDENCIES += libgtk3 +GCR_CONF_OPTS += -Dgtk=true else GCR_CONF_OPTS += -Dgtk=false endif
gcr has supported wayland since commit 685e1da9642b7a3fb0dbe1afda482f7bd5b05f33. Signed-off-by: Adam Duskett <aduskett@gmail.com> --- package/gcr/gcr.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)