leksah 0.14.2.0 → 0.14.3.0
raw patch · 6 files changed
+20/−30 lines, 6 filesdep ~gtkdep ~gtk3dep ~leksah
Dependency ranges changed: gtk, gtk3, leksah, leksah-server, ltk
Files
- leksah.cabal +12/−12
- scripts/stage.sh +2/−5
- src/IDE/Completion.hs +2/−6
- src/IDE/Pane/Modules.hs +4/−4
- win32/leksah.nsi +0/−1
- win32/makeinstaller.sh +0/−2
leksah.cabal view
@@ -1,5 +1,5 @@ name: leksah-version: 0.14.2.0+version: 0.14.3.0 cabal-version: >=1.18 build-type: Simple license: GPL@@ -225,10 +225,10 @@ ghc-options: -threaded if flag(gtk3)- build-depends: gtk3 >=0.13.0.0 && <0.14, gtksourceview3 >=0.13.1.0 && <0.14+ build-depends: gtk3 >=0.13.2 && <0.14, gtksourceview3 >=0.13.1.0 && <0.14 cpp-options: -DMIN_VERSION_gtk=MIN_VERSION_gtk3 else- build-depends: gtk >=0.13.0.0 && <0.14, gtksourceview2 >=0.13.1.0 && <0.14+ build-depends: gtk >=0.13.2 && <0.14, gtksourceview2 >=0.13.1.0 && <0.14 if flag(gtk3) build-depends: webkitgtk3 -any, webkitgtk3-javascriptcore -any@@ -256,8 +256,8 @@ mtl >=1.1.0.2 && <2.3, 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 && <1.3, regex-tdfa-text, regex-base ==0.93.*, utf8-string >=0.3.1.1 && <0.4, array >=0.2.0.0 && <0.6,- time >=0.1 && <1.5, ltk >= 0.14.0.0 && <0.15, binary-shared >= 0.8 && <0.9, deepseq >= 1.1.0.0 && <1.4,- hslogger >= 1.0.7 && <1.3, leksah-server >=0.14.0.0 && <0.15,+ time >=0.1 && <1.5, ltk >= 0.14.3.0 && <0.15, binary-shared >= 0.8 && <0.9, deepseq >= 1.1.0.0 && <1.4,+ hslogger >= 1.0.7 && <1.3, leksah-server >=0.14.3.0 && <0.15, ghc >=6.10.1 && <7.9, strict >= 0.3.2 && <0.4, conduit >= 1.0.8 && <1.3, text >= 0.11.1.5 && < 1.3, gio >=0.13.0.0 && <0.14, transformers >=0.2.2.0 && <0.5, executable-path >=0.0.3 && <0.1,@@ -310,7 +310,7 @@ ghc-options: -threaded hs-source-dirs: main- build-depends: leksah == 0.14.2.0, base >= 4.0.0.0 && <=4.8, gtk3 -any+ build-depends: leksah == 0.14.3.0, base >= 4.0.0.0 && <=4.8, gtk3 -any if os(linux) && flag(loc) cpp-options: -DLOCALIZATION build-depends: hgettext, setlocale@@ -326,14 +326,14 @@ ghc-options: -rtsopts -O2 -fwarn-missing-fields -fwarn-incomplete-patterns -ferror-spans executable bewleksah- build-depends: leksah ==0.14.2.0, base >=4.0.0.0 && <=4.8,+ build-depends: leksah ==0.14.3.0, base >=4.0.0.0 && <=4.8, jsaddle -any, ghcjs-dom -any if flag(gtk3)- build-depends: gtk3 >=0.13.0.0 && <0.14, gtksourceview3 >=0.13.1.0 && <0.14,+ build-depends: gtk3 >=0.13.2 && <0.14, gtksourceview3 >=0.13.1.0 && <0.14, webkitgtk3 -any, webkitgtk3-javascriptcore -any cpp-options: -DMIN_VERSION_gtk=MIN_VERSION_gtk3 else- build-depends: gtk >=0.13.0.0 && <0.14, gtksourceview2 >=0.13.1.0 && <0.14,+ build-depends: gtk >=0.13.2 && <0.14, gtksourceview2 >=0.13.1.0 && <0.14, webkit -any, webkit-javascriptcore -any main-is: Main.hs@@ -343,14 +343,14 @@ test-suite tests build-depends: base >=4.0.0.0 && <4.8, Cabal >=1.10.2.0 && <1.22,- QuickCheck >=2.4.2 && <2.8, leksah ==0.14.2.0,+ QuickCheck >=2.4.2 && <2.8, leksah ==0.14.3.0, containers, ltk, leksah-server, hslogger, transformers, glib, monad-loops, text if flag(gtk3)- build-depends: gtk3 >=0.13.0.0 && <0.14, gtksourceview3 >=0.13.1.0 && <0.14, webkitgtk3 -any+ build-depends: gtk3 >=0.13.2 && <0.14, gtksourceview3 >=0.13.1.0 && <0.14, webkitgtk3 -any cpp-options: -DMIN_VERSION_gtk=MIN_VERSION_gtk3 else- build-depends: gtk >=0.13.0.0 && <0.14, gtksourceview2 >=0.13.1.0 && <0.14, webkit -any+ build-depends: gtk >=0.13.2 && <0.14, gtksourceview2 >=0.13.1.0 && <0.14, webkit -any if flag(yi) build-depends: yi type: exitcode-stdio-1.0
scripts/stage.sh view
@@ -26,16 +26,13 @@ # Gtk2Hs needs the latest Cabal to install properly # cabal install --with-ghc=ghc$GHCVERSION -j4 text parsec network uniplate Cabal --constraint='text>=0.11.3.1' --constraint='parsec>=3.1.3' --constraint='ghc -any' || true -# Needed for installing curl package on windows-export CPPFLAGS=`pkg-config --cflags-only-I libcurl`- # Only used by OS X # export DYLD_LIBRARY_PATH="/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources:$GTK_PREFIX/lib:$DYLD_LIBRARY_PATH" if test "`uname`" = "Darwin"; then- cabal install ./ ./vendor/ltk ./vendor/leksah-server ./vendor/yi gtk3 ghcjs-dom jsaddle vendor/haskellVCSWrapper/vcswrapper vendor/haskellVCSGUI/vcsgui --with-ghc=ghc$GHCVERSION -j4 -fhave-quartz-gtk -fwebkit -flibcurl -fyi -fpango --with-gcc=gcc-mp-4.8 || exit+ cabal install ./ ./vendor/ltk ./vendor/leksah-server ./vendor/yi gtk3 ghcjs-dom jsaddle vendor/haskellVCSWrapper/vcswrapper vendor/haskellVCSGUI/vcsgui --with-ghc=ghc$GHCVERSION -j4 -fwebkit -fyi -fpango --with-gcc=gcc-mp-4.8 || exit else- cabal install ./ ./vendor/ltk ./vendor/leksah-server gtk3 ghcjs-dom jsaddle vendor/haskellVCSWrapper/vcswrapper vendor/haskellVCSGUI/vcsgui --with-ghc=ghc$GHCVERSION -j4 -fwebkit -flibcurl -f-yi -fpango -f-vty --force-reinstalls --extra-lib-dirs=/c/MinGWRPM/lib || bash || exit+ cabal install ./ ./vendor/ltk ./vendor/leksah-server gtk3 ghcjs-dom jsaddle vendor/haskellVCSWrapper/vcswrapper vendor/haskellVCSGUI/vcsgui --with-ghc=ghc$GHCVERSION -j4 -fwebkit -f-yi -fpango -f-vty --force-reinstalls --extra-lib-dirs=/c/MinGWRPM/lib || bash || exit # if [ "$GHC_VER" != "7.0.3" ] && [ "$GHC_VER" != "7.0.4" ] && [ "$GHC_VER" != "7.6.1" ]; then # echo https://github.com/yi-editor/yi.git >> sources.txt # export LEKSAH_CONFIG_ARGS="$LEKSAH_CONFIG_ARGS -fyi -f-vty -f-dyre -fpango"
src/IDE/Completion.hs view
@@ -216,9 +216,7 @@ let newRow = maybe 0 (\row -> row + 1) maybeRow when (newRow < count) $ liftIO $ do treeSelectionSelectPath selection [newRow]- treeViewScrollToCell tree [newRow] column Nothing- -- Crazy hack to avoid the horizontal scroll- treeViewScrollToCell tree [newRow] column Nothing+ treeViewScrollToCell tree (Just [newRow]) Nothing Nothing return True ) else return False@@ -230,9 +228,7 @@ let newRow = maybe 0 (\row -> row - 1) maybeRow when (newRow >= 0) $ liftIO $ do treeSelectionSelectPath selection [newRow]- treeViewScrollToCell tree [newRow] column Nothing- -- Crazy hack to avoid the horizontal scroll- treeViewScrollToCell tree [newRow] column Nothing+ treeViewScrollToCell tree (Just [newRow]) Nothing Nothing return True ) else return False
src/IDE/Pane/Modules.hs view
@@ -396,7 +396,7 @@ sel <- treeViewGetSelection (treeView mods) treeSelectionSelectPath sel treePath col <- treeViewGetColumn (treeView mods) 0- treeViewScrollToCell (treeView mods) treePath (fromJust col) (Just (0.3,0.3))+ treeViewScrollToCell (treeView mods) (Just treePath) col (Just (0.3,0.3)) mbFacetTree <- treeStoreGetTreeSave (descrStore mods) [] selF <- treeViewGetSelection (descrView mods) case findPathFor symbol mbFacetTree of@@ -405,7 +405,7 @@ treeViewExpandToPath (descrView mods) path treeSelectionSelectPath selF path col <- treeViewGetColumn (descrView mods) 0- treeViewScrollToCell (descrView mods) path (fromJust col) (Just (0.3,0.3))+ treeViewScrollToCell (descrView mods) (Just path) col (Just (0.3,0.3)) bringPaneToFront mods Nothing -> return () @@ -997,7 +997,7 @@ sel <- treeViewGetSelection (treeView mods) treeSelectionSelectPath sel treePath col <- treeViewGetColumn (treeView mods) 0- treeViewScrollToCell (treeView mods) treePath (fromJust col)+ treeViewScrollToCell (treeView mods) (Just treePath) col (Just (0.3,0.3)) case mbIdName of Nothing -> do@@ -1011,7 +1011,7 @@ Just path -> do treeSelectionSelectPath selF path col <- treeViewGetColumn (descrView mods) 0- treeViewScrollToCell (descrView mods) path (fromJust col)+ treeViewScrollToCell (descrView mods) (Just path) col (Just (0.3,0.3)) reloadKeepSelection :: Bool -> IDEAction
win32/leksah.nsi view
@@ -73,7 +73,6 @@ File "$%GTK_PREFIX%\bin\libcairo-2.dll" File "$%GTK_PREFIX%\bin\libcairo-gobject-2.dll" File "$%GTK_PREFIX%\bin\libcrypto-10.dll" - File "$%GTK_PREFIX%\bin\libcurl-4.dll" File "$%GTK_PREFIX%\bin\libenchant.dll" File "$%GTK_PREFIX%\bin\libexpat-1.dll" File "$%GTK_PREFIX%\bin\libffi-6.dll"
win32/makeinstaller.sh view
@@ -14,7 +14,6 @@ cd win32 || exit -export CURL_PREFIX=`pkg-config --libs-only-L libcurl | sed 's|^-L||' | sed 's|/lib *$||'` export MINGW_BIN=`cmd //C echo \`dirname \\\`which gcc\\\`\`` export PATH=$PATH:/c/Program\ Files\ \(x86\)/NSIS:/c/Program\ Files/NSIS #makensis leksah.nsi @@ -57,7 +56,6 @@ cp -u "$GTK_PREFIX"/bin/libcairo-2.dll SourceDir/bin cp -u "$GTK_PREFIX"/bin/libcairo-gobject-2.dll SourceDir/bin cp -u "$GTK_PREFIX"/bin/libcrypto-10.dll SourceDir/bin -cp -u "$GTK_PREFIX"/bin/libcurl-4.dll SourceDir/bin cp -u "$GTK_PREFIX"/bin/libenchant.dll SourceDir/bin cp -u "$GTK_PREFIX"/bin/libexpat-1.dll SourceDir/bin cp -u "$GTK_PREFIX"/bin/libffi-6.dll SourceDir/bin