- Update to 0.7.1

PR:		ports/156040
Submitted by:	Gvozdikov Veniamin <g.veniamin@googlemail.com> (maintainer)

4 files changed, 32 insertions, 20 deletions

diff --git a/audio/clementine-player/Makefile b/audio/clementine-player/Makefile
index 9c9b72e5dbfe..d05c8cc606d0 100644
--- a/audio/clementine-player/Makefile
+++ b/audio/clementine-player/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clementine
-PORTVERSION=	0.6
+PORTVERSION=	0.7.1
 CATEGORIES=	audio
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMESUFFIX=	-player
diff --git a/audio/clementine-player/distinfo b/audio/clementine-player/distinfo
index 9cda648417b8..623ae32596ec 100644
--- a/audio/clementine-player/distinfo
+++ b/audio/clementine-player/distinfo
@@ -1,2 +1,2 @@
-SHA256 (clementine-0.6.tar.gz) = 7a7393af462a3c0864279d8cb2fc59afeec718837e5a1d0818a16b8a20d7cd0c
-SIZE (clementine-0.6.tar.gz) = 5601219
+SHA256 (clementine-0.7.1.tar.gz) = 246e56f9283384b354bd43d5ec9937ceb93889f680f7bf45bd1ab00db36d61bc
+SIZE (clementine-0.7.1.tar.gz) = 5967162
diff --git a/audio/clementine-player/files/patch-src_CMakeLists.txt b/audio/clementine-player/files/patch-src_CMakeLists.txt
index 341faa0db60c..903b5952deda 100644
--- a/audio/clementine-player/files/patch-src_CMakeLists.txt
+++ b/audio/clementine-player/files/patch-src_CMakeLists.txt
@@ -1,6 +1,18 @@
---- src/CMakeLists.txt.orig	2010-12-10 15:26:29.000000000 +0100
-+++ src/CMakeLists.txt	2010-12-29 19:47:49.000000000 +0100
-@@ -772,7 +772,6 @@
+--- src/CMakeLists.txt.orig	2011-04-02 01:17:22.000000000 +0800
++++ src/CMakeLists.txt	2011-04-02 01:20:20.000000000 +0800
+@@ -5,9 +5,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} 
+ option(BUILD_WERROR "Build with -Werror" ON)
+ 
+ if(BUILD_WERROR)
+-  if (LINUX)
++  if (UNIX AND NOT APPLE)
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+-  endif (LINUX)
++  endif (UNIX AND NOT APPLE)
+ endif(BUILD_WERROR)
+ 
+ include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+@@ -883,7 +883,6 @@ target_link_libraries(clementine_lib
    ${QTSINGLECOREAPPLICATION_LIBRARIES}
    ${QTIOCOMPRESSOR_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT}
@@ -8,19 +20,29 @@
    z
  )
  
-@@ -842,7 +841,7 @@
+@@ -982,14 +981,14 @@ if (WIN32)
+   )
+ endif (WIN32)
+ 
+-if (LINUX)
++if (UNIX AND NOT APPLE)
+   # Hack: the Gold linker pays attention to the order that libraries are
+   # specified on the link line.  -lX11 and -ldl are provided earlier in the link
    # command but they're actually used by libraries that appear after them, so
    # they end up getting ignored.  This appends them to the very end of the link
    # line, ensuring they're always used.
 -  target_link_libraries(clementine_lib -lX11 -ldl)
+-endif (LINUX)
 +  target_link_libraries(clementine_lib -lX11)
- endif (UNIX AND NOT APPLE)
++endif (UNIX AND NOT APPLE)
  
  add_dependencies(clementine_lib qtsingleapplication)
-@@ -870,6 +869,7 @@
+ 
+@@ -1016,6 +1015,8 @@ add_executable(clementine
    ${CLEMENTINE-WIN32-RESOURCES}
    main.cpp
  )
++
 +set_target_properties(clementine PROPERTIES OUTPUT_NAME clementine-player)
  target_link_libraries(clementine
    clementine_lib
diff --git a/audio/clementine-player/pkg-plist b/audio/clementine-player/pkg-plist
index a31ec081e294..3d5c870d2f28 100644
--- a/audio/clementine-player/pkg-plist
+++ b/audio/clementine-player/pkg-plist
@@ -1,11 +1,7 @@
 bin/clementine-player
-share/applications/clementine.desktop
 share/icons/hicolor/64x64/apps/application-x-clementine.png
 share/icons/hicolor/scalable/apps/application-x-clementine.svg
-share/icons/ubuntu-mono-dark/apps/24/clementine-panel.png
-share/icons/ubuntu-mono-dark/apps/24/clementine-panel-grey.png
-share/icons/ubuntu-mono-light/apps/24/clementine-panel.png
-share/icons/ubuntu-mono-light/apps/24/clementine-panel-grey.png
+share/applications/clementine.desktop
 %%VSL%%%%DATADIR%%/projectm-presets/Aderrasi - Agitator.milk
 %%VSL%%%%DATADIR%%/projectm-presets/Aderrasi - Aimless (Gravity Directive Mix).milk
 %%VSL%%%%DATADIR%%/projectm-presets/Aderrasi - Aimless (Spirogravity Mix).milk
@@ -580,9 +576,3 @@ share/icons/ubuntu-mono-light/apps/24/clementine-panel-grey.png
 %%VSL%%@dirrm %%DATADIR%%/projectm-presets
 %%VSL%%@dirrm %%DATADIR%%
 @dirrmtry share/applications
-@dirrmtry share/icons/ubuntu-mono-light/apps/24
-@dirrmtry share/icons/ubuntu-mono-light/apps
-@dirrmtry share/icons/ubuntu-mono-light
-@dirrmtry share/icons/ubuntu-mono-dark/apps/24
-@dirrmtry share/icons/ubuntu-mono-dark/apps
-@dirrmtry share/icons/ubuntu-mono-dark