New commits:
commit 599b68133801d7f227833b88b2aa0e3862989f74
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
wxgtk-new: version 3.0.3
commit 8cc0f315320ba8c18dbe66cce930c914c4e7382c
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
audacity: version 2.2.1
commit 83af4feaf2c1bafa34db27a36b12ff829d621038
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
This commit combines several spells as some fixes got moved
from the deprecated wxwidgets over to wxgtk-new and also
audacity spell would be broken would it still depend on
wxwidget instead of WXWIDGET.
commit a50eaf8391aad895df29a7cb772206cceff833cb
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
Revert "x11-toolkits/wxgtk-new: version 3.1.0"
This reverts commit 9c38f6c06f065327c9df74c0d21c81e5dfe6b157.
Sorry, we don't do development releases by default in the grimoire
without a good reason.
diff --git a/ChangeLog b/ChangeLog
index 4874824..7770871 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2018-01-17 Thomas Orgis <sobukus AT sourcemage.org>
+ * x11-toolkits/wxwidgets: spell deprecated [duplicate spell]
+
2018-01-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* audio-drivers/alsa-tinycompress: userspace support for compression
offloading
diff --git a/audio-creation/audacity/DEPENDS b/audio-creation/audacity/DEPENDS
index 2ae570a..fd7dcff 100755
--- a/audio-creation/audacity/DEPENDS
+++ b/audio-creation/audacity/DEPENDS
@@ -1,5 +1,5 @@
depends zip &&
-depends wxwidgets &&
+depends WXWIDGET &&
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 36933a9..3a0a519 100755
--- a/audio-creation/audacity/DETAILS
+++ b/audio-creation/audacity/DETAILS
@@ -1,21 +1,10 @@
-. "$GRIMOIRE/FUNCTIONS"
SPELL=audacity
-case "$AUDACITY_BRANCH"
-# TODO: switched to github
-in scm)
- VERSION=$(get_scm_version)
- SOURCE=$SPELL-cvs.tar.bz2
-
SOURCE_URL[0]="cvs://:pserver:anonymous AT cvs.sourceforge.net:/cvsroot/audacity:audacity"
- SOURCE_IGNORE=volatile
- FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
-;; *)
- VERSION=2.1.2
+ VERSION=2.2.1
+ VERSIONX=-rc3 # Yes, they keep the -rc in the directory name!
SOURCE=${SPELL}-minsrc-${VERSION}.tar.xz
- SOURCE_URL[0]=http://mirror.sobukus.de/$SOURCE
-
SOURCE_HASH=sha512:46bc68825d29e88b14a674749532345ab63673ea1b85ad0d2a1b72b0974c74d2175e0ef307dad735592d18e56c1e0c65f994f4ee05d9e0f1aec194cd02c930da
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-minsrc-$VERSION
-;; esac
+ SOURCE_URL[0]=https://sobukus.de/$spell/$SOURCE
+
SOURCE_HASH=sha512:92c094e4903c438b0aac27b1fb6c9ccc9ca089e4d3123769ff23e434de1e6a519482b42588a54f56afdf5d2013e5681fce3d143f9e092731a9511d4bba31cfaa
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-minsrc-$VERSION$VERSIONX
WEB_SITE=http://audacityteam.org/
ENTERED=20011217
LICENSE[0]=GPL
diff --git a/audio-creation/audacity/HISTORY b/audio-creation/audacity/HISTORY
index 39b138f..fe5b3b6 100644
--- a/audio-creation/audacity/HISTORY
+++ b/audio-creation/audacity/HISTORY
@@ -1,3 +1,9 @@
+2018-01-17 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 2.2.1, removed defunct scm version code
+ * PRE_BUILD, patches/0001-Fix-build-against-ffmpeg-svn-20160315.patch,
+ patches/fix-gcc6-ftbfs.patch: not needed anymore
+ * DEPENDS: WXWIDGET instead of deprecated wxwidgets
+
2016-11-23 Ismael Luceno <ismael AT sourcemage.org>
* patches/0001-Fix-build-against-ffmpeg-svn-20160315.patch,
patches/fix-gcc6-ftbfs.patch, PRE_BUILD: Fixed build
diff --git a/audio-creation/audacity/PRE_BUILD
b/audio-creation/audacity/PRE_BUILD
deleted file mode 100755
index c230ad1..0000000
--- a/audio-creation/audacity/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-apply_patch_dir patches
diff --git
a/audio-creation/audacity/patches/0001-Fix-build-against-ffmpeg-svn-20160315.patch
# all of the "depends" below strictly speaking are not required, e.g. we can
# use included library by specifying --with-*=builtin, but we want to use the
@@ -9,7 +12,8 @@ depends zlib '--with-zlib' &&
depends libpng '--with-libpng' &&
depends JPEG '--with-libjpeg' &&
depends tiff '--with-libtiff' &&
-depends pkgconfig &&
+depends libxpm '--with-libxpm' &&
+
optional_depends pcre \
'--with-regex=sys' \
'--with-regex=builtin' \
@@ -30,14 +34,17 @@ optional_depends OPENGL \
'--with-opengl' \
'--without-opengl' \
'for OpenGL support' &&
+if is_depends_enabled $SPELL OPENGL; then
+ depends glu
+fi &&
optional_depends expat \
'--with-expat' \
'--without-expat' \
'for XML parsing using expat library' &&
optional_depends libgnomeprint \
- '--with-gnomeprint' \
- '--without-gnomeprint' \
- 'for GNOME print system support' &&
+ '--without-gtkprint' \
+ '--with-gtkprint' \
+ 'for GNOME print system support instead of GTK print' &&
optional_depends libiodbc \
'--with-odbc' \
'--without-odbc' \
@@ -45,7 +52,4 @@ optional_depends libiodbc \
optional_depends sdl \
'--with-sdl --enable-sound' \
'--without-sdl' \
- 'for sound system support' &&
-optional_depends libxpm '--with-libxpm' \
- '--without-libxpm' \
- 'support XPM file format'
+ 'for sound system support'
diff --git a/x11-toolkits/wxgtk-new/DETAILS b/x11-toolkits/wxgtk-new/DETAILS
index 0ebe966..a3a302e 100755
--- a/x11-toolkits/wxgtk-new/DETAILS
+++ b/x11-toolkits/wxgtk-new/DETAILS
@@ -1,8 +1,8 @@
SPELL=wxgtk-new
SPELLX=wxGTK
SPELLX=wxWidgets
- VERSION=3.1.0
-
SOURCE_HASH=sha512:740f3c977526395f32c2da4ea7f5f2ddc9b9a4cfd8d2cd129f011ede8e427621461c551c648b5d7a8f9ce78477e30426b836b310cff09c427ca8f9b9a9532074
+ VERSION=3.0.3
+
SOURCE_HASH=sha512:afc7741c21ce6dc06c7123f4e1846a7ba42a1fa5e5041722dde57af0e29c02e5638c7694fb05163aa69594f2d8e298c192cb40312f0b625f00c1bf53fc8df8cc
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-${VERSION}
SOURCE_URL[0]=https://github.com/wxWidgets/wxWidgets/archive/v${VERSION}.tar.gz
diff --git a/x11-toolkits/wxgtk-new/HISTORY b/x11-toolkits/wxgtk-new/HISTORY
index b76262c..ffcfe44 100644
--- a/x11-toolkits/wxgtk-new/HISTORY
+++ b/x11-toolkits/wxgtk-new/HISTORY
@@ -1,5 +1,14 @@
-2016-08-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: version 3.1.0
+2018-01-17 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 3.0.3
+ * PRE_BUILD, wxWidgets-3.0.2-gcc6-abs.patch: not needed anymore
+
+2018-01-17 Thomas Orgis <sobukus AT sourcemage.org>
+ * UP_TRIGGERS: Fix dependent spells for the downgrade from version
+ 3.1.0 which was in test grimoire for a while.
+ * PRE_BUILD, wxWidgets-3.0.2-gcc6-abs.patch: move patch from
+ deprecated wxwidgets spell for version 3.0.2 and gcc-6
+ * DEPENDS: some fixup (mostly from wxwidgets spell)
+ * CONFLICTS: The self-conflict is hopefully not necessary anymore.
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)
diff --git a/x11-toolkits/wxgtk-new/UP_TRIGGERS
b/x11-toolkits/wxgtk-new/UP_TRIGGERS
new file mode 100755
index 0000000..0bcea52
--- /dev/null
+++ b/x11-toolkits/wxgtk-new/UP_TRIGGERS
@@ -0,0 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+# Take care of the downgrade from 3.1 to 3.0 in test grimoire.
+if spell_ok $SPELL && is_version_less $VERSION 3.1 &&
+ is_version_less $VERSION $(installed_version $SPELL); then
+ cast_dependents $SPELL
+fi
diff --git a/x11-toolkits/wxwidgets/BUILD b/x11-toolkits/wxwidgets/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/x11-toolkits/wxwidgets/BUILD
@@ -0,0 +1 @@
+true
diff --git a/x11-toolkits/wxwidgets/DEPENDS b/x11-toolkits/wxwidgets/DEPENDS
deleted file mode 100755
index 3d03068..0000000
--- a/x11-toolkits/wxwidgets/DEPENDS
+++ /dev/null
@@ -1,44 +0,0 @@
-depends -sub CXX gcc &&
-
-depends gtk+3 '--with-gtk=3' &&
-
-depends libx11 '--with-x' &&
-depends libxpm '--with-libxpm' &&
-# all of the "depends" below strictly speaking are not required, e.g. we can
-# use included library by specifying --with-*=builtin, but we want to use the
-# system libraries, so we're saying --with-*[=sys] here.
-depends zlib '--with-zlib' &&
-depends libpng '--with-libpng' &&
-depends JPEG '--with-libjpeg' &&
-depends tiff '--with-libtiff' &&
-depends libnotify '--with-libnotify' &&
-depends libsm &&
-depends libxinerama &&
-
-optional_depends pcre \
- '--with-regex=sys' \
- '--with-regex=builtin' \
- 'use PCRE for RegEx (disable for advanced features)' &&
-
-optional_depends mesalib \
- '--with-opengl' \
- '--without-opengl' \
- 'for OpenGL support' &&
-depends glu &&
-
-optional_depends expat \
- '--with-expat' \
- '--without-expat' \
- 'for XML parsing using expat library' &&
-optional_depends libgnomeprint \
- '--with-gnomeprint --without-gtkprint' \
- '--without-gnomeprint --with-gtkprint' \
- 'for GNOME print system support' &&
-optional_depends libiodbc \
- '--with-odbc' \
- '--without-odbc' \
- 'for ODBC support' &&
-optional_depends sdl \
- '--with-sdl --enable-sound' \
- '--without-sdl' \
- 'for sound system support'
diff --git a/x11-toolkits/wxwidgets/DETAILS b/x11-toolkits/wxwidgets/DETAILS
index a102053..6176832 100755
--- a/x11-toolkits/wxwidgets/DETAILS
+++ b/x11-toolkits/wxwidgets/DETAILS
@@ -1,20 +1,7 @@
- SPELL=wxwidgets
- VERSION=3.0.2
- 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://www.wxwidgets.org/"
- LICENSE[0]=LGPL
- TMPFS=off
- ENTERED=20150823
- SHORT="a C++ framework for writing advanced GUI applications"
-cat << EOF
-wxWidgets is a free and open source cross-platform C++ framework for writing
-advanced GUI applications using native controls. wxWidgets allows you to
write
-native-looking GUI applications for all the major desktop platforms and also
-helps with abstracting the differences in the non-GUI aspects between them.
It
-is free for the use in both open source and commercial applications, comes
-with the full, easy to read and modify, source and extensive documentation
-and a collection of more than a hundred examples.
-EOF
+ SPELL=wxwidgets
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
+ cat << EOF
+ deprecated spell [replaced by wxgtk-new]
+ EOF
diff --git a/x11-toolkits/wxwidgets/HISTORY b/x11-toolkits/wxwidgets/HISTORY
index f41e9a3..8bf8d27 100644
--- a/x11-toolkits/wxwidgets/HISTORY
+++ b/x11-toolkits/wxwidgets/HISTORY
@@ -1,3 +1,8 @@
+2018-01-17 Thomas Orgis <sobukus AT sourcemage.org>
+ * spell deprecated [duplicate spell]
+ * PATCHLEVEL=9999
+ * DETAILS: version 0
+
2017-09-27 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: TMPFS=off, needs >2G