Skip to Content.
Sympa Menu

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

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 (908a350ab85699869e55c66bbc898833bfcde4df)
  • Date: Sun, 25 Dec 2016 11:34:29 +0000

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

graphics/darktable/0001-do-not-build-darktable-viewer.patch | 44
------------
graphics/darktable/DETAILS | 4 -
graphics/darktable/HISTORY | 4 +
graphics/darktable/PRE_BUILD | 5 -
python-pypi/cherrypy/DETAILS | 4 -
python-pypi/cherrypy/HISTORY | 3
python-pypi/setuptools/DETAILS | 4 -
python-pypi/setuptools/HISTORY | 3
8 files changed, 16 insertions(+), 55 deletions(-)

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

graphics/darktable: version 2.2.0

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

python-pypi/setuptools: version 32.3.0

commit 81d9cafa45d1ec2c1c42c8b6dd9a25c93ff79e41
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.3.0

diff --git a/graphics/darktable/0001-do-not-build-darktable-viewer.patch
b/graphics/darktable/0001-do-not-build-darktable-viewer.patch
deleted file mode 100644
index b634dfe..0000000
--- a/graphics/darktable/0001-do-not-build-darktable-viewer.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 7a26b2751a34f485f18a4106e489f9e09415574e Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.net>
-Date: Sun, 7 Aug 2016 15:28:58 +0200
-Subject: [PATCH] do not build darktable-viewer
-
----
- src/dtview/CMakeLists.txt | 24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/src/dtview/CMakeLists.txt b/src/dtview/CMakeLists.txt
-index d45bb0c..c220712 100644
---- a/src/dtview/CMakeLists.txt
-+++ b/src/dtview/CMakeLists.txt
-@@ -12,15 +12,15 @@ include_directories(SYSTEM ${SDL_INCLUDE_DIR})
- include_directories(SYSTEM ${OPENGL_INCLUDE_DIR})
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
- include_directories(${CMAKE_CURRENT_BINARY_DIR}/..)
--add_executable(darktable-viewer main.c)
--
--set_target_properties(darktable-viewer PROPERTIES
CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
--set_target_properties(darktable-viewer PROPERTIES
CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
--if(APPLE)
-- set_target_properties(darktable-viewer PROPERTIES INSTALL_RPATH
@loader_path/../${LIB_INSTALL}/darktable)
--else(APPLE)
-- set_target_properties(darktable-viewer PROPERTIES INSTALL_RPATH
$ORIGIN/../${LIB_INSTALL}/darktable)
--endif(APPLE)
--set_target_properties(darktable-viewer PROPERTIES LINKER_LANGUAGE C)
--target_link_libraries(darktable-viewer lib_darktable ${SDL_LIBRARY}
${OPENGL_LIBRARIES})
--install(TARGETS darktable-viewer DESTINATION bin)
-+#add_executable(darktable-viewer main.c)
-+#
-+#set_target_properties(darktable-viewer PROPERTIES
CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-+#set_target_properties(darktable-viewer PROPERTIES
CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
-+#if(APPLE)
-+# set_target_properties(darktable-viewer PROPERTIES INSTALL_RPATH
@loader_path/../${LIB_INSTALL}/darktable)
-+#else(APPLE)
-+# set_target_properties(darktable-viewer PROPERTIES INSTALL_RPATH
$ORIGIN/../${LIB_INSTALL}/darktable)
-+#endif(APPLE)
-+#set_target_properties(darktable-viewer PROPERTIES LINKER_LANGUAGE C)
-+#target_link_libraries(darktable-viewer lib_darktable ${SDL_LIBRARY}
${OPENGL_LIBRARIES})
-+#install(TARGETS darktable-viewer DESTINATION bin)
---
-2.9.2
-
diff --git a/graphics/darktable/DETAILS b/graphics/darktable/DETAILS
index 3fbf2fd..f931344 100755
--- a/graphics/darktable/DETAILS
+++ b/graphics/darktable/DETAILS
@@ -1,10 +1,10 @@
. "$GRIMOIRE/FUNCTIONS"
SPELL=darktable
if [[ "$DARKTABLE_BRANCH" == "stable" ]]; then
- VERSION=2.0.7
+ VERSION=2.2.0
SOURCE="${SPELL}-${VERSION}.tar.xz"

SOURCE_URL[0]=https://github.com/darktable-org/darktable/releases/download/release-${VERSION}/${SOURCE}
-
SOURCE_HASH=sha256:a9226157404538183549079e3b8707c910fedbb669bd018106bdf584b88a1dab
+
SOURCE_HASH=sha256:3eca193831faae58200bb1cb6ef29e658bce43a81706b54420953a7c33d79377
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
else
VERSION=$(get_scm_version)
diff --git a/graphics/darktable/HISTORY b/graphics/darktable/HISTORY
index f414c12..4ce63ae 100644
--- a/graphics/darktable/HISTORY
+++ b/graphics/darktable/HISTORY
@@ -1,3 +1,7 @@
+2016-10-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.2.0
+ * 0001-do-not-build-darktable-viewer.patch, PRE_BUILD: removed
+
2016-12-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD: don't apply patch against scm version

diff --git a/graphics/darktable/PRE_BUILD b/graphics/darktable/PRE_BUILD
deleted file mode 100755
index 5bd29ac..0000000
--- a/graphics/darktable/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-if [[ "$DARKTABLE_BRANCH" == "stable" ]]; then
- patch -p1 < "$SPELL_DIRECTORY/0001-do-not-build-darktable-viewer.patch"
-fi
diff --git a/python-pypi/cherrypy/DETAILS b/python-pypi/cherrypy/DETAILS
index 009c056..533c290 100755
--- a/python-pypi/cherrypy/DETAILS
+++ b/python-pypi/cherrypy/DETAILS
@@ -1,9 +1,9 @@
SPELL=cherrypy
SPELLX=CherryPy
- VERSION=8.2.0
+ VERSION=8.3.0
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_URL[0]="https://pypi.io/packages/source/C/${SPELLX}/${SOURCE}";
-
SOURCE_HASH=sha512:8a5ba1b544f737db3a59b6e63afdf93e45db5bf607436976637982178cedd4b230d6bc20c4504f20f6626d3d73757c5abb5a485b555098194f407d97daa2ca9e
+
SOURCE_HASH=sha512:35880deebd114b3a89cad1525607337e433fc55ceb7d5858d6d1239a513fbab023d00220c7e00596fa40098fcfa0447c27a967882a07a353d0736cc379838740
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 fd77f05..16df171 100644
--- a/python-pypi/cherrypy/HISTORY
+++ b/python-pypi/cherrypy/HISTORY
@@ -1,3 +1,6 @@
+2016-12-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 8.3.0
+
2016-12-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 8.2.0

diff --git a/python-pypi/setuptools/DETAILS b/python-pypi/setuptools/DETAILS
index a0c1e10..5317203 100755
--- a/python-pypi/setuptools/DETAILS
+++ b/python-pypi/setuptools/DETAILS
@@ -1,6 +1,6 @@
SPELL=setuptools
- VERSION=32.2.0
-
SOURCE_HASH=sha512:b0d4369a053a2cd522d8c5cea2690289e74cb8f4272b04ec93778496c78f4bb96c71699423f2f5cce077655b19c4eadef4d0f68142e47cbd115759a73470b121
+ VERSION=32.3.0
+
SOURCE_HASH=sha512:ebb792f5e08cfd1090f5134c2f2fede980d6a1a94e7457854905aaa9c3ecd86dc5c434ac9451bd294d8dac8b2e114591b8544ca3c232aa86f58a8c96bf6b5988
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=https://github.com/pypa/$SPELL/archive/v$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/setuptools/HISTORY b/python-pypi/setuptools/HISTORY
index 792f4c3..fbe4454 100644
--- a/python-pypi/setuptools/HISTORY
+++ b/python-pypi/setuptools/HISTORY
@@ -1,3 +1,6 @@
+2016-12-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 32.3.0
+
2016-12-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 32.2.0




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (908a350ab85699869e55c66bbc898833bfcde4df), Florian Franzmann, 12/25/2016

Archive powered by MHonArc 2.6.24.

Top of Page