public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-perl/Tk/, dev-perl/Tk/files/
@ 2016-07-08 20:37 Andreas Hüttel
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Hüttel @ 2016-07-08 20:37 UTC (permalink / raw
  To: gentoo-commits

commit:     1a305e858701353f5b55adf5d82e428bfb5e130c
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  8 20:17:57 2016 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jul  8 20:37:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a305e85

dev-perl/Tk: Remove old

Package-Manager: portage-2.3.0

 dev-perl/Tk/Manifest                         |  1 -
 dev-perl/Tk/Tk-804.32.0-r1.ebuild            | 55 ----------------------------
 dev-perl/Tk/files/Tk-804.31.0-xorg.patch     | 43 ----------------------
 dev-perl/Tk/files/freetype_location.patch    | 32 ----------------
 dev-perl/Tk/files/mainwindow_segfaults.patch | 25 -------------
 5 files changed, 156 deletions(-)

diff --git a/dev-perl/Tk/Manifest b/dev-perl/Tk/Manifest
index 80ea29c..0150a4c 100644
--- a/dev-perl/Tk/Manifest
+++ b/dev-perl/Tk/Manifest
@@ -1,2 +1 @@
-DIST Tk-804.032.tar.gz 6933200 SHA256 8003fa82672367093d8fd26d89dcac695afad92f4ad406a106d56e07e9dd5949 SHA512 9370c7d954a11b4a16317d749fd06a8ea70b37309a9ba6bb8c9ff6fecf1a264d12f101fcc9aaf1aac781a42f45758e66c955b2f550d7894e94927060a5e29ef7 WHIRLPOOL 1851c9fde36f62a5a96e17c6c1c3eb206a948f669457ac765c28b560076e4b0e32f4ef6c49e725b90f7c704aa270265b7c305ceb3c1dc277eedfafc1a831cb10
 DIST Tk-804.033.tar.gz 6924238 SHA256 84756e9b07a2555c8eecf88e63d5cbbba9b1aa97b1e71a3d4aa524a7995a88ad SHA512 ea56be8246123bbc570d86a7d4f1610349cced91ad92ab740baca4c280822aac2e3acab6334bef60b10a70d5840f331fa40b507aba47a7929f44960df95f2aee WHIRLPOOL 105bce71314e63d7512c6c8bcfa913c6026d8081ad2a5a1bde19f471552026d1c31d28589ae27a0468e73946f030e21d2b79f838033ba5623df94be02bd14826

diff --git a/dev-perl/Tk/Tk-804.32.0-r1.ebuild b/dev-perl/Tk/Tk-804.32.0-r1.ebuild
deleted file mode 100644
index bcfad3f..0000000
--- a/dev-perl/Tk/Tk-804.32.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=SREZIC
-MODULE_VERSION=804.032
-inherit multilib perl-module
-
-DESCRIPTION="A Perl Module for Tk"
-
-LICENSE+=" BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="
-	media-libs/freetype
-	>=media-libs/libpng-1.4
-	virtual/jpeg
-	x11-libs/libX11
-	x11-libs/libXft"
-RDEPEND="${DEPEND}"
-
-# No test running here, requires an X server, and fails lots anyway.
-SRC_TEST="skip"
-PATCHES=(
-	"${FILESDIR}"/${PN}-804.31.0-xorg.patch
-	"${FILESDIR}"/freetype_location.patch
-	"${FILESDIR}"/mainwindow_segfaults.patch
-	)
-
-src_prepare() {
-	MAKEOPTS+=" -j1" #333049
-	myconf=( X11ROOT=${EPREFIX}/usr XFT=1 -I${EPREFIX}/usr/include/ -l${EPREFIX}/usr/$(get_libdir) )
-	mydoc="ToDo VERSIONS"
-
-	perl-module_src_prepare
-	# fix detection logic for Prefix, bug #385621
-	sed -i -e "s:/usr:${EPREFIX}/usr:g" myConfig || die
-	# having this around breaks with perl-module and a case-IN-sensitive fs
-	rm build_ptk || die
-
-	# Remove all bundled libs, fixes #488194
-	local BUNDLED="PNG/libpng \
-					PNG/zlib \
-					JPEG/jpeg"
-	for dir in ${BUNDLED}; do
-		rm -r "${S}/${dir}" || die "Can't remove bundle"
-		# Makefile.PL can copy files to ${S}/${dir}, so recreate them back.
-		mkdir -p "${S}/${dir}" || die "Can't restore bundled dir"
-		sed -i "\#^${dir}#d" "${S}"/MANIFEST || die 'Can not remove bundled libs from MANIFEST'
-	done
-}

diff --git a/dev-perl/Tk/files/Tk-804.31.0-xorg.patch b/dev-perl/Tk/files/Tk-804.31.0-xorg.patch
deleted file mode 100644
index 2bad0ba..0000000
--- a/dev-perl/Tk/files/Tk-804.31.0-xorg.patch
+++ /dev/null
@@ -1,43 +0,0 @@
- myConfig | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/myConfig b/myConfig
-index e0ace45..be52a82 100755
---- a/myConfig
-+++ b/myConfig
-@@ -307,7 +307,7 @@ if ($win_arch eq 'x') {
- 	}
- 	close(XMKMF);
- 	while (defined $uidir) {
--	  last unless ($uidir =~ s!^.*-I(\S+)/lib/X11/config!!o);
-+	  last unless ($uidir =~ s!^.*-I(\S+)/lib(64)/X11/config!!o);
- 	  $try = $1;
- 	  $try =~ s/'x11root'/$ENV{X11ROOT}/;
- 	  push(@xdirs,$try);
-@@ -356,7 +356,7 @@ if ($win_arch eq 'x') {
-   #
-   unless (defined $xlib)
-     {
--      $xlib = &lX11(0,chooseX11(</usr/X11*/lib>),chooseX11(</usr/lib/X11*>),</usr/Xfree*/lib>,'/usr/X386/lib')
-+      $xlib = &lX11(0,chooseX11(</usr/X11*/lib>),chooseX11(</usr/lib/X11*>),</usr/Xfree*/lib>,'/usr/X386/lib','/usr/lib64')
-     }
- 
-   #
-@@ -375,7 +375,7 @@ if ($win_arch eq 'x') {
-       exit 0;
-     }
- 
--  ($base) = $xlib =~ m#-L(.*)(?:/lib)$#x;
-+  ($base) = $xlib =~ m#-L(.*)(?:/lib(64))$#x;
-   if (defined $X11INC)
-     {
-       $xinc = &IX11("$X11INC");
-@@ -387,6 +387,8 @@ if ($win_arch eq 'x') {
-     {
-       warn "Cannot find X include files via $base/include\n";
-       $xinc = &IX11(map("$_/include",@xdirs),
-+            chooseX11(</usr/include/X11*>),
-+		    '/usr/include',
- 		    '/usr/openwin/include',
- 		    chooseX11(</usr/X11*/include>),
- 		    chooseX11(</usr/include/X11*>),

diff --git a/dev-perl/Tk/files/freetype_location.patch b/dev-perl/Tk/files/freetype_location.patch
deleted file mode 100644
index bac2a43..0000000
--- a/dev-perl/Tk/files/freetype_location.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1ca4589ef5a87999ec564081900bc8fdaed83c74 Mon Sep 17 00:00:00 2001
-From: Slaven Rezic <slaven@rezic.de>
-Date: Sun, 2 Mar 2014 12:10:31 +0100
-Subject: [PATCH] look also for /usr/include/freetype2/freetype.h
-
-In some freetype installations (e.g. Debian/jessie) the intermediate
-"freetype" directory may be missing in the include path.
-
-This should fix
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=740207
----
- myConfig | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/myConfig b/myConfig
-index 02d2ee5..3ca8144 100755
---- a/myConfig
-+++ b/myConfig
-@@ -147,7 +147,12 @@ sub Ift
- {
-  foreach (map { "$_/freetype2" } @_)
-   {
--   if (-d $_ && -d "$_/freetype" && -r "$_/freetype/freetype.h")
-+   if (-r "$_/freetype.h") # location in Debian (since jessie)
-+    {
-+     print "Using -I$_ to find $_/freetype/freetype.h\n";
-+     return "-I$_";
-+    }
-+   if (-r "$_/freetype/freetype.h") # location in FreeBSD (up to version 10.0) and Debian (up to wheezy)
-     {
-      print "Using -I$_ to find $_/freetype/freetype.h\n";
-      return "-I$_";

diff --git a/dev-perl/Tk/files/mainwindow_segfaults.patch b/dev-perl/Tk/files/mainwindow_segfaults.patch
deleted file mode 100644
index 50e2e4b..0000000
--- a/dev-perl/Tk/files/mainwindow_segfaults.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ba3a92a779f7adcf655b7e45b40ee5b0cb79bc8b Mon Sep 17 00:00:00 2001
-From: Slaven Rezic <slaven@rezic.de>
-Date: Fri, 14 Mar 2014 16:00:05 +0100
-Subject: [PATCH] no segfaults if Tk::MainWindow::Create was called without
- args
-
-However, this case never happened in real life, as this function was
-not supposed to be used directly anyway.
----
- tkGlue.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tkGlue.c b/tkGlue.c
-index 57f0bca..ae595bf 100644
---- a/tkGlue.c
-+++ b/tkGlue.c
-@@ -2370,7 +2370,7 @@ XS(XS_Tk__MainWindow_Create)
-  STRLEN na;
-  Tcl_Interp *interp = Tcl_CreateInterp();
-  SV **args = &ST(0);
-- char *appName = SvPV(ST(1),na);
-+ char *appName = items >= 1 ? SvPV(ST(1),na) : "";
-  int offset = args - sp;
-  int code;
-  if (!initialized)


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-perl/Tk/, dev-perl/Tk/files/
@ 2018-03-14  1:27 Kent Fredric
  0 siblings, 0 replies; 3+ messages in thread
From: Kent Fredric @ 2018-03-14  1:27 UTC (permalink / raw
  To: gentoo-commits

commit:     b8d01ca7685680ae718a9327b3db1c5a3d7b439e
Author:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 14 01:24:34 2018 +0000
Commit:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Wed Mar 14 01:26:50 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8d01ca7

dev-perl/Tk: Bump to version 804.34.0

- EAPI6
- Add USE="examples"
- Remove pod author tests
- Enable/fix tests (inc: virtualx)
- Make patches 'git am'-able.

Upstream:
- Remove special xOKp handling in Perl_Value
- Fix freetype2 path on OSX
- Fix clang/llvm strcpy/strncpy aborts on OSX Sierra
- Fix Tk::NoteBook's FindMenu
- Documentation fixes

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-perl/Tk/Manifest                    |  1 +
 dev-perl/Tk/Tk-804.34.0.ebuild          | 64 +++++++++++++++++++++++++++++++++
 dev-perl/Tk/files/Tk-804.034-xorg.patch | 57 +++++++++++++++++++++++++++++
 dev-perl/Tk/metadata.xml                |  3 --
 4 files changed, 122 insertions(+), 3 deletions(-)

diff --git a/dev-perl/Tk/Manifest b/dev-perl/Tk/Manifest
index b99bda652ee..8077e15dcf9 100644
--- a/dev-perl/Tk/Manifest
+++ b/dev-perl/Tk/Manifest
@@ -1 +1,2 @@
 DIST Tk-804.033.tar.gz 6924238 BLAKE2B 72ea4ca69a7602e3c7386254995983e6896c5d722f06e552b423df2dc9d5fc0a70bed6408cc1b797e803560b00a17223503a2807b847360721104a3edc324df2 SHA512 ea56be8246123bbc570d86a7d4f1610349cced91ad92ab740baca4c280822aac2e3acab6334bef60b10a70d5840f331fa40b507aba47a7929f44960df95f2aee
+DIST Tk-804.034.tar.gz 6937691 BLAKE2B ee676f82bc805ecb193c2fe999c3d451281a16a4bcd8072f0687859e6634d16cd1db40cc252b1540a3f7b883b4ca585d2b5ef1fa48f12cacffd72ca84693bdc4 SHA512 8d04fd902db72f80f749256453703e40c94fd009c6a196c608dd3bde4eeb99f974a154d5f52b28baa9e67f75529f0180619989c16cae28a9417b647908de04b6

diff --git a/dev-perl/Tk/Tk-804.34.0.ebuild b/dev-perl/Tk/Tk-804.34.0.ebuild
new file mode 100644
index 00000000000..edfc369512f
--- /dev/null
+++ b/dev-perl/Tk/Tk-804.34.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=SREZIC
+DIST_VERSION=804.034
+DIST_EXAMPLES=("examples/*")
+inherit multilib perl-module virtualx
+
+DESCRIPTION="A Perl Module for Tk"
+
+LICENSE+=" tcltk BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="
+	media-libs/freetype
+	>=media-libs/libpng-1.4:0
+	virtual/jpeg
+	x11-libs/libX11
+	x11-libs/libXft"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-804.034-xorg.patch
+)
+PERL_RM_FILES=( "t/pod.t" )
+src_prepare() {
+	MAKEOPTS+=" -j1" #333049
+	myconf=( X11ROOT=${EPREFIX}/usr XFT=1 -I${EPREFIX}/usr/include/ -l${EPREFIX}/usr/$(get_libdir) )
+	mydoc="ToDo VERSIONS"
+
+	perl-module_src_prepare
+	# fix detection logic for Prefix, bug #385621
+	sed -i -e "s:/usr:${EPREFIX}/usr:g" myConfig || die
+	# having this around breaks with perl-module and a case-IN-sensitive fs
+	rm build_ptk || die
+
+	# Remove all bundled libs, fixes #488194
+	local BUNDLED="PNG/libpng \
+					PNG/zlib \
+					JPEG/jpeg"
+
+	# Move files required for tests temporarily
+
+	mkdir -p "${T}/stash" || die "can't create temporary stash"
+	mv "${S}/JPEG/jpeg/testimg.jpg" "${T}/stash/testimg.jpg" || die "can't move testimg.jpg"
+
+	for dir in ${BUNDLED}; do
+		einfo "Removing bundled: ${dir}"
+		rm -r "${S}/${dir}" || die "Can't remove bundle"
+		# Makefile.PL can copy files to ${S}/${dir}, so recreate them back.
+		mkdir -p "${S}/${dir}" || die "Can't restore bundled dir"
+		sed -i "\#^${dir}#d" "${S}"/MANIFEST || die 'Can not remove bundled libs from MANIFEST'
+	done
+
+	# Restore test files
+	mv "${T}/stash/testimg.jpg" "${S}/JPEG/jpeg/testimg.jpg" || die "can't restore testimg.jpg"
+}
+src_test() {
+	virtx perl-module_src_test || die "src_test failed"
+}

diff --git a/dev-perl/Tk/files/Tk-804.034-xorg.patch b/dev-perl/Tk/files/Tk-804.034-xorg.patch
new file mode 100644
index 00000000000..fd9ce4185cf
--- /dev/null
+++ b/dev-perl/Tk/files/Tk-804.034-xorg.patch
@@ -0,0 +1,57 @@
+From 14428e2e2ab517e935b6c8cd6c3bd90dba429532 Mon Sep 17 00:00:00 2001
+From: Michael Cummings <mcummings@gentoo.org>
+Date: Wed, 14 Jun 2006 15:06:45 +1200
+Subject: Modify build for users that didnt install xorg meta
+
+And fix finding X11 headers
+
+Bug: https://bugs.gentoo.org/128326
+Bug: https://bugs.gentoo.org/198977
+---
+ myConfig | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/myConfig b/myConfig
+index 6260866b..6b5f3ddd 100755
+--- a/myConfig
++++ b/myConfig
+@@ -316,7 +316,7 @@ if ($win_arch eq 'x') {
+ 	}
+ 	close(XMKMF);
+ 	while (defined $uidir) {
+-	  last unless ($uidir =~ s!^.*-I(\S+)/lib/X11/config!!o);
++	  last unless ($uidir =~ s!^.*-I(\S+)/lib(64)/X11/config!!o);
+ 	  $try = $1;
+ 	  $try =~ s/'x11root'/$ENV{X11ROOT}/;
+ 	  push(@xdirs,$try);
+@@ -365,8 +365,7 @@ if ($win_arch eq 'x') {
+   #
+   unless (defined $xlib)
+     {
+-      $xlib = &lX11(0,chooseX11(</usr/X11*/lib>),chooseX11(</usr/lib/X11*>),</usr/Xfree*/lib>,'/usr/X386/lib',
+-                    '/opt/X11/lib')
++      $xlib = &lX11(0,chooseX11(</usr/X11*/lib>),chooseX11(</usr/lib/X11*>),</usr/Xfree*/lib>,'/usr/X386/lib','/opt/X11/lib','/usr/lib64')
+     }
+ 
+   #
+@@ -385,7 +384,7 @@ if ($win_arch eq 'x') {
+       exit 0;
+     }
+ 
+-  ($base) = $xlib =~ m#-L(.*)(?:/lib)$#x;
++  ($base) = $xlib =~ m#-L(.*)(?:/lib(64))$#x;
+   if (defined $X11INC)
+     {
+       $xinc = &IX11("$X11INC");
+@@ -397,6 +396,8 @@ if ($win_arch eq 'x') {
+     {
+       warn "Cannot find X include files via $base/include\n";
+       $xinc = &IX11(map("$_/include",@xdirs),
++            chooseX11(</usr/include/X11*>),
++		    '/usr/include',
+ 		    '/usr/openwin/include',
+ 		    chooseX11(</usr/X11*/include>),
+ 		    chooseX11(</usr/include/X11*>),
+-- 
+2.16.2
+

diff --git a/dev-perl/Tk/metadata.xml b/dev-perl/Tk/metadata.xml
index 71bef34370b..f88353dcea1 100644
--- a/dev-perl/Tk/metadata.xml
+++ b/dev-perl/Tk/metadata.xml
@@ -8,9 +8,6 @@
   <upstream>
     <remote-id type="cpan">Tk</remote-id>
     <remote-id type="cpan-module">Tie::Watch</remote-id>
-    <remote-id type="cpan-module">Tie::Watch::Array</remote-id>
-    <remote-id type="cpan-module">Tie::Watch::Hash</remote-id>
-    <remote-id type="cpan-module">Tie::Watch::Scalar</remote-id>
     <remote-id type="cpan-module">Tk</remote-id>
     <remote-id type="cpan-module">Tk::Adjuster</remote-id>
     <remote-id type="cpan-module">Tk::Adjuster::Item</remote-id>


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-perl/Tk/, dev-perl/Tk/files/
@ 2023-09-23 22:40 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-09-23 22:40 UTC (permalink / raw
  To: gentoo-commits

commit:     e0a874138a15a8317a223e8d9f7676b9e7b51e58
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 23 22:39:47 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 23 22:40:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0a87413

dev-perl/Tk: fix incompatible function pointer types

Closes: https://bugs.gentoo.org/883391
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-perl/Tk/Tk-804.36.0-r2.ebuild                  | 69 ++++++++++++++++++++++
 ...4.036-incompatible-function-pointer-types.patch | 14 +++++
 2 files changed, 83 insertions(+)

diff --git a/dev-perl/Tk/Tk-804.36.0-r2.ebuild b/dev-perl/Tk/Tk-804.36.0-r2.ebuild
new file mode 100644
index 000000000000..962e432cb9a7
--- /dev/null
+++ b/dev-perl/Tk/Tk-804.36.0-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=SREZIC
+DIST_VERSION=804.036
+DIST_EXAMPLES=("examples/*")
+inherit perl-module virtualx
+
+DESCRIPTION="A Perl Module for Tk"
+
+LICENSE+=" tcltk BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	media-libs/freetype
+	media-libs/libjpeg-turbo:=
+	>=media-libs/libpng-1.4:0
+	x11-libs/libX11
+	x11-libs/libXft
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-804.034-xorg.patch
+	"${FILESDIR}"/${PN}-804.036-configure-clang16.patch
+	"${FILESDIR}"/${PN}-804.036-crash.patch
+	"${FILESDIR}"/${PN}-804.036-incompatible-function-pointer-types.patch
+)
+
+PERL_RM_FILES=( "t/pod.t" )
+
+src_prepare() {
+	myconf=( X11ROOT="${EPREFIX}"/usr XFT=1 -I"${EPREFIX}"/usr/include/ -l"${EPREFIX}"/usr/$(get_libdir) )
+	mydoc="ToDo VERSIONS"
+
+	perl-module_src_prepare
+	# fix detection logic for Prefix, bug #385621
+	sed -i -e "s:/usr:${EPREFIX}/usr:g" myConfig || die
+	# having this around breaks with perl-module and a case-IN-sensitive fs
+	rm build_ptk || die
+
+	# Remove all bundled libs, fixes #488194
+	local BUNDLED="PNG/libpng \
+					PNG/zlib \
+					JPEG/jpeg"
+
+	# Move files required for tests temporarily
+
+	mkdir -p "${T}/stash" || die "can't create temporary stash"
+	mv "${S}/JPEG/jpeg/testimg.jpg" "${T}/stash/testimg.jpg" || die "can't move testimg.jpg"
+
+	for dir in ${BUNDLED}; do
+		einfo "Removing bundled: ${dir}"
+		rm -r "${S}/${dir}" || die "Can't remove bundle"
+		# Makefile.PL can copy files to ${S}/${dir}, so recreate them back.
+		mkdir -p "${S}/${dir}" || die "Can't restore bundled dir"
+		sed -i "\#^${dir}#d" "${S}"/MANIFEST || die 'Can not remove bundled libs from MANIFEST'
+	done
+
+	# Restore test files
+	mv "${T}/stash/testimg.jpg" "${S}/JPEG/jpeg/testimg.jpg" || die "can't restore testimg.jpg"
+}
+
+src_test() {
+	virtx perl-module_src_test
+}

diff --git a/dev-perl/Tk/files/Tk-804.036-incompatible-function-pointer-types.patch b/dev-perl/Tk/files/Tk-804.036-incompatible-function-pointer-types.patch
new file mode 100644
index 000000000000..9eefdf1b4e23
--- /dev/null
+++ b/dev-perl/Tk/files/Tk-804.036-incompatible-function-pointer-types.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/883391
+https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=271521
+https://cgit.freebsd.org/ports/commit/?id=ecedf2f3cd2c933fb5df179f174c704c89cf1f31
+--- a/pTk/Xlib.t
++++ b/pTk/Xlib.t
+@@ -331,7 +331,7 @@ VFUNC(int,XIntersectRegion,V_XIntersectRegion,_ANSI_AR
+ #endif /* !DO_X_EXCLUDE */
+ 
+ #ifndef XKeycodeToKeysym
+-VFUNC(KeySym,XKeycodeToKeysym,V_XKeycodeToKeysym,_ANSI_ARGS_((Display *, unsigned int, int)))
++VFUNC(KeySym,XKeycodeToKeysym,V_XKeycodeToKeysym,_ANSI_ARGS_((Display *, KeyCode, int)))
+ #endif /* #ifndef XKeycodeToKeysym */
+ 
+ #ifndef XKeysymToString


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-09-23 22:40 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-14  1:27 [gentoo-commits] repo/gentoo:master commit in: dev-perl/Tk/, dev-perl/Tk/files/ Kent Fredric
  -- strict thread matches above, loose matches on Subject: below --
2023-09-23 22:40 Sam James
2016-07-08 20:37 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