From 2948786ddbb336cd249a1f66b38b3957e9424f66 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Thu, 18 Oct 2018 11:35:41 -0700 Subject: [PATCH] New package: io.elementary.calendar-4.2.3 --- common/shlibs | 1 + .../patches/00-musl.patch | 40 +++++++++++++++++++ srcpkgs/io.elementary.calendar/template | 35 ++++++++++++++++ srcpkgs/libio.elementary.calendar | 1 + srcpkgs/libio.elementary.calendar-devel | 1 + 5 files changed, 78 insertions(+) create mode 100644 srcpkgs/io.elementary.calendar/patches/00-musl.patch create mode 100644 srcpkgs/io.elementary.calendar/template create mode 120000 srcpkgs/libio.elementary.calendar create mode 120000 srcpkgs/libio.elementary.calendar-devel diff --git a/common/shlibs b/common/shlibs index 5df47833aa0..9b538cce423 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3317,3 +3317,4 @@ libunarr.so.1 libunarr-1.0.1_1 libretro-gtk-0.14.so.0 retro-gtk-0.16.0_1 libmanette-0.2.so.0 libmanette-0.2.1_1 libfmt.so.5 fmt-5.2.1_1 +libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1 diff --git a/srcpkgs/io.elementary.calendar/patches/00-musl.patch b/srcpkgs/io.elementary.calendar/patches/00-musl.patch new file mode 100644 index 00000000000..684363f24e3 --- /dev/null +++ b/srcpkgs/io.elementary.calendar/patches/00-musl.patch @@ -0,0 +1,40 @@ +diff --git core/Model/CalendarModel.vala core/Model/CalendarModel.vala +index 3e3b8cbd..b33f75f8 100644 +--- core/Model/CalendarModel.vala ++++ core/Model/CalendarModel.vala +@@ -68,7 +68,11 @@ public class Maya.Model.CalendarModel : Object { + } + + private CalendarModel () { ++#if HAVE_NL_TIME_FIRST_WEEKDAY + int week_start = Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0]; ++#else ++ int week_start = 0; ++#endif + if (week_start >= 1 && week_start <= 7) { + week_starts_on = (Maya.Settings.Weekday)week_start-1; + } +diff --git meson.build meson.build +index 1f83be6d..480706a1 100644 +--- meson.build ++++ meson.build +@@ -31,13 +31,18 @@ folks_dep = dependency('folks') + geocode_glib_dep = dependency('geocode-glib-1.0') + gclue_dep = dependency('libgeoclue-2.0') + +-m_dep = meson.get_compiler('c').find_library('m', required : false) ++cc = meson.get_compiler('c') ++m_dep = cc.find_library('m', required : false) + libnotify_dep = dependency('libnotify', required: false) + + if libnotify_dep.found() + add_project_arguments('--define=HAVE_LIBNOTIFY', language: 'vala') + endif + ++if cc.has_header_symbol('langinfo.h', '_NL_TIME_FIRST_WEEKDAY') ++ add_project_arguments('--define=HAVE_NL_TIME_FIRST_WEEKDAY', language: 'vala') ++endif ++ + gresource_calendar = gnome.compile_resources( + 'gresource_calendar', + 'data/maya.gresource.xml', diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template new file mode 100644 index 00000000000..eb4ec32e2e5 --- /dev/null +++ b/srcpkgs/io.elementary.calendar/template @@ -0,0 +1,35 @@ +# Template file for 'io.elementary.calendar' +pkgname=io.elementary.calendar +version=4.2.3 +revision=1 +wrksrc="calendar-${version}" +build_style=meson +hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream" +makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel + libchamplain-devel clutter-devel evolution-data-server-devel + folks-devel geocode-glib-devel geoclue2-devel libical-devel libnotify-devel" +maintainer="Cameron Nemo " +short_desc="Desktop calendar app designed for elementary OS" +homepage="https://github.com/elementary/calendar" +license="GPL-3.0-only" +distfiles="${homepage}/archive/${version}.tar.gz" +checksum=4f36334ec9402bb59998816fd1849be9e8eb6a3ee96df292efe79d322ee3aa09 + +libio.elementary.calendar_package() { + short_desc+=" - library" + pkg_install() { + vmove "usr/lib/*.so.*" + } +} + +libio.elementary.calendar-devel_package() { + short_desc+=" - library development files" + depends="libio.elementary.calendar>=${version} evolution-data-server-devel + granite-devel gtk+3-devel libglib-devel libical-devel libsoup-devel" + pkg_install() { + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig + vmove usr/include + vmove usr/share/vala + } +} diff --git a/srcpkgs/libio.elementary.calendar b/srcpkgs/libio.elementary.calendar new file mode 120000 index 00000000000..b26f4f755d4 --- /dev/null +++ b/srcpkgs/libio.elementary.calendar @@ -0,0 +1 @@ +io.elementary.calendar \ No newline at end of file diff --git a/srcpkgs/libio.elementary.calendar-devel b/srcpkgs/libio.elementary.calendar-devel new file mode 120000 index 00000000000..b26f4f755d4 --- /dev/null +++ b/srcpkgs/libio.elementary.calendar-devel @@ -0,0 +1 @@ +io.elementary.calendar \ No newline at end of file