Hello community, here is the log from the commit of package stardict for openSUSE:Factory checked in at 2014-08-25 11:03:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/stardict (Old) and /work/SRC/openSUSE:Factory/.stardict.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "stardict" Changes: -------- --- /work/SRC/openSUSE:Factory/stardict/stardict.changes 2013-09-09 09:54:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.stardict.new/stardict.changes 2014-08-25 11:03:55.000000000 +0200 @@ -1,0 +2,16 @@ +Mon Aug 18 21:24:06 UTC 2014 - [email protected] + +- update to 3.0.5 + + update Kazakh and Russian translations + + stardict-advertisement-plugin comes back + + 'P' dictionary content type identifier comes back + + add don't load bad dict option + + add show_ads checkbox for update-info-plugin +- compile with --disable-gnome-support since GNOME 2 is obsoleted +- drop upstreamed patches: + + stardict-3.0.3-wrong-memset.patch + + stardict-3.0.3-zlib-update.patch +- add patch to enable gtk3 build: + + stardict-3.0.5-enable-gtk3.patch + +------------------------------------------------------------------- Old: ---- ru.po stardict-3.0.3-wrong-memset.patch stardict-3.0.3-zlib-update.patch stardict-3.0.4.tar.bz2 New: ---- stardict-3.0.5-enable-gtk3.patch stardict-3.0.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ stardict.spec ++++++ --- /var/tmp/diff_new_pack.vSI4l7/_old 2014-08-25 11:03:56.000000000 +0200 +++ /var/tmp/diff_new_pack.vSI4l7/_new 2014-08-25 11:03:56.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package stardict # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,22 +17,19 @@ Name: stardict -Version: 3.0.4 +Version: 3.0.5 Release: 0 Summary: A cross-platform and internationalized dictionary License: GPL-3.0 Group: Productivity/Office/Dictionary -Url: http://code.google.com/p/stardict-3/ +Url: http://stardict-4.sourceforge.net/ Source0: %{name}-%{version}.tar.bz2 -Source1: ru.po # PATCH-FIX-OPENSUSE stardict-3.0.3-fix-path-for-sounds.patch -- adjust default path for sound files Patch0: stardict-3.0.3-fix-path-for-sounds.patch # PATCH-FIX-OPENSUSE stardict-3.0.3-improve-desktop-file.patch -- add GenericName entry Patch1: stardict-3.0.3-improve-desktop-file.patch -# PATCH-FIX-UPSTREAM stardict-wrong-memset.patch [email protected] -- Fix wrong memset size parameter -Patch2: stardict-3.0.3-wrong-memset.patch -# PATCH-FIX-UPSTREAM stardict-3.0.3-zlib-update.patch [email protected] - fix zlib -Patch3: stardict-3.0.3-zlib-update.patch +# PATCH-FIX-OPENSUSE stardict-3.0.5-enable-gtk3.patch -- use gtk3 code +Patch2: stardict-3.0.5-enable-gtk3.patch %if 0%{?suse_version} BuildRequires: update-desktop-files %endif @@ -40,25 +37,24 @@ BuildRequires: espeak-devel BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: gnome-common BuildRequires: gnome-doc-utils-devel -BuildRequires: gtk2 >= 2.20 +BuildRequires: gtk3-devel >= 3.0 BuildRequires: intltool -BuildRequires: libgnomeui-devel BuildRequires: libsigc++2-devel +BuildRequires: libtool BuildRequires: perl-XML-Parser BuildRequires: sgml-skel BuildRequires: zlib-devel +BuildRequires: pkgconfig(libxml-2.0) # gucharmap now uses gtk3, but stardict still uses gtk2 # BuildRequires: gucharmap-devel Requires: enchant Requires: espeak BuildRoot: %{_tmppath}/%{name}-%{version}-build -%gconf_schemas_prereq %description StarDict is a Cross-Platform and international dictionary written in -Gtk2. +Gtk3. It has powerful features such as "Glob-style pattern matching", "Scan selection word","Fuzzy query" etc. @@ -70,25 +66,20 @@ %patch0 %patch1 %patch2 -%if 0%{?suse_version} > 1210 -%patch3 -p1 -%endif -cp %{SOURCE1} dict/po/ # Remove unneeded sigc++ header files to make it sure # that we are using system-wide libsigc++ find src/sigc++* -name \*.h -or -name \*.cc | xargs rm -f %build -mkdir -p m4 -autoreconf -fi %configure \ - --disable-tools \ + --disable-dictdotcn \ + --disable-festival \ + --disable-gnome-support \ + --disable-gucharmap \ --disable-schemas-install \ - --disable-updateinfo \ --disable-scrollkeeper \ - --disable-festival \ - --disable-gucharmap + --disable-tools make %{?_smp_mflags} %install @@ -101,9 +92,6 @@ %find_lang %{name} -%find_gconf_schemas -cat %{name}.lang %{name}.schemas_list >%{name}.lst - %suse_update_desktop_file stardict Office Dictionary # save space, create symlinks for identical files %fdupes -s %{buildroot} @@ -111,30 +99,15 @@ %clean rm -rf %{buildroot} -%pre -f %{name}.schemas_pre - -%posttrans -f %{name}.schemas_posttrans - -%preun -f %{name}.schemas_preun - -%files -f %{name}.lst +%files -f %{name}.lang %defattr(-,root,root) %doc dict/doc/FAQ dict/doc/HACKING dict/doc/HowToCreateDictionary dict/doc/StarDictFileFormat dict/doc/Translation dict/AUTHORS COPYING dict/ChangeLog dict/README -%{_libdir}/bonobo/servers/* %{_libdir}/stardict %{_bindir}/* %{_datadir}/applications/*.desktop -%{_datadir}/idl %{_datadir}/omf %{_datadir}/pixmaps/*.png %{_datadir}/stardict %{_mandir}/man1/stardict.1.gz -%if 0%{?suse_version} < 1030 -%dir %{_libdir}/bonobo -%dir %{_libdir}/bonobo/servers -%dir %{_datadir}/gnome -%dir %{_datadir}/gnome/help -%config %{sysconfdir}/gconf/schemas/stardict.schemas -%endif %changelog ++++++ stardict-3.0.3-fix-path-for-sounds.patch ++++++ --- /var/tmp/diff_new_pack.vSI4l7/_old 2014-08-25 11:03:56.000000000 +0200 +++ /var/tmp/diff_new_pack.vSI4l7/_new 2014-08-25 11:03:56.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- dict/src/conf.cpp.orig +++ dict/src/conf.cpp -@@ -205,8 +205,8 @@ AppConf::AppConf() : +@@ -210,8 +210,8 @@ AppConf::AppConf() : // stores absolute and relative paths add_entry("/apps/stardict/preferences/dictionary/tts_path", pathlist); #else ++++++ stardict-3.0.5-enable-gtk3.patch ++++++ Index: dict/configure =================================================================== --- dict/configure.orig +++ dict/configure @@ -18553,15 +18553,15 @@ fi if test "x${enable_gpe_support}" = "xyes" ; then - DEP_MODULES="gtk+-2.0 glib-2.0 >= 2.32 gmodule-2.0 gthread-2.0 libgpewidget >= 0.109" + DEP_MODULES="gtk+-3.0 glib-2.0 >= 2.32 gmodule-2.0 gthread-2.0 libgpewidget >= 0.109" elif test "x${enable_maemo_support}" = "xyes" ; then - DEP_MODULES="gtk+-2.0 glib-2.0 >= 2.32 gmodule-2.0 gthread-2.0 gconf-2.0 >= 2.6 hildon-libs >= 0.12" + DEP_MODULES="gtk+-3.0 glib-2.0 >= 2.32 gmodule-2.0 gthread-2.0 gconf-2.0 >= 2.6 hildon-libs >= 0.12" elif test "x${enable_darwin_support}" = "xyes" ; then - DEP_MODULES="gtk+-2.0 glib-2.0 >= 2.32 gmodule-2.0 gthread-2.0" + DEP_MODULES="gtk+-3.0 glib-2.0 >= 2.32 gmodule-2.0 gthread-2.0" elif test "x${enable_gnome_support}" = "xno" ; then - DEP_MODULES="gtk+-2.0 glib-2.0 >= 2.32 gmodule-2.0 gthread-2.0" + DEP_MODULES="gtk+-3.0 glib-2.0 >= 2.32 gmodule-2.0 gthread-2.0" else - DEP_MODULES="gtk+-2.0 glib-2.0 >= 2.32 gmodule-2.0 gthread-2.0 libgnome-2.0 libbonobo-2.0 gconf-2.0" + DEP_MODULES="gtk+-3.0 glib-2.0 >= 2.32 gmodule-2.0 gthread-2.0 libgnome-2.0 libbonobo-2.0 gconf-2.0" fi Index: lib/configure =================================================================== --- lib/configure.orig +++ lib/configure @@ -16008,7 +16008,7 @@ done # Checks for typedefs, structures, and compiler characteristics. # Checks for library functions. -DEP_MODULES="gtk+-2.0 glib-2.0 >= 2.8 gmodule-2.0 zlib libxml-2.0 >= 2.5" +DEP_MODULES="gtk+-3.0 glib-2.0 >= 2.8 gmodule-2.0 zlib libxml-2.0 >= 2.5" Index: tools/configure =================================================================== --- tools/configure.orig +++ tools/configure @@ -16043,7 +16043,7 @@ done # Checks for typedefs, structures, and compiler characteristics. # Checks for library functions. -DEP_MODULES="gtk+-2.0 glib-2.0 >= 2.8 zlib gio-2.0" +DEP_MODULES="gtk+-3.0 glib-2.0 >= 2.8 zlib gio-2.0" ++++++ stardict-3.0.4.tar.bz2 -> stardict-3.0.5.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/stardict/stardict-3.0.4.tar.bz2 /work/SRC/openSUSE:Factory/.stardict.new/stardict-3.0.5.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
