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

[Tobias Powalowski]

    Date: Tuesday, May 21, 2013 @ 17:02:48
  Author: tpowa
Revision: 186165

upgpkg: capi4hylafax 010300-9

remove rc.d scripts, added gcc48 compile patch

Added:
  capi4hylafax/trunk/capi4hylafax-compile-gcc48-fix.patch
Modified:
  capi4hylafax/trunk/PKGBUILD
Deleted:
  capi4hylafax/trunk/capi4hylafax.rc

--------------------------------------+
 PKGBUILD                             |   23 ++++++++++-----
 capi4hylafax-compile-gcc48-fix.patch |   11 +++++++
 capi4hylafax.rc                      |   49 ---------------------------------
 3 files changed, 27 insertions(+), 56 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-21 13:35:09 UTC (rev 186164)
+++ PKGBUILD	2013-05-21 15:02:48 UTC (rev 186165)
@@ -3,7 +3,7 @@
 
 pkgname=capi4hylafax
 pkgver=010300
-pkgrel=8
+pkgrel=9
 pkgdesc="capi plugin for hylafax to enable isdn faxing"
 arch=(i686 x86_64)
 url="ftp://ftp.avm.de/tools"
@@ -11,18 +11,24 @@
 depends=('glibc' 'isdn4k-utils' 'hylafax' 'gcc-libs' 'libtiff' 'dialog')
 source=(ftp://ftp.avm.de/tools/capi4hylafax.linux/capi4hylafax-01.03.00.tar.gz
 	config.faxCAPI 
-	capi4hylafax.rc
 	c2faxrecv.service
-	capi4hylafax.conf)
+	capi4hylafax.conf
+        capi4hylafax-compile-gcc48-fix.patch)
 
 install=capi4hylafax.install
 backup=(var/spool/hylafax/etc/config.faxCAPI)
 
-build() {
+prepare() {
   cd "$srcdir"/$pkgname-01.03.00
-# fix config file
+  # fix compiling with gcc48
+  patch -Np1 -i $srcdir/capi4hylafax-compile-gcc48-fix.patch
+  # fix config file
   sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' src/defaults.h.in
   autoreconf --force --install
+}
+
+build() {
+  cd "$srcdir"/$pkgname-01.03.00
   ./configure
   make
 }
@@ -33,7 +39,6 @@
   install -m755 -D src/faxrecv/c2faxrecv "$pkgdir"/usr/bin/c2faxrecv
   install -m755 -D setupconffile "$pkgdir"/usr/bin/c2faxaddmodem
   install -m644 -D "$srcdir"/config.faxCAPI "$pkgdir"/var/spool/hylafax/etc/config.faxCAPI
-  install -m755 -D "$srcdir"/capi4hylafax.rc "$pkgdir"/etc/rc.d/capi4hylafax
 # adding FIFO
   mkfifo "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
   chown 10 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
@@ -59,6 +64,10 @@
 }
 md5sums=('d37dc652ac80d1525ef8693be55ee67f'
          '653b60695d21c128f020a86274ca9192'
-         '1fe40c58289fa3ba625ce6fe2fdb3d07'
          'e2c085a00189ded0a659642c689a1be2'
          '7c41d4fa5c5ef7b1372813341fd0d02b')
+md5sums=('d37dc652ac80d1525ef8693be55ee67f'
+         '653b60695d21c128f020a86274ca9192'
+         'e2c085a00189ded0a659642c689a1be2'
+         '7c41d4fa5c5ef7b1372813341fd0d02b'
+         'fa01597396c5493f90243a8d9e2841c0')

Added: capi4hylafax-compile-gcc48-fix.patch
===================================================================
--- capi4hylafax-compile-gcc48-fix.patch	                        (rev 0)
+++ capi4hylafax-compile-gcc48-fix.patch	2013-05-21 15:02:48 UTC (rev 186165)
@@ -0,0 +1,11 @@
+--- capi4hylafax-01.03.00/src/standard/aStdLib.cpp.old	2013-05-21 16:55:37.031658830 +0200
++++ capi4hylafax-01.03.00/src/standard/aStdLib.cpp	2013-05-21 16:55:42.314905957 +0200
+@@ -233,7 +233,7 @@
+ 
+ tUInt a_pointer2string (void *pointer, tWiChar *string) {
+     tULong    p   = (tULong) pointer;
+-    tWiChar  *fmt = (sizeof (p) > 4) ? L"    .    :    .    " : L"    :    "; // must be symmetric!
++    const tWiChar  *fmt = (sizeof (p) > 4) ? L"    .    :    .    " : L"    :    "; // must be symmetric!
+     unsigned i  = s_strlen (fmt);
+ 
+     string[i] = '\0';

Deleted: capi4hylafax.rc
===================================================================
--- capi4hylafax.rc	2013-05-21 13:35:09 UTC (rev 186164)
+++ capi4hylafax.rc	2013-05-21 15:02:48 UTC (rev 186165)
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/c2faxrecv`
-case "$1" in
-  start)
-    stat_busy "Starting capi4hylafax"
-    if [ -z "$PID" ]; then
-    /usr/bin/c2faxrecv > /dev/null &
-       faxmodem faxCAPI
-    fi
-    if [ ! -f /var/run/faxq.pid ]; then
-       stat_fail
-       echo "ERROR: hylafax is not running"
-       exit 1
-    fi
-    if [ ! -f /var/run/hfaxd.pid ]; then
-    stat_fail
-    echo "ERROR: hylafax is not running"
-    exit 1
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon capi4hylafax
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping capi4hylafax"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon capi4hylafax
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0