Re: [PR PATCH] [Updated] gsimplecal-gtk3: update to 2.4.1.

[Chocimier <Chocimier@users.noreply.github.com>]

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

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

https://github.com/Chocimier/void-packages-org gsimplecal
https://github.com/void-linux/void-packages/pull/38539

gsimplecal-gtk3: update to 2.4.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gsimplecal-38539.patch --]
[-- Type: text/x-diff, Size: 4960 bytes --]

From 16cb9806bfc1007f9d5a9551692b5f14542039c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 8 Aug 2022 20:17:07 +0200
Subject: [PATCH 1/2] gsimplecal-gtk3: update to 2.4.1, adopt.

---
 srcpkgs/gsimplecal-gtk3/patches  | 1 -
 srcpkgs/gsimplecal-gtk3/template | 9 +++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 120000 srcpkgs/gsimplecal-gtk3/patches

diff --git a/srcpkgs/gsimplecal-gtk3/patches b/srcpkgs/gsimplecal-gtk3/patches
deleted file mode 120000
index 7ee8024d19bb..000000000000
--- a/srcpkgs/gsimplecal-gtk3/patches
+++ /dev/null
@@ -1 +0,0 @@
-../gsimplecal-gtk2/patches
\ No newline at end of file
diff --git a/srcpkgs/gsimplecal-gtk3/template b/srcpkgs/gsimplecal-gtk3/template
index 52acc624d51c..ab90906496b8 100644
--- a/srcpkgs/gsimplecal-gtk3/template
+++ b/srcpkgs/gsimplecal-gtk3/template
@@ -1,17 +1,18 @@
 # Template file for 'gsimplecal-gtk3'
 pkgname=gsimplecal-gtk3
-version=2.1
-revision=4
+version=2.4.1
+revision=1
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
 makedepends="gtk+3-devel"
 short_desc="Simple and lightweight GTK calendar"
-maintainer="Jarbowski <jarbowski@gmail.com>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-3-Clause"
 homepage="http://dmedvinsky.github.io/gsimplecal/"
+changelog="https://github.com/dmedvinsky/gsimplecal/raw/master/ChangeLog"
 distfiles="https://github.com/dmedvinsky/${pkgname%-*}/archive/v${version}.tar.gz"
-checksum="660cac7333d3507203a008e142e2b8f5dfcf0735b6ccabdd8d3d902b5d2c40e9"
+checksum=fd47df49ec26115bd6022d0e6a24648873c619e0406375d807fb18428d07d000
 
 replaces="gsimplecal-gtk2>=0"
 

From f6fabfea757c528a2890124c8b49d75a029ba79f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 8 Aug 2022 20:16:56 +0200
Subject: [PATCH 2/2] gsimplecal-gtk2: transition to gsimplecal-gtk3

---
 srcpkgs/gsimplecal-gtk2                    |  1 +
 srcpkgs/gsimplecal-gtk2/patches/musl.patch | 19 ----------------
 srcpkgs/gsimplecal-gtk2/template           | 25 ----------------------
 srcpkgs/gsimplecal-gtk3/template           |  8 +++++--
 4 files changed, 7 insertions(+), 46 deletions(-)
 create mode 120000 srcpkgs/gsimplecal-gtk2
 delete mode 100644 srcpkgs/gsimplecal-gtk2/patches/musl.patch
 delete mode 100644 srcpkgs/gsimplecal-gtk2/template

diff --git a/srcpkgs/gsimplecal-gtk2 b/srcpkgs/gsimplecal-gtk2
new file mode 120000
index 000000000000..bd547b0783c2
--- /dev/null
+++ b/srcpkgs/gsimplecal-gtk2
@@ -0,0 +1 @@
+gsimplecal-gtk3
\ No newline at end of file
diff --git a/srcpkgs/gsimplecal-gtk2/patches/musl.patch b/srcpkgs/gsimplecal-gtk2/patches/musl.patch
deleted file mode 100644
index eef2a786bb73..000000000000
--- a/srcpkgs/gsimplecal-gtk2/patches/musl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/Unique.cpp.orig	2016-04-24 08:08:43.921536576 +0200
-+++ b/src/Unique.cpp	2016-04-24 08:09:18.615896283 +0200
-@@ -1,10 +1,16 @@
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
- #include <limits.h>
- #include <signal.h>
- #include <sys/sem.h>
-+#ifdef HAVE_SYSCTL_H
- #include <sys/sysctl.h>
-+#endif
- #include <sys/types.h>
- 
- #include "Unique.hpp"
diff --git a/srcpkgs/gsimplecal-gtk2/template b/srcpkgs/gsimplecal-gtk2/template
deleted file mode 100644
index 73cf3bd39b88..000000000000
--- a/srcpkgs/gsimplecal-gtk2/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'gsimplecal-gtk2'
-pkgname=gsimplecal-gtk2
-version=2.1
-revision=4
-wrksrc="${pkgname%-*}-${version}"
-build_style=gnu-configure
-configure_args="--enable-gtk2"
-hostmakedepends="automake pkg-config"
-makedepends="gtk+-devel"
-short_desc="Simple and lightweight GTK calendar"
-maintainer="Jarbowski <jarbowski@gmail.com>"
-license="BSD-3-Clause"
-homepage="http://dmedvinsky.github.io/gsimplecal/"
-distfiles="https://github.com/dmedvinsky/${pkgname%-*}/archive/v${version}.tar.gz"
-checksum="660cac7333d3507203a008e142e2b8f5dfcf0735b6ccabdd8d3d902b5d2c40e9"
-
-replaces="gsimplecal-gtk3>=0"
-
-pre_configure() {
-	./autogen.sh
-}
-
-post_install() {
-	vlicense COPYING
-}
diff --git a/srcpkgs/gsimplecal-gtk3/template b/srcpkgs/gsimplecal-gtk3/template
index ab90906496b8..21c75517bdb8 100644
--- a/srcpkgs/gsimplecal-gtk3/template
+++ b/srcpkgs/gsimplecal-gtk3/template
@@ -14,8 +14,6 @@ changelog="https://github.com/dmedvinsky/gsimplecal/raw/master/ChangeLog"
 distfiles="https://github.com/dmedvinsky/${pkgname%-*}/archive/v${version}.tar.gz"
 checksum=fd47df49ec26115bd6022d0e6a24648873c619e0406375d807fb18428d07d000
 
-replaces="gsimplecal-gtk2>=0"
-
 pre_configure() {
 	./autogen.sh
 }
@@ -23,3 +21,9 @@ pre_configure() {
 post_install() {
 	vlicense COPYING
 }
+
+gsimplecal-gtk2_package() {
+	build_style=meta
+	depends="gsimplecal-gtk3>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+}