packages: clementine/clementine-dont-bundle-external-lib.patch, clementine/...

glen glen at pld-linux.org
Wed Jul 7 09:27:17 CEST 2010 

Author: glen                         Date: Wed Jul  7 07:27:17 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.4.2

---- Files affected:
packages/clementine:
   clementine-dont-bundle-external-lib.patch (1.1 -> 1.2) , clementine.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: packages/clementine/clementine-dont-bundle-external-lib.patch
diff -u packages/clementine/clementine-dont-bundle-external-lib.patch:1.1 packages/clementine/clementine-dont-bundle-external-lib.patch:1.2
--- packages/clementine/clementine-dont-bundle-external-lib.patch:1.1	Sat Apr 24 13:16:06 2010
+++ packages/clementine/clementine-dont-bundle-external-lib.patch	Wed Jul  7 09:27:12 2010
@@ -1,48 +1,60 @@
-diff -rupN clementine-0.2.old/CMakeLists.txt clementine-0.2/CMakeLists.txt
---- clementine-0.2.old/CMakeLists.txt	2010-03-22 14:35:31.000000000 -0400
-+++ clementine-0.2/CMakeLists.txt	2010-04-17 16:06:29.000000000 -0400
-@@ -83,8 +83,6 @@ if (WIN32)
- endif(WIN32)
+--- clementine-0.4.2/CMakeLists.txt~	2010-07-01 21:18:22.000000000 +0300
++++ clementine-0.4.2/CMakeLists.txt	2010-07-07 09:03:25.664272595 +0300
+@@ -149,12 +149,7 @@
+ endif(STATIC_SQLITE)
  
  # Subdirectories
 -add_subdirectory(3rdparty/qtsingleapplication)
--add_subdirectory(3rdparty/qxt)
+-add_subdirectory(3rdparty/qtiocompressor)
  add_subdirectory(src)
- 
+-if (NOT APPLE)
+-  add_subdirectory(3rdparty/qxt)
+-endif (NOT APPLE)
+ add_subdirectory(3rdparty/universalchardet)
  add_subdirectory(tests)
-diff -rupN clementine-0.2.old/src/CMakeLists.txt clementine-0.2/src/CMakeLists.txt
---- clementine-0.2.old/src/CMakeLists.txt	2010-03-22 14:35:31.000000000 -0400
-+++ clementine-0.2/src/CMakeLists.txt	2010-04-17 16:11:00.000000000 -0400
-@@ -193,9 +193,9 @@ qt4_add_resources(CLEMENTINE-SOURCES-RES
+ add_subdirectory(dist)
+--- clementine-0.4.2/src/CMakeLists.txt~	2010-07-01 21:17:36.000000000 +0300
++++ clementine-0.4.2/src/CMakeLists.txt	2010-07-07 08:33:17.521870705 +0300
+@@ -5,10 +5,9 @@
  
  include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+ include_directories(${SPARKLE})
+-include_directories(../3rdparty/gmock/gtest/include)
+-include_directories(../3rdparty/qtsingleapplication)
+-include_directories(../3rdparty/qtiocompressor)
+-include_directories(../3rdparty/qxt)
++include_directories("/usr/include/QtSolutions")
++include_directories("/usr/include/QxtGui")
++include_directories("/usr/include/QxtCore")
+ include_directories(../3rdparty/libprojectm)
+ 
+ include_directories(${GLIB_INCLUDE_DIRECTORIES})
+@@ -449,8 +448,8 @@
+ add_dependencies(clementine_lib pot)
  
--include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/qtsingleapplication")
--include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/qxt")
--include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/gmock/gtest/include")
-+include_directories("/usr/include/QtSolutions/")
-+include_directories("/usr/include/QxtGui/")
-+include_directories("/usr/include/QxtCore/")
- 
- set(EXECUTABLE_OUTPUT_PATH ..)
- add_library(clementine_lib
-@@ -206,8 +206,8 @@ add_library(clementine_lib
-    ${CLEMENTINE-QM-FILES}
- )
  target_link_libraries(clementine_lib
--    qtsingleapplication
--    qxt
-+    QtSolutions_SingleApplication-2.6
-+    QxtCore QxtGui
-     lastfm
-     ${XINE_LIBRARIES}
-     ${LIBNOTIFY_LIBRARIES}
-@@ -220,7 +220,7 @@ if (APPLE)
+-  qtsingleapplication
+-  qtiocompressor
++  QtSolutions_SingleApplication-2.6
++  QtSolutions_IOCompressor-2.3
+   chardet
+   ${GOBJECT_LIBRARIES}
+   ${GLIB_LIBRARIES}
+@@ -475,7 +474,7 @@
    )
-   include_directories(${GROWL}/Headers)
+   include_directories(${SPARKLE}/Headers)
+ else (APPLE)
+-  target_link_libraries(clementine_lib qxt)
++  target_link_libraries(clementine_lib QxtCore QxtGui)
  endif (APPLE)
--add_dependencies(clementine_lib qtsingleapplication qxt)
-+add_dependencies(clementine_lib QtSolutions_SingleApplication-2.6 QxtCore QxtGui)
  
- # Link against the qsqlite plugin on windows
- if(WIN32)
+ # Link against the qsqlite plugin on windows and mac
+@@ -484,7 +483,7 @@
+   target_link_libraries(clementine_lib qsqlite)
+ endif(HAVE_STATIC_SQLITE)
+ 
+-add_dependencies(clementine_lib qtsingleapplication)
++add_dependencies(clementine_lib QtSolutions_SingleApplication-2.6)
+ 
+ 
+ ###############################################################################

================================================================
Index: packages/clementine/clementine.spec
diff -u packages/clementine/clementine.spec:1.11 packages/clementine/clementine.spec:1.12
--- packages/clementine/clementine.spec:1.11	Tue Jun 29 22:56:37 2010
+++ packages/clementine/clementine.spec	Wed Jul  7 09:27:12 2010
@@ -1,8 +1,12 @@
 # $Revision$, $Date$
 # TODO:
-# - update patch0
 # - add missing BRs
-# - Gstreamer error: "A text/uri-list decoder plugin is required to play this stream, but not installed." 
+# - Gstreamer error: "A text/uri-list decoder plugin is required to play this stream, but not installed."
+# -- Building engines: gst
+# -- Skipping engines: vlc xine qt-phonon
+#    The following engines are NOT supported by clementine developers:
+#     vlc xine qt-phonon
+# - apply patches to libprojectM.spec and use
 #
 # Conditional build:
 %bcond_without	engine_xine		# without xine engine
@@ -13,18 +17,19 @@
 Summary:	A music player and library organiser
 Summary(hu.UTF-8):	Egy zenelejátszó és gyűjtemény-kezelő
 Name:		clementine
-Version:	0.4
+Version:	0.4.2
 Release:	0.1
 License:	GPL v3 and GPL v2+
 Group:		Applications/Multimedia
 URL:		http://code.google.com/p/clementine-player
 Source0:	http://clementine-player.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5:	dbfec89142910a60502674234daf01df
+# Source0-md5:	c6819b0d2a8324f1d686fb5a3b1d287b
 Patch0:		%{name}-dont-bundle-external-lib.patch
 Patch2:		desktop-install.patch
 BuildRequires:	QtCore-devel
 BuildRequires:	QtDBus-devel
 BuildRequires:	QtGui-devel
+BuildRequires:	QtIOCompressor-devel
 BuildRequires:	QtNetwork-devel
 BuildRequires:	QtOpenGL-devel
 BuildRequires:	QtSingleApplication-devel
@@ -35,10 +40,14 @@
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext-devel
 BuildRequires:	gstreamer-devel
+BuildRequires:	gstreamer-devel >= 0.10
+BuildRequires:	gstreamer-plugins-base-devel >= 0.10
 BuildRequires:	gtest-devel
 BuildRequires:	liblastfm-devel
 BuildRequires:	libnotify-devel
+#BuildRequires:	libprojectM-devel
 BuildRequires:	libqxt-devel
+#BuildRequires:	libqxt-devel >= 0.6.0-0.2
 BuildRequires:	notification-daemon
 BuildRequires:	phonon-devel
 BuildRequires:	pkgconfig
@@ -49,13 +58,18 @@
 BuildRequires:	sed >= 4.0
 BuildRequires:	sqlite-devel
 BuildRequires:	sqlite3-devel
-BuildRequires:	taglib-devel
+BuildRequires:	taglib-devel >= 1.6
 BuildRequires:	vlc-devel
 BuildRequires:	xine-lib-devel
 Requires(post,postun):	desktop-file-utils
 Requires:	QtSql-sqlite3
+# while we do not link (yet), we use datafiles
+Requires:	libprojectM
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# see libprojectM.spec for explanation
+%define		filterout_ld	-Wl,--as-needed -Wl,--no-copy-dt-needed-entries
+
 %description
 Clementine is a modern music player and library organiser. It is
 largely a port of Amarok 1.4, with some features rewritten to take
@@ -68,20 +82,25 @@
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
 %patch2 -p1
 
 # We already don't use these but just to make sure
-#rm -fr 3rdparty
+rm -rf 3rdparty/gmock
+rm -rf 3rdparty/qsqlite
+rm -rf 3rdparty/qtsingleapplication
+rm -rf 3rdparty/qxt
+rm -rf 3rdparty/qtiocompressor
 
 # Don't build tests. They require gmock
-sed -i -e '/tests/d' CMakeLists.txt
+sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt
 
 %build
 install -d build
 cd build
 %cmake \
 	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+	-DBUNDLE_PROJECTM_PRESETS=OFF \
 	-DENGINE_GSTREAMER_ENABLED=%{?with_engine_gstreamer:ON}%{!?with_engine_gstreamer:OFF} \
 	-DENGINE_LIBVLC_ENABLED=%{?with_engine_vlc:ON}%{!?with_engine_vlc:OFF} \
 	-DENGINE_LIBXINE_ENABLED=%{?with_engine_xine:ON}%{!?with_engine_xine:OFF} \
@@ -116,6 +135,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2010/07/07 07:27:12  glen
+- up to 0.4.2
+
 Revision 1.11  2010/06/29 20:56:37  arvenil
 - -static.patch already in sources
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/clementine/clementine-dont-bundle-external-lib.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/clementine/clementine.spec?r1=1.11&r2=1.12&f=u

More information about the pld-cvs-commit mailing list