dovecot2 on openbsd
Hi Is there any reason dovecot2 is _not_ on the OpenBSD ports tree? I found that downloading the source from the website build straight away without any patches or anything. I haven't seen this discussed earier on either. Would a port be welcome? :-) -- Hugo Osvaldo Barrera
Re: New multimedia/p5-Data-AMF 0.09 get_flash_videos missing optional dependency
I will look at this post unlock, I have left a todo file in my tree but would appreciate a reminder as well in case I don't notice it for a while :-) Thanks Nigel. Stuart On 2011/01/19 22:26, Nigel Taylor wrote: > multimedia/p5-Data-AMF 0.09 - deserializer for Adobe Action Message Format > > This port is a missing optional dependency for the multimedia/get_flash_videos > port. Used by get_flash_videos when downloading from nbc.com and a few other > sites. Tried on OpenBSD current amd64 using get_flash_videos to download from > nbc.com. Regression tests passed on OpenBSD current amd64, and 4.8 stable > i386. > > Regards > > Nigel Taylor
Re: Time to slow down..
On 2011/01/19 23:57, Vadim Zhukov wrote: > I hope then this update from 09.01 will have opportunity to go in... Please don't take this the wrong way as I don't mean any offense (and although I'm replying to your mail, I mean this to apply to anyone thinking of sending an update at this time) - what in particular does this update bring that would make it important that it makes 4.9, and if it's something that can be narrowed down to a manageable patch, can it be done in a way that's easier to check than a version update? There are hundreds of ports which could be updated (or small fixes made which make for a better user experience) and no way will they all make it, so we need to direct review time towards those diffs that will seriously improve the quality and consistency of the next OpenBSD release with minimal risk, with priority given to things that are likely to benefit a larger number of people. Thanks. Stuart
New multimedia/p5-Data-AMF 0.09 get_flash_videos missing optional dependency
multimedia/p5-Data-AMF 0.09 - deserializer for Adobe Action Message Format This port is a missing optional dependency for the multimedia/get_flash_videos port. Used by get_flash_videos when downloading from nbc.com and a few other sites. Tried on OpenBSD current amd64 using get_flash_videos to download from nbc.com. Regression tests passed on OpenBSD current amd64, and 4.8 stable i386. Regards Nigel Taylor p5-Data-AMF.tgz Description: Binary data
icewm - strange display of icons in taskbar on sparc64
Hello,
icewm on sparc64 has some strange looking icons in the taskbar or at the
upper left corner of windows. The start ("icewm") buttom, the show
desktop, the window list icons also looks strange.
Strange in the meaning of the is some miscoloured background around for
example the normal xterm icon.
Anyone familiar with the icewm code base where those stuff is handled?
Any hints appreciated.
Regards,
Markus
Re: Time to slow down..
On 19 January 2011 г. 22:12:04 Jasper Lievisse Adriaanse wrote:
> Hey,
>
> Since it's that time of the year again, time to slow down.
> So, no more imports from now on.
>
> We'll lock in a few days, so updates/diffs/fixes should be OK'd by AT LEAST
> one of the following people: ajacoutot@ espie@ landry@ naddy@ sthen@ jasper@
>
> And this doesn't mean that it's time to get updates in that have no real added
> value for 4.9...there's still life after the lock ;-)
I hope then this update from 09.01 will have opportunity to go in...
From: Vadim Zhukov
Date: Sun, 9 Jan 2011 21:53:39 +0300 (MSK)
To: ports@openbsd.org
Subject: UPDATE: security/libfwbuilder and security/fwbuilder
Hello all.
This updates security/libfwbuilder and security/fwbuilder to 4.1.3.
Contains a bunch of small fixes, also some our patches commited
upstream. Next version will have those two packages merged, but
author says it will not come early, so it's better to update now.
Tested on i386. Has problems with cheking in RCS, but looks like
it's Qt fault, to be investigated later. Other stuff works fine.
Testing on !i386, OKing and commiting being welcome. :)
(patches should applied in ${PORTSDIR}/security directory)
Index: libfwbuilder/Makefile
===
RCS file: /cvs/ports/security/libfwbuilder/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- libfwbuilder/Makefile 20 Nov 2010 17:22:43 - 1.18
+++ libfwbuilder/Makefile 9 Jan 2011 18:46:24 -
@@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.18 2010/11/20 17:22:43 espie Exp $
COMMENT= libraries for fwbuilder
-DISTNAME= libfwbuilder-4.1.2
+DISTNAME= libfwbuilder-4.1.3
CATEGORIES=net security
-SHARED_LIBS= fwbuilder 15.0 \
- fwcompiler 15.0
+SHARED_LIBS= fwbuilder 16.0 \
+ fwcompiler 16.0
HOMEPAGE= http://www.fwbuilder.org/
@@ -16,7 +16,7 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_DISTFILES_CDROM=Yes
-WANTLIB= m netsnmp stdc++ xml2 xslt z
+WANTLIB= crypto m netsnmp stdc++ xml2 xslt z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
Index: libfwbuilder/distinfo
===
RCS file: /cvs/ports/security/libfwbuilder/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- libfwbuilder/distinfo 11 Oct 2010 20:19:11 - 1.10
+++ libfwbuilder/distinfo 9 Jan 2011 18:46:24 -
@@ -1,5 +1,5 @@
-MD5 (libfwbuilder-4.1.2.tar.gz) = qi99d86o0pSjWULkeve5bg==
-RMD160 (libfwbuilder-4.1.2.tar.gz) = Ijvp5IfBkhRl8BnfVrbet/ABw5Y=
-SHA1 (libfwbuilder-4.1.2.tar.gz) = YuntnUmCicOombCdULfi0S1qZKc=
-SHA256 (libfwbuilder-4.1.2.tar.gz) =
E0Qt9gGVJhEKtWWjUxlpvwUUy8u1RAidAS84bnn4Azc=
-SIZE (libfwbuilder-4.1.2.tar.gz) = 378748
+MD5 (libfwbuilder-4.1.3.tar.gz) = gQ6DKjytxiWRdAP0sZH9og==
+RMD160 (libfwbuilder-4.1.3.tar.gz) = 7I0miYaFQtBepYSjmt3MITFVWnw=
+SHA1 (libfwbuilder-4.1.3.tar.gz) = TGseW67l5Lo2Pej3nIvMJyoGibw=
+SHA256 (libfwbuilder-4.1.3.tar.gz) =
oWV+XOnK7w4Xi5n1dgB2i0/kfK4RWEAMSTO21BrRPxY=
+SIZE (libfwbuilder-4.1.3.tar.gz) = 363194
Index: libfwbuilder/pkg/PLIST
===
RCS file: /cvs/ports/security/libfwbuilder/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- libfwbuilder/pkg/PLIST 11 Oct 2010 20:19:11 - 1.7
+++ libfwbuilder/pkg/PLIST 9 Jan 2011 18:46:24 -
@@ -75,6 +75,7 @@ include/fwb-4/fwbuilder/libfwbuilder-con
include/fwb-4/fwbuilder/libfwbuilder-version.h
include/fwb-4/fwbuilder/physAddress.h
include/fwb-4/fwbuilder/snmp.h
+include/fwb-4/fwbuilder/uint128.h
include/fwb-4/fwcompiler/
include/fwb-4/fwcompiler/BaseCompiler.h
include/fwb-4/fwcompiler/Compiler.h
Index: fwbuilder/Makefile
===
RCS file: /cvs/ports/security/fwbuilder/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- fwbuilder/Makefile 20 Nov 2010 17:22:43 - 1.23
+++ fwbuilder/Makefile 9 Jan 2011 18:46:24 -
@@ -3,7 +3,7 @@
# Consumes more than 512MB on at least i386 when building qrc_MainRes.o
VMEM_WARNING = Yes
-V =4.1.2
+V =4.1.3
COMMENT = firewall GUI
DISTNAME = fwbuilder-$V
CATEGORIES = net security
@@ -46,9 +46,9 @@ LIB_DEPENDS = libfwbuilder-$V:security/l
REGRESS_TARGET =tests
USE_GROFF =Yes
-WANTLIB += c m netsnmp
+WANTLIB += c crypto m netsnmp
WANTLIB += pthread stdc++ util xml2 xslt z
-WANTLIB += QtGui QtNetwork
+WANTLIB += QtDBus QtGui QtNetwork QtXml
WANTLIB += fwcompiler>=14 fwbuilder>=14
FAKE_FLAGS = INSTA
Re: Bugfix update to libev-4.03
On Wed, Jan 19, 2011 at 1:02 PM, David Coppa wrote: > Minor update to libev-4.03, no functional changes. Now with properly bumped minor, since a new function was added (as pointed out by jasper). Ok ? Cheers, David Index: Makefile === RCS file: /cvs/ports/devel/libev/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- Makefile18 Nov 2010 12:18:06 - 1.7 +++ Makefile19 Jan 2011 20:07:53 - @@ -2,12 +2,12 @@ COMMENT = high-performance event loop library -DISTNAME = libev-4.01 +DISTNAME = libev-4.03 CATEGORIES = devel MAINTAINER = David Coppa -SHARED_LIBS= ev 2.0 # 4.0 +SHARED_LIBS= ev 2.1 # 4.0 HOMEPAGE = http://software.schmorp.de/pkg/libev.html MASTER_SITES = http://dist.schmorp.de/libev/ \ Index: distinfo === RCS file: /cvs/ports/devel/libev/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo18 Nov 2010 12:18:06 - 1.3 +++ distinfo19 Jan 2011 20:07:53 - @@ -1,5 +1,5 @@ -MD5 (libev-4.01.tar.gz) = Km4NPX7afVSznzgAuCeXBw== -RMD160 (libev-4.01.tar.gz) = e7n58Ec+jSLUp3b/EJBd65Lpcyg= -SHA1 (libev-4.01.tar.gz) = wdeP0AgA/Kjs868sI/ua05EZ14s= -SHA256 (libev-4.01.tar.gz) = QdRo/uMSu8P2MpjVY7EEsLEr8YHUMZdsH5fUuMy1C3g= -SIZE (libev-4.01.tar.gz) = 466183 +MD5 (libev-4.03.tar.gz) = hs1cG0L87RvQLG4BGem4ZQ== +RMD160 (libev-4.03.tar.gz) = UE3RshkP2qFiTyqx0Ydce6m//gA= +SHA1 (libev-4.03.tar.gz) = mPjB7KxHUcBONgfn3kBcX0IXTQs= +SHA256 (libev-4.03.tar.gz) = CvUUnfhN3NAEH8I/K03otP1s6WOJpjxgYxDv26EB8I8= +SIZE (libev-4.03.tar.gz) = 471094
Re: xxxterm 1.275
On 19 January 2011 г. 19:39:47 Landry Breuil wrote:
> On Wed, Jan 19, 2011 at 03:53:00PM +0300, Vadim Zhukov wrote:
> > On 19 January 2011 ?. 11:18:12 Landry Breuil wrote:
> > > On Wed, Jan 19, 2011 at 06:04:17AM +0300, Vadim Zhukov wrote:
> > > > On 18 January 2011 ?. 22:09:53 Marco Peereboom wrote:
> > > > > anyone?
> > > >
> > > > Oops, there is packaging problem with .desktop file: pkg-subst replaces
> > > > TRUEPREFIX only in the beginning of line, so the file is actually
> > > > copied with ${TRUEPREFIX}/bin/xxxterm (and so) line itself. Updated
> > > > patch below.
> > >
> > > > - @${SUBST_CMD} -c ${WRKSRC}/xxxterm.desktop
> > > > ${PREFIX}/share/applications/xxxterm.desktop
> > > > - ${INSTALL_DATA} ${WRKSRC}/xxxterm.desktop
> > > > ${PREFIX}/share/applications/
> > > > - ${CHOWN} ${SHAREOWN}:${SHAREGRP}
> > > > $(PREFIX)/share/applications/xxxterm.desktop
> > > > + ${INSTALL_DATA} ${WRKSRC}/xxxterm.desktop
> > > > ${PREFIX}/share/applications/xxxterm.desktop
> > > > + ${SUBST_CMD} ${PREFIX}/share/applications/xxxterm.desktop
> > >
> > > It's more wrong. subst was done on the source file and was installed to
> > > prefix, then overwritten by the install_data just after.
> >
> > Yes.
> >
> > > you can also just use
> > > ${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${WRKSRC}/xxxterm.desktop
> > > ${PREFIX}/share/applications/xxxterm.desktop
> > > instead of doing install+subst
> >
> > But then you have to do chown anyway, since SUBST_CMD does not support
> > "-m mode" switch. Is anyone supported in it, BTW?
>
> Why do you think you need -m mode here ? go read
> infrastructure/bin/pkg_subst, if the source file has the correct perms
> they will be carried on to the dest file. If it doesn't, well fix it
> upstream :)
Hm-m-m, and what if upstream (talking about common case, not xxxterm)
doesn't like those permissions? Say, they want a file to be 0644
initially? Or if they just don't want to re-roll source package while
next release is planned after a while?
From the other side, if we're talking about SUBST_CMD mimic install(1)
then why not implement -m too? This makes SUBST_CMD more predictable.
BTW, I looked over ports tree and found some inconsistency in Makefiles
doing chmod:
./books/JVMS/Makefile: ${CHMOD} -R ${DOCMODE} ${INSTALL_LOC}
./cad/fritzing/Makefile:chmod ${BINMODE} ${PREFIX}/bin/fritzing
./databases/pkglocatedb/Makefile: chmod ${BINMODE} ${PREFIX}/bin/pkglocate
./devel/gmake/Makefile: @chmod ${BINMODE} ${PREFIX}/bin/gmake
./devel/intellij/Makefile: @chmod ${BINMODE} ${PREFIX}/bin/idea
./devel/intellij/Makefile: @chmod ${SHAREMODE} \
./devel/netbeans/Makefile: @chmod ${BINMODE} ${PREFIX}/bin/netbeans
./games/xneko/Makefile: BINOWN=${BINOWN} BINMODE=${BINMODE}
./graphics/povray/Makefile: find ${PREFIX}/share/povray31 -type d | xargs
chmod ${DIRMODE}
./graphics/povray/Makefile: find ${PREFIX}/share/povray31 -type f | xargs
chmod ${SHAREMODE}
./net/cvsync/Makefile: INSTALL_MAN_OPTS="-o ${MANOWN} -g ${MANGRP} -m
${MANMODE}" \
./net/cvsync/Makefile: INSTALL_BIN_OPTS="-o ${BINOWN} -g ${BINGRP} -m
${BINMODE} ${INSTALL_STRIP}"
./net/samba/Makefile: xargs chmod ${SHAREMODE}
./net/samba/Makefile: xargs chmod ${DIRMODE}
./net/uucp/Makefile:@chmod ${BINMODE} ${PREFIX}/bin/cu
./mail/exmh2/Makefile: find ${PREFIX}/share/exmh -type d -print0 | xargs -0
chmod ${DIRMODE}
./mail/exmh2/Makefile: find ${PREFIX}/share/exmh -type f -print0 | xargs -0
chmod ${SHAREMODE}
./mail/mailscanner/files/Makefile: @-chmod -R ${BINMODE}
${PREFIX}/libexec/MailScanner 2>/dev/null
./mail/mailscanner/files/Makefile: @-chmod -R ${BINMODE}
${PREFIX}/share/MailScanner/reports
./mail/zarafa/zarafa/Makefile: chmod ${SHAREMODE}
${PREFIX}/share/examples/zarafa/zarafa.m4 \
./misc/mc/Makefile: xargs chmod ${SHAREMODE}
./misc/mc/Makefile: xargs chmod ${DIRMODE}
./print/cups/Makefile:FAKE_FLAGS= BINMODE=${BINMODE} \
./print/cups/Makefile: SHAREMODE=${SHAREMODE} \
./textproc/html/Makefile: @chmod ${SHAREMODE} `find ${INSTDIR} -type f`
./textproc/iso8879/Makefile:@chmod ${SHAREMODE}
${PREFIX}/share/sgml/iso8879/*
./textproc/linuxdoc/files/Makefile: -m ${SHAREMODE} ${FILES} ${INSTDIR}
./textproc/sp/Makefile: ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
find: ./lost+found: Доступ запрещен
./www/wwwcount/Makefile:xargs chmod ${SHAREMODE}
./www/wwwcount/Makefile:xargs chmod ${BINMODE}
./www/xxxterm/Makefile: ${SUBST_CMD} -c -o ${SHAREOWN} -g ${SHAREGRP} -m
${SHAREMODE} \
Should this inconsistency be fixed? I assume, it should be "${CHMOD}"
everywhere, not "chmod", "@chmod" or "@${CHMOD}"?
--
Best wishes,
Vadim Zhukov
A: Because it messes up the order in which people normally read text.
Q: Why is top-posting such a bad thing?
A: Top-posting.
Q: What is the most annoying thing in e-mail?
Re: xxxterm 1.275
On 19 January 2011 г. 15:53:00 Vadim Zhukov wrote: > But then you have to do chown anyway, since SUBST_CMD does not support > "-m mode" switch. Is anyone supported in it, BTW? Oops. I meant "interested", of course... Need to sleep a bit more. -- Best wishes, Vadim Zhukov A: Because it messes up the order in which people normally read text. Q: Why is top-posting such a bad thing? A: Top-posting. Q: What is the most annoying thing in e-mail?
Re: Re-enable system cairo for xul-1.9.2 based apps
On Wed, Jan 19, 2011 at 5:54 PM, Landry Breuil wrote: > On Wed, Jan 19, 2011 at 04:16:28PM +, Stuart Henderson wrote: >> this looks like post-unlock material to me. > > Definitely for post-unlock. Too late for such 'invasive changes' > touching too many files. reading the comments on the bz, it looks like > the patch may land into the tree at some point. > Did you actually tested it ? Yes, using it since some days and no problems appeared (animated gifs are working, of course)... > Oh, and btw i'd prefer the --enable-system-cairo to go in > mozilla.port.mk, within an .if MOZILLA_BRANCH = 1.9.2 check.. Ok, I'll redo the diff using your suggestion ciao, david
Re: xxxterm 1.275
On 19 January 2011 ?. 19:56:34 Stuart Henderson wrote:
> On 2011/01/19 09:41, Marco Peereboom wrote:
> > Since I don't know how to fix this, can someone send me a correct diff?
>
> see below, I think this one is better.
>
> I cleaned up whitespace a bit too, sorted WANTLIB, and added a patch
> to fix a typo in xxxterm.desktop (which makes the patch slightly annoying
> to apply to a tree which you might commit from; cd /usr/ports/www/xterm;
> cvs up -dA (** NO -P **); then you can patch with -E -p0).
>
> > > > you can also just use
> > > > ${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${WRKSRC}/xxxterm.desktop
> > > > ${PREFIX}/share/applications/xxxterm.desktop
> > > > instead of doing install+subst
> > >
> > > But then you have to do chown anyway, since SUBST_CMD does not support
> > > "-m mode" switch.
>
> if the desktop file had been in the ports tree instead (e.g. in
> www/xterm/files) then we could not rely on the mode as the tree
> might have been checked out with umask 002. but it's ok here,
> because the file is in the tarball with the correct permissions
> (pkg_subst just copies the existing permissions - I wouldn't
> oppose -m support for pkg_subst, I think it was discussed before
> but I don't recall the outcome).
The file is there with 0644 permissions, and ${SHAREMODE} is 0444.
Whatever it worth, below is pkg_subst patch.
--
Best wishes,
Vadim Zhukov
A: Because it messes up the order in which people normally read text.
Q: Why is top-posting such a bad thing?
A: Top-posting.
Q: What is the most annoying thing in e-mail?
Index: pkg_subst
===
RCS file: /cvs/ports/infrastructure/bin/pkg_subst,v
retrieving revision 1.1
diff -u -p -r1.1 pkg_subst
--- pkg_subst 20 Aug 2010 14:38:31 - 1.1
+++ pkg_subst 19 Jan 2011 18:13:03 -
@@ -28,14 +28,14 @@ use OpenBSD::IdCache;
my $subst = OpenBSD::Subst->new;
our $opt_c;
-my ($fuid, $fgid);
+my ($fuid, $fgid, $fmode);
my ($uidc, $gidc);
my $ui = OpenBSD::State->new('pkg_subst');
-$ui->usage_is( '[-c] [-Dvar=value ...] [-g group] [-o owner] [file ...]');
+$ui->usage_is( '[-c] [-Dvar=value ...] [-g group] [-m mode] [-o owner] [file
...]');
$ui->do_options(
sub {
- getopts('D:g:o:ch',
+ getopts('D:g:m:o:ch',
{'D' =>
sub {
$subst->parse_option(shift);
@@ -54,6 +54,13 @@ $ui->do_options(
$fgid = $gidc->lookup($group, -1);
die "$group is not a valid group" if $fgid == -1;
},
+'m' => sub {
+ my $mode = shift;
+
+ die "$mode is not a valid file mode"
+ if $mode !~ /0*[0-7]{3,4}/;
+ $fmode = oct($mode);
+ },
'h' => sub { $ui->usage; },
});
});
@@ -79,6 +86,7 @@ while (my $src = shift) {
my $fh = $subst->copy($src, $dest);
# copy rights, owner, group as well
my ($uid, $gid, $mode) = (stat $src)[4, 5, 2];
+ $mode = $fmode if defined $fmode;
my $r1 = chown $fuid // $uid, $fgid // $gid, $fh;
my $r2 = chmod $mode & 0, $fh;
if (defined $fuid || defined $fgid || $< == 0) {
Re: WIP: multimedia/lives lives NLE video editing
On Wed, 19 Jan 2011, Ian Darwin wrote: > > It misses the update-desktop-database goos and dependency. > > Actually it was installing the file so it worked with KDE, but wasn't > running the update program (hence not work with gnome?). I've added > the depend for that. But you are still missing the goos in PLIST ;) @exec %D/bin/update-desktop-database @unexec-delete %D/bin/update-desktop-database -- Antoine
Re: WIP: multimedia/lives lives NLE video editing
> Some nitpicks.
>
> Can you make it install its doc into share/doc/lives instead of
> /share/doc/lives-version...
Will try that.
> It misses the update-desktop-database goos and dependency.
Actually it was installing the file so it worked with KDE, but wasn't
running the update program (hence not work with gnome?). I've added
the depend for that.
>
> iconv in WANTLIB can go (you are already using the gettext MODULE).
Done.
>
> You can probably tighten the RUN_DEPENDS. For example you register
> graphics/gdk-pixbuf2 but you already depends on multimedia/mjpegtools
> which brings gtk+2 which has a dependency on gdk-pixbuf2 already.
Example done. port-lib-depends-check doesn't warn you when you've
over-done it :-)
> This is a bad construct:
> WRKDIST = ${WRKDIR}/${PKGNAME}
> because when the package is bumped, WRKDIST will be wrong.
Ooh, you are so right. That's fixed.
> I had this on my porting todo for a while, I'm happy someone took a shot
> at it, thanks :)
Gladly, and thanks for the comments. A port with the above fixes is at
the same spot, http://www.darwinsys.com/openbsd/myports/lives.tar.gz
Time to slow down..
Hey, Since it's that time of the year again, time to slow down. So, no more imports from now on. We'll lock in a few days, so updates/diffs/fixes should be OK'd by AT LEAST one of the following people: ajacoutot@ espie@ landry@ naddy@ sthen@ jasper@ And this doesn't mean that it's time to get updates in that have no real added value for 4.9...there's still life after the lock ;-) -- Cheers, Jasper "Capable, generous men do not create victims, they nurture them."
Re: WIP: multimedia/lives lives NLE video editing
On Wed, 19 Jan 2011, Ian Darwin wrote:
> Lives is one of half a dozen vaguely competent NLE video editing tools
> out there in open source.
>
> It has the advantage over Cinelerra and OpenShot of depending
> only on stuff that is already in our tree for its "required"
> dependencies. It also differs in that it runs external programs
> for a lot of things instead of trying to have everything
> built in.
>
> This is the current development version (1.3.0); the "stable"
> version crashed due to a sigsegv while sorting an array
> during startup. This version at least starts up,
> but crashes on some import operations, and doesn't have good
> audio support - its configure doesn't find jack, though it's installed.
>
> Some import operations are unimaginably slow.
>
> But it opens and displays flv movies, so it's a start.
>
> port is at http://www.darwinsys.com/openbsd/myports/lives.tar.gz
Some nitpicks.
Can you make it install its doc into share/doc/lives instead of
/share/doc/lives-version...
It misses the update-desktop-database goos and dependency.
iconv in WANTLIB can go (you are already using the gettext MODULE).
You can probably tighten the RUN_DEPENDS. For example you register
graphics/gdk-pixbuf2 but you already depends on multimedia/mjpegtools
which brings gtk+2 which has a dependency on gdk-pixbuf2 already.
This is a bad construct:
WRKDIST = ${WRKDIR}/${PKGNAME}
because when the package is bumped, WRKDIST will be wrong.
I had this on my porting todo for a while, I'm happy someone took a shot
at it, thanks :)
--
Antoine
WIP: multimedia/lives lives NLE video editing
Lives is one of half a dozen vaguely competent NLE video editing tools out there in open source. It has the advantage over Cinelerra and OpenShot of depending only on stuff that is already in our tree for its "required" dependencies. It also differs in that it runs external programs for a lot of things instead of trying to have everything built in. This is the current development version (1.3.0); the "stable" version crashed due to a sigsegv while sorting an array during startup. This version at least starts up, but crashes on some import operations, and doesn't have good audio support - its configure doesn't find jack, though it's installed. Some import operations are unimaginably slow. But it opens and displays flv movies, so it's a start. port is at http://www.darwinsys.com/openbsd/myports/lives.tar.gz
Re: Re-enable system cairo for xul-1.9.2 based apps
On Wed, Jan 19, 2011 at 5:16 PM, Stuart Henderson wrote: > this looks like post-unlock material to me. I agree. I was just pushing it to your attention. ciao, david
Re: xxxterm 1.275
On 2011/01/19 18:13, Antoine Jacoutot wrote: > > I don't really see the point of adding this: > > > +SUBST_VARS += TRUEPREFIX ah, I misunderstood pkg_subst, for some reason I thought ^TRUEPREFIX (which is in the default SUBST_VARS) would only match at the start of the line. you're right, this can go.
Re: xxxterm 1.275
On Wed, 19 Jan 2011, Stuart Henderson wrote:
> On 2011/01/19 09:41, Marco Peereboom wrote:
> > Since I don't know how to fix this, can someone send me a correct diff?
>
> see below, I think this one is better.
>
> I cleaned up whitespace a bit too, sorted WANTLIB, and added a patch
> to fix a typo in xxxterm.desktop (which makes the patch slightly annoying
> to apply to a tree which you might commit from; cd /usr/ports/www/xterm;
> cvs up -dA (** NO -P **); then you can patch with -E -p0).
>
> > > > you can also just use
> > > > ${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${WRKSRC}/xxxterm.desktop
> > > > ${PREFIX}/share/applications/xxxterm.desktop
> > > > instead of doing install+subst
> > >
> > > But then you have to do chown anyway, since SUBST_CMD does not support
> > > "-m mode" switch.
>
> if the desktop file had been in the ports tree instead (e.g. in
> www/xterm/files) then we could not rely on the mode as the tree
> might have been checked out with umask 002. but it's ok here,
> because the file is in the tarball with the correct permissions
> (pkg_subst just copies the existing permissions - I wouldn't
> oppose -m support for pkg_subst, I think it was discussed before
> but I don't recall the outcome).
>
> I'm ok with this update and diff, but at this point I would like
> to see an ok from another ports hacker who has been through a
> couple of release cycles as obviously we are going to be short
> on time to fix any problems.
I don't really see the point of adding this:
> +SUBST_VARS +=TRUEPREFIX
Re: xxxterm 1.275
On 2011/01/19 09:41, Marco Peereboom wrote:
> Since I don't know how to fix this, can someone send me a correct diff?
see below, I think this one is better.
I cleaned up whitespace a bit too, sorted WANTLIB, and added a patch
to fix a typo in xxxterm.desktop (which makes the patch slightly annoying
to apply to a tree which you might commit from; cd /usr/ports/www/xterm;
cvs up -dA (** NO -P **); then you can patch with -E -p0).
> > > you can also just use
> > > ${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${WRKSRC}/xxxterm.desktop
> > > ${PREFIX}/share/applications/xxxterm.desktop
> > > instead of doing install+subst
> >
> > But then you have to do chown anyway, since SUBST_CMD does not support
> > "-m mode" switch.
if the desktop file had been in the ports tree instead (e.g. in
www/xterm/files) then we could not rely on the mode as the tree
might have been checked out with umask 002. but it's ok here,
because the file is in the tarball with the correct permissions
(pkg_subst just copies the existing permissions - I wouldn't
oppose -m support for pkg_subst, I think it was discussed before
but I don't recall the outcome).
I'm ok with this update and diff, but at this point I would like
to see an ok from another ports hacker who has been through a
couple of release cycles as obviously we are going to be short
on time to fix any problems.
Index: Makefile
===
RCS file: /cvs/ports/www/xxxterm/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile9 Jan 2011 21:28:37 - 1.12
+++ Makefile19 Jan 2011 16:52:36 -
@@ -1,9 +1,7 @@
# $OpenBSD: Makefile,v 1.12 2011/01/09 21:28:37 marco Exp $
COMMENT = vi-like minimalists web browser
-
-DISTNAME = xxxterm-1.226
-
+DISTNAME = xxxterm-1.275
CATEGORIES = www
HOMEPAGE = http://opensource.conformal.com/wiki/XXXTerm
@@ -16,30 +14,27 @@ PERMIT_PACKAGE_FTP =Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
-MODULES = devel/gettext
+MODULES += devel/gettext
-WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
-WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
-WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gnutls gobject-2.0 gthread-2.0 gtk-x11-2.0
-WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png
-WANTLIB += pthread pthread-stubs soup-2.4 util xcb xcb-render
-WANTLIB += GL Xxf86vm drm xcb-shm xml2 z
-WANTLIB += webkit-1.0
+WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi
+WANTLIB += Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo drm expat
+WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
+WANTLIB += glib-2.0 gmodule-2.0 gnutls gobject-2.0 gthread-2.0
+WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += pixman-1 png pthread pthread-stubs soup-2.4 util webkit-1.0
+WANTLIB += xcb xcb-render xcb-shm xml2 z
-LIB_DEPENDS = www/webkit
+MASTER_SITES = http://opensource.conformal.com/snapshots/xxxterm/
+LIB_DEPENDS = www/webkit
RUN_DEPENDS = devel/desktop-file-utils
-MASTER_SITES = http://opensource.conformal.com/snapshots/xxxterm/
-
EXTRACT_SUFX = .tgz
-
-
-NO_REGRESS=Yes
+NO_REGRESS = Yes
EXAMPLEDIR = ${PREFIX}/share/examples/xxxterm
+SUBST_VARS += TRUEPREFIX
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xxxterm ${PREFIX}/bin
@@ -50,8 +45,8 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/xxxterm/
${INSTALL_DATA} ${WRKSRC}/xxxtermicon*.png ${PREFIX}/share/xxxterm/
${INSTALL_DATA_DIR} ${PREFIX}/share/applications/
- @${SUBST_CMD} -c ${WRKSRC}/xxxterm.desktop
${PREFIX}/share/applications/xxxterm.desktop
- ${INSTALL_DATA} ${WRKSRC}/xxxterm.desktop ${PREFIX}/share/applications/
- ${CHOWN} ${SHAREOWN}:${SHAREGRP}
$(PREFIX)/share/applications/xxxterm.desktop
+ ${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} \
+ -c ${WRKSRC}/xxxterm.desktop \
+ ${PREFIX}/share/applications/xxxterm.desktop
.include
Index: distinfo
===
RCS file: /cvs/ports/www/xxxterm/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo9 Jan 2011 21:28:37 - 1.8
+++ distinfo19 Jan 2011 16:52:36 -
@@ -1,5 +1,5 @@
-MD5 (xxxterm-1.226.tgz) = rGSq8lv/qqHUy/MKhgiX7w==
-RMD160 (xxxterm-1.226.tgz) = Zztf0SpiaxshUyeRoG+OtjO7goU=
-SHA1 (xxxterm-1.226.tgz) = uQcTZk1gmFEQwOMKxPFSFmNh1rY=
-SHA256 (xxxterm-1.226.tgz) = 94AI2MFunhjDk/lBW+3de8GkkcYh+Y5L+soab2jge7A=
-SIZE (xxxterm-1.226.tgz) = 124171
+MD5 (xxxterm-1.275.tgz) = fE223846IS1FhLDu6b2R7g==
+RMD160 (xxxterm-1.275.tgz) = 5nLeg5hUw6wF7dyfQPE7H1Nn9D4=
+SHA1 (xxxterm-1.275.tgz) = jTh8LGz4bxzAg9uMbvYPy0H6UKE=
+SHA256 (xxxterm-1.275.tgz)
Re: Re-enable system cairo for xul-1.9.2 based apps
On Wed, Jan 19, 2011 at 04:16:28PM +, Stuart Henderson wrote: > this looks like post-unlock material to me. Definitely for post-unlock. Too late for such 'invasive changes' touching too many files. reading the comments on the bz, it looks like the patch may land into the tree at some point. Did you actually tested it ? Oh, and btw i'd prefer the --enable-system-cairo to go in mozilla.port.mk, within an .if MOZILLA_BRANCH = 1.9.2 check.. Landry
Re: xxxterm 1.275
On Wed, Jan 19, 2011 at 03:53:00PM +0300, Vadim Zhukov wrote:
> On 19 January 2011 ?. 11:18:12 Landry Breuil wrote:
> > On Wed, Jan 19, 2011 at 06:04:17AM +0300, Vadim Zhukov wrote:
> > > On 18 January 2011 ?. 22:09:53 Marco Peereboom wrote:
> > > > anyone?
> > >
> > > Oops, there is packaging problem with .desktop file: pkg-subst replaces
> > > TRUEPREFIX only in the beginning of line, so the file is actually
> > > copied with ${TRUEPREFIX}/bin/xxxterm (and so) line itself. Updated
> > > patch below.
> >
> > > - @${SUBST_CMD} -c ${WRKSRC}/xxxterm.desktop
> > > ${PREFIX}/share/applications/xxxterm.desktop
> > > - ${INSTALL_DATA} ${WRKSRC}/xxxterm.desktop ${PREFIX}/share/applications/
> > > - ${CHOWN} ${SHAREOWN}:${SHAREGRP}
> > > $(PREFIX)/share/applications/xxxterm.desktop
> > > + ${INSTALL_DATA} ${WRKSRC}/xxxterm.desktop
> > > ${PREFIX}/share/applications/xxxterm.desktop
> > > + ${SUBST_CMD} ${PREFIX}/share/applications/xxxterm.desktop
> >
> > It's more wrong. subst was done on the source file and was installed to
> > prefix, then overwritten by the install_data just after.
>
> Yes.
>
> > you can also just use
> > ${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${WRKSRC}/xxxterm.desktop
> > ${PREFIX}/share/applications/xxxterm.desktop
> > instead of doing install+subst
>
> But then you have to do chown anyway, since SUBST_CMD does not support
> "-m mode" switch. Is anyone supported in it, BTW?
Why do you think you need -m mode here ? go read
infrastructure/bin/pkg_subst, if the source file has the correct perms
they will be carried on to the dest file. If it doesn't, well fix it
upstream :)
Oh, and marco btw, you can fix it yourself. There's no rocket
science here, i gave you the line.
Landry
Re: Re-enable system cairo for xul-1.9.2 based apps
this looks like post-unlock material to me.
On 2011/01/19 15:18, David Coppa wrote:
> Hi,
>
> Now that we have cairo-1.10.2, that has fixed many annoying bugs
> present in version 1.10.0,
> we can safely re-enable system-cairo for mozilla-firefox and
> mozilla-thunderbird.
> The only remaining problem was with animated gifs, but this[1] patch,
> backported from
> the firefox-4 branch, fixes it:
>
> [1]
> http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-libs/xulrunner/files/fix-animated-gifs.patch
>
> Unfortunately, the above trick cannot be applied to firefox35,
> seamonkey and sunbird, which will
> remain with their in-tree cairo.
>
> What about the following diff?
>
> CIAO
> David
>
> Index: devel/xulrunner/1.9/Makefile
> ===
> RCS file: /cvs/ports/devel/xulrunner/1.9/Makefile,v
> retrieving revision 1.36
> diff -u -p -r1.36 Makefile
> --- devel/xulrunner/1.9/Makefile 18 Jan 2011 12:37:44 - 1.36
> +++ devel/xulrunner/1.9/Makefile 19 Jan 2011 14:01:13 -
> @@ -5,7 +5,7 @@ FFX_VERSION = 3.6.13
> MOZILLA_BRANCH = 1.9.2
> MOZILLA_PROJECT =xulrunner1.9
> DISTNAME = firefox-${FFX_VERSION}.source
> -REVISION-main = 2
> +REVISION-main = 3
> REVISION-devel = 1
>
> MASTER_SITES =
> http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${FFX_VERSION}/source/
> @@ -26,6 +26,8 @@ PKG_ARGS+= -Djit=0 -Damd64=0
> # use files and patches from www/mozilla-firefox
> PATCHDIR = ${PORTSDIR}/www/mozilla-firefox/patches
> FILESDIR = ${PORTSDIR}/www/mozilla-firefox/files
> +
> +CONFIGURE_ARGS +=--enable-system-cairo
>
> MOZILLA_DATADIRS = chrome components defaults dictionaries greprefs \
> icons modules plugins res
> Index: mail/mozilla-thunderbird/Makefile
> ===
> RCS file: /cvs/ports/mail/mozilla-thunderbird/Makefile,v
> retrieving revision 1.116
> diff -u -p -r1.116 Makefile
> --- mail/mozilla-thunderbird/Makefile 18 Jan 2011 12:37:44 - 1.116
> +++ mail/mozilla-thunderbird/Makefile 19 Jan 2011 13:57:47 -
> @@ -12,7 +12,7 @@ MOZILLA_CODENAME = mail
>
> MULTI_PACKAGES = -main -lightning
> PKGNAME-main = ${PKGNAME}
> -REVISION-main = 2
> +REVISION-main = 3
> PKGNAME-lightning = lightning-1.0beta2
> EPOCH-lightning =0
> REVISION-lightning = 13
> @@ -69,6 +69,8 @@ BUILD_DEPENDS +=archivers/unzip #to unz
> # build lightning xpi
> CONFIGURE_ARGS +=--enable-calendar \
> --enable-official-branding
> +
> +CONFIGURE_ARGS +=--enable-system-cairo
>
> ALL_TARGET = default
>
> Index:
> mail/mozilla-thunderbird/patches/patch-mozilla_modules_libpr0n_decoders_gif_nsGIFDecoder2_cpp
> ===
> RCS file:
> mail/mozilla-thunderbird/patches/patch-mozilla_modules_libpr0n_decoders_gif_nsGIFDecoder2_cpp
> diff -N
> mail/mozilla-thunderbird/patches/patch-mozilla_modules_libpr0n_decoders_gif_nsGIFDecoder2_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++
> mail/mozilla-thunderbird/patches/patch-mozilla_modules_libpr0n_decoders_gif_nsGIFDecoder2_cpp
> 19
> Jan 2011 13:57:47 -
> @@ -0,0 +1,20 @@
> +$OpenBSD$
> +--- mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp.orig Tue
> Dec 7 17:35:50 2010
> mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp Wed Jan 19
> 11:28:20 2011
> +@@ -202,7 +202,7 @@ static NS_METHOD ReadDataOut(nsIInputStream* in,
> + nsresult
> + nsGIFDecoder2::FlushImageData(PRUint32 fromRow, PRUint32 rows)
> + {
> +- nsIntRect r(0, fromRow, mGIFStruct.width, rows);
> ++ nsIntRect r(mGIFStruct.x_offset, mGIFStruct.y_offset + fromRow,
> mGIFStruct.width, rows);
> +
> + // Update image
> + nsresult rv = mImageContainer->FrameUpdated(mGIFStruct.images_decoded, r);
> +@@ -215,7 +215,6 @@ nsGIFDecoder2::FlushImageData(PRUint32 fromRow, PRUint
> + if (!mGIFStruct.images_decoded && mObserver) {
> + PRUint32 imgCurFrame;
> + mImageContainer->GetCurrentFrameIndex(&imgCurFrame);
> +-r.y += mGIFStruct.y_offset;
> + mObserver->OnDataAvailable(nsnull, imgCurFrame ==
> PRUint32(mGIFStruct.images_decoded), &r);
> + }
> + return NS_OK;
> Index:
> mail/mozilla-thunderbird/patches/patch-mozilla_modules_libpr0n_src_imgContainer_cpp
> ===
> RCS file:
> mail/mozilla-thunderbird/patches/patch-mozilla_modules_libpr0n_src_imgContainer_cpp
> diff -N
> mail/mozilla-thunderbird/patches/patch-mozilla_modules_libpr0n_src_imgContainer_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++
> mail/mozilla-thunderbird/patches/patch-mozilla_modules_libpr0n_src_imgContainer_cpp
>19
> Jan 2011 13:57:47 -
> @@ -0,0 +1,24 @@
> +$OpenBSD$
> +--- mozilla/modules/libpr0n/src/img
Re: xxxterm 1.275
Since I don't know how to fix this, can someone send me a correct diff?
On Wed, Jan 19, 2011 at 03:53:00PM +0300, Vadim Zhukov wrote:
> On 19 January 2011 ?. 11:18:12 Landry Breuil wrote:
> > On Wed, Jan 19, 2011 at 06:04:17AM +0300, Vadim Zhukov wrote:
> > > On 18 January 2011 ?. 22:09:53 Marco Peereboom wrote:
> > > > anyone?
> > >
> > > Oops, there is packaging problem with .desktop file: pkg-subst replaces
> > > TRUEPREFIX only in the beginning of line, so the file is actually
> > > copied with ${TRUEPREFIX}/bin/xxxterm (and so) line itself. Updated
> > > patch below.
> >
> > > - @${SUBST_CMD} -c ${WRKSRC}/xxxterm.desktop
> > > ${PREFIX}/share/applications/xxxterm.desktop
> > > - ${INSTALL_DATA} ${WRKSRC}/xxxterm.desktop ${PREFIX}/share/applications/
> > > - ${CHOWN} ${SHAREOWN}:${SHAREGRP}
> > > $(PREFIX)/share/applications/xxxterm.desktop
> > > + ${INSTALL_DATA} ${WRKSRC}/xxxterm.desktop
> > > ${PREFIX}/share/applications/xxxterm.desktop
> > > + ${SUBST_CMD} ${PREFIX}/share/applications/xxxterm.desktop
> >
> > It's more wrong. subst was done on the source file and was installed to
> > prefix, then overwritten by the install_data just after.
>
> Yes.
>
> > you can also just use
> > ${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${WRKSRC}/xxxterm.desktop
> > ${PREFIX}/share/applications/xxxterm.desktop
> > instead of doing install+subst
>
> But then you have to do chown anyway, since SUBST_CMD does not support
> "-m mode" switch. Is anyone supported in it, BTW?
>
> --
> Best wishes,
> Vadim Zhukov
>
> A: Because it messes up the order in which people normally read text.
> Q: Why is top-posting such a bad thing?
> A: Top-posting.
> Q: What is the most annoying thing in e-mail?
>
Re-enable system cairo for xul-1.9.2 based apps
Hi,
Now that we have cairo-1.10.2, that has fixed many annoying bugs
present in version 1.10.0,
we can safely re-enable system-cairo for mozilla-firefox and
mozilla-thunderbird.
The only remaining problem was with animated gifs, but this[1] patch,
backported from
the firefox-4 branch, fixes it:
[1]
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-libs/xulrunner/files/fix-animated-gifs.patch
Unfortunately, the above trick cannot be applied to firefox35,
seamonkey and sunbird, which will
remain with their in-tree cairo.
What about the following diff?
CIAO
David
Index: devel/xulrunner/1.9/Makefile
===
RCS file: /cvs/ports/devel/xulrunner/1.9/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- devel/xulrunner/1.9/Makefile18 Jan 2011 12:37:44 - 1.36
+++ devel/xulrunner/1.9/Makefile19 Jan 2011 14:01:13 -
@@ -5,7 +5,7 @@ FFX_VERSION = 3.6.13
MOZILLA_BRANCH = 1.9.2
MOZILLA_PROJECT = xulrunner1.9
DISTNAME = firefox-${FFX_VERSION}.source
-REVISION-main =2
+REVISION-main =3
REVISION-devel = 1
MASTER_SITES =
http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${FFX_VERSION}/source/
@@ -26,6 +26,8 @@ PKG_ARGS+=-Djit=0 -Damd64=0
# use files and patches from www/mozilla-firefox
PATCHDIR = ${PORTSDIR}/www/mozilla-firefox/patches
FILESDIR = ${PORTSDIR}/www/mozilla-firefox/files
+
+CONFIGURE_ARGS += --enable-system-cairo
MOZILLA_DATADIRS = chrome components defaults dictionaries greprefs \
icons modules plugins res
Index: mail/mozilla-thunderbird/Makefile
===
RCS file: /cvs/ports/mail/mozilla-thunderbird/Makefile,v
retrieving revision 1.116
diff -u -p -r1.116 Makefile
--- mail/mozilla-thunderbird/Makefile 18 Jan 2011 12:37:44 - 1.116
+++ mail/mozilla-thunderbird/Makefile 19 Jan 2011 13:57:47 -
@@ -12,7 +12,7 @@ MOZILLA_CODENAME =mail
MULTI_PACKAGES = -main -lightning
PKGNAME-main = ${PKGNAME}
-REVISION-main =2
+REVISION-main =3
PKGNAME-lightning =lightning-1.0beta2
EPOCH-lightning = 0
REVISION-lightning = 13
@@ -69,6 +69,8 @@ BUILD_DEPENDS += archivers/unzip #to unz
# build lightning xpi
CONFIGURE_ARGS += --enable-calendar \
--enable-official-branding
+
+CONFIGURE_ARGS += --enable-system-cairo
ALL_TARGET = default
Index:
mail/mozilla-thunderbird/patches/patch-mozilla_modules_libpr0n_decoders_gif_nsGIFDecoder2_cpp
===
RCS file:
mail/mozilla-thunderbird/patches/patch-mozilla_modules_libpr0n_decoders_gif_nsGIFDecoder2_cpp
diff -N
mail/mozilla-thunderbird/patches/patch-mozilla_modules_libpr0n_decoders_gif_nsGIFDecoder2_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++
mail/mozilla-thunderbird/patches/patch-mozilla_modules_libpr0n_decoders_gif_nsGIFDecoder2_cpp
19
Jan 2011 13:57:47 -
@@ -0,0 +1,20 @@
+$OpenBSD$
+--- mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp.origTue
Dec 7 17:35:50 2010
mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp Wed Jan 19
11:28:20 2011
+@@ -202,7 +202,7 @@ static NS_METHOD ReadDataOut(nsIInputStream* in,
+ nsresult
+ nsGIFDecoder2::FlushImageData(PRUint32 fromRow, PRUint32 rows)
+ {
+- nsIntRect r(0, fromRow, mGIFStruct.width, rows);
++ nsIntRect r(mGIFStruct.x_offset, mGIFStruct.y_offset + fromRow,
mGIFStruct.width, rows);
+
+ // Update image
+ nsresult rv = mImageContainer->FrameUpdated(mGIFStruct.images_decoded, r);
+@@ -215,7 +215,6 @@ nsGIFDecoder2::FlushImageData(PRUint32 fromRow, PRUint
+ if (!mGIFStruct.images_decoded && mObserver) {
+ PRUint32 imgCurFrame;
+ mImageContainer->GetCurrentFrameIndex(&imgCurFrame);
+-r.y += mGIFStruct.y_offset;
+ mObserver->OnDataAvailable(nsnull, imgCurFrame ==
PRUint32(mGIFStruct.images_decoded), &r);
+ }
+ return NS_OK;
Index:
mail/mozilla-thunderbird/patches/patch-mozilla_modules_libpr0n_src_imgContainer_cpp
===
RCS file:
mail/mozilla-thunderbird/patches/patch-mozilla_modules_libpr0n_src_imgContainer_cpp
diff -N
mail/mozilla-thunderbird/patches/patch-mozilla_modules_libpr0n_src_imgContainer_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++
mail/mozilla-thunderbird/patches/patch-mozilla_modules_libpr0n_src_imgContainer_cpp
19
Jan 2011 13:57:47 -
@@ -0,0 +1,24 @@
+$OpenBSD$
+--- mozilla/modules/libpr0n/src/imgContainer.cpp.orig Tue Dec 7 17:35:50 2010
mozilla/modules/libpr0n/src/imgContainer.cpp Wed Jan 19 11:28:20 2011
+@@ -420,6 +420,8 @@ nsresult imgContainer::InternalAddFrameHelper(PRUint32
+
+ frame->GetImageData(imageData, imageLength);
+
++ frame->LockImageData();
++
+
Re: Re-enable system cairo for xul-1.9.2 based apps
On Wed, Jan 19, 2011 at 3:18 PM, David Coppa wrote: > Hi, > > Now that we have cairo-1.10.2, that has fixed many annoying bugs > present in version 1.10.0, > we can safely re-enable system-cairo for mozilla-firefox and > mozilla-thunderbird. > The only remaining problem was with animated gifs, but this[1] patch, > backported from > the firefox-4 branch, fixes it: > > [1] > http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-libs/xulrunner/files/fix-animated-gifs.patch > > Unfortunately, the above trick cannot be applied to firefox35, > seamonkey and sunbird, which will > remain with their in-tree cairo. > > What about the following diff? Formatting has been fucked up. Fortunately, I've attached the original diff. I'm sorry, david moz_sys_cairo.patch Description: Binary data
Re: xxxterm 1.275
On 19 January 2011 г. 11:18:12 Landry Breuil wrote:
> On Wed, Jan 19, 2011 at 06:04:17AM +0300, Vadim Zhukov wrote:
> > On 18 January 2011 ?. 22:09:53 Marco Peereboom wrote:
> > > anyone?
> >
> > Oops, there is packaging problem with .desktop file: pkg-subst replaces
> > TRUEPREFIX only in the beginning of line, so the file is actually
> > copied with ${TRUEPREFIX}/bin/xxxterm (and so) line itself. Updated
> > patch below.
>
> > - @${SUBST_CMD} -c ${WRKSRC}/xxxterm.desktop
> > ${PREFIX}/share/applications/xxxterm.desktop
> > - ${INSTALL_DATA} ${WRKSRC}/xxxterm.desktop ${PREFIX}/share/applications/
> > - ${CHOWN} ${SHAREOWN}:${SHAREGRP}
> > $(PREFIX)/share/applications/xxxterm.desktop
> > + ${INSTALL_DATA} ${WRKSRC}/xxxterm.desktop
> > ${PREFIX}/share/applications/xxxterm.desktop
> > + ${SUBST_CMD} ${PREFIX}/share/applications/xxxterm.desktop
>
> It's more wrong. subst was done on the source file and was installed to
> prefix, then overwritten by the install_data just after.
Yes.
> you can also just use
> ${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${WRKSRC}/xxxterm.desktop
> ${PREFIX}/share/applications/xxxterm.desktop
> instead of doing install+subst
But then you have to do chown anyway, since SUBST_CMD does not support
"-m mode" switch. Is anyone supported in it, BTW?
--
Best wishes,
Vadim Zhukov
A: Because it messes up the order in which people normally read text.
Q: Why is top-posting such a bad thing?
A: Top-posting.
Q: What is the most annoying thing in e-mail?
Bugfix update to libev-4.03
Minor update to libev-4.03, no functional changes. OK? ciao, david Index: Makefile === RCS file: /cvs/ports/devel/libev/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- Makefile18 Nov 2010 12:18:06 - 1.7 +++ Makefile19 Jan 2011 12:00:08 - @@ -2,7 +2,7 @@ COMMENT = high-performance event loop library -DISTNAME = libev-4.01 +DISTNAME = libev-4.03 CATEGORIES = devel MAINTAINER = David Coppa Index: distinfo === RCS file: /cvs/ports/devel/libev/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo18 Nov 2010 12:18:06 - 1.3 +++ distinfo19 Jan 2011 12:00:08 - @@ -1,5 +1,5 @@ -MD5 (libev-4.01.tar.gz) = Km4NPX7afVSznzgAuCeXBw== -RMD160 (libev-4.01.tar.gz) = e7n58Ec+jSLUp3b/EJBd65Lpcyg= -SHA1 (libev-4.01.tar.gz) = wdeP0AgA/Kjs868sI/ua05EZ14s= -SHA256 (libev-4.01.tar.gz) = QdRo/uMSu8P2MpjVY7EEsLEr8YHUMZdsH5fUuMy1C3g= -SIZE (libev-4.01.tar.gz) = 466183 +MD5 (libev-4.03.tar.gz) = hs1cG0L87RvQLG4BGem4ZQ== +RMD160 (libev-4.03.tar.gz) = UE3RshkP2qFiTyqx0Ydce6m//gA= +SHA1 (libev-4.03.tar.gz) = mPjB7KxHUcBONgfn3kBcX0IXTQs= +SHA256 (libev-4.03.tar.gz) = CvUUnfhN3NAEH8I/K03otP1s6WOJpjxgYxDv26EB8I8= +SIZE (libev-4.03.tar.gz) = 471094
Re: NEW: sieve-connect
On Wed, Jan 19, 2011 at 11:24:16AM +0100, LEVAI Daniel wrote: > On Wed, Jan 19, 2011 at 11:17:37 +0100, Pierre-Emmanuel André wrote: > > On Wed, Jan 19, 2011 at 10:46:05AM +0100, LEVAI Daniel wrote: > > > Hi! > > > > > > Just thought I'd try again. > > > sieve-connect is a command-line perl interface for managesieve servers. > > > > > > > You must add devel/p5-Term-ReadKey to RUN_DEPENDS. > Corrected, thanks! > > > Otherwise it runs fine with Dovecot managesieve. > Yes, I've been using it with Dovecot too for a while. No problem > whatsoever. Commited, thanks ! -- Pierre-Emmanuel André GPG key: 0x7AE329DC
Re: NEW: sieve-connect
On Wed, Jan 19, 2011 at 11:17:37 +0100, Pierre-Emmanuel André wrote: > On Wed, Jan 19, 2011 at 10:46:05AM +0100, LEVAI Daniel wrote: > > Hi! > > > > Just thought I'd try again. > > sieve-connect is a command-line perl interface for managesieve servers. > > > > You must add devel/p5-Term-ReadKey to RUN_DEPENDS. Corrected, thanks! > Otherwise it runs fine with Dovecot managesieve. Yes, I've been using it with Dovecot too for a while. No problem whatsoever. Daniel -- LÉVAI Dániel PGP key ID = 0x83B63A8F Key fingerprint = DBEC C66B A47A DFA2 792D 650C C69B BE4C 83B6 3A8F sieve-connect.tgz Description: application/tar-gz
Re: NEW: sieve-connect
On Wed, Jan 19, 2011 at 10:46:05AM +0100, LEVAI Daniel wrote: > Hi! > > Just thought I'd try again. > sieve-connect is a command-line perl interface for managesieve servers. > You must add devel/p5-Term-ReadKey to RUN_DEPENDS. Otherwise it runs fine with Dovecot managesieve. -- Pierre-Emmanuel André GPG key: 0x7AE329DC
NEW: sieve-connect
Hi! Just thought I'd try again. sieve-connect is a command-line perl interface for managesieve servers. Daniel -- LÉVAI Dániel PGP key ID = 0x83B63A8F Key fingerprint = DBEC C66B A47A DFA2 792D 650C C69B BE4C 83B6 3A8F sieve-connect.tgz Description: application/tar-gz
Re: xxxterm 1.275
On Wed, Jan 19, 2011 at 06:04:17AM +0300, Vadim Zhukov wrote:
> On 18 January 2011 ?. 22:09:53 Marco Peereboom wrote:
> > anyone?
>
> Oops, there is packaging problem with .desktop file: pkg-subst replaces
> TRUEPREFIX only in the beginning of line, so the file is actually
> copied with ${TRUEPREFIX}/bin/xxxterm (and so) line itself. Updated
> patch below.
> - @${SUBST_CMD} -c ${WRKSRC}/xxxterm.desktop
> ${PREFIX}/share/applications/xxxterm.desktop
> - ${INSTALL_DATA} ${WRKSRC}/xxxterm.desktop ${PREFIX}/share/applications/
> - ${CHOWN} ${SHAREOWN}:${SHAREGRP}
> $(PREFIX)/share/applications/xxxterm.desktop
> + ${INSTALL_DATA} ${WRKSRC}/xxxterm.desktop
> ${PREFIX}/share/applications/xxxterm.desktop
> + ${SUBST_CMD} ${PREFIX}/share/applications/xxxterm.desktop
It's more wrong. subst was done on the source file and was installed to
prefix, then overwritten by the install_data just after.
you can also just use
${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${WRKSRC}/xxxterm.desktop
${PREFIX}/share/applications/xxxterm.desktop
instead of doing install+subst
Landry
