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

Antonio Rojas arojas at archlinux.org
Sun Jan 10 12:08:11 UTC 2021


    Date: Sunday, January 10, 2021 @ 12:08:10
  Author: arojas
Revision: 817040

Update to 2.0.3

Modified:
  gnome-break-timer/trunk/PKGBUILD
Deleted:
  gnome-break-timer/trunk/0001-Fix-AppStream-metadata-validation.patch

----------------------------------------------+
 0001-Fix-AppStream-metadata-validation.patch |   67 -------------------------
 PKGBUILD                                     |   35 ++++---------
 2 files changed, 11 insertions(+), 91 deletions(-)

Deleted: 0001-Fix-AppStream-metadata-validation.patch
===================================================================
--- 0001-Fix-AppStream-metadata-validation.patch	2021-01-10 12:06:36 UTC (rev 817039)
+++ 0001-Fix-AppStream-metadata-validation.patch	2021-01-10 12:08:10 UTC (rev 817040)
@@ -1,67 +0,0 @@
-From 8280360b66c2dde9414f294a537969bcf4b4cc19 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
-Date: Fri, 28 Dec 2018 18:57:32 +0100
-Subject: [PATCH] Fix AppStream metadata validation
-
----
- data/Makefile.am                      |  2 +-
- data/gnome-break-timer.appdata.xml.in | 33 +++++++++++++++++----------
- 2 files changed, 22 insertions(+), 13 deletions(-)
-
-diff --git a/data/Makefile.am b/data/Makefile.am
-index d26b312..4f0cc66 100644
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -27,7 +27,7 @@ check: $(desktop_DATA) $(autostart_DATA)
- 
- # appdata
- 
--appdatadir = $(datadir)/appdata
-+appdatadir = $(datadir)/metainfo
- appdata_in_files = gnome-break-timer.appdata.xml.in
- appdata_DATA = $(appdata_in_files:.appdata.xml.in=.appdata.xml)
- 
-diff --git a/data/gnome-break-timer.appdata.xml.in b/data/gnome-break-timer.appdata.xml.in
-index f2ae5e3..d63dfc3 100644
---- a/data/gnome-break-timer.appdata.xml.in
-+++ b/data/gnome-break-timer.appdata.xml.in
-@@ -1,15 +1,24 @@
- <?xml version="1.0" encoding="UTF-8"?>
--<application>
-- <id type="desktop">gnome-break-timer.desktop</id>
-- <licence>GPLv3</licence>
-+<component type="desktop-application">
-+ <id>org.gnome.breaktimer</id>
-+ <launchable type="desktop-id">gnome-break-timer.desktop</launchable>
-+ <metadata_license>CC0-1.0</metadata_license>
-+ <project_license>GPL-3.0</project_license>
-  <_name>Break Timer</_name>
-  <_summary>Remember to take regular breaks from using the computer</_summary>
-- <_description>
--<p>Break Timer keeps track of how much you are using the computer, and it reminds you to take regular breaks. It is designed to encourage healthy behaviour, with a mix of short breaks for your eyes and wrists, as well as longer breaks to keep your body moving and your mind on task.</p>
--<p>Break Timer is simple to set up, so you can pick a break schedule that works for you and it will carry on working in the background.</p>
--</_description>
--<screenshots>
--</screenshots>
--<url type="homepage">https://wiki.gnome.org/GnomeBreakTimer</url>
--<updatecontact>dylanmccall at ubuntu.com</updatecontact>
--</application>
-+ <description>
-+  <_p>Break Timer keeps track of how much you are using the computer, and it reminds you to take regular breaks. It is designed to encourage healthy behaviour, with a mix of short breaks for your eyes and wrists, as well as longer breaks to keep your body moving and your mind on task.</_p>
-+  <_p>Break Timer is simple to set up, so you can pick a break schedule that works for you and it will carry on working in the background.</_p>
-+ </description>
-+ <screenshots>
-+  <screenshot>
-+   <image>https://i0.wp.com/dylanmc.ca/wp-content/uploads/Screenshot-from-2013-09-13-183224.png</image>
-+  </screenshot>
-+  <screenshot type="default">
-+   <image>https://i0.wp.com/dylanmc.ca/wp-content/uploads/Screenshot-from-2013-09-13-182608.png</image>
-+  </screenshot>
-+ </screenshots>
-+ <url type="bugtracker">https://gitlab.gnome.org/GNOME/gnome-break-timer/issues</url>
-+ <url type="homepage">https://wiki.gnome.org/Apps/BreakTimer</url>
-+ <update_contact>dylanmccall at ubuntu.com</update_contact>
-+</component>
--- 
-2.20.1
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-10 12:06:36 UTC (rev 817039)
+++ PKGBUILD	2021-01-10 12:08:10 UTC (rev 817040)
@@ -1,19 +1,17 @@
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=gnome-break-timer
-pkgver=1.1+47+ga51a32a
-pkgrel=3
+pkgver=2.0.3
+pkgrel=1
 pkgdesc="Keeps track of how much you are using the computer, and it reminds you to take regular breaks"
 arch=('x86_64')
 url="https://wiki.gnome.org/Apps/BreakTimer"
 license=('GPL3')
-depends=('gtk3' 'libcanberra' 'libgee' 'libnotify')
-makedepends=('intltool' 'git' 'gobject-introspection' 'vala')
-_commit=a51a32a3c64110d8aafae2f21492754f693cd973  # master
-source=("git+https://gitlab.gnome.org/GNOME/gnome-break-timer#commit=$_commit"
-        0001-Fix-AppStream-metadata-validation.patch)
-sha256sums=('SKIP'
-            'b043a8f1687438df61199ea32f614f4541cbe1253b676761c561c24b2eded9d1')
+depends=('gtk3' 'libcanberra' 'libgee' 'libnotify' 'gsound')
+makedepends=('meson' 'intltool' 'git' 'gobject-introspection' 'vala')
+_commit=65e7d6c536b9f1ed4c2ee21839f4ea8633ff3c50
+source=("git+https://gitlab.gnome.org/GNOME/gnome-break-timer#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -20,23 +18,12 @@
   git describe --tags | sed 's/-/+/g'
 }
 
-prepare() {
-  cd $pkgname
-  patch -Np1 -i ../0001-Fix-AppStream-metadata-validation.patch
-  sed -i 's/gee-1.0/gee-0.8/' configure.ac helper/helper.am settings/settings.am
-  sed -i 's|$(top_builddir)/helper/libgnome_break_timer_service.la|libgnome_break_timer_service.la|' helper/Makefile.am
-
-  NOCONFIGURE=1 ./autogen.sh
-}
-
 build() {
-  cd $pkgname
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-schemas-compile
-  make
+  arch-meson $pkgname build \
+    --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  ninja -C build
 }
 
 package() {
-  cd $pkgname
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" ninja install -C build
 }



More information about the arch-commits mailing list