Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Thomas Orgis (b587973ac707682273d449da29c7a51ae81eea97)

Chronological Thread  
    < 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 (b587973ac707682273d449da29c7a51ae81eea97)
  • Date: Thu, 29 Sep 2016 17:14:18 +0000
GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

audio-plugins/swh-plugins/BUILD | 7 ++
audio-plugins/swh-plugins/HISTORY | 3
graphics/imagemagick/DETAILS | 6 -
graphics/imagemagick/HISTORY | 3
graphics/inkscape/HISTORY | 4 +
graphics/inkscape/PRE_BUILD | 5 +
graphics/inkscape/inkscape-0.48-fixed-glibmm.patch | 64
+++++++++++++++++++++
7 files changed, 89 insertions(+), 3 deletions(-)

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

inkscape: fix build with current glibmm

commit 07247372fb92ee524ff178e2593cfd406391725b
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

imagemagick: bump to 7.0.3-1 (previous version already unavailable and
not mirrored)

commit 15dae408a62de4b3a1e858665d6b7e1f8f630777
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

swh-plugins: un-break build where PIC flags are not ensured for x86-64

diff --git a/audio-plugins/swh-plugins/BUILD b/audio-plugins/swh-plugins/BUILD
new file mode 100755
index 0000000..b1e67ec
--- /dev/null
+++ b/audio-plugins/swh-plugins/BUILD
@@ -0,0 +1,7 @@
+# If we got -march=… in CFLAGS, the configure script assumes we
+# got everything arch-specific set up, including PICyness. Without
+# prescribed architecture, it would detect one and add PIC flags.
+if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
+ CFLAGS="$CFLAGS -DPIC -fPIC"
+fi &&
+default_build
diff --git a/audio-plugins/swh-plugins/HISTORY
b/audio-plugins/swh-plugins/HISTORY
index 928dea1..c32a6ec 100644
--- a/audio-plugins/swh-plugins/HISTORY
+++ b/audio-plugins/swh-plugins/HISTORY
@@ -1,3 +1,6 @@
+2016-09-29 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: added to fix PICyness and un-break build here
+
2016-08-09 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0]
updated spell to 0.4.16
diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index ef77a54..178c950 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,11 +1,11 @@
SPELL=imagemagick
SPELLX=ImageMagick
- VERSION=7.0.3-0
- SECURITY_PATCH=3
+ VERSION=7.0.3-1
+ SECURITY_PATCH=4
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
SOURCE_URL[0]=http://www.imagemagick.org/download/$SOURCE
-
SOURCE_HASH=sha512:ab0b99d3f656c68f32336561b0679792c876ff81eb172cc0ac48dd5217960d2aef4d01281517ec94548cf1783f3fd9b7618d9909fe00945ce4b95afd182c0aa3
+
SOURCE_HASH=sha512:4abfed5502ea408911b54225d8a45fd0e7c090c61c7950c031b0629dc543b41166dbaa1f743fdceaaab483db1ab5d5bb70dec595a5f7f87c687088d47db579bd
CCACHE="off"
WEB_SITE=http://www.imagemagick.org/
ENTERED=20010922
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index d2b4be2..23ae056 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2016-09-29 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 7.0.3-1, SECURITY_PATCH++
+
2016-09-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 7.0.3-0

diff --git a/graphics/inkscape/HISTORY b/graphics/inkscape/HISTORY
index 984c431..f28dba1 100644
--- a/graphics/inkscape/HISTORY
+++ b/graphics/inkscape/HISTORY
@@ -1,3 +1,7 @@
+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
+
2016-03-06 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD: added, to enable C++11 mode to make it build again with
those funky dependencies
diff --git a/graphics/inkscape/PRE_BUILD b/graphics/inkscape/PRE_BUILD
new file mode 100755
index 0000000..ab5380a
--- /dev/null
+++ b/graphics/inkscape/PRE_BUILD
@@ -0,0 +1,5 @@
+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"
diff --git a/graphics/inkscape/inkscape-0.48-fixed-glibmm.patch
b/graphics/inkscape/inkscape-0.48-fixed-glibmm.patch
new file mode 100644
index 0000000..aefa0fd
--- /dev/null
+++ b/graphics/inkscape/inkscape-0.48-fixed-glibmm.patch
@@ -0,0 +1,64 @@
+=== 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
+ ####################################### */
+


  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (b587973ac707682273d449da29c7a51ae81eea97), Thomas Orgis, 09/29/2016

Archive powered by MHonArc 2.6.24.

Top of Page