rpms/nspluginwrapper/F-9 nspluginwrapper-1.3.0-configure.patch, NONE, 1.1 nspluginwrapper-1.3.0-directory.patch, NONE, 1.1 nspluginwrapper-1.3.0-make.patch, NONE, 1.1 plugin-config-native.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 nspluginwrapper.spec, 1.61, 1.62 sources, 1.13, 1.14 nspluginwrapper-1.1.10-configure.patch, 1.1, NONE nspluginwrapper-1.1.2-event.patch, 1.1, NONE nspluginwrapper-1.1.4-make.patch, 1.1, NONE nspluginwrapper-1.1.8-directory.patch, 1.1, NONE
Warren Togami 砥上勇
wtogami at fedoraproject.org
Sun Jan 11 23:51:30 UTC 2009
Author: wtogami
Update of /cvs/pkgs/rpms/nspluginwrapper/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19263
Modified Files:
.cvsignore nspluginwrapper.spec sources
Added Files:
nspluginwrapper-1.3.0-configure.patch
nspluginwrapper-1.3.0-directory.patch
nspluginwrapper-1.3.0-make.patch plugin-config-native.patch
Removed Files:
nspluginwrapper-1.1.10-configure.patch
nspluginwrapper-1.1.2-event.patch
nspluginwrapper-1.1.4-make.patch
nspluginwrapper-1.1.8-directory.patch
Log Message:
- Fixed multilib conflicts
- Updated to 1.3.0 and removed some fedora build patches
nspluginwrapper-1.3.0-configure.patch:
--- NEW FILE nspluginwrapper-1.3.0-configure.patch ---
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
nspluginwrapper-1.3.0-directory.patch:
--- NEW FILE nspluginwrapper-1.3.0-directory.patch ---
diff -up nspluginwrapper-1.3.0/src/npw-config.c.dir nspluginwrapper-1.3.0/src/npw-config.c
--- nspluginwrapper-1.3.0/src/npw-config.c.dir 2009-01-02 15:22:29.000000000 +0100
+++ nspluginwrapper-1.3.0/src/npw-config.c 2009-01-08 16:29:55.000000000 +0100
@@ -38,11 +38,14 @@
#include <pwd.h>
#include <dirent.h>
+#include <asm/types.h>
static bool g_auto = false;
static bool g_verbose = false;
static bool g_allow_native = false;
static const char NPW_CONFIG[] = "nspluginwrapper";
+static char *p_plugin_dir = NULL;
+static char *p_plugin_prefix = NULL;
static void error(const char *format, ...)
{
@@ -858,7 +861,9 @@ static int do_install_plugin(const char
plugin_base += 1;
char d_plugin_path[PATH_MAX];
- int n = snprintf(d_plugin_path, sizeof(d_plugin_path), "%s/%s.%s", plugin_dir, NPW_WRAPPER_BASE, plugin_base);
+ int n = snprintf(d_plugin_path, sizeof(d_plugin_path),
+ "%s/%s.%s", plugin_dir, p_plugin_prefix ? p_plugin_prefix : NPW_WRAPPER_BASE,
+ plugin_base);
if (n < 0 || n >= sizeof(d_plugin_path))
return 3;
@@ -951,28 +956,32 @@ static int install_plugin(const char *pl
if (g_verbose)
printf("Install plugin %s\n", plugin_path);
- // don't install plugin system-wide if it is only accessible by root
- if (!is_root_only_accessible_plugin(plugin_path)) {
- ret = do_install_plugin(plugin_path, get_system_mozilla_plugin_dir(), plugin_info);
- if (ret == 0)
- return 0;
+ if(p_plugin_dir) {
+ ret = do_install_plugin(plugin_path, p_plugin_dir, plugin_info);
}
+ else {
+ // don't install plugin system-wide if it is only accessible by root
+ if (!is_root_only_accessible_plugin(plugin_path)) {
+ ret = do_install_plugin(plugin_path, get_system_mozilla_plugin_dir(), plugin_info);
+ if (ret == 0)
+ return 0;
+ }
- // don't install plugin in user home dir if already available system-wide
- if (has_system_wide_wrapper_plugin(plugin_path, true)) {
- if (g_verbose)
- printf(" ... already installed system-wide, skipping\n");
- return 0;
+ // don't install plugin in user home dir if already available system-wide
+ if (has_system_wide_wrapper_plugin(plugin_path, true)) {
+ if (g_verbose)
+ printf(" ... already installed system-wide, skipping\n");
+ return 0;
+ }
+
+ const char *user_plugin_dir = get_user_mozilla_plugin_dir();
+ if (access(user_plugin_dir, R_OK | W_OK) < 0 && mkdir_p(user_plugin_dir) < 0)
+ return 1;
+
+ ret = do_install_plugin(plugin_path, user_plugin_dir, plugin_info);
+ if (ret == 0)
+ return 0;
}
-
- const char *user_plugin_dir = get_user_mozilla_plugin_dir();
- if (access(user_plugin_dir, R_OK | W_OK) < 0 && mkdir_p(user_plugin_dir) < 0)
- return 1;
-
- ret = do_install_plugin(plugin_path, user_plugin_dir, plugin_info);
- if (ret == 0)
- return 0;
-
return ret;
}
@@ -1139,6 +1148,8 @@ static void print_usage(void)
printf(" -h --help print this message\n");
printf(" -v --verbose flag: set verbose mode\n");
printf(" -a --auto flag: set automatic mode for plugins discovery\n");
+ printf(" -d --dir plugin-dir flag: target plugin(s) directory\n");
+ printf(" -p --prefix prefix flag: a prefix of wrapped plugin file\n");
printf(" -n --native flag: allow native plugin(s) to be wrapped\n");
printf(" -l --list list plugins currently installed\n");
printf(" -u --update update plugin(s) currently installed\n");
@@ -1171,6 +1182,18 @@ static int process_native(int argc, char
return 0;
}
+static int process_dir(int argc, char *argv[])
+{
+ p_plugin_dir = argv[0];
+ return 0;
+}
+
+static int process_prefix(int argc, char *argv[])
+{
+ p_plugin_prefix = argv[0];
+ return 0;
+}
+
static int process_list(int argvc, char *argv[])
{
const char **plugin_dirs = get_mozilla_plugin_dirs();
@@ -1266,57 +1287,56 @@ static int process_remove(int argc, char
int main(int argc, char *argv[])
{
- char **args;
- int i, j, n_args;
-
- n_args = argc - 1;
- args = argv + 1;
+ int i, j;
- if (n_args < 1) {
+ if (argc < 2) {
print_usage();
return 1;
}
-
- if (args[0][0] != '-') {
- print_usage();
- return 1;
+
+ if (argv[1][0] != '-') {
+ print_usage();
+ return 1;
}
-
+
static const struct option {
- char short_option;
- const char *long_option;
- int (*process_callback)(int argc, char *argv[]);
- bool terminal;
+ const char *short_option;
+ const char *long_option;
+ int (*process_callback)(int argc, char *argv[]);
+ bool terminal;
+ int extra_args;
}
options[] = {
- { 'h', "help", process_help, 1 },
- { 'v', "verbose", process_verbose, 0 },
- { 'a', "auto", process_auto, 0 },
- { 'n', "native", process_native, 0 },
- { 'l', "list", process_list, 1 },
- { 'u', "update", process_update, 1 },
- { 'i', "install", process_install, 1 },
- { 'r', "remove", process_remove, 1 },
- { 0, NULL, NULL, 1 }
- };
-
- for (i = 0; i < n_args; i++) {
- const char *arg = args[i];
+ { "-h", "--help", process_help, 1, 0 },
+ { "-v", "--verbose", process_verbose, 0, 0 },
+ { "-a", "--auto", process_auto, 0, 0 },
+ { "-d", "--dir", process_dir, 0, 1 },
+ { "-p", "--prefix", process_prefix, 0, 1 },
+ { "-n", "--native", process_native, 0, 0 },
+ { "-l", "--list", process_list, 1, 0 },
+ { "-u", "--update", process_update, 1, 0 },
+ { "-i", "--install", process_install, 1, 0 },
+ { "-r", "--remove", process_remove, 1, 0 }
+ };
+
+ for (i = 1; i < argc; i++) {
const struct option *opt = NULL;
- for (j = 0; opt == NULL && options[j].process_callback != NULL; j++) {
- if ((arg[0] == '-' && arg[1] == options[j].short_option && arg[2] == '\0') ||
- (arg[0] == '-' && arg[1] == '-' && strcmp(&arg[2], options[j].long_option) == 0))
- opt = &options[j];
- }
- if (opt == NULL) {
- fprintf(stderr, "invalid option %s\n", arg);
- print_usage();
- return 1;
- }
- int ret = opt->process_callback(n_args - i - 1, args + i + 1);
- if (opt->terminal)
- return ret;
+ for (j = 0; j < sizeof(options)/sizeof(options[0]); j++) {
+ if (!strcmp(options[j].short_option,argv[i]) || !strcmp(options[j].long_option,argv[i])) {
+ opt = &options[j];
+ break;
+ }
+ }
+ if (opt == NULL) {
+ fprintf(stderr, "invalid option %s\n", argv[i]);
+ print_usage();
+ return 1;
+ }
+ int ret = opt->process_callback(argc - i - 1, argv + i + 1);
+ if (opt->terminal)
+ return ret;
+ i += opt->extra_args;
}
-
+
return 0;
}
diff -up nspluginwrapper-1.3.0/src/npw-viewer.sh.dir nspluginwrapper-1.3.0/src/npw-viewer.sh
--- nspluginwrapper-1.3.0/src/npw-viewer.sh.dir 2009-01-02 15:22:29.000000000 +0100
+++ nspluginwrapper-1.3.0/src/npw-viewer.sh 2009-01-08 16:29:40.000000000 +0100
@@ -100,6 +100,9 @@ if test "$ARCH" != "$TARGET_ARCH"; then
NPW_USE_XSHM="no"
fi
;;
+ x86_64)
+ LOADER=""
+ ;;
ppc)
if test "$ARCH" = "ppc64"; then
case "$OS" in
nspluginwrapper-1.3.0-make.patch:
--- NEW FILE nspluginwrapper-1.3.0-make.patch ---
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' '`
plugin-config-native.patch:
--- NEW FILE plugin-config-native.patch ---
diff -up nspluginwrapper-1.3.0/plugin-config-1.9/src/plugin-config.c.native nspluginwrapper-1.3.0/plugin-config-1.9/src/plugin-config.c
--- nspluginwrapper-1.3.0/plugin-config-1.9/src/plugin-config.c.native 2009-01-06 17:20:02.000000000 +0100
+++ nspluginwrapper-1.3.0/plugin-config-1.9/src/plugin-config.c 2009-01-06 17:22:43.000000000 +0100
@@ -444,6 +444,7 @@ int wrap_plugin_2(WRAP_PLUGIN *p_plugin,
char *params[] =
{
p_wrapper,
+ "-n",
"-p",
prefix,
"-d",
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-9/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 9 Dec 2008 05:05:46 -0000 1.10
+++ .cvsignore 11 Jan 2009 23:51:29 -0000 1.11
@@ -1 +1,9 @@
-nspluginwrapper-1.1.10.tar.bz2
+nspluginwrapper-0.9.91.4.tar.bz2
+plugin-config-1.3.tar.gz
+plugin-config-1.4.tar.gz
+nspluginwrapper-0.9.91.5.tar.bz2
+plugin-config-1.6.tar.gz
+plugin-config-1.9.tar.gz
+nspluginwrapper-1.1.4.tar.bz2
+nspluginwrapper-1.1.8.tar.bz2
+nspluginwrapper-1.3.0.tar.bz2
Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-9/nspluginwrapper.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- nspluginwrapper.spec 9 Dec 2008 05:05:48 -0000 1.61
+++ nspluginwrapper.spec 11 Jan 2009 23:51:29 -0000 1.62
@@ -64,19 +64,19 @@
Summary: A compatibility layer for Netscape 4 plugins
Name: nspluginwrapper
-Version: 1.1.10
-Release: 1%{?dist}
+Version: 1.3.0
+Release: 2%{?dist}
Source0: %{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
-Source1: %{plugin_config_name}.tar.gz
+Source1: %{plugin_config_name}.tar.gz
Source2: plugin-config.sh.in
Source3: %{name}.sh.in
-Patch1: nspluginwrapper-1.1.4-make.patch
-Patch2: nspluginwrapper-1.1.10-configure.patch
-Patch3: nspluginwrapper-1.1.8-directory.patch
-Patch10: nspluginwrapper-1.1.2-event.patch
+Patch1: nspluginwrapper-1.3.0-make.patch
+Patch2: nspluginwrapper-1.3.0-configure.patch
+Patch3: nspluginwrapper-1.3.0-directory.patch
Patch100: plugin-config-setuid.patch
Patch101: plugin-config-umask.patch
Patch102: plugin-config-print.patch
+Patch103: plugin-config-native.patch
License: GPLv2+
Group: Networking/WWW
Url: http://gwenole.beauchesne.info/projects/nspluginwrapper/
@@ -106,21 +106,14 @@
%patch2 -p1 -b .conf
%patch3 -p1 -b .dir
-# Package fixes
-%patch10 -p1 -b .event
-
# Plugin-config patches
pushd %plugin_config_name
%patch100 -p2
%patch101 -p2 -b .umask
%patch102 -p2 -b .print
+%patch103 -p2 -b .native
popd
-
-# remove old/incompatibile stuff
-rm -rf npapi
-rm -rf lsb-build
-
%build
# Build wrapper
@@ -152,11 +145,14 @@
--with-lib32=%{lib32} \
--with-lib64=%{lib64} \
--with-base-lib=%{lib} \
- --with-xpcom=no \
--with-base-libdir=%{libdir} \
- --with-x11-prefix=/usr \
- --with-gecko=%{gecko_flavour}
-
+ --viewer-paths=%{pkgdir} \
+ --with-x11-prefix=/usr \
+ --with-gecko=%{gecko_flavour} \
+ --enable-viewer \
+ --viewer-paths="%{pkgdir32}:%{pkgdir64}"\
+ --disable-biarch
+
make
popd
@@ -203,6 +199,10 @@
EOF
chmod 755 $RPM_BUILD_ROOT%{pkgdir}/nspluginplayer
+# Remove conflicting files
+rm -rf $RPM_BUILD_ROOT%{_bindir}/nspluginplayer
+rm -rf $RPM_BUILD_ROOT%{_bindir}/nspluginwrapper
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -224,19 +224,26 @@
%{pkgdir}/npconfig
%{pkgdir}/npwrapper.so
%{pkgdir}/npviewer.bin
+%{pkgdir}/npviewer.sh
%{pkgdir}/npviewer
%{pkgdir}/npplayer
+%{pkgdir}/libxpcom.so
+%{pkgdir}/libnoxshm.so
%{pkgdir}/nspluginplayer
%{plugindir}/npwrapper.so
%{_bindir}/mozilla-plugin-config
%config %{_sysconfdir}/sysconfig/%{name}
+
%changelog
-* Mon Dec 08 2008 Warren Togami <wtogami at redhat.com> 1.1.10-1
-- Update to 1.1.10
+* Thu Jan 9 2009 Martin Stransky <stransky at redhat.com> 1.3.0-2
+- Fixed multilib conflicts
+
+* Thu Jan 8 2009 Martin Stransky <stransky at redhat.com> 1.3.0-1
+- Updated to 1.3.0 and removed some fedora build patches
* Tue Dec 02 2008 Warren Togami <wtogami at redhat.com> 1.1.8-2
-- fix-invalid-RPC-after-NPP_Destroy fixes a crasher
+- fix-invalid-RPC-after-NPP_Destroy fixes a crasher
* Mon Dec 1 2008 Martin Stransky <stransky at redhat.com> 1.1.8-1
- Updated to 1.1.8
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 9 Dec 2008 05:05:48 -0000 1.13
+++ sources 11 Jan 2009 23:51:29 -0000 1.14
@@ -1,2 +1,2 @@
0a00e94ba608dfea365851af9deb20dc plugin-config-1.9.tar.gz
-127ecc8c3eb2b2c8d60cbae97b3c11f2 nspluginwrapper-1.1.10.tar.bz2
+188f77bd3427c131ccba4bfdb25892a9 nspluginwrapper-1.3.0.tar.bz2
--- nspluginwrapper-1.1.10-configure.patch DELETED ---
--- nspluginwrapper-1.1.2-event.patch DELETED ---
--- nspluginwrapper-1.1.4-make.patch DELETED ---
--- nspluginwrapper-1.1.8-directory.patch DELETED ---
More information about the fedora-extras-commits
mailing list