public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/xfig] epel10.2: Re-organize / consolidate patches
@ 2026-05-30 14:28 Hans de Goede
0 siblings, 0 replies; only message in thread
From: Hans de Goede @ 2026-05-30 14:28 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/xfig
Branch : epel10.2
Commit : deaf0af570611ab6d91b096237d463fe8eff72fc
Author : Hans de Goede <hdegoede@redhat.com>
Date : 2012-08-12T18:06:54+02:00
Stats : +782/-310 in 23 file(s)
URL : https://src.fedoraproject.org/rpms/xfig/c/deaf0af570611ab6d91b096237d463fe8eff72fc?branch=epel10.2
Log:
Re-organize / consolidate patches
- Add a bunch of patches (minor bug-fixes) from the Debian package
- Add better icons from the Debian package
---
diff --git a/.gitignore b/.gitignore
index b652b45..64810f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
xfig.3.2.5b.full.tar.gz
+/xfig-icons.tar.gz
diff --git a/03_usr_share.patch b/03_usr_share.patch
new file mode 100644
index 0000000..0f09372
--- /dev/null
+++ b/03_usr_share.patch
@@ -0,0 +1,35 @@
+From: Roland Rosenfeld <roland@debian.org>
+Subject: Change documentation, that image libraries are in
+
+--- a/Doc/xfig.man
++++ b/Doc/xfig.man
+@@ -1475,8 +1475,11 @@
+ See the
+ .IR Imakefile .
+ .TP
+-/usr/lib/X11/xfig
+-This directory contains the html documentation, the above mentioned
++/usr/share/doc/xfig
++This directory contains the documentation.
++.TP
++/usr/share/xfig
++This directory contains the above mentioned
+ CompKeyDB file, and a directory of libraries containing Fig objects
+ such as electrical symbols, logic symbols, etc.
+ .TP
+--- a/Doc/xfig_man.html
++++ b/Doc/xfig_man.html
+@@ -2539,8 +2539,11 @@
+ See the
+ <I>Imakefile</I>.
+
+-<DT>/usr/lib/X11/xfig<DD>
+-This directory contains the html documentation, the above mentioned
++<DT>/usr/share/doc/xfig<DD>
++This directory contains the documentation.
++
++<DT>/usr/share/xfig<DD>
++This directory contains the above mentioned
+ CompKeyDB file, and a directory of libraries containing Fig objects
+ such as electrical symbols, logic symbols, etc.
+ <DT><B>Fig.ad and Fig-color.ad</B>
diff --git a/12_network_images.patch b/12_network_images.patch
new file mode 100644
index 0000000..0f63ac1
--- /dev/null
+++ b/12_network_images.patch
@@ -0,0 +1,361 @@
+From: Roland Rosenfeld <roland@debian.org>
+Subject: Some network icons colored and/or combined by Roland Rosenfeld.
+
+--- /dev/null
++++ b/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@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
+--- /dev/null
++++ b/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
+--- /dev/null
++++ b/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
+--- /dev/null
++++ b/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
+--- /dev/null
++++ b/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
+--- /dev/null
++++ b/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/13_remove_extra_libs.patch b/13_remove_extra_libs.patch
new file mode 100644
index 0000000..6db176f
--- /dev/null
+++ b/13_remove_extra_libs.patch
@@ -0,0 +1,21 @@
+From: Roland Rosenfeld <roland@debian.org>
+Subject: Remove unnecessary dependencies on libz, libXmu, libSM, libICE, libXext
+
+--- a/Imakefile
++++ b/Imakefile
+@@ -227,7 +227,14 @@
+ XCOMM #define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB)
+ #ifdef XawClientLibs
+ # undef XawClientLibs
+-# define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XTOOLONLYLIIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XONLYLIB)
++# define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XTOOLONLYLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XONLYLIB)
++#endif
++
++XCOMM Shorten unnecessary dependencies:
++XCOMM #define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB)
++#ifdef XawClientLibs
++# undef XawClientLibs
++# define XawClientLibs $(XAWLIB) $(XTOOLONLYLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XONLYLIB)
+ #endif
+
+ XCOMM *****************************************************
diff --git a/31_spelling.patch b/31_spelling.patch
new file mode 100644
index 0000000..e92e64c
--- /dev/null
+++ b/31_spelling.patch
@@ -0,0 +1,23 @@
+From: Roland Rosenfeld <roland@debian.org>
+Subject: Fix spelling errors in binary.
+
+--- a/f_load.c
++++ b/f_load.c
+@@ -373,5 +373,5 @@
+ /* Format error; relevant error message is already delivered */
+ ;
+ else
+- file_msg("File \"%s\" is not accessable; %s.", file, strerror(err));
++ file_msg("File \"%s\" is not accessible; %s.", file, strerror(err));
+ }
+--- a/f_readgif.c
++++ b/f_readgif.c
+@@ -137,7 +137,7 @@
+
+ if (c == '!') { /* Extension */
+ if (! ReadOK(file,&c,1))
+- file_msg("GIF read error on extention function code");
++ file_msg("GIF read error on extension function code");
+ (void) DoGIFextension(file, c);
+ continue;
+ }
diff --git a/32_papersize_b1.patch b/32_papersize_b1.patch
new file mode 100644
index 0000000..5a33604
--- /dev/null
+++ b/32_papersize_b1.patch
@@ -0,0 +1,22 @@
+From: Roland Rosenfeld <roland@debian.org>
+Subject: xfig -papersize b1 now really uses B1 instead of B10; Closes: #535181
+Bug-Debian: http://bugs.debian.org/535181
+
+--- a/resources.c
++++ b/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/33_pdfimport_mediabox.patch b/33_pdfimport_mediabox.patch
new file mode 100644
index 0000000..a12ee33
--- /dev/null
+++ b/33_pdfimport_mediabox.patch
@@ -0,0 +1,33 @@
+From: jsoula@univ-lille2.fr
+Subject: Fix reading "/MediaBox" when importing PDF (Closes: #530898).
+Bug-Debian: http://bugs.debian.org/530898
+
+--- a/f_readeps.c
++++ b/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/35_CVE-2010-4262.patch b/35_CVE-2010-4262.patch
new file mode 100644
index 0000000..244a911
--- /dev/null
+++ b/35_CVE-2010-4262.patch
@@ -0,0 +1,28 @@
+From: Dr. Werner Fink <werner@suse.de>
+Subject: Fix stack-based buffer overflow by processing certain FIG images.
+ Closes: 606257: CVE-2010-4262: Buffer overflow
+Bug: https://bugzilla.redhat.com/show_bug.cgi?id=659676
+Bug-Debian: http://bugs.debian.org/606257
+
+--- a/w_msgpanel.c
++++ b/w_msgpanel.c
+@@ -60,7 +60,7 @@
+ /* for the popup message (file_msg) window */
+
+ static int file_msg_length=0;
+-static char tmpstr[300];
++static char tmpstr[512];
+ static Widget file_msg_panel,
+ file_msg_win, file_msg_dismiss;
+
+@@ -582,8 +582,8 @@
+ }
+
+ va_start(ap, format);
+- /* format the string */
+- vsprintf(tmpstr, format, ap);
++ /* format the string (but leave room for \n and \0) */
++ vsnprintf(tmpstr, sizeof(tmpstr)-2, format, ap);
+ va_end(ap);
+
+ strcat(tmpstr,"\n");
diff --git a/36_libpng15.dpatch b/36_libpng15.dpatch
deleted file mode 100644
index fbeba17..0000000
--- a/36_libpng15.dpatch
+++ /dev/null
@@ -1,84 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 36_libpng15.dpatch by Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Some changes to cooperate with libpng 1.5.
-
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' xfig~/f_readpng.c xfig/f_readpng.c
---- xfig~/f_readpng.c
-+++ xfig/f_readpng.c
-@@ -43,7 +43,7 @@
- char *ptr;
- int num_palette;
- png_colorp palette;
-- png_color_16 background;
-+ png_color_16 background, *image_background;
-
- /* make scale factor smaller for metric */
- float scale = (appres.INCHES ?
-@@ -73,7 +73,7 @@
- }
-
- /* set long jump recovery here */
-- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf((png_ptr)))) {
- /* if we get here there was a problem reading the file */
- png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
- close_picfile(file,filetype);
-@@ -90,14 +90,18 @@
- png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type,
- &interlace_type, &compression_type, &filter_type);
-
-- if (info_ptr->valid & PNG_INFO_gAMA)
-- png_set_gamma(png_ptr, 2.2, info_ptr->gamma);
-- else
-+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_gAMA)) {
-+ double gamma;
-+ png_get_gAMA(png_ptr, info_ptr, &gamma);
-+ png_set_gamma(png_ptr, 2.2, gamma);
-+ } else {
- png_set_gamma(png_ptr, 2.2, 0.45);
-+ }
-
-- if (info_ptr->valid & PNG_INFO_bKGD)
-+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_bKGD) &&
-+ png_get_bKGD(png_ptr, info_ptr, &image_background))
- /* set the background to the one supplied */
-- png_set_background(png_ptr, &info_ptr->background,
-+ png_set_background(png_ptr, image_background,
- PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
- else {
- /* blend the canvas background using the alpha channel */
-@@ -136,7 +140,11 @@
-
- if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) {
- png_get_hIST(png_ptr, info_ptr, &histogram);
-+#ifdef PNG_READ_QUANTIZE_SUPPORTED
-+ png_set_quantize(png_ptr, palette, num_palette, 256, histogram, 0);
-+#else
- png_set_dither(png_ptr, palette, num_palette, 256, histogram, 0);
-+#endif
- }
- }
- if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
-diff -urNad '--exclude=CVS' '--exclude=.svn' xfig~/f_wrpng.c xfig/f_wrpng.c
---- xfig~/f_wrpng.c
-+++ xfig/f_wrpng.c
-@@ -20,6 +20,7 @@
- #include "w_msgpanel.h"
- #include "w_setup.h"
- #include <png.h>
-+#include <zlib.h>
-
- /*
- * Write PNG file from rgb data
-@@ -59,7 +60,7 @@
- }
-
- /* set long jump recovery here */
-- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf((png_ptr)))) {
- /* if we get here there was a problem reading the file */
- png_destroy_write_struct(&png_ptr, &info_ptr);
- return False;
diff --git a/36_libpng15.patch b/36_libpng15.patch
new file mode 100644
index 0000000..86bd50c
--- /dev/null
+++ b/36_libpng15.patch
@@ -0,0 +1,78 @@
+From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+Subject: Some changes to cooperate with libpng 1.5.
+
+--- a/f_readpng.c
++++ b/f_readpng.c
+@@ -43,7 +43,7 @@
+ char *ptr;
+ int num_palette;
+ png_colorp palette;
+- png_color_16 background;
++ png_color_16 background, *image_background;
+
+ /* make scale factor smaller for metric */
+ float scale = (appres.INCHES ?
+@@ -73,7 +73,7 @@
+ }
+
+ /* set long jump recovery here */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf((png_ptr)))) {
+ /* if we get here there was a problem reading the file */
+ png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+ close_picfile(file,filetype);
+@@ -90,14 +90,18 @@
+ png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type,
+ &interlace_type, &compression_type, &filter_type);
+
+- if (info_ptr->valid & PNG_INFO_gAMA)
+- png_set_gamma(png_ptr, 2.2, info_ptr->gamma);
+- else
++ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_gAMA)) {
++ double gamma;
++ png_get_gAMA(png_ptr, info_ptr, &gamma);
++ png_set_gamma(png_ptr, 2.2, gamma);
++ } else {
+ png_set_gamma(png_ptr, 2.2, 0.45);
++ }
+
+- if (info_ptr->valid & PNG_INFO_bKGD)
++ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_bKGD) &&
++ png_get_bKGD(png_ptr, info_ptr, &image_background))
+ /* set the background to the one supplied */
+- png_set_background(png_ptr, &info_ptr->background,
++ png_set_background(png_ptr, image_background,
+ PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
+ else {
+ /* blend the canvas background using the alpha channel */
+@@ -136,7 +140,11 @@
+
+ if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) {
+ png_get_hIST(png_ptr, info_ptr, &histogram);
++#ifdef PNG_READ_QUANTIZE_SUPPORTED
++ png_set_quantize(png_ptr, palette, num_palette, 256, histogram, 0);
++#else
+ png_set_dither(png_ptr, palette, num_palette, 256, histogram, 0);
++#endif
+ }
+ }
+ if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
+--- a/f_wrpng.c
++++ b/f_wrpng.c
+@@ -20,6 +20,7 @@
+ #include "w_msgpanel.h"
+ #include "w_setup.h"
+ #include <png.h>
++#include <zlib.h>
+
+ /*
+ * Write PNG file from rgb data
+@@ -59,7 +60,7 @@
+ }
+
+ /* set long jump recovery here */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf((png_ptr)))) {
+ /* if we get here there was a problem reading the file */
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ return False;
diff --git a/37_fix-eps-reading.patch b/37_fix-eps-reading.patch
new file mode 100644
index 0000000..657cd1e
--- /dev/null
+++ b/37_fix-eps-reading.patch
@@ -0,0 +1,48 @@
+From: Hans de Goede <hdegoede@redhat.com>
+Subject: Fix importing of eps files.
+
+--- a/f_readeps.c
++++ b/f_readeps.c
+@@ -256,12 +256,13 @@
+ {
+ char buf[300];
+ FILE *tmpfp, *pixfile, *gsfile;
+- char *psnam, *driver;
++ char *driver;
+ int status, wid, ht, nbitmap, fd;
+ char tmpfile[PATH_MAX],
+ pixnam[PATH_MAX],
+ errnam[PATH_MAX],
+- gscom[2 * PATH_MAX];
++ gscom[2 * PATH_MAX],
++ psnam[PATH_MAX];
+
+ wid = urx - llx;
+ ht = ury - lly;
+@@ -311,19 +312,14 @@
+ /* for color, use pcx */
+ driver = "pcx256";
+ }
+- /* avoid absolute paths (for Cygwin with gswin32) by changing directory */
+- if (tmpfile[0] == '/') {
+- psnam = strrchr(tmpfile, '/');
+- *psnam = 0;
+- sprintf(gscom, "cd \"%s/\";", tmpfile);
+- *psnam++ = '/'; /* Restore name for unlink() below */
+- } else {
+- psnam = tmpfile;
+- gscom[0] = '\0';
++ /* Canonicalize the eps file filename, needed to "defeat" -dSAFER */
++ if (!realpath(tmpfile, psnam)) {
++ file_msg("Cannot canonicalize %s: %s\n", tmpfile, strerror(errno));
++ return False;
+ }
+- sprintf(&gscom[strlen(gscom)],
+- "%s -r72x72 -dSAFER -sDEVICE=%s -g%dx%d -sOutputFile=%s -q - > %s 2>&1",
+- appres.ghostscript, driver, wid, ht, pixnam, errnam);
++ sprintf(gscom,
++ "%s -r72x72 -sDEVICE=%s -g%dx%d -sOutputFile=%s -dDELAYSAFER -c '<< /PermitFileReading [ (%s)] >> setuserparams .locksafe' -dSAFER -q - > %s 2>&1",
++ appres.ghostscript, driver, wid, ht, pixnam, psnam, errnam);
+ if (appres.DEBUG)
+ fprintf(stderr,"calling: %s\n",gscom);
+ if ((gsfile = popen(gscom, "w")) == 0) {
diff --git a/38_formatstring.patch b/38_formatstring.patch
new file mode 100644
index 0000000..985caa3
--- /dev/null
+++ b/38_formatstring.patch
@@ -0,0 +1,14 @@
+From: Roland Rosenfeld <roland@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/sources b/sources
index 9b95348..74035c1 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
499b0ce103a6b353453bf7e327f9a3b9 xfig.3.2.5b.full.tar.gz
+f58e3bde288d623c826e1784ebb45de0 xfig-icons.tar.gz
diff --git a/xfig-3.2.5-Imakefile.patch b/xfig-3.2.5-Imakefile.patch
new file mode 100644
index 0000000..90f91c3
--- /dev/null
+++ b/xfig-3.2.5-Imakefile.patch
@@ -0,0 +1,37 @@
+diff -up xfig.3.2.5b/Imakefile.fed xfig.3.2.5b/Imakefile
+--- xfig.3.2.5b/Imakefile.fed 2012-08-12 16:54:00.102765148 +0200
++++ xfig.3.2.5b/Imakefile 2012-08-12 16:57:32.883846828 +0200
+@@ -45,12 +45,12 @@ XCOMM Don't set the DESTDIR variable unl
+ XCOMM different tree than the "correct" tree that your X system expects. The usual
+ XCOMM purpose of DESTDIR is to test an install process by installing in a benign area.
+
+-XCOMM XAPPLOADDIR = /home/user/xfig
++XAPPLOADDIR = /usr/share/X11/app-defaults
+
+ XCOMM Comment out the following definition for XAW3D if you don't to want to use
+ XCOMM the 3d Athena Widget Set
+
+-#define XAW3D
++XCOMM #define XAW3D
+
+ #ifdef XAW3D
+ XAWLIB = -lXaw3d
+@@ -169,15 +169,14 @@ XCOMM be sure to comment out the second
+ XCOMM XFIGLIBDIR = $(LIBDIR)
+
+ XCOMM use this if you want the multi-key data base file in the standard X11 tree
+-XFIGLIBDIR = $(LIBDIR)/xfig
++XFIGLIBDIR = /usr/share/xfig
+
+ XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
+-XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
+-XFIGDOCDIR = /usr/local/xfig/doc
++XFIGDOCDIR = /usr/share/doc/xfig
+
+ XCOMM MANDIR tells where the standard man pages should go (no need to change it
+ XCOMM if you want the man pages installed in the standard place on your system
+-MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
++MANDIR = /usr/share/man/man1
+ XCOMM MANDIR = /usr/local/xfig/man
+
+ XCOMM If your system doesn't have strstr undefine the following definition
diff --git a/xfig-3.2.5-debian.patch b/xfig-3.2.5-debian.patch
deleted file mode 100644
index 13c1cf0..0000000
--- a/xfig-3.2.5-debian.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -urN xfig.3.2.5.orig/Doc/xfig.man xfig.3.2.5/Doc/xfig.man
---- xfig.3.2.5.orig/Doc/xfig.man 2004-04-14 19:26:07.000000000 +0200
-+++ xfig.3.2.5/Doc/xfig.man 2009-03-15 16:44:48.000000000 +0100
-@@ -1474,8 +1475,11 @@
- See the
- .IR Imakefile .
- .TP
--/usr/lib/X11/xfig
--This directory contains the html documentation, the above mentioned
-+/usr/share/doc/xfig-3.2.5
-+This directory contains the documentation.
-+.TP
-+/usr/share/xfig
-+This directory contains the above mentioned
- CompKeyDB file, and a directory of libraries containing Fig objects
- such as electrical symbols, logic symbols, etc.
- .TP
-diff -urN xfig.3.2.5.orig/Doc/xfig_man.html xfig.3.2.5/Doc/xfig_man.html
---- xfig.3.2.5.orig/Doc/xfig_man.html 2004-04-14 19:35:44.000000000 +0200
-+++ xfig.3.2.5/Doc/xfig_man.html 2009-03-15 16:44:48.000000000 +0100
-@@ -2504,8 +2504,11 @@
- See the
- <I>Imakefile</I>.
-
--<DT>/usr/lib/X11/xfig<DD>
--This directory contains the html documentation, the above mentioned
-+<DT>/usr/share/doc/xfig-3.2.5<DD>
-+This directory contains the documentation.
-+
-+<DT>/usr/share/xfig<DD>
-+This directory contains the above mentioned
- CompKeyDB file, and a directory of libraries containing Fig objects
- such as electrical symbols, logic symbols, etc.
- <DT><B>Fig.ad and Fig-color.ad</B>
-diff -urN xfig.3.2.5.orig/Fig.ad xfig.3.2.5/Fig.ad
---- xfig.3.2.5.orig/Fig.ad 2009-03-15 16:31:31.000000000 +0100
-+++ xfig.3.2.5/Fig.ad 2009-03-15 16:44:48.000000000 +0100
-@@ -5,6 +5,10 @@
-
- ! some sample settings you may want to change
-
-+! If the following resource is set to false, xfig will use metric units
-+! by default.
-+Fig.inches: true
-+
- ! The following fixes a problem that some window managers have
- ! with xfig continually resizing itself
-
diff --git a/xfig-3.2.5-fhs.patch b/xfig-3.2.5-fhs.patch
deleted file mode 100644
index a17d908..0000000
--- a/xfig-3.2.5-fhs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- xfig.3.2.5/Imakefile.fhs 2006-10-11 01:19:22.000000000 +0200
-+++ xfig.3.2.5/Imakefile 2007-04-16 14:04:45.000000000 +0200
-@@ -169,8 +169,7 @@
- XFIGLIBDIR = $(LIBDIR)/xfig
-
- XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
--XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
--XFIGDOCDIR = /usr/local/xfig/doc
-+XFIGDOCDIR = $(DOCDIR)/xfig
-
- XCOMM MANDIR tells where the standard man pages should go (no need to change it
- XCOMM if you want the man pages installed in the standard place on your system
diff --git a/xfig-3.2.5a-default-apps.patch b/xfig-3.2.5a-default-apps.patch
index 29f42d4..9930866 100644
--- a/xfig-3.2.5a-default-apps.patch
+++ b/xfig-3.2.5a-default-apps.patch
@@ -1,7 +1,18 @@
diff -up xfig.3.2.5a/Fig.ad~ xfig.3.2.5a/Fig.ad
--- xfig.3.2.5a/Fig.ad~ 2007-04-14 04:17:24.000000000 +0200
+++ xfig.3.2.5a/Fig.ad 2009-03-27 15:15:27.000000000 +0100
-@@ -23,18 +23,16 @@ Fig*AllowShellResize: false
+@@ -5,6 +5,10 @@
+
+ ! some sample settings you may want to change
+
++! If the following resource is set to false, xfig will use metric units
++! by default.
++Fig.inches: false
++
+ ! The following fixes a problem that some window managers have
+ ! with xfig continually resizing itself
+
+@@ -23,18 +27,16 @@
! Browser - put your favorite browser here.
! This is for viewing the xfig html reference.
diff --git a/xfig-3.2.5b-fix-eps-reading.patch b/xfig-3.2.5b-fix-eps-reading.patch
deleted file mode 100644
index 7601d20..0000000
--- a/xfig-3.2.5b-fix-eps-reading.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -ur xfig.3.2.5b/f_readeps.c xfig.3.2.5b.new/f_readeps.c
---- xfig.3.2.5b/f_readeps.c 2009-03-30 17:52:18.000000000 +0200
-+++ xfig.3.2.5b.new/f_readeps.c 2010-11-25 16:53:54.328247928 +0100
-@@ -252,12 +252,13 @@
- {
- char buf[300];
- FILE *tmpfp, *pixfile, *gsfile;
-- char *psnam, *driver;
-+ char *driver;
- int status, wid, ht, nbitmap, fd;
- char tmpfile[PATH_MAX],
- pixnam[PATH_MAX],
- errnam[PATH_MAX],
-- gscom[2 * PATH_MAX];
-+ gscom[2 * PATH_MAX],
-+ psnam[PATH_MAX];
-
- wid = urx - llx;
- ht = ury - lly;
-@@ -307,19 +308,14 @@
- /* for color, use pcx */
- driver = "pcx256";
- }
-- /* avoid absolute paths (for Cygwin with gswin32) by changing directory */
-- if (tmpfile[0] == '/') {
-- psnam = strrchr(tmpfile, '/');
-- *psnam = 0;
-- sprintf(gscom, "cd \"%s/\";", tmpfile);
-- *psnam++ = '/'; /* Restore name for unlink() below */
-- } else {
-- psnam = tmpfile;
-- gscom[0] = '\0';
-+ /* Canonicalize the eps file filename, needed to "defeat" -dSAFER */
-+ if (!realpath(tmpfile, psnam)) {
-+ file_msg("Cannot canonicalize %s: %s\n", tmpfile, strerror(errno));
-+ return False;
- }
-- sprintf(&gscom[strlen(gscom)],
-- "%s -r72x72 -dSAFER -sDEVICE=%s -g%dx%d -sOutputFile=%s -q - > %s 2>&1",
-- appres.ghostscript, driver, wid, ht, pixnam, errnam);
-+ sprintf(gscom,
-+ "%s -r72x72 -sDEVICE=%s -g%dx%d -sOutputFile=%s -dDELAYSAFER -c '<< /PermitFileReading [ (%s)] >> setuserparams .locksafe' -dSAFER -q - > %s 2>&1",
-+ appres.ghostscript, driver, wid, ht, pixnam, psnam, errnam);
- if (appres.DEBUG)
- fprintf(stderr,"calling: %s\n",gscom);
- if ((gsfile = popen(gscom, "w")) == 0) {
diff --git a/xfig-3.2.5b-fix-fig-buffer-overflow.patch b/xfig-3.2.5b-fix-fig-buffer-overflow.patch
deleted file mode 100644
index 77b7224..0000000
--- a/xfig-3.2.5b-fix-fig-buffer-overflow.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- w_msgpanel.c
-+++ w_msgpanel.c 2010-12-03 14:21:07.931926127 +0000
-@@ -60,7 +60,7 @@ DeclareStaticArgs(12);
- /* for the popup message (file_msg) window */
-
- static int file_msg_length=0;
--static char tmpstr[300];
-+static char tmpstr[512];
- static Widget file_msg_panel,
- file_msg_win, file_msg_dismiss;
-
-@@ -582,8 +582,8 @@ file_msg(char *format,...)
- }
-
- va_start(ap, format);
-- /* format the string */
-- vsprintf(tmpstr, format, ap);
-+ /* format the string (but leave room for \n and \0) */
-+ vsnprintf(tmpstr, sizeof(tmpstr)-2, format, ap);
- va_end(ap);
-
- strcat(tmpstr,"\n");
diff --git a/xfig.3.2.5-Xaw3d.patch b/xfig.3.2.5-Xaw3d.patch
deleted file mode 100644
index c5d54c3..0000000
--- a/xfig.3.2.5-Xaw3d.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up xfig.3.2.5a/Imakefile.Xaw3d xfig.3.2.5a/Imakefile
---- xfig.3.2.5a/Imakefile.Xaw3d 2009-03-27 16:32:20.000000000 +0100
-+++ xfig.3.2.5a/Imakefile 2009-03-27 16:33:20.000000000 +0100
-@@ -50,7 +50,7 @@ XAPPLOADDIR = /usr/share/X11/app-default
- XCOMM Comment out the following definition for XAW3D if you don't to want to use
- XCOMM the 3d Athena Widget Set
-
--#define XAW3D
-+XCOMM #define XAW3D
-
- #ifdef XAW3D
- XAWLIB = -lXaw3d
diff --git a/xfig.3.2.5-modularX.patch b/xfig.3.2.5-modularX.patch
deleted file mode 100644
index f5fb91f..0000000
--- a/xfig.3.2.5-modularX.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -up xfig.3.2.5a/Imakefile~ xfig.3.2.5a/Imakefile
---- xfig.3.2.5a/Imakefile~ 2009-03-27 15:31:02.000000000 +0100
-+++ xfig.3.2.5a/Imakefile 2009-03-27 15:35:44.000000000 +0100
-@@ -45,7 +45,7 @@ XCOMM Don't set the DESTDIR variable unl
- XCOMM different tree than the "correct" tree that your X system expects. The usual
- XCOMM purpose of DESTDIR is to test an install process by installing in a benign area.
-
--XCOMM XAPPLOADDIR = /home/user/xfig
-+XAPPLOADDIR = /usr/share/X11/app-defaults
-
- XCOMM Comment out the following definition for XAW3D if you don't to want to use
- XCOMM the 3d Athena Widget Set
-@@ -169,14 +169,14 @@ XCOMM be sure to comment out the second
- XCOMM XFIGLIBDIR = $(LIBDIR)
-
- XCOMM use this if you want the multi-key data base file in the standard X11 tree
--XFIGLIBDIR = $(LIBDIR)/xfig
-+XFIGLIBDIR = /usr/share/xfig
-
- XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
- XFIGDOCDIR = $(DOCDIR)/xfig
-
- XCOMM MANDIR tells where the standard man pages should go (no need to change it
- XCOMM if you want the man pages installed in the standard place on your system
--MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
-+MANDIR = /usr/share/man/man1
- XCOMM MANDIR = /usr/local/xfig/man
-
- XCOMM If your system doesn't have strstr undefine the following definition
diff --git a/xfig.png b/xfig.png
deleted file mode 100644
index c0d68e9..0000000
Binary files a/xfig.png and /dev/null differ
diff --git a/xfig.spec b/xfig.spec
index 691792c..99d5bde 100644
--- a/xfig.spec
+++ b/xfig.spec
@@ -3,26 +3,30 @@
Summary: An X Window System tool for drawing basic vector graphics
Name: xfig
Version: 3.2.5
-Release: 32.b%{?dist}
+Release: 33.b%{?dist}
License: MIT
Group: Applications/Multimedia
URL: http://www.xfig.org/
Source0: http://downloads.sourceforge.net/mcj/xfig.%{version}b.full.tar.gz
-Source1: xfig.png
+Source1: xfig-icons.tar.gz
Source2: xfig.desktop
Source3: xfig.sh
Patch0: xfig-3.2.5a-default-apps.patch
-Patch1: xfig-3.2.5-fhs.patch
-Patch7: xfig.3.2.5-modularX.patch
-Patch9: xfig.3.2.5-Xaw3d.patch
-Patch10: xfig-3.2.5-enable-Xaw3d.patch
-Patch13: xfig-3.2.5-urwfonts.patch
-Patch19: xfig-3.2.5-debian.patch
-Patch20: xfig-3.2.5b-fix-eps-reading.patch
-Patch21: xfig-3.2.5b-fix-fig-buffer-overflow.patch
-Patch22: 36_libpng15.dpatch
-Patch23: 30_figparserstack.patch
+Patch1: xfig-3.2.5-Imakefile.patch
+Patch2: xfig-3.2.5-enable-Xaw3d.patch
+Patch3: xfig-3.2.5-urwfonts.patch
+Patch4: 03_usr_share.patch
+Patch5: 12_network_images.patch
+Patch6: 13_remove_extra_libs.patch
+Patch7: 30_figparserstack.patch
+Patch8: 31_spelling.patch
+Patch9: 32_papersize_b1.patch
+Patch10: 33_pdfimport_mediabox.patch
+Patch11: 35_CVE-2010-4262.patch
+Patch12: 36_libpng15.patch
+Patch13: 37_fix-eps-reading.patch
+Patch14: 38_formatstring.patch
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
@@ -86,18 +90,23 @@ Files common to both the plain Xaw and the Xaw3d version of xfig.
%prep
-%setup -q -n xfig.%{version}b
-%patch0 -p1 -b .redhat
-%patch1 -p1 -b .fhs
-%patch7 -p1 -b .modularX
-%patch9 -p1 -b .Xaw3d
-%patch10 -p1 -b .no-Xaw3d
-%patch13 -p1 -b .urw
-%patch19 -p1
-%patch20 -p1
-%patch21
-%patch22 -p1 -b .libpng
-%patch23 -p1
+%setup -q -n xfig.%{version}b -a 1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1 -b .no-Xaw3d
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+
iconv -f ISO-8859-1 -t UTF8 CHANGES > tmp; touch -r CHANGES tmp; mv tmp CHANGES
rm Doc/html/images/sav1a0.tmp
chmod -x `find -type f`
@@ -108,8 +117,7 @@ chmod -x `find -type f`
xmkmf
# make sure cmdline option parsing still works despite us renaming the binary
sed -i 's/"xfig"/"xfig-Xaw3d"/' main.c
-make XFIGDOCDIR=%{_docdir}/%{name}-%{version} \
- CDEBUGFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fno-strength-reduce -fno-strict-aliasing"
+make CDEBUGFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fno-strength-reduce -fno-strict-aliasing"
mv xfig xfig-Xaw3d
make distclean
@@ -118,51 +126,50 @@ mv Imakefile.no-Xaw3d Imakefile
xmkmf
# make sure cmdline option parsing still works despite us renaming the binary
sed -i 's/"xfig-Xaw3d"/"xfig-plain"/' main.c
-make XFIGDOCDIR=%{_docdir}/%{name}-%{version} \
- CDEBUGFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fno-strength-reduce -fno-strict-aliasing"
+make CDEBUGFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fno-strength-reduce -fno-strict-aliasing"
%install
-make DESTDIR=%{buildroot} XFIGDOCDIR=%{_docdir}/%{name}-%{version} \
- INSTALL="install -p" install.all
+make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install.all
install -p -m 644 CHANGES README LATEX.AND.XFIG* FIGAPPS \
- %{buildroot}%{_docdir}/%{name}-%{version}
-
-# install the Xaw3d version and the wrapper for the .desktop file
-mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-plain
-install -p -m 755 %{SOURCE3} %{buildroot}%{_bindir}/%{name}
-install -m 755 %{name}-Xaw3d %{buildroot}%{_bindir}
+ $RPM_BUILD_ROOT%{_docdir}/%{name}
# remove the map generation scripts, these are for xfig developers only
-rm %{buildroot}%{_datadir}/%{name}/Libraries/Maps/{USA,Canada}/assemble
-
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps \
- %{buildroot}%{_datadir}/applications
-
-install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
+rm $RPM_BUILD_ROOT%{_datadir}/%{name}/Libraries/Maps/{USA,Canada}/assemble
+# remove app-defaults symlink which gets installed
+rm $RPM_BUILD_ROOT%{_prefix}/lib*/X11/app-defaults
+# install the Xaw3d version and the wrapper for the .desktop file
+mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}-plain
+install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/%{name}
+install -m 755 %{name}-Xaw3d $RPM_BUILD_ROOT%{_bindir}
+
+install -D -p -m 644 %{name}16x16.xpm \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.xpm
+install -D -p -m 644 %{name}32x32.xpm \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
+install -D -p -m 644 %{name}64x64.xpm \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora \
- --dir %{buildroot}%{_datadir}/applications \
- %{SOURCE2}
-
-# remove app-defaults symlink which gets installed
-rm %{buildroot}%{_prefix}/lib*/X11/app-defaults
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
%post common
update-desktop-database &> /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun common
update-desktop-database &> /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
+%posttrans common
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
%files
%{_bindir}/%{name}-Xaw3d
@@ -171,16 +178,21 @@ fi
%{_bindir}/%{name}-plain
%files common
-%doc %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_mandir}/*/*
%{app_defaults_dir}/*
%{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{_datadir}/icons/hicolor/??x??/apps/%{name}.xpm
%changelog
+* Sun Aug 12 2012 Hans de Goede <hdegoede@redhat.com> - 3.2.5-33.b
+- Re-organize / consolidate patches
+- Add a bunch of patches (minor bug-fixes) from the Debian package
+- Add better icons from the Debian package
+
* Sun Aug 12 2012 Hans de Goede <hdegoede@redhat.com> - 3.2.5-32.b
- Fix a stack overflow when importing 1.3 files (CVE-2009-4227) (rhbz#543905)
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-05-30 14:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-05-30 14:28 [rpms/xfig] epel10.2: Re-organize / consolidate patches Hans de Goede
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox