rpms/inkscape/EL-5 inkscape-0.46-fixlatex.patch, NONE, 1.1 inkscape-0.46pre2-icons.patch, NONE, 1.1 inkscape-16571-cxxinclude.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 inkscape-0.45.1-desktop.patch, 1.1, 1.2 inkscape.spec, 1.37, 1.38 sources, 1.12, 1.13 inkscape-0.44.1-psinput.patch, 1.1, NONE inkscape-0.45-python.patch, 1.2, NONE inkscape-0.45.1-gtkprint.patch, 1.1, NONE
Lubomir Kundrak (lkundrak)
fedora-extras-commits at redhat.com
Sun Apr 6 13:52:18 UTC 2008
- Previous message (by thread): rpms/nx/devel .cvsignore, 1.11, 1.12 nx.spec, 1.19, 1.20 sources, 1.12, 1.13
- Next message (by thread): rpms/lua-filesystem/devel lua-filesystem.spec, NONE, 1.1 luafilesystem-1.4.0-includefix.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: lkundrak
Update of /cvs/pkgs/rpms/inkscape/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20095/EL-5
Modified Files:
.cvsignore inkscape-0.45.1-desktop.patch inkscape.spec sources
Added Files:
inkscape-0.46-fixlatex.patch inkscape-0.46pre2-icons.patch
inkscape-16571-cxxinclude.patch
Removed Files:
inkscape-0.44.1-psinput.patch inkscape-0.45-python.patch
inkscape-0.45.1-gtkprint.patch
Log Message:
Merge 0.46 from devel
inkscape-0.46-fixlatex.patch:
--- NEW FILE inkscape-0.46-fixlatex.patch ---
Patch to fix #441017: LaTeX rendering nonfunctional in Inkscape 0.46.
First hunk is from Stéphane Bonnet, thanks!
http://launchpadlibrarian.net/12978623/eqtexsvg.py.patch
Second hunk is from here, unlike Ubuntu we support -quiet though
https://bugs.launchpad.net/inkscape/+bug/195052/comments/1
--- inkscape-0.46/share/extensions/eqtexsvg.py.orig 2008-04-05 22:12:35.000000000 +0200
+++ inkscape-0.46/share/extensions/eqtexsvg.py 2008-04-05 22:14:04.000000000 +0200
@@ -49,16 +49,18 @@ def svg_open(self,filename):
doc_sizeW = max(doc_width,doc_height)
def clone_and_rewrite(self, node_in):
- if node_in.tag != 'svg':
- node_out = inkex.etree.Element(inkex.addNS(node_in.tag,'svg'))
+ in_tag = node_in.tag.rsplit('}',1)[-1]
+ if in_tag != 'svg':
+ node_out = inkex.etree.Element(inkex.addNS(in_tag,'svg'))
for name in node_in.attrib:
node_out.set(name, node_in.attrib[name])
else:
node_out = inkex.etree.Element(inkex.addNS('g','svg'))
for c in node_in.iterchildren():
- if c.tag in ('g', 'path', 'polyline', 'polygon'):
+ c_tag = c.tag.rsplit('}',1)[-1]
+ if c_tag in ('g', 'path', 'polyline', 'polygon'):
child = clone_and_rewrite(self, c)
- if c.tag == 'g':
+ if c_tag == 'g':
child.set('transform','matrix('+str(doc_sizeH/700.)+',0,0,'+str(-doc_sizeH/700.)+','+str(-doc_sizeH*0.25)+','+str(doc_sizeW*0.75)+')')
node_out.append(child)
@@ -110,7 +112,7 @@ class EQTEXSVG(inkex.Effect):
os.system('dvips -q -f -E -D 600 -y 5000 -o ' + ps_file + ' ' + dvi_file)
#os.system('cd ' + base_dir)
- os.system('pstoedit -f plot-svg -dt -ssp ' + ps_file + ' ' + svg_file + '> ' + out_file)
+ os.system('pstoedit -quiet -f plot-svg -dt -ssp ' + ps_file + ' ' + svg_file + '> ' + out_file)
svg_open(self, svg_file)
clean()
inkscape-0.46pre2-icons.patch:
--- NEW FILE inkscape-0.46pre2-icons.patch ---
Default to small icons and Sans font.
diff -urp inkscape-0.45+0.46pre2.orig/src/preferences-skeleton.h inkscape-0.45+0.46pre2/src/preferences-skeleton.h
--- inkscape-0.45+0.46pre2.orig/src/preferences-skeleton.h 2008-02-17 05:24:14.000000000 +0100
+++ inkscape-0.45+0.46pre2/src/preferences-skeleton.h 2008-02-22 09:34:12.000000000 +0100
@@ -73,7 +73,7 @@ static char const preferences_skeleton[]
" tracebackground=\"0\" usepressure=\"1\" usetilt=\"0\" keep_selected=\"1\"/>\n"
" <eventcontext id=\"text\" usecurrent=\"0\" gradientdrag=\"1\"\n"
" font_sample=\"AaBbCcIiPpQq12369$\342\202\254\302\242?.;/()\"\n"
-" style=\"fill:black;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;font-style:normal;font-weight:normal;font-size:40px;\" selcue=\"1\"/>\n"
+" style=\"fill:black;fill-opacity:1;stroke:none;font-family:Sans;font-style:normal;font-weight:normal;font-size:40px;-inkscape-font-specification:Sans;font-stretch:normal;font-variant:normal\" selcue=\"1\"/>\n"
" <eventcontext id=\"nodes\" selcue=\"1\" gradientdrag=\"1\" show_handles=\"1\" sculpting_profile=\"1\" />\n"
" <eventcontext id=\"tweak\" selcue=\"0\" gradientdrag=\"0\" show_handles=\"0\" width=\"0.2\" force=\"0.2\" fidelity=\"0.5\" usepressure=\"1\" style=\"fill:red;stroke:none;\" usecurrent=\"0\"/>\n"
" <eventcontext id=\"gradient\" selcue=\"1\"/>\n"
@@ -308,7 +308,7 @@ static char const preferences_skeleton[]
" <group\n"
" id=\"tools\"\n"
" icononly=\"1\"\n"
-" small=\"0\" />\n"
+" small=\"1\" />\n"
" </group>\n"
"\n"
" <group\n"
inkscape-16571-cxxinclude.patch:
--- NEW FILE inkscape-16571-cxxinclude.patch ---
--- inkscape-16571/src/Makefile.in.orig 2007-11-29 13:38:13.000000000 +0100
+++ inkscape-16571/src/Makefile.in 2007-11-29 13:38:29.000000000 +0100
@@ -317,7 +317,8 @@
$(POPPLER_GLIB_CFLAGS) \
-DPOTRACE=\"potrace\" \
$(INKSCAPE_CFLAGS) \
- -I$(top_srcdir)/cxxtest
+ -I$(top_srcdir)/cxxtest \
+ -I$(top_srcdir)/src/extension/script
@PLATFORM_WIN32_TRUE at win32_sources = winmain.cpp registrytool.cpp registrytool.h
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/EL-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 21 Mar 2007 08:32:12 -0000 1.12
+++ .cvsignore 6 Apr 2008 13:51:37 -0000 1.13
@@ -1 +1 @@
-inkscape-0.45.1.tar.gz
+inkscape-0.46.tar.bz2
inkscape-0.45.1-desktop.patch:
Index: inkscape-0.45.1-desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/EL-5/inkscape-0.45.1-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- inkscape-0.45.1-desktop.patch 13 Dec 2007 02:23:15 -0000 1.1
+++ inkscape-0.45.1-desktop.patch 6 Apr 2008 13:51:37 -0000 1.2
@@ -1,6 +1,8 @@
Make desktop-file-validate and rpmlint happy, handle compressed svgs (#245413)
and let it conform enough not to break the build in Rawhide.
+
(Lubomir Kundrak <lkundrak at redhat.com>)
+https://bugs.launchpad.net/inkscape/+bug/190420
--- inkscape-0.45.1.orig/inkscape.desktop.in 2007-01-16 03:49:00.000000000 +0100
+++ inkscape-0.45.1/inkscape.desktop.in 2007-12-02 03:17:08.000000000 +0100
Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/EL-5/inkscape.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- inkscape.spec 13 Dec 2007 02:23:15 -0000 1.37
+++ inkscape.spec 6 Apr 2008 13:51:37 -0000 1.38
@@ -1,17 +1,17 @@
-
Name: inkscape
-Version: 0.45.1
+Version: 0.46
Release: 2%{?dist}
Summary: Vector-based drawing program using SVG
Group: Applications/Productivity
License: GPLv2+
URL: http://inkscape.sourceforge.net/
-Source0: http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.gz
-Patch0: inkscape-0.44.1-psinput.patch
-Patch1: inkscape-0.45-python.patch
-Patch2: inkscape-0.45.1-gtkprint.patch
-Patch3: inkscape-0.45.1-desktop.patch
+Source0: http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
+Patch0: inkscape-16571-cxxinclude.patch
+Patch1: inkscape-0.45.1-desktop.patch
+Patch2: inkscape-0.46pre2-icons.patch
+Patch3: inkscape-0.46-fixlatex.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: atk-devel
@@ -19,33 +19,34 @@
BuildRequires: freetype-devel
BuildRequires: gc-devel >= 6.4
BuildRequires: gettext
-BuildRequires: gtkmm24-devel
+BuildRequires: gtkmm24-devel >= 2.8.0
BuildRequires: gtkspell-devel
BuildRequires: gnome-vfs2-devel >= 2.0
BuildRequires: libpng-devel >= 1.2
-BuildRequires: libsigc++20-devel >= 2.0.12
BuildRequires: libxml2-devel >= 2.6.11
BuildRequires: libxslt-devel >= 1.0.15
BuildRequires: pango-devel
BuildRequires: pkgconfig
BuildRequires: lcms-devel >= 1.13
BuildRequires: cairo-devel
+BuildRequires: openssl-devel
BuildRequires: dos2unix
BuildRequires: perl-XML-Parser
BuildRequires: python-devel
-BuildRequires: popt
-# The following are needed due to gtkprint patch changing configure.ac
-BuildRequires: autoconf automake17 intltool
+BuildRequires: poppler-devel >= 0.5.9
+BuildRequires: popt-devel
+BuildRequires: loudmouth-devel >= 1.0
+BuildRequires: boost-devel
Requires: pstoedit
Requires: perl(Image::Magick)
Requires: numpy
Requires: PyXML
+Requires: python-lxml
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
-
%description
Inkscape is a vector-based drawing program, like CorelDraw® or Adobe
Illustrator® from the proprietary software world, and Sketch or Karbon14 from
@@ -62,19 +63,16 @@
%prep
%setup -q
-%patch0 -p1 -b .psinput
-%patch1 -p1 -b .python
-%patch2 -p0 -b .gtkprint
-%patch3 -p1 -b .desktop
+%patch0 -p1 -b .cxxinclude
+%patch1 -p1 -b .desktop
+%patch2 -p1 -b .icons
+%patch3 -p1 -b .fixlatex
find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';'
find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';'
-dos2unix share/extensions/*.py
+dos2unix -k -q share/extensions/*.py
%build
-intltoolize --force
-autoconf
-autoheader
%configure \
--disable-dependency-tracking \
--with-xinerama \
@@ -84,14 +82,15 @@
--with-gnome-vfs \
--with-inkjar \
--enable-inkboard \
---enable-lcms
+--enable-lcms \
+--enable-poppler-cairo
make %{?_smp_mflags}
%install
-rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
@@ -99,12 +98,12 @@
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/txt2svg.*
desktop-file-install --vendor fedora --delete-original \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
- ${RPM_BUILD_ROOT}/usr/share/applications/%{name}.desktop
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
%clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
%post
@@ -127,10 +126,64 @@
%changelog
-* Wed Dec 12 2007 <denis at localhost.localdomain> - 0.45.1-2
-- Merging with F-8 spec
+* Sat Apr 05 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.46-2
+- Fix LaTeX rendering, #441017
+
+* Tue Mar 25 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.46-1
+- 0.46 released
+
+* Sun Mar 23 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.46-0.3.pre3
+- Rebuild for newer Poppler
+
+* Wed Mar 12 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.46-0.2.pre3
+- Probably last prerelease?
+
+* Fri Feb 22 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.46-0.2.pre2
+- Panel icon sizes
+
+* Sun Feb 17 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.46-0.1.pre2
+- 0.46pre2
+- Dropping upstreamed patches
+
+* Sat Feb 16 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.45.1+0.46pre1-5
+- Attempt to fix the font selector (#432892)
+
+* Thu Feb 14 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.45.1+0.46pre1-4
+- Tolerate recoverable errors in OCAL feeds
+- Fix OCAL insecure temporary file usage (#432807)
+
+* Wed Feb 13 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.45.1+0.46pre1-3
+- Fix crash when adding text objects (#432220)
+
+* Thu Feb 07 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.45.1+0.46pre1-2
+- Build with gcc-4.3
+
+* Wed Feb 06 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.45.1+0.46pre1-1
+- 0.46 prerelease
+- Minor cosmetic changes to satisfy the QA script
+- Dependency on Boost
+- Inkboard is not optional
+- Merge from Denis Leroy's svn16571 snapshot:
+- Require specific gtkmm24-devel versions
+- enable-poppler-cairo
+- No longer BuildRequire libsigc++20-devel
+
+* Wed Dec 5 2007 Denis Leroy <denis at poolshark.org> - 0.45.1-5
+- Rebuild with new openssl
+
+* Sun Dec 02 2007 Lubomir Kundrak <lkundrak at redhat.com> - 0.45.1-4
+- Added missing dependencies for modules (#301881)
+
+* Sun Dec 02 2007 Lubomir Kundrak <lkundrak at redhat.com> - 0.45.1-3
+- Satisfy desktop-file-validate, so that Rawhide build won't break
+
+* Sat Dec 01 2007 Lubomir Kundrak <lkundrak at redhat.com> - 0.45.1-2
+- Use GTK print dialog
+- Added compressed SVG association (#245413)
+- popt headers went into popt-devel, post Fedora 7
+- Fix macro usage in changelog
-* Tue Mar 20 2007 Denis Leroy <denis at poolshark.org> - 0.45.1-1
+* Wed Mar 21 2007 Denis Leroy <denis at poolshark.org> - 0.45.1-1
- Update to bugfix release 0.45.1
- Added R to ImageMagick-perl (#231563)
@@ -141,7 +194,7 @@
- LaTex patch integrated upstreamed, removed
- Some rpmlint cleanups
-* Fri Dec 1 2006 Denis Leroy <denis at poolshark.org> - 0.44.1-2
+* Wed Dec 6 2006 Denis Leroy <denis at poolshark.org> - 0.44.1-2
- Added patches to fix LaTex import (#217699)
- Added patch to base postscript import on pstoedit plot-svg
@@ -255,9 +308,9 @@
* Tue Mar 16 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.6
- fix typo in provides
* Tue Mar 16 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.5
-- add %{release} to provides perl(SpSVG) = %{epoch}:%{version}:%{release} only
+- add %%{release} to provides perl(SpSVG) = %%{epoch}:%%{version}:%%{release} only
* Tue Mar 16 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.4
-- add %{release} to provides
+- add %%{release} to provides
* Sun Mar 14 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.3
- add arch dependent flags
* Thu Mar 11 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/EL-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 21 Mar 2007 08:32:12 -0000 1.12
+++ sources 6 Apr 2008 13:51:37 -0000 1.13
@@ -1 +1 @@
-1ac63dfd5d78a676599bf5cf6d22e493 inkscape-0.45.1.tar.gz
+59997096c3640b2601c2b4afba8a3d75 inkscape-0.46.tar.bz2
--- inkscape-0.44.1-psinput.patch DELETED ---
--- inkscape-0.45-python.patch DELETED ---
--- inkscape-0.45.1-gtkprint.patch DELETED ---
- Previous message (by thread): rpms/nx/devel .cvsignore, 1.11, 1.12 nx.spec, 1.19, 1.20 sources, 1.12, 1.13
- Next message (by thread): rpms/lua-filesystem/devel lua-filesystem.spec, NONE, 1.1 luafilesystem-1.4.0-includefix.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list