Date: Wednesday, May 31, 2017 @ 07:07:12 Author: foutrelis Revision: 231440
archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: gnokii/repos/community-staging-i686/PKGBUILD (from rev 231439, gnokii/trunk/PKGBUILD) gnokii/repos/community-staging-i686/gnokii-config.patch (from rev 231439, gnokii/trunk/gnokii-config.patch) gnokii/repos/community-staging-i686/gnokii-gcc5.patch (from rev 231439, gnokii/trunk/gnokii-gcc5.patch) gnokii/repos/community-staging-i686/gnokii-gcc7.patch (from rev 231439, gnokii/trunk/gnokii-gcc7.patch) gnokii/repos/community-staging-i686/gnokii-lock.patch (from rev 231439, gnokii/trunk/gnokii-lock.patch) gnokii/repos/community-staging-i686/gnokii.install (from rev 231439, gnokii/trunk/gnokii.install) gnokii/repos/community-staging-x86_64/PKGBUILD (from rev 231439, gnokii/trunk/PKGBUILD) gnokii/repos/community-staging-x86_64/gnokii-config.patch (from rev 231439, gnokii/trunk/gnokii-config.patch) gnokii/repos/community-staging-x86_64/gnokii-gcc5.patch (from rev 231439, gnokii/trunk/gnokii-gcc5.patch) gnokii/repos/community-staging-x86_64/gnokii-gcc7.patch (from rev 231439, gnokii/trunk/gnokii-gcc7.patch) gnokii/repos/community-staging-x86_64/gnokii-lock.patch (from rev 231439, gnokii/trunk/gnokii-lock.patch) gnokii/repos/community-staging-x86_64/gnokii.install (from rev 231439, gnokii/trunk/gnokii.install) Deleted: gnokii/repos/community-staging-i686/PKGBUILD gnokii/repos/community-staging-i686/gnokii-config.patch gnokii/repos/community-staging-i686/gnokii-gcc5.patch gnokii/repos/community-staging-i686/gnokii-gcc7.patch gnokii/repos/community-staging-i686/gnokii-lock.patch gnokii/repos/community-staging-i686/gnokii.install gnokii/repos/community-staging-x86_64/PKGBUILD gnokii/repos/community-staging-x86_64/gnokii-config.patch gnokii/repos/community-staging-x86_64/gnokii-gcc5.patch gnokii/repos/community-staging-x86_64/gnokii-gcc7.patch gnokii/repos/community-staging-x86_64/gnokii-lock.patch gnokii/repos/community-staging-x86_64/gnokii.install ----------------------------------------------+ /PKGBUILD | 154 +++++++++++++++++++++++++ /gnokii-config.patch | 24 +++ /gnokii-gcc5.patch | 54 ++++++++ /gnokii-gcc7.patch | 26 ++++ /gnokii-lock.patch | 30 ++++ /gnokii.install | 6 community-staging-i686/PKGBUILD | 77 ------------ community-staging-i686/gnokii-config.patch | 12 - community-staging-i686/gnokii-gcc5.patch | 27 ---- community-staging-i686/gnokii-gcc7.patch | 13 -- community-staging-i686/gnokii-lock.patch | 15 -- community-staging-i686/gnokii.install | 3 community-staging-x86_64/PKGBUILD | 77 ------------ community-staging-x86_64/gnokii-config.patch | 12 - community-staging-x86_64/gnokii-gcc5.patch | 27 ---- community-staging-x86_64/gnokii-gcc7.patch | 13 -- community-staging-x86_64/gnokii-lock.patch | 15 -- community-staging-x86_64/gnokii.install | 3 18 files changed, 294 insertions(+), 294 deletions(-) Deleted: community-staging-i686/PKGBUILD =================================================================== --- community-staging-i686/PKGBUILD 2017-05-31 07:06:48 UTC (rev 231439) +++ community-staging-i686/PKGBUILD 2017-05-31 07:07:12 UTC (rev 231440) @@ -1,77 +0,0 @@ -# $Id$ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Roman Kyrylych <ro...@archlinux.org> -# Contributor: Aurelien Foret <orel...@chez.com> - -pkgname=gnokii -pkgver=0.6.31 -pkgrel=13 -pkgdesc="Tools and user space driver for use with mobile phones" -arch=('i686' 'x86_64') -url="http://www.gnokii.org/" -license=('GPL') -depends=('libusb-compat' 'libxpm' 'bluez-libs' 'libical' 'sqlite' 'systemd') -makedepends=('gtk2' 'libmariadb' 'postgresql-libs' 'intltool') -optdepends=('dialog: sendsms tool' - 'gtk2: xgnokii GUI' - 'libmariadb: smsd mysql backend' - 'postgresql-libs: smsd postgresql backend') -backup=('etc/gnokiirc') -install=$pkgname.install -source=("https://www.gnokii.org/download/$pkgname/$pkgname-$pkgver.tar.bz2" - 'gnokii-config.patch' - 'gnokii-lock.patch' - 'gnokii-gcc5.patch' - 'gnokii-gcc7.patch') -md5sums=('d9627f4a1152d3ea7806df4532850d5f' - 'b2961b52ac1f770c4704ccc50b64fde2' - '17b629db85a6bb2b98ca59941aa95295' - '5bcf2dadd31a826d1f80b53bb37d9bd0' - '338e376185ff5323c5fdd3538890f776') - -prepare() { - cd $pkgname-$pkgver - - # Set bindir location - patch -Np1 -i "$srcdir/gnokii-config.patch" - - # Set lock path - patch -Np1 -i "$srcdir/gnokii-lock.patch" - - # Fix build with GCC 5 (Fedora patch) - patch -Np1 -i "$srcdir/gnokii-gcc5.patch" - - # Fix build with GCC 7 - patch -Np1 -i "$srcdir/gnokii-gcc7.patch" -} - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \ - --enable-security - make - pushd xgnokii - make - popd -} - -package() { - cd $pkgname-$pkgver - - make DESTDIR="$pkgdir" install - pushd xgnokii - make DESTDIR="$pkgdir" install - popd - - # Install initial config file - install -Dm644 Docs/sample/gnokiirc "$pkgdir/etc/gnokiirc" - - # Fix file permission - chmod 755 "$pkgdir/usr/bin/sendsms" - - # Setup lock directory - install -dm755 "$pkgdir"/usr/lib/{sysusers,tmpfiles}.d - echo 'g lock - - -' > "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" - echo 'd /run/lock/lockdev 0775 root lock -' > "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" -} Copied: gnokii/repos/community-staging-i686/PKGBUILD (from rev 231439, gnokii/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2017-05-31 07:07:12 UTC (rev 231440) @@ -0,0 +1,77 @@ +# $Id$ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Roman Kyrylych <ro...@archlinux.org> +# Contributor: Aurelien Foret <orel...@chez.com> + +pkgname=gnokii +pkgver=0.6.31 +pkgrel=14 +pkgdesc="Tools and user space driver for use with mobile phones" +arch=('i686' 'x86_64') +url="http://www.gnokii.org/" +license=('GPL') +depends=('libusb-compat' 'libxpm' 'bluez-libs' 'libical' 'sqlite' 'systemd') +makedepends=('gtk2' 'libmariadb' 'postgresql-libs' 'intltool') +optdepends=('dialog: sendsms tool' + 'gtk2: xgnokii GUI' + 'libmariadb: smsd mysql backend' + 'postgresql-libs: smsd postgresql backend') +backup=('etc/gnokiirc') +install=$pkgname.install +source=("https://www.gnokii.org/download/$pkgname/$pkgname-$pkgver.tar.bz2" + 'gnokii-config.patch' + 'gnokii-lock.patch' + 'gnokii-gcc5.patch' + 'gnokii-gcc7.patch') +md5sums=('d9627f4a1152d3ea7806df4532850d5f' + 'b2961b52ac1f770c4704ccc50b64fde2' + '17b629db85a6bb2b98ca59941aa95295' + '5bcf2dadd31a826d1f80b53bb37d9bd0' + '338e376185ff5323c5fdd3538890f776') + +prepare() { + cd $pkgname-$pkgver + + # Set bindir location + patch -Np1 -i "$srcdir/gnokii-config.patch" + + # Set lock path + patch -Np1 -i "$srcdir/gnokii-lock.patch" + + # Fix build with GCC 5 (Fedora patch) + patch -Np1 -i "$srcdir/gnokii-gcc5.patch" + + # Fix build with GCC 7 + patch -Np1 -i "$srcdir/gnokii-gcc7.patch" +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \ + --enable-security + make + pushd xgnokii + make + popd +} + +package() { + cd $pkgname-$pkgver + + make DESTDIR="$pkgdir" install + pushd xgnokii + make DESTDIR="$pkgdir" install + popd + + # Install initial config file + install -Dm644 Docs/sample/gnokiirc "$pkgdir/etc/gnokiirc" + + # Fix file permission + chmod 755 "$pkgdir/usr/bin/sendsms" + + # Setup lock directory + install -dm755 "$pkgdir"/usr/lib/{sysusers,tmpfiles}.d + echo 'g lock - - -' > "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" + echo 'd /run/lock/lockdev 0775 root lock -' > "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" +} Deleted: community-staging-i686/gnokii-config.patch =================================================================== --- community-staging-i686/gnokii-config.patch 2017-05-31 07:06:48 UTC (rev 231439) +++ community-staging-i686/gnokii-config.patch 2017-05-31 07:07:12 UTC (rev 231440) @@ -1,12 +0,0 @@ -diff -Nura gnokii-0.6.31.orig/Docs/sample/gnokiirc gnokii-0.6.31/Docs/sample/gnokiirc ---- gnokii-0.6.31.orig/Docs/sample/gnokiirc 2011-12-02 15:53:04.000000000 +0100 -+++ gnokii-0.6.31/Docs/sample/gnokiirc 2012-02-18 12:49:26.957557504 +0100 -@@ -238,7 +238,7 @@ - # In particular ensure that mgnokiidev is in this location, with - # permissions 4750, owned by root, group gnokii. Ensure you - # are in the gnokii group and that the group exists... --bindir = /usr/local/sbin/ -+bindir = /usr/bin/ - - # Any entries in the following two sections will be set as environment - # variables when running the scripts. Copied: gnokii/repos/community-staging-i686/gnokii-config.patch (from rev 231439, gnokii/trunk/gnokii-config.patch) =================================================================== --- community-staging-i686/gnokii-config.patch (rev 0) +++ community-staging-i686/gnokii-config.patch 2017-05-31 07:07:12 UTC (rev 231440) @@ -0,0 +1,12 @@ +diff -Nura gnokii-0.6.31.orig/Docs/sample/gnokiirc gnokii-0.6.31/Docs/sample/gnokiirc +--- gnokii-0.6.31.orig/Docs/sample/gnokiirc 2011-12-02 15:53:04.000000000 +0100 ++++ gnokii-0.6.31/Docs/sample/gnokiirc 2012-02-18 12:49:26.957557504 +0100 +@@ -238,7 +238,7 @@ + # In particular ensure that mgnokiidev is in this location, with + # permissions 4750, owned by root, group gnokii. Ensure you + # are in the gnokii group and that the group exists... +-bindir = /usr/local/sbin/ ++bindir = /usr/bin/ + + # Any entries in the following two sections will be set as environment + # variables when running the scripts. Deleted: community-staging-i686/gnokii-gcc5.patch =================================================================== --- community-staging-i686/gnokii-gcc5.patch 2017-05-31 07:06:48 UTC (rev 231439) +++ community-staging-i686/gnokii-gcc5.patch 2017-05-31 07:07:12 UTC (rev 231440) @@ -1,27 +0,0 @@ -Patch by Robert Scheck <rob...@fedoraproject.org> for gnokii <= 0.6.31 to avoid -build failures with GCC 5.x as "gnokii-0.6.31/xgnokii/xgnokii.c:1209: undefined -reference to `GUI_HideAbout'" and "xgnokii-xgnokii_logos.o:(.data.rel+0xe0): -undefined reference to `CloseLogosWindow'". - ---- gnokii-0.6.31/xgnokii/xgnokii.c 2011-12-02 15:53:04.000000000 +0100 -+++ gnokii-0.6.31/xgnokii/xgnokii.c.gcc5 2015-06-20 15:49:59.000000000 +0200 -@@ -798,7 +798,7 @@ - } - - --inline void GUI_HideAbout(void) -+void GUI_HideAbout(void) - { - gtk_widget_hide(AboutDialog); - } ---- gnokii-0.6.31/xgnokii/xgnokii_logos.c 2011-12-02 15:53:04.000000000 +0100 -+++ gnokii-0.6.31/xgnokii/xgnokii_logos.c.gcc5 2015-06-20 15:50:15.000000000 +0200 -@@ -1304,7 +1304,7 @@ - return 0; - } - --inline void CloseLogosWindow(void) -+void CloseLogosWindow(void) - { - gtk_widget_hide(GUI_LogosWindow); - } Copied: gnokii/repos/community-staging-i686/gnokii-gcc5.patch (from rev 231439, gnokii/trunk/gnokii-gcc5.patch) =================================================================== --- community-staging-i686/gnokii-gcc5.patch (rev 0) +++ community-staging-i686/gnokii-gcc5.patch 2017-05-31 07:07:12 UTC (rev 231440) @@ -0,0 +1,27 @@ +Patch by Robert Scheck <rob...@fedoraproject.org> for gnokii <= 0.6.31 to avoid +build failures with GCC 5.x as "gnokii-0.6.31/xgnokii/xgnokii.c:1209: undefined +reference to `GUI_HideAbout'" and "xgnokii-xgnokii_logos.o:(.data.rel+0xe0): +undefined reference to `CloseLogosWindow'". + +--- gnokii-0.6.31/xgnokii/xgnokii.c 2011-12-02 15:53:04.000000000 +0100 ++++ gnokii-0.6.31/xgnokii/xgnokii.c.gcc5 2015-06-20 15:49:59.000000000 +0200 +@@ -798,7 +798,7 @@ + } + + +-inline void GUI_HideAbout(void) ++void GUI_HideAbout(void) + { + gtk_widget_hide(AboutDialog); + } +--- gnokii-0.6.31/xgnokii/xgnokii_logos.c 2011-12-02 15:53:04.000000000 +0100 ++++ gnokii-0.6.31/xgnokii/xgnokii_logos.c.gcc5 2015-06-20 15:50:15.000000000 +0200 +@@ -1304,7 +1304,7 @@ + return 0; + } + +-inline void CloseLogosWindow(void) ++void CloseLogosWindow(void) + { + gtk_widget_hide(GUI_LogosWindow); + } Deleted: community-staging-i686/gnokii-gcc7.patch =================================================================== --- community-staging-i686/gnokii-gcc7.patch 2017-05-31 07:06:48 UTC (rev 231439) +++ community-staging-i686/gnokii-gcc7.patch 2017-05-31 07:07:12 UTC (rev 231440) @@ -1,13 +0,0 @@ -diff --git a/common/gsm-filetypes.c b/common/gsm-filetypes.c -index b4ceea1..264420a 100644 ---- a/common/gsm-filetypes.c -+++ b/common/gsm-filetypes.c -@@ -1409,7 +1409,7 @@ static int get_next_token(char *src, int delim) - #define GET_NEXT_TOKEN() o = get_next_token(line + offset, ';') - #define STORE_TOKEN(a) strip_slashes(a, line + offset, sizeof(a) - 1, o - 1) - --inline int local_atoi(char *str, int len) -+int local_atoi(char *str, int len) - { - int retval; - char *aux = strndup(str, len); Copied: gnokii/repos/community-staging-i686/gnokii-gcc7.patch (from rev 231439, gnokii/trunk/gnokii-gcc7.patch) =================================================================== --- community-staging-i686/gnokii-gcc7.patch (rev 0) +++ community-staging-i686/gnokii-gcc7.patch 2017-05-31 07:07:12 UTC (rev 231440) @@ -0,0 +1,13 @@ +diff --git a/common/gsm-filetypes.c b/common/gsm-filetypes.c +index b4ceea1..264420a 100644 +--- a/common/gsm-filetypes.c ++++ b/common/gsm-filetypes.c +@@ -1409,7 +1409,7 @@ static int get_next_token(char *src, int delim) + #define GET_NEXT_TOKEN() o = get_next_token(line + offset, ';') + #define STORE_TOKEN(a) strip_slashes(a, line + offset, sizeof(a) - 1, o - 1) + +-inline int local_atoi(char *str, int len) ++int local_atoi(char *str, int len) + { + int retval; + char *aux = strndup(str, len); Deleted: community-staging-i686/gnokii-lock.patch =================================================================== --- community-staging-i686/gnokii-lock.patch 2017-05-31 07:06:48 UTC (rev 231439) +++ community-staging-i686/gnokii-lock.patch 2017-05-31 07:07:12 UTC (rev 231440) @@ -1,15 +0,0 @@ -diff -Naur gnokii-0.6.31.orig/common/misc.c gnokii-0.6.31/common/misc.c ---- gnokii-0.6.31.orig/common/misc.c 2011-12-02 15:53:04.000000000 +0100 -+++ gnokii-0.6.31/common/misc.c 2013-08-12 18:38:41.021668458 +0200 -@@ -448,9 +448,9 @@ - - #define BUFFER_MAX_LENGTH 128 - #if defined (__svr4__) --# define lock_path "/var/run/LCK.." -+# define lock_path "/var/run/lockdev/LCK.." - #else --# define lock_path "/var/lock/LCK.." -+# define lock_path "/var/lock/lockdev/LCK.." - #endif - - /* Lock the device. Return allocated string with a lock name */ Copied: gnokii/repos/community-staging-i686/gnokii-lock.patch (from rev 231439, gnokii/trunk/gnokii-lock.patch) =================================================================== --- community-staging-i686/gnokii-lock.patch (rev 0) +++ community-staging-i686/gnokii-lock.patch 2017-05-31 07:07:12 UTC (rev 231440) @@ -0,0 +1,15 @@ +diff -Naur gnokii-0.6.31.orig/common/misc.c gnokii-0.6.31/common/misc.c +--- gnokii-0.6.31.orig/common/misc.c 2011-12-02 15:53:04.000000000 +0100 ++++ gnokii-0.6.31/common/misc.c 2013-08-12 18:38:41.021668458 +0200 +@@ -448,9 +448,9 @@ + + #define BUFFER_MAX_LENGTH 128 + #if defined (__svr4__) +-# define lock_path "/var/run/LCK.." ++# define lock_path "/var/run/lockdev/LCK.." + #else +-# define lock_path "/var/lock/LCK.." ++# define lock_path "/var/lock/lockdev/LCK.." + #endif + + /* Lock the device. Return allocated string with a lock name */ Deleted: community-staging-i686/gnokii.install =================================================================== --- community-staging-i686/gnokii.install 2017-05-31 07:06:48 UTC (rev 231439) +++ community-staging-i686/gnokii.install 2017-05-31 07:07:12 UTC (rev 231440) @@ -1,3 +0,0 @@ -post_install() { - echo "Users need to be in 'lock' and 'uucp' groups to connect to devices" -} Copied: gnokii/repos/community-staging-i686/gnokii.install (from rev 231439, gnokii/trunk/gnokii.install) =================================================================== --- community-staging-i686/gnokii.install (rev 0) +++ community-staging-i686/gnokii.install 2017-05-31 07:07:12 UTC (rev 231440) @@ -0,0 +1,3 @@ +post_install() { + echo "Users need to be in 'lock' and 'uucp' groups to connect to devices" +} Deleted: community-staging-x86_64/PKGBUILD =================================================================== --- community-staging-x86_64/PKGBUILD 2017-05-31 07:06:48 UTC (rev 231439) +++ community-staging-x86_64/PKGBUILD 2017-05-31 07:07:12 UTC (rev 231440) @@ -1,77 +0,0 @@ -# $Id$ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Roman Kyrylych <ro...@archlinux.org> -# Contributor: Aurelien Foret <orel...@chez.com> - -pkgname=gnokii -pkgver=0.6.31 -pkgrel=13 -pkgdesc="Tools and user space driver for use with mobile phones" -arch=('i686' 'x86_64') -url="http://www.gnokii.org/" -license=('GPL') -depends=('libusb-compat' 'libxpm' 'bluez-libs' 'libical' 'sqlite' 'systemd') -makedepends=('gtk2' 'libmariadb' 'postgresql-libs' 'intltool') -optdepends=('dialog: sendsms tool' - 'gtk2: xgnokii GUI' - 'libmariadb: smsd mysql backend' - 'postgresql-libs: smsd postgresql backend') -backup=('etc/gnokiirc') -install=$pkgname.install -source=("https://www.gnokii.org/download/$pkgname/$pkgname-$pkgver.tar.bz2" - 'gnokii-config.patch' - 'gnokii-lock.patch' - 'gnokii-gcc5.patch' - 'gnokii-gcc7.patch') -md5sums=('d9627f4a1152d3ea7806df4532850d5f' - 'b2961b52ac1f770c4704ccc50b64fde2' - '17b629db85a6bb2b98ca59941aa95295' - '5bcf2dadd31a826d1f80b53bb37d9bd0' - '338e376185ff5323c5fdd3538890f776') - -prepare() { - cd $pkgname-$pkgver - - # Set bindir location - patch -Np1 -i "$srcdir/gnokii-config.patch" - - # Set lock path - patch -Np1 -i "$srcdir/gnokii-lock.patch" - - # Fix build with GCC 5 (Fedora patch) - patch -Np1 -i "$srcdir/gnokii-gcc5.patch" - - # Fix build with GCC 7 - patch -Np1 -i "$srcdir/gnokii-gcc7.patch" -} - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \ - --enable-security - make - pushd xgnokii - make - popd -} - -package() { - cd $pkgname-$pkgver - - make DESTDIR="$pkgdir" install - pushd xgnokii - make DESTDIR="$pkgdir" install - popd - - # Install initial config file - install -Dm644 Docs/sample/gnokiirc "$pkgdir/etc/gnokiirc" - - # Fix file permission - chmod 755 "$pkgdir/usr/bin/sendsms" - - # Setup lock directory - install -dm755 "$pkgdir"/usr/lib/{sysusers,tmpfiles}.d - echo 'g lock - - -' > "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" - echo 'd /run/lock/lockdev 0775 root lock -' > "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" -} Copied: gnokii/repos/community-staging-x86_64/PKGBUILD (from rev 231439, gnokii/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2017-05-31 07:07:12 UTC (rev 231440) @@ -0,0 +1,77 @@ +# $Id$ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Roman Kyrylych <ro...@archlinux.org> +# Contributor: Aurelien Foret <orel...@chez.com> + +pkgname=gnokii +pkgver=0.6.31 +pkgrel=14 +pkgdesc="Tools and user space driver for use with mobile phones" +arch=('i686' 'x86_64') +url="http://www.gnokii.org/" +license=('GPL') +depends=('libusb-compat' 'libxpm' 'bluez-libs' 'libical' 'sqlite' 'systemd') +makedepends=('gtk2' 'libmariadb' 'postgresql-libs' 'intltool') +optdepends=('dialog: sendsms tool' + 'gtk2: xgnokii GUI' + 'libmariadb: smsd mysql backend' + 'postgresql-libs: smsd postgresql backend') +backup=('etc/gnokiirc') +install=$pkgname.install +source=("https://www.gnokii.org/download/$pkgname/$pkgname-$pkgver.tar.bz2" + 'gnokii-config.patch' + 'gnokii-lock.patch' + 'gnokii-gcc5.patch' + 'gnokii-gcc7.patch') +md5sums=('d9627f4a1152d3ea7806df4532850d5f' + 'b2961b52ac1f770c4704ccc50b64fde2' + '17b629db85a6bb2b98ca59941aa95295' + '5bcf2dadd31a826d1f80b53bb37d9bd0' + '338e376185ff5323c5fdd3538890f776') + +prepare() { + cd $pkgname-$pkgver + + # Set bindir location + patch -Np1 -i "$srcdir/gnokii-config.patch" + + # Set lock path + patch -Np1 -i "$srcdir/gnokii-lock.patch" + + # Fix build with GCC 5 (Fedora patch) + patch -Np1 -i "$srcdir/gnokii-gcc5.patch" + + # Fix build with GCC 7 + patch -Np1 -i "$srcdir/gnokii-gcc7.patch" +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \ + --enable-security + make + pushd xgnokii + make + popd +} + +package() { + cd $pkgname-$pkgver + + make DESTDIR="$pkgdir" install + pushd xgnokii + make DESTDIR="$pkgdir" install + popd + + # Install initial config file + install -Dm644 Docs/sample/gnokiirc "$pkgdir/etc/gnokiirc" + + # Fix file permission + chmod 755 "$pkgdir/usr/bin/sendsms" + + # Setup lock directory + install -dm755 "$pkgdir"/usr/lib/{sysusers,tmpfiles}.d + echo 'g lock - - -' > "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" + echo 'd /run/lock/lockdev 0775 root lock -' > "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" +} Deleted: community-staging-x86_64/gnokii-config.patch =================================================================== --- community-staging-x86_64/gnokii-config.patch 2017-05-31 07:06:48 UTC (rev 231439) +++ community-staging-x86_64/gnokii-config.patch 2017-05-31 07:07:12 UTC (rev 231440) @@ -1,12 +0,0 @@ -diff -Nura gnokii-0.6.31.orig/Docs/sample/gnokiirc gnokii-0.6.31/Docs/sample/gnokiirc ---- gnokii-0.6.31.orig/Docs/sample/gnokiirc 2011-12-02 15:53:04.000000000 +0100 -+++ gnokii-0.6.31/Docs/sample/gnokiirc 2012-02-18 12:49:26.957557504 +0100 -@@ -238,7 +238,7 @@ - # In particular ensure that mgnokiidev is in this location, with - # permissions 4750, owned by root, group gnokii. Ensure you - # are in the gnokii group and that the group exists... --bindir = /usr/local/sbin/ -+bindir = /usr/bin/ - - # Any entries in the following two sections will be set as environment - # variables when running the scripts. Copied: gnokii/repos/community-staging-x86_64/gnokii-config.patch (from rev 231439, gnokii/trunk/gnokii-config.patch) =================================================================== --- community-staging-x86_64/gnokii-config.patch (rev 0) +++ community-staging-x86_64/gnokii-config.patch 2017-05-31 07:07:12 UTC (rev 231440) @@ -0,0 +1,12 @@ +diff -Nura gnokii-0.6.31.orig/Docs/sample/gnokiirc gnokii-0.6.31/Docs/sample/gnokiirc +--- gnokii-0.6.31.orig/Docs/sample/gnokiirc 2011-12-02 15:53:04.000000000 +0100 ++++ gnokii-0.6.31/Docs/sample/gnokiirc 2012-02-18 12:49:26.957557504 +0100 +@@ -238,7 +238,7 @@ + # In particular ensure that mgnokiidev is in this location, with + # permissions 4750, owned by root, group gnokii. Ensure you + # are in the gnokii group and that the group exists... +-bindir = /usr/local/sbin/ ++bindir = /usr/bin/ + + # Any entries in the following two sections will be set as environment + # variables when running the scripts. Deleted: community-staging-x86_64/gnokii-gcc5.patch =================================================================== --- community-staging-x86_64/gnokii-gcc5.patch 2017-05-31 07:06:48 UTC (rev 231439) +++ community-staging-x86_64/gnokii-gcc5.patch 2017-05-31 07:07:12 UTC (rev 231440) @@ -1,27 +0,0 @@ -Patch by Robert Scheck <rob...@fedoraproject.org> for gnokii <= 0.6.31 to avoid -build failures with GCC 5.x as "gnokii-0.6.31/xgnokii/xgnokii.c:1209: undefined -reference to `GUI_HideAbout'" and "xgnokii-xgnokii_logos.o:(.data.rel+0xe0): -undefined reference to `CloseLogosWindow'". - ---- gnokii-0.6.31/xgnokii/xgnokii.c 2011-12-02 15:53:04.000000000 +0100 -+++ gnokii-0.6.31/xgnokii/xgnokii.c.gcc5 2015-06-20 15:49:59.000000000 +0200 -@@ -798,7 +798,7 @@ - } - - --inline void GUI_HideAbout(void) -+void GUI_HideAbout(void) - { - gtk_widget_hide(AboutDialog); - } ---- gnokii-0.6.31/xgnokii/xgnokii_logos.c 2011-12-02 15:53:04.000000000 +0100 -+++ gnokii-0.6.31/xgnokii/xgnokii_logos.c.gcc5 2015-06-20 15:50:15.000000000 +0200 -@@ -1304,7 +1304,7 @@ - return 0; - } - --inline void CloseLogosWindow(void) -+void CloseLogosWindow(void) - { - gtk_widget_hide(GUI_LogosWindow); - } Copied: gnokii/repos/community-staging-x86_64/gnokii-gcc5.patch (from rev 231439, gnokii/trunk/gnokii-gcc5.patch) =================================================================== --- community-staging-x86_64/gnokii-gcc5.patch (rev 0) +++ community-staging-x86_64/gnokii-gcc5.patch 2017-05-31 07:07:12 UTC (rev 231440) @@ -0,0 +1,27 @@ +Patch by Robert Scheck <rob...@fedoraproject.org> for gnokii <= 0.6.31 to avoid +build failures with GCC 5.x as "gnokii-0.6.31/xgnokii/xgnokii.c:1209: undefined +reference to `GUI_HideAbout'" and "xgnokii-xgnokii_logos.o:(.data.rel+0xe0): +undefined reference to `CloseLogosWindow'". + +--- gnokii-0.6.31/xgnokii/xgnokii.c 2011-12-02 15:53:04.000000000 +0100 ++++ gnokii-0.6.31/xgnokii/xgnokii.c.gcc5 2015-06-20 15:49:59.000000000 +0200 +@@ -798,7 +798,7 @@ + } + + +-inline void GUI_HideAbout(void) ++void GUI_HideAbout(void) + { + gtk_widget_hide(AboutDialog); + } +--- gnokii-0.6.31/xgnokii/xgnokii_logos.c 2011-12-02 15:53:04.000000000 +0100 ++++ gnokii-0.6.31/xgnokii/xgnokii_logos.c.gcc5 2015-06-20 15:50:15.000000000 +0200 +@@ -1304,7 +1304,7 @@ + return 0; + } + +-inline void CloseLogosWindow(void) ++void CloseLogosWindow(void) + { + gtk_widget_hide(GUI_LogosWindow); + } Deleted: community-staging-x86_64/gnokii-gcc7.patch =================================================================== --- community-staging-x86_64/gnokii-gcc7.patch 2017-05-31 07:06:48 UTC (rev 231439) +++ community-staging-x86_64/gnokii-gcc7.patch 2017-05-31 07:07:12 UTC (rev 231440) @@ -1,13 +0,0 @@ -diff --git a/common/gsm-filetypes.c b/common/gsm-filetypes.c -index b4ceea1..264420a 100644 ---- a/common/gsm-filetypes.c -+++ b/common/gsm-filetypes.c -@@ -1409,7 +1409,7 @@ static int get_next_token(char *src, int delim) - #define GET_NEXT_TOKEN() o = get_next_token(line + offset, ';') - #define STORE_TOKEN(a) strip_slashes(a, line + offset, sizeof(a) - 1, o - 1) - --inline int local_atoi(char *str, int len) -+int local_atoi(char *str, int len) - { - int retval; - char *aux = strndup(str, len); Copied: gnokii/repos/community-staging-x86_64/gnokii-gcc7.patch (from rev 231439, gnokii/trunk/gnokii-gcc7.patch) =================================================================== --- community-staging-x86_64/gnokii-gcc7.patch (rev 0) +++ community-staging-x86_64/gnokii-gcc7.patch 2017-05-31 07:07:12 UTC (rev 231440) @@ -0,0 +1,13 @@ +diff --git a/common/gsm-filetypes.c b/common/gsm-filetypes.c +index b4ceea1..264420a 100644 +--- a/common/gsm-filetypes.c ++++ b/common/gsm-filetypes.c +@@ -1409,7 +1409,7 @@ static int get_next_token(char *src, int delim) + #define GET_NEXT_TOKEN() o = get_next_token(line + offset, ';') + #define STORE_TOKEN(a) strip_slashes(a, line + offset, sizeof(a) - 1, o - 1) + +-inline int local_atoi(char *str, int len) ++int local_atoi(char *str, int len) + { + int retval; + char *aux = strndup(str, len); Deleted: community-staging-x86_64/gnokii-lock.patch =================================================================== --- community-staging-x86_64/gnokii-lock.patch 2017-05-31 07:06:48 UTC (rev 231439) +++ community-staging-x86_64/gnokii-lock.patch 2017-05-31 07:07:12 UTC (rev 231440) @@ -1,15 +0,0 @@ -diff -Naur gnokii-0.6.31.orig/common/misc.c gnokii-0.6.31/common/misc.c ---- gnokii-0.6.31.orig/common/misc.c 2011-12-02 15:53:04.000000000 +0100 -+++ gnokii-0.6.31/common/misc.c 2013-08-12 18:38:41.021668458 +0200 -@@ -448,9 +448,9 @@ - - #define BUFFER_MAX_LENGTH 128 - #if defined (__svr4__) --# define lock_path "/var/run/LCK.." -+# define lock_path "/var/run/lockdev/LCK.." - #else --# define lock_path "/var/lock/LCK.." -+# define lock_path "/var/lock/lockdev/LCK.." - #endif - - /* Lock the device. Return allocated string with a lock name */ Copied: gnokii/repos/community-staging-x86_64/gnokii-lock.patch (from rev 231439, gnokii/trunk/gnokii-lock.patch) =================================================================== --- community-staging-x86_64/gnokii-lock.patch (rev 0) +++ community-staging-x86_64/gnokii-lock.patch 2017-05-31 07:07:12 UTC (rev 231440) @@ -0,0 +1,15 @@ +diff -Naur gnokii-0.6.31.orig/common/misc.c gnokii-0.6.31/common/misc.c +--- gnokii-0.6.31.orig/common/misc.c 2011-12-02 15:53:04.000000000 +0100 ++++ gnokii-0.6.31/common/misc.c 2013-08-12 18:38:41.021668458 +0200 +@@ -448,9 +448,9 @@ + + #define BUFFER_MAX_LENGTH 128 + #if defined (__svr4__) +-# define lock_path "/var/run/LCK.." ++# define lock_path "/var/run/lockdev/LCK.." + #else +-# define lock_path "/var/lock/LCK.." ++# define lock_path "/var/lock/lockdev/LCK.." + #endif + + /* Lock the device. Return allocated string with a lock name */ Deleted: community-staging-x86_64/gnokii.install =================================================================== --- community-staging-x86_64/gnokii.install 2017-05-31 07:06:48 UTC (rev 231439) +++ community-staging-x86_64/gnokii.install 2017-05-31 07:07:12 UTC (rev 231440) @@ -1,3 +0,0 @@ -post_install() { - echo "Users need to be in 'lock' and 'uucp' groups to connect to devices" -} Copied: gnokii/repos/community-staging-x86_64/gnokii.install (from rev 231439, gnokii/trunk/gnokii.install) =================================================================== --- community-staging-x86_64/gnokii.install (rev 0) +++ community-staging-x86_64/gnokii.install 2017-05-31 07:07:12 UTC (rev 231440) @@ -0,0 +1,3 @@ +post_install() { + echo "Users need to be in 'lock' and 'uucp' groups to connect to devices" +}