Date: Wednesday, August 2, 2017 @ 07:32:36 Author: bpiotrowski Revision: 247398
archrelease: copy trunk to community-i686, multilib-x86_64 Added: nspluginwrapper/repos/community-i686/PKGBUILD (from rev 247397, nspluginwrapper/trunk/PKGBUILD) nspluginwrapper/repos/community-i686/fix_missing_lib.patch (from rev 247397, nspluginwrapper/trunk/fix_missing_lib.patch) nspluginwrapper/repos/community-i686/install (from rev 247397, nspluginwrapper/trunk/install) nspluginwrapper/repos/multilib-x86_64/PKGBUILD (from rev 247397, nspluginwrapper/trunk/PKGBUILD) nspluginwrapper/repos/multilib-x86_64/fix_missing_lib.patch (from rev 247397, nspluginwrapper/trunk/fix_missing_lib.patch) nspluginwrapper/repos/multilib-x86_64/install (from rev 247397, nspluginwrapper/trunk/install) Deleted: nspluginwrapper/repos/community-i686/PKGBUILD nspluginwrapper/repos/community-i686/fix_missing_lib.patch nspluginwrapper/repos/community-i686/install nspluginwrapper/repos/multilib-x86_64/PKGBUILD nspluginwrapper/repos/multilib-x86_64/fix_missing_lib.patch nspluginwrapper/repos/multilib-x86_64/install ---------------------------------------+ /PKGBUILD | 78 ++++++++++++++++++++++++++++++++ /fix_missing_lib.patch | 40 ++++++++++++++++ /install | 10 ++++ community-i686/PKGBUILD | 51 -------------------- community-i686/fix_missing_lib.patch | 20 -------- community-i686/install | 5 -- multilib-x86_64/PKGBUILD | 51 -------------------- multilib-x86_64/fix_missing_lib.patch | 20 -------- multilib-x86_64/install | 5 -- 9 files changed, 128 insertions(+), 152 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2017-08-02 07:32:20 UTC (rev 247397) +++ community-i686/PKGBUILD 2017-08-02 07:32:36 UTC (rev 247398) @@ -1,51 +0,0 @@ -# $Id$ -# Maintainer: Thomas Bächler <tho...@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: Copied: nspluginwrapper/repos/community-i686/PKGBUILD (from rev 247397, nspluginwrapper/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2017-08-02 07:32:36 UTC (rev 247398) @@ -0,0 +1,39 @@ +# $Id$ +# Maintainer: Thomas Bächler <tho...@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: Deleted: community-i686/fix_missing_lib.patch =================================================================== --- community-i686/fix_missing_lib.patch 2017-08-02 07:32:20 UTC (rev 247397) +++ community-i686/fix_missing_lib.patch 2017-08-02 07:32:36 UTC (rev 247398) @@ -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/community-i686/fix_missing_lib.patch (from rev 247397, nspluginwrapper/trunk/fix_missing_lib.patch) =================================================================== --- community-i686/fix_missing_lib.patch (rev 0) +++ community-i686/fix_missing_lib.patch 2017-08-02 07:32:36 UTC (rev 247398) @@ -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: community-i686/install =================================================================== --- community-i686/install 2017-08-02 07:32:20 UTC (rev 247397) +++ community-i686/install 2017-08-02 07:32:36 UTC (rev 247398) @@ -1,5 +0,0 @@ -post_upgrade() { - for i in `nspluginwrapper -l | grep -v "^ "`; do - /usr/bin/nspluginwrapper -u "$i" - done -} Copied: nspluginwrapper/repos/community-i686/install (from rev 247397, nspluginwrapper/trunk/install) =================================================================== --- community-i686/install (rev 0) +++ community-i686/install 2017-08-02 07:32:36 UTC (rev 247398) @@ -0,0 +1,5 @@ +post_upgrade() { + for i in `nspluginwrapper -l | grep -v "^ "`; do + /usr/bin/nspluginwrapper -u "$i" + done +} Deleted: multilib-x86_64/PKGBUILD =================================================================== --- multilib-x86_64/PKGBUILD 2017-08-02 07:32:20 UTC (rev 247397) +++ multilib-x86_64/PKGBUILD 2017-08-02 07:32:36 UTC (rev 247398) @@ -1,51 +0,0 @@ -# $Id$ -# Maintainer: Thomas Bächler <tho...@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: Copied: nspluginwrapper/repos/multilib-x86_64/PKGBUILD (from rev 247397, nspluginwrapper/trunk/PKGBUILD) =================================================================== --- multilib-x86_64/PKGBUILD (rev 0) +++ multilib-x86_64/PKGBUILD 2017-08-02 07:32:36 UTC (rev 247398) @@ -0,0 +1,39 @@ +# $Id$ +# Maintainer: Thomas Bächler <tho...@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: Deleted: multilib-x86_64/fix_missing_lib.patch =================================================================== --- multilib-x86_64/fix_missing_lib.patch 2017-08-02 07:32:20 UTC (rev 247397) +++ multilib-x86_64/fix_missing_lib.patch 2017-08-02 07:32:36 UTC (rev 247398) @@ -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 247397, nspluginwrapper/trunk/fix_missing_lib.patch) =================================================================== --- multilib-x86_64/fix_missing_lib.patch (rev 0) +++ multilib-x86_64/fix_missing_lib.patch 2017-08-02 07:32:36 UTC (rev 247398) @@ -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: multilib-x86_64/install =================================================================== --- multilib-x86_64/install 2017-08-02 07:32:20 UTC (rev 247397) +++ multilib-x86_64/install 2017-08-02 07:32:36 UTC (rev 247398) @@ -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 247397, nspluginwrapper/trunk/install) =================================================================== --- multilib-x86_64/install (rev 0) +++ multilib-x86_64/install 2017-08-02 07:32:36 UTC (rev 247398) @@ -0,0 +1,5 @@ +post_upgrade() { + for i in `nspluginwrapper -l | grep -v "^ "`; do + /usr/bin/nspluginwrapper -u "$i" + done +}