diff options
| author | 0b100100 | 2022-02-03 23:55:14 +0100 |
|---|---|---|
| committer | 0b100100 | 2022-02-04 00:09:11 +0100 |
| commit | 4a8a0f0cb05f117235dc4dd03b430a570b8a9441 (patch) | |
| tree | 6482dc9e4e483b1cd1a82cead17514e1f3716ecb | |
| parent | 489e9d8f9fe47b2e93794fdf699f81e2d112fe1d (diff) | |
| download | aur-4a8a0f0cb05f117235dc4dd03b430a570b8a9441.tar.gz | |
Revive the package since upstream is active again
Fix the url and source
Change the group
Adapt new dependencies
Remove the libical3 patch
Adapt libexecdir to the guidelines
Disable the debug mode
| -rw-r--r-- | .SRCINFO | 20 | ||||
| -rw-r--r-- | PKGBUILD | 50 | ||||
| -rw-r--r-- | libical3.patch | 59 |
3 files changed, 32 insertions, 97 deletions
@@ -1,23 +1,21 @@ pkgbase = orage-git pkgdesc = A simple calendar application with reminders for Xfce - pkgver = 4.12.1.r319.g11aa2e5f + pkgver = 4.12.1.r546.g9474e560 pkgrel = 1 - url = http://www.xfce.org + url = https://docs.xfce.org/apps/orage/start arch = i686 arch = x86_64 - groups = xfce4-git + groups = xfce4-goodies license = GPL2 makedepends = git - makedepends = intltool - makedepends = pkgconfig - makedepends = xfce4-dev-tools-git - depends = hicolor-icon-theme - depends = xfce4-panel-git + makedepends = xfce4-dev-tools + depends = xfce4-panel depends = libnotify + depends = dbus-glib + depends = libical provides = orage conflicts = orage - source = orage::git://git.xfce.org/apps/orage - md5sums = SKIP + source = orage::git+https://gitlab.xfce.org/apps/orage.git + sha512sums = SKIP pkgname = orage-git - @@ -1,47 +1,43 @@ -# Maintainer: Frederic Bezies <fredbezies at gmail dot com> +# Maintainer: 0b100100 <0b100100 at protonmail dot ch> +# Contributor: Frederic Bezies <fredbezies at gmail dot com> # Contributor: Baurzhan Muftakhidinov <baurthefirst@gmail.com> # Contributor: Pablo Lezaeta <prflr88@gmail.com> -_pkgname=orage -pkgname=${_pkgname}-git -pkgver=4.12.1.r319.g11aa2e5f +pkgname=orage-git +pkgver=4.12.1.r546.g9474e560 pkgrel=1 pkgdesc="A simple calendar application with reminders for Xfce" arch=("i686" "x86_64") license=('GPL2') -url="http://www.xfce.org" -groups=('xfce4-git') -depends=('hicolor-icon-theme' 'xfce4-panel-git' 'libnotify') -makedepends=('git' 'intltool' 'pkgconfig' 'xfce4-dev-tools-git') +url="https://docs.xfce.org/apps/orage/start" +groups=('xfce4-goodies') +depends=('xfce4-panel' 'libnotify' 'dbus-glib' 'libical') +makedepends=('git' 'xfce4-dev-tools') provides=("orage") conflicts=("orage") -source=("${_pkgname}::git://git.xfce.org/apps/$_pkgname") -md5sums=('SKIP') +source=("${pkgname%-git}::git+https://gitlab.xfce.org/apps/${pkgname%-git}.git") +sha512sums=('SKIP') pkgver() { - cd "${_pkgname}" - git describe --long | sed 's/^orage-//;s/\([^-]*-g\)/r\1/;s/-/./g' -} - -prepare() { - - cd "${_pkgname}" - # https://bugzilla.redhat.com/show_bug.cgi?id=1512302 - patch -Np1 -i ../../libical3.patch - + cd "${pkgname%-git}" + git describe --long | sed 's/^orage-//;s/\([^-]*-g\)/r\1/;s/-/./g' } build() { - - cd "${srcdir}/${_pkgname}" - - ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ - --localstatedir=/var --disable-static --enable-debug=minimum \ - --enable-maintainer-mode + cd "${pkgname%-git}" + ./autogen.sh \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/xfce4 \ + --localstatedir=/var \ + --disable-static \ + --disable-debug make } package() { - cd "${srcdir}/${_pkgname}" + cd "${pkgname%-git}" make DESTDIR="${pkgdir}" install } + +# vim:set ts=2 sw=2 et: diff --git a/libical3.patch b/libical3.patch deleted file mode 100644 index af962b36757e..000000000000 --- a/libical3.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -up orage-4.12.1/src/ical-code.c.libical-3.0 orage-4.12.1/src/ical-code.c ---- orage-4.12.1/src/ical-code.c.libical-3.0 2017-11-14 08:41:30.917375493 +0100 -+++ orage-4.12.1/src/ical-code.c 2017-11-14 08:41:56.823375135 +0100 -@@ -129,7 +129,6 @@ static struct icaltimetype ical_get_curr - && (strcmp(g_par.local_timezone, "floating") != 0)) - ctime = icaltime_current_time_with_zone(local_icaltimezone); - else { / * use floating time * / -- ctime.is_utc = 0; - ctime.is_date = 0; - ctime.is_daylight = 0; - ctime.zone = NULL; -@@ -2579,7 +2578,6 @@ static struct icaltimetype count_first_a - * when counting alarm time. */ - if (rel == ICAL_RELATED_START) { - per.stime.is_date = 0; -- per.stime.is_utc = 1; - per.stime.is_daylight = 0; - per.stime.zone = utc_icaltimezone; - per.stime.hour = 0; -@@ -2588,7 +2586,6 @@ static struct icaltimetype count_first_a - } - else { - per.etime.is_date = 0; -- per.etime.is_utc = 1; - per.etime.is_daylight = 0; - per.etime.zone = utc_icaltimezone; - per.etime.hour = 0; -@@ -2613,7 +2610,6 @@ static struct icaltimetype count_next_al - /* HACK: convert to UTC time so that we can use time arithmetic - * when counting alarm time. */ - start_time.is_date = 0; -- start_time.is_utc = 1; - start_time.is_daylight = 0; - start_time.zone = utc_icaltimezone; - start_time.hour = 0; -@@ -2768,7 +2764,6 @@ static alarm_struct *process_alarm_trigg - */ - if (icaltime_is_date(per.stime)) { - if (local_icaltimezone != utc_icaltimezone) { -- next_alarm_time.is_utc = 0; - next_alarm_time.is_daylight = 0; - next_alarm_time.zone = local_icaltimezone; - } -@@ -2850,7 +2845,6 @@ orage_message(120, P_N "Alarm rec loop n - */ - if (icaltime_is_date(per.stime)) { - if (local_icaltimezone != utc_icaltimezone) { -- next_alarm_time.is_utc = 0; - next_alarm_time.is_daylight = 0; - next_alarm_time.zone = local_icaltimezone; - } -@@ -2944,7 +2938,6 @@ orage_message(120, P_N "*****After loop - */ - if (icaltime_is_date(per.stime)) { - if (local_icaltimezone != utc_icaltimezone) { -- next_alarm_time.is_utc = 0; - next_alarm_time.is_daylight = 0; - next_alarm_time.zone = local_icaltimezone; - } |