From 20f3d39db95318b16d316c7729db665f1aeb1dfa Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Wed, 10 Aug 2016 14:09:37 +0200 Subject: [PATCH] xfig: update to 3.2.6. --- srcpkgs/xfig/patches/xfig-3.2.4-redhat.patch | 31 --------------- .../patches/xfig-3.2.5-color-resources.patch | 39 ------------------- .../xfig/patches/xfig-3.2.5-urwfonts.patch | 4 +- ...g-fix_dash_list_for_different_styles.patch | 34 ---------------- srcpkgs/xfig/template | 38 +++++------------- 5 files changed, 11 insertions(+), 135 deletions(-) delete mode 100644 srcpkgs/xfig/patches/xfig-3.2.4-redhat.patch delete mode 100644 srcpkgs/xfig/patches/xfig-3.2.5-color-resources.patch delete mode 100644 srcpkgs/xfig/patches/xfig-fix_dash_list_for_different_styles.patch diff --git a/srcpkgs/xfig/patches/xfig-3.2.4-redhat.patch b/srcpkgs/xfig/patches/xfig-3.2.4-redhat.patch deleted file mode 100644 index da6f150b319..00000000000 --- a/srcpkgs/xfig/patches/xfig-3.2.4-redhat.patch +++ /dev/null @@ -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 diff --git a/srcpkgs/xfig/patches/xfig-3.2.5-color-resources.patch b/srcpkgs/xfig/patches/xfig-3.2.5-color-resources.patch deleted file mode 100644 index 4a716b541f1..00000000000 --- a/srcpkgs/xfig/patches/xfig-3.2.5-color-resources.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 -@@ -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 -@@ -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 -@@ -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/srcpkgs/xfig/patches/xfig-3.2.5-urwfonts.patch b/srcpkgs/xfig/patches/xfig-3.2.5-urwfonts.patch index 7bc766bd9e7..16957b30eef 100644 --- a/srcpkgs/xfig/patches/xfig-3.2.5-urwfonts.patch +++ b/srcpkgs/xfig/patches/xfig-3.2.5-urwfonts.patch @@ -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 +--- src/u_fonts.c ++++ src/u_fonts.c @@ -22,41 +22,41 @@ /* X11 font names */ diff --git a/srcpkgs/xfig/patches/xfig-fix_dash_list_for_different_styles.patch b/srcpkgs/xfig/patches/xfig-fix_dash_list_for_different_styles.patch deleted file mode 100644 index 7c5aaa94fa4..00000000000 --- a/srcpkgs/xfig/patches/xfig-fix_dash_list_for_different_styles.patch +++ /dev/null @@ -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 }; diff --git a/srcpkgs/xfig/template b/srcpkgs/xfig/template index b6688276a05..626dcf471cc 100644 --- a/srcpkgs/xfig/template +++ b/srcpkgs/xfig/template @@ -1,42 +1,22 @@ # Template file for 'xfig' pkgname=xfig -version=3.2.5c -revision=2 -wrksrc="${pkgname}.${version}" -patch_args="-Np1" -hostmakedepends="imake xorg-cf-files" +version=3.2.6 +revision=1 +build_style="gnu-configure" +configure_args="--without-xaw3d" makedepends="libpng-devel libjpeg-turbo-devel libXaw-devel libXi-devel" depends="gsfonts" short_desc="An interactive drawing tool" maintainer="Christian Neukirchen " license="MIT-like" homepage="http://www.xfig.org/" -distfiles="${SOURCEFORGE_SITE}/mcj/${pkgname}.${version}.full.tar.gz" -checksum=ea628f975b79ab175ab29220cc118274466497f6217f2989928317be2993a1f9 -nocross=yes +distfiles="${SOURCEFORGE_SITE}/mcj/${pkgname}-full-${version}.tar.xz" +checksum=086706635c747b1feb4adb5a1df10e4be67ebcb09dc7eb8e6df4a38f2cd110a6 post_extract() { - find . -type d -perm 0700 -print0 | xargs -0 chmod 0755 - find . -type f -perm 0700 -print0 | xargs -0 chmod 0644 - sed -i -e '/define XAW3D/s/^/XCOMM /' \ - -e '/USEINLINE/s/^XCOMM //' \ - -e '/define I18N/s/^XCOMM //' \ - -e '/XAW_INTERN/s/^XCOMM //' \ - Imakefile - sed -i 's/__FreeBSD__/__linux__/g' w_keyboard.c + sed -i 's/spell/aspell/' app-defaults/Fig.in } -do_configure() { - xmkmf -} -do_build() { - make ${makejobs} CCOPTIONS="$CFLAGS" LOCAL_LDFLAGS="$LDFLAGS" \ - LIBDIR=/usr/share XAPPLOADDIR=/usr/share/X11/app-defaults -} -do_install() { - make ${makejobs} DESTDIR="$DESTDIR" LIBDIR=/usr/share \ - MANDIR=/usr/share/man/man1 \ - XAPPLOADDIR=/usr/share/X11/app-defaults \ - install install.man install.libs - rm ${DESTDIR}/usr/share/app-defaults + +post_install() { vlicense README LICENSE }