public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/
@ 2016-05-03  9:47 Lars Wendler
  0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2016-05-03  9:47 UTC (permalink / raw
  To: gentoo-commits

commit:     457b066c7b0068bd287180ad5bb0ab5dc3d95788
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue May  3 09:26:48 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue May  3 09:47:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=457b066c

dev-vcs/git: Fixed openrc init script shebang.

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 dev-vcs/git/files/git-daemon-r1.initd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-vcs/git/files/git-daemon-r1.initd b/dev-vcs/git/files/git-daemon-r1.initd
index b6ecfd9..df03162 100644
--- a/dev-vcs/git/files/git-daemon-r1.initd
+++ b/dev-vcs/git/files/git-daemon-r1.initd
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/
@ 2016-05-08 20:00 Mike Gilbert
  0 siblings, 0 replies; 9+ messages in thread
From: Mike Gilbert @ 2016-05-08 20:00 UTC (permalink / raw
  To: gentoo-commits

commit:     843954e66426a8e87c42a2c3d3d99ca6fa7d4744
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun May  8 19:59:36 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun May  8 19:59:49 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=843954e6

dev-vcs/git: for systemd, don't source /etc/conf.d/git-daemon

Package-Manager: portage-2.2.28_p97

 dev-vcs/git/files/git-daemon_at.service | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-vcs/git/files/git-daemon_at.service b/dev-vcs/git/files/git-daemon_at.service
index 2a080d4..0a1bd14 100644
--- a/dev-vcs/git/files/git-daemon_at.service
+++ b/dev-vcs/git/files/git-daemon_at.service
@@ -5,9 +5,8 @@ Documentation=man:git-daemon(1)
 [Service]
 User=nobody
 Group=nobody
-EnvironmentFile=/etc/conf.d/git-daemon
 # Ignore non-zero exit status, access error makes git-daemon return them
-ExecStart=-/usr/libexec/git-core/git-daemon --inetd --base-path=/var/git --verbose $GITDAEMON_OPTS
+ExecStart=-/usr/libexec/git-core/git-daemon --inetd --base-path=/var/git --verbose
 StandardInput=socket
 StandardOutput=inherit
 StandardError=journal


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/
@ 2016-05-08 22:57 Mike Gilbert
  0 siblings, 0 replies; 9+ messages in thread
From: Mike Gilbert @ 2016-05-08 22:57 UTC (permalink / raw
  To: gentoo-commits

commit:     e3d1d95bd9a6935fddfb0f4253d784c1b72564d3
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun May  8 22:47:28 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun May  8 22:47:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3d1d95b

Revert "dev-vcs/git: for systemd, don't source /etc/conf.d/git-daemon"

This reverts commit 843954e66426a8e87c42a2c3d3d99ca6fa7d4744.

 dev-vcs/git/files/git-daemon_at.service | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-vcs/git/files/git-daemon_at.service b/dev-vcs/git/files/git-daemon_at.service
index 0a1bd14..2a080d4 100644
--- a/dev-vcs/git/files/git-daemon_at.service
+++ b/dev-vcs/git/files/git-daemon_at.service
@@ -5,8 +5,9 @@ Documentation=man:git-daemon(1)
 [Service]
 User=nobody
 Group=nobody
+EnvironmentFile=/etc/conf.d/git-daemon
 # Ignore non-zero exit status, access error makes git-daemon return them
-ExecStart=-/usr/libexec/git-core/git-daemon --inetd --base-path=/var/git --verbose
+ExecStart=-/usr/libexec/git-core/git-daemon --inetd --base-path=/var/git --verbose $GITDAEMON_OPTS
 StandardInput=socket
 StandardOutput=inherit
 StandardError=journal


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/
@ 2017-11-17 17:20 Robin H. Johnson
  0 siblings, 0 replies; 9+ messages in thread
From: Robin H. Johnson @ 2017-11-17 17:20 UTC (permalink / raw
  To: gentoo-commits

commit:     e00b96011c71971123920187ca04dedff5cc1915
Author:     i.Dark_Templar <darktemplar <AT> dark-templar-archives <DOT> net>
AuthorDate: Sun Nov 12 09:43:30 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Nov 17 17:20:36 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e00b9601

dev-vcs/git: update openrc init.d script

(cherry picked from commit 0b833f1e0a45466af5b1df0e302b9a64bfb3f757)
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 dev-vcs/git/files/git-daemon-r1.initd | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-vcs/git/files/git-daemon-r1.initd b/dev-vcs/git/files/git-daemon-r1.initd
index da315cb3b09..78e5444ed4d 100644
--- a/dev-vcs/git/files/git-daemon-r1.initd
+++ b/dev-vcs/git/files/git-daemon-r1.initd
@@ -5,7 +5,8 @@
 pidfile="/var/run/git-daemon.pid"
 command="/usr/bin/git"
 command_args="daemon ${GITDAEMON_OPTS}"
-start_stop_daemon_args="-e HOME= -e XDG_CONFIG_HOME= -b -m -p ${pidfile} -u ${GIT_USER:-nobody}:${GIT_GROUP:-nobody}"
+command_user="${GIT_USER:-nobody}:${GIT_GROUP:-nobody}"
+start_stop_daemon_args="-e HOME= -e XDG_CONFIG_HOME= -b -m"
 
 depend() {
 	use logger


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/
@ 2019-03-11  4:48 Aaron Bauman
  0 siblings, 0 replies; 9+ messages in thread
From: Aaron Bauman @ 2019-03-11  4:48 UTC (permalink / raw
  To: gentoo-commits

commit:     031b939d0b29fba6390863cad39fa3aefad3c05a
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Mar  5 16:47:40 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 04:46:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=031b939d

dev-vcs/git: remove unused patch

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11269
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch b/dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch
deleted file mode 100644
index a874236dc65..00000000000
--- a/dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naurp git-2.5.1.orig/config.mak.uname git-2.5.1/config.mak.uname
---- git-2.5.1.orig/config.mak.uname	2015-08-28 15:37:13.000000000 -0400
-+++ git-2.5.1/config.mak.uname	2015-09-06 18:54:28.538437000 -0400
-@@ -189,7 +189,9 @@ ifeq ($(uname_O),Cygwin)
- 	SPARSE_FLAGS = -isystem /usr/include/w32api -Wno-one-bit-signed-bitfield
- endif
- ifeq ($(uname_S),FreeBSD)
--	NEEDS_LIBICONV = YesPlease
-+	ifeq ($(shell expr "$(uname_R)" : '[1-9]\.'),2)
-+		NEEDS_LIBICONV = YesPlease
-+	endif
- 	OLD_ICONV = YesPlease
- 	NO_MEMMEM = YesPlease
- 	BASIC_CFLAGS += -I/usr/local/include


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/
@ 2021-09-01 23:43 Sam James
  0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2021-09-01 23:43 UTC (permalink / raw
  To: gentoo-commits

commit:     dc0e0cc69eb0aac984574a9be3ecf19eaca09806
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  1 23:42:41 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep  1 23:43:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc0e0cc6

dev-vcs/git: add missing patch

Fixes: 8421a765ad29bcf111da8f05bb74ff3df64d25c5
Bug: https://bugs.gentoo.org/751907
Closes: https://bugs.gentoo.org/811369
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-vcs/git/files/git-2.32.0-r1-test-t5582.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/dev-vcs/git/files/git-2.32.0-r1-test-t5582.patch b/dev-vcs/git/files/git-2.32.0-r1-test-t5582.patch
new file mode 100644
index 00000000000..fc6072bf733
--- /dev/null
+++ b/dev-vcs/git/files/git-2.32.0-r1-test-t5582.patch
@@ -0,0 +1,22 @@
+https://www.spinics.net/lists/git/msg417169.html
+https://bugs.gentoo.org/751907
+
+The test fails when ${D} is exported in the environment. It actually _shouldn't_
+be exported in src_test anyway, but Portage isn't yet fixed for this because
+it'll break misbehaving ebuilds (see e.g. pkgcheck's VariableScope warnings).
+
+Upstream are currently discussing other patches and work to find other cases
+of environment contamination.
+--- a/t/t5582-fetch-negative-refspec.sh
++++ b/t/t5582-fetch-negative-refspec.sh
+@@ -105,7 +105,6 @@ test_expect_success "fetch with negative pattern refspec does not expand prefix"
+ '
+
+ test_expect_success "fetch with negative refspec avoids duplicate conflict" '
+-	cd "$D" &&
+ 	(
+ 		cd one &&
+ 		git branch dups/a &&
+--
+2.30.2
+


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/
@ 2021-12-06  9:38 Lars Wendler
  0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2021-12-06  9:38 UTC (permalink / raw
  To: gentoo-commits

commit:     5a4cc6f1b6146c6f07883aaa963fca2915abe1c9
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  6 09:38:02 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Dec  6 09:38:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a4cc6f1

dev-vcs/git: Use /run for pidfile

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 dev-vcs/git/files/git-daemon-r2.initd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git/files/git-daemon-r2.initd b/dev-vcs/git/files/git-daemon-r2.initd
index 177458b27366..453fd608363f 100644
--- a/dev-vcs/git/files/git-daemon-r2.initd
+++ b/dev-vcs/git/files/git-daemon-r2.initd
@@ -2,7 +2,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-pidfile="/var/run/git-daemon.pid"
+pidfile="/run/git-daemon.pid"
 command="/usr/bin/git"
 command_args="daemon ${GITDAEMON_OPTS}"
 command_user="${GIT_USER:-nobody}:${GIT_GROUP:-nobody}"


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/
@ 2023-03-16 16:39 Robin H. Johnson
  0 siblings, 0 replies; 9+ messages in thread
From: Robin H. Johnson @ 2023-03-16 16:39 UTC (permalink / raw
  To: gentoo-commits

commit:     37305aa8f6bd146c01c41ae9aca55b52c82c5193
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  8 20:04:55 2023 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Mar 16 16:39:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37305aa8

dev-vcs/git: cleanup patches

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 .../git/files/git-2.7.0-mediawiki-500pages.patch   | 46 ----------
 .../git/files/git-2.7.0-mediawiki-namespaces.patch | 97 ----------------------
 .../git/files/git-2.7.0-mediawiki-subpages.patch   | 48 -----------
 3 files changed, 191 deletions(-)

diff --git a/dev-vcs/git/files/git-2.7.0-mediawiki-500pages.patch b/dev-vcs/git/files/git-2.7.0-mediawiki-500pages.patch
deleted file mode 100644
index 0ce706db99a6..000000000000
--- a/dev-vcs/git/files/git-2.7.0-mediawiki-500pages.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Searching for pages using the MediaWiki API returns at most 500 results
-(hi Patrick). To get a list of all pages in a larger wiki, we need to run
-repeated searches...
-
-Source: https://github.com/moy/Git-Mediawiki/issues/32
-Author: anarcat https://github.com/anarcat
-
-diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
-index 8dd74a9..f2ce311 100755
---- a/contrib/mw-to-git/git-remote-mediawiki.perl
-+++ b/contrib/mw-to-git/git-remote-mediawiki.perl
-@@ -259,16 +259,29 @@ sub get_mw_tracked_categories {
- sub get_mw_all_pages {
- 	my $pages = shift;
- 	# No user-provided list, get the list of pages from the API.
--	my $mw_pages = $mediawiki->list({
-+	my $query = {
- 		action => 'query',
- 		list => 'allpages',
- 		aplimit => 'max'
--	});
--	if (!defined($mw_pages)) {
-+	};
-+	my $curpage;
-+	my $oldpage = '';
-+	while (1) {
-+	if (defined($curpage)) {
-+		if ($oldpage eq $curpage) {
-+		    last;
-+		}
-+		$query->{apfrom} = $curpage;
-+		$oldpage = $curpage;
-+	    }
-+	    my $mw_pages = $mediawiki->list($query);
-+	    if (!defined($mw_pages)) {
- 		fatal_mw_error("get the list of wiki pages");
--	}
--	foreach my $page (@{$mw_pages}) {
-+	    }
-+	    foreach my $page (@{$mw_pages}) {
- 		$pages->{$page->{title}} = $page;
-+		$curpage = $page->{title};
-+	    }
- 	}
- 	return;
- }

diff --git a/dev-vcs/git/files/git-2.7.0-mediawiki-namespaces.patch b/dev-vcs/git/files/git-2.7.0-mediawiki-namespaces.patch
deleted file mode 100644
index 72ab2126fa9c..000000000000
--- a/dev-vcs/git/files/git-2.7.0-mediawiki-namespaces.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-source:
-https://gist.github.com/anarcat/f821fa285c6b8b6b16a5
-https://github.com/moy/Git-Mediawiki/issues/10
-
-
-From 147224cfe6143c44b16aec0bb6d6a506a6b96ced Mon Sep 17 00:00:00 2001
-From: Kevin <kevin@ki-ai.org>
-Date: Fri, 28 Aug 2015 15:53:37 -0500
-Subject: [PATCH] Add namespace support to git-mediawiki
-
-Signed-off-by: Kevin <kevin@ki-ai.org>
----
- contrib/mw-to-git/git-remote-mediawiki.perl | 34 +++++++++++++++++++++++++++--
- 1 file changed, 32 insertions(+), 2 deletions(-)
-
-diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
-index 8dd74a9..662a5b5 100755
---- a/contrib/mw-to-git/git-remote-mediawiki.perl
-+++ b/contrib/mw-to-git/git-remote-mediawiki.perl
-@@ -17,6 +17,7 @@ use Git;
- use Git::Mediawiki qw(clean_filename smudge_filename connect_maybe
- 					EMPTY HTTP_CODE_OK);
- use DateTime::Format::ISO8601;
-+use Scalar::Util;
- use warnings;
- 
- # By default, use UTF-8 to communicate with Git and the user
-@@ -63,6 +64,10 @@ chomp(@tracked_pages);
- my @tracked_categories = split(/[ \n]/, run_git("config --get-all remote.${remotename}.categories"));
- chomp(@tracked_categories);
- 
-+# Just like @tracked_categories, but for MediaWiki namespaces.
-+my @tracked_namespaces = split(/[ \n]/, run_git("config --get-all remote.${remotename}.namespaces"));
-+chomp(@tracked_namespaces);
-+
- # Import media files on pull
- my $import_media = run_git("config --get --bool remote.${remotename}.mediaimport");
- chomp($import_media);
-@@ -256,6 +261,23 @@ sub get_mw_tracked_categories {
- 	return;
- }
- 
-+sub get_mw_tracked_namespaces {
-+    my $pages = shift;
-+    foreach my $local_namespace (@tracked_namespaces) {
-+        my $mw_pages = $mediawiki->list( {
-+            action => 'query',
-+            list => 'allpages',
-+            apnamespace => get_mw_namespace_id($local_namespace),
-+            aplimit => 'max' } )
-+            || die $mediawiki->{error}->{code} . ': '
-+                . $mediawiki->{error}->{details} . "\n";
-+        foreach my $page (@{$mw_pages}) {
-+            $pages->{$page->{title}} = $page;
-+        }
-+    }
-+    return;
-+}
-+
- sub get_mw_all_pages {
- 	my $pages = shift;
- 	# No user-provided list, get the list of pages from the API.
-@@ -319,6 +341,10 @@ sub get_mw_pages {
- 		$user_defined = 1;
- 		get_mw_tracked_categories(\%pages);
- 	}
-+    if (@tracked_namespaces) {
-+        $user_defined = 1;
-+        get_mw_tracked_namespaces(\%pages);
-+    }
- 	if (!$user_defined) {
- 		get_mw_all_pages(\%pages);
- 	}
-@@ -1263,7 +1289,6 @@ my %cached_mw_namespace_id;
- sub get_mw_namespace_id {
- 	$mediawiki = connect_maybe($mediawiki, $remotename, $url);
- 	my $name = shift;
--
- 	if (!exists $namespace_id{$name}) {
- 		# Look at configuration file, if the record for that namespace is
- 		# already cached. Namespaces are stored in form:
-@@ -1331,7 +1356,12 @@ sub get_mw_namespace_id {
- sub get_mw_namespace_id_for_page {
- 	my $namespace = shift;
- 	if ($namespace =~ /^([^:]*):/) {
--		return get_mw_namespace_id($namespace);
-+		my ($ns, $id) = split(/:/, $namespace);
-+		if (Scalar::Util::looks_like_number($id)) {
-+			return get_mw_namespace_id($ns);
-+		} else{
-+			return
-+		}
- 	} else {
- 		return;
- 	}
--- 
-2.5.0

diff --git a/dev-vcs/git/files/git-2.7.0-mediawiki-subpages.patch b/dev-vcs/git/files/git-2.7.0-mediawiki-subpages.patch
deleted file mode 100644
index c798a894d3f8..000000000000
--- a/dev-vcs/git/files/git-2.7.0-mediawiki-subpages.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 2593304723c6def159c10b9060dafa78a775a057 Mon Sep 17 00:00:00 2001
-From: Lyubomyr Shaydariv <lyubomyr-shaydariv@users.noreply.github.com>
-Date: Fri, 11 Sep 2015 00:41:17 +0300
-Subject: [PATCH] git-remote-mediawiki: support subpages as subdirectories
-
-This is a fix for https://github.com/moy/Git-Mediawiki/issues/22
-The subdirectories option is enabled using -c remote.origin.subpageDirs=true
-during the cloning and it is not recommended to be modified in or
-removed from .git/config after the cloning.
----
- contrib/mw-to-git/git-remote-mediawiki.perl | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
-index 8dd74a9..f3624be 100755
---- a/contrib/mw-to-git/git-remote-mediawiki.perl
-+++ b/contrib/mw-to-git/git-remote-mediawiki.perl
-@@ -63,6 +63,11 @@
- my @tracked_categories = split(/[ \n]/, run_git("config --get-all remote.${remotename}.categories"));
- chomp(@tracked_categories);
- 
-+# Use subdirectories for subpages
-+my $use_subpage_dirs = run_git("config --get --bool remote.${remotename}.subpageDirs");
-+chomp($use_subpage_dirs);
-+$use_subpage_dirs = ($use_subpage_dirs eq 'true');
-+
- # Import media files on pull
- my $import_media = run_git("config --get --bool remote.${remotename}.mediaimport");
- chomp($import_media);
-@@ -689,6 +694,9 @@ sub fe_escape_path {
-     $path =~ s/\\/\\\\/g;
-     $path =~ s/"/\\"/g;
-     $path =~ s/\n/\\n/g;
-+    if ($use_subpage_dirs) {
-+        $path =~ s/%2F/\//g;
-+    }
-     return qq("${path}");
- }
- 
-@@ -927,7 +935,7 @@ sub mw_import_revids {
- 		# If this is a revision of the media page for new version
- 		# of a file do one common commit for both file and media page.
- 		# Else do commit only for that page.
--		print {*STDERR} "${n}/", scalar(@{$revision_ids}), ": Revision #$rev->{revid} of $commit{title}\n";
-+		print {*STDERR} "${n}/", scalar(@{$revision_ids}), ": Revision #$rev->{revid} of ", fe_escape_path($commit{title}), "\n";
- 		import_file_revision(\%commit, ($fetch_from == 1), $n_actual, \%mediafile);
- 	}
- 


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/
@ 2024-10-13 13:43 Conrad Kostecki
  0 siblings, 0 replies; 9+ messages in thread
From: Conrad Kostecki @ 2024-10-13 13:43 UTC (permalink / raw
  To: gentoo-commits

commit:     ef96c5e1938bc4370bdd9678ffa793f431891976
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Oct 12 17:45:14 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 13:40:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef96c5e1

dev-vcs/git: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/git-2.37.2-darwin-prefix-gettext.patch   | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/dev-vcs/git/files/git-2.37.2-darwin-prefix-gettext.patch b/dev-vcs/git/files/git-2.37.2-darwin-prefix-gettext.patch
deleted file mode 100644
index af267347e65e..000000000000
--- a/dev-vcs/git/files/git-2.37.2-darwin-prefix-gettext.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Don't examine outside of the prefix for gettext on macOS/Darwin.
-https://bugs.gentoo.org/757309
---- a/config.mak.uname
-+++ b/config.mak.uname
-@@ -148,17 +148,6 @@ ifeq ($(uname_S),Darwin)
- 	HAVE_NS_GET_EXECUTABLE_PATH = YesPlease
- 	CSPRNG_METHOD = arc4random
- 
--	# Workaround for `gettext` being keg-only and not even being linked via
--	# `brew link --force gettext`, should be obsolete as of
--	# https://github.com/Homebrew/homebrew-core/pull/53489
--	ifeq ($(shell test -d /usr/local/opt/gettext/ && echo y),y)
--		BASIC_CFLAGS += -I/usr/local/include -I/usr/local/opt/gettext/include
--		BASIC_LDFLAGS += -L/usr/local/lib -L/usr/local/opt/gettext/lib
--		ifeq ($(shell test -x /usr/local/opt/gettext/bin/msgfmt && echo y),y)
--			MSGFMT = /usr/local/opt/gettext/bin/msgfmt
--		endif
--	endif
--
- 	# The builtin FSMonitor on MacOS builds upon Simple-IPC.  Both require
- 	# Unix domain sockets and PThreads.
- 	ifndef NO_PTHREADS


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

end of thread, other threads:[~2024-10-13 13:43 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-03  9:47 [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/ Lars Wendler
  -- strict thread matches above, loose matches on Subject: below --
2016-05-08 20:00 Mike Gilbert
2016-05-08 22:57 Mike Gilbert
2017-11-17 17:20 Robin H. Johnson
2019-03-11  4:48 Aaron Bauman
2021-09-01 23:43 Sam James
2021-12-06  9:38 Lars Wendler
2023-03-16 16:39 Robin H. Johnson
2024-10-13 13:43 Conrad Kostecki

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox