New commits:
commit fc10162c8ca2865271fbcb1e83778e84c29a13f3
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xz-utils: no conflict with lzip
(cherry picked from commit d555e13711c9f03ed755401c38078d70099002db)
Conflicts:
archive/xz-utils/HISTORY
commit 5a15f073f7abe8729b55644037031670b895b4ac
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libfakekey - fix build
(cherry picked from commit 73f1f7226cb2c6ea242aa0a10bdea8ea0b275c8e)
commit f28f74c8a9549d2152df038a5d878d017b15b115
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
seamonkey: => 2.33.1 [security]
(cherry picked from commit 6c0a7d1d0577888c7eac1e91156407bd79e85d50)
commit 6e1ef6b0c703149bbb4015ec61fe1c9a04f1ccf2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
http/firefox: downgrade sup dependency on nss to 3.17
(cherry picked from commit 6b414a0ca545cecc479d4ad401944222a40ca4fe)
commit 1ede1c828a8e1f5b23c44ceba45bfaf7ec15baee
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
meterbridge: more resolute autotools regeneration, fixing strange erratic
build failures
(cherry picked from commit ad4b98995189ab4f5430d299e1ffd195989bdd7e)
commit bcd76beb277a53fa024a7afbd059c52f89249624
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
http/firefox: version 36.0.4
(cherry picked from commit cffa5b03873240d906fc55389cc20d5f4e0a1f9c)
commit 7d715e254bb47fa2426975d7231b2207af21577b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
git: fixed resurrection
(cherry picked from commit 35bfc8fe201fa20fc0e3673af229061b4add2236)
Conflicts:
devel/git/HISTORY
commit 45fae4b22101abc99cb90a43bb4b263446e9a901
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
qtiplot: Fix SOURCE_URL[0]
(cherry picked from commit d40d32953536ef7ee6f8dbd5d005334ed27b2b45)
commit be9ad9cb196142cdeab75e8943fbf387301bfe5a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
qtiplot: Fix WEB_SITE and trim whitespace
(cherry picked from commit ef4841526c6d01b8e4461b3b1363292e7dc8bf58)
commit a4de8a4ec61c1ab5a8c44de066f8c4506db79cf1
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
virtuoso: enforce libiodbc if python (could that be PYTHON?)
(cherry picked from commit c69d08f64a427dfc967c4460c377b7980b541c2f)
commit 5362dcad4a5b2355d2a63a52374694dac36addc6
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
kdepimlibs4: more dependencies
(cherry picked from commit ea63b050bccf120a40552284e5c97d5ae1471e66)
commit 7c985cde0d3a7dab2bfd9593481af70cbbbc7a39
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
dbus: reduce attack surface by not picking up glib for tests during build
(cherry picked from commit 075b0ba9b92d0232e0dc2ad36e7245484fbc3316)
commit 44ce84d2a4a18ea808bb37199a3214463a9e2d16
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libxml2: unified $PYTHON
(cherry picked from commit 3cedb81d4e5b4bc0cf8e2a2b9dd7cfef029f6768)
commit 205b31ce0c6023d8942b80cb6ae6840e279342fe
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
sip: today
(cherry picked from commit 3ad41e5624f25c907bbeff92ef3bf149fde9c15b)
commit 0f992d1220bf7e0564a1550989dba5ebdefa5dbc
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
pyqt4: syntax fix
(cherry picked from commit b3706a713b732e7391c3cd9c20de8924c344a263)
commit 7f2e3e216f2898bf53bf3dcc9857fee9e93faccd
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
sip: define $PYTHON to make it build
(cherry picked from commit cbf48d6826e8809b94f2cfcc89fa6390020a28bb)
commit 9845c5fc189ab1d24157f03285c3c6b9d30e1fff
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
net/ntp: remove dead SOURCE_URL
(cherry picked from commit 8c347a699bf892dd5d5910a1b44874528c8c1487)
commit 4e03db8d78b3d4bb9e16602e6d019ba41b8f3ac8
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libssh2: => 1.5.0 SECURITY FIX
(cherry picked from commit 620311ae45cc0e4e404eb1b8c5e0ea66295c8b68)
commit 707a733127f5c39ebf4de656e03f62fff5ff29c8
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
dbus-c++: switch to released version 0.9.0 (identical to most recent git
head)
(cherry picked from commit c22b07acf954dbbf8d30f0ac2849296ec82b2479)
commit d7756bf2a11d9d4bd7a473697da67a47b81c83a0
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
pyqt4: fix build
(cherry picked from commit 7079bad5c299fc79615ce68e04a4e3b55bd0acf3)
commit 91229f8d1aee2265d79c62c8ee2c6a89287472af
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
FUNCTIONS: added get_spell_provider_file
(cherry picked from commit d05f2932783549b602c120cfbb3372e3728dc1d7)
Conflicts:
ChangeLog
commit 7a8c27c7c60f241b2a581a972639c77f1b97ee82
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
p11-kit: depends on libffi, too
(cherry picked from commit 62b9d1e35fed545c392e66247be79a0f31bab192)
commit 8a24503ed01f70cd7e13ac88ef771cc7f7b2ec03
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
openssl 0.9.8zf, 1.0.1m, SECURITY_PATCH++
(cherry picked from commit 3957e6307e876d6902f6e3a3f52fe952c8cae0d9)
commit 3c0b7b4647a37091bc3ccaf666a259bcb3e2eeeb
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
wicd: added missing pytz dependency
(cherry picked from commit 960881ae591903c6f0c413ef1976f9f7077732de)
commit 656711e7218e2c747448b12241310d636ec0260c
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
firefox: only disable tests if pgo is not enabled
mozconfig: remove --disable-tests, pgo requires it
Makefile.in-pgo.patch, bug999496_change1f10a8067853.patch: removed, no
longer applies
(cherry picked from commit 50ad1fd98591b9dc5ddead9f5e7d725f69dde833)
Conflicts:
http/firefox/PRE_BUILD
commit 0fab1efc2b4ab3a40a140af474dbfa51b726dfa3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
sox: => 14.4.2
(cherry picked from commit 8f58803772f9832b834015f4216c7a3e83446f1b)
commit bc915d92212066297dfff2221453d1a037e58fc7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
slim: updated website & source url; added another mirror
(cherry picked from commit ead4f76ae63bae926b29cef55cf34474f674861a)
commit a4f1d07d071e9d37c8758e74119015e4e1293206
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
+2014-10-15 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: tarball version 2.5.1a, the non-a vanished
+ * DEPENDS: sub on harfbuzz with ICU
+
2014-10-07 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: version 2.6.0
SOURCE_HASH=sha512:3a0cb7b49c508f56228e8e3a259b4fd34c872410ad14ef1d8656372e3e8ab9f92e59094a9cc1a75680099a8832f7472ad31462b3ae8a9e132ac7056d5245cf2a
- SOURCE="${SPELL}-${VERSION}.tar.bz2"
- SOURCE_URL[0]=http://soft.proindependent.com/src/${SOURCE}
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://soft.proindependent.com/qtiplot.html "
+ SOURCE="$SPELL-$VERSION.tar.bz2"
+
SOURCE_URL[0]="http://downloads.sourceforge.net/project/$SPELL.berlios/$SOURCE"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE="http://www.qtiplot.com"
LICENSE[0]=GPL
ENTERED=20070421
SHORT="A clone of Origin for data analysis and scientific
plotting."
@@ -16,26 +16,26 @@ is not free, of course. The purpose of this project is to
develop a free
far from this goal, but there's a "wish to" list we are constantly working
on. All suggestions and contributions are most welcome!
-Features:
-* 3D Plots
+Features:
+* 3D Plots
* Publication quality 2D plots: Error Bars, Multilayer
- Plots, Bar Plots, Pie Plots, Vector Plots, Contour and Image Plots
-* Statistical Plots: Box/Whiskers Diagramms, Histograms
-* Easy export of plots to vector formats (EPS, PS, PDF) and to other various
- image formats (BMP, JPG, PNG, TIFF etc ...)
-* Powerful and versatile spreadsheets and calculations in column-logic
-* Easy ASCII-Import/Export of single or multiple files
+ Plots, Bar Plots, Pie Plots, Vector Plots, Contour and Image Plots
+* Statistical Plots: Box/Whiskers Diagramms, Histograms
+* Easy export of plots to vector formats (EPS, PS, PDF) and to other various
+ image formats (BMP, JPG, PNG, TIFF etc ...)
+* Powerful and versatile spreadsheets and calculations in column-logic
+* Easy ASCII-Import/Export of single or multiple files
* Linear and non-linear curve fitting with weighting and estimation of
statistical errors of the fit-parameters, using Levenberg-Marquardt
- Least-Squares Algorithm or Nelder-Mead simplex minimization algorithm.
-* Multi-peak fitting with Gaussian and Lorentzian peak profiles
-* Data analysis: statistics, sorting, FFT, data smoothing (Savitzky-Golay,
- FFT smoothing, and moving window average), data filtering (low/high/band
pass
- and band block filters), convolution/deconvolution, correlation,
- interpolation, numerical integration/differentiation, etc...
-* Matrices optimized for 3D plotting
+ Least-Squares Algorithm or Nelder-Mead simplex minimization algorithm.
+* Multi-peak fitting with Gaussian and Lorentzian peak profiles
+* Data analysis: statistics, sorting, FFT, data smoothing (Savitzky-Golay,
+ FFT smoothing, and moving window average), data filtering (low/high/band
pass
+ and band block filters), convolution/deconvolution, correlation,
+ interpolation, numerical integration/differentiation, etc...
+* Matrices optimized for 3D plotting
* Templates support: all the settings for plots (2D/3D), tables and matrixes
can
- be saved to ASCII files and restored later on for a fast editing process
+ be saved to ASCII files and restored later on for a fast editing process
* Project files based on folders, a powerful project explorer with extensive
built-in features: drag and drop, searching facilities, etc...
EOF
diff --git a/science/qtiplot/HISTORY b/science/qtiplot/HISTORY
index 814bbad..d016dcb 100644
--- a/science/qtiplot/HISTORY
+++ b/science/qtiplot/HISTORY
@@ -1,3 +1,7 @@
+2015-03-20 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed WEB_SITE and trim whitespace
+ * DETAILS: Fixed SOURCE_URL[0]
+
2013-08-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.8.9
* BUILD: use qt4_build
diff --git a/utils/dbus-c++/DETAILS b/utils/dbus-c++/DETAILS
index dee703e..51640a0 100755
--- a/utils/dbus-c++/DETAILS
+++ b/utils/dbus-c++/DETAILS
@@ -1,13 +1,10 @@
-. "$GRIMOIRE/FUNCTIONS"
SPELL=dbus-c++
- VERSION=$(get_scm_version)
- SOURCE=$SPELL-git.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
- SOURCE_URL[0]=git://gitorious.org/dbus-cplusplus/mainline.git
- SOURCE_IGNORE=volatile
- FORCE_DOWNLOAD=1
-# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
-
WEB_SITE=http://sourceforge.net/apps/mediawiki/dbus-cplusplus/index.php?title=Main_Page
+ VERSION=0.9.0
+ SOURCE=lib$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/lib$SPELL-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/dbus-cplusplus/$SOURCE
+
SOURCE_HASH=sha512:7acebbb4254b2886cc0f05c5ddeeeac0b5863c5552d32249463b89380b0b95b8225c80bd98b8c7fcaada42ab770b5eff41b15390cd0d78bf1ee322ac6c2de319
+ WEB_SITE=http://dbus-cplusplus.sourceforge.net/
ENTERED=20100702
LICENSE[0]=GPL
KEYWORDS="utils"
diff --git a/utils/dbus-c++/HISTORY b/utils/dbus-c++/HISTORY
index e687104..fcef747 100644
--- a/utils/dbus-c++/HISTORY
+++ b/utils/dbus-c++/HISTORY
@@ -1,3 +1,8 @@
+2015-03-20 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: switch to release 0.9.0 (identical to current git head)
+ * PRE_BUILD: cleanup and clarification
+ * PREPARE: removed
+
2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
* unistd.patch, PRE_BUILD: gimme standard headers, proper bootstrap
diff --git a/utils/dbus-c++/PREPARE b/utils/dbus-c++/PREPARE
deleted file mode 100755
index 86a5079..0000000
--- a/utils/dbus-c++/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-. "$GRIMOIRE/FUNCTIONS" &&
-prepare_select_branch
diff --git a/utils/dbus-c++/PRE_BUILD b/utils/dbus-c++/PRE_BUILD
index 74f9121..d4274ed 100755
--- a/utils/dbus-c++/PRE_BUILD
+++ b/utils/dbus-c++/PRE_BUILD
@@ -1,10 +1,7 @@
default_pre_build &&
-
-cd $SOURCE_DIRECTORY &&
-
-patch -p1 < $SPELL_DIRECTORY/configure.patch &&
-patch -p1 < $SPELL_DIRECTORY/unistd.patch &&
-
+cd "$SOURCE_DIRECTORY" &&
+patch -p1 < "$SCRIPT_DIRECTORY/unistd.patch"
+patch -p1 < "$SCRIPT_DIRECTORY/configure.patch"
+# This is needed to fix up libtool stuff, too!
+# Otherwise we'd get linking errors with as-needed (missing -lexpat, p.ex.).
./bootstrap
-
-
diff --git a/utils/dbus/BUILD b/utils/dbus/BUILD
index 8e356ac..5210a48 100755
--- a/utils/dbus/BUILD
+++ b/utils/dbus/BUILD
@@ -5,6 +5,11 @@ fi &&
if [ "$DBUS_SELINUX" == "y" ]; then
OPTS="--enable-selinux $OPTS"
fi &&
+# Glib2 is used for regression tests and can cause unnecessary build failure
+# when we're in a chain where libffi just has been updated and glib2 not yet.
+# Other solution would be to unnecessarily depend on glib2, or even
+# dbus-glib, which just smells too circular.
+OPTS="--without-dbus-glib --disable-modular-tests $OPTS" &&
create_account messagebus &&
default_build &&
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index 84184fc..543f9d0 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,6 @@
+2015-03-19 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: avoid picking up of glib2 for tests
+
2015-02-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.8.16, SECURITY_PATCH=15