RE: www/midori problems

["Larson, Timothy E." <TELarson%west.com@localhost>]

> Because EOL style of "ast.po" is CRLF, not LF, so msgfmt will be
> failed to handle it.

OK, that makes sense.

> (for me, midori crashed, not usable).

Do you have python 2.5 installed?  I still can't get 0.2.3 to build on my NB 
5.0.2 system with Python 2.6.  I get to the same point as I did with the 0.1.9 
version, then have the same problem.  I don't know if it's something specific 
to the version of python being used, but if someone using Python 2.5 could try 
these patches, that would be appreciated.



Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/midori/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile    10 Feb 2010 19:17:47 -0000      1.18
+++ Makefile    24 Feb 2010 16:19:42 -0000
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.18 2010/02/10 19:17:47 joerg Exp $

-DISTNAME=      midori-0.1.9
-PKGREVISION=   5
+DISTNAME=      midori-0.2.3
+#PKGREVISION=  5
 CATEGORIES=    www
-MASTER_SITES=  http://archive.xfce.org/src/apps/midori/0.1/
+MASTER_SITES=  http://archive.xfce.org/src/apps/midori/0.2/

 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.twotoasts.de/index.php?/pages/midori_summary.html
@@ -23,6 +23,7 @@

 BUILD_DEPENDS+=                
${PYPKGPREFIX}-docutils>=0.4:../../textproc/py-docutils
 BUILD_DEPENDS+=                librsvg>=2.18:../../graphics/librsvg
+BUILD_DEPENDS+=                unix2dos:../../converters/unix2dos

 DEPENDS+=              gnome-themes-[0-9]*:../../x11/gnome-themes

@@ -49,7 +50,10 @@

 pre-configure:
        ${MV} ${WRKSRC}/midori/marshal.list ${WRKSRC}/midori/marshallocal.list
-       ${MV} ${WRKSRC}/katze/marshal.list ${WRKSRC}/katze/marshallocal.list
+       #${MV} ${WRKSRC}/katze/marshal.list ${WRKSRC}/katze/marshallocal.list
+
+pre-build:
+       dos2unix ${WRKSRC}/po/ast.po

 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/www/midori/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo    6 Aug 2009 06:48:11 -0000       1.7
+++ distinfo    24 Feb 2010 16:19:42 -0000
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.7 2009/08/06 06:48:11 hasso Exp $

-SHA1 (midori-0.1.9.tar.bz2) = d54314f7e0e2714866e0e57dc55f142c2285757c
-RMD160 (midori-0.1.9.tar.bz2) = 9e1d6d18cd16f00119adc739551c6ecbb980b166
-Size (midori-0.1.9.tar.bz2) = 516902 bytes
-SHA1 (patch-aa) = e8b1576dc4b42756d33eb260eab4d7fa88d4117b
+SHA1 (midori-0.2.3.tar.bz2) = 44e2558681d9a31b1c1203064445a2a36ab42a91
+RMD160 (midori-0.2.3.tar.bz2) = ec4823e99e90fe0c4d34b51d825830cde09bab9d
+Size (midori-0.2.3.tar.bz2) = 642642 bytes
+SHA1 (patch-aa) = 1075488c628a2a097860bd87fc0b7c14e22e252f
cvs diff: Diffing patches
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/www/midori/patches/patch-aa,v
retrieving revision 1.1
diff -u -r1.1 patch-aa
--- patches/patch-aa    18 Mar 2009 03:14:11 -0000      1.1
+++ patches/patch-aa    24 Feb 2010 16:19:42 -0000
@@ -1,9 +1,7 @@
-$NetBSD: patch-aa,v 1.1 2009/03/18 03:14:11 snj Exp $
-
---- wscript.orig       2009-03-17 18:29:37.000000000 -0700
-+++ wscript    2009-03-17 18:29:33.000000000 -0700
-@@ -311,7 +311,7 @@ def build (bld):
-             'AUTHORS ChangeLog COPYING EXPAT README TRANSLATE')
+--- wscript.orig       2010-02-20 05:39:23.000000000 -0600
++++ wscript    2010-02-23 11:58:22.000000000 -0600
+@@ -430,7 +430,7 @@
+             'AUTHORS COPYING ChangeLog EXPAT README')

      # Install default configuration
 -    bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + '/', 'data/search')



Tim
-- 
Tim Larson
App Admin, Intercall Production Services