rpms/xulrunner/devel mozilla-pkgconfig.patch, 1.5, 1.6 mozilla-sqlite-build.patch, 1.3, 1.4 xulrunner-mozconfig, 1.7, 1.8 xulrunner-redhat-default-prefs.js, 1.1, 1.2 xulrunner.spec, 1.45, 1.46 add-gecko-provides.in, 1.1, NONE mozilla-gtkmozembed.patch, 1.3, NONE

Christopher Aillon (caillon) fedora-extras-commits at redhat.com
Sun Jan 13 23:57:54 UTC 2008 

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15654

Modified Files:
	mozilla-pkgconfig.patch mozilla-sqlite-build.patch 
	xulrunner-mozconfig xulrunner-redhat-default-prefs.js 
	xulrunner.spec 
Removed Files:
	add-gecko-provides.in mozilla-gtkmozembed.patch 
Log Message:
* Sat Jan 13 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.beta2.10
- Update to latest trunk (2008-01-13)
- Use CFLAGS instead of configure arguments
- Random cleanups: BuildRequires, scriptlets, prefs, etc.


mozilla-pkgconfig.patch:

Index: mozilla-pkgconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/mozilla-pkgconfig.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mozilla-pkgconfig.patch	8 Jan 2008 10:09:34 -0000	1.5
+++ mozilla-pkgconfig.patch	13 Jan 2008 23:57:38 -0000	1.6
@@ -27,7 +27,7 @@
  sdkdir=%sdkdir%
  includedir=%includedir%
 -idldir=%idldir%
-+idldir=%idldir%/unstable
++idldir=%idldir%/stable
  includetype=stable
  
  # Note: the default pkg-config includes will only list include directories

mozilla-sqlite-build.patch:

Index: mozilla-sqlite-build.patch
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/mozilla-sqlite-build.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mozilla-sqlite-build.patch	12 Jan 2008 16:19:11 -0000	1.3
+++ mozilla-sqlite-build.patch	13 Jan 2008 23:57:38 -0000	1.4
@@ -70,48 +70,30 @@
 diff -up mozilla/config/system-headers.sqlite mozilla/config/system-headers
 --- mozilla/config/system-headers.sqlite	2007-10-12 14:34:46.000000000 +0200
 +++ mozilla/config/system-headers	2007-12-13 12:06:36.000000000 +0100
-@@ -617,8 +617,6 @@ SIOUX.h
+@@ -617,7 +617,6 @@ SIOUX.h
  size_t.h
  someincludefile.h
  Sound.h
 -sqlite3.h
--sqlite3file.h
  ssdef.h
  sslerr.h
  ssl.h
-diff -up mozilla/db/sqlite3/src/sqlite3file.h.sqlite mozilla/db/sqlite3/src/sqlite3file.h
---- mozilla/db/sqlite3/src/sqlite3file.h.sqlite	2007-07-25 04:18:54.000000000 +0200
-+++ mozilla/db/sqlite3/src/sqlite3file.h	2007-12-13 12:06:36.000000000 +0100
-@@ -199,11 +199,7 @@ struct sqlite3OsVtbl {
-   /*
-   ** Files other than os.c just reference the global virtual function table. 
-   */
--#ifdef XP_WIN
--  extern __declspec(dllimport) struct sqlite3OsVtbl sqlite3Os;
--#else
-   extern struct sqlite3OsVtbl sqlite3Os;
--#endif // windows symbol ifdef
- #endif /* _SQLITE_OS_C_ */
- 
- } // extern "C"
 diff -up mozilla/db/sqlite3/src/Makefile.in.sqlite mozilla/db/sqlite3/src/Makefile.in
 --- mozilla/db/sqlite3/src/Makefile.in.sqlite	2007-12-01 08:17:37.000000000 +0100
 +++ mozilla/db/sqlite3/src/Makefile.in	2007-12-13 12:12:37.000000000 +0100
-@@ -45,10 +45,10 @@ VPATH		= @srcdir@
+@@ -45,9 +45,9 @@ VPATH		= @srcdir@
  include $(DEPTH)/config/autoconf.mk
  
  MODULE           = sqlite3
 -LIBRARY_NAME     = sqlite3
 -FORCE_SHARED_LIB = 1
 -VISIBILITY_FLAGS =
--LIB_IS_C_ONLY = 1
 +LIBRARY_NAME     = sqlite3_s
 +MODULE_NAME      = sqlite3
 +FORCE_STATIC_LIB = 1
-+LIB_IS_C_ONLY    = 1
+ LIB_IS_C_ONLY    = 1
  
  ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
- ifndef GNU_CC
 @@ -85,6 +85,9 @@ endif
  endif
  


Index: xulrunner-mozconfig
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner-mozconfig,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xulrunner-mozconfig	7 Jan 2008 16:40:36 -0000	1.7
+++ xulrunner-mozconfig	13 Jan 2008 23:57:38 -0000	1.8
@@ -12,7 +12,7 @@
 ac_add_options --disable-tests
 ac_add_options --disable-installer
 ac_add_options --disable-debug
-ac_add_options --enable-optimize="$RPM_OPT_FLAGS"
+ac_add_options --enable-optimize
 #ac_add_options --enable-debug
 #ac_add_options --disable-optimize
 ac_add_options --enable-xinerama


Index: xulrunner-redhat-default-prefs.js
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner-redhat-default-prefs.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xulrunner-redhat-default-prefs.js	31 Aug 2007 04:34:18 -0000	1.1
+++ xulrunner-redhat-default-prefs.js	13 Jan 2008 23:57:38 -0000	1.2
@@ -2,9 +2,6 @@
 pref("app.update.autoInstallEnabled", false);
 pref("browser.display.use_system_colors",   true);
 pref("browser.link.open_external",          3);
-pref("browser.startup.homepage", "file:///usr/share/doc/HTML/index.html");
-pref("startup.homepage_override_url", "file:///usr/share/doc/HTML/index.html");
-pref("startup.homepage_welcome_url", "file:///usr/share/doc/HTML/index.html");
 pref("general.smoothScroll",                true);
 pref("general.useragent.vendor", "Fedora");
 pref("general.useragent.vendorSub", "RPM_VERREL");


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- xulrunner.spec	12 Jan 2008 16:19:33 -0000	1.45
+++ xulrunner.spec	13 Jan 2008 23:57:38 -0000	1.46
@@ -1,4 +1,3 @@
-%define desktop_file_utils_version 0.9
 %define nspr_version 4.6.99
 %define nss_version 3.11.99
 %define cairo_version 0.5
@@ -10,23 +9,21 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9
-Release:        0.beta2.9%{?dist}
+Release:        0.beta2.10.nightly20080113%{?dist}
 URL:            http://www.mozilla.org/projects/xulrunner/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 %if %{official_branding}
 %define tarball xulrunner-%{version}-source.tar.bz2
 %else
-%define tarball xulrunner-20080107.tar.bz2
+%define tarball xulrunner-20080113.tar.bz2
 %endif
 Source0:        %{tarball}
 Source10:       %{name}-mozconfig
 Source12:       %{name}-redhat-default-prefs.js
-#Source20:       %{name}.desktop
 #Source21:       %{name}.sh.in
 Source23:       %{name}.1
 Source100:      find-external-requires
-Source101:      add-gecko-provides.in
 
 # build patches
 Patch4:         mozilla-build.patch
@@ -44,7 +41,6 @@
 
 # Other
 Patch105:       mozilla-sqlite-build.patch
-Patch106:       mozilla-gtkmozembed.patch
 Patch107:       mozilla-pkgconfig.patch
 
 %if %{official_branding}
@@ -66,7 +62,6 @@
 BuildRequires:  libpng-devel, libjpeg-devel
 BuildRequires:  zlib-devel, zip
 BuildRequires:  libIDL-devel
-BuildRequires:  desktop-file-utils
 BuildRequires:  gtk2-devel
 BuildRequires:  gnome-vfs2-devel
 BuildRequires:  libgnome-devel
@@ -76,13 +71,10 @@
 BuildRequires:  freetype-devel >= 2.1.9
 BuildRequires:  libXt-devel
 BuildRequires:  libXrender-devel
-BuildRequires:  system-bookmarks
 BuildRequires:  curl-devel
 
 Requires:       nspr >= %{nspr_version}
 Requires:       nss >= %{nss_version}
-Requires:       desktop-file-utils >= %{desktop_file_utils_version}
-Requires:       system-bookmarks
 Provides:       gecko-libs = %{version}
 
 #define _use_internal_dependency_generator 0
@@ -123,8 +115,6 @@
 %patch6   -p1 -b .ver
 
 %patch105 -p1 -b .sqlite
-
-%patch106 -p1 -b .gtk
 %patch107 -p1 -b .pk
 
 
@@ -152,9 +142,9 @@
 INTERNAL_GECKO=%{version_internal}
 MOZ_APP_DIR=%{_libdir}/%{name}-${INTERNAL_GECKO}
 
-# Build with -Os as it helps the browser; also, don't override mozilla's warning
-# level; they use -Wall but disable a few warnings that show up _everywhere_
-MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-O2/-Os/' -e 's/-Wall//')
+# Mozilla builds with -Wall with exception of a few warnings which show up
+# everywhere in the code; so, don't override that.
+MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-Wall//')
 
 export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
 export PREFIX='%{_prefix}'
@@ -166,6 +156,7 @@
 %define moz_make_flags %{?_smp_mflags}
 %endif
 
+export CFLAGS=$RPM_OPT_FLAGS
 export LDFLAGS="-Wl,-rpath,${MOZ_APP_DIR}"
 export MAKE="gmake %{moz_make_flags}"
 make -f client.mk build
@@ -196,12 +187,6 @@
 
 %{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications}
 
-#desktop-file-install --vendor mozilla \
-#  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-#  --add-category WebBrowser \
-#  --add-category Network \
-#  %{SOURCE20} 
-
 # set up our default preferences
 %{__cat} %{SOURCE12} | %{__sed} -e 's,RPM_VERREL,%{version}-%{release},g' > rh-default-prefs
 %{__install} -p -D -m 644 rh-default-prefs $RPM_BUILD_ROOT/${MOZ_APP_DIR}/defaults/pref/all-redhat.js
@@ -293,11 +278,6 @@
 %{__cat} > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{ld_conf_file} << EOF
 ${MOZ_APP_DIR}
 EOF
-
-GECKO_VERSION=%{version_internal}
-%{__cat} %{SOURCE101} | %{__sed} -e "s/@GECKO_VERSION@/$GECKO_VERSION/g" > \
-                        %{_builddir}/add-gecko-provides
-chmod 700 %{_builddir}/add-gecko-provides
                         
 # Copy over the LICENSE
 install -c -m 644 LICENSE $RPM_BUILD_ROOT${MOZ_APP_DIR}
@@ -316,11 +296,9 @@
 
 %post
 /sbin/ldconfig
-#update-desktop-database %{_datadir}/applications
 
 %postun
 /sbin/ldconfig
-#update-desktop-database %{_datadir}/applications
 
 %preun
 # is it a final removal?
@@ -399,6 +377,11 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Sat Jan 13 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.beta2.10
+- Update to latest trunk (2008-01-13)
+- Use CFLAGS instead of configure arguments
+- Random cleanups: BuildRequires, scriptlets, prefs, etc.
+
 * Sat Jan 12 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.beta2.9
 - Provide gecko-devel-unstable as well
 


--- add-gecko-provides.in DELETED ---


--- mozilla-gtkmozembed.patch DELETED ---

More information about the fedora-extras-commits mailing list