rpms/bmpx/F-10 bmpx-compile.patch,NONE,1.1 bmpx.spec,1.16,1.17
Michael Schwendt
mschwendt at fedoraproject.org
Thu Aug 6 13:05:20 UTC 2009
Author: mschwendt
Update of /cvs/pkgs/rpms/bmpx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3112
Modified Files:
bmpx.spec
Added Files:
bmpx-compile.patch
Log Message:
sync with F-11 for needed rebuild (rhbz 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(-)
--- NEW FILE bmpx-compile.patch ---
--- 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.
#include <glib.h>
+#include <stdio.h>
#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-10/bmpx.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- bmpx.spec 5 Mar 2009 08:29:08 -0000 1.16
+++ bmpx.spec 6 Aug 2009 13:05:20 -0000 1.17
@@ -1,7 +1,7 @@
Summary: Beep Media Player eXperimental
Name: bmpx
Version: 0.40.14
-Release: 9%{?dist}
+Release: 14%{?dist}.1
License: GPLv2
Group: Applications/Multimedia
@@ -9,6 +9,7 @@ URL: http://bmpx.backtrace.info/
Source: http://files.beep-media-player.org/releases/0.40/%{name}-%{version}.tar.bz2
Patch0: bmpx-libsoup24.patch
Patch1: bmpx-hostnotfound.patch
+Patch2: bmpx-compile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gcc-c++
@@ -80,14 +81,17 @@ Development files required for compiling
%setup -q
%patch0 -p1 -b .libsoup24
%patch1 -p1 -b .hostnotfound
+%patch2 -p1 -b .compile
%build
+autoreconf -i -f
%configure \
--disable-hal \
--enable-mp4v2 \
--disable-sid \
--enable-modplug \
--with-cdparanoia
+# --without-cdparanoia
# --enable-sid \
%{__make} %{?_smp_mflags}
@@ -179,12 +183,33 @@ fi
%changelog
-* Tue Feb 24 2009 josef radinger <cheese at nosuchhost.net> - 0.40.14-9
-- cleanup
+* 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)
-* Mon Feb 23 2009 josef radinger <cheese at nosuchhost.net> - 0.40.14-8
+* 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
+
+* Tue Feb 24 2009 josef radinger <cheese at nosuchhost.net> - 0.40.14-12
+- fix compile error because of missing header-file
+- but needs more
+
+* Tue Feb 24 2009 josef radinger <cheese at nosuchhost.net> - 0.40.14-11
+- specfile merge
+
+* Mon Feb 23 2009 josef radinger <cheese at nosuchhost.net> - 0.40.14-10
- reenable cdparanoia
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.40.14-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Dec 18 2008 Petr Machata <pmachata at redhat.com> - 0.40.14-8
+- rebuild for new boost
+
* Sun Sep 14 2008 josef radinger <cheese at nosuchhost.net> - 0.40.14-7
- cvs problems
More information about the scm-commits
mailing list