From bf01e741608154553dd3cf573b6e73348c9236f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 8 Aug 2022 20:17:07 +0200 Subject: [PATCH 1/2] gsimplecal-gtk3: update to 2.4.1. --- srcpkgs/gsimplecal-gtk3/patches | 1 - srcpkgs/gsimplecal-gtk3/template | 7 ++++--- 2 files changed, 4 insertions(+), 4 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..d0f210ef19f4 100644 --- a/srcpkgs/gsimplecal-gtk3/template +++ b/srcpkgs/gsimplecal-gtk3/template @@ -1,7 +1,7 @@ # 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" @@ -10,8 +10,9 @@ short_desc="Simple and lightweight GTK calendar" maintainer="Jarbowski " 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 26cc7df0add394b56ef705642dc3bcbcf190a885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= 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 - #include - #include - #include - #include - #include -+#ifdef HAVE_SYSCTL_H - #include -+#endif - #include - - #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 " -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 d0f210ef19f4..cd2af06a7407 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)" +}