rpms/nspluginwrapper/devel nspluginwrapper-0.9.91.4-rh.patch, 1.1, 1.2 nspluginwrapper.spec, 1.3, 1.4
Martin Stransky (stransky)
fedora-extras-commits at redhat.com
Fri Aug 3 11:51:58 UTC 2007
- Previous message (by thread): rpms/smb4k/FC-6 .cvsignore, 1.16, 1.17 smb4k.spec, 1.20, 1.21 sources, 1.16, 1.17
- Next message (by thread): rpms/kchmviewer/devel kchmviewer-2.0-desktop_fix.patch, 1.1, 1.2 kchmviewer.spec, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: stransky
Update of /cvs/pkgs/rpms/nspluginwrapper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13953
Modified Files:
nspluginwrapper-0.9.91.4-rh.patch nspluginwrapper.spec
Log Message:
fixed totem-complex plugin wrapping
nspluginwrapper-0.9.91.4-rh.patch:
Index: nspluginwrapper-0.9.91.4-rh.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper-0.9.91.4-rh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nspluginwrapper-0.9.91.4-rh.patch 30 Jul 2007 09:52:11 -0000 1.1
+++ nspluginwrapper-0.9.91.4-rh.patch 3 Aug 2007 11:51:56 -0000 1.2
@@ -1,5 +1,5 @@
--- nspluginwrapper-0.9.91.4/Makefile.rh 2007-04-03 07:31:22.000000000 +0200
-+++ nspluginwrapper-0.9.91.4/Makefile 2007-07-11 16:44:19.000000000 +0200
++++ nspluginwrapper-0.9.91.4/Makefile 2007-08-03 13:34:34.000000000 +0200
@@ -52,23 +52,6 @@ ifneq (,$(findstring $(OS),netbsd dragon
X_LDFLAGS += -Wl,--rpath,$(x11prefix)/$(lib64)
endif
@@ -78,8 +78,8 @@
npconfig_SOURCES = $(npconfig_RAWSRCS:%.c=$(SRC_PATH)/src/%.c)
npconfig_OBJECTS = $(npconfig_RAWSRCS:%.c=npconfig-%.o)
-npconfig_LDFLAGS = $(libdl_LDFLAGS)
-+npconfig_CFLAGS = $(CFLAGS)
-+npconfig_LDFLAGS = $(LDFLAGS) $(libdl_LDFLAGS)
++npconfig_CFLAGS = $(CFLAGS) $(MOZILLA_CFLAGS)
++npconfig_LDFLAGS = $(LDFLAGS) $(libdl_LDFLAGS) $(MOZILLA_LDFLAGS)
ifneq (,$(findstring $(OS),netbsd dragonfly))
# We will try to dlopen() the native plugin library. If that lib is
# linked against libpthread, then so must our program too.
@@ -178,7 +178,7 @@
$(archivedir)::
[ -d $(archivedir) ] || mkdir $(archivedir) > /dev/null 2>&1
-@@ -291,35 +231,40 @@ npwrapper-%.os: $(SRC_PATH)/src/%.c
+@@ -291,35 +231,41 @@ npwrapper-%.os: $(SRC_PATH)/src/%.c
$(CC) -o $@ -c $< -fPIC $(CPPFLAGS) $(npwrapper_CFLAGS) -DBUILD_WRAPPER
$(npviewer_PROGRAM): $(npviewer_OBJECTS) $(npviewer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS)
@@ -215,6 +215,7 @@
+ -e "s|%NPW_LIB64%|$(lib64)|" \
+ -e "s|%TARGET_OS%|$(TARGET_OS)|" \
+ -e "s|%TARGET_ARCH%|$(TARGET_ARCH)|" \
++ -e "s|%GECKO_LIBDIR%|$(GECKO_LIBDIR)|" \
+ -e "s|%NPW_DIR%|$(pkgdir)|" $< > $@
chmod 755 $@
@@ -227,7 +228,7 @@
$(LSB_OBJ_DIR)/%.a: $(LSB_OBJ_DIR)/%.o
$(AR) rc $@ $<
-@@ -332,6 +277,6 @@ $(LSB_OBJ_DIR)/libgcc_s_32.so: $(LSB_OBJ
+@@ -332,6 +278,6 @@ $(LSB_OBJ_DIR)/libgcc_s_32.so: $(LSB_OBJ
ln -sf libgcc_s.so $@
$(LSB_OBJ_DIR)/%.so: $(LSB_OBJ_DIR)/%.o
@@ -236,7 +237,7 @@
-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' '`
--- nspluginwrapper-0.9.91.4/configure.rh 2007-04-02 23:42:24.000000000 +0200
-+++ nspluginwrapper-0.9.91.4/configure 2007-07-11 16:44:19.000000000 +0200
++++ nspluginwrapper-0.9.91.4/configure 2007-08-03 13:40:32.000000000 +0200
@@ -21,44 +21,16 @@ TMPS="${TMPDIR1}/npw-conf-${RANDOM}-$$-$
# default parameters
@@ -442,7 +443,7 @@
if $pkgconfig --exists gtk+-2.0; then
GTK_CFLAGS=`$pkgconfig --cflags gtk+-2.0`
GTK_LDFLAGS=`$pkgconfig --libs gtk+-2.0`
-@@ -319,27 +237,18 @@ EOF
+@@ -319,27 +237,19 @@ EOF
exit 1
fi
rm -f $TMPC $TMPE
@@ -450,8 +451,9 @@
+
+# check for Gecko compile CFLAGS
+if $pkgconfig --exists firefox-plugin; then
-+ GECKO_CFLAGS=`$pkgconfig --cflags firefox-plugin`
-+ GECKO_LDFLAGS=`$pkgconfig --libs firefox-plugin`
++ GECKO_CFLAGS=`$pkgconfig --cflags firefox-plugin --cflags firefox-xpcom --cflags firefox-gtkmozembed`
++ GECKO_LDFLAGS=`$pkgconfig --libs firefox-plugin --libs firefox-xpcom --libs firefox-gtkmozembed`
++ GECKO_LIBDIR=`$pkgconfig --libs-only-L firefox-xpcom | sed -e "s|-L||"`
+else
+ echo "gecko-devel not found"
+ exit 1
@@ -479,7 +481,7 @@
if test -z "$x_base_dir"; then
echo "X11 environment not found"
exit 1
-@@ -450,15 +359,14 @@ EOF
+@@ -450,15 +360,14 @@ EOF
echo "Standard options:"
echo " --help print this message"
echo " --prefix=PREFIX install in PREFIX [$prefix]"
@@ -496,7 +498,7 @@
echo " --with-lib32=NAME use NAME as the 32-bit library dir name [$lib32]"
echo " --with-lib64=NAME use NAME as the 64-bit library dir name [$lib64]"
echo " --with-x11-prefix=PREFIX use PREFIX as the X11 base dir [autodetect]"
-@@ -470,17 +378,13 @@ exit 1
+@@ -470,17 +379,13 @@ exit 1
fi
echo "Install prefix $prefix"
@@ -515,7 +517,7 @@
echo "host big endian $bigendian"
echo "target OS $target_os"
echo "target CPU $target_cpu"
-@@ -494,16 +398,15 @@ echo "/* Automatically generated by conf
+@@ -494,16 +399,16 @@ echo "/* Automatically generated by conf
echo "CC=$cc" >> $config_mak
echo "CXX=$cxx" >> $config_mak
echo "CFLAGS=$CFLAGS" >> $config_mak
@@ -532,12 +534,13 @@
-fi
+echo "GECKO_CFLAGS=$GECKO_CFLAGS" >> $config_mak
+echo "GECKO_LDFLAGS=$GECKO_LDFLAGS" >> $config_mak
++echo "GECKO_LIBDIR=$GECKO_LIBDIR" >> $config_mak
+
+host_os=$target_os
if test "$host_os" = "linux"; then
echo "OS=linux" >> $config_mak
echo "#define HOST_LINUX 1" >> $config_h
-@@ -524,6 +427,8 @@ else
+@@ -524,6 +429,8 @@ else
echo "Unsupported OS"
exit 1
fi
@@ -546,7 +549,7 @@
if test "$host_cpu" = "i386" ; then
echo "ARCH=i386" >> $config_mak
echo "#define HOST_I386 1" >> $config_h
-@@ -565,16 +470,13 @@ if test -n "$fbigendian" ; then
+@@ -565,16 +472,13 @@ if test -n "$fbigendian" ; then
fi
echo "SRC_PATH=$source_path" >> $config_mak
@@ -566,7 +569,7 @@
echo "x11prefix=$x_base_dir" >> $config_mak
VERSION=`sed < $source_path/$PACKAGE.spec -n '/^\%define version[ ]*/s///p'`
-@@ -597,8 +499,14 @@ else
+@@ -597,8 +501,14 @@ else
echo "#define NPW_VERSION \"$VERSION\"" >> $config_h
fi
@@ -582,7 +585,7 @@
if test "$has_visibility_attribute" = "yes"; then
echo "#define attribute_hidden __attribute__((visibility(\"hidden\")))" >> $config_h
-@@ -626,9 +534,8 @@ config_h="config.h"
+@@ -626,9 +536,8 @@ config_h="config.h"
echo "/* Automatically generated by configure - do not modify */" > $config_h
echo "#include \"config-host.h\"" >> $config_h
@@ -594,7 +597,7 @@
if test "$target_os" = "linux"; then
echo "TARGET_OS=linux" >> $config_mak
-@@ -647,6 +554,10 @@ if test "$target_cpu" = "i386" ; then
+@@ -647,6 +556,10 @@ if test "$target_cpu" = "i386" ; then
echo "TARGET_ARCH=i386" >> $config_mak
echo "#define TARGET_ARCH \"i386\"" >> $config_h
echo "#define TARGET_I386 1" >> $config_h
@@ -605,7 +608,7 @@
elif test "$target_cpu" = "ppc" ; then
echo "TARGET_ARCH=ppc" >> $config_mak
echo "#define TARGET_ARCH \"ppc\"" >> $config_h
-@@ -665,3 +576,7 @@ if test "$source_path_used" = "yes" ; th
+@@ -665,3 +578,7 @@ if test "$source_path_used" = "yes" ; th
esac
ln -sf $source_path/Makefile Makefile
fi
@@ -614,7 +617,7 @@
+echo "DONT_STRIP=yes" >> $config_mak
+
--- nspluginwrapper-0.9.91.4/src/npw-wrapper.c.rh 2007-04-02 21:52:57.000000000 +0200
-+++ nspluginwrapper-0.9.91.4/src/npw-wrapper.c 2007-07-11 16:44:19.000000000 +0200
++++ nspluginwrapper-0.9.91.4/src/npw-wrapper.c 2007-08-03 13:34:34.000000000 +0200
@@ -42,6 +42,7 @@
#include "rpc.h"
@@ -635,8 +638,8 @@
// Cache MIME info and plugin name/description
if (g_plugin.name == NULL && g_plugin.description == NULL && g_plugin.formats == NULL) {
---- /dev/null 2007-07-11 09:36:28.615752132 +0200
-+++ nspluginwrapper-0.9.91.4/src/npw-dir.c 2007-07-11 16:44:19.000000000 +0200
+--- /dev/null 2007-08-03 09:39:03.625062137 +0200
++++ nspluginwrapper-0.9.91.4/src/npw-dir.c 2007-08-03 13:34:34.000000000 +0200
@@ -0,0 +1,97 @@
+/*
+ * npw-dir.h - Directory management for nspluginwrapper
@@ -736,7 +739,7 @@
+ return(p_path);
+}
--- nspluginwrapper-0.9.91.4/src/debug.h.rh 2007-03-04 16:01:22.000000000 +0100
-+++ nspluginwrapper-0.9.91.4/src/debug.h 2007-07-11 16:44:19.000000000 +0200
++++ nspluginwrapper-0.9.91.4/src/debug.h 2007-08-03 13:34:34.000000000 +0200
@@ -29,7 +29,7 @@ extern void npw_printf(const char *forma
extern void npw_vprintf(const char *format, va_list args) attribute_hidden;
@@ -747,7 +750,7 @@
#else
#define D(x) ;
--- nspluginwrapper-0.9.91.4/src/sysdeps.h.rh 2007-03-04 16:01:22.000000000 +0100
-+++ nspluginwrapper-0.9.91.4/src/sysdeps.h 2007-07-11 16:44:19.000000000 +0200
++++ nspluginwrapper-0.9.91.4/src/sysdeps.h 2007-08-03 13:34:34.000000000 +0200
@@ -43,8 +43,8 @@
#define NPW_VIEWER NPW_VIEWER_BASE
#define NPW_WRAPPER_BASE "npwrapper"
@@ -760,8 +763,8 @@
#define NPW_PLUGIN_IDENT_SIZE 32
typedef struct __attribute__((packed)) {
--- nspluginwrapper-0.9.91.4/src/npw-viewer.sh.rh 2007-04-02 21:52:57.000000000 +0200
-+++ nspluginwrapper-0.9.91.4/src/npw-viewer.sh 2007-07-11 16:44:19.000000000 +0200
-@@ -4,7 +4,12 @@
++++ nspluginwrapper-0.9.91.4/src/npw-viewer.sh 2007-08-03 13:34:34.000000000 +0200
+@@ -4,7 +4,13 @@
#
OS="`uname -s`"
ARCH="`uname -m`"
@@ -772,10 +775,11 @@
+TARGET_OS="%TARGET_OS%"
+TARGET_ARCH="%TARGET_ARCH%"
+NPW_DIR="%NPW_DIR%"
++GECKO_LIBDIR="%GECKO_LIBDIR%"
if test -z "$TARGET_OS"; then
echo "*** NSPlugin Viewer *** error, TARGET_OS not initialized"
-@@ -16,11 +21,6 @@ if test -z "$TARGET_ARCH"; then
+@@ -16,11 +22,6 @@ if test -z "$TARGET_ARCH"; then
exit 1
fi
@@ -787,7 +791,7 @@
case $ARCH in
i?86)
ARCH=i386
-@@ -51,6 +51,9 @@ if test "$ARCH" != "$TARGET_ARCH"; then
+@@ -51,6 +52,9 @@ if test "$ARCH" != "$TARGET_ARCH"; then
LOADER=`which qemu-i386`
fi
;;
@@ -797,7 +801,7 @@
ppc)
if test "$ARCH" = "ppc64"; then
case "$OS" in
-@@ -71,15 +74,24 @@ if test "$ARCH" != "$TARGET_ARCH"; then
+@@ -71,15 +75,24 @@ if test "$ARCH" != "$TARGET_ARCH"; then
fi
fi
@@ -824,13 +828,13 @@
esac
+# Set a new LD_LIBRARY_PATH that is TARGET specific
-+export LD_LIBRARY_PATH=$NPW_VIEWER_DIR
++export LD_LIBRARY_PATH=$NPW_VIEWER_DIR:$GECKO_LIBDIR:$LD_LIBRARY_PATH
+
# Expand PATH for RealPlayer package on NetBSD (realplay)
if test "$OS" = "NetBSD"; then
REALPLAYER_HOME="/usr/pkg/lib/RealPlayer"
---- /dev/null 2007-07-11 09:36:28.615752132 +0200
-+++ nspluginwrapper-0.9.91.4/src/npw-dir.h 2007-07-11 16:44:19.000000000 +0200
+--- /dev/null 2007-08-03 09:39:03.625062137 +0200
++++ nspluginwrapper-0.9.91.4/src/npw-dir.h 2007-08-03 13:34:34.000000000 +0200
@@ -0,0 +1,35 @@
+/*
+ * npw-dir.h - Directory management for nspluginwrapper
@@ -868,7 +872,7 @@
+
+#endif
--- nspluginwrapper-0.9.91.4/src/npw-config.c.rh 2007-04-02 22:42:15.000000000 +0200
-+++ nspluginwrapper-0.9.91.4/src/npw-config.c 2007-07-11 16:59:11.000000000 +0200
++++ nspluginwrapper-0.9.91.4/src/npw-config.c 2007-08-03 13:34:34.000000000 +0200
@@ -38,10 +38,15 @@
#include <pwd.h>
#include <dirent.h>
Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nspluginwrapper.spec 30 Jul 2007 15:23:55 -0000 1.3
+++ nspluginwrapper.spec 3 Aug 2007 11:51:56 -0000 1.4
@@ -51,7 +51,7 @@
Summary: A compatibility layer for Netscape 4 plugins
Name: nspluginwrapper
Version: 0.9.91.4
-Release: 9%{?dist}
+Release: 10%{?dist}
Source0: %{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
Patch0: nspluginwrapper-0.9.91.4-rh.patch
License: GPL
@@ -157,6 +157,9 @@
%{plugindir}/*
%changelog
+* Fri Aug 3 2007 Martin Stransky <stransky at redhat.com> 0.9.91.4-10
+- fixed totem-complex plugin wrapping
+
* Mon Jul 30 2007 Martin Stransky <stransky at redhat.com> 0.9.91.4-9
- added plugin dirs
- Previous message (by thread): rpms/smb4k/FC-6 .cvsignore, 1.16, 1.17 smb4k.spec, 1.20, 1.21 sources, 1.16, 1.17
- Next message (by thread): rpms/kchmviewer/devel kchmviewer-2.0-desktop_fix.patch, 1.1, 1.2 kchmviewer.spec, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list