From e45f0df9d7f9f5260e69235b8c7c6e00153747f0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 13 Jan 2023 11:48:35 +0000 Subject: gentoo auto-resync : 13:01:2023 - 11:48:35 --- .../distcc/files/distcc-3.3.2-freedesktop.patch | 112 --------------------- .../distcc/files/distcc-3.3.3-gcc-10-fix.patch | 28 ------ .../files/distcc-3.3.3-no-rewrite-chost.patch | 28 ------ sys-devel/distcc/files/distcc-3.3.3-py38.patch | 53 ---------- 4 files changed, 221 deletions(-) delete mode 100644 sys-devel/distcc/files/distcc-3.3.2-freedesktop.patch delete mode 100644 sys-devel/distcc/files/distcc-3.3.3-gcc-10-fix.patch delete mode 100644 sys-devel/distcc/files/distcc-3.3.3-no-rewrite-chost.patch delete mode 100644 sys-devel/distcc/files/distcc-3.3.3-py38.patch (limited to 'sys-devel/distcc/files') diff --git a/sys-devel/distcc/files/distcc-3.3.2-freedesktop.patch b/sys-devel/distcc/files/distcc-3.3.2-freedesktop.patch deleted file mode 100644 index 7b735ebec7f9..000000000000 --- a/sys-devel/distcc/files/distcc-3.3.2-freedesktop.patch +++ /dev/null @@ -1,112 +0,0 @@ -From d852c808d6f470031f40edec9ebe980afc69b9b9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Sat, 8 Dec 2018 12:50:07 +0100 -Subject: [PATCH] Fix desktop spec compliance of distccmon-gnome install - ---- - Makefile.in | 18 ++++++++++-------- - gnome/distccmon-gnome.desktop | 7 +++---- - ...mon-gnome-icon.png => distccmon-gnome.png} | Bin - src/mon-gnome.c | 2 +- - 4 files changed, 14 insertions(+), 13 deletions(-) - rename gnome/{distccmon-gnome-icon.png => distccmon-gnome.png} (100%) - -diff --git a/Makefile.in b/Makefile.in -index 6e1e467..1106559 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -52,13 +52,14 @@ mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include - docdir = @docdir@ --pkgdatadir = $(datadir)/@PACKAGE_NAME@ -+icondir = $(datarootdir)/pixmaps -+desktopdir = $(datarootdir)/applications - - include_server_builddir = $(builddir)/_include_server - - # These must be done from here, not from autoconf, because they can - # contain variable expansions written in Make syntax. Ew. --DIR_DEFS = -DLIBDIR="\"${libdir}\"" -DSYSCONFDIR="\"${sysconfdir}\"" -DPKGDATADIR="\"${pkgdatadir}\"" -+DIR_DEFS = -DLIBDIR="\"${libdir}\"" -DSYSCONFDIR="\"${sysconfdir}\"" -DICONDIR="\"${icondir}\"" - - # arguments to pkgconfig - GNOME_PACKAGES = @GNOME_PACKAGES@ -@@ -387,7 +388,7 @@ man_HTML = man/distcc_1.html man/distccd_1.html man/distccmon_text_1.html \ - man/lsdistcc_1.html man/pump_1.html man/include_server_1.html - MEN = $(man1_MEN) - --gnome_data = gnome/distccmon-gnome-icon.png \ -+gnome_data = gnome/distccmon-gnome.png \ - gnome/distccmon-gnome.desktop - - popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ -@@ -1033,7 +1034,8 @@ showpaths: - @echo " programs $(DESTDIR)$(bindir)" - @echo " sbin programs $(DESTDIR)$(sbindir)" - @echo " system configuration $(DESTDIR)$(sysconfdir)" -- @echo " shared data files $(DESTDIR)$(pkgdatadir)" -+ @echo " icon file $(DESTDIR)$(icondir)" -+ @echo " application file $(DESTDIR)$(desktopdir)" - - - # install-sh can't handle multiple arguments, but we don't need any -@@ -1129,10 +1131,10 @@ install-example: $(example_DOCS) - done - - install-gnome-data: $(gnome_data) -- $(mkinstalldirs) "$(DESTDIR)$(pkgdatadir)" -- for p in $(gnome_data); do \ -- $(INSTALL_DATA) "$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \ -- done -+ $(mkinstalldirs) "$(DESTDIR)$(icondir)" -+ $(mkinstalldirs) "$(DESTDIR)$(desktopdir)" -+ $(INSTALL_DATA) gnome/distccmon-gnome.png "$(DESTDIR)$(icondir)" -+ $(INSTALL_DATA) gnome/distccmon-gnome.desktop "$(DESTDIR)$(desktopdir)" - - install-conf: $(conf_files) $(default_files) - $(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc" -diff --git a/gnome/distccmon-gnome.desktop b/gnome/distccmon-gnome.desktop -index bd1fa26..7205f5e 100644 ---- a/gnome/distccmon-gnome.desktop -+++ b/gnome/distccmon-gnome.desktop -@@ -1,6 +1,5 @@ - [Desktop Entry] --Version=0.9.4 --Encoding=UTF-8 -+Version=1.0 - Exec=distccmon-gnome - Name=distcc monitor - Name[sv]=distcc övervakare -@@ -8,9 +7,9 @@ GenericName=Distributed Compile Monitor - GenericName[sv]=Distribuerad kompilerings-övervakare - Comment=Graphical view of distributed compile tasks - Comment[sv]=Grafisk vy av distribuerade kompileringsuppgifter --Icon=distccmon-gnome-icon.png -+Icon=distccmon-gnome - TryExec=distccmon-gnome - Terminal=false - Type=Application --Categories=GNOME;Application;Development; -+Categories=GNOME;GTK;Development; - StartupNotify=true -diff --git a/gnome/distccmon-gnome-icon.png b/gnome/distccmon-gnome.png -similarity index 100% -rename from gnome/distccmon-gnome-icon.png -rename to gnome/distccmon-gnome.png -diff --git a/src/mon-gnome.c b/src/mon-gnome.c -index 24681d0..bfc286d 100644 ---- a/src/mon-gnome.c -+++ b/src/mon-gnome.c -@@ -599,7 +599,7 @@ static GtkWidget * dcc_gnome_make_mainwin (void) - - #if GTK_CHECK_VERSION(2,2,0) - gtk_window_set_icon_from_file (GTK_WINDOW (mainwin), -- PKGDATADIR "/distccmon-gnome-icon.png", -+ ICONDIR "/distccmon-gnome.png", - NULL); - #endif - --- -2.20.0.rc2 - diff --git a/sys-devel/distcc/files/distcc-3.3.3-gcc-10-fix.patch b/sys-devel/distcc/files/distcc-3.3.3-gcc-10-fix.patch deleted file mode 100644 index 2c0bce6c82b6..000000000000 --- a/sys-devel/distcc/files/distcc-3.3.3-gcc-10-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 377969cc762569f4a5ec409a1e7ad6a7be3e51b3 Mon Sep 17 00:00:00 2001 -From: Romain Geissler -Date: Mon, 27 Jan 2020 09:28:43 +0000 -Subject: [PATCH] Fix build with gcc 10 which defaults to -fno-common (cf - https://gcc.gnu.org/gcc-10/porting_to.html) - -This fixes the following link error I see when I use the latest gcc 10 -git branch: -/opt/1A/toolchain/x86_64-v20.0.7/lib/gcc/x86_64-1a-linux-gnu/10.0.1/../../../../x86_64-1a-linux-gnu/bin/ld: src/serve.o:(.bss+0x0): multiple definition of `stats_text'; src/prefork.o:(.bss+0x0): first defined here -/opt/1A/toolchain/x86_64-v20.0.7/lib/gcc/x86_64-1a-linux-gnu/10.0.1/../../../../x86_64-1a-linux-gnu/bin/ld: src/stats.o:(.data+0x20): multiple definition of `stats_text'; src/prefork.o:(.bss+0x0): first defined here -collect2: error: ld returned 1 exit status ---- - src/stats.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/stats.h b/src/stats.h -index 9bde285..74d4690 100644 ---- a/src/stats.h -+++ b/src/stats.h -@@ -33,7 +33,7 @@ enum stats_e { STATS_TCP_ACCEPT, STATS_REJ_BAD_REQ, STATS_REJ_OVERLOAD, - STATS_COMPILE_OK, STATS_COMPILE_ERROR, STATS_COMPILE_TIMEOUT, - STATS_CLI_DISCONN, STATS_OTHER, STATS_ENUM_MAX }; - --const char *stats_text[20]; -+extern const char *stats_text[20]; - - int dcc_stats_init(void); - void dcc_stats_init_kid(void); diff --git a/sys-devel/distcc/files/distcc-3.3.3-no-rewrite-chost.patch b/sys-devel/distcc/files/distcc-3.3.3-no-rewrite-chost.patch deleted file mode 100644 index dafaa90759b4..000000000000 --- a/sys-devel/distcc/files/distcc-3.3.3-no-rewrite-chost.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c2471d4cf3e2ef2556c150d52860b4e8f04e4994 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= -Date: Mon, 1 Mar 2021 22:13:36 +0200 -Subject: [PATCH] distcc: fix i686 cross compile - -[mgorny: disable toolchain prefix rewriting code that workarounds some - Debian invention and breaks everything else] - ---- - src/compile.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/compile.c b/src/compile.c -index 25df355..e5d655b 100644 ---- a/src/compile.c -+++ b/src/compile.c -@@ -572,7 +572,7 @@ static int dcc_gcc_rewrite_fqn(char **argv) - if (!newcmd) - return -ENOMEM; - -- if ((t = strstr(target_with_vendor, "-pc-"))) { -+ if (0 && (t = strstr(target_with_vendor, "-pc-"))) { - memcpy(newcmd, target_with_vendor, t - target_with_vendor); - strcat(newcmd, t + strlen("-pc")); - } else --- -2.26.2 - diff --git a/sys-devel/distcc/files/distcc-3.3.3-py38.patch b/sys-devel/distcc/files/distcc-3.3.3-py38.patch deleted file mode 100644 index 1ba5fee7d87e..000000000000 --- a/sys-devel/distcc/files/distcc-3.3.3-py38.patch +++ /dev/null @@ -1,53 +0,0 @@ -From c52a023b8a17e4346c66a8fddee69b40b327eae7 Mon Sep 17 00:00:00 2001 -From: MartB -Date: Thu, 28 Nov 2019 21:00:59 +0100 -Subject: [PATCH] Replace time.clock() with time.perf_counter() - -.clock() got removed in python 3.8 and was marked as deprecated since 3.3 -(https://github.com/python/cpython/pull/13270) ---- - include_server/parse_file.py | 4 ++-- - include_server/statistics.py | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/include_server/parse_file.py b/include_server/parse_file.py -index d1dcc74..f5d78b7 100755 ---- a/include_server/parse_file.py -+++ b/include_server/parse_file.py -@@ -272,7 +272,7 @@ def Parse(self, filepath, symbol_table): - - assert isinstance(filepath, str) - self.filepath = filepath -- parse_file_start_time = time.clock() -+ parse_file_start_time = time.perf_counter() - statistics.parse_file_counter += 1 - - includepath_map_index = self.includepath_map.Index -@@ -338,6 +338,6 @@ def Parse(self, filepath, symbol_table): - expr_includes, next_includes) - - -- statistics.parse_file_total_time += time.clock() - parse_file_start_time -+ statistics.parse_file_total_time += time.perf_counter() - parse_file_start_time - - return (quote_includes, angle_includes, expr_includes, next_includes) -diff --git a/include_server/statistics.py b/include_server/statistics.py -index 9677af3..7bc9cb8 100755 ---- a/include_server/statistics.py -+++ b/include_server/statistics.py -@@ -62,13 +62,13 @@ def StartTiming(): - global start_time, translation_unit_counter - """Mark the start of a request to find an include closure.""" - translation_unit_counter += 1 -- start_time = time.clock() -+ start_time = time.perf_counter() - - - def EndTiming(): - """Mark the end of an include closure calculation.""" - global translation_unit_time, min_time, max_time, total_time -- translation_unit_time = time.clock() - start_time -+ translation_unit_time = time.perf_counter() - start_time - min_time = min(translation_unit_time, min_time) - max_time = max(translation_unit_time, max_time) - total_time += translation_unit_time -- cgit v1.2.3