Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (0a09378fbe26c8026d0e5d31b4fd6381c8a99958)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (0a09378fbe26c8026d0e5d31b4fd6381c8a99958)
  • Date: Tue, 17 Apr 2007 18:07:31 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

ChangeLog | 3
http/nvu/BUILD | 27 ++++++
http/nvu/DEPENDS | 33 +++++++
http/nvu/DETAILS | 27 ++++++
http/nvu/HISTORY | 19 ++++
http/nvu/INSTALL | 14 +++
http/nvu/PRE_BUILD | 41 +++++++++
http/nvu/desktop/nvu.desktop | 8 +
http/nvu/gfxshared_s.patch | 28 ++++++
http/nvu/nvu | 18 ++++
http/nvu/nvu-1.0-gcc4-1.patch | 135 ++++++++++++++++++++++++++++++
http/nvu/nvu-1.0-glibc-2.4.patch | 53 +++++++++++
http/nvu/nvu-1.0-sources.tar.bz2.sig |binary
http/nvu/security_manager_makefile.diff | 142
++++++++++++++++++++++++++++++++
http/nvu/xprintutil.patch | 14 +++
15 files changed, 562 insertions(+)

New commits:
commit 0a09378fbe26c8026d0e5d31b4fd6381c8a99958
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

nvu: Added Mozilla-based web page editor

diff --git a/ChangeLog b/ChangeLog
index 4d5d147..c72deac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-04-17 Eric Sandall <sandalle AT sourcemage.org>
+ * http/nvu: Added Mozilla-based web page editor
+
2007-04-16 Robin Cook <rcook AT wyrms.net>
* added gnome2-libs/xdg-user-dirs
* added gnome2-libs/xdg-user-dirs-gtk
diff --git a/http/nvu/BUILD b/http/nvu/BUILD
new file mode 100755
index 0000000..fb698f7
--- /dev/null
+++ b/http/nvu/BUILD
@@ -0,0 +1,27 @@
+local NVU_HOME=${INSTALL_ROOT}/usr/lib/nvu &&
+
+OPTS="--disable-mailnews \
+ --disable-installer \
+ --disable-activex \
+ --disable-activex-scripting \
+ --disable-tests \
+ --disable-oji \
+ --disable-necko-disk-cache \
+ --disable-profilesharing \
+ --disable-pedantic \
+ --disable-mathml \
+ --disable-freetype2 \
+ --disable-svg \
+ --disable-ldap \
+ --disable-debug \
+ --enable-reorder \
+ --enable-cpp-rtti \
+ --enable-xft \
+ --enable-single-profile \
+
--enable-extensions=wallet,xml-rpc,xmlextras,pref,universalchardet,editor/cascades,spellcheck
\
+ --enable-necko-protocols=http,ftp,file,jar,viewsource,res,data \
+ --with-pthreads \
+ --with-default-mozilla-five-home=$NVU_HOME \
+ $OPTS" &&
+
+default_build
diff --git a/http/nvu/DEPENDS b/http/nvu/DEPENDS
new file mode 100755
index 0000000..76c7d79
--- /dev/null
+++ b/http/nvu/DEPENDS
@@ -0,0 +1,33 @@
+depends gtk+2 '--enable-toolkit=gtk2 --enable-default-toolkit=gtk2' &&
+depends jpeg '--with-system-jpeg' &&
+depends libidl '--with-libIDL' &&
+depends libpng '--with-system-png' &&
+depends nspr '--with-system-nspr' &&
+depends perl &&
+depends zip &&
+depends zlib '--with-system-zlib' &&
+
+source $GRIMOIRE/FUNCTIONS &&
+
+if check_if_xorg_modular_libs gtk+2; then
+ depends libx11 &&
+ depends libxext &&
+ depends libxft &&
+ depends libxprintutil &&
+ depends libxrender
+fi &&
+
+optional_depends nss \
+ '--enable-crypto' \
+ '--disable-crypto' \
+ 'for encrypted communications support (e.g. https://)' &&
+
+optional_depends libmng \
+ '--with-system-mng' \
+ '--without-system-mng' \
+ 'for MNG picture format support' &&
+
+optional_depends gnome-vfs2 \
+ '' \
+ '--disable-gnomevfs' \
+ 'for smb:// url support (if enabled in gnome-vfs)'
diff --git a/http/nvu/DETAILS b/http/nvu/DETAILS
new file mode 100755
index 0000000..10c0159
--- /dev/null
+++ b/http/nvu/DETAILS
@@ -0,0 +1,27 @@
+ SPELL=nvu
+ VERSION=1.0
+ SOURCE=$SPELL-$VERSION-sources.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
+ SOURCE_URL[0]=http://cvs.nvu.com/download/$SOURCE
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+ WEB_SITE=http://www.nvu.com/
+ KEYWORDS="web http editors"
+ ENTERED=20070417
+ SHORT='GECKO-based web editing environment'
+cat << EOF
+Nvu is the new Web editing environment based on the Mozilla platform and its
Gecko layout engine. Primarily made for Linspire and other Linux flavors,
its cross-platform architecture makes it available on a wide variety of other
platforms.
+Features:
+ * WYSIWYG editing of pages, making web creation as easy as typing a letter
+ with your word processor.
+ * Integrated file management via FTP. Simply login to your web site and
+ navigate through your files, editing web pages on the fly, directly from
+ your site.
+ * Reliable HTML code creation that will work with all of today's most
popular
+ browsers.
+ * Jump between WYSIWYG Editing Mode and HTML using tabs.
+ * Tabbed editing to make working on multiple pages a snap.
+ * Powerful support for forms, tables, and templates.
+ * The easiest-to-use, most powerful Web Authoring System available for
+ Desktop Linux, Microsoft Windows and Apple Macintosh users.
+
+EOF
diff --git a/http/nvu/HISTORY b/http/nvu/HISTORY
new file mode 100644
index 0000000..a5686ec
--- /dev/null
+++ b/http/nvu/HISTORY
@@ -0,0 +1,19 @@
+2007-04-17 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, DEPENDS, PRE_BUILD, BUILD, INSTALL: Created
+ Note that SVG is broken (both cairo and libart_lgpl), so disable it
+ * security_manager_makefile.diff: Copied from mozilla and updated to
+ nvu 1.0
+ * nvu-1.0-gcc4-1.patch: Copied from
http://aur.archlinux.org/packages/nvu-kde/nvu-kde/nvu-1.0-gcc4-1.patch
+ to fix compilation with gcc 4.1.x
+ * nvu-1.0-glibc-2.4.patch: Copied from
http://aur.archlinux.org/packages/nvu-kde/nvu-kde/nvu-1.0-glibc-2.4.patch
+ to fix compilation with glibc 2.4
+ Updated for nvu 1.0
+ * gfxshared_s.patch: Properly link against gfxshared_s
+ From
http://www.redhat.com/archives/fedora-cvs-commits/2005-April/msg00816.html
+ Updated to nvu 1.0
+ * xprintutil.patch: Link against xprintutil
+ Updated to nvu 1.0
+ From
http://www.linuxfromscratch.org/patches/downloads/mozilla/mozilla-1.7.12-gfx_fixes-1.patch
+ * desktop/nvu.desktop: Copied from mozilla and modified for nvu
+ * nvu: Run script copied and modified from firefox
+
diff --git a/http/nvu/INSTALL b/http/nvu/INSTALL
new file mode 100755
index 0000000..0505ca6
--- /dev/null
+++ b/http/nvu/INSTALL
@@ -0,0 +1,14 @@
+default_install &&
+
+#
+# Setup version-agnostic symlink for /usr/lib/nvu
+#
+cd $INSTALL_ROOT/usr/lib &&
+ln -sf nvu-${VERSION} nvu &&
+
+#
+# install script so it loads properly even if MOZILLA_FIVE_HOME is
+# not set or set to a different mozilla/firefox directory
+#
+install -m 755 -o root -g root $SCRIPT_DIRECTORY/$SPELL \
+ $INSTALL_ROOT/usr/bin
diff --git a/http/nvu/PRE_BUILD b/http/nvu/PRE_BUILD
new file mode 100755
index 0000000..684afed
--- /dev/null
+++ b/http/nvu/PRE_BUILD
@@ -0,0 +1,41 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+cp composer/config/mozconfig.linux .mozconfig &&
+
+#
+# Add user optimizations
+#
+sedit "s:#export CFLAGS=.*:export CFLAGS=\"$CFLAGS\":" .mozconfig &&
+sedit "s:#export CXXFLAGS=.*:export CXXFLAGS=\"$CXXFLAGS\":" .mozconfig &&
+
+#
+# Fix compilation with gcc 4.1.x
+#
+message "${MESSAGE_COLOR}Fixing compilation with gcc 4.1.x${DEFAULT_COLOR}"
&&
+patch -p1 < $SCRIPT_DIRECTORY/nvu-1.0-gcc4-1.patch
&&
+
+#
+# Fix compilation with glibc 2.4
+#
+message "${MESSAGE_COLOR}Fixing compilation with glibc 2.4${DEFAULT_COLOR}"
&&
+patch -p1 < $SCRIPT_DIRECTORY/nvu-1.0-glibc-2.4.patch
&&
+
+#
+# Fix linking against gfxshared
+#
+message "${MESSAGE_COLOR}Fix linking against gfxshared_s${DEFAULT_COLOR}"
&&
+patch -p1 < $SCRIPT_DIRECTORY/gfxshared_s.patch
&&
+
+#
+# Fix linking against xprintutil
+#
+message "${MESSAGE_COLOR}Fix linking against xprintutil${DEFAULT_COLOR}" &&
+patch -p1 < $SCRIPT_DIRECTORY/xprintutil.patch &&
+
+#
+# Use the system provided NSS/NSPR libraries
+#
+message "${MESSAGE_COLOR}Use system NSS/NSPR libraries${DEFAULT_COLOR}" &&
+mozilla_remove_nspr_nss &&
+
+message "${MESSAGE_COLOR}Begin building
${SPELL_COLOR}$SPELL${DEFAULT_COLOR}..."
diff --git a/http/nvu/desktop/nvu.desktop b/http/nvu/desktop/nvu.desktop
new file mode 100644
index 0000000..f464eeb
--- /dev/null
+++ b/http/nvu/desktop/nvu.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Nvu
+Exec=nvu
+Icon=/usr/lib/nvu/chrome/icons/default/default.xpm
+Terminal=false
+Type=Application
+Categories=Application;Network;Browsers;
diff --git a/http/nvu/gfxshared_s.patch b/http/nvu/gfxshared_s.patch
new file mode 100644
index 0000000..f96f0b7
--- /dev/null
+++ b/http/nvu/gfxshared_s.patch
@@ -0,0 +1,28 @@
+diff -Naur mozilla.orig/gfx/src/gtk/Makefile.in
mozilla/gfx/src/gtk/Makefile.in
+--- mozilla.orig/gfx/src/gtk/Makefile.in 2007-04-17 12:44:26.861000605
-0700
++++ mozilla/gfx/src/gtk/Makefile.in 2007-04-17 12:45:12.523034576 -0700
+@@ -135,6 +135,8 @@
+ SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)gfxft2_s.$(LIB_SUFFIX)
+ endif
+
++EXTRA_DSO_LDOPTS = $(DIST)/lib/$(LIB_PREFIX)gfxshared_s.$(LIB_SUFFIX)
++
+ include $(topsrcdir)/config/rules.mk
+
+ ifdef MOZ_ENABLE_XINERAMA
+@@ -145,7 +147,6 @@
+ EXTRA_DSO_LDOPTS += \
+ $(LIBS_DIR) \
+ -lgkgfx \
+- -lgfxshared_s \
+ $(GFX_XINERAMA_LIBS) \
+ -lgtksuperwin \
+ $(MOZ_COMPONENT_LIBS) \
+@@ -165,7 +166,6 @@
+ ifdef MOZ_ENABLE_GTK2
+ EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \
+ -lgkgfx \
+- -lgfxshared_s \
+ $(GFX_XINERAMA_LIBS) \
+ $(MOZ_JS_LIBS) \
+ $(MOZ_UNICHARUTIL_LIBS) \
diff --git a/http/nvu/nvu b/http/nvu/nvu
new file mode 100644
index 0000000..c42eadc
--- /dev/null
+++ b/http/nvu/nvu
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# Created by Eric Sandall 2007-04-17
+#
+# This script is here to set the correct LD_LIBRARY_PATH for firefox 1.0+
+# based on the information from this thread:
+# http://lists.freebsd.org/pipermail/freebsd-gnome/2004-October/008443.html
+#
+
+export LD_LIBRARY_PATH=/usr/lib/nvu
+remote=""
+if /usr/lib/nvu/nvu-bin -remote "ping()" > /dev/null 2>&1 ; then
+ if [ -z "$@" ] ; then
+ remote='-remote xfeDoCommand(openBrowser)'
+ fi
+fi
+
+/usr/lib/nvu/nvu-bin $remote $@
diff --git a/http/nvu/nvu-1.0-gcc4-1.patch b/http/nvu/nvu-1.0-gcc4-1.patch
new file mode 100644
index 0000000..ff58d9b
--- /dev/null
+++ b/http/nvu/nvu-1.0-gcc4-1.patch
@@ -0,0 +1,135 @@
+diff -ur mozilla-orig/security/nss/lib/pki1/oiddata.h
mozilla/security/nss/lib/pki1/oiddata.h
+--- mozilla-orig/security/nss/lib/pki1/oiddata.h 2005-03-13
19:12:25.000000000 -0500
++++ mozilla/security/nss/lib/pki1/oiddata.h 2005-03-13 19:15:19.000000000
-0500
+@@ -43,12 +43,6 @@
+ #include "nsspki1t.h"
+ #endif /* NSSPKI1T_H */
+
+-extern const NSSOID nss_builtin_oids[];
+-extern const PRUint32 nss_builtin_oid_count;
+-
+-/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
+-/*extern const PRUint32 nss_attribute_type_alias_count;*/
+-
+ extern const NSSOID *NSS_OID_RFC1274_UID;
+ extern const NSSOID *NSS_OID_RFC1274_EMAIL;
+ extern const NSSOID *NSS_OID_RFC2247_DC;
+diff -ur mozilla-orig/security/nss/lib/pki1/oidgen.perl
mozilla/security/nss/lib/pki1/oidgen.perl
+--- mozilla-orig/security/nss/lib/pki1/oidgen.perl 2005-03-13
19:12:25.000000000 -0500
++++ mozilla/security/nss/lib/pki1/oidgen.perl 2005-03-13 19:15:19.000000000
-0500
+@@ -233,12 +233,6 @@
+ #include "nsspki1t.h"
+ #endif /* NSSPKI1T_H */
+
+-extern const NSSOID nss_builtin_oids[];
+-extern const PRUint32 nss_builtin_oid_count;
+-
+-/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
+-/*extern const PRUint32 nss_attribute_type_alias_count;*/
+-
+ EOD
+ ;
+
+diff -ur mozilla-orig/security/nss/lib/pki1/pki1.h
mozilla/security/nss/lib/pki1/pki1.h
+--- mozilla-orig/security/nss/lib/pki1/pki1.h 2005-03-13 19:12:25.000000000
-0500
++++ mozilla/security/nss/lib/pki1/pki1.h 2005-03-13 19:15:19.000000000
-0500
+@@ -55,7 +55,9 @@
+
+ PR_BEGIN_EXTERN_C
+
+-/* fgmr 19990505 moved these here from oiddata.h */
++extern const NSSOID nss_builtin_oids[];
++extern const PRUint32 nss_builtin_oid_count;
++
+ extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];
+ extern const PRUint32 nss_attribute_type_alias_count;
+
+diff -ur mozilla-orig/xpcom/base/nscore.h mozilla/xpcom/base/nscore.h
+--- mozilla-orig/xpcom/base/nscore.h 2005-07-24 05:07:54.627311840 +0000
++++ mozilla/xpcom/base/nscore.h 2005-07-24 05:13:02.327534296 +0000
+@@ -365,8 +365,9 @@
+ * Use these macros to do 64bit safe pointer conversions.
+ */
+
+-#define NS_PTR_TO_INT32(x) ((char *)(x) - (char *)0)
+-#define NS_INT32_TO_PTR(x) ((void *)((char *)0 + (x)))
++#define NS_PTR_TO_INT32(x) ((PRInt32) (PRWord) (x))
++#define NS_PTR_TO_UINT32(x) ((PRUint32) (PRWord) (x))
++#define NS_INT32_TO_PTR(x) ((void *) (PRWord) (x))
+
+ /*
+ * These macros allow you to give a hint to the compiler about branch
+diff -ur mozilla-orig/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp
mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp
+--- mozilla-orig/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp
2005-07-24 05:07:51.199832896 +0000
++++ mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 2005-07-24
05:13:08.302625944 +0000
+@@ -834,8 +834,8 @@
+ void
+ nsHttpConnectionMgr::OnMsgUpdateParam(nsresult status, void *param)
+ {
+- PRUint16 name = (PRUint32(param) & 0xFFFF0000) >> 16;
+- PRUint16 value = PRUint32(param) & 0x0000FFFF;
++ PRUint16 name = (NS_PTR_TO_UINT32(param) & 0xFFFF0000) >> 16;
++ PRUint16 value = NS_PTR_TO_UINT32(param) & 0x0000FFFF;
+
+ switch (name) {
+ case MAX_CONNECTIONS:
+diff -ur mozilla-orig/widget/src/gtk2/nsDragService.cpp
mozilla/widget/src/gtk2/nsDragService.cpp
+--- mozilla-orig/widget/src/gtk2/nsDragService.cpp 2005-07-24
05:08:57.666728392 +0000
++++ mozilla/widget/src/gtk2/nsDragService.cpp 2005-07-24 05:13:33.910732920
+0000
+@@ -838,7 +838,7 @@
+ (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+ listTarget->target = g_strdup(gMimeListType);
+ listTarget->flags = 0;
+- listTarget->info = (guint)listAtom;
++ listTarget->info = GPOINTER_TO_UINT(listAtom);
+ PR_LOG(sDragLm, PR_LOG_DEBUG,
+ ("automatically adding target %s with id %ld\n",
+ listTarget->target, listAtom));
+@@ -877,7 +877,7 @@
+ (GtkTargetEntry
*)g_malloc(sizeof(GtkTargetEntry));
+ listTarget->target = g_strdup(gTextUriListType);
+ listTarget->flags = 0;
+- listTarget->info = (guint)listAtom;
++ listTarget->info = GPOINTER_TO_UINT(listAtom);
+ PR_LOG(sDragLm, PR_LOG_DEBUG,
+ ("automatically adding target %s with \
+ id %ld\n", listTarget->target,
listAtom));
+@@ -914,7 +930,7 @@
+ (GtkTargetEntry
*)g_malloc(sizeof(GtkTargetEntry));
+ target->target = g_strdup(flavorStr);
+ target->flags = 0;
+- target->info = (guint)atom;
++ target->info = GPOINTER_TO_UINT(atom);
+ PR_LOG(sDragLm, PR_LOG_DEBUG,
+ ("adding target %s with id %ld\n",
+ target->target, atom));
+@@ -931,7 +947,7 @@
+ (GtkTargetEntry
*)g_malloc(sizeof(GtkTargetEntry));
+ plainTarget->target = g_strdup(kTextMime);
+ plainTarget->flags = 0;
+- plainTarget->info = (guint)plainAtom;
++ plainTarget->info = GPOINTER_TO_UINT(plainAtom);
+ PR_LOG(sDragLm, PR_LOG_DEBUG,
+ ("automatically adding target %s with \
+ id %ld\n", plainTarget->target,
plainAtom));
+@@ -948,7 +964,7 @@
+ (GtkTargetEntry
*)g_malloc(sizeof(GtkTargetEntry));
+ urlTarget->target = g_strdup(gMozUrlType);
+ urlTarget->flags = 0;
+- urlTarget->info = (guint)urlAtom;
++ urlTarget->info = GPOINTER_TO_UINT(urlAtom);
+ PR_LOG(sDragLm, PR_LOG_DEBUG,
+ ("automatically adding target %s with \
+ id %ld\n", urlTarget->target, urlAtom));
+diff -urN mozilla-orig/gfx/src/freetype/nsFreeType.cpp
mozilla/gfx/src/freetype/nsFreeType.cpp
+--- mozilla-orig/gfx/src/freetype/nsFreeType.cpp 2005-10-22
13:17:35.151589250 -0500
++++ mozilla/gfx/src/freetype/nsFreeType.cpp 2005-10-22 13:23:07.672370500
-0500
+@@ -96,7 +96,7 @@
+ // 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},
diff --git a/http/nvu/nvu-1.0-glibc-2.4.patch
b/http/nvu/nvu-1.0-glibc-2.4.patch
new file mode 100644
index 0000000..da92f8d
--- /dev/null
+++ b/http/nvu/nvu-1.0-glibc-2.4.patch
@@ -0,0 +1,53 @@
+diff -Naur mozilla.orig/xpcom/base/nsStackFrameUnix.cpp
mozilla/xpcom/base/nsStackFrameUnix.cpp
+--- mozilla.orig/xpcom/base/nsStackFrameUnix.cpp 2007-04-17
12:44:25.090270741 -0700
++++ mozilla/xpcom/base/nsStackFrameUnix.cpp 2007-04-17 13:09:43.169678209
-0700
+@@ -77,9 +77,20 @@
+ #endif // MOZ_DEMANGLE_SYMBOLS
+ }
+
++#if defined(linux) // Linux
++#if (__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 3)) // use
glibc backtrace()
++#include <execinfo.h>
++void DumpStackToFile(FILE* aStream)
++{
++ void *array[20];
++ size_t size;
+
+-#if defined(linux) && defined(__GLIBC__) && (defined(__i386) ||
defined(PPC)) // i386 or PPC Linux stackwalking code
++ fflush(aStream);
++ size = backtrace (array, 20);
++ backtrace_symbols_fd (array, size, fileno(aStream));
++}
+
++#elif defined(__GLIBC__) && (defined(__i386) || defined(PPC)) // old style
i386 or PPC Linux stackwalking code
+ #include <setjmp.h>
+ //
+
+@@ -135,6 +146,13 @@
+ }
+ }
+
++#else // not implemented
++void DumpStackToFile(FILE* aStream)
++{
++ fprintf(aStream, "Info: Stacktrace not implemented for this Linux
platform\n");
++}
++#endif // Linux
++
+ #elif defined(__sun) && (defined(__sparc) || defined(sparc) ||
defined(__i386) || defined(i386))
+
+ /*
+diff -Naur mozilla.orig/xpcom/base/nsTraceRefcntImpl.cpp
mozilla/xpcom/base/nsTraceRefcntImpl.cpp
+--- mozilla.orig/xpcom/base/nsTraceRefcntImpl.cpp 2007-04-17
12:44:25.089270894 -0700
++++ mozilla/xpcom/base/nsTraceRefcntImpl.cpp 2007-04-17 13:09:43.174677447
-0700
+@@ -857,8 +857,8 @@
+ }
+
+ // WIN32 x86 stack walking code
+-// i386 or PPC Linux stackwalking code or Solaris
+-#elif (defined(linux) && defined(__GLIBC__) && (defined(__i386) ||
defined(PPC))) || (defined(__sun) && (defined(__sparc) || defined(sparc) ||
defined(__i386) || defined(i386)))
++// Linux stackwalking code or Solaris
++#elif (defined(linux) && defined(__GLIBC__)) || (defined(__sun) &&
(defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386)))
+ #include "nsStackFrameUnix.h"
+ void
+ nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
diff --git a/http/nvu/nvu-1.0-sources.tar.bz2.sig
b/http/nvu/nvu-1.0-sources.tar.bz2.sig
new file mode 100644
index 0000000..99b539a
Binary files /dev/null and b/http/nvu/nvu-1.0-sources.tar.bz2.sig differ
diff --git a/http/nvu/security_manager_makefile.diff
b/http/nvu/security_manager_makefile.diff
new file mode 100644
index 0000000..27f978b
--- /dev/null
+++ b/http/nvu/security_manager_makefile.diff
@@ -0,0 +1,142 @@
+diff -Naur mozilla.orig/security/manager/Makefile.in
mozilla/security/manager/Makefile.in
+--- mozilla.orig/security/manager/Makefile.in 2007-04-17 11:54:03.749195266
-0700
++++ mozilla/security/manager/Makefile.in 2007-04-17 11:54:05.041998040
-0700
+@@ -30,35 +30,6 @@
+ MODULE = psm
+
+ PACKAGE_FILE = psm.pkg
+-PACKAGE_VARS += \
+- NSS3_LIB \
+- SMIME3_LIB \
+- SSL3_LIB \
+- SOFTOKEN3_LIB \
+- SOFTOKEN3_CHK \
+- LOADABLE_ROOT_MODULE \
+- HAVE_FREEBL_MODULES \
+- $(NULL)
+-
+-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
+-
+-NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
+-SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
+-SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
+-SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
+-SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
+-
+-ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
+-ifeq (,$(filter i86pc ia64,$(OS_TEST)))
+-ifndef HAVE_64BIT_OS
+-HAVE_FREEBL_MODULES = 1
+-FREEBL_PURE32_MODULE = libfreebl_pure32_3$(DLL_SUFFIX)
+-FREEBL_PURE32_CHK = libfreebl_pure32_3.chk
+-FREEBL_HYBRID_MODULE = libfreebl_hybrid_3$(DLL_SUFFIX)
+-FREEBL_HYBRID_CHK = libfreebl_hybrid_3.chk
+-endif
+-endif
+-endif
+
+ # NSS makefiles are not safe for parallel execution.
+ DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
+@@ -120,19 +91,7 @@
+ include $(topsrcdir)/config/rules.mk
+
+ # Attempt to properly handle NSS' refusal to implement a dependency system
+-export:: .nss.cleaned
+-
+-.nss.cleaned: .nss.checkout
+- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
+- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
+-ifndef SKIP_CHK
+- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
clean
+- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign
$(DEFAULT_GMAKE_FLAGS) clean
+-endif
+- touch $@
+-
+-.nss.checkout:
+- touch $(srcdir)/$@
++export::
+
+ dependclean export packages chrome::
+ $(MAKE) -C boot $@
+@@ -143,48 +102,6 @@
+
+ libs::
+ $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
+-ifeq ($(OS_ARCH),WINNT)
+- cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX)
$(LIB_PREFIX)dbm.$(LIB_SUFFIX)
+-else
+- cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX)
$(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
+-endif
+- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
+-ifndef SKIP_CHK
+- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
+- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign
$(DEFAULT_GMAKE_FLAGS)
+-endif
+-ifndef DISABLE_DIST_GRE
+- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST)
+-ifndef SKIP_CHK
+- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST)
+-endif
+- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST)
+- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST)
+- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST)
+- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST)
+-ifdef HAVE_FREEBL_MODULES
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST)
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST)
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST)
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST)
+-endif
+-endif
+-ifndef _SKIP_OLD_GRE_INSTALL
+- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
+-ifndef SKIP_CHK
+- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
+-endif
+- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
+- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
+- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
+- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
+-ifdef HAVE_FREEBL_MODULES
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
+-endif
+-endif
+ $(MAKE) -C boot $@
+ $(MAKE) -C ssl $@
+ ifdef MOZ_XUL
+@@ -192,20 +109,6 @@
+ endif
+
+ install::
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE)
$(DESTDIR)$(mozappdir)
+-ifndef SKIP_CHK
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK)
$(DESTDIR)$(mozappdir)
+-endif
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB)
$(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
+-ifdef HAVE_FREEBL_MODULES
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK)
$(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE)
$(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK)
$(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE)
$(DESTDIR)$(mozappdir)
+-endif
+ $(MAKE) -C boot $@
+ $(MAKE) -C ssl $@
+ ifdef MOZ_XUL
+@@ -219,11 +122,6 @@
+ $(MAKE) -C pki $@
+ endif
+ $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
+- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
+-ifndef SKIP_CHK
+- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
clean
+- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign
$(DEFAULT_GMAKE_FLAGS) clean
+-endif
+
+ echo-requires-recursive::
+ $(MAKE) -C boot $@
diff --git a/http/nvu/xprintutil.patch b/http/nvu/xprintutil.patch
new file mode 100644
index 0000000..1c7b85f
--- /dev/null
+++ b/http/nvu/xprintutil.patch
@@ -0,0 +1,14 @@
+diff -Naur mozilla.orig/gfx/src/gtk/Makefile.in
mozilla/gfx/src/gtk/Makefile.in
+--- mozilla.orig/gfx/src/gtk/Makefile.in 2007-04-17 12:44:26.861000605
-0700
++++ mozilla/gfx/src/gtk/Makefile.in 2007-04-17 13:03:22.151804875 -0700
+@@ -197,9 +197,9 @@
+ endif
+
+ ifdef MOZ_ENABLE_XPRINT
++EXTRA_DSO_LDOPTS += $(DIST)/lib/$(LIB_PREFIX)xprintutil.$(LIB_SUFFIX)
+ DEFINES += -DUSE_XPRINT -DUSE_MOZILLA_TYPES
+ EXTRA_DSO_LDOPTS += \
+- -lxprintutil \
+ $(MOZ_XPRINT_LDFLAGS)
+ endif
+



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (0a09378fbe26c8026d0e5d31b4fd6381c8a99958), Eric Sandall, 04/17/2007

Archive powered by MHonArc 2.6.24.

Top of Page