Attachment 77519 Details for Bug 111635 – blam-1.8.4.patch

[patch] blam-1.8.4.patch

blam-1.8.4.patch (text/plain), 8.48 KB, created by Phillip N. on 2007-04-16 00:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Phillip N.

Created: 2007-04-16 00:20:01 UTC

Size: 8.48 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/blam/Makefile,v
>retrieving revision 1.19
>diff -u -r1.19 Makefile
>--- Makefile	4 Feb 2007 23:36:18 -0000	1.19
>+++ Makefile	15 Apr 2007 23:06:23 -0000
>@@ -7,35 +7,31 @@
> #
> 
> PORTNAME=	blam
>-PORTVERSION=	1.8.2
>-PORTREVISION=	6
>+PORTVERSION=	1.8.4
> CATEGORIES=	net gnome
>-MASTER_SITES=	${MASTER_SITE_GNOME}
>-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.8
>+MASTER_SITES=	http://www.cmartin.tk/blam/
> 
> MAINTAINER=	bsd-sharp-list@forge.novell.com
> COMMENT=	Mono based RSS feed reader
> 
>-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gecko-sharp.pc:${PORTSDIR}/www/gecko-sharp10
>-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gecko-sharp.pc:${PORTSDIR}/www/gecko-sharp10
>+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gecko-sharp-2.0.pc:${PORTSDIR}/www/gecko-sharp20
>+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gecko-sharp-2.0.pc:${PORTSDIR}/www/gecko-sharp20
> 
> USE_GECKO=	firefox mozilla
>-USE_GNOME=	gnomeprefix gnomehack intlhack intltool libgnomeui gtksharp10
>+USE_GNOME=	gnomeprefix gnomehack intlhack intltool libgnomeui gnomesharp20
> USE_BZIP2=	yes
> USE_GETTEXT=	yes
> USE_GMAKE=	yes
>-USE_XLIB=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-mozilla=${GECKO}
> CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
> 		LDFLAGS="-L${LOCALBASE}/lib"
> 
>+MAN1=	blam.1
>+
> GCONF_SCHEMAS=	blam.schemas
> 
> .include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
> .include <bsd.port.pre.mk>
> .include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
>-.if ${GECKO}!="mozilla"
>-EXTRA_PATCHES+= ${PATCHDIR}/extra-libblam_blam-gecko-utils.cpp
>-.endif
> .include <bsd.port.post.mk>
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/net/blam/distinfo,v
>retrieving revision 1.5
>diff -u -r1.5 distinfo
>--- distinfo	1 Dec 2005 03:39:24 -0000	1.5
>+++ distinfo	15 Apr 2007 23:06:23 -0000
>@@ -1,3 +1,3 @@
>-MD5 (blam-1.8.2.tar.bz2) = 9d8038f5cdcee2cd4dc5dc9cc602ccaf
>-SHA256 (blam-1.8.2.tar.bz2) = 154db4de714966db2bab18b562c67b3472907aebc428e618b1a04988014de548
>-SIZE (blam-1.8.2.tar.bz2) = 485604
>+MD5 (blam-1.8.4.tar.bz2) = 7ec48fece9994ed71dbb53ffa35b633e
>+SHA256 (blam-1.8.4.tar.bz2) = c867ce3638d31705d484538f0cd18ff7f8209eea56466b430db63267adde1c13
>+SIZE (blam-1.8.4.tar.bz2) = 517873
>Index: pkg-descr
>===================================================================
>RCS file: /home/ncvs/ports/net/blam/pkg-descr,v
>retrieving revision 1.4
>diff -u -r1.4 pkg-descr
>--- pkg-descr	10 Nov 2005 05:03:23 -0000	1.4
>+++ pkg-descr	15 Apr 2007 23:06:23 -0000
>@@ -10,4 +10,4 @@
> * Print the news entries you like
> * Automatically update the feeds at regular intervals
> 
>-WWW: http://www.imendio.com/projects/blam/
>+WWW: http://www.cmartin.tk/blam.html
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/net/blam/pkg-plist,v
>retrieving revision 1.6
>diff -u -r1.6 pkg-plist
>--- pkg-plist	23 Feb 2006 10:38:17 -0000	1.6
>+++ pkg-plist	15 Apr 2007 23:06:23 -0000
>@@ -8,12 +8,29 @@
> lib/blam/libblam.so
> lib/blam/libblam.so.0
> share/gnome/applications/blam.desktop
>+share/gnome/blam/themes/planet/theme.html
>+share/gnome/blam/themes/planet/planet.css
>+share/gnome/blam/themes/planet/bubble-top.png
>+share/gnome/blam/themes/planet/bubble-top-right.png
>+share/gnome/blam/themes/planet/bubble-top-left.png
>+share/gnome/blam/themes/planet/bubble-right.png
>+share/gnome/blam/themes/planet/bubble-nipple.png
>+share/gnome/blam/themes/planet/bubble-left.png
>+share/gnome/blam/themes/planet/bubble-bottom.png
>+share/gnome/blam/themes/planet/bubble-bottom-right.png
>+share/gnome/blam/themes/planet/bubble-bottom-left.png
>+share/gnome/blam/themes/pimped/theme.html
>+share/gnome/blam/themes/pimped/pimped.css
>+share/gnome/blam/themes/pimped/news.png
>+share/gnome/blam/themes/pimped/blam.png
>+share/gnome/blam/themes/blam/theme.html
>+share/gnome/blam/themes/blam/blam-box-top-right.png
>+share/gnome/blam/themes/blam/blam-box-top-left.png
>+share/gnome/blam/themes/blam/blam-box-pad.png
>+share/gnome/blam/themes/blam/blam-box-bottom-right.png
>+share/gnome/blam/themes/blam/blam-box-bottom-left.png
>+share/gnome/blam/themes/akregator/theme.html
> share/gnome/blam/collection.xml
>-share/gnome/blam/images/blam-box-bottom-left.png
>-share/gnome/blam/images/blam-box-bottom-right.png
>-share/gnome/blam/images/blam-box-pad.png
>-share/gnome/blam/images/blam-box-top-left.png
>-share/gnome/blam/images/blam-box-top-right.png
> share/gnome/pixmaps/blam.png
> share/locale/bg/LC_MESSAGES/blam.mo
> share/locale/bs/LC_MESSAGES/blam.mo
>@@ -36,24 +53,39 @@
> share/locale/it/LC_MESSAGES/blam.mo
> share/locale/ja/LC_MESSAGES/blam.mo
> share/locale/lt/LC_MESSAGES/blam.mo
>+share/locale/lv/LC_MESSAGES/blam.mo
> share/locale/nb/LC_MESSAGES/blam.mo
>+share/locale/ne/LC_MESSAGES/blam.mo
> share/locale/nl/LC_MESSAGES/blam.mo
>-share/locale/no/LC_MESSAGES/blam.mo
> share/locale/pa/LC_MESSAGES/blam.mo
> share/locale/pl/LC_MESSAGES/blam.mo
> share/locale/pt/LC_MESSAGES/blam.mo
> share/locale/pt_BR/LC_MESSAGES/blam.mo
> share/locale/rw/LC_MESSAGES/blam.mo
>+share/locale/ru/LC_MESSAGES/blam.mo
> share/locale/sq/LC_MESSAGES/blam.mo
> share/locale/sr/LC_MESSAGES/blam.mo
> share/locale/sr@Latn/LC_MESSAGES/blam.mo
> share/locale/sv/LC_MESSAGES/blam.mo
>+share/locale/sk/LC_MESSAGES/blam.mo
> share/locale/tr/LC_MESSAGES/blam.mo
> share/locale/uk/LC_MESSAGES/blam.mo
>+share/locale/vi/LC_MESSAGES/blam.mo
> share/locale/zh_CN/LC_MESSAGES/blam.mo
>+share/locale/zh_HK/LC_MESSAGES/blam.mo
> share/locale/zh_TW/LC_MESSAGES/blam.mo
>+@dirrmtry share/locale/zh_HK/LC_MESSAGES
>+@dirrmtry share/locale/zh_HK
>+@dirrmtry share/locale/sk/LC_MESSAGES
>+@dirrmtry share/locale/sk
> @dirrmtry share/locale/rw/LC_MESSAGES
> @dirrmtry share/locale/rw
>-@dirrm share/gnome/blam/images
>+@dirrmtry share/locale/ne/LC_MESSAGES
>+@dirrmtry share/locale/ne
>+@dirrm share/gnome/blam/themes/planet
>+@dirrm share/gnome/blam/themes/pimped
>+@dirrm share/gnome/blam/themes/blam
>+@dirrm share/gnome/blam/themes/akregator
>+@dirrm share/gnome/blam/themes
> @dirrm share/gnome/blam
> @dirrm lib/blam
>Index: files/extra-libblam_blam-gecko-utils.cpp
>===================================================================
>RCS file: files/extra-libblam_blam-gecko-utils.cpp
>diff -N files/extra-libblam_blam-gecko-utils.cpp
>--- files/extra-libblam_blam-gecko-utils.cpp	21 Sep 2006 02:24:31 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,11 +0,0 @@
>---- libblam/blam-gecko-utils.cpp.orig	Fri May  6 04:07:49 2005
>-+++ libblam/blam-gecko-utils.cpp	Wed Sep 20 19:15:58 2006
>-@@ -29,6 +29,8 @@
>- #include <nsEmbedString.h>
>- #include <nsIPrefService.h>
>- #include <nsIServiceManager.h>
>-+#include <nsServiceManagerUtils.h>
>-+#include <nsCOMPtr.h>
>- 
>- #if defined (HAVE_CHROME_NSICHROMEREGISTRYSEA_H)
>- #include <chrome/nsIChromeRegistrySea.h>
>Index: files/patch-blam.in
>===================================================================
>RCS file: files/patch-blam.in
>diff -N files/patch-blam.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-blam.in	15 Apr 2007 23:06:23 -0000
>@@ -0,0 +1,9 @@
>+--- blam.in.orig	Sun Apr 15 16:58:55 2007
>++++ blam.in	Sun Apr 15 16:59:02 2007
>+@@ -1,4 +1,4 @@
>+-#!/bin/bash
>++#!/bin/sh
>+ 
>+ LD_LIBRARY_PATH="@prefix@/lib/blam:@MOZILLA_HOME@${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}" MOZILLA_FIVE_HOME=@MOZILLA_HOME@ \
>+-MOZILLA_HOME=@MOZILLA_HOME@ exec -a 'blam' mono @prefix@/lib/blam/blam.exe $@
>++MOZILLA_HOME=@MOZILLA_HOME@ exec mono @prefix@/lib/blam/blam.exe $@
>Index: files/patch-src-Application.cs
>===================================================================
>RCS file: files/patch-src-Application.cs
>diff -N files/patch-src-Application.cs
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-src-Application.cs	15 Apr 2007 23:06:23 -0000
>@@ -0,0 +1,25 @@
>+--- src/Application.cs.orig	Sun Apr 15 16:59:40 2007
>++++ src/Application.cs	Sun Apr 15 17:00:45 2007
>+@@ -23,8 +23,7 @@
>+     public class Application : Program {
>+ 
>+ 	[DllImport("libc")]
>+-	private static extern int prctl(int option, byte [] arg2, ulong arg3, 
>+-    	ulong arg4, ulong arg5);
>++	private static extern void setproctitle(byte [] fmt, byte [] str_arg);
>+         
>+ 	public static Application TheApp;
>+ 
>+@@ -723,11 +722,7 @@
>+ 
>+ 	public static void SetProcessName(string name)
>+ 	{
>+-	    if(prctl(15 /* PR_SET_NAME */, Encoding.ASCII.GetBytes(name + "\0"), 
>+-        	0, 0, 0) != 0) {
>+-        	throw new ApplicationException("Error setting process name: " + 
>+-        	    Mono.Unix.Native.Stdlib.GetLastError());
>+-	    }
>++		setproctitle(Encoding.ASCII.GetBytes("%s\0"), Encoding.ASCII.GetBytes(name + "\0"));
>+ 	}
>+ 
>+         public static void Main(string[] args)

Actions: View | Diff

Attachments on bug 111635: 77519 | 77520