[arch-commits] Commit in gnome-calendar/trunk (2 files)

[Jan Steffens]

    Date: Tuesday, September 27, 2016 @ 14:06:56
  Author: heftig
Revision: 277046

3.22.0+2+g8d4d7f4-1

Modified:
  gnome-calendar/trunk/PKGBUILD
Deleted:
  gnome-calendar/trunk/year-view-use-gsettings-desktop-schemas.patch

-----------------------------------------------+
 PKGBUILD                                      |   24 ++++----
 year-view-use-gsettings-desktop-schemas.patch |   72 ------------------------
 2 files changed, 14 insertions(+), 82 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-09-27 14:06:04 UTC (rev 277045)
+++ PKGBUILD	2016-09-27 14:06:56 UTC (rev 277046)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-calendar
-pkgver=3.20.4
+pkgver=3.22.0+2+g8d4d7f4
 pkgrel=1
 pkgdesc="Simple and beautiful calendar application designed to perfectly fit the GNOME desktop"
 url="https://wiki.gnome.org/Apps/Calendar"
@@ -9,20 +9,24 @@
 arch=(i686 x86_64)
 license=(GPL)
 depends=(evolution-data-server 'gsettings-desktop-schemas>=3.21.2')
-makedepends=(intltool python gnome-common)
+makedepends=(intltool python gnome-common appstream-glib git)
 groups=(gnome-extra)
-source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
-        year-view-use-gsettings-desktop-schemas.patch)
-sha256sums=('eb39488c7087eb597d281f16414fe6439fc8280b618535a66db85e5cfceccc11'
-            '668a698fc5e6902f3796b70a418c6c88ef49ab1e1c11bb9e2f4f16d344ee8f77')
+_commit=8d4d7f40ac2f6d493f153de1e76484d66e9dffe6
+source=("git://git.gnome.org/gnome-calendar#commit=$_commit")
+sha256sums=('SKIP')
 
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
 prepare() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../year-view-use-gsettings-desktop-schemas.patch
+  cd $pkgname
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   autoreconf -fi
   ./configure --prefix=/usr
   make
@@ -29,7 +33,7 @@
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   make DESTDIR="$pkgdir" install
 }
 

Deleted: year-view-use-gsettings-desktop-schemas.patch
===================================================================
--- year-view-use-gsettings-desktop-schemas.patch	2016-09-27 14:06:04 UTC (rev 277045)
+++ year-view-use-gsettings-desktop-schemas.patch	2016-09-27 14:06:56 UTC (rev 277046)
@@ -1,72 +0,0 @@
-From da06a48fde20f84d920953a7d4f80f67ed51fe50 Mon Sep 17 00:00:00 2001
-From: Iain Lane <iain at orangesquash.org.uk>
-Date: Thu, 12 May 2016 11:26:35 +0100
-Subject: [PATCH] year-view: Use the new schema from gsettings-desktop-schemas
-
-So that we don't have to depend on GNOME shell.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=764001
----
- configure.ac         |  4 +++-
- src/gcal-year-view.c | 10 +++++-----
- 2 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 815260e..693d38e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -100,6 +100,7 @@ EDATASERVER_REQUIRED=3.17.1
- EDATASERVERUI_REQUIRED=3.17.1
- LIBICAL_REQUIRED=1.0
- GOA_MIN_VERSION=3.2.0
-+GSETTINGS_DESKTOP_SCHEMAS_REQUIRED=3.21.2
- 
- PKG_CHECK_MODULES(CALENDAR,
-                   gmodule-export-2.0
-@@ -110,7 +111,8 @@ PKG_CHECK_MODULES(CALENDAR,
-                   libecal-1.2 >= $ECAL_REQUIRED
-                   libedataserver-1.2 >= $EDATASERVER_REQUIRED
-                   libedataserverui-1.2 >= $EDATASERVERUI_REQUIRED
--                  libical >= $LIBICAL_REQUIRED)
-+                  libical >= $LIBICAL_REQUIRED
-+                  gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED)
- 
- AC_CHECK_LIB(ical, icaltime_days_in_year, [],
-                 AC_MSG_ERROR([Error: icaltime_days_in_year() not found in libical!. Upgrade your libical library.]))
-diff --git a/src/gcal-year-view.c b/src/gcal-year-view.c
-index 60b061c..3864c83 100644
---- a/src/gcal-year-view.c
-+++ b/src/gcal-year-view.c
-@@ -88,7 +88,7 @@ struct _GcalYearView
-   gboolean      use_24h_format;
- 
-   /* show week numbers from GNOME Shell settings */
--  GSettings    *shell_settings;
-+  GSettings    *calendar_settings;
-   gboolean      show_week_numbers;
- 
-   /* text direction factors */
-@@ -1099,7 +1099,7 @@ gcal_year_view_finalize (GObject *object)
- 
-   g_clear_pointer (&year_view->date, g_free);
- 
--  g_clear_object (&year_view->shell_settings);
-+  g_clear_object (&year_view->calendar_settings);
- 
-   G_OBJECT_CLASS (gcal_year_view_parent_class)->finalize (object);
- }
-@@ -1502,9 +1502,9 @@ gcal_year_view_init (GcalYearView *self)
-   self->end_selected_date->zone = e_cal_util_get_system_timezone ();
- 
-   /* bind GNOME Shell' show week numbers property to GNOME Calendar's one */
--  self->shell_settings = g_settings_new ("org.gnome.shell.calendar");
--  g_settings_bind (self->shell_settings, "show-weekdate", self, "show-week-numbers", G_SETTINGS_BIND_DEFAULT);
--  g_signal_connect_swapped (self->shell_settings, "changed::show-weekdate", G_CALLBACK (gtk_widget_queue_draw), self);
-+  self->calendar_settings = g_settings_new ("org.gnome.desktop.calendar");
-+  g_settings_bind (self->calendar_settings, "show-weekdate", self, "show-week-numbers", G_SETTINGS_BIND_DEFAULT);
-+  g_signal_connect_swapped (self->calendar_settings, "changed::show-weekdate", G_CALLBACK (gtk_widget_queue_draw), self);
- 
-   gtk_list_box_set_header_func (GTK_LIST_BOX (self->events_sidebar), update_sidebar_headers, self, NULL);
-   gtk_list_box_set_sort_func (GTK_LIST_BOX (self->events_sidebar), sidebar_sort_func, NULL, NULL);
--- 
-2.7.4
\ No newline at end of file