[arch-commits] Commit in xfig/trunk (8 files)
Eric Bélanger
eric at nymeria.archlinux.org
Tue Sep 10 00:29:21 UTC 2013
Date: Tuesday, September 10, 2013 @ 02:29:19
Author: eric
Revision: 194014
upgpkg: xfig 3.2.5c-1
Upstream update, Add i18n support, Switch to upstream desktop file, Remove old patches
Modified:
xfig/trunk/PKGBUILD
xfig/trunk/xfig-3.2.5-color-resources.patch
Deleted:
xfig/trunk/xfig-3.2.5-fhs.patch
xfig/trunk/xfig-3.2.5-missing-protos.patch
xfig/trunk/xfig-3.2.5b-fix-eps-reading.patch
xfig/trunk/xfig-3.2.5b-libpng-1.5.patch
xfig/trunk/xfig.3.2.5-modularX.patch
xfig/trunk/xfig.desktop
-----------------------------------+
PKGBUILD | 42 +++++++++------------
xfig-3.2.5-color-resources.patch | 68 +++++++++++++++++-----------------
xfig-3.2.5-fhs.patch | 12 ------
xfig-3.2.5-missing-protos.patch | 11 -----
xfig-3.2.5b-fix-eps-reading.patch | 46 -----------------------
xfig-3.2.5b-libpng-1.5.patch | 70 ------------------------------------
xfig.3.2.5-modularX.patch | 28 --------------
xfig.desktop | 47 ------------------------
8 files changed, 53 insertions(+), 271 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-09-10 00:08:24 UTC (rev 194013)
+++ PKGBUILD 2013-09-10 00:29:19 UTC (rev 194014)
@@ -2,8 +2,8 @@
# Maintainer: Eric Bélanger <eric at archlinux.org>
pkgname=xfig
-pkgver=3.2.5b
-pkgrel=9
+pkgver=3.2.5c
+pkgrel=1
pkgdesc="An interactive drawing tool"
arch=('i686' 'x86_64')
url="http://www.xfig.org/userman/"
@@ -16,52 +16,48 @@
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-3.2.5-fhs.patch xfig-3.2.5-missing-protos.patch \
- xfig.3.2.5-modularX.patch xfig-3.2.5b-fix-eps-reading.patch \
- xfig-3.2.5b-libpng-1.5.patch LICENSE xfig.desktop)
-sha1sums=('0730d7e6bc217c0de02682efb0078821512bb542'
+ LICENSE)
+sha1sums=('47d31dd9ad46819732ab74db340e11489db2c646'
'926ad99c7221baa4aa9e9737722958860b2700fc'
- 'b7c03fb70066ff476a4039a8c0f8930c15edef68'
+ '45e7fb80193825b088d798089aeade2e1729c9ac'
'e595ccdbe293ea0fdecbf59a2192ae57ced2c8eb'
- '39bec6bac9746b643b05fd1286826113ede07ff6'
- 'bd76cd50be6a5789cfd6f182309cfd7056be04f3'
- 'a1285f4e61ad2eec040460ab03e8022098e7f78e'
- '12a64ddaf65a73e23ef74f31483515a0e262768c'
- '83032eb61c8dc96d5fc509a1ce632528457d4598'
- '31edf4cfab708820ea3f114d095dfef5aa88e5aa'
- '9011b8fa6143e37525b28cc9800a3bf2d6b008d2')
+ '31edf4cfab708820ea3f114d095dfef5aa88e5aa')
prepare() {
cd ${pkgname}.${pkgver}
patch -p1 < ../xfig-3.2.4-redhat.patch
- patch -p1 < ../xfig-3.2.5-fhs.patch
- patch -p1 < ../xfig.3.2.5-modularX.patch
patch -p1 < ../xfig-3.2.5-color-resources.patch
patch -p1 < ../xfig-3.2.5-urwfonts.patch
- patch -p1 < ../xfig-3.2.5-missing-protos.patch
- patch -p1 < ../xfig-3.2.5b-fix-eps-reading.patch
- patch -p1 < ../xfig-3.2.5b-libpng-1.5.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
- make DOCDIR=/usr/share/doc
+ make XFIGDOCDIR=/usr/share/doc/xfig LIBDIR=/usr/share \
+ XAPPLOADDIR=/usr/share/X11/app-defaults
}
package() {
cd ${pkgname}.${pkgver}
- make DESTDIR="${pkgdir}" DOCDIR=/usr/share/doc install.all
- rm "${pkgdir}/usr/lib/X11/app-defaults"
+ 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"
+
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.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"
}
Modified: xfig-3.2.5-color-resources.patch
===================================================================
--- xfig-3.2.5-color-resources.patch 2013-09-10 00:08:24 UTC (rev 194013)
+++ xfig-3.2.5-color-resources.patch 2013-09-10 00:29:19 UTC (rev 194014)
@@ -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
-@@ -93,7 +93,7 @@ Fig*sideruler.background: gray95
- 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
+@@ -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
+ 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
Deleted: xfig-3.2.5-fhs.patch
===================================================================
--- xfig-3.2.5-fhs.patch 2013-09-10 00:08:24 UTC (rev 194013)
+++ xfig-3.2.5-fhs.patch 2013-09-10 00:29:19 UTC (rev 194014)
@@ -1,12 +0,0 @@
---- xfig.3.2.5/Imakefile.fhs 2006-10-11 01:19:22.000000000 +0200
-+++ xfig.3.2.5/Imakefile 2007-04-16 14:04:45.000000000 +0200
-@@ -169,8 +169,7 @@
- XFIGLIBDIR = $(LIBDIR)/xfig
-
- XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
--XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
--XFIGDOCDIR = /usr/local/xfig/doc
-+XFIGDOCDIR = $(DOCDIR)/xfig
-
- XCOMM MANDIR tells where the standard man pages should go (no need to change it
- XCOMM if you want the man pages installed in the standard place on your system
Deleted: xfig-3.2.5-missing-protos.patch
===================================================================
--- xfig-3.2.5-missing-protos.patch 2013-09-10 00:08:24 UTC (rev 194013)
+++ xfig-3.2.5-missing-protos.patch 2013-09-10 00:29:19 UTC (rev 194014)
@@ -1,11 +0,0 @@
-diff -up xfig.3.2.5/u_draw.c~ xfig.3.2.5/u_draw.c
---- xfig.3.2.5/u_draw.c~ 2008-04-03 15:58:23.000000000 +0200
-+++ xfig.3.2.5/u_draw.c 2008-04-03 15:58:23.000000000 +0200
-@@ -43,6 +43,7 @@
- #include "w_zoom.h"
- #include "u_redraw.h"
- #include "w_cursor.h"
-+#include <X11/ImUtil.h>
-
- static Boolean add_point(int x, int y);
- static void init_point_array(void);
Deleted: xfig-3.2.5b-fix-eps-reading.patch
===================================================================
--- xfig-3.2.5b-fix-eps-reading.patch 2013-09-10 00:08:24 UTC (rev 194013)
+++ xfig-3.2.5b-fix-eps-reading.patch 2013-09-10 00:29:19 UTC (rev 194014)
@@ -1,46 +0,0 @@
-diff -ur xfig.3.2.5b/f_readeps.c xfig.3.2.5b.new/f_readeps.c
---- xfig.3.2.5b/f_readeps.c 2009-03-30 17:52:18.000000000 +0200
-+++ xfig.3.2.5b.new/f_readeps.c 2010-11-25 16:53:54.328247928 +0100
-@@ -252,12 +252,13 @@
- {
- char buf[300];
- FILE *tmpfp, *pixfile, *gsfile;
-- char *psnam, *driver;
-+ char *driver;
- int status, wid, ht, nbitmap, fd;
- char tmpfile[PATH_MAX],
- pixnam[PATH_MAX],
- errnam[PATH_MAX],
-- gscom[2 * PATH_MAX];
-+ gscom[2 * PATH_MAX],
-+ psnam[PATH_MAX];
-
- wid = urx - llx;
- ht = ury - lly;
-@@ -307,19 +308,14 @@
- /* for color, use pcx */
- driver = "pcx256";
- }
-- /* avoid absolute paths (for Cygwin with gswin32) by changing directory */
-- if (tmpfile[0] == '/') {
-- psnam = strrchr(tmpfile, '/');
-- *psnam = 0;
-- sprintf(gscom, "cd \"%s/\";", tmpfile);
-- *psnam++ = '/'; /* Restore name for unlink() below */
-- } else {
-- psnam = tmpfile;
-- gscom[0] = '\0';
-+ /* Canonicalize the eps file filename, needed to "defeat" -dSAFER */
-+ if (!realpath(tmpfile, psnam)) {
-+ file_msg("Cannot canonicalize %s: %s\n", tmpfile, strerror(errno));
-+ return False;
- }
-- sprintf(&gscom[strlen(gscom)],
-- "%s -r72x72 -dSAFER -sDEVICE=%s -g%dx%d -sOutputFile=%s -q - > %s 2>&1",
-- appres.ghostscript, driver, wid, ht, pixnam, errnam);
-+ sprintf(gscom,
-+ "%s -r72x72 -sDEVICE=%s -g%dx%d -sOutputFile=%s -dDELAYSAFER -c '<< /PermitFileReading [ (%s)] >> setuserparams .locksafe' -dSAFER -q - > %s 2>&1",
-+ appres.ghostscript, driver, wid, ht, pixnam, psnam, errnam);
- if (appres.DEBUG)
- fprintf(stderr,"calling: %s\n",gscom);
- if ((gsfile = popen(gscom, "w")) == 0) {
Deleted: xfig-3.2.5b-libpng-1.5.patch
===================================================================
--- xfig-3.2.5b-libpng-1.5.patch 2013-09-10 00:08:24 UTC (rev 194013)
+++ xfig-3.2.5b-libpng-1.5.patch 2013-09-10 00:29:19 UTC (rev 194014)
@@ -1,70 +0,0 @@
-Index: xfig.3.2.5b/f_readpng.c
-===================================================================
---- xfig.3.2.5b.orig/f_readpng.c
-+++ xfig.3.2.5b/f_readpng.c
-@@ -73,7 +73,7 @@ read_png(FILE *file, int filetype, F_pic
- }
-
- /* set long jump recovery here */
-- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png_ptr))) {
- /* if we get here there was a problem reading the file */
- png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
- close_picfile(file,filetype);
-@@ -90,15 +90,17 @@ read_png(FILE *file, int filetype, F_pic
- png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type,
- &interlace_type, &compression_type, &filter_type);
-
-- if (info_ptr->valid & PNG_INFO_gAMA)
-- png_set_gamma(png_ptr, 2.2, info_ptr->gamma);
-- else
-- png_set_gamma(png_ptr, 2.2, 0.45);
-+ png_fixed_point gamma = 0.45;
-+ png_get_gAMA_fixed(png_ptr,info_ptr,&gamma);
-+ png_set_gamma(png_ptr, 2.2, gamma);
-
-- if (info_ptr->valid & PNG_INFO_bKGD)
-+ if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) {
- /* set the background to the one supplied */
-- png_set_background(png_ptr, &info_ptr->background,
-+ png_color_16p background;
-+ png_get_bKGD(png_ptr,info_ptr,&background);
-+ png_set_background(png_ptr, background,
- PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
-+ }
- else {
- /* blend the canvas background using the alpha channel */
- background.red = x_bg_color.red >> 8;
-@@ -136,7 +138,11 @@ read_png(FILE *file, int filetype, F_pic
-
- if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) {
- png_get_hIST(png_ptr, info_ptr, &histogram);
-+#if PNG_LIBPNG_VER_MAJOR <= 1 && PNG_LIBPNG_VER_MINOR < 5
- png_set_dither(png_ptr, palette, num_palette, 256, histogram, 0);
-+#else
-+ png_set_quantize(png_ptr, palette, num_palette, 256, histogram, 0);
-+#endif
- }
- }
- if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
-Index: xfig.3.2.5b/f_wrpng.c
-===================================================================
---- xfig.3.2.5b.orig/f_wrpng.c
-+++ xfig.3.2.5b/f_wrpng.c
-@@ -20,6 +20,7 @@
- #include "w_msgpanel.h"
- #include "w_setup.h"
- #include <png.h>
-+#include <zlib.h>
-
- /*
- * Write PNG file from rgb data
-@@ -59,7 +60,7 @@ write_png(FILE *file, unsigned char *dat
- }
-
- /* set long jump recovery here */
-- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png_ptr))) {
- /* if we get here there was a problem reading the file */
- png_destroy_write_struct(&png_ptr, &info_ptr);
- return False;
Deleted: xfig.3.2.5-modularX.patch
===================================================================
--- xfig.3.2.5-modularX.patch 2013-09-10 00:08:24 UTC (rev 194013)
+++ xfig.3.2.5-modularX.patch 2013-09-10 00:29:19 UTC (rev 194014)
@@ -1,28 +0,0 @@
---- xfig.3.2.5/Imakefile.modularX 2007-04-16 14:27:49.000000000 +0200
-+++ xfig.3.2.5/Imakefile 2007-04-16 14:29:18.000000000 +0200
-@@ -45,7 +45,7 @@
- XCOMM different tree than the "correct" tree that your X system expects. The usual
- XCOMM purpose of DESTDIR is to test an install process by installing in a benign area.
-
--XCOMM XAPPLOADDIR = /home/user/xfig
-+XAPPLOADDIR = /usr/share/X11/app-defaults
-
- XCOMM Uncomment the following definition for XAW3D if you want to use
- XCOMM the 3d Athena Widget Set (highly recommended!)
-@@ -166,12 +166,12 @@
- XCOMM XFIGLIBDIR = $(LIBDIR)
-
- XCOMM use this if you want the multi-key data base file in the standard X11 tree
--XFIGLIBDIR = $(LIBDIR)/xfig
-+XFIGLIBDIR = /usr/share/xfig
-
- XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
- XFIGDOCDIR = $(DOCDIR)/xfig
-
- XCOMM MANDIR tells where the standard man pages should go (no need to change it
- XCOMM if you want the man pages installed in the standard place on your system
--MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
-+MANDIR = /usr/share/man/man1
- XCOMM MANDIR = /usr/local/xfig/man
-
- XCOMM If your system doesn't have strstr undefine the following definition
Deleted: xfig.desktop
===================================================================
--- xfig.desktop 2013-09-10 00:08:24 UTC (rev 194013)
+++ xfig.desktop 2013-09-10 00:29:19 UTC (rev 194014)
@@ -1,47 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Categories=Application;Graphics;
-MimeType=image/fig;image/x-xfig;
-Exec=xfig
-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 绘图应用程序
More information about the arch-commits
mailing list