Hello community, here is the log from the commit of package stardict for openSUSE:Factory checked in at 2012-06-14 21:11:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/stardict (Old) and /work/SRC/openSUSE:Factory/.stardict.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "stardict", Maintainer is "dmzh...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/stardict/stardict.changes 2012-01-25 11:09:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.stardict.new/stardict.changes 2012-06-14 21:11:23.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 14 14:15:40 UTC 2012 - co...@suse.com + +- compile with latest zlib + +------------------------------------------------------------------- New: ---- stardict-3.0.3-zlib-update.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ stardict.spec ++++++ --- /var/tmp/diff_new_pack.ad3jdK/_old 2012-06-14 21:11:25.000000000 +0200 +++ /var/tmp/diff_new_pack.ad3jdK/_new 2012-06-14 21:11:25.000000000 +0200 @@ -16,7 +16,6 @@ # - Name: stardict Version: 3.0.3 Release: 0 @@ -36,9 +35,11 @@ Patch3: stardict-3.0.3-NetDictRequest.patch # PATCH-FIX-UPSTREAM stardict-wrong-memset.patch idoen...@suse.de -- Fix wrong memset size parameter Patch4: stardict-3.0.3-wrong-memset.patch -%if 0%{?suse_version} # PATCH-FIX-UPSTREAM stardict-3.0.3-fix-glib_h-include.patch kkir...@opensuse.org -- Fix glib.h include Patch5: stardict-3.0.3-fix-glib_h-include.patch +# PATCH-FIX-UPSTREAM stardict-3.0.3-zlib-update.patch co...@suse.de - fix zlib +Patch6: stardict-3.0.3-zlib-update.patch +%if 0%{?suse_version} BuildRequires: update-desktop-files %endif BuildRequires: enchant-devel @@ -49,11 +50,11 @@ BuildRequires: gnome-doc-utils-devel BuildRequires: gtk2 >= 2.20 BuildRequires: intltool -BuildRequires: zlib-devel BuildRequires: libgnomeui-devel BuildRequires: libsigc++2-devel BuildRequires: perl-XML-Parser BuildRequires: sgml-skel +BuildRequires: zlib-devel # gucharmap now uses gtk3, but stardict still uses gtk2 # BuildRequires: gucharmap-devel Requires: enchant @@ -78,6 +79,9 @@ %patch3 %patch4 %patch5 +%if 0%{?suse_version} > 1210 +%patch6 -p1 +%endif cp %{SOURCE1} dict/po/ # Remove unneeded sigc++ header files to make it sure ++++++ stardict-3.0.3-zlib-update.patch ++++++ Only in stardict-3.0.3/dict/data: GNOME_Stardict.server Only in stardict-3.0.3/dict/data: stardict.desktop Only in stardict-3.0.3/dict/data: stardict.schemas Only in stardict-3.0.3/dict/help/mk: mk.mo Only in stardict-3.0.3/dict/help/nl: nl.mo Only in stardict-3.0.3/dict/help/ru: ru.mo Only in stardict-3.0.3/dict/help: stardict-C.omf Only in stardict-3.0.3/dict/help: stardict-mk.omf Only in stardict-3.0.3/dict/help: stardict-nl.omf Only in stardict-3.0.3/dict/help: stardict-ru.omf Only in stardict-3.0.3/dict/help: stardict-uk.omf Only in stardict-3.0.3/dict/help: stardict-zh_CN.omf Only in stardict-3.0.3/dict/help: stardict-zh_TW.omf Only in stardict-3.0.3/dict/help/uk: uk.mo Only in stardict-3.0.3/dict/help/zh_CN: zh_CN.mo Only in stardict-3.0.3/dict/help/zh_TW: zh_TW.mo Only in stardict-3.0.3/dict/po: .intltool-merge-cache Only in stardict-3.0.3/dict/po: ar.gmo Only in stardict-3.0.3/dict/po: be.gmo Only in stardict-3.0.3/dict/po: cs.gmo Only in stardict-3.0.3/dict/po: de.gmo Only in stardict-3.0.3/dict/po: el.gmo Only in stardict-3.0.3/dict/po: es.gmo Only in stardict-3.0.3/dict/po: fr.gmo Only in stardict-3.0.3/dict/po: ga.gmo Only in stardict-3.0.3/dict/po: hr.gmo Only in stardict-3.0.3/dict/po: hu.gmo Only in stardict-3.0.3/dict/po: kk.gmo Only in stardict-3.0.3/dict/po: ku.gmo Only in stardict-3.0.3/dict/po: lt.gmo Only in stardict-3.0.3/dict/po: mk.gmo Only in stardict-3.0.3/dict/po: nl.gmo Only in stardict-3.0.3/dict/po: pt_BR.gmo Only in stardict-3.0.3/dict/po: ru.gmo Only in stardict-3.0.3/dict/po: rw.gmo Only in stardict-3.0.3/dict/po: sk.gmo Only in stardict-3.0.3/dict/po: sv.gmo Only in stardict-3.0.3/dict/po: tr.gmo Only in stardict-3.0.3/dict/po: tt.gmo Only in stardict-3.0.3/dict/po: uk.gmo Only in stardict-3.0.3/dict/po: vi.gmo Only in stardict-3.0.3/dict/po: zh_CN.gmo Only in stardict-3.0.3/dict/po: zh_TW.gmo Only in stardict-3.0.3/dict/src: .libs Only in stardict-3.0.3/dict/src: GNOME_Stardict-common.o Only in stardict-3.0.3/dict/src: GNOME_Stardict-skels.o Only in stardict-3.0.3/dict/src: GNOME_Stardict-stubs.o Only in stardict-3.0.3/dict/src: articleview.o Only in stardict-3.0.3/dict/src: class_factory.o Only in stardict-3.0.3/dict/src: cmdlineopts.o Only in stardict-3.0.3/dict/src: conf.o Only in stardict-3.0.3/dict/src: desktop.o Only in stardict-3.0.3/dict/src: dictmanage.o Only in stardict-3.0.3/dict/src: dictmanagedlg.o Only in stardict-3.0.3/dict/src: docklet.o Only in stardict-3.0.3/dict/src: eggaccelerators.o Only in stardict-3.0.3/dict/src: floatwin.o Only in stardict-3.0.3/dict/src: gconf_file.o Only in stardict-3.0.3/dict/src: globalhotkeys.o Only in stardict-3.0.3/dict/src: gtk_iskeyspressed.o Only in stardict-3.0.3/dict/src: gtktextviewpango.o Only in stardict-3.0.3/dict/src: hotkeyeditor.o Only in stardict-3.0.3/dict/src: inifile.o Only in stardict-3.0.3/dict/src/lib: .libs Only in stardict-3.0.3/dict/src/lib: collation.lo Only in stardict-3.0.3/dict/src/lib: compositelookup.lo Only in stardict-3.0.3/dict/src/lib: ctype-mb.lo Only in stardict-3.0.3/dict/src/lib: ctype-uca.lo Only in stardict-3.0.3/dict/src/lib: ctype-utf8.lo Only in stardict-3.0.3/dict/src/lib: dictbase.lo Only in stardict-3.0.3/dict/src/lib: dictziplib.lo Only in stardict-3.0.3/dict/src/lib: edit-distance.lo Only in stardict-3.0.3/dict/src/lib: full_text_trans.lo Only in stardict-3.0.3/dict/src/lib: http_client.lo Only in stardict-3.0.3/dict/src/lib: httpmanager.lo Only in stardict-3.0.3/dict/src/lib: iappdirs.lo Only in stardict-3.0.3/dict/src/lib: kmp.lo Only in stardict-3.0.3/dict/src/lib: libstardict.la Only in stardict-3.0.3/dict/src/lib: md5.lo Only in stardict-3.0.3/dict/src/lib: netdictcache.lo Only in stardict-3.0.3/dict/src/lib: netdictplugin.lo Only in stardict-3.0.3/dict/src/lib: parsedata_plugin.lo Only in stardict-3.0.3/dict/src/lib: plugin.lo Only in stardict-3.0.3/dict/src/lib: pluginmanager.lo Only in stardict-3.0.3/dict/src/lib: sockets.lo Only in stardict-3.0.3/dict/src/lib: specialdictplugin.lo Only in stardict-3.0.3/dict/src/lib: stardict_client.lo Only in stardict-3.0.3/dict/src/lib: stddict.lo Only in stardict-3.0.3/dict/src/lib: storage.lo Only in stardict-3.0.3/dict/src/lib: treedict.lo Only in stardict-3.0.3/dict/src/lib: ttsplugin.lo Only in stardict-3.0.3/dict/src/lib: utils.lo Only in stardict-3.0.3/dict/src/lib: verify_dict.lo Only in stardict-3.0.3/dict/src/lib: virtualdictplugin.lo Only in stardict-3.0.3/dict/src/lib: xml_str.lo Only in stardict-3.0.3/dict/src: log.o Only in stardict-3.0.3/dict/src: mainwin.o Only in stardict-3.0.3/dict/src: pangoview.o Only in stardict-3.0.3/dict/src: pluginmanagedlg.o Only in stardict-3.0.3/dict/src: prefsdlg.o Only in stardict-3.0.3/dict/src: progresswin.o Only in stardict-3.0.3/dict/src: readword.o Only in stardict-3.0.3/dict/src: selection.o Only in stardict-3.0.3/dict/src: skin.o Only in stardict-3.0.3/dict/src: splash.o Only in stardict-3.0.3/dict/src: stardict Only in stardict-3.0.3/dict/src: stardict-application-server.o Only in stardict-3.0.3/dict/src: stardict.o Only in stardict-3.0.3/dict/src: tomboykeybinder.o Only in stardict-3.0.3/dict/src: tray.o Only in stardict-3.0.3/dict/src: x11_iskeyspressed.o Only in stardict-3.0.3/dict/stardict-plugins/stardict-dictdotcn-plugin: .libs Only in stardict-3.0.3/dict/stardict-plugins/stardict-dictdotcn-plugin: stardict_dictdotcn.la Only in stardict-3.0.3/dict/stardict-plugins/stardict-dictdotcn-plugin: stardict_dictdotcn.lo Only in stardict-3.0.3/dict/stardict-plugins/stardict-espeak-tts-plugin: .libs Only in stardict-3.0.3/dict/stardict-plugins/stardict-espeak-tts-plugin: stardict_espeak.la Only in stardict-3.0.3/dict/stardict-plugins/stardict-espeak-tts-plugin: stardict_espeak.lo Only in stardict-3.0.3/dict/stardict-plugins/stardict-html-parsedata-plugin: .libs Only in stardict-3.0.3/dict/stardict-plugins/stardict-html-parsedata-plugin: stardict_html_parsedata.la Only in stardict-3.0.3/dict/stardict-plugins/stardict-html-parsedata-plugin: stardict_html_parsedata.lo Only in stardict-3.0.3/dict/stardict-plugins/stardict-man-plugin: .libs Only in stardict-3.0.3/dict/stardict-plugins/stardict-man-plugin: stardict_man.la Only in stardict-3.0.3/dict/stardict-plugins/stardict-man-plugin: stardict_man.lo Only in stardict-3.0.3/dict/stardict-plugins/stardict-powerword-parsedata-plugin: .libs Only in stardict-3.0.3/dict/stardict-plugins/stardict-powerword-parsedata-plugin: stardict_powerword_parsedata.la Only in stardict-3.0.3/dict/stardict-plugins/stardict-powerword-parsedata-plugin: stardict_powerword_parsedata.lo Only in stardict-3.0.3/dict/stardict-plugins/stardict-qqwry-plugin: .libs Only in stardict-3.0.3/dict/stardict-plugins/stardict-qqwry-plugin: stardict_qqwry.la Only in stardict-3.0.3/dict/stardict-plugins/stardict-qqwry-plugin: stardict_qqwry.lo Only in stardict-3.0.3/dict/stardict-plugins/stardict-spell-plugin: .libs Only in stardict-3.0.3/dict/stardict-plugins/stardict-spell-plugin: stardict_spell.la Only in stardict-3.0.3/dict/stardict-plugins/stardict-spell-plugin: stardict_spell.lo Only in stardict-3.0.3/dict/stardict-plugins/stardict-wiki-parsedata-plugin: .libs Only in stardict-3.0.3/dict/stardict-plugins/stardict-wiki-parsedata-plugin: TXML.lo Only in stardict-3.0.3/dict/stardict-plugins/stardict-wiki-parsedata-plugin: WIKI2XML.lo Only in stardict-3.0.3/dict/stardict-plugins/stardict-wiki-parsedata-plugin: global.lo Only in stardict-3.0.3/dict/stardict-plugins/stardict-wiki-parsedata-plugin: stardict_wiki2xml.lo Only in stardict-3.0.3/dict/stardict-plugins/stardict-wiki-parsedata-plugin: stardict_wiki_parsedata.la Only in stardict-3.0.3/dict/stardict-plugins/stardict-wiki-parsedata-plugin: stardict_wiki_parsedata.lo Only in stardict-3.0.3/dict/stardict-plugins/stardict-wordnet-plugin: .libs Only in stardict-3.0.3/dict/stardict-plugins/stardict-wordnet-plugin: court_widget.lo Only in stardict-3.0.3/dict/stardict-plugins/stardict-wordnet-plugin: newton.lo Only in stardict-3.0.3/dict/stardict-plugins/stardict-wordnet-plugin: newton_env.lo Only in stardict-3.0.3/dict/stardict-plugins/stardict-wordnet-plugin: partic.lo Only in stardict-3.0.3/dict/stardict-plugins/stardict-wordnet-plugin: scene.lo Only in stardict-3.0.3/dict/stardict-plugins/stardict-wordnet-plugin: spring.lo Only in stardict-3.0.3/dict/stardict-plugins/stardict-wordnet-plugin: stardict_wordnet.la Only in stardict-3.0.3/dict/stardict-plugins/stardict-wordnet-plugin: stardict_wordnet.lo Only in stardict-3.0.3/dict/stardict-plugins/stardict-wordnet-plugin: stardict_wordnet_parsedata.la Only in stardict-3.0.3/dict/stardict-plugins/stardict-wordnet-plugin: stardict_wordnet_parsedata.lo Only in stardict-3.0.3/dict/stardict-plugins/stardict-wordnet-plugin: vector_t.lo Only in stardict-3.0.3/dict/stardict-plugins/stardict-xdxf-parsedata-plugin: .libs Only in stardict-3.0.3/dict/stardict-plugins/stardict-xdxf-parsedata-plugin: stardict_xdxf_parsedata.la Only in stardict-3.0.3/dict/stardict-plugins/stardict-xdxf-parsedata-plugin: stardict_xdxf_parsedata.lo Only in stardict-3.0.3/dict/tests: .libs Only in stardict-3.0.3/dict/tests: gconf_file.o Only in stardict-3.0.3/dict/tests: inifile.o Only in stardict-3.0.3/dict/tests: t_articleview Only in stardict-3.0.3/dict/tests: t_articleview.o Only in stardict-3.0.3/dict/tests: t_config_file Only in stardict-3.0.3/dict/tests: t_config_file.o Only in stardict-3.0.3/dict/tests: t_convert_old_ini Only in stardict-3.0.3/dict/tests: t_convert_old_ini.o Only in stardict-3.0.3/dict/tests: t_dict Only in stardict-3.0.3/dict/tests: t_dict.o Only in stardict-3.0.3/dict/tests: t_fuzzy Only in stardict-3.0.3/dict/tests: t_fuzzy.o Only in stardict-3.0.3/dict/tests: t_lookupdata Only in stardict-3.0.3/dict/tests: t_lookupdata.o Only in stardict-3.0.3/dict/tests: t_query Only in stardict-3.0.3/dict/tests: t_query.o Only in stardict-3.0.3/dict/tests: t_res_database Only in stardict-3.0.3/dict/tests: t_res_database.o Only in stardict-3.0.3/dict/tests: t_xml Only in stardict-3.0.3/dict/tests: t_xml.o Only in stardict-3.0.3/lib/src/.libs: ifo_file.o Only in stardict-3.0.3/lib/src/.libs: lib_binary_dict_parser.o Only in stardict-3.0.3/lib/src/.libs: lib_chars.o Only in stardict-3.0.3/lib/src/.libs: lib_dict_data_block.o Only in stardict-3.0.3/lib/src/.libs: lib_dict_verify.o Only in stardict-3.0.3/lib/src/.libs: lib_res_store.o Only in stardict-3.0.3/lib/src/.libs: libcommon.a Only in stardict-3.0.3/lib/src/.libs: libcommon.la Only in stardict-3.0.3/lib/src/.libs: libcommon.o Only in stardict-3.0.3/lib/src: ifo_file.lo Only in stardict-3.0.3/lib/src: ifo_file.o Only in stardict-3.0.3/lib/src: lib_binary_dict_parser.lo Only in stardict-3.0.3/lib/src: lib_binary_dict_parser.o Only in stardict-3.0.3/lib/src: lib_chars.lo Only in stardict-3.0.3/lib/src: lib_chars.o Only in stardict-3.0.3/lib/src: lib_dict_data_block.lo Only in stardict-3.0.3/lib/src: lib_dict_data_block.o Only in stardict-3.0.3/lib/src: lib_dict_verify.lo Only in stardict-3.0.3/lib/src: lib_dict_verify.o Only in stardict-3.0.3/lib/src: lib_res_store.lo Only in stardict-3.0.3/lib/src: lib_res_store.o diff -ru stardict-3.0.3.orig/lib/src/libcommon.h stardict-3.0.3/lib/src/libcommon.h --- stardict-3.0.3.orig/lib/src/libcommon.h 2011-07-08 12:32:09.000000000 +0000 +++ stardict-3.0.3/lib/src/libcommon.h 2012-06-14 14:04:06.000000000 +0000 @@ -188,7 +188,7 @@ } namespace zip { -typedef ResourceWrapper<void, void*, int, gzclose> gzFile; +typedef ResourceWrapper< struct gzFile_s , struct gzFile_s *, int, gzclose> gzFile; } /* Create a new temporary file. Return file name in file name encoding. Only in stardict-3.0.3/lib/src: libcommon.la Only in stardict-3.0.3/lib/src: libcommon.lo Only in stardict-3.0.3/lib/src: libcommon.o -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org