From 8e00754a1476c391c7804b3538a79c3b2d35d14a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 24 Apr 2016 08:12:05 +0200 Subject: [PATCH] gsimplecal-gtk{2,3}: fix musl builds; use replaces rather than conflicts. --- srcpkgs/gsimplecal-gtk2/patches/musl.patch | 19 +++++++++++++++++++ srcpkgs/gsimplecal-gtk2/template | 4 ++-- srcpkgs/gsimplecal-gtk3/patches | 1 + srcpkgs/gsimplecal-gtk3/template | 4 ++-- 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/gsimplecal-gtk2/patches/musl.patch create mode 120000 srcpkgs/gsimplecal-gtk3/patches diff --git a/srcpkgs/gsimplecal-gtk2/patches/musl.patch b/srcpkgs/gsimplecal-gtk2/patches/musl.patch new file mode 100644 index 0000000000..2295d20b33 --- /dev/null +++ b/srcpkgs/gsimplecal-gtk2/patches/musl.patch @@ -0,0 +1,19 @@ +--- src/Unique.cpp.orig 2016-04-24 08:08:43.921536576 +0200 ++++ 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 index 8ea49fa086..f3c413783d 100644 --- a/srcpkgs/gsimplecal-gtk2/template +++ b/srcpkgs/gsimplecal-gtk2/template @@ -1,13 +1,13 @@ # Template file for 'gsimplecal-gtk2' pkgname=gsimplecal-gtk2 version=2.1 -revision=1 +revision=2 wrksrc="${pkgname%-*}-${version}" build_style=gnu-configure configure_args="--enable-gtk2" makedepends="gtk+-devel" hostmakedepends="automake pkg-config" -conflicts="gsimplecal-gtk3>=0" +replaces="gsimplecal-gtk3>=0" short_desc="Simple and lightweight GTK calendar" maintainer="Jarbowski " license="BSD" diff --git a/srcpkgs/gsimplecal-gtk3/patches b/srcpkgs/gsimplecal-gtk3/patches new file mode 120000 index 0000000000..7ee8024d19 --- /dev/null +++ b/srcpkgs/gsimplecal-gtk3/patches @@ -0,0 +1 @@ +../gsimplecal-gtk2/patches \ No newline at end of file diff --git a/srcpkgs/gsimplecal-gtk3/template b/srcpkgs/gsimplecal-gtk3/template index e569c13a0a..bba5e88c5d 100644 --- a/srcpkgs/gsimplecal-gtk3/template +++ b/srcpkgs/gsimplecal-gtk3/template @@ -1,12 +1,12 @@ # Template file for 'gsimplecal-gtk3' pkgname=gsimplecal-gtk3 version=2.1 -revision=1 +revision=2 wrksrc="${pkgname%-*}-${version}" build_style=gnu-configure makedepends="gtk+3-devel" hostmakedepends="automake pkg-config" -conflicts="gsimplecal-gtk2>=0" +replaces="gsimplecal-gtk2>=0" short_desc="Simple and lightweight GTK calendar" maintainer="Jarbowski " license="BSD"