diff --git a/03_usr_share.patch b/03_usr_share.patch deleted file mode 100644 index 0f09372..0000000 --- a/03_usr_share.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Roland Rosenfeld -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 - Imakefile. - --
/usr/lib/X11/xfig
--This directory contains the html documentation, the above mentioned -+
/usr/share/doc/xfig
-+This directory contains the documentation. -+ -+
/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. -
Fig.ad and Fig-color.ad diff --git a/12_network_images.patch b/12_network_images.patch deleted file mode 100644 index 0f63ac1..0000000 --- a/12_network_images.patch +++ /dev/null @@ -1,361 +0,0 @@ -From: Roland Rosenfeld -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 ) -+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 deleted file mode 100644 index 6db176f..0000000 --- a/13_remove_extra_libs.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Roland Rosenfeld -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/30_figparserstack.patch b/30_figparserstack.patch deleted file mode 100644 index 70d3912..0000000 --- a/30_figparserstack.patch +++ /dev/null @@ -1,56 +0,0 @@ -From: Hans de Goede -Subject: Fix Stack-based buffer overflow by loading malformed .FIG files -Bug: https://bugzilla.redhat.com/show_bug.cgi?id=543905 -Bug-Debian: http://bugs.debian.org/559274 - ---- a/f_readold.c -+++ b/f_readold.c -@@ -471,7 +471,7 @@ - F_text *t; - int n; - int dum; -- char buf[128]; -+ char buf[512]; - PR_SIZE tx_dim; - - if ((t = create_text()) == NULL) -@@ -485,22 +485,34 @@ - t->pen_style = -1; - t->angle = 0.0; - t->next = NULL; -+ if (!fgets(buf, sizeof(buf), fp)) { -+ file_msg("Incomplete text data"); -+ free((char *) t); -+ return (NULL); -+ } -+ -+ /* Note using strlen(buf) here will waste a few bytes, as the -+ various text attributes are counted into this length too. */ -+ if ((t->cstring = new_string(strlen(buf))) == NULL) -+ return (NULL); -+ - /* ascent and length will be recalculated later */ -- n = fscanf(fp, " %d %d %d %d %d %d %d %[^\n]", -+ n = sscanf(buf, " %d %d %d %d %d %d %d %[^\n]", - &t->font, &dum, &dum, &t->ascent, &t->length, -- &t->base_x, &t->base_y, buf); -+ &t->base_x, &t->base_y, t->cstring); - if (n != 8) { - file_msg("Incomplete text data"); -+ free(t->cstring); - free((char *) t); - return (NULL); - } -- if ((t->cstring = new_string(strlen(buf))) == NULL) { -+ -+ if (!strlen(t->cstring)) { -+ free(t->cstring); - free((char *) t); - file_msg("Empty text string at line %d.", line_no); - return (NULL); - } -- /* put string in structure */ -- strcpy(t->cstring, buf); - - /* get the font struct */ - t->zoom = zoomscale; diff --git a/31_spelling.patch b/31_spelling.patch index e92e64c..fd35db5 100644 --- a/31_spelling.patch +++ b/31_spelling.patch @@ -10,14 +10,3 @@ Subject: Fix spelling errors in binary. - 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 deleted file mode 100644 index 5a33604..0000000 --- a/32_papersize_b1.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Roland Rosenfeld -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/35_CVE-2010-4262.patch b/35_CVE-2010-4262.patch deleted file mode 100644 index 244a911..0000000 --- a/35_CVE-2010-4262.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Dr. Werner Fink -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.patch b/36_libpng15.patch deleted file mode 100644 index 86bd50c..0000000 --- a/36_libpng15.patch +++ /dev/null @@ -1,78 +0,0 @@ -From: Nobuhiro Iwamatsu -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 -+#include - - /* - * 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 deleted file mode 100644 index 657cd1e..0000000 --- a/37_fix-eps-reading.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: Hans de Goede -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 deleted file mode 100644 index 985caa3..0000000 --- a/38_formatstring.patch +++ /dev/null @@ -1,14 +0,0 @@ -From: Roland Rosenfeld -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/39_add_xfig_man_html.patch b/39_add_xfig_man_html.patch new file mode 100644 index 0000000..ecef0bb --- /dev/null +++ b/39_add_xfig_man_html.patch @@ -0,0 +1,2936 @@ +--- /dev/null 2013-11-23 20:48:05.582065962 +0100 ++++ b/Doc/xfig_man.html 2008-03-31 18:29:22.000000000 +0200 +@@ -0,0 +1,2933 @@ ++ ++Man page of XFIG ++ ++

XFIG

++Section: User Commands (1)
Updated: Xfig 3.2.4 (Dec 2002)
Index ++
++ ++  ++

NAME

++ ++xfig - Facility for Interactive Generation of figures under X11 ++
++ ++Version 3.2.4 ++  ++

SYNOPSIS

++ ++xfig ++ ++[options] ++ ++[file] ++ ++  ++

DESCRIPTION

++ ++Xfig ++ ++is a menu-driven tool that allows the user to draw and manipulate ++objects interactively under the X Window System. ++It runs under X version 11 ++ ++release 4 or higher ++ ++and requires a two- or three-button mouse. ++file ++ ++specifies the name of a file to be edited. ++The objects in the file will be read at the start of ++xfig. ++ ++

++ ++The bulk of the documentation fori ++xfig ++ ++is in an HTML-based reference guide. ++See the Help menu in ++xfig ++ ++or point your browser at ++Doc/html/index.html ++ ++(provided with the ++xfig ++ ++distribution, usually in the ++Doc/www ++ ++directory). ++There are both English and Japanese versions. ++

++ ++When using a two-button mouse use the ++<Meta> ++ ++key and the right button at the same time to effect ++the action of the middle button. ++

++ ++Xfig ++ ++is available from ++http://www.xfig.org . ++

++ ++The ++TransFig ++ ++package is used when printing or exporting the output from ++xfig. ++ ++The ++fig2dev ++ ++program from the ++TransFig ++ ++package is automatically called by ++xfig ++ ++as a back-end processor to produce various types of output: ++

++ ++LaTeX, Metafont, PostScript or Encapsulated PostScript, ++tk (tcl/tk tool command language/tool kit package), ++GIF, JPEG, PCX, PNG, PPM, TIFF, ++XBM, XPM, AutoCAD Slide, IBM-GL (HP/GL), Pic ++PiCTeX, box, epic, eepic and eepicemu. ++

++ ++See man fig2dev for all options. ++

++ ++The ++TransFig ++ ++package is available from ++http://www.xfig.org . ++  ++

OPTIONS

++ ++ ++ ++

++ ++ ++-help ++ ++ ++ ++

++
++ ++ ++Print all command-line options for xfig and quit. ++ ++ ++
++

++ ++ ++-a[llownegcoords] ++ ++ ++ ++

++
++ ++ ++Allow panning into the negative region of the canvas. ++This is the default ++ ++ ++
++

++ ++ ++-bal[loon_delay] ++ ++msec ++ ++ ++ ++

++
++ ++ ++Cause popup information balloons to be delayed by ++msec ++ ++milliseconds. The default is 500 milliseconds. ++ ++ ++
++

++ ++ ++-bol[d] ++ ++font ++ ++ ++ ++

++
++ ++ ++Cause the font used for displaying the file name and ++confirmation messages to be ++font ++ ++(default = 8x13bold). ++ ++ ++
++

++ ++ ++-butt[on] ++ ++font ++ ++ ++ ++

++
++ ++ ++Cause the font used for most buttons to be ++font ++ ++(default = 6x13). ++ ++ ++
++

++ ++ ++-but_[per_row] ++ ++number ++ ++ ++ ++

++
++ ++ ++Specify the number of buttons wide the mode panel should be. ++This is useful in conjunction with the ++-pheight ++ ++parameter to reduce the canvas height for small screens. ++ ++ ++
++

++ ++ ++-cbg color ++ ++ ++ ++

++
++ ++ ++Use ++color ++ ++as the background color for the canvas. ++If you want to set the background of everything in xfig ++(e.g. menus, etc.) use the general ++-bg ++ ++option. ++ ++ ++
++

++ ++ ++-center ++ ++ ++ ++

++
++ ++ ++Set the print option to print the figure centered on the page. ++This is the default. ++ ++ ++
++

++ ++ ++-centim[ers] ++ ++ ++ ++

++
++ ++ ++Make centimeters the unit of choice. See also ++-metric. ++ ++ ++ ++
++

++ ++ ++-cfg color ++ ++ ++ ++

++
++ ++ ++Use ++color ++ ++as the default color for objects. ++If you want to set the foreground of everything in xfig ++(e.g. menus, etc.) use the general ++-fg ++ ++option. ++ ++ ++
++

++ ++ ++-correct_font_size ++ ++ ++ ++

++
++ ++ ++Normally, ++fig2dev ++ ++uses 1/80 inch for font size increments (for historical reasons), ++instead of the more proper ``points'' (1/72 inch) that ++xfig ++ ++uses. This option makes xfig call fig2dev with the ++-F ++ ++option to make it use points (1/72 inch). ++ ++ ++
++

++ ++ ++-deb[ug] ++ ++ ++ ++

++
++ ++ ++Turn on debugging mode. ++Prints various debugging messages like font names etc. ++ ++ ++
++

++ ++ ++-dep[th] ++ ++ ++ ++

++
++ ++ ++Choose depth of visual desired. Your server must support the desired ++visual and depth chosen. ++Use ++xdpyinfo ++ ++to see what visuals and depths are supported. ++See also the ++-visual ++ ++option. ++ ++ ++
++

++ ++ ++-donta[llownegcoords] ++ ++ ++ ++

++
++ ++ ++Don't allow panning into the negative region of the canvas. ++The default is to allow panning in the negative region. ++ ++ ++
++

++ ++ ++-dontshowb[alloons] ++ ++ ++ ++

++
++ ++ ++Prevents xfig from popping up the information balloons. ++See also ++-showballoons. ++ ++ ++ ++
++

++ ++ ++-dontshowl[engths] ++ ++ ++ ++

++
++ ++ ++Don't show lengths of lines as they are being drawn. ++This is the default. ++ ++ ++
++

++ ++ ++-dontshowz[erolines] ++ ++ ++ ++

++
++ ++ ++Don't show axis zero lines on the canvas. ++The default is to show them. ++ ++ ++
++

++ ++ ++-dontsw[itchcmap] ++ ++ ++ ++

++
++ ++ ++Prevents xfig from switching to a private colormap if there aren't ++enough colors available in the default colormap. See also ++-max_image_colors. ++ ++ ++ ++
++

++ ++ ++-enc[oding] ++ ++encoding ++ ++ ++ ++

++
++ ++ ++Encode character set using ++encoding ++ ++when exporting LaTeX text. The default is 1. This is used ++for the ISO-8859 encoding of character sets. Allowed ++values are 0 (no encoding), 1 (ISO-8859-1) or 2 (ISO-8859-2). ++ ++ ++
++

++ ++ ++-exportL[anguage] ++ ++language ++ ++ ++ ++

++
++ ++ ++Specifies the default language to be used for when exporting a fig file. ++Choices are: ++ ++

++ ++ ++ ++ ++ ++

++
++Name              Language
++
Vector formats:
++box               LaTeX box (figure boundary)
++latex             LaTeX picture
++epic              LaTeX picture + epic macros
++eepic             LaTeX picture + eepic macros
++eepicemu          LaTeX picture + eepicemu macros
++pictex            PiCTeX macros
++hpl               HPGL (IBMGL)
++eps               Encapuslated PostScript
++eps_ascii         Encapuslated PostScript with ASCII preview
++eps_mono_tiff     Encapuslated PostScript with monochrome binary (TIFF) preview
++eps_color_tiff    Encapuslated PostScript with color binary (TIFF) preview
++ps                PostScript
++pdf               PDF (Portable Document Format)
++pstex             Combined PS/LaTeX (both PS and LaTeX parts)
++pdftex            Combined PDF/LaTeX (both PDF and LaTeX parts)
++textyl            Textyl special commands
++tpic              TPIC
++pic               PIC
++mf                MF (MetaFont)
++mp                MP (MetaPost)
++mmp               MMP (Multi-MetaPost)
++cgm               CGM (Computer Graphics Meta file)
++bcgm              Binary CGM (Computer Graphics Meta file)
++emf               Enhanced Meta file)
++tk                Tk (of the tcl/tk fame)
++svg               SVG (Scalable Vector Graphics (XML variant))
++
++Bitmap formats:
++gif               GIF
++jpeg              JPEG (JFIF)
++pcx               PCX
++png               PNG
++ppm               PPM (portable pixmap package)
++sld               (AutoCad slide)
++tiff              TIFF
++xbm               X11 Bitmap
++xpm               X11 Pixmap (XPM3 package)
++
++
++ ++ ++ ++ ++ ++

++ ++

++

++ ++ ++-export_m[argin] ++ ++width ++ ++ ++ ++

++
++ ++ ++Set the size of the border margin around the figure for exporting ++to bitmap, PostScript, Encapsulated PostScript, or HTML MAP formats. ++This is in units of pixels (1/80th inch). ++The default is 0. ++ ++ ++
++

++ ++ ++-fli[pvisualhints] ++ ++ ++ ++

++
++ ++ ++Flip left/right mouse indicator messages for mice whose buttons ++have been switched. ++The default is to NOT flip the messages. ++ ++ ++
++

++ ++ ++-flu[shleft] ++ ++ ++ ++

++
++ ++ ++Set the print option to print the figure flush left. ++The default is to center the figure on the page. ++ ++ ++
++

++ ++ ++-free[hand_resolution] ++ ++resolution ++ ++ ++ ++

++
++ ++ ++Set the resolution of the freehand drawing mode to ++resolution ++ ++pixels. This is the number of pixels the mouse must move before xfig ++adds another point to the object being drawn. ++ ++ ++
++

++ ++ ++-geom[etry] ++ ++[WxH][+X+Y] ++ ++ ++ ++

++
++ ++ ++You may use the -geometry option or resource to ++size and/or position the xfig window, ++ ++or you may use ++-pwidth ++ ++and/or ++-pheight ++ ++to specify the canvas size in inches or centimeters. ++If you use the ++-geom ++ ++option to make the xfig window smaller ++than the default, you may have to use the ++-but_per_row ++ ++option to ++tell xfig to put 3 or 4 buttons per row on the left mode panel. ++ ++ ++
++

++ ++ ++-gh[ostscript] ++ ++postscript-interpreter ++ ++ ++ ++

++
++ ++ ++Select the PostScript (tm) interpreter of your choice. The default is ghostscript (gs). ++This is needed when importing Encapsulated PostScript files. ++ ++ ++
++

++ ++ ++-grid_c[olor] ++ ++color ++ ++ ++ ++

++
++ ++ ++Draw the grid on the canvas in this color (default: red). ++ ++ ++
++

++ ++ ++-grid_u[nit] ++ ++unit ++ ++ ++ ++

++
++ ++ ++Only used when in inches mode to choose between showing fractions or decimal inches ++in the rulers and grid. Any of the following may be used to force decimal inches: ++"ten", "tenth", "10, "1/10". ++If any other value is used for this option, the rulers will show 1/16 inch divisions. ++ ++ ++
++

++ ++ ++-hidd[entext] ++ ++ ++ ++

++
++ ++ ++Start ++xfig ++ ++with the ++hidden text ++ ++mode for text objects. ++The ++Hidden ++ ++attribute is used for figures that will be used with ++LaTeX ++ ++and is applicable only to the display of the document in ++xfig. ++ ++It means that the text itself is not shown onscreen, but only the string ++``<text>''. This is to keep long sequences of ++LaTeX ++ ++formatting commands from making the screen messy and hard to read. ++The default for the ++Hidden ++ ++flag is ++off. ++ ++ ++ ++
++

++ ++ ++-dontshowd[epthmanager] ++ ++ ++ ++

++
++ ++ ++Hide the depth manager panel. ++The default is to show the panel. ++ ++ ++
++

++ ++ ++-icon_[view] ++ ++ ++ ++

++
++ ++ ++Show the library objects as icons. This is the default. The other ++mode is ++-list_view. ++ ++ ++ ++
++

++ ++ ++-iconG[eometry] ++ +++X+Y ++ ++ ++ ++

++
++ ++ ++Specifies the position for the icon. ++ ++ ++
++

++ ++ ++-im[age_editor] ++ ++editor ++ ++ ++ ++

++
++ ++ ++Specify bitmap editor to use when ``Edit Image'' button is pressed ++in Picture Object panel. ++ ++ ++
++

++ ++ ++-inc[hes] ++ ++(or-imperial) ++ ++ ++ ++

++
++ ++ ++Make inches the unit of choice. ++This is the default. ++ ++ ++
++

++ ++ ++-ins[tallowncmap] ++ ++ ++ ++

++
++ ++ ++Install own colormap. Normally, xfig uses the current colormap. ++ ++ ++
++

++ ++ ++-internalBW width ++ ++ ++ ++

++
++ ++ ++Use lines of width ++width ++ ++between all buttons and panels (default = 1). ++ ++ ++
++

++ ++ ++-international ++ ++ ++ ++

++
++ ++ ++Switch on international support (mainly Japanese and Korean), ++users of ISO Latin 1 (ISO-8859-1) probably should not use this, ++therefore the international support is switched off by default ++for locales using ISO-8859-1* codesets. For all other locales this ++option is already used by default. ++ ++ ++
++

++ ++ ++-jpeg[_quality] ++ ++quality ++ ++ ++ ++

++
++ ++ ++Set the quality factor for exporting to the jpeg format. ++The default is 75. ++ ++ ++
++

++ ++ ++-k[eyFile] ++ ++compose-key-file ++ ++ ++ ++

++
++ ++ ++Use ++compose-key-file ++ ++instead of ++CompKeyDB ++ ++for compose (meta) key database. ++If there are no ++``/''s ++ ++in the name, the file must reside in the ++xfig ++ ++library directory, ++$XFIGLIBDIR, ++ ++usually ++/usr/local/lib/X11/xfig. ++ ++If there are any ++``/''s ++ ++in the name it is taken as is (not relative to ++$XFIGLIBDIR). ++ ++If there is a leading ++``~/'' ++ ++in the string then the ++``~'' ++ ++is expanded to the user's home directory. ++ ++ ++
++

++ ++ ++-lan[dscape] ++ ++ ++ ++

++
++ ++ ++Make ++xfig ++ ++come up in landscape mode (10.5" x 8"). ++This is the default; however as the orientation is stored with Fig files, ++when you load a Fig file the orientation will change as required. ++This is only true for files of version 3.0 or higher. ++
++ ++See also -portrait. ++ ++ ++
++

++ ++ ++-lat[exfonts] ++ ++ ++ ++

++
++ ++ ++Start ++xfig ++ ++with ++LaTeX ++ ++font selection. ++Normally, the ++PostScript ++ ++fonts are available as the default. ++This flag selects the ++LaTeX ++ ++fonts to start. ++ ++ ++
++

++ ++ ++-le[ft] ++ ++ ++ ++

++
++ ++ ++Change the position of the side panel window to the left of the canvas window. ++This is the default. ++ ++ ++
++

++ ++ ++-library_d[ir] ++ ++directory ++ ++ ++ ++

++
++ ++ ++Specify directory where Fig object libraries are located. There may be sub-directories ++there and sub-sub-directories, etc. ++ ++ ++
++

++ ++ ++-library_i[con_size] ++ ++size ++ ++ ++ ++

++
++ ++ ++Specify the size of the icons shown for library objects. The default is 60 pixels, with the ++minimum being 40 and the maximum being 120. ++ ++ ++
++

++ ++ ++-lis[t_view] ++ ++ ++ ++

++
++ ++ ++Show the library objects as a list of names. The default ++mode is ++-icon_view. ++ ++ ++ ++
++

++ ++ ++-mag[nification] ++ ++mag ++ ++ ++ ++

++
++ ++ ++Set export and print magnification in %. ++ ++
++

++ ++ ++-max[_image_colors] ++ ++numcols ++ ++ ++ ++

++
++ ++ ++Limit the number of colors used for imported images to ++numcols (default 64). ++ ++ ++ ++
++

++ ++ ++-me[tric] ++ ++ ++ ++

++
++ ++ ++Make centimeters the unit of choice. ++The option ++-centimeters ++ ++may also be used. ++
++After ++xfig ++ ++is started you may change the units from metric to ++imperial or vice versa from a popup menu available by pressing mouse ++button 3 in the ++units ++ ++box where the two rulers meet. ++ ++ ++
++

++ ++ ++-mo[nochrome] ++ ++ ++ ++

++
++ ++ ++Use black and white only. ++ ++ ++
++

++ ++ ++-mu[ltiple] ++ ++ ++ ++

++
++ ++ ++Sets multiple page mode for print or export. See also ++-single. ++ ++ ++ ++
++

++ ++ ++-noo[verlap] ++ ++ ++ ++

++
++ ++ ++When exporting in multiple page mode, causes no overlap from page to page. ++This is the default. See also ++-overlap. ++ ++ ++ ++
++

++ ++ ++-nor[mal] ++ ++font ++ ++ ++ ++

++
++ ++ ++Cause the font used for the message window to be ++font. ++ ++This font is also used on the canvas when the selected font is not ++available in an X11 font (default = 6x13). ++ ++ ++
++

++ ++ ++-nosc[alablefonts] ++ ++ ++ ++

++
++ ++ ++Disables use of the X11R5 or OpenWindows scalable fonts. ++You might want to use this for debugging. ++ ++ ++
++

++ ++ ++-nosp[lash] ++ ++ ++ ++

++
++ ++ ++Don't show the startup splash screen. The default is to show it ( ++-splash ++ ++). ++ ++ ++
++

++ ++ ++-not[rack] ++ ++ ++ ++

++
++ ++ ++Turn off cursor (mouse) tracking arrows. ++ ++ ++
++

++ ++ ++-ov[erlap] ++ ++ ++ ++

++
++ ++ ++When exporting in multiple page mode, causes overlap from page to page of ++about 10%. ++See also ++-nooverlap. ++ ++ ++ ++
++

++ ++ ++-pag[eborder] ++ ++color ++ ++ ++ ++

++
++ ++ ++Draw the page border on the canvas in this color (default light blue). ++The page border is turned on by the ++-showpageborder ++ ++option ++(resource Fig.showpageborder), ++and shows the edges of the current ++export ++ ++paper size. ++ ++ ++
++

++ ++ ++-pap[er_size] ++ ++size ++ ++ ++ ++

++
++ ++ ++Set the initial paper size for Export and Print. Choices are ++ ++

++ ++ ++ ++ ++ ++

++
++Option     Paper      Size
++
letter     Letter     8.5in x 11in
++legal      Legal      8.5in x 14in
++tabloid    Tabloid    17in x 11in
++a          ANSI A     8.5in x 11in
++b          ANSI B     11in x 17in
++c          ANSI C     17in x 22in
++d          ANSI D     22in x 34in
++e          ANSI E     34in x 44in
++a9         ISO A9     37mm x 52mm
++a8         ISO A8     52mm x 74mm
++a7         ISO A7     74mm x 105mm
++a6         ISO A6     105mm x 148mm
++a5         ISO A5     148mm x 210mm
++a4         ISO A4     210mm x 297mm
++a3         ISO A3     297mm x 420mm
++a2         ISO A2     420mm x 594mm
++a1         ISO A1     594mm x 840mm
++a0         ISO A0     840mm x 1189mm
++b10        JIS B10    32mm x 45mm
++b9         JIS B9     45mm x 64mm
++b8         JIS B8     64mm x 91mm
++b7         JIS B7     91mm x 128mm
++b6         JIS B6     128mm x 182mm
++b5         JIS B5     182mm x 257mm
++b4         JIS B4     257mm x 364mm
++b3         JIS B3     364mm x 515mm
++b2         JIS B2     515mm x 728mm
++b1         JIS B1     728mm x 1030mm
++b0         JIS B0     1030mm x 1456mm
++
++ ++ ++ ++ ++ ++ ++

++ ++Note that this doesn't affect the size of the drawing canvas. ++Use the ++-pheight ++ ++and ++-pwidth ++ ++options for that. ++ ++ ++

++

++ ++ ++-ph[eight] ++ ++height ++ ++ ++ ++

++
++ ++ ++Make the ++xfig ++ ++canvas ++height ++ ++high (where ++height ++ ++is either cm or in, depending on the ++-metric ++ ++setting). ++ ++ ++
++

++ ++ ++-po[rtrait] ++ ++ ++ ++

++
++ ++ ++Make ++xfig ++ ++come up in portrait mode (8.5" x 9"). See note about landscape mode. ++ ++ ++
++

++ ++ ++-pw[idth] ++ ++width ++ ++ ++ ++

++
++ ++ ++Make the ++xfig ++ ++canvas ++width ++ ++wide (where ++width ++ ++is either cm or in, depending on the ++-metric ++ ++setting). ++ ++ ++
++

++ ++ ++-righ[t] ++ ++ ++ ++

++
++ ++ ++Change the position of the side panel window to the right of the canvas window ++(default: left). ++ ++ ++
++

++ ++ ++-rigi[d] ++ ++ ++ ++

++
++ ++ ++Start ++xfig ++ ++with the ++rigid text ++ ++mode for text objects. ++The ++Rigid ++ ++attribute forces text to remain the same size even if ++inside a compound object that is scaled up or down. ++The default is ++off. ++ ++ ++ ++
++

++ ++ ++-ru[lerthick] ++ ++ ++ ++

++
++ ++ ++Set the height(width) of the top(side) rulers in pixels. ++The default (and minimum) is 24. ++ ++ ++
++

++ ++ ++-scala[blefonts] ++ ++ ++ ++

++
++ ++ ++Allows use of the X11R5 or OpenWindows scalable fonts (this is the default). ++If the scalable fonts aren't available ++xfig ++ ++will automatically switch to non-scaling fonts. ++ ++ ++
++

++ ++ ++-scale_factor ++ ++scale ++ ++ ++ ++

++
++ ++ ++Scale every figure read in by this value. This is useful in conjunction with the ++-update ++ ++option to do batch scaling of figures. ++ ++ ++
++

++ ++ ++-showa[llbuttons] ++ ++ ++ ++

++
++ ++ ++Show all the ++xfig ++ ++indicator buttons instead of only those relevant ++to the current drawing mode. ++Normally, the buttons ++line width, ++ ++area-fill, ++ ++grid mode, ++ ++text size, ++ ++etc. are only visible when ++they are relevant to the current drawing mode. ++The ++-showallbuttons ++ ++option makes all ++of the indicator buttons visible at all times. ++This takes up more screen real estate, ++but allows the user to see all settable parameters. ++ ++ ++
++

++ ++ ++-showb[alloons] ++ ++ ++ ++

++
++ ++ ++Forces ++xfig ++ ++to pop up the information balloons when the mouse ++passws over a button. This is the default. See also ++-dontshowballoons . ++ ++ ++ ++
++

++ ++ ++-showd[epthmanager] ++ ++ ++ ++

++
++ ++ ++Show the depth manager panel. This panel lets one show or hide ++objects at various depths. ++This is the default. ++ ++ ++
++

++ ++ ++-showl[engths] ++ ++ ++ ++

++
++ ++ ++Makes ++xfig ++ ++show the lengths of lines being drawn, in red text near the ++line itself. Also, when points are moved or added. In addition, imagine ++a triangle formed with the line segment as the hypotenuse, ++and a vertical and horizontal line forming the other two sides. These ++lines and their lengths are also drawn in red as the point is moved or added. ++This mode is ignored when drawing in freehand mode. ++
++ ++This flag may be toggled by pressing <Meta>i (default). ++ ++ ++
++

++ ++ ++-shown[ums] ++ ++ ++ ++

++
++ ++ ++With this option, xfig will draw all objects with a red number next to each vertex. ++This is generally only useful for debugging. ++ ++ ++
++

++ ++ ++-showp[ageborder] ++ ++ ++ ++

++
++ ++ ++Makes ++xfig ++ ++show the border of the current paper size in the color specified ++by the ++-pageborder ++ ++option (default: light blue). ++ ++ ++
++

++ ++ ++-showz[erolines] ++ ++ ++ ++

++
++ ++ ++Show axis zero lines on the canvas. ++This is the default ++ ++ ++
++

++ ++ ++-si[ngle] ++ ++ ++ ++

++
++ ++ ++Sets single page mode for print or export. ++This is the default. See also ++-multiple. ++ ++ ++ ++
++

++ ++ ++-sm[ooth_factor] ++ ++factor ++ ++ ++ ++

++
++ ++ ++Enable smoothing when exporting to the bitmap formats (e.g. GIF, PNG, etc.). The allowed ++values are 0 (no smoothing), 2 or 4 (most smoothing). This parameter is passed ++to ghostscript in the -dTextAlphaBits -dGraphicsAlphaBits options to smooth the figure. ++ ++ ++
++

++ ++ ++-spec[ialtext] ++ ++ ++ ++

++
++ ++ ++Start ++xfig ++ ++with the ++special text ++ ++mode for text objects. ++Special text means that special characters in the string are not specially ++processed but are passed directly to ++LaTeX. ++ ++This is most useful for writing LaTeX equations. ++If this flag is not set, then the backslash character '\' is changed ++to the \backslash command, a brace '{' is turned into a brace command \{, etc. ++ ++ ++
++

++ ++ ++-spel[lcheckcommand] ++ ++command ++ ++ ++ ++

++
++ ++ ++Use ++command ++ ++for the external spell checking program when using the spell check/search/replace ++popup. ++The string ++command ++ ++should include the string ``%s'' which is replaced by a temporary filename. ++Default is ``spell %s''. ++ ++ ++
++

++ ++ ++-spinner_d[elay] ++ ++msec ++ ++ ++ ++

++
++ ++ ++The delay (in milliseconds) before the spinner will automatically count up ++or down when the button is pressed. ++Spinners are the (numeric) text widgets with an up- and down-arrow, which when ++clicked, cause the value to be incremented/decremented. ++The default is 500 milliseconds. ++ ++ ++
++

++ ++ ++-spinner_r[rate] ++ ++msec ++ ++ ++ ++

++
++ ++ ++The rate (in milliseconds) at which the spinner will count ++when the up- or down-arrow is pressed. ++ ++ ++
++

++ ++ ++-startfi[llstyle] ++ ++stylenumber ++ ++ ++ ++

++
++ ++ ++Set the starting fill style for area fill (-1 to 21). ++ ++ ++
++

++ ++ ++-startfo[ntsize] ++ ++pointsize ++ ++ ++ ++

++
++ ++ ++Set the default font size for text objects (default = 12pt). ++ ++ ++
++

++ ++ ++-startg[ridmode] ++ ++modenumber ++ ++ ++ ++

++
++ ++ ++Set the starting grid mode (0 to 3). Mode 0 is no grid. ++In imperial (inches) mode, grid mode 1 is 1/4 inch, ++mode 2 is 1/2 inch and mode 3 is 1 inch. ++In metric mode, grid mode 1 is 5mm, mode 2 is 1cm and mode 3 is 2cm. ++ ++ ++
++

++ ++ ++-startla[texFont] ++ ++font ++ ++ ++ ++

++
++ ++ ++Set the starting font name for ++LaTeX ++ ++fonts. ++ ++ ++
++

++ ++ ++-startli[newidth] ++ ++width ++ ++ ++ ++

++
++ ++ ++Set the starting line width. ++ ++ ++
++

++ ++ ++-startpo[snmode] ++ ++modenumber ++ ++ ++ ++

++
++ ++ ++Set the starting point positioning mode (0 to 4) ++In imperial (inches) mode, positioning mode 0 is ``any'', ++mode 1 is 1/16 inch, ++mode 2 is 1/4 inch, mode 3 is 1/2 inch and mode 4 is 1 inch. ++In metric mode, mode 0 is ``any'', ++mode 1 is 1mm, mode 2 is 5mm, mode 3 is 10mm and mode 4 is 20mm. ++ ++ ++
++

++ ++ ++-startp[sFont] ++ ++font ++ ++ ++ ++

++
++ ++ ++Set the starting font name for ++PostScript ++ ++fonts. ++ ++ ++
++

++ ++ ++-startt[extstep] ++ ++stepsize ++ ++ ++ ++

++
++ ++ ++Set the starting text step. ++ ++ ++
++

++ ++ ++-ta[blet] ++ ++ ++ ++

++
++ ++ ++Specifies that xfig should use the input tablet instead of the mouse ++for drawing. You must have the XInputExtension in your X server and ++an input tablet for this to work. Also, you must modify the Imakefile ++to include the ++USETAB ++ ++and ++TABLIB ++ ++variables. ++ ++ ++
++

++ ++ ++-track ++ ++ ++ ++

++
++ ++ ++Turn on cursor (mouse) tracking arrows (default). ++ ++ ++
++

++ ++ ++-tran[sparent_color] ++ ++color_number ++ ++ ++ ++

++
++ ++ ++Make the transparent color for GIF export ++color_number. ++ ++This number is the color number according to the ++xfig ++ ++color panel, starting at 0 (black) and ending at 31 (gold), ++or may be a user-defined color number, which is 32 or higher. ++ ++ ++
++

++ ++ ++-update ++ ++file [ file ... ] ++ ++ ++ ++

++
++ ++ ++Run xfig in an "update" mode, where it will read each Fig file specified ++on the command line and write it out to the original file, ++in the current file format for the version of xfig being run. ++The original Fig file will be preserved with ++the suffix .bak attached to the name. ++
++ ++In this mode, xfig doesn't connect the X server, so no window is opened, ++and it exits when finished. ++ ++ ++
++

++ ++ ++-users[cale] ++ ++scale ++ ++ ++ ++

++
++ ++ ++Set the multiplier for displayed line lengths etc. ++This factor is multiplied by the actual length, ++radius or diameter of the object currently ++being drawn on the canvas. ++It is useful for making scale drawings, where ++e.g. 1 inch = 1 foot (userscale = 12.0) or 1cm = 1m (userscale = 100.0). ++ ++ ++
++

++ ++ ++-useru[nit] ++ ++units ++ ++ ++ ++

++
++ ++ ++The ++units ++ ++string is printed with the length information when drawing objects. ++For example if the ++userscale ++ ++= 1.0 and the ++userunit ++ ++= ++ft ++ ++then a line which is 3 inches long on the canvas would be displayed as ++``length = 3 ft'' when it is being drawn. ++
++After ++xfig ++ ++is started you may change the ++userscale ++ ++and the ++userunit ++ ++from a popup menu available by pressing mouse button 3 in the ++units ++ ++box where the two rulers meet. ++ ++ ++
++

++ ++ ++-visual ++ ++visualname ++ ++ ++ ++

++
++ ++ ++Use ++visualname ++ ++as the visual for xfig. The names are TrueColor (case is not important), ++StaticColor, DirectColor, StaticGray, GrayScale and PseudoColor. ++xfig ++ ++uses the default visual unless this is specified. Your server must ++support the desired visual. ++Use ++xdpyinfo ++ ++to see what visuals and depths are supported. ++See also the ++-depth ++ ++option. ++ ++ ++
++

++ ++ ++-zoom ++ ++zoomscale ++ ++ ++ ++

++
++ ++ ++Set the starting zoom scale. ++

++

++

++

++ ++  ++

X RESOURCES and DEFAULTS

++ ++The overall widget name(Class) is xfig(Fig). ++These resources correspond to the command line arguments: ++

++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++

++Name                Type    Default         Command-line equivalent
++
allownegcoords      boolean true            -allownegcoords (true),
++                                            -dontallownegcoords (false)
++axislines           string  pink            -axislines
++balloon_delay       integer 500 (ms)        -balloon_delay
++boldFont            string  8x13bold        -bold
++but_per_row         integer 2               -but_per_row
++buttonFont          string  6x13            -button
++canvasbackground    string  white           -cbg
++canvasforeground    string  black           -cfg
++correctfontsize     boolean false           -correctfontsize
++debug               boolean false           -debug
++depth               integer *               -depth
++dontswitchcmap      boolean false           -dontswitchcmap
++euc_encoding        boolean false           (n/a)
++encoding            integer 1               -encoding
++exportLanguage      string  eps             -exportLanguage
++export_margin       integer 0               -export_margin
++flipvisualhints     boolean false           -flipvisualhints
++flushleft           boolean false           -flushleft (true),
++                                            -center (false)
++freehand_resolution integer 25              -freehand_resolution
++grid_color          string  black           -grid_color
++grid_unit           string  1/16 (inch)     -grid_unit
++                            0.1 (metric)
++hiddentext          boolean false           -hiddentext
++icon_view           boolean true            -icon_view (true),
++                                            -list_view (false)
++image_editor        string  xv              -image_editor
++inches              boolean true            -inches (true),
++                                            -imperial (true),
++                                            -centimeters (false),
++                                            -metric (false)
++installowncmap      boolean false           -installowncmap
++internalborderwidth integer 1               -internalBW
++international       International           booleanfalse-international
++jpeg_quality        integer 75              -jpeg_quality
++justify             boolean false           -left (false),
++                                            -right (true)
++keyFile             string  CompKeyDB       -keyFile
++landscape           boolean true            -Landscape (true),
++                                            -landscape (true),
++                                            -Portrait (false),
++                                            -portrait (false)
++latexfonts          boolean false           -latexfonts
++library_dir         string  ~/xfiglib       -library_dir
++magnification       float   100             -magnification
++max_image_colors    integer 64              -max_image_colors
++monochrome          boolean false           -monochrome
++multiple            boolean false           -multiple
++normalFont          string  6x13            -normal
++overlap             boolean true            -overlap (true),
++                                            -nooverlap (false)
++pageborder          string  lightblue       -pageborder
++paper_size          string  Letter (inch)   -paper_size
++                            A4 (metric)
++pheight             float   8.5 (landscape) -pheight
++                            9.5 (portrait)
++pwidth              float   11 (landscape)  -pwidth
++                            8.5 (portrait)
++rigidtext           boolean false           -rigid (true)
++rulerthick          integer 24              -rulerthick
++scalablefonts       boolean true            -scalablefonts (true),
++                                            -noscalablefonts (false)
++scale_factor        float   1.0             -scale_factor
++showallbuttons      boolean false           -showallbuttons
++showaxislines       boolean true            -showaxislines (true),
++                                            -dontshowaxislines (false)
++showballoons        boolean true            -showballoons (true),
++                                            -dontshowballoons (false)
++showdepthmanager    boolean true            -showdepthmanager (true),
++                                            -dontshowdepthmanager (false)
++showlengths         boolean false           -showlengths (true),
++                                            -dontshowlengths (false)
++shownums            boolean false           -shownums (true),
++                                            -dontshownums (false)
++showpageborder      boolean true            -showpageborder (true),
++                                            -dontshowpageborder (false)
++single              boolean true            -single
++smooth_factor       integer 0               -smooth_factor
++specialtext         boolean false           -specialtext
++splash              boolean true            -splash (true),
++                                            -nosplash (false)
++spellcheckcommand   string  spell %s        -spellcheckcommand
++spinner_delay       integer 500 (ms)        -spinner_delay
++spinner_rate        integer 100 (ms)        -spinner_rate
++startfillstyle      integer 0               -startfillstyle
++startfontsize       float   12              -startfontsize
++startgridmode       integer 0               -startgridmode
++startlatexFont      string  Default         -startlatexFont
++startlinewidth      integer 1               -startlinewidth
++startposnmode       integer 1               -startposnmode
++startpsFont         string  Times-Roman     -startpsFont
++starttextstep       float   1.2             -starttextstep
++tablet              boolean false           -track,
++trackCursor         boolean true            -track (true),
++                                            -notrack (false)
++transparent_color   integer -2 (none)       -transparent_color
++userscale           float   1.0             -userscale
++userunit            string  in (inches)     -userunit
++                            cm (metric)
++visual              string  *               -visual
++zoom                float   1.0             -zoom
++
++* Default visual and depth depend on the X server. Use xdpyinfo to see what visuals
++and depths are supported.
++
++ ++ ++ ++ ++ ++

++

++ ++  ++

BUGS and RESTRICTIONS

++ ++Please send bug reports, fixes, new features etc. to: ++
++ ++bvsmith@lbl.gov ++(Brian V. Smith) ++

++ ++When reporting a bug, please first check if the problem is mentioned in ++the FAQ section of the HTML files (xfig Help menu). ++

++ ++If it is not mentioned there, be sure to report the operating system you ++are using (e.g. SunOS 4.1.3), type of X server and version (OpenWindows 3, X11R6.4, ++XFree86 3.2.2, etc) and color depth (e.g. 8bpp, 16bpp), and most ++importantly the version of xfig or fig2dev that is having the problem. ++

++ ++It is also VERY useful to me if you can provide a stack trace from a debugger ++such as gdb, dbx, ups, etc, if the bug causes xfig to crash. ++

++ ++Because of the difference of some fonts in some X servers and the PostScript ++fonts on printers, text alignment can be problematic. ++

++ ++Not all operations employ smart redrawing of objects which are altered ++as a by product of the operation. ++You may need to use ++Redraw ++ ++in these cases. ++

++ ++Some servers do not allow bitmaps/pixmaps taller than the screen height ++or wider than the screen width. ++That is why there is a limit on the width ++of the top ruler and height of the side ruler. ++If you need wider/taller rulers AND your server allows bigger pixmaps, ++you may define ++MAX_TOPRULER_WD ++ ++and/or ++MAX_SIDERULER_HT ++ ++in your Imakefile in the ++DEFINES ++ ++line. ++For example, ++to have a maximum top ruler width of 1160 pixels, add ++-DMAX_TOPRULER_WD=1160 ++ ++to your ++DEFINES ++ ++line in the Imakefile. ++

++ ++If the image is panned or the ++xfig ++ ++window iconified and de-iconified ++during the middle of an operation (e.g. while drawing a line), the picture ++will be distorted. ++This can be corrected using ++Redraw ++ ++after the operation is complete. ++

++ ++When zoomed very large, the length of dashes in dashed lines will top out ++at 255 pixels long. This is due to a restriction in X ++that the dash list is defined by char (255 pixels maximum for a dash). ++The figure will print correctly, however. ++

++ ++When you do a copy/rotate with multiple copies, ++only the creation of the last object can be undone with the Undo button. ++

++ ++Modifications to text using the popup search/update/replace/spell check panel ++cannot be undone. ++

++ ++See the ++README ++ ++file for troubleshooting. ++  ++

SEE ALSO

++ ++

++ ++fig2dev(1) ++(TransFig ++ ++package) ++

++ ++gs(1) ++(Ghostscript ++ ++PostScript previewer) ++  ++

ACKNOWLEDGEMENT

++ ++(From the original author, Supoj Sutanthavibul): ++Many thanks goes to Professor Donald E. Fussell who inspired the ++creation of this tool. ++

++ ++(From current maintainer Brian Smith): ++Thanks to all the users who have contributed to xfig, especially ++Paul King who, besides adding many features, ++revamped the look and feel which became version 2.1. ++  ++

COPYRIGHT

++ ++
++Original Copyright (c) 1985 by Supoj Sutanthavibul
++Parts Copyright (c) 1994-1999 by Brian V. Smith
++Parts Copyright (c) 1991 by Paul King
++Other Copyrights may be found in various files
++
++
++
++ ++

++ ++Any party obtaining a copy of these files is granted, free of charge, a ++full and unrestricted irrevocable, world-wide, paid up, royalty-free, ++nonexclusive right and license to deal in this software and ++documentation files (the "Software"), including without limitation the ++rights to use, copy, modify, merge, publish and/or distribute copies of ++the Software, and to permit persons who receive copies from any such ++party to do so, with the only requirement being that this copyright ++notice remain intact. ++

++ ++Note that although I work at Lawrence Berkeley National Laboratory (LBNL) ++I don't speak for LBNL nor do I represent LBNL with respect to my work on ++TransFig and xfig, nor does LBL make any representations about the suitability ++of this software for any purpose. ++

++ ++Here is the legal part: ++

++ ++THE LAWRENCE BERKELEY NATIONAL LABORATORY DISCLAIMS ALL WARRANTIES WITH ++REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY ++AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, ++INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM ++LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE ++OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++PERFORMANCE OF THIS SOFTWARE. ++

++

++ ++PostScript ++ ++is a trademark of Adobe Systems Incorporated. ++ ++

++ ++

++Parts Copyright (C) 1989 by Jef Poskanzer.
++Copyright notice for pbmplus code:
++
++
++Permission to use, copy, modify, and distribute this
++software and its documentation for any purpose and without
++fee is hereby granted, provided that the above copyright
++notice appear in all copies and that both that copyright
++notice and this permission notice appear in supporting
++documentation.  This software is provided ``as is'' without
++express or implied warranty.
++
++ ++
++ ++  ++

FILES

++ ++ ++ ++
++
CompKeyDB ++ ++
++Data base of compose (meta) key sequences for 8-bit characters. ++Must be installed in ++$(XFIGLIBDIR) ++ ++with ``make install'', ++or may be specified with command line option ++-keyFile ++ ++or X toolkit resource keyFile. ++See the ++Imakefile. ++ ++
/usr/lib/X11/xfig
++This directory contains the html documentation, the above mentioned ++CompKeyDB file, and a directory of libraries containing Fig objects ++such as electrical symbols, logic symbols, etc. ++
Fig.ad and Fig-color.ad ++ ++
++Application defaults files which are automatically installed ++in the system app-defaults directory with the ++make install ++ ++command. ++
Doc/FORMAT3.2 ++ ++
++Description of Fig file format. ++
README ++ ++
++Installation instructions and troubleshooting. ++
CHANGES ++ ++
++Description of bug fixes/new features. ++

++

++  ++

AUTHORS

++ ++Many people have contributed to ++xfig. ++ ++Here is a list of the people who ++have contributed the most (in chronological order): ++

++Version 1: ++ ++

++ ++Original author: ++
++ ++Supoj Sutanthavibul, University of Texas at Austin ++

++The ++LaTeX ++ ++line drawing modes were contributed by: ++
++ ++Frank Schmuck, Cornell University ++

++Original X11 port by: ++
++ ++Ken Yap, Rochester ++

++Variable window sizes, cleanup of X11 port, right hand side panel: ++
++ ++Dana Chee, Bellcore ++

++Cleanup of color port to X11 by: ++
++ ++John T. Kohl, MIT ++

++ ++Version 2.0: ++ ++ ++

++Area fill, multiple line thicknesses, multiple fonts and font sizes, ++bottom panel, line style/thickness, ++(and anything else that wasn't written by the others) ++by: ++
++ ++Brian Smith ++
++ ++(standard disclaimer applies) ++
++ ++(bvsmith@lbl.gov) ++

++Popup change-object menu by: ++
++ ++Jon Tombs ++
++ ++Frank Schmuck ++

++Zooming and panning functions, shift key select mechanism by: ++
++ ++Dieter Pellkofer ++
++ ++Henning Spruth ++

++Depth feature by: ++
++ ++Mike Lutz ++

++Cut/Paste by: ++
++ ++Tom Tkacik ++

++ ++Version 2.1: ++ ++ ++

++Indicator panel, file menu popup, print menu popup, ++panning with rulers, mouse function window, regular polygon, ++rubberbanding of circles/ellipses, filled splines on canvas, ++dashed/dotted splines on canvas, update button, ++arbitrary angle rotation of objects, alignment in compound, ++object scaling, constrained copy/move, corner markers for compound, ++context sensitive corner markers, smarter redraw, undo for compound ++and point move for boxes, cancel object creation, point positioning ++to three resolutions, ++TransFig ++ ++scalable text, hidden text, ++special text, save of figure on crash by: ++

++Paul King (king@cs.uq.oz.au) ++
++ ++with help from: ++
++ ++Brian Smith ++and Micah Beck (beck@cs.utk.edu) ++

++Encapsulated ++PostScript ++ ++importing by: ++
++ ++Brian Boyter ++

++Pan/zoom with ctrl key/mouse by: ++
++ ++Henning Spruth ++

++International characters by: ++
++ ++Herve Soulard ++

++Directory Browser based on XDir by: ++
++ ++Win Treese, Digital Equipment Corporation ++

++Rotated ellipses by: ++
++ ++James Tough, Dept. of Computer Science, Heriot-Watt University, Scotland ++

++Rotated text from the ++xvertext ++ ++package by: ++
++ ++Alan Richardson, Space Science Centre, School of MAPS, ++University of Sussex ++

++Popup scale menu and dynamic switching between inches and cm by: ++
++ ++Paul King (king@cs.uq.oz.au) ++

++Extensive man page formatting revisions by: ++
++ ++David W. Sanderson ++

++Display Postscript code for IBM RS/6000 by: ++
++ ++Dave Hale (dhale@green.mines.colorado.edu) ++ ++

++Version 3.0: ++ ++ ++

++
++ ++New arrowhead types, separate pen/fill colors, new file protocol, ++more colors with extended color popup panel, new arc style, ++new fill patterns (bricks, etc), new line join and cap styles, ++export offset and file load offset, XPM import, XBM import and export ++(and anything else that wasn't written by the others) by: ++
++ ++Brian Smith ++
++ ++(Note: the color popup panel was based on ++xcoloredit ++ ++by Richard Hesketh) ++

++

++GIF header reading code by: ++
++ ++David Koblas from the giftoppm part of the pbmplus package ++

++XPM export code (using XPM3 libraries) by: ++
++ ++Karel van Houten (K.H.C.vanHouten@research.ptt.nl) ++

++Higher figure resolution (1200dpi) by: ++
++ ++Ross Martin (martin@trcsun3.eas.asu.edu) ++

++Color quantization using neural network by: ++
++ ++Anthony Dekker (dekker@ACM.org) ++
++ ++[NEUQUANT Neural-Net quantization algorithm by Anthony Dekker, 1994. ++See ``Kohonen neural networks for optimal colour quantization'' ++in ``Network: Computation in Neural Systems'' Vol. 5 (1994) pp 351-367. ++for a discussion of the algorithm.] ++

++Floyd-Steinberg algorithm for dithering color images on monochrome ++displays lifted from the Pbmplus package by Jef Poskanser. ++

++rotate/flip objects around/about selected anchor point and multiple ++copies of objects by: ++
++ ++Uwe Bonnes (bon@lte.e-technik.uni-erlangen.de) ++

++Input tablet extension by: ++
++ ++Greg LaCoste (greg@seismo.do.usbr.gov) ++ ++

++Version 3.1: ++ ++

++ ++
++ ++The only difference between protocol version 3.0 and version 3.1 is ++that the position of the ``magnet'' has been shifted by 14 fig units. ++In the 2.1 and older versions of xfig the grid was in multiples of 5 fig ++units, but they were on intervals 4, 9, 14, 19, etc. ++When version 3.0 was created, coordinates were simply multiplied by the ++ratio of the resolutions (1200/80 = 15) so values like 4 became 60 instead ++of 74 ((4+1)*15 - 1). ++

++The JPEG import/export code uses the Independent JPEG Group software ++(see jpeg/README for details) ++

++Image browser, editor and screen capture features by: ++
++ ++Jim Daley (jdaley@cix.compulink.co.uk) ++ ++

++Version 3.2: ++ ++

++ ++
++ ++The changes to the version 3.2 file protocol are the addition of the ++paper size, print/export magnification, single/multiple page indicator ++and a transparent color name used for GIF export to the header ++of the file. ++
++ ++The other difference in the version 3.2 protocol is the ++mathematical model used for splines. The new version ++uses X-splines which allows the user to mix interpolation and approximation ++points in a same curve. More precisely, it means that an X-spline curve ++is neither an interpolated spline nor an approximated one, it is BOTH ++(the behaviour of each point is controlled by one single parameter ++called ``shape factor''). For additional information about X-splines, see: ++

++
  "X-Splines: A Spline Model Designed for the End User" ++
  by C. Blanc and C. Schlick, Proceedings of SIGGRAPH'95 ++
  http://dept-info.labri.u-bordeaux.fr/~schlick/DOC/sig1.html ++

++Caveat: Because previous spline models (quadratic B-splines and Bezier ++with hidden points) are no longer supported, curves that are present ++in version 3.1 and older files are automatically converted to X-splines. ++This translation is only an approximation process. It means that the ++converted curves are not exactly the same as the original ones. Though ++they are usually very close, some hand-fitting may be needed in ++some pathological cases. ++

++Inclusion of X-splines by: ++
++ ++Carole Blanc (blanc@labri.u-bordeaux.fr) ++
++ ++Christophe Schlick (schlick@labri.u-bordeaux.fr) ++
++ ++Note: the initial implementation was done by C. Feuille, S. Grosbois, L. ++Maziere and L. Minihot as a student practice (Universite Bordeaux, France). ++

++Open/close compound feature written by ++
++ ++Bill Taylor (bill@mainstream.com) ++

++Library feature written by ++
++ ++Stephane Mancini (mancini@elecsrv.enst.fr) ++(object preview by Brian V. Smith) ++

++The library objects in the Electrical and Logic libraries were done by ++
++ ++Peter Hiscocks (phiscock@ee.ryerson.ca) ++

++The library objects in the Computer, Networks, and Hospital-Equipment ++libraries were extracted from the clipart example files by ++
++ ++Bill Chimiak (chim@bgsm.edu) ++

++ ++

++Version 3.2.3 and newer: ++ ++

++ ++Please see the CHANGES file for credits for newer releases. ++ ++  ++

NOTES

++ ++Many bug fixes/cleanups etc. by a host of faithful users ++

++See the ++CHANGES ++ ++file for all the credits ++

++The ++TransFig ++ ++package was written by Micah Beck and is maintained by Brian Smith ++

++ ++

++ 

Index

++
++
NAME
++
SYNOPSIS
++
DESCRIPTION
++
OPTIONS
++
X RESOURCES and DEFAULTS
++
BUGS and RESTRICTIONS
++
SEE ALSO
++
ACKNOWLEDGEMENT
++
COPYRIGHT
++
FILES
++
AUTHORS
++
NOTES
++
++
++This document was created by ++man2html, ++using the manual pages.
++Time: 16:26:41 GMT, March 22, 2008 ++ ++ diff --git a/sources b/sources index 74035c1..db0a967 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -499b0ce103a6b353453bf7e327f9a3b9 xfig.3.2.5b.full.tar.gz +210851330fa4bb3581bec1f8448a4db8 xfig.3.2.5c.full.tar.gz f58e3bde288d623c826e1784ebb45de0 xfig-icons.tar.gz diff --git a/xfig-3.2.5-Imakefile.patch b/xfig-3.2.5-Imakefile.patch index 90f91c3..6451bff 100644 --- a/xfig-3.2.5-Imakefile.patch +++ b/xfig-3.2.5-Imakefile.patch @@ -1,7 +1,7 @@ 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 +@@ -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. @@ -10,12 +10,6 @@ diff -up xfig.3.2.5b/Imakefile.fed xfig.3.2.5b/Imakefile 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) diff --git a/xfig-3.2.5-disable-Xaw3d.patch b/xfig-3.2.5-disable-Xaw3d.patch new file mode 100644 index 0000000..3b5b8fc --- /dev/null +++ b/xfig-3.2.5-disable-Xaw3d.patch @@ -0,0 +1,21 @@ +diff -up xfig.3.2.5a/Imakefile.with-Xaw3d xfig.3.2.5a/Imakefile +--- xfig.3.2.5c/Imakefile.with-Xaw3d 2013-11-27 22:24:46.000000000 +0100 ++++ xfig.3.2.5c/Imakefile 2013-11-27 22:24:06.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 +@@ -60,7 +60,7 @@ XCOMM Uncomment the following if you hav + XCOMM some new features, including "Tips", which replace xfig's "help balloons" + XCOMM NOTE: This is the default for many X systems now. + +-#define XAW3D1_5E ++XCOMM #define XAW3D1_5E + + #ifdef XAW3D1_5E + DUSEXAW3D = -DXAW3D -DXAW3D1_5E diff --git a/xfig-3.2.5-enable-Xaw3d.patch b/xfig-3.2.5-enable-Xaw3d.patch deleted file mode 100644 index a1df816..0000000 --- a/xfig-3.2.5-enable-Xaw3d.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up xfig.3.2.5a/Imakefile.no-Xaw3d xfig.3.2.5a/Imakefile ---- xfig.3.2.5a/Imakefile.no-Xaw3d 2009-03-27 16:33:46.000000000 +0100 -+++ xfig.3.2.5a/Imakefile 2009-03-27 16:35:06.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 - --XCOMM #define XAW3D -+#define XAW3D - - #ifdef XAW3D - XAWLIB = -lXaw3d -@@ -60,7 +60,7 @@ XCOMM Uncomment the following if you hav - XCOMM some new features, including "Tips", which replace xfig's "help balloons" - XCOMM NOTE: This is the default for many X systems now. - --XCOMM #define XAW3D1_5E -+#define XAW3D1_5E - - #ifdef XAW3D1_5E - DUSEXAW3D = -DXAW3D -DXAW3D1_5E diff --git a/xfig.spec b/xfig.spec index e492de1..74df78e 100644 --- a/xfig.spec +++ b/xfig.spec @@ -3,31 +3,25 @@ Summary: An X Window System tool for drawing basic vector graphics Name: xfig Version: 3.2.5 -Release: 38.b%{?dist} +Release: 39.c%{?dist} License: MIT Group: Applications/Multimedia URL: http://www.xfig.org/ -Source0: http://downloads.sourceforge.net/mcj/xfig.%{version}b.full.tar.gz +Source0: http://downloads.sourceforge.net/mcj/xfig.%{version}c.full.tar.gz Source1: xfig-icons.tar.gz Source2: xfig.desktop Source3: xfig.sh Patch0: xfig-3.2.5a-default-apps.patch Patch1: xfig-3.2.5-Imakefile.patch -Patch2: xfig-3.2.5-enable-Xaw3d.patch +Patch2: xfig-3.2.5-disable-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 -Patch15: 40_fix_dash_list_for_different_styles.patch +Patch4: 31_spelling.patch +Patch5: 33_pdfimport_mediabox.patch +# xfig_man.html is not in 3.2.5c tarball from some reason, +# but makefile still tries to install it +Patch6: 39_add_xfig_man_html.patch +Patch7: 40_fix_dash_list_for_different_styles.patch BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -91,23 +85,15 @@ Files common to both the plain Xaw and the Xaw3d version of xfig. %prep -%setup -q -n xfig.%{version}b -a 1 +%setup -q -n xfig.%{version}c -a 1 %patch0 -p1 %patch1 -p1 -%patch2 -p1 -b .no-Xaw3d +%patch2 -p1 -b .with-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 -%patch15 -p1 iconv -f ISO-8859-1 -t UTF8 CHANGES > tmp; touch -r CHANGES tmp; mv tmp CHANGES rm Doc/html/images/sav1a0.tmp @@ -115,7 +101,7 @@ chmod -x `find -type f` %build -# First build the Xaw3d version +# First build the normal Xaw version xmkmf # make sure cmdline option parsing still works despite us renaming the binary sed -i 's/"xfig"/"xfig-Xaw3d"/' main.c @@ -123,8 +109,8 @@ make CDEBUGFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fno-strength-reduce -fno-strict- mv xfig xfig-Xaw3d make distclean -# And then build the normal Xaw version -mv Imakefile.no-Xaw3d Imakefile +# And then build the plain version +mv Imakefile.with-Xaw3d Imakefile xmkmf # make sure cmdline option parsing still works despite us renaming the binary sed -i 's/"xfig-Xaw3d"/"xfig-plain"/' main.c @@ -190,6 +176,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Fri Jan 03 2014 David Kaufmann - 3.2.5-39.c +- Version bump to 3.2.5-39c + * Fri Jan 03 2014 Michal Srb - 3.2.5-38.b - Fix crash when creating lines with linestyle 3 - Resolves: rhbz#1023744 (Thanks to Maurizio Paolini and David Kaufmann)