[arch-commits] Commit in inkscape/trunk (3 files)
Gaetan Bisson
bisson at archlinux.org
Fri Jan 30 05:17:58 UTC 2015
Date: Friday, January 30, 2015 @ 06:17:58
Author: bisson
Revision: 230277
upstream update
Modified:
inkscape/trunk/PKGBUILD
Deleted:
inkscape/trunk/fix-build-with-poppler-0.29.0.patch
inkscape/trunk/ime-placement.patch
-------------------------------------+
PKGBUILD | 20 +-----
fix-build-with-poppler-0.29.0.patch | 98 ----------------------------------
ime-placement.patch | 62 ---------------------
3 files changed, 5 insertions(+), 175 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-01-30 04:43:10 UTC (rev 230276)
+++ PKGBUILD 2015-01-30 05:17:58 UTC (rev 230277)
@@ -4,8 +4,8 @@
# Contributor: tobias <tobias at archlinux.org>
pkgname=inkscape
-pkgver=0.48.5
-pkgrel=4
+pkgver=0.91
+pkgrel=1
pkgdesc='Vector graphics editor using the SVG file format'
url='http://inkscape.sourceforge.net/'
license=('GPL' 'LGPL')
@@ -18,29 +18,19 @@
'python2-numpy: some extensions'
'python2-lxml: some extensions and filters'
'uniconvertor: reading/writing to some proprietary formats')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
- 'fix-build-with-poppler-0.29.0.patch'
- 'ime-placement.patch')
-sha1sums=('83ddb0c96069638f712a869039989bfd7d79c6a8'
- '82ad02357a2405c11f29f2e516b1a7f55953e807'
- 'b12b948ca5ee7e02703a13aa8b8bccdf67947f12')
+#source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
+source=("https://inkscape.global.ssl.fastly.net/media/resources/file/inkscape-0.91.tar.bz2")
+sha1sums=('9941ee467af570ac71a70f965cd9c48d4993b8f3')
install=install
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
-
- # https://bugs.launchpad.net/inkscape/+bug/1399811
- patch -p0 -i ../fix-build-with-poppler-0.29.0.patch
- autoreconf -vi
-
- patch -p1 -i ../ime-placement.patch # FS#39898
sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py
sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py
sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp
sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py
sed -i 's|"python"|"python2"|g' src/main.cpp
- sed -i '/extern unsigned GC_version;/c unsigned GC_version=GC_VERSION_MAJOR<<16+GC_VERSION_MINOR<<8+GC_VERSION_MICRO;' configure
}
build() {
Deleted: fix-build-with-poppler-0.29.0.patch
===================================================================
--- fix-build-with-poppler-0.29.0.patch 2015-01-30 04:43:10 UTC (rev 230276)
+++ fix-build-with-poppler-0.29.0.patch 2015-01-30 05:17:58 UTC (rev 230277)
@@ -1,98 +0,0 @@
-=== modified file 'configure.ac'
---- configure.ac 2014-06-20 21:38:59 +0000
-+++ configure.ac 2014-12-10 20:32:33 +0000
-@@ -593,6 +593,11 @@
- AC_DEFINE(POPPLER_EVEN_NEWER_COLOR_SPACE_API, 1, [Use even newer color space API from Poppler >= 0.26.0])
- fi
-
-+PKG_CHECK_MODULES(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, poppler >= 0.29.0, popplernewernewcolorspaceapi=yes, popplernewernewcolorspaceapi=no)
-+if test "x$popplernewernewcolorspaceapi" = "xyes"; then
-+ AC_DEFINE(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, 1, [Use even newer new color space API from Poppler >= 0.29.0])
-+fi
-+
- # Poppler's b604a008 commit changes this
- AC_MSG_CHECKING([whether Poppler's GfxPatch no longer uses GfxColor])
- popplergfxcolor="no"
-=== modified file 'src/extension/internal/pdfinput/pdf-parser.cpp'
---- src/extension/internal/pdfinput/pdf-parser.cpp 2014-06-03 15:44:09 +0000
-+++ src/extension/internal/pdfinput/pdf-parser.cpp 2014-12-10 20:32:30 +0000
-@@ -860,7 +860,9 @@
- blendingColorSpace = NULL;
- isolated = knockout = gFalse;
- if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
--#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
-+ blendingColorSpace = GfxColorSpace::parse(NULL, &obj5, NULL, NULL);
-+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
- blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL);
- #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
-@@ -1085,7 +1087,13 @@
-
- state->setFillPattern(NULL);
- res->lookupColorSpace(args[0].getName(), &obj);
--#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
-+ if (obj.isNull()) {
-+ colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL);
-+ } else {
-+ colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL);
-+ }
-+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
- if (obj.isNull()) {
- colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
- } else {
-@@ -1126,7 +1134,13 @@
-
- state->setStrokePattern(NULL);
- res->lookupColorSpace(args[0].getName(), &obj);
--#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
-+ if (obj.isNull()) {
-+ colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL);
-+ } else {
-+ colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL);
-+ }
-+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
- if (obj.isNull()) {
- colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
- } else {
-@@ -2756,8 +2770,10 @@
- }
- }
- if (!obj1.isNull()) {
--#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-- colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
-+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
-+ colorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL);
-+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+ colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
- #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- colorSpace = GfxColorSpace::parse(&obj1, NULL);
- #else
-@@ -2847,8 +2863,10 @@
- obj2.free();
- }
- }
--#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-- GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
-+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
-+ GfxColorSpace *maskColorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL);
-+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+ GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
- #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
- #else
-@@ -3040,7 +3058,9 @@
- if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
- transpGroup = gTrue;
- if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
--#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
-+ blendingColorSpace = GfxColorSpace::parse(NULL, &obj3, NULL, NULL);
-+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
- blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL);
- #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
-
-
Deleted: ime-placement.patch
===================================================================
--- ime-placement.patch 2015-01-30 04:43:10 UTC (rev 230276)
+++ ime-placement.patch 2015-01-30 05:17:58 UTC (rev 230277)
@@ -1,62 +0,0 @@
-diff -aur old/src/text-context.cpp new/src/text-context.cpp
---- old/src/text-context.cpp 2011-07-08 08:25:09.468790000 -1000
-+++ new/src/text-context.cpp 2014-04-21 14:48:22.668759004 -1000
-@@ -684,6 +684,17 @@
- // articifically here, for the text object does not exist yet:
- double cursor_height = sp_desktop_get_font_size_tool(desktop);
- sp_ctrlline_set_coords(SP_CTRLLINE(tc->cursor), dtp, dtp + Geom::Point(0, cursor_height));
-+ if (tc->imc) {
-+ GdkRectangle im_cursor;
-+ Geom::Point const top_left = SP_EVENT_CONTEXT(tc)->desktop->get_display_area().corner(3);
-+ Geom::Point const cursor_size(0, cursor_height);
-+ Geom::Point const im_position = SP_EVENT_CONTEXT(tc)->desktop->d2w(dtp + cursor_size - top_left);
-+ im_cursor.x = (int) floor(im_position[Geom::X]);
-+ im_cursor.y = (int) floor(im_position[Geom::Y]);
-+ im_cursor.width = 0;
-+ im_cursor.height = (int) -floor(SP_EVENT_CONTEXT(tc)->desktop->d2w(cursor_size)[Geom::Y]);
-+ gtk_im_context_set_cursor_location(tc->imc, &im_cursor);
-+ }
- event_context->_message_context->set(Inkscape::NORMAL_MESSAGE, _("Type text; <b>Enter</b> to start new line.")); // FIXME:: this is a copy of a string from _update_cursor below, do not desync
-
- event_context->within_tolerance = false;
-@@ -1560,8 +1571,6 @@
- static void
- sp_text_context_update_cursor(SPTextContext *tc, bool scroll_to_see)
- {
-- GdkRectangle im_cursor = { 0, 0, 1, 1 };
--
- // due to interruptible display, tc may already be destroyed during a display update before
- // the cursor update (can't do both atomically, alas)
- if (!tc->desktop) return;
-@@ -1586,10 +1595,17 @@
- sp_ctrlline_set_coords(SP_CTRLLINE(tc->cursor), d0, d1);
-
- /* fixme: ... need another transformation to get canvas widget coordinate space? */
-- im_cursor.x = (int) floor(d0[Geom::X]);
-- im_cursor.y = (int) floor(d0[Geom::Y]);
-- im_cursor.width = (int) floor(d1[Geom::X]) - im_cursor.x;
-- im_cursor.height = (int) floor(d1[Geom::Y]) - im_cursor.y;
-+ if (tc->imc) {
-+ GdkRectangle im_cursor = { 0, 0, 1, 1 };
-+ Geom::Point const top_left = SP_EVENT_CONTEXT(tc)->desktop->get_display_area().corner(3);
-+ Geom::Point const im_d0 = SP_EVENT_CONTEXT(tc)->desktop->d2w(d0 - top_left);
-+ Geom::Point const im_d1 = SP_EVENT_CONTEXT(tc)->desktop->d2w(d1 - top_left);
-+ im_cursor.x = (int) floor(im_d0[Geom::X]);
-+ im_cursor.y = (int) floor(im_d1[Geom::Y]);
-+ im_cursor.width = (int) floor(im_d1[Geom::X]) - im_cursor.x;
-+ im_cursor.height = (int) floor(im_d0[Geom::Y]) - im_cursor.y;
-+ gtk_im_context_set_cursor_location(tc->imc, &im_cursor);
-+ }
-
- tc->show = TRUE;
- tc->phase = 1;
-@@ -1631,9 +1647,6 @@
- }
- }
-
-- if (tc->imc) {
-- gtk_im_context_set_cursor_location(tc->imc, &im_cursor);
-- }
- SP_EVENT_CONTEXT(tc)->desktop->emitToolSubselectionChanged((gpointer)tc);
- }
-
More information about the arch-commits
mailing list