OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 19-Sep-2006 09:30:39
Branch: HEAD Handle: 2006091908303600
Modified files:
openpkg-src/gq gq.patch gq.spec
Log:
upgrading package: gq 1.1.0 -> 1.1.3
Summary:
Revision Changes Path
1.4 +39 -105 openpkg-src/gq/gq.patch
1.17 +4 -3 openpkg-src/gq/gq.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gq/gq.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 gq.patch
--- openpkg-src/gq/gq.patch 27 Aug 2006 10:24:34 -0000 1.3
+++ openpkg-src/gq/gq.patch 19 Sep 2006 07:30:36 -0000 1.4
@@ -1,90 +1,27 @@
Index: configure
---- configure.orig 2006-08-04 16:32:02 +0200
-+++ configure 2006-08-27 12:18:46 +0200
-@@ -4279,12 +4279,10 @@
- if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"glib-2.0 >= 2.6
- gtk+-2.0 >= 2.6
-- gnome-keyring-1
- libglade-2.0
- libxml-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.6
- gtk+-2.0 >= 2.6
-- gnome-keyring-1
- libglade-2.0
- libxml-2.0") 2>&5
- ac_status=$?
-@@ -4292,7 +4290,6 @@
- (exit $ac_status); }; then
- pkg_cv_GQ_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.6
- gtk+-2.0 >= 2.6
-- gnome-keyring-1
- libglade-2.0
- libxml-2.0" 2>/dev/null`
- else
-@@ -4309,12 +4306,10 @@
- if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"glib-2.0 >= 2.6
- gtk+-2.0 >= 2.6
-- gnome-keyring-1
- libglade-2.0
- libxml-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.6
- gtk+-2.0 >= 2.6
-- gnome-keyring-1
- libglade-2.0
- libxml-2.0") 2>&5
- ac_status=$?
-@@ -4322,7 +4317,6 @@
- (exit $ac_status); }; then
- pkg_cv_GQ_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.6
- gtk+-2.0 >= 2.6
-- gnome-keyring-1
- libglade-2.0
- libxml-2.0" 2>/dev/null`
- else
-@@ -4345,13 +4339,11 @@
- if test $_pkg_short_errors_supported = yes; then
- GQ_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout
--print-errors "glib-2.0 >= 2.6
- gtk+-2.0 >= 2.6
-- gnome-keyring-1
- libglade-2.0
- libxml-2.0"`
- else
- GQ_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors
"glib-2.0 >= 2.6
- gtk+-2.0 >= 2.6
-- gnome-keyring-1
- libglade-2.0
- libxml-2.0"`
- fi
-@@ -4360,7 +4352,6 @@
-
- { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.6
- gtk+-2.0 >= 2.6
-- gnome-keyring-1
- libglade-2.0
- libxml-2.0) were not met:
-
-@@ -4375,7 +4366,6 @@
- " >&5
- echo "$as_me: error: Package requirements (glib-2.0 >= 2.6
- gtk+-2.0 >= 2.6
-- gnome-keyring-1
- libglade-2.0
- libxml-2.0) were not met:
-
+--- configure.orig 2006-09-18 16:37:20 +0200
++++ configure 2006-09-19 09:26:06 +0200
+@@ -4208,7 +4208,7 @@
+
+ case "$with_keyring_api" in
+ "gnome")
+- gnome_keyring="gnome-keyring-1 >= 0.4.4"
++ gnome_keyring=""
+ ;;
+ "apple")
+ gnome_keyring=""
Index: src/gq-keyring.c
---- src/gq-keyring.c.orig 2006-08-04 14:34:22 +0200
-+++ src/gq-keyring.c 2006-08-27 12:18:46 +0200
+--- src/gq-keyring.c.orig 2006-09-15 12:20:26 +0200
++++ src/gq-keyring.c 2006-09-19 09:27:25 +0200
@@ -27,6 +27,7 @@
- gq_keyring_attribute_list_from_server(struct ldapserver* server) {
+ gq_keyring_attribute_list_from_server(GqServer* server) {
GnomeKeyringAttributeList* attributes = NULL;
+#if 0
g_return_val_if_fail(GQ_IS_SERVER(server), NULL);
attributes = gnome_keyring_attribute_list_new();
-@@ -34,14 +35,18 @@
+@@ -34,20 +35,25 @@
gnome_keyring_attribute_list_append_string(attributes, "server",
server->ldaphost);
gnome_keyring_attribute_list_append_uint32(attributes, "port",
server->ldapport);
gnome_keyring_attribute_list_append_string(attributes, "protocol",
"ldap");
@@ -93,7 +30,7 @@
}
static GList*
- gq_keyring_find_servers(struct ldapserver* server) {
+ gq_keyring_find_servers(GqServer* server) {
+#if 0
GnomeKeyringAttributeList* list = NULL;
+#endif
@@ -103,20 +40,21 @@
list = gq_keyring_attribute_list_from_server(server);
// FIXME: do async
// FIXME: check result
-@@ -49,11 +54,13 @@
+ gnome_keyring_find_items_sync(GNOME_KEYRING_ITEM_NETWORK_PASSWORD,
list, &found);
gnome_keyring_attribute_list_free(list);
list = NULL;
-
+#endif
+
return found;
}
+@@ -59,6 +65,7 @@
- void
- gq_keyring_forget_password(struct ldapserver* server) {
-+#if 0
- GList* ret = NULL,
- * item;
+ g_return_if_fail(GQ_IS_SERVER(server));
++#if 0
+ if(!gnome_keyring_is_available()) {
+ return;
+ }
@@ -72,15 +79,19 @@
}
@@ -125,10 +63,10 @@
}
gchar*
- gq_keyring_get_password(struct ldapserver* server) {
-+#if 0
+ gq_keyring_get_password(GqServer* server) {
GList* found = NULL;
GList* item;
++#if 0
GnomeKeyringAttributeList* list = NULL;
+#endif
gchar* retval = NULL;
@@ -146,7 +84,7 @@
}
void
- gq_keyring_save_server_password(struct ldapserver* server) {
+ gq_keyring_save_server_password(GqServer* server) {
+#if 0
GnomeKeyringAttributeList* list = NULL;
gchar* display_name = NULL;
@@ -159,9 +97,9 @@
}
Index: src/gq-keyring.h
---- src/gq-keyring.h.orig 2006-05-19 18:00:27 +0200
-+++ src/gq-keyring.h 2006-08-27 12:21:08 +0200
-@@ -24,17 +24,25 @@
+--- src/gq-keyring.h.orig 2006-09-15 12:20:26 +0200
++++ src/gq-keyring.h 2006-09-19 09:26:06 +0200
+@@ -24,7 +24,11 @@
#ifndef GQ_KEYRING_H
#define GQ_KEYRING_H
@@ -173,23 +111,19 @@
#include "common.h" // for ldapserver
G_BEGIN_DECLS
-
-+
- GnomeKeyringAttributeList*
- gq_keyring_attribute_list_from_server(struct ldapserver* server);
- void gq_keyring_forget_password (struct ldapserver* server);
- gchar* gq_keyring_get_password (struct ldapserver*
server);
- void gq_keyring_save_server_password (struct ldapserver*
server);
+@@ -35,6 +39,9 @@
+ gchar* gq_keyring_get_password (GqServer* server);
+ void gq_keyring_save_server_password (GqServer* server);
+#define gnome_keyring_is_available() 0
+#define gnome_keyring_free_password(n) (void)0
-+
++
G_END_DECLS
#endif /* !GQ_KEYRING_H */
Index: src/state.c
---- src/state.c.orig 2006-05-23 19:14:47 +0200
-+++ src/state.c 2006-08-27 12:18:46 +0200
+--- src/state.c.orig 2006-09-15 12:20:28 +0200
++++ src/state.c 2006-09-19 09:26:06 +0200
@@ -744,7 +744,7 @@
}
}
@@ -198,10 +132,10 @@
+ if (n != NULL && v!=NULL && v->type != 0) {
char *ep;
- assert(v);
+ g_assert(v);
Index: src/xmlparse.c
---- src/xmlparse.c.orig 2006-05-23 18:16:42 +0200
-+++ src/xmlparse.c 2006-08-27 12:18:46 +0200
+--- src/xmlparse.c.orig 2006-09-15 12:20:26 +0200
++++ src/xmlparse.c 2006-09-19 09:26:06 +0200
@@ -51,7 +51,7 @@
#include "xmlparse.h"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gq/gq.spec
============================================================================
$ cvs diff -u -r1.16 -r1.17 gq.spec
--- openpkg-src/gq/gq.spec 27 Aug 2006 10:24:34 -0000 1.16
+++ openpkg-src/gq/gq.spec 19 Sep 2006 07:30:36 -0000 1.17
@@ -23,8 +23,8 @@
##
# package version
-%define V_dist 1.1.0
-%define V_opkg 1.1.0
+%define V_dist 1.1.3
+%define V_opkg 1.1.3
# package information
Name: gq
@@ -37,7 +37,7 @@
Group: Database
License: GPL
Version: %{V_opkg}
-Release: 20060827
+Release: 20060919
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/gqclient/gq-%{V_dist}.tar.gz
@@ -80,6 +80,7 @@
--prefix=%{l_prefix} \
--with-ldap-prefix=%{l_prefix} \
--with-ssl-prefix=%{l_prefix} \
+ --disable-update-mimedb \
--disable-nls
%{l_make} %{l_mflags -O}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
