commit 358ac72c92f9e9d270361b886a78f6cb7165f763
Author: Jakub Bogusz <[email protected]>
Date: Sun Oct 29 12:04:36 2023 +0100
- updated to 3.2.9
transfig-broken.patch | 48 ++++++++++++++++++++++++------------------------
transfig.spec | 14 ++------------
2 files changed, 26 insertions(+), 36 deletions(-)
---
diff --git a/transfig.spec b/transfig.spec
index f8e567e..09a9582 100644
--- a/transfig.spec
+++ b/transfig.spec
@@ -11,13 +11,13 @@ Summary(ru.UTF-8): Конвертор файлов .fig (формат прогр
Summary(tr.UTF-8): fig dosyalarını başka biçimlere dönüştürür
Summary(uk.UTF-8): Конвертор файлів .fig (формат програми xfig) в інші
формати
Name: transfig
-Version: 3.2.8b
+Version: 3.2.9
Release: 1
Epoch: 1
License: distributable
Group: X11/Applications/Graphics
Source0: https://downloads.sourceforge.net/mcj/fig2dev-%{version}.tar.xz
-# Source0-md5: a4c3a99fbbd8b61363eee6304d79ca7e
+# Source0-md5: b5a04023cc74f3413247efb1dcd511e9
Patch0: %{name}-broken.patch
URL: https://mcj.sourceforge.net/
BuildRequires: libpng-devel
@@ -127,22 +127,12 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/pic2tpic
%dir %{_datadir}/fig2dev
%dir %{_datadir}/fig2dev/i18n
-# other latin-2 files are symlinks to cs_CZ.ps
-%lang(cs,hr,hu,pl,ro,sk,sl) %{_datadir}/fig2dev/i18n/cs_CZ.ps
-%lang(hr) %{_datadir}/fig2dev/i18n/hr_HR.ps
-%lang(hu) %{_datadir}/fig2dev/i18n/hu_HU.ps
%lang(ja) %{_datadir}/fig2dev/i18n/japanese.ps
%lang(ja) %{_datadir}/fig2dev/i18n/ja.ps
%lang(ja) %{_datadir}/fig2dev/i18n/ja_JP*.ps
%lang(ko) %{_datadir}/fig2dev/i18n/korean.ps
%lang(ko) %{_datadir}/fig2dev/i18n/ko.ps
%lang(ko) %{_datadir}/fig2dev/i18n/ko_KR*.ps
-%lang(pl) %{_datadir}/fig2dev/i18n/pl_PL.ps
-%lang(ro) %{_datadir}/fig2dev/i18n/ro_RO.ps
-%lang(ru) %{_datadir}/fig2dev/i18n/ru_RU*.ps
-%lang(sk) %{_datadir}/fig2dev/i18n/sk_SK.ps
-%lang(sl) %{_datadir}/fig2dev/i18n/sl_SI.ps
-%lang(uk) %{_datadir}/fig2dev/i18n/uk_UA*.ps
%{_mandir}/man1/fig2dev.1*
%{_mandir}/man1/fig2ps2tex.1*
%{_mandir}/man1/pic2tpic.1*
diff --git a/transfig-broken.patch b/transfig-broken.patch
index 8070673..833982c 100644
--- a/transfig-broken.patch
+++ b/transfig-broken.patch
@@ -1,15 +1,15 @@
---- fig2dev-3.2.6a/fig2dev/dev/genemf.c.orig 2017-01-07 23:07:15.000000000
+0100
-+++ fig2dev-3.2.6a/fig2dev/dev/genemf.c 2017-07-29 18:19:49.027329674
+0200
-@@ -696,7 +696,7 @@
- static void shape();
- static void shape_interior();
- static void textunicode();
--static void text();
-+static void textfunc();
- static void textcolr();
- static void textalign();
- #if defined(I18N) && defined(HAVE_ICONV)
-@@ -3020,7 +3020,7 @@
+--- fig2dev-3.2.9/fig2dev/dev/genemf.c.orig 2023-06-03 17:25:42.000000000
+0200
++++ fig2dev-3.2.9/fig2dev/dev/genemf.c 2023-10-29 10:00:25.864117040 +0100
+@@ -726,7 +726,7 @@ static void shape(F_line *l, int join, i
+ static void shape_interior(F_line *l, void (*drawshape)(F_line *));
+ static void textunicode(const char *str, int *n_chars, short **utext,
+ int *n_unicode);
+-static void text(int x, int y, RECTL *bbx, char *str);
++static void textfunc(int x, int y, RECTL *bbx, char *str);
+ static void textcolr(int color);
+ static void textalign(int align);
+ #ifdef HAVE_ICONV
+@@ -3074,7 +3074,7 @@ textunicode(
static void
@@ -18,21 +18,21 @@
int x,
int y, /* reference point */
RECTL *bbx, /* bounding box */
-@@ -3506,7 +3506,7 @@
- bak = *s1;
- *s1 = '\0';
+@@ -3578,7 +3578,7 @@ genemf_text(F_text *t)
+ bak = *s1;
+ *s1 = '\0';
-- text(0, 0, &rclBounds, s);
-+ textfunc(0, 0, &rclBounds, s);
+- text(0, 0, &rclBounds, s);
++ textfunc(0, 0, &rclBounds, s);
- *s1 = bak;
- }
-@@ -3532,7 +3532,7 @@
- }
+ *s1 = bak;
+ }
+@@ -3604,7 +3604,7 @@ genemf_text(F_text *t)
+ }
- textfont(font, t->size, round(t->angle * RAD_01DEG));
-- text(t->base_x, t->base_y, &rclBounds, t->cstring);
-+ textfunc(t->base_x, t->base_y, &rclBounds, t->cstring);
+ textfont(font, t->size, round(t->angle * RAD_01DEG));
+- text(t->base_x, t->base_y, &rclBounds, t->cstring);
++ textfunc(t->base_x, t->base_y, &rclBounds, t->cstring);
}/* end genemf_text */
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/transfig.git/commitdiff/358ac72c92f9e9d270361b886a78f6cb7165f763
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
