commit seamonkey for openSUSE:11.4

28 Sep 2011

Hello community,

here is the log from the commit of package seamonkey for openSUSE:11.4
checked in at Wed Sep 28 17:29:28 CEST 2011.



--------

--- old-versions/11.4/UPDATES/all/seamonkey/seamonkey.changes	2011-09-08 02:11:26.000000000 +0200
+++ 11.4/seamonkey/seamonkey.changes	2011-09-26 14:58:38.000000000 +0200
@@ -1,0 +2,15 @@
+Mon Sep 26 12:42:54 UTC 2011 - wr@rosenauer.org
+
+- update to 2.4 (bnc#720264)
+- removed obsolete mozilla-cairo-lcd.patch
+- rebased patches
+- removed XLIB_SKIP_ARGB_VISUALS=1 from environment in
+  mozilla.sh.in (bnc#680758)
+
+-------------------------------------------------------------------
+Wed Sep 14 07:07:13 UTC 2011 - wr@rosenauer.org
+
+- add dbus-1-glib-devel to BuildRequires (not pulled in
+  automatically with 12.1)
+
+-------------------------------------------------------------------

calling whatdependson for 11.4-i586


Old:
----
  l10n-2.3.3.tar.bz2
  mozilla-cairo-lcd.patch
  seamonkey-2.3.3-source.tar.bz2

New:
----
  l10n-2.4.tar.bz2
  seamonkey-2.4-source.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ seamonkey.spec ++++++
--- /var/tmp/diff_new_pack.9TlcL3/_old	2011-09-28 17:28:46.000000000 +0200
+++ /var/tmp/diff_new_pack.9TlcL3/_new	2011-09-28 17:28:46.000000000 +0200
@@ -20,12 +20,12 @@
 
 
 Name:           seamonkey
-BuildRequires:  Mesa-devel autoconf213 fdupes gcc-c++ hunspell-devel libgnomeui-devel libidl-devel libiw-devel libnotify-devel libproxy-devel nss-shared-helper-devel python startup-notification-devel unzip update-desktop-files yasm zip
+BuildRequires:  Mesa-devel autoconf213 dbus-1-glib-devel fdupes gcc-c++ hunspell-devel libgnomeui-devel libidl-devel libiw-devel libnotify-devel libproxy-devel nss-shared-helper-devel python startup-notification-devel unzip update-desktop-files yasm zip
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Provides:       web_browser
-Version:        2.3.3
-Release:        0.<RELEASE2>
-%define releasedate 2011090700
+Version:        2.4
+Release:        1.<RELEASE2>
+%define releasedate 2011092200
 Summary:        The successor of the Mozilla Application Suite
 Url:            http://www.mozilla.org/projects/seamonkey
 Group:          Productivity/Networking/Web/Browsers
@@ -43,7 +43,6 @@
 Patch1:         mozilla-nongnome-proxies.patch
 Patch2:         mozilla-prefer_plugin_pref.patch
 Patch3:         mozilla-shared-nss-db.patch
-Patch4:         mozilla-cairo-lcd.patch
 Patch5:         mozilla-language.patch
 Patch7:         mozilla-cairo-return.patch
 Patch8:         mozilla-ntlm-full-path.patch
@@ -146,7 +145,6 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 %patch5 -p1
 %patch7 -p1
 %patch8 -p1
@@ -324,6 +322,7 @@
 %dir %{progdir}/distribution/extensions/
 #%exclude %{progdir}/distribution/extensions/debugQA@mozilla.org.xpi
 %{progdir}/chrome/icons
+%{progdir}/hyphenation/
 %{progdir}/extensions/modern@themes.mozilla.org.xpi
 %{progdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
 #%{progdir}/greprefs/

++++++ compare-locales.tar.bz2 ++++++

++++++ create-tar.sh ++++++
--- /var/tmp/diff_new_pack.9TlcL3/_old	2011-09-28 17:28:47.000000000 +0200
+++ /var/tmp/diff_new_pack.9TlcL3/_new	2011-09-28 17:28:47.000000000 +0200
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 BRANCH="releases/comm-release"
-RELEASE_TAG="SEAMONKEY_2_3_3_RELEASE"
-VERSION="2.3.3"
+RELEASE_TAG="SEAMONKEY_2_4_RELEASE"
+VERSION="2.4"
 
 echo "cloning $BRANCH..."
 hg clone http://hg.mozilla.org/$BRANCH seamonkey

++++++ l10n-2.3.3.tar.bz2 -> l10n-2.4.tar.bz2 ++++++
old-versions/11.4/UPDATES/all/seamonkey/l10n-2.3.3.tar.bz2 11.4/seamonkey/l10n-2.4.tar.bz2 differ: char 11, line 1

++++++ mozilla-cairo-return.patch ++++++
--- /var/tmp/diff_new_pack.9TlcL3/_old	2011-09-28 17:28:47.000000000 +0200
+++ /var/tmp/diff_new_pack.9TlcL3/_new	2011-09-28 17:28:47.000000000 +0200
@@ -1,6 +1,6 @@
 # HG changeset patch
 # User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent e36e1a20cb5e1ba0e4bc3facac58029544d92e0a
+# Parent 43cb27a012f2532add0e9791c1b5a7d0c3b03f9b
 Bug 631155 - undefined return value in function '_cairo_surface_wrapper_flush'
 
 diff --git a/gfx/cairo/cairo/src/cairo-surface-wrapper.c b/gfx/cairo/cairo/src/cairo-surface-wrapper.c

++++++ mozilla-language.patch ++++++
--- /var/tmp/diff_new_pack.9TlcL3/_old	2011-09-28 17:28:47.000000000 +0200
+++ /var/tmp/diff_new_pack.9TlcL3/_new	2011-09-28 17:28:47.000000000 +0200
@@ -1,48 +1,48 @@
 # HG changeset patch
 # User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent db620d83124746201970dcf50c661957df979eca
+# Parent 0d6917b8f28f6e0398dbf329dda4932ba4f997c2
 Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE
 
 diff --git a/intl/locale/src/nsLocaleService.cpp b/intl/locale/src/nsLocaleService.cpp
 --- a/intl/locale/src/nsLocaleService.cpp
 +++ b/intl/locale/src/nsLocaleService.cpp
-@@ -181,16 +181,17 @@ nsLocaleService::nsLocaleService(void)
-         }
- 
+@@ -160,16 +160,17 @@ nsLocaleService::nsLocaleService(void)
+     nsRefPtr<nsLocale> resultLocale(new nsLocale());
+     NS_ENSURE_TRUE(resultLocale, );
  
  #ifdef MOZ_WIDGET_QT
-         const char* lang = QLocale::system().name().toAscii();
+     const char* lang = QLocale::system().name().toAscii();
  #else
-         // Get system configuration
-         const char* lang = getenv("LANG");
-+        const char* language = getenv("LANGUAGE");
+     // Get system configuration
+     const char* lang = getenv("LANG");
++    const char* language = getenv("LANGUAGE");
  #endif
  
-         for( i = 0; i < LocaleListLength; i++ ) {
-             nsresult result;
-             // setlocale( , "") evaluates LC_* and LANG
-             char* lc_temp = setlocale(posix_locale_category[i], "");
-             CopyASCIItoUTF16(LocaleList[i], category);
-             category_platform = category;
-@@ -206,16 +207,21 @@ nsLocaleService::nsLocaleService(void)
-                 else {
-                     CopyASCIItoUTF16(lang, platformLocale);
-                     result = posixConverter->GetXPLocale(lang, xpLocale);
-                 }
-             }
-             if (NS_FAILED(result)) {
-                 return;
+     nsAutoString xpLocale, platformLocale;
+     nsAutoString category, category_platform;
+     int i;
+ 
+     for( i = 0; i < LocaleListLength; i++ ) {
+         nsresult result;
+@@ -188,16 +189,21 @@ nsLocaleService::nsLocaleService(void)
+             } else {
+                 CopyASCIItoUTF16(lang, platformLocale);
+                 result = nsPosixLocale::GetXPLocale(lang, xpLocale);
              }
-+            // LANGUAGE is overriding LC_MESSAGES
-+            if (i == LC_MESSAGES && language && *language) {
-+                CopyASCIItoUTF16(language, platformLocale);
-+                result = posixConverter->GetXPLocale(language, xpLocale);
-+            }
-             resultLocale->AddCategory(category, xpLocale);
-             resultLocale->AddCategory(category_platform, platformLocale);
          }
-         mSystemLocale = do_QueryInterface(resultLocale);
-         mApplicationLocale = do_QueryInterface(resultLocale);
-     }  // if ( NS_SUCCEEDED )...
+         if (NS_FAILED(result)) {
+             return;
+         }
++        // LANGUAGE is overriding LC_MESSAGES
++        if (i == LC_MESSAGES && language && *language) {
++          CopyASCIItoUTF16(language, platformLocale);
++          result = nsPosixLocale::GetXPLocale(language, xpLocale);
++        }
+         resultLocale->AddCategory(category, xpLocale);
+         resultLocale->AddCategory(category_platform, platformLocale);
+     }
+     mSystemLocale = do_QueryInterface(resultLocale);
+     mApplicationLocale = do_QueryInterface(resultLocale);
         
  #endif // XP_UNIX
+ #ifdef XP_OS2

++++++ mozilla-shared-nss-db.patch ++++++
--- /var/tmp/diff_new_pack.9TlcL3/_old	2011-09-28 17:28:47.000000000 +0200
+++ /var/tmp/diff_new_pack.9TlcL3/_new	2011-09-28 17:28:47.000000000 +0200
@@ -7,7 +7,7 @@
 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
 --- a/config/autoconf.mk.in
 +++ b/config/autoconf.mk.in
-@@ -582,16 +582,20 @@ MOZ_ALSA_LIBS           = @MOZ_ALSA_LIBS
+@@ -579,16 +579,20 @@ MOZ_ALSA_LIBS           = @MOZ_ALSA_LIBS
  
  GLIB_CFLAGS	= @GLIB_CFLAGS@
  GLIB_LIBS	= @GLIB_LIBS@
@@ -31,7 +31,7 @@
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -8507,16 +8507,31 @@ AC_SUBST(QCMS_LIBS)
+@@ -8625,16 +8625,31 @@ AC_SUBST(QCMS_LIBS)
  
  dnl ========================================================
  dnl HarfBuzz
@@ -66,7 +66,7 @@
 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
 --- a/security/manager/ssl/src/Makefile.in
 +++ b/security/manager/ssl/src/Makefile.in
-@@ -114,19 +114,20 @@ CSRCS += md4.c
+@@ -114,12 +114,14 @@ CSRCS += md4.c
  
  
  EXTRA_DEPS = $(NSS_DEP_LIBS)
@@ -77,14 +77,8 @@
  # so that Mozilla's nss.h is used, not glibc's
 -LOCAL_INCLUDES += $(NSS_CFLAGS)
 +LOCAL_INCLUDES += $(NSS_CFLAGS) $(NSSHELPER_CFLAGS)
- 
- EXTRA_DSO_LDOPTS += \
- 		$(MOZ_UNICHARUTIL_LIBS) \
- 		$(MOZ_COMPONENT_LIBS) \
- 		$(MOZ_JS_LIBS) \
-+		$(NSSHELPER_LIBS) \
- 		$(NSS_LIBS) \
- 		$(NULL)
++
++EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS)
  
  include $(topsrcdir)/config/rules.mk
  
@@ -115,7 +109,7 @@
  
  #include "nsNetUtil.h"
  #include "nsAppDirectoryServiceDefs.h"
-@@ -1733,18 +1740,34 @@ nsNSSComponent::InitializeNSS(PRBool sho
+@@ -1761,18 +1768,34 @@ nsNSSComponent::InitializeNSS(PRBool sho
      ConfigureInternalPKCS11Token();
  
      // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
@@ -128,11 +122,11 @@
 -                                         SECMOD_DB, init_flags);
 +    SECStatus init_rv = SECFailure;
 +#ifdef MOZ_ENABLE_NSSHELPER
-+    if (PR_GetEnv("MOZ_SM_NO_NSSHELPER")) {
++    if (PR_GetEnv("MOZ_XRE_NO_NSSHELPER")) {
 +      init_rv = ::NSS_Initialize(profileStr.get(), "", "",
 +                                 SECMOD_DB, init_flags);
 +    } else {
-+      init_rv = ::nsshelp_open_db ("seamonkey", profileStr.get(), init_flags);
++      init_rv = ::nsshelp_open_db ("SeaMonkey", profileStr.get(), init_flags);
 +
 +      if (init_rv != SECSuccess) {
 +        PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS using nsshelp_open_db in %s\n", profileStr.get()));

++++++ mozilla.sh.in ++++++
--- /var/tmp/diff_new_pack.9TlcL3/_old	2011-09-28 17:28:47.000000000 +0200
+++ /var/tmp/diff_new_pack.9TlcL3/_new	2011-09-28 17:28:47.000000000 +0200
@@ -75,9 +75,6 @@
 LD_LIBRARY_PATH=$MOZ_DIST_LIB${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 export LD_LIBRARY_PATH
 
-# ignore composite extension (needed for Flash)
-export XLIB_SKIP_ARGB_VISUALS=1
-
 # needed for SUN Java under Xorg >= 7.2
 export LIBXCB_ALLOW_SLOPPY_LOCK=1
 

++++++ seamonkey-2.3.3-source.tar.bz2 -> seamonkey-2.4-source.tar.bz2 ++++++
old-versions/11.4/UPDATES/all/seamonkey/seamonkey-2.3.3-source.tar.bz2 11.4/seamonkey/seamonkey-2.4-source.tar.bz2 differ: char 11, line 1

++++++ seamonkey-shared-nss-db.patch ++++++
--- /var/tmp/diff_new_pack.9TlcL3/_old	2011-09-28 17:28:47.000000000 +0200
+++ /var/tmp/diff_new_pack.9TlcL3/_new	2011-09-28 17:28:47.000000000 +0200
@@ -8,7 +8,7 @@
 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
 --- a/config/autoconf.mk.in
 +++ b/config/autoconf.mk.in
-@@ -458,16 +458,20 @@ MOZ_PANGO_LIBS          = @MOZ_PANGO_LIB
+@@ -450,16 +450,20 @@ MOZ_PANGO_LIBS          = @MOZ_PANGO_LIB
  XT_LIBS			= @XT_LIBS@
  
  MOZ_ALSA_LIBS           = @MOZ_ALSA_LIBS@
@@ -32,7 +32,7 @@
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -6761,16 +6761,30 @@ fi
+@@ -6675,16 +6675,30 @@ fi
  AC_SUBST(MOZ_CAIRO_LIBS)
  
  dnl qcms
@@ -66,7 +66,7 @@
 diff --git a/suite/app/Makefile.in b/suite/app/Makefile.in
 --- a/suite/app/Makefile.in
 +++ b/suite/app/Makefile.in
-@@ -105,16 +105,17 @@ endif
+@@ -93,16 +93,17 @@ endif
  
  APP_XPCOM_LIBS = $(XPCOM_GLUE_LDOPTS)
  
@@ -78,9 +78,9 @@
 +	$(NSSHELPER_LIBS) \
  	$(NULL)
  
- ifdef BUILD_STATIC_LIBS
- LIBS += \
- 	$(MOZ_JS_LIBS) \
- 	$(TK_LIBS) \
- 	$(NULL)
+ ifdef MOZ_JPROF
+ LIBS += -ljprof
+ endif
  
+ ifdef MOZ_ENABLE_DBUS
+ LIBS += $(MOZ_DBUS_GLIB_LIBS)


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)