[arch-commits] Commit in osmo/trunk (3 files)

[Jan de Groot]

    Date: Monday, October 28, 2013 @ 17:12:55
  Author: jgc
Revision: 99426

upgpkg: osmo 0.2.12-1

Update to svn version, drops libwebkitgtk2 dependency

Added:
  osmo/trunk/osmo-0.2.10-configure.patch
Modified:
  osmo/trunk/PKGBUILD
  osmo/trunk/osmo.install

-----------------------------+
 PKGBUILD                    |   34 ++++++++++++++++++----------------
 osmo-0.2.10-configure.patch |   24 ++++++++++++++++++++++++
 osmo.install                |    2 +-
 3 files changed, 43 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-28 14:29:30 UTC (rev 99425)
+++ PKGBUILD	2013-10-28 16:12:55 UTC (rev 99426)
@@ -4,33 +4,35 @@
 # Contributor: Benzo <mb_benzo at yahoo.es>
 
 pkgname=osmo
-pkgver=0.2.10
-pkgrel=8
+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=('gtk2>=2.12' 'gtkspell' 'hicolor-icon-theme' 'libical' 'libnotify'  'libgtkhtml' 'libgringotts>=1.2.1' 'libxml2')
+depends=('gtkspell' 'hicolor-icon-theme' 'libical' 'libnotify' 'webkitgtk2' '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')
+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 "$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
-
+  cd osmo-pim
+  ./configure --prefix=/usr
   make 
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd osmo-pim
   make DESTDIR="$pkgdir" install
 }

Added: osmo-0.2.10-configure.patch
===================================================================
--- osmo-0.2.10-configure.patch	                        (rev 0)
+++ osmo-0.2.10-configure.patch	2013-10-28 16:12:55 UTC (rev 99426)
@@ -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([

Modified: osmo.install
===================================================================
--- osmo.install	2013-10-28 14:29:30 UTC (rev 99425)
+++ osmo.install	2013-10-28 16:12:55 UTC (rev 99426)
@@ -1,5 +1,5 @@
 post_install() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
 post_upgrade() {