[arch-commits] Commit in nspluginwrapper/trunk (PKGBUILD nspluginwrapper-redef.patch)

[Antonio Rojas]

    Date: Saturday, June 9, 2018 @ 11:26:53
  Author: arojas
Revision: 342167

BUILDINFO rebuild

Added:
  nspluginwrapper/trunk/nspluginwrapper-redef.patch
Modified:
  nspluginwrapper/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   22 ++++++++++++++--------
 nspluginwrapper-redef.patch |   13 +++++++++++++
 2 files changed, 27 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-09 11:06:16 UTC (rev 342166)
+++ PKGBUILD	2018-06-09 11:26:53 UTC (rev 342167)
@@ -2,7 +2,7 @@
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 pkgname=nspluginwrapper
 pkgver=1.4.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Cross-platform NPAPI compatible plugin viewer"
 arch=('x86_64')
 url="http://nspluginwrapper.davidben.net/"
@@ -11,16 +11,22 @@
 depends_x86_64=('lib32-libxt' 'lib32-gcc-libs' 'lib32-gtk2')
 makedepends_x86_64=('gcc-multilib')
 install="install"
-source=(http://nspluginwrapper.davidben.net/download/$pkgname-$pkgver.tar.gz
-        'fix_missing_lib.patch')
-md5sums=('36f3e290fc4ce56f65ee695078961188'
-         '00ca2d1ab0d7348e3157cb7b72f30e1a')
+#source=(http://nspluginwrapper.davidben.net/download/$pkgname-$pkgver.tar.gz
+source=("https://github.com/davidben/nspluginwrapper/archive/nspluginwrapper-$pkgver.tar.gz"
+        'fix_missing_lib.patch' nspluginwrapper-redef.patch)
+md5sums=('f00fbc0cea8c962dfc0de2f11e2ab548'
+         '00ca2d1ab0d7348e3157cb7b72f30e1a'
+         'd42696fb591d278b1b56002e547f7740')
 
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
+prepare() {
+  cd $pkgname-$pkgname-$pkgver
 
   patch -p1 -i "$srcdir/fix_missing_lib.patch"
+  patch -p1 -i ../nspluginwrapper-redef.patch # Fix redefinitions
+}
 
+build() {
+  cd $pkgname-$pkgname-$pkgver
   configure_args=""
   if [[ $CARCH == x86_64 ]]; then
     configure_args="$configure_args --with-lib32=lib32 --with-lib64=lib"
@@ -31,7 +37,7 @@
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgname-$pkgver
 
   make -j1 DESTDIR="$pkgdir/" install
 }

Added: nspluginwrapper-redef.patch
===================================================================
--- nspluginwrapper-redef.patch	                        (rev 0)
+++ nspluginwrapper-redef.patch	2018-06-09 11:26:53 UTC (rev 342167)
@@ -0,0 +1,13 @@
+--- nspluginwrapper-nspluginwrapper-1.4.4/lsb-build/headers/sys/time.h.orig	2018-06-09 11:22:38.912598873 +0000
++++ nspluginwrapper-nspluginwrapper-1.4.4/lsb-build/headers/sys/time.h	2018-06-09 11:22:48.142598699 +0000
+@@ -30,10 +30,6 @@
+ 
+ 
+ 
+-    struct timespec {
+-	time_t tv_sec;
+-	long int tv_nsec;
+-    };
+ 
+ 
+