From c90978d63b5d2c65f948e4fe09c838d1f8ef01c2 Mon Sep 17 00:00:00 2001
From: songnannan <songnannan2@huawei.com>
Date: Thu, 9 Jan 2020 15:41:29 +0800
Subject: [PATCH] optimization the spec

---
 ...-all-GdkDisplays-are-GdkX11Displays-.patch | 70 -------------------
 libcanberra.spec                              | 34 +++++----
 2 files changed, 19 insertions(+), 85 deletions(-)
 delete mode 100644 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch

diff --git a/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch b/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
deleted file mode 100644
index 6187900..0000000
--- a/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From c0620e432650e81062c1967cc669829dbd29b310 Mon Sep 17 00:00:00 2001
-From: Michael Meeks <michael.meeks@suse.com>
-Date: Fri, 9 Nov 2012 16:16:40 +0000
-Subject: [PATCH] gtk: Don't assume all GdkDisplays are GdkX11Displays:
- broadway/wayland
-
----
- src/canberra-gtk-module.c | 15 +++++++++++++++
- src/canberra-gtk.c        |  5 +++++
- 2 files changed, 20 insertions(+)
-
-diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c
-index 67791f0..c1532ab 100644
---- a/src/canberra-gtk-module.c
-+++ b/src/canberra-gtk-module.c
-@@ -307,6 +307,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
-         guchar *data = NULL;
-         gint ret = -1;
- 
-+#ifdef GDK_IS_X11_DISPLAY
-+        if (!GDK_IS_X11_DISPLAY(d))
-+                return 0;
-+#endif
-+
-         if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
-                                gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"),
-                                0, G_MAXLONG, False, XA_CARDINAL, &type_return,
-@@ -335,6 +340,11 @@ static gint display_get_desktop(GdkDisplay *d) {
-         guchar *data = NULL;
-         gint ret = -1;
- 
-+#ifdef GDK_IS_X11_DISPLAY
-+        if (!GDK_IS_X11_DISPLAY(d))
-+                return 0;
-+#endif
-+
-         if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), DefaultRootWindow(GDK_DISPLAY_XDISPLAY(d)),
-                                gdk_x11_get_xatom_by_name_for_display(d, "_NET_CURRENT_DESKTOP"),
-                                0, G_MAXLONG, False, XA_CARDINAL, &type_return,
-@@ -365,6 +375,11 @@ static gboolean window_is_xembed(GdkDisplay *d, GdkWindow *w) {
-         gboolean ret = FALSE;
-         Atom xembed;
- 
-+#ifdef GDK_IS_X11_DISPLAY
-+        if (!GDK_IS_X11_DISPLAY(d))
-+                return FALSE;
-+#endif
-+
-         /* Gnome Panel applets are XEMBED windows. We need to make sure we
-          * ignore them */
- 
-diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c
-index 34446f5..08cb668 100644
---- a/src/canberra-gtk.c
-+++ b/src/canberra-gtk.c
-@@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
-         guchar *data = NULL;
-         gint ret = -1;
- 
-+#ifdef GDK_IS_X11_DISPLAY
-+        if (!GDK_IS_X11_DISPLAY(d))
-+                return 0;
-+#endif
-+
-         if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
-                                gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"),
-                                0, G_MAXLONG, False, XA_CARDINAL, &type_return,
--- 
-1.9.0
-
diff --git a/libcanberra.spec b/libcanberra.spec
index bbbacb0..f688d2b 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,13 +1,11 @@
 Name:             libcanberra
 Version:          0.30
-Release:          24
+Release:          25
 Summary:          XDG Sound Theme and Name Specifications
 License:          LGPLv2+
 Url:              https://0pointer.de/lennart/projects/libcanberra
 Source0:          http://0pointer.de/lennart/projects/libcanberra/%{name}-%{version}.tar.xz
 
-Patch0:           0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
-
 BuildRequires:    gcc gtk2-devel gtk3-devel alsa-lib-devel libvorbis-devel libtool-ltdl-devel gtk-doc
 BuildRequires:    pulseaudio-libs-devel gstreamer1-devel libtdb-devel gettext-devel systemd-devel
 Requires:         sound-theme-freedesktop pulseaudio-libs
@@ -44,6 +42,18 @@ developing applications that use %{name}.
 
 %package_help
 
+%prep
+%autosetup -n %{name}-%{version} -p1
+
+%build
+%configure  --enable-pulse --enable-alsa --enable-null --disable-oss --with-builtin=dso --with-systemdsystemunitdir=/usr/lib/systemd/system
+%make_build
+
+%install
+%make_install
+%delete_la_and_a
+rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
+
 %post
 /sbin/ldconfig
 %systemd_post canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service
@@ -58,18 +68,6 @@ developing applications that use %{name}.
 %ldconfig_scriptlets gtk2
 %ldconfig_scriptlets gtk3
 
-%prep
-%autosetup -n %{name}-%{version} -p1
-
-%build
-%configure  --enable-pulse --enable-alsa --enable-null --disable-oss --with-builtin=dso --with-systemdsystemunitdir=/usr/lib/systemd/system
-%make_build
-
-%install
-%make_install
-%delete_la_and_a
-rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
-
 %files
 %defattr(-,root,root)
 %doc LGPL
@@ -105,6 +103,12 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Jan 9 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.30-25
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC: optimization the spec
+
 * Tue Dec 31 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.30-24
 - Type:bugfix
 - Id:NA