Accepting request 25859 from GNOME:Factory
Copy from GNOME:Factory/inkscape based on submit request 25859 from user vuntz OBS-URL: https://build.opensuse.org/request/show/25859 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/inkscape?expand=0&rev=30
This commit is contained in:
OBS User autobuild
Git OBS Bridge
parent
141988b1c3
commit
79a6bfd1b8
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2d50f940064da47c967109d95871128e609abaeb8f0f8f11204304e3f476c4f6
|
||||
size 13371001
|
||||
3
inkscape-0.47.tar.bz2
Normal file
3
inkscape-0.47.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4985bc5bf1938d818fee31c72151a2d889300c0be00fab5dc94ccd84df39ef3a
|
||||
size 20742550
|
||||
@ -1,12 +0,0 @@
|
||||
Index: inkscape-0.46/share/templates/Makefile.am
|
||||
===================================================================
|
||||
--- inkscape-0.46.orig/share/templates/Makefile.am
|
||||
+++ inkscape-0.46/share/templates/Makefile.am
|
||||
@@ -15,7 +15,6 @@ templates_DATA = \
|
||||
DVD_cover_slim_300dpi.svg \
|
||||
DVD_cover_superslim_300dpi.svg \
|
||||
DVD_cover_ultraslim_300dpi.svg \
|
||||
- default.svg \
|
||||
default.ca.svg \
|
||||
default.cs.svg \
|
||||
default.de.svg \
|
||||
@ -1,374 +0,0 @@
|
||||
Index: src/dom/lsimpl.cpp
|
||||
===================================================================
|
||||
--- src/dom/lsimpl.cpp.orig
|
||||
+++ src/dom/lsimpl.cpp
|
||||
@@ -33,6 +33,7 @@
|
||||
#include "lsimpl.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
+#include <cstdio>
|
||||
|
||||
namespace org
|
||||
{
|
||||
Index: src/dom/domimpl.cpp
|
||||
===================================================================
|
||||
--- src/dom/domimpl.cpp.orig
|
||||
+++ src/dom/domimpl.cpp
|
||||
@@ -28,6 +28,7 @@
|
||||
*/
|
||||
|
||||
|
||||
+#include <cstdio>
|
||||
#include "domimpl.h"
|
||||
|
||||
namespace org
|
||||
Index: src/dom/io/domstream.h
|
||||
===================================================================
|
||||
--- src/dom/io/domstream.h.orig
|
||||
+++ src/dom/io/domstream.h
|
||||
@@ -30,7 +30,7 @@
|
||||
*/
|
||||
|
||||
|
||||
-
|
||||
+#include <cstdio>
|
||||
#include <dom/dom.h>
|
||||
|
||||
namespace org
|
||||
Index: src/dom/io/uristream.cpp
|
||||
===================================================================
|
||||
--- src/dom/io/uristream.cpp.orig
|
||||
+++ src/dom/io/uristream.cpp
|
||||
@@ -41,6 +41,8 @@
|
||||
|
||||
|
||||
#include "uristream.h"
|
||||
+#include <cstdio>
|
||||
+#include <string.h>
|
||||
|
||||
|
||||
|
||||
Index: src/dom/io/socket.cpp
|
||||
===================================================================
|
||||
--- src/dom/io/socket.cpp.orig
|
||||
+++ src/dom/io/socket.cpp
|
||||
@@ -35,6 +35,7 @@
|
||||
#include <sys/filio.h> // needed on Solaris 8
|
||||
#endif
|
||||
|
||||
+#include <cstdio>
|
||||
#include "socket.h"
|
||||
#include "dom/util/thread.h"
|
||||
|
||||
Index: src/dom/io/domstream.cpp
|
||||
===================================================================
|
||||
--- src/dom/io/domstream.cpp.orig
|
||||
+++ src/dom/io/domstream.cpp
|
||||
@@ -34,6 +34,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
+#include <cstdio>
|
||||
#include <math.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
Index: src/dom/xpathtoken.h
|
||||
===================================================================
|
||||
--- src/dom/xpathtoken.h.orig
|
||||
+++ src/dom/xpathtoken.h
|
||||
@@ -35,6 +35,7 @@
|
||||
|
||||
#include <math.h>
|
||||
|
||||
+#include <cstdio>
|
||||
#include <vector>
|
||||
|
||||
namespace org
|
||||
Index: src/prefix.cpp
|
||||
===================================================================
|
||||
--- src/prefix.cpp.orig
|
||||
+++ src/prefix.cpp
|
||||
@@ -355,7 +355,8 @@ br_strndup (char *str, size_t size)
|
||||
char *
|
||||
br_extract_dir (const char *path)
|
||||
{
|
||||
- char *end, *result;
|
||||
+ const char *end;
|
||||
+ char *result;
|
||||
|
||||
br_return_val_if_fail (path != (char*)NULL, (char*)NULL);
|
||||
|
||||
@@ -390,7 +391,8 @@ br_extract_dir (const char *path)
|
||||
char *
|
||||
br_extract_prefix (const char *path)
|
||||
{
|
||||
- char *end, *tmp, *result;
|
||||
+ const char *end;
|
||||
+ char *tmp, *result;
|
||||
|
||||
br_return_val_if_fail (path != (char*)NULL, (char*)NULL);
|
||||
|
||||
Index: src/2geom/sbasis-math.cpp
|
||||
===================================================================
|
||||
--- src/2geom/sbasis-math.cpp.orig
|
||||
+++ src/2geom/sbasis-math.cpp
|
||||
@@ -37,12 +37,12 @@
|
||||
#include "sbasis-math.h"
|
||||
//#define ZERO 1e-3
|
||||
|
||||
+#include <stdio.h>
|
||||
+#include <math.h>
|
||||
|
||||
-namespace Geom {
|
||||
|
||||
+namespace Geom {
|
||||
|
||||
-#include <stdio.h>
|
||||
-#include <math.h>
|
||||
|
||||
//-|x|-----------------------------------------------------------------------
|
||||
Piecewise<SBasis> abs(SBasis const &f){
|
||||
Index: src/xml/event.cpp
|
||||
===================================================================
|
||||
--- src/xml/event.cpp.orig
|
||||
+++ src/xml/event.cpp
|
||||
@@ -14,6 +14,7 @@
|
||||
*/
|
||||
|
||||
#include <glib.h> // g_assert()
|
||||
+#include <cstdio>
|
||||
|
||||
#include "event.h"
|
||||
#include "event-fns.h"
|
||||
Index: src/dialogs/export.cpp
|
||||
===================================================================
|
||||
--- src/dialogs/export.cpp.orig
|
||||
+++ src/dialogs/export.cpp
|
||||
@@ -20,6 +20,9 @@
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
+// This has to be included prior to anything that includes setjmp.h, it croaks otherwise
|
||||
+#include <png.h>
|
||||
+
|
||||
#include <gtk/gtk.h>
|
||||
#include <gtkmm/box.h>
|
||||
#include <gtkmm/buttonbox.h>
|
||||
@@ -60,7 +63,6 @@
|
||||
#include "io/sys.h"
|
||||
|
||||
#include "helper/png-write.h"
|
||||
-#include <png.h>
|
||||
|
||||
|
||||
#define SP_EXPORT_MIN_SIZE 1.0
|
||||
@@ -1041,7 +1043,7 @@ create_progress_dialog (GtkObject *base,
|
||||
static gchar *
|
||||
filename_add_extension (const gchar *filename, const gchar *extension)
|
||||
{
|
||||
- gchar *dot;
|
||||
+ const gchar *dot;
|
||||
|
||||
dot = strrchr (filename, '.');
|
||||
if ( !dot )
|
||||
Index: src/sp-image.cpp
|
||||
===================================================================
|
||||
--- src/sp-image.cpp.orig
|
||||
+++ src/sp-image.cpp
|
||||
@@ -17,6 +17,9 @@
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
+// This has to be included prior to anything that includes setjmp.h, it croaks otherwise
|
||||
+#include <png.h>
|
||||
+
|
||||
#include <cstring>
|
||||
#include <string>
|
||||
#include <libnr/nr-matrix-fns.h>
|
||||
@@ -41,7 +44,6 @@
|
||||
#include "libnr/nr-matrix-fns.h"
|
||||
|
||||
#include "io/sys.h"
|
||||
-#include <png.h>
|
||||
#if ENABLE_LCMS
|
||||
#include "color-profile-fns.h"
|
||||
#include "color-profile.h"
|
||||
Index: src/document.cpp
|
||||
===================================================================
|
||||
--- src/document.cpp.orig
|
||||
+++ src/document.cpp
|
||||
@@ -746,7 +746,7 @@ Glib::ustring SPDocument::getLanguage()
|
||||
}
|
||||
|
||||
if ( NULL != document_language ) {
|
||||
- gchar *pos = strchr(document_language, '_');
|
||||
+ const char *pos = strchr(document_language, '_');
|
||||
if ( NULL != pos ) {
|
||||
return Glib::ustring(document_language, pos - document_language);
|
||||
}
|
||||
Index: src/libavoid/vertices.h
|
||||
===================================================================
|
||||
--- src/libavoid/vertices.h.orig
|
||||
+++ src/libavoid/vertices.h
|
||||
@@ -27,6 +27,7 @@
|
||||
#include <set>
|
||||
#include <map>
|
||||
#include <iostream>
|
||||
+#include <cstdio>
|
||||
#include "libavoid/geomtypes.h"
|
||||
|
||||
namespace Avoid {
|
||||
Index: src/libnr/nr-matrix-fns.cpp
|
||||
===================================================================
|
||||
--- src/libnr/nr-matrix-fns.cpp.orig
|
||||
+++ src/libnr/nr-matrix-fns.cpp
|
||||
@@ -1,4 +1,5 @@
|
||||
#include <libnr/nr-matrix-fns.h>
|
||||
+#include <cstdio>
|
||||
|
||||
namespace NR {
|
||||
|
||||
Index: src/main.cpp
|
||||
===================================================================
|
||||
--- src/main.cpp.orig
|
||||
+++ src/main.cpp
|
||||
@@ -28,6 +28,9 @@
|
||||
#endif
|
||||
#include "path-prefix.h"
|
||||
|
||||
+// This has to be included prior to anything that includes setjmp.h, it croaks otherwise
|
||||
+#include <png.h>
|
||||
+
|
||||
#include <gtk/gtkmessagedialog.h>
|
||||
|
||||
#ifdef HAVE_IEEEFP_H
|
||||
@@ -111,7 +114,6 @@ using Inkscape::Extension::Internal::Pri
|
||||
|
||||
#include "main-cmdlineact.h"
|
||||
|
||||
-#include <png.h>
|
||||
#include <errno.h>
|
||||
|
||||
enum {
|
||||
Index: src/io/inkscapestream.h
|
||||
===================================================================
|
||||
--- src/io/inkscapestream.h.orig
|
||||
+++ src/io/inkscapestream.h
|
||||
@@ -12,6 +12,7 @@
|
||||
*/
|
||||
|
||||
|
||||
+#include <cstdio>
|
||||
#include <glibmm.h>
|
||||
|
||||
namespace Inkscape
|
||||
Index: src/io/gzipstream.cpp
|
||||
===================================================================
|
||||
--- src/io/gzipstream.cpp.orig
|
||||
+++ src/io/gzipstream.cpp
|
||||
@@ -14,6 +14,7 @@
|
||||
*/
|
||||
|
||||
#include "gzipstream.h"
|
||||
+#include <cstdio>
|
||||
#include <cstring>
|
||||
#include <string>
|
||||
|
||||
Index: src/streams-handles.cpp
|
||||
===================================================================
|
||||
--- src/streams-handles.cpp.orig
|
||||
+++ src/streams-handles.cpp
|
||||
@@ -12,6 +12,7 @@
|
||||
#include "streams-handles.h"
|
||||
#include "uri.h"
|
||||
|
||||
+#include <cstdio>
|
||||
#include <iostream>
|
||||
|
||||
namespace Inkscape {
|
||||
Index: src/streams-zlib.cpp
|
||||
===================================================================
|
||||
--- src/streams-zlib.cpp.orig
|
||||
+++ src/streams-zlib.cpp
|
||||
@@ -9,6 +9,7 @@
|
||||
* Released under GNU LGPL, read the file 'COPYING.LIB' for more information
|
||||
*/
|
||||
|
||||
+#include <cstdio>
|
||||
#include <cstring>
|
||||
#include <string>
|
||||
#include <string.h>
|
||||
Index: src/dom/svg/svgtypes.h
|
||||
===================================================================
|
||||
--- src/dom/svg/svgtypes.h.orig
|
||||
+++ src/dom/svg/svgtypes.h
|
||||
@@ -47,6 +47,7 @@
|
||||
#include "dom/smil.h"
|
||||
|
||||
|
||||
+#include <cstdio>
|
||||
#include <math.h>
|
||||
|
||||
|
||||
Index: src/dom/svg/svgparser.cpp
|
||||
===================================================================
|
||||
--- src/dom/svg/svgparser.cpp.orig
|
||||
+++ src/dom/svg/svgparser.cpp
|
||||
@@ -32,6 +32,7 @@
|
||||
#include "dom/cssparser.h"
|
||||
#include "dom/charclass.h"
|
||||
|
||||
+#include <cstdio>
|
||||
#include <stdarg.h>
|
||||
|
||||
#define SVG_NAMESPACE "http://www.w3.org/2000/svg"
|
||||
Index: src/io/sys.cpp
|
||||
===================================================================
|
||||
--- src/io/sys.cpp.orig
|
||||
+++ src/io/sys.cpp
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <glibmm/ustring.h>
|
||||
#include <gtk/gtkmessagedialog.h>
|
||||
|
||||
+#include <cstdio>
|
||||
#include "prefs-utils.h"
|
||||
#include "sys.h"
|
||||
|
||||
Index: src/2geom/svg-path-parser.h
|
||||
===================================================================
|
||||
--- src/2geom/svg-path-parser.h.orig
|
||||
+++ src/2geom/svg-path-parser.h
|
||||
@@ -32,6 +32,7 @@
|
||||
#ifndef SEEN_SVG_PATH_PARSER_H
|
||||
#define SEEN_SVG_PATH_PARSER_H
|
||||
|
||||
+#include <cstdio>
|
||||
#include <vector>
|
||||
#include <iterator>
|
||||
#include <stdexcept>
|
||||
Index: src/libnr/nr-matrix.cpp
|
||||
===================================================================
|
||||
--- src/libnr/nr-matrix.cpp.orig
|
||||
+++ src/libnr/nr-matrix.cpp
|
||||
@@ -11,6 +11,7 @@
|
||||
* This code is in public domain
|
||||
*/
|
||||
|
||||
+#include <cstdio>
|
||||
#include <cstdlib>
|
||||
#include "nr-matrix.h"
|
||||
|
||||
Index: src/libnr/nr-object.cpp
|
||||
===================================================================
|
||||
--- src/libnr/nr-object.cpp.orig
|
||||
+++ src/libnr/nr-object.cpp
|
||||
@@ -198,8 +198,8 @@ NRObject *NRObject::alloc(NRType type)
|
||||
);
|
||||
memset(object, 0xf0, c->isize);
|
||||
|
||||
- object->klass = c;
|
||||
c->cpp_ctor(object);
|
||||
+ object->klass = c;
|
||||
nr_class_tree_object_invoke_init (c, object);
|
||||
|
||||
return object;
|
||||
@ -1,25 +0,0 @@
|
||||
=== modified file 'src/widgets/sp-xmlview-attr-list.cpp'
|
||||
--- src/widgets/sp-xmlview-attr-list.cpp 2008-06-27 22:00:47 +0000
|
||||
+++ src/widgets/sp-xmlview-attr-list.cpp 2008-06-27 22:48:41 +0000
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
#include <cstring>
|
||||
#include <glibmm/i18n.h>
|
||||
-
|
||||
+#include <gtk/gtk.h>
|
||||
#include "helper/sp-marshal.h"
|
||||
#include "../xml/node-event-vector.h"
|
||||
#include "sp-xmlview-attr-list.h"
|
||||
|
||||
=== modified file 'src/widgets/sp-xmlview-attr-list.h'
|
||||
--- src/widgets/sp-xmlview-attr-list.h 2008-06-27 22:00:47 +0000
|
||||
+++ src/widgets/sp-xmlview-attr-list.h 2008-06-27 22:46:50 +0000
|
||||
@@ -14,6 +14,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <gtk/gtkclist.h>
|
||||
+#include <gtk/gtk.h>
|
||||
#include "../xml/repr.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
diff -NrU5 inkscape-0.46.orig/src/extension/internal/pdfinput/pdf-parser.cpp inkscape-0.46/src/extension/internal/pdfinput/pdf-parser.cpp
|
||||
--- inkscape-0.46.orig/src/extension/internal/pdfinput/pdf-parser.cpp 2008-06-05 00:26:20.000000000 +0200
|
||||
+++ inkscape-0.46/src/extension/internal/pdfinput/pdf-parser.cpp 2008-06-05 00:51:47.000000000 +0200
|
||||
@@ -2194,11 +2194,11 @@
|
||||
void PdfParser::doShowText(GooString *s) {
|
||||
GfxFont *font;
|
||||
int wMode;
|
||||
double riseX, riseY;
|
||||
CharCode code;
|
||||
- Unicode u[8];
|
||||
+ Unicode *u = NULL;
|
||||
double x, y, dx, dy, dx2, dy2, curX, curY, tdx, tdy, lineX, lineY;
|
||||
double originX, originY, tOriginX, tOriginY;
|
||||
double oldCTM[6], newCTM[6];
|
||||
double *mat;
|
||||
Object charProc;
|
||||
@@ -2242,11 +2242,11 @@
|
||||
oldParser = parser;
|
||||
p = s->getCString();
|
||||
len = s->getLength();
|
||||
while (len > 0) {
|
||||
n = font->getNextChar(p, len, &code,
|
||||
- u, (int)(sizeof(u) / sizeof(Unicode)), &uLen,
|
||||
+ &u, &uLen,
|
||||
&dx, &dy, &originX, &originY);
|
||||
dx = dx * state->getFontSize() + state->getCharSpace();
|
||||
if (n == 1 && *p == ' ') {
|
||||
dx += state->getWordSpace();
|
||||
}
|
||||
@@ -2291,11 +2291,11 @@
|
||||
state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
|
||||
p = s->getCString();
|
||||
len = s->getLength();
|
||||
while (len > 0) {
|
||||
n = font->getNextChar(p, len, &code,
|
||||
- u, (int)(sizeof(u) / sizeof(Unicode)), &uLen,
|
||||
+ &u, &uLen,
|
||||
&dx, &dy, &originX, &originY);
|
||||
|
||||
if (wMode) {
|
||||
dx *= state->getFontSize();
|
||||
dy = dy * state->getFontSize() + state->getCharSpace();
|
||||
|
||||
@ -1,22 +1,26 @@
|
||||
--- share/extensions/export_gimp_palette.py
|
||||
+++ share/extensions/export_gimp_palette.py
|
||||
@@ -11,7 +11,7 @@
|
||||
try:
|
||||
from xml.dom.minidom import parse
|
||||
except:
|
||||
- sys.exit('The export_gpl.py module requires PyXML. Please download the latest version from <http://pyxml.sourceforge.net/>.')
|
||||
+ sys.exit('The export_gpl.py module requires PyXML. Please install pyxml package.')
|
||||
|
||||
colortags=(u'fill',u'stroke',u'stop-color',u'flood-color',u'lighting-color')
|
||||
colors={}
|
||||
--- share/extensions/inkex.py
|
||||
+++ share/extensions/inkex.py
|
||||
@@ -56,7 +56,7 @@
|
||||
Index: inkscape-0.47/share/extensions/export_gimp_palette.py
|
||||
===================================================================
|
||||
--- inkscape-0.47.orig/share/extensions/export_gimp_palette.py
|
||||
+++ inkscape-0.47/share/extensions/export_gimp_palette.py
|
||||
@@ -11,7 +11,7 @@ import sys, simplestyle
|
||||
try:
|
||||
from xml.dom.minidom import parse
|
||||
except:
|
||||
- sys.exit(_('The export_gpl.py module requires PyXML. Please download the latest version from http://pyxml.sourceforge.net/.'))
|
||||
+ sys.exit(_('The export_gpl.py module requires PyXML. Please install pyxml package.'))
|
||||
|
||||
colortags=(u'fill',u'stroke',u'stop-color',u'flood-color',u'lighting-color')
|
||||
colors={}
|
||||
Index: inkscape-0.47/share/extensions/inkex.py
|
||||
===================================================================
|
||||
--- inkscape-0.47.orig/share/extensions/inkex.py
|
||||
+++ inkscape-0.47/share/extensions/inkex.py
|
||||
@@ -63,7 +63,7 @@ def uutounit(val, unit):
|
||||
try:
|
||||
from lxml import etree
|
||||
except:
|
||||
- sys.exit('The fantastic lxml wrapper for libxml2 is required by inkex.py and therefore this extension. Please download and install the latest version from <http://cheeseshop.python.org/pypi/lxml/>, or install it through your package manager by a command like: sudo apt-get install python-lxml')
|
||||
+ sys.exit('The fantastic lxml wrapper for libxml2 is required by inkex.py and therefore this extension. Please install python-lxml package.')
|
||||
- sys.exit(_('The fantastic lxml wrapper for libxml2 is required by inkex.py and therefore this extension. Please download and install the latest version from http://cheeseshop.python.org/pypi/lxml/, or install it through your package manager by a command like: sudo apt-get install python-lxml'))
|
||||
+ sys.exit(_('The fantastic lxml wrapper for libxml2 is required by inkex.py and therefore this extension. Please download and install it through your package manager by a command like: sudo zypper install python-lxml'))
|
||||
|
||||
def debug(what):
|
||||
sys.stderr.write(str(what) + "\n")
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
--- src/libavoid/polyutil.cpp
|
||||
+++ src/libavoid/polyutil.cpp
|
||||
@@ -35,6 +35,7 @@
|
||||
{
|
||||
Polygn newpoly;
|
||||
|
||||
+ newpoly.id = 0;
|
||||
newpoly.pn = size;
|
||||
newpoly.ps = (Point *) calloc(size, sizeof(Point));
|
||||
if (!newpoly.ps)
|
||||
@ -1,28 +1,28 @@
|
||||
Index: inkscape-0.46/src/main.cpp
|
||||
Index: inkscape-0.47/src/main.cpp
|
||||
===================================================================
|
||||
--- inkscape-0.46.orig/src/main.cpp
|
||||
+++ inkscape-0.46/src/main.cpp
|
||||
@@ -1506,7 +1506,7 @@ sp_process_args(poptContext ctx)
|
||||
--- inkscape-0.47.orig/src/main.cpp
|
||||
+++ inkscape-0.47/src/main.cpp
|
||||
@@ -1854,7 +1854,7 @@ sp_process_args(poptContext ctx)
|
||||
break;
|
||||
}
|
||||
case SP_ARG_VERSION: {
|
||||
- printf("Inkscape %s (%s)\n", INKSCAPE_VERSION, __DATE__);
|
||||
+ printf("Inkscape %s\n", INKSCAPE_VERSION);
|
||||
- printf("Inkscape %s (%s)\n", Inkscape::version_string, __DATE__);
|
||||
+ printf("Inkscape %s\n", Inkscape::version_string);
|
||||
exit(0);
|
||||
break;
|
||||
}
|
||||
Index: inkscape-0.46/src/ui/dialog/aboutbox.cpp
|
||||
Index: inkscape-0.47/src/ui/dialog/aboutbox.cpp
|
||||
===================================================================
|
||||
--- inkscape-0.46.orig/src/ui/dialog/aboutbox.cpp
|
||||
+++ inkscape-0.46/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, __DATE__);
|
||||
- Inkscape::version_string, __DATE__);
|
||||
+ g_strdup_printf("<small><i>Inkscape %s</i></small>",
|
||||
+ INKSCAPE_VERSION);
|
||||
+ Inkscape::version_string);
|
||||
label->set_markup(label_text);
|
||||
label->set_alignment(Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER);
|
||||
g_free(label_text);
|
||||
|
||||
@ -1,164 +0,0 @@
|
||||
=== modified file 'src/2geom/convex-cover.cpp'
|
||||
--- src/2geom/convex-cover.cpp 2008-05-07 15:41:04 +0000
|
||||
+++ src/2geom/convex-cover.cpp 2008-05-07 16:42:51 +0000
|
||||
@@ -264,7 +264,8 @@
|
||||
*/
|
||||
bool
|
||||
ConvexHull::no_colinear_points() const {
|
||||
-
|
||||
+ // Urgh
|
||||
+ return false;
|
||||
}
|
||||
|
||||
bool
|
||||
@@ -350,6 +351,7 @@
|
||||
// al and bl now point to the top of the first pair of edges that overlap in y value
|
||||
double sweep_y = std::min(a.boundary[al][Y],
|
||||
b.boundary[bl][Y]);
|
||||
+ return ret;
|
||||
}
|
||||
|
||||
/*** ConvexHull intersection(ConvexHull a, ConvexHull b);
|
||||
|
||||
=== modified file 'src/2geom/poly-laguerre-solve.cpp'
|
||||
--- src/2geom/poly-laguerre-solve.cpp 2008-05-07 15:41:04 +0000
|
||||
+++ src/2geom/poly-laguerre-solve.cpp 2008-05-07 16:44:43 +0000
|
||||
@@ -133,6 +133,9 @@
|
||||
laguerre_real_interval(Poly const & ply,
|
||||
const double lo, const double hi,
|
||||
const double tol) {
|
||||
+ std::vector<double> retval;
|
||||
+
|
||||
+ return retval;
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
=== modified file 'src/display/nr-filter-specularlighting.cpp'
|
||||
--- src/display/nr-filter-specularlighting.cpp 2008-05-07 15:41:04 +0000
|
||||
+++ src/display/nr-filter-specularlighting.cpp 2008-05-07 15:41:27 +0000
|
||||
@@ -108,8 +108,9 @@
|
||||
data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_RED]);
|
||||
data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_GREEN]);
|
||||
data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_BLUE]);
|
||||
- data_o[j++] = MAX(MAX(data_o[j-3], data_o[j-2]), data_o[j-1]);
|
||||
- }
|
||||
+ data_o[j] = MAX(MAX(data_o[j-3], data_o[j-2]), data_o[j-1]);
|
||||
+ j++;
|
||||
+ }
|
||||
out->empty = FALSE;
|
||||
delete dl;
|
||||
}
|
||||
@@ -135,7 +136,8 @@
|
||||
data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_RED]);
|
||||
data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_GREEN]);
|
||||
data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_BLUE]);
|
||||
- data_o[j++] = MAX(MAX(data_o[j-3], data_o[j-2]), data_o[j-1]);
|
||||
+ data_o[j] = MAX(MAX(data_o[j-3], data_o[j-2]), data_o[j-1]);
|
||||
+ j++;
|
||||
}
|
||||
out->empty = FALSE;
|
||||
delete pl;
|
||||
@@ -162,7 +164,8 @@
|
||||
data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_RED]);
|
||||
data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_GREEN]);
|
||||
data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_BLUE]);
|
||||
- data_o[j++] = MAX(MAX(data_o[j-3], data_o[j-2]), data_o[j-1]);
|
||||
+ data_o[j] = MAX(MAX(data_o[j-3], data_o[j-2]), data_o[j-1]);
|
||||
+ j++;
|
||||
}
|
||||
out->empty = FALSE;
|
||||
delete sl;
|
||||
|
||||
=== modified file 'src/extension/internal/pov-out.cpp'
|
||||
--- src/extension/internal/pov-out.cpp 2008-05-07 15:41:04 +0000
|
||||
+++ src/extension/internal/pov-out.cpp 2008-05-07 15:41:27 +0000
|
||||
@@ -133,9 +133,9 @@
|
||||
void PovOutput::vec2(double a, double b)
|
||||
{
|
||||
out("<");
|
||||
- out(dstr(a).c_str());
|
||||
+ out("%s", dstr(a).c_str());
|
||||
out(", ");
|
||||
- out(dstr(b).c_str());
|
||||
+ out("%s", dstr(b).c_str());
|
||||
out(">");
|
||||
}
|
||||
|
||||
@@ -147,11 +147,11 @@
|
||||
void PovOutput::vec3(double a, double b, double c)
|
||||
{
|
||||
out("<");
|
||||
- out(dstr(a).c_str());
|
||||
- out(", ");
|
||||
- out(dstr(b).c_str());
|
||||
- out(", ");
|
||||
- out(dstr(c).c_str());
|
||||
+ out("%s", dstr(a).c_str());
|
||||
+ out(", ");
|
||||
+ out("%s", dstr(b).c_str());
|
||||
+ out(", ");
|
||||
+ out("%s", dstr(c).c_str());
|
||||
out(">");
|
||||
}
|
||||
|
||||
@@ -163,13 +163,13 @@
|
||||
void PovOutput::vec4(double a, double b, double c, double d)
|
||||
{
|
||||
out("<");
|
||||
- out(dstr(a).c_str());
|
||||
- out(", ");
|
||||
- out(dstr(b).c_str());
|
||||
- out(", ");
|
||||
- out(dstr(c).c_str());
|
||||
- out(", ");
|
||||
- out(dstr(d).c_str());
|
||||
+ out("%s", dstr(a).c_str());
|
||||
+ out(", ");
|
||||
+ out("%s", dstr(b).c_str());
|
||||
+ out(", ");
|
||||
+ out("%s", dstr(c).c_str());
|
||||
+ out(", ");
|
||||
+ out("%s", dstr(d).c_str());
|
||||
out(">");
|
||||
}
|
||||
|
||||
|
||||
=== modified file 'src/libgdl/gdl-dock-placeholder.c'
|
||||
--- src/libgdl/gdl-dock-placeholder.c 2008-05-07 15:41:04 +0000
|
||||
+++ src/libgdl/gdl-dock-placeholder.c 2008-05-07 15:41:27 +0000
|
||||
@@ -491,7 +491,7 @@
|
||||
GdlDockObject *toplevel;
|
||||
|
||||
if (!gdl_dock_object_is_bound (GDL_DOCK_OBJECT (ph))) {
|
||||
- g_warning (_("Attempt to dock a dock object to an unbound placeholder"));
|
||||
+ g_warning ("%s", _("Attempt to dock a dock object to an unbound placeholder"));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
=== modified file 'src/libgdl/gdl-stock.c'
|
||||
--- src/libgdl/gdl-stock.c 2008-05-07 15:41:04 +0000
|
||||
+++ src/libgdl/gdl-stock.c 2008-05-07 15:41:27 +0000
|
||||
@@ -60,7 +60,7 @@
|
||||
|
||||
pixbuf = gdk_pixbuf_new_from_inline (data_size, icon_data, FALSE, &err);
|
||||
if (err) {
|
||||
- g_warning (err->message);
|
||||
+ g_warning ("%s", err->message);
|
||||
g_error_free (err);
|
||||
err = NULL;
|
||||
g_object_unref (source);
|
||||
|
||||
=== modified file 'src/libgdl/gdl-switcher.c'
|
||||
--- src/libgdl/gdl-switcher.c 2008-05-07 15:41:04 +0000
|
||||
+++ src/libgdl/gdl-switcher.c 2008-05-07 16:45:53 +0000
|
||||
@@ -524,6 +524,7 @@
|
||||
}
|
||||
GDL_CALL_PARENT_WITH_DEFAULT (GTK_WIDGET_CLASS, expose_event,
|
||||
(widget, event), FALSE);
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
|
||||
@ -1,3 +1,40 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 27 14:50:21 CET 2009 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 0.47:
|
||||
+ Timed autosave: no more lost work
|
||||
+ Spiro splines: an exciting new way to work with paths, fully
|
||||
supported in Pen, Pencil, and Node tools
|
||||
+ Auto smooth nodes: a new type of node that keeps the path as
|
||||
smooth as possible as you move it or its neighbors
|
||||
+ New modes in Tweak tool: pushing and jittering whole objects,
|
||||
scaling/rotating objects, deleting and duplicating using the
|
||||
"soft brush"
|
||||
+ Reworked, much more usable snapping system and a Snapping
|
||||
toolbar
|
||||
+ New path effects, including sketch, hatching, envelope
|
||||
deformation: effects can be stacked and assigned to groups
|
||||
+ A huge collection of preset filters in the new Filters menu
|
||||
+ New cairo-based PS and EPS export: improved quality, more
|
||||
features supported, fallback rasterization for filters and
|
||||
transparency
|
||||
+ Spell checker for text objects in a document
|
||||
+ Many new extensions: restacking, calendar, printing marks,
|
||||
cartesian and polar grids, interpolating attributes
|
||||
+ Optimized SVG code options, now with their own Preferences page
|
||||
+ Many other improvements, usability tweaks, memleak stops, and
|
||||
misc bugfixes
|
||||
- Drop patches: inkscape-automake111.patch, inkscape-gcc44.patch,
|
||||
inkscape-gtk-clist.patch, inkscape-lp237574-poppler.patch,
|
||||
inkscape-polyutil-newpoly.patch, inkscape-warnings.patch,
|
||||
- Rebased patches: inkscape-packages.patch and
|
||||
inkscape-remove-datetime.patch.
|
||||
- No longer patch configure.ac during %setup.
|
||||
- Add gsl-devel BuildRequires.
|
||||
- Added openSUSE palette file to the package (openSUSE.gpl).
|
||||
- Do not provide sodipodi; version Obsoletes for sodipodi.
|
||||
Fixes a rpmlint warning.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 3 19:09:21 UTC 2009 - coolo@novell.com
|
||||
|
||||
|
||||
420
inkscape.spec
420
inkscape.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package inkscape (Version 0.46)
|
||||
# spec file for package inkscape (Version 0.47)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -15,105 +15,70 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
|
||||
|
||||
Name: inkscape
|
||||
BuildRequires: boost-devel docbook-toys fdupes gc-devel gcc-c++ gnome-vfs2-devel gtkmm24-devel intltool libMagick++-devel liblcms-devel libpoppler-glib-devel libwpg-devel libxslt-devel perl python-devel python-gtk-devel sgml-skel update-desktop-files
|
||||
License: GPL v2 only ; LGPL v2.1 only
|
||||
Version: 0.47
|
||||
Release: 1
|
||||
License: GPLv2 ; LGPLv2.1
|
||||
Summary: Vector Illustration Program
|
||||
Url: http://www.inkscape.org/
|
||||
Group: Productivity/Graphics/Vector Editors
|
||||
Requires: ghostscript-fonts-std python-gtk pstoedit gzip /usr/bin/gs
|
||||
Summary: Inkscape Vector Illustration Program
|
||||
Version: 0.46
|
||||
Release: 69
|
||||
# package in <= NLD9 and SuSE Linux <= 9.1
|
||||
Provides: sodipodi
|
||||
Obsoletes: sodipodi
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
# openSUSE palette file
|
||||
Source1: openSUSE.gpl
|
||||
Source2: inkscape-split-extensions-extra.sh
|
||||
#PATCH-FIX-OPENSUSE inkscape-packages.patch sbrabec@suse.cz -- Suggest packages instead of compilation from source.
|
||||
Patch1: inkscape-packages.patch
|
||||
# PATCH-FIX-UPSTREAM inkscape-polyutil-newpoly.patch lp375771
|
||||
Patch13: inkscape-polyutil-newpoly.patch
|
||||
# PATCH-FIX-UPSTREAM inkscape-warnings.patch
|
||||
Patch15: inkscape-warnings.patch
|
||||
# PATCH-FIX-UPSTREAM inkscape-gtk-clist.patch lp238223 maw@novell.com -- This is arguably a gtk+ bug (bgo536767)
|
||||
Patch16: inkscape-gtk-clist.patch
|
||||
# PATCH-FIX-UPSTREAM inkscape-lp237574-poppler.patch lp237574 vuntz@novell.com -- Fix compilation with latest poppler
|
||||
Patch17: inkscape-lp237574-poppler.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-gcc44.patch vuntz@novell.com -- Taken from svn
|
||||
Patch19: inkscape-gcc44.patch
|
||||
# PATCH-FIX-UPSTREAM inkscape-automake111.patch coolo@novell.com -- fix duplicated files
|
||||
Patch20: inkscape-automake111.patch
|
||||
Url: http://www.inkscape.org/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: docbook-toys
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gc-devel
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gnome-vfs2-devel
|
||||
BuildRequires: gsl-devel
|
||||
BuildRequires: gtkmm24-devel
|
||||
BuildRequires: intltool
|
||||
BuildRequires: libMagick++-devel
|
||||
BuildRequires: liblcms-devel
|
||||
BuildRequires: libpoppler-glib-devel
|
||||
BuildRequires: libwpg-devel
|
||||
BuildRequires: libxslt-devel
|
||||
BuildRequires: perl
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: python-gtk-devel
|
||||
BuildRequires: sgml-skel
|
||||
BuildRequires: update-desktop-files
|
||||
Requires: %{name}-lang = %{version}
|
||||
Requires: /usr/bin/gs
|
||||
Requires: ghostscript-fonts-std
|
||||
Requires: gzip
|
||||
Requires: pstoedit
|
||||
Requires: python-gtk
|
||||
Recommends: python-lxml
|
||||
# package in <= NLD9 and SuSE Linux <= 9.1
|
||||
Obsoletes: sodipodi <= 0.34
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
Inkscape is a vector illustration program for the GNOME desktop.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Alexander Clausen
|
||||
John Bintz
|
||||
Arpad Biro
|
||||
Daniel Borgmann
|
||||
Hans Breuer
|
||||
Bulia Byak
|
||||
Chema Celorio
|
||||
Johan Ceuppens
|
||||
Zbigniew Chyla
|
||||
John Cliff
|
||||
Kees Cook
|
||||
Robert Crosbie
|
||||
Jon Cruz
|
||||
Danilo Egan
|
||||
Frank Felfe
|
||||
Fred
|
||||
Ted Gould
|
||||
Bryce Harrington
|
||||
Carl Hetherington
|
||||
Nathan Hurst
|
||||
Thomas Ingham
|
||||
Bob Jamison
|
||||
Lauris Kaplinski
|
||||
Lynn Kerby
|
||||
Petr Kovar
|
||||
Raph Levien
|
||||
Vitaly Lipatov
|
||||
Dmitry G. Mastrukov
|
||||
Michael Meeks
|
||||
Federico Mena
|
||||
MenTaLguY
|
||||
Peter Moulder
|
||||
Yukihiro Nakai
|
||||
Christian Neumair
|
||||
Mitsuru Oka
|
||||
Jon Phillips
|
||||
Christian Schaller
|
||||
Tom von Schwerdtner
|
||||
Pat Suwalski
|
||||
Adib Taraben
|
||||
Daniel Yacob
|
||||
Masatake Yamato
|
||||
|
||||
%package extensions-extra
|
||||
License: GPL v2 only ; LGPL v2.1 only
|
||||
Summary: Inkscape Vector Illustration Program - Extra Extensions
|
||||
License: GPLv2 ; LGPLv2.1
|
||||
Summary: Vector Illustration Program - Extra Extensions
|
||||
Group: Productivity/Graphics/Vector Editors
|
||||
Requires: %{name} = %{version} python-lxml pyxml
|
||||
Requires: %{name} = %{version}
|
||||
Requires: python-lxml
|
||||
Requires: pyxml
|
||||
# for cdr and wmf modules
|
||||
Requires: yudit
|
||||
# python-lxml requires pyxml => supplement installation, if all three are present
|
||||
Supplements: packageand(%{name}:python-lxml)
|
||||
Enhances: %{name}
|
||||
# Package in openSUSE <= 11.0 and SLED <= 10
|
||||
Provides: %{name}:%{_datadir}/inkscape/extensions/inkex.py
|
||||
Enhances: %{name}
|
||||
|
||||
%description extensions-extra
|
||||
Extra extensions for Inkscape. Recommended for everybody who wants to
|
||||
@ -121,124 +86,32 @@ use Inkscape.
|
||||
|
||||
Inkscape is a vector illustration program for the GNOME desktop.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Alexander Clausen
|
||||
John Bintz
|
||||
Arpad Biro
|
||||
Daniel Borgmann
|
||||
Hans Breuer
|
||||
Bulia Byak
|
||||
Chema Celorio
|
||||
Johan Ceuppens
|
||||
Zbigniew Chyla
|
||||
John Cliff
|
||||
Kees Cook
|
||||
Robert Crosbie
|
||||
Jon Cruz
|
||||
Danilo Egan
|
||||
Frank Felfe
|
||||
Fred
|
||||
Ted Gould
|
||||
Bryce Harrington
|
||||
Carl Hetherington
|
||||
Nathan Hurst
|
||||
Thomas Ingham
|
||||
Bob Jamison
|
||||
Lauris Kaplinski
|
||||
Lynn Kerby
|
||||
Petr Kovar
|
||||
Raph Levien
|
||||
Vitaly Lipatov
|
||||
Dmitry G. Mastrukov
|
||||
Michael Meeks
|
||||
Federico Mena
|
||||
MenTaLguY
|
||||
Peter Moulder
|
||||
Yukihiro Nakai
|
||||
Christian Neumair
|
||||
Mitsuru Oka
|
||||
Jon Phillips
|
||||
Christian Schaller
|
||||
Tom von Schwerdtner
|
||||
Pat Suwalski
|
||||
Adib Taraben
|
||||
Daniel Yacob
|
||||
Masatake Yamato
|
||||
|
||||
%package extensions-dia
|
||||
License: GPL v2 only ; LGPL v2.1 only
|
||||
Summary: Inkscape Vector Illustration Program - Dia Import Extension
|
||||
License: GPLv2 ; LGPLv2.1
|
||||
Summary: Vector Illustration Program - Dia Import Extension
|
||||
Group: Productivity/Graphics/Vector Editors
|
||||
Requires: %{name} = %{version} dia
|
||||
Requires: %{name} = %{version}
|
||||
Requires: dia
|
||||
Supplements: packageand(%{name}:dia)
|
||||
Enhances: %{name}
|
||||
# Package in openSUSE <= 11.0 and SLED <= 10
|
||||
Provides: %{name}:%{_datadir}/inkscape/extensions/dia.inx
|
||||
Enhances: %{name}
|
||||
|
||||
%description extensions-dia
|
||||
Dia import extension for Inkscape.
|
||||
|
||||
Inkscape is a vector illustration program for the GNOME desktop.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Alexander Clausen
|
||||
John Bintz
|
||||
Arpad Biro
|
||||
Daniel Borgmann
|
||||
Hans Breuer
|
||||
Bulia Byak
|
||||
Chema Celorio
|
||||
Johan Ceuppens
|
||||
Zbigniew Chyla
|
||||
John Cliff
|
||||
Kees Cook
|
||||
Robert Crosbie
|
||||
Jon Cruz
|
||||
Danilo Egan
|
||||
Frank Felfe
|
||||
Fred
|
||||
Ted Gould
|
||||
Bryce Harrington
|
||||
Carl Hetherington
|
||||
Nathan Hurst
|
||||
Thomas Ingham
|
||||
Bob Jamison
|
||||
Lauris Kaplinski
|
||||
Lynn Kerby
|
||||
Petr Kovar
|
||||
Raph Levien
|
||||
Vitaly Lipatov
|
||||
Dmitry G. Mastrukov
|
||||
Michael Meeks
|
||||
Federico Mena
|
||||
MenTaLguY
|
||||
Peter Moulder
|
||||
Yukihiro Nakai
|
||||
Christian Neumair
|
||||
Mitsuru Oka
|
||||
Jon Phillips
|
||||
Christian Schaller
|
||||
Tom von Schwerdtner
|
||||
Pat Suwalski
|
||||
Adib Taraben
|
||||
Daniel Yacob
|
||||
Masatake Yamato
|
||||
|
||||
%package extensions-fig
|
||||
License: GPL v2 only ; LGPL v2.1 only
|
||||
Summary: Inkscape Vector Illustration Program - Fig Import Extension
|
||||
License: GPLv2 ; LGPLv2.1
|
||||
Summary: Vector Illustration Program - Fig Import Extension
|
||||
Group: Productivity/Graphics/Vector Editors
|
||||
Requires: %{name} = %{version} transfig
|
||||
Requires: %{name} = %{version}
|
||||
Requires: transfig
|
||||
Supplements: packageand(%{name}:transfig)
|
||||
Enhances: %{name}
|
||||
# Package in openSUSE <= 11.0 and SLED <= 10
|
||||
Provides: %{name}:%{_datadir}/inkscape/extensions/fig_input.inx
|
||||
Enhances: %{name}
|
||||
|
||||
%description extensions-fig
|
||||
Fig family (XFig, Figurine, JFig, WinFig,...) import extension for
|
||||
@ -246,202 +119,47 @@ Inkscape.
|
||||
|
||||
Inkscape is a vector illustration program for the GNOME desktop.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Alexander Clausen
|
||||
John Bintz
|
||||
Arpad Biro
|
||||
Daniel Borgmann
|
||||
Hans Breuer
|
||||
Bulia Byak
|
||||
Chema Celorio
|
||||
Johan Ceuppens
|
||||
Zbigniew Chyla
|
||||
John Cliff
|
||||
Kees Cook
|
||||
Robert Crosbie
|
||||
Jon Cruz
|
||||
Danilo Egan
|
||||
Frank Felfe
|
||||
Fred
|
||||
Ted Gould
|
||||
Bryce Harrington
|
||||
Carl Hetherington
|
||||
Nathan Hurst
|
||||
Thomas Ingham
|
||||
Bob Jamison
|
||||
Lauris Kaplinski
|
||||
Lynn Kerby
|
||||
Petr Kovar
|
||||
Raph Levien
|
||||
Vitaly Lipatov
|
||||
Dmitry G. Mastrukov
|
||||
Michael Meeks
|
||||
Federico Mena
|
||||
MenTaLguY
|
||||
Peter Moulder
|
||||
Yukihiro Nakai
|
||||
Christian Neumair
|
||||
Mitsuru Oka
|
||||
Jon Phillips
|
||||
Christian Schaller
|
||||
Tom von Schwerdtner
|
||||
Pat Suwalski
|
||||
Adib Taraben
|
||||
Daniel Yacob
|
||||
Masatake Yamato
|
||||
|
||||
%package extensions-gimp
|
||||
License: GPL v2 only ; LGPL v2.1 only
|
||||
Summary: Inkscape Vector Illustration Program - The GIMP Extensions
|
||||
License: GPLv2 ; LGPLv2.1
|
||||
Summary: Vector Illustration Program - The GIMP Extensions
|
||||
Group: Productivity/Graphics/Vector Editors
|
||||
Requires: %{name} = %{version} gimp-2.0
|
||||
Requires: %{name} = %{version}
|
||||
Requires: gimp-2.0
|
||||
Supplements: packageand(%{name}:gimp)
|
||||
Supplements: packageand(%{name}:gimp-2.0)
|
||||
Enhances: %{name}
|
||||
# Package in openSUSE <= 11.0 and SLED <= 10
|
||||
Provides: %{name}:%{_datadir}/inkscape/extensions/gimp_xcf.inx
|
||||
Enhances: %{name}
|
||||
|
||||
%description extensions-gimp
|
||||
The GIMP import and export extensions for Inkscape.
|
||||
|
||||
Inkscape is a vector illustration program for the GNOME desktop.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Alexander Clausen
|
||||
John Bintz
|
||||
Arpad Biro
|
||||
Daniel Borgmann
|
||||
Hans Breuer
|
||||
Bulia Byak
|
||||
Chema Celorio
|
||||
Johan Ceuppens
|
||||
Zbigniew Chyla
|
||||
John Cliff
|
||||
Kees Cook
|
||||
Robert Crosbie
|
||||
Jon Cruz
|
||||
Danilo Egan
|
||||
Frank Felfe
|
||||
Fred
|
||||
Ted Gould
|
||||
Bryce Harrington
|
||||
Carl Hetherington
|
||||
Nathan Hurst
|
||||
Thomas Ingham
|
||||
Bob Jamison
|
||||
Lauris Kaplinski
|
||||
Lynn Kerby
|
||||
Petr Kovar
|
||||
Raph Levien
|
||||
Vitaly Lipatov
|
||||
Dmitry G. Mastrukov
|
||||
Michael Meeks
|
||||
Federico Mena
|
||||
MenTaLguY
|
||||
Peter Moulder
|
||||
Yukihiro Nakai
|
||||
Christian Neumair
|
||||
Mitsuru Oka
|
||||
Jon Phillips
|
||||
Christian Schaller
|
||||
Tom von Schwerdtner
|
||||
Pat Suwalski
|
||||
Adib Taraben
|
||||
Daniel Yacob
|
||||
Masatake Yamato
|
||||
|
||||
%package extensions-skencil
|
||||
License: GPL v2 only ; LGPL v2.1 only
|
||||
Summary: Inkscape Vector Illustration Program - Skencil Import Extension
|
||||
License: GPLv2 ; LGPLv2.1
|
||||
Summary: Vector Illustration Program - Skencil Import Extension
|
||||
Group: Productivity/Graphics/Vector Editors
|
||||
Requires: %{name} = %{version} skencil
|
||||
Requires: %{name} = %{version}
|
||||
Requires: skencil
|
||||
Supplements: packageand(%{name}:skencil)
|
||||
Enhances: %{name}
|
||||
# Package in openSUSE <= 11.0 and SLED <= 10
|
||||
Provides: %{name}:%{_datadir}/inkscape/extensions/sk_input.inx
|
||||
Enhances: %{name}
|
||||
|
||||
%description extensions-skencil
|
||||
Skencil import extension for Inkscape.
|
||||
|
||||
Inkscape is a vector illustration program for the GNOME desktop.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Alexander Clausen
|
||||
John Bintz
|
||||
Arpad Biro
|
||||
Daniel Borgmann
|
||||
Hans Breuer
|
||||
Bulia Byak
|
||||
Chema Celorio
|
||||
Johan Ceuppens
|
||||
Zbigniew Chyla
|
||||
John Cliff
|
||||
Kees Cook
|
||||
Robert Crosbie
|
||||
Jon Cruz
|
||||
Danilo Egan
|
||||
Frank Felfe
|
||||
Fred
|
||||
Ted Gould
|
||||
Bryce Harrington
|
||||
Carl Hetherington
|
||||
Nathan Hurst
|
||||
Thomas Ingham
|
||||
Bob Jamison
|
||||
Lauris Kaplinski
|
||||
Lynn Kerby
|
||||
Petr Kovar
|
||||
Raph Levien
|
||||
Vitaly Lipatov
|
||||
Dmitry G. Mastrukov
|
||||
Michael Meeks
|
||||
Federico Mena
|
||||
MenTaLguY
|
||||
Peter Moulder
|
||||
Yukihiro Nakai
|
||||
Christian Neumair
|
||||
Mitsuru Oka
|
||||
Jon Phillips
|
||||
Christian Schaller
|
||||
Tom von Schwerdtner
|
||||
Pat Suwalski
|
||||
Adib Taraben
|
||||
Daniel Yacob
|
||||
Masatake Yamato
|
||||
|
||||
%lang_package
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1
|
||||
%patch13
|
||||
%patch15 -p0
|
||||
%patch16 -p0
|
||||
%patch17 -p1
|
||||
%patch1 -p1
|
||||
%patch18 -p1
|
||||
%patch19 -p0
|
||||
%patch20 -p1
|
||||
patch <<EOF
|
||||
--- configure.ac
|
||||
+++ configure.ac
|
||||
@@ -612,1 +612,1 @@
|
||||
-AC_DEFINE_UNQUOTED([INKSCAPE_LIBDIR], "\${prefix}/lib",
|
||||
+AC_DEFINE_UNQUOTED([INKSCAPE_LIBDIR], "\${prefix}/%_lib",
|
||||
EOF
|
||||
chmod -x README.ca.txt
|
||||
|
||||
%build
|
||||
autoreconf -f -i
|
||||
intltoolize --force
|
||||
export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
export CXXFLAGS="%{optflags} -fno-strict-aliasing"
|
||||
# We're building without perl support for now...
|
||||
%configure\
|
||||
--with-python\
|
||||
@ -452,10 +170,9 @@ make %{?jobs:-j%jobs}
|
||||
%install
|
||||
%makeinstall
|
||||
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 Office FlowChart
|
||||
%find_lang %{name}
|
||||
# remove Windows script
|
||||
rm %{buildroot}%{_datadir}/inkscape/extensions/ps2pdf.cmd
|
||||
bash %{S:2} %{buildroot}%{_datadir}/inkscape/extensions "%%{_datadir}/inkscape/extensions/"
|
||||
%fdupes %{buildroot}
|
||||
|
||||
@ -476,12 +193,13 @@ rm -rf %{buildroot}
|
||||
%{_datadir}/inkscape/extensions/*.xsl*
|
||||
%{_datadir}/inkscape/extensions/colors.xml
|
||||
%{_datadir}/inkscape/extensions/ps2*
|
||||
%{_datadir}/inkscape/extensions/Poly3DObjects/
|
||||
%{_datadir}/inkscape/extensions/alphabet_soup/
|
||||
%{_datadir}/inkscape/extensions/inkweb.js
|
||||
#BEGIN FIXME: What is purpose of these plugins? I see no references to them:
|
||||
%{_datadir}/inkscape/extensions/SpSVG.pm
|
||||
%{_datadir}/inkscape/extensions/inkscape-shadow*
|
||||
%{_datadir}/inkscape/extensions/Inkscape.pm
|
||||
%{_datadir}/inkscape/extensions/simplepath.rb
|
||||
# *.txt contain inactive plugins
|
||||
%{_datadir}/inkscape/extensions/*.txt
|
||||
#END FIXME
|
||||
%{_datadir}/pixmaps/inkscape.png
|
||||
%doc %{_mandir}/man?/*.*
|
||||
@ -503,6 +221,8 @@ rm -rf %{buildroot}
|
||||
%{_datadir}/inkscape/extensions/Barcode
|
||||
%{_datadir}/inkscape/extensions/cdr*
|
||||
%{_datadir}/inkscape/extensions/wmf*
|
||||
# This extensions seems erronous being copied in here too.
|
||||
%exclude %{_datadir}/inkscape/extensions/*gimp*
|
||||
|
||||
%files extensions-dia
|
||||
%defattr(-,root,root)
|
||||
|
||||
19
openSUSE.gpl
Normal file
19
openSUSE.gpl
Normal file
@ -0,0 +1,19 @@
|
||||
GIMP Palette
|
||||
Name: openSUSE
|
||||
Columns: 7
|
||||
#
|
||||
252 177 28 Orange Light
|
||||
255 255 102 Butter Light
|
||||
145 208 7 Lemon Light
|
||||
212 196 255 Plum Light
|
||||
80 128 255 Sky Light
|
||||
186 189 182 Dust Light
|
||||
255 77 77 Blood Light
|
||||
227 83 2 Orange
|
||||
178 178 71 Butter
|
||||
33 120 8 Lemon
|
||||
77 68 102 Plum
|
||||
0 0 116 Sky
|
||||
46 52 54 Dust
|
||||
140 0 0 Blood
|
||||
115 186 37 SUSE Green
|
||||
Loading…
Reference in New Issue
Block a user