From nobody Tue Mar 7 16:12:42 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PWL7t6zxRz3wKRg; Tue, 7 Mar 2023 16:12:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PWL7t6bB5z4Drd; Tue, 7 Mar 2023 16:12:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678205562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BZ4wl/o3AENNQx7LpLfAvw2mfB+pyui9Ks4KRiXxZVM=; b=IhjJfG0P54xsnk/atTDDLhrs/ba1i1P6MsfLMXRlgpJEdqE4XhzGCDzevnysoOo3X9yukt KH1BBJ508HdCscFdOM99Bwui2FB50f7mkh0KsaWT5aRfGY5npQhPWB1hOpBs42dI4tQjrZ DizwtMXIODfn9K8578TzTE9VJwpGNI8PTwjDhZFEyviq6YhxOlSi75BxftsY03dB+FSBHY FqDnIIL7RIEcqqnUpH5qcUWKdLMjTmaznsQLxhAgN/Q8EOXDf0K5eyxqRNfz0RnTNpc/GF RZ6g/oO4sz0l7YeynywShMfhCCgSwokDpkBnx6RIblnQn/PV4XskPPhrctYtzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678205562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BZ4wl/o3AENNQx7LpLfAvw2mfB+pyui9Ks4KRiXxZVM=; b=qFYQzjrx7lc6QN6Is96V6xiaw5hd5cKNxycGadlXIXYEKJuu/Jj8su+NRICf1NtxWT54OP sqlGLkz8ZlVJOJUGrxCeOvLFZ5Bg+moJ4+QsNaxVN1V9Lz4ijUGpqG8/DTQz7OA2ydmqqX ejRGUi3pamwQsJFOxn7nnU3nHeYXronjFCL3YuO72dgLtN6qiXPtEHMrsEnJeHZQLOxdRy NwEPMmgZQ8xWdb6zd+oCpkAtgPr6nMrrUU2bAlcyicfi4hfh+mT0VeKLxyu5glzPWOlWp7 Jkqnw5xp2pWZcefihMZ4NYZ1jpOaGtr1VOkdF0OgikcV1fjuMHQt9pOfLVrDCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678205562; a=rsa-sha256; cv=none; b=cBwOoQy3sSACcq3JBrG4lH+kdieBlImnwdT+ZgpIkjh35L1iBYWnCDl8bsnqNoV5og6Z0U d/q7dhQyc3w/D42WADX28NvfVXjHFWsj5fLauP+9CKLRGE1JQlOYJLUZaTCBPouUjE52BV l/xJd0+GbhzC8oJK3duL6G8JA5DjooaKkZd8ha6cgpXzE1Gip2nyub2MMbq3G+ICYQ+Mae wK5x+0Sb9yyACgkLJJ/YEiyttKMMUSZ3utTPtKslwOD7ZIM9OPIx5TBKBB5Oa916T6EgHN PhwSPvVpWp9xvUTxz9l6mzbFZUB92i3F3aPIjRJgnp6pZZt8ISwVE5ytcjRAkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PWL7t5hW2zqdh; Tue, 7 Mar 2023 16:12:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 327GCgq1057005; Tue, 7 Mar 2023 16:12:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 327GCgLx057004; Tue, 7 Mar 2023 16:12:42 GMT (envelope-from git) Date: Tue, 7 Mar 2023 16:12:42 GMT Message-Id: <202303071612.327GCgLx057004@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jesper Schmitz Mouridsen Subject: git: 104045c79d12 - main - x11/albert: Update to 0.20.5 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jsm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 104045c79d12a2b68dcd68e4868bcfc5e0097ece Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jsm: URL: https://cgit.FreeBSD.org/ports/commit/?id=104045c79d12a2b68dcd68e4868bcfc5e0097ece commit 104045c79d12a2b68dcd68e4868bcfc5e0097ece Author: Jesper Schmitz Mouridsen AuthorDate: 2023-03-07 15:59:02 +0000 Commit: Jesper Schmitz Mouridsen CommitDate: 2023-03-07 16:07:37 +0000 x11/albert: Update to 0.20.5 Reviewed by: arrowd Differential Revision: https://reviews.freebsd.org/D38422 --- x11/albert/Makefile | 20 +- x11/albert/distinfo | 14 +- x11/albert/files/patch-CMakeLists.txt | 23 -- .../files/patch-lib_globalshortcut_CMakeLists.txt | 14 -- .../patch-lib_globalshortcut_src_hotkeymanager.cpp | 11 - .../files/patch-plugins_calculator_CMakeLists.txt | 25 -- .../files/patch-plugins_files_src_plugin.cpp | 11 + .../files/patch-plugins_python_CMakeLists.txt | 11 - ...ch-plugins_python_plugins_timer_____init____.py | 19 ++ .../files/patch-plugins_qmlboxmodel_CMakeLists.txt | 19 -- .../patch-plugins_qmlboxmodel_src_mainwindow.cpp | 13 - .../patch-plugins_widgetboxmodel_CMakeLists.txt | 19 -- ...h-plugins_widgetboxmodel_src_frontendwidget.cpp | 11 - x11/albert/files/patch-src_app_main.cpp | 25 -- ...patch-src_app_settingswidget_settingswidget.cpp | 11 - x11/albert/files/patch-src_terminalprovider.cpp | 11 + x11/albert/pkg-descr | 4 +- x11/albert/pkg-plist | 261 +++++++++++++++------ 18 files changed, 248 insertions(+), 274 deletions(-) diff --git a/x11/albert/Makefile b/x11/albert/Makefile index 176aaa67459e..25bb82cc470c 100644 --- a/x11/albert/Makefile +++ b/x11/albert/Makefile @@ -1,6 +1,6 @@ PORTNAME= albert DISTVERSIONPREFIX=v -DISTVERSION= 0.16.1 +DISTVERSION= 0.20.5 CATEGORIES= x11 MAINTAINER= jsm@FreeBSD.org @@ -9,18 +9,20 @@ WWW= https://github.com/albertlauncher/albert LICENSE= GPLv3 -LIB_DEPENDS= libmuparser.so:math/muparser BUILD_DEPENDS= pybind11>=2.4.3:devel/pybind11 +LIB_DEPENDS= libmuparser.so:math/muparser \ + libqalculate.so:math/libqalculate +RUN_DEPENDS= play:audio/sox -USES= cmake localbase pkgconfig xorg qt:5 python:3.7+ compiler:c++14-lang - -USE_QT= buildtools qmake core x11extras charts network sql gui widgets concurrent dbus \ - declarative svg +USES= cmake compiler:c++20-lang gl localbase:ldflags pkgconfig python:3.7+ qt:6 xorg +USE_GL= gl opengl +USE_QT= base declarative scxml svg USE_XORG=x11 xext sm ice USE_LDCONFIG= yes USE_GITHUB= yes -GH_TUPLE= albertlauncher:albert:v0.16.1 \ - albertlauncher:plugins:029bd8ccb58c4452bd82ab42be8739f1639e42d4:albert/plugins - +GH_ACCOUNT= albertlauncher +GH_TUPLE= albertlauncher:plugins:5a4611e31b41ab3ae638252116c72e2a7050a2cc:plugins/plugins \ + albertlauncher:python:6f734c7586c3889796846618fc9d8edb1a1ea386:python/plugins/python/plugins \ + skycoder42:QHotkey:34330d6ff5d2ca111c376f6d7da66be9d1817430:QHotkey/lib/QHotkey .include diff --git a/x11/albert/distinfo b/x11/albert/distinfo index 8e2eb6141d83..504396cb723c 100644 --- a/x11/albert/distinfo +++ b/x11/albert/distinfo @@ -1,5 +1,9 @@ -TIMESTAMP = 1579666891 -SHA256 (albertlauncher-albert-v0.16.1_GH0.tar.gz) = e244b5825ef453221b221d76df30f8496c2e176ec6b9c26db21735d8e809956a -SIZE (albertlauncher-albert-v0.16.1_GH0.tar.gz) = 68739 -SHA256 (albertlauncher-plugins-029bd8ccb58c4452bd82ab42be8739f1639e42d4_GH0.tar.gz) = 1986041e464c87e7ccc4f01b0eb4302f101aa3d62f5b02929fc97f68b3a38623 -SIZE (albertlauncher-plugins-029bd8ccb58c4452bd82ab42be8739f1639e42d4_GH0.tar.gz) = 534401 +TIMESTAMP = 1675610602 +SHA256 (albertlauncher-albert-v0.20.5_GH0.tar.gz) = 391d3b3b96936717d42d540d177a5d034cc08da31c76bb40cbf979bd3d06ba72 +SIZE (albertlauncher-albert-v0.20.5_GH0.tar.gz) = 137505 +SHA256 (albertlauncher-plugins-5a4611e31b41ab3ae638252116c72e2a7050a2cc_GH0.tar.gz) = 1b0737829abc6e59d5c8e58fa710da55041bc5b6c49b0bab5b94c61692c2a0f6 +SIZE (albertlauncher-plugins-5a4611e31b41ab3ae638252116c72e2a7050a2cc_GH0.tar.gz) = 793118 +SHA256 (albertlauncher-python-6f734c7586c3889796846618fc9d8edb1a1ea386_GH0.tar.gz) = 467194240da1fa6f1a4bb6c103700073bb882a68e9b871655d1a61103ac6d7d5 +SIZE (albertlauncher-python-6f734c7586c3889796846618fc9d8edb1a1ea386_GH0.tar.gz) = 1157795 +SHA256 (skycoder42-QHotkey-34330d6ff5d2ca111c376f6d7da66be9d1817430_GH0.tar.gz) = 0e8cb92db8ae05a01b50593ebcc97ef8761aff45351db1d67e14971a8d69fdd0 +SIZE (skycoder42-QHotkey-34330d6ff5d2ca111c376f6d7da66be9d1817430_GH0.tar.gz) = 53154 diff --git a/x11/albert/files/patch-CMakeLists.txt b/x11/albert/files/patch-CMakeLists.txt deleted file mode 100644 index 777e5705f430..000000000000 --- a/x11/albert/files/patch-CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ ---- CMakeLists.txt.orig 2018-12-31 18:07:36 UTC -+++ CMakeLists.txt -@@ -18,7 +18,9 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) - set(CMAKE_AUTOUIC ON) - set(CMAKE_AUTORCC ON) -+SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Xlinker --export-dynamic") - -+ - # Set standard - set(CMAKE_CXX_STANDARD 14) - set(CMAKE_CXX_STANDARD_REQUIRED ON) -@@ -135,8 +137,8 @@ install(TARGETS ${TARGET_NAME_LIB} ${TARGET_NAME_BIN} - ) - - # Do platform specific post target stuff --if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") -+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") - # Install desktop entry and icon - install(FILES resources/albert.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications ) - install(FILES resources/icons/albert.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps) --endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") -+endif() diff --git a/x11/albert/files/patch-lib_globalshortcut_CMakeLists.txt b/x11/albert/files/patch-lib_globalshortcut_CMakeLists.txt deleted file mode 100644 index 9b2fd2574d39..000000000000 --- a/x11/albert/files/patch-lib_globalshortcut_CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ ---- lib/globalshortcut/CMakeLists.txt.orig 2018-12-31 18:07:36 UTC -+++ lib/globalshortcut/CMakeLists.txt -@@ -16,6 +16,11 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") - find_package(Qt5 5.5.0 REQUIRED X11Extras) - set(SRC ${SRC} src/hotkeymanager_x11.cpp) - set(LIB ${LIB} Qt5::X11Extras X11) -+elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") -+ find_package(Qt5 5.5.0 REQUIRED X11Extras) -+ find_package(X11 REQUIRED) -+ set(SRC ${SRC} src/hotkeymanager_x11.cpp) -+ set(LIB ${LIB} Qt5::X11Extras ${X11_LIBRARIES}) - elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows") - set(SRC ${SRC} src/hotkey/hotkeymanager_win.cpp) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUNICODE") diff --git a/x11/albert/files/patch-lib_globalshortcut_src_hotkeymanager.cpp b/x11/albert/files/patch-lib_globalshortcut_src_hotkeymanager.cpp deleted file mode 100644 index fe7a11c4eb28..000000000000 --- a/x11/albert/files/patch-lib_globalshortcut_src_hotkeymanager.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/globalshortcut/src/hotkeymanager.cpp.orig 2018-12-31 18:07:36 UTC -+++ lib/globalshortcut/src/hotkeymanager.cpp -@@ -1,7 +1,7 @@ - // Copyright (C) 2014-2018 Manuel Schneider - - #include "globalshortcut/hotkeymanager.h" --#if defined __linux__ -+#if defined __linux__ || defined(__FreeBSD__) - #include "hotkeymanager_x11.h" - #elif defined __APPLE__ - #elif defined _WIN32 diff --git a/x11/albert/files/patch-plugins_calculator_CMakeLists.txt b/x11/albert/files/patch-plugins_calculator_CMakeLists.txt deleted file mode 100644 index e7629ece5692..000000000000 --- a/x11/albert/files/patch-plugins_calculator_CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ ---- plugins/calculator/CMakeLists.txt.orig 2018-12-31 15:24:22 UTC -+++ plugins/calculator/CMakeLists.txt -@@ -1,11 +1,12 @@ - cmake_minimum_required(VERSION 3.1.3) - - project(calculator) -+find_package(PkgConfig REQUIRED) - - file(GLOB_RECURSE SRC src/*) - - find_package(Qt5 5.5.0 REQUIRED COMPONENTS Widgets) -- -+pkg_check_modules(muparser REQUIRED muparser) - add_library(${PROJECT_NAME} SHARED ${SRC} ${PROJECT_NAME}.qrc metadata.json) - - target_include_directories(${PROJECT_NAME} PRIVATE src/) -@@ -14,7 +15,7 @@ target_link_libraries(${PROJECT_NAME} - PRIVATE - Qt5::Widgets - albert::lib -- muparser -+ ${muparser_LDFLAGS} - xdg - ) - diff --git a/x11/albert/files/patch-plugins_files_src_plugin.cpp b/x11/albert/files/patch-plugins_files_src_plugin.cpp new file mode 100644 index 000000000000..4306de013158 --- /dev/null +++ b/x11/albert/files/patch-plugins_files_src_plugin.cpp @@ -0,0 +1,11 @@ +--- plugins/files/src/plugin.cpp.orig 2023-01-31 09:29:00 UTC ++++ plugins/files/src/plugin.cpp +@@ -116,7 +116,7 @@ void Plugin::updateIndexItems() + ii.emplace_back(update_item, update_item->text()); + + // Add trash item +-#if defined(Q_OS_LINUX) ++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) + auto trash_path = "trash:///"; + #elif defined(Q_OS_MAC) + auto trash_path = QString("file://%1/.Trash").arg(QDir::homePath()); diff --git a/x11/albert/files/patch-plugins_python_CMakeLists.txt b/x11/albert/files/patch-plugins_python_CMakeLists.txt deleted file mode 100644 index ec17352d693e..000000000000 --- a/x11/albert/files/patch-plugins_python_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/python/CMakeLists.txt.orig 2018-12-31 15:24:22 UTC -+++ plugins/python/CMakeLists.txt -@@ -5,7 +5,7 @@ PROJECT(python) - FILE(GLOB_RECURSE SRC src/*) - - find_package(Qt5 5.5.0 REQUIRED COMPONENTS Widgets) --add_subdirectory(pybind11) -+find_package(pybind11 REQUIRED) - - add_library(${PROJECT_NAME} SHARED ${SRC} ${PROJECT_NAME}.qrc metadata.json) - diff --git a/x11/albert/files/patch-plugins_python_plugins_timer_____init____.py b/x11/albert/files/patch-plugins_python_plugins_timer_____init____.py new file mode 100644 index 000000000000..9334985cce1f --- /dev/null +++ b/x11/albert/files/patch-plugins_python_plugins_timer_____init____.py @@ -0,0 +1,19 @@ +--- plugins/python/plugins/timer/__init__.py.orig 2023-02-05 15:51:51 UTC ++++ plugins/python/plugins/timer/__init__.py +@@ -65,7 +65,8 @@ class Plugin(QueryHandler): + subprocess.Popen(["aplay", self.soundPath]) + elif platform == "darwin": + subprocess.Popen(["afplay", self.soundPath]) +- ++ else: ++ subprocess.Popen(["play", self.soundPath]) + self.deleteTimer(timer) + + def id(self): +@@ -130,4 +131,4 @@ class Plugin(QueryHandler): + )) + + if items: +- query.add(items) +\ No newline at end of file ++ query.add(items) diff --git a/x11/albert/files/patch-plugins_qmlboxmodel_CMakeLists.txt b/x11/albert/files/patch-plugins_qmlboxmodel_CMakeLists.txt deleted file mode 100644 index eb1cde486413..000000000000 --- a/x11/albert/files/patch-plugins_qmlboxmodel_CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ ---- plugins/qmlboxmodel/CMakeLists.txt.orig 2018-12-31 15:24:22 UTC -+++ plugins/qmlboxmodel/CMakeLists.txt -@@ -5,6 +5,7 @@ project(qmlboxmodel) - file(GLOB_RECURSE SRC src/*) - - find_package(Qt5 5.5.0 REQUIRED COMPONENTS Widgets Qml Quick) -+find_package(X11) - - add_library(${PROJECT_NAME} SHARED ${SRC} metadata.json) - -@@ -16,7 +17,7 @@ target_link_libraries(${PROJECT_NAME} - Qt5::Quick - Qt5::Widgets - albert::lib -- Xext -+ ${X11_Xext_LIB} - ) - - install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/albert/plugins) diff --git a/x11/albert/files/patch-plugins_qmlboxmodel_src_mainwindow.cpp b/x11/albert/files/patch-plugins_qmlboxmodel_src_mainwindow.cpp deleted file mode 100644 index 0e25fe51d214..000000000000 --- a/x11/albert/files/patch-plugins_qmlboxmodel_src_mainwindow.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- plugins/qmlboxmodel/src/mainwindow.cpp.orig 2018-12-31 15:24:22 UTC -+++ plugins/qmlboxmodel/src/mainwindow.cpp -@@ -397,8 +397,8 @@ bool QmlBoxModel::MainWindow::event(QEvent *event) { - } - - --#ifdef Q_OS_LINUX --/** **************************************************************************** -+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) -+/****************************************************************************** - * @brief MainWidget::nativeEvent - * - * The purpose of this function is to hide in special casesonly. diff --git a/x11/albert/files/patch-plugins_widgetboxmodel_CMakeLists.txt b/x11/albert/files/patch-plugins_widgetboxmodel_CMakeLists.txt deleted file mode 100644 index 36e8ce5bb059..000000000000 --- a/x11/albert/files/patch-plugins_widgetboxmodel_CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ ---- plugins/widgetboxmodel/CMakeLists.txt.orig 2018-12-31 15:24:22 UTC -+++ plugins/widgetboxmodel/CMakeLists.txt -@@ -5,6 +5,7 @@ project(widgetboxmodel) - file(GLOB_RECURSE SRC src/*) - - find_package(Qt5 5.5.0 REQUIRED COMPONENTS Widgets Svg) -+find_package(X11) - - add_library(${PROJECT_NAME} SHARED ${SRC} metadata.json) - -@@ -15,7 +16,7 @@ target_link_libraries(${PROJECT_NAME} - Qt5::Svg - Qt5::Widgets - albert::lib -- Xext -+ ${X11_Xext_LIB} - ) - - install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/albert/plugins) diff --git a/x11/albert/files/patch-plugins_widgetboxmodel_src_frontendwidget.cpp b/x11/albert/files/patch-plugins_widgetboxmodel_src_frontendwidget.cpp deleted file mode 100644 index 4c14a1e62a0c..000000000000 --- a/x11/albert/files/patch-plugins_widgetboxmodel_src_frontendwidget.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/widgetboxmodel/src/frontendwidget.cpp.orig 2018-12-31 15:24:22 UTC -+++ plugins/widgetboxmodel/src/frontendwidget.cpp -@@ -656,7 +656,7 @@ bool WidgetBoxModel::FrontendWidget::eventFilter(QObje - } - - --#ifdef Q_OS_LINUX -+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - /** **************************************************************************** - * @brief MainWidget::nativeEvent - * diff --git a/x11/albert/files/patch-src_app_main.cpp b/x11/albert/files/patch-src_app_main.cpp deleted file mode 100644 index b8f7f97ac1d5..000000000000 --- a/x11/albert/files/patch-src_app_main.cpp +++ /dev/null @@ -1,25 +0,0 @@ ---- src/app/main.cpp.orig 2018-12-31 18:07:36 UTC -+++ src/app/main.cpp -@@ -296,15 +296,21 @@ int main(int argc, char **argv) { - if ( parser.isSet("plugin-dirs") ) - pluginDirs = parser.value("plugin-dirs").split(','); - else { --#if defined __linux__ -+#if defined __linux__ || defined __FreeBSD__ - QStringList dirs = { - #if defined MULTIARCH_TUPLE - QFileInfo("/usr/lib/" MULTIARCH_TUPLE).canonicalFilePath(), - #endif -+#if defined __linux__ - QFileInfo("/usr/lib/").canonicalFilePath(), - QFileInfo("/usr/lib64/").canonicalFilePath(), - QFileInfo("/usr/local/lib/").canonicalFilePath(), - QFileInfo("/usr/local/lib64/").canonicalFilePath(), -+#endif -+#if defined __FreeBSD__ -+ QFileInfo("/usr/lib/").canonicalFilePath(), -+ QFileInfo("/usr/local/lib/").canonicalFilePath(), -+#endif - QDir::home().filePath(".local/lib/"), - QDir::home().filePath(".local/lib64/") - }; diff --git a/x11/albert/files/patch-src_app_settingswidget_settingswidget.cpp b/x11/albert/files/patch-src_app_settingswidget_settingswidget.cpp deleted file mode 100644 index 39192fac99b1..000000000000 --- a/x11/albert/files/patch-src_app_settingswidget_settingswidget.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/app/settingswidget/settingswidget.cpp.orig 2018-12-31 18:07:36 UTC -+++ src/app/settingswidget/settingswidget.cpp -@@ -89,7 +89,7 @@ Core::SettingsWidget::SettingsWidget(ExtensionManager - connect(ui.checkBox_telemetry, &QCheckBox::toggled, this, [this](bool checked){ telemetry_->enable(checked); }); - - // AUTOSTART --#ifdef Q_OS_LINUX -+#if defined Q_OS_LINUX || defined Q_OS_FREEBSD - QString desktopfile_path = QStandardPaths::locate(QStandardPaths::ApplicationsLocation, - "albert.desktop", - QStandardPaths::LocateFile); diff --git a/x11/albert/files/patch-src_terminalprovider.cpp b/x11/albert/files/patch-src_terminalprovider.cpp new file mode 100644 index 000000000000..c8bc59a7921f --- /dev/null +++ b/x11/albert/files/patch-src_terminalprovider.cpp @@ -0,0 +1,11 @@ +--- src/terminalprovider.cpp.orig 2023-02-05 13:24:46 UTC ++++ src/terminalprovider.cpp +@@ -32,7 +32,7 @@ static QString userShell() + } + + +-#if defined(Q_OS_LINUX) ++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) + + + struct ExecutableTerminal : public Terminal diff --git a/x11/albert/pkg-descr b/x11/albert/pkg-descr index 9a31e95a5ddd..2ce90c2ef094 100644 --- a/x11/albert/pkg-descr +++ b/x11/albert/pkg-descr @@ -1 +1,3 @@ -Albert is a fast and flexible keyboard launcher +Albert is a unified and efficient access to your machine. Technically it is a +plugin based keyboard launcher written in C++/Qt and Python. Not all plugins are +tested in FreeBSD diff --git a/x11/albert/pkg-plist b/x11/albert/pkg-plist index 9ec6696a5eb3..0456c77c9bf0 100644 --- a/x11/albert/pkg-plist +++ b/x11/albert/pkg-plist @@ -1,80 +1,187 @@ bin/albert -lib/albert/libalbert.so -lib/albert/libxdg.so -lib/albert/plugins/libapplications.so -lib/albert/plugins/libcalculator.so -lib/albert/plugins/libchromebookmarks.so -lib/albert/plugins/libexternalextensions.so -lib/albert/plugins/libfiles.so -lib/albert/plugins/libfirefoxbookmarks.so -lib/albert/plugins/libhashgenerator.so -lib/albert/plugins/libmpris.so -lib/albert/plugins/libpython.so -lib/albert/plugins/libqmlboxmodel.so -lib/albert/plugins/libsnippets.so -lib/albert/plugins/libssh.so -lib/albert/plugins/libsystem.so -lib/albert/plugins/libterminal.so -lib/albert/plugins/libwebsearch.so -lib/albert/plugins/libwidgetboxmodel.so -%%DATADIR%%/org.albert.frontend.qmlboxmodel/styles/BoxModel/DesktopListView.qml -%%DATADIR%%/org.albert.frontend.qmlboxmodel/styles/BoxModel/HistoryTextInput.qml -%%DATADIR%%/org.albert.frontend.qmlboxmodel/styles/BoxModel/ItemViewDelegate.qml -%%DATADIR%%/org.albert.frontend.qmlboxmodel/styles/BoxModel/MainComponent.qml -%%DATADIR%%/org.albert.frontend.qmlboxmodel/styles/BoxModel/Preferences.qml -%%DATADIR%%/org.albert.frontend.qmlboxmodel/styles/BoxModel/SettingsButton.qml -%%DATADIR%%/org.albert.frontend.qmlboxmodel/styles/BoxModel/fonts/Roboto-Thin.ttf -%%DATADIR%%/org.albert.frontend.qmlboxmodel/styles/BoxModel/gear.svg -%%DATADIR%%/org.albert.frontend.qmlboxmodel/styles/BoxModel/metadata.json -%%DATADIR%%/org.albert.frontend.qmlboxmodel/styles/BoxModel/themes.js -%%DATADIR%%/org.albert.frontend.widgetboxmodel/ArcTemplate.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/ArcTemplate.sh -%%DATADIR%%/org.albert.frontend.widgetboxmodel/SpotlightTemplate.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/SpotlightTemplate.sh -%%DATADIR%%/org.albert.frontend.widgetboxmodel/StandardThemeTemplate.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/StandardThemeTemplate.sh -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/Adapta.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/Arc Blue.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/Arc Dark Blue.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/Arc Dark Grey.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/Arc Grey.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/Bright.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/BrightBlue.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/BrightGreen.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/BrightMagenta.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/BrightMint.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/BrightOrange.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/BrightViolet.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/Dark.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/DarkBlue.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/DarkGreen.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/DarkMagenta.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/DarkMint.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/DarkOrange.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/DarkViolet.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/Elementary.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/Numix Rounded.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/Numix.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/SolarizedBrightBlue.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/SolarizedBrightCyan.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/SolarizedBrightGreen.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/SolarizedBrightMagenta.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/SolarizedBrightOrange.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/SolarizedBrightRed.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/SolarizedBrightViolet.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/SolarizedBrightYellow.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/SolarizedDarkBlue.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/SolarizedDarkCyan.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/SolarizedDarkGreen.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/SolarizedDarkMagenta.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/SolarizedDarkOrange.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/SolarizedDarkRed.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/SolarizedDarkViolet.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/SolarizedDarkYellow.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/Spotlight Dark.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/Spotlight.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/Yosemite Dark.qss -%%DATADIR%%/org.albert.frontend.widgetboxmodel/themes/Yosemite.qss +lib/albert-0.20.5/albert-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/albert-0.20.5/albert-targets.cmake +lib/albert/libapplications.so +lib/albert/libcalculator_muparser.so +lib/albert/libcalculator_qalculate.so +lib/albert/libchromium.so +lib/albert/libdatetime.so +lib/albert/libdebug.so +lib/albert/libfiles.so +lib/albert/libhash.so +lib/albert/libpython.so +lib/albert/libsnippets.so +lib/albert/libssh.so +lib/albert/libsystem.so +lib/albert/libtemplate.so +lib/albert/libterminal.so +lib/albert/liburlhandler.so +lib/albert/libwebsearch.so +lib/albert/libwidgetsboxmodel.so +lib/cmake/albert/albert-config-version.cmake +lib/cmake/albert/albert-config.cmake +lib/cmake/albert/albert-macros.cmake +lib/libalbert.so +%%DATADIR%%/python/plugins/.archive/README.md +%%DATADIR%%/python/plugins/.archive/atom_projects/__init__.py +%%DATADIR%%/python/plugins/.archive/base_converter/__init__.py +%%DATADIR%%/python/plugins/.archive/binance/Binance.svg +%%DATADIR%%/python/plugins/.archive/binance/__init__.py +%%DATADIR%%/python/plugins/.archive/bitfinex/Bitfinex.svg +%%DATADIR%%/python/plugins/.archive/bitfinex/__init__.py +%%DATADIR%%/python/plugins/.archive/bitwarden/__init__.py +%%DATADIR%%/python/plugins/.archive/coinmarketcap/__init__.py +%%DATADIR%%/python/plugins/.archive/coinmarketcap/emblem-money.svg +%%DATADIR%%/python/plugins/.archive/currency_converter/__init__.py +%%DATADIR%%/python/plugins/.archive/dango_emoji/__init__.py +%%DATADIR%%/python/plugins/.archive/dango_emoji/dangoemoji.png +%%DATADIR%%/python/plugins/.archive/dango_kao/__init__.py +%%DATADIR%%/python/plugins/.archive/dango_kao/kaoicon.svg +%%DATADIR%%/python/plugins/.archive/find/__init__.py +%%DATADIR%%/python/plugins/.archive/fortune/__init__.py +%%DATADIR%%/python/plugins/.archive/gnome_dictionary/__init__.py +%%DATADIR%%/python/plugins/.archive/gnote/__init__.py +%%DATADIR%%/python/plugins/.archive/google_translate/__init__.py +%%DATADIR%%/python/plugins/.archive/ip/__init__.py +%%DATADIR%%/python/plugins/.archive/lpass/__init__.py +%%DATADIR%%/python/plugins/.archive/lpass/lastpass.svg +%%DATADIR%%/python/plugins/.archive/mathematica_eval/__init__.py +%%DATADIR%%/python/plugins/.archive/multi_google_translate/__init__.py +%%DATADIR%%/python/plugins/.archive/node_eval/__init__.py +%%DATADIR%%/python/plugins/.archive/node_eval/nodejs.svg +%%DATADIR%%/python/plugins/.archive/npm/__init__.py +%%DATADIR%%/python/plugins/.archive/npm/logo.svg +%%DATADIR%%/python/plugins/.archive/packagist/__init__.py +%%DATADIR%%/python/plugins/.archive/packagist/logo.png +%%DATADIR%%/python/plugins/.archive/php_eval/__init__.py +%%DATADIR%%/python/plugins/.archive/php_eval/php.svg +%%DATADIR%%/python/plugins/.archive/pidgin/__init__.py +%%DATADIR%%/python/plugins/.archive/rand/__init__.py +%%DATADIR%%/python/plugins/.archive/rand/rand.png +%%DATADIR%%/python/plugins/.archive/scrot/__init__.py +%%DATADIR%%/python/plugins/.archive/texdoc/__init__.py +%%DATADIR%%/python/plugins/.archive/texdoc/texdoc-logo.svg +%%DATADIR%%/python/plugins/.archive/tomboy/__init__.py +%%DATADIR%%/python/plugins/.archive/unicode_emoji/__init__.py +%%DATADIR%%/python/plugins/.archive/unicode_emoji/emoji.txt +%%DATADIR%%/python/plugins/.archive/units/__init__.py +%%DATADIR%%/python/plugins/.archive/virtualbox/README.md +%%DATADIR%%/python/plugins/.archive/virtualbox/__init__.py +%%DATADIR%%/python/plugins/.archive/vpn/__init__.py +%%DATADIR%%/python/plugins/.archive/window_switcher/__init__.py +%%DATADIR%%/python/plugins/.archive/xkcd/.gitignore +%%DATADIR%%/python/plugins/.archive/xkcd/LICENSE +%%DATADIR%%/python/plugins/.archive/xkcd/README.md +%%DATADIR%%/python/plugins/.archive/xkcd/__init__.py +%%DATADIR%%/python/plugins/.archive/xkcd/image.png +%%DATADIR%%/python/plugins/.archive/xkcd/install-plugin.sh +%%DATADIR%%/python/plugins/.archive/xkcd/misc/demo.gif +%%DATADIR%%/python/plugins/.archive/zeal/__init__.py +%%DATADIR%%/python/plugins/.github/ISSUE_TEMPLATE/bug_report.md +%%DATADIR%%/python/plugins/.github/ISSUE_TEMPLATE/config.yml +%%DATADIR%%/python/plugins/.gitignore +%%DATADIR%%/python/plugins/.gitmodules +%%DATADIR%%/python/plugins/README.md +%%DATADIR%%/python/plugins/api_test/__init__.py +%%DATADIR%%/python/plugins/api_test/plugin.svg +%%DATADIR%%/python/plugins/arch_wiki/ArchWiki.svg +%%DATADIR%%/python/plugins/arch_wiki/__init__.py +%%DATADIR%%/python/plugins/aur/__init__.py +%%DATADIR%%/python/plugins/aur/arch.svg +%%DATADIR%%/python/plugins/copyq/__init__.py +%%DATADIR%%/python/plugins/docker/__init__.py +%%DATADIR%%/python/plugins/docker/running.png +%%DATADIR%%/python/plugins/docker/stopped.png +%%DATADIR%%/python/plugins/goldendict/__init__.py +%%DATADIR%%/python/plugins/googletrans/__init__.py +%%DATADIR%%/python/plugins/googletrans/google_translate.png +%%DATADIR%%/python/plugins/jetbrains_projects/LICENSE +%%DATADIR%%/python/plugins/jetbrains_projects/README.md +%%DATADIR%%/python/plugins/jetbrains_projects/__init__.py +%%DATADIR%%/python/plugins/jetbrains_projects/androidstudio.svg +%%DATADIR%%/python/plugins/jetbrains_projects/clion.svg +%%DATADIR%%/python/plugins/jetbrains_projects/datagrip.svg +%%DATADIR%%/python/plugins/jetbrains_projects/dataspell.svg +%%DATADIR%%/python/plugins/jetbrains_projects/goland.svg +%%DATADIR%%/python/plugins/jetbrains_projects/idea.svg +%%DATADIR%%/python/plugins/jetbrains_projects/phpstorm.svg +%%DATADIR%%/python/plugins/jetbrains_projects/pycharm.svg +%%DATADIR%%/python/plugins/jetbrains_projects/rider.svg +%%DATADIR%%/python/plugins/jetbrains_projects/rubymine.svg +%%DATADIR%%/python/plugins/jetbrains_projects/webstorm.svg +%%DATADIR%%/python/plugins/kill/__init__.py +%%DATADIR%%/python/plugins/locate/__init__.py +%%DATADIR%%/python/plugins/locate/locate.svg +%%DATADIR%%/python/plugins/pacman/__init__.py +%%DATADIR%%/python/plugins/pacman/arch.svg +%%DATADIR%%/python/plugins/pass/__init__.py +%%DATADIR%%/python/plugins/pomodoro/__init__.py +%%DATADIR%%/python/plugins/pomodoro/pomodoro.svg +%%DATADIR%%/python/plugins/python_eval/__init__.py +%%DATADIR%%/python/plugins/python_eval/python.svg +%%DATADIR%%/python/plugins/tex_to_unicode/__init__.py +%%DATADIR%%/python/plugins/tex_to_unicode/tex.png +%%DATADIR%%/python/plugins/timer/__init__.py +%%DATADIR%%/python/plugins/timer/bing.wav +%%DATADIR%%/python/plugins/timer/time.svg +%%DATADIR%%/python/plugins/unit_converter/__init__.py +%%DATADIR%%/python/plugins/unit_converter/icons/currency.svg +%%DATADIR%%/python/plugins/unit_converter/icons/current.svg +%%DATADIR%%/python/plugins/unit_converter/icons/length.svg +%%DATADIR%%/python/plugins/unit_converter/icons/lengthtime.svg +%%DATADIR%%/python/plugins/unit_converter/icons/luminosity.svg +%%DATADIR%%/python/plugins/unit_converter/icons/mass.svg +%%DATADIR%%/python/plugins/unit_converter/icons/printing_unit.svg +%%DATADIR%%/python/plugins/unit_converter/icons/substance.svg +%%DATADIR%%/python/plugins/unit_converter/icons/temperature.svg +%%DATADIR%%/python/plugins/unit_converter/icons/time.svg +%%DATADIR%%/python/plugins/unit_converter/icons/unit_converter.svg +%%DATADIR%%/python/plugins/vpn/__init__.py +%%DATADIR%%/python/plugins/wikipedia/__init__.py +%%DATADIR%%/python/plugins/youtube/__init__.py +%%DATADIR%%/python/plugins/youtube/youtube.svg +%%DATADIR%%/widgetsboxmodel/themes/Adapta.qss +%%DATADIR%%/widgetsboxmodel/themes/Arc Blue.qss +%%DATADIR%%/widgetsboxmodel/themes/Arc Dark Blue.qss +%%DATADIR%%/widgetsboxmodel/themes/Arc Dark Grey.qss +%%DATADIR%%/widgetsboxmodel/themes/Arc Grey.qss +%%DATADIR%%/widgetsboxmodel/themes/Bright.qss +%%DATADIR%%/widgetsboxmodel/themes/BrightBlue.qss +%%DATADIR%%/widgetsboxmodel/themes/BrightGreen.qss +%%DATADIR%%/widgetsboxmodel/themes/BrightMagenta.qss +%%DATADIR%%/widgetsboxmodel/themes/BrightMint.qss +%%DATADIR%%/widgetsboxmodel/themes/BrightOrange.qss +%%DATADIR%%/widgetsboxmodel/themes/BrightViolet.qss +%%DATADIR%%/widgetsboxmodel/themes/Dark.qss +%%DATADIR%%/widgetsboxmodel/themes/DarkBlue.qss +%%DATADIR%%/widgetsboxmodel/themes/DarkGreen.qss +%%DATADIR%%/widgetsboxmodel/themes/DarkMagenta.qss +%%DATADIR%%/widgetsboxmodel/themes/DarkMint.qss +%%DATADIR%%/widgetsboxmodel/themes/DarkOrange.qss +%%DATADIR%%/widgetsboxmodel/themes/DarkViolet.qss +%%DATADIR%%/widgetsboxmodel/themes/Elementary.qss +%%DATADIR%%/widgetsboxmodel/themes/Nord.qss +%%DATADIR%%/widgetsboxmodel/themes/Numix Rounded.qss +%%DATADIR%%/widgetsboxmodel/themes/Numix.qss +%%DATADIR%%/widgetsboxmodel/themes/SolarizedBrightBlue.qss +%%DATADIR%%/widgetsboxmodel/themes/SolarizedBrightCyan.qss +%%DATADIR%%/widgetsboxmodel/themes/SolarizedBrightGreen.qss +%%DATADIR%%/widgetsboxmodel/themes/SolarizedBrightMagenta.qss +%%DATADIR%%/widgetsboxmodel/themes/SolarizedBrightOrange.qss +%%DATADIR%%/widgetsboxmodel/themes/SolarizedBrightRed.qss +%%DATADIR%%/widgetsboxmodel/themes/SolarizedBrightViolet.qss +%%DATADIR%%/widgetsboxmodel/themes/SolarizedBrightYellow.qss +%%DATADIR%%/widgetsboxmodel/themes/SolarizedDarkBlue.qss +%%DATADIR%%/widgetsboxmodel/themes/SolarizedDarkCyan.qss +%%DATADIR%%/widgetsboxmodel/themes/SolarizedDarkGreen.qss +%%DATADIR%%/widgetsboxmodel/themes/SolarizedDarkMagenta.qss +%%DATADIR%%/widgetsboxmodel/themes/SolarizedDarkOrange.qss +%%DATADIR%%/widgetsboxmodel/themes/SolarizedDarkRed.qss +%%DATADIR%%/widgetsboxmodel/themes/SolarizedDarkViolet.qss +%%DATADIR%%/widgetsboxmodel/themes/SolarizedDarkYellow.qss +%%DATADIR%%/widgetsboxmodel/themes/Spotlight Dark.qss +%%DATADIR%%/widgetsboxmodel/themes/Spotlight.qss +%%DATADIR%%/widgetsboxmodel/themes/Yosemite Dark.qss +%%DATADIR%%/widgetsboxmodel/themes/Yosemite.qss share/applications/albert.desktop share/icons/hicolor/scalable/apps/albert.svg -@dir %%DATADIR%%/org.albert.extension.python/modules