Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a50cf9e6611c62c3774c6994ebda06781429ca03
commit a50cf9e6611c62c3774c6994ebda06781429ca03 Author: DeX77 <[email protected]> Date: Thu Jan 5 13:23:01 2017 +0100 inkscape-0.92.0-1-x86_64 * version bump diff --git a/source/xapps-extra/inkscape/FrugalBuild b/source/xapps-extra/inkscape/FrugalBuild index 66f3c24..7e3e7c2 100644 --- a/source/xapps-extra/inkscape/FrugalBuild +++ b/source/xapps-extra/inkscape/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: Shrift <[email protected]> pkgname=inkscape -pkgver=0.91 -pkgrel=9 +pkgver=0.92.0 +pkgrel=1 pkgdesc="A vector illustrator program" depends=('gtkspell>=2.0.16-17' 'gtkmm2>=2.24.4-2' 'libgc>=7.4.2-2' 'gsl>=2.1' \ 'libxslt>=1.1.28-3' 'imagemagick>=6.9.7' 'poppler-glib>=0.49.0' @@ -15,10 +15,8 @@ archs=('x86_64') options=('scriptlet') url="http://www.inkscape.org/"; up2date="Flasttar https://inkscape.org/en/download/source/"; -source=(https://inkscape.org/en/gallery/item/3860/$pkgname-$pkgver.tar.bz2 \ - fix-FTBFS.patch) -sha1sums=('9941ee467af570ac71a70f965cd9c48d4993b8f3' \ - '5293e7df15d5bfe189f8cf3c509d3a272f12edc4') +source=(https://inkscape.org/en/gallery/item/10552/$pkgname-$pkgver.tar.bz2) +sha1sums=('8f576bc828138e9c3c835a458c3cefd5801a907a') # TODO: java ?! diff --git a/source/xapps-extra/inkscape/fix-FTBFS.patch b/source/xapps-extra/inkscape/fix-FTBFS.patch deleted file mode 100644 index 8cb04c2..0000000 --- a/source/xapps-extra/inkscape/fix-FTBFS.patch +++ /dev/null @@ -1,71 +0,0 @@ -Description: Remove inkscape-specific glib clone function (and get rid of deprecated Glib ScopedPtr use) -Author: Marc Jeanmougin <[email protected]> -Origin: upstream, https://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/14766 -Bug: https://bugs.launchpad.net/inkscape/+bug/1567485 -Bug-Debian: https://bugs.debian.org/822392 -Acked-By: Mattia Rizzolo <[email protected]> -Last-Update: 2016-04-26 - - ---- a/src/ui/clipboard.cpp -+++ b/src/ui/clipboard.cpp -@@ -145,8 +145,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 -@@ -1222,9 +1220,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 - /* -@@ -1376,39 +1372,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 - ####################################### */ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
