Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (4a34c75892022ff548fb59e77ad021d86bb8175d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (4a34c75892022ff548fb59e77ad021d86bb8175d)
  • Date: Tue, 29 Aug 2017 13:09:01 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

graphics/inkscape/DETAILS | 4 -
graphics/inkscape/HISTORY | 3
graphics/inkscape/PRE_BUILD | 6 -
graphics/inkscape/inkscape-0.48-fixed-glibmm.patch | 64
---------------------
video/vlc/DETAILS | 2
5 files changed, 9 insertions(+), 70 deletions(-)

New commits:
commit 4a34c75892022ff548fb59e77ad021d86bb8175d
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

inkscape: 0.92.2

commit 9ddb54475f199942ea6b33128061b7f7dd2fa131
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

vlc: fix hash, forgotten in upgrade

diff --git a/graphics/inkscape/DETAILS b/graphics/inkscape/DETAILS
index 0b1b470..b596b68 100755
--- a/graphics/inkscape/DETAILS
+++ b/graphics/inkscape/DETAILS
@@ -1,10 +1,10 @@
SPELL=inkscape
- VERSION=0.91
+ VERSION=0.92.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"

SOURCE_URL[0]=https://inkscape.global.ssl.fastly.net/media/resources/file/$SOURCE
#
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/project/${SPELL}/${SPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:3778ef7d4a1c759a7afc093e55eefb69a78dcb60332655cc8ab8c481f54a3e6550df6070178390eb08588245531906b8bef33301f0765a4d28d6c7506fcf3bc7
+
SOURCE_HASH=sha512:e790cafb7cc2be2eb75f04ac4c18ae8558ae997f4261c38dac9c2a3383c7a12a0f4a090956770d1341b212fc9698d31d212f2c1609421907255f8af650569b30
WEB_SITE=http://www.inkscape.org/
ENTERED=20031207
SECURITY_PATCH=2
diff --git a/graphics/inkscape/HISTORY b/graphics/inkscape/HISTORY
index f28dba1..29fdc51 100644
--- a/graphics/inkscape/HISTORY
+++ b/graphics/inkscape/HISTORY
@@ -1,3 +1,6 @@
+2017-08-29 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 0.92.2
+
2016-09-29 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD, inkscape-0.48-fixed-glibmm.patch: fix build with
current glibmm by removing old glibmm bug workaround
diff --git a/graphics/inkscape/PRE_BUILD b/graphics/inkscape/PRE_BUILD
index ab5380a..f2f33a4 100755
--- a/graphics/inkscape/PRE_BUILD
+++ b/graphics/inkscape/PRE_BUILD
@@ -1,5 +1,5 @@
+# Since 0.92.2, cmake build is the new default, but autotools still
available.
+# We need to switch the spell to cmake some time.
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-# Remove a workaround for a bug in old glibmm that relied
-# on deprecated symbols.
-patch -p0 < "$SCRIPT_DIRECTORY/inkscape-0.48-fixed-glibmm.patch"
+./autogen.sh
diff --git a/graphics/inkscape/inkscape-0.48-fixed-glibmm.patch
b/graphics/inkscape/inkscape-0.48-fixed-glibmm.patch
deleted file mode 100644
index aefa0fd..0000000
--- a/graphics/inkscape/inkscape-0.48-fixed-glibmm.patch
+++ /dev/null
@@ -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
- ####################################### */
-
diff --git a/video/vlc/DETAILS b/video/vlc/DETAILS
index 0690551..9bb284f 100755
--- a/video/vlc/DETAILS
+++ b/video/vlc/DETAILS
@@ -4,7 +4,7 @@
VERSION=3.0.0-git-20170829
SOURCE=$SPELL-$VERSION.tar.xz
# Switch back to upstream GPG once 3.0.0 is relased.
-
SOURCE_HASH=sha512:7a0d93f8582653050cfe54dd749be8610455deb6afb11d73925e3f89ebbec1c2fa94c9a44828d3b89ed9bb2610f03b1d5dfc3d05f8e6efcb36316bf3f1e19536
+
SOURCE_HASH=sha512:a5ebffce08cea1375c51dcb2f9a150494cffc2ab5923690dc186a0ad2ca85134863795a8d8cac3bec6119d438b99ac69d96242995d72dd3c7cc2c3c7b16b6316
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
# SOURCE2=$SOURCE.asc
# SOURCE2_IGNORE=signature



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (4a34c75892022ff548fb59e77ad021d86bb8175d), Thomas Orgis, 08/29/2017

Archive powered by MHonArc 2.6.24.

Top of Page