packages/libcanberra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!2 libcanberra: optimization the spec

Browse Source 
Merge pull request !2 from orange-snn/init
This commit is contained in:
openeuler-ci-bot 2020-01-11 19:10:53 +08:00 committed by Gitee
commit ea23d36172
2 changed files with 19 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
View File

@ -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

34
libcanberra.spec
View File

@ -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