From owner-svn-ports-head@FreeBSD.ORG  Sat Aug 10 15:08:23 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id C16D6EBB;
 Sat, 10 Aug 2013 15:08:23 +0000 (UTC) (envelope-from vg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id AEA522130;
 Sat, 10 Aug 2013 15:08:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7AF8NuN043074;
 Sat, 10 Aug 2013 15:08:23 GMT (envelope-from vg@svn.freebsd.org)
Received: (from vg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7AF8NfK043068;
 Sat, 10 Aug 2013 15:08:23 GMT (envelope-from vg@svn.freebsd.org)
Message-Id: <201308101508.r7AF8NfK043068@svn.freebsd.org>
From: Veniamin Gvozdikov <vg@FreeBSD.org>
Date: Sat, 10 Aug 2013 15:08:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r324538 - in head/audio/clementine-player: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Aug 2013 15:08:23 -0000

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@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();