[leksah] Added patches to fix build issues new file: haddock.patch modified: leksah.spec new file: l
narasim
narasim at fedoraproject.org
Mon Mar 12 11:18:36 UTC 2012
commit 61386181309a34fa11089662e88107616cecafc8
Author: Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com>
Date: Mon Mar 12 16:48:17 2012 +0530
Added patches to fix build issues
new file: haddock.patch
modified: leksah.spec
new file: leksah_dep.patch
haddock.patch | 17 +++++++++++++++++
leksah.spec | 11 ++++++++++-
leksah_dep.patch | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 81 insertions(+), 1 deletions(-)
---
diff --git a/haddock.patch b/haddock.patch
new file mode 100644
index 0000000..ba3f4df
--- /dev/null
+++ b/haddock.patch
@@ -0,0 +1,17 @@
+--- leksah-0.12.0.3_old/src/IDE/SymbolNavigation.hs 2012-03-12 15:02:10.648974351 +0530
++++ leksah-0.12.0.3/src/IDE/SymbolNavigation.hs 2012-03-12 16:03:36.235100048 +0530
+@@ -50,10 +50,10 @@
+ deriving (Ord,Eq,Show)
+
+ createHyperLinkSupport ::
+- SourceView -> -- ^ source buffer view
+- ScrolledWindow -> -- ^ container window
+- (Bool -> Bool -> TextIter -> IO (TextIter, TextIter)) -> -- ^ identifiermapper (bools=control,shift)
+- (Bool -> Bool -> String -> IO ()) -> -- ^ click handler
++ SourceView -> -- source buffer view
++ ScrolledWindow -> -- container window
++ (Bool -> Bool -> TextIter -> IO (TextIter, TextIter)) -> -- identifiermapper (bools=control,shift)
++ (Bool -> Bool -> String -> IO ()) -> -- click handler
+ IO [Connection]
+ createHyperLinkSupport sv sw identifierMapper clickHandler = do
+ let tv = castToTextView sv
diff --git a/leksah.spec b/leksah.spec
index 05d2b95..8670b4f 100644
--- a/leksah.spec
+++ b/leksah.spec
@@ -32,12 +32,15 @@ BuildRequires: hscolour
# END: cabal2spec-0.24
# BR any C devel dependency here
# list ghc-*-prof dependencies:
-BuildRequires: ghc-Cabal-prof, ghc-directory-prof, ghc-gtksourceview2-prof, ghc-old-time-prof, ghc-process-leksah-prof, ghc-regex-tdfa-prof, ghc-utf8-string-prof, ghc-time-prof, ghc-ltk-prof, ghc-binary-shared-prof, ghc-deepseq-prof, ghc-hslogger-prof, ghc-leksah-server-prof, ghc-network-prof, ghc-ghc-prof, ghc-strict-prof, ghc-gio-prof, ghc-text-prof, ghc-enumerator-prof, ghc-QuickCheck-prof
+BuildRequires: ghc-Cabal-prof, ghc-directory-prof, ghc-gtksourceview2-prof, ghc-old-time-prof, ghc-process-leksah-prof, ghc-regex-tdfa-prof, ghc-utf8-string-prof, ghc-time-prof, ghc-ltk-prof, ghc-binary-shared-prof, ghc-deepseq-prof, ghc-hslogger-prof, ghc-leksah-server-prof, ghc-network-prof, ghc-ghc-prof, ghc-strict-prof
BuildRequires: desktop-file-utils
# all requires list
Requires: hicolor-icon-theme
Requires: leksah-server
+# patches
+Patch1: leksah_dep.patch
+Patch2: haddock.patch
%description
%{common_description}
@@ -81,6 +84,8 @@ This package contains the development files.
%prep
%setup -q
+%patch1 -p1 -b .orig
+%patch2 -p1 -b .orig
%build
@@ -111,10 +116,12 @@ install --mode=0644 -D %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/mime/packages
%dir %{_datadir}/%{name}-%{version}
%dir %{_datadir}/%{name}-%{version}/data
%dir %{_datadir}/%{name}-%{version}/pics
+%dir %{_datadir}/%{name}-%{version}/language-specs
%attr(644,root,root) %{_datadir}/%{name}-%{version}/LICENSE
%attr(644,root,root) %{_datadir}/%{name}-%{version}/Readme
%attr(644,root,root) %{_datadir}/%{name}-%{version}/pics/*
%attr(644,root,root) %{_datadir}/%{name}-%{version}/data/*
+%attr(644,root,root) %{_datadir}/%{name}-%{version}/language-specs/*
%attr(644,root,root) %{_datadir}/applications/%{name}.desktop
%attr(644,root,root) %{_datadir}/applications/%{name}_loadsession.desktop
%attr(644,root,root) %{_datadir}/mime/packages/leksah.xml
@@ -150,6 +157,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
* Mon Mar 12 2012 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.12.0.3-1
- Package update to 0.12.0.3
+- Added patches for reducing version requirement of QuickCheck and fixing issue when
+- running haddock
* Sun Jan 08 2012 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.10.0.4-7
- Rebuild for haskell-platform
diff --git a/leksah_dep.patch b/leksah_dep.patch
new file mode 100644
index 0000000..a525f4a
--- /dev/null
+++ b/leksah_dep.patch
@@ -0,0 +1,54 @@
+--- leksah-0.12.0.3_old/leksah.cabal 2012-03-12 15:02:10.562974279 +0530
++++ leksah-0.12.0.3/leksah.cabal 2012-03-12 15:43:35.763319764 +0530
+@@ -123,7 +123,7 @@
+ hslogger >= 1.0.7 && <1.2, leksah-server >=0.12.0.3 && <0.13, network >= 2.2 && <3.0,
+ ghc >=6.10.1 && <7.5, strict >= 0.3.2 && <0.4, enumerator >=0.4.14 && <0.5, text >= 0.11.1.5 && < 0.12,
+ gio >=0.12.2 && <0.13, transformers >=0.2.2.0 && <0.3,
+- QuickCheck >=2.4.2 && <2.5
++ QuickCheck
+
+ exposed-modules:
+ IDE.Leksah IDE.Completion IDE.ImportTool
+@@ -194,10 +194,39 @@
+ hslogger >= 1.0.7 && <1.2, leksah-server >=0.12.0.3 && <0.13, network >= 2.2 && <3.0,
+ ghc >=6.10.1 && <7.5, strict >= 0.3.2 && <0.4, enumerator >=0.4.14 && <0.5, text >= 0.11.1.5 && < 0.12,
+ gio >=0.12.2 && <0.13, transformers >=0.2.2.0 && <0.3,
+- QuickCheck >=2.4.2 && <2.5
++ QuickCheck
+ else
+- hs-source-dirs: main
+- build-depends: leksah ==0.12.0.3, base >=4.0.0.0 && <= 5
++ hs-source-dirs: src, main
++ build-depends: Cabal >=1.6.0.1 && <1.15, base >=4.0.0.0 && <4.6, binary >=0.5.0.0 && <0.6,
++ bytestring >=0.9.0.1 && <0.10, containers >=0.2.0.0 && <0.5, directory >=1.0.0.2 && <3.1,
++ filepath >=1.1.0.1 && <1.4, glib >=0.10 && <0.13, gtk >=0.10 && <0.13,
++ gtksourceview2 >=0.10.0 && <0.13, mtl >=1.1.0.2 && <2.1, old-time >=1.0.0.1 && <1.2,
++ parsec >=2.1.0.1 && <3.2, pretty >=1.0.1.0 && <1.2,
++ regex-tdfa ==1.1.*, regex-base ==0.93.*, utf8-string >=0.3.1.1 && <0.4, array >=0.2.0.0 && <0.5,
++ time >=0.1 && <1.5, ltk >=0.12 && <0.13, binary-shared >= 0.8 && <0.9, deepseq >= 1.1.0.0 && <1.4,
++ hslogger >= 1.0.7 && <1.2, leksah-server >=0.12.0.3 && <0.13, network >= 2.2 && <3.0,
++ ghc >=6.10.1 && <7.5, strict >= 0.3.2 && <0.4, enumerator >=0.4.14 && <0.5, text >= 0.11.1.5 && < 0.12,
++ gio >=0.12.2 && <0.13, transformers >=0.2.2.0 && <0.3,
++ QuickCheck
++
++ other-modules:
++ IDE.Leksah IDE.Completion IDE.ImportTool
++ IDE.Find IDE.Session IDE.Command IDE.Keymap IDE.Utils.GUIUtils IDE.SymbolNavigation
++ IDE.Package IDE.YiConfig IDE.OSX
++ IDE.GUIHistory IDE.SourceCandy IDE.NotebookFlipper
++ IDE.Core.Types IDE.Core.State
++ IDE.Metainfo.Provider
++ IDE.Pane.Preferences IDE.Pane.PackageEditor
++ IDE.Pane.Info IDE.Pane.Log IDE.Pane.SourceBuffer IDE.Pane.Modules
++ IDE.Pane.Search IDE.Pane.PackageFlags
++ IDE.LogRef IDE.Debug IDE.Pane.Grep IDE.Pane.Files
++ IDE.Pane.Breakpoints IDE.Pane.Trace IDE.Pane.Variables
++ IDE.Pane.Errors IDE.TextEditor IDE.Workspaces
++ IDE.Statusbar IDE.Pane.Workspace IDE.PaneGroups
++ IDE.Utils.ServerConnection
++ IDE.BufferMode
++ IDE.Build
++ Paths_leksah
+
+ main-is: Main.hs
+ buildable: True
More information about the scm-commits
mailing list