[arch-commits] Commit in inkscape/trunk (PKGBUILD inkscape-0.47-gcc45.patch)
Jan de Groot
jgc at archlinux.org
Tue Jun 22 18:41:27 UTC 2010
Date: Tuesday, June 22, 2010 @ 14:41:27
Author: jgc
Revision: 83743
upgpkg: inkscape 0.47-3
Rebuild for poppler 0.14, add patch to fix compile with gcc 4.5
Added:
inkscape/trunk/inkscape-0.47-gcc45.patch
Modified:
inkscape/trunk/PKGBUILD
---------------------------+
PKGBUILD | 19 +++++-----
inkscape-0.47-gcc45.patch | 83 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 94 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-06-22 18:37:29 UTC (rev 83742)
+++ PKGBUILD 2010-06-22 18:41:27 UTC (rev 83743)
@@ -4,23 +4,26 @@
pkgname=inkscape
pkgver=0.47
-pkgrel=2
+pkgrel=3
pkgdesc="A vector-based drawing program - svg compliant"
url="http://inkscape.sourceforge.net/"
arch=('i686' 'x86_64')
license=('GPL' 'LGPL')
-depends=('poppler-glib>=0.12.4' 'imagemagick>=6.6.1.4' 'gtkspell>=2.0.16' 'gc>=7.1' 'gtkmm>=2.20.2' 'libxslt>=1.1.26' 'gsl>=1.14' 'pyxml>=0.8.4' 'desktop-file-utils' 'popt')
+depends=('poppler-glib>=0.14.0' 'imagemagick>=6.6.2.0' 'gtkspell>=2.0.16' 'gc>=7.1' 'gtkmm>=2.20.3' 'libxslt>=1.1.26' 'gsl>=1.14' 'pyxml>=0.8.4' 'desktop-file-utils' 'popt')
makedepends=('boost' 'pkgconfig' 'intltool')
options=('!libtool')
install=inkscape.install
source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
- 50-poppler-API.dpatch)
+ 50-poppler-API.dpatch
+ inkscape-0.47-gcc45.patch)
md5sums=('916c85b501bcfb0ae61fcf7318f36348'
- 'b447272c9b282b49e86dca24c2581065')
+ 'b447272c9b282b49e86dca24c2581065'
+ 'a63bb0a325e3c40d86420183e003350d')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/50-poppler-API.dpatch" || return 1
+ patch -Np1 -i "${srcdir}/50-poppler-API.dpatch"
+ patch -Np1 -i "${srcdir}/inkscape-0.47-gcc45.patch"
./configure --prefix=/usr \
--with-python \
--with-perl \
@@ -28,7 +31,7 @@
--with-xft \
--enable-lcms \
--enable-poppler-cairo \
- --disable-dependency-tracking || return 1
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
+ --disable-dependency-tracking
+ make
+ make DESTDIR="${pkgdir}" install
}
Added: inkscape-0.47-gcc45.patch
===================================================================
--- inkscape-0.47-gcc45.patch (rev 0)
+++ inkscape-0.47-gcc45.patch 2010-06-22 18:41:27 UTC (rev 83743)
@@ -0,0 +1,83 @@
+http://bugs.gentoo.org/show_bug.cgi?id=305749
+
+diff -Naur inkscape-0.47-orig/src/eraser-context.cpp inkscape-0.47/src/eraser-context.cpp
+--- inkscape-0.47-orig/src/eraser-context.cpp 2010-02-18 08:45:58.000000000 -0500
++++ inkscape-0.47/src/eraser-context.cpp 2010-02-18 08:46:26.000000000 -0500
+@@ -749,7 +749,7 @@
+ if ( eraserMode ) {
+ toWorkOn = sp_document_partial_items_in_box(sp_desktop_document(desktop), desktop->dkey, bounds);
+ } else {
+- Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
++ Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
+ toWorkOn = sp_document_items_at_points(sp_desktop_document(desktop), desktop->dkey, r->getPoints());
+ }
+ toWorkOn = g_slist_remove( toWorkOn, acid );
+diff -Naur inkscape-0.47-orig/src/extension/internal/filter/filter-file.cpp inkscape-0.47/src/extension/internal/filter/filter-file.cpp
+--- inkscape-0.47-orig/src/extension/internal/filter/filter-file.cpp 2010-02-18 08:45:58.000000000 -0500
++++ inkscape-0.47/src/extension/internal/filter/filter-file.cpp 2010-02-18 09:07:54.000000000 -0500
+@@ -161,7 +161,7 @@
+ mywriter writer;
+ sp_repr_write_stream(node, writer, 0, FALSE, g_quark_from_static_string("svg"), 0, 0);
+
+- Inkscape::Extension::build_from_mem(xml_str, new Filter::Filter(g_strdup(writer.c_str())));
++ Inkscape::Extension::build_from_mem(xml_str, new Filter(g_strdup(writer.c_str())));
+ g_free(xml_str);
+ return;
+ }
+diff -Naur inkscape-0.47-orig/src/extension/internal/filter/filter.cpp inkscape-0.47/src/extension/internal/filter/filter.cpp
+--- inkscape-0.47-orig/src/extension/internal/filter/filter.cpp 2010-02-18 08:45:58.000000000 -0500
++++ inkscape-0.47/src/extension/internal/filter/filter.cpp 2010-02-18 09:21:06.000000000 -0500
+@@ -217,7 +217,7 @@
+ "<menu-tip>%s</menu-tip>\n"
+ "</effect>\n"
+ "</inkscape-extension>\n", name, id, submenu, tip);
+- Inkscape::Extension::build_from_mem(xml_str, new Filter::Filter(filter));
++ Inkscape::Extension::build_from_mem(xml_str, new Filter(filter));
+ g_free(xml_str);
+ return;
+ }
+diff -Naur inkscape-0.47-orig/src/flood-context.cpp inkscape-0.47/src/flood-context.cpp
+--- inkscape-0.47-orig/src/flood-context.cpp 2010-02-18 08:45:58.000000000 -0500
++++ inkscape-0.47/src/flood-context.cpp 2010-02-18 08:48:16.000000000 -0500
+@@ -900,7 +900,7 @@
+ if (is_point_fill) {
+ fill_points.push_back(Geom::Point(event->button.x, event->button.y));
+ } else {
+- Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
++ Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
+ fill_points = r->getPoints();
+ }
+
+@@ -1206,7 +1206,7 @@
+
+ case GDK_BUTTON_RELEASE:
+ if (event->button.button == 1 && !event_context->space_panning) {
+- Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
++ Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
+ if (r->is_started()) {
+ // set "busy" cursor
+ desktop->setWaitingCursor();
+diff -Naur inkscape-0.47-orig/src/gradient-context.cpp inkscape-0.47/src/gradient-context.cpp
+--- inkscape-0.47-orig/src/gradient-context.cpp 2010-02-18 08:45:58.000000000 -0500
++++ inkscape-0.47/src/gradient-context.cpp 2010-02-18 08:47:33.000000000 -0500
+@@ -641,7 +641,7 @@
+ if (!event_context->within_tolerance) {
+ // we've been dragging, either do nothing (grdrag handles that),
+ // or rubberband-select if we have rubberband
+- Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
++ Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
+ if (r->is_started() && !event_context->within_tolerance) {
+ // this was a rubberband drag
+ if (r->getMode() == RUBBERBAND_MODE_RECT) {
+diff -Naur inkscape-0.47-orig/src/select-context.cpp inkscape-0.47/src/select-context.cpp
+--- inkscape-0.47-orig/src/select-context.cpp 2010-02-18 08:45:58.000000000 -0500
++++ inkscape-0.47/src/select-context.cpp 2010-02-18 08:50:11.000000000 -0500
+@@ -602,7 +602,7 @@
+ }
+ sc->item = NULL;
+ } else {
+- Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
++ Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
+ if (r->is_started() && !within_tolerance) {
+ // this was a rubberband drag
+ GSList *items = NULL;
More information about the arch-commits
mailing list