[PR PATCH] distcc: remove distcc-gtk subpackage

[PR PATCH] distcc: remove distcc-gtk subpackage

[paper42]

[-- Attachment #1: Type: text/plain, Size: 340 bytes --]

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages remove/distcc-gtk
https://github.com/void-linux/void-packages/pull/40116

distcc: remove distcc-gtk subpackage
uses gtk2

A patch file from https://github.com/void-linux/void-packages/pull/40116.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove/distcc-gtk-40116.patch --]
[-- Type: text/x-diff, Size: 2672 bytes --]

From c73298c3a351cd32f268679fa006a1a9168dfb61 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 22:37:17 +0200
Subject: [PATCH] distcc: remove distcc-gtk subpackage

uses gtk2
---
 srcpkgs/distcc-gtk                |  1 -
 srcpkgs/distcc/template           | 18 ++++--------------
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 5 insertions(+), 15 deletions(-)
 delete mode 120000 srcpkgs/distcc-gtk

diff --git a/srcpkgs/distcc-gtk b/srcpkgs/distcc-gtk
deleted file mode 120000
index fa7d8db9497e..000000000000
--- a/srcpkgs/distcc-gtk
+++ /dev/null
@@ -1 +0,0 @@
-distcc
\ No newline at end of file
diff --git a/srcpkgs/distcc/template b/srcpkgs/distcc/template
index 7a6c2483b575..8f9fe2926da0 100644
--- a/srcpkgs/distcc/template
+++ b/srcpkgs/distcc/template
@@ -3,29 +3,27 @@ pkgname=distcc
 version=3.3.3
 revision=6
 build_style=gnu-configure
-configure_args="--disable-Werror --with-gtk"
+configure_args="--disable-Werror"
 conf_files="
 	/etc/distcc/hosts
 	/etc/distcc/clients.allow"
 hostmakedepends="automake libtool pkg-config which"
-makedepends="binutils-devel popt-devel avahi-libs-devel gtk+-devel"
+makedepends="binutils-devel popt-devel avahi-libs-devel"
 short_desc="Distributed compilation for faster C/C++ builds"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://distcc.github.io"
-distfiles="https://github.com/distcc/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+distfiles="https://github.com/distcc/distcc/releases/download/v${version}/distcc-${version}.tar.gz"
 checksum=bead25471d5a53ecfdf8f065a6fe48901c14d5008956c318c700e56bc87bf0bc
 conflicts="chroot-distcc>=0"
 
-subpackages="distcc-gtk"
-
 CFLAGS="-fcommon"
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --disable-pump-mode"
 else
 	makedepends+=" python3-devel"
-	subpackages+=" distcc-pump"
+	subpackages="distcc-pump"
 fi
 
 pre_configure() {
@@ -55,14 +53,6 @@ post_install() {
 	done
 }
 
-distcc-gtk_package() {
-	depends="distcc-${version}_${revision}"
-	short_desc+=" - GTK+ monitor"
-	pkg_install() {
-		vmove usr/bin/distccmon-gnome
-	}
-}
-
 distcc-pump_package() {
 	depends="distcc-${version}_${revision}"
 	short_desc+=" - Pump mode support files"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6d06ff1eb22f..a92227c4f4fd 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -68,6 +68,7 @@ replaces="
  deepin-turbo<=0.0.3_1
  deepin-voice-recorder<=5.0.0_2
  dht-node<=0.2.0_3
+ distcc-gtk<=3.3.3_6
  djmount<=0.71_8
  dleyna-core<=0.6.0_2
  dleyna-renderer<=0.6.0_2

Re: [PR PATCH] [Updated] distcc: remove distcc-gtk subpackage

[paper42]

[-- Attachment #1: Type: text/plain, Size: 345 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages remove/distcc-gtk
https://github.com/void-linux/void-packages/pull/40116

distcc: remove distcc-gtk subpackage
uses gtk2

A patch file from https://github.com/void-linux/void-packages/pull/40116.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove/distcc-gtk-40116.patch --]
[-- Type: text/x-diff, Size: 2575 bytes --]

From 747c80dce72d500a2a8fefda256a746c59f38dcc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 22:37:17 +0200
Subject: [PATCH] distcc: remove distcc-gtk subpackage

uses gtk2
---
 srcpkgs/distcc-gtk                |  1 -
 srcpkgs/distcc/template           | 18 +++++-------------
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 6 insertions(+), 14 deletions(-)
 delete mode 120000 srcpkgs/distcc-gtk

diff --git a/srcpkgs/distcc-gtk b/srcpkgs/distcc-gtk
deleted file mode 120000
index fa7d8db9497e..000000000000
--- a/srcpkgs/distcc-gtk
+++ /dev/null
@@ -1 +0,0 @@
-distcc
\ No newline at end of file
diff --git a/srcpkgs/distcc/template b/srcpkgs/distcc/template
index 7a6c2483b575..1f779d83feac 100644
--- a/srcpkgs/distcc/template
+++ b/srcpkgs/distcc/template
@@ -3,24 +3,24 @@ pkgname=distcc
 version=3.3.3
 revision=6
 build_style=gnu-configure
-configure_args="--disable-Werror --with-gtk"
+configure_args="--disable-Werror"
 conf_files="
 	/etc/distcc/hosts
 	/etc/distcc/clients.allow"
 hostmakedepends="automake libtool pkg-config which"
-makedepends="binutils-devel popt-devel avahi-libs-devel gtk+-devel"
+makedepends="binutils-devel popt-devel avahi-libs-devel"
 short_desc="Distributed compilation for faster C/C++ builds"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://distcc.github.io"
-distfiles="https://github.com/distcc/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+distfiles="https://github.com/distcc/distcc/releases/download/v${version}/distcc-${version}.tar.gz"
 checksum=bead25471d5a53ecfdf8f065a6fe48901c14d5008956c318c700e56bc87bf0bc
 conflicts="chroot-distcc>=0"
 
-subpackages="distcc-gtk"
-
 CFLAGS="-fcommon"
 
+subpackages=""
+
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --disable-pump-mode"
 else
@@ -55,14 +55,6 @@ post_install() {
 	done
 }
 
-distcc-gtk_package() {
-	depends="distcc-${version}_${revision}"
-	short_desc+=" - GTK+ monitor"
-	pkg_install() {
-		vmove usr/bin/distccmon-gnome
-	}
-}
-
 distcc-pump_package() {
 	depends="distcc-${version}_${revision}"
 	short_desc+=" - Pump mode support files"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6d06ff1eb22f..a92227c4f4fd 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -68,6 +68,7 @@ replaces="
  deepin-turbo<=0.0.3_1
  deepin-voice-recorder<=5.0.0_2
  dht-node<=0.2.0_3
+ distcc-gtk<=3.3.3_6
  djmount<=0.71_8
  dleyna-core<=0.6.0_2
  dleyna-renderer<=0.6.0_2

Re: [PR REVIEW] distcc: remove distcc-gtk subpackage

[sgn]

[-- Attachment #1: Type: text/plain, Size: 246 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/40116#discussion_r1002644094

Comment:
This doesn't work, empty subpackages will be calculated from template. `subpackages=" "` works but ...

Re: [PR PATCH] [Updated] distcc: remove distcc-gtk subpackage

[paper42]

[-- Attachment #1: Type: text/plain, Size: 345 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages remove/distcc-gtk
https://github.com/void-linux/void-packages/pull/40116

distcc: remove distcc-gtk subpackage
uses gtk2

A patch file from https://github.com/void-linux/void-packages/pull/40116.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove/distcc-gtk-40116.patch --]
[-- Type: text/x-diff, Size: 2576 bytes --]

From 3d73133c3c4208565807815efc670b6da45a7ca9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 22:37:17 +0200
Subject: [PATCH] distcc: remove distcc-gtk subpackage

uses gtk2
---
 srcpkgs/distcc-gtk                |  1 -
 srcpkgs/distcc/template           | 18 +++++-------------
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 6 insertions(+), 14 deletions(-)
 delete mode 120000 srcpkgs/distcc-gtk

diff --git a/srcpkgs/distcc-gtk b/srcpkgs/distcc-gtk
deleted file mode 120000
index fa7d8db9497e..000000000000
--- a/srcpkgs/distcc-gtk
+++ /dev/null
@@ -1 +0,0 @@
-distcc
\ No newline at end of file
diff --git a/srcpkgs/distcc/template b/srcpkgs/distcc/template
index 7a6c2483b575..cc7c733399a0 100644
--- a/srcpkgs/distcc/template
+++ b/srcpkgs/distcc/template
@@ -3,24 +3,24 @@ pkgname=distcc
 version=3.3.3
 revision=6
 build_style=gnu-configure
-configure_args="--disable-Werror --with-gtk"
+configure_args="--disable-Werror"
 conf_files="
 	/etc/distcc/hosts
 	/etc/distcc/clients.allow"
 hostmakedepends="automake libtool pkg-config which"
-makedepends="binutils-devel popt-devel avahi-libs-devel gtk+-devel"
+makedepends="binutils-devel popt-devel avahi-libs-devel"
 short_desc="Distributed compilation for faster C/C++ builds"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://distcc.github.io"
-distfiles="https://github.com/distcc/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+distfiles="https://github.com/distcc/distcc/releases/download/v${version}/distcc-${version}.tar.gz"
 checksum=bead25471d5a53ecfdf8f065a6fe48901c14d5008956c318c700e56bc87bf0bc
 conflicts="chroot-distcc>=0"
 
-subpackages="distcc-gtk"
-
 CFLAGS="-fcommon"
 
+subpackages=" "
+
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --disable-pump-mode"
 else
@@ -55,14 +55,6 @@ post_install() {
 	done
 }
 
-distcc-gtk_package() {
-	depends="distcc-${version}_${revision}"
-	short_desc+=" - GTK+ monitor"
-	pkg_install() {
-		vmove usr/bin/distccmon-gnome
-	}
-}
-
 distcc-pump_package() {
 	depends="distcc-${version}_${revision}"
 	short_desc+=" - Pump mode support files"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index d1a0476ce734..0f0a4fcd826b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -68,6 +68,7 @@ replaces="
  deepin-turbo<=0.0.3_1
  deepin-voice-recorder<=5.0.0_2
  dht-node<=0.2.0_3
+ distcc-gtk<=3.3.3_6
  djmount<=0.71_8
  dleyna-core<=0.6.0_2
  dleyna-renderer<=0.6.0_2

Re: [PR PATCH] [Merged]: distcc: remove distcc-gtk subpackage

[paper42]

[-- Attachment #1: Type: text/plain, Size: 179 bytes --]

There's a merged pull request on the void-packages repository

distcc: remove distcc-gtk subpackage
https://github.com/void-linux/void-packages/pull/40116

Description:
uses gtk2