SOURCES: nvu-64bit-fixes.patch (NEW), nvu-browser.patch (NEW), nvu...
blekot
blekot at pld-linux.org
Thu Jan 26 18:44:30 CET 2006
Author: blekot Date: Thu Jan 26 17:44:30 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- new
---- Files affected:
SOURCES:
nvu-64bit-fixes.patch (NONE -> 1.1) (NEW), nvu-browser.patch (NONE -> 1.1) (NEW), nvu-pld.patch (NONE -> 1.1) (NEW), nvu-systemnspr.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/nvu-64bit-fixes.patch
diff -u /dev/null SOURCES/nvu-64bit-fixes.patch:1.1
--- /dev/null Thu Jan 26 18:44:30 2006
+++ SOURCES/nvu-64bit-fixes.patch Thu Jan 26 18:44:25 2006
@@ -0,0 +1,71 @@
+--- mozilla/gfx/src/freetype/nsFreeType.cpp.64bit-fixes 2005-09-07 16:54:44.000000000 +0200
++++ mozilla/gfx/src/freetype/nsFreeType.cpp 2005-09-07 16:58:34.000000000 +0200
+@@ -96,7 +96,7 @@ static NS_DEFINE_CID(kCharSetManagerCID,
+ // Define the FreeType2 functions we resolve at run time.
+ // see the comment near nsFreeType2::DoneFace() for more info
+ //
+-#define NS_FT2_OFFSET(f) (int)&((nsFreeType2*)0)->f
++#define NS_FT2_OFFSET(f) (NS_PTR_TO_INT32(&((nsFreeType2*)0)->f))
+ FtFuncList nsFreeType2::FtFuncs [] = {
+ {"FT_Done_Face", NS_FT2_OFFSET(nsFT_Done_Face), PR_TRUE},
+ {"FT_Done_FreeType", NS_FT2_OFFSET(nsFT_Done_FreeType), PR_TRUE},
+--- mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp.64bit-fixes 2004-09-02 01:31:03.000000000 +0200
++++ mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 2005-09-07 16:54:44.000000000 +0200
+@@ -834,8 +834,8 @@ nsHttpConnectionMgr::OnMsgReclaimConnect
+ void
+ nsHttpConnectionMgr::OnMsgUpdateParam(nsresult status, void *param)
+ {
+- PRUint16 name = (PRUint32(param) & 0xFFFF0000) >> 16;
+- PRUint16 value = PRUint32(param) & 0x0000FFFF;
++ PRUint16 name = (NS_PTR_TO_INT32(param) & 0xFFFF0000) >> 16;
++ PRUint16 value = NS_PTR_TO_INT32(param) & 0x0000FFFF;
+
+ switch (name) {
+ case MAX_CONNECTIONS:
+--- mozilla/widget/src/gtk2/nsDragService.cpp.64bit-fixes 2003-10-30 02:48:41.000000000 +0100
++++ mozilla/widget/src/gtk2/nsDragService.cpp 2005-09-07 17:01:45.000000000 +0200
+@@ -838,7 +838,7 @@ nsDragService::GetSourceList(void)
+ (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+ listTarget->target = g_strdup(gMimeListType);
+ listTarget->flags = 0;
+- listTarget->info = (guint)listAtom;
++ listTarget->info = (guint)(NS_PTR_TO_INT32(listAtom));
+ PR_LOG(sDragLm, PR_LOG_DEBUG,
+ ("automatically adding target %s with id %ld\n",
+ listTarget->target, listAtom));
+@@ -877,7 +877,7 @@ nsDragService::GetSourceList(void)
+ (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+ listTarget->target = g_strdup(gTextUriListType);
+ listTarget->flags = 0;
+- listTarget->info = (guint)listAtom;
++ listTarget->info = (guint)NS_PTR_TO_INT32(listAtom);
+ PR_LOG(sDragLm, PR_LOG_DEBUG,
+ ("automatically adding target %s with \
+ id %ld\n", listTarget->target, listAtom));
+@@ -914,7 +914,7 @@ nsDragService::GetSourceList(void)
+ (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+ target->target = g_strdup(flavorStr);
+ target->flags = 0;
+- target->info = (guint)atom;
++ target->info = (guint)NS_PTR_TO_INT32(atom);
+ PR_LOG(sDragLm, PR_LOG_DEBUG,
+ ("adding target %s with id %ld\n",
+ target->target, atom));
+@@ -931,7 +931,7 @@ nsDragService::GetSourceList(void)
+ (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+ plainTarget->target = g_strdup(kTextMime);
+ plainTarget->flags = 0;
+- plainTarget->info = (guint)plainAtom;
++ plainTarget->info = (guint)NS_PTR_TO_INT32(plainAtom);
+ PR_LOG(sDragLm, PR_LOG_DEBUG,
+ ("automatically adding target %s with \
+ id %ld\n", plainTarget->target, plainAtom));
+@@ -948,7 +948,7 @@ nsDragService::GetSourceList(void)
+ (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+ urlTarget->target = g_strdup(gMozUrlType);
+ urlTarget->flags = 0;
+- urlTarget->info = (guint)urlAtom;
++ urlTarget->info = (guint)NS_PTR_TO_INT32(urlAtom);
+ PR_LOG(sDragLm, PR_LOG_DEBUG,
+ ("automatically adding target %s with \
+ id %ld\n", urlTarget->target, urlAtom));
================================================================
Index: SOURCES/nvu-browser.patch
diff -u /dev/null SOURCES/nvu-browser.patch:1.1
--- /dev/null Thu Jan 26 18:44:30 2006
+++ SOURCES/nvu-browser.patch Thu Jan 26 18:44:25 2006
@@ -0,0 +1,17 @@
+--- mozilla/composer/app/profile/all.js.launcher 2005-09-08 17:23:49.000000000 +0200
++++ mozilla/composer/app/profile/all.js 2005-09-08 17:24:24.000000000 +0200
+@@ -943,10 +943,10 @@
+ pref("tipoftheday.openAtStartup", true);
+ pref("pinger.pinged", " ");
+
+-pref("network.protocol-handler.app.http", "/usr/lib/mozilla/mozilla-ext");
+-pref("network.protocol-handler.app.https", "/usr/lib/mozilla/mozilla-ext");
+-pref("network.protocol-handler.app.ftp", "/usr/lib/mozilla/mozilla-ext");
+-pref("network.protocol-handler.app.file", "/usr/lib/mozilla/mozilla-ext");
++pref("network.protocol-handler.app.http", "/usr/bin/www-browser");
++pref("network.protocol-handler.app.https", "/usr/bin/www-browser");
++pref("network.protocol-handler.app.ftp", "/usr/bin/www-browser");
++pref("network.protocol-handler.app.file", "/usr/bin/www-browser");
+
+ pref("spellchecker.enablerealtimespell", false);
+ pref("spellchecker.realtimespell.warning_color", "orange");
================================================================
Index: SOURCES/nvu-pld.patch
diff -u /dev/null SOURCES/nvu-pld.patch:1.1
--- /dev/null Thu Jan 26 18:44:30 2006
+++ SOURCES/nvu-pld.patch Thu Jan 26 18:44:25 2006
@@ -0,0 +1,11 @@
+--- mozilla/composer/app/profile/all.js.mandriva 2005-09-08 17:01:18.000000000 +0200
++++ mozilla/composer/app/profile/all.js 2005-09-08 17:01:44.000000000 +0200
+@@ -126,7 +126,7 @@
+ pref("keyword.enabled", false);
+ pref("general.useragent.locale", "chrome://navigator/locale/navigator.properties");
+ pref("general.useragent.contentlocale", "chrome://navigator-region/locale/region.properties");
+-pref("general.useragent.vendor", "Linspire Inc.");
++pref("general.useragent.vendor", "PLD Linux");
+ pref("general.useragent.vendorSub",
+ #expand __APP_VERSION__
+ );
================================================================
Index: SOURCES/nvu-systemnspr.patch
diff -u /dev/null SOURCES/nvu-systemnspr.patch:1.1
--- /dev/null Thu Jan 26 18:44:30 2006
+++ SOURCES/nvu-systemnspr.patch Thu Jan 26 18:44:25 2006
@@ -0,0 +1,46 @@
+--- mozilla/security/nss/lib/ckfw/builtins/Makefile.systemnspr 2005-03-16 15:44:48.954844037 +0100
++++ mozilla/security/nss/lib/ckfw/builtins/Makefile 2005-03-16 15:40:05.693274512 +0100
+@@ -64,8 +64,8 @@
+ else
+
+ EXTRA_LIBS += \
+- $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
++ -lplc4 \
++ -lplds4 \
+ $(NULL)
+
+ endif
+--- mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile.systemnspr 2005-03-16 15:41:51.644540566 +0100
++++ mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile 2005-03-16 15:42:31.814257185 +0100
+@@ -94,8 +94,8 @@
+ $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
+ $(CRYPTO_LIB) \
+ $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
++ -lplc4 \
++ -lplds4 \
+ $(NULL)
+
+ endif
+--- mozilla/security/coreconf/Linux.mk.systemnspr 2004-02-11 03:33:51.000000000 +0100
++++ mozilla/security/coreconf/Linux.mk 2005-03-16 14:49:35.137467570 +0100
+@@ -152,6 +152,7 @@
+ DSO_LDFLAGS =
+
+ # INCLUDES += -I/usr/include -Y/usr/include/linux
++INCLUDES += `nspr-config --cflags`
+ G++INCLUDES = -I/usr/include/g++
+
+ #
+--- mozilla/gfx/src/gtk/Makefile.in.systemnspr 2003-11-10 13:24:51.000000000 +0100
++++ mozilla/gfx/src/gtk/Makefile.in 2005-03-16 14:16:13.000000000 +0100
+@@ -164,6 +164,7 @@
+
+ ifdef MOZ_ENABLE_GTK2
+ EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \
++ $(LIBS_DIR) \
+ -lgkgfx \
+ -lgfxshared_s \
+ $(GFX_XINERAMA_LIBS) \
================================================================
More information about the pld-cvs-commit
mailing list