summaryrefslogtreecommitdiff
path: root/community/dia
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-04-26 10:52:42 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2013-04-26 10:52:42 +0200
commit127dc69a077301eaf514a49a1c8f883584396e1c (patch)
treea48e082ea38a50dee109bbfe7d977b5a81c3c4a1 /community/dia
parentb820811488f4e50bbff8e8e84af774adc79375d9 (diff)
parenta247f0004e94d32b5fe69a5123e1c6684d8cf096 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/apvlv/PKGBUILD community/audit/PKGBUILD community/cinnamon-control-center/PKGBUILD community/dia/PKGBUILD community/gedit-plugins/PKGBUILD community/giggle/PKGBUILD community/gitg/PKGBUILD community/gmic/PKGBUILD community/gnome-applets/PKGBUILD community/gnome-panel/PKGBUILD community/gnome-screensaver/PKGBUILD community/gtranslator/PKGBUILD community/metacity/PKGBUILD community/zeitgeist-datahub/PKGBUILD core/glib2/PKGBUILD core/perl/PKGBUILD extra/anjuta-extras/PKGBUILD extra/anjuta/PKGBUILD extra/atkmm/PKGBUILD extra/brltty/PKGBUILD extra/cheese/PKGBUILD extra/clutter/PKGBUILD extra/cogl/PKGBUILD extra/devhelp/PKGBUILD extra/empathy/PKGBUILD extra/eog/PKGBUILD extra/epiphany/PKGBUILD extra/evince/PKGBUILD extra/evolution/PKGBUILD extra/fontconfig/PKGBUILD extra/gcr/PKGBUILD extra/gdl/PKGBUILD extra/gedit/PKGBUILD extra/gjs/PKGBUILD extra/glade/PKGBUILD extra/glib-networking/PKGBUILD extra/gnome-calculator/PKGBUILD extra/gnome-contacts/PKGBUILD extra/gnome-control-center/PKGBUILD extra/gnome-desktop/PKGBUILD extra/gnome-disk-utility/PKGBUILD extra/gnome-documents/PKGBUILD extra/gnome-font-viewer/PKGBUILD extra/gnome-games/PKGBUILD extra/gnome-power-manager/PKGBUILD extra/gnome-screenshot/PKGBUILD extra/gnome-session/PKGBUILD extra/gnome-terminal/PKGBUILD extra/gobject-introspection/PKGBUILD extra/grilo-plugins/PKGBUILD extra/gssdp/PKGBUILD extra/gthumb/PKGBUILD extra/gtkmm3/PKGBUILD extra/gtksourceview3/PKGBUILD extra/gucharmap/PKGBUILD extra/gupnp-av/PKGBUILD extra/gupnp-dlna/PKGBUILD extra/gupnp-igd/PKGBUILD extra/gupnp/PKGBUILD extra/gvfs/PKGBUILD extra/js/PKGBUILD extra/kdeadmin/PKGBUILD extra/libchamplain/PKGBUILD extra/libgee/PKGBUILD extra/libgweather/PKGBUILD extra/liboauth/PKGBUILD extra/libpeas/PKGBUILD extra/librsvg/PKGBUILD extra/libsocialweb/PKGBUILD extra/libsoup/PKGBUILD extra/mash/PKGBUILD extra/modemmanager/PKGBUILD extra/mutter/PKGBUILD extra/mysql/PKGBUILD extra/nautilus-sendto/PKGBUILD extra/nautilus/PKGBUILD extra/network-manager-applet/PKGBUILD extra/notification-daemon/PKGBUILD extra/p11-kit/PKGBUILD extra/pango/PKGBUILD extra/pangomm/PKGBUILD extra/polkit/PKGBUILD extra/pygobject/PKGBUILD extra/qtwebkit/PKGBUILD extra/rest/PKGBUILD extra/rhythmbox/PKGBUILD extra/rygel/PKGBUILD extra/totem-plparser/PKGBUILD extra/totem/PKGBUILD extra/vala/PKGBUILD extra/vinagre/PKGBUILD extra/vte3/PKGBUILD extra/webkitgtk/PKGBUILD extra/yelp/PKGBUILD extra/zeitgeist/PKGBUILD libre/rp-pppoe-libre/PKGBUILD pcr/python-sfml2/PKGBUILD pcr/python2-sfml2/PKGBUILD
Diffstat (limited to 'community/dia')
-rw-r--r--community/dia/PKGBUILD13
1 files changed, 5 insertions, 8 deletions
diff --git a/community/dia/PKGBUILD b/community/dia/PKGBUILD
index ed33f7837..2e50cfa1e 100644
--- a/community/dia/PKGBUILD
+++ b/community/dia/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69446 2012-04-16 11:44:58Z spupykin $
+# $Id: PKGBUILD 88862 2013-04-24 13:59:45Z spupykin $
# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Juergen Hoetzel <juergen@archlinux.org>
@@ -6,7 +6,7 @@
pkgname=dia
pkgver=0.97.2
-pkgrel=3
+pkgrel=4
pkgdesc="A GTK+ based diagram creation program"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
@@ -17,21 +17,18 @@ makedepends=('intltool' 'python2' 'docbook-xsl')
optdepends=('python2')
options=('!libtool' 'docs' '!emptydirs')
source=("ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.97/${pkgname}-${pkgver}.tar.xz"
- "dia-overflow-fix.patch"
- "dia-0.97.2-glib.patch")
+ "dia-crash.patch::https://git.gnome.org/browse/dia/patch/?id=213bdfe956bf8fe57c86316f68a09408fef1647e")
md5sums=('1e1180a513fb567709b09bc19f12105e'
- '8fd9a2ad35b5a6fd8c758d7c73dbfe66'
- '430d39de524c112f39a4bd9801038b05')
+ '2ad4fcfbfb561930a1d0335cc942a07b')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i ${srcdir}/dia-0.97.2-glib.patch
export PYTHON=/usr/bin/python2
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-overflow-fix.patch
+ patch -p1 <$srcdir/dia-crash.patch
./configure --prefix=/usr \
--with-cairo \