[arch-commits] Commit in nspluginwrapper/repos/multilib-x86_64 (6 files)

[Felix Yan]

    Date: Saturday, July 12, 2014 @ 19:41:22
  Author: fyan
Revision: 115621

archrelease: copy trunk to multilib-x86_64

Added:
  nspluginwrapper/repos/multilib-x86_64/PKGBUILD
    (from rev 115620, nspluginwrapper/trunk/PKGBUILD)
  nspluginwrapper/repos/multilib-x86_64/fix_missing_lib.patch
    (from rev 115620, nspluginwrapper/trunk/fix_missing_lib.patch)
  nspluginwrapper/repos/multilib-x86_64/install
    (from rev 115620, nspluginwrapper/trunk/install)
Deleted:
  nspluginwrapper/repos/multilib-x86_64/PKGBUILD
  nspluginwrapper/repos/multilib-x86_64/fix_missing_lib.patch
  nspluginwrapper/repos/multilib-x86_64/install

-----------------------+
 PKGBUILD              |  102 ++++++++++++++++++++++++------------------------
 fix_missing_lib.patch |   31 +++++++++-----
 install               |   10 ++--
 3 files changed, 76 insertions(+), 67 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-12 17:41:00 UTC (rev 115620)
+++ PKGBUILD	2014-07-12 17:41:22 UTC (rev 115621)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Thomas Bächler <thomas at archlinux.org>
-pkgname=nspluginwrapper
-pkgver=1.4.4
-pkgrel=2.1
-pkgdesc="Cross-platform NPAPI compatible plugin viewer"
-arch=('i686' 'x86_64')
-url="http://nspluginwrapper.davidben.net/"
-license=('GPL')
-depends=(
-  'curl'
-  'libxt' 'lib32-libxt'
-  'gcc-libs' 'lib32-gcc-libs'
-  'gtk2' 'lib32-gtk2'
-)
-makedepends=('gcc-multilib')
-install="install"
-source=(http://nspluginwrapper.davidben.net/download/$pkgname-$pkgver.tar.gz
-        'fix_missing_lib.patch')
-md5sums=('36f3e290fc4ce56f65ee695078961188'
-         'd40ad2f55d9989e04e3ef0cf4326b1df')
-
-if [[ $CARCH == i686 ]]; then
-  # Strip lib32 etc. on i686
-  depends=(${depends[@]/*32-*/})
-  makedepends=(${makedepends[@]/*32-*/})
-  makedepends=(${makedepends[@]/*-multilib*/})
-  optdepends=(${optdepends[@]/*32-*/})
-fi
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  patch -p0 -i "$srcdir/fix_missing_lib.patch"
-
-  configure_args=""
-  if [[ $CARCH == x86_64 ]]; then
-    configure_args="$configure_args --with-lib32=lib32 --with-lib64=lib"
-  fi
-
-  ./configure $configure_args
-  make -j1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make -j1 DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: nspluginwrapper/repos/multilib-x86_64/PKGBUILD (from rev 115620, nspluginwrapper/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-07-12 17:41:22 UTC (rev 115621)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
+pkgname=nspluginwrapper
+pkgver=1.4.4
+pkgrel=3
+pkgdesc="Cross-platform NPAPI compatible plugin viewer"
+arch=('i686' 'x86_64')
+url="http://nspluginwrapper.davidben.net/"
+license=('GPL')
+depends=(
+  'curl'
+  'libxt' 'lib32-libxt'
+  'gcc-libs' 'lib32-gcc-libs'
+  'gtk2' 'lib32-gtk2'
+)
+makedepends=('gcc-multilib')
+install="install"
+source=(http://nspluginwrapper.davidben.net/download/$pkgname-$pkgver.tar.gz
+        'fix_missing_lib.patch')
+md5sums=('36f3e290fc4ce56f65ee695078961188'
+         '00ca2d1ab0d7348e3157cb7b72f30e1a')
+
+if [[ $CARCH == i686 ]]; then
+  # Strip lib32 etc. on i686
+  depends=(${depends[@]/*32-*/})
+  makedepends=(${makedepends[@]/*32-*/})
+  makedepends=(${makedepends[@]/*-multilib*/})
+  optdepends=(${optdepends[@]/*32-*/})
+fi
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  patch -p1 -i "$srcdir/fix_missing_lib.patch"
+
+  configure_args=""
+  if [[ $CARCH == x86_64 ]]; then
+    configure_args="$configure_args --with-lib32=lib32 --with-lib64=lib"
+  fi
+
+  ./configure $configure_args
+  make -j1
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make -j1 DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: fix_missing_lib.patch
===================================================================
--- fix_missing_lib.patch	2014-07-12 17:41:00 UTC (rev 115620)
+++ fix_missing_lib.patch	2014-07-12 17:41:22 UTC (rev 115621)
@@ -1,11 +0,0 @@
---- Makefile	2012-01-15 13:25:28.922775770 +0100
-+++ Makefile.new	2012-01-15 13:25:09.185815643 +0100
-@@ -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
- 
- libnoxshm_LIBRARY = libnoxshm.so
- libnoxshm_RAWSRCS = libnoxshm.c

Copied: nspluginwrapper/repos/multilib-x86_64/fix_missing_lib.patch (from rev 115620, nspluginwrapper/trunk/fix_missing_lib.patch)
===================================================================
--- fix_missing_lib.patch	                        (rev 0)
+++ fix_missing_lib.patch	2014-07-12 17:41:22 UTC (rev 115621)
@@ -0,0 +1,20 @@
+--- 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 -lgthread-2.0
+ 
+ libnoxshm_LIBRARY = libnoxshm.so
+ libnoxshm_RAWSRCS = libnoxshm.c

Deleted: install
===================================================================
--- install	2014-07-12 17:41:00 UTC (rev 115620)
+++ install	2014-07-12 17:41:22 UTC (rev 115621)
@@ -1,5 +0,0 @@
-post_upgrade() {
-  for i in `nspluginwrapper -l | grep -v "^ "`; do
-    /usr/bin/nspluginwrapper -u "$i"
-  done
-}

Copied: nspluginwrapper/repos/multilib-x86_64/install (from rev 115620, nspluginwrapper/trunk/install)
===================================================================
--- install	                        (rev 0)
+++ install	2014-07-12 17:41:22 UTC (rev 115621)
@@ -0,0 +1,5 @@
+post_upgrade() {
+  for i in `nspluginwrapper -l | grep -v "^ "`; do
+    /usr/bin/nspluginwrapper -u "$i"
+  done
+}