From a924ce6e9a904c1ec0644aab31c5aa4d7712984d Mon Sep 17 00:00:00 2001 From: cr6git Date: Mon, 18 Dec 2017 02:26:04 +0100 Subject: [PATCH] albert: update to 0.14.14. Closes: #10070 [via git-merge-pr] --- .../albert/patches/0001_CMakeLists.txt.patch | 13 +++++++++ .../0002_FindPythonLibsNew.cmake.patch | 14 ++++++++++ srcpkgs/albert/template | 28 +++++++++++++------ 3 files changed, 46 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/albert/patches/0001_CMakeLists.txt.patch create mode 100644 srcpkgs/albert/patches/0002_FindPythonLibsNew.cmake.patch diff --git a/srcpkgs/albert/patches/0001_CMakeLists.txt.patch b/srcpkgs/albert/patches/0001_CMakeLists.txt.patch new file mode 100644 index 00000000000..b5a7157427c --- /dev/null +++ b/srcpkgs/albert/patches/0001_CMakeLists.txt.patch @@ -0,0 +1,13 @@ +diff --git application/CMakeLists.txt application/CMakeLists.txt +index df1f64c..9ac74f8 100644 +--- application/CMakeLists.txt ++++ application/CMakeLists.txt +@@ -6,7 +6,7 @@ project(albert) + add_executable(${PROJECT_NAME} main.cpp) + + # Link target to libraries +-target_link_libraries(${PROJECT_NAME} PRIVATE albertcore) ++target_link_libraries(${PROJECT_NAME} PRIVATE albertcore xdg globalshortcut) + + # Set the RPATH for the library lookup + set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}/albert/") diff --git a/srcpkgs/albert/patches/0002_FindPythonLibsNew.cmake.patch b/srcpkgs/albert/patches/0002_FindPythonLibsNew.cmake.patch new file mode 100644 index 00000000000..40ad846536a --- /dev/null +++ b/srcpkgs/albert/patches/0002_FindPythonLibsNew.cmake.patch @@ -0,0 +1,14 @@ +--- plugins/python/pybind11/tools/FindPythonLibsNew.cmake ++++ plugins/python/pybind11/tools/FindPythonLibsNew.cmake +@@ -57,9 +57,9 @@ endif() + + # Use the Python interpreter to find the libs. + if(PythonLibsNew_FIND_REQUIRED) +- find_package(PythonInterp ${PythonLibsNew_FIND_VERSION} REQUIRED) ++ find_package(PythonLibs ${PythonLibsNew_FIND_VERSION} REQUIRED) + else() +- find_package(PythonInterp ${PythonLibsNew_FIND_VERSION}) ++ find_package(PythonLibs ${PythonLibsNew_FIND_VERSION}) + endif() + + if(NOT PYTHONINTERP_FOUND) diff --git a/srcpkgs/albert/template b/srcpkgs/albert/template index 7ab79e15504..0bc559dfb7b 100644 --- a/srcpkgs/albert/template +++ b/srcpkgs/albert/template @@ -1,18 +1,28 @@ # Template file for 'albert' pkgname=albert -version=0.12.0 +version=0.14.14 revision=1 +_plugins_hash=a5ee438af138d6e069384edc749d097bb0038c56 +_pybind_version=2.2.1 build_style=cmake -makedepends="muparser-devel qt5-svg-devel qt5-x11extras-devel qt5-plugin-mysql - qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds" +configure_args="-DBUILD_VIRTUALBOX=OFF" +hostmakedepends="git qt5-host-tools qt5-qmake" +makedepends="muparser-devel python-devel qt5-svg-devel qt5-x11extras-devel + qt5-declarative-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql + qt5-plugin-sqlite qt5-plugin-tds" depends="qt5-plugin-sqlite" short_desc="Lightweight desktop environment agnostic launcher" maintainer="Nemh " license="GPL-3" -homepage="https://github.com/ManuelSchneid3r/albert" -distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=e1ec7783b6cc22e5ed28d2f1ac6148528cb3eb734f139945b49d44e07770d9c8 +homepage="https://github.com/albertlauncher/albert" +distfiles="https://github.com/albertlauncher/albert/archive/v${version}.tar.gz + https://github.com/albertlauncher/plugins/archive/${_plugins_hash}.tar.gz + https://github.com/pybind/pybind11/archive/v${_pybind_version}.tar.gz" +checksum="8abfa38f306e26d2419549a15fffc8d8b5b466c2e189f566c7b9e8f1e1491bdf + f5a893f3a2c85e466dbc6ec981819f679279dba9bc2cfab7d9301f88ade6d2c6 + f8bd1509578b2a1e7407d52e6ee8afe64268909a1bbda620ca407318598927e7" -if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-host-tools qt5-svg-devel qt5-x11extras-devel" -fi +post_extract() { + cp -rup ${wrksrc}/../plugins-*/* ${wrksrc}/plugins + cp -rup ${wrksrc}/../pybind11-*/* ${wrksrc}/plugins/python/pybind11 +}