[ghc-process-leksah] Add patches to enable build with ghc-7.4 new file: encoding_fix.patch new file: filepath_versi
narasim
narasim at fedoraproject.org
Sat Mar 24 18:59:19 UTC 2012
commit 224ac2a355359a9858cb6024f3f6b3322d02e056
Author: Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com>
Date: Sun Mar 25 00:27:40 2012 +0530
Add patches to enable build with ghc-7.4
new file: encoding_fix.patch
new file: filepath_versionfix.patch
modified: ghc-process-leksah.spec
encoding_fix.patch | 13 +++++++++++++
filepath_versionfix.patch | 11 +++++++++++
ghc-process-leksah.spec | 6 ++++++
3 files changed, 30 insertions(+), 0 deletions(-)
---
diff --git a/encoding_fix.patch b/encoding_fix.patch
new file mode 100644
index 0000000..566c803
--- /dev/null
+++ b/encoding_fix.patch
@@ -0,0 +1,13 @@
+--- process-leksah-1.0.1.4_old/IDE/System/Process/Internals.hs 2012-03-25 00:15:31.421119204 +0530
++++ process-leksah-1.0.1.4/IDE/System/Process/Internals.hs 2012-03-25 00:22:15.156809261 +0530
+@@ -540,8 +540,9 @@
+ False {-is_socket-}
+ False {-non-blocking-}
+ fD <- FD.setNonBlockingMode fD True -- see #3316
++ enc <- getLocaleEncoding
+ mkHandleFromFD fD fd_type filepath mode False{-is_socket-}
+- (Just localeEncoding)
++ (Just enc)
+ #else
+ fdToHandle' fd (Just Stream)
+ False{-Windows: not a socket, Unix: don't set non-blocking-}
diff --git a/filepath_versionfix.patch b/filepath_versionfix.patch
new file mode 100644
index 0000000..3a437c0
--- /dev/null
+++ b/filepath_versionfix.patch
@@ -0,0 +1,11 @@
+--- process-leksah-1.0.1.4_old/process-leksah.cabal 2012-03-25 00:15:31.414120065 +0530
++++ process-leksah-1.0.1.4/process-leksah.cabal 2012-03-25 00:16:18.002595496 +0530
+@@ -56,7 +56,7 @@
+ }
+
+ build-depends: directory >= 1.0 && < 1.2,
+- filepath >= 1.1 && < 1.3
++ filepath >= 1.1 && < 1.4
+
+ extensions: CPP
+ }
diff --git a/ghc-process-leksah.spec b/ghc-process-leksah.spec
index 71b5afc..4e9cf49 100644
--- a/ghc-process-leksah.spec
+++ b/ghc-process-leksah.spec
@@ -23,12 +23,18 @@ BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour}
# END cabal2spec
+#Patches
+Patch1 : filepath_versionfix.patch
+Patch2 : encoding_fix.patch
+
%description
%{common_description}
%prep
%setup -q -n %{pkg_name}-%{version}
+%patch1 -p1 -b .orig
+%patch2 -p1 -b .orig
%build
More information about the scm-commits
mailing list