From 876e1b99b2cd4fa0f62772f039c770f7d2b8d7b5 Mon Sep 17 00:00:00 2001 From: badshah400 <> Date: Wed, 22 May 2024 19:33:35 +0000 Subject: [PATCH] Update stardict-tools to version 3.0.1 / rev 24 via SR 1175883 https://build.opensuse.org/request/show/1175883 by user badshah400 + anag+factory --- packages/s/stardict-tools/.files | Bin 810 -> 810 bytes packages/s/stardict-tools/.rev | 8 ++++++ ...rdict-tools-3.0.1-destbufferoverflow.patch | 14 +++++----- .../stardict-tools-3.0.1-gcc44.patch | 24 ++++++++++++------ .../s/stardict-tools/stardict-tools.changes | 10 +++++++- packages/s/stardict-tools/stardict-tools.spec | 10 ++------ 6 files changed, 42 insertions(+), 24 deletions(-) diff --git a/packages/s/stardict-tools/.files b/packages/s/stardict-tools/.files index a550413869e51fb43f64a2d6c6ad5d17e84249ac..c4e6b1517de10d999303be557cb468bd5b3b66a5 100644 GIT binary patch delta 236 zcmZ9EJx&8L5QTRWNI|HGK$H}SF37)QPb8=i4FzWyk7of1k%0FK9AI(D4bpK8ZiQ>4 zSG*^E-`g+ti{-A2>hNgZb=`42=T{0O|h^fU7n$YE_JsIC#*VFrHJ(-`^`~G1QGP9D1Hs}!9L1zX^(263Jtg%QoL?3h#LyVGIZT{+?Uv|RN^79XF CxIyLs delta 195 zcmWO0Ep7ub5J2JeRt@M63t1^(K^0cXW6!KTQB+VCv^>lnuW_U_M+l8%`3xm{h#sY= zw7i+wm-^jat8Mr7U+v24XT7LHPY^AMP$uV%8!}|1U_f{X zOo*}kY
    1;CKjK1CqR;Fz<^NfKK~^;d1mIQGVQSsb1;#Asv!%N)H85{)Jvu-@9P h{C&JJ3hOLO2myUgXhO1#&T&Y7@XPCafptBq?heJ&HRb>S diff --git a/packages/s/stardict-tools/.rev b/packages/s/stardict-tools/.rev index f9467725fde..bd1d91c50b1 100644 --- a/packages/s/stardict-tools/.rev +++ b/packages/s/stardict-tools/.rev @@ -158,4 +158,12 @@ 918855 + + b1110e72503c57f549105a1d998ff40e + 3.0.1 + + anag+factory + + 1175883 + diff --git a/packages/s/stardict-tools/stardict-tools-3.0.1-destbufferoverflow.patch b/packages/s/stardict-tools/stardict-tools-3.0.1-destbufferoverflow.patch index b72c67b36ef..e697ebc8660 100644 --- a/packages/s/stardict-tools/stardict-tools-3.0.1-destbufferoverflow.patch +++ b/packages/s/stardict-tools/stardict-tools-3.0.1-destbufferoverflow.patch @@ -1,8 +1,8 @@ -Index: src/myspell2dic.c +Index: stardict-tools-3.0.1/src/myspell2dic.c =================================================================== ---- src/myspell2dic.c.orig 2007-09-07 05:10:45.000000000 +0200 -+++ src/myspell2dic.c 2008-10-08 22:23:39.000000000 +0200 -@@ -132,7 +132,7 @@ if (argc<3) +--- stardict-tools-3.0.1.orig/src/myspell2dic.c ++++ stardict-tools-3.0.1/src/myspell2dic.c +@@ -132,7 +132,7 @@ if (argc<3) fprintf(stderr, "Enter grammar language [Spanish]: "); fflush(stderr); @@ -11,10 +11,10 @@ Index: src/myspell2dic.c if ((p=strchr(lang, '\n'))!=NULL) *p=0; if (*lang==0) strcpy(lang, "Spanish"); -Index: src/ooo2dict.c +Index: stardict-tools-3.0.1/src/ooo2dict.c =================================================================== ---- src/ooo2dict.c.orig 2007-07-10 09:16:06.000000000 +0200 -+++ src/ooo2dict.c 2008-10-08 22:24:23.000000000 +0200 +--- stardict-tools-3.0.1.orig/src/ooo2dict.c ++++ stardict-tools-3.0.1/src/ooo2dict.c @@ -71,7 +71,7 @@ current2=malloc(10000); fprintf(stderr, "Enter thesaurus language [WordNet_English]: "); diff --git a/packages/s/stardict-tools/stardict-tools-3.0.1-gcc44.patch b/packages/s/stardict-tools/stardict-tools-3.0.1-gcc44.patch index 8a79da7b02b..42ecec10685 100644 --- a/packages/s/stardict-tools/stardict-tools-3.0.1-gcc44.patch +++ b/packages/s/stardict-tools/stardict-tools-3.0.1-gcc44.patch @@ -1,12 +1,16 @@ ---- src/bgl2txt.cpp.orig -+++ src/bgl2txt.cpp +Index: stardict-tools-3.0.1/src/bgl2txt.cpp +=================================================================== +--- stardict-tools-3.0.1.orig/src/bgl2txt.cpp ++++ stardict-tools-3.0.1/src/bgl2txt.cpp @@ -1,3 +1,4 @@ +#include #include #include "libbgl2txt.h" ---- src/KangXi.cpp.orig -+++ src/KangXi.cpp +Index: stardict-tools-3.0.1/src/KangXi.cpp +=================================================================== +--- stardict-tools-3.0.1.orig/src/KangXi.cpp ++++ stardict-tools-3.0.1/src/KangXi.cpp @@ -57,7 +57,7 @@ void parse_line(const char *line) gchar utf8[7]; gint n = g_unichar_to_utf8(uc, utf8); @@ -16,8 +20,10 @@ p = strchr(line, '\t'); if (!p) { g_print("Error: %s\n", line); ---- src/Unihan.cpp.orig -+++ src/Unihan.cpp +Index: stardict-tools-3.0.1/src/Unihan.cpp +=================================================================== +--- stardict-tools-3.0.1.orig/src/Unihan.cpp ++++ stardict-tools-3.0.1/src/Unihan.cpp @@ -58,7 +58,7 @@ void parse_line(const char *line) const char *han = line+2; @@ -36,8 +42,10 @@ if (!p) { g_print("Error: %s\n", line); return; ---- configure.in.orig -+++ configure.in +Index: stardict-tools-3.0.1/configure.in +=================================================================== +--- stardict-tools-3.0.1.orig/configure.in ++++ stardict-tools-3.0.1/configure.in @@ -7,11 +7,12 @@ AC_CONFIG_SRCDIR([src/stardict-editor.cp AM_INIT_AUTOMAKE([dist-bzip2]) AC_CONFIG_HEADER([config.h]) diff --git a/packages/s/stardict-tools/stardict-tools.changes b/packages/s/stardict-tools/stardict-tools.changes index 3aa3317502f..fe7b7657434 100644 --- a/packages/s/stardict-tools/stardict-tools.changes +++ b/packages/s/stardict-tools/stardict-tools.changes @@ -1,9 +1,17 @@ +------------------------------------------------------------------- +Fri May 17 09:10:21 UTC 2024 - Dominique Leuenberger + +- Use %autosetup macro: allows us to eliminate usage of deprecated + %patchN syntax. +- Rebase stardict-tools-3.0.1-destbufferoverflow.patch and + stardict-tools-3.0.1-gcc44.patch: make the apply witch patch -p1. + ------------------------------------------------------------------- Fri Aug 27 05:45:11 UTC 2021 - Steve Kowalik - Add patch: python3-support.patch * Convert all Python 2 scripts to Python 3 -- Remove shebang mangling from the specfile for python scripts. +- Remove shebang mangling from the specfile for python scripts. ------------------------------------------------------------------- Sun Dec 10 04:46:08 UTC 2017 - i@marguerite.su diff --git a/packages/s/stardict-tools/stardict-tools.spec b/packages/s/stardict-tools/stardict-tools.spec index d520e079fa9..4412207364d 100644 --- a/packages/s/stardict-tools/stardict-tools.spec +++ b/packages/s/stardict-tools/stardict-tools.spec @@ -1,7 +1,7 @@ # # spec file for package stardict-tools # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -56,13 +56,7 @@ This package contains the dictionary conversion tools which can convert dictionaries of DICT, wquick, mova and pydict to stardict format. %prep -%setup -q -%patch1 -p1 -%patch2 -%patch3 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 +%autosetup -p1 %build autoreconf -fiv