From: Pacho Ramos Date: Sun, 20 Jun 2010 10:07:01 +0000 (+0000) Subject: Version bump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a46d20cfcf21a9558557520f755eef908188e8f5;p=gentoo.git Version bump Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- diff --git a/www-plugins/nspluginwrapper/ChangeLog b/www-plugins/nspluginwrapper/ChangeLog index fcbfb0b9c1c6..a9bc623f8fed 100644 --- a/www-plugins/nspluginwrapper/ChangeLog +++ b/www-plugins/nspluginwrapper/ChangeLog @@ -1,6 +1,23 @@ # ChangeLog for www-plugins/nspluginwrapper # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.4 2010/02/13 12:29:51 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.5 2010/06/20 10:07:01 pacho Exp $ + +*nspluginwrapper-1.3.0 (20 Jun 2010) + + 20 Jun 2010; Pacho Ramos -nspluginwrapper-1.0.0.ebuild, + -nspluginwrapper-1.2.2.ebuild, -nspluginwrapper-1.2.2-r1.ebuild, + +nspluginwrapper-1.3.0.ebuild, + +files/nspluginwrapper-1.3.0-fix-npident-array-sending.patch, + +files/nspluginwrapper-1.3.0-fortify.patch, + +files/nspluginwrapper-1.3.0-gdk-native-windows.patch, + +files/nspluginwrapper-1.3.0-inst-crash.patch, + +files/nspluginwrapper-1.3.0-ldflags.patch, + +files/nspluginwrapper-1.3.0-make.patch, + +files/nspluginwrapper-1.3.0-offsetof.patch: + Version bump to 1.3.0 (provided by most distributions) with bugfixes over + 1.2.2. Also including some patches from Mandriva, Fedora and OpenSUSE to + set GDK_NATIVE_WINDOWS=1 (bug #324773 by Alexander E. Patrakov), LDFLAGS + fixes, prevent some crashes and others. Removing old versions. 13 Feb 2010; Pacho Ramos nspluginwrapper-1.2.2-r2.ebuild: diff --git a/www-plugins/nspluginwrapper/Manifest b/www-plugins/nspluginwrapper/Manifest index 8849b24f7ea6..7a3e334336d2 100644 --- a/www-plugins/nspluginwrapper/Manifest +++ b/www-plugins/nspluginwrapper/Manifest @@ -4,18 +4,23 @@ Hash: SHA1 AUX nspluginwrapper-1.2.2-gcc44.patch 3085 RMD160 f6e8508449e66c80f5aad5d40233b0d941bf20d7 SHA1 14a2cea1f14f30bd6d9ce78f3dec21a704fd2998 SHA256 678b7f359fdca751e7a2a12de2cc06a1b4c650f57f204b580a400d54b061752e AUX nspluginwrapper-1.2.2-npidentifiers.patch 5839 RMD160 75cc5acd80b31b014c15149308b61aeb9193fc5d SHA1 c4efb846c429d958619b76abdd82e45d3e3dfa3f SHA256 8bb55b845017b60912c62c4abadc50a3f0397ddf470599b8453b97d9e69f8cd5 AUX nspluginwrapper-1.2.2-respect-ldflags.patch 823 RMD160 15717dab32c80cd66702c5a88431b9218d0f11b5 SHA1 e7902088653b1fe9e3836676e178f8122b5ba8d4 SHA256 4efb0473338ff86c0f6f02729b92c8d74a53f97ad69717e449c2224572468416 -DIST nspluginwrapper-1.0.0.tar.bz2 271028 RMD160 d3b5a5d1dd314e5331ffc877fb9621d6566087c6 SHA1 ef551fb508835b3358355477be794a34e9f64135 SHA256 e5c4661eb91d05fc3da2f4ccf6e0769e8cd097ac232ffc6afe16e645729a02d5 +AUX nspluginwrapper-1.3.0-fix-npident-array-sending.patch 5839 RMD160 75cc5acd80b31b014c15149308b61aeb9193fc5d SHA1 c4efb846c429d958619b76abdd82e45d3e3dfa3f SHA256 8bb55b845017b60912c62c4abadc50a3f0397ddf470599b8453b97d9e69f8cd5 +AUX nspluginwrapper-1.3.0-fortify.patch 541 RMD160 89c49f7bca2c64972e4f8ee5172b3dec12c26f65 SHA1 65312992cd23be4ebac2ae302d6770770ae6e4d6 SHA256 e76dcb361f0ce78f01fcd64a6f18baa4479a163d56253261bf32e47a8a35aa90 +AUX nspluginwrapper-1.3.0-gdk-native-windows.patch 526 RMD160 e254dfc264828d6b1cc11adc73fe5666fbf27072 SHA1 ebe6ce5fa8cd8df4d98bbd5ec298500141f0fda0 SHA256 b616b16549fb1c61a43504da4b81b14ea2649239ff9ef5e7bfb3c58471f6fd1a +AUX nspluginwrapper-1.3.0-inst-crash.patch 592 RMD160 814f5f7491eb96539f78ac4c742cec030dd6263d SHA1 52c75e510332241568ec7e78a6d9032cf98164fa SHA256 5d724a73978ebffdb082eaf01ffbb2bb98aae4aad8433b56da3f73c2610515c3 +AUX nspluginwrapper-1.3.0-ldflags.patch 777 RMD160 541c4914e2eb9068cc34875b62d2684434888180 SHA1 6573c681fb22e414ff550923fbc68182eb99839c SHA256 f32779cfd46dccb60ba7b708ba17ca4644a56ecef52abf6ad1c7174a3ec9021f +AUX nspluginwrapper-1.3.0-make.patch 2663 RMD160 1b98f3eb96f9171c92c31a45810de55b8f1972cb SHA1 c69528dcb79a3de9f1fc85d8d4a9d62bb3e32e6c SHA256 1a7d5dfc0f75575ab2a019c2674df1024372626eb7280ed6cad791362db97707 +AUX nspluginwrapper-1.3.0-offsetof.patch 245 RMD160 63003f206042d1c303c09f46d73714e3f366d26b SHA1 90423132c6f9d08cca27667d9f8619a0c5c97391 SHA256 b087e057c2b6a0d49d5b3ee28deb9deb6d2b24490876a08d982c11730d92eb16 DIST nspluginwrapper-1.2.2.tar.bz2 327947 RMD160 d5aa265966f87c51bb9ea4f2a079a87b74fdcbf3 SHA1 be581c39dcc1a8d9a5b3f81e4650f553a30cf249 SHA256 4e6cbb7aeda1c9f0d6e5a17e729160b5d3f3e7048f90353238806289752175c3 -EBUILD nspluginwrapper-1.0.0.ebuild 2400 RMD160 c5eb90d99f1ffa6082a196af90a24a7e85b7f14f SHA1 dbee596e2c67ce76ba027ba3487b659fabd04d38 SHA256 1147c4670b7cdf28026fae04a33bcdb0e8d5cb4bee7b2dcf71b9727143eced2a -EBUILD nspluginwrapper-1.2.2-r1.ebuild 2567 RMD160 018c45e22a8bc3697edd1f5b73cb565bc51ad5d4 SHA1 4a4cba781bfb454afccb5637908c74ce848608df SHA256 6269fc0621885b0344a56cf7ac5679a30f288e116f11855fee7002bc13e64e71 +DIST nspluginwrapper_1.3.0.orig.tar.gz 431176 RMD160 4d01263a010b155e578901913648ed1202f49629 SHA1 4558ed89411e53965cbbf974bf881ac88cff863d SHA256 0af7e2ae4c6258d5c17addbcc4658b84c979860da843873f0d15d90ee9a8259d EBUILD nspluginwrapper-1.2.2-r2.ebuild 2678 RMD160 bfa815b401b451d325d7d7519fd1e7f5cc45210e SHA1 cc37fe900554f0257a49b2e4320f63fc1bf009ee SHA256 0498e1cc647e57d4c84e348fcaf55381d85568c76ab2590c0736876801e4b749 -EBUILD nspluginwrapper-1.2.2.ebuild 2391 RMD160 b8db5ff9cb5a6c2583877a7b8b3775ad26ec6504 SHA1 d84a56652505af9578ad68bd955b0d6c23161ad8 SHA256 0656a04823aef66245e4f82cd810bdb6b5d86b82b4ce66abf0efd3a10af5d0bd -MISC ChangeLog 6980 RMD160 52cfdf8ca8b2e9136d1f25802467e9dc83856f37 SHA1 371736f41fde8ed94b39f6948ef2254dada7129a SHA256 0d2e9240d231b7c506893b87aa106c5a1b205aecbb1f11b1ac8538662b848a73 +EBUILD nspluginwrapper-1.3.0.ebuild 2933 RMD160 9a61c10169574025743103112163b3eeba961df3 SHA1 96c27817a284ce7cb1ceec671bfe4d7ec7d31c93 SHA256 84f127f0c465c7eed0a4d4303ded5392e753ee4ded5501dc901ce54a5b8aa794 +MISC ChangeLog 7839 RMD160 59055f9700ed044b2da6aa75e9ec7ddc6199ee14 SHA1 f98de00d0ae754887dad96141ea8fa32d3b416d2 SHA256 668c894ae490f95997e5189fb9296b5f7b6df7808aa614f562785d723e9955d9 MISC metadata.xml 253 RMD160 37a89adccd0388cf014f6768a21b1ec09252d21c SHA1 fa43576fb2327afb837b5b2ea57dc6ab8525494b SHA256 0b0d878d1f93316b2966ec90c1f80c46fe67fb3f5647b28f7c30d9647dbb1854 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkt2m0sACgkQCaWpQKGI+9R4OgCfTfG0Nj+x9OK3AM4EVyOb8NNg -s6cAniJHEX/M8kTlN8JyF/R3i+mH2tYi -=o9bk +iEUEARECAAYFAkwd6E4ACgkQCaWpQKGI+9QvnQCdEffkhJc8bkMX9kMylz599xEc +pTEAmOez7buP6PjB9vAKgtSKg2HMDPI= +=rtuT -----END PGP SIGNATURE----- diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-fix-npident-array-sending.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-fix-npident-array-sending.patch new file mode 100644 index 000000000000..568a4ea1f79a --- /dev/null +++ b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-fix-npident-array-sending.patch @@ -0,0 +1,178 @@ +Index: src/npw-viewer.c +=================================================================== +--- src/npw-viewer.c (revision 942) ++++ src/npw-viewer.c (working copy) +@@ -2059,7 +2059,7 @@ + RPC_METHOD_NPN_INVOKE, + RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin, + RPC_TYPE_NP_OBJECT, npobj, +- RPC_TYPE_NP_IDENTIFIER, methodName, ++ RPC_TYPE_NP_IDENTIFIER, &methodName, + RPC_TYPE_ARRAY, RPC_TYPE_NP_VARIANT, argCount, args, + RPC_TYPE_INVALID); + +@@ -2249,7 +2249,7 @@ + RPC_METHOD_NPN_GET_PROPERTY, + RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin, + RPC_TYPE_NP_OBJECT, npobj, +- RPC_TYPE_NP_IDENTIFIER, propertyName, ++ RPC_TYPE_NP_IDENTIFIER, &propertyName, + RPC_TYPE_INVALID); + + if (error != RPC_ERROR_NO_ERROR) { +@@ -2311,7 +2311,7 @@ + RPC_METHOD_NPN_SET_PROPERTY, + RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin, + RPC_TYPE_NP_OBJECT, npobj, +- RPC_TYPE_NP_IDENTIFIER, propertyName, ++ RPC_TYPE_NP_IDENTIFIER, &propertyName, + RPC_TYPE_NP_VARIANT, value, + RPC_TYPE_INVALID); + +@@ -2370,7 +2370,7 @@ + RPC_METHOD_NPN_REMOVE_PROPERTY, + RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin, + RPC_TYPE_NP_OBJECT, npobj, +- RPC_TYPE_NP_IDENTIFIER, propertyName, ++ RPC_TYPE_NP_IDENTIFIER, &propertyName, + RPC_TYPE_INVALID); + + if (error != RPC_ERROR_NO_ERROR) { +@@ -2427,7 +2427,7 @@ + RPC_METHOD_NPN_HAS_PROPERTY, + RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin, + RPC_TYPE_NP_OBJECT, npobj, +- RPC_TYPE_NP_IDENTIFIER, propertyName, ++ RPC_TYPE_NP_IDENTIFIER, &propertyName, + RPC_TYPE_INVALID); + + if (error != RPC_ERROR_NO_ERROR) { +@@ -2484,7 +2484,7 @@ + RPC_METHOD_NPN_HAS_METHOD, + RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin, + RPC_TYPE_NP_OBJECT, npobj, +- RPC_TYPE_NP_IDENTIFIER, methodName, ++ RPC_TYPE_NP_IDENTIFIER, &methodName, + RPC_TYPE_INVALID); + + if (error != RPC_ERROR_NO_ERROR) { +@@ -2780,7 +2780,7 @@ + + int error = rpc_method_invoke(g_rpc_connection, + RPC_METHOD_NPN_IDENTIFIER_IS_STRING, +- RPC_TYPE_NP_IDENTIFIER, identifier, ++ RPC_TYPE_NP_IDENTIFIER, &identifier, + RPC_TYPE_INVALID); + + if (error != RPC_ERROR_NO_ERROR) { +@@ -2838,7 +2838,7 @@ + + int error = rpc_method_invoke(g_rpc_connection, + RPC_METHOD_NPN_UTF8_FROM_IDENTIFIER, +- RPC_TYPE_NP_IDENTIFIER, identifier, ++ RPC_TYPE_NP_IDENTIFIER, &identifier, + RPC_TYPE_INVALID); + + if (error != RPC_ERROR_NO_ERROR) { +@@ -2902,7 +2902,7 @@ + + int error = rpc_method_invoke(g_rpc_connection, + RPC_METHOD_NPN_INT_FROM_IDENTIFIER, +- RPC_TYPE_NP_IDENTIFIER, identifier, ++ RPC_TYPE_NP_IDENTIFIER, &identifier, + RPC_TYPE_INVALID); + + if (error != RPC_ERROR_NO_ERROR) { +Index: src/npw-wrapper.c +=================================================================== +--- src/npw-wrapper.c (revision 942) ++++ src/npw-wrapper.c (working copy) +@@ -1528,7 +1528,7 @@ + free(name); + + return rpc_method_send_reply(connection, +- RPC_TYPE_NP_IDENTIFIER, ident, ++ RPC_TYPE_NP_IDENTIFIER, &ident, + RPC_TYPE_INVALID); + } + +@@ -1601,7 +1601,7 @@ + NPIdentifier ident = g_NPN_GetIntIdentifier(intid); + + return rpc_method_send_reply(connection, +- RPC_TYPE_NP_IDENTIFIER, ident, ++ RPC_TYPE_NP_IDENTIFIER, &ident, + RPC_TYPE_INVALID); + } + +Index: src/npruntime.c +=================================================================== +--- src/npruntime.c (revision 942) ++++ src/npruntime.c (working copy) +@@ -221,7 +221,7 @@ + int error = rpc_method_invoke(g_rpc_connection, + RPC_METHOD_NPCLASS_HAS_METHOD, + RPC_TYPE_NP_OBJECT, npobj, +- RPC_TYPE_NP_IDENTIFIER, name, ++ RPC_TYPE_NP_IDENTIFIER, &name, + RPC_TYPE_INVALID); + + if (error != RPC_ERROR_NO_ERROR) { +@@ -327,7 +327,7 @@ + int error = rpc_method_invoke(g_rpc_connection, + RPC_METHOD_NPCLASS_INVOKE, + RPC_TYPE_NP_OBJECT, npobj, +- RPC_TYPE_NP_IDENTIFIER, name, ++ RPC_TYPE_NP_IDENTIFIER, &name, + RPC_TYPE_ARRAY, RPC_TYPE_NP_VARIANT, argCount, args, + RPC_TYPE_INVALID); + +@@ -509,7 +509,7 @@ + int error = rpc_method_invoke(g_rpc_connection, + RPC_METHOD_NPCLASS_HAS_PROPERTY, + RPC_TYPE_NP_OBJECT, npobj, +- RPC_TYPE_NP_IDENTIFIER, name, ++ RPC_TYPE_NP_IDENTIFIER, &name, + RPC_TYPE_INVALID); + + if (error != RPC_ERROR_NO_ERROR) { +@@ -599,7 +599,7 @@ + int error = rpc_method_invoke(g_rpc_connection, + RPC_METHOD_NPCLASS_GET_PROPERTY, + RPC_TYPE_NP_OBJECT, npobj, +- RPC_TYPE_NP_IDENTIFIER, name, ++ RPC_TYPE_NP_IDENTIFIER, &name, + RPC_TYPE_INVALID); + + if (error != RPC_ERROR_NO_ERROR) { +@@ -684,7 +684,7 @@ + int error = rpc_method_invoke(g_rpc_connection, + RPC_METHOD_NPCLASS_SET_PROPERTY, + RPC_TYPE_NP_OBJECT, npobj, +- RPC_TYPE_NP_IDENTIFIER, name, ++ RPC_TYPE_NP_IDENTIFIER, &name, + RPC_TYPE_NP_VARIANT, value, + RPC_TYPE_INVALID); + +@@ -763,7 +763,7 @@ + int error = rpc_method_invoke(g_rpc_connection, + RPC_METHOD_NPCLASS_REMOVE_PROPERTY, + RPC_TYPE_NP_OBJECT, npobj, +- RPC_TYPE_NP_IDENTIFIER, name, ++ RPC_TYPE_NP_IDENTIFIER, &name, + RPC_TYPE_INVALID); + + if (error != RPC_ERROR_NO_ERROR) { +Index: src/npw-rpc.c +=================================================================== +--- src/npw-rpc.c (revision 942) ++++ src/npw-rpc.c (working copy) +@@ -1252,7 +1252,7 @@ + // the browser side + static int do_send_NPIdentifier(rpc_message_t *message, void *p_value) + { +- NPIdentifier ident = (NPIdentifier)p_value; ++ NPIdentifier ident = *(NPIdentifier *)p_value; + int id = 0; + if (ident) { + #ifdef BUILD_WRAPPER diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-fortify.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-fortify.patch new file mode 100644 index 000000000000..e0b077f67251 --- /dev/null +++ b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-fortify.patch @@ -0,0 +1,19 @@ +--- nspluginwrapper-1.3.0/lsb-build/stub_libs/libc_nonshared.c.fortify 2008-12-20 23:34:55.000000000 +0100 ++++ nspluginwrapper-1.3.0/lsb-build/stub_libs/libc_nonshared.c 2010-03-30 16:03:51.000000000 +0200 +@@ -98,3 +98,16 @@ + + _fini (); + } ++ ++int ++__sprintf_chk (char *str, int flags, size_t size, const char *format, ...) ++{ ++ __builtin_va_list ap; ++ int result; ++ __builtin_va_start(ap, format); ++ result = __builtin_vsnprintf(str, size, format, ap); ++ __builtin_va_end(ap); ++ return result; ++} ++ ++void __stack_chk_fail_local (void) {} diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-gdk-native-windows.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-gdk-native-windows.patch new file mode 100644 index 000000000000..977af6c97e85 --- /dev/null +++ b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-gdk-native-windows.patch @@ -0,0 +1,13 @@ +diff -up nspluginwrapper-1.3.0/src/npw-viewer.sh.old nspluginwrapper-1.3.0/src/npw-viewer.sh +--- nspluginwrapper-1.3.0/src/npw-viewer.sh.old 2009-11-16 12:57:53.000000000 +0100 ++++ nspluginwrapper-1.3.0/src/npw-viewer.sh 2009-12-04 16:16:27.000000000 +0100 +@@ -77,6 +77,9 @@ NPW_USE_XSHM=${NPW_USE_XSHM:-yes} + NPW_USE_VALGRIND=${NPW_USE_VALGRIND:-no} + can_use_valgrind="no" + ++# Compiz/Flash workaround (rhbz#542424) ++export GDK_NATIVE_WINDOWS=1 ++ + if test "$ARCH" != "$TARGET_ARCH"; then + case $TARGET_ARCH in + i386) diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-inst-crash.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-inst-crash.patch new file mode 100644 index 000000000000..60f6b1e0f5e5 --- /dev/null +++ b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-inst-crash.patch @@ -0,0 +1,12 @@ +diff -up nspluginwrapper-1.3.0/src/npw-common.h.old nspluginwrapper-1.3.0/src/npw-common.h +--- nspluginwrapper-1.3.0/src/npw-common.h.old 2009-01-02 15:22:29.000000000 +0100 ++++ nspluginwrapper-1.3.0/src/npw-common.h 2009-11-10 09:58:34.000000000 +0100 +@@ -115,7 +115,7 @@ npw_plugin_instance_is_valid(void *ptr) + static inline NPW_PluginInstance * + _npw_get_plugin_instance (NPP instance) + { +- return (NPW_PluginInstance *)instance->_NPW_INSTANCE_PRIVATE_DATA; ++ return instance ? (NPW_PluginInstance *)instance->_NPW_INSTANCE_PRIVATE_DATA : NULL; + } + + static inline NPW_PluginInstance * diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-ldflags.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-ldflags.patch new file mode 100644 index 000000000000..e8922e651179 --- /dev/null +++ b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-ldflags.patch @@ -0,0 +1,22 @@ +diff -up nspluginwrapper-1.3.0/configure.conf nspluginwrapper-1.3.0/configure +--- nspluginwrapper-1.3.0/configure.conf 2009-01-02 15:22:29.000000000 +0100 ++++ nspluginwrapper-1.3.0/configure 2009-01-07 12:06:21.000000000 +0100 +@@ -559,10 +559,6 @@ for dir in $x_base_dirs; do + fi + fi + done +-if test -z "$x_base_dir"; then +- echo "X11/Xt environment not found" +- exit 1 +-fi + + # big/little endian test + cat > $TMPC << EOF +@@ -763,6 +759,7 @@ echo "COMPILER=$compiler" >> $config_mak + echo "CC=$cc" >> $config_mak + echo "CXX=$cxx" >> $config_mak + echo "CFLAGS=$CFLAGS" >> $config_mak ++echo "LDFLAGS=$LDFLAGS" >> $config_mak + echo "GLIB_CFLAGS=$GLIB_CFLAGS" >> $config_mak + echo "GLIB_LDFLAGS=$GLIB_LDFLAGS" >> $config_mak + echo "GTK_CFLAGS=$GTK_CFLAGS" >> $config_mak diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-make.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-make.patch new file mode 100644 index 000000000000..13587225b484 --- /dev/null +++ b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-make.patch @@ -0,0 +1,51 @@ +diff -up nspluginwrapper-1.3.0/Makefile.make nspluginwrapper-1.3.0/Makefile +--- nspluginwrapper-1.3.0/Makefile.make 2009-01-02 15:22:29.000000000 +0100 ++++ nspluginwrapper-1.3.0/Makefile 2009-01-07 13:00:40.000000000 +0100 +@@ -364,13 +364,13 @@ changelog.commit: changelog + svn commit -m "Generated by svn2cl." ChangeLog + + $(npwrapper_LIBRARY): $(npwrapper_OBJECTS) +- $(CC) -o $@ $(DSO_LDFLAGS) $(npwrapper_OBJECTS) $(npwrapper_LDFLAGS) ++ $(CC) -o $@ $(DSO_LDFLAGS) $(npwrapper_OBJECTS) $(npwrapper_LDFLAGS) $(LDFLAGS) + + npwrapper-%.os: $(SRC_PATH)/src/%.c + $(CC) -o $@ -c $< $(PIC_CFLAGS) $(CPPFLAGS) $(npwrapper_CFLAGS) -DBUILD_WRAPPER + + $(npviewer_PROGRAM): $(npviewer_OBJECTS) $(npviewer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS) +- $(CC) $(LDFLAGS_32) -o $@ $(npviewer_OBJECTS) $(npviewer_LDFLAGS) ++ $(CC) $(LDFLAGS_32) -o $@ $(npviewer_OBJECTS) $(npviewer_LDFLAGS) $(LDFLAGS) + + npviewer-%.o: $(SRC_PATH)/src/%.c + $(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(npviewer_CFLAGS) -DBUILD_VIEWER +@@ -387,19 +387,19 @@ npplayer-%.o: $(SRC_PATH)/src/tidy/%.c + $(CC) $(CFLAGS) -o $@ -c $< $(CPPFLAGS) $(npplayer_CFLAGS) -DBUILD_PLAYER + + $(libxpcom_LIBRARY): $(libxpcom_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS) +- $(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libxpcom_OBJECTS) $(libxpcom_LDFLAGS) -Wl,$(LD_soname),libxpcom.so ++ $(CC) $(LDFLAGS) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libxpcom_OBJECTS) $(libxpcom_LDFLAGS) -Wl,$(LD_soname),libxpcom.so + + libxpcom-%.o: $(SRC_PATH)/src/%.c + $(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(libxpcom_CFLAGS) -DBUILD_XPCOM + + $(libnoxshm_LIBRARY): $(libnoxshm_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS) +- $(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libnoxshm_OBJECTS) $(libnoxshm_LDFLAGS) -Wl,$(LD_soname),libnoxshm.so ++ $(CC) $(LDFLAGS) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libnoxshm_OBJECTS) $(libnoxshm_LDFLAGS) -Wl,$(LD_soname),libnoxshm.so + + libnoxshm-%.o: $(SRC_PATH)/src/%.c + $(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(libnoxshm_CFLAGS) + + $(npconfig_PROGRAM): $(npconfig_OBJECTS) +- $(CC) -o $@ $(npconfig_OBJECTS) $(npconfig_LDFLAGS) ++ $(CC) -o $@ $(npconfig_OBJECTS) $(npconfig_LDFLAGS) $(LDFLAGS) + + npconfig-%.o: $(SRC_PATH)/src/%.c + $(CC) -o $@ -c $< $(CPPFLAGS) $(CFLAGS) +@@ -425,7 +425,7 @@ $(LSB_OBJ_DIR)/libgcc_s_32.so: $(LSB_OBJ + $(LN_S) libgcc_s.so $@ + + $(LSB_OBJ_DIR)/%.so: $(LSB_OBJ_DIR)/%.o +- $(CC) $(LDFLAGS_32) -nostdlib $(DSO_LDFLAGS) $< -o $@ \ ++ $(CC) $(LDFLAGS) $(LDFLAGS_32) -nostdlib $(DSO_LDFLAGS) $< -o $@ \ + -Wl,--version-script,$(patsubst $(LSB_OBJ_DIR)/%.o,$(LSB_SRC_DIR)/%.Version,$<) \ + -Wl,-soname,`grep "$(patsubst $(LSB_OBJ_DIR)/%.o,%,$<) " $(LSB_SRC_DIR)/LibNameMap.txt | cut -f2 -d' '` + diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-offsetof.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-offsetof.patch new file mode 100644 index 000000000000..93e3e174adac --- /dev/null +++ b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-offsetof.patch @@ -0,0 +1,11 @@ +--- lsb-build/headers/stddef.h ++++ lsb-build/headers/stddef.h +@@ -7,7 +7,7 @@ + #endif + + +-#define offsetof(TYPE,MEMBER) ((size_t)&((TYPE*)0)->MEMBER) ++#define offsetof(TYPE,MEMBER) __builtin_offsetof(TYPE,MEMBER) + + #if !defined(__cplusplus) + diff --git a/www-plugins/nspluginwrapper/nspluginwrapper-1.0.0.ebuild b/www-plugins/nspluginwrapper/nspluginwrapper-1.0.0.ebuild deleted file mode 100644 index 2639ec263b75..000000000000 --- a/www-plugins/nspluginwrapper/nspluginwrapper-1.0.0.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.0.0.ebuild,v 1.1 2009/04/09 21:06:33 ulm Exp $ - -inherit eutils nsplugins flag-o-matic multilib - -DESCRIPTION="Netscape Plugin Wrapper - Load 32bit plugins on 64bit browser" -HOMEPAGE="http://www.gibix.net/projects/nspluginwrapper/" -SRC_URI="http://www.gibix.net/projects/nspluginwrapper/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64" -IUSE="" - -RDEPEND=">=x11-libs/gtk+-2 - app-emulation/emul-linux-x86-xlibs - app-emulation/emul-linux-x86-gtklibs - || ( >=sys-apps/util-linux-2.13 sys-apps/setarch )" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -autoinstall() { - if [[ -x /usr/bin/${PN} ]]; then - einfo "Auto installing 32bit plugins..." - ${PN} -a -i - ls /usr/lib64/nsbrowser/plugins - - # Remove wrappers if equivalent 64-bit plugins exist - # TODO: May be better to patch nspluginwrapper so it doesn't create - # duplicate wrappers in the first place... - local DIR64="${ROOT}/usr/lib64/nsbrowser/plugins/" - for f in "${DIR64}"/npwrapper.*.so; do - local PLUGIN=${f##*/npwrapper.} - if [[ -f ${DIR64}/${PLUGIN} ]]; then - einfo " Removing duplicate wrapper for native 64-bit ${PLUGIN}" - ${PN} -r "${f}" - fi - done - fi -} - -src_compile() { - econf --with-biarch \ - --with-lib32=$(ABI=x86 get_libdir) \ - --with-lib64=$(get_libdir) \ - --pkglibdir=/usr/$(get_libdir)/${PN} || die - emake || die -} - -src_install() { - emake -j1 DESTDIR="${D}" DONT_STRIP=yes install || die - - inst_plugin /usr/$(get_libdir)/nspluginwrapper/x86_64/linux/npwrapper.so - dosym /usr/$(get_libdir)/nspluginwrapper/x86_64/linux/npconfig /usr/bin/nspluginwrapper - - dodoc NEWS README TODO ChangeLog -} - -pkg_postinst() { - autoinstall - elog "Any 32bit plugins you currently have installed have now been" - elog "configured to work in a 64bit browser. Any plugins you install in" - elog "the future will first need to be setup with:" - elog " \"nspluginwrapper -i \"" - elog "before they will function in a 64bit browser" - elog -} - -# this is terribly ugly, but without a way to query portage as to whether -# we are upgrading/reinstalling a package versus unmerging, I can't think of -# a better way - -pkg_prerm() { - einfo "Removing wrapper plugins..." - nspluginwrapper -a -r -} - -pkg_postrm() { - autoinstall -} diff --git a/www-plugins/nspluginwrapper/nspluginwrapper-1.2.2.ebuild b/www-plugins/nspluginwrapper/nspluginwrapper-1.2.2.ebuild deleted file mode 100644 index e0e6639d4b38..000000000000 --- a/www-plugins/nspluginwrapper/nspluginwrapper-1.2.2.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.2.2.ebuild,v 1.2 2009/07/20 20:26:05 chutzpah Exp $ - -inherit eutils nsplugins multilib - -DESCRIPTION="Netscape Plugin Wrapper - Load 32bit plugins on 64bit browser" -HOMEPAGE="http://www.gibix.net/projects/nspluginwrapper/" -SRC_URI="http://www.gibix.net/projects/${PN}/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64" -IUSE="" - -RDEPEND=">=x11-libs/gtk+-2 - net-misc/curl - app-emulation/emul-linux-x86-xlibs - app-emulation/emul-linux-x86-gtklibs - || ( >=sys-apps/util-linux-2.13 sys-apps/setarch )" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -autoinstall() { - if [[ -x /usr/bin/${PN} ]]; then - einfo "Auto installing 32bit plugins..." - ${PN} -a -i - ls /usr/lib64/nsbrowser/plugins - - # Remove wrappers if equivalent 64-bit plugins exist - # TODO: May be better to patch nspluginwrapper so it doesn't create - # duplicate wrappers in the first place... - local DIR64="${ROOT}/usr/lib64/nsbrowser/plugins/" - for f in "${DIR64}"/npwrapper.*.so; do - local PLUGIN=${f##*/npwrapper.} - if [[ -f ${DIR64}/${PLUGIN} ]]; then - einfo " Removing duplicate wrapper for native 64-bit ${PLUGIN}" - ${PN} -r "${f}" - fi - done - fi -} - -src_compile() { - econf --with-biarch \ - --with-lib32=$(ABI=x86 get_libdir) \ - --with-lib64=$(get_libdir) \ - --pkglibdir=/usr/$(get_libdir)/${PN} - - emake || die "emake failed" - -} - -src_install() { - emake -j1 DESTDIR="${D}" install || die "emake install failed" - - inst_plugin "/usr/$(get_libdir)/${PN}/x86_64/linux/npwrapper.so" - dosym "/usr/$(get_libdir)/${PN}/x86_64/linux/npconfig" "/usr/bin/${PN}" - - dodoc NEWS README TODO ChangeLog -} - -pkg_postinst() { - autoinstall - elog "Any 32bit plugins you currently have installed have now been" - elog "configured to work in a 64bit browser. Any plugins you install in" - elog "the future will first need to be setup with:" - elog " \"nspluginwrapper -i \"" - elog "before they will function in a 64bit browser" - elog -} - -# this is terribly ugly, but without a way to query portage as to whether -# we are upgrading/reinstalling a package versus unmerging, I can't think of -# a better way - -pkg_prerm() { - einfo "Removing wrapper plugins..." - ${PN} --auto --remove -} - -pkg_postrm() { - autoinstall -} diff --git a/www-plugins/nspluginwrapper/nspluginwrapper-1.2.2-r1.ebuild b/www-plugins/nspluginwrapper/nspluginwrapper-1.3.0.ebuild similarity index 75% rename from www-plugins/nspluginwrapper/nspluginwrapper-1.2.2-r1.ebuild rename to www-plugins/nspluginwrapper/nspluginwrapper-1.3.0.ebuild index 20a82be30913..fca9fcb4f2c3 100644 --- a/www-plugins/nspluginwrapper/nspluginwrapper-1.2.2-r1.ebuild +++ b/www-plugins/nspluginwrapper/nspluginwrapper-1.3.0.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.2.2-r1.ebuild,v 1.1 2009/07/20 20:26:05 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.3.0.ebuild,v 1.1 2010/06/20 10:07:01 pacho Exp $ EAPI=2 -inherit eutils nsplugins multilib +inherit eutils nsplugins multilib flag-o-matic DESCRIPTION="Netscape Plugin Wrapper - Load 32bit plugins on 64bit browser" HOMEPAGE="http://www.gibix.net/projects/nspluginwrapper/" -SRC_URI="http://www.gibix.net/projects/${PN}/files/${P}.tar.bz2" +#SRC_URI="http://www.gibix.net/projects/${PN}/files/${P}.tar.bz2" +SRC_URI="mirror://debian/pool/contrib/n/${PN}/${P/-/_}.orig.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -44,12 +45,19 @@ autoinstall() { } src_prepare() { - epatch "${FILESDIR}/${P}-gcc44.patch" - epatch "${FILESDIR}/${P}-npidentifiers.patch" + epatch "${FILESDIR}/${P}-gdk-native-windows.patch" + epatch "${FILESDIR}/${P}-ldflags.patch" + epatch "${FILESDIR}/${P}-inst-crash.patch" + epatch "${FILESDIR}/${P}-make.patch" + epatch "${FILESDIR}/${P}-fix-npident-array-sending.patch" + epatch "${FILESDIR}/${P}-fortify.patch" + epatch "${FILESDIR}/${P}-offsetof.patch" } src_configure() { - econf --enable-biarch \ + replace-flags -O3 -O2 + + ./configure --enable-biarch \ --target-cpu=i386 \ --with-lib32=$(ABI=x86 get_libdir) \ --with-lib64=$(get_libdir) \ @@ -57,7 +65,7 @@ src_configure() { } src_compile() { - emake || die "emake failed" + emake LDFLAGS_32="-m32 ${LDFLAGS}" || die "emake failed" } src_install() {