[arch-commits] Commit in mtr/trunk (PKGBUILD mtr-glib2.patch)

[Ionuț Mircea Bîru]

    Date: Tuesday, February 26, 2013 @ 19:55:39
  Author: ioni
Revision: 178763

update to 0.83

Added:
  mtr/trunk/mtr-glib2.patch
Modified:
  mtr/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   27 ++++++++++++++++-----------
 mtr-glib2.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-26 18:22:51 UTC (rev 178762)
+++ PKGBUILD	2013-02-26 18:55:39 UTC (rev 178763)
@@ -4,30 +4,35 @@
 
 pkgbase=mtr
 pkgname=(mtr mtr-gtk)
-pkgver=0.82
+pkgver=0.83
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 makedepends=('ncurses' 'gtk2')
-source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz)
+source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz
+        mtr-glib2.patch)
 url="http://www.bitwizard.nl/mtr/"
-md5sums=('10601ea543fda3e51545c4bce195b64c')
+md5sums=('2e3a40f2da47748ad0053a5d678b9b4a'
+         '6bce08e1de7c6835bdda893847981bc8')
 
 build() {
-    install -d  "$srcdir/"{mtr-cli,mtr-gtk}
-    cd "$srcdir/mtr-cli"
-    ../$pkgbase-$pkgver/configure --prefix=/usr --disable-gtktest --without-gtk
+    patch -Np0 -i mtr-glib2.patch
+    cp -r  $pkgbase-$pkgver $pkgbase-cli
+    cd mtr-cli
+    ./bootstrap.sh
+    ./configure --prefix=/usr --without-gtk
     make
 
-    cd "$srcdir/mtr-gtk"
-    ../$pkgbase-$pkgver/configure --prefix=/usr
+    cd "$srcdir/$pkgbase-$pkgver"
+    ./bootstrap.sh
+    ./configure --prefix=/usr
     make
 }
 
 package_mtr() {
     pkgdesc="Combines the functionality of traceroute and ping into one tool (CLI version)"
-    depends=('ncurses')
-    cd "$srcdir/mtr-cli"
+    depends=('ncurses' 'glib2')
+    cd mtr-cli
     make DESTDIR="$pkgdir" install
 }
 
@@ -37,6 +42,6 @@
     conflicts=("mtr")
     provides=("mtr=$pkgver")
 
-    cd "$srcdir/mtr-gtk"
+    cd $pkgbase-$pkgver
     make DESTDIR="$pkgdir" install
 }

Added: mtr-glib2.patch
===================================================================
--- mtr-glib2.patch	                        (rev 0)
+++ mtr-glib2.patch	2013-02-26 18:55:39 UTC (rev 178763)
@@ -0,0 +1,26 @@
+diff -up mtr-0.83/configure.in.glib2 mtr-0.83/configure.in
+--- mtr-0.83/configure.in.glib2	2013-02-18 20:10:00.767417356 +0100
++++ mtr-0.83/configure.in	2013-02-18 20:10:53.549513018 +0100
+@@ -59,6 +59,8 @@ else
+ 	GTK_OBJ=""
+ fi
+ 
++PKG_CHECK_MODULES([GLIB2], [glib-2.0])
++
+ AC_CHECK_FUNC(socket, , 
+   AC_CHECK_LIB(socket, socket, , AC_MSG_ERROR(No socket library found)))
+ 
+diff -up mtr-0.83/Makefile.am.glib2 mtr-0.83/Makefile.am
+--- mtr-0.83/Makefile.am.glib2	2013-02-18 20:13:54.635841512 +0100
++++ mtr-0.83/Makefile.am	2013-02-18 20:16:17.877101679 +0100
+@@ -19,8 +19,9 @@ mtr_SOURCES = mtr.c \
+               mtr-gtk.h
+ EXTRA_mtr_SOURCES = curses.c \
+                     gtk.c
++AM_CFLAGS = $(GLIB2_CFLAGS)
+ mtr_DEPENDENCIES = $(GTK_OBJ) $(CURSES_OBJ)
+-mtr_LDFLAGS = $(GTK_OBJ) $(CURSES_OBJ)
++mtr_LDFLAGS = $(GTK_OBJ) $(GLIB2_LIBS) $(CURSES_OBJ)
+ 
+ EXTRA_DIST = SECURITY mtr.8 Makefile Makefile.dist
+ distclean-local: