new gq version

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

new gq version

Mischa Diehm-4
Hi,

mbalmer@ pointed out there might be a patch for gq? I would really like
to have a newer version and can offer to test and look at a patch.

Thanks,
Mischa

Reply | Threaded
Open this post in threaded view
|

Re: new gq version

Landry Breuil-6
On Thu, Apr 02, 2009 at 12:14:47PM +0200, Mischa Diehm wrote:
> Hi,
>
> mbalmer@ pointed out there might be a patch for gq? I would really like
> to have a newer version and can offer to test and look at a patch.

I have it somewhere in one of my trees, i'll try to find it this
weekend. Don't hesitate to ping me back in case i don't post it again.

Landry

Reply | Threaded
Open this post in threaded view
|

Re: new gq version

Jasper Lievisse Adriaanse-4
On Thu, Apr 02, 2009 at 11:41:40PM +0200, Landry Breuil wrote:

> On Thu, Apr 02, 2009 at 12:14:47PM +0200, Mischa Diehm wrote:
> > Hi,
> >
> > mbalmer@ pointed out there might be a patch for gq? I would really like
> > to have a newer version and can offer to test and look at a patch.
>
> I have it somewhere in one of my trees, i'll try to find it this
> weekend. Don't hesitate to ping me back in case i don't post it again.
>
> Landry
here is a diff i have lingering around.

cheers,
jasper

--
"Intelligence should guide our actions, but in harmony with the
  texture of the situation at hand"
        -- Francisco Varela


Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/gq/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- Makefile 12 Oct 2008 17:36:03 -0000 1.27
+++ Makefile 26 Jan 2009 14:59:04 -0000
@@ -3,7 +3,7 @@
 COMMENT= GTK-based LDAP client
 
 DISTNAME= gq-1.0beta1
-PKGNAME= ${DISTNAME}p9
+PKGNAME= ${DISTNAME}p10
 CATEGORIES= databases sysutils
 
 HOMEPAGE= http://biot.com/gq/
@@ -20,13 +20,14 @@
 
 WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi \
  Xinerama Xrandr Xrender atk-1.0 c cairo crypto expat \
- fontconfig freetype glib-2.0 glitz gmodule-2.0 gobject-2.0 \
- krb5 m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png \
- sasl2 ssl z
+ fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 \
+ gobject-2.0 krb5 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
+ pixman-1 png sasl2 ssl z
 
 MODULES= devel/gettext
 
 BUILD_DEPENDS=  :cyrus-sasl-*:security/cyrus-sasl2
+RUN_DEPENDS+= ::devel/desktop-file-utils
 LIB_DEPENDS= gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 \
  ldap.>=7,lber.>=7::databases/openldap \
  xml2::textproc/libxml
@@ -37,6 +38,7 @@
 CONFIGURE_ARGS= --with-ldap-prefix=${LOCALBASE} \
  --with-sasl-prefix=${LOCALBASE} \
  --with-kerberos-prefix=/usr
+CFLAGS+= -DLDAP_DEPRECATED
 
 pre-configure:
  ${SUBST_CMD} ${WRKSRC}/src/gq.desktop
Index: patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/databases/gq/patches/patch-configure_in,v
retrieving revision 1.4
diff -u -r1.4 patch-configure_in
--- patches/patch-configure_in 12 Oct 2008 17:36:03 -0000 1.4
+++ patches/patch-configure_in 26 Jan 2009 14:59:04 -0000
@@ -1,3 +1,4 @@
+$OpenBSD$
 --- configure.in.orig Mon Nov  3 23:56:14 2003
 +++ configure.in Sun Oct 12 17:02:00 2008
 @@ -278,9 +278,9 @@ AC_CHECK_LIB(lber, ber_alloc,
Index: patches/patch-intl_dcigettext_c
===================================================================
RCS file: /cvs/ports/databases/gq/patches/patch-intl_dcigettext_c,v
retrieving revision 1.2
diff -u -r1.2 patch-intl_dcigettext_c
--- patches/patch-intl_dcigettext_c 12 Oct 2008 17:36:03 -0000 1.2
+++ patches/patch-intl_dcigettext_c 26 Jan 2009 14:59:04 -0000
@@ -1,3 +1,4 @@
+$OpenBSD$
 --- intl/dcigettext.c.orig Sat May  4 18:10:13 2002
 +++ intl/dcigettext.c Sun Oct 12 17:01:58 2008
 @@ -57,11 +57,6 @@ extern int errno;
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: patches/patch-src_Makefile_in
diff -N patches/patch-src_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Makefile_in 26 Jan 2009 14:59:04 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/Makefile.in.orig Mon Jan 26 15:54:51 2009
++++ src/Makefile.in Mon Jan 26 15:55:28 2009
+@@ -251,7 +251,7 @@ EXTRA_DIST = \
+ gq.desktop COPYING.c
+
+
+-sysdir = $(datadir)/gnome/apps/Internet
++sysdir = $(datadir)/applications/
+ sys_DATA = gq.desktop
+ subdir = src
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
Index: patches/patch-src_state_c
===================================================================
RCS file: /cvs/ports/databases/gq/patches/patch-src_state_c,v
retrieving revision 1.2
diff -u -r1.2 patch-src_state_c
--- patches/patch-src_state_c 12 Oct 2008 17:36:03 -0000 1.2
+++ patches/patch-src_state_c 26 Jan 2009 14:59:04 -0000
@@ -1,3 +1,4 @@
+$OpenBSD$
 --- src/state.c.orig Mon Nov  3 22:19:54 2003
 +++ src/state.c Sun Oct 12 17:01:58 2008
 @@ -754,7 +754,7 @@ static void state_valueE(struct parser_context *ctx,
Index: patches/patch-src_xmlparse_c
===================================================================
RCS file: /cvs/ports/databases/gq/patches/patch-src_xmlparse_c,v
retrieving revision 1.2
diff -u -r1.2 patch-src_xmlparse_c
--- patches/patch-src_xmlparse_c 12 Oct 2008 17:36:03 -0000 1.2
+++ patches/patch-src_xmlparse_c 26 Jan 2009 14:59:04 -0000
@@ -1,3 +1,4 @@
+$OpenBSD$
 --- src/xmlparse.c.orig Mon Nov  3 22:05:18 2003
 +++ src/xmlparse.c Sun Oct 12 17:01:58 2008
 @@ -51,7 +51,7 @@
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/gq/pkg/PLIST,v
retrieving revision 1.8
diff -u -r1.8 PLIST
--- pkg/PLIST 12 Oct 2008 17:36:03 -0000 1.8
+++ pkg/PLIST 26 Jan 2009 14:59:04 -0000
@@ -1,9 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.8 2008/10/12 17:36:03 ajacoutot Exp $
 @bin bin/gq
-share/gnome/
-share/gnome/apps/
-share/gnome/apps/Internet/
-share/gnome/apps/Internet/gq.desktop
+share/applications/gq.desktop
 share/pixmaps/
 share/pixmaps/gq/
 share/pixmaps/gq/bomb.xpm
@@ -13,3 +10,5 @@
 share/pixmaps/gq/new.xpm
 share/pixmaps/gq/textarea.xpm
 share/pixmaps/gq/warning.xpm
+@exec %D/bin/update-desktop-database
+@unexec %D/bin/update-desktop-database

Reply | Threaded
Open this post in threaded view
|

Re: new gq version

Landry Breuil-6
On Fri, Apr 03, 2009 at 07:42:21AM +0200, Jasper Lievisse Adriaanse wrote:

> On Thu, Apr 02, 2009 at 11:41:40PM +0200, Landry Breuil wrote:
> > On Thu, Apr 02, 2009 at 12:14:47PM +0200, Mischa Diehm wrote:
> > > Hi,
> > >
> > > mbalmer@ pointed out there might be a patch for gq? I would really like
> > > to have a newer version and can offer to test and look at a patch.
> >
> > I have it somewhere in one of my trees, i'll try to find it this
> > weekend. Don't hesitate to ping me back in case i don't post it again.
> >
> > Landry
> here is a diff i have lingering around.
And here's one for the latest version (1.3.4), resurrected from one of
my dead trees, tested on i386/sparc64 against db.debian.org. Not tested
TLS as i don't have an ldaps:// around, but more testing is welcomed.

Landry

gq-1.3.4.diff (18K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: new gq version

Marc Balmer-2

Am 06.04.2009 um 22:48 schrieb Landry Breuil:

> On Fri, Apr 03, 2009 at 07:42:21AM +0200, Jasper Lievisse Adriaanse  
> wrote:
>> On Thu, Apr 02, 2009 at 11:41:40PM +0200, Landry Breuil wrote:
>>> On Thu, Apr 02, 2009 at 12:14:47PM +0200, Mischa Diehm wrote:
>>>> Hi,
>>>>
>>>> mbalmer@ pointed out there might be a patch for gq? I would  
>>>> really like
>>>> to have a newer version and can offer to test and look at a patch.
>>>
>>> I have it somewhere in one of my trees, i'll try to find it this
>>> weekend. Don't hesitate to ping me back in case i don't post it  
>>> again.
>>>
>>> Landry
>> here is a diff i have lingering around.
>
> And here's one for the latest version (1.3.4), resurrected from one of
> my dead trees, tested on i386/sparc64 against db.debian.org. Not  
> tested
> TLS as i don't have an ldaps:// around, but more testing is welcomed.
>

I tested it, works like a charm, even with TLS.  I tested against  
several
LDAP servers, some of them quite big.

ok by me.