From owner-svn-ports-all@FreeBSD.ORG Tue Apr 21 16:26:18 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B8D1A7E8; Tue, 21 Apr 2015 16:26:18 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A6B8A1DC5; Tue, 21 Apr 2015 16:26:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3LGQIIn077971; Tue, 21 Apr 2015 16:26:18 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3LGQIMb077967; Tue, 21 Apr 2015 16:26:18 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201504211626.t3LGQIMb077967@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Tue, 21 Apr 2015 16:26:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384430 - in branches/2015Q2/audio/cantata: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Apr 2015 16:26:18 -0000 Author: rakuco Date: Tue Apr 21 16:26:17 2015 New Revision: 384430 URL: https://svnweb.freebsd.org/changeset/ports/384430 Log: MFH: r384421 Look for icons in places other than /usr/share/icons. Incorporate upstream commit 5750: - When checking for icon themes, also check in $PREFIX - Also ensure path is in QIcon's theme path This makes the port correctly find/show icons in the UI. PR: 199549 Submitted by: Tobias Berner Approved by: portmgr (erwin) Added: branches/2015Q2/audio/cantata/files/patch-svn-5739-gui__application_qt.cpp - copied unchanged from r384421, head/audio/cantata/files/patch-svn-5739-gui__application_qt.cpp Modified: branches/2015Q2/audio/cantata/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/audio/cantata/Makefile ============================================================================== --- branches/2015Q2/audio/cantata/Makefile Tue Apr 21 16:12:49 2015 (r384429) +++ branches/2015Q2/audio/cantata/Makefile Tue Apr 21 16:26:17 2015 (r384430) @@ -2,6 +2,7 @@ PORTNAME= cantata PORTVERSION= 1.5.1 +PORTREVISION= 1 CATEGORIES= audio kde MASTER_SITES= https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60UktwaTRMTjRIUW8&dummy= Copied: branches/2015Q2/audio/cantata/files/patch-svn-5739-gui__application_qt.cpp (from r384421, head/audio/cantata/files/patch-svn-5739-gui__application_qt.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/audio/cantata/files/patch-svn-5739-gui__application_qt.cpp Tue Apr 21 16:26:17 2015 (r384430, copy of r384421, head/audio/cantata/files/patch-svn-5739-gui__application_qt.cpp) @@ -0,0 +1,39 @@ +Look for icons in more than just /usr/share -- upstream svn patch: +Log message + +- When checking for icon themes, also check in $PREFIX +- Also ensure path is in QIcon's theme path + +https://code.google.com/p/cantata/source/detail?r=5740 + + +Index: gui/application_qt.cpp +=================================================================== +--- gui/application_qt.cpp (revision 5739) ++++ gui/application_qt.cpp (working copy) +@@ -45,11 +45,21 @@ + // or gnome icon themes are installed, and set theme to one of those. + if (!QIcon::hasThemeIcon("document-save-as")) { + QStringList themes=QStringList() << QLatin1String("oxygen") << QLatin1String("gnome"); ++ QStringList prefixes=QStringList() << QLatin1String("/usr") << QLatin1String("/usr/local"); ++ if (!prefixes.contains(QLatin1String(INSTALL_PREFIX))) { ++ prefixes+=QLatin1String(INSTALL_PREFIX); ++ } + foreach (const QString &theme, themes) { +- QString dir(QLatin1String("/usr/share/icons/")+theme); +- if (QDir(dir).exists()) { +- QIcon::setThemeName(theme); +- return; ++ foreach (const QString &prefix, prefixes) { ++ QString dir(prefix+QLatin1String("/share/icons/")+theme); ++ if (QDir(dir).exists()) { ++ QIcon::setThemeName(theme); ++ // Add to theme search paths, if it is not there already... ++ if (!QIcon::themeSearchPaths().contains(prefix+QLatin1String("/share/icons"))) { ++ QIcon::setThemeSearchPaths(QIcon::themeSearchPaths() << QString(prefix+QLatin1String("/share/icons"))); ++ } ++ return; ++ } + } + } + }