[arch-commits] Commit in dia/repos (10 files)

Sergej Pupykin spupykin at archlinux.org
Wed Nov 19 15:50:51 UTC 2014


    Date: Wednesday, November 19, 2014 @ 16:50:51
  Author: spupykin
Revision: 122759

archrelease: copy trunk to community-i686, community-x86_64

Added:
  dia/repos/community-i686/PKGBUILD
    (from rev 122758, dia/trunk/PKGBUILD)
  dia/repos/community-i686/dia.install
    (from rev 122758, dia/trunk/dia.install)
  dia/repos/community-x86_64/PKGBUILD
    (from rev 122758, dia/trunk/PKGBUILD)
  dia/repos/community-x86_64/dia.install
    (from rev 122758, dia/trunk/dia.install)
Deleted:
  dia/repos/community-i686/PKGBUILD
  dia/repos/community-i686/dia-overflow-fix.patch
  dia/repos/community-i686/dia.install
  dia/repos/community-x86_64/PKGBUILD
  dia/repos/community-x86_64/dia-overflow-fix.patch
  dia/repos/community-x86_64/dia.install

-----------------------------------------+
 /PKGBUILD                               |  102 ++++++++++++++++++++++++++++++
 /dia.install                            |   26 +++++++
 community-i686/PKGBUILD                 |   55 ----------------
 community-i686/dia-overflow-fix.patch   |   28 --------
 community-i686/dia.install              |   13 ---
 community-x86_64/PKGBUILD               |   55 ----------------
 community-x86_64/dia-overflow-fix.patch |   28 --------
 community-x86_64/dia.install            |   13 ---
 8 files changed, 128 insertions(+), 192 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-11-19 15:50:35 UTC (rev 122758)
+++ community-i686/PKGBUILD	2014-11-19 15:50:51 UTC (rev 122759)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Thorsten Töpper <atsutane-tu at freethoughts.de>
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Juergen Hoetzel <juergen at archlinux.org>
-# Contributor: Gregor Ibic <gregor.ibic at intelicom.si>
-
-pkgname=dia
-pkgver=0.97.2
-pkgrel=6
-pkgdesc="A GTK+ based diagram creation program"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://live.gnome.org/Dia"
-install=dia.install
-depends=('libxslt' 'desktop-file-utils' 'libart-lgpl' 'gtk2' 'hicolor-icon-theme')
-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')
-
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  for file in `find -type f -name '*.py'`; do
-      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() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  export PYTHON=/usr/bin/python2
-  ./configure --prefix=/usr \
-    --with-cairo \
-    --with-python \
-    --disable-gnome \
-    --with-hardbooks
-  sed -i 's#SUBDIRS = lib objects plug-ins shapes app bindings samples po sheets data doc tests installer#SUBDIRS = lib objects plug-ins shapes app bindings samples po sheets data tests installer#' Makefile
-  make
-  cd doc
-  make html
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  cd doc
-  make DESTDIR="${pkgdir}" install-html
-  ln -sf ../doc/dia/html "${pkgdir}"/usr/share/dia/help
-}

Copied: dia/repos/community-i686/PKGBUILD (from rev 122758, dia/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-11-19 15:50:51 UTC (rev 122759)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Thorsten Töpper <atsutane-tu at freethoughts.de>
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Juergen Hoetzel <juergen at archlinux.org>
+# Contributor: Gregor Ibic <gregor.ibic at intelicom.si>
+
+pkgname=dia
+pkgver=0.97.3
+pkgrel=1
+pkgdesc="A GTK+ based diagram creation program"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://live.gnome.org/Dia"
+install=dia.install
+depends=('libxslt' 'desktop-file-utils' 'libart-lgpl' 'gtk2' 'hicolor-icon-theme')
+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")
+md5sums=('0e744a0f6a6c4cb6a089e4d955392c3c')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  for file in `find -type f -name '*.py'`; do
+      sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' "$file"
+  done
+  sed -i 's#python2\.1#python2 python2.1#' configure
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  export PYTHON=/usr/bin/python2
+  ./configure --prefix=/usr \
+    --with-cairo \
+    --with-python \
+    --disable-gnome \
+    --with-hardbooks
+  sed -i 's#SUBDIRS = lib objects plug-ins shapes app bindings samples po sheets data doc tests installer#SUBDIRS = lib objects plug-ins shapes app bindings samples po sheets data tests installer#' Makefile
+  make
+  cd doc
+  make html
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  cd doc
+  make DESTDIR="${pkgdir}" install-html
+  ln -sf ../doc/dia/html "${pkgdir}"/usr/share/dia/help
+}

Deleted: community-i686/dia-overflow-fix.patch
===================================================================
--- community-i686/dia-overflow-fix.patch	2014-11-19 15:50:35 UTC (rev 122758)
+++ community-i686/dia-overflow-fix.patch	2014-11-19 15:50:51 UTC (rev 122759)
@@ -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),

Deleted: community-i686/dia.install
===================================================================
--- community-i686/dia.install	2014-11-19 15:50:35 UTC (rev 122758)
+++ community-i686/dia.install	2014-11-19 15:50:51 UTC (rev 122759)
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime > /dev/null
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Copied: dia/repos/community-i686/dia.install (from rev 122758, dia/trunk/dia.install)
===================================================================
--- community-i686/dia.install	                        (rev 0)
+++ community-i686/dia.install	2014-11-19 15:50:51 UTC (rev 122759)
@@ -0,0 +1,13 @@
+post_install() {
+  update-desktop-database -q
+  update-mime-database usr/share/mime > /dev/null
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2014-11-19 15:50:35 UTC (rev 122758)
+++ community-x86_64/PKGBUILD	2014-11-19 15:50:51 UTC (rev 122759)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Thorsten Töpper <atsutane-tu at freethoughts.de>
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Juergen Hoetzel <juergen at archlinux.org>
-# Contributor: Gregor Ibic <gregor.ibic at intelicom.si>
-
-pkgname=dia
-pkgver=0.97.2
-pkgrel=6
-pkgdesc="A GTK+ based diagram creation program"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://live.gnome.org/Dia"
-install=dia.install
-depends=('libxslt' 'desktop-file-utils' 'libart-lgpl' 'gtk2' 'hicolor-icon-theme')
-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')
-
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  for file in `find -type f -name '*.py'`; do
-      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() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  export PYTHON=/usr/bin/python2
-  ./configure --prefix=/usr \
-    --with-cairo \
-    --with-python \
-    --disable-gnome \
-    --with-hardbooks
-  sed -i 's#SUBDIRS = lib objects plug-ins shapes app bindings samples po sheets data doc tests installer#SUBDIRS = lib objects plug-ins shapes app bindings samples po sheets data tests installer#' Makefile
-  make
-  cd doc
-  make html
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  cd doc
-  make DESTDIR="${pkgdir}" install-html
-  ln -sf ../doc/dia/html "${pkgdir}"/usr/share/dia/help
-}

Copied: dia/repos/community-x86_64/PKGBUILD (from rev 122758, dia/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-11-19 15:50:51 UTC (rev 122759)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Thorsten Töpper <atsutane-tu at freethoughts.de>
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Juergen Hoetzel <juergen at archlinux.org>
+# Contributor: Gregor Ibic <gregor.ibic at intelicom.si>
+
+pkgname=dia
+pkgver=0.97.3
+pkgrel=1
+pkgdesc="A GTK+ based diagram creation program"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://live.gnome.org/Dia"
+install=dia.install
+depends=('libxslt' 'desktop-file-utils' 'libart-lgpl' 'gtk2' 'hicolor-icon-theme')
+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")
+md5sums=('0e744a0f6a6c4cb6a089e4d955392c3c')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  for file in `find -type f -name '*.py'`; do
+      sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' "$file"
+  done
+  sed -i 's#python2\.1#python2 python2.1#' configure
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  export PYTHON=/usr/bin/python2
+  ./configure --prefix=/usr \
+    --with-cairo \
+    --with-python \
+    --disable-gnome \
+    --with-hardbooks
+  sed -i 's#SUBDIRS = lib objects plug-ins shapes app bindings samples po sheets data doc tests installer#SUBDIRS = lib objects plug-ins shapes app bindings samples po sheets data tests installer#' Makefile
+  make
+  cd doc
+  make html
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  cd doc
+  make DESTDIR="${pkgdir}" install-html
+  ln -sf ../doc/dia/html "${pkgdir}"/usr/share/dia/help
+}

Deleted: community-x86_64/dia-overflow-fix.patch
===================================================================
--- community-x86_64/dia-overflow-fix.patch	2014-11-19 15:50:35 UTC (rev 122758)
+++ community-x86_64/dia-overflow-fix.patch	2014-11-19 15:50:51 UTC (rev 122759)
@@ -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),

Deleted: community-x86_64/dia.install
===================================================================
--- community-x86_64/dia.install	2014-11-19 15:50:35 UTC (rev 122758)
+++ community-x86_64/dia.install	2014-11-19 15:50:51 UTC (rev 122759)
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime > /dev/null
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Copied: dia/repos/community-x86_64/dia.install (from rev 122758, dia/trunk/dia.install)
===================================================================
--- community-x86_64/dia.install	                        (rev 0)
+++ community-x86_64/dia.install	2014-11-19 15:50:51 UTC (rev 122759)
@@ -0,0 +1,13 @@
+post_install() {
+  update-desktop-database -q
+  update-mime-database usr/share/mime > /dev/null
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}


More information about the arch-commits mailing list