Hello community,

here is the log from the commit of package libtunepimp for openSUSE:Factory
checked in at Thu Aug 11 10:06:50 CEST 2011.



--------
--- libtunepimp/libtunepimp.changes     2011-05-02 02:40:35.000000000 +0200
+++ /mounts/work_src_done/STABLE/libtunepimp/libtunepimp.changes        
2011-08-08 19:06:19.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Aug  8 17:05:35 UTC 2011 - [email protected]
+
+- Fix build with newer curl 
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libtunepimp.spec ++++++
--- /var/tmp/diff_new_pack.YvSEUq/_old  2011-08-11 10:06:33.000000000 +0200
+++ /var/tmp/diff_new_pack.YvSEUq/_new  2011-08-11 10:06:33.000000000 +0200
@@ -38,7 +38,7 @@
 License:        LGPL v2.1 or later
 Group:          System/Libraries
 Version:        0.5.3
-Release:        150
+Release:        152
 # Package name for 9.1 and SLES9:
 Provides:       trm
 Obsoletes:      trm < %{version}
@@ -170,7 +170,7 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch
 %patch1
 
 %build

++++++ libtunepimp-fixes.patch ++++++
--- /var/tmp/diff_new_pack.YvSEUq/_old  2011-08-11 10:06:33.000000000 +0200
+++ /var/tmp/diff_new_pack.YvSEUq/_new  2011-08-11 10:06:33.000000000 +0200
@@ -1,7 +1,5 @@
-Index: libtunepimp-0.5.3/lib/utf8/utf8util.cpp
-===================================================================
---- libtunepimp-0.5.3.orig/lib/utf8/utf8util.cpp
-+++ libtunepimp-0.5.3/lib/utf8/utf8util.cpp
+--- lib/utf8/utf8util.cpp.orig
++++ lib/utf8/utf8util.cpp
 @@ -26,6 +26,7 @@
  ----------------------------------------------------------------------------*/
  
@@ -10,10 +8,8 @@
  #include "utf8util.h"
  #include "utf8.h"
  #ifdef WIN32
-Index: libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h
-===================================================================
---- libtunepimp-0.5.3.orig/include/tunepimp-0.5/metadata.h
-+++ libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h
+--- include/tunepimp-0.5/metadata.h.orig
++++ include/tunepimp-0.5/metadata.h
 @@ -28,6 +28,7 @@
  #define __METADATA_H__
  
@@ -22,10 +18,8 @@
  #include <cstdio>
  
  #include "defs.h"
-Index: libtunepimp-0.5.3/lib/metadata.cpp
-===================================================================
---- libtunepimp-0.5.3.orig/lib/metadata.cpp
-+++ libtunepimp-0.5.3/lib/metadata.cpp
+--- lib/metadata.cpp.orig
++++ lib/metadata.cpp
 @@ -25,6 +25,7 @@
  
  ----------------------------------------------------------------------------*/
@@ -34,11 +28,9 @@
  #include <stdio.h>
  #include "metadata.h"
  #include "../config.h"
-Index: libtunepimp-0.5.3/lib/protocol.cpp
-===================================================================
---- libtunepimp-0.5.3.orig/lib/protocol.cpp
-+++ libtunepimp-0.5.3/lib/protocol.cpp
-@@ -9,6 +9,7 @@
+--- lib/protocol.cpp.orig
++++ lib/protocol.cpp
+@@ -9,10 +9,13 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string>
@@ -46,10 +38,14 @@
  #include <map>
  #include <expat.h>
  #include <curl/curl.h>
-Index: libtunepimp-0.5.3/lib/tunepimp.cpp
-===================================================================
---- libtunepimp-0.5.3.orig/lib/tunepimp.cpp
-+++ libtunepimp-0.5.3/lib/tunepimp.cpp
++#ifdef HAVE_CURL_TYPES_H
+ #include <curl/types.h>
++#endif
+ #include <curl/easy.h>
+ using namespace std;
+ 
+--- lib/tunepimp.cpp.orig
++++ lib/tunepimp.cpp
 @@ -32,6 +32,7 @@
  
  #include <stdio.h>
@@ -58,10 +54,8 @@
  using namespace std;
  
  #ifdef WIN32
-Index: libtunepimp-0.5.3/lib/c_wrapper.cpp
-===================================================================
---- libtunepimp-0.5.3.orig/lib/c_wrapper.cpp
-+++ libtunepimp-0.5.3/lib/c_wrapper.cpp
+--- lib/c_wrapper.cpp.orig
++++ lib/c_wrapper.cpp
 @@ -28,6 +28,7 @@
  #include "mutex.h"
  #include "tp_c.h"
@@ -70,10 +64,8 @@
  
  #define DB printf("%s:%d\n", __FILE__, __LINE__);
  
-Index: libtunepimp-0.5.3/lib/readmeta.cpp
-===================================================================
---- libtunepimp-0.5.3.orig/lib/readmeta.cpp
-+++ libtunepimp-0.5.3/lib/readmeta.cpp
+--- lib/readmeta.cpp.orig
++++ lib/readmeta.cpp
 @@ -31,6 +31,7 @@
  #endif
  
@@ -82,10 +74,8 @@
  #ifndef WIN32
  #include <unistd.h>
  #endif
-Index: libtunepimp-0.5.3/lib/fileio.cpp
-===================================================================
---- libtunepimp-0.5.3.orig/lib/fileio.cpp
-+++ libtunepimp-0.5.3/lib/fileio.cpp
+--- lib/fileio.cpp.orig
++++ lib/fileio.cpp
 @@ -28,6 +28,8 @@
  #include <assert.h>
  #include <errno.h>
@@ -107,10 +97,8 @@
      ptr = strrchr(path, dirSepChar);
      if (ptr)
      {
-Index: libtunepimp-0.5.3/plugins/wma/wmafile.cpp
-===================================================================
---- libtunepimp-0.5.3.orig/plugins/wma/wmafile.cpp
-+++ libtunepimp-0.5.3/plugins/wma/wmafile.cpp
+--- plugins/wma/wmafile.cpp.orig
++++ plugins/wma/wmafile.cpp
 @@ -20,6 +20,7 @@
   ***************************************************************************/
  
@@ -119,10 +107,8 @@
  #include <wmafile.h>
  #include <wmatag.h>
  #include <wmaproperties.h>
-Index: libtunepimp-0.5.3/plugins/wma/wma.cpp
-===================================================================
---- libtunepimp-0.5.3.orig/plugins/wma/wma.cpp
-+++ libtunepimp-0.5.3/plugins/wma/wma.cpp
+--- plugins/wma/wma.cpp.orig
++++ plugins/wma/wma.cpp
 @@ -27,6 +27,7 @@
  
  #include <string.h>
@@ -131,3 +117,25 @@
  #include <wmafile.h>
  #include "metadata.h"
  #include "plugin.h"
+--- configure.in.orig
++++ configure.in
+@@ -32,7 +32,9 @@ AM_CONDITIONAL(FREEBSD, test x$os = xfre
+ 
+ dnl Checks for programs.
+ AC_PREREQ(2.52)
+-AC_PROG_CC
++AC_PROG_CC_STDC
++AC_USE_SYSTEM_EXTENSIONS
++AC_SYS_LARGEFILE
+ AC_LIBLTDL_CONVENIENCE
+ AC_SUBST(INCLTDL)
+ AC_SUBST(LIBLTDL)
+@@ -87,6 +89,8 @@ AC_CHECK_LIB(curl, curl_global_init,
+       echo "*"
+       AC_MSG_ERROR("Cannot build. Stop.")], -lcurl)
+ 
++AC_CHECK_HEADERS([curl/types.h])
++
+ AC_CHECK_LIB(ofa, ofa_get_version,,
+         [
+         echo "*"


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to