diff options
| author | Gleb Popov <arrowd@FreeBSD.org> | 2019-05-09 14:39:30 +0000 |
|---|---|---|
| committer | Gleb Popov <arrowd@FreeBSD.org> | 2019-05-09 14:39:30 +0000 |
| commit | 6dc2e22e2d89226195d89002a02b431dee6e0e67 (patch) | |
| tree | 9a88fb63bb22aa2eb4215ec6bb8c45c1aaa2ce61 /devel/hs-git-annex/files/patch-Build__DesktopFile.hs | |
| parent | Prepare for the pending removal of ispec from GENERIC, making sure (diff) | |
Introduce USES=cabal and use it to build Haskell applications.
PR: 230186
Reviewed by: mat, tcberner
Approved by: tcberner (mentor)
Differential Revision: https://reviews.freebsd.org/D19730
Diffstat (limited to 'devel/hs-git-annex/files/patch-Build__DesktopFile.hs')
| -rw-r--r-- | devel/hs-git-annex/files/patch-Build__DesktopFile.hs | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/devel/hs-git-annex/files/patch-Build__DesktopFile.hs b/devel/hs-git-annex/files/patch-Build__DesktopFile.hs index 8290342bfff3..a7bcba487062 100644 --- a/devel/hs-git-annex/files/patch-Build__DesktopFile.hs +++ b/devel/hs-git-annex/files/patch-Build__DesktopFile.hs @@ -1,14 +1,23 @@ ---- Build/DesktopFile.hs.orig 2017-06-12 17:56:05 UTC +--- Build/DesktopFile.hs.orig 2018-12-11 20:34:28 UTC +++ Build/DesktopFile.hs -@@ -25,6 +25,7 @@ import System.Environment - #ifndef mingw32_HOST_OS - import System.Posix.User - #endif -+import System.FilePath.Posix +@@ -21,6 +21,7 @@ import Utility.OSX + import Assistant.Install.AutoStart + import Assistant.Install.Menu + ++import System.FilePath ((</>)) + import System.Environment + import System.PosixCompat.User import Data.Maybe - import Control.Applicative +@@ -28,7 +29,7 @@ import Control.Applicative import Prelude -@@ -50,12 +51,17 @@ writeFDODesktop :: FilePath -> IO () + + systemwideInstall :: IO Bool +-#ifndef mingw32_HOST_OS ++#ifndef mingw32_HOST_OS + systemwideInstall = isroot <||> destdirset + where + isroot = do +@@ -48,13 +49,18 @@ writeFDODesktop :: FilePath -> IO () writeFDODesktop command = do systemwide <- systemwideInstall @@ -24,7 +33,9 @@ installMenu command menufile "doc" icondir - configdir <- if systemwide then return systemConfigDir else userConfigDir +- installAutoStart command + configdir <- if systemwide then return scdir else userConfigDir - installAutoStart command ++ installAutoStart command =<< inDestDir (autoStartPath "git-annex" configdir) + writeOSXDesktop :: FilePath -> IO () |