[gentoo-commits] repo/gentoo:master commit in: dev-haskell/wxc/
commit: b2888b448eb3b4870426fefffe36c652df4035b8
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sat Apr 24 12:33:52 2021 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sat Apr 24 12:37:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2888b44
dev-haskell/wxc: drop old
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-haskell/wxc/wxc-0.92.3.0.ebuild | 67 -
1 file changed, 67 deletions(-)
diff --git a/dev-haskell/wxc/wxc-0.92.3.0.ebuild
b/dev-haskell/wxc/wxc-0.92.3.0.ebuild
deleted file mode 100644
index b2da12e4f9e..000
--- a/dev-haskell/wxc/wxc-0.92.3.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.3.
-
-WX_GTK_VER="3.0"
-
-CABAL_FEATURES="lib profile" # ho docs as it has no haskell files
-inherit haskell-cabal multilib wxwidgets
-
-DESCRIPTION="wxHaskell C++ wrapper"
-HOMEPAGE="https://wiki.haskell.org/WxHaskell;
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
-
-LICENSE="wxWinLL-3.1"
-SLOT="${WX_GTK_VER}/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="gstreamer"
-
-RDEPEND=">dev-haskell/split-0:=[profile?]
- >=dev-haskell/wxdirect-0.90.1.1:${WX_GTK_VER}=[profile?]
- x11-libs/wxGTK:${WX_GTK_VER}=[X,gstreamer?,opengl]
- >=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.23
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.92.3.0-cabal-2.2.patch
- "${FILESDIR}"/${PN}-0.92.3.0-cabal-3.patch
- "${FILESDIR}"/${PN}-0.92.3.0-cabal-3.2.patch
-)
-
-src_prepare() {
- default
-
- setup-wxwidgets
-
- sed -e "s@\"wx-config\"@\"${WX_CONFIG}\"@g" \
- -i "${S}/Setup.hs" || die "Could not specify wx-config in
Setup.hs"
-}
-
-src_configure() {
- local cgcc=()
- for i in ${CXXFLAGS}
- do
- cgcc+=( --gcc-option="${i}" )
- done
- # Trying to specify the LDFLAGS in --ld-option does not work, as ld does
- # not understand ld options prefixed with -Wl,
- # The linker that is used to link the libwxc.so shared library is hard
coded
- # in Setup.hs. So the --with-ld would not change the linker used when
- # linking libwxc.so. --with-ld="gcc" does not help, as then cabal
passes
- # ld options like -x to gcc which then returns a non-zero exit status,
then
- # cabal ignores all the --ld-option parameters.
- # So I place all the LDFLAGS in --gcc-option parameters. They are
ignored
- # when building .o files.
- local cld=()
- for i in ${LDFLAGS}
- do
- cld+=( --gcc-option="${i}" )
- done
- cabal_src_configure ${cgcc[*]} ${cld[*]} --verbose=3
-}
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/wxc/
commit: bda138c4470ce9e77035a3db5182b40472000f85
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sat Apr 17 10:25:37 2021 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sat Apr 17 10:25:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bda138c4
dev-haskell/wxc: tweak older slot for ghc-8.10
Reported-by: Agostino Sarubbo
Closes: https://bugs.gentoo.org/783390
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-haskell/wxc/wxc-0.92.3.0.ebuild | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dev-haskell/wxc/wxc-0.92.3.0.ebuild
b/dev-haskell/wxc/wxc-0.92.3.0.ebuild
index a704fc0cd19..b2da12e4f9e 100644
--- a/dev-haskell/wxc/wxc-0.92.3.0.ebuild
+++ b/dev-haskell/wxc/wxc-0.92.3.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
# ebuild generated by hackport 0.5.3.
WX_GTK_VER="3.0"
CABAL_FEATURES="lib profile" # ho docs as it has no haskell files
-inherit haskell-cabal multilib versionator wxwidgets
+inherit haskell-cabal multilib wxwidgets
DESCRIPTION="wxHaskell C++ wrapper"
HOMEPAGE="https://wiki.haskell.org/WxHaskell;
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-0.92.3.0-cabal-2.2.patch
"${FILESDIR}"/${PN}-0.92.3.0-cabal-3.patch
+ "${FILESDIR}"/${PN}-0.92.3.0-cabal-3.2.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/wxc/, dev-haskell/wxc/files/
commit: 9de2814211ceca4a2b501584b815defa6cea11fe
Author: Sergei Trofimovich gentoo org>
AuthorDate: Fri Apr 16 22:04:15 2021 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Fri Apr 16 22:11:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9de28142
dev-haskell/wxc: switch to WX_GTK_VER="3.0-gtk3"
Reported-by: David Seifert
Closes: https://bugs.gentoo.org/781038
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.2.patch | 27 +
dev-haskell/wxc/wxc-0.92.3.0-r1.ebuild | 68 ++
2 files changed, 95 insertions(+)
diff --git a/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.2.patch
b/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.2.patch
new file mode 100644
index 000..096e971de4b
--- /dev/null
+++ b/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.2.patch
@@ -0,0 +1,27 @@
+--- a/Setup.hs
b/Setup.hs
+@@ -81,7 +81,12 @@ rawShellSystemStdInOut :: Verbosity --
Verbosity level
+-> FilePath -- Path to command
+-> [String] -- Command arguments
+-> IO (String, String, ExitCode) -- (Command result,
Errors, Command exit status)
+-#if MIN_VERSION_Cabal(2,2,0)
++
++#if MIN_VERSION_Cabal(3,2,0)
++rawShellSystemStdInOut v f as = do
++ (so, se, c) <- rawSystemStdInOut v "sh" (f:as) Nothing Nothing Nothing
DSU.IODataModeText
++ return (so, se, c)
++#elif MIN_VERSION_Cabal(2,2,0)
+ rawShellSystemStdInOut v f as = do
+ (~(DSU.IODataText so), se, c) <- rawSystemStdInOut v "sh" (f:as) Nothing
Nothing Nothing DSU.IODataModeText
+ return (so, se, c)
+@@ -444,7 +449,9 @@ deMsysPaths bi = do
+ if b
+ then do
+ let cor ph = do
+-#if MIN_VERSION_Cabal(2,2,0)
++#if MIN_VERSION_Cabal(3,2,0)
++(r, e, c) <- rawSystemStdInOut normal "sh" ["-c", "cd " ++ ph ++
"; pwd -W"] Nothing Nothing Nothing DSU.IODataModeText
++#elif MIN_VERSION_Cabal(2,2,0)
+ (~(DSU.IODataText r), e, c) <- rawSystemStdInOut normal "sh"
["-c", "cd " ++ ph ++ "; pwd -W"] Nothing Nothing Nothing DSU.IODataModeText
+ #else
+ (r, e, c ) <- rawSystemStdInOut normal "sh" ["-c", "cd " ++ ph ++
"; pwd -W"] Nothing Nothing Nothing False
diff --git a/dev-haskell/wxc/wxc-0.92.3.0-r1.ebuild
b/dev-haskell/wxc/wxc-0.92.3.0-r1.ebuild
new file mode 100644
index 000..d9c666dfcca
--- /dev/null
+++ b/dev-haskell/wxc/wxc-0.92.3.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.3.
+
+WX_GTK_VER="3.0-gtk3"
+
+CABAL_FEATURES="lib profile" # ho docs as it has no haskell files
+inherit haskell-cabal multilib wxwidgets
+
+DESCRIPTION="wxHaskell C++ wrapper"
+HOMEPAGE="https://wiki.haskell.org/WxHaskell;
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
+
+LICENSE="wxWinLL-3.1"
+SLOT="${WX_GTK_VER}/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="gstreamer"
+
+RDEPEND=">dev-haskell/split-0:=[profile?]
+ >=dev-haskell/wxdirect-0.90.1.1:${WX_GTK_VER}=[profile?]
+ x11-libs/wxGTK:${WX_GTK_VER}=[X,gstreamer?,opengl]
+ >=dev-lang/ghc-7.6.1:=
+ !!dev-haskell/wxc:3.0
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.23
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.92.3.0-cabal-2.2.patch
+ "${FILESDIR}"/${PN}-0.92.3.0-cabal-3.patch
+ "${FILESDIR}"/${PN}-0.92.3.0-cabal-3.2.patch
+)
+
+src_prepare() {
+ default
+
+ setup-wxwidgets
+
+ sed -e "s@\"wx-config\"@\"${WX_CONFIG}\"@g" \
+ -i "${S}/Setup.hs" || die "Could not specify wx-config in
Setup.hs"
+}
+
+src_configure() {
+ local cgcc=()
+ for i in ${CXXFLAGS}
+ do
+ cgcc+=( --gcc-option="${i}" )
+ done
+ # Trying to specify the LDFLAGS in --ld-option does not work, as ld does
+ # not understand ld options prefixed with -Wl,
+ # The linker that is used to link the libwxc.so shared library is hard
coded
+ # in Setup.hs. So the --with-ld would not change the linker used when
+ # linking libwxc.so. --with-ld="gcc" does not help, as then cabal
passes
+ # ld options like -x to gcc which then returns a non-zero exit status,
then
+ # cabal ignores all the --ld-option parameters.
+ # So I place all the LDFLAGS in --gcc-option parameters. They are
ignored
+ # when building .o files.
+ local cld=()
+ for i in ${LDFLAGS}
+ do
+ cld+=( --gcc-option="${i}" )
+ done
+ cabal_src_configure ${cgcc[*]} ${cld[*]} --verbose=3
+}
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/wxc/
commit: f0882a6d6ed1b5a22a4c08070bcf77e2f6d0aead
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sat Sep 12 22:52:03 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sat Sep 12 22:53:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0882a6d
dev-haskell/wxc: drop old
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-haskell/wxc/Manifest| 1 -
dev-haskell/wxc/wxc-0.92.2.0.ebuild | 57 -
2 files changed, 58 deletions(-)
diff --git a/dev-haskell/wxc/Manifest b/dev-haskell/wxc/Manifest
index c24115f1645..b82eb1f350d 100644
--- a/dev-haskell/wxc/Manifest
+++ b/dev-haskell/wxc/Manifest
@@ -1,2 +1 @@
-DIST wxc-0.92.2.0.tar.gz 203065 BLAKE2B
3f873b3bbc50e5fa7690f2f05a25ab360260d90523dd0b9c016f5dfeea99e9a59fe4848de520d642d2cea52dbadfd69aa31671f521243240488d643d4554e880
SHA512
e6fba1be94978603965b8902fad9326772b5483d5df621d5245f1fae97d85bcb1aff4565f1e8396de23c854050151c5e009e34a1ea29c3037057599ac0412bcd
DIST wxc-0.92.3.0.tar.gz 203597 BLAKE2B
e73745fe17747c1abb79cdb2e7ecadee1f286abd34d1ccfbc2bb53d729fbab4dc60ab054af07f75cae9aa67e83ae794ea23f3f00decd39f69b93a5a56726d9d2
SHA512
60f34e316a4dfa4951e18d99d24508d36806f8a9d0bf05485904b03622ebda138b7a93a7477a2a107007d40e8cadbe51200322507054f65bd0b720545b414b37
diff --git a/dev-haskell/wxc/wxc-0.92.2.0.ebuild
b/dev-haskell/wxc/wxc-0.92.2.0.ebuild
deleted file mode 100644
index 0e5e4f13e99..000
--- a/dev-haskell/wxc/wxc-0.92.2.0.ebuild
+++ /dev/null
@@ -1,57 +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.7.
-
-WX_GTK_VER="3.0"
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal multilib versionator wxwidgets
-
-DESCRIPTION="wxHaskell C++ wrapper"
-HOMEPAGE="https://wiki.haskell.org/WxHaskell;
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
-
-LICENSE="wxWinLL-3.1"
-SLOT="${WX_GTK_VER}/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">dev-haskell/split-0:=[profile?]
- >=dev-haskell/wxdirect-0.90.1.1:${WX_GTK_VER}=[profile?]
- x11-libs/wxGTK:${WX_GTK_VER}=[X,gstreamer,opengl]
- >=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.16.0
-"
-
-src_prepare() {
- sed -e "s@\"wx-config\"@\"${WX_CONFIG}\"@g" \
- -i "${S}/Setup.hs" || die "Could not specify wx-config in
Setup.hs"
-}
-
-src_configure() {
- local cgcc=()
- for i in ${CXXFLAGS}
- do
- cgcc+=( --gcc-option="${i}" )
- done
- # Trying to specify the LDFLAGS in --ld-option does not work, as ld does
- # not understand ld options prefixed with -Wl,
- # The linker that is used to link the libwxc.so shared library is hard
coded
- # in Setup.hs. So the --with-ld would not change the linker used when
- # linking libwxc.so. --with-ld="gcc" does not help, as then cabal
passes
- # ld options like -x to gcc which then returns a non-zero exit status,
then
- # cabal ignores all the --ld-option parameters.
- # So I place all the LDFLAGS in --gcc-option parameters. They are
ignored
- # when building .o files.
- local cld=()
- for i in ${LDFLAGS}
- do
- cld+=( --gcc-option="${i}" )
- done
- cabal_src_configure ${cgcc[*]} ${cld[*]} --verbose=3
-}
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/wxc/, dev-haskell/wxc/files/
commit: 546cb495723c209dd4c8364aef53b1e6dfe14b98
Author: Sergei Trofimovich gentoo org>
AuthorDate: Wed Aug 19 21:26:12 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Wed Aug 19 21:26:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=546cb495
dev-haskell/wxc: bump up to 0.92.3.0
Reported-by: Agostino Sarubbo
Closes: https://bugs.gentoo.org/736444
Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-haskell/wxc/Manifest | 1 +
dev-haskell/wxc/files/wxc-0.92.3.0-cabal-2.2.patch | 32 +++
dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.patch | 12
dev-haskell/wxc/wxc-0.92.3.0.ebuild| 66 ++
4 files changed, 111 insertions(+)
diff --git a/dev-haskell/wxc/Manifest b/dev-haskell/wxc/Manifest
index 9626844845e..c24115f1645 100644
--- a/dev-haskell/wxc/Manifest
+++ b/dev-haskell/wxc/Manifest
@@ -1 +1,2 @@
DIST wxc-0.92.2.0.tar.gz 203065 BLAKE2B
3f873b3bbc50e5fa7690f2f05a25ab360260d90523dd0b9c016f5dfeea99e9a59fe4848de520d642d2cea52dbadfd69aa31671f521243240488d643d4554e880
SHA512
e6fba1be94978603965b8902fad9326772b5483d5df621d5245f1fae97d85bcb1aff4565f1e8396de23c854050151c5e009e34a1ea29c3037057599ac0412bcd
+DIST wxc-0.92.3.0.tar.gz 203597 BLAKE2B
e73745fe17747c1abb79cdb2e7ecadee1f286abd34d1ccfbc2bb53d729fbab4dc60ab054af07f75cae9aa67e83ae794ea23f3f00decd39f69b93a5a56726d9d2
SHA512
60f34e316a4dfa4951e18d99d24508d36806f8a9d0bf05485904b03622ebda138b7a93a7477a2a107007d40e8cadbe51200322507054f65bd0b720545b414b37
diff --git a/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-2.2.patch
b/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-2.2.patch
new file mode 100644
index 000..86d523b362f
--- /dev/null
+++ b/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-2.2.patch
@@ -0,0 +1,32 @@
+--- a/Setup.hs
b/Setup.hs
+@@ -22,2 +22,3 @@ import Distribution.Simple.Setup ( BuildFlags, ConfigFlags
+ import Distribution.Simple.Utils (installOrdinaryFile, rawSystemExitWithEnv,
rawSystemStdInOut, die)
++import qualified Distribution.Simple.Utils as DSU
+ import Distribution.System (OS (..), Arch (..), buildOS, buildArch)
+@@ -81,3 +82,9 @@ rawShellSystemStdInOut :: Verbosity --
Verbosity level
+-> IO (String, String, ExitCode) -- (Command result,
Errors, Command exit status)
++#if MIN_VERSION_Cabal(2,2,0)
++rawShellSystemStdInOut v f as = do
++ (~(DSU.IODataText so), se, c) <- rawSystemStdInOut v "sh" (f:as) Nothing
Nothing Nothing DSU.IODataModeText
++ return (so, se, c)
++#else
+ rawShellSystemStdInOut v f as = rawSystemStdInOut v "sh" (f:as) Nothing
Nothing Nothing False
++#endif
+
+@@ -438,3 +445,7 @@ deMsysPaths bi = do
+ let cor ph = do
++#if MIN_VERSION_Cabal(2,2,0)
++(~(DSU.IODataText r), e, c) <- rawSystemStdInOut normal "sh"
["-c", "cd " ++ ph ++ "; pwd -W"] Nothing Nothing Nothing DSU.IODataModeText
++#else
+ (r, e, c ) <- rawSystemStdInOut normal "sh" ["-c", "cd " ++ ph ++
"; pwd -W"] Nothing Nothing Nothing False
++#endif
+ unless (c == ExitSuccess) (putStrLn ("Error: failed to convert
MSYS path to native path \n" ++ e) >> exitFailure)
+@@ -504,3 +515,7 @@ sharedLibName ver basename =
+ where
++#if MIN_VERSION_Cabal(2,2,0)
++ full_ver = (concat . intersperse "." . map show . versionNumbers)
ver
++#else
+ full_ver = (concat . intersperse "." . map show . versionBranch) ver
++#endif
+
diff --git a/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.patch
b/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.patch
new file mode 100644
index 000..5d474098987
--- /dev/null
+++ b/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.patch
@@ -0,0 +1,12 @@
+--- a/Setup.hs
b/Setup.hs
+@@ -19,7 +19,8 @@ import Distribution.Simple.Setup ( BuildFlags, ConfigFlags
+ , InstallFlags, installVerbosity
+ , fromFlag, fromFlagOrDefault, copyDest
+ )
+-import Distribution.Simple.Utils (installOrdinaryFile, rawSystemExitWithEnv,
rawSystemStdInOut, die)
++import Distribution.Simple.Utils (installOrdinaryFile, rawSystemExitWithEnv,
rawSystemStdInOut)
++import System.Exit (die)
+ import qualified Distribution.Simple.Utils as DSU
+ import Distribution.System (OS (..), Arch (..), buildOS, buildArch)
+ import Distribution.Verbosity (Verbosity, normal, verbose)
diff --git a/dev-haskell/wxc/wxc-0.92.3.0.ebuild
b/dev-haskell/wxc/wxc-0.92.3.0.ebuild
new file mode 100644
index 000..a704fc0cd19
--- /dev/null
+++ b/dev-haskell/wxc/wxc-0.92.3.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.3.
+
+WX_GTK_VER="3.0"
+
+CABAL_FEATURES="lib profile" # ho docs as it has no haskell files
+inherit haskell-cabal multilib versionator
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/wxc/files/
commit: 1da26aa386b916934395cbfd52863fbbc4d67521
Author: Michael Mair-Keimberger (asterix) gmail
com>
AuthorDate: Tue Aug 8 16:13:03 2017 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Tue Aug 8 19:56:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1da26aa3
dev-haskell/wcx: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/5357
dev-haskell/wxc/files/wxc-0.90.0.4-wxGTK-2.9.4.1.patch | 11 ---
1 file changed, 11 deletions(-)
diff --git a/dev-haskell/wxc/files/wxc-0.90.0.4-wxGTK-2.9.4.1.patch
b/dev-haskell/wxc/files/wxc-0.90.0.4-wxGTK-2.9.4.1.patch
deleted file mode 100644
index 3786e6ad532..000
--- a/dev-haskell/wxc/files/wxc-0.90.0.4-wxGTK-2.9.4.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
wxc-0.90.0.4-orig/src/cpp/eljpen.cpp 2012-07-03 20:12:17.0
+1000
-+++ wxc-0.90.0.4/src/cpp/eljpen.cpp2012-08-18 11:37:00.625281748 +1000
-@@ -156,7 +156,7 @@
- EWXWEXPORT(void,wxPen_GetStipple)(void* self,wxBitmap* _ref)
- {
- #if defined(__WXGTK__)
--*_ref = NULL;
-+*_ref = wxBitmap();
- #else
- *_ref = *(((wxPen*)self)->GetStipple());
- #endif
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/wxc/
commit: 50022f0002ce7b5325a20dff69e50d6647f95ce2
Author: Pacho Ramos gentoo org>
AuthorDate: Tue May 24 19:05:59 2016 +
Commit: Pacho Ramos gentoo org>
CommitDate: Tue May 24 19:12:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50022f00
dev-haskell/wxc: Drop old version relying on obsolete wxGTK
Package-Manager: portage-2.3.0_rc1
dev-haskell/wxc/Manifest| 1 -
dev-haskell/wxc/wxc-0.90.1.1.ebuild | 65 -
2 files changed, 66 deletions(-)
diff --git a/dev-haskell/wxc/Manifest b/dev-haskell/wxc/Manifest
index 0492182..228b4c2 100644
--- a/dev-haskell/wxc/Manifest
+++ b/dev-haskell/wxc/Manifest
@@ -1,2 +1 @@
-DIST wxc-0.90.1.1.tar.gz 183992 SHA256
ec71deebafdb69e50742acf1a4307ab2706f3282d24022a8a603eb3d35bc6e33 SHA512
917af9eaa8e07b0ce827da9c350811d514ebd0627f410b28836340adec21c119283a62d1533475eb3ba2e960dad2e26067ad6e8e5820b2e69ede86e5f4404548
WHIRLPOOL
58ff612f74d0dada055030eb907559c056ab8fb40b2d31647f33bd900c17c75c0abdeba36d59aeb3127e28020d4d21af4c9d60eb3d3c29f36677ffccbbed97b8
DIST wxc-0.92.2.0.tar.gz 203065 SHA256
e0da20807bafb22d51a0922211da11eb428b2a6661cb53bc98f6e17be9775191 SHA512
e6fba1be94978603965b8902fad9326772b5483d5df621d5245f1fae97d85bcb1aff4565f1e8396de23c854050151c5e009e34a1ea29c3037057599ac0412bcd
WHIRLPOOL
bbc05a53a02ee9a5dea7c3eb9745bab82c5290fb0a81e46eb359da27869538b5397a65149cf1ef8c551235584b77c055356422edb9f75bf3fbd4022efa90b042
diff --git a/dev-haskell/wxc/wxc-0.90.1.1.ebuild
b/dev-haskell/wxc/wxc-0.90.1.1.ebuild
deleted file mode 100644
index 21af12e..000
--- a/dev-haskell/wxc/wxc-0.90.1.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.
-
-WX_GTK_VER="2.9"
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal multilib versionator wxwidgets
-
-DESCRIPTION="wxHaskell C++ wrapper"
-HOMEPAGE="http://haskell.org/haskellwiki/WxHaskell;
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="wxWinLL-3.1"
-SLOT="${WX_GTK_VER}/${PV}"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/wxdirect-0.90.1.0:${WX_GTK_VER}=[profile?]
- x11-libs/wxGTK:${WX_GTK_VER}=[X,gstreamer,opengl]
- >=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6.0.3
-"
-
-src_prepare() {
- sed -e "s@\"wx-config\"@\"${WX_CONFIG}\"@g" \
- -i "${S}/Setup.hs" || die "Could not specify wx-config in
Setup.hs"
-}
-
-src_configure() {
- local cgcc=()
- for i in ${CXXFLAGS}
- do
- cgcc+=( --gcc-option="${i}" )
- done
- # Trying to specify the LDFLAGS in --ld-option does not work, as ld does
- # not understand ld options prefixed with -Wl,
- # The linker that is used to link the libwxc.so shared library is hard
coded
- # in Setup.hs. So the --with-ld would not change the linker used when
- # linking libwxc.so. --with-ld="gcc" does not help, as then cabal
passes
- # ld options like -x to gcc which then returns a non-zero exit status,
then
- # cabal ignores all the --ld-option parameters.
- # So I place all the LDFLAGS in --gcc-option parameters. They are
ignored
- # when building .o files.
- local cld=()
- for i in ${LDFLAGS}
- do
- cld+=( --gcc-option="${i}" )
- done
- cabal_src_configure ${cgcc[*]} ${cld[*]} --verbose=3
-}
-
-src_install() {
- cabal_src_install
- dolib.so dist/build/lib${PN}.so.${PV}
- dosym lib${PN}.so.${PV}
/usr/$(get_libdir)/lib${PN}.so.$(get_version_component_range 1-2)
- dosym lib${PN}.so.${PV}
/usr/$(get_libdir)/lib${PN}.so.$(get_major_version)
- dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
-}
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/wxc/
commit: 736a568f188ea020e5c2920ad755c2733e3e39b5
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sat Mar 26 22:02:35 2016 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sat Mar 26 22:02:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=736a568f
dev-haskell/wxc: bump up to 0.92.2.0
Package-Manager: portage-2.2.28
dev-haskell/wxc/Manifest| 1 +
dev-haskell/wxc/wxc-0.92.2.0.ebuild | 58 +
2 files changed, 59 insertions(+)
diff --git a/dev-haskell/wxc/Manifest b/dev-haskell/wxc/Manifest
index d064e40..c103234 100644
--- a/dev-haskell/wxc/Manifest
+++ b/dev-haskell/wxc/Manifest
@@ -1,2 +1,3 @@
DIST wxc-0.90.0.4.tar.gz 181799 SHA256
e69e4870c33dc32ee388c5f1be5b0ad1f2b231aa16a51da205cfa295430402ae SHA512
4dd3846465a3c43c507a8b76e3929736b1e0ed0941201803f2209cb2ce347cddda9fd725796c6a7d306209324a9201c91d36ee9808c694c9110ab393d80f5c97
WHIRLPOOL
ddebc3f800f15249185e7d0d6b207fd7576e70037792cbb164568c3a960a7cee96518eb6099ffbd2c06319b04c10e4f684b5c376388d39d648afd614806ab6e5
DIST wxc-0.90.1.1.tar.gz 183992 SHA256
ec71deebafdb69e50742acf1a4307ab2706f3282d24022a8a603eb3d35bc6e33 SHA512
917af9eaa8e07b0ce827da9c350811d514ebd0627f410b28836340adec21c119283a62d1533475eb3ba2e960dad2e26067ad6e8e5820b2e69ede86e5f4404548
WHIRLPOOL
58ff612f74d0dada055030eb907559c056ab8fb40b2d31647f33bd900c17c75c0abdeba36d59aeb3127e28020d4d21af4c9d60eb3d3c29f36677ffccbbed97b8
+DIST wxc-0.92.2.0.tar.gz 203065 SHA256
e0da20807bafb22d51a0922211da11eb428b2a6661cb53bc98f6e17be9775191 SHA512
e6fba1be94978603965b8902fad9326772b5483d5df621d5245f1fae97d85bcb1aff4565f1e8396de23c854050151c5e009e34a1ea29c3037057599ac0412bcd
WHIRLPOOL
bbc05a53a02ee9a5dea7c3eb9745bab82c5290fb0a81e46eb359da27869538b5397a65149cf1ef8c551235584b77c055356422edb9f75bf3fbd4022efa90b042
diff --git a/dev-haskell/wxc/wxc-0.92.2.0.ebuild
b/dev-haskell/wxc/wxc-0.92.2.0.ebuild
new file mode 100644
index 000..09e345e
--- /dev/null
+++ b/dev-haskell/wxc/wxc-0.92.2.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.7.
+
+WX_GTK_VER="3.0"
+
+CABAL_FEATURES="lib profile"
+inherit haskell-cabal multilib versionator wxwidgets
+
+DESCRIPTION="wxHaskell C++ wrapper"
+HOMEPAGE="https://wiki.haskell.org/WxHaskell;
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="wxWinLL-3.1"
+SLOT="${WX_GTK_VER}/${PV}"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">dev-haskell/split-0:=[profile?]
+ >=dev-haskell/wxdirect-0.90.1.1:${WX_GTK_VER}=[profile?]
+ x11-libs/wxGTK:${WX_GTK_VER}=[X,gstreamer,opengl]
+ >=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.16.0
+"
+
+src_prepare() {
+ sed -e "s@\"wx-config\"@\"${WX_CONFIG}\"@g" \
+ -i "${S}/Setup.hs" || die "Could not specify wx-config in
Setup.hs"
+}
+
+src_configure() {
+ local cgcc=()
+ for i in ${CXXFLAGS}
+ do
+ cgcc+=( --gcc-option="${i}" )
+ done
+ # Trying to specify the LDFLAGS in --ld-option does not work, as ld does
+ # not understand ld options prefixed with -Wl,
+ # The linker that is used to link the libwxc.so shared library is hard
coded
+ # in Setup.hs. So the --with-ld would not change the linker used when
+ # linking libwxc.so. --with-ld="gcc" does not help, as then cabal
passes
+ # ld options like -x to gcc which then returns a non-zero exit status,
then
+ # cabal ignores all the --ld-option parameters.
+ # So I place all the LDFLAGS in --gcc-option parameters. They are
ignored
+ # when building .o files.
+ local cld=()
+ for i in ${LDFLAGS}
+ do
+ cld+=( --gcc-option="${i}" )
+ done
+ cabal_src_configure ${cgcc[*]} ${cld[*]} --verbose=3
+}
