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
bmwiedemann · May 22, 2024 · 876e1b9 · 876e1b9
1 parent 39d4680
commit 876e1b9
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 24 deletions.
diff --git a/packages/s/stardict-tools/.files b/packages/s/stardict-tools/.files
diff --git a/packages/s/stardict-tools/.rev b/packages/s/stardict-tools/.rev
@@ -158,4 +158,12 @@
     <comment></comment>
     <requestid>918855</requestid>
   </revision>
+  <revision rev="24" vrev="86">
+    <srcmd5>b1110e72503c57f549105a1d998ff40e</srcmd5>
+    <version>3.0.1</version>
+    <time>1716406414</time>
+    <user>anag+factory</user>
+    <comment></comment>
+    <requestid>1175883</requestid>
+  </revision>
 </revisionlist>
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
@@ -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
@@ -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 <cstdio>
  #include <cstring>
  #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
@@ -1,9 +1,17 @@
+-------------------------------------------------------------------
+Fri May 17 09:10:21 UTC 2024 - Dominique Leuenberger <[email protected]>
+
+- 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 <[email protected]>
 
 - 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 - [email protected]

diff --git 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