summaryrefslogtreecommitdiff
path: root/dev-haskell/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'dev-haskell/gtk')
-rw-r--r--dev-haskell/gtk/Manifest9
-rw-r--r--dev-haskell/gtk/files/gtk-0.14.10-glib-2.62.patch13
-rw-r--r--dev-haskell/gtk/gtk-0.12.5.7.2.ebuild61
-rw-r--r--dev-haskell/gtk/gtk-0.13.9.ebuild43
-rw-r--r--dev-haskell/gtk/gtk-0.14.10-r3.ebuild (renamed from dev-haskell/gtk/gtk-0.14.10-r2.ebuild)8
-rw-r--r--dev-haskell/gtk/gtk-0.14.6.ebuild43
6 files changed, 20 insertions, 157 deletions
diff --git a/dev-haskell/gtk/Manifest b/dev-haskell/gtk/Manifest
index fbc8d64435dc..3ffb568812d9 100644
--- a/dev-haskell/gtk/Manifest
+++ b/dev-haskell/gtk/Manifest
@@ -1,9 +1,4 @@
-DIST gtk-0.12.5.7.tar.gz 671695 BLAKE2B fb76cd0adabfdbd2ba8ba67a9b272d1feb13321bd9bbd2bfd0305899c90152df02864c57896d7b923b55d3c12a2375d33112526aed2de996621961c454392510 SHA512 ec8bb9a97f329a6be314d05481027bfe38317d3c16b48209d71a56b82dcf797cab1b1c94726a66d66677858523306ff59ab225b09d36f32b678a8b11a9ad165c
-DIST gtk-0.13.9.tar.gz 684971 BLAKE2B fafbdab72b0b2d3a8d3e4ed54bb6cac2ca0140fc20332b7c20e008943a095a17dd1fe705842fc8099c75840cd4f527abddd3eb2a302a92d9faaf1239e1f15f16 SHA512 11ef461382b67da40d9dffda8f4cbfe086ef937affedf1ac154cb2ca306b22f03f1b00512b7ef5de49d71041b0ee2cc0ddb6761ad51524b1fbbbf740653f12a0
+AUX gtk-0.14.10-glib-2.62.patch 501 BLAKE2B c402ff8bca84a4cc5bb02ef534da715e1b2edc0c675b219f08fe8a268ed22192192a5596816b35ad514851b9ee6ae105eddb2f9f37f9bb6974ee187f5d5292a7 SHA512 2d34480a33d60038627bfe3a490a35b52918c4b772cc398058c9efc3321e8415b29e8224d011a362b67ac0d75eb5e0b250da410eed40a3c7dc53403be213edbf
DIST gtk-0.14.10.tar.gz 677787 BLAKE2B 536b4ce1bdbb17c662342bd8cb8086354a31842e1fc39e4bb2e4c2e505fb03f4e1ad0b689fb48dcf24d61c280cf659d8f30ac0fe77083e9887054cc8ed5feb75 SHA512 857fa71391e4bc8d884f5bb5e4f072ebd35b6bbcdc3901b6e28e03e79f4732d56430cf395aabc6007d3f7b1e991dcf0c6e21c9b84ccde96b1943d26ad37243eb
-DIST gtk-0.14.6.tar.gz 679274 BLAKE2B 4554cfd990abb8ad189b11baf6f38525e72c1989f762f091a7e7fcde159d5516ad9fee71bdb6e7983b1b4293280f59e6a4db34fb4944b14e209e2660fbf95334 SHA512 f6f12fb0b07129b313858134d7dd1844a75f1ceaae27b14172891c281949822c222841665cdea62e3bb27c7b47e7fd3e0370721ebc520a0335b512ddf66f9428
-EBUILD gtk-0.12.5.7.2.ebuild 2121 BLAKE2B 8a0682f5a458bcfb7af12b8b9722fcd3dd2b00189fd9639f1a0f52987705f3297f058e8fe146fda1712d808070550fe8e16823da85c4f058095943c9b980c658 SHA512 7834a7bd65ba1ef4d172e1087e7a20296013c0780397b836fb8a19e7536976709c56af2e47aee93e9e45aff56b8b88f24b869f6217e7dbb570cd1635944141d5
-EBUILD gtk-0.13.9.ebuild 1341 BLAKE2B 2c10b508a41a3c50f6404c6f8817a00a6d39c7587b7c60c8014c8c71aee187a96b2ad379a506794916d1e9805abc5216fc42091d51991fc31156f01782e79ea4 SHA512 95b846ca120d1439e35d4302e059d31c371da8a8d60b2f5e7672ffdd7973b78a605103c15a27698576dcea6fe2ddda82080ee1db712bbf2debaadf7d62fe14fc
-EBUILD gtk-0.14.10-r2.ebuild 1508 BLAKE2B f561a0a41b78395f41fd96f22fde67aee5950e9fb772130205f7e14004568be0d6335522a01281255cb18810393d05a76131c49ff9ced41b803bea00c95dd3b1 SHA512 d7ea3cff1146c6010e9731ff8839aa07e453b93db4a28fe8f6a054d5501200f3348716ec76045707d371ba1a9f104caf2471705ac623445bb6fe9ddb4e4c4997
-EBUILD gtk-0.14.6.ebuild 1339 BLAKE2B 159fa1db183e4377320de164fc7ce5fd042bdf18acfdf3a5d0e6fee131595940d16ad07bb19ddf5854f7cb9ebecd0a8320e14a8f48f7427f3c3ac68ba685942e SHA512 978cefdd2285ccaa02bd0ef1d78f8e6672d6a717249dd34a5f95a975418b3d97440677eba50251306eb16c1872b34b753c495c3f046a7cfac4a3522808e1eabb
+EBUILD gtk-0.14.10-r3.ebuild 1563 BLAKE2B d735993bda3b7d140e15df52d695b4db8b2602050e30a791472b86b3361f03286fcf9407636ed36c2dd715a1c207783a00613646beb3d882b6c9dbad533aad57 SHA512 b3dde549eee8290ccef8bce3747968ff16fe8e9b9868460e7bdb268de4a9efe734887526370d36b90f719d262dadafcc9e52337ec9837cf5b4de32cdea263035
MISC metadata.xml 783 BLAKE2B 03cf02ef8216abd88b601f79acf0301d104c8c788c63138378cf7cd19a5adcd6a50a4d9dcd2ea95032acd9466a7be7e81123a35c60dcd5e0b5a41457f18801f6 SHA512 9da50d73780cdfb09196111d6abc5ad9b58ac08a7e2a0ace9b55626209512b4df2812b8de969c4d3b16b4d00b82f1be5c0bf1152050d77285a2dbda09e0240b1
diff --git a/dev-haskell/gtk/files/gtk-0.14.10-glib-2.62.patch b/dev-haskell/gtk/files/gtk-0.14.10-glib-2.62.patch
new file mode 100644
index 000000000000..78e1dc146b43
--- /dev/null
+++ b/dev-haskell/gtk/files/gtk-0.14.10-glib-2.62.patch
@@ -0,0 +1,13 @@
+https://github.com/gtk2hs/gtk2hs/issues/276
+https://bugs.gentoo.org/712988
+--- a/gtk.cabal
++++ b/gtk.cabal
+@@ -381,7 +381,7 @@ Library
+ -- needs to be imported from this module:
+ x-Signals-Import: Graphics.UI.Gtk.General.Threading
+ include-dirs: .
+- cpp-options: -U__BLOCKS__
++ cpp-options: -U__BLOCKS__ -D__attribute__(A)=
+ if os(darwin) || os(freebsd)
+ cpp-options: -D__attribute__(A)= -D_Nullable= -D_Nonnull=
+ if !flag(deprecated)
diff --git a/dev-haskell/gtk/gtk-0.12.5.7.2.ebuild b/dev-haskell/gtk/gtk-0.12.5.7.2.ebuild
deleted file mode 100644
index 742aa165b7c0..000000000000
--- a/dev-haskell/gtk/gtk-0.12.5.7.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-GTK_MAJ_VER="2"
-
-MY_P="${PN}-${PV%.*}"
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Gtk+ graphical user interface library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2.1"
-SLOT="${GTK_MAJ_VER}/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+fmode-binary +gio"
-
-RDEPEND="fmode-binary? ( >=dev-haskell/glib-0.12.5.4:0=[profile?] <dev-haskell/glib-0.13:0=[profile?]
- dev-haskell/mtl:=[profile?]
- >=dev-haskell/pango-0.12.5.3:0=[profile?] <dev-haskell/pango-0.13:0=[profile?]
- >=dev-lang/ghc-7.4.1:=
- dev-libs/glib:2
- x11-libs/gtk+:2 )
- gio? ( >=dev-haskell/cairo-0.12.5.3:0=[profile?] <dev-haskell/cairo-0.13:0=[profile?]
- >=dev-haskell/gio-0.12.5:0=[profile?] <dev-haskell/gio-0.13:0=[profile?]
- >=dev-haskell/glib-0.12.5.4:0=[profile?] <dev-haskell/glib-0.13:0=[profile?]
- dev-haskell/mtl:=[profile?]
- >=dev-haskell/pango-0.12.5.3:0=[profile?] <dev-haskell/pango-0.13:0=[profile?]
- >=dev-lang/ghc-7.4.1:=
- dev-libs/glib:2
- x11-libs/gtk+:2 )
- !gio? ( fmode-binary? ( >=dev-haskell/cairo-0.12.5.3:0=[profile?] <dev-haskell/cairo-0.13:0=[profile?] )
- !fmode-binary? ( >=dev-haskell/cairo-0.12.5.3:0=[profile?] <dev-haskell/cairo-0.13:0=[profile?]
- >=dev-haskell/glib-0.12.5.4:0=[profile?] <dev-haskell/glib-0.13:0=[profile?]
- dev-haskell/mtl:=[profile?]
- >=dev-haskell/pango-0.12.5.3:0=[profile?] <dev-haskell/pango-0.13:0=[profile?]
- >=dev-lang/ghc-7.4.1:=
- dev-libs/glib:2
- x11-libs/gtk+:2 ) )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- >=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0=
- virtual/pkgconfig
-"
-
-src_configure() {
- # Upstream has this enabled, so we might as well force it enabled to be sure.
- cabal_src_configure \
- --flags=deprecated \
- $(cabal_flag fmode-binary fmode-binary) \
- $(cabal_flag gio have-giob)
-}
diff --git a/dev-haskell/gtk/gtk-0.13.9.ebuild b/dev-haskell/gtk/gtk-0.13.9.ebuild
deleted file mode 100644
index 6630fc28ff4e..000000000000
--- a/dev-haskell/gtk/gtk-0.13.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: have-gio:gio,-have-quartz-gtk
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Gtk+ graphical user interface library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+deprecated +fmode-binary +gio"
-
-RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
- >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
- dev-haskell/mtl:=[profile?]
- >=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?]
- >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- dev-libs/glib:2
- x11-libs/gtk+:2
- gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18
- dev-haskell/gtk2hs-buildtools
- virtual/pkgconfig
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag deprecated deprecated) \
- $(cabal_flag fmode-binary fmode-binary) \
- $(cabal_flag gio have-gio) \
- --flag=-have-quartz-gtk
-}
diff --git a/dev-haskell/gtk/gtk-0.14.10-r2.ebuild b/dev-haskell/gtk/gtk-0.14.10-r3.ebuild
index e557e8eaef75..bfb99727150d 100644
--- a/dev-haskell/gtk/gtk-0.14.10-r2.ebuild
+++ b/dev-haskell/gtk/gtk-0.14.10-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -29,16 +29,18 @@ RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[prof
gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] )
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.1
+ >=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3
>=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
virtual/pkgconfig
"
+PATCHES=("${FILESDIR}"/${PN}-0.14.10-glib-2.62.patch)
+
src_prepare() {
default
cabal_chdeps \
- 'Cabal >= 1.24 && < 2.3' 'Cabal >= 1.24 && < 3.1'
+ 'Cabal >= 1.24 && < 2.3' 'Cabal >= 1.24 && < 3.3'
}
src_configure() {
diff --git a/dev-haskell/gtk/gtk-0.14.6.ebuild b/dev-haskell/gtk/gtk-0.14.6.ebuild
deleted file mode 100644
index d70f535b3423..000000000000
--- a/dev-haskell/gtk/gtk-0.14.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: have-gio:gio,-have-quartz-gtk
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Gtk+ graphical user interface library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+deprecated +fmode-binary +gio"
-
-RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
- >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
- dev-haskell/mtl:=[profile?]
- >=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?]
- >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- dev-libs/glib:2
- x11-libs/gtk+:2
- gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24
- dev-haskell/gtk2hs-buildtools
- virtual/pkgconfig
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag deprecated deprecated) \
- $(cabal_flag fmode-binary fmode-binary) \
- $(cabal_flag gio have-gio) \
- --flag=-have-quartz-gtk
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-25 18:09:42 +0000