From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jan 12 07:25:18 2012 Return-Path: Delivered-To: freebsd-ports-bugs@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0FC59106566C; Thu, 12 Jan 2012 07:25:18 +0000 (UTC) (envelope-from loox@e-shell.net) Received: from mail.serpronet.com (mail.serpronet.com [64.214.84.187]) by mx1.freebsd.org (Postfix) with ESMTP id C194A8FC08; Thu, 12 Jan 2012 07:25:17 +0000 (UTC) Received: by mail.serpronet.com (Postfix, from userid 506) id E2A6EC4C6F; Thu, 12 Jan 2012 01:09:23 -0600 (CST) X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on titan.serpronet.com X-Spam-Level: X-Spam-Status: No, score=-4.4 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.2.5 Received: from twinmoon.e-shell.net (unknown [10.1.10.180]) by mail.serpronet.com (Postfix) with ESMTP id EA1AEC4C6C; Thu, 12 Jan 2012 01:09:20 -0600 (CST) Received: from moonlight.e-shell.tk (unknown [187.193.133.117]) by twinmoon.e-shell.net (Postfix) with ESMTPSA id 5DD991702D; Thu, 12 Jan 2012 01:10:52 -0600 (CST) From: Axel Gonzalez To: bug-followup@freebsd.org Date: Thu, 12 Jan 2012 01:09:17 -0600 Message-ID: <3274575.qtJrjF4Gcd@moonlight.e-shell.tk> User-Agent: KMail/4.7.1 (FreeBSD/9.0-RC1; KDE/4.7.2; i386; ; ) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="nextPart1907671.sBZbF9NMnR" Content-Transfer-Encoding: 7Bit Cc: freebsd-ports-bugs@freebsd.org, Veniamin Gvozdikov , edwin@freebsd.org Subject: Re: ports/164043: [patch] audio/clementine-player remove dependency on gcc46 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jan 2012 07:25:18 -0000 --nextPart1907671.sBZbF9NMnR Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" The new full patch with a fix from Veniamin Gvozdikov --nextPart1907671.sBZbF9NMnR Content-Disposition: attachment; filename="clementine.diff" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="ISO-8859-1"; name="clementine.diff" diff -ruN clementine-player.orig/Makefile clementine-player/Makefile --- clementine-player.orig/Makefile 2012-01-11 22:36:02.000000000 -0600 +++ clementine-player/Makefile 2012-01-12 00:55:13.000000000 -0600 @@ -19,13 +19,8 @@ LIB_DEPENDS= tag.1:${PORTSDIR}/audio/taglib \ notify.4:${PORTSDIR}/devel/libnotify \ xine.1:${PORTSDIR}/multimedia/libxine \ - mtp.11:${PORTSDIR}/audio/libmtp \ - usbmuxd.1:${PORTSDIR}/comms/usbmuxd \ - imobiledevice.1:${PORTSDIR}/comms/libimobiledevice \ - gpod.7:${PORTSDIR}/audio/libgpod \ qjson.0:${PORTSDIR}/devel/qjson -BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs \ - chrpath:${PORTSDIR}/devel/chrpath +BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs PROJECTHOST= ${PORTNAME}${PKGNAMESUFFIX} @@ -35,17 +30,17 @@ USE_QT_VER= 4 QT_COMPONENTS= gui xml qmake_build uic_build moc_build rcc_build \ linguist_build network sql opengl dbus qtestlib corelib -USE_GCC= 4.6+ +USE_GCC= 4.2+ INSTALLS_ICONS= yes USE_GSTREAMER= gio ogg mp3 flac soup vorbis MAKE_JOBS_UNSAFE= yes -GCC_LIBS= "${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}" -CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib" \ - -DCMAKE_SKIP_RPATH:BOOL=ON +CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib" OPTIONS= VISUALISATION "Visualisations from projectM" off \ - LASTFM "Support Last.fm service (requires ruby)" on + LASTFM "Support Last.fm service (requires ruby)" on \ + GPOD "iPod support" on \ + MTP "MTP device support" on .include @@ -60,7 +55,12 @@ LIB_DEPENDS+= lastfm.0:${PORTSDIR}/audio/liblastfm .endif -post-build: - ${LOCALBASE}/bin/chrpath -r "${GCC_LIBS}" "${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}" +.if defined(WITH_GPOD) +LIB_DEPENDS+= gpod.7:${PORTSDIR}/audio/libgpod +.endif + +.if defined(WITH_MTP) +LIB_DEPENDS+= mtp.11:${PORTSDIR}/audio/libmtp +.endif .include diff -ruN clementine-player.orig/files/patch-src-devices-cddadevice.h clementine-player/files/patch-src-devices-cddadevice.h --- clementine-player.orig/files/patch-src-devices-cddadevice.h 1969-12-31 18:00:00.000000000 -0600 +++ clementine-player/files/patch-src-devices-cddadevice.h 2012-01-11 22:44:50.000000000 -0600 @@ -0,0 +1,15 @@ +--- src/devices/cddadevice.h.orig 2012-01-11 22:39:56.000000000 -0600 ++++ src/devices/cddadevice.h 2012-01-11 22:40:33.000000000 -0600 +@@ -18,10 +18,10 @@ + #ifndef CDDADEVICE_H + #define CDDADEVICE_H + +-#include +-#include + #include + ++#include ++#include + #include "connecteddevice.h" + #include "core/song.h" + #include "musicbrainz/musicbrainzclient.h" diff -ruN clementine-player.orig/files/patch-src-devices-cddalister.cpp clementine-player/files/patch-src-devices-cddalister.cpp --- clementine-player.orig/files/patch-src-devices-cddalister.cpp 1969-12-31 18:00:00.000000000 -0600 +++ clementine-player/files/patch-src-devices-cddalister.cpp 2012-01-11 22:45:08.000000000 -0600 @@ -0,0 +1,16 @@ +--- src/devices/cddalister.cpp.orig 2012-01-11 22:39:03.000000000 -0600 ++++ src/devices/cddalister.cpp 2012-01-11 22:39:22.000000000 -0600 +@@ -15,12 +15,12 @@ + along with Clementine. If not, see . + */ + +-#include + #include + #include + #include + #include + ++#include + #include "cddalister.h" + #include "core/logging.h" + #include "core/song.h" --nextPart1907671.sBZbF9NMnR--