rpms/nspluginwrapper/F-10 nspluginwrapper-1.1.10-configure.patch, NONE, 1.1 nspluginwrapper-1.1.4-configure.patch, 1.1, NONE
Warren Togami 砥上勇
wtogami at fedoraproject.org
Tue Dec 9 04:29:30 UTC 2008
- Previous message (by thread): rpms/nspluginwrapper/F-10 .cvsignore, 1.8, 1.9 nspluginwrapper.spec, 1.67, 1.68 sources, 1.13, 1.14 nspluginwrapper-1.1.8-fix-invalid-RPC-after-NPP_Destroy.patch, 1.1, NONE
- Next message (by thread): rpms/tomboy/devel tomboy.spec,1.97,1.98
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: wtogami
Update of /cvs/pkgs/rpms/nspluginwrapper/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21098
Added Files:
nspluginwrapper-1.1.10-configure.patch
Removed Files:
nspluginwrapper-1.1.4-configure.patch
Log Message:
remove old patch and add new one
nspluginwrapper-1.1.10-configure.patch:
--- NEW FILE nspluginwrapper-1.1.10-configure.patch ---
diff -urN nspluginwrapper-1.1.10.orig/configure nspluginwrapper-1.1.10/configure
--- nspluginwrapper-1.1.10.orig/configure 2008-12-06 09:48:39.000000000 -0500
+++ nspluginwrapper-1.1.10/configure 2008-12-08 22:45:42.000000000 -0500
@@ -3,6 +3,8 @@
# nspluginwrapper configure script (C) 2005-2008 Gwenole Beauchesne
# derived from qemu configure script, (C) 2003 Fabrice Bellard
#
+#set -x
+
PACKAGE=nspluginwrapper
# set temporary file name
@@ -20,14 +22,18 @@
TMPS="${TMPDIR1}/npw-conf-${RANDOM}-$$-${RANDOM}.S"
# default parameters
+with_gecko="mozilla"
prefix="/usr"
lib32=""
lib64=""
-x_base_dirs=""
-biarch="guess"
-build_viewer="guess"
+base_lib=""
+base_libdir=""
+pkglibdir=""
+x_base_dir=""
+biarch="no"
+build_viewer="no"
build_player="yes"
-linux_only="guess"
+linux_only="yes"
strip="no"
cc="gcc"
cxx="g++"
@@ -86,9 +92,15 @@
for opt do
case "$opt" in
+--with-gecko=*)
+ with_gecko=`echo $opt | cut -d '=' -f 2`
+ ;;
--prefix=*)
prefix=`echo "$opt" | cut -d '=' -f 2`
;;
+--pkgdir=*)
+ pkgdir=`echo $opt | cut -d '=' -f 2`
+ ;;
--pkglibdir=*)
pkglibdir=`echo "$opt" | cut -d '=' -f 2`
;;
@@ -98,6 +110,12 @@
--target-cpu=*)
target_cpu=`echo "$opt" | cut -d '=' -f 2 | sed -e 's/^i.86$/i386/'`
;;
+--with-base-lib=*)
+ base_lib=`echo $opt | cut -d '=' -f 2`
+ ;;
+--with-base-libdir=*)
+ base_libdir=`echo $opt | cut -d '=' -f 2`
+ ;;
--enable-generic)
linux_only="no"
;;
@@ -138,7 +156,7 @@
lib64=`echo "$opt" | cut -d '=' -f 2`
;;
--with-x11-prefix=*)
- x_base_dirs=`echo "$opt" | cut -d '=' -f 2`
+ x_base_dir=`echo "$opt" | cut -d '=' -f 2`
;;
--with-cc=*)
cc=`echo "$opt" | cut -d '=' -f 2`
@@ -405,8 +423,8 @@
# check for GTK+ 2.0 compile CFLAGS
if test "$build_viewer" = "yes" -o "$build_player" = "yes"; then
if $pkgconfig --exists gtk+-2.0; then
- GTK_CFLAGS=`$pkgconfig --cflags gtk+-2.0`
- GTK_LDFLAGS=`$pkgconfig --libs gtk+-2.0`
+ GTK_CFLAGS=`$pkgconfig --cflags gtk+-2.0 gthread-2.0`
+ GTK_LDFLAGS=`$pkgconfig --libs gtk+-2.0 gthread-2.0`
GTK_VERSION=`$pkgconfig --modversion gtk+-2.0`
else
echo "GTK+ 2.0 environment not found"
@@ -457,25 +475,17 @@
rm -f $TMPC $TMPE
fi
+# check for Gecko compile CFLAGS
+if $pkgconfig --exists $with_gecko-plugin; then
+ GECKO_CFLAGS=`$pkgconfig --cflags $with_gecko-plugin`
+ GECKO_LDFLAGS=`$pkgconfig --libs $with_gecko-plugin`
+ GECKO_LIBDIR=""
+else
+ echo "gecko-devel not found"
+ exit 1
+fi
+
# check for X11 base dir
-if test -z "$x_base_dirs"; then
- x_base_dirs="
- /usr
- /usr/X11R6
- /usr/local/X11R6
- $prefix
- "
-fi
-for dir in $x_base_dirs; do
- x_include_dir="$dir/include"
- if test -f $x_include_dir/X11/Intrinsic.h; then
- x_lib_dir="$dir/$lib64"
- if test -f $x_lib_dir/libXt.so; then
- x_base_dir=$dir
- break
- fi
- fi
-done
if test -z "$x_base_dir"; then
echo "X11/Xt environment not found"
exit 1
@@ -621,6 +631,7 @@
echo "Standard options:"
echo " --help print this message"
echo " --prefix=PREFIX install in PREFIX [$prefix]"
+echo " --pkgdir=name name of package directory [$pkgdir]"
echo " --pkglibdir=ROOT install private files in ROOT [$pkglibdir]"
echo " --target-os=OS build plugin support for target OS [$target_os]"
echo " --target-cpu=CPU build plugin support for target CPU [$target_cpu]"
@@ -646,6 +657,7 @@
fi
echo "Install prefix $prefix"
+echo "nspluginwrapper dir $pkgdir"
echo "nspluginwrapper root dir $pkglibdir"
echo "Strip binaries $strip"
echo "Bi-arch build $biarch"
@@ -662,6 +674,7 @@
echo "Host big endian $bigendian"
echo "Target OS $target_os"
echo "Target CPU $target_cpu"
+echo "Gecko $with_gecko"
echo "RPC init timeout $rpc_init_timeout secs"
echo "Memory allocation hooks $malloc_hooks"
echo "Use PID check (DEBUG) $use_pid_check"
@@ -676,18 +689,18 @@
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
echo "GTK_LDFLAGS=$GTK_LDFLAGS" >> $config_mak
echo "CURL_CFLAGS=$CURL_CFLAGS" >> $config_mak
echo "CURL_LDFLAGS=$CURL_LDFLAGS" >> $config_mak
-if test "$biarch" = "yes"; then
-echo "LDFLAGS_32=-m32" >> $config_mak
-echo "CFLAGS_32=$CFLAGS_32" >> $config_mak
-else
-echo 'CFLAGS_32=$(CFLAGS)' >> $config_mak
-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
@@ -712,6 +725,8 @@
echo "Unsupported OS"
exit 1
fi
+
+host_cpu=$target_cpu
if test "$host_cpu" = "i386" ; then
echo "ARCH=i386" >> $config_mak
echo "#define HOST_I386 1" >> $config_h
@@ -756,20 +771,18 @@
echo "#define FLOAT_WORDS_BIGENDIAN $fbigendian" >> $config_h
fi
-echo "SRC_PATH=$source_path" >> $config_mak
-echo "build_viewer=$build_viewer" >> $config_mak
echo "build_player=$build_player" >> $config_mak
-echo "biarch=$biarch" >> $config_mak
+echo "SRC_PATH=$source_path" >> $config_mak
echo "lib32=$lib32" >> $config_mak
echo "lib64=$lib64" >> $config_mak
echo "prefix=$prefix" >> $config_mak
echo "bindir=$prefix/bin" >> $config_mak
-libdir="$prefix/$lib64"
-echo "libdir=$libdir" >> $config_mak
-echo "#define LIB \"$lib64\"" >> $config_h
-echo "#define LIBDIR \"$libdir\"" >> $config_h
+echo "base_libdir=$base_libdir" >> $config_mak
+echo "#define LIB \"$base_lib\"" >> $config_h
+echo "#define LIBDIR \"$base_libdir\"" >> $config_h
echo "x11prefix=$x_base_dir" >> $config_mak
echo "ALLOW_STRIP=$strip" >> $config_mak
+echo "#define USE_XPCOM 0" >> $config_h
VERSION=`sed < $source_path/$PACKAGE.spec -n '/^\%define version[ ]*/s///p'`
RELEASE=`sed < $source_path/$PACKAGE.spec -n '/^\%define release[ ]*/s///p'`
@@ -791,8 +804,14 @@
echo "#define NPW_VERSION \"$VERSION\"" >> $config_h
fi
+echo "#define NPW_PREFIX \"$prefix\"" >> $config_h
+echo "#define NPW_LIB32 \"$lib32\"" >> $config_h
+echo "#define NPW_LIB64 \"$lib64\"" >> $config_h
+
+echo "pkgdir=$pkgdir" >> $config_mak
+echo "#define NPW_DIR \"$pkgdir\"" >> $config_h
+
echo "pkglibdir=$pkglibdir" >> $config_mak
-echo "#define NPW_LIBDIR \"$pkglibdir\"" >> $config_h
echo "#define RPC_INIT_TIMEOUT $rpc_init_timeout" >> $config_h
@@ -837,9 +856,8 @@
echo "/* Automatically generated by configure - do not modify */" > $config_h
echo "#include \"config-host.h\"" >> $config_h
-if test "$linux_only" = "yes"; then
- echo "#define BUILD_LINUX_ONLY 1" >> $config_h
-fi
+# Linux only by default
+echo "#define BUILD_LINUX_ONLY 1" >> $config_h
if test "$target_os" = "linux"; then
echo "TARGET_OS=linux" >> $config_mak
@@ -880,3 +898,7 @@
esac
ln -sf $source_path/Makefile Makefile
fi
+
+# Don't strip binaries
+echo "DONT_STRIP=yes" >> $config_mak
+
--- nspluginwrapper-1.1.4-configure.patch DELETED ---
- Previous message (by thread): rpms/nspluginwrapper/F-10 .cvsignore, 1.8, 1.9 nspluginwrapper.spec, 1.67, 1.68 sources, 1.13, 1.14 nspluginwrapper-1.1.8-fix-invalid-RPC-after-NPP_Destroy.patch, 1.1, NONE
- Next message (by thread): rpms/tomboy/devel tomboy.spec,1.97,1.98
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list