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 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 #include 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 #include 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 + #include #include +#include #include #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-0.48.0-poppler.patch b/inkscape-0.48.0-poppler.patch deleted file mode 100644 index 377304c..0000000 --- a/inkscape-0.48.0-poppler.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 646a577c1a10ec62cd4e65e34f7af7e6f8900aee Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Sun, 14 Nov 2010 17:12:58 +0100 -Subject: [PATCH] Fix build with Poppler 0.15.1 - ---- - config.h.in | 3 ++ - configure.ac | 29 ++++++++++++++++++++--- - src/extension/internal/pdfinput/pdf-parser.cpp | 10 ++++++++ - 3 files changed, 38 insertions(+), 4 deletions(-) - -diff --git a/config.h.in b/config.h.in -index 909c36b..cab6f0d 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -246,6 +246,9 @@ - /* Use color space API from Poppler >= 0.12.2 */ - #undef POPPLER_NEW_COLOR_SPACE_API - -+/* GfxPatch no longer uses GfxColor in >= 0.15.1 */ -+#undef POPPLER_NEW_GFXPATCH -+ - /* Use GfxFont from Poppler >= 0.8.3 */ - #undef POPPLER_NEW_GFXFONT - -diff --git a/configure.ac b/configure.ac -index b3c9fd0..815a402 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -611,11 +611,12 @@ if test "x$popplernew" = "xyes"; then - AC_DEFINE(POPPLER_NEW_GFXFONT, 1, [Use GfxFont from Poppler >= 0.8.3]) - fi - --AC_MSG_CHECKING(for new color space API in Poppler) - ink_svd_CPPFLAGS=$CPPFLAGS - ink_svd_LIBS=$LIBS - CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS" - LIBS="$LIBS $POPPLER_LIBS" -+ -+AC_MSG_CHECKING(for new color space API in Poppler) - popplercolor="no" - AC_COMPILE_IFELSE([ - #include -@@ -627,9 +628,6 @@ int main() { - return 0; - } - ], [popplercolor=yes]) --CPPFLAGS=$ink_svd_CPPFLAGS --LIBS=$ink_svd_LIBS -- - if test "x$popplercolor" = "xyes"; then - AC_DEFINE(POPPLER_NEW_COLOR_SPACE_API, 1, [Use color space API from Poppler >= 0.12.2]) - AC_MSG_RESULT(yes) -@@ -637,6 +635,29 @@ else - AC_MSG_RESULT(no) - fi - -+# Poppler's b604a008 commit changes this -+AC_MSG_CHECKING(whether Poppler''s GfxPatch no longer uses GfxColor) -+popplergfxcolor="no" -+AC_COMPILE_IFELSE([ -+#include -+ -+int main() { -+ GfxPatch::ColorValue color = {c: {0}}; -+ GfxPatch patch; -+ patch.color[[0]][[0]] = color; -+ return 0; -+} -+], [popplergfxcolor=yes]) -+if test "x$popplergfxcolor" = "xyes"; then -+ AC_DEFINE(POPPLER_NEW_GFXPATCH, 1, [GfxPatch no longer uses GfxColor in >= 0.15.1]) -+ AC_MSG_RESULT(yes) -+else -+ AC_MSG_RESULT(no) -+fi -+ -+CPPFLAGS=$ink_svd_CPPFLAGS -+LIBS=$ink_svd_LIBS -+ - dnl ****************************** - dnl Inkboard dependency checking - dnl ****************************** -diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp -index b37cbb7..ef31cd3 100644 ---- a/src/extension/internal/pdfinput/pdf-parser.cpp -+++ b/src/extension/internal/pdfinput/pdf-parser.cpp -@@ -1874,6 +1874,9 @@ void PdfParser::doPatchMeshShFill(GfxPatchMeshShading *shading) { - - void PdfParser::fillPatch(GfxPatch *patch, int nComps, int depth) { - GfxPatch patch00, patch01, patch10, patch11; -+#ifdef POPPLER_NEW_GFXPATCH -+ GfxColor color; -+#endif - double xx[4][8], yy[4][8]; - double xxm, yym; - double patchColorDelta = colorDeltas[pdfPatchMeshShading-1]; -@@ -1890,9 +1893,16 @@ void PdfParser::fillPatch(GfxPatch *patch, int nComps, int depth) { - > patchColorDelta) { - break; - } -+#ifdef POPPLER_NEW_GFXPATCH -+ color.c[i] = GfxColorComp(patch->color[0][0].c[i]); -+#endif - } - if (i == nComps || depth == maxDepths[pdfPatchMeshShading-1]) { -+#ifdef POPPLER_NEW_GFXPATCH -+ state->setFillColor(&color); -+#else - state->setFillColor(&patch->color[0][0]); -+#endif - state->moveTo(patch->x[0][0], patch->y[0][0]); - state->curveTo(patch->x[0][1], patch->y[0][1], - patch->x[0][2], patch->y[0][2], --- -1.7.3.2 - 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 - 0.48.1-1 +- Bump release + * Fri Feb 04 2011 Lubomir Rintel - 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