Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ed897281453db6ce009b8e81ad5ff39ed7b2cf4b
commit ed897281453db6ce009b8e81ad5ff39ed7b2cf4b
Author: Melko <me...@frugalware.org>
Date: Fri Oct 21 19:52:54 2011 +0200
kompozer-0.8b3-5-i686
* util-linux-ng -> util-linux
* add patch to fix build against gcc46
diff --git a/source/gnome-extra/kompozer/FrugalBuild
b/source/gnome-extra/kompozer/FrugalBuild
index d829067..4d6ca9d 100644
--- a/source/gnome-extra/kompozer/FrugalBuild
+++ b/source/gnome-extra/kompozer/FrugalBuild
@@ -3,10 +3,10 @@
pkgname=kompozer
pkgver=0.8b3
-pkgrel=4
+pkgrel=5
pkgdesc="KompoZer is a wysiwyg HTML editor using the Mozilla Composer codebase."
depends=('libstdc++' 'atk' 'pango' 'libxau' 'libxdmcp' 'libxt' 'libxinerama'
'libxi' \
- 'libxrandr' 'libxcursor' 'libxdamage' 'util-linux-ng' 'libidl' 'nss'
'libgnome>=2.32.0' 'popt' 'openssl>=1.0.0' 'libjpeg>=8a')
+ 'libxrandr' 'libxcursor' 'libxdamage' 'util-linux' 'libidl' 'nss'
'libgnome>=2.32.0' 'popt' 'openssl>=1.0.0' 'libjpeg>=8a')
makedepends=('pkgconfig' 'zip')
_F_sourceforge_ext="-src.tar.bz2"
_F_archive_grepv="[0-9]\{3\}"
@@ -15,7 +15,9 @@ options=('scriptlet')
groups=('gnome-extra')
archs=('i686' 'x86_64')
replaces=('nvu')
-sha1sums=('bd355c4e2583b19b45ce17ab4f0ef137a65ba223')
+source=(${source[@]} gcc46_default_ctors.patch)
+sha1sums=('bd355c4e2583b19b45ce17ab4f0ef137a65ba223' \
+ 'ce08e78a064acde89870c363e56d4137c1140029')
_F_desktop_name="Kompozer"
_F_desktop_desc="WYSIWYG Web Editor"
@@ -36,6 +38,10 @@ build() {
Fsed "ac_add_options --with-system-nss" "ac_add_options --without-system-nss"
.mozconfig
Fsed "ac_add_options --with-system-nspr" "ac_add_options --without-system-nspr"
.mozconfig
+ ## should be fixed upstream with next release
+ cp security/coreconf/Linux{2.6.mk,3.0.mk} || Fdie
+ Fpatchall
+
make -f client.mk build || Fdie
cd ../obj-kompozer || Fdie
make DESTDIR=$Fdestdir install || Fdie
diff --git a/source/gnome-extra/kompozer/gcc46_default_ctors.patch
b/source/gnome-extra/kompozer/gcc46_default_ctors.patch
new file mode 100644
index 0000000..7f3fa78
--- /dev/null
+++ b/source/gnome-extra/kompozer/gcc46_default_ctors.patch
@@ -0,0 +1,22 @@
+--- intl/unicharutil/util/nsUnicharUtils.h 2011-05-10 17:02:12.472642196
+0200
++++ intl/unicharutil/util/nsUnicharUtils.h 2011-05-10 17:02:50.656034735
+0200
+@@ -64,6 +64,9 @@
+ : public nsStringComparator
+ {
+ public:
++ nsCaseInsensitiveStringComparator()
++ {
++ }
+ virtual int operator()( const PRUnichar*, const PRUnichar*, PRUint32
aLength ) const;
+ virtual int operator()( PRUnichar, PRUnichar ) const;
+ };
+--- toolkit/xre/nsAppRunner.cpp 2011-05-10
17:26:05.853608464 +0200
++++ toolkit/xre/nsAppRunner.cpp 2011-05-10
17:26:15.079221177 +0200
+@@ -491,6 +491,7 @@
+
+ {
+ public:
++ nsXULAppInfo() {}
+ NS_DECL_ISUPPORTS_INHERITED
+ NS_DECL_NSIXULAPPINFO
+ NS_DECL_NSIXULRUNTIME
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
