svn commit: r324538 - in head/audio/clementine-player: . files

[Veniamin Gvozdikov]

Author: vg
Date: Sat Aug 10 15:08:22 2013
New Revision: 324538
URL: http://svnweb.freebsd.org/changeset/ports/324538

Log:
  - Added conflict with Qt3
  - Fixed build with new glibc
  
  PR:		ports/175429
  Submitted by:	Heino Tiedemann <rotkap at gmx.de>
  Approved by:	eadler (mentor)

Added:
  head/audio/clementine-player/files/patch-src-main.cpp   (contents, props changed)
Modified:
  head/audio/clementine-player/Makefile

Modified: head/audio/clementine-player/Makefile
==============================================================================
--- head/audio/clementine-player/Makefile	Sat Aug 10 14:49:45 2013	(r324537)
+++ head/audio/clementine-player/Makefile	Sat Aug 10 15:08:22 2013	(r324538)
@@ -33,6 +33,7 @@ USE_GCC=	4.2+
 INSTALLS_ICONS=	yes
 USE_GSTREAMER=	gio ogg mp3 flac soup vorbis
 MAKE_JOBS_UNSAFE=	yes
+CONFLICTS_BUILD=	qt-3.*
 
 CMAKE_ARGS+=	-DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib"
 

Added: head/audio/clementine-player/files/patch-src-main.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/clementine-player/files/patch-src-main.cpp	Sat Aug 10 15:08:22 2013	(r324538)
@@ -0,0 +1,12 @@
+--- src/main.cpp.orig	2013-08-05 07:51:55.259557059 +0000
++++ src/main.cpp	2013-08-05 08:02:30.142556079 +0000
+@@ -265,7 +265,9 @@
+ #endif
+ 
+   // This makes us show up nicely in gnome-volume-control
++#if !GLIB_CHECK_VERSION(2, 36, 0)
+   g_type_init();
++#endif
+   g_set_application_name(QCoreApplication::applicationName().toLocal8Bit());
+ 
+   RegisterMetaTypes();