rpms/firefox/FC-3 firefox-1.0-g-application-name.patch, NONE, 1.1 firefox-1.0-remote-intern-atoms.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 firefox.spec, 1.41, 1.42 sources, 1.6, 1.7
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Mar 23 18:59:13 UTC 2005
Update of /cvs/dist/rpms/firefox/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv4794
Modified Files:
.cvsignore firefox.spec sources
Added Files:
firefox-1.0-g-application-name.patch
firefox-1.0-remote-intern-atoms.patch
Log Message:
* Wed Mar 23 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.2-1.3.1
- Firefox 1.0.2
- Fix issues with italic rendering using certain fonts (e.g. Tahoma)
- Add upstream fix to reduce round trips to xserver during remote control
- Add upstream fix to call g_set_application_name
firefox-1.0-g-application-name.patch:
nsAppRunner.cpp | 18 ++++++++++++++++++
1 files changed, 18 insertions(+)
--- NEW FILE firefox-1.0-g-application-name.patch ---
Index: toolkit/xre/nsAppRunner.cpp
===================================================================
RCS file: /cvsroot/mozilla/toolkit/xre/nsAppRunner.cpp,v
retrieving revision 1.68
diff -d -u -p -r1.68 nsAppRunner.cpp
--- toolkit/xre/nsAppRunner.cpp 22 Feb 2005 21:49:43 -0000 1.68
+++ toolkit/xre/nsAppRunner.cpp 28 Feb 2005 04:28:58 -0000
@@ -1456,6 +1456,11 @@ public:
};
#endif
+#ifdef MOZ_WIDGET_GTK2
+#include "prlink.h"
+typedef void (*_g_set_application_name_fn)(const gchar *application_name);
+#endif
+
int xre_main(int argc, char* argv[], const nsXREAppData* aAppData)
{
nsresult rv;
@@ -1598,6 +1603,19 @@ int xre_main(int argc, char* argv[], con
#endif
gtk_init(&gArgc, &gArgv);
+#if defined(MOZ_WIDGET_GTK2)
+ // g_set_application_name () is only defined in glib2.2 and higher.
+ PRLibrary *glib2;
+ _g_set_application_name_fn _g_set_application_name =
+ (_g_set_application_name_fn)PR_FindFunctionSymbolAndLibrary("g_set_application_name", &glib2);
+ if (_g_set_application_name) {
+ _g_set_application_name(gAppData->appName);
+ }
+ if (glib2) {
+ PR_UnloadLibrary(glib2);
+ }
+#endif
+
gtk_widget_set_default_visual(gdk_rgb_get_visual());
gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
#endif /* MOZ_WIDGET_GTK || MOZ_WIDGET_GTK2 */
firefox-1.0-remote-intern-atoms.patch:
gtk/nsGtkMozRemoteHelper.cpp | 45 +++++++++++++++++++++++++---------------
gtk2/nsGtkMozRemoteHelper.cpp | 45 +++++++++++++++++++++++++---------------
xremoteclient/XRemoteClient.cpp | 34 +++++++++++++++++++++++-------
3 files changed, 84 insertions(+), 40 deletions(-)
--- NEW FILE firefox-1.0-remote-intern-atoms.patch ---
? widget/src/gtk/dependentLibs.h
? widget/src/gtk2/dependentLibs.h
? widget/src/xremoteclient/dependentLibs.h
Index: widget/src/gtk/nsGtkMozRemoteHelper.cpp
===================================================================
RCS file: /cvsroot/mozilla/widget/src/gtk/nsGtkMozRemoteHelper.cpp,v
retrieving revision 1.35
diff -d -u -p -r1.35 nsGtkMozRemoteHelper.cpp
--- widget/src/gtk/nsGtkMozRemoteHelper.cpp 18 Apr 2004 22:00:16 -0000 1.35
+++ widget/src/gtk/nsGtkMozRemoteHelper.cpp 16 Feb 2005 05:10:05 -0000
@@ -62,6 +62,20 @@ Atom nsGtkMozRemoteHelper::sMozUserAtom
Atom nsGtkMozRemoteHelper::sMozProfileAtom = 0;
Atom nsGtkMozRemoteHelper::sMozProgramAtom = 0;
+#define ARRAY_LENGTH(array_) (sizeof(array_)/sizeof(array_[0]))
+
+// Minimize the roundtrips to the X-server
+static char *XAtomNames[] = {
+ MOZILLA_VERSION_PROP,
+ MOZILLA_LOCK_PROP,
+ MOZILLA_COMMAND_PROP,
+ MOZILLA_RESPONSE_PROP,
+ MOZILLA_USER_PROP,
+ MOZILLA_PROFILE_PROP,
+ MOZILLA_PROGRAM_PROP
+};
+static Atom XAtoms[ARRAY_LENGTH(XAtomNames)];
+
// XXX get this dynamically
static const char sRemoteVersion[] = "5.0";
@@ -200,23 +214,22 @@ nsGtkMozRemoteHelper::HandlePropertyChan
void
nsGtkMozRemoteHelper::EnsureAtoms(void)
{
- // init our atoms if we need to
- if (!sMozVersionAtom)
- sMozVersionAtom = XInternAtom(GDK_DISPLAY(), MOZILLA_VERSION_PROP, False);
- if (!sMozLockAtom)
- sMozLockAtom = XInternAtom(GDK_DISPLAY(), MOZILLA_LOCK_PROP, False);
- if (!sMozCommandAtom)
- sMozCommandAtom = XInternAtom(GDK_DISPLAY(), MOZILLA_COMMAND_PROP, False);
- if (!sMozResponseAtom)
- sMozResponseAtom = XInternAtom(GDK_DISPLAY(), MOZILLA_RESPONSE_PROP,
- False);
- if (!sMozUserAtom)
- sMozUserAtom = XInternAtom(GDK_DISPLAY(), MOZILLA_USER_PROP, False);
- if (!sMozProfileAtom)
- sMozProfileAtom = XInternAtom(GDK_DISPLAY(), MOZILLA_PROFILE_PROP, False);
- if (!sMozProgramAtom)
- sMozProgramAtom = XInternAtom(GDK_DISPLAY(), MOZILLA_PROGRAM_PROP, False);
+ // init our atoms if we need to
+ static PRBool initialized;
+ if (!initialized) {
+ XInternAtoms(GDK_DISPLAY(), XAtomNames, ARRAY_LENGTH(XAtomNames), False, XAtoms);
+ int i = 0;
+ sMozVersionAtom = XAtoms[i++];
+ sMozLockAtom = XAtoms[i++];
+ sMozCommandAtom = XAtoms[i++];
+ sMozResponseAtom = XAtoms[i++];
+ sMozUserAtom = XAtoms[i++];
+ sMozProfileAtom = XAtoms[i++];
+ sMozProgramAtom = XAtoms[i++];
+
+ initialized = PR_TRUE;
+ }
}
Index: widget/src/gtk2/nsGtkMozRemoteHelper.cpp
===================================================================
RCS file: /cvsroot/mozilla/widget/src/gtk2/nsGtkMozRemoteHelper.cpp,v
retrieving revision 1.5
diff -d -u -p -r1.5 nsGtkMozRemoteHelper.cpp
--- widget/src/gtk2/nsGtkMozRemoteHelper.cpp 18 Apr 2004 22:00:17 -0000 1.5
+++ widget/src/gtk2/nsGtkMozRemoteHelper.cpp 16 Feb 2005 05:10:06 -0000
@@ -65,6 +65,20 @@ Atom nsGtkMozRemoteHelper::sMozUserAtom
Atom nsGtkMozRemoteHelper::sMozProfileAtom = 0;
Atom nsGtkMozRemoteHelper::sMozProgramAtom = 0;
+#define ARRAY_LENGTH(array_) (sizeof(array_)/sizeof(array_[0]))
+
+// Minimize the roundtrips to the X-server
+static char *XAtomNames[] = {
+ MOZILLA_VERSION_PROP,
+ MOZILLA_LOCK_PROP,
+ MOZILLA_COMMAND_PROP,
+ MOZILLA_RESPONSE_PROP,
+ MOZILLA_USER_PROP,
+ MOZILLA_PROFILE_PROP,
+ MOZILLA_PROGRAM_PROP
+};
+static Atom XAtoms[ARRAY_LENGTH(XAtomNames)];
+
// XXX get this dynamically
static const char sRemoteVersion[] = "5.0";
@@ -203,23 +217,22 @@ nsGtkMozRemoteHelper::HandlePropertyChan
void
nsGtkMozRemoteHelper::EnsureAtoms(void)
{
- // init our atoms if we need to
- if (!sMozVersionAtom)
- sMozVersionAtom = XInternAtom(GDK_DISPLAY(), MOZILLA_VERSION_PROP, False);
- if (!sMozLockAtom)
- sMozLockAtom = XInternAtom(GDK_DISPLAY(), MOZILLA_LOCK_PROP, False);
- if (!sMozCommandAtom)
- sMozCommandAtom = XInternAtom(GDK_DISPLAY(), MOZILLA_COMMAND_PROP, False);
- if (!sMozResponseAtom)
- sMozResponseAtom = XInternAtom(GDK_DISPLAY(), MOZILLA_RESPONSE_PROP,
- False);
- if (!sMozUserAtom)
- sMozUserAtom = XInternAtom(GDK_DISPLAY(), MOZILLA_USER_PROP, False);
- if (!sMozProfileAtom)
- sMozProfileAtom = XInternAtom(GDK_DISPLAY(), MOZILLA_PROFILE_PROP, False);
- if (!sMozProgramAtom)
- sMozProgramAtom = XInternAtom(GDK_DISPLAY(), MOZILLA_PROGRAM_PROP, False);
+ // init our atoms if we need to
+ static PRBool initialized;
+ if (!initialized) {
+ XInternAtoms(GDK_DISPLAY(), XAtomNames, ARRAY_LENGTH(XAtomNames), False, XAtoms);
+ int i = 0;
+ sMozVersionAtom = XAtoms[i++];
+ sMozLockAtom = XAtoms[i++];
+ sMozCommandAtom = XAtoms[i++];
+ sMozResponseAtom = XAtoms[i++];
+ sMozUserAtom = XAtoms[i++];
+ sMozProfileAtom = XAtoms[i++];
+ sMozProgramAtom = XAtoms[i++];
+
+ initialized = PR_TRUE;
+ }
}
Index: widget/src/xremoteclient/XRemoteClient.cpp
===================================================================
RCS file: /cvsroot/mozilla/widget/src/xremoteclient/XRemoteClient.cpp,v
retrieving revision 1.15
diff -d -u -p -r1.15 XRemoteClient.cpp
--- widget/src/xremoteclient/XRemoteClient.cpp 18 Apr 2004 22:00:39 -0000 1.15
+++ widget/src/xremoteclient/XRemoteClient.cpp 16 Feb 2005 05:10:06 -0000
@@ -64,6 +64,8 @@
#define MOZILLA_PROFILE_PROP "_MOZILLA_PROFILE"
#define MOZILLA_PROGRAM_PROP "_MOZILLA_PROGRAM"
+#define ARRAY_LENGTH(array_) (sizeof(array_)/sizeof(array_[0]))
+
static PRLogModuleInfo *sRemoteLm = NULL;
XRemoteClient::XRemoteClient()
@@ -93,6 +95,19 @@ XRemoteClient::~XRemoteClient()
NS_IMPL_ISUPPORTS1(XRemoteClient, nsIXRemoteClient)
#endif
+// Minimize the roundtrips to the X-server
+static char *XAtomNames[] = {
+ MOZILLA_VERSION_PROP,
+ MOZILLA_LOCK_PROP,
+ MOZILLA_COMMAND_PROP,
+ MOZILLA_RESPONSE_PROP,
+ "WM_STATE",
+ MOZILLA_USER_PROP,
+ MOZILLA_PROFILE_PROP,
+ MOZILLA_PROGRAM_PROP
+};
+static Atom XAtoms[ARRAY_LENGTH(XAtomNames)];
+
NS_IMETHODIMP
XRemoteClient::Init (void)
{
@@ -106,14 +121,17 @@ XRemoteClient::Init (void)
return NS_ERROR_FAILURE;
// get our atoms
- mMozVersionAtom = XInternAtom(mDisplay, MOZILLA_VERSION_PROP, False);
- mMozLockAtom = XInternAtom(mDisplay, MOZILLA_LOCK_PROP, False);
- mMozCommandAtom = XInternAtom(mDisplay, MOZILLA_COMMAND_PROP, False);
- mMozResponseAtom = XInternAtom(mDisplay, MOZILLA_RESPONSE_PROP, False);
- mMozWMStateAtom = XInternAtom(mDisplay, "WM_STATE", False);
- mMozUserAtom = XInternAtom(mDisplay, MOZILLA_USER_PROP, False);
- mMozProfileAtom = XInternAtom(mDisplay, MOZILLA_PROFILE_PROP, False);
- mMozProgramAtom = XInternAtom(mDisplay, MOZILLA_PROGRAM_PROP, False);
+ XInternAtoms(mDisplay, XAtomNames, ARRAY_LENGTH(XAtomNames), False, XAtoms);
+
+ int i = 0;
+ mMozVersionAtom = XAtoms[i++];
+ mMozLockAtom = XAtoms[i++];
+ mMozCommandAtom = XAtoms[i++];
+ mMozResponseAtom = XAtoms[i++];
+ mMozWMStateAtom = XAtoms[i++];
+ mMozUserAtom = XAtoms[i++];
+ mMozProfileAtom = XAtoms[i++];
+ mMozProgramAtom = XAtoms[i++];
mInitialized = PR_TRUE;
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 2 Oct 2004 04:05:23 -0000 1.4
+++ .cvsignore 23 Mar 2005 18:59:09 -0000 1.5
@@ -1,3 +1,4 @@
firefox-0.9.3-source.tar.bz2
firefox-1.0PR-source.tar.bz2
firefox-0.10.1-source.tar.bz2
+firefox-1.0.2-source.tar.bz2
Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-3/firefox.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- firefox.spec 2 Mar 2005 21:18:20 -0000 1.41
+++ firefox.spec 23 Mar 2005 18:59:09 -0000 1.42
@@ -9,8 +9,8 @@
Summary: Mozilla Firefox Web browser.
Name: firefox
-Version: 1.0.1
-Release: 1.3.2
+Version: 1.0.2
+Release: 1.3.1
Epoch: 0
URL: http://www.mozilla.org/projects/firefox/
License: MPL/LGPL
@@ -58,6 +58,8 @@
Patch104: firefox-1.0-nspr-s390.patch
Patch105: firefox-1.0-useragent.patch
Patch106: firefox-1.0-gtk-system-colors.patch
+Patch107: firefox-1.0-remote-intern-atoms.patch
+Patch108: firefox-1.0-g-application-name.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libpng-devel, libjpeg-devel
@@ -272,6 +274,12 @@
#---------------------------------------------------------------------
%changelog
+* Wed Mar 23 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.2-1.3.1
+- Firefox 1.0.2
+- Fix issues with italic rendering using certain fonts (e.g. Tahoma)
+- Add upstream fix to reduce round trips to xserver during remote control
+- Add upstream fix to call g_set_application_name
+
* Thu Mar 2 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.1-1.3.2
- Remerge firefox-1.0-pango-selection.patch
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 25 Feb 2005 01:36:52 -0000 1.6
+++ sources 23 Mar 2005 18:59:09 -0000 1.7
@@ -1,3 +1,3 @@
b628d5f24a49ab15d1943b7d694edd90 firefox-gnomestripe-0.1.tar.gz
b742f86f641fd59d52acbb30e206195a firefox-1.0-langpacks-3.tar.bz2
-ebaea974fea9460ab7050fff76b41cb1 firefox-1.0.1-source.tar.bz2
+fd1a0dec3e763e93eb45c0c34b399712 firefox-1.0.2-source.tar.bz2
More information about the fedora-cvs-commits
mailing list