diff --git a/kde/kdemultimedia/juk/juk-18.08.1-20181029.diff b/kde/kdemultimedia/juk/juk-18.08.1-20181029.diff new file mode 100644 index 00000000..aaaf4170 --- /dev/null +++ b/kde/kdemultimedia/juk/juk-18.08.1-20181029.diff @@ -0,0 +1,247 @@ +diff -Nrub -x '*~' -x '*\.rej' -x '*\.orig' -x '*\.o' -x '*\.pyc' juk-18.08.1.orig/cmake/FindLibraryWithDebug.cmake juk-18.08.1/cmake/FindLibraryWithDebug.cmake +--- juk-18.08.1.orig/cmake/FindLibraryWithDebug.cmake 1970-01-01 01:00:00.000000000 +0100 ++++ juk-18.08.1/cmake/FindLibraryWithDebug.cmake 2018-10-08 10:14:09.000000000 +0200 +@@ -0,0 +1,135 @@ ++# ++# FIND_LIBRARY_WITH_DEBUG ++# -> enhanced FIND_LIBRARY to allow the search for an ++# optional debug library with a WIN32_DEBUG_POSTFIX similar ++# to CMAKE_DEBUG_POSTFIX when creating a shared lib ++# it has to be the second and third argument ++ ++# Copyright (c) 2007, Christian Ehrlicher, ++ ++# Redistribution and use in source and binary forms, with or without ++# modification, are permitted provided that the following conditions ++# are met: ++# 1. Redistributions of source code must retain the above copyright ++# notice, this list of conditions and the following disclaimer. ++# 2. Redistributions in binary form must reproduce the above copyright ++# notice, this list of conditions and the following disclaimer in the ++# documentation and/or other materials provided with the distribution. ++# 3. Neither the name of the University nor the names of its contributors ++# may be used to endorse or promote products derived from this software ++# without specific prior written permission. ++# ++# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ++# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE ++# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT ++# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY ++# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++# SUCH DAMAGE. ++ ++MACRO(FIND_LIBRARY_WITH_DEBUG var_name win32_dbg_postfix_name dgb_postfix libname) ++ ++ IF(NOT "${win32_dbg_postfix_name}" STREQUAL "WIN32_DEBUG_POSTFIX") ++ ++ # no WIN32_DEBUG_POSTFIX -> simply pass all arguments to FIND_LIBRARY ++ FIND_LIBRARY(${var_name} ++ ${win32_dbg_postfix_name} ++ ${dgb_postfix} ++ ${libname} ++ ${ARGN} ++ ) ++ ++ ELSE(NOT "${win32_dbg_postfix_name}" STREQUAL "WIN32_DEBUG_POSTFIX") ++ ++ IF(NOT WIN32) ++ # on non-win32 we don't need to take care about WIN32_DEBUG_POSTFIX ++ ++ FIND_LIBRARY(${var_name} ${libname} ${ARGN}) ++ ++ ELSE(NOT WIN32) ++ ++ # 1. get all possible libnames ++ SET(args ${ARGN}) ++ SET(newargs "") ++ SET(libnames_release "") ++ SET(libnames_debug "") ++ ++ LIST(LENGTH args listCount) ++ ++ IF("${libname}" STREQUAL "NAMES") ++ SET(append_rest 0) ++ LIST(APPEND args " ") ++ ++ FOREACH(i RANGE ${listCount}) ++ LIST(GET args ${i} val) ++ ++ IF(append_rest) ++ LIST(APPEND newargs ${val}) ++ ELSE(append_rest) ++ IF("${val}" STREQUAL "PATHS") ++ LIST(APPEND newargs ${val}) ++ SET(append_rest 1) ++ ELSE("${val}" STREQUAL "PATHS") ++ LIST(APPEND libnames_release "${val}") ++ LIST(APPEND libnames_debug "${val}${dgb_postfix}") ++ ENDIF("${val}" STREQUAL "PATHS") ++ ENDIF(append_rest) ++ ++ ENDFOREACH(i) ++ ++ ELSE("${libname}" STREQUAL "NAMES") ++ ++ # just one name ++ LIST(APPEND libnames_release "${libname}") ++ LIST(APPEND libnames_debug "${libname}${dgb_postfix}") ++ ++ SET(newargs ${args}) ++ ++ ENDIF("${libname}" STREQUAL "NAMES") ++ ++ # search the release lib ++ FIND_LIBRARY(${var_name}_RELEASE ++ NAMES ${libnames_release} ++ ${newargs} ++ ) ++ ++ # search the debug lib ++ FIND_LIBRARY(${var_name}_DEBUG ++ NAMES ${libnames_debug} ++ ${newargs} ++ ) ++ ++ IF(${var_name}_RELEASE AND ${var_name}_DEBUG) ++ ++ # both libs found ++ SET(${var_name} optimized ${${var_name}_RELEASE} ++ debug ${${var_name}_DEBUG}) ++ ++ ELSE(${var_name}_RELEASE AND ${var_name}_DEBUG) ++ ++ IF(${var_name}_RELEASE) ++ ++ # only release found ++ SET(${var_name} ${${var_name}_RELEASE}) ++ ++ ELSE(${var_name}_RELEASE) ++ ++ # only debug (or nothing) found ++ SET(${var_name} ${${var_name}_DEBUG}) ++ ++ ENDIF(${var_name}_RELEASE) ++ ++ ENDIF(${var_name}_RELEASE AND ${var_name}_DEBUG) ++ ++ MARK_AS_ADVANCED(${var_name}_RELEASE) ++ MARK_AS_ADVANCED(${var_name}_DEBUG) ++ ++ ENDIF(NOT WIN32) ++ ++ ENDIF(NOT "${win32_dbg_postfix_name}" STREQUAL "WIN32_DEBUG_POSTFIX") ++ ++ENDMACRO(FIND_LIBRARY_WITH_DEBUG) +diff -Nrub -x '*~' -x '*\.rej' -x '*\.orig' -x '*\.o' -x '*\.pyc' juk-18.08.1.orig/cmake/FindTaglib.cmake juk-18.08.1/cmake/FindTaglib.cmake +--- juk-18.08.1.orig/cmake/FindTaglib.cmake 2018-09-02 22:41:02.000000000 +0200 ++++ juk-18.08.1/cmake/FindTaglib.cmake 2018-10-29 13:13:16.116253800 +0100 +@@ -2,23 +2,44 @@ + # Once done this will define + # + # TAGLIB_FOUND - system has the taglib library +-# TAGLIB_CFLAGS - the taglib cflags ++# TAGLIB_INCLUDES - the taglib includes + # TAGLIB_LIBRARIES - The libraries needed to use taglib + + # Copyright (c) 2006, Laurent Montel, + # +-# Redistribution and use is allowed according to the terms of the BSD license. +-# For details see the accompanying COPYING-CMAKE-SCRIPTS file. ++# Redistribution and use in source and binary forms, with or without ++# modification, are permitted provided that the following conditions ++# are met: ++# 1. Redistributions of source code must retain the above copyright ++# notice, this list of conditions and the following disclaimer. ++# 2. Redistributions in binary form must reproduce the above copyright ++# notice, this list of conditions and the following disclaimer in the ++# documentation and/or other materials provided with the distribution. ++# 3. Neither the name of the University nor the names of its contributors ++# may be used to endorse or promote products derived from this software ++# without specific prior written permission. ++# ++# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ++# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE ++# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT ++# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY ++# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++# SUCH DAMAGE. + + if(NOT TAGLIB_MIN_VERSION) + set(TAGLIB_MIN_VERSION "1.4") + endif(NOT TAGLIB_MIN_VERSION) + +-if(NOT WIN32) ++if(NOT WIN32 AND NOT ANDROID) + find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS + ${BIN_INSTALL_DIR} + ) +-endif(NOT WIN32) ++endif() + + #reset vars + set(TAGLIB_LIBRARIES) +@@ -29,21 +50,15 @@ + + exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION) + +- if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") +- message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}") +- set(TAGLIB_FOUND FALSE) +- else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") +- + exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) + + exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS) +- +- if(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) +- set(TAGLIB_FOUND TRUE) +- message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}") +- endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) + string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}") +- endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") ++ ++ include(FindPackageHandleStandardArgs) ++ find_package_handle_standard_args(Taglib FOUND_VAR TAGLIB_FOUND ++ REQUIRED_VARS TAGLIB_LIBRARIES TAGLIB_INCLUDES ++ VERSION_VAR TAGLIB_VERSION) + mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES) + + else(TAGLIBCONFIG_EXECUTABLE) +@@ -59,6 +74,7 @@ + ${KDE4_INCLUDE_DIR} + ${INCLUDE_INSTALL_DIR} + ) ++ list(APPEND TAGLIB_INCLUDES "${TAGLIB_INCLUDES}/..") + + find_library_with_debug(TAGLIB_LIBRARIES + WIN32_DEBUG_POSTFIX d +@@ -68,18 +84,7 @@ + ${LIB_INSTALL_DIR} + ) + ++ include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(Taglib DEFAULT_MSG + TAGLIB_INCLUDES TAGLIB_LIBRARIES) + endif(TAGLIBCONFIG_EXECUTABLE) +- +- +-if(TAGLIB_FOUND) +- if(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE) +- message(STATUS "Taglib found: ${TAGLIB_LIBRARIES}") +- endif(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE) +-else(TAGLIB_FOUND) +- if(Taglib_FIND_REQUIRED) +- message(FATAL_ERROR "Could not find Taglib") +- endif(Taglib_FIND_REQUIRED) +-endif(TAGLIB_FOUND) +- diff --git a/kde/kdemultimedia/juk/juk.py b/kde/kdemultimedia/juk/juk.py index f055ef20..9073662e 100644 --- a/kde/kdemultimedia/juk/juk.py +++ b/kde/kdemultimedia/juk/juk.py @@ -1,44 +1,45 @@ import info class subinfo(info.infoclass): def setTargets(self): self.versionInfo.setDefaultValues() self.displayName = "JuK" + self.patchToApply["18.08.1"] = [("juk-18.08.1-20181029.diff", 1)] self.description = "JuK is a simple music player and helps manage your music collection" self.webpage = "https://juk.kde.org/" def setDependencies(self): self.runtimeDependencies["virtual/base"] = None self.buildDependencies["kde/frameworks/extra-cmake-modules"] = None self.runtimeDependencies["libs/qt5/qtbase"] = None self.runtimeDependencies["libs/qt5/qtsvg"] = None self.runtimeDependencies["qt-libs/phonon"] = None self.runtimeDependencies["libs/taglib"] = None self.runtimeDependencies["kde/frameworks/tier1/kconfig"] = None self.runtimeDependencies["kde/frameworks/tier1/kconfig"] = None self.runtimeDependencies["kde/frameworks/tier1/kcoreaddons"] = None self.runtimeDependencies["kde/frameworks/tier1/ki18n"] = None self.runtimeDependencies["kde/frameworks/tier1/kwidgetsaddons"] = None self.runtimeDependencies["kde/frameworks/tier1/kwindowsystem"] = None self.runtimeDependencies["kde/frameworks/tier2/kcompletion"] = None self.runtimeDependencies["kde/frameworks/tier2/kcrash"] = None self.runtimeDependencies["kde/frameworks/tier2/kdoctools"] = None self.runtimeDependencies["kde/frameworks/tier2/kjobwidgets"] = None self.runtimeDependencies["kde/frameworks/tier3/kglobalaccel"] = None self.runtimeDependencies["kde/frameworks/tier3/kiconthemes"] = None self.runtimeDependencies["kde/frameworks/tier3/kio"] = None self.runtimeDependencies["kde/frameworks/tier3/knotifications"] = None self.runtimeDependencies["kde/frameworks/tier3/ktextwidgets"] = None self.runtimeDependencies["kde/frameworks/tier3/kwallet"] = None self.runtimeDependencies["kde/frameworks/tier3/kxmlgui"] = None from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__(self): CMakePackageBase.__init__(self)