Attachment #100024 for bug #138454

Lines 35-41 Link Here

(-)nspluginwrapper-0.9.90.1-orig/Makefile (-1 / +1 lines)
35	npviewer_LDFLAGS = -L/usr/X11R6/$(lib) -lX11 -lXext -lXt -ldl -lpthread	35	npviewer_LDFLAGS = -L/usr/X11R6/$(lib) -lX11 -lXext -lXt -ldl -lpthread
36	npviewer_LDFLAGS += $(GTK_LDFLAGS)	36	npviewer_LDFLAGS += $(GTK_LDFLAGS)
37	ifeq ($(ARCH),i386)	37	ifeq ($(ARCH),i386)
38	npviewer_LDFLAGS += -Wl,-shared	38	npviewer_LDFLAGS += -Wl,-shared -L/emul/linux/x86/usr/lib
39	endif	39	endif
40		40
41	npconfig_PROGRAM = npconfig	41	npconfig_PROGRAM = npconfig

Lines 260-266 Link Here

(-)nspluginwrapper-0.9.90.1-orig/configure (-1 / +1 lines)
260	echo "VERSION=$VERSION" >>$config_mak	260	echo "VERSION=$VERSION" >>$config_mak
261	echo "#define NPW_VERSION \"$VERSION\"" >> $config_h	261	echo "#define NPW_VERSION \"$VERSION\"" >> $config_h
262		262
263	pkglibdir="$prefix/lib/$PACKAGE"	263	pkglibdir="$prefix/$lib/$PACKAGE"
264	echo "pkglibdir=$pkglibdir" >> $config_mak	264	echo "pkglibdir=$pkglibdir" >> $config_mak
265	echo "#define NPW_LIBDIR \"$pkglibdir\"" >> $config_h	265	echo "#define NPW_LIBDIR \"$pkglibdir\"" >> $config_h
266		266

Lines 80-90 Link Here

(-)nspluginwrapper-0.9.90.1-orig/src/npw-config.c (-2 / +4 lines)
80		80
81	static const char *get_system_mozilla_plugin_dir(void)	81	static const char *get_system_mozilla_plugin_dir(void)
82	{	82	{
83	static const char default_dir[] = LIBDIR "/mozilla/plugins";	83	static const char default_dir[] = LIBDIR "/nsbrowser/plugins";
84	const char *dir;	84	const char *dir;
85		85
86	if (access("/etc/SuSE-release", F_OK) == 0) {	86	if (access("/etc/SuSE-release", F_OK) == 0) {
87	dir = LIBDIR "/firefox/plugins"; // new plugins location (10.1?)	87	dir = LIBDIR "/nsbrowser/plugins"; // new plugins location (10.1?)
88	if (access(dir, F_OK) != 0)	88	if (access(dir, F_OK) != 0)
89	dir = "/opt/MozillaFirefox/lib/plugins"; // XXX not lib64 aware?	89	dir = "/opt/MozillaFirefox/lib/plugins"; // XXX not lib64 aware?
90	}	90	}
Lines 109-114 Link Here
109	static const char **get_mozilla_plugin_dirs(void)	109	static const char **get_mozilla_plugin_dirs(void)
110	{	110	{
111	static const char *default_dirs[] = {	111	static const char *default_dirs[] = {
		112	"/usr/lib32/nsbrowser/plugins",
		113	"/usr/lib64/nsbrowser/plugins",
112	"/usr/lib/mozilla/plugins",	114	"/usr/lib/mozilla/plugins",
113	"/usr/lib64/mozilla/plugins",	115	"/usr/lib64/mozilla/plugins",
114	"/usr/lib/browser-plugins",	116	"/usr/lib/browser-plugins",

Return to bug 138454