rpms/amarok/F-10 amarok-2.0.1.1-gcc44.patch, NONE, 1.1 amarok-2.0.1.1-qt45.patch, NONE, 1.1 amarok-libgpod-0.7.0.patch, NONE, 1.1 .cvsignore, 1.42, 1.43 amarok.spec, 1.130, 1.131 sources, 1.43, 1.44
Rex Dieter
rdieter at fedoraproject.org
Thu Mar 5 16:50:01 UTC 2009
- Previous message (by thread): rpms/python-pycurl/devel .cvsignore, 1.7, 1.8 python-pycurl.spec, 1.11, 1.12 sources, 1.7, 1.8
- Next message (by thread): rpms/perl-AnyEvent/devel perl-AnyEvent.spec, 1.9, 1.10 sources, 1.7, 1.8 .cvsignore, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/amarok/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9386
Modified Files:
.cvsignore amarok.spec sources
Added Files:
amarok-2.0.1.1-gcc44.patch amarok-2.0.1.1-qt45.patch
amarok-libgpod-0.7.0.patch
Log Message:
* Wed Mar 04 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-1
- amarok-2.0.2
amarok-2.0.1.1-gcc44.patch:
--- NEW FILE amarok-2.0.1.1-gcc44.patch ---
diff -up amarok-2.0.1.1/src/metadata/audible/audibletag.cpp.orig amarok-2.0.1.1/src/metadata/audible/audibletag.cpp
--- amarok-2.0.1.1/src/metadata/audible/audibletag.cpp.orig 2009-02-24 17:53:43.000000000 +0100
+++ amarok-2.0.1.1/src/metadata/audible/audibletag.cpp 2009-02-24 17:54:03.000000000 +0100
@@ -25,6 +25,7 @@
#include "audibletag.h"
+#include <cstdio>
#include <tag.h>
#include <string.h>
#include <stdlib.h>
diff -up amarok-2.0.1.1/src/metadata/audible/taglib_audiblefile.cpp.orig amarok-2.0.1.1/src/metadata/audible/taglib_audiblefile.cpp
--- amarok-2.0.1.1/src/metadata/audible/taglib_audiblefile.cpp.orig 2009-02-24 18:22:41.000000000 +0100
+++ amarok-2.0.1.1/src/metadata/audible/taglib_audiblefile.cpp 2009-02-24 18:23:05.000000000 +0100
@@ -28,6 +28,7 @@
#include "audibletag.h"
#include "../tfile_helper.h"
#include <audioproperties.h>
+#include <cstdio>
#include <string.h>
namespace TagLib {
diff -up amarok-2.0.1.1/src/metadata/audible/taglib_audiblefiletyperesolver.cpp.orig amarok-2.0.1.1/src/metadata/audible/taglib_audiblefiletyperesolver.cpp
--- amarok-2.0.1.1/src/metadata/audible/taglib_audiblefiletyperesolver.cpp.orig 2009-02-24 18:23:44.000000000 +0100
+++ amarok-2.0.1.1/src/metadata/audible/taglib_audiblefiletyperesolver.cpp 2009-02-24 18:23:57.000000000 +0100
@@ -22,6 +22,7 @@
#include "taglib_audiblefiletyperesolver.h"
#include "taglib_audiblefile.h"
+#include <cstdio>
#include <string.h>
TagLib::File *AudibleFileTypeResolver::createFile(TagLib::FileName fileName,
diff -up amarok-2.0.1.1/src/metadata/wav/wavfile.cpp.orig amarok-2.0.1.1/src/metadata/wav/wavfile.cpp
--- amarok-2.0.1.1/src/metadata/wav/wavfile.cpp.orig 2009-02-24 18:24:38.000000000 +0100
+++ amarok-2.0.1.1/src/metadata/wav/wavfile.cpp 2009-02-24 18:25:01.000000000 +0100
@@ -27,6 +27,7 @@
#include "../tfile_helper.h"
#include <audioproperties.h>
+#include <cstdio>
#include <tag.h>
namespace TagLib {
diff -up amarok-2.0.1.1/src/metadata/wav/wavfiletyperesolver.cpp.orig amarok-2.0.1.1/src/metadata/wav/wavfiletyperesolver.cpp
--- amarok-2.0.1.1/src/metadata/wav/wavfiletyperesolver.cpp.orig 2009-02-24 18:26:23.000000000 +0100
+++ amarok-2.0.1.1/src/metadata/wav/wavfiletyperesolver.cpp 2009-02-24 18:26:36.000000000 +0100
@@ -22,6 +22,7 @@
#include "wavfiletyperesolver.h"
#include "wavfile.h"
+#include <cstdio>
#include <string.h>
TagLib::File *WavFileTypeResolver::createFile(TagLib::FileName fileName,
diff -up amarok-2.0.1.1/src/metadata/wav/wavproperties.cpp.orig amarok-2.0.1.1/src/metadata/wav/wavproperties.cpp
--- amarok-2.0.1.1/src/metadata/wav/wavproperties.cpp.orig 2009-02-24 18:25:40.000000000 +0100
+++ amarok-2.0.1.1/src/metadata/wav/wavproperties.cpp 2009-02-24 18:25:52.000000000 +0100
@@ -25,6 +25,7 @@
#include "wavproperties.h"
+#include <cstdio>
#include <tstring.h>
#include <stdint.h>
diff -up amarok-2.0.1.1/src/metadata/audible/audibleproperties.cpp.gcc4 amarok-2.0.1.1/src/metadata/audible/audibleproperties.cpp
--- amarok-2.0.1.1/src/metadata/audible/audibleproperties.cpp.gcc4 2009-01-06 13:49:08.000000000 +0100
+++ amarok-2.0.1.1/src/metadata/audible/audibleproperties.cpp 2009-02-24 16:33:55.000000000 +0100
@@ -22,6 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, *
* MA 02110-1301 USA *
***************************************************************************/
+#include <cstdio>
#include "audibleproperties.h"
diff -up amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h.gcc4 amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h
--- amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h.gcc4 2009-02-24 16:41:44.000000000 +0100
+++ amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h 2009-02-24 16:42:48.000000000 +0100
@@ -15,6 +15,7 @@
#ifndef PP_INTERNAL_H
#define PP_INTERNAL_H
+#include <cstdio>
#include <algorithm>
namespace rpp {
diff -up amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp.gcc4 amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp
--- amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp.gcc4 2009-01-06 13:50:11.000000000 +0100
+++ amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp 2009-02-24 16:33:55.000000000 +0100
@@ -14,6 +14,7 @@
#include "preprocessor.h"
+#include <cstdio>
#include <string>
// register callback for include hooks
amarok-2.0.1.1-qt45.patch:
--- NEW FILE amarok-2.0.1.1-qt45.patch ---
Index: src/scriptengine/generator/generator/typesystem_gui.xml
===================================================================
--- src/scriptengine/generator/generator/typesystem_gui.xml (revision 926173)
+++ src/scriptengine/generator/generator/typesystem_gui.xml (working copy)
@@ -5389,8 +5389,13 @@
<object-type name="QInputContextPlugin"/>
<object-type name="QPictureFormatPlugin"/>
<object-type name="QStylePlugin"/>
- <object-type name="QTextCodecPlugin"/>
-
+
+ <object-type name="QTextCodecPlugin">
+ <inject-code class="shell" position="beginning">
+Q_DECLARE_METATYPE(QList<int>)
+ </inject-code>
+ </object-type>
+
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QPixmap::QPixmap', unmatched parameter type 'QPixmapData*'"/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private&'"/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private\*'"/>
Index: src/scriptengine/generator/generator/shellimplgenerator.cpp
===================================================================
--- src/scriptengine/generator/generator/shellimplgenerator.cpp (revision 926173)
+++ src/scriptengine/generator/generator/shellimplgenerator.cpp (working copy)
@@ -105,6 +105,7 @@
declareFunctionMetaTypes(s, functions, registeredTypeNames);
s << endl;
}
+ writeInjectedCode(s, meta_class);
// write constructors
foreach (const AbstractMetaFunction *ctor, ctors) {
amarok-libgpod-0.7.0.patch:
--- NEW FILE amarok-libgpod-0.7.0.patch ---
Index: src/collection/ipodcollection/handler/IpodHandler.cpp
===================================================================
--- src/collection/ipodcollection/handler/IpodHandler.cpp (revision 871432)
+++ src/collection/ipodcollection/handler/IpodHandler.cpp (revision 871434)
@@ -1025,12 +1025,17 @@
QFileInfo tempImageFileInfo( tempImageFile ); // get info for path
QString tempImagePath = tempImageFileInfo.absoluteFilePath(); // path
+#ifdef ITDB_THUMB_COVER_SMALL
Itdb_Thumb *thumb = NULL;
+#endif
GdkPixbuf *gpixbuf = NULL;
QString thumbPath;
// pull image out of ipod
+#ifdef ITDB_THUMB_COVER_SMALL
+ // we've got libgpod 0.6.0 here
+
if( ipodtrack->has_artwork == 0x01 )
{
// try small first
@@ -1115,7 +1120,15 @@
}
}
}
+#else
+ // libgpod 0.7.0
+ if( itdb_track_has_thumbnails ( ipodtrack ) )
+ {
+ gpixbuf = (GdkPixbuf*) itdb_track_get_thumbnail (ipodtrack, -1, -1 );
+ }
+#endif
+
if(gpixbuf != NULL)
{
// temporarily save to file
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-10/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore 10 Jan 2009 23:14:08 -0000 1.42
+++ .cvsignore 5 Mar 2009 16:49:30 -0000 1.43
@@ -1 +1 @@
-amarok-2.0.1.1.tar.bz2
+amarok-2.0.2.tar.bz2
Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-10/amarok.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- amarok.spec 10 Jan 2009 23:14:08 -0000 1.130
+++ amarok.spec 5 Mar 2009 16:49:30 -0000 1.131
@@ -1,7 +1,7 @@
Name: amarok
Summary: Media player
-Version: 2.0.1.1
+Version: 2.0.2
Release: 1%{?dist}
Group: Applications/Multimedia
@@ -10,14 +10,19 @@
Source0: http://download.kde.org/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# From amarok svn, r871433 (Note that this was reverted later, I believe the
+# reasoning for reverting was incorrect. -- tmz :)
+Patch0: amarok-libgpod-0.7.0.patch
+Patch1: amarok-2.0.1.1-gcc44.patch
+
+Patch100: amarok-2.0.1.1-qt45.patch
+
BuildRequires: curl-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext
-# FIXME: bogus deps, from where?
-BuildRequires: giflib-devel pcre-devel
-BuildRequires: kdelibs4-devel >= 4.1.0
+BuildRequires: kdelibs4-devel
BuildRequires: libifp-devel
-BuildRequires: libgpod-devel gtk2-devel
+BuildRequires: libgpod-devel
BuildRequires: libmp4v2-devel
%if 0%{?fedora} > 9
BuildRequires: libmtp-devel >= 0.3.0
@@ -46,7 +51,14 @@
- nice GUI, integrates into the KDE look, but with a unique touch
%prep
-%setup -q
+%setup -q
+
+%if 0%{?fedora} > 10
+%patch0 -p0 -b .libgpod-0.7.0
+%endif
+%patch1 -p1 -b .gcc4
+
+%patch100 -p0 -b .qt45
%build
@@ -54,7 +66,6 @@
pushd %{_target_platform}
%{cmake_kde4} ..
popd
-
make %{?_smp_mflags} -C %{_target_platform}
@@ -113,6 +124,25 @@
%changelog
+* Wed Mar 04 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-1
+- amarok-2.0.2
+
+* Tue Feb 24 2009 Than Ngo <than at redhat.com> 2.0.1.1-6
+- fix build issue against gcc-4.4
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Feb 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0.1.1-4
+- qt45 patch
+
+* Fri Feb 20 2009 Todd Zullinger <tmz at pobox.com> - 2.0.1.1-3
+- Rebuild against libgpod-0.7.0
+- Drop gtk2-devel BR, libgpod properly requires that now
+
+* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0.1.1-2
+- respin (mysql)
+
* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0.1.1-1
- amarok-2.0.1.1
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-10/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources 10 Jan 2009 23:14:08 -0000 1.43
+++ sources 5 Mar 2009 16:49:30 -0000 1.44
@@ -1 +1 @@
-818bc2b0350f35cba0fff0a72b9ffd22 amarok-2.0.1.1.tar.bz2
+98b78372ec6ea3432faba356c90c6dbe amarok-2.0.2.tar.bz2
- Previous message (by thread): rpms/python-pycurl/devel .cvsignore, 1.7, 1.8 python-pycurl.spec, 1.11, 1.12 sources, 1.7, 1.8
- Next message (by thread): rpms/perl-AnyEvent/devel perl-AnyEvent.spec, 1.9, 1.10 sources, 1.7, 1.8 .cvsignore, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list