Hello community, here is the log from the commit of package maya-calendar for openSUSE:Factory checked in at 2018-04-24 15:34:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maya-calendar (Old) and /work/SRC/openSUSE:Factory/.maya-calendar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maya-calendar" Tue Apr 24 15:34:29 2018 rev:4 rq:600155 version:0.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/maya-calendar/maya-calendar.changes 2017-12-22 12:19:17.492815071 +0100 +++ /work/SRC/openSUSE:Factory/.maya-calendar.new/maya-calendar.changes 2018-04-24 15:34:31.431195094 +0200 @@ -1,0 +2,5 @@ +Mon Apr 23 21:45:08 UTC 2018 - [email protected] + +- Fix build with vala >= 0.40.4 (add maya-calendar-0.4.1-vapi.patch) + +------------------------------------------------------------------- New: ---- maya-calendar-0.4.1-vapi.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maya-calendar.spec ++++++ --- /var/tmp/diff_new_pack.xzPJxB/_old 2018-04-24 15:34:32.047172807 +0200 +++ /var/tmp/diff_new_pack.xzPJxB/_new 2018-04-24 15:34:32.047172807 +0200 @@ -1,7 +1,7 @@ # # spec file for package maya-calendar # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,10 +21,12 @@ Version: 0.4.1 Release: 0 Summary: Maya Calendar for the Pantheon Desktop -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Office/Organizers Url: https://elementary.io Source: https://github.com/elementary/calendar/archive/%{version}.tar.gz#/calendar-%{version}.tar.gz +# PATCH-FIX-UPSTREAM -- Remove NLTime because it was upstreamed (#234) +Patch0: maya-calendar-0.4.1-vapi.patch BuildRequires: cmake >= 2.8 BuildRequires: elementary-icon-theme BuildRequires: fdupes @@ -80,6 +82,9 @@ %prep %setup -q -n calendar-%{version} +%if 0%{?suse_version} > 1500 +%patch0 -p2 +%endif %build %cmake \ ++++++ maya-calendar-0.4.1-vapi.patch ++++++ diff -ruN calendar-0.4.1.orig/calendar-0.4.1/CMakeLists.txt calendar-0.4.1/calendar-0.4.1/CMakeLists.txt --- calendar-0.4.1.orig/calendar-0.4.1/CMakeLists.txt 2017-12-01 23:54:43.000000000 +0300 +++ calendar-0.4.1/calendar-0.4.1/CMakeLists.txt 2018-04-24 00:47:27.131498733 +0300 @@ -125,7 +125,7 @@ find_package (Vala REQUIRED) include (ValaVersion) -ensure_vala_version ("0.23.2" MINIMUM) +ensure_vala_version ("0.40.4" MINIMUM) include (ValaPrecompile) add_subdirectory (po) diff -ruN calendar-0.4.1.orig/calendar-0.4.1/core/CMakeLists.txt calendar-0.4.1/calendar-0.4.1/core/CMakeLists.txt --- calendar-0.4.1.orig/calendar-0.4.1/core/CMakeLists.txt 2017-12-01 23:54:43.000000000 +0300 +++ calendar-0.4.1/calendar-0.4.1/core/CMakeLists.txt 2018-04-24 00:48:06.303739259 +0300 @@ -27,8 +27,6 @@ ${CORE_PACKAGES} OPTIONS ${BASIC_VALAC_OPTIONS} - CUSTOM_VAPIS - ${CMAKE_SOURCE_DIR}/vapi/posix-extension.vapi GENERATE_VAPI ${CMAKE_PROJECT_NAME} GENERATE_HEADER diff -ruN calendar-0.4.1.orig/calendar-0.4.1/core/Model/CalendarModel.vala calendar-0.4.1/calendar-0.4.1/core/Model/CalendarModel.vala --- calendar-0.4.1.orig/calendar-0.4.1/core/Model/CalendarModel.vala 2017-12-01 23:54:43.000000000 +0300 +++ calendar-0.4.1/calendar-0.4.1/core/Model/CalendarModel.vala 2018-04-24 00:49:25.636205644 +0300 @@ -68,7 +68,7 @@ } private CalendarModel () { - int week_start = Posix.nl_langinfo2 (Posix.NLTime.FIRST_WEEKDAY).data[0]; + int week_start = Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0]; if (week_start >= 1 && week_start <= 7) { week_starts_on = (Maya.Settings.Weekday)week_start-1; } diff -ruN calendar-0.4.1.orig/calendar-0.4.1/vapi/posix-extension.vapi calendar-0.4.1/calendar-0.4.1/vapi/posix-extension.vapi --- calendar-0.4.1.orig/calendar-0.4.1/vapi/posix-extension.vapi 2017-12-01 23:54:43.000000000 +0300 +++ calendar-0.4.1/calendar-0.4.1/vapi/posix-extension.vapi 1970-01-01 03:00:00.000000000 +0300 @@ -1,15 +0,0 @@ -[CCode (cprefix = "", lower_case_cprefix = "")] -namespace Posix { - [CCode (cheader_filename = "langinfo.h", cname = "nl_item", cprefix = "_NL_TIME_", has_type_id = false)] - public enum NLTime { - WEEK_NDAYS, - WEEK_1STDAY, - WEEK_1STWEEK, - FIRST_WEEKDAY, - FIRST_WORKDAY, - CAL_DIRECTION, - TIMEZONE - } - [CCode (cname = "nl_langinfo",cheader_filename = "langinfo.h")] - public unowned string nl_langinfo2 (NLTime item); -}
