[arch-commits] Commit in dia/trunk (PKGBUILD dia-overflow-fix.patch)

[Sergej Pupykin]

    Date: Wednesday, November 19, 2014 @ 16:50:35
  Author: spupykin
Revision: 122758

upgpkg: dia 0.97.3-1

upd

Modified:
  dia/trunk/PKGBUILD
Deleted:
  dia/trunk/dia-overflow-fix.patch

------------------------+
 PKGBUILD               |   12 ++++--------
 dia-overflow-fix.patch |   28 ----------------------------
 2 files changed, 4 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-19 15:26:06 UTC (rev 122757)
+++ PKGBUILD	2014-11-19 15:50:35 UTC (rev 122758)
@@ -5,8 +5,8 @@
 # Contributor: Gregor Ibic <gregor.ibic at intelicom.si>
 
 pkgname=dia
-pkgver=0.97.2
-pkgrel=6
+pkgver=0.97.3
+pkgrel=1
 pkgdesc="A GTK+ based diagram creation program"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -16,10 +16,8 @@
 makedepends=('intltool' 'python2' 'docbook-xsl')
 optdepends=('python2')
 options=('docs' '!emptydirs')
-source=("ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.97/${pkgname}-${pkgver}.tar.xz"
-	"dia-crash.patch::https://git.gnome.org/browse/dia/patch/?id=213bdfe956bf8fe57c86316f68a09408fef1647e")
-md5sums=('1e1180a513fb567709b09bc19f12105e'
-         '9ae7a0f48498962240208b9f7c86b1ff')
+source=("ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.97/${pkgname}-${pkgver}.tar.xz")
+md5sums=('0e744a0f6a6c4cb6a089e4d955392c3c')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -27,8 +25,6 @@
       sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' "$file"
   done
   sed -i 's#python2\.1#python2 python2.1#' configure
-  patch -p1 <$srcdir/dia-crash.patch
-  sed -i 's|#include <freetype/|#include <freetype2/|g' plug-ins/postscript/diapsft2renderer.c
 }
 
 build() {

Deleted: dia-overflow-fix.patch
===================================================================
--- dia-overflow-fix.patch	2014-11-19 15:26:06 UTC (rev 122757)
+++ dia-overflow-fix.patch	2014-11-19 15:50:35 UTC (rev 122758)
@@ -1,28 +0,0 @@
-diff -wbBur dia-0.97.1/plug-ins/xfig/xfig-export.c dia-0.97.1.my/plug-ins/xfig/xfig-export.c
---- dia-0.97.1/plug-ins/xfig/xfig-export.c	2009-11-07 17:28:34.000000000 +0300
-+++ dia-0.97.1.my/plug-ins/xfig/xfig-export.c	2010-11-15 17:44:05.640896280 +0300
-@@ -417,6 +417,9 @@
-     if (text[i] > 127) {
-       newlen += 3;
-     }
-+    if (text[i] == '\\') {
-+      newlen += 1;
-+    }
-   }
-   returntext = g_malloc(sizeof(char)*(newlen+1));
-   j = 0;
-@@ -1085,10 +1088,10 @@
-   figtext = figText(renderer, (unsigned char *) text);
-   /* xfig texts are specials */
-   fprintf(renderer->file, "4 %d %d %d 0 %d %s 0.0 6 0.0 0.0 %d %d %s\\001\n",
--	  figAlignment(renderer, alignment),
--	  figColor(renderer, color), 
--	  figDepth(renderer),
--	  figFont(renderer),
-+	  (int)figAlignment(renderer, alignment),
-+	  (int)figColor(renderer, color), 
-+	  (int)figDepth(renderer),
-+	  (int)figFont(renderer),
- 	  xfig_dtostr(d_buf, figFontSize(renderer)),
- 	  (int)figCoord(renderer, pos->x),
- 	  (int)figCoord(renderer, pos->y),