diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2021-11-24 20:49:02 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2021-11-25 08:59:57 +0100 |
| commit | 7a10b39e8f036460e7ea52ed953ac0fa75a76cd4 (patch) | |
| tree | c248a7393473d1cff5147dbc801396503345a80a /source | |
| parent | 8ed399a7a71742513c5052b560a0e74cf0f0af47 (diff) | |
| download | current-7a10b39e8f036460e7ea52ed953ac0fa75a76cd4.tar.gz | |
Wed Nov 24 20:49:02 UTC 202120211124204902
kde/kopeninghours-21.08.3-x86_64-2.txz: Rebuilt.
Repect $LIBDIRSUFFIX when installing the Python module.
Thanks to qunying.
Diffstat (limited to 'source')
| -rw-r--r-- | source/kde/kde/build/kopeninghours | 2 | ||||
| -rw-r--r-- | source/kde/kde/patch/kopeninghours.patch | 4 | ||||
| -rw-r--r-- | source/kde/kde/patch/kopeninghours/kopeninghours.x86_64.python.libdir.diff | 11 | ||||
| -rwxr-xr-x | source/l/Mako/Mako.SlackBuild | 2 |
4 files changed, 17 insertions, 2 deletions
diff --git a/source/kde/kde/build/kopeninghours b/source/kde/kde/build/kopeninghours index d00491fd..0cfbf088 100644 --- a/source/kde/kde/build/kopeninghours +++ b/source/kde/kde/build/kopeninghours @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/patch/kopeninghours.patch b/source/kde/kde/patch/kopeninghours.patch new file mode 100644 index 00000000..8579bf76 --- /dev/null +++ b/source/kde/kde/patch/kopeninghours.patch @@ -0,0 +1,4 @@ +# Fix install dir for Python module if $LIBDIRSUFFIX = 64: +if [ "$LIBDIRSUFFIX" = "64" ]; then + cat $CWD/patch/kopeninghours/kopeninghours.x86_64.python.libdir.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +fi diff --git a/source/kde/kde/patch/kopeninghours/kopeninghours.x86_64.python.libdir.diff b/source/kde/kde/patch/kopeninghours/kopeninghours.x86_64.python.libdir.diff new file mode 100644 index 00000000..883e4296 --- /dev/null +++ b/source/kde/kde/patch/kopeninghours/kopeninghours.x86_64.python.libdir.diff @@ -0,0 +1,11 @@ +--- ./PyKOpeningHours/CMakeLists.txt.orig 2021-11-02 10:24:56.000000000 -0500 ++++ ./PyKOpeningHours/CMakeLists.txt 2021-11-24 14:36:44.808100571 -0600 +@@ -24,7 +24,7 @@ + target_link_libraries(PyKOpeningHours PUBLIC ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} KOpeningHours) + target_include_directories(PyKOpeningHours PRIVATE ${PYTHON_INCLUDE_DIRS}) + +-set(_install_dir lib/python${PYTHONLIBS_VERSION_MAJOR}.${PYTHONLIBS_VERSION_MINOR}/site-packages) ++set(_install_dir lib64/python${PYTHONLIBS_VERSION_MAJOR}.${PYTHONLIBS_VERSION_MINOR}/site-packages) + + install(TARGETS PyKOpeningHours DESTINATION ${_install_dir}/PyKOpeningHours) + install(FILES PyKOpeningHours.pyi __init__.py DESTINATION ${_install_dir}/PyKOpeningHours) diff --git a/source/l/Mako/Mako.SlackBuild b/source/l/Mako/Mako.SlackBuild index 1bb54f87..c2d386b1 100755 --- a/source/l/Mako/Mako.SlackBuild +++ b/source/l/Mako/Mako.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=Mako VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in |