[arch-commits] Commit in osmo/repos (18 files)
Jan de Groot
jgc at nymeria.archlinux.org
Mon Oct 28 16:13:05 UTC 2013
Date: Monday, October 28, 2013 @ 17:13:05
Author: jgc
Revision: 99427
archrelease: copy trunk to community-i686, community-x86_64
Added:
osmo/repos/community-i686/ChangeLog
(from rev 99426, osmo/trunk/ChangeLog)
osmo/repos/community-i686/PKGBUILD
(from rev 99426, osmo/trunk/PKGBUILD)
osmo/repos/community-i686/osmo-0.2.10-configure.patch
(from rev 99426, osmo/trunk/osmo-0.2.10-configure.patch)
osmo/repos/community-i686/osmo-0.2.10-libnotify-0.7.patch
(from rev 99426, osmo/trunk/osmo-0.2.10-libnotify-0.7.patch)
osmo/repos/community-i686/osmo.install
(from rev 99426, osmo/trunk/osmo.install)
osmo/repos/community-x86_64/ChangeLog
(from rev 99426, osmo/trunk/ChangeLog)
osmo/repos/community-x86_64/PKGBUILD
(from rev 99426, osmo/trunk/PKGBUILD)
osmo/repos/community-x86_64/osmo-0.2.10-configure.patch
(from rev 99426, osmo/trunk/osmo-0.2.10-configure.patch)
osmo/repos/community-x86_64/osmo-0.2.10-libnotify-0.7.patch
(from rev 99426, osmo/trunk/osmo-0.2.10-libnotify-0.7.patch)
osmo/repos/community-x86_64/osmo.install
(from rev 99426, osmo/trunk/osmo.install)
Deleted:
osmo/repos/community-i686/ChangeLog
osmo/repos/community-i686/PKGBUILD
osmo/repos/community-i686/osmo-0.2.10-libnotify-0.7.patch
osmo/repos/community-i686/osmo.install
osmo/repos/community-x86_64/ChangeLog
osmo/repos/community-x86_64/PKGBUILD
osmo/repos/community-x86_64/osmo-0.2.10-libnotify-0.7.patch
osmo/repos/community-x86_64/osmo.install
--------------------------------------------------+
/ChangeLog | 24 +++++
/PKGBUILD | 76 ++++++++++++++++
/osmo-0.2.10-libnotify-0.7.patch | 96 +++++++++++++++++++++
/osmo.install | 24 +++++
community-i686/ChangeLog | 12 --
community-i686/PKGBUILD | 36 -------
community-i686/osmo-0.2.10-configure.patch | 24 +++++
community-i686/osmo-0.2.10-libnotify-0.7.patch | 48 ----------
community-i686/osmo.install | 12 --
community-x86_64/ChangeLog | 12 --
community-x86_64/PKGBUILD | 36 -------
community-x86_64/osmo-0.2.10-configure.patch | 24 +++++
community-x86_64/osmo-0.2.10-libnotify-0.7.patch | 48 ----------
community-x86_64/osmo.install | 12 --
14 files changed, 268 insertions(+), 216 deletions(-)
Deleted: community-i686/ChangeLog
===================================================================
--- community-i686/ChangeLog 2013-10-28 16:12:55 UTC (rev 99426)
+++ community-i686/ChangeLog 2013-10-28 16:13:05 UTC (rev 99427)
@@ -1,12 +0,0 @@
-2010-04-04 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
- * FS#18941 solved
-
-2010-04-02 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
- * Update to major release 0.2.10
-
-2009-03-26 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
- * FS#13879 solved
-
-2009-03-17 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
- * Updated to major version 0.2.6
-
Copied: osmo/repos/community-i686/ChangeLog (from rev 99426, osmo/trunk/ChangeLog)
===================================================================
--- community-i686/ChangeLog (rev 0)
+++ community-i686/ChangeLog 2013-10-28 16:13:05 UTC (rev 99427)
@@ -0,0 +1,12 @@
+2010-04-04 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+ * FS#18941 solved
+
+2010-04-02 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+ * Update to major release 0.2.10
+
+2009-03-26 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+ * FS#13879 solved
+
+2009-03-17 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+ * Updated to major version 0.2.6
+
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-10-28 16:12:55 UTC (rev 99426)
+++ community-i686/PKGBUILD 2013-10-28 16:13:05 UTC (rev 99427)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
-# Contributor: Benzo <mb_benzo at yahoo.es>
-
-pkgname=osmo
-pkgver=0.2.10
-pkgrel=8
-pkgdesc="A handy personal organizer"
-arch=('i686' 'x86_64')
-url="http://clayo.org/osmo/"
-license=('GPL')
-depends=('gtk2>=2.12' 'gtkspell' 'hicolor-icon-theme' 'libical' 'libnotify' 'libgtkhtml' 'libgringotts>=1.2.1' 'libxml2')
-makedepends=('pkgconfig' 'libtar')
-optdepends=('sox: to play sounds')
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/osmo-pim/$pkgname-$pkgver.tar.gz"
- 'osmo-0.2.10-libnotify-0.7.patch')
-md5sums=('a774db748228efee96186158d553ade9'
- '0b146a548f2d3208dc88e6501a8f3448')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- patch -Np0 -i "$srcdir/osmo-0.2.10-libnotify-0.7.patch"
-
- #libical 0.4.4 workaround
- LIBICAL_CFLAGS='-I/usr/include/libical' ./configure --prefix=/usr
-
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
Copied: osmo/repos/community-i686/PKGBUILD (from rev 99426, osmo/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-10-28 16:13:05 UTC (rev 99427)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
+# Contributor: Benzo <mb_benzo at yahoo.es>
+
+pkgname=osmo
+pkgver=0.2.12
+pkgrel=1
+pkgdesc="A handy personal organizer"
+_svnver=937
+arch=('i686' 'x86_64')
+url="http://clayo.org/osmo/"
+license=('GPL')
+depends=('gtkspell' 'hicolor-icon-theme' 'libical' 'libnotify' 'webkitgtk2' 'libgringotts>=1.2.1' 'libxml2')
+makedepends=('pkgconfig' 'libtar')
+optdepends=('sox: to play sounds')
+install=osmo.install
+source=(ftp://ftp.archlinux.org/other/community/osmo-${_svnver}.tar.xz
+ osmo-0.2.10-configure.patch)
+md5sums=('ddcd0b23a24d8f1ec5abc904742233bf'
+ '122fc15441b6215081772a00aa532394')
+
+prepare() {
+ cd osmo-pim
+ patch -Np1 -i ../osmo-0.2.10-configure.patch
+ autoreconf -fi
+}
+
+build() {
+ cd osmo-pim
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd osmo-pim
+ make DESTDIR="$pkgdir" install
+}
Copied: osmo/repos/community-i686/osmo-0.2.10-configure.patch (from rev 99426, osmo/trunk/osmo-0.2.10-configure.patch)
===================================================================
--- community-i686/osmo-0.2.10-configure.patch (rev 0)
+++ community-i686/osmo-0.2.10-configure.patch 2013-10-28 16:13:05 UTC (rev 99427)
@@ -0,0 +1,24 @@
+--- osmo-pim/configure.ac 2011-08-15 19:06:25.184165142 -0700
++++ osmo-pim/configure.ac.new 2011-08-15 19:35:19.285312355 -0700
+@@ -4,7 +4,7 @@
+ AC_PREREQ(2.61)
+ AC_INIT([Osmo], [0.2.12], [pasp at users.sf.net])
+ AC_CONFIG_MACRO_DIR([m4])
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
++AM_INIT_AUTOMAKE([-Werror foreign])
+ AC_CONFIG_SRCDIR([src/contacts.c])
+ AC_CONFIG_HEADER([config.h])
+ AC_MSG_CHECKING(for type of build)
+@@ -245,9 +245,9 @@
+ [configdir=$withval AC_SUBST([configdir])])
+ AM_CONDITIONAL([CONFIGDIR], [test x$configdir != x])
+
+-CFLAGS=${CFLAGS:="$BUILD_CFLAGS -Wall $PLATFORM_CFLAGS -D_GNU_SOURCE"}
+-CXXFLAGS=${CXXFLAGS:="$CFLAGS"}
+-CPPFLAGS=""
++CFLAGS="$BUILD_CFLAGS -Wall $PLATFORM_CFLAGS $CFLAGS"
++CXXFLAGS="$CFLAGS $CXXFLAGS"
++CPPFLAGS="-D_GNU_SOURCE"
+ LIBS="$gringotts_LIBS"
+
+ AC_CONFIG_FILES([
Deleted: community-i686/osmo-0.2.10-libnotify-0.7.patch
===================================================================
--- community-i686/osmo-0.2.10-libnotify-0.7.patch 2013-10-28 16:12:55 UTC (rev 99426)
+++ community-i686/osmo-0.2.10-libnotify-0.7.patch 2013-10-28 16:13:05 UTC (rev 99427)
@@ -1,48 +0,0 @@
-http://pkgs.fedoraproject.org/gitweb/?p=osmo.git;a=blob_plain;f=osmo-0.2.10-libnotify-0.7.0.patch;hb=HEAD
-
---- src/check_events.c
-+++ src/check_events.c
-@@ -454,9 +454,9 @@
- a->date = 0;
-
- if (textdesc != NULL)
-- a->notify = notify_notification_new (item->summary, textdesc, GTK_STOCK_DIALOG_WARNING, NULL);
-+ a->notify = notify_notification_new (item->summary, textdesc, GTK_STOCK_DIALOG_WARNING);
- else
-- a->notify = notify_notification_new (item->summary, text, GTK_STOCK_DIALOG_WARNING, NULL);
-+ a->notify = notify_notification_new (item->summary, text, GTK_STOCK_DIALOG_WARNING);
-
- g_free (textdesc);
- g_free (text);
-@@ -483,9 +483,6 @@
- #endif /* HAVE_LIBNOTIFY */
-
- if (gtk_status_icon_get_visible (appGUI->osmo_trayicon)) {
--#ifdef HAVE_LIBNOTIFY
-- notify_notification_attach_to_status_icon (a->notify, appGUI->osmo_trayicon);
--#endif /* HAVE_LIBNOTIFY */
- gtk_status_icon_set_from_stock (appGUI->osmo_trayicon, OSMO_STOCK_SYSTRAY_TASK);
-
- if (config.blink_on_events) {
-@@ -532,9 +529,9 @@
- a->time = -1;
- a->date = 0;
- if (textdesc != NULL)
-- a->notify = notify_notification_new (_("Alarm warning!"), textdesc, GTK_STOCK_DIALOG_INFO, NULL);
-+ a->notify = notify_notification_new (_("Alarm warning!"), textdesc, GTK_STOCK_DIALOG_INFO);
- else
-- a->notify = notify_notification_new (_("Alarm warning!"), text, GTK_STOCK_DIALOG_INFO, NULL);
-+ a->notify = notify_notification_new (_("Alarm warning!"), text, GTK_STOCK_DIALOG_INFO);
-
- notify_notification_set_timeout (a->notify, NOTIFY_EXPIRES_NEVER);
- notify_notification_set_urgency (a->notify, NOTIFY_URGENCY_NORMAL);
-@@ -545,9 +542,6 @@
- #endif /* HAVE_LIBNOTIFY */
-
- if (gtk_status_icon_get_visible (appGUI->osmo_trayicon)) {
--#ifdef HAVE_LIBNOTIFY
-- notify_notification_attach_to_status_icon (a->notify, appGUI->osmo_trayicon);
--#endif /* HAVE_LIBNOTIFY */
- gtk_status_icon_set_from_stock (appGUI->osmo_trayicon, OSMO_STOCK_SYSTRAY_TASK);
-
- if (config.blink_on_events) {
Copied: osmo/repos/community-i686/osmo-0.2.10-libnotify-0.7.patch (from rev 99426, osmo/trunk/osmo-0.2.10-libnotify-0.7.patch)
===================================================================
--- community-i686/osmo-0.2.10-libnotify-0.7.patch (rev 0)
+++ community-i686/osmo-0.2.10-libnotify-0.7.patch 2013-10-28 16:13:05 UTC (rev 99427)
@@ -0,0 +1,48 @@
+http://pkgs.fedoraproject.org/gitweb/?p=osmo.git;a=blob_plain;f=osmo-0.2.10-libnotify-0.7.0.patch;hb=HEAD
+
+--- src/check_events.c
++++ src/check_events.c
+@@ -454,9 +454,9 @@
+ a->date = 0;
+
+ if (textdesc != NULL)
+- a->notify = notify_notification_new (item->summary, textdesc, GTK_STOCK_DIALOG_WARNING, NULL);
++ a->notify = notify_notification_new (item->summary, textdesc, GTK_STOCK_DIALOG_WARNING);
+ else
+- a->notify = notify_notification_new (item->summary, text, GTK_STOCK_DIALOG_WARNING, NULL);
++ a->notify = notify_notification_new (item->summary, text, GTK_STOCK_DIALOG_WARNING);
+
+ g_free (textdesc);
+ g_free (text);
+@@ -483,9 +483,6 @@
+ #endif /* HAVE_LIBNOTIFY */
+
+ if (gtk_status_icon_get_visible (appGUI->osmo_trayicon)) {
+-#ifdef HAVE_LIBNOTIFY
+- notify_notification_attach_to_status_icon (a->notify, appGUI->osmo_trayicon);
+-#endif /* HAVE_LIBNOTIFY */
+ gtk_status_icon_set_from_stock (appGUI->osmo_trayicon, OSMO_STOCK_SYSTRAY_TASK);
+
+ if (config.blink_on_events) {
+@@ -532,9 +529,9 @@
+ a->time = -1;
+ a->date = 0;
+ if (textdesc != NULL)
+- a->notify = notify_notification_new (_("Alarm warning!"), textdesc, GTK_STOCK_DIALOG_INFO, NULL);
++ a->notify = notify_notification_new (_("Alarm warning!"), textdesc, GTK_STOCK_DIALOG_INFO);
+ else
+- a->notify = notify_notification_new (_("Alarm warning!"), text, GTK_STOCK_DIALOG_INFO, NULL);
++ a->notify = notify_notification_new (_("Alarm warning!"), text, GTK_STOCK_DIALOG_INFO);
+
+ notify_notification_set_timeout (a->notify, NOTIFY_EXPIRES_NEVER);
+ notify_notification_set_urgency (a->notify, NOTIFY_URGENCY_NORMAL);
+@@ -545,9 +542,6 @@
+ #endif /* HAVE_LIBNOTIFY */
+
+ if (gtk_status_icon_get_visible (appGUI->osmo_trayicon)) {
+-#ifdef HAVE_LIBNOTIFY
+- notify_notification_attach_to_status_icon (a->notify, appGUI->osmo_trayicon);
+-#endif /* HAVE_LIBNOTIFY */
+ gtk_status_icon_set_from_stock (appGUI->osmo_trayicon, OSMO_STOCK_SYSTRAY_TASK);
+
+ if (config.blink_on_events) {
Deleted: community-i686/osmo.install
===================================================================
--- community-i686/osmo.install 2013-10-28 16:12:55 UTC (rev 99426)
+++ community-i686/osmo.install 2013-10-28 16:13:05 UTC (rev 99427)
@@ -1,12 +0,0 @@
-post_install() {
- which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
-
Copied: osmo/repos/community-i686/osmo.install (from rev 99426, osmo/trunk/osmo.install)
===================================================================
--- community-i686/osmo.install (rev 0)
+++ community-i686/osmo.install 2013-10-28 16:13:05 UTC (rev 99427)
@@ -0,0 +1,12 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
+
Deleted: community-x86_64/ChangeLog
===================================================================
--- community-x86_64/ChangeLog 2013-10-28 16:12:55 UTC (rev 99426)
+++ community-x86_64/ChangeLog 2013-10-28 16:13:05 UTC (rev 99427)
@@ -1,12 +0,0 @@
-2010-04-04 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
- * FS#18941 solved
-
-2010-04-02 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
- * Update to major release 0.2.10
-
-2009-03-26 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
- * FS#13879 solved
-
-2009-03-17 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
- * Updated to major version 0.2.6
-
Copied: osmo/repos/community-x86_64/ChangeLog (from rev 99426, osmo/trunk/ChangeLog)
===================================================================
--- community-x86_64/ChangeLog (rev 0)
+++ community-x86_64/ChangeLog 2013-10-28 16:13:05 UTC (rev 99427)
@@ -0,0 +1,12 @@
+2010-04-04 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+ * FS#18941 solved
+
+2010-04-02 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+ * Update to major release 0.2.10
+
+2009-03-26 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+ * FS#13879 solved
+
+2009-03-17 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+ * Updated to major version 0.2.6
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-10-28 16:12:55 UTC (rev 99426)
+++ community-x86_64/PKGBUILD 2013-10-28 16:13:05 UTC (rev 99427)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
-# Contributor: Benzo <mb_benzo at yahoo.es>
-
-pkgname=osmo
-pkgver=0.2.10
-pkgrel=8
-pkgdesc="A handy personal organizer"
-arch=('i686' 'x86_64')
-url="http://clayo.org/osmo/"
-license=('GPL')
-depends=('gtk2>=2.12' 'gtkspell' 'hicolor-icon-theme' 'libical' 'libnotify' 'libgtkhtml' 'libgringotts>=1.2.1' 'libxml2')
-makedepends=('pkgconfig' 'libtar')
-optdepends=('sox: to play sounds')
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/osmo-pim/$pkgname-$pkgver.tar.gz"
- 'osmo-0.2.10-libnotify-0.7.patch')
-md5sums=('a774db748228efee96186158d553ade9'
- '0b146a548f2d3208dc88e6501a8f3448')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- patch -Np0 -i "$srcdir/osmo-0.2.10-libnotify-0.7.patch"
-
- #libical 0.4.4 workaround
- LIBICAL_CFLAGS='-I/usr/include/libical' ./configure --prefix=/usr
-
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
Copied: osmo/repos/community-x86_64/PKGBUILD (from rev 99426, osmo/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-10-28 16:13:05 UTC (rev 99427)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
+# Contributor: Benzo <mb_benzo at yahoo.es>
+
+pkgname=osmo
+pkgver=0.2.12
+pkgrel=1
+pkgdesc="A handy personal organizer"
+_svnver=937
+arch=('i686' 'x86_64')
+url="http://clayo.org/osmo/"
+license=('GPL')
+depends=('gtkspell' 'hicolor-icon-theme' 'libical' 'libnotify' 'webkitgtk2' 'libgringotts>=1.2.1' 'libxml2')
+makedepends=('pkgconfig' 'libtar')
+optdepends=('sox: to play sounds')
+install=osmo.install
+source=(ftp://ftp.archlinux.org/other/community/osmo-${_svnver}.tar.xz
+ osmo-0.2.10-configure.patch)
+md5sums=('ddcd0b23a24d8f1ec5abc904742233bf'
+ '122fc15441b6215081772a00aa532394')
+
+prepare() {
+ cd osmo-pim
+ patch -Np1 -i ../osmo-0.2.10-configure.patch
+ autoreconf -fi
+}
+
+build() {
+ cd osmo-pim
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd osmo-pim
+ make DESTDIR="$pkgdir" install
+}
Copied: osmo/repos/community-x86_64/osmo-0.2.10-configure.patch (from rev 99426, osmo/trunk/osmo-0.2.10-configure.patch)
===================================================================
--- community-x86_64/osmo-0.2.10-configure.patch (rev 0)
+++ community-x86_64/osmo-0.2.10-configure.patch 2013-10-28 16:13:05 UTC (rev 99427)
@@ -0,0 +1,24 @@
+--- osmo-pim/configure.ac 2011-08-15 19:06:25.184165142 -0700
++++ osmo-pim/configure.ac.new 2011-08-15 19:35:19.285312355 -0700
+@@ -4,7 +4,7 @@
+ AC_PREREQ(2.61)
+ AC_INIT([Osmo], [0.2.12], [pasp at users.sf.net])
+ AC_CONFIG_MACRO_DIR([m4])
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
++AM_INIT_AUTOMAKE([-Werror foreign])
+ AC_CONFIG_SRCDIR([src/contacts.c])
+ AC_CONFIG_HEADER([config.h])
+ AC_MSG_CHECKING(for type of build)
+@@ -245,9 +245,9 @@
+ [configdir=$withval AC_SUBST([configdir])])
+ AM_CONDITIONAL([CONFIGDIR], [test x$configdir != x])
+
+-CFLAGS=${CFLAGS:="$BUILD_CFLAGS -Wall $PLATFORM_CFLAGS -D_GNU_SOURCE"}
+-CXXFLAGS=${CXXFLAGS:="$CFLAGS"}
+-CPPFLAGS=""
++CFLAGS="$BUILD_CFLAGS -Wall $PLATFORM_CFLAGS $CFLAGS"
++CXXFLAGS="$CFLAGS $CXXFLAGS"
++CPPFLAGS="-D_GNU_SOURCE"
+ LIBS="$gringotts_LIBS"
+
+ AC_CONFIG_FILES([
Deleted: community-x86_64/osmo-0.2.10-libnotify-0.7.patch
===================================================================
--- community-x86_64/osmo-0.2.10-libnotify-0.7.patch 2013-10-28 16:12:55 UTC (rev 99426)
+++ community-x86_64/osmo-0.2.10-libnotify-0.7.patch 2013-10-28 16:13:05 UTC (rev 99427)
@@ -1,48 +0,0 @@
-http://pkgs.fedoraproject.org/gitweb/?p=osmo.git;a=blob_plain;f=osmo-0.2.10-libnotify-0.7.0.patch;hb=HEAD
-
---- src/check_events.c
-+++ src/check_events.c
-@@ -454,9 +454,9 @@
- a->date = 0;
-
- if (textdesc != NULL)
-- a->notify = notify_notification_new (item->summary, textdesc, GTK_STOCK_DIALOG_WARNING, NULL);
-+ a->notify = notify_notification_new (item->summary, textdesc, GTK_STOCK_DIALOG_WARNING);
- else
-- a->notify = notify_notification_new (item->summary, text, GTK_STOCK_DIALOG_WARNING, NULL);
-+ a->notify = notify_notification_new (item->summary, text, GTK_STOCK_DIALOG_WARNING);
-
- g_free (textdesc);
- g_free (text);
-@@ -483,9 +483,6 @@
- #endif /* HAVE_LIBNOTIFY */
-
- if (gtk_status_icon_get_visible (appGUI->osmo_trayicon)) {
--#ifdef HAVE_LIBNOTIFY
-- notify_notification_attach_to_status_icon (a->notify, appGUI->osmo_trayicon);
--#endif /* HAVE_LIBNOTIFY */
- gtk_status_icon_set_from_stock (appGUI->osmo_trayicon, OSMO_STOCK_SYSTRAY_TASK);
-
- if (config.blink_on_events) {
-@@ -532,9 +529,9 @@
- a->time = -1;
- a->date = 0;
- if (textdesc != NULL)
-- a->notify = notify_notification_new (_("Alarm warning!"), textdesc, GTK_STOCK_DIALOG_INFO, NULL);
-+ a->notify = notify_notification_new (_("Alarm warning!"), textdesc, GTK_STOCK_DIALOG_INFO);
- else
-- a->notify = notify_notification_new (_("Alarm warning!"), text, GTK_STOCK_DIALOG_INFO, NULL);
-+ a->notify = notify_notification_new (_("Alarm warning!"), text, GTK_STOCK_DIALOG_INFO);
-
- notify_notification_set_timeout (a->notify, NOTIFY_EXPIRES_NEVER);
- notify_notification_set_urgency (a->notify, NOTIFY_URGENCY_NORMAL);
-@@ -545,9 +542,6 @@
- #endif /* HAVE_LIBNOTIFY */
-
- if (gtk_status_icon_get_visible (appGUI->osmo_trayicon)) {
--#ifdef HAVE_LIBNOTIFY
-- notify_notification_attach_to_status_icon (a->notify, appGUI->osmo_trayicon);
--#endif /* HAVE_LIBNOTIFY */
- gtk_status_icon_set_from_stock (appGUI->osmo_trayicon, OSMO_STOCK_SYSTRAY_TASK);
-
- if (config.blink_on_events) {
Copied: osmo/repos/community-x86_64/osmo-0.2.10-libnotify-0.7.patch (from rev 99426, osmo/trunk/osmo-0.2.10-libnotify-0.7.patch)
===================================================================
--- community-x86_64/osmo-0.2.10-libnotify-0.7.patch (rev 0)
+++ community-x86_64/osmo-0.2.10-libnotify-0.7.patch 2013-10-28 16:13:05 UTC (rev 99427)
@@ -0,0 +1,48 @@
+http://pkgs.fedoraproject.org/gitweb/?p=osmo.git;a=blob_plain;f=osmo-0.2.10-libnotify-0.7.0.patch;hb=HEAD
+
+--- src/check_events.c
++++ src/check_events.c
+@@ -454,9 +454,9 @@
+ a->date = 0;
+
+ if (textdesc != NULL)
+- a->notify = notify_notification_new (item->summary, textdesc, GTK_STOCK_DIALOG_WARNING, NULL);
++ a->notify = notify_notification_new (item->summary, textdesc, GTK_STOCK_DIALOG_WARNING);
+ else
+- a->notify = notify_notification_new (item->summary, text, GTK_STOCK_DIALOG_WARNING, NULL);
++ a->notify = notify_notification_new (item->summary, text, GTK_STOCK_DIALOG_WARNING);
+
+ g_free (textdesc);
+ g_free (text);
+@@ -483,9 +483,6 @@
+ #endif /* HAVE_LIBNOTIFY */
+
+ if (gtk_status_icon_get_visible (appGUI->osmo_trayicon)) {
+-#ifdef HAVE_LIBNOTIFY
+- notify_notification_attach_to_status_icon (a->notify, appGUI->osmo_trayicon);
+-#endif /* HAVE_LIBNOTIFY */
+ gtk_status_icon_set_from_stock (appGUI->osmo_trayicon, OSMO_STOCK_SYSTRAY_TASK);
+
+ if (config.blink_on_events) {
+@@ -532,9 +529,9 @@
+ a->time = -1;
+ a->date = 0;
+ if (textdesc != NULL)
+- a->notify = notify_notification_new (_("Alarm warning!"), textdesc, GTK_STOCK_DIALOG_INFO, NULL);
++ a->notify = notify_notification_new (_("Alarm warning!"), textdesc, GTK_STOCK_DIALOG_INFO);
+ else
+- a->notify = notify_notification_new (_("Alarm warning!"), text, GTK_STOCK_DIALOG_INFO, NULL);
++ a->notify = notify_notification_new (_("Alarm warning!"), text, GTK_STOCK_DIALOG_INFO);
+
+ notify_notification_set_timeout (a->notify, NOTIFY_EXPIRES_NEVER);
+ notify_notification_set_urgency (a->notify, NOTIFY_URGENCY_NORMAL);
+@@ -545,9 +542,6 @@
+ #endif /* HAVE_LIBNOTIFY */
+
+ if (gtk_status_icon_get_visible (appGUI->osmo_trayicon)) {
+-#ifdef HAVE_LIBNOTIFY
+- notify_notification_attach_to_status_icon (a->notify, appGUI->osmo_trayicon);
+-#endif /* HAVE_LIBNOTIFY */
+ gtk_status_icon_set_from_stock (appGUI->osmo_trayicon, OSMO_STOCK_SYSTRAY_TASK);
+
+ if (config.blink_on_events) {
Deleted: community-x86_64/osmo.install
===================================================================
--- community-x86_64/osmo.install 2013-10-28 16:12:55 UTC (rev 99426)
+++ community-x86_64/osmo.install 2013-10-28 16:13:05 UTC (rev 99427)
@@ -1,12 +0,0 @@
-post_install() {
- which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
-
Copied: osmo/repos/community-x86_64/osmo.install (from rev 99426, osmo/trunk/osmo.install)
===================================================================
--- community-x86_64/osmo.install (rev 0)
+++ community-x86_64/osmo.install 2013-10-28 16:13:05 UTC (rev 99427)
@@ -0,0 +1,12 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
+
More information about the arch-commits
mailing list