From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- dev-perl/Wx-Scintilla/Manifest | 6 +++ .../Wx-Scintilla/Wx-Scintilla-0.390.0-r2.ebuild | 44 ++++++++++++++++++++++ .../Wx-Scintilla/Wx-Scintilla-0.390.0-r3.ebuild | 41 ++++++++++++++++++++ .../files/Wx-Scintilla-0.34-flags.patch | 19 ++++++++++ .../files/Wx-Scintilla-0.39-gcc6.patch | 32 ++++++++++++++++ dev-perl/Wx-Scintilla/metadata.xml | 17 +++++++++ 6 files changed, 159 insertions(+) create mode 100644 dev-perl/Wx-Scintilla/Manifest create mode 100644 dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r2.ebuild create mode 100644 dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r3.ebuild create mode 100644 dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.34-flags.patch create mode 100644 dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-gcc6.patch create mode 100644 dev-perl/Wx-Scintilla/metadata.xml (limited to 'dev-perl/Wx-Scintilla') diff --git a/dev-perl/Wx-Scintilla/Manifest b/dev-perl/Wx-Scintilla/Manifest new file mode 100644 index 000000000000..6e5838e1a45a --- /dev/null +++ b/dev-perl/Wx-Scintilla/Manifest @@ -0,0 +1,6 @@ +AUX Wx-Scintilla-0.34-flags.patch 545 BLAKE2B ce7f59a2d369c522469679d79c81d5154e1ee0861712b2cc0d68892f941cf7536ad88300cb56a543a6cba043a1a7418e099d33afd6dad2e51715a053d4355006 SHA512 b1a12522cfd20dfd309a86da23214ace540f0365c3ac8753f081ad8bd7cff16f1f6f1b8345ac1cb3243208085c82a558e50e16ae0e4c556cc5bc2b9704d9a244 +AUX Wx-Scintilla-0.39-gcc6.patch 1099 BLAKE2B 3b6531b42f6c83f6963ba1142d90b6073a941521b2b1c441f0916f505afff878c861bf9833c5d4e4fefe8752f2267ea7dfb51b7b24c42b53b5fcf492e68d62b5 SHA512 c5eceb13994cd0f156efacb0d505a95b873f954b6bea9f016d60d003fa24e82db8d13f440cad3b91188b2b4794c64d46ce077613516f2e78acbdfd06b93dd7de +DIST Wx-Scintilla-0.39.tar.gz 848565 BLAKE2B e6404ebfa506ba63e6bd11f3a81321241ed69b58ccf59cfd37b58a14c9fd6ba8b954623c97e19f9d8d123c0aa352d1a80e0e527358d1de0e0d1e823f42fb8b7a SHA512 d9ecec347c1f1382788e5ed7708b0caf86f2ff87db0fdb2b8fa07460c96b1a7921a9402431105beee61f4627f3694a79db7515ceb76b1ae4fb3f95c807afb4d4 +EBUILD Wx-Scintilla-0.390.0-r2.ebuild 817 BLAKE2B c00cf22273a29ca7cfa3a07aa87fe5978acdd8644cedaf2a8ae1c62ee72cb8836207bf140e1beaeadd111b18611ecbd8bec5247da750d0f7e44889abbec9d011 SHA512 c5174bea04620af4400a5a2ffde748571c7278ceeaac1e504d69c1cb0697aea0b472c4a99b4de8a2d4a3fde7aa83e7856635f611a62575b9cb0d0ee55215935e +EBUILD Wx-Scintilla-0.390.0-r3.ebuild 728 BLAKE2B 43f9ef3dceff896a1d9f4c99a2ac714646c9857b1961332d1c05b4414946175a47f4442b7e03e7f84bf505252a2d84275d99397adbc12d09b9f69c565952602b SHA512 9f6d9448d8cbc82063eb01ce90ecb236e88e788528704ac963c80c9cfb645643f12f21b2080d125f3b4357b538535c65a803ad8111862f1f866afb3cf9014cd6 +MISC metadata.xml 744 BLAKE2B 32b74b415634112c5c1bae52ced35928c80ef07fcf5a1e220c8bf951a10188f28e57526f9389afc767cf7b63ee1c6f54e0b06a50f60741e5ee3a7dd0c1d29031 SHA512 96093148b5aa6af8a600273f746835adf2cf77596b6ded2c20b03734c43376f1d2e678254b0a15b1fe15747a6607b846e3f4824555bfa3aafcbb7f95319285d6 diff --git a/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r2.ebuild b/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r2.ebuild new file mode 100644 index 000000000000..b11bb08f1896 --- /dev/null +++ b/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +WX_GTK_VER="3.0" +#VIRTUALX_REQUIRED=test +#inherit virtualx +MODULE_AUTHOR=AZAWAWI +MODULE_VERSION=0.39 +inherit wxwidgets perl-module + +DESCRIPTION="Scintilla source code editing component for wxWidgets" + +LICENSE+=" HPND" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + dev-perl/Alien-wxWidgets + dev-perl/Wx + x11-libs/wxGTK:${WX_GTK_VER} +" +DEPEND="${RDEPEND} + >=dev-perl/ExtUtils-XSpp-0.160.200 + >=dev-perl/Module-Build-0.360.0 +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.34-flags.patch + "${FILESDIR}"/${PN}-0.39-gcc6.patch +) + +src_configure() { + need-wxwidgets base-unicode + myconf=( --verbose ) + perl-module_src_configure +} + +#SRC_TEST=do +#src_test() { +# VIRTUALX_COMMAND="./Build" virtualmake test || die +#} diff --git a/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r3.ebuild b/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r3.ebuild new file mode 100644 index 000000000000..df5e61dfc0ae --- /dev/null +++ b/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r3.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +WX_GTK_VER="3.0" +DIST_AUTHOR=AZAWAWI +DIST_VERSION=0.39 +inherit wxwidgets perl-module virtualx + +DESCRIPTION="Scintilla source code editing component for wxWidgets" + +LICENSE+=" HPND" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + dev-perl/Alien-wxWidgets + dev-perl/Wx + x11-libs/wxGTK:${WX_GTK_VER} +" +DEPEND="${RDEPEND} + >=dev-perl/ExtUtils-XSpp-0.160.200 + >=dev-perl/Module-Build-0.360.0 +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.34-flags.patch + "${FILESDIR}"/${PN}-0.39-gcc6.patch +) + +src_configure() { + setup-wxwidgets + myconf=( --verbose ) + perl-module_src_configure +} + +src_test() { + virtx perl-module_src_test +} diff --git a/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.34-flags.patch b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.34-flags.patch new file mode 100644 index 000000000000..31b669dc6844 --- /dev/null +++ b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.34-flags.patch @@ -0,0 +1,19 @@ +--- a/inc/Module/Build/Scintilla/GTK.pm ++++ b/inc/Module/Build/Scintilla/GTK.pm +@@ -48,7 +48,6 @@ + $self->stc_defines, + '-c -fPIC', + '-o ' . $object_name, +- '-O2', + '-Wall', + $object_name !~ /((Plat|Scintilla)WX|scintilla)\.o/ + ? '-Wno-missing-braces -Wno-char-subscripts' +@@ -143,7 +142,7 @@ + Alien::wxWidgets->link_flags, + $Config{lddlflags}, + '-fPIC -L.', +- '-s -o ' . $dll, ++ '-o ' . $dll, + 'Scintilla.o', + '-Lblib/arch/auto/Wx/Scintilla ' . $self->stc_scintilla_link, + Alien::wxWidgets->libraries(qw(core base)), diff --git a/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-gcc6.patch b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-gcc6.patch new file mode 100644 index 000000000000..269d1d483d34 --- /dev/null +++ b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-gcc6.patch @@ -0,0 +1,32 @@ +diff -ruN Wx-Scintilla-0.39.orig/wx-scintilla/src/scintilla/src/Editor.cxx Wx-Scintilla-0.39/wx-scintilla/src/scintilla/src/Editor.cxx +--- Wx-Scintilla-0.39.orig/wx-scintilla/src/scintilla/src/Editor.cxx 2012-09-04 12:20:46.000000000 +0200 ++++ Wx-Scintilla-0.39/wx-scintilla/src/scintilla/src/Editor.cxx 2017-04-25 01:20:51.586427196 +0200 +@@ -11,6 +11,7 @@ + #include + #include + ++#include + #include + #include + #include +@@ -989,7 +990,7 @@ + // Try to optimise small scrolls + #ifndef UNDER_CE + int linesToMove = topLine - topLineNew; +- bool performBlit = (abs(linesToMove) <= 10) && (paintState == notPainting); ++ bool performBlit = (std::abs(linesToMove) <= 10) && (paintState == notPainting); + willRedrawAll = !performBlit; + #endif + SetTopLine(topLineNew); +@@ -5868,9 +5869,9 @@ + } + + static bool Close(Point pt1, Point pt2) { +- if (abs(pt1.x - pt2.x) > 3) ++ if (std::abs(pt1.x - pt2.x) > 3) + return false; +- if (abs(pt1.y - pt2.y) > 3) ++ if (std::abs(pt1.y - pt2.y) > 3) + return false; + return true; + } diff --git a/dev-perl/Wx-Scintilla/metadata.xml b/dev-perl/Wx-Scintilla/metadata.xml new file mode 100644 index 000000000000..bdf98e0943b3 --- /dev/null +++ b/dev-perl/Wx-Scintilla/metadata.xml @@ -0,0 +1,17 @@ + + + + + perl@gentoo.org + Gentoo Perl Project + + + Wx-Scintilla + Wx::Scintilla + Wx::Scintilla::Constant + Wx::Scintilla::TextCtrl + Wx::Scintilla::TextEvent + Wx::ScintillaTextCtrl + Wx::ScintillaTextEvent + + -- cgit v1.2.3