Re: UPDATE: Pidgin / Finch 2.6.1
Hi Brad, Do you have a newer diff vs. the PIdgin v2.5.9 in ports? I was working on trying to get farsight2 working but I realized it wants gstreamer 0.10.24 and we're at 0.10.19. With libnice in ports, all that's needed is an updated gstreamer and we can have Jingle support in Pidgin. Tom
Re: UPDATE: Pidgin / Finch 2.6.1
On Tue, 25 Aug 2009, Tom wrote: Hi Brad, Do you have a newer diff vs. the PIdgin v2.5.9 in ports? I was working on trying to get farsight2 working but I realized it wants gstreamer 0.10.24 and we're at 0.10.19. With libnice in ports, all that's needed is an updated gstreamer and we can have Jingle support in Pidgin. To have an updated gstreamer, we need an updated flex(1) in base. -- Antoine
Re: UPDATE: Pidgin / Finch 2.6.1
On 2009/08/25 11:48, Antoine Jacoutot wrote: On Tue, 25 Aug 2009, Tom wrote: Hi Brad, Do you have a newer diff vs. the PIdgin v2.5.9 in ports? I was working on trying to get farsight2 working but I realized it wants gstreamer 0.10.24 and we're at 0.10.19. With libnice in ports, all that's needed is an updated gstreamer and we can have Jingle support in Pidgin. To have an updated gstreamer, we need an updated flex(1) in base. and we need -P in m4(1) before we can update flex(1) in base, either my diff or an equivalent. I think we also needed an updated ffmpeg somewhere in the chain before we can update gstreamer, too. Or maybe that was afterwards, I can't quite remember...
Re: UPDATE: Pidgin / Finch 2.6.1
On Mon, Aug 24, 2009 at 09:22:44PM -0700, Aaron Stellman wrote:
On Mon, Aug 24, 2009 at 11:29:37PM -0400, Brad wrote:
Here is an update to Pidgin / Finch 2.6.1.
I am more so looking for some Finch users to try that out but
some testing of Pidgin wouldn't hurt either.
Index: Makefile
===
RCS file: /cvs/ports/net/pidgin/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- Makefile10 Aug 2009 06:33:43 - 1.49
+++ Makefile25 Aug 2009 03:07:18 -
@@ -6,20 +6,21 @@ COMMENT-main= multi-protocol instant mes
COMMENT-finch= multi-protocol instant messaging client, console client
COMMENT-libpurple= multi-protocol instant messaging library
-VERSION= 2.5.8
+VERSION= 2.6.1
The pidgin port has been updated to 2.5.9 several days ago. Your patch
doesn't apply.
oops. I was updating to 2.6.1 in a separate dir while also working on 2.5.9
and forgot to update my separate dir after 2.5.9 was commited.
Index: Makefile
===
RCS file: /cvs/ports/net/pidgin/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- Makefile20 Aug 2009 10:43:13 - 1.51
+++ Makefile25 Aug 2009 14:38:42 -
@@ -6,7 +6,7 @@ COMMENT-main= multi-protocol instant mes
COMMENT-finch= multi-protocol instant messaging client, console client
COMMENT-libpurple= multi-protocol instant messaging library
-VERSION= 2.5.9
+VERSION= 2.6.1
DISTNAME= pidgin-${VERSION}
PKGNAME= pidgin-${VERSION}
PKGNAME-main= pidgin-${VERSION}
@@ -17,9 +17,10 @@ MASTER_SITES=${MASTER_SITE_SOURCEFORGE:
SHARED_LIBS= jabber 0.0 \
oscar 0.0 \
- purple 4.7 \
- purple-client 4.7 \
- gnt 4.7
+ purple 5.0 \
+ purple-client 5.0 \
+ gnt 5.0 \
+ ymsg0.0
HOMEPAGE= http://pidgin.im/
@@ -32,18 +33,18 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c dbus-1 dbus-glib-1 glib-2.0 gmodule-2.0 gobject-2.0 \
- gthread-2.0 iconv intl m ncurses pcre pthread xml2 z
+ gthread-2.0 iconv intl m pcre pthread xml2 z
-WANTLIB-main= ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
+WANTLIB-main= X11 Xau Xdmcp ICE SM Xcomposite Xcursor Xdamage Xext \
Xfixes Xi Xinerama Xrandr Xrender Xss atk-1.0 cairo \
- execinfo expat fontconfig freetype gdk-x11-2.0 \
- gdk_pixbuf-2.0 gio-2.0 glitz gtk-x11-2.0 pango-1.0 \
- pangocairo-1.0 pangoft2-1.0 pixman-1 png pthread-stubs \
- stdc++ xcb xcb-atom xcb-aux xcb-event ${WANTLIB}
+ execinfo expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 \
+ gio-2.0 glitz gtk-x11-2.0 pango-1.0 pangocairo-1.0 \
+ pangoft2-1.0 pixman-1 png pthread-stubs stdc++ xcb-atom \
+ xcb-aux xcb-event xcb ${WANTLIB}
WANTLIB-libpurple= crypto ssl ${WANTLIB}
-WANTLIB-finch= X11 Xau Xdmcp panel pthread-stubs xcb ${WANTLIB}
+WANTLIB-finch= X11 Xau Xdmcp ncurses panel pthread-stubs xcb ${WANTLIB}
MODULES= devel/gettext \
textproc/intltool \
@@ -74,15 +75,18 @@ USE_GMAKE= Yes
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.61
CONFIGURE_ARGS+= --disable-avahi \
+--disable-cap \
--disable-doxygen \
+--disable-farsight \
--disable-gevolution \
--disable-gnutls \
+--disable-idn \
--disable-nm \
--disable-nss \
--disable-perl \
--disable-tcl \
--disable-tk \
---disable-cap \
+--disable-vv \
--with-python=${MODPY_BIN}
# XXX prevent a fatal error at install phase
CONFIGURE_ARGS+= --disable-schemas-install
@@ -102,8 +106,6 @@ LIB_DEPENDS-main+= gstreamer-0.10:gstrea
LIB_DEPENDS-finch+=
gstreamer-0.10:gstreamer-=0.10,=0.11:multimedia/gstreamer-0.10/core
.else
CONFIGURE_ARGS+= --disable-gstreamer
-# --disable-gstreamer is not sufficient
-MAKE_FLAGS+=GSTREAMER_CFLAGS= GSTREAMER_LIBS=
.endif
.if ${FLAVOR:L:Mgtkspell}
Index: distinfo
===
RCS file: /cvs/ports/net/pidgin/distinfo,v
retrieving revision 1.22
diff -u -p -r1.22 distinfo
--- distinfo20 Aug 2009 10:43:13 - 1.22
+++ distinfo19 Aug 2009 20:11:13 -
@@ -1,5 +1,5 @@
-MD5 (pidgin-2.5.9.tar.gz) = bR6qW8PVIj/P41g6mDefpg==
-RMD160 (pidgin-2.5.9.tar.gz) = QraN7BOdzZByfzO+fiRF9EV0gd8=
-SHA1 (pidgin-2.5.9.tar.gz) = +pOTEa7s7/HXTMi1+ge8LynThqY=
-SHA256 (pidgin-2.5.9.tar.gz) = /NcaaDyeiL2Z3fF4jnwT0EvBS17EwYmfYuKOtYp6N+k=
Re: UPDATE: Pidgin / Finch 2.6.1
On Tue, 25 Aug 2009 16:42:13 +0200, Brad wrote: On Mon, Aug 24, 2009 at 09:22:44PM -0700, Aaron Stellman wrote: On Mon, Aug 24, 2009 at 11:29:37PM -0400, Brad wrote: Here is an update to Pidgin / Finch 2.6.1. I am more so looking for some Finch users to try that out but some testing of Pidgin wouldn't hurt either. The pidgin port has been updated to 2.5.9 several days ago. Your patch doesn't apply. oops. I was updating to 2.6.1 in a separate dir while also working on 2.5.9 and forgot to update my separate dir after 2.5.9 was commited. It still doesn't apply, I'm afraid. A few files in your patches dir appear to be outdated. Also, it's worth mentioning that the diff should be applied with `patch -E'. Regards, Tim
Re: UPDATE: Pidgin / Finch 2.6.1
On 2009/08/25 17:57, Tim van der Molen wrote:
On Tue, 25 Aug 2009 16:42:13 +0200, Brad wrote:
On Mon, Aug 24, 2009 at 09:22:44PM -0700, Aaron Stellman wrote:
On Mon, Aug 24, 2009 at 11:29:37PM -0400, Brad wrote:
Here is an update to Pidgin / Finch 2.6.1.
I am more so looking for some Finch users to try that out but
some testing of Pidgin wouldn't hurt either.
The pidgin port has been updated to 2.5.9 several days ago. Your patch
doesn't apply.
oops. I was updating to 2.6.1 in a separate dir while also working on 2.5.9
and forgot to update my separate dir after 2.5.9 was commited.
It still doesn't apply, I'm afraid. A few files in your patches dir
appear to be outdated.
Also, it's worth mentioning that the diff should be applied with `patch
-E'.
Regards,
Tim
I've just built this one on amd64.
Index: Makefile
===
RCS file: /cvs/ports/net/pidgin/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- Makefile20 Aug 2009 10:43:13 - 1.51
+++ Makefile25 Aug 2009 16:05:18 -
@@ -6,7 +6,7 @@ COMMENT-main= multi-protocol instant mes
COMMENT-finch= multi-protocol instant messaging client, console client
COMMENT-libpurple= multi-protocol instant messaging library
-VERSION= 2.5.9
+VERSION= 2.6.1
DISTNAME= pidgin-${VERSION}
PKGNAME= pidgin-${VERSION}
PKGNAME-main= pidgin-${VERSION}
@@ -17,9 +17,10 @@ MASTER_SITES=${MASTER_SITE_SOURCEFORGE:
SHARED_LIBS= jabber 0.0 \
oscar 0.0 \
- purple 4.7 \
- purple-client 4.7 \
- gnt 4.7
+ purple 5.0 \
+ purple-client 5.0 \
+ gnt 5.0 \
+ ymsg0.0
HOMEPAGE= http://pidgin.im/
@@ -32,18 +33,18 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c dbus-1 dbus-glib-1 glib-2.0 gmodule-2.0 gobject-2.0 \
- gthread-2.0 iconv intl m ncurses pcre pthread xml2 z
+ gthread-2.0 iconv intl m pcre pthread xml2 z
-WANTLIB-main= ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
+WANTLIB-main= X11 Xau Xdmcp ICE SM Xcomposite Xcursor Xdamage Xext \
Xfixes Xi Xinerama Xrandr Xrender Xss atk-1.0 cairo \
- execinfo expat fontconfig freetype gdk-x11-2.0 \
- gdk_pixbuf-2.0 gio-2.0 glitz gtk-x11-2.0 pango-1.0 \
- pangocairo-1.0 pangoft2-1.0 pixman-1 png pthread-stubs \
- stdc++ xcb xcb-atom xcb-aux xcb-event ${WANTLIB}
+ execinfo expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 \
+ gio-2.0 glitz gtk-x11-2.0 pango-1.0 pangocairo-1.0 \
+ pangoft2-1.0 pixman-1 png pthread-stubs stdc++ xcb-atom \
+ xcb-aux xcb-event xcb ${WANTLIB}
WANTLIB-libpurple= crypto ssl ${WANTLIB}
-WANTLIB-finch= X11 Xau Xdmcp panel pthread-stubs xcb ${WANTLIB}
+WANTLIB-finch= X11 Xau Xdmcp ncurses panel pthread-stubs xcb ${WANTLIB}
MODULES= devel/gettext \
textproc/intltool \
@@ -74,15 +75,18 @@ USE_GMAKE= Yes
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.61
CONFIGURE_ARGS+= --disable-avahi \
+--disable-cap \
--disable-doxygen \
+--disable-farsight \
--disable-gevolution \
--disable-gnutls \
+--disable-idn \
--disable-nm \
--disable-nss \
--disable-perl \
--disable-tcl \
--disable-tk \
---disable-cap \
+--disable-vv \
--with-python=${MODPY_BIN}
# XXX prevent a fatal error at install phase
CONFIGURE_ARGS+= --disable-schemas-install
@@ -102,8 +106,6 @@ LIB_DEPENDS-main+= gstreamer-0.10:gstrea
LIB_DEPENDS-finch+=
gstreamer-0.10:gstreamer-=0.10,=0.11:multimedia/gstreamer-0.10/core
.else
CONFIGURE_ARGS+= --disable-gstreamer
-# --disable-gstreamer is not sufficient
-MAKE_FLAGS+=GSTREAMER_CFLAGS= GSTREAMER_LIBS=
.endif
.if ${FLAVOR:L:Mgtkspell}
Index: distinfo
===
RCS file: /cvs/ports/net/pidgin/distinfo,v
retrieving revision 1.22
diff -u -p -r1.22 distinfo
--- distinfo20 Aug 2009 10:43:13 - 1.22
+++ distinfo25 Aug 2009 16:05:18 -
@@ -1,5 +1,5 @@
-MD5 (pidgin-2.5.9.tar.gz) = bR6qW8PVIj/P41g6mDefpg==
-RMD160 (pidgin-2.5.9.tar.gz) = QraN7BOdzZByfzO+fiRF9EV0gd8=
-SHA1 (pidgin-2.5.9.tar.gz) = +pOTEa7s7/HXTMi1+ge8LynThqY=
-SHA256 (pidgin-2.5.9.tar.gz) = /NcaaDyeiL2Z3fF4jnwT0EvBS17EwYmfYuKOtYp6N+k=
-SIZE (pidgin-2.5.9.tar.gz) = 11932429
+MD5 (pidgin-2.6.1.tar.gz) = VdYl1984EcubpzS2N5G2eQ==
+RMD160 (pidgin-2.6.1.tar.gz) = lkcNMzOqP5fLbJLnCChasp+dKFs=
+SHA1 (pidgin-2.6.1.tar.gz) =
Re: UPDATE: Pidgin / Finch 2.6.1
On Tue, 25 Aug 2009 18:05:55 +0200, Stuart Henderson wrote:
On 2009/08/25 17:57, Tim van der Molen wrote:
On Tue, 25 Aug 2009 16:42:13 +0200, Brad wrote:
On Mon, Aug 24, 2009 at 09:22:44PM -0700, Aaron Stellman wrote:
On Mon, Aug 24, 2009 at 11:29:37PM -0400, Brad wrote:
Here is an update to Pidgin / Finch 2.6.1.
I am more so looking for some Finch users to try that out but
some testing of Pidgin wouldn't hurt either.
The pidgin port has been updated to 2.5.9 several days ago. Your patch
doesn't apply.
oops. I was updating to 2.6.1 in a separate dir while also working on
2.5.9
and forgot to update my separate dir after 2.5.9 was commited.
It still doesn't apply, I'm afraid. A few files in your patches dir
appear to be outdated.
Also, it's worth mentioning that the diff should be applied with `patch
-E'.
Regards,
Tim
I've just built this one on amd64.
That works. Thanks.
Regards,
Tim
Index: Makefile
===
RCS file: /cvs/ports/net/pidgin/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- Makefile 20 Aug 2009 10:43:13 - 1.51
+++ Makefile 25 Aug 2009 16:05:18 -
@@ -6,7 +6,7 @@ COMMENT-main= multi-protocol instant mes
COMMENT-finch= multi-protocol instant messaging client, console client
COMMENT-libpurple= multi-protocol instant messaging library
-VERSION= 2.5.9
+VERSION= 2.6.1
DISTNAME=pidgin-${VERSION}
PKGNAME= pidgin-${VERSION}
PKGNAME-main=pidgin-${VERSION}
@@ -17,9 +17,10 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:
SHARED_LIBS= jabber 0.0 \
oscar 0.0 \
- purple 4.7 \
- purple-client 4.7 \
- gnt 4.7
+ purple 5.0 \
+ purple-client 5.0 \
+ gnt 5.0 \
+ ymsg0.0
HOMEPAGE=http://pidgin.im/
@@ -32,18 +33,18 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP=Yes
WANTLIB= c dbus-1 dbus-glib-1 glib-2.0 gmodule-2.0 gobject-2.0 \
- gthread-2.0 iconv intl m ncurses pcre pthread xml2 z
+ gthread-2.0 iconv intl m pcre pthread xml2 z
-WANTLIB-main=ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
+WANTLIB-main=X11 Xau Xdmcp ICE SM Xcomposite Xcursor Xdamage Xext \
Xfixes Xi Xinerama Xrandr Xrender Xss atk-1.0 cairo \
- execinfo expat fontconfig freetype gdk-x11-2.0 \
- gdk_pixbuf-2.0 gio-2.0 glitz gtk-x11-2.0 pango-1.0 \
- pangocairo-1.0 pangoft2-1.0 pixman-1 png pthread-stubs \
- stdc++ xcb xcb-atom xcb-aux xcb-event ${WANTLIB}
+ execinfo expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 \
+ gio-2.0 glitz gtk-x11-2.0 pango-1.0 pangocairo-1.0 \
+ pangoft2-1.0 pixman-1 png pthread-stubs stdc++ xcb-atom \
+ xcb-aux xcb-event xcb ${WANTLIB}
WANTLIB-libpurple= crypto ssl ${WANTLIB}
-WANTLIB-finch= X11 Xau Xdmcp panel pthread-stubs xcb ${WANTLIB}
+WANTLIB-finch= X11 Xau Xdmcp ncurses panel pthread-stubs xcb ${WANTLIB}
MODULES= devel/gettext \
textproc/intltool \
@@ -74,15 +75,18 @@ USE_GMAKE=Yes
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.61
CONFIGURE_ARGS+= --disable-avahi \
+ --disable-cap \
--disable-doxygen \
+ --disable-farsight \
--disable-gevolution \
--disable-gnutls \
+ --disable-idn \
--disable-nm \
--disable-nss \
--disable-perl \
--disable-tcl \
--disable-tk \
- --disable-cap \
+ --disable-vv \
--with-python=${MODPY_BIN}
# XXX prevent a fatal error at install phase
CONFIGURE_ARGS+= --disable-schemas-install
@@ -102,8 +106,6 @@ LIB_DEPENDS-main+=gstreamer-0.10:gstrea
LIB_DEPENDS-finch+=
gstreamer-0.10:gstreamer-=0.10,=0.11:multimedia/gstreamer-0.10/core
.else
CONFIGURE_ARGS+= --disable-gstreamer
-# --disable-gstreamer is not sufficient
-MAKE_FLAGS+=GSTREAMER_CFLAGS= GSTREAMER_LIBS=
.endif
.if ${FLAVOR:L:Mgtkspell}
Index: distinfo
===
RCS file: /cvs/ports/net/pidgin/distinfo,v
retrieving revision 1.22
diff -u -p -r1.22 distinfo
--- distinfo 20 Aug 2009 10:43:13 - 1.22
+++ distinfo 25 Aug 2009 16:05:18 -
@@ -1,5 +1,5 @@
-MD5 (pidgin-2.5.9.tar.gz) = bR6qW8PVIj/P41g6mDefpg==
-RMD160 (pidgin-2.5.9.tar.gz) = QraN7BOdzZByfzO+fiRF9EV0gd8=
-SHA1 (pidgin-2.5.9.tar.gz) = +pOTEa7s7/HXTMi1+ge8LynThqY=
-SHA256 (pidgin-2.5.9.tar.gz) = /NcaaDyeiL2Z3fF4jnwT0EvBS17EwYmfYuKOtYp6N+k=
-SIZE (pidgin-2.5.9.tar.gz) =
