Skip to content

Commit

Permalink
x11/albert: Update to 0.20.5
Browse files Browse the repository at this point in the history
Reviewed by:		arrowd
Differential Revision:	https://reviews.freebsd.org/D38422
  • Loading branch information
jsm222 committed Mar 7, 2023
1 parent 164e526 commit 104045c
Show file tree
Hide file tree
Showing 18 changed files with 248 additions and 274 deletions.
20 changes: 11 additions & 9 deletions 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
Expand All @@ -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 <bsd.port.mk>
14 changes: 9 additions & 5 deletions 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
23 changes: 0 additions & 23 deletions x11/albert/files/patch-CMakeLists.txt

This file was deleted.

14 changes: 0 additions & 14 deletions x11/albert/files/patch-lib_globalshortcut_CMakeLists.txt

This file was deleted.

11 changes: 0 additions & 11 deletions x11/albert/files/patch-lib_globalshortcut_src_hotkeymanager.cpp

This file was deleted.

25 changes: 0 additions & 25 deletions x11/albert/files/patch-plugins_calculator_CMakeLists.txt

This file was deleted.

11 changes: 11 additions & 0 deletions 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());
11 changes: 0 additions & 11 deletions x11/albert/files/patch-plugins_python_CMakeLists.txt

This file was deleted.

@@ -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)
19 changes: 0 additions & 19 deletions x11/albert/files/patch-plugins_qmlboxmodel_CMakeLists.txt

This file was deleted.

13 changes: 0 additions & 13 deletions x11/albert/files/patch-plugins_qmlboxmodel_src_mainwindow.cpp

This file was deleted.

19 changes: 0 additions & 19 deletions x11/albert/files/patch-plugins_widgetboxmodel_CMakeLists.txt

This file was deleted.

This file was deleted.

25 changes: 0 additions & 25 deletions x11/albert/files/patch-src_app_main.cpp

This file was deleted.

11 changes: 0 additions & 11 deletions x11/albert/files/patch-src_app_settingswidget_settingswidget.cpp

This file was deleted.

11 changes: 11 additions & 0 deletions 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
4 changes: 3 additions & 1 deletion 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

0 comments on commit 104045c

Please sign in to comment.