Index: Makefile =================================================================== --- Makefile (revision 473560) +++ Makefile (working copy) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= flameshot -PORTVERSION= 0.5.0 +PORTVERSION= 0.5.1 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= deskutils MAINTAINER= nivit@FreeBSD.org Index: distinfo =================================================================== --- distinfo (revision 473560) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1516551815 -SHA256 (lupoDharkael-flameshot-v0.5.0_GH0.tar.gz) = 32d593c14c37286d9f64873c4ef9a07eb084723c92b2280d5c22152547c1e3f0 -SIZE (lupoDharkael-flameshot-v0.5.0_GH0.tar.gz) = 464600 +TIMESTAMP = 1530397578 +SHA256 (lupoDharkael-flameshot-v0.5.1_GH0.tar.gz) = 35220eabb8c4203abb0732c63e0b4d955e17ddd0c03c3d2c7a5beb875728e44e +SIZE (lupoDharkael-flameshot-v0.5.1_GH0.tar.gz) = 600895 Index: files/patch-flameshot.pro =================================================================== --- files/patch-flameshot.pro (revision 473560) +++ files/patch-flameshot.pro (nonexistent) @@ -1,35 +0,0 @@ ---- flameshot.pro.orig 2017-12-20 13:41:48 UTC -+++ flameshot.pro -@@ -177,27 +177,27 @@ unix: { - packaging { - USRPATH = /usr - } else { -- USRPATH = /usr/local -+ USRPATH = %%LOCALBASE%% - } - - target.path = $${BASEDIR}$${USRPATH}/bin/ - -- qmfile.path = $${BASEDIR}/usr/share/flameshot/translations/ -+ qmfile.path = $${BASEDIR}$${USRPATH}/share/flameshot/translations/ - qmfile.files = $${TRANSLATIONS_FILES} - -- dbus.path = $${BASEDIR}/usr/share/dbus-1/interfaces/ -+ dbus.path = $${BASEDIR}$${USRPATH}/share/dbus-1/interfaces/ - dbus.files = dbus/org.dharkael.Flameshot.xml - - icon.path = $${BASEDIR}$${USRPATH}/share/icons/ - icon.files = img/flameshot.png - -- completion.path = /usr/share/bash-completion/completions/ -+ completion.path = $${BASEDIR}$${USRPATH}/share/bash-completion/completions/ - completion.files = docs/bash-completion/flameshot - - desktopentry.path = $${BASEDIR}$${USRPATH}/share/applications - desktopentryinit.path = $${BASEDIR}$${USRPATH}/share/applications - desktopentryconfig.path = $${BASEDIR}$${USRPATH}/share/applications -- servicedbus.path = $${BASEDIR}/usr/share/dbus-1/services/ -+ servicedbus.path = $${BASEDIR}$${USRPATH}/share/dbus-1/services/ - - packaging { - desktopentry.files = docs/desktopEntry/package/flameshot.desktop Property changes on: files/patch-flameshot.pro ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-git_481069 =================================================================== --- files/patch-git_481069 (revision 473560) +++ files/patch-git_481069 (nonexistent) @@ -1,25 +0,0 @@ -From 48106975fb120fa7b6b1abb136183cb84bc957c9 Mon Sep 17 00:00:00 2001 -From: Peter Schuller -Date: Mon, 22 Jan 2018 12:15:21 -0800 -Subject: [PATCH] Fix case statement (so we build with clang). (#101) - ---- src/utils/screengrabber.cpp.orig 2017-12-20 13:41:48 UTC -+++ src/utils/screengrabber.cpp -@@ -35,7 +35,7 @@ QPixmap ScreenGrabber::grabEntireDesktop(bool &ok) { - QPixmap res; - // handle screenshot based on DE - switch (m_info.windowManager()) { -- case m_info.GNOME: { -+ case DesktopInfo::GNOME: { - // https://github.com/GNOME/gnome-shell/blob/695bfb96160033be55cfb5ac41c121998f98c328/data/org.gnome.Shell.Screenshot.xml - QString path = FileNameHandler().generateAbsolutePath("/tmp") + ".png"; - QDBusInterface gnomeInterface(QStringLiteral("org.gnome.Shell"), -@@ -48,7 +48,7 @@ QPixmap ScreenGrabber::grabEntireDesktop(bool &ok) { - ok = false; - } - break; -- } case m_info.KDE: { -+ } case DesktopInfo::KDE: { - // https://github.com/KDE/spectacle/blob/517a7baf46a4ca0a45f32fd3f2b1b7210b180134/src/PlatformBackends/KWinWaylandImageGrabber.cpp#L145 - QDBusInterface kwinInterface(QStringLiteral("org.kde.KWin"), - QStringLiteral("/Screenshot"), Property changes on: files/patch-git_481069 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-src_config_geneneralconf.cpp =================================================================== --- files/patch-src_config_geneneralconf.cpp (nonexistent) +++ files/patch-src_config_geneneralconf.cpp (working copy) @@ -0,0 +1,20 @@ +--- src/config/geneneralconf.cpp.orig 2018-06-30 22:54:22 UTC ++++ src/config/geneneralconf.cpp +@@ -48,7 +48,7 @@ void GeneneralConf::updateComponents() { + m_sysNotifications->setChecked(config.desktopNotificationValue()); + m_autostart->setChecked(config.startupLaunchValue()); + +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX) + m_showTray->setChecked(!config.disabledTrayIconValue()); + #endif + } +@@ -145,7 +145,7 @@ void GeneneralConf::initShowDesktopNotification() { + } + + void GeneneralConf::initShowTrayIcon() { +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX) + m_showTray = new QCheckBox(tr("Show tray icon"), this); + ConfigHandler config; + bool checked = !config.disabledTrayIconValue(); Property changes on: files/patch-src_config_geneneralconf.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src_core_controller.cpp =================================================================== --- files/patch-src_core_controller.cpp (nonexistent) +++ files/patch-src_core_controller.cpp (working copy) @@ -0,0 +1,20 @@ +--- src/core/controller.cpp.orig 2018-06-30 22:55:08 UTC ++++ src/core/controller.cpp +@@ -39,7 +39,7 @@ Controller::Controller() : m_captureWindow(nullptr) + qApp->setQuitOnLastWindowClosed(false); + + // init tray icon +-#if defined(Q_OS_LINUX) ++#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX) + if (!ConfigHandler().disabledTrayIconValue()) { + enableTrayIcon(); + } +@@ -137,7 +137,7 @@ void Controller::enableTrayIcon() { + } + + void Controller::disableTrayIcon() { +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX) + if (m_trayIcon) { + m_trayIcon->deleteLater(); + } Property changes on: files/patch-src_core_controller.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src_main.cpp =================================================================== --- files/patch-src_main.cpp (nonexistent) +++ files/patch-src_main.cpp (working copy) @@ -0,0 +1,20 @@ +--- src/main.cpp.orig 2018-02-24 11:19:04 UTC ++++ src/main.cpp +@@ -28,7 +28,7 @@ + #include + #include + +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX) + #include "src/core/flameshotdbusadapter.h" + #include "src/utils/dbusutils.h" + #include +@@ -62,7 +62,7 @@ int main(int argc, char *argv[]) { + app.setApplicationName("flameshot"); + app.setOrganizationName("Dharkael"); + +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX) + auto c = Controller::getInstance(); + new FlameshotDBusAdapter(c); + QDBusConnection dbus = QDBusConnection::sessionBus(); Property changes on: files/patch-src_main.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src_utils_confighandler.cpp =================================================================== --- files/patch-src_utils_confighandler.cpp (nonexistent) +++ files/patch-src_utils_confighandler.cpp (working copy) @@ -0,0 +1,20 @@ +--- src/utils/confighandler.cpp.orig 2018-06-30 22:56:46 UTC ++++ src/utils/confighandler.cpp +@@ -183,7 +183,7 @@ void ConfigHandler::setKeepOpenAppLauncher(const bool + + bool ConfigHandler::startupLaunchValue() { + bool res = false; +-#if defined(Q_OS_LINUX) ++#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX) + QString path = QDir::homePath() + "/.config/autostart/Flameshot.desktop"; + res = QFile(path).exists(); + #elif defined(Q_OS_WIN) +@@ -197,7 +197,7 @@ bool ConfigHandler::startupLaunchValue() { + } + + void ConfigHandler::setStartupLaunch(const bool start) { +-#if defined(Q_OS_LINUX) ++#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX) + QString path = QDir::homePath() + "/.config/autostart/Flameshot.desktop"; + QFile file(path); + if (start) { Property changes on: files/patch-src_utils_confighandler.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src_utils_pathinfo.cpp =================================================================== --- files/patch-src_utils_pathinfo.cpp (nonexistent) +++ files/patch-src_utils_pathinfo.cpp (working copy) @@ -0,0 +1,11 @@ +--- src/utils/pathinfo.cpp.orig 2018-06-30 22:49:58 UTC ++++ src/utils/pathinfo.cpp +@@ -24,7 +24,7 @@ QStringList PathInfo::translations() { + QString binaryPath = QFileInfo(qApp->applicationFilePath()) + .absoluteFilePath(); + QString trPath = QDir::toNativeSeparators(binaryPath) + "translations"; +-#if defined(Q_OS_LINUX) ++#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX) + return QStringList() + << QString(APP_PREFIX) + "/share/flameshot/translations" + << trPath Property changes on: files/patch-src_utils_pathinfo.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src_utils_screengrabber.cpp =================================================================== --- files/patch-src_utils_screengrabber.cpp (nonexistent) +++ files/patch-src_utils_screengrabber.cpp (working copy) @@ -0,0 +1,20 @@ +--- src/utils/screengrabber.cpp.orig 2018-06-30 22:57:57 UTC ++++ src/utils/screengrabber.cpp +@@ -23,7 +23,7 @@ + #include + #include + +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX) + #include + #include + #include +@@ -35,7 +35,7 @@ ScreenGrabber::ScreenGrabber(QObject *parent) : QObjec + + QPixmap ScreenGrabber::grabEntireDesktop(bool &ok) { + ok = true; +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX) + if(m_info.waylandDectected()) { + QPixmap res; + // handle screenshot based on DE Property changes on: files/patch-src_utils_screengrabber.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src_utils_systemnotification.cpp =================================================================== --- files/patch-src_utils_systemnotification.cpp (nonexistent) +++ files/patch-src_utils_systemnotification.cpp (working copy) @@ -0,0 +1,11 @@ +--- src/utils/systemnotification.cpp.orig 2018-06-30 22:57:18 UTC ++++ src/utils/systemnotification.cpp +@@ -10,7 +10,7 @@ + #endif + #include "src/core/controller.h" + +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX) + SystemNotification::SystemNotification(QObject *parent) : QObject(parent) { + m_interface = new QDBusInterface(QStringLiteral("org.freedesktop.Notifications"), + QStringLiteral("/org/freedesktop/Notifications"), Property changes on: files/patch-src_utils_systemnotification.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: pkg-plist =================================================================== --- pkg-plist (revision 473560) +++ pkg-plist (working copy) @@ -7,4 +7,12 @@ share/dbus-1/services/org.dharkael.Flameshot.service %%DATADIR%%/translations/Internationalization_ca.qm %%DATADIR%%/translations/Internationalization_es.qm +%%DATADIR%%/translations/Internationalization_fr.qm +%%DATADIR%%/translations/Internationalization_ka.qm +%%DATADIR%%/translations/Internationalization_pl.qm +%%DATADIR%%/translations/Internationalization_ru.qm +%%DATADIR%%/translations/Internationalization_tr.qm +%%DATADIR%%/translations/Internationalization_zh_CN.qm +%%DATADIR%%/translations/Internationalization_zh_TW.qm share/icons/flameshot.png +share/metainfo/flameshot.appdata.xml