Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6d079fe42fff87ab7969102f597e1235de0035c7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6d079fe42fff87ab7969102f597e1235de0035c7)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6d079fe42fff87ab7969102f597e1235de0035c7)
  • Date: Tue, 5 Jan 2016 16:45:03 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

database/firebird3/BUILD | 14 ++++++------
database/firebird3/DEPENDS | 6 ++++-
database/firebird3/HISTORY | 3 ++
kde5-pim/akonadi/HISTORY | 4 +++
kde5-pim/akonadi/PRE_BUILD | 2 -
kde5-pim/akonadi/TRIGGERS | 1
kde5-pim/kdepim-runtime/HISTORY | 3 ++
kde5-pim/kdepim-runtime/PRE_BUILD | 2 -
kde5-pim/kdepimlibs/HISTORY | 3 ++
kde5-pim/kdepimlibs/PRE_BUILD | 2 -
libs/boost/DETAILS | 4 +--
libs/boost/HISTORY | 41
+++++++++++++++++++++++---------------
libs/boost/PRE_BUILD | 1
libs/boost/asio_ssl.patch | 19 -----------------
14 files changed, 55 insertions(+), 50 deletions(-)

New commits:
commit 6d079fe42fff87ab7969102f597e1235de0035c7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kdepim-runtime - fix typo

commit 65b1468816f8e198c32934da8eb8df667f969423
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kdepimlibs - fix typo

commit b2b1b98540d934c9e356a8b983ee0afe14901e49
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

akonadi - fix typo

commit c8c0b25b30544d5a1d05e87b139fef5d63375434
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

boost: => 1_60_0

commit 4c05700b6bd75f7150a045c41febdad0f37e99ad
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

firebird3 - ninja support

diff --git a/database/firebird3/BUILD b/database/firebird3/BUILD
index 853667b..8140859 100755
--- a/database/firebird3/BUILD
+++ b/database/firebird3/BUILD
@@ -1,9 +1,9 @@
persistent_add FB_PREFIX &&
FB_PREFIX=${INSTALL_ROOT}/opt/firebird &&
-cd $SOURCE_DIRECTORY/build &&
-cmake -DCMAKE_INSTALL_PREFIX=$FB_PREFIX \
- -DCMAKE_INSTALL_LOCALSTATEDIR=$INSTALL_ROOT/var \
- -DCMAKE_BUILD_TYPE=$CM_BUILD_TYPE \
- $OPTS $SOURCE_DIRECTORY &&
-make &&
-make copy_files
+cmake_build $FB_PREFIX &&
+if [[ $CMAKE_GEN == Ninja ]];then
+ ninja copy_files
+else
+ make copy_files
+fi
+
diff --git a/database/firebird3/DEPENDS b/database/firebird3/DEPENDS
index c8066dc..f60f951 100755
--- a/database/firebird3/DEPENDS
+++ b/database/firebird3/DEPENDS
@@ -1,4 +1,8 @@
depends cmake &&
depends icu &&
#depends readline &&
-depends zlib
+depends zlib &&
+if [[ $CMAKE_GEN == Ninja ]];then
+ depends ninja-build-system
+fi
+
diff --git a/database/firebird3/HISTORY b/database/firebird3/HISTORY
index 580bc98..e293d33 100644
--- a/database/firebird3/HISTORY
+++ b/database/firebird3/HISTORY
@@ -1,3 +1,6 @@
+2016=-1-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPNDS: BUILD: ninja support
+
2015-12-09 Treeve Jelbert <treeve AT sourcemage.org>
* INSTALL: fix

diff --git a/kde5-pim/akonadi/HISTORY b/kde5-pim/akonadi/HISTORY
index 23890a2..2ed98be 100644
--- a/kde5-pim/akonadi/HISTORY
+++ b/kde5-pim/akonadi/HISTORY
@@ -1,3 +1,7 @@
+2016-01-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * TRIGGERS: deleted, obsolete
+ * PRE_BUILD: fix typo
+
2015-12-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 15.12.0

diff --git a/kde5-pim/akonadi/PRE_BUILD b/kde5-pim/akonadi/PRE_BUILD
index cf7d67b..ae0fab7 100755
--- a/kde5-pim/akonadi/PRE_BUILD
+++ b/kde5-pim/akonadi/PRE_BUILD
@@ -1,3 +1,3 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-sed -i '/-update_xdg_mimetypes/D' CMakeLists.txt
+sed -i '/update_xdg_mimetypes/D' CMakeLists.txt
diff --git a/kde5-pim/akonadi/TRIGGERS b/kde5-pim/akonadi/TRIGGERS
deleted file mode 100755
index 1696e74..0000000
--- a/kde5-pim/akonadi/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast boost check_self
diff --git a/kde5-pim/kdepim-runtime/HISTORY b/kde5-pim/kdepim-runtime/HISTORY
index 0cbc019..2fc232c 100644
--- a/kde5-pim/kdepim-runtime/HISTORY
+++ b/kde5-pim/kdepim-runtime/HISTORY
@@ -1,3 +1,6 @@
+2016-01-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: fix typo
+
2015-12-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 15.12.0

diff --git a/kde5-pim/kdepim-runtime/PRE_BUILD
b/kde5-pim/kdepim-runtime/PRE_BUILD
index 5ad2540..f78bfd4 100755
--- a/kde5-pim/kdepim-runtime/PRE_BUILD
+++ b/kde5-pim/kdepim-runtime/PRE_BUILD
@@ -1,5 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-sed -i '/-update_xdg_mimetypes/D;/Declarative/d' CMakeLists.txt
+sed -i '/update_xdg_mimetypes/D;/Declarative/d' CMakeLists.txt
# temporary fix
sed -i '/dav/D' resources/CMakeLists.txt
diff --git a/kde5-pim/kdepimlibs/HISTORY b/kde5-pim/kdepimlibs/HISTORY
index 87decf7..c8b6236 100644
--- a/kde5-pim/kdepimlibs/HISTORY
+++ b/kde5-pim/kdepimlibs/HISTORY
@@ -1,3 +1,6 @@
+2016-01-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: fix typo
+
2015-12-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 15.12.0

diff --git a/kde5-pim/kdepimlibs/PRE_BUILD b/kde5-pim/kdepimlibs/PRE_BUILD
index 9a1994e..b3e1d34 100755
--- a/kde5-pim/kdepimlibs/PRE_BUILD
+++ b/kde5-pim/kdepimlibs/PRE_BUILD
@@ -1,4 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-sed -i '/-update_xdg_mimetypes/D' akonadi-mime/src/CMakeLists.txt \
+sed -i '/update_xdg_mimetypes/D' akonadi-mime/src/CMakeLists.txt \
akonadi-socialutils/src/serializer/CMakeLists.txt
diff --git a/libs/boost/DETAILS b/libs/boost/DETAILS
index 835264c..ec6b671 100755
--- a/libs/boost/DETAILS
+++ b/libs/boost/DETAILS
@@ -1,6 +1,6 @@
SPELL=boost
- VERSION=1_59_0
-
SOURCE_HASH=sha512:8139e1ae997a86974071c5714ad3307e3d8fd15ef702b81a953410dd4d424b932135f53a0ef4891d9b9b747a38e539e66d6a803388fe0cc98e5166be872d682a
+ VERSION=1_60_0
+
SOURCE_HASH=sha512:7c851b3fc2b322ff05d642d9cf03e7c30c5f04d5cf0579c99046b1ec708901c58a3d349031dfe24591f5b88c1e664b6a0d40abea6cce89abb52080c02eb725df
PATCHLEVEL=1
SECURITY_PATCH=1
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/libs/boost/HISTORY b/libs/boost/HISTORY
index fb13e72..3e4f843 100644
--- a/libs/boost/HISTORY
+++ b/libs/boost/HISTORY
@@ -1,3 +1,7 @@
+2016-01-05 Treeeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1_60_0
+ * PRE_BUILD, asio_ssl.patch: patch not needed
+
2015-11-11 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* PRE_BUILD, asio_ssl.patch: added patch to check for SSLv3
@@ -72,7 +76,7 @@
* PRE_BUILD: fix detection of python3

2012-04-18 Sukneet Basuta <sukneet AT sourcemage.org>
- * BUILD: Dont build with --with-libraries specified
+ * BUILD: Dont build with --with-libraries specified
when you don't select them, so all libs are built

2012-04-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
@@ -80,7 +84,8 @@

2012-04-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, CONFIGURE, DEPENDS, PRE_SUB_DEPENDS,
REPAIR^all^PRE_SUB_DEPENDS,
- SUB_DEPENDS: split selectable libraries into two variables, added
missing libraries
+ SUB_DEPENDS: split selectable libraries into two variables, added
missing
+libraries

2012-04-07 Treeeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1_49_0
@@ -98,7 +103,8 @@
https://svn.boost.org/trac/boost/ticket/6131

2011-08-18 Bor Kraljič <pyrobor AT ver.si>
- * PRE_BUILD: added patch converter_policies_hpp.patch so rocs
compiles without an error
+ * PRE_BUILD: added patch converter_policies_hpp.patch so rocs
compiles without
+an error
(patch taken from https://svn.boost.org/trac/boost/ticket/5076 )

2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
@@ -121,7 +127,7 @@

2011-05-23 Sukneet Basuta <sukneet AT sourcemage.org>
* BUILD: build Boost.Jam first with boostrap.sh
- then build boost with that rather than local version; bug #15983
+ then build boost with that rather than local version; bug #15983

2011-05-22 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 1_46_1
@@ -136,7 +142,8 @@
* PRE_BUILD: Apply boost-use-cxxflags.patch (Required to fix Bug
#15694)
* BUILD: Add '-Wno-strict-aliasing' to CXXFLAGS (Bug #15694)
* boost-use-cxxflags.patch: Allow providing our own CXXFLAGS
- From
http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/boost/current/SOURCES/boost-use-cxxflags.patch?view=markup
+ From
+http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/boost/current/SOURCES/boost-use-cxxflags.patch?view=markup

2010-02-08 Sukneet <skipinder AT gmail.com>
* DETAILS: updated spell to 1_42_0; bug #15595
@@ -144,27 +151,27 @@
2009-11-29 Finn Haedicke <finn_haedicke AT gmx.net>
* DETAILS: version 1_41_0

-2009-09-02 Treeeve Jelbert <treeve AT sourcemage.org>
+2009-09-02 Treeeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add openmpi
* BUILD: remove mpi related stuff

-2009-08-27 Treeeve Jelbert <treeve AT sourcemage.org>
+2009-08-27 Treeeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1_40_0
* PRE_BUILD, gcc44.diff: deleted

-2009-05-10 Treeeve Jelbert <treeve AT sourcemage.org>
+2009-05-10 Treeeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1_39_0
* PRE_BUILD, gcc44.diff: added
* BUILD, INSTALL: remove threading=single (obsolete)

-2009-02-09 Treeeve Jelbert <treeve AT sourcemage.org>
+2009-02-09 Treeeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1_38_0

2009-01-05 Vlad Glagolev <stealth AT sourcemage.org>
* REPAIR^*^SUB_DEPENDS: removed
* REPAIR^all^SUB_DEPENDS: added

-2008-12-17 Treeeve Jelbert <treeve AT sourcemage.org>
+2008-12-17 Treeeve Jelbert <treeve AT sourcemage.org>
* SUB_DEPENDS: OPTS1 -> LIBS
make usage consistent between SUB_DEPENDS and PRE_SUB_DEPENDS
* REPAIR^*^SUB_DEPENDS: added
@@ -178,7 +185,7 @@
2008-08-16 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DETAILS: corrected wrong hashsum

-2008-08-13 Treeeve Jelbert <treeve AT sourcemage.org>
+2008-08-13 Treeeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1_36_0

2008-05-01 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
@@ -190,10 +197,12 @@
* SUB_DEPENDS: added some new options

2008-04-24 Elisamuel Resto <ryuji AT sourcemage.org>
- * PRE_BUILD, boost-1_35_0-serialization_gcc43_64bit.patch: added, the
combination
- x86_64 + boost-1_35_0 + gcc-4.3 breaks compiling of boost. Applied
in upstream scm.
+ * PRE_BUILD, boost-1_35_0-serialization_gcc43_64bit.patch: added, the
+combination
+ x86_64 + boost-1_35_0 + gcc-4.3 breaks compiling of boost. Applied
in upstream
+scm.

-2008-03-29 Treeeve Jelbert <treeve AT sourcemage.org>
+2008-03-29 Treeeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1_35_0
* PRE_BUILD, gcc43.patch: deleted, not needed

@@ -207,7 +216,7 @@
2007-08-07 Pol Vinogradov <vin.public AT gmail.com>
* DEPENDS, SUB_DEPENDS: removed options for python dependency

-2007-07-25 Treeeve Jelbert <treeve AT sourcemage.org>
+2007-07-25 Treeeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1_34_1

2007-06-21 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
@@ -246,7 +255,7 @@
* DETAILS: [automated] Removed BUILD_API=2.

2006-08-15 Juuso Alasuutari <iuso AT sourcemage.org>
- * DETAILS: [automated] Removed UPDATED (deprecated in favor of
+ * DETAILS: [automated] Removed UPDATED (deprecated in favor of
PATCHLEVEL).

2006-06-14 Treeeve Jelbert <treeve AT sourcemage.org>
diff --git a/libs/boost/PRE_BUILD b/libs/boost/PRE_BUILD
index 447893c..7052fb6 100755
--- a/libs/boost/PRE_BUILD
+++ b/libs/boost/PRE_BUILD
@@ -1,6 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < ${SPELL_DIRECTORY}/asio_ssl.patch &&
if is_depends_enabled $SPELL python3;then
sed -i 's/python$/&3/;s/sys.prefix/(&)/' bootstrap.sh
fi &&
diff --git a/libs/boost/asio_ssl.patch b/libs/boost/asio_ssl.patch
deleted file mode 100644
index 9705e46..0000000
--- a/libs/boost/asio_ssl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- boost/asio/ssl/impl/context.ipp.orig 2015-03-23 15:24:12.000000000
-0500
-+++ boost/asio/ssl/impl/context.ipp 2015-11-11 21:43:08.551733213 -0500
-@@ -89,6 +89,8 @@
- handle_ = ::SSL_CTX_new(::SSLv2_server_method());
- break;
- #endif // defined(OPENSSL_NO_SSL2)
-+#if defined(HAVE_SSLV3_METHOD) && defined(HAVE_SSLV3_SERVER_METHOD) && \
-+ defined(HAVE_SSLV3_CLIENT_METHOD)
- case context::sslv3:
- handle_ = ::SSL_CTX_new(::SSLv3_method());
- break;
-@@ -98,6 +100,7 @@
- case context::sslv3_server:
- handle_ = ::SSL_CTX_new(::SSLv3_server_method());
- break;
-+#endif
- case context::tlsv1:
- handle_ = ::SSL_CTX_new(::TLSv1_method());
- break;


  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6d079fe42fff87ab7969102f597e1235de0035c7), Treeve Jelbert, 01/05/2016

Archive powered by MHonArc 2.6.24.

Top of Page