commit MozillaSunbird for openSUSE:Factory

Hello community, here is the log from the commit of package MozillaSunbird for openSUSE:Factory checked in at Tue Dec 29 18:59:26 CET 2009. -------- --- MozillaSunbird/MozillaSunbird.changes 2009-07-16 08:32:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/MozillaSunbird/MozillaSunbird.changes 2009-12-28 20:25:43.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Dec 28 19:05:53 CET 2009 - wr@rosenauer.org + +- major update to version 1.0b1 +- build against mozilla-xulrunner191 and use its runtime +- build lightning addon package from here + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- abuild.patch cvs-update.sh l10n-0.9.tar.bz2 locale.patch missing-return.patch mozilla-gcc4.3-fixes.patch mozilla-gcc44.patch mozilla-path_len.patch nss-opt.patch sunbird-0.9-source.tar.bz2 New: ---- create-tar.sh find-external-requires.sh l10n-0.9.99.tar.bz2 mozilla-installdir.patch sunbird-0.9.99-source.tar.bz2 sunbird-libxul-sdk.patch sunbird-system-proxy.patch suse-default-prefs.js ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaSunbird.spec ++++++ --- /var/tmp/diff_new_pack.oyW32b/_old 2009-12-29 18:59:04.000000000 +0100 +++ /var/tmp/diff_new_pack.oyW32b/_new 2009-12-29 18:59:04.000000000 +0100 @@ -1,8 +1,8 @@ # -# spec file for package MozillaSunbird (Version 0.9) +# spec file for package MozillaSunbird (Version 0.9.99) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2006-2009 Wolfgang Rosenauer +# 2006-2009 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,53 +16,49 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# norootforbuild +%define xulrunner mozilla-xulrunner191 Name: MozillaSunbird -BuildRequires: gcc-c++ libgnomeui-devel libidl-devel orbit-devel unzip update-desktop-files zip -%if %suse_version > 1020 -BuildRequires: fdupes -%endif +BuildRequires: autoconf213 fdupes gcc-c++ libgnomeui-devel libidl-devel mozilla-nss-devel orbit-devel python startup-notification-devel unzip update-desktop-files zip %if %suse_version > 1100 BuildRequires: nss-shared-helper-devel %endif -# fix broken SLES9 requirements -%if %suse_version == 910 -BuildRequires: freetype2-devel gnome-vfs2 libgnome libgnomeui pkgconfig popt-devel -%endif -%if %suse_version > 930 -BuildRequires: mozilla-nspr-devel -%endif -%if %suse_version > 1010 || 0%{?opensuse_bs} -BuildRequires: mozilla-nss-devel -%endif -License: GPL v2 or later ; LGPL v2.1 or later ; MPL .. -Version: 0.9 -Release: 2 +%if 0%{?xulrunner:1} +BuildRequires: %xulrunner-devel +%endif +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +Version: 0.9.99 +Release: 1 Summary: Mozilla's Calendar Application Url: http://www.mozilla.org/projects/calendar/ Group: Productivity/Office/Organizers Source: sunbird-%{version}-source.tar.bz2 Source1: sunbird.desktop Source2: l10n-%{version}.tar.bz2 -Source3: MozillaSunbird-rpmlintrc -Source4: cvs-update.sh -Patch1: mozilla-gcc4.3-fixes.patch -Patch2: mozilla-path_len.patch -Patch3: mozilla-gcc44.patch -Patch4: nss-opt.patch -Patch5: sunbird-shared-nssdb.patch -Patch8: abuild.patch -Patch9: locale.patch -Patch11: missing-return.patch +Source3: %{name}-rpmlintrc +Source4: create-tar.sh +Source5: find-external-requires.sh +Source6: suse-default-prefs.js +Patch1: mozilla-installdir.patch +Patch2: sunbird-shared-nssdb.patch +Patch3: sunbird-system-proxy.patch +Patch4: sunbird-libxul-sdk.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: libstdc++ fileutils textutils /bin/sh -%define _unpackaged_files_terminate_build 0 -%define releasedate 2008092400 +Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) +Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) +%if 0%{?xulrunner:1} +Requires: %xulrunner +%endif +%define releasedate 2009122200 %define progname sunbird -%define progdir %{_prefix}/%_lib/%{progname} -%define my_provides /tmp/my-provides -%define my_requires /tmp/my-requires +%define progdir %{_libdir}/%{progname} +%define lightning 1 +%define _use_internal_dependency_generator 0 +%define __find_requires sh %{SOURCE5} +%global provfind sh -c "grep -v '.so' | %__find_provides" +%global __find_provides %provfind %description The Sunbird Project is a redesign of the Mozilla Calendar component. @@ -72,43 +68,37 @@ intended user is someone who uses Mozilla Firefox and Mozilla Thunderbird and wants a calendar application based on Mozilla. -Authors: --------- - Mozilla Foundation %package translations -License: GPL v2 or later ; LGPL v2.1 or later ; MPL .. -Summary: Translations of Mozilla Sunbird -Provides: locale(%{name}:ca;cs;da;de;es_AR;es_ES;eu;fr;ga_IE;hu;is;it;ja;ka;ko;lt;nb_NO;nl;pl;pt_BR;pt_PT;ro;ru;sk;sl;sv_SE;uk;zh_CN;zh_TW) -Group: Productivity/Office/Organizers +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +Summary: Translations for Mozilla Sunbird +Provides: locale(%{name}:ca;cs;da;de;es_AR;es_ES;et;eu;gl;fr;fy_NL;ga_IE;id;he;hu;is;it;ja;ka;ko;lt;nb_NO;nl;nn_NO;pa_IN;pl;pt-BR;pt_PT;ro;ru;si;sk;ta_LK;tr;vi;zh_CN) +Group: System/Localization PreReq: %{name} = %{version} %description translations -This package contains the additional languages for Sunbird. +This package contains several optional languages for Sunbird. -The Sunbird Project is a redesign of the Mozilla Calendar component. -The goal is to produce a cross-platform stand-alone calendar -application based on Mozilla's XUL user interface language. At the -moment, the Sunbird name is a project name. It is not official and may -change in the future. -The intended user is someone who uses Mozilla Firefox and Mozilla -Thunderbird and wants a calendar application based on Mozilla. +%if %lightning -Authors: --------- - Mozilla Foundation +%package -n lightning +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +Summary: Calendar extension for SeaMonkey and Thunderbird +Group: Productivity/Office/Organizers + +%description -n lightning +Addon for SeaMonkey and Thunderbird to provide calendaring functionality. +%endif %prep -%setup -n mozilla -b 2 -q -%patch1 -%patch2 -p1 -%patch3 -%patch4 -%patch5 -%patch8 -p1 -%patch9 -%patch11 +%setup -n sunbird -b 2 -q +pushd mozilla +%patch1 -p1 +popd +#%patch2 +#%patch3 -p1 #disabled because of l10n impact +%patch4 -p1 %build export SUSE_ASNEEDED=0 @@ -117,164 +107,180 @@ export BUILD_OFFICIAL=1 export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing" export CXXFLAGS="$CFLAGS" +%if 0%{?xulrunner:1} +SDKDIR=$(pkg-config --variable=sdkdir libxul) +%endif export MOZCONFIG=$RPM_BUILD_DIR/mozconfig cat << EOF > $MOZCONFIG mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 mk_add_options MOZ_MAKE_FLAGS=%{?jobs:-j%jobs} -. \$topsrcdir/calendar/sunbird/config/mozconfig +mk_add_options MOZ_MILESTONE_RELEASE=1 +ac_add_options --enable-application=calendar +ac_add_options --enable-calendar ac_add_options --prefix=%{_prefix} ac_add_options --libdir=%{_libdir} -ac_add_options --sysconfdir=%{_sysconfdir} -ac_add_options --mandir=%{_mandir} -ac_add_options --includedir=%{_includedir} ac_add_options --enable-optimize -ac_add_options --with-system-jpeg -ac_add_options --with-system-png -ac_add_options --with-system-zlib -ac_add_options --enable-default-toolkit=gtk2 -ac_add_options --enable-xft ac_add_options --disable-tests -ac_add_options --disable-freetype2 ac_add_options --disable-installer -ac_add_options --enable-static -ac_add_options --disable-shared -ac_add_options --enable-logging +ac_add_options --disable-updater +ac_add_options --disable-crashreporter +ac_add_options --disable-ogg +ac_add_options --enable-startup-notification ac_add_options --enable-official-branding +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-nspr +ac_add_options --with-system-nss #ac_add_options --enable-debug +ac_add_options --with-l10n-base=../l10n EOF -%if %suse_version > 930 +%if 0%{?xulrunner:1} cat << EOF >> $MOZCONFIG -ac_add_options --with-system-nspr -ac_add_options --enable-system-cairo +ac_add_options --with-libxul-sdk=$SDKDIR +EOF +%else +cat << EOF >> $MOZCONFIG +ac_add_options --enable-static +ac_add_options --disable-shared EOF %endif -%if %suse_version > 1010 || 0%{?opensuse_bs} +%if %suse_version > 1110 cat << EOF >> $MOZCONFIG -ac_add_options --with-system-nss +ac_add_options --enable-system-cairo EOF %endif make -f client.mk build %install -make -C xpinstall/packager STRIP=/bin/true +make -C calendar/installer STRIP=/bin/true # copy tree into RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{progdir} -cp -rf $RPM_BUILD_DIR/mozilla/dist/%{progname}/* $RPM_BUILD_ROOT%{progdir} -mkdir $RPM_BUILD_ROOT%{_bindir} -ln -sf ../..%{progdir}/%{progname} $RPM_BUILD_ROOT%{_bindir}/%{progname} +cp -rf $RPM_BUILD_DIR/sunbird/mozilla/dist/%{progname}/* \ + $RPM_BUILD_ROOT%{progdir} +%if 0%{?xulrunner:1} +cp %{SOURCE6} $RPM_BUILD_ROOT%{progdir}/defaults/preferences/all-opensuse.js +%else +cp %{SOURCE6} $RPM_BUILD_ROOT%{progdir}/defaults/pref/all-opensuse.js +%endif # install additional locales -echo %defattr\(-,root,root\) > %{_tmppath}/translations.list +rm -f %{_tmppath}/translations.* for locale in $(awk '{ print $1; }' calendar/locales/shipped-locales); do case $locale in ja-JP-mac|en-US) + # locales not to be included in translations package ;; *) - make -C calendar/locales libs-$locale - cp dist/xpi-stage/locale-$locale/chrome/$locale.jar \ - dist/xpi-stage/locale-$locale/chrome/calendar-$locale.jar \ + make -C calendar/locales libs-$locale || continue +%if %lightning + make -C calendar/lightning/locales AB_CD=$locale XPI_NAME=locale-$locale || continue +%endif + cp mozilla/dist/xpi-stage/locale-$locale/chrome/$locale.jar \ + mozilla/dist/xpi-stage/locale-$locale/chrome/calendar-$locale.jar \ + mozilla/dist/xpi-stage/locale-$locale/chrome/sunbird-$locale.jar \ $RPM_BUILD_ROOT/%{progdir}/chrome - cp dist/xpi-stage/locale-$locale/chrome/$locale.manifest \ - dist/xpi-stage/locale-$locale/chrome/calendar-$locale.manifest \ + cp mozilla/dist/xpi-stage/locale-$locale/chrome/$locale.manifest \ + mozilla/dist/xpi-stage/locale-$locale/chrome/calendar-$locale.manifest \ + mozilla/dist/xpi-stage/locale-$locale/chrome/sunbird-$locale.manifest \ $RPM_BUILD_ROOT/%{progdir}/chrome echo %{progdir}/chrome/$locale.jar >> %{_tmppath}/translations.list echo %{progdir}/chrome/$locale.manifest >> %{_tmppath}/translations.list echo %{progdir}/chrome/calendar-$locale.jar >> %{_tmppath}/translations.list echo %{progdir}/chrome/calendar-$locale.manifest >> %{_tmppath}/translations.list + echo %{progdir}/chrome/sunbird-$locale.jar >> %{_tmppath}/translations.list + echo %{progdir}/chrome/sunbird-$locale.manifest >> %{_tmppath}/translations.list esac done +# link startscript +mkdir --parents $RPM_BUILD_ROOT%{_bindir}/ +ln -s %{_libdir}/%{progname}/%{progname} $RPM_BUILD_ROOT%{_bindir}/ # freedesktop definition mkdir -p $RPM_BUILD_ROOT/usr/share/applications/ install -m 644 %{SOURCE1} \ $RPM_BUILD_ROOT/usr/share/applications mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/ -cp -f $RPM_BUILD_ROOT%{progdir}/chrome/icons/default/default.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}.xpm +cp -f $RPM_BUILD_ROOT%{progdir}/chrome/icons/default/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}.png %suse_update_desktop_file %{progname} Office Calendar GTK # remove spurious executable bits -find $RPM_BUILD_ROOT%{_libdir}/sunbird -name "*.js" -o -name "*.xpm" | xargs chmod a-x -# modify provides and requires lists -%if %suse_version == 1000 || %suse_version == 1010 -cat << EOF > %{my_provides} -grep -vE "libnss3.so|libnssckbi.so|libsmime3.so|libsoftokn3.so|libssl3.so|libfreebl3.so" | %{__find_provides} -EOF -chmod 755 %{my_provides} -%define __find_provides %{my_provides} -cat << EOF > %{my_requires} -grep -vE "libnss3.so|libnssckbi.so|libsmime3.so|libsoftokn3.so|libssl3.so|libfreebl3.so|sunbird-bin" | %{__find_requires} -EOF -chmod 755 %{my_requires} -%define __find_requires %{my_requires} +find $RPM_BUILD_ROOT%{_libdir}/sunbird -name "*.js" -o -name "*.xpm" -o -name "*.png" | xargs chmod a-x +# Lightning +%if %lightning +_tbaddondir=$RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/\{3550f703-e582-4d05-9a08-453d09bdfdc6\} +_smaddondir=$RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/\{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a\} +mkdir -p $_tbaddondir/\{e2fda1a4-762b-4020-b5ad-a41df1933103\} +mkdir -p $_smaddondir +cp -rL mozilla/dist/xpi-stage/lightning/* \ + $_tbaddondir/\{e2fda1a4-762b-4020-b5ad-a41df1933103\} +(cd $_smaddondir ; \ + ln -s ../\{3550f703-e582-4d05-9a08-453d09bdfdc6\}/\{e2fda1a4-762b-4020-b5ad-a41df1933103\} ) +find $RPM_BUILD_ROOT%{_libdir}/mozilla -name "*.js" -o -name "*.xpm" -o -name "*.png" -o -name "*.sqlite" | xargs chmod a-x +cp mozilla/dist/xpi-stage/locale-*/chrome/calendar-* \ + mozilla/dist/xpi-stage/locale-*/chrome/lightning-* \ + $_tbaddondir/\{e2fda1a4-762b-4020-b5ad-a41df1933103\}/chrome/ +%fdupes $RPM_BUILD_ROOT%{_libdir}/mozilla %endif -%if %suse_version > 1020 +# fdupes %fdupes $RPM_BUILD_ROOT%{progdir} %fdupes $RPM_BUILD_ROOT%{_datadir} +# remove unneeded stuff +rm $RPM_BUILD_ROOT%{progdir}/removed-files +rm -rf $RPM_BUILD_ROOT%{progdir}/dictionaries +rm -rf $RPM_BUILD_ROOT%{progdir}/plugins +rm -r $RPM_BUILD_ROOT%{progdir}/LICENSE +rm -r $RPM_BUILD_ROOT%{progdir}/README.txt +%if 0%{?xulrunner:1} +rm $RPM_BUILD_ROOT%{progdir}/run-mozilla.sh %endif %clean rm -rf $RPM_BUILD_ROOT -%if %suse_version == 1000 || %suse_version == 1010 -rm -f %{my_provides} -rm -f %{my_requires} -%endif -rm -rf %{_tmppath}/translations.list +rm -rf %{_tmppath}/translations.* %files %defattr(-,root,root) %{_bindir}/%{progname} -%attr(644,root,root) %{_datadir}/pixmaps/%{progname}.xpm +%attr(644,root,root) %{_datadir}/pixmaps/%{progname}.png %attr(644,root,root) %{_datadir}/applications/%{progname}.desktop %dir %{progdir} %dir %{progdir}/chrome/ %{progdir}/chrome/icons/ %{progdir}/chrome/calendar-en-US.* %{progdir}/chrome/calendar.* -%{progdir}/chrome/classic.* -%{progdir}/chrome/comm.* %{progdir}/chrome/en-US.* -%{progdir}/chrome/pippki.* -%{progdir}/chrome/toolkit.* +%{progdir}/chrome/sunbird-en-US.* +%{progdir}/chrome/sunbird.* +%{progdir}/calendar-js/ %{progdir}/components/ %{progdir}/defaults/ %{progdir}/extensions/ +%{progdir}/modules/ +%{progdir}/application.ini +%{progdir}/%{progname} +%if ! 0%{?xulrunner:1} +%{progdir}/chrome/classic.* +%{progdir}/chrome/comm.* +%{progdir}/chrome/pippki.* +%{progdir}/chrome/toolkit.* %{progdir}/greprefs/ -%{progdir}/icons/ -%{progdir}/js/ %{progdir}/res/ -# NSPR -%if %suse_version <= 930 -%{progdir}/libnspr4.so -%{progdir}/libplc4.so -%{progdir}/libplds4.so -%endif -# NSS -%if %suse_version <= 1010 && !0%{?opensuse_bs} -%{progdir}/libnss3.so -%{progdir}/libnssckbi.so -%{progdir}/libsmime3.so -%{progdir}/libsoftokn3.chk -%{progdir}/libsoftokn3.so -%{progdir}/libfreebl3.chk -%{progdir}/libfreebl3.so -%{progdir}/libssl3.so -%endif -# +%{progdir}/dependentlibs.list %{progdir}/libmozjs.so -%{progdir}/libxpcom_compat.so +%{progdir}/libsqlite3.so %{progdir}/libxpcom_core.so %{progdir}/libxpcom.so -%{progdir}/libxpistub.so -%{progdir}/LICENSE %{progdir}/mozilla-xremote-client -%{progdir}/README.txt %{progdir}/run-mozilla.sh -%{progdir}/%{progname} %{progdir}/%{progname}-bin -%exclude %{progdir}/updater -%exclude %{progdir}/updater.ini -%{progdir}/xpicleanup -%{progdir}/dependentlibs.list +%{progdir}/platform.ini +%endif %files translations -f %{_tmppath}/translations.list %defattr(-,root,root) +%if %lightning + +%files -n lightning +%defattr(-,root,root) +%{_libdir}/mozilla/ +%endif %changelog ++++++ create-tar.sh ++++++ #!/bin/bash BRANCH="releases/comm-1.9.1" # comm-central RELEASE_TAG="SUNBIRD_1_0b1_RELEASE" VERSION="0.9.99" echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH sunbird pushd sunbird hg update -r $RELEASE_TAG echo "running client.py..." [ "$RELEASE_TAG" == "default" ] || _extra="--comm-rev=$RELEASE_TAG --mozilla-rev=$RELEASE_TAG" python client.py checkout --skip-chatzilla --skip-venkman $_extra popd echo "creating archive..." tar cjf sunbird-$VERSION-source.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS sunbird # l10n # http://l10n.mozilla.org/dashboard/?tree=tb30x -> shipped-locales echo "fetching locales..." if [ -e shipped-locales ]; then SHIPPED_LOCALES=shipped-locales else SHIPPED_LOCALES=sunbird/calendar/locales/shipped-locales fi test ! -d l10n && mkdir l10n for locale in $(awk '{ print $1; }' $SHIPPED_LOCALES); do case $locale in ja-JP-mac|en-US) ;; *) echo "fetching $locale ..." hg clone http://hg.mozilla.org/releases/l10n-mozilla-1.9.1/$locale l10n/$locale hg -R l10n/$locale up -C -r $RELEASE_TAG ;; esac done echo "creating l10n archive..." tar cjf l10n-$VERSION.tar.bz2 \ --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=browser --exclude=mail \ --exclude=suite \ l10n ++++++ find-external-requires.sh ++++++ #!/bin/sh # Finds requirements provided outside of the current file set filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"` provides=`echo "$filelist" | /usr/lib/rpm/find-provides` { for f in $filelist ; do echo $f | /usr/lib/rpm/find-requires | while read req ; do found=0 for p in $provides ; do if [ "$req" = "$p" ]; then found=1 fi done if [ "$found" = "0" ]; then echo $req fi done done } | sort -u ++++++ l10n-0.9.tar.bz2 -> l10n-0.9.99.tar.bz2 ++++++ MozillaSunbird/l10n-0.9.tar.bz2 /mounts/work_src_done/STABLE/MozillaSunbird/l10n-0.9.99.tar.bz2 differ: char 11, line 1 ++++++ mozilla-installdir.patch ++++++ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -58,17 +58,17 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) libdir = @libdir@ datadir = @datadir@ mandir = @mandir@ idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +installdir = $(libdir)/$(MOZ_APP_NAME) sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) DIST = $(DEPTH)/dist LIBXUL_SDK = @LIBXUL_SDK@ L10NBASEDIR = @L10NBASEDIR@ LIBXUL_DIST = @LIBXUL_DIST@ ++++++ sunbird-0.9-source.tar.bz2 -> sunbird-0.9.99-source.tar.bz2 ++++++ MozillaSunbird/sunbird-0.9-source.tar.bz2 /mounts/work_src_done/STABLE/MozillaSunbird/sunbird-0.9.99-source.tar.bz2 differ: char 11, line 1 ++++++ sunbird-libxul-sdk.patch ++++++ diff --git a/calendar/installer/Makefile.in b/calendar/installer/Makefile.in --- a/calendar/installer/Makefile.in +++ b/calendar/installer/Makefile.in @@ -53,17 +53,17 @@ NO_PKG_FILES = \ xpt_link* \ nspr-config \ $(NULL) include $(topsrcdir)/config/rules.mk MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in -ifdef BUILD_STATIC_LIBS +ifneq (,$(BUILD_STATIC_LIBS)$(MOZ_ENABLE_LIBXUL)) ifeq (WINNT,$(OS_ARCH)) MOZ_PKG_MANIFEST_P = $(srcdir)/windows/packages-static # XXX Enable when landing unix installer # else # ifneq (,$(filter-out OS2 Darwin,$(OS_ARCH))) # MOZ_PKG_MANIFEST_P = $(srcdir)/unix/packages-static # endif endif diff --git a/calendar/locales/Makefile.in b/calendar/locales/Makefile.in --- a/calendar/locales/Makefile.in +++ b/calendar/locales/Makefile.in @@ -107,17 +107,19 @@ endif endif endif clobber-%: $(RM) -rf $(DIST)/xpi-stage/locale-$* libs-%: $(NSINSTALL) -D $(DIST)/install +ifndef LIBXUL_SDK @$(MAKE) -C ../../mozilla/toolkit/locales libs-$* BOTH_MANIFESTS=1 +endif ifdef MOZ_SUNBIRD @$(MAKE) -C ../sunbird/locales libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1 endif @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1 ifdef MOZ_BRANDING_DIRECTORY @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 endif @$(MAKE) tests AB_CD=$* diff --git a/calendar/sunbird/app/Makefile.in b/calendar/sunbird/app/Makefile.in --- a/calendar/sunbird/app/Makefile.in +++ b/calendar/sunbird/app/Makefile.in @@ -74,17 +74,19 @@ ifdef SOURCE_STAMP DEFINES += -DMOZ_SOURCE_STAMP="$(SOURCE_STAMP)" endif SOURCE_REPO := $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/") ifdef SOURCE_REPO DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)" endif -ifndef LIBXUL_SDK +ifdef LIBXUL_SDK +include $(topsrcdir)/config/rules.mk +else # Build a binary bootstrapping with XRE_main MOZILLA_INTERNAL_API = 1 ifeq ($(USE_SHORT_LIBNAME), 1) PROGRAM = sunbird$(BIN_SUFFIX) else PROGRAM = sunbird-bin$(BIN_SUFFIX) @@ -219,22 +221,16 @@ RCFLAGS += -DDEBUG endif RCFLAGS += -DSUNBIRD_ICO=\"$(DIST)/branding/sunbird.ico\" endif LIBS += $(JEMALLOC_LIBS) include $(topsrcdir)/config/rules.mk -ifdef MOZILLA_OFFICIAL -DEFINES += -DMOZILLA_OFFICIAL -endif - -DEFINES += -DSUNBIRD_ICO=\"$(DIST)/branding/sunbird.ico\" - ifdef BUILD_STATIC_LIBS include $(topsrcdir)/config/static-rules.mk endif ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) ifdef BUILD_STATIC_LIBS LIBS += -framework QuickTime -framework IOKit endif @@ -275,66 +271,16 @@ libs:: sunbird install:: sunbird $(SYSINSTALL) $< $(DESTDIR)$(bindir) GARBAGE += sunbird GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, sunbird.js) endif -ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT))) -ICON_FILES = \ - $(DIST)/branding/mozicon128.png \ - $(DIST)/branding/mozicon50.xpm \ - $(DIST)/branding/mozicon16.xpm \ - $(NULL) - -libs:: $(ICON_FILES) - $(INSTALL) $^ $(DIST)/bin/icons - -install:: - $(SYSINSTALL) $(IFLAGS1) $(ICON_FILES) $(DESTDIR)$(mozappdir)/icons -endif - -ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) -libs:: - $(INSTALL) $(DIST)/branding/default.xpm $(DIST)/bin/chrome/icons/default - -install:: - $(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default.xpm $(DESTDIR)$(mozappdir)/chrome/icons/default -endif - -export:: -ifndef MOZ_BRANDING_DIRECTORY - $(NSINSTALL) -D $(DIST)/branding -ifeq ($(OS_ARCH),WINNT) - cp $(srcdir)/sunbird.ico $(DIST)/branding/sunbird.ico - cp $(srcdir)/sunbird.ico $(DIST)/branding/app.ico - cp $(srcdir)/sunbird.ico $(DIST)/branding/document.ico -endif -ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) - cp $(srcdir)/macbuild/sunbird.icns $(DIST)/branding/sunbird.icns - cp $(srcdir)/macbuild/sb_ICS.icns $(DIST)/branding/sb_ICS.icns - cp $(srcdir)/macbuild/dsstore $(DIST)/branding/dsstore - cp $(srcdir)/macbuild/background.png $(DIST)/branding/background.png - cp $(srcdir)/macbuild/disk.icns $(DIST)/branding/disk.icns -endif -ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT))) - cp $(srcdir)/mozicon128.png $(DIST)/branding/mozicon128.png - cp $(srcdir)/mozicon50.xpm $(DIST)/branding/mozicon50.xpm - cp $(srcdir)/mozicon16.xpm $(DIST)/branding/mozicon16.xpm -endif -ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) - cp $(srcdir)/default.xpm $(DIST)/branding/default.xpm -endif -ifeq ($(OS_ARCH),OS2) - cp $(srcdir)/sunbird-os2.ico $(DIST)/branding/sunbird.ico -endif -endif - libs:: touch $(DIST)/bin/.autoreg ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) APP_NAME = $(MOZ_APP_DISPLAYNAME) ifdef MOZ_DEBUG @@ -373,16 +319,77 @@ libs repackage:: $(PROGRAM) printf APPL$(MAC_CREATOR_CODE) > $(DIST)/$(APP_NAME).app/Contents/PkgInfo # remove CVS dirs from packaged app find $(DIST)/$(APP_NAME).app -type d -name "CVS" -prune -exec rm -rf {} \; endif endif # LIBXUL_SDK +ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT))) +ICON_FILES = \ + $(DIST)/branding/mozicon128.png \ + $(DIST)/branding/mozicon50.xpm \ + $(DIST)/branding/mozicon16.xpm \ + $(NULL) + +libs:: $(ICON_FILES) + $(INSTALL) $^ $(DIST)/bin/chrome/icons/default + +install:: + $(SYSINSTALL) $(IFLAGS1) $(ICON_FILES) $(DESTDIR)$(mozappdir)/chrome/icons/default +endif + +export:: +ifndef MOZ_BRANDING_DIRECTORY + $(NSINSTALL) -D $(DIST)/branding +ifeq ($(OS_ARCH),WINNT) + cp $(srcdir)/sunbird.ico $(DIST)/branding/sunbird.ico + cp $(srcdir)/sunbird.ico $(DIST)/branding/app.ico + cp $(srcdir)/sunbird.ico $(DIST)/branding/document.ico +endif +ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) + cp $(srcdir)/macbuild/sunbird.icns $(DIST)/branding/sunbird.icns + cp $(srcdir)/macbuild/sb_ICS.icns $(DIST)/branding/sb_ICS.icns + cp $(srcdir)/macbuild/dsstore $(DIST)/branding/dsstore + cp $(srcdir)/macbuild/background.png $(DIST)/branding/background.png + cp $(srcdir)/macbuild/disk.icns $(DIST)/branding/disk.icns +endif +ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT))) + cp $(srcdir)/mozicon128.png $(DIST)/branding/mozicon128.png + cp $(srcdir)/mozicon50.xpm $(DIST)/branding/mozicon50.xpm + cp $(srcdir)/mozicon16.xpm $(DIST)/branding/mozicon16.xpm +endif +ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) + cp $(srcdir)/default.xpm $(DIST)/branding/default.xpm +endif +ifeq ($(OS_ARCH),OS2) + cp $(srcdir)/sunbird-os2.ico $(DIST)/branding/sunbird.ico +endif +endif + +ifdef MOZILLA_OFFICIAL +DEFINES += -DMOZILLA_OFFICIAL +endif + +DEFINES += -DSUNBIRD_ICO=\"$(DIST)/branding/sunbird.ico\" + +ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) +libs:: + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DIST)/bin/chrome/icons/default + +install:: + $(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DESTDIR)$(mozappdir)/chrome/icons/default +endif + +ifdef LIBXUL_SDK +libs:: + cp $(LIBXUL_DIST)/bin/xulrunner-stub$(BIN_SUFFIX) $(DIST)/bin/sunbird$(BIN_SUFFIX) +endif + libs:: ifeq ($(OS_ARCH),WINNT) $(EXIT_ON_ERROR) \ $(PERL) -pe 's/(? $(DIST)/bin/LICENSE else $(INSTALL) $(MOZILLA_SRCDIR)/LICENSE $(DIST)/bin endif diff --git a/calendar/sunbird/app/application.ini b/calendar/sunbird/app/application.ini --- a/calendar/sunbird/app/application.ini +++ b/calendar/sunbird/app/application.ini @@ -47,18 +47,18 @@ SourceRepository=@MOZ_SOURCE_REPO@ #endif #ifdef MOZ_SOURCE_STAMP SourceStamp=@MOZ_SOURCE_STAMP@ #endif Copyright=Copyright (c) 1998 - 2009 mozilla.org ID={718e30fb-e89b-41dd-9da7-e25a45638b28} [Gecko] -MinVersion=@GRE_MILESTONE@ -MaxVersion=@GRE_MILESTONE@ +MinVersion=1.9.1 +MaxVersion=1.9.1.* [XRE] EnableProfileMigrator=1 EnableExtensionManager=1 [Crash Reporter] #if MOZILLA_OFFICIAL Enabled=1 ++++++ sunbird-system-proxy.patch ++++++ diff --git a/calendar/base/content/preferences/connection.js b/calendar/base/content/preferences/connection.js --- a/calendar/base/content/preferences/connection.js +++ b/calendar/base/content/preferences/connection.js @@ -69,17 +69,22 @@ var gConnectionsDialog = { } } var noProxiesPref = document.getElementById("network.proxy.no_proxies_on"); noProxiesPref.value = noProxiesPref.value.replace(/[;]/g,','); return true; }, - + + checkForSystemProxy: function () + { + if ("@mozilla.org/system-proxy-settings;1" in Components.classes) + document.getElementById("systemPref").removeAttribute("hidden"); + }, /** * Handler function to be called when the network.proxy.type preference has * changed while the connection preferences dialog is open. */ proxyTypeChanged: function gCD_proxyTypeChanged() { var proxyTypePref = document.getElementById("network.proxy.type"); diff --git a/calendar/base/content/preferences/connection.xul b/calendar/base/content/preferences/connection.xul --- a/calendar/base/content/preferences/connection.xul +++ b/calendar/base/content/preferences/connection.xul @@ -40,16 +40,17 @@ <?xml-stylesheet href="chrome://global/skin/"?> http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" title="&connectionsDialog.title;" dlgbuttons="accept,cancel" onbeforeaccept="return gConnectionsDialog.beforeAccept();" + onload="gConnectionsDialog.checkForSystemProxy();" #ifdef XP_MACOSX style="width: &window.macWidth; !important;"> #else style="width: &window.width; !important;"> #endif <prefpane id="ConnectionsDialogPane"> @@ -88,16 +89,17 @@ <groupbox> <caption label="&proxyTitle.label;"/> <radiogroup id="networkProxyType" preference="network.proxy.type" onsyncfrompreference="return gConnectionsDialog.readProxyType();"> <radio value="0" label="&directTypeRadio.label;" accesskey="&directTypeRadio.accesskey;"/> <radio value="4" label="&WPADTypeRadio.label;" accesskey="&WPADTypeRadio.accesskey;"/> + <radio value="5" label="&systemTypeRadio.label;" accesskey="&systemTypeRadio.accesskey;" id="systemPref" hidden="true"/> <radio value="1" label="&manualTypeRadio.label;" accesskey="&manualTypeRadio.accesskey;"/> <grid class="indent" flex="1"> <columns> <column/> <column flex="1"/> </columns> <rows> <row align="center"> diff --git a/calendar/locales/en-US/chrome/calendar/preferences/connection.dtd b/calendar/locales/en-US/chrome/calendar/preferences/connection.dtd --- a/calendar/locales/en-US/chrome/calendar/preferences/connection.dtd +++ b/calendar/locales/en-US/chrome/calendar/preferences/connection.dtd @@ -43,16 +43,18 @@ <!ENTITY window.width "37em"> <!ENTITY window.macWidth "39em"> <!ENTITY proxyTitle.label "Configure Proxies to Access the Internet"> <!ENTITY directTypeRadio.label "Direct connection to the Internet"> <!ENTITY directTypeRadio.accesskey "d"> <!ENTITY WPADTypeRadio.label "Auto-detect proxy settings for this network"> <!ENTITY WPADTypeRadio.accesskey "w"> +<!ENTITY systemTypeRadio.label "Use system proxy settings"> +<!ENTITY systemTypeRadio.accesskey "u"> <!ENTITY manualTypeRadio.label "Manual proxy configuration:"> <!ENTITY manualTypeRadio.accesskey "m"> <!ENTITY autoTypeRadio.label "Automatic proxy configuration URL:"> <!ENTITY autoTypeRadio.accesskey "A"> <!ENTITY reload.label "Reload"> <!ENTITY reload.accesskey "e"> <!ENTITY ftp.label "FTP Proxy:"> <!ENTITY ftp.accesskey "F"> ++++++ sunbird.desktop ++++++ --- /var/tmp/diff_new_pack.oyW32b/_old 2009-12-29 18:59:04.000000000 +0100 +++ /var/tmp/diff_new_pack.oyW32b/_new 2009-12-29 18:59:04.000000000 +0100 @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 Type=Application Name=Sunbird Name[de]=Sunbird ++++++ suse-default-prefs.js ++++++ pref("font.default", "sans-serif"); pref("font.default.x-western", "sans-serif"); pref("font.name.monospace.x-western", "monospace"); pref("font.name.monospace.x-unicode", "monospace"); pref("print.print_edge_top", 14); // 1/100 of an inch pref("print.print_edge_left", 16); // 1/100 of an inch pref("print.print_edge_right", 16); // 1/100 of an inch pref("print.print_edge_bottom", 14); // 1/100 of an inch pref("intl.locale.matchOS", true); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org