gsimplecal-gtk{2,3}: fix musl builds; use replaces rather than conflicts.

This commit is contained in:
Juan RP 2016-04-24 08:12:05 +02:00
parent 9032f42854
commit 8e00754a14
4 changed files with 24 additions and 4 deletions

View file

@ -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 <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"

View file

@ -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 <jarbowski@gmail.com>"
license="BSD"

View file

@ -0,0 +1 @@
../gsimplecal-gtk2/patches

View file

@ -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 <jarbowski@gmail.com>"
license="BSD"