This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
f31162c7fa
commit
071d018ebc
File diff suppressed because it is too large
Load Diff
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:859068d81173c57f812c6679cac8ac6ced196e4e6232f29008282a6fa9beaabd
|
|
||||||
size 8834980
|
|
||||||
3
inkscape-0.46.tar.bz2
Normal file
3
inkscape-0.46.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:2d50f940064da47c967109d95871128e609abaeb8f0f8f11204304e3f476c4f6
|
||||||
|
size 13371001
|
||||||
@ -1,9 +1,11 @@
|
|||||||
--- src/desktop-style.cpp
|
Index: src/desktop-style.cpp
|
||||||
|
===================================================================
|
||||||
|
--- src/desktop-style.cpp.orig
|
||||||
+++ src/desktop-style.cpp
|
+++ src/desktop-style.cpp
|
||||||
@@ -474,7 +474,7 @@
|
@@ -500,7 +500,7 @@ objects_query_fillstroke (GSList *object
|
||||||
|
// 2. Sum color, copy server from paint to paint_res
|
||||||
if (paint_res->set && paint_effectively_set && paint->type == SP_PAINT_TYPE_COLOR) {
|
|
||||||
|
|
||||||
|
if (paint_res->set && paint_effectively_set && paint->isColor()) {
|
||||||
- gfloat d[3];
|
- gfloat d[3];
|
||||||
+ gfloat d[4];
|
+ gfloat d[4];
|
||||||
sp_color_get_rgb_floatv (&paint->value.color, d);
|
sp_color_get_rgb_floatv (&paint->value.color, d);
|
||||||
|
|||||||
@ -1,318 +0,0 @@
|
|||||||
=== modified file 'src/attributes.cpp'
|
|
||||||
--- src/attributes.cpp 2008-01-28 23:20:47 +0000
|
|
||||||
+++ src/attributes.cpp 2008-01-28 23:21:23 +0000
|
|
||||||
@@ -17,6 +17,7 @@
|
|
||||||
# include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#include <glib.h>
|
|
||||||
#include <glib/ghash.h>
|
|
||||||
#include "attributes.h"
|
|
||||||
|
|
||||||
|
|
||||||
=== modified file 'src/color-rgba.h'
|
|
||||||
--- src/color-rgba.h 2008-01-28 23:20:47 +0000
|
|
||||||
+++ src/color-rgba.h 2008-01-28 23:35:51 +0000
|
|
||||||
@@ -12,6 +12,7 @@
|
|
||||||
#ifndef SEEN_COLOR_RGBA_H
|
|
||||||
#define SEEN_COLOR_RGBA_H
|
|
||||||
|
|
||||||
+#include <glib.h>
|
|
||||||
#include <glib/gmessages.h>
|
|
||||||
#include "libnr/nr-pixops.h"
|
|
||||||
#include "decimal-round.h"
|
|
||||||
|
|
||||||
=== modified file 'src/display/bezier-utils.cpp'
|
|
||||||
--- src/display/bezier-utils.cpp 2008-01-28 23:20:47 +0000
|
|
||||||
+++ src/display/bezier-utils.cpp 2008-01-28 23:33:40 +0000
|
|
||||||
@@ -33,6 +33,7 @@
|
|
||||||
# include <ieeefp.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#include <glib.h>
|
|
||||||
#include <glib/gmessages.h>
|
|
||||||
#include <glib/gmem.h>
|
|
||||||
#include "bezier-utils.h"
|
|
||||||
|
|
||||||
=== modified file 'src/helper/sp-marshal.cpp'
|
|
||||||
--- src/helper/sp-marshal.cpp 2008-01-28 23:20:47 +0000
|
|
||||||
+++ src/helper/sp-marshal.cpp 2008-01-28 23:37:47 +0000
|
|
||||||
@@ -57,10 +57,10 @@
|
|
||||||
/* NONE:POINTER,BOOLEAN (./helper/sp-marshal.list:5) */
|
|
||||||
void
|
|
||||||
sp_marshal_VOID__POINTER_BOOLEAN (GClosure *closure,
|
|
||||||
- GValue *return_value,
|
|
||||||
+ GValue *return_value G_GNUC_UNUSED,
|
|
||||||
guint n_param_values,
|
|
||||||
const GValue *param_values,
|
|
||||||
- gpointer invocation_hint,
|
|
||||||
+ gpointer invocation_hint G_GNUC_UNUSED,
|
|
||||||
gpointer marshal_data)
|
|
||||||
{
|
|
||||||
typedef void (*GMarshalFunc_VOID__POINTER_BOOLEAN) (gpointer data1,
|
|
||||||
@@ -94,10 +94,10 @@
|
|
||||||
/* NONE:POINTER,UINT (./helper/sp-marshal.list:6) */
|
|
||||||
void
|
|
||||||
sp_marshal_VOID__POINTER_UINT (GClosure *closure,
|
|
||||||
- GValue *return_value,
|
|
||||||
+ GValue *return_value G_GNUC_UNUSED,
|
|
||||||
guint n_param_values,
|
|
||||||
const GValue *param_values,
|
|
||||||
- gpointer invocation_hint,
|
|
||||||
+ gpointer invocation_hint G_GNUC_UNUSED,
|
|
||||||
gpointer marshal_data)
|
|
||||||
{
|
|
||||||
typedef void (*GMarshalFunc_VOID__POINTER_UINT) (gpointer data1,
|
|
||||||
@@ -131,10 +131,10 @@
|
|
||||||
/* NONE:POINTER,DOUBLE (./helper/sp-marshal.list:7) */
|
|
||||||
void
|
|
||||||
sp_marshal_VOID__POINTER_DOUBLE (GClosure *closure,
|
|
||||||
- GValue *return_value,
|
|
||||||
+ GValue *return_value G_GNUC_UNUSED,
|
|
||||||
guint n_param_values,
|
|
||||||
const GValue *param_values,
|
|
||||||
- gpointer invocation_hint,
|
|
||||||
+ gpointer invocation_hint G_GNUC_UNUSED,
|
|
||||||
gpointer marshal_data)
|
|
||||||
{
|
|
||||||
typedef void (*GMarshalFunc_VOID__POINTER_DOUBLE) (gpointer data1,
|
|
||||||
@@ -168,10 +168,10 @@
|
|
||||||
/* NONE:DOUBLE,DOUBLE (./helper/sp-marshal.list:8) */
|
|
||||||
void
|
|
||||||
sp_marshal_VOID__DOUBLE_DOUBLE (GClosure *closure,
|
|
||||||
- GValue *return_value,
|
|
||||||
+ GValue *return_value G_GNUC_UNUSED,
|
|
||||||
guint n_param_values,
|
|
||||||
const GValue *param_values,
|
|
||||||
- gpointer invocation_hint,
|
|
||||||
+ gpointer invocation_hint G_GNUC_UNUSED,
|
|
||||||
gpointer marshal_data)
|
|
||||||
{
|
|
||||||
typedef void (*GMarshalFunc_VOID__DOUBLE_DOUBLE) (gpointer data1,
|
|
||||||
@@ -205,10 +205,10 @@
|
|
||||||
/* NONE:STRING,BOOL (./helper/sp-marshal.list:9) */
|
|
||||||
void
|
|
||||||
sp_marshal_VOID__STRING_BOOLEAN (GClosure *closure,
|
|
||||||
- GValue *return_value,
|
|
||||||
+ GValue *return_value G_GNUC_UNUSED,
|
|
||||||
guint n_param_values,
|
|
||||||
const GValue *param_values,
|
|
||||||
- gpointer invocation_hint,
|
|
||||||
+ gpointer invocation_hint G_GNUC_UNUSED,
|
|
||||||
gpointer marshal_data)
|
|
||||||
{
|
|
||||||
typedef void (*GMarshalFunc_VOID__STRING_BOOLEAN) (gpointer data1,
|
|
||||||
@@ -242,10 +242,10 @@
|
|
||||||
/* BOOLEAN:NONE (./helper/sp-marshal.list:10) */
|
|
||||||
void
|
|
||||||
sp_marshal_BOOLEAN__VOID (GClosure *closure,
|
|
||||||
- GValue *return_value,
|
|
||||||
+ GValue *return_value G_GNUC_UNUSED,
|
|
||||||
guint n_param_values,
|
|
||||||
const GValue *param_values,
|
|
||||||
- gpointer invocation_hint,
|
|
||||||
+ gpointer invocation_hint G_GNUC_UNUSED,
|
|
||||||
gpointer marshal_data)
|
|
||||||
{
|
|
||||||
typedef gboolean (*GMarshalFunc_BOOLEAN__VOID) (gpointer data1,
|
|
||||||
@@ -279,10 +279,10 @@
|
|
||||||
/* BOOLEAN:UINT (./helper/sp-marshal.list:11) */
|
|
||||||
void
|
|
||||||
sp_marshal_BOOLEAN__UINT (GClosure *closure,
|
|
||||||
- GValue *return_value,
|
|
||||||
+ GValue *return_value G_GNUC_UNUSED,
|
|
||||||
guint n_param_values,
|
|
||||||
const GValue *param_values,
|
|
||||||
- gpointer invocation_hint,
|
|
||||||
+ gpointer invocation_hint G_GNUC_UNUSED,
|
|
||||||
gpointer marshal_data)
|
|
||||||
{
|
|
||||||
typedef gboolean (*GMarshalFunc_BOOLEAN__UINT) (gpointer data1,
|
|
||||||
@@ -318,10 +318,10 @@
|
|
||||||
/* BOOLEAN:POINTER (./helper/sp-marshal.list:12) */
|
|
||||||
void
|
|
||||||
sp_marshal_BOOLEAN__POINTER (GClosure *closure,
|
|
||||||
- GValue *return_value,
|
|
||||||
+ GValue *return_value G_GNUC_UNUSED,
|
|
||||||
guint n_param_values,
|
|
||||||
const GValue *param_values,
|
|
||||||
- gpointer invocation_hint,
|
|
||||||
+ gpointer invocation_hint G_GNUC_UNUSED,
|
|
||||||
gpointer marshal_data)
|
|
||||||
{
|
|
||||||
typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER) (gpointer data1,
|
|
||||||
@@ -357,10 +357,10 @@
|
|
||||||
/* BOOLEAN:POINTER,UINT (./helper/sp-marshal.list:13) */
|
|
||||||
void
|
|
||||||
sp_marshal_BOOLEAN__POINTER_UINT (GClosure *closure,
|
|
||||||
- GValue *return_value,
|
|
||||||
+ GValue *return_value G_GNUC_UNUSED,
|
|
||||||
guint n_param_values,
|
|
||||||
const GValue *param_values,
|
|
||||||
- gpointer invocation_hint,
|
|
||||||
+ gpointer invocation_hint G_GNUC_UNUSED,
|
|
||||||
gpointer marshal_data)
|
|
||||||
{
|
|
||||||
typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER_UINT) (gpointer data1,
|
|
||||||
@@ -398,10 +398,10 @@
|
|
||||||
/* BOOLEAN:POINTER,POINTER (./helper/sp-marshal.list:14) */
|
|
||||||
void
|
|
||||||
sp_marshal_BOOLEAN__POINTER_POINTER (GClosure *closure,
|
|
||||||
- GValue *return_value,
|
|
||||||
+ GValue *return_value G_GNUC_UNUSED,
|
|
||||||
guint n_param_values,
|
|
||||||
const GValue *param_values,
|
|
||||||
- gpointer invocation_hint,
|
|
||||||
+ gpointer invocation_hint G_GNUC_UNUSED,
|
|
||||||
gpointer marshal_data)
|
|
||||||
{
|
|
||||||
typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER_POINTER) (gpointer data1,
|
|
||||||
@@ -439,10 +439,10 @@
|
|
||||||
/* INT:POINTER,POINTER (./helper/sp-marshal.list:15) */
|
|
||||||
void
|
|
||||||
sp_marshal_INT__POINTER_POINTER (GClosure *closure,
|
|
||||||
- GValue *return_value,
|
|
||||||
+ GValue *return_value G_GNUC_UNUSED,
|
|
||||||
guint n_param_values,
|
|
||||||
const GValue *param_values,
|
|
||||||
- gpointer invocation_hint,
|
|
||||||
+ gpointer invocation_hint G_GNUC_UNUSED,
|
|
||||||
gpointer marshal_data)
|
|
||||||
{
|
|
||||||
typedef gint (*GMarshalFunc_INT__POINTER_POINTER) (gpointer data1,
|
|
||||||
@@ -480,10 +480,10 @@
|
|
||||||
/* DOUBLE:POINTER,UINT (./helper/sp-marshal.list:16) */
|
|
||||||
void
|
|
||||||
sp_marshal_DOUBLE__POINTER_UINT (GClosure *closure,
|
|
||||||
- GValue *return_value,
|
|
||||||
+ GValue *return_value G_GNUC_UNUSED,
|
|
||||||
guint n_param_values,
|
|
||||||
const GValue *param_values,
|
|
||||||
- gpointer invocation_hint,
|
|
||||||
+ gpointer invocation_hint G_GNUC_UNUSED,
|
|
||||||
gpointer marshal_data)
|
|
||||||
{
|
|
||||||
typedef gdouble (*GMarshalFunc_DOUBLE__POINTER_UINT) (gpointer data1,
|
|
||||||
|
|
||||||
=== modified file 'src/helper/units.cpp'
|
|
||||||
--- src/helper/units.cpp 2008-01-28 23:20:47 +0000
|
|
||||||
+++ src/helper/units.cpp 2008-01-28 23:38:40 +0000
|
|
||||||
@@ -19,6 +19,7 @@
|
|
||||||
# include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#include <glib.h>
|
|
||||||
#include "helper/units.h"
|
|
||||||
#include <glibmm/i18n.h>
|
|
||||||
#include "unit-constants.h"
|
|
||||||
|
|
||||||
=== modified file 'src/io/resource.cpp'
|
|
||||||
--- src/io/resource.cpp 2008-01-28 23:20:47 +0000
|
|
||||||
+++ src/io/resource.cpp 2008-01-28 23:40:15 +0000
|
|
||||||
@@ -16,6 +16,8 @@
|
|
||||||
#include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#include <glib.h>
|
|
||||||
+
|
|
||||||
#include <glib/gmessages.h>
|
|
||||||
#include <glib/gstrfuncs.h>
|
|
||||||
#include <glib/gfileutils.h>
|
|
||||||
|
|
||||||
=== modified file 'src/libnr/nr-matrix.h'
|
|
||||||
--- src/libnr/nr-matrix.h 2008-01-28 23:20:47 +0000
|
|
||||||
+++ src/libnr/nr-matrix.h 2008-01-28 23:26:28 +0000
|
|
||||||
@@ -17,6 +17,7 @@
|
|
||||||
* This code is in public domain.
|
|
||||||
*/
|
|
||||||
|
|
||||||
+#include <glib.h>
|
|
||||||
#include <glib/gmessages.h>
|
|
||||||
|
|
||||||
#include "libnr/nr-coord.h"
|
|
||||||
|
|
||||||
=== modified file 'src/svg/svg-color.cpp'
|
|
||||||
--- src/svg/svg-color.cpp 2008-01-28 23:20:47 +0000
|
|
||||||
+++ src/svg/svg-color.cpp 2008-01-28 23:49:06 +0000
|
|
||||||
@@ -22,6 +22,7 @@
|
|
||||||
#include "svg-icc-color.h"
|
|
||||||
#include <cassert>
|
|
||||||
#include <math.h>
|
|
||||||
+#include <glib.h>
|
|
||||||
#include <glib/gmem.h>
|
|
||||||
#include <glib/gmessages.h>
|
|
||||||
#include <glib/gstrfuncs.h>
|
|
||||||
|
|
||||||
=== modified file 'src/svg/svg-path.cpp'
|
|
||||||
--- src/svg/svg-path.cpp 2008-01-28 23:20:47 +0000
|
|
||||||
+++ src/svg/svg-path.cpp 2008-01-28 23:49:27 +0000
|
|
||||||
@@ -27,6 +27,7 @@
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <cassert>
|
|
||||||
+#include <glib.h>
|
|
||||||
#include <glib/gmem.h>
|
|
||||||
#include <glib/gmessages.h>
|
|
||||||
#include <glib/gstrfuncs.h>
|
|
||||||
|
|
||||||
=== modified file 'src/xml/composite-node-observer.cpp'
|
|
||||||
--- src/xml/composite-node-observer.cpp 2008-01-28 23:20:47 +0000
|
|
||||||
+++ src/xml/composite-node-observer.cpp 2008-01-28 23:49:50 +0000
|
|
||||||
@@ -12,6 +12,7 @@
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
+#include <glib.h>
|
|
||||||
#include <cstring>
|
|
||||||
#include "algorithms/find-if-before.h"
|
|
||||||
#include "xml/composite-node-observer.h"
|
|
||||||
|
|
||||||
=== modified file 'src/xml/event.cpp'
|
|
||||||
--- src/xml/event.cpp 2008-01-28 23:20:47 +0000
|
|
||||||
+++ src/xml/event.cpp 2008-01-28 23:52:19 +0000
|
|
||||||
@@ -13,6 +13,7 @@
|
|
||||||
* Released under GNU GPL, read the file 'COPYING' for more information
|
|
||||||
*/
|
|
||||||
|
|
||||||
+#include <glib.h>
|
|
||||||
#include "event.h"
|
|
||||||
#include "event-fns.h"
|
|
||||||
#include "util/reverse-list.h"
|
|
||||||
|
|
||||||
=== modified file 'src/xml/node-fns.cpp'
|
|
||||||
--- src/xml/node-fns.cpp 2008-01-28 23:20:47 +0000
|
|
||||||
+++ src/xml/node-fns.cpp 2008-01-28 23:50:19 +0000
|
|
||||||
@@ -2,6 +2,7 @@
|
|
||||||
# include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#include <glib.h>
|
|
||||||
#include <map>
|
|
||||||
#include <cstring>
|
|
||||||
#include <string>
|
|
||||||
|
|
||||||
=== modified file 'src/xml/repr-css.cpp'
|
|
||||||
--- src/xml/repr-css.cpp 2008-01-28 23:20:47 +0000
|
|
||||||
+++ src/xml/repr-css.cpp 2008-01-28 23:50:05 +0000
|
|
||||||
@@ -4,7 +4,7 @@
|
|
||||||
|
|
||||||
#define SP_REPR_CSS_C
|
|
||||||
|
|
||||||
-
|
|
||||||
+#include <glib.h>
|
|
||||||
#include <glibmm/ustring.h>
|
|
||||||
#include <cstring>
|
|
||||||
#include "xml/repr.h"
|
|
||||||
|
|
||||||
=== modified file 'src/xml/simple-node.h'
|
|
||||||
--- src/xml/simple-node.h 2008-01-28 23:20:47 +0000
|
|
||||||
+++ src/xml/simple-node.h 2008-01-28 23:50:38 +0000
|
|
||||||
@@ -15,6 +15,7 @@
|
|
||||||
#ifndef SEEN_INKSCAPE_XML_SIMPLE_NODE_H
|
|
||||||
#define SEEN_INKSCAPE_XML_SIMPLE_NODE_H
|
|
||||||
|
|
||||||
+#include <glib.h>
|
|
||||||
#include "xml/node.h"
|
|
||||||
#include "xml/attribute-record.h"
|
|
||||||
#include "xml/transaction-logger.h"
|
|
||||||
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
--- src/extension/script/inkscape_py_wrap.cpp
|
|
||||||
+++ src/extension/script/inkscape_py_wrap.cpp
|
|
||||||
@@ -802,7 +802,7 @@
|
|
||||||
obj = pyobj;
|
|
||||||
if (PyCFunction_Check(obj)) {
|
|
||||||
/* here we get the method pointer for callbacks */
|
|
||||||
- char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
|
|
||||||
+ const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
|
|
||||||
c = doc ? strstr(doc, "swig_ptr: ") : 0;
|
|
||||||
if (c) {
|
|
||||||
c += 10;
|
|
||||||
@@ -977,11 +977,11 @@
|
|
||||||
swig_type_info **types_initial) {
|
|
||||||
int i;
|
|
||||||
for (i = 0; methods[i].ml_name; ++i) {
|
|
||||||
- char *c = methods[i].ml_doc;
|
|
||||||
+ const char *c = methods[i].ml_doc;
|
|
||||||
if (c && (c = strstr(c, "swig_ptr: "))) {
|
|
||||||
int j;
|
|
||||||
swig_const_info *ci = 0;
|
|
||||||
- char *name = c + 10;
|
|
||||||
+ const char *name = c + 10;
|
|
||||||
for (j = 0; const_table[j].type; j++) {
|
|
||||||
if (strncmp(const_table[j].name, name,
|
|
||||||
strlen(const_table[j].name)) == 0) {
|
|
||||||
116
inkscape-warnings.patch
Normal file
116
inkscape-warnings.patch
Normal file
@ -0,0 +1,116 @@
|
|||||||
|
=== modified file 'src/display/nr-filter-specularlighting.cpp'
|
||||||
|
--- src/display/nr-filter-specularlighting.cpp 2008-03-28 20:56:04 +0000
|
||||||
|
+++ src/display/nr-filter-specularlighting.cpp 2008-03-28 20:58:43 +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-03-28 20:56:04 +0000
|
||||||
|
+++ src/extension/internal/pov-out.cpp 2008-03-28 20:58:43 +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-03-28 20:56:04 +0000
|
||||||
|
+++ src/libgdl/gdl-dock-placeholder.c 2008-03-28 21:19:25 +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-03-28 20:56:04 +0000
|
||||||
|
+++ src/libgdl/gdl-stock.c 2008-03-28 20:58:43 +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);
|
||||||
|
|
||||||
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Mar 28 23:18:56 CET 2008 - maw@suse.de
|
||||||
|
|
||||||
|
- Update to version 0.46:
|
||||||
|
+ Many new features and bugfeatures
|
||||||
|
+ For a detailed account of what's new, see the NEWS file
|
||||||
|
- Remove stale patches: inkscape-invalid-conversion.patch,
|
||||||
|
inkscape-0.45.1-gcc43.patch, inkscape-g_assert.patch
|
||||||
|
- Respin inkscape-bug-189159.patch
|
||||||
|
- Add inkscape-warnings.patch
|
||||||
|
- Rename sr@latin to sr@Latn.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Mar 6 19:27:48 CET 2008 - maw@suse.de
|
Thu Mar 6 19:27:48 CET 2008 - maw@suse.de
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file for package inkscape (Version 0.45.1)
|
# spec file for package inkscape (Version 0.46)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
# This file and all modifications and additions to the pristine
|
# This file and all modifications and additions to the pristine
|
||||||
@ -12,14 +12,14 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: inkscape
|
Name: inkscape
|
||||||
BuildRequires: cairomm docbook-toys fdupes gcc-c++ gtkmm24-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel liblcms-devel libwnck-devel libxslt-devel loudmouth-devel perl python-devel python-gtk-devel sgml-skel update-desktop-files
|
BuildRequires: boost-devel cairomm docbook-toys fdupes gcc-c++ gtkmm24-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel liblcms-devel libwnck-devel libxslt-devel loudmouth-devel perl python-devel python-gtk-devel sgml-skel update-desktop-files
|
||||||
License: GPL v2 or later
|
License: GPL v2 or later
|
||||||
Group: Productivity/Graphics/Vector Editors
|
Group: Productivity/Graphics/Vector Editors
|
||||||
Requires: cairomm ghostscript-fonts-std python-gtk python-numeric pstoedit libwmf gzip skencil /usr/bin/gs
|
Requires: cairomm ghostscript-fonts-std python-gtk python-numeric pstoedit libwmf gzip skencil /usr/bin/gs
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
Summary: Inkscape Vector Illustration Program
|
Summary: Inkscape Vector Illustration Program
|
||||||
Version: 0.45.1
|
Version: 0.46
|
||||||
Release: 148
|
Release: 1
|
||||||
Provides: sodipodi
|
Provides: sodipodi
|
||||||
Obsoletes: sodipodi
|
Obsoletes: sodipodi
|
||||||
PreReq: /bin/rm /bin/ln /bin/sh /usr/bin/perl
|
PreReq: /bin/rm /bin/ln /bin/sh /usr/bin/perl
|
||||||
@ -28,14 +28,13 @@ Source: %{name}-%{version}.tar.bz2
|
|||||||
Source1: gc6.4.tar.bz2
|
Source1: gc6.4.tar.bz2
|
||||||
Patch: %{name}-boehm-gc.patch
|
Patch: %{name}-boehm-gc.patch
|
||||||
Patch4: %{name}-swigfix.patch
|
Patch4: %{name}-swigfix.patch
|
||||||
Patch6: %{name}-invalid-conversion.patch
|
|
||||||
Patch7: %{name}-bug-189159.patch
|
Patch7: %{name}-bug-189159.patch
|
||||||
Patch8: %{name}-configure.patch
|
Patch8: %{name}-configure.patch
|
||||||
Patch10: gc6.4.patch
|
Patch10: gc6.4.patch
|
||||||
Patch13: %{name}-polyutil-newpoly.patch
|
Patch13: %{name}-polyutil-newpoly.patch
|
||||||
Patch14: %{name}-buffer-overrun.patch
|
Patch14: %{name}-buffer-overrun.patch
|
||||||
Patch15: inkscape-0.45.1-gcc43.patch
|
# PATCH-FIX-UPSTREAM inkscape-warnings.patch
|
||||||
Patch16: inkscape-g_assert.patch
|
Patch15: inkscape-warnings.patch
|
||||||
Url: http://www.inkscape.org/
|
Url: http://www.inkscape.org/
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
Requires: %{name}-lang = %{version}
|
Requires: %{name}-lang = %{version}
|
||||||
@ -95,13 +94,11 @@ Authors:
|
|||||||
%setup -q -b 1
|
%setup -q -b 1
|
||||||
%patch
|
%patch
|
||||||
%patch4
|
%patch4
|
||||||
%patch6
|
|
||||||
%patch7
|
%patch7
|
||||||
%patch8
|
%patch8
|
||||||
%patch13
|
%patch13
|
||||||
%patch14 -p1
|
%patch14 -p1
|
||||||
%patch15 -p1
|
%patch15 -p0
|
||||||
%patch16
|
|
||||||
pushd ../gc*
|
pushd ../gc*
|
||||||
%patch10
|
%patch10
|
||||||
popd
|
popd
|
||||||
@ -112,6 +109,9 @@ patch <<EOF
|
|||||||
-AC_DEFINE_UNQUOTED([INKSCAPE_LIBDIR], "\${prefix}/lib",
|
-AC_DEFINE_UNQUOTED([INKSCAPE_LIBDIR], "\${prefix}/lib",
|
||||||
+AC_DEFINE_UNQUOTED([INKSCAPE_LIBDIR], "\${prefix}/%_lib",
|
+AC_DEFINE_UNQUOTED([INKSCAPE_LIBDIR], "\${prefix}/%_lib",
|
||||||
EOF
|
EOF
|
||||||
|
# Change sr@latin to sr@Latn
|
||||||
|
rename sr@latin sr@Latn po/sr@latin.*
|
||||||
|
sed -i "/^ALL_LINGUAS/s/ sr@latin / sr@Latn /" configure.ac
|
||||||
chmod -x README.ca.txt
|
chmod -x README.ca.txt
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -171,6 +171,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%dir %{_datadir}/inkscape/extensions
|
%dir %{_datadir}/inkscape/extensions
|
||||||
%{_datadir}/inkscape/extensions/[a-ce-zA-Z]*
|
%{_datadir}/inkscape/extensions/[a-ce-zA-Z]*
|
||||||
%{_datadir}/inkscape/extensions/dia2*
|
%{_datadir}/inkscape/extensions/dia2*
|
||||||
|
%{_datadir}/inkscape/extensions/dimension.*
|
||||||
%{_datadir}/inkscape/extensions/dots*
|
%{_datadir}/inkscape/extensions/dots*
|
||||||
%{_datadir}/inkscape/extensions/dx*
|
%{_datadir}/inkscape/extensions/dx*
|
||||||
%ghost %{_datadir}/inkscape/extensions/dia.inx
|
%ghost %{_datadir}/inkscape/extensions/dia.inx
|
||||||
@ -184,6 +185,15 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%files lang -f %{name}.lang
|
%files lang -f %{name}.lang
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Mar 29 2008 maw@suse.de
|
||||||
|
- Update to version 0.46:
|
||||||
|
+ Many new features and bugfeatures
|
||||||
|
+ For a detailed account of what's new, see the NEWS file
|
||||||
|
- Remove stale patches: inkscape-invalid-conversion.patch,
|
||||||
|
inkscape-0.45.1-gcc43.patch, inkscape-g_assert.patch
|
||||||
|
- Respin inkscape-bug-189159.patch
|
||||||
|
- Add inkscape-warnings.patch
|
||||||
|
- Rename sr@latin to sr@Latn.
|
||||||
* Thu Mar 06 2008 maw@suse.de
|
* Thu Mar 06 2008 maw@suse.de
|
||||||
- Fix the build when against newer versions of intltool.
|
- Fix the build when against newer versions of intltool.
|
||||||
* Tue Feb 05 2008 maw@suse.de
|
* Tue Feb 05 2008 maw@suse.de
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user