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

[Felix Yan]

    Date: Saturday, July 12, 2014 @ 19:41:00
  Author: fyan
Revision: 115620

upgpkg: nspluginwrapper 1.4.4-3

mtree rebuild

Modified:
  nspluginwrapper/trunk/PKGBUILD
  nspluginwrapper/trunk/fix_missing_lib.patch

-----------------------+
 PKGBUILD              |    6 +++---
 fix_missing_lib.patch |   15 ++++++++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-12 17:40:22 UTC (rev 115619)
+++ PKGBUILD	2014-07-12 17:41:00 UTC (rev 115620)
@@ -2,7 +2,7 @@
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 pkgname=nspluginwrapper
 pkgver=1.4.4
-pkgrel=2.1
+pkgrel=3
 pkgdesc="Cross-platform NPAPI compatible plugin viewer"
 arch=('i686' 'x86_64')
 url="http://nspluginwrapper.davidben.net/"
@@ -18,7 +18,7 @@
 source=(http://nspluginwrapper.davidben.net/download/$pkgname-$pkgver.tar.gz
         'fix_missing_lib.patch')
 md5sums=('36f3e290fc4ce56f65ee695078961188'
-         'd40ad2f55d9989e04e3ef0cf4326b1df')
+         '00ca2d1ab0d7348e3157cb7b72f30e1a')
 
 if [[ $CARCH == i686 ]]; then
   # Strip lib32 etc. on i686
@@ -31,7 +31,7 @@
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  patch -p0 -i "$srcdir/fix_missing_lib.patch"
+  patch -p1 -i "$srcdir/fix_missing_lib.patch"
 
   configure_args=""
   if [[ $CARCH == x86_64 ]]; then

Modified: fix_missing_lib.patch
===================================================================
--- fix_missing_lib.patch	2014-07-12 17:40:22 UTC (rev 115619)
+++ fix_missing_lib.patch	2014-07-12 17:41:00 UTC (rev 115620)
@@ -1,11 +1,20 @@
---- Makefile	2012-01-15 13:25:28.922775770 +0100
-+++ Makefile.new	2012-01-15 13:25:09.185815643 +0100
+--- a/Makefile	2011-07-01 11:18:57.000000000 +0800
++++ b/Makefile	2014-07-13 01:21:41.887559397 +0800
+@@ -128,7 +128,7 @@
+ ifeq ($(TARGET_OS):$(TARGET_ARCH),linux:i386)
+ npviewer_SOURCES += $(SRC_PATH)/src/cxxabi-compat.cpp
+ npviewer_OBJECTS += npviewer-cxxabi-compat.o
+-npviewer_LIBS    += -lsupc++
++npviewer_LIBS    += -lsupc++ -lgthread-2.0
+ endif
+ ifeq ($(TARGET_OS):$(TARGET_ARCH),solaris:i386)
+ npviewer_LIBS    += $(libsocket_LIBS)
 @@ -142,7 +142,7 @@
  npplayer_LDFLAGS  = $(LDFLAGS)
  npplayer_LDFLAGS += $(libpthread_LDFLAGS)
  npplayer_LIBS     = $(GTK_LIBS) $(GLIB_LIBS) $(CURL_LIBS) $(X_LIBS)
 -npplayer_LIBS    += $(libpthread_LIBS) $(libsocket_LIBS)
-+npplayer_LIBS    += $(libpthread_LIBS) $(libsocket_LIBS) -ldl
++npplayer_LIBS    += $(libpthread_LIBS) $(libsocket_LIBS) -ldl -lgthread-2.0
  
  libnoxshm_LIBRARY = libnoxshm.so
  libnoxshm_RAWSRCS = libnoxshm.c