rpms/balsa/devel .cvsignore, 1.28, 1.29 balsa-gmime-537507.patch, 1.1, 1.2 balsa.spec, 1.46, 1.47 sources, 1.28, 1.29
Pawel Salek
pawsa at fedoraproject.org
Mon Mar 2 21:17:43 UTC 2009
- Previous message (by thread): rpms/levien-inconsolata-fonts/devel levien-inconsolata-fonts.spec, 1.1, 1.2
- Next message (by thread): rpms/snake/devel .cvsignore, 1.10, 1.11 import.log, 1.5, 1.6 snake.spec, 1.19, 1.20 sources, 1.18, 1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pawsa
Update of /cvs/pkgs/rpms/balsa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9948
Modified Files:
.cvsignore balsa-gmime-537507.patch balsa.spec sources
Log Message:
- upgrade to 2.3.28. Fix bug 487780.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/balsa/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore 7 Sep 2008 20:16:10 -0000 1.28
+++ .cvsignore 2 Mar 2009 21:17:13 -0000 1.29
@@ -1 +1 @@
-balsa-2.3.26.tar.bz2
+balsa-2.3.28.tar.bz2
balsa-gmime-537507.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 balsa-gmime-537507.patch
Index: balsa-gmime-537507.patch
===================================================================
RCS file: /cvs/pkgs/rpms/balsa/devel/balsa-gmime-537507.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- balsa-gmime-537507.patch 18 Dec 2008 21:31:53 -0000 1.1
+++ balsa-gmime-537507.patch 2 Mar 2009 21:17:13 -0000 1.2
@@ -1,849 +1,861 @@
-Index: src/balsa-mime-widget-message.c
-===================================================================
---- src/balsa-mime-widget-message.c (revision 7967)
-+++ src/balsa-mime-widget-message.c (working copy)
-@@ -305,9 +305,9 @@
-
- /* create a message */
- message = libbalsa_message_new();
-- data = internet_address_to_string(balsa_app.current_ident->ia, FALSE);
-- message->headers->from = internet_address_parse_string(data);
-- g_free(data);
-+ message->headers->from = internet_address_list_new();
-+ internet_address_list_add(message->headers->from,
-+ balsa_app.current_ident->ia);
-
- data = libbalsa_message_body_get_parameter(mime_body, "subject");
- if (data) {
-@@ -316,7 +316,7 @@
- }
-
- data = libbalsa_message_body_get_parameter(mime_body, "server");
-- message->headers->to_list = internet_address_parse_string(data);
-+ message->headers->to_list = internet_address_list_parse_string(data);
- g_free(data);
+diff -ur balsa-2.3.28-orig/configure.in balsa-2.3.28/configure.in
+--- balsa-2.3.28-orig/configure.in 2009-01-18 17:46:40.000000000 +0100
++++ balsa-2.3.28/configure.in 2009-03-02 21:50:03.000000000 +0100
+@@ -371,7 +371,7 @@
+ PKG_CHECK_MODULES(BALSA, [
+ glib-2.0
+ gtk+-2.0 >= 2.4
+-gmime-2.0 >= 2.1.9
++gmime-2.4 >= 2.3.8
+ gconf-2.0
+ $gio_extra
+ $gnome_extras
+@@ -382,7 +382,7 @@
+ libgnome-2.0 libgnomeui-2.0
+ glib-2.0
+ gtk+-2.0 >= 2.4
+- gmime-2.0 >= 2.1.9
++ gmime-2.4 >= 2.3.8
+ ])
- /* the original body my have some data to be returned as commands... */
-@@ -614,7 +614,7 @@
- {
- gchar *value;
+ dnl ##########################################################################
+@@ -951,16 +951,6 @@
+ dnl things that it fixes, for eg. user installs, package builds etc.
+ dnl AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache)
-- if (list == NULL)
-+ if (list == NULL || internet_address_list_length(list) == 0)
- return;
+-dnl check GMime version
+-if $PKG_CONFIG --atleast-version=2.2.5 gmime-2.0 ; then
+- AC_DEFINE(HAVE_GMIME_2_2_5,1,[Defined when GMime is at least version
+- 2.2.5.])
+-fi
+-if $PKG_CONFIG --atleast-version=2.2.7 gmime-2.0 ; then
+- AC_DEFINE(HAVE_GMIME_2_2_7,1,[Defined when GMime is at least version
+- 2.2.7.])
+-fi
+-
+ dnl #####################################################################
+ dnl 8. Output
+ dnl #####################################################################
+diff -ur balsa-2.3.28-orig/libbalsa/abook-completion.c balsa-2.3.28/libbalsa/abook-completion.c
+--- balsa-2.3.28-orig/libbalsa/abook-completion.c 2007-01-01 20:13:32.000000000 +0100
++++ balsa-2.3.28/libbalsa/abook-completion.c 2009-03-02 21:50:03.000000000 +0100
+@@ -46,7 +46,7 @@
- if (!(bm->shown_headers == HEADERS_ALL ||
-Index: src/store-address.c
-===================================================================
---- src/store-address.c (revision 7967)
-+++ src/store-address.c (working copy)
-@@ -59,13 +59,13 @@
- StoreAddressInfo * info);
- static void store_address_add_address(StoreAddressInfo * info,
- const gchar * label,
-- const InternetAddress * address,
-- const InternetAddress * group);
-+ InternetAddress * address,
-+ InternetAddress * group);
- static void store_address_add_lbaddress(StoreAddressInfo * info,
- const LibBalsaAddress *address);
- static void store_address_add_list(StoreAddressInfo * info,
- const gchar * label,
-- const InternetAddressList * list);
-+ InternetAddressList * list);
+ ret = g_new0(CompletionData, 1);
- /*
- * public interface: balsa_store_address
-@@ -348,8 +348,8 @@
- * make a new page in the notebook */
- static void
- store_address_add_address(StoreAddressInfo * info,
-- const gchar * lab, const InternetAddress * ia,
-- const InternetAddress * group)
-+ const gchar * lab, InternetAddress * ia,
-+ InternetAddress * group)
- {
- gchar *text;
- LibBalsaAddress *address;
-@@ -366,7 +366,7 @@
- address = libbalsa_address_new();
- address->full_name =
- g_strdup(ia->name ? ia->name : group ? group->name : NULL);
-- address->address_list = g_list_prepend(NULL, g_strdup(ia->value.addr));
-+ address->address_list = g_list_prepend(NULL, g_strdup(INTERNET_ADDRESS_MAILBOX (ia)->addr));
- ew = libbalsa_address_get_edit_widget(address, entries, NULL, NULL);
- g_object_unref(address);
+- internet_address_ref(ia);
++ g_object_ref(ia);
+ ret->ia = ia;
-@@ -409,20 +409,22 @@
- static void
- store_address_add_list(StoreAddressInfo * info,
- const gchar * label,
-- const InternetAddressList * list)
-+ InternetAddressList * list)
+ string = g_string_new(nick_name);
+@@ -78,7 +78,7 @@
+ void
+ completion_data_free(CompletionData * data)
{
-- for (; list; list = list->next) {
-- InternetAddress *ia = list->address;
--
-- if (ia->type == INTERNET_ADDRESS_NAME)
-+ int i, j;
-+
-+ for (i = 0; i < internet_address_list_length (list); i++) {
-+ InternetAddress *ia = internet_address_list_get_address (list, i);
-+
-+ if (INTERNET_ADDRESS_IS_MAILBOX (ia))
- store_address_add_address(info, label, ia, NULL);
-- else if (ia->type == INTERNET_ADDRESS_GROUP) {
-- InternetAddressList *member;
-+ else {
-+ InternetAddressList *members = INTERNET_ADDRESS_GROUP (ia)->members;
+- internet_address_unref(data->ia);
++ g_object_unref(data->ia);
+ g_free(data->string);
+ g_free(data);
+ }
+diff -ur balsa-2.3.28-orig/libbalsa/address-book-extern.c balsa-2.3.28/libbalsa/address-book-extern.c
+--- balsa-2.3.28-orig/libbalsa/address-book-extern.c 2007-10-13 21:33:51.000000000 +0200
++++ balsa-2.3.28/libbalsa/address-book-extern.c 2009-03-02 21:50:13.000000000 +0100
+@@ -369,7 +369,7 @@
+ if(!name || !*name)
+ name = _("No-Name");
+ *res = g_list_prepend(*res,
+- internet_address_new_name(name, email));
++ internet_address_mailbox_new(name, email));
+ }
+ }
-- for (member = ia->value.members; member; member = member->next) {
-- InternetAddress *member_address = member->address;
-+ for (j = 0; j < internet_address_list_length (members); j++) {
-+ InternetAddress *member_address = internet_address_list_get_address (members, j);
+diff -ur balsa-2.3.28-orig/libbalsa/address-book-gpe.c balsa-2.3.28/libbalsa/address-book-gpe.c
+--- balsa-2.3.28-orig/libbalsa/address-book-gpe.c 2007-01-01 20:13:32.000000000 +0100
++++ balsa-2.3.28/libbalsa/address-book-gpe.c 2009-03-02 21:50:03.000000000 +0100
+@@ -729,7 +729,7 @@
+ if(!a->full_name)
+ a->full_name = create_name(a->first_name, a->last_name);
+ for(l=a->address_list; l; l = l->next) {
+- ia = internet_address_new_name(a->full_name, l->data);
++ ia = internet_address_mailbox_new(a->full_name, l->data);
+ gc->res = g_list_prepend(gc->res, ia);
+ }
+ if(gc->new_prefix && !*gc->new_prefix)
+diff -ur balsa-2.3.28-orig/libbalsa/address-book-rubrica.c balsa-2.3.28/libbalsa/address-book-rubrica.c
+--- balsa-2.3.28-orig/libbalsa/address-book-rubrica.c 2007-10-23 20:06:21.000000000 +0200
++++ balsa-2.3.28/libbalsa/address-book-rubrica.c 2009-03-02 21:50:03.000000000 +0100
+@@ -236,8 +236,7 @@
+ g_completion_complete(ab_text->name_complete, (gchar *) prefix,
+ new_prefix); list; list = list->next) {
+ InternetAddress *ia = ((CompletionData *) list->data)->ia;
+- internet_address_ref(ia);
+- res = g_list_prepend(res, ia);
++ res = g_list_prepend(res, g_object_ref(ia));
+ }
[...6413 lines suppressed...]
-@@ -7144,7 +7144,7 @@
- libgnome-2.0 libgnomeui-2.0
- glib-2.0
- gtk+-2.0 >= 2.4
-- gmime-2.0 >= 2.1.9
-+ gmime-2.4 >= 2.1.9
- " 2>/dev/null`
- else
- pkg_failed=yes
-@@ -7160,13 +7160,13 @@
- libgnome-2.0 libgnomeui-2.0
- glib-2.0
- gtk+-2.0 >= 2.4
-- gmime-2.0 >= 2.1.9
-+ gmime-2.4 >= 2.1.9
- \"") >&5
- ($PKG_CONFIG --exists --print-errors "
- libgnome-2.0 libgnomeui-2.0
- glib-2.0
- gtk+-2.0 >= 2.4
-- gmime-2.0 >= 2.1.9
-+ gmime-2.4 >= 2.1.9
- ") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -7175,7 +7175,7 @@
- libgnome-2.0 libgnomeui-2.0
- glib-2.0
- gtk+-2.0 >= 2.4
-- gmime-2.0 >= 2.1.9
-+ gmime-2.4 >= 2.1.9
- " 2>/dev/null`
- else
- pkg_failed=yes
-@@ -7198,14 +7198,14 @@
- libgnome-2.0 libgnomeui-2.0
- glib-2.0
- gtk+-2.0 >= 2.4
-- gmime-2.0 >= 2.1.9
-+ gmime-2.4 >= 2.1.9
- " 2>&1`
- else
- BALSA_AB_PKG_ERRORS=`$PKG_CONFIG --print-errors "
- libgnome-2.0 libgnomeui-2.0
- glib-2.0
- gtk+-2.0 >= 2.4
-- gmime-2.0 >= 2.1.9
-+ gmime-2.4 >= 2.1.9
- " 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
-@@ -7215,7 +7215,7 @@
- libgnome-2.0 libgnomeui-2.0
- glib-2.0
- gtk+-2.0 >= 2.4
-- gmime-2.0 >= 2.1.9
-+ gmime-2.4 >= 2.1.9
- ) were not met:
+ /* collect all to and cc recipients */
+- ia_list = libbalsa_address_view_get_list(bsmsg->recipient_view, "To:");
+- cc_list = libbalsa_address_view_get_list(bsmsg->recipient_view, "Cc:");
+- from_list = internet_address_list_prepend(NULL, bsmsg->ident->ia);
+ protocol = bsmsg->gpg_mode & LIBBALSA_PROTECT_SMIMEV3 ?
+ GPGME_PROTOCOL_CMS : GPGME_PROTOCOL_OpenPGP;
+- can_encrypt = libbalsa_can_encrypt_for_all(from_list, protocol) &
+- libbalsa_can_encrypt_for_all(ia_list, protocol) &
+- libbalsa_can_encrypt_for_all(cc_list, protocol);
+- internet_address_list_destroy(from_list);
+- internet_address_list_destroy(ia_list);
+- internet_address_list_destroy(cc_list);
++
++ ia_list = libbalsa_address_view_get_list(bsmsg->recipient_view, "To:");
++ can_encrypt = libbalsa_can_encrypt_for_all(ia_list, protocol);
++ g_object_unref(ia_list);
++ if (can_encrypt) {
++ ia_list = libbalsa_address_view_get_list(bsmsg->recipient_view, "Cc:");
++ can_encrypt = libbalsa_can_encrypt_for_all(ia_list, protocol);
++ g_object_unref(ia_list);
++ }
++ if (can_encrypt) {
++ ia_list = internet_address_list_new();
++ internet_address_list_add(ia_list, bsmsg->ident->ia);
++ can_encrypt = libbalsa_can_encrypt_for_all(ia_list, protocol);
++ g_object_unref(ia_list);
++ }
- $BALSA_AB_PKG_ERRORS
-@@ -7231,7 +7231,7 @@
- libgnome-2.0 libgnomeui-2.0
- glib-2.0
- gtk+-2.0 >= 2.4
-- gmime-2.0 >= 2.1.9
-+ gmime-2.4 >= 2.1.9
- ) were not met:
+ /* ask the user if we could encrypt this message */
+ if (can_encrypt) {
+@@ -6768,7 +6765,7 @@
+ if (mailing_list_address) {
+ libbalsa_address_view_set_from_list(bsmsg->recipient_view, "To:",
+ mailing_list_address);
+- internet_address_list_destroy(mailing_list_address);
++ g_object_unref(mailing_list_address);
+ return;
+ }
- $BALSA_AB_PKG_ERRORS
-@@ -10703,14 +10703,14 @@
- HICOLOR_ICON_DIR=`$PKG_CONFIG --variable=prefix gtk+-2.0`/share/icons/hicolor
+@@ -6902,7 +6899,7 @@
+ list = libbalsa_address_view_get_list(bsmsg->recipient_view, "To:");
+ to_string = internet_address_list_to_string(list, FALSE);
+- internet_address_list_destroy(list);
++ g_object_unref(list);
--if $PKG_CONFIG --atleast-version=2.2.5 gmime-2.0 ; then
-+if $PKG_CONFIG --atleast-version=2.2.5 gmime-2.4 ; then
+ title = g_strdup_printf(title_format, to_string,
+ gtk_entry_get_text(GTK_ENTRY(bsmsg->subject[1])));
+diff -ur balsa-2.3.28-orig/src/store-address.c balsa-2.3.28/src/store-address.c
+--- balsa-2.3.28-orig/src/store-address.c 2009-01-02 14:40:57.000000000 +0100
++++ balsa-2.3.28/src/store-address.c 2009-03-02 21:50:03.000000000 +0100
+@@ -58,13 +58,13 @@
+ StoreAddressInfo * info);
+ static void store_address_add_address(StoreAddressInfo * info,
+ const gchar * label,
+- const InternetAddress * address,
+- const InternetAddress * group);
++ InternetAddress * address,
++ InternetAddress * group);
+ static void store_address_add_lbaddress(StoreAddressInfo * info,
+ const LibBalsaAddress *address);
+ static void store_address_add_list(StoreAddressInfo * info,
+ const gchar * label,
+- const InternetAddressList * list);
++ InternetAddressList * list);
+
+ /*
+ * public interface: balsa_store_address
+@@ -347,8 +347,8 @@
+ * make a new page in the notebook */
+ static void
+ store_address_add_address(StoreAddressInfo * info,
+- const gchar * lab, const InternetAddress * ia,
+- const InternetAddress * group)
++ const gchar * lab, InternetAddress * ia,
++ InternetAddress * group)
+ {
+ gchar *text;
+ LibBalsaAddress *address;
+@@ -365,7 +365,7 @@
+ address = libbalsa_address_new();
+ address->full_name =
+ g_strdup(ia->name ? ia->name : group ? group->name : NULL);
+- address->address_list = g_list_prepend(NULL, g_strdup(ia->value.addr));
++ address->address_list = g_list_prepend(NULL, g_strdup(INTERNET_ADDRESS_MAILBOX (ia)->addr));
+ ew = libbalsa_address_get_edit_widget(address, entries, NULL, NULL);
+ g_object_unref(address);
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_GMIME_2_2_5 1
- _ACEOF
+@@ -408,20 +408,22 @@
+ static void
+ store_address_add_list(StoreAddressInfo * info,
+ const gchar * label,
+- const InternetAddressList * list)
++ InternetAddressList * list)
+ {
+- for (; list; list = list->next) {
+- InternetAddress *ia = list->address;
+-
+- if (ia->type == INTERNET_ADDRESS_NAME)
++ int i, j;
++
++ for (i = 0; i < internet_address_list_length (list); i++) {
++ InternetAddress *ia = internet_address_list_get_address (list, i);
++
++ if (INTERNET_ADDRESS_IS_MAILBOX (ia))
+ store_address_add_address(info, label, ia, NULL);
+- else if (ia->type == INTERNET_ADDRESS_GROUP) {
+- InternetAddressList *member;
++ else {
++ InternetAddressList *members = INTERNET_ADDRESS_GROUP (ia)->members;
- fi
--if $PKG_CONFIG --atleast-version=2.2.7 gmime-2.0 ; then
-+if $PKG_CONFIG --atleast-version=2.2.7 gmime-2.4 ; then
+- for (member = ia->value.members; member; member = member->next) {
+- InternetAddress *member_address = member->address;
++ for (j = 0; j < internet_address_list_length (members); j++) {
++ InternetAddress *member_address = internet_address_list_get_address (members, j);
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_GMIME_2_2_7 1
+- if (member_address->type == INTERNET_ADDRESS_NAME)
++ if (INTERNET_ADDRESS_IS_MAILBOX (member_address))
+ store_address_add_address(info, label, member_address,
+ ia);
+ }
Index: balsa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/balsa/devel/balsa.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- balsa.spec 24 Feb 2009 04:01:20 -0000 1.46
+++ balsa.spec 2 Mar 2009 21:17:13 -0000 1.47
@@ -1,8 +1,8 @@
%define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --disable-more-warnings --with-ssl --with-gss --with-gtkspell --with-gpgme
Name: balsa
-Version: 2.3.26
-Release: 5%{?dist}
+Version: 2.3.28
+Release: 1%{?dist}
Summary: Mail Client
Group: Applications/Internet
@@ -59,7 +59,8 @@
desktop-file-install $RPM_BUILD_ROOT%{_datadir}/applications/balsa.desktop \
--vendor=fedora \
- --add-category=X-Fedora \
+ --add-category=Email \
+ --remove-category=Application \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
--copy-name-to-generic-name \
--delete-original
@@ -106,6 +107,9 @@
%changelog
+* Mon Mar 2 2009 Pawel Salek <pawsa at theochem.kth.se> - 2.3.28-1
+- upgrade to 2.3.28. Fix bug 487780.
+
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.26-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/balsa/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources 7 Sep 2008 20:16:10 -0000 1.28
+++ sources 2 Mar 2009 21:17:13 -0000 1.29
@@ -1 +1 @@
-e2d59f88ab0c39ba49dac09a47531b70 balsa-2.3.26.tar.bz2
+c9ea1f5683fc094b1ffcab7b9e66dd5c balsa-2.3.28.tar.bz2
- Previous message (by thread): rpms/levien-inconsolata-fonts/devel levien-inconsolata-fonts.spec, 1.1, 1.2
- Next message (by thread): rpms/snake/devel .cvsignore, 1.10, 1.11 import.log, 1.5, 1.6 snake.spec, 1.19, 1.20 sources, 1.18, 1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list