Date: Thursday, September 22, 2016 @ 21:33:02 Author: arojas Revision: 276851
Update to 3.2.6 Added: xfig/trunk/xfig-aspell.patch Modified: xfig/trunk/PKGBUILD xfig/trunk/xfig-3.2.5-color-resources.patch xfig/trunk/xfig-3.2.5-urwfonts.patch Deleted: xfig/trunk/xfig-3.2.4-redhat.patch xfig/trunk/xfig-fix_dash_list_for_different_styles.patch -----------------------------------------------+ PKGBUILD | 60 +++++++------------- xfig-3.2.4-redhat.patch | 31 ---------- xfig-3.2.5-color-resources.patch | 70 ++++++++++++------------ xfig-3.2.5-urwfonts.patch | 4 - xfig-aspell.patch | 11 +++ xfig-fix_dash_list_for_different_styles.patch | 34 ----------- 6 files changed, 70 insertions(+), 140 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-09-22 21:30:27 UTC (rev 276850) +++ PKGBUILD 2016-09-22 21:33:02 UTC (rev 276851) @@ -2,64 +2,48 @@ # Maintainer: Eric BĂ©langer <e...@archlinux.org> pkgname=xfig -pkgver=3.2.5c -pkgrel=3 +pkgver=3.2.6 +pkgrel=1 pkgdesc="An interactive drawing tool" arch=('i686' 'x86_64') -url="http://www.xfig.org/userman/" +url="http://mcj.sourceforge.net/" license=('custom') -depends=('libpng' 'libjpeg' 'libxaw' 'libxi' 'desktop-file-utils' 'gsfonts') -makedepends=('imake') -optdepends=('transfig: to use the frontend to convert fig files') +depends=('libjpeg' 'xaw3d' 'gsfonts') +optdepends=('fig2dev: to use the frontend to convert fig files') options=('!makeflags' '!emptydirs') -source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.full.tar.gz - xfig-3.2.4-redhat.patch xfig-3.2.5-color-resources.patch - xfig-3.2.5-urwfonts.patch xfig-fix_dash_list_for_different_styles.patch - LICENSE) -sha1sums=('47d31dd9ad46819732ab74db340e11489db2c646' - '926ad99c7221baa4aa9e9737722958860b2700fc' - '45e7fb80193825b088d798089aeade2e1729c9ac' - 'e595ccdbe293ea0fdecbf59a2192ae57ced2c8eb' - '6aa98ab4497c30d18b4d0599f9d943bf78991246' +source=(http://downloads.sourceforge.net/mcj/${pkgname}-${pkgver}.tar.xz + xfig-aspell.patch xfig-3.2.5-color-resources.patch + xfig-3.2.5-urwfonts.patch LICENSE) +sha1sums=('10872f47f0da53d7dc5e30507a8520bebf32068a' + 'a57fcc3c8396d58b19061f9cdd93beea728e38e5' + 'dd41e0a007bb74b74e1af50b6b04aa6aec61ab22' + 'a11af0a4edb7991fb81b6a2ff12fd33203a9dc45' '31edf4cfab708820ea3f114d095dfef5aa88e5aa') prepare() { - cd ${pkgname}.${pkgver} - patch -p1 -i "${srcdir}/xfig-3.2.4-redhat.patch" + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}/xfig-aspell.patch" patch -p1 -i "${srcdir}/xfig-3.2.5-color-resources.patch" patch -p1 -i "${srcdir}/xfig-3.2.5-urwfonts.patch" - patch -p1 -i "${srcdir}/xfig-fix_dash_list_for_different_styles.patch" - - sed -i -e 's|X11R6/||' -e 's|image/x-xfig|image/fig;image/x-xfig|' xfig.desktop - echo -e "Categories=Application;Graphics;\nIcon=xfig" >> xfig.desktop - sed -i 's/#define XAW3D/XCOMM #define XAW3D/' Imakefile - sed -i 's/XCOMM USEINLINE/USEINLINE/' Imakefile - sed -i -e 's/XCOMM #define I18N/#define I18N/' \ - -e 's/XCOMM XAW_INTERN/XAW_INTERN/' Imakefile - chmod 755 Libraries - groff -mandoc -Thtml Doc/xfig.man > Doc/xfig_man.html } build() { - cd ${pkgname}.${pkgver} - xmkmf + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr make XFIGDOCDIR=/usr/share/doc/xfig LIBDIR=/usr/share \ XAPPLOADDIR=/usr/share/X11/app-defaults } package() { - cd ${pkgname}.${pkgver} + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" XFIGDOCDIR=/usr/share/doc/xfig LIBDIR=/usr/share \ - MANDIR=/usr/share/man/man1 XAPPLOADDIR=/usr/share/X11/app-defaults install.all - rm "${pkgdir}/usr/share/app-defaults" + MANDIR=/usr/share/man/man1 XAPPLOADDIR=/usr/share/X11/app-defaults install - find "${pkgdir}/usr/share/xfig/Libraries" -type f -exec chmod 0644 {} \; - find "${pkgdir}/usr/share/xfig/Libraries" -type d -exec chmod 0755 {} \; - find "${pkgdir}/usr/share/doc/xfig" -type f -exec chmod 0644 {} \; - find "${pkgdir}/usr/share/doc/xfig" -type d -exec chmod 0755 {} \; +# find "${pkgdir}/usr/share/xfig/Libraries" -type f -exec chmod 0644 {} \; +# find "${pkgdir}/usr/share/xfig/Libraries" -type d -exec chmod 0755 {} \; +# find "${pkgdir}/usr/share/doc/xfig" -type f -exec chmod 0644 {} \; +# find "${pkgdir}/usr/share/doc/xfig" -type d -exec chmod 0755 {} \; - install -D -m644 xfig.desktop "${pkgdir}/usr/share/applications/xfig.desktop" - install -D -m644 xfig.png "${pkgdir}/usr/share/pixmaps/xfig.png" install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } Deleted: xfig-3.2.4-redhat.patch =================================================================== --- xfig-3.2.4-redhat.patch 2016-09-22 21:30:27 UTC (rev 276850) +++ xfig-3.2.4-redhat.patch 2016-09-22 21:33:02 UTC (rev 276851) @@ -1,31 +0,0 @@ ---- xfig.3.2.4/Fig.ad.redhat 2002-12-19 01:05:41.000000000 +0100 -+++ xfig.3.2.4/Fig.ad 2003-05-06 11:45:15.000000000 +0200 -@@ -11,7 +11,7 @@ - Fig*AllowShellResize: false - - ! Image editor - can edit imported image --Fig.image_editor: xv -+Fig.image_editor: xdg-open - - ! name of ghostscript (not ghostview) - Fig.ghostscript: gs -@@ -20,16 +20,16 @@ - ! This is for viewing the xfig html reference. - ! For netscape, this command will open the help pages in a running netscape, - ! or start a new netscape if one isn't already running --Fig.browser: firefox -remote 'openFile(%f)' || firefox %f -+Fig.browser: xdg-open %f - - ! pdfviewer - put your favorite pdf viewer here. - ! This is for viewing the xfig how-to guide and man pages --Fig.pdfviewer: xpdf %f -+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: aspell %f - - ! delay before spinner automatically counts when pressed (milliseconds) - Fig.spinner_delay: 1000 Modified: xfig-3.2.5-color-resources.patch =================================================================== --- xfig-3.2.5-color-resources.patch 2016-09-22 21:30:27 UTC (rev 276850) +++ xfig-3.2.5-color-resources.patch 2016-09-22 21:33:02 UTC (rev 276851) @@ -1,39 +1,39 @@ diff -up xfig.3.2.5/Fig-color.bisque.ad~ xfig.3.2.5/Fig-color.bisque.ad ---- xfig.3.2.5/Fig-color.bisque.ad~ 2007-11-16 13:47:45.000000000 +0100 -+++ xfig.3.2.5/Fig-color.bisque.ad 2007-11-16 13:47:52.000000000 +0100 +--- xfig.3.2.5/app-defaults/Fig-color.bisque 2007-11-16 13:47:45.000000000 +0100 ++++ xfig.3.2.5/app-defaults/Fig-color.bisque 2007-11-16 13:47:52.000000000 +0100 @@ -72,7 +72,7 @@ - Fig*topruler.background: gray95 - Fig*sideruler.background: gray95 - Fig*List*background: gray95 --Fig*Scrollbar.background: gray95 -+! Fig*Scrollbar.background: gray95 - - Fig*cancel.background: navajowhite1 - Fig*dismiss.background: navajowhite1 + Fig*topruler.background: gray95 + Fig*sideruler.background: gray95 + Fig*List*background: gray95 +-Fig*Scrollbar.background: gray95 ++! Fig*Scrollbar.background: gray95 + + Fig*cancel.background: navajowhite1 + Fig*dismiss.background: navajowhite1 @@ -104,8 +104,8 @@ Fig*menu_divider.foreground: red - Fig*menu_divider.foreground: red - - !##### Shadows --Fig*shadowWidth: 2 --Fig*Label.shadowWidth: 1 -+! Fig*shadowWidth: 2 -+! Fig*Label.shadowWidth: 1 - Fig*horizontal.shadowWidth: 2 - Fig*Scrollbar.shadowWidth: 2 - ! no shadows for update indicators + Fig*menu_divider.foreground: red + + !##### Shadows +-Fig*shadowWidth: 2 +-Fig*Label.shadowWidth: 1 ++! Fig*shadowWidth: 2 ++! 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 + + 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 Modified: xfig-3.2.5-urwfonts.patch =================================================================== --- xfig-3.2.5-urwfonts.patch 2016-09-22 21:30:27 UTC (rev 276850) +++ xfig-3.2.5-urwfonts.patch 2016-09-22 21:33:02 UTC (rev 276851) @@ -1,5 +1,5 @@ ---- 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 +--- xfig.3.2.4/src/u_fonts.c 2002-09-09 13:36:58.000000000 -0400 ++++ new-xfig-3.2.4/src/u_fonts.c 2006-10-11 00:29:07.000000000 -0400 @@ -22,41 +22,41 @@ /* X11 font names */ Added: xfig-aspell.patch =================================================================== --- xfig-aspell.patch (rev 0) +++ xfig-aspell.patch 2016-09-22 21:33:02 UTC (rev 276851) @@ -0,0 +1,11 @@ +--- xfig.3.2.4/app-defaults/Fig 2002-12-19 01:05:41.000000000 +0100 ++++ xfig.3.2.4/app-defaults/Fig 2003-05-06 11:45:15.000000000 +0200 +@@ -34,7 +34,7 @@ + ! 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: aspell %f + + ! delay before spinner automatically counts when pressed (milliseconds) + Fig.spinner_delay: 1000 Deleted: xfig-fix_dash_list_for_different_styles.patch =================================================================== --- xfig-fix_dash_list_for_different_styles.patch 2016-09-22 21:30:27 UTC (rev 276850) +++ xfig-fix_dash_list_for_different_styles.patch 2016-09-22 21:33:02 UTC (rev 276851) @@ -1,34 +0,0 @@ ---- xfig.3.2.5c/w_drawprim.c 2012-10-17 00:14:09.000000000 +0200 -+++ xfig.3.2.5c/w_drawprim.c 2013-11-29 02:45:36.950448714 +0100 -@@ -1292,14 +1292,23 @@ void set_fill_gc(int fill_style, int op, - } - - --static unsigned char dash_list[16][2] = {{255, 255}, {255, 255}, -- {255, 255}, {255, 255}, -- {255, 255}, {255, 255}, -- {255, 255}, {255, 255}, -- {255, 255}, {255, 255}, -- {255, 255}, {255, 255}, -- {255, 255}, {255, 255}, -- {255, 255}, {255, 255}}; -+static unsigned char dash_list[16][8] = { -+ {255, 255, 255, 255, 255, 255, 255, 255}, -+ {255, 255, 255, 255, 255, 255, 255, 255}, -+ {255, 255, 255, 255, 255, 255, 255, 255}, -+ {255, 255, 255, 255, 255, 255, 255, 255}, -+ {255, 255, 255, 255, 255, 255, 255, 255}, -+ {255, 255, 255, 255, 255, 255, 255, 255}, -+ {255, 255, 255, 255, 255, 255, 255, 255}, -+ {255, 255, 255, 255, 255, 255, 255, 255}, -+ {255, 255, 255, 255, 255, 255, 255, 255}, -+ {255, 255, 255, 255, 255, 255, 255, 255}, -+ {255, 255, 255, 255, 255, 255, 255, 255}, -+ {255, 255, 255, 255, 255, 255, 255, 255}, -+ {255, 255, 255, 255, 255, 255, 255, 255}, -+ {255, 255, 255, 255, 255, 255, 255, 255}, -+ {255, 255, 255, 255, 255, 255, 255, 255}, -+ {255, 255, 255, 255, 255, 255, 255, 255}}; - - static int join_styles[3] = { JoinMiter, JoinRound, JoinBevel }; - static int cap_styles[3] = { CapButt, CapRound, CapProjecting };