gsimplecal-gtk{2,3}: fix musl builds; use replaces rather than conflicts.
This commit is contained in:
parent
9032f42854
commit
8e00754a14
19
srcpkgs/gsimplecal-gtk2/patches/musl.patch
Normal file
19
srcpkgs/gsimplecal-gtk2/patches/musl.patch
Normal 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"
|
|
@ -1,13 +1,13 @@
|
||||||
# Template file for 'gsimplecal-gtk2'
|
# Template file for 'gsimplecal-gtk2'
|
||||||
pkgname=gsimplecal-gtk2
|
pkgname=gsimplecal-gtk2
|
||||||
version=2.1
|
version=2.1
|
||||||
revision=1
|
revision=2
|
||||||
wrksrc="${pkgname%-*}-${version}"
|
wrksrc="${pkgname%-*}-${version}"
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--enable-gtk2"
|
configure_args="--enable-gtk2"
|
||||||
makedepends="gtk+-devel"
|
makedepends="gtk+-devel"
|
||||||
hostmakedepends="automake pkg-config"
|
hostmakedepends="automake pkg-config"
|
||||||
conflicts="gsimplecal-gtk3>=0"
|
replaces="gsimplecal-gtk3>=0"
|
||||||
short_desc="Simple and lightweight GTK calendar"
|
short_desc="Simple and lightweight GTK calendar"
|
||||||
maintainer="Jarbowski <jarbowski@gmail.com>"
|
maintainer="Jarbowski <jarbowski@gmail.com>"
|
||||||
license="BSD"
|
license="BSD"
|
||||||
|
|
1
srcpkgs/gsimplecal-gtk3/patches
Symbolic link
1
srcpkgs/gsimplecal-gtk3/patches
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
../gsimplecal-gtk2/patches
|
|
@ -1,12 +1,12 @@
|
||||||
# Template file for 'gsimplecal-gtk3'
|
# Template file for 'gsimplecal-gtk3'
|
||||||
pkgname=gsimplecal-gtk3
|
pkgname=gsimplecal-gtk3
|
||||||
version=2.1
|
version=2.1
|
||||||
revision=1
|
revision=2
|
||||||
wrksrc="${pkgname%-*}-${version}"
|
wrksrc="${pkgname%-*}-${version}"
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
makedepends="gtk+3-devel"
|
makedepends="gtk+3-devel"
|
||||||
hostmakedepends="automake pkg-config"
|
hostmakedepends="automake pkg-config"
|
||||||
conflicts="gsimplecal-gtk2>=0"
|
replaces="gsimplecal-gtk2>=0"
|
||||||
short_desc="Simple and lightweight GTK calendar"
|
short_desc="Simple and lightweight GTK calendar"
|
||||||
maintainer="Jarbowski <jarbowski@gmail.com>"
|
maintainer="Jarbowski <jarbowski@gmail.com>"
|
||||||
license="BSD"
|
license="BSD"
|
||||||
|
|
Loading…
Reference in a new issue