public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Hans de Goede <jwrdegoede@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/xfig] epel10: - Also compile a version against Xaw3d instead of plain Xaw, available in
Date: Sat, 30 May 2026 14:25:30 GMT [thread overview]
Message-ID: <178015113083.1.6831467211357431804.rpms-xfig-f4225651698d@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/xfig
Branch : epel10
Commit : f4225651698d1df0e1a7313fc9ca13f69cf08c49
Author : Hans de Goede <jwrdegoede@fedoraproject.org>
Date : 2007-11-16T20:56:21+00:00
Stats : +202/-10 in 7 file(s)
URL : https://src.fedoraproject.org/rpms/xfig/c/f4225651698d1df0e1a7313fc9ca13f69cf08c49?branch=epel10
Log:
- Also compile a version against Xaw3d instead of plain Xaw, available in
the new xfig-Xaw3d package
- Various specfile cleanups for packaging guidelines compliance
- Remove spurious executable permissions on various files (bz 247424)
- Apply patch fixing problems with xfig not finding fonts (bz 210278)
---
diff --git a/xfig-3.2.5-color-resources.patch b/xfig-3.2.5-color-resources.patch
new file mode 100644
index 0000000..4c7d690
--- /dev/null
+++ b/xfig-3.2.5-color-resources.patch
@@ -0,0 +1,39 @@
+diff -up xfig.3.2.5/Fig-color.ad~ xfig.3.2.5/Fig-color.ad
+--- xfig.3.2.5/Fig-color.ad~ 2007-11-16 13:47:45.000000000 +0100
++++ xfig.3.2.5/Fig-color.ad 2007-11-16 13:47:52.000000000 +0100
+@@ -93,7 +93,7 @@ Fig*sideruler.background: gray95
+
+ Fig*FigList*background: gray95
+ Fig*List*background: gray95
+-Fig*Scrollbar.background: gray95
++! Fig*Scrollbar.background: gray95
+
+ Fig*Label.background: gray80
+ Fig*ind_box.background: gray80
+@@ -104,8 +104,8 @@ Fig*button_form.update*foreground: red
+ Fig*upd_ctrl_form.upd_ctrl_btns*shadowWidth: 2
+
+ !##### Shadows
+-Fig*shadowWidth: 1
+-Fig*Label.shadowWidth: 1
++!Fig*shadowWidth: 1
++!Fig*Label.shadowWidth: 1
+ Fig*horizontal.shadowWidth: 2
+ Fig*Scrollbar.shadowWidth: 2
+ ! no shadows for update indicators
+@@ -136,3 +136,15 @@ Fig*color_box*topShadowPixel: gray80
+
+ Fig*toggle*bottomShadowPixel: gray80
+ Fig*toggle*topShadowPixel: gray50
++
++! repare damage done to scrollbar shadows non color resources file
++
++Fig*horizontal.topShadowPixel: gray95
++Fig*horizontal.bottomShadowPixel: gray50
++Fig*horizontal.topShadow: gray95
++Fig*horizontal.bottomShadow: gray50
++
++Fig*Scrollbar.topShadow: gray95
++Fig*Scrollbar.bottomShadow: gray50
++Fig*Scrollbar.topShadowPixel: gray95
++Fig*Scrollbar.bottomShadowPixel: gray50
diff --git a/xfig-3.2.5-enable-Xaw3d.patch b/xfig-3.2.5-enable-Xaw3d.patch
new file mode 100644
index 0000000..7f6e1a0
--- /dev/null
+++ b/xfig-3.2.5-enable-Xaw3d.patch
@@ -0,0 +1,34 @@
+diff -up xfig.3.2.5/Imakefile.no-Xaw3d xfig.3.2.5/Imakefile
+--- xfig.3.2.5/Imakefile.no-Xaw3d 2007-11-16 10:38:18.000000000 +0100
++++ xfig.3.2.5/Imakefile 2007-11-16 10:38:49.000000000 +0100
+@@ -50,16 +50,16 @@ XAPPLOADDIR = /usr/share/X11/app-default
+ XCOMM Uncomment the following definition for XAW3D if you want to use
+ XCOMM the 3d Athena Widget Set (highly recommended!)
+
+-XCOMM #define XAW3D
++#define XAW3D
+
+ XCOMM Uncomment the following if you have David Hawkey's Xaw3D version 1.5E which has
+ XCOMM some new features, including "Tips", which replace xfig's "help balloons"
+
+-XCOMM #define XAW3D1_5E
++#define XAW3D1_5E
+
+ #ifdef XAW3D1_5E
+ DUSEXAW3D = -DXAW3D -DXAW3D1_5E
+- XAWLIB = -lXaw3d15e
++ XAWLIB = -lXaw3d
+ #else
+ XAW_SRC = w_menuentry.c SmeCascade.c SmeBSB.c SimpleMenu.c
+ XAW_OBJ = w_menuentry.o SmeCascade.o SmeBSB.o SimpleMenu.o
+diff -up xfig.3.2.5/w_library.c.no-Xaw3d xfig.3.2.5/w_library.c
+--- xfig.3.2.5/w_library.c.no-Xaw3d 2006-04-03 18:27:30.000000000 +0200
++++ xfig.3.2.5/w_library.c 2007-11-16 10:38:18.000000000 +0100
+@@ -1029,6 +1029,7 @@ make_library_menu(Widget parent, char *n
+ Widget menu, entry;
+ #ifndef XAW3D1_5E
+ Widget submenu;
++#else
+ char submenu_name[200];
+ #endif /* XAW3D1_5E */
+ char menu_name[200];
diff --git a/xfig-3.2.5-quiet.patch b/xfig-3.2.5-quiet.patch
new file mode 100644
index 0000000..00803fc
--- /dev/null
+++ b/xfig-3.2.5-quiet.patch
@@ -0,0 +1,12 @@
+diff -up xfig.3.2.5/w_drawprim.c~ xfig.3.2.5/w_drawprim.c
+--- xfig.3.2.5/w_drawprim.c~ 2007-11-16 13:21:55.000000000 +0100
++++ xfig.3.2.5/w_drawprim.c 2007-11-16 13:21:55.000000000 +0100
+@@ -512,7 +512,7 @@ void init_gc(void)
+ gccache[ERASE] = makegc(ERASE, x_fg_color.pixel, x_bg_color.pixel);
+ gccache[INV_PAINT] = makegc(INV_PAINT, x_fg_color.pixel, x_bg_color.pixel);
+ /* parse any grid color spec */
+-fprintf(stderr,"color = '%s'\n",appres.grid_color);
++/* fprintf(stderr,"color = '%s'\n",appres.grid_color); */
+ XParseColor(tool_d, tool_cm, appres.grid_color, &tmp_color);
+ if (XAllocColor(tool_d, tool_cm, &tmp_color)==0) {
+ fprintf(stderr,"Can't allocate color for grid \n");
diff --git a/xfig-3.2.5-urwfonts.patch b/xfig-3.2.5-urwfonts.patch
new file mode 100644
index 0000000..7bc766b
--- /dev/null
+++ b/xfig-3.2.5-urwfonts.patch
@@ -0,0 +1,79 @@
+--- xfig.3.2.4/u_fonts.c 2002-09-09 13:36:58.000000000 -0400
++++ new-xfig-3.2.4/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 condensed-medium-r-condensed--", (struct xfont*) NULL},
++ {"-urw-nimbus sans l condensed-medium-i-condensed--", (struct xfont*) NULL},
++ {"-urw-nimbus sans l condensed-bold-r-condensed--", (struct xfont*) NULL},
++ {"-urw-nimbus sans l condensed-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.desktop b/xfig.desktop
index 5827357..3fd49e7 100644
--- a/xfig.desktop
+++ b/xfig.desktop
@@ -1,7 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
-Categories=Application;Graphics;X-Red-Hat-Extra;
-X-Desktop-File-Install-Version=0.2
+Categories=Graphics;
MimeType=image/fig;image/x-xfig;
Exec=xfig
Icon=xfig
@@ -17,7 +16,7 @@ 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[el]=Xfig
Comment[eo]=Desegnilo "Xfig"
Comment[es]=Aplicación de diseño vectorial (objetos)
Comment[et]=XFig joonistusprogramm
@@ -44,5 +43,5 @@ Comment[sr]=Xfig prgram za vektorsko crtanje
Comment[sv]=Xfig ritprogram
Comment[ta]=Xfig Ũþø ÀÂýÀ¡Î
Comment[tr]=Xfig çizim uygulaması
-Comment[uk]=Програма для утворення зображень Xfig
+Comment[uk]=Xfig
Comment[zh_CN.GB2312]=Xfig 绘图应用程序
diff --git a/xfig.sh b/xfig.sh
new file mode 100644
index 0000000..3df7cea
--- /dev/null
+++ b/xfig.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ -x /usr/bin/xfig-Xaw3d ]; then
+ cd /usr/share/X11/app-defaults
+ xrdb -merge Fig-color 2> /dev/null
+ cd - > /dev/null
+ exec xfig-Xaw3d "$@"
+else
+ exec xfig-plain "$@"
+fi
diff --git a/xfig.spec b/xfig.spec
index f7bf385..1b2be0d 100644
--- a/xfig.spec
+++ b/xfig.spec
@@ -35,6 +35,7 @@ BuildRequires: libXmu-devel
BuildRequires: libXpm-devel
BuildRequires: libXt-devel
BuildRequires: Xaw3d-devel
+BuildRequires: desktop-file-utils
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -90,7 +91,7 @@ Files common to both the plain Xaw and the Xaw3d version of xfig.
%patch12 -p1 -b .quiet
%patch13 -p1 -b .urw
ln -nfs Doc/xfig.man xfig.man
-chmod -x `find -type f`
+find -type f -print0 | xargs -0 chmod -x
rm `find Doc -name '*.orig'` Doc/html/*.save Doc/html/images/sav1a0.tmp
sed -i 's/\r//g' Doc/html/index.html
for i in Doc/html/{new_features,new_features.3.2.4,bugs_fixed.3.2.4}.html; do
@@ -124,11 +125,14 @@ mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-plain
install -p -m 755 %{SOURCE3} %{buildroot}%{_bindir}/%{name}
install -m 755 %{name}-Xaw3d %{buildroot}%{_bindir}
-mkdir -p %{buildroot}%{_datadir}/pixmaps \
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps \
%{buildroot}%{_datadir}/applications
-install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps
-install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/applications/net-xfig.desktop
+install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
+
+desktop-file-install --vendor fedora \
+ --dir %{buildroot}%{_datadir}/applications \
+ %{SOURCE2}
# remove app-defaults symlink which gets installed
rm %{buildroot}%{_prefix}/lib*/X11/app-defaults
@@ -138,6 +142,21 @@ rm %{buildroot}%{_prefix}/lib*/X11/app-defaults
rm -rf %{buildroot}
+%post common
+update-desktop-database &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun common
+update-desktop-database &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
%files
%defattr(-,root,root,-)
%{_bindir}/%{name}-plain
@@ -152,9 +171,9 @@ rm -rf %{buildroot}
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_mandir}/*/*
-%{_datadir}/pixmaps/%{name}.png
%{app_defaults_dir}/*
-%{_datadir}/applications/*
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%changelog
next reply other threads:[~2026-05-30 14:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-30 14:25 Hans de Goede [this message]
2026-05-30 14:25 [rpms/xfig] epel10: - Also compile a version against Xaw3d instead of plain Xaw, available in Hans de Goede
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178015113083.1.6831467211357431804.rpms-xfig-f4225651698d@fedoraproject.org \
--to=jwrdegoede@fedoraproject.org \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox