Hello community, here is the log from the commit of package libqtpod for openSUSE:Factory checked in at 2012-03-26 11:03:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqtpod (Old) and /work/SRC/openSUSE:Factory/.libqtpod.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqtpod", Maintainer is "co...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libqtpod/libqtpod.changes 2011-09-23 02:09:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqtpod.new/libqtpod.changes 2012-03-26 11:03:32.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Mar 24 13:48:19 UTC 2012 - dims...@opensuse.org + +- Add libqtpod-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- New: ---- libqtpod-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqtpod.spec ++++++ --- /var/tmp/diff_new_pack.myHHy2/_old 2012-03-26 11:03:33.000000000 +0200 +++ /var/tmp/diff_new_pack.myHHy2/_new 2012-03-26 11:03:33.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libqtpod (Version 0.4.2) +# spec file for package libqtpod # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,21 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: libqtpod Url: http://sourceforge.net/projects/kpod Version: 0.4.2 -Release: 6 +Release: 0 Summary: A Qt based library to access the data on an Apple iPod -Group: Productivity/Multimedia/Sound/Utilities License: GPL-2.0+ ; LGPL-2.1+ +Group: Productivity/Multimedia/Sound/Utilities BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: libqtpod-%{version}.tar.bz2 -BuildRequires: qt3-devel xorg-x11-libs +BuildRequires: qt3-devel +BuildRequires: xorg-x11-libs Patch1: libqtpod-0.4.2.patch Patch2: libqtpod-target.patch +Patch3: libqtpod-gcc47.patch %description A Qt based library to access the data on an Apple iPod @@ -41,11 +41,10 @@ Michael Schulze <mik...@genion.de> %package -n libqtpod0 -License: GPL-2.0+ ; LGPL-2.1+ -Group: Productivity/Multimedia/Sound/Utilities Provides: libqtpod = %{version}-%{release} # Summary: A Qt based library to access the data on an Apple iPod +Group: Productivity/Multimedia/Sound/Utilities %description -n libqtpod0 A Qt based library to access the data on an Apple iPod @@ -57,11 +56,9 @@ Michael Schulze <mik...@genion.de> %package devel -License: GPL-2.0+ ; LGPL-2.1+ -Group: Development/Libraries/C and C++ -AutoReqProv: on Requires: libqtpod0 = %{version} Summary: A Qt based library to access the data on an Apple iPod +Group: Development/Libraries/C and C++ %description devel A Qt based library to access the data on an Apple iPod @@ -73,10 +70,8 @@ Michael Schulze <mik...@genion.de> %package doc -License: GPL-2.0+ ; LGPL-2.1+ -Group: Productivity/Multimedia/Sound/Utilities -AutoReqProv: on Summary: A Qt based library to access the data on an Apple iPod +Group: Productivity/Multimedia/Sound/Utilities %description doc A Qt based library to access the data on an Apple iPod. @@ -93,17 +88,17 @@ %setup -n libqtpod-%{version} %patch1 %patch2 +%patch3 -p1 %build +export QTDIR=/usr/lib/qt3 +export PATH="$QTDIR/bin:$PATH" CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" /usr/lib/qt3/bin/qmake -d make %install BUILDLIBDIR=%{buildroot}%{_libdir} BUILDINCLDIR=%{buildroot}%{_includedir}/libqtpod %makeinstall -%clean -rm -rf %{buildroot} - %post -n libqtpod0 -p /sbin/ldconfig %postun -n libqtpod0 -p /sbin/ldconfig ++++++ libqtpod-gcc47.patch ++++++ Index: libqtpod-0.4.2/src/itunesdbwriter.cpp =================================================================== --- libqtpod-0.4.2.orig/src/itunesdbwriter.cpp +++ libqtpod-0.4.2/src/itunesdbwriter.cpp @@ -31,6 +31,8 @@ #ifdef WIN32 #include <Windows.h> +#else +#include <unistd.h> // for fsync() #endif #if QT_VERSION >= 0x040000 Index: libqtpod-0.4.2/src/utils.h =================================================================== --- libqtpod-0.4.2.orig/src/utils.h +++ libqtpod-0.4.2/src/utils.h @@ -673,7 +673,7 @@ public: if ( m_deleteElements ) { delete *posIter; } - erase( posIter ); + this->erase( posIter ); return true; } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
