rpms/xulrunner/devel mozilla-build.patch, NONE, 1.1 mozilla-xpcom.patch, 1.1, 1.2 xulrunner-mozconfig, 1.4, 1.5 xulrunner.spec, 1.21, 1.22
Martin Stransky (stransky)
fedora-extras-commits at redhat.com
Tue Nov 6 10:12:09 UTC 2007
- Previous message: rpms/kazehakase/devel kazehakase.spec,1.40,1.41
- Next message: rpms/busybox/devel busybox-1.7.2-gc-section.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 busybox.spec, 1.68, 1.69 sources, 1.17, 1.18 busybox-1.6.1-st_err.patch, 1.1, NONE busybox-1.7.2-grep.patch, 1.1, NONE busybox-1.7.2-sed.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: stransky
Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12114
Modified Files:
mozilla-xpcom.patch xulrunner-mozconfig xulrunner.spec
Added Files:
mozilla-build.patch
Log Message:
build fixes
mozilla-build.patch:
--- NEW FILE mozilla-build.patch ---
diff -up mozilla/security/manager/Makefile.in.old mozilla/security/manager/Makefile.in
--- mozilla/security/manager/Makefile.in.old 2007-10-25 00:25:30.000000000 +0200
+++ mozilla/security/manager/Makefile.in 2007-11-06 10:57:39.000000000 +0100
@@ -150,7 +150,6 @@ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR=
DEFAULT_GMAKE_FLAGS += NSPR_LIB_DIR=$(NSPR_LIB_DIR)
DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1
-DEFAULT_GMAKE_FLAGS += NSS_ENABLE_ECC=1
ABS_topsrcdir := $(shell cd $(topsrcdir); pwd)
ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
DEFAULT_GMAKE_FLAGS += BUILD_TREE=$(MOZ_BUILD_ROOT)
diff -up mozilla/security/manager/ssl/src/Makefile.in.old mozilla/security/manager/ssl/src/Makefile.in
--- mozilla/security/manager/ssl/src/Makefile.in.old 2007-10-19 21:16:36.000000000 +0200
+++ mozilla/security/manager/ssl/src/Makefile.in 2007-11-06 10:57:52.000000000 +0100
@@ -134,8 +134,6 @@ REQUIRES = nspr \
EXTRA_DEPS = $(NSS_DEP_LIBS)
-DEFINES += -DNSS_ENABLE_ECC
-
# Use local includes because they are inserted before INCLUDES
# so that Mozilla's nss.h is used, not glibc's
LOCAL_INCLUDES += $(NSS_CFLAGS)
mozilla-xpcom.patch:
Index: mozilla-xpcom.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/mozilla-xpcom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mozilla-xpcom.patch 30 Oct 2007 16:23:41 -0000 1.1
+++ mozilla-xpcom.patch 6 Nov 2007 10:12:06 -0000 1.2
@@ -1,7 +1,13 @@
-diff -up mozilla/xulrunner/installer/mozilla-xpcom.pc.in.old mozilla/xulrunner/installer/mozilla-xpcom.pc.in
---- mozilla/xulrunner/installer/mozilla-xpcom.pc.in.old 2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/mozilla-xpcom.pc.in 2007-10-30 16:48:09.000000000 +0100
-@@ -8,7 +8,7 @@ includetype=stable
+--- mozilla/xulrunner/installer/mozilla-xpcom.pc.in.xul 2007-11-01 11:49:13.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-xpcom.pc.in 2007-11-01 11:49:13.000000000 +0100
+@@ -2,13 +2,14 @@ prefix=%prefix%
+ sdkdir=%sdkdir%
+ includedir=%includedir%
+ idldir=%idldir%
++libdir=%sdkdir%/lib
+ includetype=stable
+
+ # Note: the default pkg-config includes will only list include directories
# that contain stable (frozen or safe for linking) header files. To include
# nonfrozen headers, run pkg-config with --define-variable=includetype=unstable
@@ -10,14 +16,93 @@
Description: The Mozilla Runtime and Embedding Engine
Version: %MOZILLA_VERSION%
Requires: %NSPR_NAME% >= %NSPR_VERSION%
-diff -up mozilla/xulrunner/installer/Makefile.in.old mozilla/xulrunner/installer/Makefile.in
---- mozilla/xulrunner/installer/Makefile.in.old 2007-08-10 14:56:59.000000000 +0200
-+++ mozilla/xulrunner/installer/Makefile.in 2007-10-30 16:48:46.000000000 +0100
-@@ -87,6 +87,7 @@ pkg_config_files = \
+--- mozilla/xulrunner/installer/xulrunner-plugin.pc.in.xul 2007-11-01 11:49:13.000000000 +0100
++++ mozilla/xulrunner/installer/xulrunner-plugin.pc.in 2007-11-01 11:51:50.000000000 +0100
+@@ -1,6 +1,7 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
+ includedir=%includedir%
++libdir=%sdkdir%/lib
+
+ Name: Mozilla Plug-In API
+ Description: Mozilla Plug-In API
+--- mozilla/xulrunner/installer/libxul.pc.in.xul 2007-08-03 16:46:28.000000000 +0200
++++ mozilla/xulrunner/installer/libxul.pc.in 2007-11-01 11:49:13.000000000 +0100
+@@ -2,6 +2,7 @@ prefix=%prefix%
+ sdkdir=%sdkdir%
+ includedir=%includedir%
+ idldir=%idldir%
++libdir=%sdkdir%/lib
+ includetype=stable
+
+ # Note: the default pkg-config includes will only list include directories
+--- mozilla/xulrunner/installer/xulrunner-js.pc.in.xul 2007-11-01 11:49:13.000000000 +0100
++++ mozilla/xulrunner/installer/xulrunner-js.pc.in 2007-11-01 11:51:32.000000000 +0100
+@@ -1,6 +1,7 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
+ includedir=%includedir%
++libdir=%sdkdir%/lib
+
+ Name: JavaScript
+ Description: The Mozilla JavaScript Library
+--- mozilla/xulrunner/installer/libxul-embedding.pc.in.xul 2007-08-03 16:46:28.000000000 +0200
++++ mozilla/xulrunner/installer/libxul-embedding.pc.in 2007-11-01 11:50:48.000000000 +0100
+@@ -2,6 +2,7 @@ prefix=%prefix%
+ sdkdir=%sdkdir%
+ includedir=%includedir%
+ idldir=%idldir%
++libdir=%sdkdir%/lib
+ includetype=stable
+
+ # Note: the default pkg-config cflags will only list include directories
+--- mozilla/xulrunner/installer/xulrunner-embedding.pc.in.xul 2007-11-01 11:49:13.000000000 +0100
++++ mozilla/xulrunner/installer/xulrunner-embedding.pc.in 2007-11-01 11:51:13.000000000 +0100
+@@ -2,13 +2,14 @@ prefix=%prefix%
+ sdkdir=%sdkdir%
+ includedir=%includedir%
+ idldir=%idldir%
++libdir=%sdkdir%/lib
+ includetype=stable
+
+ # Note: the default pkg-config cflags will only list include directories
+ # that contain stable (frozen or safe for linking) header files. To include
+ # nonfrozen headers, run pkg-config with --define-variable=includetype=unstable
+
+-Name: libxul-embedding
++Name: xulrunner-embedding
+ Description: Static library for version-independent embedding of the Mozilla runtime
+ Version: %MOZILLA_VERSION%
+ Libs: -L${sdkdir}/lib -lxpcomglue
+--- mozilla/xulrunner/installer/xulrunner-xpcom.pc.in.xul 2007-11-01 11:49:13.000000000 +0100
++++ mozilla/xulrunner/installer/xulrunner-xpcom.pc.in 2007-11-01 11:52:20.000000000 +0100
+@@ -3,12 +3,13 @@ sdkdir=%sdkdir%
+ includedir=%includedir%
+ idldir=%idldir%
+ includetype=stable
++libdir=%sdkdir%/lib
+
+ # Note: the default pkg-config includes will only list include directories
+ # that contain stable (frozen or safe for linking) header files. To include
+ # nonfrozen headers, run pkg-config with --define-variable=includetype=unstable
+
+-Name: libxul
++Name: xulrunner-xpcom
+ Description: The Mozilla Runtime and Embedding Engine
+ Version: %MOZILLA_VERSION%
+ Requires: %NSPR_NAME% >= %NSPR_VERSION%
+--- mozilla/xulrunner/installer/Makefile.in.xul 2007-08-10 14:56:59.000000000 +0200
++++ mozilla/xulrunner/installer/Makefile.in 2007-11-01 11:55:06.000000000 +0100
+@@ -87,6 +87,12 @@ pkg_config_files = \
libxul-embedding.pc \
mozilla-js.pc \
mozilla-plugin.pc \
+ mozilla-xpcom.pc \
++ mozilla-embedding.pc \
++ xulrunner-js.pc \
++ xulrunner-plugin.pc \
++ xulrunner-xpcom.pc \
++ xulrunner-embedding.pc \
$(NULL)
ifdef MOZ_NATIVE_NSPR
Index: xulrunner-mozconfig
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner-mozconfig,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xulrunner-mozconfig 30 Oct 2007 16:22:33 -0000 1.4
+++ xulrunner-mozconfig 6 Nov 2007 10:12:06 -0000 1.5
@@ -2,19 +2,21 @@
ac_add_options --prefix="$PREFIX"
ac_add_options --libdir="$LIBDIR"
-#ac_add_options --with-system-nspr
-#ac_add_options --with-system-nss
ac_add_options --without-system-nspr
ac_add_options --without-system-nss
+#ac_add_options --with-system-nspr
+#ac_add_options --with-system-nss
ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
#ac_add_options --with-system-png
ac_add_options --with-pthreads
ac_add_options --disable-strip
ac_add_options --disable-tests
-ac_add_options --disable-debug
ac_add_options --disable-installer
+ac_add_options --disable-debug
ac_add_options --enable-optimize="$RPM_OPT_FLAGS"
+#ac_add_options --enable-debug
+#ac_add_options --disable-optimize
ac_add_options --enable-xinerama
ac_add_options --enable-default-toolkit=cairo-gtk2
ac_add_options --disable-xprint
Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xulrunner.spec 30 Oct 2007 16:22:33 -0000 1.21
+++ xulrunner.spec 6 Nov 2007 10:12:06 -0000 1.22
@@ -11,7 +11,7 @@
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
Version: 1.9
-Release: 0.alpha9.1%{?dist}
+Release: 0.alpha9.2%{?dist}
URL: http://www.mozilla.org/projects/xulrunner/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -33,6 +33,7 @@
Patch1: firefox-2.0-link-layout.patch
Patch2: camellia256.patch
Patch3: xulrunner-compile.patch
+Patch4: mozilla-build.patch
# customization patches
Patch21: firefox-0.7.3-psfonts.patch
@@ -122,12 +123,22 @@
%patch1 -p1 -b .link-layout
%patch2 -R -p1 -b .camellia256
%patch3 -p1
+%patch4 -p1
%patch104 -p0 -b .ppc64
# Install missing *.pc files
pushd xulrunner/installer
+
+# Copy as xpcom
cp libxul.pc.in mozilla-xpcom.pc.in
+cp libxul-embedding.pc.in mozilla-embedding.pc.in
+
+# Copy to expected xulrunner-*.pc
+cp mozilla-js.pc.in xulrunner-js.pc.in
+cp mozilla-plugin.pc.in xulrunner-plugin.pc.in
+cp mozilla-xpcom.pc.in xulrunner-xpcom.pc.in
+cp mozilla-embedding.pc.in xulrunner-embedding.pc.in
popd
%patch105 -p1
@@ -351,6 +362,9 @@
#---------------------------------------------------------------------
%changelog
+* Tue Nov 6 2007 Martin Stransky <stransky at redhat.com> 1.9-0.alpha9.2
+- build fixes
+
* Tue Oct 30 2007 Martin Stransky <stransky at redhat.com> 1.9-0.alpha9.1
- updated to the latest trunk
- Previous message: rpms/kazehakase/devel kazehakase.spec,1.40,1.41
- Next message: rpms/busybox/devel busybox-1.7.2-gc-section.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 busybox.spec, 1.68, 1.69 sources, 1.17, 1.18 busybox-1.6.1-st_err.patch, 1.1, NONE busybox-1.7.2-grep.patch, 1.1, NONE busybox-1.7.2-sed.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list