Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/www-plugins/nspluginwrapper
diff options
context:
space:
mode:
authorPatrick McLean <chutzpah@gentoo.org>2011-07-14 16:09:41 +0000
committerPatrick McLean <chutzpah@gentoo.org>2011-07-14 16:09:41 +0000
commit1fab70bce7aa51a50400a3a0f4920a863fb8b87e (patch)
tree5b39b282e3fb0c9e19326d5349a29a74d1275600 /www-plugins/nspluginwrapper
parentVersion bump (diff)
downloadhistorical-1fab70bce7aa51a50400a3a0f4920a863fb8b87e.tar.gz
historical-1fab70bce7aa51a50400a3a0f4920a863fb8b87e.tar.bz2
historical-1fab70bce7aa51a50400a3a0f4920a863fb8b87e.zip
Another parallel build fix (bug #375121).
Package-Manager: portage-2.1.10.4/cvs/Linux x86_64
Diffstat (limited to 'www-plugins/nspluginwrapper')
-rw-r--r--www-plugins/nspluginwrapper/ChangeLog9
-rw-r--r--www-plugins/nspluginwrapper/Manifest36
-rw-r--r--www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-compile-on-hardened.patch9
-rw-r--r--www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-parallel-make.patch (renamed from www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.2-parallel-make.patch)24
-rw-r--r--www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r1.ebuild4
-rw-r--r--www-plugins/nspluginwrapper/nspluginwrapper-1.4.4.ebuild4
6 files changed, 59 insertions, 27 deletions
diff --git a/www-plugins/nspluginwrapper/ChangeLog b/www-plugins/nspluginwrapper/ChangeLog
index 7c84d50930f0..0430bc95cbe4 100644
--- a/www-plugins/nspluginwrapper/ChangeLog
+++ b/www-plugins/nspluginwrapper/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for www-plugins/nspluginwrapper
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.22 2011/07/13 15:56:30 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.23 2011/07/14 16:09:41 chutzpah Exp $
+
+ 14 Jul 2011; Patrick McLean <chutzpah@gentoo.org>
+ -files/nspluginwrapper-1.4.2-parallel-make.patch,
+ nspluginwrapper-1.4.4.ebuild, nspluginwrapper-1.4.4-r1.ebuild,
+ files/nspluginwrapper-1.4.4-compile-on-hardened.patch,
+ +files/nspluginwrapper-1.4.4-parallel-make.patch:
+ Another parallel build fix (bug #375121).
*nspluginwrapper-1.4.4-r1 (11 Jul 2011)
diff --git a/www-plugins/nspluginwrapper/Manifest b/www-plugins/nspluginwrapper/Manifest
index df946149b251..af7465f362e5 100644
--- a/www-plugins/nspluginwrapper/Manifest
+++ b/www-plugins/nspluginwrapper/Manifest
@@ -2,27 +2,27 @@
Hash: SHA256
AUX nspluginwrapper-1.3.0-gdk-native-windows.patch 526 RMD160 e254dfc264828d6b1cc11adc73fe5666fbf27072 SHA1 ebe6ce5fa8cd8df4d98bbd5ec298500141f0fda0 SHA256 b616b16549fb1c61a43504da4b81b14ea2649239ff9ef5e7bfb3c58471f6fd1a
-AUX nspluginwrapper-1.4.2-parallel-make.patch 2993 RMD160 da60c94b536097446d85e0bf43893808ffa030e1 SHA1 de1f8ec1b308b1c65b4ff4f27f24ffb64104a46f SHA256 b236074764cfc6ef051f8414386bc47b41a84799204388f6cf09d3f826b039b4
-AUX nspluginwrapper-1.4.4-compile-on-hardened.patch 464 RMD160 234b87864fde979610178cc4ccbee9091b401192 SHA1 06f8d2e986df226cce2b3b0b7bfabe5b533880af SHA256 3c1386036ae4825f59ac755acbf2cb40913d9d9cddf9252fab87279ccff0cc35
+AUX nspluginwrapper-1.4.4-compile-on-hardened.patch 604 RMD160 1cea85a86efc84e606f99e4b81391776d933719c SHA1 e12b9e5fc728638d1b87c4294637bc87b429d8ec SHA256 614e9a0f9f3c6632192c08ccd138c6d97b50cc85b48a6b2017e97595faf56534
+AUX nspluginwrapper-1.4.4-parallel-make.patch 4018 RMD160 28b84f168a55e3eb01491085103ff9467a480e55 SHA1 ef2961249835018bb338d07ded3b8225f872deae SHA256 f071aafad78e919133e56877efe47c43c049e534123cb3a1ec3512205c90ec74
DIST nspluginwrapper-1.4.4.tar.gz 412513 RMD160 6acd93653aa8466e1e3703c2b794f32691c10d12 SHA1 ffb271a741215874808d4a77d0a0dd65588a8440 SHA256 f2ed94d42dbbb5370b000a3f30d2b601eb2b09d5742b2842cd0d70e862fab2bb
-EBUILD nspluginwrapper-1.4.4-r1.ebuild 2749 RMD160 a73db92e01bc5f1a2a75ba62fecf2af9fd67836a SHA1 76cf4ebfd2522a8418a0a61ed27e079128c4caeb SHA256 e0e89cc1d9d3ad47bf2c12ef5e8d47e96dd3bf17ae7ddc38118e11ce93b8947d
-EBUILD nspluginwrapper-1.4.4.ebuild 2647 RMD160 5824fbf94a811313152d4927991352734280b458 SHA1 97d319423f9f73d991deb3987d780d8f343aebef SHA256 71720ec738f2d5e344691c6041ea35e0e48d3e09e51bbddef86dc0393ad57558
-MISC ChangeLog 11486 RMD160 bdd462422075514a31b0b7c4a4b9024d843936de SHA1 8b1fae9554176f67ac9e2f2fe9c7262d9182c438 SHA256 6292e18ba4fc820ca60512fb91b29a10afe7fbd6a7662c1c81b703ebc8142593
+EBUILD nspluginwrapper-1.4.4-r1.ebuild 2742 RMD160 e5909f7cc93a3592bf83d28d6d4969882b7db1ea SHA1 2108752683ee3b3418045bd2cb173ef6a6e87fda SHA256 fd38017778edd3895fce085d6928c4754e944e317f50dcffb74388f16a0bf0c2
+EBUILD nspluginwrapper-1.4.4.ebuild 2640 RMD160 0ab6a1b0042683f425a5749d42d834e092c06344 SHA1 12be162c0ef233d5b73a3560822377674fe229ab SHA256 a461a2e1b530b63f0fadbcc5d9009065238bab7e91a1957f65d09a8984616e1b
+MISC ChangeLog 11809 RMD160 1005fbfcd1456363e7698d8c86603f5675f9bed2 SHA1 99d28bb6421389e096b4ac06dcdf091a7547778c SHA256 684cac506396c99d64dabdcf88d81cec764f20c467aacca700b7a84ff9f0831b
MISC metadata.xml 253 RMD160 37a89adccd0388cf014f6768a21b1ec09252d21c SHA1 fa43576fb2327afb837b5b2ea57dc6ab8525494b SHA256 0b0d878d1f93316b2966ec90c1f80c46fe67fb3f5647b28f7c30d9647dbb1854
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCAAGBQJOHcBCAAoJEHy/RO9cNQiDf/kQALdj9BgwnmHowLnAaoOs2amz
-9aUEYQ3xwdYKVf0SIrnWj4mkiOpV7Oy8vsXHLyI9zkgErEcsXjtNp3gyY6xH3cpU
-vYABlzKQeFwBmLp5OgCBK80vvL7KOcrrX9zPiEg1G1CjwNArC2RuR4tFtPMLO8ou
-vkpCjrF0l0hPW3z2xun/ZFsnPMY67ofW/phV2AZO3BhezgUeiH1w7fmmUFB+Ksu4
-ahE4/2GpI7kg6yCHNf2Gxffyc14vujzBKe+TgtpdQwc7uxQUwoDy0/wOXJ0PEL/m
-+PZ9blQFUz3QJK1IL33JHPtYHTpr/IcNmD10kwTa7CmfIK3xSZrjV2MXHUEwPPeZ
-riuTX8JKXIUfeiMZDp9ef131mSHr3Rhd5806oL5PfhyLr0XJneELpBOGMiaWbAY8
-1UwLSSUqDJnqzhADrjGntNp6bfJB+WQxAHT4ZeA0yyFj0S/MxXTwBiRtXJmjOCS1
-twu8kQNidyUXF7Wh0kQoMcm2iQ9vAsThGS4AUTIVERJXLOnEcsKrAx0G9ewwooha
-Rar7pO94pBIUaW5K9XmD2e9jCTsjP4I5VqiJpJh+T9w90ZgCIRHVPvGWbplnSGwL
-XcejXhMcSp9no6s4P6dC8awZIw/RH7g4RymvyyydCK4pTm+dvrCiiaoGVt5HXubW
-lqaQUtMVjLDmQd+PAuTW
-=8Y0/
+iQIcBAEBCAAGBQJOHxTVAAoJEHy/RO9cNQiDv9oQAJgx2nmoDulU77O2nJsvJi3m
+Y/O1D1ocSysvaVQ3bjQs8eZULfeIKX8jnF4PrFDOm+C3VeYWDpYdAqyfzVCO9eZ4
+QwuMnn0qjCECzeJ+GqYR9QMcZ2ghFFX3bf2OmDDEGneD8EW4Zle+toUjirm89hKh
+D9mHqYe399Qd/2zIBGilIh0iRALcjAY17eCtQYW7BSpWfvHylT3Yna4aZCdbt6Cs
++vkQV1dVOMIPAdFgcwSLaH7TtUhIJqqgGL55FK1ccEylpKFF03MhUmQqm1BrP7BW
+jMrrvijpj08TCyg7VLji8T3DETM1PcfRihEYuruUVz36Z8P77u0jeFQUqOk4JSUP
+7V4h8T9gmBFg/AQFgGATOcRB6mSfp59dqAobpD+JgQww4g2SHxtiuu7WS2Ia8Tuy
+dWr6nmEh41+GGZ2dairGp+W9QkERQCdlToayw3CzfZnG8MT9WpWAWQv2Jwj/90EZ
+Xo7tqalth3XTQ3N7gaF8JZUlkKqwfzJqxshf6s3pmssMZOd5oEdPMuxCEmkN90Zg
+KHHAYpqol40+cO5GCA5fXxc/fniq/eFoiVv8chT/+oQO9RqczoZ3m6xoDs7Dxcab
+G9w012EJTti4uPGULXkX17EGrW+dT9uB5sRknKo0J1H/CW//ORuLc0q/WYPhtvCa
+P5Z3nhA8oZrYwZ17annb
+=Ormu
-----END PGP SIGNATURE-----
diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-compile-on-hardened.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-compile-on-hardened.patch
index 45d6be54e999..6d9adc20e9b3 100644
--- a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-compile-on-hardened.patch
+++ b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-compile-on-hardened.patch
@@ -1,9 +1,10 @@
---- b/Makefile 2011-06-29 02:10:27.000000000 +0200
-+++ a/Makefile 2011-06-29 02:09:06.000000000 +0200
-@@ -333,7 +333,7 @@
+diff -ur nspluginwrapper-1.4.4.orig2//Makefile nspluginwrapper-1.4.4/Makefile
+--- nspluginwrapper-1.4.4.orig2//Makefile 2011-07-14 11:56:52.674790086 -0400
++++ nspluginwrapper-1.4.4/Makefile 2011-07-14 12:01:00.281197722 -0400
+@@ -337,7 +337,7 @@
@[ -d $(LSB_OBJ_DIR) ] || mkdir $(LSB_OBJ_DIR) > /dev/null 2>&1
- $(LSB_OBJ_DIR)/%.o: $(LSB_SRC_DIR)/%.c
+ $(LSB_OBJ_DIR)/%.o: $(LSB_SRC_DIR)/%.c $(LSB_OBJ_DIR)
- $(CC) $(CFLAGS_32) -nostdinc -fno-builtin -I. -I$(LSB_INC_DIR) -c $< -o $@
+ $(CC) $(CFLAGS_32) -nostdinc -fno-builtin -I. -I$(LSB_INC_DIR) -c -fno-stack-protector $< -o $@
diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.2-parallel-make.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-parallel-make.patch
index b3280d6b2c75..95a7e49d6afa 100644
--- a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.2-parallel-make.patch
+++ b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-parallel-make.patch
@@ -65,3 +65,27 @@ diff -ur nspluginwrapper-1.4.2.orig//Makefile nspluginwrapper-1.4.2/Makefile
$(INSTALL) -m 755 $(nploader_PROGRAM) $(DESTDIR)$(npcommondir)/$(nploader_PROGRAM)
install.mkruntime: $(SRC_PATH)/utils/mkruntime.sh
$(INSTALL) -m 755 $< $(DESTDIR)$(npcommondir)/mkruntime
+Only in nspluginwrapper-1.4.4: .Makefile.swp
+diff -ur nspluginwrapper-1.4.4.orig//Makefile nspluginwrapper-1.4.4/Makefile
+--- nspluginwrapper-1.4.4.orig//Makefile 2011-06-30 23:18:57.000000000 -0400
++++ nspluginwrapper-1.4.4/Makefile 2011-07-14 11:56:52.674790086 -0400
+@@ -333,16 +333,16 @@
+ sed -e 's|%NPW_VIEWER_DIR%|$(nptargetdir_var)|' $< > $@
+ chmod 755 $@
+
+-$(LSB_OBJ_DIR)::
++$(LSB_OBJ_DIR):
+ @[ -d $(LSB_OBJ_DIR) ] || mkdir $(LSB_OBJ_DIR) > /dev/null 2>&1
+
+-$(LSB_OBJ_DIR)/%.o: $(LSB_SRC_DIR)/%.c
++$(LSB_OBJ_DIR)/%.o: $(LSB_SRC_DIR)/%.c $(LSB_OBJ_DIR)
+ $(CC) $(CFLAGS_32) -nostdinc -fno-builtin -I. -I$(LSB_INC_DIR) -c $< -o $@
+
+ $(LSB_OBJ_DIR)/%.a: $(LSB_OBJ_DIR)/%.o
+ $(AR) rc $@ $<
+
+-$(LSB_OBJ_DIR)/libc.so: $(LSB_OBJ_DIR)/libc_main.so $(LSB_OBJ_DIR)/libc_nonshared.a
++$(LSB_OBJ_DIR)/libc.so: $(LSB_OBJ_DIR)/libc_main.so $(LSB_OBJ_DIR)/libc_nonshared.a $(LSB_OBJ_DIR)
+ @echo "OUTPUT_FORMAT($(TARGET_ELF_ARCH))" > $@
+ @echo "GROUP ( $(LSB_OBJ_DIR)/libc_main.so $(LSB_OBJ_DIR)/libc_nonshared.a )" >> $@
+
diff --git a/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r1.ebuild b/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r1.ebuild
index 9abdb3294522..3f84469f3dbc 100644
--- a/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r1.ebuild
+++ b/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r1.ebuild,v 1.1 2011/07/11 15:00:41 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r1.ebuild,v 1.2 2011/07/14 16:09:41 chutzpah Exp $
EAPI=2
@@ -45,7 +45,7 @@ autoinstall() {
src_prepare() {
epatch "${FILESDIR}/${PN}-1.3.0-gdk-native-windows.patch"
- epatch "${FILESDIR}/${PN}-1.4.2-parallel-make.patch"
+ epatch "${FILESDIR}/${P}-parallel-make.patch"
epatch "${FILESDIR}/${P}-compile-on-hardened.patch"
sed -i -r "s:^libnoxshm_LDFLAGS = :libnoxshm_LDFLAGS = -L/usr/$(ABI=x86 get_libdir)/ :" Makefile
}
diff --git a/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4.ebuild b/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4.ebuild
index 1b11b238f709..3484c0a8ca01 100644
--- a/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4.ebuild
+++ b/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4.ebuild,v 1.3 2011/07/05 07:49:27 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4.ebuild,v 1.4 2011/07/14 16:09:41 chutzpah Exp $
EAPI=2
@@ -45,7 +45,7 @@ autoinstall() {
src_prepare() {
epatch "${FILESDIR}/${PN}-1.3.0-gdk-native-windows.patch"
- epatch "${FILESDIR}/${PN}-1.4.2-parallel-make.patch"
+ epatch "${FILESDIR}/${P}-parallel-make.patch"
epatch "${FILESDIR}/${P}-compile-on-hardened.patch"
}