From owner-svn-ports-head@FreeBSD.ORG Thu Jan 15 07:40:50 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0AF7DD3A; Thu, 15 Jan 2015 07:40:50 +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 D1CC87C0; Thu, 15 Jan 2015 07:40:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0F7enav007976; Thu, 15 Jan 2015 07:40:49 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0F7enw1007974; Thu, 15 Jan 2015 07:40:49 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201501150740.t0F7enw1007974@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Thu, 15 Jan 2015 07:40:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r377061 - in head/astro/stellarium-qt4: . 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.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jan 2015 07:40:50 -0000 Author: danfe Date: Thu Jan 15 07:40:48 2015 New Revision: 377061 URL: https://svnweb.freebsd.org/changeset/ports/377061 QAT: https://qat.redports.org/buildarchive/r377061/ Log: Merge upstream patch that fixes saving of screenshots when $HOME/Pictures directory does not yet exist. While it might deem a minor issue, bump port revision; the port is fast to build even on relatively slow hardware. Launchpad bug #: 1410263 Bazaar revision: 0.12/5816 Added: head/astro/stellarium-qt4/files/patch-src_core_StelFileMgr.cpp (contents, props changed) Modified: head/astro/stellarium-qt4/Makefile Modified: head/astro/stellarium-qt4/Makefile ============================================================================== --- head/astro/stellarium-qt4/Makefile Thu Jan 15 00:26:39 2015 (r377060) +++ head/astro/stellarium-qt4/Makefile Thu Jan 15 07:40:48 2015 (r377061) @@ -3,6 +3,7 @@ PORTNAME= stellarium PORTVERSION= 0.12.5 +PORTREVISION= 1 CATEGORIES= astro MASTER_SITES= SF/${PORTNAME}/Stellarium-sources/${PORTVERSION} PKGNAMESUFFIX= -qt4 Added: head/astro/stellarium-qt4/files/patch-src_core_StelFileMgr.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/stellarium-qt4/files/patch-src_core_StelFileMgr.cpp Thu Jan 15 07:40:48 2015 (r377061) @@ -0,0 +1,27 @@ +--- src/core/StelFileMgr.cpp.orig 2014-10-11 11:24:38 UTC ++++ src/core/StelFileMgr.cpp +@@ -84,7 +84,23 @@ void StelFileMgr::init() + qWarning() << "WARNING: could not locate installation directory"; + } + +- screenshotDir = QDesktopServices::storageLocation(QDesktopServices::PicturesLocation); ++ // Wasn't set path to screenshots directory via --screenshot-dir? ++ if (screenshotDir.isEmpty()) ++ { ++ QString screenshotDirSuffix = "/Stellarium"; ++ if (!QDesktopServices::storageLocation(QDesktopServices::PicturesLocation).isEmpty()) ++ screenshotDir = QDesktopServices::storageLocation(QDesktopServices::PicturesLocation).append(screenshotDirSuffix); ++ else ++ screenshotDir = userDir.append(screenshotDirSuffix); ++ } ++ try ++ { ++ makeSureDirExistsAndIsWritable(screenshotDir); ++ } ++ catch (std::runtime_error &e) ++ { ++ qDebug("Error: cannot create screenshot directory: %s", e.what()); ++ } + } + +