Re: [PATCH weston] libweston-desktop/xdg-shell-v5: Drop xdg-shell v5 support

2018-02-14 Thread Pekka Paalanen 
On Wed, 14 Feb 2018 10:06:27 +0200
Pekka Paalanen  wrote:

> On Tue, 13 Feb 2018 09:49:53 -0600
> Derek Foreman  wrote:
> 
> > On 2018-02-13 08:20 AM, Alexandros Frantzis wrote:  
> > > Drop support for the obsolete xdg-shell v5 protocol. This clears the
> > > path to properly support xdg-shell stable, since xdg-shell stable and
> > > xdg-shell v5 can't currently co-exist in the same compositor, as both
> > > define structures with the same name (such as struct
> > > xdg_surface_interface).
> > > 
> > > Signed-off-by: Alexandros Frantzis 
> > 
> > Looks right to me,
> > Reviewed-by: Derek Foreman 
> > 
> > Daniel gave an ack on irc...
> > 
> > Do we want to land this immediately?  
> 
> Acked-by: Pekka Paalanen 
> 
> for landing immediately.

And pushed with some more irc acks:
   9350bfd9..eba58edc  master -> master


> > > ---
> > >   Makefile.am   |   6 +-
> > >   libweston-desktop/internal.h  |   3 -
> > >   libweston-desktop/libweston-desktop.c |  10 -
> > >   libweston-desktop/xdg-shell-v5.c  | 911 
> > > --
> > >   4 files changed, 1 insertion(+), 929 deletions(-)
> > >   delete mode 100644 libweston-desktop/xdg-shell-v5.c  

Thanks,
pq


pgpXPoBMuvQmT.pgp
Description: OpenPGP digital signature
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/wayland-devel

Re: [PATCH weston] libweston-desktop/xdg-shell-v5: Drop xdg-shell v5 support

2018-02-14 Thread Pekka Paalanen 
On Tue, 13 Feb 2018 09:49:53 -0600
Derek Foreman  wrote:

> On 2018-02-13 08:20 AM, Alexandros Frantzis wrote:
> > Drop support for the obsolete xdg-shell v5 protocol. This clears the
> > path to properly support xdg-shell stable, since xdg-shell stable and
> > xdg-shell v5 can't currently co-exist in the same compositor, as both
> > define structures with the same name (such as struct
> > xdg_surface_interface).
> > 
> > Signed-off-by: Alexandros Frantzis   
> 
> Looks right to me,
> Reviewed-by: Derek Foreman 
> 
> Daniel gave an ack on irc...
> 
> Do we want to land this immediately?

Acked-by: Pekka Paalanen 

for landing immediately.


Thanks,
pq

> 
> Thanks,
> Derek
> 
> > ---
> >   Makefile.am   |   6 +-
> >   libweston-desktop/internal.h  |   3 -
> >   libweston-desktop/libweston-desktop.c |  10 -
> >   libweston-desktop/xdg-shell-v5.c  | 911 
> > --
> >   4 files changed, 1 insertion(+), 929 deletions(-)
> >   delete mode 100644 libweston-desktop/xdg-shell-v5.c


pgpFfpeVNh6Hx.pgp
Description: OpenPGP digital signature
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/wayland-devel

Re: [PATCH weston] libweston-desktop/xdg-shell-v5: Drop xdg-shell v5 support

2018-02-13 Thread Derek Foreman 

On 2018-02-13 08:20 AM, Alexandros Frantzis wrote:

Drop support for the obsolete xdg-shell v5 protocol. This clears the
path to properly support xdg-shell stable, since xdg-shell stable and
xdg-shell v5 can't currently co-exist in the same compositor, as both
define structures with the same name (such as struct
xdg_surface_interface).

Signed-off-by: Alexandros Frantzis 


Looks right to me,
Reviewed-by: Derek Foreman 

Daniel gave an ack on irc...

Do we want to land this immediately?

Thanks,
Derek


---
  Makefile.am   |   6 +-
  libweston-desktop/internal.h  |   3 -
  libweston-desktop/libweston-desktop.c |  10 -
  libweston-desktop/xdg-shell-v5.c  | 911 --
  4 files changed, 1 insertion(+), 929 deletions(-)
  delete mode 100644 libweston-desktop/xdg-shell-v5.c

diff --git a/Makefile.am b/Makefile.am
index 32c9a0f2..189e7d8a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -132,19 +132,15 @@ libweston_desktop_@LIBWESTON_MAJOR@_la_SOURCES =  \
libweston-desktop/surface.c \
libweston-desktop/wl-shell.c\
libweston-desktop/xdg-shell-v6.c\
-   libweston-desktop/xdg-shell-v5.c\
libweston-desktop/xwayland.c
  
  nodist_libweston_desktop_@LIBWESTON_MAJOR@_la_SOURCES =		\

protocol/xdg-shell-unstable-v6-protocol.c   \
-   protocol/xdg-shell-unstable-v6-server-protocol.h\
-   protocol/xdg-shell-unstable-v5-protocol.c   \
-   protocol/xdg-shell-unstable-v5-server-protocol.h
+   protocol/xdg-shell-unstable-v6-server-protocol.h
  
  BUILT_SOURCES += $(nodist_libweston_desktop_@LIBWESTON_MAJOR@_la_SOURCES)
  
  libweston-desktop-@LIBWESTON_MAJOR@.la libweston-desktop/libweston_desktop_@LIBWESTON_MAJOR@_la-xdg-shell-v6.lo: protocol/xdg-shell-unstable-v6-server-protocol.h

-libweston-desktop-@LIBWESTON_MAJOR@.la 
libweston-desktop/libweston_desktop_@LIBWESTON_MAJOR@_la-xdg-shell-v5.lo: 
protocol/xdg-shell-unstable-v5-server-protocol.h
  
  if SYSTEMD_NOTIFY_SUPPORT

  module_LTLIBRARIES += systemd-notify.la
diff --git a/libweston-desktop/internal.h b/libweston-desktop/internal.h
index 763355bf..564f7b3c 100644
--- a/libweston-desktop/internal.h
+++ b/libweston-desktop/internal.h
@@ -230,9 +230,6 @@ struct wl_global *
  weston_desktop_xdg_shell_v6_create(struct weston_desktop *desktop,
   struct wl_display *display);
  struct wl_global *
-weston_desktop_xdg_shell_v5_create(struct weston_desktop *desktop,
-  struct wl_display *display);
-struct wl_global *
  weston_desktop_wl_shell_create(struct weston_desktop *desktop,
   struct wl_display *display);
  void
diff --git a/libweston-desktop/libweston-desktop.c 
b/libweston-desktop/libweston-desktop.c
index 48e90009..c840a8a9 100644
--- a/libweston-desktop/libweston-desktop.c
+++ b/libweston-desktop/libweston-desktop.c
@@ -41,7 +41,6 @@ struct weston_desktop {
struct weston_desktop_api api;
void *user_data;
struct wl_global *xdg_shell_v6;
-   struct wl_global *xdg_shell_v5;
struct wl_global *wl_shell;
  };
  
@@ -77,13 +76,6 @@ weston_desktop_create(struct weston_compositor *compositor,

return NULL;
}
  
-	desktop->xdg_shell_v5 =

-   weston_desktop_xdg_shell_v5_create(desktop, display);
-   if (desktop->xdg_shell_v5 == NULL) {
-   weston_desktop_destroy(desktop);
-   return NULL;
-   }
-
desktop->wl_shell =
weston_desktop_wl_shell_create(desktop, display);
if (desktop->wl_shell == NULL) {
@@ -104,8 +96,6 @@ weston_desktop_destroy(struct weston_desktop *desktop)
  
  	if (desktop->wl_shell != NULL)

wl_global_destroy(desktop->wl_shell);
-   if (desktop->xdg_shell_v5 != NULL)
-   wl_global_destroy(desktop->xdg_shell_v5);
if (desktop->xdg_shell_v6 != NULL)
wl_global_destroy(desktop->xdg_shell_v6);
  
diff --git a/libweston-desktop/xdg-shell-v5.c b/libweston-desktop/xdg-shell-v5.c

deleted file mode 100644
index ebe7940e..
--- a/libweston-desktop/xdg-shell-v5.c
+++ /dev/null
@@ -1,911 +0,0 @@
-/*
- * Copyright © 2010-2012 Intel Corporation
- * Copyright © 2011-2012 Collabora, Ltd.
- * Copyright © 2013 Raspberry Pi Foundation
- * Copyright © 2016 Quentin "Sardem FF7" Glidic
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the

[PATCH weston] libweston-desktop/xdg-shell-v5: Drop xdg-shell v5 support

2018-02-13 Thread Alexandros Frantzis 
Drop support for the obsolete xdg-shell v5 protocol. This clears the
path to properly support xdg-shell stable, since xdg-shell stable and
xdg-shell v5 can't currently co-exist in the same compositor, as both
define structures with the same name (such as struct
xdg_surface_interface).

Signed-off-by: Alexandros Frantzis 
---
 Makefile.am   |   6 +-
 libweston-desktop/internal.h  |   3 -
 libweston-desktop/libweston-desktop.c |  10 -
 libweston-desktop/xdg-shell-v5.c  | 911 --
 4 files changed, 1 insertion(+), 929 deletions(-)
 delete mode 100644 libweston-desktop/xdg-shell-v5.c

diff --git a/Makefile.am b/Makefile.am
index 32c9a0f2..189e7d8a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -132,19 +132,15 @@ libweston_desktop_@LIBWESTON_MAJOR@_la_SOURCES =  \
libweston-desktop/surface.c \
libweston-desktop/wl-shell.c\
libweston-desktop/xdg-shell-v6.c\
-   libweston-desktop/xdg-shell-v5.c\
libweston-desktop/xwayland.c
 
 nodist_libweston_desktop_@LIBWESTON_MAJOR@_la_SOURCES =\
protocol/xdg-shell-unstable-v6-protocol.c   \
-   protocol/xdg-shell-unstable-v6-server-protocol.h\
-   protocol/xdg-shell-unstable-v5-protocol.c   \
-   protocol/xdg-shell-unstable-v5-server-protocol.h
+   protocol/xdg-shell-unstable-v6-server-protocol.h
 
 BUILT_SOURCES += $(nodist_libweston_desktop_@LIBWESTON_MAJOR@_la_SOURCES)
 
 libweston-desktop-@LIBWESTON_MAJOR@.la 
libweston-desktop/libweston_desktop_@LIBWESTON_MAJOR@_la-xdg-shell-v6.lo: 
protocol/xdg-shell-unstable-v6-server-protocol.h
-libweston-desktop-@LIBWESTON_MAJOR@.la 
libweston-desktop/libweston_desktop_@LIBWESTON_MAJOR@_la-xdg-shell-v5.lo: 
protocol/xdg-shell-unstable-v5-server-protocol.h
 
 if SYSTEMD_NOTIFY_SUPPORT
 module_LTLIBRARIES += systemd-notify.la
diff --git a/libweston-desktop/internal.h b/libweston-desktop/internal.h
index 763355bf..564f7b3c 100644
--- a/libweston-desktop/internal.h
+++ b/libweston-desktop/internal.h
@@ -230,9 +230,6 @@ struct wl_global *
 weston_desktop_xdg_shell_v6_create(struct weston_desktop *desktop,
   struct wl_display *display);
 struct wl_global *
-weston_desktop_xdg_shell_v5_create(struct weston_desktop *desktop,
-  struct wl_display *display);
-struct wl_global *
 weston_desktop_wl_shell_create(struct weston_desktop *desktop,
   struct wl_display *display);
 void
diff --git a/libweston-desktop/libweston-desktop.c 
b/libweston-desktop/libweston-desktop.c
index 48e90009..c840a8a9 100644
--- a/libweston-desktop/libweston-desktop.c
+++ b/libweston-desktop/libweston-desktop.c
@@ -41,7 +41,6 @@ struct weston_desktop {
struct weston_desktop_api api;
void *user_data;
struct wl_global *xdg_shell_v6;
-   struct wl_global *xdg_shell_v5;
struct wl_global *wl_shell;
 };
 
@@ -77,13 +76,6 @@ weston_desktop_create(struct weston_compositor *compositor,
return NULL;
}
 
-   desktop->xdg_shell_v5 =
-   weston_desktop_xdg_shell_v5_create(desktop, display);
-   if (desktop->xdg_shell_v5 == NULL) {
-   weston_desktop_destroy(desktop);
-   return NULL;
-   }
-
desktop->wl_shell =
weston_desktop_wl_shell_create(desktop, display);
if (desktop->wl_shell == NULL) {
@@ -104,8 +96,6 @@ weston_desktop_destroy(struct weston_desktop *desktop)
 
if (desktop->wl_shell != NULL)
wl_global_destroy(desktop->wl_shell);
-   if (desktop->xdg_shell_v5 != NULL)
-   wl_global_destroy(desktop->xdg_shell_v5);
if (desktop->xdg_shell_v6 != NULL)
wl_global_destroy(desktop->xdg_shell_v6);
 
diff --git a/libweston-desktop/xdg-shell-v5.c b/libweston-desktop/xdg-shell-v5.c
deleted file mode 100644
index ebe7940e..
--- a/libweston-desktop/xdg-shell-v5.c
+++ /dev/null
@@ -1,911 +0,0 @@
-/*
- * Copyright © 2010-2012 Intel Corporation
- * Copyright © 2011-2012 Collabora, Ltd.
- * Copyright © 2013 Raspberry Pi Foundation
- * Copyright © 2016 Quentin "Sardem FF7" Glidic
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE