Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (3a65d2282ec05ae1df8f2043a12e17e613c9c488)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (3a65d2282ec05ae1df8f2043a12e17e613c9c488)
  • Date: Fri, 13 Jan 2017 20:38:39 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

archive-libs/zlib/0001-fix-zlib.pc-install-path.patch | 25
++++++++++++++++++
archive-libs/zlib/DETAILS | 2 -
archive-libs/zlib/HISTORY | 5 +++
archive-libs/zlib/INSTALL | 4 --
archive-libs/zlib/PRE_BUILD | 2 -
crypto/keepassx/DETAILS | 4 +-
crypto/keepassx/HISTORY | 3 ++
libs/boost/DETAILS | 4 +-
libs/boost/HISTORY | 3 ++
python-pypi/cherrypy/DETAILS | 4 +-
python-pypi/cherrypy/HISTORY | 3 ++
11 files changed, 48 insertions(+), 11 deletions(-)

New commits:
commit 3a65d2282ec05ae1df8f2043a12e17e613c9c488
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

crypto/keepassx: version 2.0.3

commit 09aa32d53d70924dd2c6063882c4c43c674b92aa
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/boost: version 1.63.0

commit 90c2428bb21c66eb40e5b1ecd750e46b489205e2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

python-pypi/cherrypy: version 8.9.0

commit 57bfb5a6d3e286586c0f739f5cd183b7143da3d6
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

archive-libs/zlib: install zlib.pc to /usr/lib/pkgconfig

diff --git a/archive-libs/zlib/0001-fix-zlib.pc-install-path.patch
b/archive-libs/zlib/0001-fix-zlib.pc-install-path.patch
new file mode 100644
index 0000000..9f2b9b9
--- /dev/null
+++ b/archive-libs/zlib/0001-fix-zlib.pc-install-path.patch
@@ -0,0 +1,25 @@
+From c332e2d5043252d9a9b523b8aed9490a43339433 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Fri, 13 Jan 2017 20:41:39 +0100
+Subject: [PATCH] fix zlib.pc install path
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 1852192..fd061cf 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -52,7 +52,7 @@ sharedlibdir = ${libdir}
+ includedir = ${prefix}/include
+ mandir = ${prefix}/share/man
+ man3dir = ${mandir}/man3
+-pkgconfigdir = ${libdir}/pkgconfig
++pkgconfigdir = ${prefix}/lib/pkgconfig
+ SRCDIR=
+ ZINC=
+ ZINCOUT=-I.
+--
+2.11.0
+
diff --git a/archive-libs/zlib/DETAILS b/archive-libs/zlib/DETAILS
index 7f70044..5f21338 100755
--- a/archive-libs/zlib/DETAILS
+++ b/archive-libs/zlib/DETAILS
@@ -1,6 +1,6 @@
SPELL=zlib
VERSION=1.2.10
- PATCHLEVEL=1
+ PATCHLEVEL=2

SOURCE_HASH=sha512:5fa71052a418a0f2b345fce28af9941bbd1c6ee276ce506ab3092157f15776ee41f96bb1799657227513b852913f96ac52dae8122a437f34b43933ee48d63ee0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/archive-libs/zlib/HISTORY b/archive-libs/zlib/HISTORY
index 0ae703e..3c2b9c6 100644
--- a/archive-libs/zlib/HISTORY
+++ b/archive-libs/zlib/HISTORY
@@ -1,3 +1,8 @@
+2017-01-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * INSTALL, PRE_BUILD, 0001-fix-zlib.pc-install-path.patch: install
zlib.pc
+ to /usr/lib/pkgconfig instead of symlinking
+ * DETAILS: PATCHLEVEL++
+
2017-01-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* INSTALL: add a symlink for zlib.pc
diff --git a/archive-libs/zlib/INSTALL b/archive-libs/zlib/INSTALL
index becd137..d4b8a77 100755
--- a/archive-libs/zlib/INSTALL
+++ b/archive-libs/zlib/INSTALL
@@ -1,6 +1,4 @@
cd $SOURCE_DIRECTORY.static &&
make prefix=$INSTALL_ROOT/usr install &&
cd $SOURCE_DIRECTORY &&
-make prefix=$INSTALL_ROOT/usr install &&
-cd $INSTALL_ROOT/usr/lib/pkgconfig &&
-ln -s $TRACK_ROOT/lib/pkgconfig/zlib.pc
+make prefix=$INSTALL_ROOT/usr install
diff --git a/archive-libs/zlib/PRE_BUILD b/archive-libs/zlib/PRE_BUILD
index 90b6592..3756c5f 100755
--- a/archive-libs/zlib/PRE_BUILD
+++ b/archive-libs/zlib/PRE_BUILD
@@ -1,7 +1,7 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-#patch -p0 < "$SPELL_DIRECTORY/pkgpath.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/0001-fix-zlib.pc-install-path.patch" &&

mk_source_dir "$SOURCE_DIRECTORY.static" &&
cp -a $SOURCE_DIRECTORY/* $SOURCE_DIRECTORY.static
diff --git a/crypto/keepassx/DETAILS b/crypto/keepassx/DETAILS
index 53a3295..673f798 100755
--- a/crypto/keepassx/DETAILS
+++ b/crypto/keepassx/DETAILS
@@ -1,9 +1,9 @@
SPELL=keepassx
- VERSION=2.0
+ VERSION=2.0.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://www.keepassx.org/releases/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:6c8b8ee6a22cab5da5f262b281ed914e9cce99607312124b068a3386d9da560a3584acea4ce1be6700e40087febcc269273ab67ea472b99e6d3f75048d164788
+
SOURCE_HASH=sha512:bf1a4ffa49fc4a6b7a27e6292981c9c13920712b4cd86759a99976f7e0593a243ea14575c57d664ba7e55d2449b5d83bc3d43a64a9a6972335e52234da79d773
LICENSE[0]=GPL
WEB_SITE=http://www.keepassx.org/
ENTERED=20100706
diff --git a/crypto/keepassx/HISTORY b/crypto/keepassx/HISTORY
index 22fb312..837f37b 100644
--- a/crypto/keepassx/HISTORY
+++ b/crypto/keepassx/HISTORY
@@ -1,3 +1,6 @@
+2017-01-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.0.3
+
2015-12-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: version 2.0
* 0001-add-missing-includes.patch, PRE_BUILD: removed
diff --git a/libs/boost/DETAILS b/libs/boost/DETAILS
index 7803191..1ebe313 100755
--- a/libs/boost/DETAILS
+++ b/libs/boost/DETAILS
@@ -1,6 +1,6 @@
SPELL=boost
- VERSION=1_62_0
-
SOURCE_HASH=sha512:5385ae3d5255a433a704169ad454d8dc2b0b5bcae3fb23defd6570df4ff7d845cf9fcbeebccdc1c5db0eec9f82ee3d90040de9507c8167467c635d3b215463be
+ VERSION=1_63_0
+
SOURCE_HASH=sha512:1508c778dc8cf4720c1abc861f9311db84e2fa959cf2122271a0cb8213f2322760d087a2aed60003a1a1543092b3567d3201cb37cc01e4b77265f8e773015100
SECURITY_PATCH=1
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE=${SPELL}_${VERSION}.tar.bz2
diff --git a/libs/boost/HISTORY b/libs/boost/HISTORY
index 6a9f207..c23b675 100644
--- a/libs/boost/HISTORY
+++ b/libs/boost/HISTORY
@@ -1,3 +1,6 @@
+2017-01-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.63
+
2016-11-26 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fixed SOURCE_HASH

diff --git a/python-pypi/cherrypy/DETAILS b/python-pypi/cherrypy/DETAILS
index f76ad4e..de360b2 100755
--- a/python-pypi/cherrypy/DETAILS
+++ b/python-pypi/cherrypy/DETAILS
@@ -1,9 +1,9 @@
SPELL=cherrypy
SPELLX=CherryPy
- VERSION=8.8.0
+ VERSION=8.9.0
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_URL[0]="https://pypi.io/packages/source/C/${SPELLX}/${SOURCE}";
-
SOURCE_HASH=sha512:49e4cb18cc9f7a75893a8b9910b2989f5f47d98af9b7bb1913f0821ad951f2fb6ede1c7da68e37265ce6e15a93a001bcb8f9300db8333e299156a666a13cb4db
+
SOURCE_HASH=sha512:5d4219ff80420a08c10bb44c103f88670d7da493e436df298cabf9073a4d35dd08915f7537acdff698535d9bc7ce09dc61d8ef0d39df6b14875cbfd0678ecb06
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
WEB_SITE=http://www.cherrypy.org/
LICENSE[0]=BSD
diff --git a/python-pypi/cherrypy/HISTORY b/python-pypi/cherrypy/HISTORY
index 1b7b5c8..76032dc 100644
--- a/python-pypi/cherrypy/HISTORY
+++ b/python-pypi/cherrypy/HISTORY
@@ -1,3 +1,6 @@
+2017-01-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 8.9.0
+
2017-01-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 8.8.0




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (3a65d2282ec05ae1df8f2043a12e17e613c9c488), Florian Franzmann, 01/13/2017

Archive powered by MHonArc 2.6.24.

Top of Page