rpms/purple-plugin_pack/devel purple-plugin_pack-2.3.0-switchspell-enchant.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 purple-plugin_pack.spec, 1.5, 1.6 sources, 1.2, 1.3 purple-plugin_pack-2.2.0-switchspell-enchant.patch, 1.1, NONE
Ignacio Vazquez-Abrams (ivazquez)
fedora-extras-commits at redhat.com
Sun Apr 6 17:26:53 UTC 2008
- Previous message (by thread): rpms/jd/devel .cvsignore, 1.218, 1.219 jd.spec, 1.254, 1.255 sources, 1.219, 1.220
- Next message (by thread): rpms/vdr-osdteletext/devel vdr-osdteletext-0.5.1-vdr15.patch, NONE, 1.1 vdr-osdteletext.spec, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ivazquez
Update of /cvs/pkgs/rpms/purple-plugin_pack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17252
Modified Files:
.cvsignore purple-plugin_pack.spec sources
Added Files:
purple-plugin_pack-2.3.0-switchspell-enchant.patch
Removed Files:
purple-plugin_pack-2.2.0-switchspell-enchant.patch
Log Message:
Upstream update
purple-plugin_pack-2.3.0-switchspell-enchant.patch:
--- NEW FILE purple-plugin_pack-2.3.0-switchspell-enchant.patch ---
diff -up purple-plugin_pack-2.3.0/configure.enchant purple-plugin_pack-2.3.0/configure
--- purple-plugin_pack-2.3.0/configure.enchant 2008-04-06 12:33:13.000000000 -0400
+++ purple-plugin_pack-2.3.0/configure 2008-04-06 12:38:06.000000000 -0400
@@ -23809,18 +23809,18 @@ fi
BUILD_SWITCH_SPELL=no
if test x"$gtkspell" = x"yes" ; then
- if test "${ac_cv_header_aspell_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for aspell.h" >&5
-echo $ECHO_N "checking for aspell.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_aspell_h+set}" = set; then
+ if test "${ac_cv_header_enchant_h+set}" = set; then
+ { echo "$as_me:$LINENO: checking for enchant.h" >&5
+echo $ECHO_N "checking for enchant.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_enchant_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_aspell_h" >&5
-echo "${ECHO_T}$ac_cv_header_aspell_h" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_enchant_h" >&5
+echo "${ECHO_T}$ac_cv_header_enchant_h" >&6; }
else
# Is the header compilable?
-{ echo "$as_me:$LINENO: checking aspell.h usability" >&5
-echo $ECHO_N "checking aspell.h usability... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking enchant.h usability" >&5
+echo $ECHO_N "checking enchant.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -23828,7 +23828,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <aspell.h>
+#include <enchant/enchant.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
@@ -23860,15 +23860,15 @@ rm -f core conftest.err conftest.$ac_obj
echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-{ echo "$as_me:$LINENO: checking aspell.h presence" >&5
-echo $ECHO_N "checking aspell.h presence... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking enchant.h presence" >&5
+echo $ECHO_N "checking enchant.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <aspell.h>
+#include <enchant/enchant.h>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
@@ -23901,25 +23901,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6;
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
- { echo "$as_me:$LINENO: WARNING: aspell.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: aspell.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: aspell.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: aspell.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: enchant.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: enchant.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: enchant.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: enchant.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: aspell.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: aspell.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: aspell.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: aspell.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: aspell.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: aspell.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: aspell.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: aspell.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: aspell.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: aspell.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: aspell.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: aspell.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: enchant.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: enchant.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: enchant.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: enchant.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: enchant.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: enchant.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: enchant.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: enchant.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: enchant.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: enchant.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: enchant.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: enchant.h: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## --------------------------------------------------- ##
## Report this to plugins-devel at lists.guifications.org ##
@@ -23928,18 +23928,18 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-{ echo "$as_me:$LINENO: checking for aspell.h" >&5
-echo $ECHO_N "checking for aspell.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_aspell_h+set}" = set; then
+{ echo "$as_me:$LINENO: checking for enchant.h" >&5
+echo $ECHO_N "checking for enchant.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_enchant_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_header_aspell_h=$ac_header_preproc
+ ac_cv_header_enchant_h=$ac_header_preproc
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_aspell_h" >&5
-echo "${ECHO_T}$ac_cv_header_aspell_h" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_enchant_h" >&5
+echo "${ECHO_T}$ac_cv_header_enchant_h" >&6; }
fi
-if test $ac_cv_header_aspell_h = yes; then
+if test $ac_cv_header_enchant_h = yes; then
HAVE_ASPELL_H=yes
else
HAVE_ASPELL_H=no
@@ -23947,13 +23947,13 @@ fi
if test x"$HAVE_ASPELL_H" = x"yes" ; then
- { echo "$as_me:$LINENO: checking for new_aspell_config in -laspell" >&5
-echo $ECHO_N "checking for new_aspell_config in -laspell... $ECHO_C" >&6; }
-if test "${ac_cv_lib_aspell_new_aspell_config+set}" = set; then
+ { echo "$as_me:$LINENO: checking for enchant_broker_init in -lenchant" >&5
+echo $ECHO_N "checking for enchant_broker_init in -lenchant... $ECHO_C" >&6; }
+if test "${ac_cv_lib_enchant_enchant_broker_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-laspell $LIBS"
+LIBS="-lenchant $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -23967,11 +23967,11 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
-char new_aspell_config ();
+char enchant_broker_init ();
int
main ()
{
-return new_aspell_config ();
+return enchant_broker_init ();
;
return 0;
}
@@ -23994,21 +23994,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_lib_aspell_new_aspell_config=yes
+ ac_cv_lib_enchant_enchant_broker_init=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_aspell_new_aspell_config=no
+ ac_cv_lib_enchant_enchant_broker_init=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_aspell_new_aspell_config" >&5
-echo "${ECHO_T}$ac_cv_lib_aspell_new_aspell_config" >&6; }
-if test $ac_cv_lib_aspell_new_aspell_config = yes; then
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_enchant_enchant_broker_init" >&5
+echo "${ECHO_T}$ac_cv_lib_enchant_enchant_broker_init" >&6; }
+if test $ac_cv_lib_enchant_enchant_broker_init = yes; then
BUILD_SWITCH_SPELL=yes
else
BUILD_SWITCH_SPELL=no
diff -up purple-plugin_pack-2.3.0/switchspell/switchspell.c.enchant purple-plugin_pack-2.3.0/switchspell/switchspell.c
--- purple-plugin_pack-2.3.0/switchspell/switchspell.c.enchant 2008-03-12 21:47:57.000000000 -0400
+++ purple-plugin_pack-2.3.0/switchspell/switchspell.c 2008-04-06 12:31:44.000000000 -0400
@@ -35,7 +35,7 @@
#include <gtkconv.h>
#include <gtkplugin.h>
-#include <aspell.h>
+#include <enchant/enchant.h>
#include <gtkspell/gtkspell.h>
#include <string.h>
@@ -97,10 +97,7 @@ regenerate_switchspell_menu(PidginConver
GtkWidget *menu;
GtkWidget *mitem;
GSList *group = NULL;
- AspellConfig * config;
- AspellDictInfoList * dlist;
- AspellDictInfoEnumeration * dels;
- const AspellDictInfo * entry;
+ EnchantBroker * eb;
if (gtkconv == NULL)
return;
@@ -122,24 +119,25 @@ regenerate_switchspell_menu(PidginConver
menu = gtk_menu_new();
gtk_menu_item_set_submenu(GTK_MENU_ITEM(mitem), menu);
- config = new_aspell_config();
- dlist = get_aspell_dict_info_list(config);
- delete_aspell_config(config);
-
- dels = aspell_dict_info_list_elements(dlist);
- aspell_dict_info_list_empty(dlist);
- while ((entry = aspell_dict_info_enumeration_next(dels)) != 0) {
- GtkWidget *menuitem = gtk_radio_menu_item_new_with_label(group, entry->name);
+ void enchDictDescCb(const char * const lang_tag,
+ const char * const provider_name,
+ const char * const provider_desc,
+ const char * const provider_file,
+ void * user_data)
+ {
+ GtkWidget *menuitem = gtk_radio_menu_item_new_with_label(group, lang_tag);
group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(menuitem));
g_object_set_data(G_OBJECT(menuitem), "user_data", win);
- g_object_set_data(G_OBJECT(menuitem), "lang", (gchar *)entry->name);
+ g_object_set_data(G_OBJECT(menuitem), "lang", (gchar *)lang_tag);
g_signal_connect(G_OBJECT(menuitem), "activate",
G_CALLBACK(menu_conv_use_dict_cb), NULL);
gtk_widget_show(menuitem);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
}
- delete_aspell_dict_info_enumeration(dels);
+ eb = enchant_broker_init();
+ enchant_broker_list_dicts(eb, enchDictDescCb, NULL);
+ enchant_broker_free(eb);
gtk_widget_show_all(menu);
}
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/purple-plugin_pack/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 14 Nov 2007 16:44:37 -0000 1.2
+++ .cvsignore 6 Apr 2008 17:26:12 -0000 1.3
@@ -1 +1 @@
-purple-plugin_pack-2.2.0.tar.bz2
+purple-plugin_pack-2.3.0.tar.bz2
Index: purple-plugin_pack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-plugin_pack/devel/purple-plugin_pack.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- purple-plugin_pack.spec 14 Feb 2008 06:21:43 -0000 1.5
+++ purple-plugin_pack.spec 6 Apr 2008 17:26:12 -0000 1.6
@@ -1,17 +1,17 @@
Name: purple-plugin_pack
-Version: 2.2.0
-Release: 5%{?dist}
+Version: 2.3.0
+Release: 1%{?dist}
Summary: A set of plugins for libpurple, pidgin, and finch
Group: Applications/Internet
License: GPLv2+
URL: http://plugins.guifications.org/trac/wiki/PluginPack
Source0: http://downloads.guifications.org/plugins/Plugin%20Pack/purple-plugin_pack-%{version}.tar.bz2
-Patch0: purple-plugin_pack-2.2.0-switchspell-enchant.patch
+Patch0: purple-plugin_pack-2.3.0-switchspell-enchant.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pidgin-devel xmms-devel perl(XML::Parser) gettext-devel
-BuildRequires: enchant-devel
+BuildRequires: enchant-devel gtkspell-devel
BuildRequires: diffutils
#Requires:
Provides: purple-plugin-pack
@@ -98,6 +98,7 @@
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS
%dir %{_datadir}/pixmaps/pidgin/plugin_pack
+%{_datadir}/pixmaps/pidgin/protocols
%{_libdir}/pidgin/[^x]*.so
%{_libdir}/pidgin/xchat-chats.so
@@ -107,6 +108,9 @@
%{_libdir}/pidgin/xmmsremote.so
%changelog
+* Sun Apr 6 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 2.3.0-1
+- Upstream update
+
* Thu Feb 14 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 2.2.0-5
- Rebuild for GCC 4.3
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/purple-plugin_pack/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 14 Nov 2007 16:44:37 -0000 1.2
+++ sources 6 Apr 2008 17:26:12 -0000 1.3
@@ -1 +1 @@
-e7486cb75722231040d0952280eab14d purple-plugin_pack-2.2.0.tar.bz2
+32a297e854341c5b043a5325ee6f0819 purple-plugin_pack-2.3.0.tar.bz2
--- purple-plugin_pack-2.2.0-switchspell-enchant.patch DELETED ---
- Previous message (by thread): rpms/jd/devel .cvsignore, 1.218, 1.219 jd.spec, 1.254, 1.255 sources, 1.219, 1.220
- Next message (by thread): rpms/vdr-osdteletext/devel vdr-osdteletext-0.5.1-vdr15.patch, NONE, 1.1 vdr-osdteletext.spec, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list