Attachment 297875 Details for Bug 436581 – Full patch

[patch] Full patch

xulrunner-pyxpcom.patch (text/plain), 5.33 KB, created by Marco Pesenti Gritti on 2008-03-13 01:28:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marco Pesenti Gritti

Created: 2008-03-13 01:28:56 UTC

Size: 5.33 KB

patch

obsolete

>? mozilla
>? xulrunner-1.9-0.40.cvs20080311.fc9.src.rpm
>? xulrunner-1_9-0_40_cvs20080311_fc9
>? xulrunner-pyxpcom.patch
>Index: xulrunner-mozconfig
>===================================================================
>RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner-mozconfig,v
>retrieving revision 1.15
>diff -u -r1.15 xulrunner-mozconfig
>--- xulrunner-mozconfig	9 Mar 2008 17:06:50 -0000	1.15
>+++ xulrunner-mozconfig	12 Mar 2008 18:03:26 -0000
>@@ -21,7 +21,7 @@
> ac_add_options --enable-canvas
> ac_add_options --enable-application=xulrunner
> ac_add_options --disable-javaxpcom
>-ac_add_options --enable-extensions=default
>+ac_add_options --enable-extensions=default,python/xpcom
> ac_add_options --disable-crashreporter
> 
> export BUILD_OFFICIAL=1
>Index: xulrunner.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
>retrieving revision 1.91
>diff -u -r1.91 xulrunner.spec
>--- xulrunner.spec	12 Mar 2008 03:35:51 -0000	1.91
>+++ xulrunner.spec	12 Mar 2008 18:03:27 -0000
>@@ -14,7 +14,7 @@
> Summary:        XUL Runtime for Gecko Applications
> Name:           xulrunner
> Version:        1.9
>-Release:        0.39%{?nightly}%{?dist}
>+Release:        0.40%{?nightly}%{?dist}
> URL:            http://www.mozilla.org/projects/xulrunner/
> License:        MPLv1.1 or GPLv2+ or LGPLv2+
> Group:          Applications/Internet
>@@ -35,6 +35,7 @@
> Patch4:         mozilla-build.patch
> Patch5:         xulrunner-path.patch
> Patch6:         xulrunner-version.patch
>+Patch7:         xulrunner-pyxpcom.patch
> 
> # customization patches
> 
>@@ -78,6 +79,7 @@
> BuildRequires:  curl-devel
> BuildRequires:  hunspell-devel
> BuildRequires:  sqlite-devel >= 3.5
>+BuildRequires:  python-devel
> 
> Requires:       nspr >= %{nspr_version}
> Requires:       nss >= %{nss_version}
>@@ -120,6 +122,7 @@
> %patch4   -p1
> %patch5   -p1
> %patch6   -p1 -b .ver
>+%patch7   -p1 -b .pyxpcom
> 
> %patch107 -p1 -b .pk
> 
>@@ -350,6 +353,7 @@
> %{_libdir}/%{name}-*/icons
> %{_libdir}/%{name}-*/modules
> %{_libdir}/%{name}-*/plugins
>+%{_libdir}/%{name}-*/python
> %{_libdir}/%{name}-*/res
> %{_libdir}/%{name}-*/*.so
> %{_libdir}/%{name}-*/mozilla-xremote-client
>@@ -400,6 +404,9 @@
> #---------------------------------------------------------------------
> 
> %changelog
>+* Wed Mar 12 2008 Marco Pesenti Gritti <mpg@redhat.com>   1.9-0.40
>+- Enable pyxpcom
>+
> * Tue Mar 11 2008 Christopher Aillon <caillon@redhat.com> 1.0-0.39
> - Update to latest trunk (2008-03-11)
> 
>--- /dev/null	2008-03-12 18:51:03.904002981 +0100
>+++ xulrunner-pyxpcom.patch	2008-03-12 14:30:56.000000000 +0100
>@@ -0,0 +1,57 @@
>+--- mozilla/configure.in.orig	2008-03-12 14:29:44.000000000 +0100
>++++ mozilla/configure.in	2008-03-12 14:28:49.000000000 +0100
>+@@ -7266,6 +7266,8 @@
>+         dnl - Fixes to the above by Python/*nix knowledgable people welcome!
>+         if test -f "$MOZ_PYTHON_PREFIX/lib/libpython$MOZ_PYTHON_VER_DOTTED.so.1.0"; then
>+             MOZ_PYTHON_LIBS="-L$MOZ_PYTHON_PREFIX/lib -lpython$MOZ_PYTHON_VER_DOTTED"
>++        elif test -f "$MOZ_PYTHON_PREFIX/lib64/libpython$MOZ_PYTHON_VER_DOTTED.so.1.0"; then
>++            MOZ_PYTHON_LIBS="-L$MOZ_PYTHON_PREFIX/lib64 -lpython$MOZ_PYTHON_VER_DOTTED"
>+         elif test -f "$MOZ_PYTHON_PREFIX/lib/libpython$MOZ_PYTHON_VER_DOTTED.so"; then
>+             MOZ_PYTHON_LIBS="-L$MOZ_PYTHON_PREFIX/lib -lpython$MOZ_PYTHON_VER_DOTTED"
>+         elif test -f "$MOZ_PYTHON_PREFIX/libpython$MOZ_PYTHON_VER_DOTTED.so"; then
>+--- mozilla/configure.orig	2008-03-12 13:46:05.000000000 +0100
>++++ mozilla/configure	2008-03-12 14:30:40.000000000 +0100
>+@@ -20025,6 +20025,8 @@
>+         MOZ_PYTHON_INCLUDES="-I$MOZ_PYTHON_PREFIX/include/python$MOZ_PYTHON_VER_DOTTED"
>+                                                                                                 if test -f "$MOZ_PYTHON_PREFIX/lib/libpython$MOZ_PYTHON_VER_DOTTED.so.1.0"; then
>+             MOZ_PYTHON_LIBS="-L$MOZ_PYTHON_PREFIX/lib -lpython$MOZ_PYTHON_VER_DOTTED"
>++        elif test -f "$MOZ_PYTHON_PREFIX/lib64/libpython$MOZ_PYTHON_VER_DOTTED.so.1.0"; then
>++            MOZ_PYTHON_LIBS="-L$MOZ_PYTHON_PREFIX/lib64 -lpython$MOZ_PYTHON_VER_DOTTED"
>+         elif test -f "$MOZ_PYTHON_PREFIX/lib/libpython$MOZ_PYTHON_VER_DOTTED.so"; then
>+             MOZ_PYTHON_LIBS="-L$MOZ_PYTHON_PREFIX/lib -lpython$MOZ_PYTHON_VER_DOTTED"
>+         elif test -f "$MOZ_PYTHON_PREFIX/libpython$MOZ_PYTHON_VER_DOTTED.so"; then
>+@@ -20296,14 +20298,14 @@
>+ cross_compiling=$ac_cv_prog_cc_cross
>+ 
>+     cat > conftest.$ac_ext <<EOF
>+-#line 20300 "configure"
>++#line 20302 "configure"
>+ #include "confdefs.h"
>+ #include <gmodule.h>
>+ int main() {
>+  int x = 1; x++; 
>+ ; return 0; }
>+ EOF
>+-if { (eval echo configure:20307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
>++if { (eval echo configure:20309: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
>+   :
>+ else
>+   echo "configure: failed program was:" >&5
>+@@ -20612,7 +20614,7 @@
>+                 _SAVE_CFLAGS=$CFLAGS
>+     CFLAGS="$CFLAGS $XCFLAGS"
>+     cat > conftest.$ac_ext <<EOF
>+-#line 20616 "configure"
>++#line 20618 "configure"
>+ #include "confdefs.h"
>+ 
>+         #include <stdio.h>
>+@@ -20629,7 +20631,7 @@
>+     
>+ ; return 0; }
>+ EOF
>+-if { (eval echo configure:20633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
>++if { (eval echo configure:20635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
>+   :
>+ else
>+   echo "configure: failed program was:" >&5

Actions: View | Diff

Attachments on bug 436581: 297819 | 297875