Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

Switch to upstream appdata/metainfo and desktop file
Drop all patches (all upstreamed)
Resolves: rhbz#2341567
Resolves: rhbz#2385740

.gitignore

@@ -7,3 +7,7 @@ xfig.3.2.5b.full.tar.gz
 /xfig-3.2.6a.tar.xz
 /xfig-3.2.7a.tar.xz
 /xfig-3.2.7b.tar.xz
+/xfig-3.2.8a.tar.xz
+/xfig-3.2.8b.tar.xz
+/xfig-3.2.9.tar.xz
+/mcj-xfig-ce9782a404b6a527393839369aac13dcfb66ff16.zip

sources

@@ -1,2 +1,2 @@
-SHA512 (xfig-3.2.7b.tar.xz) = f3396ebf8a5961909e58b05b60117fd7bbc8c24fabbd47f108eaea9586f4180af572faffe077b1a5dcbf669ebd69b1c2791f302c126dea62a44aa1592de66f73
+SHA512 (mcj-xfig-ce9782a404b6a527393839369aac13dcfb66ff16.zip) = a0d483d77edb16d869596a53f89783efd232832b4447089227f34ff552836209f595e5cc9f179242386e85f6f8378607433913720aab29b9d69a2a4007404b47
 SHA512 (xfig-icons.tar.gz) = f7d9b314d57994d479712740dcac4a2c924ddacea028db1c6cdeef36fb7d846885c45d21499f7453c750c265eeb5877e4b032454911ce91667ccc550cb2112e5

xfig-3.2.5-urwfonts.patch

@@ -1,79 +0,0 @@
---- xfig.3.2.4/src/u_fonts.c	2002-09-09 13:36:58.000000000 -0400
-+++ xfig-3.2.4/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.

xfig-3.2.5a-default-apps.patch

@@ -1,23 +0,0 @@
-diff -up xfig-3.2.6/app-defaults/Fig.in~ xfig-3.2.6/app-defaults/Fig.in
---- xfig-3.2.6/app-defaults/Fig.in~	2016-07-23 23:12:46.000000000 +0200
-+++ xfig-3.2.6/app-defaults/Fig.in	2016-08-11 12:36:56.550555744 +0200
-@@ -10,6 +10,10 @@ Fig.version:			@VERSION@
- 
- ! 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
- 
-@@ -38,7 +38,7 @@ Fig.pdfviewer:			xdg-open %f
- ! Spell check program - put your favorite spelling check program here.
- !		It must write the misspelled words to standard output.
- 
--Fig.spellcheckcommand:		spell %f
-+Fig.spellcheckcommand:		enchant -l %f
- 
- ! delay before spinner automatically counts when pressed (milliseconds)
- Fig.spinner_delay:		1000

xfig.appdata.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component type="desktop">
-  <id>xfig.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>MIT</project_license>
-  <name>Xfig</name>
-  <summary>Xfig drawing application</summary>
-  <description>
-    <p>
-      Xfig is an X Window System tool for creating basic vector graphics,
-      including bezier curves, lines, rulers and more.  The resulting
-      graphics can be saved, printed on PostScript printers or converted to
-      a variety of other formats (e.g., X11 bitmaps, Encapsulated
-      PostScript, LaTeX).
-    </p>
-    <p>
-      You should install xfig if you need a simple program to create vector
-      graphics.
-    </p>
-  </description>
-  <url type="homepage">https://en.wikipedia.org/wiki/Xfig</url>
-  <url type="help">http://epb.lbl.gov/xfig/</url>
-  <screenshots>
-    <screenshot type="default">http://mcj.sourceforge.net/images/screen-image.png</screenshot>
-    <screenshot>http://mcj.sourceforge.net/images/library-icon-view.png</screenshot>
-    <screenshot>http://mcj.sourceforge.net/images/file-panel.png</screenshot>
-    <screenshot>http://mcj.sourceforge.net/images/color-panel.png</screenshot>
-    <screenshot>http://mcj.sourceforge.net/images/dimline-panel.png</screenshot>
-  </screenshots>
-  <updatecontact>jwrdegoede_at_fedoraproject.org</updatecontact>
-</component>

xfig.desktop

@@ -1,49 +0,0 @@
-[Desktop Entry]
-Categories=Graphics;
-MimeType=image/fig;image/x-xfig;
-Exec=/usr/bin/xfig %f
-Icon=xfig
-Type=Application
-Name=Xfig
-Name[eo]=XDesegno
-Name[et]=Ffig
-Name[ja]=xfig
-Name[no]=X-figur
-Comment=Xfig drawing application
-Comment[bg]=Xfig ïðîãðàìà çà ðèñóâàíå
-Comment[ca]=Aplicació de dibuix Xfig
-Comment[cs]=Aplikace pro kreslení vektorových obrázků
-Comment[da]=Xfig tegneprogram
-Comment[de]=Xfig-Zeichenprogramm
-Comment[el]=Xfig
-Comment[eo]=Desegnilo "Xfig"
-Comment[es]=Aplicación de diseño vectorial (objetos)
-Comment[et]=XFig joonistusprogramm
-Comment[fi]=Xfig vektoripiirto-ohjelma
-Comment[fr]=Programme de dessin objet Xfig
-Comment[gl]=Aplicación de debuxo (obxectos)
-Comment[he]=Xfig רויצה םושיי
-Comment[hr]=Program za crtanje
-Comment[hu]=Rajzolóprogram
-Comment[is]=Hlutbundið teikniforrit
-Comment[it]=Applicazione di disegno Xfig
-Comment[lt]=Xfig braižymo programa
-Comment[mk]=Едноставна апликација за векторско цртање
-Comment[nl]=Xfig-tekenprogramma
-Comment[no]=Xfig-tegneprogram
-Comment[no_NY]=Teikneprogrammet Xfig
-Comment[pl]=Aplikacja do kreślenia
-Comment[pt]=Aplicação de desenho
-Comment[ro]=Program de desenare vectorială
-Comment[ru]=Приложения для рисования векторной графики
-Comment[sk]=Xfig aplikácia pre kreslenie vektorových obrázkov
-Comment[sl]=Program za risanje Xfig
-Comment[sr]=Xfig prgram za vektorsko crtanje
-Comment[sv]=Xfig ritprogram
-Comment[ta]=Xfig Ũþø ÀÂýÀ¡Î
-Comment[tr]=Xfig çizim uygulaması
-Comment[uk]=Xfig
-Comment[zh_CN.GB2312]=Xfig 绘图应用程序
-Terminal=false
-StartupNotify=false
-Keywords=vector;graphics;figure;drawing;

xfig.rpmlintrc

@@ -1,2 +1,5 @@
-addFilter("W: spelling-error.*")
 addFilter("W: invalid-url Source1")
+addFilter("W: no-%check-section")
+addFilter("W: files-duplicate /usr/share/")
+addFilter("E: non-executable-script /usr/share/xfig/Libraries/Maps/")
+addFilter("E: spelling-error")

xfig.spec

@@ -1,26 +1,27 @@
-%global app_defaults_dir %{_datadir}/X11/app-defaults
+%global commit ce9782a404b6a527393839369aac13dcfb66ff16
+%global commitdate 20250317
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Summary: An X Window System tool for drawing basic vector graphics
 Name: xfig
-Version: 3.2.7b
-Release: 3%{?dist}
+Version: 3.2.9a
+Release: 3.%{commitdate}git%{shortcommit}%{?dist}
 License: MIT
 URL:     https://en.wikipedia.org/wiki/Xfig
-Source0: http://downloads.sourceforge.net/mcj/xfig-%{version}.tar.xz
+#Source0: http://downloads.sourceforge.net/mcj/xfig-%%{version}.tar.xz
+Source0: https://sourceforge.net/code-snapshots/git/m/mc/mcj/xfig.git/mcj-xfig-%{commit}.zip
 Source1: xfig-icons.tar.gz
-Source2: xfig.desktop
-Source3: xfig.appdata.xml
-
-Patch0: xfig-3.2.5a-default-apps.patch
-Patch1: xfig-3.2.5-urwfonts.patch
 
+BuildRequires: make
 BuildRequires: gcc libtool
 BuildRequires: transfig
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
+BuildRequires: libtiff-devel
 BuildRequires: libICE-devel
 BuildRequires: libSM-devel
 BuildRequires: libX11-devel
+BuildRequires: libXft-devel
 BuildRequires: libXaw-devel
 BuildRequires: libXext-devel
 BuildRequires: libXi-devel
@@ -29,14 +30,13 @@ BuildRequires: libXpm-devel
 BuildRequires: libXt-devel
 BuildRequires: Xaw3d-devel
 BuildRequires: man2html-core ImageMagick
-BuildRequires: desktop-file-utils libappstream-glib
 # For eps preview generation
 Requires: ghostscript
 Requires: transfig
 # Used in the UI
 Requires: xorg-x11-fonts-misc
 # For scalable fonts, inc. Bookman, New Century Schoolbook and Palatino
-Requires: urw-base35-bookman-fonts
+Requires: urw-base35-fonts-legacy
 
 # We used to have seperate Xaw3d and non Xaw3d pkgs, now we only have Xaw3d
 Obsoletes: %{name}-common < %{version}-%{release}
@@ -58,7 +58,7 @@ graphics.
 
 
 %prep
-%autosetup -p1 -a 1
+%autosetup -p1 -a 1 -n mcj-xfig-%{commit}
 for i in doc/html/japanese/button_frame.fig doc/html/japanese/japanese.ps \
          doc/html/animate.js; do
   sed -i.orig 's/\r//' $i; touch -r $i.orig $i; rm $i.orig
@@ -86,28 +86,83 @@ convert %{name}32x32.xpm \
 convert %{name}64x64.xpm \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
-install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/appdata
-appstream-util validate-relax --nonet \
-  $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml
-
 
 %files
 %doc %{_docdir}/%{name}
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_mandir}/man1/%{name}.1*
-%{app_defaults_dir}/Fig
-%{_datadir}/appdata/%{name}.appdata.xml
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/X11/app-defaults/Fig
+%{_datadir}/metainfo/org.xfig.xfig.metainfo.xml
+%{_datadir}/applications/org.xfig.xfig.desktop
 %{_datadir}/icons/hicolor/??x??/apps/%{name}.png
 
 
 %changelog
-* Tue Jun 23 2020 Steve Traylen <steve.traylen@cern.ch> - 3.2.7b-3
-- Use explicit bookman fonts package
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.9a-3.20250317gitce9782a
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.9a-2.20250317gitce9782a
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Wed Aug 6 2025 Hans de Goede <hans@hansg.org> - 3.2.9a-1.20250317gitce9782a
+- Update to 3.2.9a + latest git changes to fix build with -std=c11
+- Switch to upstream appdata/metainfo and desktop file
+- Drop all patches (all upstreamed)
+- Resolves: rhbz#2341567
+- Resolves: rhbz#2385740
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.9-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.9-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.9-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Mon Feb 26 2024 Hans de Goede <hdegoede@redhat.com> - 3.2.9-4
+- Fix missing Dingbats and Symbol glyphs
+- Resolves: rhbz#2260359
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jan 18 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.2.9-2
+- Backport upstream patches for upstream 2 issues
+  - Fix exporting only active layers
+  - Sanitize a call to realloc (redhat #2252679)
+
+* Sat Aug 26 2023 Ranjan Maitra <aarem@fedoraproject.org> - 3.2.9-1
+- New upstream release 3.2.9
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.8b-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.8b-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.8b-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Oct 11 2021 Hans de Goede <hdegoede@redhat.com> - 3.2.8b-1
+- New upstream release 3.2.8b
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.8a-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Sat May 29 2021 Hans de Goede <hdegoede@redhat.com> - 3.2.8a-1
+- New upstream release 3.2.8a
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.7b-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.7b-4
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.7b-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.7b-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild