[arch-commits] Commit in inkscape/trunk (4 files)

Gaetan Bisson bisson at archlinux.org
Tue Aug 31 08:55:04 EDT 2010


    Date: Tuesday, August 31, 2010 @ 08:55:03
  Author: bisson
Revision: 89365

upstream update:
- patches not needed anymore
- new icon files...

Modified:
  inkscape/trunk/PKGBUILD
  inkscape/trunk/inkscape.install
Deleted:
  inkscape/trunk/50-poppler-API.dpatch
  inkscape/trunk/inkscape-0.47-gcc45.patch

---------------------------+
 50-poppler-API.dpatch     |   97 --------------------------------------------
 PKGBUILD                  |   21 +++------
 inkscape-0.47-gcc45.patch |   83 -------------------------------------
 inkscape.install          |    1 
 4 files changed, 9 insertions(+), 193 deletions(-)

Deleted: 50-poppler-API.dpatch
===================================================================
--- 50-poppler-API.dpatch	2010-08-31 12:54:46 UTC (rev 89364)
+++ 50-poppler-API.dpatch	2010-08-31 12:55:03 UTC (rev 89365)
@@ -1,97 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50-poppler-API.patch.dpatch by Kees Cook <kees at ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: https://bugs.launchpad.net/inkscape/+bug/487038
-
- at DPATCH@
-diff -urNad inkscape~/src/extension/internal/pdfinput/pdf-parser.cpp inkscape/src/extension/internal/pdfinput/pdf-parser.cpp
---- inkscape~/src/extension/internal/pdfinput/pdf-parser.cpp	2009-10-10 12:17:47.000000000 -0700
-+++ inkscape/src/extension/internal/pdfinput/pdf-parser.cpp	2009-12-23 22:34:13.000000000 -0800
-@@ -809,7 +809,7 @@
- 	  blendingColorSpace = NULL;
- 	  isolated = knockout = gFalse;
- 	  if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
--	    blendingColorSpace = GfxColorSpace::parse(&obj5);
-+	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
- 	  }
- 	  obj5.free();
- 	  if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) {
-@@ -1009,9 +1009,9 @@
-   state->setFillPattern(NULL);
-   res->lookupColorSpace(args[0].getName(), &obj);
-   if (obj.isNull()) {
--    colorSpace = GfxColorSpace::parse(&args[0]);
-+    colorSpace = GfxColorSpace::parse(&args[0], NULL);
-   } else {
--    colorSpace = GfxColorSpace::parse(&obj);
-+    colorSpace = GfxColorSpace::parse(&obj, NULL);
-   }
-   obj.free();
-   if (colorSpace) {
-@@ -1032,9 +1032,9 @@
-   state->setStrokePattern(NULL);
-   res->lookupColorSpace(args[0].getName(), &obj);
-   if (obj.isNull()) {
--    colorSpace = GfxColorSpace::parse(&args[0]);
-+    colorSpace = GfxColorSpace::parse(&args[0], NULL);
-   } else {
--    colorSpace = GfxColorSpace::parse(&obj);
-+    colorSpace = GfxColorSpace::parse(&obj, NULL);
-   }
-   obj.free();
-   if (colorSpace) {
-@@ -1101,7 +1101,7 @@
-       builder->updateStyle(state);
-     }
-     if (args[numArgs-1].isName() &&
--	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
-+	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
-       state->setFillPattern(pattern);
-       builder->updateStyle(state);
-     }
-@@ -1145,7 +1145,7 @@
-       builder->updateStyle(state);
-     }
-     if (args[numArgs-1].isName() &&
--	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
-+	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
-       state->setStrokePattern(pattern);
-       builder->updateStyle(state);
-     }
-@@ -1543,7 +1543,7 @@
-   double *matrix = NULL;
-   GBool savedState = gFalse;
- 
--  if (!(shading = res->lookupShading(args[0].getName()))) {
-+  if (!(shading = res->lookupShading(args[0].getName(), NULL))) {
-     return;
-   }
- 
-@@ -2507,7 +2507,7 @@
-       }
-     }
-     if (!obj1.isNull()) {
--      colorSpace = GfxColorSpace::parse(&obj1);
-+      colorSpace = GfxColorSpace::parse(&obj1, NULL);
-     } else if (csMode == streamCSDeviceGray) {
-       colorSpace = new GfxDeviceGrayColorSpace();
-     } else if (csMode == streamCSDeviceRGB) {
-@@ -2592,7 +2592,7 @@
- 	  obj2.free();
- 	}
-       }
--      maskColorSpace = GfxColorSpace::parse(&obj1);
-+      maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
-       obj1.free();
-       if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
- 	goto err1;
-@@ -2767,7 +2767,7 @@
-     if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
-       transpGroup = gTrue;
-       if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
--	blendingColorSpace = GfxColorSpace::parse(&obj3);
-+	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
-       }
-       obj3.free();
-       if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) {

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-31 12:54:46 UTC (rev 89364)
+++ PKGBUILD	2010-08-31 12:55:03 UTC (rev 89365)
@@ -3,27 +3,22 @@
 # Contributor: Tobias Kieslich <tobias at justdreams.de>
 
 pkgname=inkscape
-pkgver=0.47
-pkgrel=4
-pkgdesc="A vector-based drawing program - svg compliant"
-url="http://inkscape.sourceforge.net/"
+pkgver=0.48.0
+pkgrel=1
+pkgdesc='Vector graphics editor using the SVG file format'
+url='http://inkscape.sourceforge.net/'
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
-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')
+depends=('gc' 'gtkmm' 'poppler-glib' 'pyxml' 'libxslt' 'gsl' 'popt'
+         'gtkspell' 'imagemagick' 'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('boost' 'pkg-config' 'intltool')
 options=('!libtool')
 install=inkscape.install
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        50-poppler-API.dpatch
-        inkscape-0.47-gcc45.patch)
-md5sums=('916c85b501bcfb0ae61fcf7318f36348'
-         'b447272c9b282b49e86dca24c2581065'
-         'a63bb0a325e3c40d86420183e003350d')
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('220ade981069a91d3afab9cbff75f65c75119da2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/50-poppler-API.dpatch"
-  patch -Np1 -i "${srcdir}/inkscape-0.47-gcc45.patch"
   ./configure --prefix=/usr \
     --with-python \
     --with-perl \

Deleted: inkscape-0.47-gcc45.patch
===================================================================
--- inkscape-0.47-gcc45.patch	2010-08-31 12:54:46 UTC (rev 89364)
+++ inkscape-0.47-gcc45.patch	2010-08-31 12:55:03 UTC (rev 89365)
@@ -1,83 +0,0 @@
-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;

Modified: inkscape.install
===================================================================
--- inkscape.install	2010-08-31 12:54:46 UTC (rev 89364)
+++ inkscape.install	2010-08-31 12:55:03 UTC (rev 89365)
@@ -1,5 +1,6 @@
 post_install() {
   update-desktop-database -q
+  xdg-icon-resource forceupdate
 }
 
 post_upgrade() {



More information about the arch-commits mailing list