[PR PATCH] cbatticon-gtk3: move to cbatticon, remove gtk2 subpkg

[PR PATCH] cbatticon-gtk3: move to cbatticon, remove gtk2 subpkg

[classabbyamp]

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

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

https://github.com/classabbyamp/void-packages remove/cbatticon-gtk2
https://github.com/void-linux/void-packages/pull/38862

cbatticon-gtk3: move to cbatticon, remove gtk2 subpkg
#### Testing the changes
- I tested the changes in this PR: **YES**



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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove/cbatticon-gtk2-38862.patch --]
[-- Type: text/x-diff, Size: 3859 bytes --]

From 75c22640d483dfead35978dd00ae2da31f15e26d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 23 Aug 2022 18:20:04 -0400
Subject: [PATCH] cbatticon-gtk3: move to cbatticon, remove gtk2 subpkg

---
 srcpkgs/cbatticon-gtk2          |  2 +-
 srcpkgs/cbatticon-gtk3          |  1 +
 srcpkgs/cbatticon-gtk3/template | 40 ---------------------------------
 srcpkgs/cbatticon/template      | 31 +++++++++++++++++++++++++
 4 files changed, 33 insertions(+), 41 deletions(-)
 create mode 120000 srcpkgs/cbatticon-gtk3
 delete mode 100644 srcpkgs/cbatticon-gtk3/template
 create mode 100644 srcpkgs/cbatticon/template

diff --git a/srcpkgs/cbatticon-gtk2 b/srcpkgs/cbatticon-gtk2
index 318b0b5dcdc8..914da0006f51 120000
--- a/srcpkgs/cbatticon-gtk2
+++ b/srcpkgs/cbatticon-gtk2
@@ -1 +1 @@
-cbatticon-gtk3
\ No newline at end of file
+cbatticon
\ No newline at end of file
diff --git a/srcpkgs/cbatticon-gtk3 b/srcpkgs/cbatticon-gtk3
new file mode 120000
index 000000000000..914da0006f51
--- /dev/null
+++ b/srcpkgs/cbatticon-gtk3
@@ -0,0 +1 @@
+cbatticon
\ No newline at end of file
diff --git a/srcpkgs/cbatticon-gtk3/template b/srcpkgs/cbatticon-gtk3/template
deleted file mode 100644
index 09b3255f8c58..000000000000
--- a/srcpkgs/cbatticon-gtk3/template
+++ /dev/null
@@ -1,40 +0,0 @@
-# Template file for 'cbatticon-gtk3'
-pkgname=cbatticon-gtk3
-version=1.6.13
-revision=1
-wrksrc="cbatticon-${version}"
-build_style=gnu-makefile
-hostmakedepends="gettext pkg-config"
-makedepends="gtk+-devel libnotify-devel"
-short_desc="Lightweight and fast battery icon that sits in your systray - GTK3"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-only"
-homepage="https://github.com/valr/cbatticon"
-changelog="https://raw.githubusercontent.com/valr/cbatticon/master/Changelog"
-distfiles="https://github.com/valr/cbatticon/archive/${version}.tar.gz"
-checksum=87c6dae4a20dcfbf4897b110a7c5105fa8cf10de74b19e128b0cfd6212c55098
-provides="cbatticon-${version}_${revision}"
-replaces="cbatticon-gtk2>=0"
-
-do_build() {
-	# Cannot build GTK2/3 versions in the same folder!
-	cp -a ${wrksrc} ${wrksrc}-gtk2
-
-	# GTK3
-	make_build_args="WITH_NOTIFY=1 WITH_GTK3=1"
-		make ${makejobs} ${make_build_args} ${make_build_target}
-
-	# GTK2
-	cd ${wrksrc}-gtk2
-	make_build_args="WITH_NOTIFY=1 WITH_GTK3=0"
-		make ${makejobs} ${make_build_args} ${make_build_target}
-}
-
-cbatticon-gtk2_package() {
-	short_desc="${short_desc/GTK3/GTK2}"
-	provides="cbatticon-${version}_${revision}"
-	replaces="cbatticon-gtk3>=0"
-	pkg_install() {
-		make STRIP=true PREFIX=/usr DESTDIR=${PKGDESTDIR} -C ${wrksrc}-gtk2 install
-	}
-}
diff --git a/srcpkgs/cbatticon/template b/srcpkgs/cbatticon/template
new file mode 100644
index 000000000000..33282ab55e34
--- /dev/null
+++ b/srcpkgs/cbatticon/template
@@ -0,0 +1,31 @@
+# Template file for 'cbatticon'
+pkgname=cbatticon
+version=1.6.13
+revision=1
+build_style=gnu-makefile
+make_use_env=yes
+hostmakedepends="gettext pkg-config"
+makedepends="gtk+3-devel libnotify-devel"
+short_desc="Lightweight and fast battery icon that sits in your systray"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/valr/cbatticon"
+changelog="https://raw.githubusercontent.com/valr/cbatticon/master/Changelog"
+distfiles="https://github.com/valr/cbatticon/archive/${version}.tar.gz"
+checksum=87c6dae4a20dcfbf4897b110a7c5105fa8cf10de74b19e128b0cfd6212c55098
+
+post_install() {
+	mv ${DESTDIR}/usr/share/doc/cbatticon-${version} ${DESTDIR}/usr/share/doc/cbatticon
+}
+
+cbatticon-gtk2_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
+}
+
+cbatticon-gtk3_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
+}

Re: [PR PATCH] [Merged]: cbatticon-gtk3: move to cbatticon, remove gtk2 subpkg

[classabbyamp]

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

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

cbatticon-gtk3: move to cbatticon, remove gtk2 subpkg
https://github.com/void-linux/void-packages/pull/38862

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**