* [gentoo-commits] repo/gentoo:master commit in: dev-perl/Wx-Scintilla/, dev-perl/Wx-Scintilla/files/
@ 2024-09-05 19:33 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-09-05 19:33 UTC (permalink / raw
To: gentoo-commits
commit: a96af1e2ef016984da15bcf721475f0951f3c11d
Author: Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Thu Sep 5 17:45:00 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 5 19:32:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a96af1e2
dev-perl/Wx-Scintilla: respect user flags
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild | 3 ++-
.../files/Wx-Scintilla-0.39-respect-user-flags.patch | 18 ++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild b/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild
index 61c60e271dfb..65cb495b5f83 100644
--- a/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild
+++ b/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -29,6 +29,7 @@ BDEPEND=${DEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-0.34-flags.patch
"${FILESDIR}"/${PN}-0.39-gcc6.patch
+ "${FILESDIR}"/${PN}-0.39-respect-user-flags.patch
)
src_configure() {
diff --git a/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-respect-user-flags.patch b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-respect-user-flags.patch
new file mode 100644
index 000000000000..e92e644a7956
--- /dev/null
+++ b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-respect-user-flags.patch
@@ -0,0 +1,18 @@
+--- a/inc/Module/Build/Scintilla.pm
++++ b/inc/Module/Build/Scintilla.pm
+@@ -89,7 +89,7 @@
+
+ sub stc_ldflags {
+ my $self = shift;
+- return Alien::wxWidgets->link_flags;
++ return Alien::wxWidgets->link_flags . $Config{ldflags};
+ }
+
+ sub stc_defines {
+@@ -119,6 +119,7 @@
+ my $flags = qx($command);
+ chomp($flags);
+ $flags .= ' ' . Alien::wxWidgets->c_flags;
++ $flags .= ' ' . $Config{ccflags};
+ return $flags;
+ }
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-perl/Wx-Scintilla/, dev-perl/Wx-Scintilla/files/
@ 2024-09-05 19:33 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-09-05 19:33 UTC (permalink / raw
To: gentoo-commits
commit: a1d4fb2a048e9fd40cba9af3942721ece13db54b
Author: Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Thu Sep 5 18:33:09 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 5 19:32:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1d4fb2a
dev-perl/Wx-Scintilla: scrub leftover gtk2 linkage attempt
Closes: https://bugs.gentoo.org/922347
Fixes: 9c0ef2be161719a22579fbc0a24963ad05b3c73b
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild | 1 +
.../files/Wx-Scintilla-0.39-scrub-gtk2.patch | 35 ++++++++++++++++++++++
2 files changed, 36 insertions(+)
diff --git a/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild b/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild
index dd6c3c1fe734..843cd133b141 100644
--- a/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild
+++ b/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild
@@ -31,6 +31,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.39-gcc6.patch
"${FILESDIR}"/${PN}-0.39-respect-user-flags.patch
"${FILESDIR}"/${PN}-0.39-force-c++11.patch
+ "${FILESDIR}"/${PN}-0.39-scrub-gtk2.patch
)
src_configure() {
diff --git a/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-scrub-gtk2.patch b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-scrub-gtk2.patch
new file mode 100644
index 000000000000..8c025f399926
--- /dev/null
+++ b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-scrub-gtk2.patch
@@ -0,0 +1,35 @@
+--- a/inc/Module/Build/Scintilla/GTK.pm
++++ b/inc/Module/Build/Scintilla/GTK.pm
+@@ -63,32 +64,6 @@
+ $self->_run_command( \@cmd );
+ }
+
+-sub stc_prebuild_check {
+- my $self = shift;
+- my $ld = Alien::wxWidgets->linker;
+- my $libstring = $self->stc_extra_scintilla_libs;
+- my $outfile = 'stc_checkdepends.out';
+- my $command = qq($ld -fPIC -shared $libstring -o $outfile);
+- if ( system($command) ) {
+- unlink($outfile);
+- print qq(Check for gtk2 development libraries failed.\n);
+- print qq(Perhaps you need to install package libgtk2.0-dev or the equivalent for your system.\n);
+- print qq(You can ofcourse uninstall it later after the installation is complete.\n);
+- print qq(The build cannot continue.\n);
+- exit(1);
+- }
+- unlink($outfile);
+- return 1;
+-}
+-
+-sub stc_extra_scintilla_libs {
+- my $self = shift;
+- my $extras = '-lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 ';
+- $extras .= '-lgdk_pixbuf-2.0 -lm -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 ';
+- $extras .= '-lgmodule-2.0 -lgthread-2.0 -lglib-2.0';
+- return $extras;
+-}
+-
+ sub stc_link_scintilla_objects {
+ my ( $self, $shared_lib, $objects ) = @_;
+
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-perl/Wx-Scintilla/, dev-perl/Wx-Scintilla/files/
@ 2024-09-05 19:33 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-09-05 19:33 UTC (permalink / raw
To: gentoo-commits
commit: 8815b1468e8082b5c6e13349cd5263e5562b1984
Author: Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Thu Sep 5 18:08:40 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 5 19:32:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8815b146
dev-perl/Wx-Scintilla: force c++11 due to std::auto_ptr
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild | 1 +
.../Wx-Scintilla/files/Wx-Scintilla-0.39-force-c++11.patch | 13 +++++++++++++
2 files changed, 14 insertions(+)
diff --git a/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild b/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild
index 65cb495b5f83..dd6c3c1fe734 100644
--- a/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild
+++ b/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild
@@ -30,6 +30,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.34-flags.patch
"${FILESDIR}"/${PN}-0.39-gcc6.patch
"${FILESDIR}"/${PN}-0.39-respect-user-flags.patch
+ "${FILESDIR}"/${PN}-0.39-force-c++11.patch
)
src_configure() {
diff --git a/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-force-c++11.patch b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-force-c++11.patch
new file mode 100644
index 000000000000..92a5af0c4892
--- /dev/null
+++ b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-force-c++11.patch
@@ -0,0 +1,13 @@
+Uses std::auto_ptr which has been officially removed in C++17.
+While GCC still has it present LLVM has explicitly removed it.
+
+--- a/inc/Module/Build/Scintilla/GTK.pm
++++ b/inc/Module/Build/Scintilla/GTK.pm
+@@ -50,6 +50,7 @@
+ '-o ' . $object_name,
+ '-O2',
+ '-Wall',
++ '-std=c++11',
+ $object_name !~ /((Plat|Scintilla)WX|scintilla)\.o/
+ ? '-Wno-missing-braces -Wno-char-subscripts'
+ : '',
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-perl/Wx-Scintilla/, dev-perl/Wx-Scintilla/files/
@ 2017-04-24 23:25 Andreas Hüttel
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Hüttel @ 2017-04-24 23:25 UTC (permalink / raw
To: gentoo-commits
commit: dba986281a22a17cb3bda851f50a5757ab17c051
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 24 23:24:50 2017 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Apr 24 23:24:50 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dba98628
dev-perl/Wx-Scintilla: Fix build with gcc-6, bug 612446
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-perl/Wx-Scintilla/Manifest | 1 -
.../Wx-Scintilla/Wx-Scintilla-0.390.0-r2.ebuild | 6 ++--
.../files/Wx-Scintilla-0.34-flags.patch | 19 +++++++++++++
.../files/Wx-Scintilla-0.39-gcc6.patch | 32 ++++++++++++++++++++++
4 files changed, 54 insertions(+), 4 deletions(-)
diff --git a/dev-perl/Wx-Scintilla/Manifest b/dev-perl/Wx-Scintilla/Manifest
index 9fcbda6e9d0..680eb9f3feb 100644
--- a/dev-perl/Wx-Scintilla/Manifest
+++ b/dev-perl/Wx-Scintilla/Manifest
@@ -1,2 +1 @@
-DIST Wx-Scintilla-0.34-patches.tar.gz 488 SHA256 3ca51b083080d0e1943c24db04251b1a1a8961ded91d18935f850e0004152bd4 SHA512 743468ea05f78f147664bc550ad6f2869db3876085d56f86b245ba568d58dfa50d957da22a29dbe322f10c5f25001d40927fdc19a83f616778e6b6c55e75d98f WHIRLPOOL 22b241121fc202386e81eb774fcfd0e6c686bdcaf3a3af4b5056465c2d35b9c21bc849702b26e4d6e386c7ea424f827c92f41788140a6f75d4c91906f4495813
DIST Wx-Scintilla-0.39.tar.gz 848565 SHA256 d6d67528a55552bb3fda2a1f22058c6c94a05eaf632dba5331afb3390defe0ea SHA512 d9ecec347c1f1382788e5ed7708b0caf86f2ff87db0fdb2b8fa07460c96b1a7921a9402431105beee61f4627f3694a79db7515ceb76b1ae4fb3f95c807afb4d4 WHIRLPOOL 229c694683e939cc1110171945aa18cddcb989c63e33c032ae755ba878717792d88f9670f968bd989e58c62066d7e8d4035962ae58975970876a6741a8285560
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
index 58d38d6c224..b11bb08f189 100644
--- a/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r2.ebuild
+++ b/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,6 @@ MODULE_VERSION=0.39
inherit wxwidgets perl-module
DESCRIPTION="Scintilla source code editing component for wxWidgets"
-SRC_URI+=" https://dev.gentoo.org/~tove/distfiles/dev-perl/${PN}-0.34-patches.tar.gz"
LICENSE+=" HPND"
SLOT="0"
@@ -29,7 +28,8 @@ DEPEND="${RDEPEND}
"
PATCHES=(
- "${WORKDIR}"/${PN}-patches/0.34-flags.patch
+ "${FILESDIR}"/${PN}-0.34-flags.patch
+ "${FILESDIR}"/${PN}-0.39-gcc6.patch
)
src_configure() {
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 00000000000..31b669dc684
--- /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 00000000000..269d1d483d3
--- /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 <ctype.h>
+ #include <assert.h>
+
++#include <cmath>
+ #include <string>
+ #include <vector>
+ #include <map>
+@@ -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;
+ }
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-09-05 19:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-05 19:33 [gentoo-commits] repo/gentoo:master commit in: dev-perl/Wx-Scintilla/, dev-perl/Wx-Scintilla/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-09-05 19:33 Sam James
2024-09-05 19:33 Sam James
2017-04-24 23:25 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox