io.elementary.calendar: update to 5.0.

This commit is contained in:
Cameron Nemo 2019-03-03 19:47:58 -08:00 committed by maxice8
parent c909378af2
commit 2c6afac6e8
2 changed files with 21 additions and 15 deletions

View file

@ -1,3 +1,9 @@
commit c9ba80af072819261a9e24a04a0859b93b5db810
Author: Cameron Nemo <camerontnorman@gmail.com>
Date: Thu Oct 18 11:33:15 2018 -0700
Check for _NL_TIME_FIRST_WEEKDAY declaration
diff --git core/Model/CalendarModel.vala core/Model/CalendarModel.vala diff --git core/Model/CalendarModel.vala core/Model/CalendarModel.vala
index 3e3b8cbd..b33f75f8 100644 index 3e3b8cbd..b33f75f8 100644
--- core/Model/CalendarModel.vala --- core/Model/CalendarModel.vala
@ -15,26 +21,25 @@ index 3e3b8cbd..b33f75f8 100644
week_starts_on = (Maya.Settings.Weekday)week_start-1; week_starts_on = (Maya.Settings.Weekday)week_start-1;
} }
diff --git meson.build meson.build diff --git meson.build meson.build
index 1f83be6d..480706a1 100644 index a0cd2dd7..02b4e1d1 100644
--- meson.build --- meson.build
+++ meson.build +++ meson.build
@@ -31,13 +31,18 @@ folks_dep = dependency('folks') @@ -31,7 +31,17 @@ folks_dep = dependency('folks')
geocode_glib_dep = dependency('geocode-glib-1.0') geocode_glib_dep = dependency('geocode-glib-1.0')
gclue_dep = dependency('libgeoclue-2.0') gclue_dep = dependency('libgeoclue-2.0')
-m_dep = meson.get_compiler('c').find_library('m', required : false) -m_dep = meson.get_compiler('c').find_library('m', required : false)
+cc = meson.get_compiler('c') +cc = meson.get_compiler('c')
+m_dep = cc.find_library('m', required : false) +m_dep = cc.find_library('m', required : false)
libnotify_dep = dependency('libnotify', required: false) +libnotify_dep = dependency('libnotify', required: false)
+
if libnotify_dep.found() +if libnotify_dep.found()
add_project_arguments('--define=HAVE_LIBNOTIFY', language: 'vala') + add_project_arguments('--define=HAVE_LIBNOTIFY', language: 'vala')
endif +endif
+
+if cc.has_header_symbol('langinfo.h', '_NL_TIME_FIRST_WEEKDAY') +if cc.has_header_symbol('langinfo.h', '_NL_TIME_FIRST_WEEKDAY')
+ add_project_arguments('--define=HAVE_NL_TIME_FIRST_WEEKDAY', language: 'vala') + add_project_arguments('--define=HAVE_NL_TIME_FIRST_WEEKDAY', language: 'vala')
+endif +endif
+
gresource_calendar = gnome.compile_resources( gresource_calendar = gnome.compile_resources(
'gresource_calendar', 'gresource_calendar',
'data/maya.gresource.xml',

View file

@ -1,19 +1,20 @@
# Template file for 'io.elementary.calendar' # Template file for 'io.elementary.calendar'
pkgname=io.elementary.calendar pkgname=io.elementary.calendar
version=4.2.3 version=5.0
revision=2 revision=1
wrksrc="calendar-${version}" wrksrc="calendar-${version}"
build_style=meson build_style=meson
build_helper="gir"
hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream" hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream"
makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel
libchamplain-devel clutter-devel evolution-data-server-devel libchamplain-devel clutter-devel evolution-data-server-devel
folks-devel geocode-glib-devel geoclue2-devel libical-devel libnotify-devel" folks-devel geocode-glib-devel geoclue2-devel libical-devel libnotify-devel"
maintainer="Cameron Nemo <camerontnorman@gmail.com>"
short_desc="Desktop calendar app designed for elementary OS" short_desc="Desktop calendar app designed for elementary OS"
homepage="https://github.com/elementary/calendar" maintainer="Cameron Nemo <camerontnorman@gmail.com>"
license="GPL-3.0-only" license="GPL-3.0-only"
homepage="https://github.com/elementary/calendar"
distfiles="${homepage}/archive/${version}.tar.gz" distfiles="${homepage}/archive/${version}.tar.gz"
checksum=4f36334ec9402bb59998816fd1849be9e8eb6a3ee96df292efe79d322ee3aa09 checksum=f47bae213163ec87c2e4f2c0563a40be8cf080cab70094a6a4f41936803fb3fa
libio.elementary.calendar_package() { libio.elementary.calendar_package() {
short_desc+=" - library" short_desc+=" - library"