kompozer-0.8b3-12: updating revision

1 files changed, 41 insertions, 31 deletions

diff --git a/pcr/kompozer/PKGBUILD b/pcr/kompozer/PKGBUILD
index 7b556e166..a65fb3e3b 100644
--- a/pcr/kompozer/PKGBUILD
+++ b/pcr/kompozer/PKGBUILD
@@ -1,59 +1,69 @@
-# Contributor: peace4all <markspost at rocketmail dot com>
+# Maintainer: Muflone <webreg@vbsimple.net>
+# Contributor: ingamedeo <ingamedeo at gmail dot com>
 # Maintainer : Parabola GNU / Linux-libre <aurelien@cwb.io>
 
 # thanks to tadzio, and techlive for the investigation
 # work and fix included as the NS_IMETHOD_i686.patch
 
+# Sorry for not honouring makepkg.conf (!buildflags)
+# but the source doesn't compile with makepkg's default C/CXXFLAGS
+
 pkgname=kompozer
 pkgver=0.8b3
-pkgrel=10
+pkgrel=12
 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' 'glib2' 'pango' 'pangox-compat' 'nss' 'libxt' 'libidl2' 'gnome-vfs')
 makedepends=('zip' 'pkgconfig')
-source=("http://downloads.sourceforge.net/kompozer/$pkgname-$pkgver-src.tar.bz2" 
-	'kompozer.desktop' 
-	'mozconfig.patch' 
-	'kompozer-libpng15.patch' 
-	'kompozer-libpng14.patch' 
-	'gcc46_default_ctors.patch' 
-	'kompozer_gcc_4.7.patch' 
-	'any_kernel_26_plus.patch'
-	'NS_IMETHOD_i686.patch')
+options=('!buildflags')
+source=("http://downloads.sourceforge.net/kompozer/${pkgname}-${pkgver}-src.tar.bz2" 
+        'kompozer.desktop' 
+        'mozconfig.patch' 
+        'kompozer-libpng15.patch' 
+        'kompozer-libpng14.patch' 
+        'gcc46_default_ctors.patch' 
+        'kompozer_gcc_4.7.patch' 
+        'any_kernel_26_plus.patch'
+        'NS_IMETHOD_i686.patch')
 md5sums=('cd4664ecda908666b19ef0607010c627'
          'ed8edf6817892a38b8b181fc9b2caaea'
-	 '4778f967307cf569089daca843de1df9'
+         '4778f967307cf569089daca843de1df9'
          '4852034f99e7943071946e7eedc6c2f5'
          'd5ba90f7fbaed76f77a6d9717e86f3a5'
          'ad3ec5cbc6677dd712b140148398f58f'
-	 '75b0e1cad65dbeb8feedac5d4f52be32'
+         '75b0e1cad65dbeb8feedac5d4f52be32'
          '58a294356b3e17ad070e4c93180bf0ad'
 	 '186c47586bebf83b9b76d339e3a38c95')
 
 build() {
-  cd "$srcdir/mozilla"
-  	
-	patch -Np0 -i "$srcdir/mozconfig.patch"
-	patch -Np0 -i "$srcdir/kompozer-libpng14.patch"
-	patch -Np0 -i "$srcdir/kompozer-libpng15.patch"
-	patch -Np0 -i "$srcdir/gcc46_default_ctors.patch"
-	patch -Np0 -i "$srcdir/kompozer_gcc_4.7.patch"
-	patch -Np0 -i "$srcdir/any_kernel_26_plus.patch"
-	patch -Np0 -i "$srcdir/NS_IMETHOD_i686.patch"
-
-  make -f client.mk build
+  cd "${srcdir}/mozilla"
+  patch -Np0 -i "${srcdir}/mozconfig.patch"
+  patch -Np0 -i "${srcdir}/kompozer-libpng14.patch"
+  patch -Np0 -i "${srcdir}/kompozer-libpng15.patch"
+  patch -Np0 -i "${srcdir}/gcc46_default_ctors.patch"
+  patch -Np0 -i "${srcdir}/kompozer_gcc_4.7.patch"
+  patch -Np0 -i "${srcdir}/any_kernel_26_plus.patch"
+  patch -Np0 -i "${srcdir}/NS_IMETHOD_i686.patch"
+
+  #make -f client.mk build #If is causing a lot of problem...try to build the package as normally
+  ./configure
+  make
 }
 
 package() {
-  cd "$srcdir/obj-kompozer"
+  cd "${srcdir}/mozilla"
+
+  make DESTDIR=${pkgdir} install
+  # Remove nspr.m4 because it's now provided by nspr package
+  rm "${pkgdir}/usr/share/aclocal/nspr.m4"
+  rmdir "${pkgdir}/usr/share/aclocal"
 
-  make DESTDIR=$pkgdir install
-  install -m755 -dD "$pkgdir/usr/share/applications/"
-  install -m644  "$srcdir/kompozer.desktop" "$pkgdir/usr/share/applications/"
+  install -m755 -dD "${pkgdir}/usr/share/applications/"
+  install -m644  "${srcdir}/kompozer.desktop" "${pkgdir}/usr/share/applications/"
 
-  mkdir -p "$pkgdir/usr/share/pixmaps/"
-  ln -s "/usr/lib/kompozer/icons/mozicon256.png" "$pkgdir/usr/share/pixmaps/kompozer.png"
-  ln -s "/usr/lib/kompozer/icons/mozicon50.xpm" "$pkgdir/usr/share/pixmaps/kompozer.xpm"
+  install -d -m755 "${pkgdir}/usr/share/pixmaps/"
+  ln -s "/usr/lib/kompozer/icons/mozicon256.png" "${pkgdir}/usr/share/pixmaps/kompozer.png"
+  ln -s "/usr/lib/kompozer/icons/mozicon50.xpm" "${pkgdir}/usr/share/pixmaps/kompozer.xpm"
 }