commit 81b5f8e309fb52ab3c15921813a8979c9e458ab5 Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Sun Oct 29 12:20:07 2023 +0100
- updated to 3.2.9 xfig-3.2.5b-app-defaults.patch | 12 +++---- xfig-3.2.5b-urwfonts.patch | 79 ------------------------------------------ xfig-i18n.patch | 15 -------- xfig.spec | 13 ++++--- 4 files changed, 12 insertions(+), 107 deletions(-) --- diff --git a/xfig.spec b/xfig.spec index fc4f9fe..d1d7c52 100644 --- a/xfig.spec +++ b/xfig.spec @@ -8,23 +8,24 @@ Summary(ru.UTF-8): Инструмент для рисования простой Summary(tr.UTF-8): X11 çizim aracı Summary(uk.UTF-8): Інструмент для малювання простої векторної графіки Name: xfig -Version: 3.2.8b +Version: 3.2.9 Release: 1 License: Freeware Group: X11/Applications/Graphics Source0: https://downloads.sourceforge.net/mcj/%{name}-%{version}.tar.xz -# Source0-md5: 049dcf9dc53d6bb7012e716d15d0d512 -Patch0: %{name}-i18n.patch +# Source0-md5: 4a338b0e513baedc460e7c64852b0ed5 Patch1: %{name}-3.2.5b-zoom-during-edit.patch -Patch2: %{name}-3.2.5b-urwfonts.patch Patch3: %{name}-3.2.5b-app-defaults.patch Patch4: %{name}-desktop.patch URL: https://mcj.sourceforge.net/ BuildRequires: Xaw3d-devel +BuildRequires: fontconfig-devel +BuildRequires: ghostscript-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: tar >= 1:1.22 -BuildRequires: xorg-lib-libXaw-devel +BuildRequires: xorg-lib-libX11-devel +BuildRequires: xorg-lib-libXft-devel BuildRequires: xorg-lib-libXpm-devel BuildRequires: xorg-lib-libXt-devel BuildRequires: xz @@ -84,9 +85,7 @@ Xfig - це інструмент для створення базової век %prep %setup -q -%patch0 -p1 %patch1 -p2 -%patch2 -p0 %patch3 -p1 %patch4 -p1 diff --git a/xfig-3.2.5b-app-defaults.patch b/xfig-3.2.5b-app-defaults.patch index 658332e..c784c07 100644 --- a/xfig-3.2.5b-app-defaults.patch +++ b/xfig-3.2.5b-app-defaults.patch @@ -1,10 +1,10 @@ Defaults for xfig. Idea from Roland Rosenfeld <rol...@debian.org> ---- xfig-3.2.6a/app-defaults/Fig.in.orig 2017-07-30 09:25:21.276709296 +0200 -+++ xfig-3.2.6a/app-defaults/Fig.in 2017-07-30 09:27:04.636708116 +0200 -@@ -10,6 +10,10 @@ - - ! some sample settings you may want to change +--- xfig-3.2.9/app-defaults/Fig.orig 2023-08-15 11:11:22.000000000 +0200 ++++ xfig-3.2.9/app-defaults/Fig 2023-10-29 12:13:38.520817101 +0100 +@@ -12,6 +12,10 @@ + ! + !----------------------------------------------------------------------- +! If the following resource is set to false, xfig will use metric units +! by default. @@ -12,4 +12,4 @@ Defaults for xfig. Idea from Roland Rosenfeld <rol...@debian.org> + ! The following fixes a problem that some window managers have ! with xfig continually resizing itself - + Fig*AllowShellResize: False diff --git a/xfig-3.2.5b-urwfonts.patch b/xfig-3.2.5b-urwfonts.patch deleted file mode 100644 index e3914c7..0000000 --- a/xfig-3.2.5b-urwfonts.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- src/u_fonts.c 2002-09-09 13:36:58.000000000 -0400 -+++ src/u_fonts.c 2006-10-11 00:29:07.000000000 -0400 -@@ -22,41 +22,41 @@ - /* X11 font names */ - - struct _xfstruct x_fontinfo[NUM_FONTS] = { -- {"-*-times-medium-r-normal--", (struct xfont*) NULL}, -- {"-*-times-medium-i-normal--", (struct xfont*) NULL}, -- {"-*-times-bold-r-normal--", (struct xfont*) NULL}, -- {"-*-times-bold-i-normal--", (struct xfont*) NULL}, -- {"-*-avantgarde-book-r-normal--", (struct xfont*) NULL}, -- {"-*-avantgarde-book-o-normal--", (struct xfont*) NULL}, -- {"-*-avantgarde-demi-r-normal--", (struct xfont*) NULL}, -- {"-*-avantgarde-demi-o-normal--", (struct xfont*) NULL}, -- {"-*-bookman-light-r-normal--", (struct xfont*) NULL}, -- {"-*-bookman-light-i-normal--", (struct xfont*) NULL}, -- {"-*-bookman-demi-r-normal--", (struct xfont*) NULL}, -- {"-*-bookman-demi-i-normal--", (struct xfont*) NULL}, -- {"-*-courier-medium-r-normal--", (struct xfont*) NULL}, -- {"-*-courier-medium-o-normal--", (struct xfont*) NULL}, -- {"-*-courier-bold-r-normal--", (struct xfont*) NULL}, -- {"-*-courier-bold-o-normal--", (struct xfont*) NULL}, -- {"-*-helvetica-medium-r-normal--", (struct xfont*) NULL}, -- {"-*-helvetica-medium-o-normal--", (struct xfont*) NULL}, -- {"-*-helvetica-bold-r-normal--", (struct xfont*) NULL}, -- {"-*-helvetica-bold-o-normal--", (struct xfont*) NULL}, -- {"-*-helvetica-medium-r-narrow--", (struct xfont*) NULL}, -- {"-*-helvetica-medium-o-narrow--", (struct xfont*) NULL}, -- {"-*-helvetica-bold-r-narrow--", (struct xfont*) NULL}, -- {"-*-helvetica-bold-o-narrow--", (struct xfont*) NULL}, -- {"-*-new century schoolbook-medium-r-normal--", (struct xfont*) NULL}, -- {"-*-new century schoolbook-medium-i-normal--", (struct xfont*) NULL}, -- {"-*-new century schoolbook-bold-r-normal--", (struct xfont*) NULL}, -- {"-*-new century schoolbook-bold-i-normal--", (struct xfont*) NULL}, -- {"-*-palatino-medium-r-normal--", (struct xfont*) NULL}, -- {"-*-palatino-medium-i-normal--", (struct xfont*) NULL}, -- {"-*-palatino-bold-r-normal--", (struct xfont*) NULL}, -- {"-*-palatino-bold-i-normal--", (struct xfont*) NULL}, -- {"-*-symbol-medium-r-normal--", (struct xfont*) NULL}, -- {"-*-itc zapf chancery-medium-i-normal--", (struct xfont*) NULL}, -- {"-*-itc zapf dingbats-*-*-*--", (struct xfont*) NULL}, -+ {"-urw-nimbus roman no9 l-medium-r-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus roman no9 l-medium-i-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus roman no9 l-bold-r-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus roman no9 l-bold-i-normal--", (struct xfont*) NULL}, -+ {"-urw-urw gothic l-medium-r-normal--", (struct xfont*) NULL}, -+ {"-urw-urw gothic l-medium-o-normal--", (struct xfont*) NULL}, -+ {"-urw-urw gothic l-semibold-r-normal--", (struct xfont*) NULL}, -+ {"-urw-urw gothic l-semibold-o-normal--", (struct xfont*) NULL}, -+ {"-urw-urw bookman l-medium-r-normal--", (struct xfont*) NULL}, -+ {"-urw-urw bookman l-medium-i-normal--", (struct xfont*) NULL}, -+ {"-urw-urw bookman l-bold-r-normal--", (struct xfont*) NULL}, -+ {"-urw-urw bookman l-bold-i-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus mono l-medium-r-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus mono l-medium-o-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus mono l-bold-r-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus mono l-bold-o-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus sans l-medium-r-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus sans l-medium-i-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus sans l-bold-r-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus sans l-bold-i-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus sans l-medium-r-condensed--", (struct xfont*) NULL}, -+ {"-urw-nimbus sans l-medium-i-condensed--", (struct xfont*) NULL}, -+ {"-urw-nimbus sans l-bold-r-condensed--", (struct xfont*) NULL}, -+ {"-urw-nimbus sans l-bold-i-condensed--", (struct xfont*) NULL}, -+ {"-urw-century schoolbook l-medium-r-normal--", (struct xfont*) NULL}, -+ {"-urw-century schoolbook l-medium-i-normal--", (struct xfont*) NULL}, -+ {"-urw-century schoolbook l-bold-r-normal--", (struct xfont*) NULL}, -+ {"-urw-century schoolbook l-bold-i-normal--", (struct xfont*) NULL}, -+ {"-urw-urw palladio l-medium-r-normal--", (struct xfont*) NULL}, -+ {"-urw-urw palladio l-medium-i-normal--", (struct xfont*) NULL}, -+ {"-urw-urw palladio l-bold-r-normal--", (struct xfont*) NULL}, -+ {"-urw-urw palladio l-bold-i-normal--", (struct xfont*) NULL}, -+ {"-urw-standard symbols l-medium-r-normal--", (struct xfont*) NULL}, -+ {"-urw-urw chancery l-medium-i-normal--", (struct xfont*) NULL}, -+ {"-urw-dingbats-medium-r-normal--", (struct xfont*) NULL}, - }; - - /* Use the following font names for any font that doesn't exist in the table above. diff --git a/xfig-i18n.patch b/xfig-i18n.patch deleted file mode 100644 index 54c4b54..0000000 --- a/xfig-i18n.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- xfig-3.2.8b/app-defaults/Fig.in.orig 2023-07-01 12:02:17.194898128 +0200 -+++ xfig-3.2.8b/app-defaults/Fig.in 2023-07-01 12:02:50.441384683 +0200 -@@ -180,9 +180,9 @@ Fig.save8bit: true - - ! If xfig is compiled with I18N option, you may want to uncomment following lines. - ! --!Fig.international: true --!Fig.localeEncoding: true --!Fig.alwaysUseFontSet: true -+Fig.international: true -+Fig.localeEncoding: true -+Fig.alwaysUseFontSet: true - - ! Note that you shouldn't remove the following "Fig*international: false". - ! It must be there to cancel any *international: true that may defined via xrdb. ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xfig.git/commitdiff/81b5f8e309fb52ab3c15921813a8979c9e458ab5 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit