Date: Friday, June 19, 2015 @ 21:37:24 Author: muflone Revision: 135599
upgpkg: kompozer 0.8b3-16 updpkg kompozer 0.8b3-16 Added: kompozer/trunk/external-nss-for-shlibsign.patch Modified: kompozer/trunk/PKGBUILD ----------------------------------+ PKGBUILD | 13 +++++++++---- external-nss-for-shlibsign.patch | 12 ++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-06-19 19:36:41 UTC (rev 135598) +++ PKGBUILD 2015-06-19 19:37:24 UTC (rev 135599) @@ -11,13 +11,13 @@ pkgname=kompozer pkgver=0.8b3 -pkgrel=15 +pkgrel=16 pkgdesc="A Dreamweaver style WYSIWYG web editor; Nvu unofficial bug-fix release" arch=('x86_64' 'i686') license=('GPL') url="http://www.kompozer.net" depends=('gtk2' 'nss' 'libxt' 'libidl2' 'gnome-vfs' 'desktop-file-utils') -makedepends=('zip' 'pkgconfig' 'pangox-compat') +makedepends=('zip' 'pkgconfig' 'pangox-compat' 'nss') options=('!buildflags') source=("http://downloads.sourceforge.net/kompozer/${pkgname}-${pkgver}-src.tar.bz2" 'kompozer.desktop' @@ -29,7 +29,8 @@ 'any_kernel_26_plus.patch' 'NS_IMETHOD_i686.patch' 'freetype-pango.patch' - 'freetype-xft.patch') + 'freetype-xft.patch' + 'external-nss-for-shlibsign.patch') md5sums=('cd4664ecda908666b19ef0607010c627' 'ed8edf6817892a38b8b181fc9b2caaea' '4778f967307cf569089daca843de1df9' @@ -40,7 +41,8 @@ '58a294356b3e17ad070e4c93180bf0ad' '186c47586bebf83b9b76d339e3a38c95' '53f0a1fecc715db5272b706ecddc880e' - 'bdaaa5b477db7897b0b4cf84cb5737a6') + 'bdaaa5b477db7897b0b4cf84cb5737a6' + '190d5c11dccb28c4b060a93270cc3d26') install="${pkgname}.install" prepare() { @@ -55,6 +57,9 @@ # Patches for moving from freetype to freetype2 packages patch -Np2 -i "${srcdir}/freetype-pango.patch" patch -Np2 -i "${srcdir}/freetype-xft.patch" + # Patch to exclude the integrated nss library to sign + # the binary libraries (currently broken for i686) + patch -Np1 -i "${srcdir}/external-nss-for-shlibsign.patch" } build() { Added: external-nss-for-shlibsign.patch =================================================================== --- external-nss-for-shlibsign.patch (rev 0) +++ external-nss-for-shlibsign.patch 2015-06-19 19:37:24 UTC (rev 135599) @@ -0,0 +1,12 @@ +diff -Naur mozilla.orig/security/nss/cmd/shlibsign/sign.sh mozilla/security/nss/cmd/shlibsign/sign.sh +--- mozilla.orig/security/nss/cmd/shlibsign/sign.sh 2009-05-02 18:41:54.000000000 +0200 ++++ mozilla/security/nss/cmd/shlibsign/sign.sh 2015-06-19 17:46:53.079361603 +0200 +@@ -45,7 +45,7 @@ + SHLIB_PATH=${1}/lib:${4}:$SHLIB_PATH + export SHLIB_PATH + LD_LIBRARY_PATH=${1}/lib:${4}:$LD_LIBRARY_PATH +- export LD_LIBRARY_PATH ++ #export LD_LIBRARY_PATH + DYLD_LIBRARY_PATH=${1}/lib:${4}:$DYLD_LIBRARY_PATH + export DYLD_LIBRARY_PATH + LIBRARY_PATH=${1}/lib:${4}:$LIBRARY_PATH