[arch-commits] Commit in nspluginwrapper/repos/multilib-x86_64 (7 files)
Antonio Rojas
arojas at archlinux.org
Sat Jun 9 11:27:22 UTC 2018
Date: Saturday, June 9, 2018 @ 11:27:21
Author: arojas
Revision: 342168
archrelease: copy trunk to multilib-x86_64
Added:
nspluginwrapper/repos/multilib-x86_64/PKGBUILD
(from rev 342167, nspluginwrapper/trunk/PKGBUILD)
nspluginwrapper/repos/multilib-x86_64/fix_missing_lib.patch
(from rev 342167, nspluginwrapper/trunk/fix_missing_lib.patch)
nspluginwrapper/repos/multilib-x86_64/install
(from rev 342167, nspluginwrapper/trunk/install)
nspluginwrapper/repos/multilib-x86_64/nspluginwrapper-redef.patch
(from rev 342167, nspluginwrapper/trunk/nspluginwrapper-redef.patch)
Deleted:
nspluginwrapper/repos/multilib-x86_64/PKGBUILD
nspluginwrapper/repos/multilib-x86_64/fix_missing_lib.patch
nspluginwrapper/repos/multilib-x86_64/install
-----------------------------+
PKGBUILD | 84 ++++++++++++++++++++++--------------------
fix_missing_lib.patch | 40 ++++++++++----------
install | 10 ++---
nspluginwrapper-redef.patch | 13 ++++++
4 files changed, 83 insertions(+), 64 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-06-09 11:26:53 UTC (rev 342167)
+++ PKGBUILD 2018-06-09 11:27:21 UTC (rev 342168)
@@ -1,39 +0,0 @@
-# $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' 'gcc-libs' 'gtk2')
-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')
-
-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:
Copied: nspluginwrapper/repos/multilib-x86_64/PKGBUILD (from rev 342167, nspluginwrapper/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-06-09 11:27:21 UTC (rev 342168)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
+pkgname=nspluginwrapper
+pkgver=1.4.4
+pkgrel=4
+pkgdesc="Cross-platform NPAPI compatible plugin viewer"
+arch=('x86_64')
+url="http://nspluginwrapper.davidben.net/"
+license=('GPL')
+depends=('curl' 'libxt' 'gcc-libs' 'gtk2')
+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
+source=("https://github.com/davidben/nspluginwrapper/archive/nspluginwrapper-$pkgver.tar.gz"
+ 'fix_missing_lib.patch' nspluginwrapper-redef.patch)
+md5sums=('f00fbc0cea8c962dfc0de2f11e2ab548'
+ '00ca2d1ab0d7348e3157cb7b72f30e1a'
+ 'd42696fb591d278b1b56002e547f7740')
+
+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"
+ fi
+
+ ./configure $configure_args
+ make -j1
+}
+
+package() {
+ cd $pkgname-$pkgname-$pkgver
+
+ make -j1 DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: fix_missing_lib.patch
===================================================================
--- fix_missing_lib.patch 2018-06-09 11:26:53 UTC (rev 342167)
+++ fix_missing_lib.patch 2018-06-09 11:27:21 UTC (rev 342168)
@@ -1,20 +0,0 @@
---- 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
Copied: nspluginwrapper/repos/multilib-x86_64/fix_missing_lib.patch (from rev 342167, nspluginwrapper/trunk/fix_missing_lib.patch)
===================================================================
--- fix_missing_lib.patch (rev 0)
+++ fix_missing_lib.patch 2018-06-09 11:27:21 UTC (rev 342168)
@@ -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 2018-06-09 11:26:53 UTC (rev 342167)
+++ install 2018-06-09 11:27:21 UTC (rev 342168)
@@ -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 342167, nspluginwrapper/trunk/install)
===================================================================
--- install (rev 0)
+++ install 2018-06-09 11:27:21 UTC (rev 342168)
@@ -0,0 +1,5 @@
+post_upgrade() {
+ for i in `nspluginwrapper -l | grep -v "^ "`; do
+ /usr/bin/nspluginwrapper -u "$i"
+ done
+}
Copied: nspluginwrapper/repos/multilib-x86_64/nspluginwrapper-redef.patch (from rev 342167, nspluginwrapper/trunk/nspluginwrapper-redef.patch)
===================================================================
--- nspluginwrapper-redef.patch (rev 0)
+++ nspluginwrapper-redef.patch 2018-06-09 11:27:21 UTC (rev 342168)
@@ -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;
+- };
+
+
+
More information about the arch-commits
mailing list