jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

xulrunner: update to 2.0.1.

Browse source
This commit is contained in:
Juan RP 2011-05-25 14:46:41 +02:00
parent 56a90266cf
commit 04fff7c0f6
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
srcpkgs/xulrunner/patches/xulrunner-omnijar.patch
View file

@ -468,11 +468,11 @@ diff --git a/js/src/xpconnect/loader/mozJSComponentLoader.cpp b/js/src/xpconnect
diff --git a/modules/libjar/nsJAR.cpp b/modules/libjar/nsJAR.cpp diff --git a/modules/libjar/nsJAR.cpp b/modules/libjar/nsJAR.cpp
--- a/modules/libjar/nsJAR.cpp --- a/modules/libjar/nsJAR.cpp
+++ b/modules/libjar/nsJAR.cpp +++ b/modules/libjar/nsJAR.cpp
@@ -170,26 +170,23 @@ nsJAR::Open(nsIFile* zipFile) @@ -171,26 +171,23 @@ nsJAR::Open(nsIFile* zipFile)
NS_ENSURE_ARG_POINTER(zipFile);
if (mLock) return NS_ERROR_FAILURE; // Already open! if (mLock) return NS_ERROR_FAILURE; // Already open!
mZipFile = zipFile; mZipFile = zipFile;
mOuterZipEntry.Truncate();
mLock = PR_NewLock(); mLock = PR_NewLock();
NS_ENSURE_TRUE(mLock, NS_ERROR_OUT_OF_MEMORY); NS_ENSURE_TRUE(mLock, NS_ERROR_OUT_OF_MEMORY);
@ -499,13 +499,13 @@ diff --git a/modules/libjar/nsJAR.cpp b/modules/libjar/nsJAR.cpp
NS_ENSURE_ARG_POINTER(aZipReader); NS_ENSURE_ARG_POINTER(aZipReader);
NS_ENSURE_ARG_POINTER(aZipEntry); NS_ENSURE_ARG_POINTER(aZipEntry);
@@ -234,23 +231,22 @@ nsJAR::Close() @@ -234,23 +231,22 @@ nsJAR::Close()
mLock = nsnull;
} }
mParsedManifest = PR_FALSE; mParsedManifest = PR_FALSE;
mManifestData.Reset(); mManifestData.Reset();
mGlobalStatus = JAR_MANIFEST_NOT_PARSED; mGlobalStatus = JAR_MANIFEST_NOT_PARSED;
mTotalItemsInManifest = 0; mTotalItemsInManifest = 0;
mOuterZipEntry.Truncate(0);
-#ifdef MOZ_OMNIJAR -#ifdef MOZ_OMNIJAR
- if (mZip == mozilla::OmnijarReader()) { - if (mZip == mozilla::OmnijarReader()) {

20
srcpkgs/xulrunner/template
View file

@ -1,8 +1,8 @@
# Template build file for 'xulrunner'. # Template build file for 'xulrunner'.
pkgname=xulrunner pkgname=xulrunner
_xulver=2.0 _xulver=2.0
#_xulpatchver=0 _xulpatchver=1
_ffver=4.0 _ffver=4.0.1
# Current xulrunner version is available at $wrksrc/config/milestone.txt # Current xulrunner version is available at $wrksrc/config/milestone.txt
if [ -n "${_xulpatchver}" ]; then if [ -n "${_xulpatchver}" ]; then
version=${_xulver}.${_xulpatchver} version=${_xulver}.${_xulpatchver}
@ -17,7 +17,7 @@ distfiles="${MOZILLA_SITE}/firefox/releases/${_ffver}/source/firefox-${_ffver}.s
build_style=custom-install build_style=custom-install
short_desc="XML User Interface Language runtime environment" short_desc="XML User Interface Language runtime environment"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
checksum=78b1e0a66be3604af49b81193e557c27ffaee16b8c26fead052455dd42c9150f checksum=cf3a39877facc229a67760915341fe95095cca647faab3a7adcb70046105199c
long_desc=" long_desc="
XULRunner is a runtime environment for applications using the XULRunner is a runtime environment for applications using the
XML User Interface Language, XUL. It is the successor of the Gecko XML User Interface Language, XUL. It is the successor of the Gecko
@ -92,8 +92,12 @@ Add_dependency build libnotify-devel
do_build() do_build()
{ {
cp -f ${FILESDIR}/mozconfig .mozconfig export CXXFLAGS="$XBPS_CXXFLAGS -fpermissive"
make ${makejobs} -f client.mk build cp -f ${FILESDIR}/mozconfig .mozconfig
if [ -n "$makejobs" ]; then
echo "mk_add_options MOZ_MAKE_FLAGS=\"${makejobs}\"" >> .mozconfig
fi
make -f client.mk build
} }
do_install() do_install()
@ -107,3 +111,9 @@ do_install()
echo "/usr/lib/xulrunner-2.0" > \ echo "/usr/lib/xulrunner-2.0" > \
${DESTDIR}/etc/ld.so.conf.d/xulrunner.conf ${DESTDIR}/etc/ld.so.conf.d/xulrunner.conf
} }
post_stow()
{
msg_normal "Updating dynamic linker shared cache...\n"
ldconfig
}