[packages/xfig] - updated to 3.2.6a - updated i18n,zoom-during-edit,urwfonts,app-defaults patches - removed obsolete
qboosh
qboosh at pld-linux.org
Sun Jul 30 13:43:32 CEST 2017
commit 07d686d408e0bb87641d691a8ae320d319e0ddc8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Jul 30 13:45:27 2017 +0200
- updated to 3.2.6a
- updated i18n,zoom-during-edit,urwfonts,app-defaults patches
- removed obsolete config,formatstring,pdfimport_mediabox,papersize_b1,network_images,mkstemp patches
- separate desktop and icon replaced by patch to upstream desktop file
38_formatstring.patch | 14 --
xfig-3.2.5b-app-defaults.patch | 15 +-
xfig-3.2.5b-mkstemp.patch | 32 ---
xfig-3.2.5b-network_images.patch | 371 -----------------------------------
xfig-3.2.5b-papersize_b1.patch | 27 ---
xfig-3.2.5b-pdfimport_mediabox.patch | 37 ----
xfig-3.2.5b-urwfonts.patch | 4 +-
xfig-3.2.5b-zoom-during-edit.patch | 6 +-
xfig-config.patch | 13 --
xfig-desktop.patch | 67 +++++++
xfig-i18n.patch | 4 +-
xfig.desktop | 61 ------
xfig.png | Bin 1511 -> 0 bytes
xfig.spec | 105 ++++------
14 files changed, 113 insertions(+), 643 deletions(-)
---
diff --git a/xfig.spec b/xfig.spec
index d43fb56..7fef49c 100644
--- a/xfig.spec
+++ b/xfig.spec
@@ -8,41 +8,36 @@ Summary(ru.UTF-8): Инструмент для рисования простой
Summary(tr.UTF-8): X11 çizim aracı
Summary(uk.UTF-8): Інструмент для малювання простої векторної графіки
Name: xfig
-Version: 3.2.5c
+Version: 3.2.6a
Release: 1
License: Freeware
Group: X11/Applications/Graphics
-#Source0Download: http://xfig.org/art15.html
-#Source0: http://files.xfig.org/%{name}.%{version}.full.tar.gz
-Source0: http://downloads.sourceforge.net/mcj/%{name}.%{version}.full.tar.gz
-# Source0-md5: 210851330fa4bb3581bec1f8448a4db8
-Source1: %{name}.desktop
-Source2: %{name}.png
-Patch0: %{name}-config.patch
-Patch1: %{name}-i18n.patch
-Patch2: 38_formatstring.patch
-
-Patch5: %{name}-3.2.5b-zoom-during-edit.patch
-Patch6: %{name}-3.2.5b-urwfonts.patch
-
-Patch8: %{name}-3.2.5b-pdfimport_mediabox.patch
-Patch9: %{name}-3.2.5b-papersize_b1.patch
-Patch10: %{name}-3.2.5b-network_images.patch
-Patch11: %{name}-3.2.5b-mkstemp.patch
-
-Patch13: %{name}-3.2.5b-app-defaults.patch
-URL: http://www.xfig.org/
+Source0: http://downloads.sourceforge.net/mcj/%{name}-%{version}.tar.xz
+# Source0-md5: 12c9a1fe3edd3719c8cf1dfec73a5bdb
+#Source1: %{name}.desktop
+#Source2: %{name}.png
+Patch0: %{name}-i18n.patch
+Patch1: %{name}-3.2.5b-zoom-during-edit.patch
+Patch2: %{name}-3.2.5b-urwfonts.patch
+Patch3: %{name}-3.2.5b-app-defaults.patch
+Patch4: %{name}-desktop.patch
+#Patch0: %{name}-config.patch
+#Patch2: 38_formatstring.patch
+#Patch8: %{name}-3.2.5b-pdfimport_mediabox.patch
+#Patch9: %{name}-3.2.5b-papersize_b1.patch
+#Patch10: %{name}-3.2.5b-network_images.patch
+#Patch11: %{name}-3.2.5b-mkstemp.patch
+URL: http://mcj.sourceforge.net/
BuildRequires: Xaw3d-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
-BuildRequires: xorg-cf-files
+BuildRequires: tar >= 1:1.22
BuildRequires: xorg-lib-libXaw-devel
-BuildRequires: xorg-lib-libXi-devel
BuildRequires: xorg-lib-libXpm-devel
-BuildRequires: xorg-util-gccmakedep
-BuildRequires: xorg-util-imake
+BuildRequires: xorg-lib-libXt-devel
+BuildRequires: xz
+Requires: fig2dev >= 3.2.6
Requires: netpbm-progs
-Requires: transfig >= 3.2.4-3
Requires: xorg-lib-libXt >= 1.0.0
Obsoletes: xfig-doc
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -96,64 +91,38 @@ роздрукувати на PostScript принтерах чи зконвер
(наприклад, X11 bitmaps, Encapsulated PostScript, LaTeX).
%prep
-%setup -q -n %{name}.%{version}
+%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
-%patch5 -p2
-%patch6 -p0
-
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p0
-
-%patch13 -p0
+%patch1 -p2
+%patch2 -p0
+%patch3 -p1
+%patch4 -p1
%build
-xmkmf -a
-%{__make} \
- CC="%{__cc}" \
- CDEBUGFLAGS="%{rpmcflags}" \
- LOCAL_LDFLAGS="%{rpmldflags}" \
- XFIGLIBDIR=%{_datadir}/xfig \
- XFIGDOCDIR=%{_docdir}/%{name}-%{version} \
- XPMINC="-I/usr/include/X11"
+%configure
+
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_libdir}}
-
-%{__make} install install.man \
- DESTDIR=$RPM_BUILD_ROOT \
- BINDIR=%{_bindir} \
- CONFDIR=%{_datadir}/X11 \
- MANPATH=%{_mandir} \
- MANSUFFIX="1" \
- XFIGLIBDIR=%{_datadir}/xfig
-
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
+
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
+
cp -a Libraries $RPM_BUILD_ROOT%{_datadir}/xfig
%{__rm} $RPM_BUILD_ROOT%{_datadir}/xfig/Libraries/*/README
-(
-cat $RPM_BUILD_ROOT%{_appdefsdir}/Fig
-echo 'Fig.inches: off'
-) > $RPM_BUILD_ROOT%{_appdefsdir}/Fig.new
-mv -f $RPM_BUILD_ROOT%{_appdefsdir}/Fig.new $RPM_BUILD_ROOT%{_appdefsdir}/Fig
+# packaged as %doc
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/xfig
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc Doc/html/ README CHANGES FIGAPPS Doc/TODO Doc/FORMAT*
+%doc CHANGES FIGAPPS README doc/{FORMAT*,TODO,html}
%attr(755,root,root) %{_bindir}/xfig
-# top dir belongs to transfig, which is required by xfig
-%{_datadir}/xfig/CompKeyDB
-%{_datadir}/xfig/Libraries
+%{_datadir}/xfig
%{_appdefsdir}/Fig
#%{_appdefsdir}/Fig-color
%{_mandir}/man1/xfig.1*
diff --git a/38_formatstring.patch b/38_formatstring.patch
deleted file mode 100644
index 985caa3..0000000
--- a/38_formatstring.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-From: Roland Rosenfeld <roland at debian.org>
-Subject: Fix format string error with hardening.
-
---- a/w_msgpanel.c
-+++ b/w_msgpanel.c
-@@ -588,7 +588,7 @@
-
- strcat(tmpstr,"\n");
- if (update_figs) {
-- fprintf(stderr,tmpstr);
-+ fprintf(stderr, "%s", tmpstr);
- } else {
- /* append this message to the file message widget string */
- block.firstPos = 0;
diff --git a/xfig-3.2.5b-app-defaults.patch b/xfig-3.2.5b-app-defaults.patch
index d773da5..658332e 100644
--- a/xfig-3.2.5b-app-defaults.patch
+++ b/xfig-3.2.5b-app-defaults.patch
@@ -1,9 +1,8 @@
Defaults for xfig. Idea from Roland Rosenfeld <roland at debian.org>
-diff -urNad xfig~/Fig.ad xfig/Fig.ad
---- Fig.ad
-+++ Fig.ad
-@@ -10,13 +10,17 @@
+--- xfig-3.2.6a/app-defaults/Fig.in.orig 2017-07-30 09:25:21.276709296 +0200
++++ xfig-3.2.6a/app-defaults/Fig.in 2017-07-30 09:27:04.636708116 +0200
+@@ -10,6 +10,10 @@
! some sample settings you may want to change
@@ -14,11 +13,3 @@ diff -urNad xfig~/Fig.ad xfig/Fig.ad
! The following fixes a problem that some window managers have
! with xfig continually resizing itself
- Fig*AllowShellResize: false
-
- ! Image editor - can edit imported image
--Fig.image_editor: xv
-+Fig.image_editor: gimp
-
- ! name of ghostscript (not ghostview)
- Fig.ghostscript: gs
diff --git a/xfig-3.2.5b-mkstemp.patch b/xfig-3.2.5b-mkstemp.patch
deleted file mode 100644
index c672a27..0000000
--- a/xfig-3.2.5b-mkstemp.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Missed hunk noticed https://bugzilla.redhat.com/show_bug.cgi?id=505257#c1 is recreated.
-
-http://bugs.gentoo.org/show_bug.cgi?id=264575
-
-=== modified file 'u_print.c'
---- u_print.c 2010-01-14 19:50:08 +0000
-+++ u_print.c 2010-01-14 19:54:14 +0000
-@@ -202,14 +202,22 @@
- char tmp_fig_file[PATH_MAX];
- char *outfile, *name, *real_lang;
- char *suf;
-+ int fd;
-
- /* if file exists, ask if ok */
- if (!ok_to_write(file, "EXPORT"))
- return (1);
-
-- sprintf(tmp_fig_file, "%s/%s%06d", TMPDIR, "xfig-fig", getpid());
-+ snprintf(tmp_fig_file, sizeof(tmp_fig_file), "%s/xfig-fig.XXXXXX", TMPDIR);
- /* write the fig objects to a temporary file */
- warnexist = False;
-+
-+ if ((fd = mkstemp(tmp_fig_file)) == -1) {
-+ file_msg("Can't open temp file %s: %s\n", tmp_fig_file, strerror(errno));
-+ return;
-+ }
-+ close(fd);
-+
- init_write_tmpfile();
- if (write_file(tmp_fig_file, False)) {
- end_write_tmpfile();
-
diff --git a/xfig-3.2.5b-network_images.patch b/xfig-3.2.5b-network_images.patch
deleted file mode 100644
index c7d01c0..0000000
--- a/xfig-3.2.5b-network_images.patch
+++ /dev/null
@@ -1,371 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12_network_images.dpatch by Roland Rosenfeld <roland at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Some network icons colored and/or combined by Roland Rosenfeld.
-
- at DPATCH@
-diff -urNad xfig~/Libraries/Networks/Devices/firewall-pair.fig xfig/Libraries/Networks/Devices/firewall-pair.fig
---- Libraries/Networks/Devices/firewall-pair.fig
-+++ Libraries/Networks/Devices/firewall-pair.fig
-@@ -0,0 +1,75 @@
-+#FIG 3.2 Produced by xfig version 3.2.5-alpha5
-+Portrait
-+Center
-+Inches
-+A4
-+100.00
-+Single
-+-2
-+# A pair of firewalls
-+# Combined by Roland Rosenfeld
-+1200 2
-+0 32 #aeaaae
-+# A pair of firewalls
-+6 3375 2175 4050 3075
-+6 3600 2250 4050 3075
-+# Firewall
-+# (from TomiOllila <Tomi.Ollila at tfi.net> )
-+6 3600 2250 4050 3075
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
-+ 3825 3075 3825 2475
-+2 1 0 1 0 20 2 0 20 0.000 0 0 -1 0 0 5
-+ 3675 2475 3675 3075 3825 3075 3975 2925 3975 2400
-+2 1 0 1 0 32 1 0 20 0.000 0 0 -1 0 0 7
-+ 3600 2400 3600 2475 3900 2475 4050 2325 4050 2250 3750 2250
-+ 3600 2400
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 3
-+ 3900 2475 3900 2400 3600 2400
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
-+ 3900 2400 4050 2250
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 3
-+ 3675 2625 3825 2625 3975 2475
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 3
-+ 3675 2775 3825 2775 3975 2625
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 3
-+ 3675 2925 3825 2925 3975 2775
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
-+ 3900 3000 3900 2850
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
-+ 3900 2700 3900 2550
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
-+ 3750 2475 3750 2625
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
-+ 3750 2775 3750 2925
-+-6
-+-6
-+6 3375 2175 3825 3000
-+6 3450 2175 3825 3000
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
-+ 3600 3000 3600 2400
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
-+ 3675 2325 3825 2175
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 3
-+ 3450 2550 3600 2550 3750 2400
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 3
-+ 3450 2700 3600 2700 3750 2550
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 3
-+ 3450 2850 3600 2850 3750 2700
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
-+ 3675 2925 3675 2775
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
-+ 3675 2625 3675 2475
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
-+ 3525 2400 3525 2550
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
-+ 3525 2700 3525 2850
-+-6
-+2 1 0 1 0 20 22 0 20 0.000 0 0 -1 0 0 5
-+ 3450 2400 3450 3000 3600 3000 3750 2850 3750 2325
-+2 1 0 1 0 32 21 0 20 0.000 0 0 -1 0 0 7
-+ 3375 2325 3375 2400 3675 2400 3825 2250 3825 2175 3525 2175
-+ 3375 2325
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 -1 0 0 3
-+ 3675 2400 3675 2325 3375 2325
-+-6
-+-6
-diff -urNad xfig~/Libraries/Networks/Devices/internet.fig xfig/Libraries/Networks/Devices/internet.fig
---- Libraries/Networks/Devices/internet.fig
-+++ Libraries/Networks/Devices/internet.fig
-@@ -0,0 +1,39 @@
-+#FIG 3.2 Produced by xfig version 3.2.5-alpha5
-+Portrait
-+Center
-+Inches
-+A4
-+100.00
-+Single
-+-2
-+# Internet cloud
-+# By Roland Rosenfeld
-+1200 2
-+# An Internet cloud
-+6 4275 5700 7200 7650
-+2 1 0 0 7 7 970 0 20 4.000 0 0 0 0 0 65
-+ 4719 7111 4633 7121 4548 7105 4469 7057 4394 6983 4346 6888
-+ 4309 6776 4298 6654 4309 6526 4346 6415 4394 6325 4469 6244
-+ 4548 6197 4633 6181 4719 6197 4798 6048 4893 5915 4994 5825
-+ 5122 5746 5244 5719 5377 5719 5505 5746 5627 5825 5733 5915
-+ 5850 5825 5961 5746 6094 5719 6222 5719 6355 5746 6472 5825
-+ 6583 5915 6668 6048 6748 6197 6833 6181 6918 6197 7003 6244
-+ 7072 6325 7130 6415 7157 6526 7168 6654 7157 6776 7130 6888
-+ 7072 6983 7003 7057 6918 7105 6833 7121 6748 7111 6668 7265
-+ 6583 7387 6472 7488 6355 7557 6222 7594 6094 7594 5961 7557
-+ 5850 7488 5733 7387 5627 7488 5505 7557 5377 7594 5244 7594
-+ 5122 7557 4994 7488 4893 7387 4798 7265 4719 7111
-+2 1 0 2 1 0 969 0 -1 0.000 0 0 0 0 0 65
-+ 4719 7111 4633 7121 4548 7105 4469 7057 4394 6983 4346 6888
-+ 4309 6776 4298 6654 4309 6526 4346 6415 4394 6325 4469 6244
-+ 4548 6197 4633 6181 4719 6197 4798 6048 4893 5915 4994 5825
-+ 5122 5746 5244 5719 5377 5719 5505 5746 5627 5825 5733 5915
-+ 5850 5825 5961 5746 6094 5719 6222 5719 6355 5746 6472 5825
-+ 6583 5915 6668 6048 6748 6197 6833 6181 6918 6197 7003 6244
-+ 7072 6325 7130 6415 7157 6526 7168 6654 7157 6776 7130 6888
-+ 7072 6983 7003 7057 6918 7105 6833 7121 6748 7111 6668 7265
-+ 6583 7387 6472 7488 6355 7557 6222 7594 6094 7594 5961 7557
-+ 5850 7488 5733 7387 5627 7488 5505 7557 5377 7594 5244 7594
-+ 5122 7557 4994 7488 4893 7387 4798 7265 4719 7111
-+4 0 0 100 0 18 33 0.0000 4 405 2040 4744 6853 Internet\001
-+-6
-diff -urNad xfig~/Libraries/Networks/Routers/router-pair.fig xfig/Libraries/Networks/Routers/router-pair.fig
---- Libraries/Networks/Routers/router-pair.fig
-+++ Libraries/Networks/Routers/router-pair.fig
-@@ -0,0 +1,78 @@
-+#FIG 3.2 Produced by xfig version 3.2.5-alpha5
-+Portrait
-+Center
-+Inches
-+A4
-+100.00
-+Single
-+-2
-+# A pair of routers
-+# Colored and combined by Roland Rosenfeld
-+1200 2
-+# A pair of routers
-+6 3150 3300 4275 3975
-+6 3346 3450 4269 3975
-+6 3844 3615 4173 3718
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 3879 3701 3854 3647 3976 3624 3955 3642 4159 3676 4111 3713
-+ 3908 3676 3879 3701
-+-6
-+6 3617 3636 3803 3759
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 3764 3731 3638 3754 3634 3694 3671 3703 3738 3646 3800 3657
-+ 3727 3719 3764 3731
-+-6
-+6 3803 3470 3988 3594
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 7 0 0 8
-+ 3837 3518 3982 3481 3983 3541 3947 3535 3876 3591 3809 3581
-+ 3882 3526 3837 3518
-+-6
-+1 2 0 1 0 15 51 0 20 0.000 1 0.0000 3807 3619 457 169 3349 3619 4264 3619
-+1 2 0 1 0 15 53 0 20 0.000 1 0.0000 3803 3806 457 169 3346 3806 4261 3806
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 3705 3557 3738 3608 3609 3637 3638 3615 3439 3581 3488 3545
-+ 3681 3576 3705 3557
-+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
-+ 3350 3613 3347 3812
-+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
-+ 4263 3626 4263 3815
-+2 2 0 0 0 15 52 -1 20 0.000 0 0 -1 0 0 5
-+ 3349 3626 4269 3626 4269 3800 3349 3800 3349 3626
-+-6
-+6 3150 3300 4125 3825
-+6 3600 3450 3975 3600
-+# polyline
-+2 1 0 1 0 7 60 0 20 0.000 0 0 0 0 0 8
-+ 3683 3551 3658 3497 3780 3474 3759 3492 3963 3526 3915 3563
-+ 3712 3526 3683 3551
-+-6
-+6 3600 3300 3825 3450
-+# polyline
-+2 1 0 1 0 7 60 0 20 0.000 0 0 7 0 0 8
-+ 3641 3368 3786 3331 3787 3391 3751 3385 3680 3441 3613 3431
-+ 3686 3376 3641 3368
-+-6
-+6 3375 3450 3675 3675
-+# polyline
-+2 1 0 1 0 7 60 0 20 0.000 0 0 0 0 0 8
-+ 3568 3581 3442 3604 3438 3544 3475 3553 3542 3496 3604 3507
-+ 3531 3569 3568 3581
-+-6
-+1 2 0 1 0 15 61 0 20 0.000 1 0.0000 3611 3469 457 169 3153 3469 4068 3469
-+1 2 0 1 0 15 63 0 20 0.000 1 0.0000 3607 3656 457 169 3150 3656 4065 3656
-+2 1 0 1 0 7 60 -1 -1 0.000 0 0 -1 0 0 2
-+ 4067 3476 4067 3665
-+# polyline
-+2 1 0 1 0 7 60 0 20 0.000 0 0 0 0 0 8
-+ 3509 3407 3542 3458 3413 3487 3442 3465 3243 3431 3292 3395
-+ 3485 3426 3509 3407
-+2 1 0 1 0 7 60 -1 -1 0.000 0 0 -1 0 0 2
-+ 3154 3463 3151 3662
-+2 2 0 0 0 15 62 -1 20 0.000 0 0 -1 0 0 5
-+ 3153 3476 4073 3476 4073 3650 3153 3650 3153 3476
-+-6
-+-6
-diff -urNad xfig~/Libraries/Networks/Routers/router4.fig xfig/Libraries/Networks/Routers/router4.fig
---- Libraries/Networks/Routers/router4.fig
-+++ Libraries/Networks/Routers/router4.fig
-@@ -0,0 +1,44 @@
-+#FIG 3.2 Produced by xfig version 3.2.5-alpha5
-+Portrait
-+Center
-+Metric
-+A4
-+100.00
-+Single
-+-2
-+# Router
-+# Colored by Roland Rosenfeld
-+1200 2
-+# Router
-+6 3870 4455 5940 5625
-+6 4995 4815 5715 5040
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 5072 5002 5018 4886 5284 4834 5238 4873 5683 4948 5578 5030
-+ 5136 4948 5072 5002
-+-6
-+6 4500 4860 4905 5130
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 4822 5067 4545 5117 4537 4989 4618 5007 4766 4883 4900 4905
-+ 4741 5041 4822 5067
-+-6
-+6 4905 4500 5310 4770
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 7 0 0 8
-+ 4981 4603 5296 4523 5300 4653 5222 4640 5066 4762 4919 4741
-+ 5079 4622 4981 4603
-+-6
-+1 2 0 1 0 15 51 0 20 0.000 1 0.0000 4914 4824 999 369 3915 4824 5913 4824
-+1 2 0 1 0 15 53 0 20 0.000 1 0.0000 4908 5231 999 369 3909 5231 5907 5231
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 4693 4690 4766 4800 4483 4863 4545 4814 4111 4740 4219 4661
-+ 4640 4731 4693 4690
-+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
-+ 3917 4811 3910 5244
-+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
-+ 5910 4838 5910 5251
-+2 2 0 0 0 15 52 -1 20 0.000 0 0 -1 0 0 5
-+ 3915 4838 5924 4838 5924 5218 3915 5218 3915 4838
-+-6
-diff -urNad xfig~/Libraries/Networks/Switches/switch-pair.fig xfig/Libraries/Networks/Switches/switch-pair.fig
---- Libraries/Networks/Switches/switch-pair.fig
-+++ Libraries/Networks/Switches/switch-pair.fig
-@@ -0,0 +1,66 @@
-+#FIG 3.2 Produced by xfig version 3.2.5-alpha5
-+Portrait
-+Center
-+Inches
-+A4
-+100.00
-+Single
-+-2
-+# A pair of switches
-+# Colored and combined by Roland Rosenfeld
-+1200 2
-+# A pair of switches
-+6 2550 2625 4725 3750
-+6 2625 2850 4725 3750
-+6 3000 2850 4425 3300
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 3603 3180 3581 3210 3194 3210 3161 3240 3028 3195 3268 3126
-+ 3214 3184 3608 3184
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 3651 3128 3673 3098 4060 3098 4093 3068 4226 3113 3986 3182
-+ 4040 3124 3646 3124
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 3760 3008 3738 3038 3351 3038 3318 3068 3185 3023 3425 2954
-+ 3371 3012 3765 3012
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 3827 2963 3849 2933 4236 2933 4269 2903 4402 2948 4162 3017
-+ 4216 2959 3822 2959
-+-6
-+2 1 0 1 0 15 51 0 20 0.000 0 0 -1 0 0 4
-+ 4125 3300 4725 2850 4725 3300 4125 3750
-+2 2 0 1 0 15 51 0 20 0.000 0 0 -1 0 0 5
-+ 2625 3300 4125 3300 4125 3750 2625 3750 2625 3300
-+2 3 0 1 0 15 51 -1 20 0.000 0 0 -1 0 0 5
-+ 2625 3300 3225 2850 4725 2850 4125 3300 2625 3300
-+-6
-+6 2550 2625 4650 3525
-+6 2925 2625 4350 3075
-+# polyline
-+2 1 0 1 0 7 61 0 20 0.000 0 0 0 0 0 8
-+ 3528 2955 3506 2985 3119 2985 3086 3015 2953 2970 3193 2901
-+ 3139 2959 3533 2959
-+# polyline
-+2 1 0 1 0 7 61 0 20 0.000 0 0 0 0 0 8
-+ 3576 2903 3598 2873 3985 2873 4018 2843 4151 2888 3911 2957
-+ 3965 2899 3571 2899
-+# polyline
-+2 1 0 1 0 7 61 0 20 0.000 0 0 0 0 0 8
-+ 3685 2783 3663 2813 3276 2813 3243 2843 3110 2798 3350 2729
-+ 3296 2787 3690 2787
-+# polyline
-+2 1 0 1 0 7 61 0 20 0.000 0 0 0 0 0 8
-+ 3752 2738 3774 2708 4161 2708 4194 2678 4327 2723 4087 2792
-+ 4141 2734 3747 2734
-+-6
-+2 1 0 1 0 15 62 0 20 0.000 0 0 -1 0 0 4
-+ 4050 3075 4650 2625 4650 3075 4050 3525
-+2 2 0 1 0 15 62 0 20 0.000 0 0 -1 0 0 5
-+ 2550 3075 4050 3075 4050 3525 2550 3525 2550 3075
-+2 3 0 1 0 15 62 -1 20 0.000 0 0 -1 0 0 5
-+ 2550 3075 3150 2625 4650 2625 4050 3075 2550 3075
-+-6
-+-6
-diff -urNad xfig~/Libraries/Networks/Switches/switch2.fig xfig/Libraries/Networks/Switches/switch2.fig
---- Libraries/Networks/Switches/switch2.fig
-+++ Libraries/Networks/Switches/switch2.fig
-@@ -0,0 +1,38 @@
-+#FIG 3.2 Produced by xfig version 3.2.5-alpha5
-+Portrait
-+Center
-+Inches
-+A4
-+100.00
-+Single
-+-2
-+# Switch
-+# colored by Roland Rosenfeld
-+1200 2
-+# Switch
-+6 2625 2850 4725 3750
-+6 3000 2850 4425 3300
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 3603 3180 3581 3210 3194 3210 3161 3240 3028 3195 3268 3126
-+ 3214 3184 3608 3184
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 3651 3128 3673 3098 4060 3098 4093 3068 4226 3113 3986 3182
-+ 4040 3124 3646 3124
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 3760 3008 3738 3038 3351 3038 3318 3068 3185 3023 3425 2954
-+ 3371 3012 3765 3012
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 3827 2963 3849 2933 4236 2933 4269 2903 4402 2948 4162 3017
-+ 4216 2959 3822 2959
-+-6
-+2 1 0 1 0 15 51 0 20 0.000 0 0 -1 0 0 4
-+ 4125 3300 4725 2850 4725 3300 4125 3750
-+2 2 0 1 0 15 51 0 20 0.000 0 0 -1 0 0 5
-+ 2625 3300 4125 3300 4125 3750 2625 3750 2625 3300
-+2 3 0 1 0 15 51 -1 20 0.000 0 0 -1 0 0 5
-+ 2625 3300 3225 2850 4725 2850 4125 3300 2625 3300
-+-6
diff --git a/xfig-3.2.5b-papersize_b1.patch b/xfig-3.2.5b-papersize_b1.patch
deleted file mode 100644
index fa0bdf0..0000000
--- a/xfig-3.2.5b-papersize_b1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 32_papersize_b1.dpatch by Roland Rosenfeld <roland at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: xfig -papersize b1 now really uses B1 instead of B10
-## DP: Closes: #535181
-
- at DPATCH@
-diff -urNad xfig~/resources.c xfig/resources.c
---- xfig~/resources.c
-+++ xfig/resources.c
-@@ -228,7 +228,6 @@
- {"A2 ", "ISO A2 ( 420mm x 594mm)", 19843, 28063},
- {"A1 ", "ISO A1 ( 594mm x 841mm)", 28063, 39732},
- {"A0 ", "ISO A0 ( 841mm x 1189mm)", 39732, 56173},
-- {"B10 ", "JIS B10 ( 32mm x 45mm)", 1516, 2117},
- {"B9 ", "JIS B9 ( 45mm x 64mm)", 2117, 3017},
- {"B8 ", "JIS B8 ( 64mm x 91mm)", 3017, 4300},
- {"B7 ", "JIS B7 ( 91mm x 128mm)", 4300, 6050},
-@@ -239,6 +238,7 @@
- {"B2 ", "JIS B2 ( 515mm x 728mm)", 24333, 34400},
- {"B1 ", "JIS B1 ( 728mm x 1030mm)", 34400, 48666},
- {"B0 ", "JIS B0 (1030mm x 1456mm)", 48666, 68783},
-+ {"B10 ", "JIS B10 ( 32mm x 45mm)", 1516, 2117},
- };
-
- char *multiple_pages[] = {
diff --git a/xfig-3.2.5b-pdfimport_mediabox.patch b/xfig-3.2.5b-pdfimport_mediabox.patch
deleted file mode 100644
index 23de740..0000000
--- a/xfig-3.2.5b-pdfimport_mediabox.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 33_pdfimport_mediabox.dpatch by jsoula at univ-lille2.fr
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix reading "/MediaBox" when importing PDF (Closes: #530898).
-
- at DPATCH@
-diff -urNad xfig~/f_readeps.c xfig/f_readeps.c
---- xfig~/f_readeps.c
-+++ xfig/f_readeps.c
-@@ -77,11 +77,13 @@
-
- /* look for /MediaBox for pdf file */
- if (pdf_flag) {
-- if (!strncmp(buf, "/MediaBox", 8)) { /* look for the MediaBox spec */
-+ char *s;
-+ for(s=buf; (s=strchr(s,'/')); s++) {
-+ if (!strncmp(s, "/MediaBox", 8)) { /* look for the MediaBox spec */
- char *c;
-
-- c = strchr(buf, '[') + 1;
-- if (c && sscanf(c, "%d %d %d %d", &llx, &lly, &urx, &ury) < 4) {
-+ c = strchr(s, '[');
-+ if (c && sscanf(c+1, "%d %d %d %d", &llx, &lly, &urx, &ury) < 4) {
- llx = lly = 0;
- urx = paper_sizes[0].width * 72 / PIX_PER_INCH;
- ury = paper_sizes[0].height * 72 / PIX_PER_INCH;
-@@ -89,7 +91,9 @@
- appres.INCHES ? "Letter" : "A4");
- app_flush();
- }
-+ break;
- }
-+ }
- /* look for bounding box */
- } else if (!nested && !strncmp(buf, "%%BoundingBox:", 14)) {
- if (!strstr(buf, "(atend)")) { /* make sure doesn't say (atend) */
diff --git a/xfig-3.2.5b-urwfonts.patch b/xfig-3.2.5b-urwfonts.patch
index 6a5c3df..e3914c7 100644
--- a/xfig-3.2.5b-urwfonts.patch
+++ b/xfig-3.2.5b-urwfonts.patch
@@ -1,5 +1,5 @@
---- u_fonts.c 2002-09-09 13:36:58.000000000 -0400
-+++ u_fonts.c 2006-10-11 00:29:07.000000000 -0400
+--- src/u_fonts.c 2002-09-09 13:36:58.000000000 -0400
++++ src/u_fonts.c 2006-10-11 00:29:07.000000000 -0400
@@ -22,41 +22,41 @@
/* X11 font names */
diff --git a/xfig-3.2.5b-zoom-during-edit.patch b/xfig-3.2.5b-zoom-during-edit.patch
index 11e5ceb..4244c6f 100644
--- a/xfig-3.2.5b-zoom-during-edit.patch
+++ b/xfig-3.2.5b-zoom-during-edit.patch
@@ -7,10 +7,8 @@ Date: Thu Oct 2 12:24:04 2008 +0400
Fixes crash. To reproduce create some object, zoom in so that it does not fit
the screen, start another edit and press Ctrl+Z.
-diff --git a/xfig/u_redraw.c b/xfig/u_redraw.c
-index 146abfa..fd53a8e 100644
---- a/xfig/u_redraw.c
-+++ b/xfig/u_redraw.c
+--- a/xfig/src/u_redraw.c
++++ b/xfig/src/u_redraw.c
@@ -434,7 +434,7 @@ redisplay_curobj()
}
} else {
diff --git a/xfig-config.patch b/xfig-config.patch
deleted file mode 100644
index 3d742ab..0000000
--- a/xfig-config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN xfig.3.2.5.org/Imakefile xfig.3.2.5/Imakefile
---- xfig.3.2.5.org/Imakefile 2006-10-11 01:19:22.000000000 +0200
-+++ xfig.3.2.5/Imakefile 2009-01-22 17:50:16.832801134 +0100
-@@ -76,7 +76,7 @@
- XCOMM are in different places
-
- PNGLIBDIR = $(USRLIBDIR)
--PNGINC = -I/usr/include
-+PNGINC =
- ZLIBDIR = $(USRLIBDIR)
-
- XCOMM If don't want JPEG support, comment out the #define USEJPEG line
-
diff --git a/xfig-desktop.patch b/xfig-desktop.patch
new file mode 100644
index 0000000..aed0809
--- /dev/null
+++ b/xfig-desktop.patch
@@ -0,0 +1,67 @@
+--- xfig-3.2.6a/xfig.desktop.orig 2016-07-20 23:12:04.000000000 +0200
++++ xfig-3.2.6a/xfig.desktop 2017-07-30 11:40:29.663283383 +0200
+@@ -1,11 +1,62 @@
+ [Desktop Entry]
+ Exec=/usr/bin/xfig %f
+ InitialPreference=2
+-MimeType=application/x-xfig;
++MimeType=application/x-xfig;image/x-xfig;
+ Name=xfig
++Name[eo]=XDesegno
++Name[et]=Ffig
++Name[nb]=X-figur
+ Comment=Facility for Interactive Generation of figures under X11
++Comment[af]=Teken Program
++Comment[ar]=برنامج الرسم
++Comment[bg]=Xfig програма за рисуване
++Comment[bs]=Program za crtanje
++Comment[ca]=Aplicació de dibuix Xfig
++Comment[cs]=Aplikace pro kreslení vektorových obrázků
++Comment[da]=Xfig tegneprogram
++Comment[de]=Xfig-Zeichenprogramm
++Comment[el]=Εφαρμογή ζωγραφικής Xfig
++Comment[eo]=Desegnilo "Xfig"
++Comment[es]=Aplicación de diseño vectorial (objetos)
++Comment[et]=XFig joonistusprogramm
++Comment[eu]=Marrazteko Programa
++Comment[fi]=Xfig vektoripiirto-ohjelma
++Comment[fr]=Programme de dessin objet Xfig
++Comment[gl]=Aplicación de debuxo (obxectos)
++Comment[he]=Xfig רויצה םושיי
++Comment[hr]=Program za crtanje
++Comment[hu]=Rajzolóprogram
++Comment[is]=Hlutbundið teikniforrit
++Comment[it]=Applicazione di disegno Xfig
++Comment[ja]=Xfig 作図用アプリケーション
++Comment[lt]=Xfig braižymo programa
++Comment[lv]=Zīmēšanas Programma
++Comment[mk]=Едноставна апликација за векторско цртање
++Comment[mt]=Programm tat-tpinġija
++Comment[nb]=Xfig-tegneprogram
++Comment[nl]=Xfig-tekenprogramma
++Comment[nn]=Teikneprogrammet Xfig
++Comment[pl]=Aplikacja do kreślenia
++Comment[pt]=Aplicação de desenho
++Comment[pt_BR]=Aplicação de desenho
++Comment[ro]=Program de desenare vectorială
++Comment[ru]=Приложения для рисования векторной графики
++Comment[sk]=Xfig aplikácia pre kreslenie vektorových obrázkov
++Comment[sl]=Program za risanje Xfig
++Comment[sr at Latn]=Xfig prgram za vektorsko crtanje
++Comment[sv]=Xfig ritprogram
++Comment[ta]=Xfig Ũþø ÀÂýÀ¡Î
++Comment[th]=โปรแกรมวาดภาพ
++Comment[tr]=Xfig çizim uygulaması
++Comment[uk]=Програма для утворення зображень Xfig
++Comment[ve]=Mbekanyomushumo ya u ola
++Comment[vi]=Chương trình vẽ
++Comment[xh]=Iprogramme Yemizobo
++Comment[zh_CN]=Xfig 绘图应用程序
++Comment[zh_TW]=繪圖程式
++Comment[zu]=Iprogremu Yemidwebo
+ Icon=xfig
+ Terminal=false
+ Type=Application
+-Categories=Graphics;
++Categories=Graphics;VectorGraphics;
+ Keywords=vector;graphics;figure;drawing;
diff --git a/xfig-i18n.patch b/xfig-i18n.patch
index 7a75aa3..83bd5b6 100644
--- a/xfig-i18n.patch
+++ b/xfig-i18n.patch
@@ -1,5 +1,5 @@
---- xfig.3.2.5c/Fig.ad~ 2012-02-16 21:21:34.000000000 +0100
-+++ xfig.3.2.5c/Fig.ad 2013-10-31 18:22:21.589616162 +0100
+--- xfig.3.2.6a/app-defaults/Fig.in~ 2012-02-16 21:21:34.000000000 +0100
++++ xfig.3.2.6a/app-defaults/Fig.in 2013-10-31 18:22:21.589616162 +0100
@@ -178,9 +178,9 @@
! If xfig is compiled with I18N option, you may want to uncomment following lines.
diff --git a/xfig.desktop b/xfig.desktop
deleted file mode 100644
index 49334f5..0000000
--- a/xfig.desktop
+++ /dev/null
@@ -1,61 +0,0 @@
-[Desktop Entry]
-Name=Xfig
-Name[eo]=XDesegno
-Name[et]=Ffig
-Name[nb]=X-figur
-MimeType=image/x-xfig;
-Comment=Drawing application
-Comment[af]=Teken Program
-Comment[ar]=برنامج الرسم
-Comment[bg]=Xfig програма за рисуване
-Comment[bs]=Program za crtanje
-Comment[ca]=Aplicació de dibuix Xfig
-Comment[cs]=Aplikace pro kreslení vektorových obrázků
-Comment[da]=Xfig tegneprogram
-Comment[de]=Xfig-Zeichenprogramm
-Comment[el]=Εφαρμογή ζωγραφικής Xfig
-Comment[eo]=Desegnilo "Xfig"
-Comment[es]=Aplicación de diseño vectorial (objetos)
-Comment[et]=XFig joonistusprogramm
-Comment[eu]=Marrazteko Programa
-Comment[fi]=Xfig vektoripiirto-ohjelma
-Comment[fr]=Programme de dessin objet Xfig
-Comment[gl]=Aplicación de debuxo (obxectos)
-Comment[he]=Xfig רויצה םושיי
-Comment[hr]=Program za crtanje
-Comment[hu]=Rajzolóprogram
-Comment[is]=Hlutbundið teikniforrit
-Comment[it]=Applicazione di disegno Xfig
-Comment[ja]=Xfig 作図用アプリケーション
-Comment[lt]=Xfig braižymo programa
-Comment[lv]=Zīmēšanas Programma
-Comment[mk]=Едноставна апликација за векторско цртање
-Comment[mt]=Programm tat-tpinġija
-Comment[nb]=Xfig-tegneprogram
-Comment[nl]=Xfig-tekenprogramma
-Comment[nn]=Teikneprogrammet Xfig
-Comment[pl]=Aplikacja do kreślenia
-Comment[pt]=Aplicação de desenho
-Comment[pt_BR]=Aplicação de desenho
-Comment[ro]=Program de desenare vectorială
-Comment[ru]=Приложения для рисования векторной графики
-Comment[sk]=Xfig aplikácia pre kreslenie vektorových obrázkov
-Comment[sl]=Program za risanje Xfig
-Comment[sr at Latn]=Xfig prgram za vektorsko crtanje
-Comment[sv]=Xfig ritprogram
-Comment[ta]=Xfig Ũþø ÀÂýÀ¡Î
-Comment[th]=โปรแกรมวาดภาพ
-Comment[tr]=Xfig çizim uygulaması
-Comment[uk]=Програма для утворення зображень Xfig
-Comment[ve]=Mbekanyomushumo ya u ola
-Comment[vi]=Chương trình vẽ
-Comment[xh]=Iprogramme Yemizobo
-Comment[zh_CN]=Xfig 绘图应用程序
-Comment[zh_TW]=繪圖程式
-Comment[zu]=Iprogremu Yemidwebo
-Terminal=false
-Exec=xfig
-Icon=xfig
-Type=Application
-Categories=Graphics;VectorGraphics;
-# vi: encoding=utf-8
diff --git a/xfig.png b/xfig.png
deleted file mode 100644
index 9c61f22..0000000
Binary files a/xfig.png and /dev/null differ
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xfig.git/commitdiff/07d686d408e0bb87641d691a8ae320d319e0ddc8
More information about the pld-cvs-commit
mailing list