From 32d92e8af745999f8b85e29be52fbb0b07eabc71 Mon Sep 17 00:00:00 2001 From: Kacper Kowalik Date: Sun, 20 Jun 2010 12:49:00 +0000 Subject: [PATCH] Adding missing bits fixing bug 269250 Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- www-plugins/nspluginwrapper/ChangeLog | 6 +- www-plugins/nspluginwrapper/Manifest | 14 +-- .../nspluginwrapper-1.3.0-asneeded.patch | 116 ++++++++++++++++-- 3 files changed, 116 insertions(+), 20 deletions(-) diff --git a/www-plugins/nspluginwrapper/ChangeLog b/www-plugins/nspluginwrapper/ChangeLog index 186e6d5af728..d1d61b2346b8 100644 --- a/www-plugins/nspluginwrapper/ChangeLog +++ b/www-plugins/nspluginwrapper/ChangeLog @@ -1,6 +1,10 @@ # 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.6 2010/06/20 11:30:09 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.7 2010/06/20 12:48:59 xarthisius Exp $ + + 20 Jun 2010; Kacper Kowalik + files/nspluginwrapper-1.3.0-asneeded.patch: + Adding missing bits fixing bug 269250 20 Jun 2010; Kacper Kowalik nspluginwrapper-1.3.0.ebuild, +files/nspluginwrapper-1.3.0-asneeded.patch, diff --git a/www-plugins/nspluginwrapper/Manifest b/www-plugins/nspluginwrapper/Manifest index b7d8199b2ceb..79f2091b0c52 100644 --- a/www-plugins/nspluginwrapper/Manifest +++ b/www-plugins/nspluginwrapper/Manifest @@ -4,7 +4,7 @@ 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 -AUX nspluginwrapper-1.3.0-asneeded.patch 10974 RMD160 e253df834037d73668742fa06fb2fbaa7a70a5d3 SHA1 81cbdfcf38005a65232e13410a33ca180d7d2003 SHA256 2e7b367aaf17ead0aff1d2c6def3bee225538041191143f9dcbf11530a9d4b9a +AUX nspluginwrapper-1.3.0-asneeded.patch 13730 RMD160 9f1253c386c79d047c30e043db7c29ccd6d98992 SHA1 3f93d78572bac82ac60e1288435c8942e548655b SHA256 ff128b4f8c2dc34584053299eaaadbc2206cf4c525bbd373baf499c7ddcb7fb0 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 @@ -14,14 +14,14 @@ DIST nspluginwrapper-1.2.2.tar.bz2 327947 RMD160 d5aa265966f87c51bb9ea4f2a079a87 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.3.0.ebuild 2901 RMD160 154e9e93ac1e3158eeac94a4ccf2338c920b2ba9 SHA1 6bbe9e90f4fbddbcf3e54bc8bb7fc1b0dcb65d84 SHA256 e396e979cb6566be420795d9b7859935ea5a4fbfc19d15497a05e3678981722b -MISC ChangeLog 8129 RMD160 fb0a5f466e606382a7e4d1e04551e494bddb8145 SHA1 fbac7180c87fceeedb9f471cb92bc06487715376 SHA256 d09c16a4c43bffac48d56f679e23db919131d2ed321b5d4917b887acff576c36 +MISC ChangeLog 8270 RMD160 a613544e2b01582fad16f8f1deb47f3ca46c71ec SHA1 1027b2987990b705265577bc121f98fb78cac385 SHA256 dfc7214ba452e2a82c90a6ed6c26550c67934a347a61ccdb97037b0f9d8f980c MISC metadata.xml 253 RMD160 37a89adccd0388cf014f6768a21b1ec09252d21c SHA1 fa43576fb2327afb837b5b2ea57dc6ab8525494b SHA256 0b0d878d1f93316b2966ec90c1f80c46fe67fb3f5647b28f7c30d9647dbb1854 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iJwEAQECAAYFAkwd+8sACgkQIiMqcbOVdxQitgQAnj8JO5Qy9r/VIizgo6y0Xz1X -+26Svu+2JmrdLlEe4TU3T8mGBVuLHOG9T3oWscBzqQEgj25hISKoJmmWAaJXEKlp -mcgsLCuFmpEiL6LcNMpiU6x0lbKBGlZRx+TJ9poLsEEJMRR9mpBKGwAQ6s3Kdr0Y -7RT6LPblagFX1x+BGR4= -=Oy+v +iJwEAQECAAYFAkweDkQACgkQIiMqcbOVdxTDKQP+LDckdse+w62yg/vRXbTYgCYz +gogGQdjmNG6r1aL6dKFpC5wsWNZjatf9k1TVCFGJ/YU1lwVwexLiO/M6p8078Z/2 +eiLIzRmS5UxetiZi6LmNqobBPL+JPUOnYg5qzNQTtCksIrUd9lsqBduFjeMReaXJ +s14KZhl9TkzZXNd8FX0= +=R/Cp -----END PGP SIGNATURE----- diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-asneeded.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-asneeded.patch index 5ea09e53d54a..a24e45dce62c 100644 --- a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-asneeded.patch +++ b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-asneeded.patch @@ -1,6 +1,7 @@ -Fixing as-needed issues and respect LDFLAGS +Fixing as-needed issues, respect LDFLAGS and use system libs http://bugs.gentoo.org/show_bug.cgi?id=321867 +http://bugs.gentoo.org/show_bug.cgi?id=269250 --- configure +++ configure @@ -94,7 +95,16 @@ http://bugs.gentoo.org/show_bug.cgi?id=321867 echo "CFLAGS_32=$CFLAGS_32" >> $config_mak --- Makefile +++ Makefile -@@ -51,16 +51,16 @@ +@@ -41,6 +41,8 @@ + STRIP_OPT = -s + endif + ++USE_SYSTEM_LIBS=1 ++ + LN_S = ln -sf + + ifeq ($(LD_soname),) +@@ -51,16 +53,16 @@ endif ifneq (,$(findstring $(OS),linux)) @@ -114,7 +124,7 @@ http://bugs.gentoo.org/show_bug.cgi?id=321867 endif PIC_CFLAGS = -fPIC -@@ -71,7 +71,7 @@ +@@ -71,7 +73,7 @@ endif X_CFLAGS = -I$(x11prefix)/include @@ -123,7 +133,27 @@ http://bugs.gentoo.org/show_bug.cgi?id=321867 ifneq (,$(findstring $(OS),netbsd dragonfly)) X_LDFLAGS += -Wl,--rpath,$(x11prefix)/$(lib64) endif -@@ -107,8 +107,9 @@ +@@ -79,6 +81,11 @@ + ARCH_32 = $(ARCH) + ifeq ($(build_biarch), yes) + ARCH_32 = $(TARGET_ARCH) ++endif ++ ++ifneq (1, $(USE_SYSTEM_LIBS)) ++ ++ifeq ($(build_biarch), yes) + LSB_LIBS = $(LSB_OBJ_DIR)/libc.so $(LSB_OBJ_DIR)/libgcc_s_32.so + LSB_LIBS += $(LSB_CORE_STUBS:%=$(LSB_OBJ_DIR)/%.so) + LSB_LIBS += $(LSB_CORE_STATIC_STUBS:%=$(LSB_OBJ_DIR)/%.a) +@@ -92,6 +99,7 @@ + LSB_CORE_STUBS = $(shell cat $(LSB_SRC_DIR)/core_filelist) + LSB_CORE_STATIC_STUBS = $(shell cat $(LSB_SRC_DIR)/core_static_filelist) + LSB_DESKTOP_STUBS = $(shell cat $(LSB_SRC_DIR)/desktop_filelist) ++endif + + ifeq (i386,$(TARGET_ARCH)) + TARGET_ELF_ARCH = elf32-i386 +@@ -107,8 +115,9 @@ npwrapper_SOURCES = $(npwrapper_RAWSRCS:%.c=$(SRC_PATH)/src/%.c) npwrapper_OBJECTS = $(npwrapper_RAWSRCS:%.c=npwrapper-%.os) npwrapper_CFLAGS = $(CFLAGS) $(X_CFLAGS) $(MOZILLA_CFLAGS) $(GLIB_CFLAGS) @@ -135,11 +165,20 @@ http://bugs.gentoo.org/show_bug.cgi?id=321867 npviewer_PROGRAM = npviewer.bin npviewer_RAWSRCS = npw-viewer.c npw-common.c npw-malloc.c npw-rpc.c rpc.c debug.c utils.c npruntime.c -@@ -120,13 +121,14 @@ +@@ -116,17 +125,23 @@ + npviewer_OBJECTS = $(npviewer_RAWSRCS:%.c=npviewer-%.o) + ifeq ($(build_biarch),yes) + npviewer_CFLAGS = $(CFLAGS_32) ++ifneq (1, $(USE_SYSTEM_LIBS)) + npviewer_CFLAGS += -I$(LSB_INC_DIR) npviewer_CFLAGS += -I$(LSB_INC_DIR)/glib-2.0 npviewer_CFLAGS += -I$(LSB_INC_DIR)/gtk-2.0 npviewer_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR) -npviewer_LDFLAGS += -lgtk-x11-2.0 -lgdk-x11-2.0 -lgobject-2.0 -ldl -lglib-2.0 -lX11 -lXt ++else ++npviewer_CFLAGS += $(shell pkg-config --cflags gtk+-2.0 glib-2.0) ++npviewer_LDFLAGS = $(LDFLAGS_32) ++endif +npviewer_LIBS += -lgtk-x11-2.0 -lgdk-x11-2.0 -lgobject-2.0 -ldl -lglib-2.0 -lX11 -lXt else npviewer_CFLAGS += $(GTK_CFLAGS) @@ -153,7 +192,7 @@ http://bugs.gentoo.org/show_bug.cgi?id=321867 ifeq ($(TARGET_OS):$(TARGET_ARCH),linux:i386) npviewer_MAPFILE = $(SRC_PATH)/src/npw-viewer.map endif -@@ -137,18 +139,19 @@ +@@ -137,18 +152,19 @@ ifeq ($(TARGET_OS):$(TARGET_ARCH),linux:i386) npviewer_SOURCES += $(SRC_PATH)/src/cxxabi-compat.cpp npviewer_OBJECTS += npviewer-cxxabi-compat.o @@ -177,7 +216,34 @@ http://bugs.gentoo.org/show_bug.cgi?id=321867 libxpcom_LIBRARY = libxpcom.so libxpcom_RAWSRCS = libxpcom.c debug.c -@@ -174,12 +177,13 @@ +@@ -156,8 +172,11 @@ + libxpcom_OBJECTS = $(libxpcom_RAWSRCS:%.c=libxpcom-%.o) + libxpcom_CFLAGS = $(PIC_CFLAGS) + ifeq ($(build_biarch),yes) ++libxpcom_LDFLAGS = $(LDFLAGS_32) ++ifneq (1, $(USE_SYSTEM_LIBS)) + libxpcom_CFLAGS += -I$(LSB_INC_DIR) +-libxpcom_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR) ++libxpcom_LDFLAGS = -L$(LSB_OBJ_DIR) ++endif + endif + + libnoxshm_LIBRARY = libnoxshm.so +@@ -165,21 +184,25 @@ + libnoxshm_SOURCES = $(libnoxshm_RAWSRCS:%.c=$(SRC_PATH)/src/%.c) + libnoxshm_OBJECTS = $(libnoxshm_RAWSRCS:%.c=libnoxshm-%.o) + libnoxshm_CFLAGS = $(PIC_CFLAGS) +-ifeq ($(biarch),yes) ++ifeq ($(build_biarch),yes) ++libnoxshm_LDFLAGS = $(LDFLAGS_32) ++ifneq (1, $(USE_SYSTEM_LIBS)) + libnoxshm_CFLAGS += -I$(LSB_INC_DIR) +-libnoxshm_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR) ++libnoxshm_LDFLAGS = -L$(LSB_OBJ_DIR) ++endif + endif + + npconfig_PROGRAM = npconfig npconfig_RAWSRCS = npw-config.c npconfig_SOURCES = $(npconfig_RAWSRCS:%.c=$(SRC_PATH)/src/%.c) npconfig_OBJECTS = $(npconfig_RAWSRCS:%.c=npconfig-%.o) @@ -193,7 +259,7 @@ http://bugs.gentoo.org/show_bug.cgi?id=321867 endif nploader_PROGRAM = npviewer.sh -@@ -192,7 +196,8 @@ +@@ -192,7 +215,8 @@ test_rpc_client_CPPFLAGS = $(CPPFLAGS) -I$(SRC_PATH)/src -DBUILD_CLIENT -DNPW_COMPONENT_NAME="\"Client\"" test_rpc_server_CPPFLAGS = $(CPPFLAGS) -I$(SRC_PATH)/src -DBUILD_SERVER -DNPW_COMPONENT_NAME="\"Server\"" test_rpc_CFLAGS = -I$(SRC_PATH)/src $(GLIB_CFLAGS) @@ -203,7 +269,33 @@ http://bugs.gentoo.org/show_bug.cgi?id=321867 test_rpc_RAWPROGS = \ test-rpc-types \ test-rpc-nested-1 \ -@@ -364,13 +369,13 @@ +@@ -230,6 +254,7 @@ + FILES += $(wildcard tests/*.html) + FILES += $(wildcard tests/*.c tests/*.h) + FILES += $(wildcard npapi/*.h npapi/nspr/*.h npapi/nspr/obsolete/*.h) ++ifneq (1, $(USE_SYSTEM_LIBS)) + FILES += $(LSB_TOP_DIR)/headers/core_filelist + FILES += $(addprefix $(LSB_TOP_DIR)/headers/,$(shell cat $(LSB_TOP_DIR)/headers/core_filelist)) + FILES += $(LSB_TOP_DIR)/headers/desktop_filelist +@@ -243,13 +268,15 @@ + FILES += $(patsubst %,$(LSB_SRC_DIR)/%.c,$(LSB_CORE_STATIC_STUBS)) + FILES += $(patsubst %,$(LSB_SRC_DIR)/%.c,$(LSB_DESKTOP_STUBS)) + FILES += $(patsubst %,$(LSB_SRC_DIR)/%.Version,$(LSB_DESKTOP_STUBS)) ++endif + + all: $(TARGETS) + + clean: +- rm -f $(TARGETS) *.o *.os ++ rm -f $(TARGETS) *.o *.os] ++ifneq (1, $(USE_SYSTEM_LIBS)) + rm -rf $(LSB_OBJ_DIR) +- ++endif + distclean: clean + rm -f config-host.* config.* + +@@ -364,13 +391,13 @@ svn commit -m "Generated by svn2cl." ChangeLog $(npwrapper_LIBRARY): $(npwrapper_OBJECTS) @@ -219,7 +311,7 @@ http://bugs.gentoo.org/show_bug.cgi?id=321867 npviewer-%.o: $(SRC_PATH)/src/%.c $(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(npviewer_CFLAGS) -DBUILD_VIEWER -@@ -379,7 +384,7 @@ +@@ -379,7 +406,7 @@ $(CXX) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(npviewer_CFLAGS) -DBUILD_VIEWER $(npplayer_PROGRAM): $(npplayer_OBJECTS) $(npplayer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS) @@ -228,7 +320,7 @@ http://bugs.gentoo.org/show_bug.cgi?id=321867 npplayer-%.o: $(SRC_PATH)/src/%.c $(CC) $(CFLAGS) -o $@ -c $< $(CPPFLAGS) $(npplayer_CFLAGS) -DBUILD_PLAYER -@@ -387,19 +392,19 @@ +@@ -387,19 +414,19 @@ $(CC) $(CFLAGS) -o $@ -c $< $(CPPFLAGS) $(npplayer_CFLAGS) -DBUILD_PLAYER $(libxpcom_LIBRARY): $(libxpcom_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS) @@ -251,7 +343,7 @@ http://bugs.gentoo.org/show_bug.cgi?id=321867 npconfig-%.o: $(SRC_PATH)/src/%.c $(CC) -o $@ -c $< $(CPPFLAGS) $(CFLAGS) -@@ -425,18 +430,18 @@ +@@ -425,18 +452,18 @@ $(LN_S) libgcc_s.so $@ $(LSB_OBJ_DIR)/%.so: $(LSB_OBJ_DIR)/%.o -- 2.26.2