rpms/inkscape
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix assert fail on useless piece of code

Browse Source
This commit is contained in:
Lubomir Rintel 2008-06-26 08:22:24 +00:00
parent 34b90c5493
commit 8f320eff8a
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
inkscape-0.46-gtkopen.patch Normal file
View File

@ -0,0 +1,20 @@
------------------------------------------------------------------------
r18721 | buliabyak | 2008-05-24 21:32:40 +0200 (Sat, 24 May 2008) | 1 line
this hack does not seem to be needed with modern gtk, and it prevents remembering of last-browsed directory from working
Index: src/ui/dialog/filedialogimpl-gtkmm.cpp
===================================================================
--- src/ui/dialog/filedialogimpl-gtkmm.cpp (revision 18720)
+++ src/ui/dialog/filedialogimpl-gtkmm.cpp (revision 18721)
@@ -761,10 +761,6 @@
bool
FileOpenDialogImplGtk::show()
{
- Glib::ustring s = Glib::filename_to_utf8 (get_current_folder());
- if (s.length() == 0)
- s = getcwd (NULL, 0);
- set_current_folder(Glib::filename_from_utf8(s)); //hack to force initial dir listing
set_modal (TRUE); //Window
sp_transientize((GtkWidget *)gobj()); //Make transient
gint b = run(); //Dialog

7
inkscape.spec
View File

@ -1,6 +1,6 @@
Name: inkscape Name: inkscape
Version: 0.46 Version: 0.46
Release: 2%{?dist}.1 Release: 3%{?dist}
Summary: Vector-based drawing program using SVG Summary: Vector-based drawing program using SVG
Group: Applications/Productivity Group: Applications/Productivity
@ -11,6 +11,7 @@ Patch0: inkscape-16571-cxxinclude.patch
Patch1: inkscape-0.45.1-desktop.patch Patch1: inkscape-0.45.1-desktop.patch
Patch2: inkscape-0.46pre2-icons.patch Patch2: inkscape-0.46pre2-icons.patch
Patch3: inkscape-0.46-fixlatex.patch Patch3: inkscape-0.46-fixlatex.patch
Patch4: inkscape-0.46-gtkopen.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -74,6 +75,7 @@ C and C++, using the Gtk+ toolkit and optionally some Gnome libraries.
%patch1 -p1 -b .desktop %patch1 -p1 -b .desktop
%patch2 -p1 -b .icons %patch2 -p1 -b .icons
%patch3 -p1 -b .fixlatex %patch3 -p1 -b .fixlatex
%patch4 -p0 -b .gtkopen
find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';' find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';'
find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';' find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';'
dos2unix -k -q share/extensions/*.py dos2unix -k -q share/extensions/*.py
@ -133,6 +135,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%changelog %changelog
* Thu Jun 26 2008 Lubomir Rintel <lkundrak@v3.sk> - 0.46-3
- Remove useless old hack, that triggered an assert after gtkfilechooser switched to gio
* Fri Apr 11 2008 Lubomir Kundrak <lkundrak@redhat.com> - 0.46-2.1 * Fri Apr 11 2008 Lubomir Kundrak <lkundrak@redhat.com> - 0.46-2.1
- More buildrequires more flexible, so that this builds on RHEL - More buildrequires more flexible, so that this builds on RHEL