[xnoise] Fix for use of deprecated (in F-16+) GLib functionality in unique-1.0

Michel Alexandre Salim salimma at fedoraproject.org
Thu Jul 28 14:59:59 UTC 2011


commit 30a1df22d7a4c3ca31d8bc55b7b4a569dfc8e837
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Thu Jul 28 16:59:07 2011 +0200

    Fix for use of deprecated (in F-16+) GLib functionality in unique-1.0

 xnoise-0.1.26-g_const_return.patch |  150 ++++++++++++++++++++++++++++++++++++
 xnoise.spec                        |    4 +
 2 files changed, 154 insertions(+), 0 deletions(-)
---
diff --git a/xnoise-0.1.26-g_const_return.patch b/xnoise-0.1.26-g_const_return.patch
new file mode 100644
index 0000000..c182ef4
--- /dev/null
+++ b/xnoise-0.1.26-g_const_return.patch
@@ -0,0 +1,150 @@
+--- xnoise-0.1.26/src/Makefile.in.g_const_return	2011-07-08 14:40:57.000000000 +0200
++++ xnoise-0.1.26/src/Makefile.in	2011-07-28 16:26:46.498879949 +0200
+@@ -315,7 +315,6 @@
+     -DGIO_DISABLE_DEPRECATED=1 \
+     -DGDK_DISABLE_DEPRECATED=1 \
+     -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
+-    -DG_DISABLE_DEPRECATED=1 \
+     -DPANGO_DISABLE_DEPRECATED=1 \
+     -DGSEAL_ENABLE=1 \
+     $(NULL)
+--- xnoise-0.1.26/libxnoise/Makefile.in.g_const_return	2011-07-08 14:40:51.000000000 +0200
++++ xnoise-0.1.26/libxnoise/Makefile.in	2011-07-28 16:15:51.946600017 +0200
+@@ -457,7 +457,6 @@
+     -DGIO_DISABLE_DEPRECATED=1 \
+     -DGDK_DISABLE_DEPRECATED=1 \
+     -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
+-    -DG_DISABLE_DEPRECATED=1 \
+     -DPANGO_DISABLE_DEPRECATED=1 \
+     -DGSEAL_ENABLE=1 \
+     $(NULL)
+--- xnoise-0.1.26/plugins/chartlyrics/Makefile.in.g_const_return	2011-07-08 14:40:51.000000000 +0200
++++ xnoise-0.1.26/plugins/chartlyrics/Makefile.in	2011-07-28 16:50:39.854510014 +0200
+@@ -345,7 +345,6 @@
+     -DGIO_DISABLE_DEPRECATED=1 \
+     -DGDK_DISABLE_DEPRECATED=1 \
+     -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
+-    -DG_DISABLE_DEPRECATED=1 \
+     -DPANGO_DISABLE_DEPRECATED=1 \
+     -DGSEAL_ENABLE=1 \
+     -I$(top_srcdir)/libxnoise \
+--- xnoise-0.1.26/plugins/lastfmCovers/Makefile.in.g_const_return	2011-07-08 14:40:52.000000000 +0200
++++ xnoise-0.1.26/plugins/lastfmCovers/Makefile.in	2011-07-28 16:50:48.526291655 +0200
+@@ -346,7 +346,6 @@
+     -DGIO_DISABLE_DEPRECATED=1 \
+     -DGDK_DISABLE_DEPRECATED=1 \
+     -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
+-    -DG_DISABLE_DEPRECATED=1 \
+     -DPANGO_DISABLE_DEPRECATED=1 \
+     -DGSEAL_ENABLE=1 \
+     $(NULL)
+--- xnoise-0.1.26/plugins/mediakeys/Makefile.in.g_const_return	2011-07-08 14:40:53.000000000 +0200
++++ xnoise-0.1.26/plugins/mediakeys/Makefile.in	2011-07-28 16:50:59.122024847 +0200
+@@ -347,7 +347,6 @@
+     -DGIO_DISABLE_DEPRECATED=1 \
+     -DGDK_DISABLE_DEPRECATED=1 \
+     -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
+-    -DG_DISABLE_DEPRECATED=1 \
+     -DPANGO_DISABLE_DEPRECATED=1 \
+     -DGSEAL_ENABLE=1 \
+     $(NULL)
+--- xnoise-0.1.26/plugins/soundmenu2/Makefile.in.g_const_return	2011-07-08 14:40:55.000000000 +0200
++++ xnoise-0.1.26/plugins/soundmenu2/Makefile.in	2011-07-28 16:51:08.941777574 +0200
+@@ -344,7 +344,6 @@
+     -DGIO_DISABLE_DEPRECATED=1 \
+     -DGDK_DISABLE_DEPRECATED=1 \
+     -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
+-    -DG_DISABLE_DEPRECATED=1 \
+     -DPANGO_DISABLE_DEPRECATED=1 \
+     -DGSEAL_ENABLE=1 \
+     $(NULL)
+--- xnoise-0.1.26/plugins/titleToDecoration/Makefile.in.g_const_return	2011-07-08 14:40:56.000000000 +0200
++++ xnoise-0.1.26/plugins/titleToDecoration/Makefile.in	2011-07-28 16:51:19.709506401 +0200
+@@ -345,7 +345,6 @@
+     -DGIO_DISABLE_DEPRECATED=1 \
+     -DGDK_DISABLE_DEPRECATED=1 \
+     -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
+-    -DG_DISABLE_DEPRECATED=1 \
+     -DPANGO_DISABLE_DEPRECATED=1 \
+     -DGSEAL_ENABLE=1 \
+     $(NULL)
+--- xnoise-0.1.26/plugins/lyricwiki/Makefile.in.g_const_return	2011-07-08 14:40:53.000000000 +0200
++++ xnoise-0.1.26/plugins/lyricwiki/Makefile.in	2011-07-28 16:51:31.502209441 +0200
+@@ -346,7 +346,6 @@
+     -DGIO_DISABLE_DEPRECATED=1 \
+     -DGDK_DISABLE_DEPRECATED=1 \
+     -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
+-    -DG_DISABLE_DEPRECATED=1 \
+     -DPANGO_DISABLE_DEPRECATED=1 \
+     -DGSEAL_ENABLE=1 \
+     $(NULL)
+--- xnoise-0.1.26/plugins/mpris/Makefile.in.g_const_return	2011-07-08 14:40:54.000000000 +0200
++++ xnoise-0.1.26/plugins/mpris/Makefile.in	2011-07-28 16:51:40.605980200 +0200
+@@ -341,7 +341,6 @@
+     -DGIO_DISABLE_DEPRECATED=1 \
+     -DGDK_DISABLE_DEPRECATED=1 \
+     -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
+-    -DG_DISABLE_DEPRECATED=1 \
+     -DPANGO_DISABLE_DEPRECATED=1 \
+     -DGSEAL_ENABLE=1 \
+     $(NULL)
+--- xnoise-0.1.26/plugins/notifications/Makefile.in.g_const_return	2011-07-08 14:40:54.000000000 +0200
++++ xnoise-0.1.26/plugins/notifications/Makefile.in	2011-07-28 16:51:48.108791255 +0200
+@@ -345,7 +345,6 @@
+     -DGIO_DISABLE_DEPRECATED=1 \
+     -DGDK_DISABLE_DEPRECATED=1 \
+     -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
+-    -DG_DISABLE_DEPRECATED=1 \
+     -DPANGO_DISABLE_DEPRECATED=1 \
+     -DGSEAL_ENABLE=1 \
+     $(NULL)
+--- xnoise-0.1.26/plugins/testplugin/Makefile.in.g_const_return	2011-07-08 14:40:56.000000000 +0200
++++ xnoise-0.1.26/plugins/testplugin/Makefile.in	2011-07-28 16:32:52.632530357 +0200
+@@ -342,7 +342,6 @@
+     -DGIO_DISABLE_DEPRECATED=1 \
+     -DGDK_DISABLE_DEPRECATED=1 \
+     -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
+-    -DG_DISABLE_DEPRECATED=1 \
+     -DPANGO_DISABLE_DEPRECATED=1 \
+     -DGSEAL_ENABLE=1 \
+     -I$(top_srcdir)/libxnoise \
+--- xnoise-0.1.26/plugins/databaseLyrics/Makefile.in.g_const_return	2011-07-08 14:40:52.000000000 +0200
++++ xnoise-0.1.26/plugins/databaseLyrics/Makefile.in	2011-07-28 16:51:58.436531214 +0200
+@@ -343,7 +343,6 @@
+     -DGIO_DISABLE_DEPRECATED=1 \
+     -DGDK_DISABLE_DEPRECATED=1 \
+     -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
+-    -DG_DISABLE_DEPRECATED=1 \
+     -DPANGO_DISABLE_DEPRECATED=1 \
+     -DGSEAL_ENABLE=1 \
+     $(NULL)
+--- xnoise-0.1.26/plugins/notifications2/Makefile.in.g_const_return	2011-07-08 14:40:55.000000000 +0200
++++ xnoise-0.1.26/plugins/notifications2/Makefile.in	2011-07-28 16:52:09.404254958 +0200
+@@ -345,7 +345,6 @@
+     -DGIO_DISABLE_DEPRECATED=1 \
+     -DGDK_DISABLE_DEPRECATED=1 \
+     -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
+-    -DG_DISABLE_DEPRECATED=1 \
+     -DPANGO_DISABLE_DEPRECATED=1 \
+     -DGSEAL_ENABLE=1 \
+     $(NULL)
+--- xnoise-0.1.26/plugins/soundmenu/Makefile.in.g_const_return	2011-07-08 14:40:55.000000000 +0200
++++ xnoise-0.1.26/plugins/soundmenu/Makefile.in	2011-07-28 16:52:17.565049435 +0200
+@@ -345,7 +345,6 @@
+     -DGIO_DISABLE_DEPRECATED=1 \
+     -DGDK_DISABLE_DEPRECATED=1 \
+     -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
+-    -DG_DISABLE_DEPRECATED=1 \
+     -DPANGO_DISABLE_DEPRECATED=1 \
+     -DGSEAL_ENABLE=1 \
+     $(NULL)
+--- xnoise-0.1.26/plugins/cyclic-save-state/Makefile.in.g_const_return	2011-07-08 14:40:52.000000000 +0200
++++ xnoise-0.1.26/plugins/cyclic-save-state/Makefile.in	2011-07-28 16:52:26.556822979 +0200
+@@ -344,7 +344,6 @@
+     -DGIO_DISABLE_DEPRECATED=1 \
+     -DGDK_DISABLE_DEPRECATED=1 \
+     -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
+-    -DG_DISABLE_DEPRECATED=1 \
+     -DPANGO_DISABLE_DEPRECATED=1 \
+     -DGSEAL_ENABLE=1 \
+     $(NULL)
diff --git a/xnoise.spec b/xnoise.spec
index 8a223bd..791457d 100644
--- a/xnoise.spec
+++ b/xnoise.spec
@@ -12,6 +12,9 @@ URL:            http://www.xnoise-media-player.com/
 # hg archive -t tbz2 -r %{hgrev} ../%{name}-%{version}.tar.bz2
 #Source0:        %{name}-%{version}.tar.bz2
 Source0:        http://xnoise.googlecode.com/files/xnoise-%{version}.tar.bz2
+# unique-1.0 uses a definition that is deprecated in F-16+'s GLib; change
+# compile flags to allow this
+Patch0:         xnoise-0.1.26-g_const_return.patch
 
 # for snapshots
 # BuildRequires:  gnome-common autoconf automake libtool
@@ -51,6 +54,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .g_const_return
 
 
 %build


More information about the scm-commits mailing list