Hello community, here is the log from the commit of package inkscape.1314 for openSUSE:12.1:Update checked in at 2013-02-14 16:51:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update/inkscape.1314 (Old) and /work/SRC/openSUSE:12.1:Update/.inkscape.1314.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "inkscape.1314", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-02-09 11:18:20.872010756 +0100 +++ /work/SRC/openSUSE:12.1:Update/.inkscape.1314.new/inkscape.changes 2013-02-14 16:51:24.000000000 +0100 @@ -0,0 +1,541 @@ +------------------------------------------------------------------- +Wed Feb 6 08:05:15 UTC 2013 - dims...@opensuse.org + +- Add inkscape-relative-filename.patch: Ensures that filenames + passed to extensions are made absolute before changing the + current working directory (bnc#796306, CVE-2012-6076). + +------------------------------------------------------------------- +Tue Dec 18 08:35:45 UTC 2012 - dims...@opensuse.org + +- Add inkscape-XXE-attacks.patch: Fix XXE vulnerability by making + network access optional for XML loading (bnc#794958, CWE-827, + CVE-2012-5656). + +------------------------------------------------------------------- +Wed Jul 13 21:16:21 UTC 2011 - mrd...@opensuse.org + +- Update to version 0.48.2: + + many crash/hang fixes + + DXF and tex export fixes + + Bugs fixed: https://launchpad.net/inkscape/+milestone/0.48.2 + + Updated translations. +- Drop inkscape-0.48.0-gcc46.patch: fixed upstream. + +------------------------------------------------------------------- +Tue Mar 22 08:00:15 UTC 2011 - idoen...@novell.com + +- Add inkscape-0.48.0-gcc46.patch: fix compilation with gcc 4.6 + +------------------------------------------------------------------- +Sat Feb 12 19:22:44 CET 2011 - vu...@opensuse.org + +- Call relevant macros in %post/%postun: + + %desktop_database_post/postun because the package ships at + least one desktop file. + + %icon_theme_cache_post/postun because the package ships themed + icons. +- Pass %{?no_lang_C} to %find_lang so that english documentation + can be packaged with the program, and not in the lang subpackage. +- Change Requires of lang subpackage to Recommends, since the + english documentation is not there anymore. + +------------------------------------------------------------------- +Mon Jan 31 12:07:52 UTC 2011 - mrd...@opensuse.org + +- Update to version 0.48.1: + 0.48.1 is a stability and bugfix release. + + Many small regressions in the node tool were fixed. + + Exporting of masks has been substantially improved in all + Cairo-based output formats. + + lp#544599, lp#591986, lp#605575: Several crash bugs in the node + tool have been fixed. + + lp#627134: Rulers are redrawn properly with recent versions of + GTK + + lp#675309: Unlinking an orphaned clone no longer causes a crash + + lp#482993: Problems with extensions sometimes not working at + all on Mac OS X. + + lp#651678: Inkscape should no longer crash due to missing icons + at startup or when opening the document properties dialog. + + lp#680520: Shift-clicking on the top rounding handle of a + rectangle will no longer cause a crash. + + lp#676271: Inkscape builds correctly with recent Poppler.lp + + Bugs fixed: lp#658055, bnc#661370 +- drop inkscape-r9710-9712.patch: fixed upstream. +- export CFLAGS, as inkscape is C and C++ +- Remove --enable-inkboard from configure: jessyink replaces it +- Remove Obsoletes: sodipodi NLD9 is obsolete +- Delete installed but useless header files +- run spec-cleaner on the spec file + +------------------------------------------------------------------- +Tue Dec 14 18:18:01 CET 2010 - vu...@opensuse.org + +- Fix the build again: the te_IN translation should simply be te, + so move the translation. + +------------------------------------------------------------------- +Sat Dec 11 11:16:56 CET 2010 - vu...@opensuse.org + +- Add popt-devel BuildRequires to fix the build. + +------------------------------------------------------------------- +Tue Dec 7 16:50:10 CET 2010 - vu...@opensuse.org + +- Tag localized man pages with the right language. We should + eventually move them to the lang subpackage, but at the moment, + they would create a file conflict between bundles and the lang + subpackage. + +------------------------------------------------------------------- +Tue Nov 30 09:51:39 CET 2010 - vu...@opensuse.org + +- Make inkscape-extensions-extra depend on python-xml instead of + pyxml: pyxml will be removed, and we really wanted to use + python-xml anyway. +- Update inkscape-packages.patch to mention python-xml instead of + pyxml: even if upstream mentions pyxml, python-xml is really okay + here. + +------------------------------------------------------------------- +Sun Aug 15 22:27:48 CEST 2010 - dims...@opensuse.org + +- Update to version 0.48.0: + + multipath editing + + improved text tool: subscript, superscript,numerical input for + text kerning, tracking and more + + new Airbrush tool + + LaTeX export with PDF/PS/EPS + + JessyInk extension to create presentations + + numerous bugfixes +- Rebase inkscape-remove-datetime.patch. +- Drop inkscape-poppler-0.12.2.patch, inkscape-gcc45.patch and + inkscape-non_void.patch: upstream fixed. +- Add inkscape-r9710-9712.patch to fix node editor crash when + dragging near the last node of a path. + +------------------------------------------------------------------- +Mon Jun 14 12:04:30 CEST 2010 - vu...@opensuse.org + +- Do not add wrong categories to inkscape.desktop (Office, + FlowChart). + +------------------------------------------------------------------- +Tue Mar 2 13:20:36 UTC 2010 - dims...@opensuse.org + +- Add inkscape-gcc45.patch to fix build with gcc 4.5. Patch + copied from upstream bug tracker, lp#522327. +- Add inkscape-non_void.patch, cross-ported from gdl upstream, + commit 40b8cb7. + +------------------------------------------------------------------- +Wed Dec 16 15:06:57 CET 2009 - vu...@opensuse.org + +- Add inkscape-poppler-0.12.2.patch to fix build with recent + poppler. This patch comes from Fedora, but was not committed + upstream. See lp#487038 for the discussion, and another patch. + +------------------------------------------------------------------- +Fri Nov 27 14:50:21 CET 2009 - dims...@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 - co...@novell.com + +- updated patches to apply with fuzz=0 + +------------------------------------------------------------------- +Mon Jul 13 11:58:53 CEST 2009 - co...@novell.com + +- remove dupliacted files (fix build with automake 1.11) + +------------------------------------------------------------------- +Wed May 13 02:53:30 CEST 2009 - vu...@novell.com + +- Remove unneeded BuildRequires: libglade2-devel, + libgnomeprintui-devel, libgnomeui-devel, libwnck-devel, + loudmouth-devel +- Add BuildRequires: gc-devel, gnome-vfs2-devel +- Do not build gc inside this package and use the system-installed + one. Drop gc6.4.patch since we don't need to patch gc now :-) +- Drop inkscape-boehm-gc.patch: we just use the system-installed gc + now. +- Drop inkscape-swigfix.patch: I don't really see the point of + this. ++++ 344 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.1:Update/.inkscape.1314.new/inkscape.changes New: ---- inkscape-0.48.2.tar.bz2 inkscape-XXE-attacks.patch inkscape-packages.patch inkscape-relative-filename.patch inkscape-remove-datetime.patch inkscape-split-extensions-extra.sh inkscape.changes inkscape.spec openSUSE.gpl ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inkscape.spec ++++++ # # spec file for package inkscape # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: inkscape Version: 0.48.2 Release: 0 Summary: Vector Illustration Program License: GPL-2.0 and LGPL-2.1 Group: Productivity/Graphics/Vector Editors Url: http://www.inkscape.org/ Source: %{name}-%{version}.tar.bz2 # openSUSE palette file Source1: openSUSE.gpl Source2: inkscape-split-extensions-extra.sh # PATCH-FEATURE-OPENSUSE inkscape-remove-datetime.patch vu...@novell.com -- Do not put date/time in the compiled binary (needed for build-compare) Patch0: inkscape-remove-datetime.patch # PATCH-FIX-OPENSUSE inkscape-packages.patch sbra...@suse.cz -- Suggest packages instead of compilation from source. Patch1: inkscape-packages.patch # PATCH-FIX-UPSTREAM inkscape-XXE-attacks.patch lp#1025185 bnc#794958 CVE-2012-5656 dims...@opensuse.org -- Fix XXE vulnerability by making network access optional for XML loading Patch2: inkscape-XXE-attacks.patch # PATCH-FIX-UPSTREAM inkscape-relative-filename.patch bnc#796306 CVE-2012-6076 dims...@opensuse.org -- relative filename vulnerability Patch3: inkscape-relative-filename.patch 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: popt-devel BuildRequires: python-devel BuildRequires: python-gtk-devel BuildRequires: sgml-skel BuildRequires: update-desktop-files Requires: /usr/bin/gs Requires: ghostscript-fonts-std Requires: gzip Requires: pstoedit Requires: python-gtk Recommends: %{name}-lang Recommends: python-lxml BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Inkscape is a vector illustration program for the GNOME desktop. %package extensions-extra Summary: Vector Illustration Program - Extra Extensions Group: Productivity/Graphics/Vector Editors Requires: %{name} = %{version} Requires: python-lxml Requires: python-xml # for cdr and wmf modules Requires: yudit # python-xml is already likely installed, so the big dependency is python-lxml. Hence this supplements. Supplements: packageand(%{name}:python-lxml) # 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 use Inkscape. Inkscape is a vector illustration program for the GNOME desktop. %package extensions-dia Summary: Vector Illustration Program - Dia Import Extension Group: Productivity/Graphics/Vector Editors Requires: %{name} = %{version} Requires: dia Supplements: packageand(%{name}:dia) # 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. %package extensions-fig Summary: Vector Illustration Program - Fig Import Extension Group: Productivity/Graphics/Vector Editors Requires: %{name} = %{version} Requires: transfig Supplements: packageand(%{name}:transfig) # 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 Inkscape. Inkscape is a vector illustration program for the GNOME desktop. %package extensions-gimp Summary: Vector Illustration Program - The GIMP Extensions Group: Productivity/Graphics/Vector Editors Requires: %{name} = %{version} Requires: gimp-2.0 Supplements: packageand(%{name}:gimp) Supplements: packageand(%{name}:gimp-2.0) # 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. %package extensions-skencil Summary: Vector Illustration Program - Skencil Import Extension Group: Productivity/Graphics/Vector Editors Requires: %{name} = %{version} Requires: skencil Supplements: packageand(%{name}:skencil) # 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. %lang_package %prep %setup -q %patch0 -p1 %patch1 -p1 %patch2 %patch3 -p1 %build export CFLAGS="%{optflags} -fno-strict-aliasing" export CXXFLAGS="%{optflags} -fno-strict-aliasing" # We're building without perl support for now... %configure\ --with-python\ --without-perl make %{?_smp_mflags} %install %makeinstall rm -rf %{buildroot}%{_datadir}/locale/en_US@piglatin rm -rf %{buildroot}%{_datadir}/inkscape/filters/filters.svg.h rm -rf %{buildroot}%{_datadir}/inkscape/patterns/patterns.svg.h install -D -m 0644 %{S:1} %{buildroot}%{_datadir}/inkscape/palettes %suse_update_desktop_file -N "Inkscape" -G "SVG Vector Illustrator" inkscape # te_IN should really just be te, see lp#690255 test ! -e %{buildroot}%{_datadir}/locale/te mv %{buildroot}%{_datadir}/locale/te_IN %{buildroot}%{_datadir}/locale/te %find_lang %{name} %{?no_lang_C} bash %{S:2} %{buildroot}%{_datadir}/inkscape/extensions "%%{_datadir}/inkscape/extensions/" ## fix line endings sed -i 's/\r$//' %{buildroot}%{_datadir}/inkscape/extensions/param_curves.py sed -i 's/\r$//' %{buildroot}%{_datadir}/inkscape/extensions/render_alphabetsoup.py %fdupes %{buildroot} %clean rm -rf %{buildroot} %if 0%{?suse_version} > 1130 %post %desktop_database_post %icon_theme_cache_post %endif %if 0%{?suse_version} > 1130 %postun %desktop_database_postun %icon_theme_cache_postun %endif %files -f inkscape.lst %defattr(-,root,root) %doc AUTHORS COPYING COPYING.LIB ChangeLog INSTALL NEWS README* TRANSLATORS %{_bindir}/* %{_datadir}/applications/inkscape.desktop %{_datadir}/icons/hicolor/*/apps/inkscape.png %dir %{_datadir}/inkscape %{_datadir}/inkscape/[cf-z]* %{_datadir}/inkscape/examples %dir %{_datadir}/inkscape/extensions %{_datadir}/inkscape/extensions/xaml2svg %{_datadir}/inkscape/extensions/*.pl %{_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 %{_datadir}/inkscape/extensions/jessyInk.js %{_datadir}/inkscape/extensions/jessyInk_core_mouseHandler_noclick.js %{_datadir}/inkscape/extensions/jessyInk_core_mouseHandler_zoomControl.js %{_datadir}/inkscape/extensions/jessyInk_video.svg #BEGIN FIXME: What is purpose of these plugins? I see no references to them: %{_datadir}/inkscape/extensions/SpSVG.pm %{_datadir}/inkscape/extensions/Inkscape.pm %{_datadir}/inkscape/extensions/simplepath.rb #END FIXME %doc %{_mandir}/man?/*.* # We can't really move the localized manpages to the lang package, since they'd # create a conflict between the lang subpackage and bundles %lang(fr) %{_mandir}/fr/man?/*.* # exclude extensions that go in other packages: %exclude %{_datadir}/inkscape/extensions/Barcode %exclude %{_datadir}/inkscape/extensions/cdr* %exclude %{_datadir}/inkscape/extensions/wmf* %exclude %{_datadir}/inkscape/extensions/dia* %exclude %{_datadir}/inkscape/extensions/fig* %exclude %{_datadir}/inkscape/extensions/*gimp* %exclude %{_datadir}/inkscape/extensions/sk* %files extensions-extra -f inkscape-extensions-extra.lst %defattr(-,root,root) %{_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) %{_datadir}/inkscape/extensions/dia* %files extensions-fig %defattr(-,root,root) %{_datadir}/inkscape/extensions/fig* %files extensions-gimp %defattr(-,root,root) # NOTE: export_gimp_palette* does not depend on gimp, but belongs here logically: %{_datadir}/inkscape/extensions/*gimp* %files extensions-skencil %defattr(-,root,root) %{_datadir}/inkscape/extensions/sk* %files lang -f %{name}.lang %changelog ++++++ inkscape-XXE-attacks.patch ++++++ === modified file 'src/preferences-skeleton.h' Index: src/preferences-skeleton.h =================================================================== --- src/preferences-skeleton.h.orig +++ src/preferences-skeleton.h @@ -315,6 +315,10 @@ static char const preferences_skeleton[] " clips=\"16711935\"" // 00ff00ff " masks=\"65535\"/>\n" // 0x0000ffff " <group id=\"svgoutput\" usenamedcolors=\"0\" numericprecision=\"8\" minimumexponent=\"-8\" inlineattrs=\"0\" indent=\"2\" allowrelativecoordinates=\"1\" forcerepeatcommands=\"0\"/>\n" +" <group id=\"externalresources\">\n" +" <group id=\"xml\" " +" allow_net_access=\"0\"/>\n" +" </group>\n" " <group id=\"forkgradientvectors\" value=\"1\"/>\n" " <group id=\"iconrender\" named_nodelay=\"0\"/>\n" " <group id=\"autosave\" enable=\"0\" interval=\"10\" path=\"\" max=\"10\"/>\n" Index: src/ui/dialog/ocaldialogs.cpp =================================================================== --- src/ui/dialog/ocaldialogs.cpp.orig +++ src/ui/dialog/ocaldialogs.cpp @@ -468,9 +468,16 @@ void FileImportFromOCALDialog::searchTag xmlDoc *doc = NULL; xmlNode *root_element = NULL; + int parse_options = XML_PARSE_RECOVER + XML_PARSE_NOWARNING + XML_PARSE_NOERROR; // do not use XML_PARSE_NOENT ! see bug lp:1025185 + prefs = Inkscape::Preferences::get(); + bool allowNetAccess = prefs->getBool("/options/externalresources/xml/allow_net_access", false); + if (!allowNetAccess) { + parse_options |= XML_PARSE_NONET; + } + doc = xmlReadIO ((xmlInputReadCallback) vfs_read_callback, - (xmlInputCloseCallback) gnome_vfs_close, from_handle, uri.c_str(), NULL, - XML_PARSE_RECOVER + XML_PARSE_NOWARNING + XML_PARSE_NOERROR); + (xmlInputCloseCallback) gnome_vfs_close, from_handle, uri.c_str(), NULL, parse_options); + if (doc == NULL) { sp_ui_error_dialog(_("Server supplied malformed Clip Art feed")); g_warning("Failed to parse %s\n", uri.c_str()); Index: src/xml/repr-io.cpp =================================================================== --- src/xml/repr-io.cpp.orig +++ src/xml/repr-io.cpp @@ -289,12 +289,18 @@ sp_repr_read_file (const gchar * filenam XmlSource src; if ( (src.setFile(filename) == 0) ) { - doc = xmlReadIO( XmlSource::readCb, + int parse_options = XML_PARSE_HUGE; // do not use XML_PARSE_NOENT ! see bug lp:1025185 + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + bool allowNetAccess = prefs->getBool("/options/externalresources/xml/allow_net_access", false); + if (!allowNetAccess) { + parse_options |= XML_PARSE_NONET; + } + doc = xmlReadIO( XmlSource::readCb, XmlSource::closeCb, &src, localFilename, src.getEncoding(), - XML_PARSE_NOENT ); + parse_options); } } ++++++ inkscape-packages.patch ++++++ 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 XML modules. Please install the python-xml 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 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") ++++++ inkscape-relative-filename.patch ++++++ From: Michael Karcher <deb...@mkarcher.dialup.fu-berlin.de> Date: Sat, 29 Dec 2012 17:33:33 +0100 Subject: Fix LP: #911146 relative filename vulnerability Ensures that filenames passed to extensions are made absolute before changing the current working directory. --- src/extension/implementation/script.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp index b78fbda..02c3aeb 100644 --- a/src/extension/implementation/script.cpp +++ b/src/extension/implementation/script.cpp @@ -954,7 +954,14 @@ int Script::execute (const std::list<std::string> &in_command, // assemble the rest of argv std::copy(in_params.begin(), in_params.end(), std::back_inserter(argv)); if (!filein.empty()) { - argv.push_back(filein); + if(Glib::path_is_absolute(filein)) + argv.push_back(filein); + else { + std::vector<std::string> buildargs; + buildargs.push_back(Glib::get_current_dir()); + buildargs.push_back(filein); + argv.push_back(Glib::build_filename(buildargs)); + } } int stdout_pipe, stderr_pipe; -- 1.7.10.4 ++++++ inkscape-remove-datetime.patch ++++++ Index: inkscape-0.48.0/src/main.cpp =================================================================== --- inkscape-0.48.0.orig/src/main.cpp +++ inkscape-0.48.0/src/main.cpp @@ -1894,7 +1894,7 @@ sp_process_args(poptContext ctx) break; } case SP_ARG_VERSION: { - printf("Inkscape %s (%s)\n", Inkscape::version_string, __DATE__); + printf("Inkscape %s\n", Inkscape::version_string); exit(0); break; } ++++++ inkscape-split-extensions-extra.sh ++++++ #!/bin/bash # List all files, that depend on NEXT_LIST_REGEXP, explicitly or implicitly cd $1 # Search all py files importing one of the mentioned modules: make_extra_list() { NEWLIST=( $(grep -rl '\(import\|from\).* '"$NEXT_LIST_REGEXP"'\(,\|\.\| \|$\)' .) ) EXTRA_LIST=( $(IFS=$'\n' ; echo "${EXTRA_LIST[*]}"$'\n'"${NEWLIST[*]}" | sed '/^$/d;s:^\./::' | sort -u) ) NEWLIST=( "${NEWLIST[@]##*/}" ) NEXT_LIST_REGEXP="\\(${NEWLIST[*]%.py}\\)" NEXT_LIST_REGEXP=${NEXT_LIST_REGEXP// /\\|} } # Search all py files that are imported by mentioned modules: make_deplist() { NEWLIST=( $( ( (IFS=$'\n' ; echo "${NEWLIST[*]}"$'\n') ; sed 2>/dev/null -n 's/^from \(.*\) import.*/\1/p;s/^import //p' ${NEWLIST[@]} | sed 's/, /\n/g' | sed 's/$/.py/;s/\.py\.py$/.py/') | sort -u) ) } OLDLIST=( EMPTY ) EXTRA_LIST=() NEXT_LIST_REGEXP='\(xml\|lxml\)' ITER=1 until test "${EXTRA_LIST[*]}" = "${OLDLIST[*]}" ; do OLDLIST=( "${EXTRA_LIST[@]}" ) make_extra_list #echo "iter $ITER list: ${LIST[*]}" let ITER++ done # We have a complete list of py files dependent on xml or lxml. # Now we need a list of inx module descriptors. INX_REGEXP="${EXTRA_LIST[*]//./\\.}" INX_REGEXP="\\(>${INX_REGEXP// /<\\|>}<\\)" INX_EXTRA_LIST=( $(grep -l "$INX_REGEXP" *.inx) ) # inx files that do not belong to INX_EXTRA_LIST will be a part of INX_STD_LIST INX_STD_LIST=() for FILE in *.inx ; do eval 'case $FILE in '"$(IFS='|' ; echo "${INX_EXTRA_LIST[*]}")"') continue;; esac' INX_STD_LIST[${#INX_STD_LIST[@]}]=$FILE done # Now create list of py files that should belong to std package: OLDLIST=( EMPTY ) NEWLIST=( $(sed -n 's@.*<dependency type="executable" location="extensions">\(.*\)\.py</dependency>.*@\1.py@p' ${INX_STD_LIST[@]}) ) ITER=1 until test "${NEWLIST[*]}" = "${OLDLIST[*]}" ; do OLDLIST=( "${NEWLIST[@]}" ) make_deplist #echo "iter $ITER list: ${LIST[*]}" let ITER++ done STD_LIST=( "${NEWLIST[@]}" ) # Now create list of py files that are required by extra modules: # (If no std module needs it, then they will belong to extra package.) OLDLIST=( EMPTY ) NEWLIST=( $(sed -n 's@.*<dependency type="executable" location="extensions">\(.*\)\.py</dependency>.*@\1.py@p' ${INX_EXTRA_LIST[@]}) ) ITER=1 until test "${NEWLIST[*]}" = "${OLDLIST[*]}" ; do OLDLIST=( "${NEWLIST[@]}" ) make_deplist #echo "iter $ITER list: ${LIST[*]}" let ITER++ done EXTRADEP_LIST=( ${NEWLIST[@]} ) # And now verify everything and generate final list: # Now its safe to ignore subdirectory issue - we know where they belong. RC=0 IFS=$'\n' exec 3>$OLDPWD/inkscape.lst echo >&3 "%defattr(-,root,root)" for FILE in ${INX_STD_LIST[@]} ; do echo >&3 $2$FILE done exec 4>$OLDPWD/inkscape-extensions-extra.lst echo >&4 "%defattr(-,root,root)" for FILE in ${INX_EXTRA_LIST[@]} ; do echo >&4 $2$FILE done for FILE in *.py ; do eval ' case $FILE in cdr*|dia*|fig*|*gimp*|sk*) continue;; '"$(IFS='|' ; echo "${EXTRA_LIST[*]}")"') echo >&4 $2$FILE; continue;; '"$(IFS='|' ; echo "${STD_LIST[*]}")"') echo >&3 $2$FILE; continue;; '"$(IFS='|' ; echo "${EXTRADEP_LIST[*]}")"') echo >&4 $2$FILE; continue;; esac' echo "ERROR: Undecided file $FILE" RC=1 done exec 3>&- exec 4>&- exit $RC ++++++ openSUSE.gpl ++++++ 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 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
