From 7667f8272d3a6641f9fd30022b8ab86382f46ab7 Mon Sep 17 00:00:00 2001 From: Denis Leroy Date: Thu, 7 Sep 2006 09:59:41 +0000 Subject: [PATCH] - Update to 0.44.1 - Removed png export patch, integrated upstream - Some updated BRs --- .cvsignore | 2 +- inkscape-0.44-pngdpi.patch | 130 ------------------------------------- inkscape.spec | 17 +++-- sources | 2 +- 4 files changed, 12 insertions(+), 139 deletions(-) delete mode 100644 inkscape-0.44-pngdpi.patch diff --git a/.cvsignore b/.cvsignore index 86c4361..007e28b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -inkscape-0.44.tar.bz2 +inkscape-0.44.1.tar.gz diff --git a/inkscape-0.44-pngdpi.patch b/inkscape-0.44-pngdpi.patch deleted file mode 100644 index 9d9d50a..0000000 --- a/inkscape-0.44-pngdpi.patch +++ /dev/null @@ -1,130 +0,0 @@ -Index: src/selection-chemistry.cpp -=================================================================== ---- src/selection-chemistry.cpp (wersja 12152) -+++ src/selection-chemistry.cpp (kopia robocza) -@@ -2332,7 +2332,7 @@ - // Do the export - sp_export_png_file(document, filepath, - bbox.x0, bbox.y0, bbox.x1, bbox.y1, -- width, height, -+ width, height, res, res, - (guint32) 0xffffff00, - NULL, NULL, - true, /*bool force_overwrite,*/ -Index: src/file.cpp -=================================================================== ---- src/file.cpp (wersja 12152) -+++ src/file.cpp (kopia robocza) -@@ -1091,7 +1091,7 @@ - int - sp_export_png_file(SPDocument *doc, gchar const *filename, - double x0, double y0, double x1, double y1, -- unsigned width, unsigned height, -+ unsigned width, unsigned height, double xdpi, double ydpi, - unsigned long bgcolor, - unsigned (*status)(float, void *), - void *data, bool force_overwrite, -@@ -1168,12 +1168,12 @@ - if ((width < 256) || ((width * height) < 32768)) { - ebp.px = nr_pixelstore_64K_new(FALSE, 0); - ebp.sheight = 65536 / (4 * width); -- write_status = sp_png_write_rgba_striped(filename, width, height, sp_export_get_rows, &ebp); -+ write_status = sp_png_write_rgba_striped(filename, width, height, xdpi, ydpi, sp_export_get_rows, &ebp); - nr_pixelstore_64K_free(ebp.px); - } else { - ebp.px = g_new(guchar, 4 * 64 * width); - ebp.sheight = 64; -- write_status = sp_png_write_rgba_striped(filename, width, height, sp_export_get_rows, &ebp); -+ write_status = sp_png_write_rgba_striped(filename, width, height, xdpi, ydpi, sp_export_get_rows, &ebp); - g_free(ebp.px); - } - -Index: src/helper/png-write.cpp -=================================================================== ---- src/helper/png-write.cpp (wersja 12152) -+++ src/helper/png-write.cpp (kopia robocza) -@@ -53,18 +53,18 @@ - } - - int --sp_png_write_rgba (const gchar *filename, const guchar *px, int width, int height, int rowstride) -+sp_png_write_rgba (const gchar *filename, const guchar *px, int width, int height, double xdpi, double ydpi, int rowstride) - { - SPPNGBD bd; - - bd.px = px; - bd.rowstride = rowstride; - -- return sp_png_write_rgba_striped (filename, width, height, sp_png_get_block_stripe, &bd); -+ return sp_png_write_rgba_striped (filename, width, height, xdpi, ydpi, sp_png_get_block_stripe, &bd); - } - - int --sp_png_write_rgba_striped (const gchar *filename, int width, int height, -+sp_png_write_rgba_striped (const gchar *filename, int width, int height, double xdpi, double ydpi, - int (* get_rows) (const guchar **rows, int row, int num_rows, void *data), - void *data) - { -@@ -151,6 +151,7 @@ - /* other optional chunks like cHRM, bKGD, tRNS, tIME, oFFs, pHYs, */ - /* note that if sRGB is present the cHRM chunk must be ignored - * on read and must be written in accordance with the sRGB profile */ -+ png_set_pHYs(png_ptr, info_ptr, unsigned(xdpi / 0.0254 + 0.5), unsigned(ydpi / 0.0254 + 0.5), PNG_RESOLUTION_METER); - - /* Write the file header information. REQUIRED */ - png_write_info(png_ptr, info_ptr); -Index: src/helper/png-write.h -=================================================================== ---- src/helper/png-write.h (wersja 12152) -+++ src/helper/png-write.h (kopia robocza) -@@ -14,9 +14,9 @@ - - #include - --int sp_png_write_rgba(gchar const *filename, guchar const *px, int width, int height, int rowstride); -+int sp_png_write_rgba(gchar const *filename, guchar const *px, int width, int height, double xdpi, double ydpi, int rowstride); - --int sp_png_write_rgba_striped(gchar const *filename, int width, int height, -+int sp_png_write_rgba_striped(gchar const *filename, int width, int height, double xdpi, double ydpi, - int (* get_rows) (guchar const **rows, int row, int num_rows, void *data), - void *data); - -Index: src/dialogs/export.cpp -=================================================================== ---- src/dialogs/export.cpp (wersja 12152) -+++ src/dialogs/export.cpp (kopia robocza) -@@ -1070,7 +1070,7 @@ - - /* Do export */ - if (!sp_export_png_file (sp_desktop_document (SP_ACTIVE_DESKTOP), filename, -- x0, y0, x1, y1, width, height, -+ x0, y0, x1, y1, width, height, xdpi, ydpi, - nv->pagecolor, - sp_export_progress_callback, base)) { - gchar * error; -Index: src/main.cpp -=================================================================== ---- src/main.cpp (wersja 12152) -+++ src/main.cpp (kopia robocza) -@@ -955,7 +955,7 @@ - g_print("Bitmap saved as: %s\n", filename); - - if ((width >= 1) && (height >= 1) && (width < 65536) && (height < 65536)) { -- sp_export_png_file(doc, filename, area.x0, area.y0, area.x1, area.y1, width, height, bgcolor, NULL, NULL, true, sp_export_id_only ? items : NULL); -+ sp_export_png_file(doc, filename, area.x0, area.y0, area.x1, area.y1, width, height, dpi, dpi, bgcolor, NULL, NULL, true, sp_export_id_only ? items : NULL); - } else { - g_warning("Calculated bitmap dimensions %d %d are out of range (1 - 65535). Nothing exported.", width, height); - } -Index: src/file.h -=================================================================== ---- src/file.h (wersja 12152) -+++ src/file.h (kopia robocza) -@@ -129,7 +129,7 @@ - */ - int sp_export_png_file (SPDocument *doc, const gchar *filename, - double x0, double y0, double x1, double y1, -- unsigned int width, unsigned int height, -+ unsigned int width, unsigned int height, double xdpi, double ydpi, - unsigned long bgcolor, - unsigned int (*status) (float, void *), void *data, bool force_overwrite = false, GSList *items_only = NULL); - diff --git a/inkscape.spec b/inkscape.spec index e15b5b7..812ed22 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -1,13 +1,12 @@ Name: inkscape -Version: 0.44 -Release: 6%{?dist} +Version: 0.44.1 +Release: 1%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity License: GPL URL: http://inkscape.sourceforge.net/ -Source0: http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.bz2 -Patch0: inkscape-0.44-pngdpi.patch +Source0: http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: atk-devel @@ -20,14 +19,14 @@ BuildRequires: gtkspell-devel BuildRequires: libart_lgpl-devel >= 2.3.10 BuildRequires: libgnomeprintui22-devel >= 2.2.0 BuildRequires: gnome-vfs2-devel >= 2.0 -BuildRequires: libpng-devel +BuildRequires: libpng-devel >= 1.2 BuildRequires: libsigc++20-devel BuildRequires: libxml2-devel >= 2.4.24 BuildRequires: libxslt-devel BuildRequires: pango-devel BuildRequires: pkgconfig BuildRequires: lcms-devel >= 1.13 -BuildRequires: boost-devel +BuildRequires: boost-devel >= 1.33.1 %{?_with_perl: BuildRequires: perl-XML-Parser, perl-libxml-enno} %{?_with_python: BuildRequires: python-devel} %{?_with_inkboard: BuildRequires: loudmouth-devel >= 1.0} @@ -58,7 +57,6 @@ C and C++, using the Gtk+ toolkit and optionally some Gnome libraries. %prep %setup -q -%patch0 -p0 -b .pngdpi %build @@ -121,6 +119,11 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Thu Sep 7 2006 Denis Leroy - 0.44.1-1 +- Update to 0.44.1 +- Removed png export patch, integrated upstream +- Some updated BRs + * Mon Aug 28 2006 Denis Leroy - 0.44-6 - FE6 Rebuild diff --git a/sources b/sources index d3dc79f..44c66c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f0bf316e15ddc6009976d97388522f85 inkscape-0.44.tar.bz2 +ae2929f70403004038963ef2448728f3 inkscape-0.44.1.tar.gz