commit 5fe14c9e10fe78dd81d9d61f92bba36d6445c730
Author: Elan Ruusamäe <[email protected]>
Date: Sat Sep 7 23:30:04 2013 +0300
use system libmygpo-qt
clementine-mygpo.patch | 15 +++++++++++++++
clementine.spec | 16 +++++++++-------
2 files changed, 24 insertions(+), 7 deletions(-)
---
diff --git a/clementine.spec b/clementine.spec
index b718d42..c62cd9d 100644
--- a/clementine.spec
+++ b/clementine.spec
@@ -27,6 +27,7 @@ Patch0: desktop-install.patch
Patch1: unbundle-po.patch
Patch2: %{name}-1.1.1-libimobiledevice-fix.patch
Patch3: %{name}-dt_categories.patch
+Patch4: %{name}-mygpo.patch
BuildRequires: QtCore-devel >= %{qtver}
BuildRequires: QtDBus-devel >= %{qtver}
BuildRequires: QtGui-devel >= %{qtver}
@@ -54,6 +55,7 @@ BuildRequires: libimobiledevice-devel >= 1.1.5
BuildRequires: libindicate-qt-devel
BuildRequires: liblastfm-devel >= 0.3.3
BuildRequires: libmtp-devel
+BuildRequires: libmygpo-qt-devel
BuildRequires: libplist-devel
%{!?with_static_projectm:BuildRequires: libprojectM-devel >= 1:2.0.1-4}
BuildRequires: libqxt-devel
@@ -82,6 +84,7 @@ Requires: QtSingleApplication >= 2.6-4
Requires: gstreamer0.10-audio-effects-base
Requires: gstreamer0.10-mad
Suggests: gstreamer0.10-flac
+
# while we do not link (yet), we use datafiles
Requires: libprojectM
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -105,14 +108,13 @@ a Qt4 előnyeit.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
-# We already don't use these but just to make sure
-rm -rf 3rdparty/gmock
-%{!?with_static_sqlite:rm -rf 3rdparty/qsqlite}
-rm -rf 3rdparty/qtsingleapplication
-rm -rf 3rdparty/qxt
-rm -rf 3rdparty/qtiocompressor
-%{!?with_static_projectm:rm -rf 3rdparty/libprojectM}
+# Remove all 3rdparty libraries exceph universalchardet
+# as it is not available as a separate library.
+mv 3rdparty 3rdparty.keep
+install -d 3rdparty
+mv
3rdparty.keep/{universalchardet,sha2,libechonest,qocoa%{?with_static_sqlite:,qsqlite}%{?with_static_projectm:,libprojectM}}
3rdparty
# Don't build tests. They require gmock
sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt
diff --git a/clementine-mygpo.patch b/clementine-mygpo.patch
new file mode 100644
index 0000000..7a4cdf3
--- /dev/null
+++ b/clementine-mygpo.patch
@@ -0,0 +1,15 @@
+diff -up clementine-1.1.1/CMakeLists.txt.mygpo clementine-1.1.1/CMakeLists.txt
+--- clementine-1.1.1/CMakeLists.txt.mygpo 2012-11-18 01:51:26.000000000
-0700
++++ clementine-1.1.1/CMakeLists.txt 2013-02-24 10:49:15.852174934 -0700
+@@ -394,9 +394,9 @@ if(NOT CHROMAPRINT_FOUND)
+ endif(NOT CHROMAPRINT_FOUND)
+
+ # We have to use our own libmygpo-qt for now
+-add_subdirectory(3rdparty/libmygpo-qt)
++#add_subdirectory(3rdparty/libmygpo-qt)
+ set(MYGPOQT_LIBRARIES mygpo-qt)
+-set(MYGPOQT_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/3rdparty/libmygpo-qt/)
++set(MYGPOQT_INCLUDE_DIRS /usr/include/mygpo-qt/)
+
+ # Qocoa
+ add_subdirectory(3rdparty/qocoa)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/clementine.git/commitdiff/5fe14c9e10fe78dd81d9d61f92bba36d6445c730
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
