Drop old patches.

This commit is contained in:
Gwyn Ciesla 2018-11-13 10:24:44 -06:00
parent 046b6e169d
commit 39c58b04c4
4 changed files with 0 additions and 1483 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,17 +0,0 @@
From: Lubomir Rintel <lkundrak@v3.sk>
https://bugzilla.redhat.com/show_bug.cgi?id=458845
Index: inkscape-0.48.2/inkscape.desktop.in
===================================================================
--- inkscape-0.48.2.orig/inkscape.desktop.in
+++ inkscape-0.48.2/inkscape.desktop.in
@@ -6,7 +6,7 @@ _X-GNOME-FullName=Inkscape Vector Graphi
_Comment=Create and edit Scalable Vector Graphics images
Type=Application
Categories=Graphics;VectorGraphics;GTK;
-MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator;
+MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator;image/cgm;image/x-wmf;application/x-xccx;application/x-xcgm;application/x-xcdt;application/x-xsk1;application/x-xcmx;image/x-xcdr;
Exec=inkscape %F
TryExec=inkscape
Terminal=false

View File

@ -1,11 +0,0 @@
--- inkscape-0.91/inkscape.desktop.in~ 2015-01-29 09:53:06.000000000 -0600
+++ inkscape-0.91/inkscape.desktop.in 2015-01-29 09:54:08.680065820 -0600
@@ -14,7 +14,7 @@
Icon=inkscape
X-Ayatana-Desktop-Shortcuts=Drawing
-[Drawing Shortcut Group]
+[X-Drawing Shortcut Group]
_Name=New Drawing
Exec=inkscape
TargetEnvironment=Unity

View File

@ -1,64 +0,0 @@
=== modified file 'src/ui/clipboard.cpp'
--- src/ui/clipboard.cpp 2016-04-02 15:15:43 +0000
+++ src/ui/clipboard.cpp 2016-04-07 16:30:32 +0000
@@ -146,8 +146,6 @@
void _setClipboardColor(guint32);
void _userWarn(SPDesktop *, char const *);
- void _inkscape_wait_for_targets(std::list<Glib::ustring> &);
-
// private properites
SPDocument *_clipboardSPDoc; ///< Document that stores the clipboard until someone requests it
Inkscape::XML::Node *_defs; ///< Reference to the clipboard document's defs node
@@ -1302,9 +1300,7 @@
*/
Glib::ustring ClipboardManagerImpl::_getBestTarget()
{
- // GTKmm's wait_for_targets() is broken, see the comment in _inkscape_wait_for_targets()
- std::list<Glib::ustring> targets; // = _clipboard->wait_for_targets();
- _inkscape_wait_for_targets(targets);
+ std::list<Glib::ustring> targets = _clipboard->wait_for_targets();
// clipboard target debugging snippet
/*
@@ -1456,39 +1452,6 @@
desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, msg);
}
-
-// GTKMM's clipboard::wait_for_targets is buggy and might return bogus, see
-//
-// https://bugs.launchpad.net/inkscape/+bug/296778
-// http://mail.gnome.org/archives/gtk-devel-list/2009-June/msg00062.html
-//
-// for details. Until this has been fixed upstream we will use our own implementation
-// of this method, as copied from /gtkmm-2.16.0/gtk/gtkmm/clipboard.cc.
-void ClipboardManagerImpl::_inkscape_wait_for_targets(std::list<Glib::ustring> &listTargets)
-{
- //Get a newly-allocated array of atoms:
- GdkAtom* targets = NULL;
- gint n_targets = 0;
- gboolean test = gtk_clipboard_wait_for_targets( gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), &targets, &n_targets );
- if (!test || (targets == NULL)) {
- return;
- }
-
- //Add the targets to the C++ container:
- for (int i = 0; i < n_targets; i++)
- {
- //Convert the atom to a string:
- gchar* const atom_name = gdk_atom_name(targets[i]);
-
- Glib::ustring target;
- if (atom_name) {
- target = Glib::ScopedPtr<char>(atom_name).get(); //This frees the gchar*.
- }
-
- listTargets.push_back(target);
- }
-}
-
/* #######################################
ClipboardManager class
####################################### */