[inkscape] Update to 0.48.1
Lubomir Rintel
lkundrak at fedoraproject.org
Mon Feb 7 09:11:49 UTC 2011
commit ea50a2abd30b611064a2b257e5fe2e5d6fce8645
Author: Lubomir Rintel <lkundrak at v3.sk>
Date: Mon Feb 7 10:11:36 2011 +0100
Update to 0.48.1
.gitignore | 1 +
inkscape-0.48.0-gcc46.patch | 16 +++---
inkscape-0.48.0-poppler.patch | 117 -----------------------------------------
inkscape.spec | 9 ++--
sources | 2 +-
5 files changed, 15 insertions(+), 130 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5d6340f..d75df1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
inkscape.tar.bz2
/inkscape-0.48.0.tar.bz2
+/inkscape-0.48.1.tar.bz2
diff --git a/inkscape-0.48.0-gcc46.patch b/inkscape-0.48.0-gcc46.patch
index 757673a..2095b05 100644
--- a/inkscape-0.48.0-gcc46.patch
+++ b/inkscape-0.48.0-gcc46.patch
@@ -1,4 +1,4 @@
-From b92d337b9d69465053e3f8ac9300d8ce49fad087 Mon Sep 17 00:00:00 2001
+From a04762c1177c62075f9a106815d63fe1e4a7a883 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 4 Feb 2011 18:00:38 +0100
Subject: [PATCH] Fix build with GCC 4.6
@@ -739,7 +739,7 @@ index c67dc97..08ba0ae 100644
#include <gtkmm/notebook.h>
#include <glibmm/i18n.h>
diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
-index 5ee916e..a39a8dd 100644
+index 72975f7..31ec07a 100644
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -28,6 +28,7 @@
@@ -799,7 +799,7 @@ index 799dad0..f7be27d 100644
#include <glib.h>
#include <gdk/gdk.h>
diff --git a/src/ui/tool/multi-path-manipulator.h b/src/ui/tool/multi-path-manipulator.h
-index 181ae6d..97e85f7 100644
+index 7a4cfdb..d7b8f8f 100644
--- a/src/ui/tool/multi-path-manipulator.h
+++ b/src/ui/tool/multi-path-manipulator.h
@@ -11,6 +11,7 @@
@@ -811,19 +811,19 @@ index 181ae6d..97e85f7 100644
#include "display/display-forward.h"
#include "forward.h"
diff --git a/src/ui/tool/node-tool.h b/src/ui/tool/node-tool.h
-index 641d064..3cbf62e 100644
+index 39d04a1..f46b7dc 100644
--- a/src/ui/tool/node-tool.h
+++ b/src/ui/tool/node-tool.h
-@@ -13,6 +13,7 @@
-
+@@ -14,6 +14,7 @@
#include <memory>
+ #include <boost/ptr_container/ptr_map.hpp>
#include <glib.h>
+#include <stddef.h>
#include <sigc++/sigc++.h>
#include "event-context.h"
#include "forward.h"
diff --git a/src/ui/tool/node.h b/src/ui/tool/node.h
-index af4cd7e..156cabd 100644
+index 494bd35..563d094 100644
--- a/src/ui/tool/node.h
+++ b/src/ui/tool/node.h
@@ -15,6 +15,7 @@
@@ -1028,5 +1028,5 @@ index d028d39..e7881cd 100644
namespace Inkscape {
--
-1.7.1
+1.7.3.4
diff --git a/inkscape.spec b/inkscape.spec
index afc17bd..e2ced62 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -1,6 +1,6 @@
Name: inkscape
-Version: 0.48.0
-Release: 10%{?dist}
+Version: 0.48.1
+Release: 1%{?dist}
Summary: Vector-based drawing program using SVG
Group: Applications/Productivity
@@ -8,7 +8,6 @@ License: GPLv2+
URL: http://inkscape.sourceforge.net/
Source0: http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
Patch0: inkscape-0.48.0-types.patch
-Patch1: inkscape-0.48.0-poppler.patch
Patch2: inkscape-0.48.0-libwpd.patch
Patch3: inkscape-0.48.0-gcc46.patch
@@ -120,7 +119,6 @@ graphics in W3C standard Scalable Vector Graphics (SVG) file format.
%prep
%setup -q
%patch0 -p1 -b .types
-%patch1 -p1 -b .poppler
%patch2 -p1 -b .libwpd
%patch3 -p1 -b .gcc46
@@ -233,6 +231,9 @@ fi
%changelog
+* Mon Feb 07 2011 Lubomir Rintel <lkundrak at v3.sk> - 0.48.1-1
+- Bump release
+
* Fri Feb 04 2011 Lubomir Rintel <lkundrak at v3.sk> - 0.48.0-10
- Drop gnome-vfs requirement
- Fix Rawhide build
diff --git a/sources b/sources
index 828bcfc..036d34f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fd8b17a3f06668603807176a77167bb9 inkscape-0.48.0.tar.bz2
+430fa43bba96ba19a98acdd163fd86d5 inkscape-0.48.1.tar.bz2
More information about the scm-commits
mailing list