[csw-devel] SF.net SVN: gar:[6291] csw/mgar/pkg/seamonkey/trunk
wbonnet at users.sourceforge.net
wbonnet at users.sourceforge.net
Sun Sep 13 13:08:13 CEST 2009
Revision: 6291
http://gar.svn.sourceforge.net/gar/?rev=6291&view=rev
Author: wbonnet
Date: 2009-09-13 11:08:13 +0000 (Sun, 13 Sep 2009)
Log Message:
-----------
Upgrade to 1.1.18
Modified Paths:
--------------
csw/mgar/pkg/seamonkey/trunk/Makefile
csw/mgar/pkg/seamonkey/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/seamonkey/trunk/files/SunOS5.mk.diff
csw/mgar/pkg/seamonkey/trunk/files/autoconfig.mk.in.diff
csw/mgar/pkg/seamonkey/trunk/files/legacydb.config.mk.diff
csw/mgar/pkg/seamonkey/trunk/files/legacydb.manifest.mm.diff
csw/mgar/pkg/seamonkey/trunk/files/packager.mk.diff
csw/mgar/pkg/seamonkey/trunk/files/softoken.config.mk.diff
csw/mgar/pkg/seamonkey/trunk/files/softoken.manifest.mm.diff
Modified: csw/mgar/pkg/seamonkey/trunk/Makefile
===================================================================
--- csw/mgar/pkg/seamonkey/trunk/Makefile 2009-09-13 02:36:30 UTC (rev 6290)
+++ csw/mgar/pkg/seamonkey/trunk/Makefile 2009-09-13 11:08:13 UTC (rev 6291)
@@ -1,5 +1,5 @@
GARNAME = seamonkey
-GARVERSION = 1.1.17
+GARVERSION = 1.1.18
CATEGORIES = x11
DISTNAME = $(GARNAME)
@@ -16,38 +16,46 @@
MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$(GARVERSION)/
UPSTREAM_MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/
-PACKAGES = CSWseamonkey
+PACKAGES = CSWseamonkey
CATALOGNAME_CSWseamonkey = $(GARNAME)
SPKG_DESC_CSWseamonkey = $(DESCRIPTION)
-# REQUIRED_PKGS_CSWseamonkey = CSWdbusglib
-# REQUIRED_PKGS_CSWseamonkey += CSWfconfig
-# REQUIRED_PKGS_CSWseamonkey += CSWftype2
-# REQUIRED_PKGS_CSWseamonkey += CSWgconf2
-# REQUIRED_PKGS_CSWseamonkey += CSWglib2
-# REQUIRED_PKGS_CSWseamonkey += CSWgnomevfs2
-# REQUIRED_PKGS_CSWseamonkey += CSWgtk2
-# REQUIRED_PKGS_CSWseamonkey += CSWlibatk
-# REQUIRED_PKGS_CSWseamonkey += CSWlibcairo
-# REQUIRED_PKGS_CSWseamonkey += CSWlibdbus
-# REQUIRED_PKGS_CSWseamonkey += CSWlibgnome
-# REQUIRED_PKGS_CSWseamonkey += CSWlibx11
-# REQUIRED_PKGS_CSWseamonkey += CSWlibxrender
-# REQUIRED_PKGS_CSWseamonkey += CSWpango
-# REQUIRED_PKGS_CSWseamonkey += CSWsqlite3rt
+REQUIRED_PKGS_CSWseamonkey += CSWbonobo2
+REQUIRED_PKGS_CSWseamonkey += CSWfconfig
+REQUIRED_PKGS_CSWseamonkey += CSWftype2
+REQUIRED_PKGS_CSWseamonkey += CSWgconf2
+REQUIRED_PKGS_CSWseamonkey += CSWggettextrt
+REQUIRED_PKGS_CSWseamonkey += CSWglib2
+REQUIRED_PKGS_CSWseamonkey += CSWgnomekeyring
+REQUIRED_PKGS_CSWseamonkey += CSWgnomevfs2
+REQUIRED_PKGS_CSWseamonkey += CSWgtk2
+REQUIRED_PKGS_CSWseamonkey += CSWlibart
+REQUIRED_PKGS_CSWseamonkey += CSWlibatk
+REQUIRED_PKGS_CSWseamonkey += CSWlibbonoboui
+REQUIRED_PKGS_CSWseamonkey += CSWlibcairo
+REQUIRED_PKGS_CSWseamonkey += CSWlibgnome
+REQUIRED_PKGS_CSWseamonkey += CSWlibgnomecanvas
+REQUIRED_PKGS_CSWseamonkey += CSWlibgnomeui
+REQUIRED_PKGS_CSWseamonkey += CSWlibidl
+REQUIRED_PKGS_CSWseamonkey += CSWlibpopt
+REQUIRED_PKGS_CSWseamonkey += CSWlibx11
+REQUIRED_PKGS_CSWseamonkey += CSWlibxft2
+REQUIRED_PKGS_CSWseamonkey += CSWlibxrender
+REQUIRED_PKGS_CSWseamonkey += CSWorbit2
+REQUIRED_PKGS_CSWseamonkey += CSWpango
+REQUIRED_PKGS_CSWseamonkey += CSWsqlite3rt
+REQUIRED_PKGS_CSWseamonkey += CSWzlib
# Defines the list of patches to be applied to the sources
-# PATCHFILES = autoconf.mk.in.diff
+PATCHFILES += autoconf.mk.in.diff
+PATCHFILES += SunOS5.mk.diff
+PATCHFILES += legacydb.manifest.mm.diff
+PATCHFILES += legacydb.config.mk.diff
+PATCHFILES += softoken.manifest.mm.diff
+PATCHFILES += softoken.config.mk.diff
+PATCHFILES += packager.mk.diff
+
# PATCHFILES += configure.diff
-# PATCHFILES += nsPluginsDirUnix.cpp.diff
-# PATCHFILES += packager.mk.diff
-# PATCHFILES += jemalloc.c.diff
-# PATCHFILES += nsMathUtils.h.diff
-# PATCHFILES += file_id.cc.diff
-# PATCHFILES += md5.h.diff
-# PATCHFILES += solaris_lwp.h.diff
-# PATCHFILES += nsNativeApSuportUnix.cpp.diff
-# PATCHFILES += nsExceptionHandler.cpp.diff
# pkg-config options
EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig
@@ -57,12 +65,12 @@
CFLAGS +=-xlibmil -D__solaris__
CFLAGS += -DG_HAVE_ISO_VARARGS
CXXFLAGS += -DG_HAVE_ISO_VARARGS
-CPPFLAGS = -I/opt/csw/include -I/opt/csw/X11/include
-XCFLAGS = -I/opt/csw/include -I/opt/csw/X11/include
+CPPFLAGS = -I/opt/csw/include -I/opt/csw/X11/include -I/opt/csw/include/cairo
+XCFLAGS = -I/opt/csw/include -I/opt/csw/X11/include -I/opt/csw/include/cairo
EXTRA_CONFIGURE_EXPORTS = XCFLAGS
-LDFLAGS+=-L/usr/lib/lwp -L/opt/csw/mozilla/seamonkey/lib -R/opt/csw/mozilla/seamonkey/lib -L/opt/csw/lib -R/opt/csw/lib -lsqlite3
+LDFLAGS+=-L/usr/lib/lwp -L/opt/csw/mozilla/seamonkey/lib -R/opt/csw/mozilla/seamonkey/lib -L/opt/csw/lib -R/opt/csw/lib -L/opt/csw/X11/lib -R/opt/csw/X11/lib -lsqlite3
export PERL CFLAGS CXXFLAGS LDFLAGS
@@ -86,13 +94,13 @@
pre-install:
( if [ ! -d $(WORK_INSTALL)/opt/csw/bin ] ; then mkdir -p $(WORK_INSTALL)/opt/csw/bin ; fi )
- ( cd $(WORK_INSTALL)/opt/csw/bin && ln -sf ../mozilla/seamonkey/bin/seamonkey . )
- ( mkdir -p $(WORK_INSTALL)/opt/csw/share/pixmaps )
- ( cp $(WORK_BUILD)/other-licenses/branding/seamonkey/mozicon128.png $(WORK_INSTALL)/opt/csw/share/pixmaps/seamonkey.png )
- ( mkdir -p $(WORK_INSTALL)/opt/csw/share/applications )
- ( cp $(FILEDIR)/seamonkey.desktop $(WORK_INSTALL)/opt/csw/share/applications/seamonkey.desktop )
- ( mkdir -p $(WORK_INSTALL)/opt/csw/share/gnome/mime-info )
- ( cp $(FILEDIR)/seamonkey.keys $(WORK_INSTALL)/opt/csw/share/gnome/mime-info/seamonkey.keys )
+ ( cd $(WORK_INSTALL)/opt/csw/bin ; rm -f seamonkey ; ln -sf ../mozilla/seamonkey/bin/seamonkey . )
+# ( mkdir -p $(WORK_INSTALL)/opt/csw/share/pixmaps )
+# ( cp $(WORK_BUILD)/other-licenses/branding/seamonkey/mozicon128.png $(WORK_INSTALL)/opt/csw/share/pixmaps/seamonkey.png )
+# ( mkdir -p $(WORK_INSTALL)/opt/csw/share/applications )
+# ( cp $(FILEDIR)/seamonkey.desktop $(WORK_INSTALL)/opt/csw/share/applications/seamonkey.desktop )
+# ( mkdir -p $(WORK_INSTALL)/opt/csw/share/gnome/mime-info )
+# ( cp $(FILEDIR)/seamonkey.keys $(WORK_INSTALL)/opt/csw/share/gnome/mime-info/seamonkey.keys )
post-install:
( gfind $(WORK_INSTALL)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; )
Modified: csw/mgar/pkg/seamonkey/trunk/checksums
===================================================================
--- csw/mgar/pkg/seamonkey/trunk/checksums 2009-09-13 02:36:30 UTC (rev 6290)
+++ csw/mgar/pkg/seamonkey/trunk/checksums 2009-09-13 11:08:13 UTC (rev 6291)
@@ -1 +1,3 @@
-9eba600ba6ca522b8eada9a0a8e890e2 download/seamonkey-1.1.17.source.tar.bz2
+3b03f00259d6897e017254e9dceed493 download/packager.mk.diff
+ef4455becf3a12833dca7dd92854aeaa download/seamonkey-1.1.18.source.tar.bz2
+c815868b27233888ae5623967cc012f5 download/softoken.config.mk.diff
Added: csw/mgar/pkg/seamonkey/trunk/files/SunOS5.mk.diff
===================================================================
--- csw/mgar/pkg/seamonkey/trunk/files/SunOS5.mk.diff (rev 0)
+++ csw/mgar/pkg/seamonkey/trunk/files/SunOS5.mk.diff 2009-09-13 11:08:13 UTC (rev 6291)
@@ -0,0 +1,11 @@
+--- seamonkey.orig/security/coreconf/SunOS5.mk 2009-08-29 23:08:08.804586828 +0200
++++ seamonkey/security/coreconf/SunOS5.mk 2009-08-29 23:08:32.556961245 +0200
+@@ -104,7 +104,7 @@
+ endif
+ endif
+
+-INCLUDES += -I/usr/dt/include -I/usr/openwin/include
++INCLUDES += -I/usr/dt/include -I/opt/csw/X11/include
+
+ RANLIB = echo
+ CPU_ARCH = sparc
Added: csw/mgar/pkg/seamonkey/trunk/files/autoconfig.mk.in.diff
===================================================================
--- csw/mgar/pkg/seamonkey/trunk/files/autoconfig.mk.in.diff (rev 0)
+++ csw/mgar/pkg/seamonkey/trunk/files/autoconfig.mk.in.diff 2009-09-13 11:08:13 UTC (rev 6291)
@@ -0,0 +1,21 @@
+--- seamonkey.orig/config/autoconf.mk.in 2009-09-13 10:26:24.361534256 +0200
++++ seamonkey/config/autoconf.mk.in 2009-09-13 10:29:26.969746616 +0200
+@@ -57,14 +57,14 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ bindir = @bindir@
+-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir = @includedir@
+ libdir = @libdir@
+ datadir = @datadir@
+ mandir = @mandir@
+-idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir = @datadir@/idl
+
+-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
++mozappdir = $(libdir)
++mredir = $(libdir)/mre
+ mrelibdir = $(mredir)/lib
+
+ DIST = $(DEPTH)/dist
Added: csw/mgar/pkg/seamonkey/trunk/files/legacydb.config.mk.diff
===================================================================
--- csw/mgar/pkg/seamonkey/trunk/files/legacydb.config.mk.diff (rev 0)
+++ csw/mgar/pkg/seamonkey/trunk/files/legacydb.config.mk.diff 2009-09-13 11:08:13 UTC (rev 6291)
@@ -0,0 +1,13 @@
+--- seamonkey.orig/security/nss/lib/softoken/legacydb/config.mk 2009-09-12 16:48:35.872144730 +0200
++++ seamonkey/security/nss/lib/softoken/legacydb/config.mk 2009-09-12 16:49:37.894263860 +0200
+@@ -83,6 +83,10 @@
+ # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
+ # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
+ EXTRA_SHARED_LIBS += \
++ -L/opt/csw/lib \
++ -R/opt/csw/lib \
++ -L/opt/csw/X11/lib \
++ -R/opt/csw/X11/lib \
+ -L$(DIST)/lib \
+ -lnssutil3 \
+ -L$(NSPR_LIB_DIR) \
Added: csw/mgar/pkg/seamonkey/trunk/files/legacydb.manifest.mm.diff
===================================================================
--- csw/mgar/pkg/seamonkey/trunk/files/legacydb.manifest.mm.diff (rev 0)
+++ csw/mgar/pkg/seamonkey/trunk/files/legacydb.manifest.mm.diff 2009-09-13 11:08:13 UTC (rev 6291)
@@ -0,0 +1,10 @@
+--- seamonkey.orig/security/nss/lib/softoken/legacydb/manifest.mn 2009-09-12 16:48:43.152291326 +0200
++++ seamonkey/security/nss/lib/softoken/legacydb/manifest.mn 2009-09-12 16:49:12.293669070 +0200
+@@ -48,6 +48,7 @@
+
+ ifdef MOZILLA_CLIENT
+ INCLUDES += -I$(DIST)/include/sqlite3
++INCLUDES += -I/opt/csw/include
+ endif
+
+ CSRCS = \
Added: csw/mgar/pkg/seamonkey/trunk/files/packager.mk.diff
===================================================================
--- csw/mgar/pkg/seamonkey/trunk/files/packager.mk.diff (rev 0)
+++ csw/mgar/pkg/seamonkey/trunk/files/packager.mk.diff 2009-09-13 11:08:13 UTC (rev 6291)
@@ -0,0 +1,12 @@
+diff --speed-large-files --minimal -Nru seamonkey.orig/toolkit/mozapps/installer/packager.mk seamonkey/toolkit/mozapps/installer/packager.mk
+--- seamonkey.orig/toolkit/mozapps/installer/packager.mk 2008-04-28 19:14:12.000000000 +0000
++++ seamonkey/toolkit/mozapps/installer/packager.mk 2008-11-15 20:28:41.679741300 +0000
+@@ -332,7 +332,7 @@
+ endif # MOZ_PKG_MANIFEST
+ ifndef PKG_SKIP_STRIP
+ @echo "Stripping package directory..."
+- @cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME); find . ! -type d \
++ @cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME); gfind . ! -type d \
+ ! -name "*.js" \
+ ! -name "*.xpt" \
+ ! -name "*.gif" \
Added: csw/mgar/pkg/seamonkey/trunk/files/softoken.config.mk.diff
===================================================================
--- csw/mgar/pkg/seamonkey/trunk/files/softoken.config.mk.diff (rev 0)
+++ csw/mgar/pkg/seamonkey/trunk/files/softoken.config.mk.diff 2009-09-13 11:08:13 UTC (rev 6291)
@@ -0,0 +1,13 @@
+--- seamonkey.orig/security/nss/lib/softoken/config.mk 2009-09-12 16:29:40.981589923 +0200
++++ seamonkey/security/nss/lib/softoken/config.mk 2009-09-12 16:40:15.362584742 +0200
+@@ -84,6 +84,10 @@
+ # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
+ # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
+ EXTRA_SHARED_LIBS += \
++ -L/opt/csw/lib \
++ -R/opt/csw/lib \
++ -L/opt/csw/X11/lib \
++ -R/opt/csw/X11/lib \
+ -L$(DIST)/lib \
+ -lnssutil3 \
+ -lsqlite3 \
Added: csw/mgar/pkg/seamonkey/trunk/files/softoken.manifest.mm.diff
===================================================================
--- csw/mgar/pkg/seamonkey/trunk/files/softoken.manifest.mm.diff (rev 0)
+++ csw/mgar/pkg/seamonkey/trunk/files/softoken.manifest.mm.diff 2009-09-13 11:08:13 UTC (rev 6291)
@@ -0,0 +1,10 @@
+--- seamonkey.orig/security/nss/lib/softoken/manifest.mm 2009-09-12 16:29:35.109858462 +0200
++++ seamonkey/security/nss/lib/softoken/manifest.mn 2009-09-12 16:39:33.257884547 +0200
+@@ -49,6 +49,7 @@
+
+ ifdef MOZILLA_CLIENT
+ INCLUDES += -I$(DIST)/include/sqlite3
++INCLUDES += -I/opt/csw/include
+ endif
+
+ EXPORTS = \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list