Accepting request 47084 from GNOME:Apps
Copy from GNOME:Apps/inkscape based on submit request 47084 from user vuntz OBS-URL: https://build.opensuse.org/request/show/47084 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/inkscape?expand=0&rev=37
This commit is contained in:
parent
fe1af7d1a9
commit
cab6443a92
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4985bc5bf1938d818fee31c72151a2d889300c0be00fab5dc94ccd84df39ef3a
|
||||
size 20742550
|
3
inkscape-0.48.0.tar.bz2
Normal file
3
inkscape-0.48.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:36acd81b96aec333b7e8fced0c9b162d0b1a4e073d56aaaf1bf5f66d8eebe270
|
||||
size 19333922
|
@ -1,82 +0,0 @@
|
||||
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;
|
||||
|
@ -1,13 +0,0 @@
|
||||
Index: inkscape-0.47/src/libgdl/gdl-switcher.c
|
||||
===================================================================
|
||||
--- inkscape-0.47.orig/src/libgdl/gdl-switcher.c
|
||||
+++ inkscape-0.47/src/libgdl/gdl-switcher.c
|
||||
@@ -521,7 +521,7 @@ gdl_switcher_expose (GtkWidget *widget,
|
||||
button, event);
|
||||
}
|
||||
}
|
||||
- GDL_CALL_PARENT_WITH_DEFAULT (GTK_WIDGET_CLASS, expose_event,
|
||||
+ return GDL_CALL_PARENT_WITH_DEFAULT (GTK_WIDGET_CLASS, expose_event,
|
||||
(widget, event), FALSE);
|
||||
}
|
||||
|
@ -1,110 +0,0 @@
|
||||
Fix Rawhide build (more recent poppler)
|
||||
|
||||
Lubomir Rintel <lkundrak@v3.sk>
|
||||
|
||||
|
||||
Index: inkscape-svn/src/extension/internal/pdfinput/pdf-parser.cpp
|
||||
===================================================================
|
||||
--- inkscape-svn/src/extension/internal/pdfinput/pdf-parser.cpp (revision 22620)
|
||||
+++ inkscape-svn/src/extension/internal/pdfinput/pdf-parser.cpp (working copy)
|
||||
@@ -56,6 +56,13 @@
|
||||
#define M_PI 3.14159265358979323846
|
||||
#endif
|
||||
|
||||
+#include <glib/poppler-features.h>
|
||||
+#if POPPLER_CHECK_VERSION(0,12,2)
|
||||
+#define PGFX ,NULL
|
||||
+#else
|
||||
+#define PGFX
|
||||
+#endif
|
||||
+
|
||||
//------------------------------------------------------------------------
|
||||
// constants
|
||||
//------------------------------------------------------------------------
|
||||
@@ -809,7 +816,7 @@
|
||||
blendingColorSpace = NULL;
|
||||
isolated = knockout = gFalse;
|
||||
if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
|
||||
- blendingColorSpace = GfxColorSpace::parse(&obj5);
|
||||
+ blendingColorSpace = GfxColorSpace::parse(&obj5 PGFX);
|
||||
}
|
||||
obj5.free();
|
||||
if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) {
|
||||
@@ -1009,9 +1016,9 @@
|
||||
state->setFillPattern(NULL);
|
||||
res->lookupColorSpace(args[0].getName(), &obj);
|
||||
if (obj.isNull()) {
|
||||
- colorSpace = GfxColorSpace::parse(&args[0]);
|
||||
+ colorSpace = GfxColorSpace::parse(&args[0] PGFX);
|
||||
} else {
|
||||
- colorSpace = GfxColorSpace::parse(&obj);
|
||||
+ colorSpace = GfxColorSpace::parse(&obj PGFX);
|
||||
}
|
||||
obj.free();
|
||||
if (colorSpace) {
|
||||
@@ -1032,9 +1039,9 @@
|
||||
state->setStrokePattern(NULL);
|
||||
res->lookupColorSpace(args[0].getName(), &obj);
|
||||
if (obj.isNull()) {
|
||||
- colorSpace = GfxColorSpace::parse(&args[0]);
|
||||
+ colorSpace = GfxColorSpace::parse(&args[0] PGFX);
|
||||
} else {
|
||||
- colorSpace = GfxColorSpace::parse(&obj);
|
||||
+ colorSpace = GfxColorSpace::parse(&obj PGFX);
|
||||
}
|
||||
obj.free();
|
||||
if (colorSpace) {
|
||||
@@ -1101,7 +1108,7 @@
|
||||
builder->updateStyle(state);
|
||||
}
|
||||
if (args[numArgs-1].isName() &&
|
||||
- (pattern = res->lookupPattern(args[numArgs-1].getName()))) {
|
||||
+ (pattern = res->lookupPattern(args[numArgs-1].getName() PGFX))) {
|
||||
state->setFillPattern(pattern);
|
||||
builder->updateStyle(state);
|
||||
}
|
||||
@@ -1145,7 +1152,7 @@
|
||||
builder->updateStyle(state);
|
||||
}
|
||||
if (args[numArgs-1].isName() &&
|
||||
- (pattern = res->lookupPattern(args[numArgs-1].getName()))) {
|
||||
+ (pattern = res->lookupPattern(args[numArgs-1].getName() PGFX))) {
|
||||
state->setStrokePattern(pattern);
|
||||
builder->updateStyle(state);
|
||||
}
|
||||
@@ -1543,7 +1550,7 @@
|
||||
double *matrix = NULL;
|
||||
GBool savedState = gFalse;
|
||||
|
||||
- if (!(shading = res->lookupShading(args[0].getName()))) {
|
||||
+ if (!(shading = res->lookupShading(args[0].getName() PGFX))) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -2507,7 +2514,7 @@
|
||||
}
|
||||
}
|
||||
if (!obj1.isNull()) {
|
||||
- colorSpace = GfxColorSpace::parse(&obj1);
|
||||
+ colorSpace = GfxColorSpace::parse(&obj1 PGFX);
|
||||
} else if (csMode == streamCSDeviceGray) {
|
||||
colorSpace = new GfxDeviceGrayColorSpace();
|
||||
} else if (csMode == streamCSDeviceRGB) {
|
||||
@@ -2592,7 +2599,7 @@
|
||||
obj2.free();
|
||||
}
|
||||
}
|
||||
- maskColorSpace = GfxColorSpace::parse(&obj1);
|
||||
+ maskColorSpace = GfxColorSpace::parse(&obj1 PGFX);
|
||||
obj1.free();
|
||||
if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
|
||||
goto err1;
|
||||
@@ -2767,7 +2774,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 PGFX);
|
||||
}
|
||||
obj3.free();
|
||||
if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) {
|
16
inkscape-r9710-9712.patch
Normal file
16
inkscape-r9710-9712.patch
Normal file
@ -0,0 +1,16 @@
|
||||
=== modified file 'src/ui/tool/path-manipulator.cpp'
|
||||
--- src/ui/tool/path-manipulator.cpp 2010-04-06 14:11:54 +0000
|
||||
+++ src/ui/tool/path-manipulator.cpp 2010-08-13 21:10:23 +0000
|
||||
@@ -1414,7 +1414,10 @@
|
||||
NodeList::iterator first = (*spi)->before(pvp->t, &fracpart);
|
||||
|
||||
double stroke_tolerance = _getStrokeTolerance();
|
||||
- if (Geom::distance(evp, nearest_point) < stroke_tolerance) {
|
||||
+ if (first && first.next() &&
|
||||
+ fracpart != 0.0 &&
|
||||
+ Geom::distance(evp, nearest_point) < stroke_tolerance)
|
||||
+ {
|
||||
_dragpoint->setVisible(true);
|
||||
_dragpoint->setPosition(_desktop->w2d(nearest_point));
|
||||
_dragpoint->setSize(2 * stroke_tolerance);
|
||||
|
@ -1,8 +1,8 @@
|
||||
Index: inkscape-0.47/src/main.cpp
|
||||
Index: inkscape-0.48.0/src/main.cpp
|
||||
===================================================================
|
||||
--- inkscape-0.47.orig/src/main.cpp
|
||||
+++ inkscape-0.47/src/main.cpp
|
||||
@@ -1854,7 +1854,7 @@ sp_process_args(poptContext ctx)
|
||||
--- inkscape-0.48.0.orig/src/main.cpp
|
||||
+++ inkscape-0.48.0/src/main.cpp
|
||||
@@ -1894,7 +1894,7 @@ sp_process_args(poptContext ctx)
|
||||
break;
|
||||
}
|
||||
case SP_ARG_VERSION: {
|
||||
@ -11,18 +11,3 @@ Index: inkscape-0.47/src/main.cpp
|
||||
exit(0);
|
||||
break;
|
||||
}
|
||||
Index: inkscape-0.47/src/ui/dialog/aboutbox.cpp
|
||||
===================================================================
|
||||
--- inkscape-0.47.orig/src/ui/dialog/aboutbox.cpp
|
||||
+++ inkscape-0.47/src/ui/dialog/aboutbox.cpp
|
||||
@@ -103,8 +103,8 @@ AboutBox::AboutBox() : Gtk::Dialog(_("Ab
|
||||
|
||||
Gtk::Label *label=new Gtk::Label();
|
||||
gchar *label_text =
|
||||
- g_strdup_printf("<small><i>Inkscape %s, built %s</i></small>",
|
||||
- Inkscape::version_string, __DATE__);
|
||||
+ g_strdup_printf("<small><i>Inkscape %s</i></small>",
|
||||
+ Inkscape::version_string);
|
||||
label->set_markup(label_text);
|
||||
label->set_alignment(Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER);
|
||||
g_free(label_text);
|
||||
|
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Aug 15 22:27:48 CEST 2010 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 0.48.0:
|
||||
+ multipath editing
|
||||
+ improved text tool: subscript, superscript,numerical input for
|
||||
text kerning, tracking and more
|
||||
+ new Airbrush tool
|
||||
+ LaTeX export with PDF/PS/EPS
|
||||
+ JessyInk extension to create presentations
|
||||
+ numerous bugfixes
|
||||
- Rebase inkscape-remove-datetime.patch.
|
||||
- Drop inkscape-poppler-0.12.2.patch, inkscape-gcc45.patch and
|
||||
inkscape-non_void.patch: upstream fixed.
|
||||
- Add inkscape-r9710-9712.patch to fix node editor crash when
|
||||
dragging near the last node of a path.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 14 12:04:30 CEST 2010 - vuntz@opensuse.org
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package inkscape (Version 0.47)
|
||||
# spec file for package inkscape (Version 0.48.0)
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -18,8 +18,8 @@
|
||||
|
||||
|
||||
Name: inkscape
|
||||
Version: 0.47
|
||||
Release: 4
|
||||
Version: 0.48.0
|
||||
Release: 1
|
||||
License: GPLv2 ; LGPLv2.1
|
||||
Summary: Vector Illustration Program
|
||||
Url: http://www.inkscape.org/
|
||||
@ -28,16 +28,12 @@ Source: %{name}-%{version}.tar.bz2
|
||||
# openSUSE palette file
|
||||
Source1: openSUSE.gpl
|
||||
Source2: inkscape-split-extensions-extra.sh
|
||||
# PATCH-FEATURE-OPENSUSE inkscape-remove-datetime.patch vuntz@novell.com -- Do not put date/time in the compiled binary (needed for build-compare)
|
||||
Patch0: inkscape-remove-datetime.patch
|
||||
# PATCH-FIX-OPENSUSE inkscape-packages.patch sbrabec@suse.cz -- Suggest packages instead of compilation from source.
|
||||
Patch1: inkscape-packages.patch
|
||||
# PATCH-FIX-UPSTREAM inkscape-poppler-0.12.2.patch lp#487038 vuntz@opensuse.org -- Fix compilation with recent poppler
|
||||
Patch2: inkscape-poppler-0.12.2.patch
|
||||
# PATCH-FIX-OPENSUSE inkscape-remove-datetime.patch vuntz@novell.com -- Do not put date/time in the compiled binary (needed for build-compare)
|
||||
Patch18: inkscape-remove-datetime.patch
|
||||
# PATCH-FIX-UPSTREAM inkscape-gcc45.patch lp#522327 dimstar@opensuse.org -- Fix build with gcc 4.5. Patch taken from upstream bug tracker.
|
||||
Patch19: inkscape-gcc45.patch
|
||||
# PATCH-FIX-UPSTREAM inkscape-non_void.patch lp#530790 dimstar@opensuse.org -- Fix no-return-in-non-void function.
|
||||
Patch20: inkscape-non_void.patch
|
||||
# PATCH-FIX-UPSTREAM inkscape-r9710-9712.patch dimstar@opensuse.org -- Fix node editor crash when dragging near the last node of a path, upstream commits r9711 & 9712 merged.
|
||||
Patch2: inkscape-r9710-9712.patch
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: docbook-toys
|
||||
BuildRequires: fdupes
|
||||
@ -161,11 +157,9 @@ Inkscape is a vector illustration program for the GNOME desktop.
|
||||
%lang_package
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch18 -p1
|
||||
%patch19 -p1
|
||||
%patch20 -p1
|
||||
%patch2 -p0
|
||||
|
||||
%build
|
||||
export CXXFLAGS="%{optflags} -fno-strict-aliasing"
|
||||
@ -181,6 +175,9 @@ make %{?jobs:-j%jobs}
|
||||
rm -rf %{buildroot}%{_datadir}/locale/en_US@piglatin
|
||||
install -D -m 0644 %{S:1} %{buildroot}%{_datadir}/inkscape/palettes
|
||||
%suse_update_desktop_file -N "Inkscape" -G "SVG Vector Illustrator" inkscape
|
||||
%if 0%{?suse_version} <= 1120
|
||||
rm -rf %{buildroot}%{_datadir}/locale/te_IN
|
||||
%endif
|
||||
%find_lang %{name}
|
||||
bash %{S:2} %{buildroot}%{_datadir}/inkscape/extensions "%%{_datadir}/inkscape/extensions/"
|
||||
%fdupes %{buildroot}
|
||||
@ -190,9 +187,10 @@ rm -rf %{buildroot}
|
||||
|
||||
%files -f inkscape.lst
|
||||
%defattr(-,root,root)
|
||||
%doc AUTHORS COPYING COPYING.LIB ChangeLog HACKING* INSTALL NEWS README* TRANSLATORS
|
||||
%doc AUTHORS COPYING COPYING.LIB ChangeLog INSTALL NEWS README* TRANSLATORS
|
||||
%{_bindir}/*
|
||||
%{_datadir}/applications/inkscape.desktop
|
||||
%{_datadir}/icons/hicolor/*/apps/inkscape.png
|
||||
%dir %{_datadir}/inkscape
|
||||
%{_datadir}/inkscape/[cf-z]*
|
||||
%{_datadir}/inkscape/examples
|
||||
@ -205,12 +203,15 @@ rm -rf %{buildroot}
|
||||
%{_datadir}/inkscape/extensions/Poly3DObjects/
|
||||
%{_datadir}/inkscape/extensions/alphabet_soup/
|
||||
%{_datadir}/inkscape/extensions/inkweb.js
|
||||
%{_datadir}/inkscape/extensions/jessyInk.js
|
||||
%{_datadir}/inkscape/extensions/jessyInk_core_mouseHandler_noclick.js
|
||||
%{_datadir}/inkscape/extensions/jessyInk_core_mouseHandler_zoomControl.js
|
||||
%{_datadir}/inkscape/extensions/jessyInk_video.svg
|
||||
#BEGIN FIXME: What is purpose of these plugins? I see no references to them:
|
||||
%{_datadir}/inkscape/extensions/SpSVG.pm
|
||||
%{_datadir}/inkscape/extensions/Inkscape.pm
|
||||
%{_datadir}/inkscape/extensions/simplepath.rb
|
||||
#END FIXME
|
||||
%{_datadir}/pixmaps/inkscape.png
|
||||
%doc %{_mandir}/man?/*.*
|
||||
%doc %{_mandir}/??/man?/*.*
|
||||
# FIXME: should be part of filesystem
|
||||
|
Loading…
Reference in New Issue
Block a user