commit: c2c54f8e6fa08028e196727d491927d57928e122
Author: Michael Mair-Keimberger (asterix) gmail
com>
AuthorDate: Tue Jul 26 16:44:45 2016 +
Commit: Patrice Clement gentoo org>
CommitDate: Wed Aug 3 07:21:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2c54f8e
dev-haskell/gtk: remove unused patches
Signed-off-by: Patrice Clement gentoo.org>
dev-haskell/gtk/files/gtk-0.12.0-ghc-7.2.patch | 23 --
dev-haskell/gtk/files/gtk-0.12.3-glib-2.32.patch | 18 --
dev-haskell/gtk/files/gtk-0.12.3.1-ghc-7.6.patch | 287 ---
dev-haskell/gtk/files/gtk-0.13.4-ghc-7.10.patch | 20 --
4 files changed, 348 deletions(-)
diff --git a/dev-haskell/gtk/files/gtk-0.12.0-ghc-7.2.patch
b/dev-haskell/gtk/files/gtk-0.12.0-ghc-7.2.patch
deleted file mode 100644
index 1d454c5..000
--- a/dev-haskell/gtk/files/gtk-0.12.0-ghc-7.2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/Graphics/UI/Gtk/General/Structs.hsc
b/Graphics/UI/Gtk/General/Structs.hsc
-index 2df0385..c1b8452 100644
a/Graphics/UI/Gtk/General/Structs.hsc
-+++ b/Graphics/UI/Gtk/General/Structs.hsc
-@@ -1,4 +1,5 @@
- {-# LANGUAGE ScopedTypeVariables, TypeSynonymInstances #-}
-+{-# LANGUAGE FlexibleInstances #-}
- {-# OPTIONS_HADDOCK hide #-}
- -- -*-haskell-*-
-
-diff --git a/gtk.cabal b/gtk.cabal
-index bd97975..aa7165f 100644
a/gtk.cabal
-+++ b/gtk.cabal
-@@ -126,7 +126,7 @@ Flag have-gio
-
- Library
- build-depends: base >= 4 && < 5,
--array, containers, haskell98, mtl, bytestring,
-+array, containers, mtl, bytestring,
- glib >= 0.12.0 && < 0.13,
- pango >= 0.12.0 && < 0.13,
- cairo >= 0.12.0 && < 0.13
diff --git a/dev-haskell/gtk/files/gtk-0.12.3-glib-2.32.patch
b/dev-haskell/gtk/files/gtk-0.12.3-glib-2.32.patch
deleted file mode 100644
index 1f07c07..000
--- a/dev-haskell/gtk/files/gtk-0.12.3-glib-2.32.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-fix build failure against recent glib-2.32
-
-In file included from Graphics/UI/Gtk/General/hsgthread.c:29:0:
-
-/usr/include/glib-2.0/glib/gthread.h:28:2:
- ошибка: #error "Only can be included directly."
-diff --git a/Graphics/UI/Gtk/General/hsgthread.c
b/Graphics/UI/Gtk/General/hsgthread.c
-index 5eaed46..6d20e73 100644
a/Graphics/UI/Gtk/General/hsgthread.c
-+++ b/Graphics/UI/Gtk/General/hsgthread.c
-@@ -26,7 +26,6 @@
- */
-
- #include
--#include
- #include
- #include "hsgthread.h"
-
diff --git a/dev-haskell/gtk/files/gtk-0.12.3.1-ghc-7.6.patch
b/dev-haskell/gtk/files/gtk-0.12.3.1-ghc-7.6.patch
deleted file mode 100644
index ab5a997..000
--- a/dev-haskell/gtk/files/gtk-0.12.3.1-ghc-7.6.patch
+++ /dev/null
@@ -1,287 +0,0 @@
gtk-0.12.3.1-orig/Graphics/UI/Gtk/Windows/Assistant.chs2012-06-18
07:39:34.0 +1000
-+++ gtk-0.12.3.1/Graphics/UI/Gtk/Windows/Assistant.chs 2012-10-11
12:51:38.040935853 +1100
-@@ -274,7 +274,7 @@
- {#pointer AssistantPageFunc#}
-
- foreign import ccall "wrapper" mkAssistantPageFunc ::
-- ({#type glong#} -> Ptr () -> IO {#type glong#})
-+ ({#type gint#} -> Ptr () -> IO {#type gint#})
- -> IO AssistantPageFunc
-
- -- | Sets the page type for @page@. The page type determines the page behavior
gtk-0.12.3.1-orig/Graphics/UI/Gtk/Multiline/TextIter.chs 2012-06-18
07:39:34.0 +1000
-+++ gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextIter.chs2012-10-11
12:50:59.510893025 +1100
-@@ -797,7 +797,7 @@
- {#pointer TextCharPredicate#}
-
- foreign import ccall "wrapper" mkTextCharPredicate ::
-- ({#type gunichar#} -> Ptr () -> {#type gboolean#}) -> IO TextCharPredicate
-+ ({#type gunichar#} -> Ptr () -> IO {#type gboolean#}) -> IO
TextCharPredicate
-
- -- | Move 'TextIter' forward until a
- -- predicate function returns True.
-@@ -810,7 +810,7 @@
- textIterForwardFindChar :: TextIter -> (Char -> Bool) -> Maybe TextIter ->
-IO Bool
- textIterForwardFindChar ti pred limit = do
-- fPtr <- mkTextCharPredicate (\c _ -> fromBool $ pred (chr (fromIntegral c)))
-+ fPtr <- mkTextCharPredicate (\c _ -> return $ fromBool $ pred (chr
(fromIntegral c)))
- res <- liftM toBool $ {#call text_iter_forward_find_char#}
- ti fPtr nullPtr (fromMaybe (TextIter nullForeignPtr) limit)
- freeHaskellFunPtr fPtr
-@@ -827,7 +827,7 @@
- textIterBackwardFindChar :: TextIter -> (Char -> Bool) -> Maybe TextIter ->
- IO Bool
- textIterBackwardFindChar ti pred limit = do
-- fPtr <- mkTextCharPredicate (\c _ -> fromBool $ pred (chr (fromIntegral c)))
-+ fPtr <- mkTextCharPredicate (\c _ -> return $ fromBool $ pred (chr
(fromIntegral c)))
- res <- liftM toBool $ {#call text_iter_backward_find_char#}
- ti fPtr nullPtr (fromMaybe (TextIter nullForeignPtr) limit)
- freeHaskellFunPtr fPtr
gtk-0.12.3.1-orig/Graphics/UI/Gtk/ModelView/TreeView.chs 2012-06-18
07:39:34.0
