Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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

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 (e87d4cc56c45c6e0b05543e164bbd37a9a2ea830)
  • Date: Tue, 22 Nov 2016 10:59:56 +0000
GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

audio-creation/audacity/DEPENDS | 9 -------
audio-creation/audacity/DETAILS | 6 ++--
audio-creation/audacity/HISTORY | 6 ++++
audio-creation/audacity/PREPARE | 3 --
x11-toolkits/wxwidgets/DETAILS | 8 +++---
x11-toolkits/wxwidgets/HISTORY | 8 +++++-
x11-toolkits/wxwidgets/PRE_BUILD | 3 ++
x11-toolkits/wxwidgets/wxWidgets-3.0.2-gcc6-abs.patch | 23
++++++++++++++++++
8 files changed, 47 insertions(+), 19 deletions(-)

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

wxwidgets: fixup, proper website and release tarball

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

audacity: version 2.1.2

diff --git a/audio-creation/audacity/DEPENDS b/audio-creation/audacity/DEPENDS
index 3f8b868..2ae570a 100755
--- a/audio-creation/audacity/DEPENDS
+++ b/audio-creation/audacity/DEPENDS
@@ -1,12 +1,5 @@
depends zip &&
-if [[ "$AUDACITY_UNI" == "no" ]]; then
- depends wxgtk-no-unicode
-else
- # Really make sure Audacity works with new wxgtk before
- # changing this. As of version 2.1.1, wxgtk-2.8.x is strongly
- # recommened!
- depends wxgtk
-fi &&
+depends wxwidgets &&
optional_depends lame "--with-lame" \
"--without-lame" \
"for mp3 import/export support" &&
diff --git a/audio-creation/audacity/DETAILS b/audio-creation/audacity/DETAILS
index 77f7f41..36933a9 100755
--- a/audio-creation/audacity/DETAILS
+++ b/audio-creation/audacity/DETAILS
@@ -10,10 +10,10 @@ in scm)
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
;; *)
- VERSION=2.1.1
+ VERSION=2.1.2
SOURCE=${SPELL}-minsrc-${VERSION}.tar.xz
- SOURCE_URL[0]=http://www.oldfoss.com/Audacity/download/$SOURCE
-
SOURCE_HASH=sha512:36ffaf40452b2b89d5c2308edc5fe1ed1a49460e16eed324904825229a14e9fd11e5beeda61bd9b38d7f06746c0945f68aef99ac81d78ac97c09c389d100651d
+ SOURCE_URL[0]=http://mirror.sobukus.de/$SOURCE
+
SOURCE_HASH=sha512:46bc68825d29e88b14a674749532345ab63673ea1b85ad0d2a1b72b0974c74d2175e0ef307dad735592d18e56c1e0c65f994f4ee05d9e0f1aec194cd02c930da
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-minsrc-$VERSION
;; esac
WEB_SITE=http://audacityteam.org/
diff --git a/audio-creation/audacity/HISTORY b/audio-creation/audacity/HISTORY
index 31af7ec..460e349 100644
--- a/audio-creation/audacity/HISTORY
+++ b/audio-creation/audacity/HISTORY
@@ -1,3 +1,9 @@
+2016-11-18 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 2.1.2, switch to my mirror as official download
+ site is hostile to direct linking and breaks download via wget
+ * DEPENDS: depends on wxwidgets now
+ * PREPARE: gone
+
2016-02-10 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: a bit of cleanup, more needed; important: portaudio19
required
Generally, things are complicated with possible choices about
dependencies.
diff --git a/audio-creation/audacity/PREPARE b/audio-creation/audacity/PREPARE
deleted file mode 100755
index eacefe4..0000000
--- a/audio-creation/audacity/PREPARE
+++ /dev/null
@@ -1,3 +0,0 @@
-. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch current scm &&
-config_query AUDACITY_UNI "Enable unicode support?" n
diff --git a/x11-toolkits/wxwidgets/DETAILS b/x11-toolkits/wxwidgets/DETAILS
index 6f55ec4..3bf2848 100755
--- a/x11-toolkits/wxwidgets/DETAILS
+++ b/x11-toolkits/wxwidgets/DETAILS
@@ -1,10 +1,10 @@
SPELL=wxwidgets
VERSION=3.0.2
- SOURCE="${SPELL}-${VERSION}.tar.gz"
-
SOURCE_URL[0]=https://github.com/wxWidgets/wxWidgets/archive/v${VERSION}.tar.gz
-
SOURCE_HASH=sha512:11fcecd22c1ed18a1d340e9731946ab765365d411262ea5d3adafcf4877606f9ad4ed99f7995e0a9517844d2a6d0a2bf361020ab495bc2995c6121ff8fd18d05
+ SOURCE="wxWidgets-${VERSION}.tar.bz2"
+
SOURCE_URL[0]=http://download.sourceforge.net/sourceforge/wxwindows/$SOURCE
+
SOURCE_HASH=sha512:098f79863103f3be0b7e21e4f0f1b34ab5277ef0033c1ef1387a9c673b0e0b76a2d732b183fa11b22cfcbbfdb7a4884f243d12f65cd49baa1772852307b393c4
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/wxWidgets-${VERSION}"
- WEB_SITE="https://github.com/wxWidgets/wxWidgets";
+ WEB_SITE="https://www.wxwidgets.org/";
LICENSE[0]=LGPL
ENTERED=20150823
SHORT="a C++ framework for writing advanced GUI applications"
diff --git a/x11-toolkits/wxwidgets/HISTORY b/x11-toolkits/wxwidgets/HISTORY
index b50607a..16adb7f 100644
--- a/x11-toolkits/wxwidgets/HISTORY
+++ b/x11-toolkits/wxwidgets/HISTORY
@@ -1,3 +1,9 @@
-2015-08-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+2016-11-21 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: proper website, switch to official URL,
+ the github tarball having changed under our feet
+ * wxWidgets-3.0.2-gcc6-abs.patch, PRE_BUILD: added, gcc6
+ build fix from https://github.com/jessehager/MINGW-packages/
+
+015-08-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS, SUB_DEPENDS, PRE_SUB_DEPENDS: spell created

diff --git a/x11-toolkits/wxwidgets/PRE_BUILD
b/x11-toolkits/wxwidgets/PRE_BUILD
new file mode 100755
index 0000000..e676ca1
--- /dev/null
+++ b/x11-toolkits/wxwidgets/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -p1 < "$SCRIPT_DIRECTORY/wxWidgets-3.0.2-gcc6-abs.patch"
diff --git a/x11-toolkits/wxwidgets/wxWidgets-3.0.2-gcc6-abs.patch
b/x11-toolkits/wxwidgets/wxWidgets-3.0.2-gcc6-abs.patch
new file mode 100644
index 0000000..1f150e4
--- /dev/null
+++ b/x11-toolkits/wxwidgets/wxWidgets-3.0.2-gcc6-abs.patch
@@ -0,0 +1,23 @@
+diff -uNr wxWidgets-3.0.2.orig/src/stc/scintilla/src/Editor.cxx
wxWidgets-3.0.2.mod/src/stc/scintilla/src/Editor.cxx
+--- wxWidgets-3.0.2.orig/src/stc/scintilla/src/Editor.cxx 2016-07-22
11:35:57.000000000 +0500
++++ wxWidgets-3.0.2.mod/src/stc/scintilla/src/Editor.cxx 2016-07-22
11:30:51.000000000 +0500
+@@ -11,6 +11,7 @@
+ #include <ctype.h>
+ #include <assert.h>
+
++#include <cmath>
+ #include <string>
+ #include <vector>
+ #include <map>
+@@ -5841,9 +5842,9 @@
+ }
+
+ static bool Close(Point pt1, Point pt2) {
+- if (abs(pt1.x - pt2.x) > 3)
++ if (std::abs(pt1.x - pt2.x) > 3)
+ return false;
+- if (abs(pt1.y - pt2.y) > 3)
++ if (std::abs(pt1.y - pt2.y) > 3)
+ return false;
+ return true;
+ }


  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (e87d4cc56c45c6e0b05543e164bbd37a9a2ea830), Thomas Orgis, 11/22/2016

Archive powered by MHonArc 2.6.24.

Top of Page