rpms/bmpx/F-11 bmpx-compile.patch,1.1,1.2 bmpx.spec,1.20,1.21

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/bmpx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1931

Modified Files:
	bmpx-compile.patch bmpx.spec 
Log Message:
* Thu Aug  6 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.40.14-14.1
- Rebuild for ABI-incompatible cairomm on Fedora 11:
  BMP exits instead of playing any track (#511333)


bmpx-compile.patch:
 docs/images/Makefile.am |    2 +-
 src/ui-part-library.cc  |    2 +-
 src/uri.cc              |    1 +
 widgets/popup.cc        |    2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

Index: bmpx-compile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bmpx/F-11/bmpx-compile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bmpx-compile.patch	5 Mar 2009 08:45:59 -0000	1.1
+++ bmpx-compile.patch	6 Aug 2009 13:03:17 -0000	1.2
@@ -1,4 +1,4 @@
---- bmpx-0.40.14/src/uri.cc.orig	2008-04-06 01:49:24.000000000 +0200
+--- bmpx-0.40.14.orig/src/uri.cc	2008-04-06 01:49:24.000000000 +0200
 +++ bmpx-0.40.14/src/uri.cc	2009-02-23 19:23:56.000000000 +0100
 @@ -35,6 +35,7 @@
  //  BMPx is covered by.
@@ -8,3 +8,34 @@
  #include <string>
  #include <boost/algorithm/string.hpp>
  #include <glibmm.h>
+--- bmpx-0.40.14.orig/widgets/popup.cc	2009-03-10 16:01:16.000000000 +0000
++++ bmpx-0.40.14/widgets/popup.cc	2009-03-10 16:01:30.000000000 +0000
+@@ -308,7 +308,7 @@
+ 
+ 		if (m_location == ARROW_TOP)
+ 		{
+-			Cairo::Matrix matrix = { 1, 0, 0, -1, 0, h };
++			Cairo::Matrix matrix(1, 0, 0, -1, 0, h);
+ 			cr->set_matrix (matrix);
+ 		}
+ 
+--- bmpx-0.40.14.orig/src/ui-part-library.cc	2009-03-10 16:31:30.000000000 +0000
++++ bmpx-0.40.14/src/ui-part-library.cc	2009-03-10 16:32:26.000000000 +0000
+@@ -509,8 +509,8 @@
+       if( node != NODE_BRANCH )
+       {
+         // Clone this node as one child row
+-        UID uid (Bmp::AlbumArtist ((*i_toplevel)[mStoreArtistCR.artist]).bmpx_album_artist_id);
+         Bmp::AlbumArtist aa ((*i_toplevel)[mStoreArtistCR.artist]);
++        UID uid (aa.bmpx_album_artist_id);
+ 
+         UidIterMapIter uid_i = mUidIterMap.find (uid);
+         if( uid_i != mUidIterMap.end() )
+--- bmpx-0.40.14.orig/docs/images/Makefile.am	2009-07-14 08:40:53.000000000 +0100
++++ bmpx-0.40.14/docs/images/Makefile.am	2009-07-14 09:57:46.000000000 +0100
+@@ -1,4 +1,4 @@
+-image_DATA=main-window.png bmp.png active-source.png playing-source.png important.png tip.png favicon.ico bmp-logo-small.png gradient.png rect1869.png favicon.ico
++image_DATA=main-window.png bmp.png active-source.png playing-source.png important.png tip.png favicon.ico bmp-logo-small.png gradient.png rect1869.png
+ imagedir=$(prefix)/share/doc/@PACKAGE@/images
+ 
+ EXTRA_DIST=$(image_DATA)


Index: bmpx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bmpx/F-11/bmpx.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- bmpx.spec	5 Mar 2009 08:49:24 -0000	1.20
+++ bmpx.spec	6 Aug 2009 13:03:17 -0000	1.21
@@ -1,7 +1,7 @@
 Summary:	Beep Media Player eXperimental
 Name:		bmpx
 Version:	0.40.14
-Release:	13%{?dist}
+Release:	14%{?dist}.1
 
 License:	GPLv2
 Group:		Applications/Multimedia
@@ -183,6 +183,13 @@ fi
 
 
 %changelog
+* Thu Aug  6 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.40.14-14.1
+- Rebuild for ABI-incompatible cairomm on Fedora 11:
+  BMP exits instead of playing any track (#511333)
+
+* Tue Jul 14 2009 Caolán McNamara <caolanm at redhat.com> - 0.40.14-14
+- Resolves: rhbz#489552 fix to compile 
+
 * Thu Mar 5 2009 josef radinger <cheese at nosuchhost.net> - 0.40.14-13
 - needs even more
 - and i forgot to update the version-number