[arch-commits] Commit in gnome-calendar/repos/extra-x86_64 (3 files)

[Jan Steffens]

    Date: Friday, February 16, 2018 @ 16:48:41
  Author: heftig
Revision: 317154

archrelease: copy trunk to extra-x86_64

Added:
  gnome-calendar/repos/extra-x86_64/PKGBUILD
    (from rev 317153, gnome-calendar/trunk/PKGBUILD)
  gnome-calendar/repos/extra-x86_64/null-icaltime.diff
    (from rev 317153, gnome-calendar/trunk/null-icaltime.diff)
Deleted:
  gnome-calendar/repos/extra-x86_64/PKGBUILD

--------------------+
 PKGBUILD           |   75 ++++++++++++++++++++++++++-------------------------
 null-icaltime.diff |   14 +++++++++
 2 files changed, 53 insertions(+), 36 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-16 16:45:44 UTC (rev 317153)
+++ PKGBUILD	2018-02-16 16:48:41 UTC (rev 317154)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gnome-calendar
-pkgver=3.26.3
-pkgrel=1
-pkgdesc="Simple and beautiful calendar application designed to perfectly fit the GNOME desktop"
-url="https://wiki.gnome.org/Apps/Calendar"
-arch=(x86_64)
-license=(GPL)
-depends=(evolution-data-server gsettings-desktop-schemas evolution gnome-control-center)
-makedepends=(python appstream-glib git meson gtk-doc)
-groups=(gnome)
-_commit=7e88d7c14493d2656edf626fef7ab6162806d607  # tags/3.26.3^0
-source=("git+https://git.gnome.org/browse/gnome-calendar#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-}
-
-build() {
-  arch-meson $pkgname build -Denable-gtk-doc=true
-  ninja -C build
-}
-
-package() {
-  DESTDIR="$pkgdir" ninja -C build install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: gnome-calendar/repos/extra-x86_64/PKGBUILD (from rev 317153, gnome-calendar/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-02-16 16:48:41 UTC (rev 317154)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gnome-calendar
+pkgver=3.26.3+2+g966ec1c5
+pkgrel=1
+pkgdesc="Simple and beautiful calendar application designed to perfectly fit the GNOME desktop"
+url="https://wiki.gnome.org/Apps/Calendar"
+arch=(x86_64)
+license=(GPL)
+depends=(evolution-data-server gsettings-desktop-schemas evolution gnome-control-center)
+makedepends=(python appstream-glib git meson gtk-doc)
+groups=(gnome)
+_commit=966ec1c554ff4c7e5385ab9389f3ca8cf5a8faa4  # gnome-3-26
+source=("git+https://gitlab.gnome.org/GNOME/gnome-calendar.git#commit=$_commit"
+        null-icaltime.diff)
+sha256sums=('SKIP'
+            'd24ae7e985ab9d568685371473006f58d169744c94a2cc89835b6f39f2001898')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+  patch -Np1 -i ../null-icaltime.diff
+}
+
+build() {
+  arch-meson $pkgname build -Denable-gtk-doc=true
+  ninja -C build
+}
+
+package() {
+  DESTDIR="$pkgdir" ninja -C build install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: gnome-calendar/repos/extra-x86_64/null-icaltime.diff (from rev 317153, gnome-calendar/trunk/null-icaltime.diff)
===================================================================
--- null-icaltime.diff	                        (rev 0)
+++ null-icaltime.diff	2018-02-16 16:48:41 UTC (rev 317154)
@@ -0,0 +1,14 @@
+diff --git i/src/gcal-utils.c w/src/gcal-utils.c
+index 9846a59b..7f96a40d 100644
+--- i/src/gcal-utils.c
++++ w/src/gcal-utils.c
+@@ -154,6 +154,9 @@ icaltime_to_datetime (const icaltimetype  *date)
+   GDateTime *dt;
+   GTimeZone *tz;
+ 
++  if (!date)
++    return NULL;
++
+   tz = date->zone ? g_time_zone_new (icaltime_get_tzid (*date)) : g_time_zone_new_utc ();
+   dt = g_date_time_new (tz,
+                         date->year,