svn commit: r497047 - in head: . Mk/Uses audio/pavucontrol-qt deskutils/lxqt-notificationd devel devel/liblxqt devel/liblxqt-l10n devel/libqtxdg devel/lxqt-build-tools graphics graphics/lximage-qt ...
Jesper Schmitz Mouridsen
jsm at FreeBSD.org
Thu Mar 28 17:59:42 UTC 2019
Author: jsm
Date: Thu Mar 28 17:59:33 2019
New Revision: 497047
URL: https://svnweb.freebsd.org/changeset/ports/497047
Log:
Upgrade the LXQt desktop environment to 0.14.0
Upstream announcement https://forum.lxqt.org/t/release-lxqt-0-14-0/572
Approved by: miwi (mentor)
Differential Revision: https://reviews.freebsd.org/D19056
Added:
head/audio/pavucontrol-qt/pkg-plist (contents, props changed)
head/deskutils/lxqt-notificationd/pkg-plist (contents, props changed)
head/security/lxqt-openssh-askpass/pkg-plist (contents, props changed)
head/sysutils/lxqt-admin/pkg-plist (contents, props changed)
head/sysutils/lxqt-policykit/pkg-plist (contents, props changed)
head/x11-wm/obconf-qt/pkg-plist (contents, props changed)
head/x11/compton-conf/pkg-plist (contents, props changed)
head/x11/lxqt-about/pkg-plist (contents, props changed)
head/x11/lxqt-runner/pkg-plist (contents, props changed)
Deleted:
head/devel/liblxqt-l10n/
head/graphics/lximageqt-l10n/
head/x11-fm/pcmanfmqt-l10n/
head/x11-toolkits/qtermwidget-l10n/
head/x11-wm/obconf-qt/files/patch-src_CMakeLists.txt
head/x11-wm/obconf-qt/files/patch-src_theme.cpp
head/x11/libfm-qt/files/
head/x11/libfmqt-l10n/
head/x11/lxqt-globalkeys-l10n/
head/x11/lxqt-l10n/
head/x11/qterminal-l10n/
Modified:
head/MOVED
head/Mk/Uses/lxqt.mk
head/audio/pavucontrol-qt/Makefile
head/audio/pavucontrol-qt/distinfo
head/deskutils/lxqt-notificationd/Makefile
head/deskutils/lxqt-notificationd/distinfo
head/devel/Makefile
head/devel/liblxqt/Makefile
head/devel/liblxqt/distinfo
head/devel/liblxqt/pkg-plist
head/devel/libqtxdg/Makefile
head/devel/libqtxdg/distinfo
head/devel/lxqt-build-tools/Makefile
head/devel/lxqt-build-tools/distinfo
head/devel/lxqt-build-tools/pkg-plist
head/graphics/Makefile
head/graphics/lximage-qt/Makefile
head/graphics/lximage-qt/distinfo
head/graphics/lximage-qt/pkg-plist
head/security/lxqt-openssh-askpass/Makefile
head/security/lxqt-openssh-askpass/distinfo
head/security/lxqt-sudo/Makefile
head/security/lxqt-sudo/distinfo
head/security/lxqt-sudo/files/patch-sudo.cpp
head/security/lxqt-sudo/pkg-plist
head/sysutils/libsysstat/Makefile
head/sysutils/libsysstat/distinfo
head/sysutils/libsysstat/files/patch-CMakeLists.txt
head/sysutils/libsysstat/files/patch-cpustat.cpp
head/sysutils/libsysstat/files/patch-cpustat.h
head/sysutils/libsysstat/files/patch-cpustat__p.h
head/sysutils/libsysstat/files/patch-memstat.cpp
head/sysutils/libsysstat/files/patch-memstat.h
head/sysutils/libsysstat/files/patch-netstat.cpp
head/sysutils/lxqt-admin/Makefile
head/sysutils/lxqt-admin/distinfo
head/sysutils/lxqt-config/Makefile
head/sysutils/lxqt-config/distinfo
head/sysutils/lxqt-config/pkg-plist
head/sysutils/lxqt-policykit/Makefile
head/sysutils/lxqt-policykit/distinfo
head/sysutils/lxqt-policykit/pkg-descr
head/sysutils/lxqt-qtplugin/Makefile
head/sysutils/lxqt-qtplugin/distinfo
head/x11-fm/Makefile
head/x11-fm/pcmanfm-qt/Makefile
head/x11-fm/pcmanfm-qt/distinfo
head/x11-fm/pcmanfm-qt/pkg-plist
head/x11-themes/lxqt-themes/Makefile
head/x11-themes/lxqt-themes/distinfo
head/x11-toolkits/Makefile
head/x11-toolkits/qtermwidget/Makefile
head/x11-toolkits/qtermwidget/distinfo
head/x11-toolkits/qtermwidget/pkg-plist
head/x11-wm/lxqt-panel/Makefile
head/x11-wm/lxqt-panel/distinfo
head/x11-wm/lxqt-panel/pkg-plist
head/x11-wm/lxqt-session/Makefile
head/x11-wm/lxqt-session/distinfo
head/x11-wm/lxqt-session/pkg-plist
head/x11-wm/lxqt/Makefile
head/x11-wm/obconf-qt/Makefile
head/x11-wm/obconf-qt/distinfo
head/x11/Makefile
head/x11/compton-conf/Makefile
head/x11/compton-conf/distinfo
head/x11/libfm-qt/Makefile
head/x11/libfm-qt/distinfo
head/x11/libfm-qt/pkg-plist
head/x11/lxqt-about/Makefile
head/x11/lxqt-about/distinfo
head/x11/lxqt-globalkeys/Makefile
head/x11/lxqt-globalkeys/distinfo
head/x11/lxqt-globalkeys/pkg-plist
head/x11/lxqt-runner/Makefile
head/x11/lxqt-runner/distinfo
head/x11/qterminal/Makefile
head/x11/qterminal/distinfo
head/x11/qterminal/pkg-plist
Modified: head/MOVED
==============================================================================
--- head/MOVED Thu Mar 28 17:33:54 2019 (r497046)
+++ head/MOVED Thu Mar 28 17:59:33 2019 (r497047)
@@ -12008,3 +12008,11 @@ www/rubygem-unicorn51|www/rubygem-unicorn|2019-03-25|O
textproc/rubygem-version_sorter21|textproc/rubygem-version_sorter|2019-03-25|Obsolete, please use textproc/rubygem-version_sorter instead
net-im/rubygem-hipchat15|net-im/rubygem-hipchat|2019-03-25|Obsolete, please use net-im/rubygem-hipchat instead
devel/rubygem-fog-json102|devel/rubygem-fog-json|2019-03-25|Obsolete, please use devel/rubygem-fog-json instead
+x11/libmfmqt-l10n||2019-02-28|Obsolete by upstream
+x11-toolkits/qtermwidget-l10n||2019-03-28|Obsolete by upstream
+graphics/lximageqt-l10n||2019-03-28|Obsolete by upstream
+x11/lxqt-globalkeys-l10n||2019-03-28|Obsolete by upstream
+x11-fm/pcmanfmqt-l10n||2019-03-28|Obsolete by upstream
+devel/liblxqt-l10n||2019-03-28|Obsolete by upstream
+x11/lxqt-l10n||2019-03-28|Obsolete by upstream
+x11/qterminal-l10n||2019-03-28|Obsolete by upstream
Modified: head/Mk/Uses/lxqt.mk
==============================================================================
--- head/Mk/Uses/lxqt.mk Thu Mar 28 17:33:54 2019 (r497046)
+++ head/Mk/Uses/lxqt.mk Thu Mar 28 17:59:33 2019 (r497047)
@@ -41,8 +41,7 @@ PLIST_SUB+= LXQT_INCLUDEDIR="include/lxqt" \
LXQT_TRANSLATIONS="share/lxqt/translations" \
VERSION="${PORTVERSION}"
-CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR=${MANDIRS} \
- -DPULL_TRANSLATIONS:BOOL=OFF
+CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR=${MANDIRS}
# Available LXQt components are:
_USE_LXQT_ALL= buildtools globalkeys libfmqt lxqt qtxdg
Modified: head/audio/pavucontrol-qt/Makefile
==============================================================================
--- head/audio/pavucontrol-qt/Makefile Thu Mar 28 17:33:54 2019 (r497046)
+++ head/audio/pavucontrol-qt/Makefile Thu Mar 28 17:59:33 2019 (r497047)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= pavucontrol-qt
-PORTVERSION= 0.4.0
-PORTREVISION= 2
+PORTVERSION= 0.14.0
CATEGORIES= audio
MASTER_SITES= LXQT/${PORTNAME}
@@ -14,14 +13,11 @@ LICENSE= GPLv2
LIB_DEPENDS= libpulse.so:audio/pulseaudio
-USES= cmake compiler:c++11-lang gettext-runtime localbase:ldflags qt:5 \
+USES= cmake compiler:c++14-lang gettext-runtime localbase:ldflags qt:5 \
lxqt pkgconfig tar:xz gnome
USE_QT= buildtools_build qmake_build core dbus gui linguisttools \
widgets
USE_LXQT= buildtools
USE_GNOME= glib20
-
-PLIST_FILES= bin/pavucontrol-qt \
- share/applications/pavucontrol-qt.desktop
.include <bsd.port.mk>
Modified: head/audio/pavucontrol-qt/distinfo
==============================================================================
--- head/audio/pavucontrol-qt/distinfo Thu Mar 28 17:33:54 2019 (r497046)
+++ head/audio/pavucontrol-qt/distinfo Thu Mar 28 17:59:33 2019 (r497047)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1529709887
-SHA256 (lxqt/pavucontrol-qt-0.4.0.tar.xz) = e6b2edc4079c067fa8710eee8bd7f11f148128a9f08d5d38e600b4c31f841b5f
-SIZE (lxqt/pavucontrol-qt-0.4.0.tar.xz) = 34916
+TIMESTAMP = 1548949670
+SHA256 (lxqt/pavucontrol-qt-0.14.0.tar.xz) = 94f3150d2155ae1ba827b233c4b8ff6bf4763318b3f1e264baef4cdc0f6844d0
+SIZE (lxqt/pavucontrol-qt-0.14.0.tar.xz) = 93908
Added: head/audio/pavucontrol-qt/pkg-plist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/pavucontrol-qt/pkg-plist Thu Mar 28 17:59:33 2019 (r497047)
@@ -0,0 +1,44 @@
+bin/pavucontrol-qt
+share/applications/pavucontrol-qt.desktop
+%%DATADIR%%/translations/pavucontrol-qt_as.qm
+%%DATADIR%%/translations/pavucontrol-qt_bn_IN.qm
+%%DATADIR%%/translations/pavucontrol-qt_ca.qm
+%%DATADIR%%/translations/pavucontrol-qt_cs.qm
+%%DATADIR%%/translations/pavucontrol-qt_cy.qm
+%%DATADIR%%/translations/pavucontrol-qt_da.qm
+%%DATADIR%%/translations/pavucontrol-qt_de.qm
+%%DATADIR%%/translations/pavucontrol-qt_el.qm
+%%DATADIR%%/translations/pavucontrol-qt_es.qm
+%%DATADIR%%/translations/pavucontrol-qt_fi.qm
+%%DATADIR%%/translations/pavucontrol-qt_fr.qm
+%%DATADIR%%/translations/pavucontrol-qt_gl.qm
+%%DATADIR%%/translations/pavucontrol-qt_gu.qm
+%%DATADIR%%/translations/pavucontrol-qt_he.qm
+%%DATADIR%%/translations/pavucontrol-qt_hi.qm
+%%DATADIR%%/translations/pavucontrol-qt_hu.qm
+%%DATADIR%%/translations/pavucontrol-qt_id.qm
+%%DATADIR%%/translations/pavucontrol-qt_it.qm
+%%DATADIR%%/translations/pavucontrol-qt_ja.qm
+%%DATADIR%%/translations/pavucontrol-qt_kn.qm
+%%DATADIR%%/translations/pavucontrol-qt_lt.qm
+%%DATADIR%%/translations/pavucontrol-qt_ml.qm
+%%DATADIR%%/translations/pavucontrol-qt_mr.qm
+%%DATADIR%%/translations/pavucontrol-qt_nb_NO.qm
+%%DATADIR%%/translations/pavucontrol-qt_nl.qm
+%%DATADIR%%/translations/pavucontrol-qt_or.qm
+%%DATADIR%%/translations/pavucontrol-qt_pa.qm
+%%DATADIR%%/translations/pavucontrol-qt_pl.qm
+%%DATADIR%%/translations/pavucontrol-qt_pt.qm
+%%DATADIR%%/translations/pavucontrol-qt_pt_BR.qm
+%%DATADIR%%/translations/pavucontrol-qt_ru.qm
+%%DATADIR%%/translations/pavucontrol-qt_sk.qm
+%%DATADIR%%/translations/pavucontrol-qt_sr.qm
+%%DATADIR%%/translations/pavucontrol-qt_sr at latin.qm
+%%DATADIR%%/translations/pavucontrol-qt_sv.qm
+%%DATADIR%%/translations/pavucontrol-qt_ta.qm
+%%DATADIR%%/translations/pavucontrol-qt_te.qm
+%%DATADIR%%/translations/pavucontrol-qt_th.qm
+%%DATADIR%%/translations/pavucontrol-qt_tr.qm
+%%DATADIR%%/translations/pavucontrol-qt_uk.qm
+%%DATADIR%%/translations/pavucontrol-qt_zh_CN.qm
+%%DATADIR%%/translations/pavucontrol-qt_zh_TW.qm
Modified: head/deskutils/lxqt-notificationd/Makefile
==============================================================================
--- head/deskutils/lxqt-notificationd/Makefile Thu Mar 28 17:33:54 2019 (r497046)
+++ head/deskutils/lxqt-notificationd/Makefile Thu Mar 28 17:59:33 2019 (r497047)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= lxqt-notificationd
-PORTVERSION= 0.13.0
-PORTREVISION= 2
+PORTVERSION= 0.14.0
CATEGORIES= deskutils
MASTER_SITES= LXQT
@@ -12,16 +11,11 @@ COMMENT= LXQt notification daemon
LICENSE= LGPL21+
-USES= cmake compiler:c++11-lib gettext kde:5 lxqt qt:5 \
+USES= cmake compiler:c++14-lang gettext kde:5 lxqt qt:5 \
pkgconfig tar:xz
USE_QT= buildtools_build qmake_build dbus core gui \
linguisttools svg widgets x11extras xml
USE_KDE= windowsystem
USE_LXQT= buildtools lxqt
-
-PLIST_FILES= bin/lxqt-config-notificationd \
- bin/lxqt-notificationd \
- etc/xdg/autostart/lxqt-notifications.desktop \
- share/applications/lxqt-config-notificationd.desktop
.include <bsd.port.mk>
Modified: head/deskutils/lxqt-notificationd/distinfo
==============================================================================
--- head/deskutils/lxqt-notificationd/distinfo Thu Mar 28 17:33:54 2019 (r497046)
+++ head/deskutils/lxqt-notificationd/distinfo Thu Mar 28 17:59:33 2019 (r497047)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527328598
-SHA256 (lxqt/lxqt-notificationd-0.13.0.tar.xz) = a69d18a0307c5a18826c2bd0a110f3862d23fece07c64bfc7e187af8f66a10d0
-SIZE (lxqt/lxqt-notificationd-0.13.0.tar.xz) = 32364
+TIMESTAMP = 1548967747
+SHA256 (lxqt/lxqt-notificationd-0.14.0.tar.xz) = 49ae08204d274768b1f3c4f6614a467185a07ea383af5b551a43cf61c964df91
+SIZE (lxqt/lxqt-notificationd-0.14.0.tar.xz) = 46608
Added: head/deskutils/lxqt-notificationd/pkg-plist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/deskutils/lxqt-notificationd/pkg-plist Thu Mar 28 17:59:33 2019 (r497047)
@@ -0,0 +1,55 @@
+bin/lxqt-config-notificationd
+bin/lxqt-notificationd
+etc/xdg/autostart/lxqt-notifications.desktop
+share/applications/lxqt-config-notificationd.desktop
+%%LXQT_TRANSLATIONS%%/lxqt-config-notificationd/lxqt-config-notificationd_ar.qm
+%%LXQT_TRANSLATIONS%%/lxqt-config-notificationd/lxqt-config-notificationd_ca.qm
+%%LXQT_TRANSLATIONS%%/lxqt-config-notificationd/lxqt-config-notificationd_cs.qm
+%%LXQT_TRANSLATIONS%%/lxqt-config-notificationd/lxqt-config-notificationd_cy.qm
+%%LXQT_TRANSLATIONS%%/lxqt-config-notificationd/lxqt-config-notificationd_da.qm
+%%LXQT_TRANSLATIONS%%/lxqt-config-notificationd/lxqt-config-notificationd_de.qm
+%%LXQT_TRANSLATIONS%%/lxqt-config-notificationd/lxqt-config-notificationd_el.qm
+%%LXQT_TRANSLATIONS%%/lxqt-config-notificationd/lxqt-config-notificationd_es.qm
+%%LXQT_TRANSLATIONS%%/lxqt-config-notificationd/lxqt-config-notificationd_fr.qm
+%%LXQT_TRANSLATIONS%%/lxqt-config-notificationd/lxqt-config-notificationd_gl.qm
+%%LXQT_TRANSLATIONS%%/lxqt-config-notificationd/lxqt-config-notificationd_hr.qm
+%%LXQT_TRANSLATIONS%%/lxqt-config-notificationd/lxqt-config-notificationd_hu.qm
+%%LXQT_TRANSLATIONS%%/lxqt-config-notificationd/lxqt-config-notificationd_id.qm
+%%LXQT_TRANSLATIONS%%/lxqt-config-notificationd/lxqt-config-notificationd_it.qm
+%%LXQT_TRANSLATIONS%%/lxqt-config-notificationd/lxqt-config-notificationd_ja.qm
+%%LXQT_TRANSLATIONS%%/lxqt-config-notificationd/lxqt-config-notificationd_lt.qm
+%%LXQT_TRANSLATIONS%%/lxqt-config-notificationd/lxqt-config-notificationd_lv.qm
+%%LXQT_TRANSLATIONS%%/lxqt-config-notificationd/lxqt-config-notificationd_nb_NO.qm
+%%LXQT_TRANSLATIONS%%/lxqt-config-notificationd/lxqt-config-notificationd_nl.qm
+%%LXQT_TRANSLATIONS%%/lxqt-config-notificationd/lxqt-config-notificationd_pl.qm
+%%LXQT_TRANSLATIONS%%/lxqt-config-notificationd/lxqt-config-notificationd_pt.qm
+%%LXQT_TRANSLATIONS%%/lxqt-config-notificationd/lxqt-config-notificationd_ru.qm
+%%LXQT_TRANSLATIONS%%/lxqt-config-notificationd/lxqt-config-notificationd_tr.qm
+%%LXQT_TRANSLATIONS%%/lxqt-config-notificationd/lxqt-config-notificationd_uk.qm
+%%LXQT_TRANSLATIONS%%/lxqt-config-notificationd/lxqt-config-notificationd_zh_CN.qm
+%%LXQT_TRANSLATIONS%%/lxqt-notificationd/lxqt-notificationd_ar.qm
+%%LXQT_TRANSLATIONS%%/lxqt-notificationd/lxqt-notificationd_ca.qm
+%%LXQT_TRANSLATIONS%%/lxqt-notificationd/lxqt-notificationd_cs.qm
+%%LXQT_TRANSLATIONS%%/lxqt-notificationd/lxqt-notificationd_cy.qm
+%%LXQT_TRANSLATIONS%%/lxqt-notificationd/lxqt-notificationd_da.qm
+%%LXQT_TRANSLATIONS%%/lxqt-notificationd/lxqt-notificationd_de.qm
+%%LXQT_TRANSLATIONS%%/lxqt-notificationd/lxqt-notificationd_el.qm
+%%LXQT_TRANSLATIONS%%/lxqt-notificationd/lxqt-notificationd_es.qm
+%%LXQT_TRANSLATIONS%%/lxqt-notificationd/lxqt-notificationd_fr.qm
+%%LXQT_TRANSLATIONS%%/lxqt-notificationd/lxqt-notificationd_gl.qm
+%%LXQT_TRANSLATIONS%%/lxqt-notificationd/lxqt-notificationd_he.qm
+%%LXQT_TRANSLATIONS%%/lxqt-notificationd/lxqt-notificationd_hu.qm
+%%LXQT_TRANSLATIONS%%/lxqt-notificationd/lxqt-notificationd_id.qm
+%%LXQT_TRANSLATIONS%%/lxqt-notificationd/lxqt-notificationd_it.qm
+%%LXQT_TRANSLATIONS%%/lxqt-notificationd/lxqt-notificationd_ja.qm
+%%LXQT_TRANSLATIONS%%/lxqt-notificationd/lxqt-notificationd_lt.qm
+%%LXQT_TRANSLATIONS%%/lxqt-notificationd/lxqt-notificationd_lv.qm
+%%LXQT_TRANSLATIONS%%/lxqt-notificationd/lxqt-notificationd_nb_NO.qm
+%%LXQT_TRANSLATIONS%%/lxqt-notificationd/lxqt-notificationd_nl.qm
+%%LXQT_TRANSLATIONS%%/lxqt-notificationd/lxqt-notificationd_pl.qm
+%%LXQT_TRANSLATIONS%%/lxqt-notificationd/lxqt-notificationd_pt.qm
+%%LXQT_TRANSLATIONS%%/lxqt-notificationd/lxqt-notificationd_ru.qm
+%%LXQT_TRANSLATIONS%%/lxqt-notificationd/lxqt-notificationd_ru_RU.qm
+%%LXQT_TRANSLATIONS%%/lxqt-notificationd/lxqt-notificationd_tr.qm
+%%LXQT_TRANSLATIONS%%/lxqt-notificationd/lxqt-notificationd_uk.qm
+%%LXQT_TRANSLATIONS%%/lxqt-notificationd/lxqt-notificationd_zh_TW.qm
Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile Thu Mar 28 17:33:54 2019 (r497046)
+++ head/devel/Makefile Thu Mar 28 17:59:33 2019 (r497047)
@@ -1488,7 +1488,6 @@
SUBDIR += liblouis
SUBDIR += libltdl
SUBDIR += liblxqt
- SUBDIR += liblxqt-l10n
SUBDIR += libmaa
SUBDIR += libmatheval
SUBDIR += libmba
Modified: head/devel/liblxqt/Makefile
==============================================================================
--- head/devel/liblxqt/Makefile Thu Mar 28 17:33:54 2019 (r497046)
+++ head/devel/liblxqt/Makefile Thu Mar 28 17:59:33 2019 (r497047)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= liblxqt
-PORTVERSION= 0.13.0
-PORTREVISION= 4
+PORTVERSION= 0.14.0
CATEGORIES= devel
MASTER_SITES= LXQT
@@ -14,12 +13,13 @@ LICENSE= LGPL21+
LIB_DEPENDS= libpolkit-qt5-core-1.so:sysutils/polkit-qt
-USES= cmake compiler:c++11-lib gettext kde:5 lxqt \
+USES= cmake compiler:c++14-lang gettext kde:5 lxqt \
pkgconfig qt:5 tar:xz
-USE_QT= buildtools_build qmake_build dbus core gui linguisttools \
+USE_QT= buildtools_build qmake_build dbus core gui linguisttools \
svg widgets x11extras xml
USE_KDE= windowsystem
USE_LXQT= buildtools qtxdg
USE_XORG= x11 xscrnsaver
+USE_LDCONFIG= yes
.include <bsd.port.mk>
Modified: head/devel/liblxqt/distinfo
==============================================================================
--- head/devel/liblxqt/distinfo Thu Mar 28 17:33:54 2019 (r497046)
+++ head/devel/liblxqt/distinfo Thu Mar 28 17:59:33 2019 (r497047)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527339804
-SHA256 (lxqt/liblxqt-0.13.0.tar.xz) = b41db9dd6fcc4e3232402ee0304d2b977ec82d696c464667dddba555b0056a39
-SIZE (lxqt/liblxqt-0.13.0.tar.xz) = 56896
+TIMESTAMP = 1548873190
+SHA256 (lxqt/liblxqt-0.14.0.tar.xz) = acbebe724532f5455b48e706df89f19a2d4b54ffd4cc4ecb81d7e8a098bf680c
+SIZE (lxqt/liblxqt-0.14.0.tar.xz) = 81424
Modified: head/devel/liblxqt/pkg-plist
==============================================================================
--- head/devel/liblxqt/pkg-plist Thu Mar 28 17:33:54 2019 (r497046)
+++ head/devel/liblxqt/pkg-plist Thu Mar 28 17:59:33 2019 (r497047)
@@ -46,4 +46,43 @@ share/cmake/lxqt/lxqt-config.cmake
share/cmake/lxqt/lxqt-targets-%%CMAKE_BUILD_TYPE%%.cmake
share/cmake/lxqt/lxqt-targets.cmake
%%LXQT_SHAREDIR%%/power.conf
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_ar.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_ca.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_cs.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_cy.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_da.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_de.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_el.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_eo.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_es.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_es_VE.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_eu.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_fi.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_fr.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_gl.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_he.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_hu.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_ia.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_id.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_it.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_ja.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_ko.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_lt.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_lv.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_nb_NO.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_nl.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_pl.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_pt.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_pt_BR.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_ro_RO.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_ru.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_sk_SK.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_sl.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_sr at latin.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_sr_RS.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_th_TH.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_tr.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_uk.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_zh_CN.qm
+%%LXQT_TRANSLATIONS%%/liblxqt/liblxqt_zh_TW.qm
share/polkit-1/actions/org.lxqt.backlight.pkexec.policy
Modified: head/devel/libqtxdg/Makefile
==============================================================================
--- head/devel/libqtxdg/Makefile Thu Mar 28 17:33:54 2019 (r497046)
+++ head/devel/libqtxdg/Makefile Thu Mar 28 17:59:33 2019 (r497047)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= libqtxdg
-PORTVERSION= 3.2.0
-PORTREVISION= 3
+PORTVERSION= 3.3.0
CATEGORIES= devel
MASTER_SITES= LXQT/${PORTNAME}
@@ -12,7 +11,7 @@ COMMENT= Qt implementation of freedesktop.org xdg spec
LICENSE= LGPL21+
-USES= cmake compiler:c++11-lib lxqt pkgconfig qt:5 tar:xz
+USES= cmake compiler:c++14-lang lxqt pkgconfig qt:5 tar:xz
USE_LDCONFIG= yes
USE_QT= buildtools_build qmake_build core dbus gui svg widgets \
xml
Modified: head/devel/libqtxdg/distinfo
==============================================================================
--- head/devel/libqtxdg/distinfo Thu Mar 28 17:33:54 2019 (r497046)
+++ head/devel/libqtxdg/distinfo Thu Mar 28 17:59:33 2019 (r497047)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527339756
-SHA256 (lxqt/libqtxdg-3.2.0.tar.xz) = 949134060d148df2ca4515e3759ed9c6a2fa7c51eb7a2197dd0e26a32e220553
-SIZE (lxqt/libqtxdg-3.2.0.tar.xz) = 67736
+TIMESTAMP = 1548872076
+SHA256 (lxqt/libqtxdg-3.3.0.tar.xz) = 14202ba8539adcac13ec1b9a74e61a1965b49c61a7a8e35c8a2924c902371287
+SIZE (lxqt/libqtxdg-3.3.0.tar.xz) = 68412
Modified: head/devel/lxqt-build-tools/Makefile
==============================================================================
--- head/devel/lxqt-build-tools/Makefile Thu Mar 28 17:33:54 2019 (r497046)
+++ head/devel/lxqt-build-tools/Makefile Thu Mar 28 17:59:33 2019 (r497047)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= lxqt-build-tools
-PORTVERSION= 0.5.0
-PORTREVISION= 1
+PORTVERSION= 0.6.0
CATEGORIES= devel
MASTER_SITES= LXQT/${PORTNAME}
@@ -13,7 +12,7 @@ COMMENT= Helpers CMake modules for LXQt
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/BSD-3-Clause
-USES= cmake lxqt pkgconfig qt:5 tar:xz
+USES= cmake lxqt pkgconfig qt:5 tar:xz gnome
USE_QT= qmake_build buildtools_build core
USE_GNOME= glib20
Modified: head/devel/lxqt-build-tools/distinfo
==============================================================================
--- head/devel/lxqt-build-tools/distinfo Thu Mar 28 17:33:54 2019 (r497046)
+++ head/devel/lxqt-build-tools/distinfo Thu Mar 28 17:59:33 2019 (r497047)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527275331
-SHA256 (lxqt/lxqt-build-tools-0.5.0.tar.xz) = a66d080d4cf075007fcdd9eab1689559728418dd8f85f7e8e79679738de8658d
-SIZE (lxqt/lxqt-build-tools-0.5.0.tar.xz) = 23392
+TIMESTAMP = 1548872954
+SHA256 (lxqt/lxqt-build-tools-0.6.0.tar.xz) = 2488f1105ba8008996b4f6a0df5c556c657c733a47a422ea3f2e59115c051758
+SIZE (lxqt/lxqt-build-tools-0.6.0.tar.xz) = 22520
Modified: head/devel/lxqt-build-tools/pkg-plist
==============================================================================
--- head/devel/lxqt-build-tools/pkg-plist Thu Mar 28 17:33:54 2019 (r497046)
+++ head/devel/lxqt-build-tools/pkg-plist Thu Mar 28 17:59:33 2019 (r497047)
@@ -1,5 +1,5 @@
+bin/lxqt-transupdate
share/cmake/lxqt-build-tools/find-modules/FindExif.cmake
-share/cmake/lxqt-build-tools/find-modules/FindFm.cmake
share/cmake/lxqt-build-tools/find-modules/FindGLIB.cmake
share/cmake/lxqt-build-tools/find-modules/FindMenuCache.cmake
share/cmake/lxqt-build-tools/find-modules/FindUDev.cmake
Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile Thu Mar 28 17:33:54 2019 (r497046)
+++ head/graphics/Makefile Thu Mar 28 17:59:33 2019 (r497047)
@@ -533,7 +533,6 @@
SUBDIR += luxrender
SUBDIR += luxrender14
SUBDIR += lximage-qt
- SUBDIR += lximageqt-l10n
SUBDIR += magnum
SUBDIR += magnum-examples
SUBDIR += magnum-extras
Modified: head/graphics/lximage-qt/Makefile
==============================================================================
--- head/graphics/lximage-qt/Makefile Thu Mar 28 17:33:54 2019 (r497046)
+++ head/graphics/lximage-qt/Makefile Thu Mar 28 17:59:33 2019 (r497047)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= lximage-qt
-PORTVERSION= 0.7.0
-PORTREVISION= 3
+PORTVERSION= 0.14.0
CATEGORIES= graphics
MASTER_SITES= LXQT
@@ -13,16 +12,15 @@ COMMENT= Image viewer and screenshot tool
LICENSE= GPLv2
LIB_DEPENDS= libexif.so:graphics/libexif \
- libmenu-cache.so:x11/menu-cache \
- libfm.so:x11/libfm at gtk2
+ libmenu-cache.so:x11/menu-cache
-USES= cmake compiler:c++11-lib desktop-file-utils gettext-runtime \
- localbase:ldflags lxqt pkgconfig qt:5 tar:xz
+USES= cmake compiler:c++14-lang desktop-file-utils gettext-runtime \
+ localbase:ldflags lxqt pkgconfig qt:5 gnome tar:xz
+
USE_GNOME= glib20
USE_QT= buildtools_build qmake_build core dbus gui linguisttools \
- network printsupport svg widgets x11extras
+ network printsupport svg widgets x11extras
USE_LXQT= buildtools libfmqt
USE_XORG= ice sm x11 xcb xext xfixes
-INSTALLS_ICONS= yes
.include <bsd.port.mk>
Modified: head/graphics/lximage-qt/distinfo
==============================================================================
--- head/graphics/lximage-qt/distinfo Thu Mar 28 17:33:54 2019 (r497046)
+++ head/graphics/lximage-qt/distinfo Thu Mar 28 17:59:33 2019 (r497047)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527343539
-SHA256 (lxqt/lximage-qt-0.7.0.tar.xz) = 1cac20e51db395eaba1c137d578f68a676a271a173a9aaad4ed92b99a98192d7
-SIZE (lxqt/lximage-qt-0.7.0.tar.xz) = 41560
+TIMESTAMP = 1548950375
+SHA256 (lxqt/lximage-qt-0.14.0.tar.xz) = 902ac98cfa4555c4080b5ebcca799898c6e51d862415b09ffb78c63a6fdfc8c2
+SIZE (lxqt/lximage-qt-0.14.0.tar.xz) = 77624
Modified: head/graphics/lximage-qt/pkg-plist
==============================================================================
--- head/graphics/lximage-qt/pkg-plist Thu Mar 28 17:33:54 2019 (r497046)
+++ head/graphics/lximage-qt/pkg-plist Thu Mar 28 17:59:33 2019 (r497047)
@@ -2,3 +2,33 @@ bin/lximage-qt
share/applications/lximage-qt-screenshot.desktop
share/applications/lximage-qt.desktop
share/icons/hicolor/48x48/apps/lximage-qt.png
+%%DATADIR%%/translations/lximage-qt_ar.qm
+%%DATADIR%%/translations/lximage-qt_ca.qm
+%%DATADIR%%/translations/lximage-qt_cs.qm
+%%DATADIR%%/translations/lximage-qt_cy.qm
+%%DATADIR%%/translations/lximage-qt_da.qm
+%%DATADIR%%/translations/lximage-qt_de.qm
+%%DATADIR%%/translations/lximage-qt_el.qm
+%%DATADIR%%/translations/lximage-qt_es.qm
+%%DATADIR%%/translations/lximage-qt_fr.qm
+%%DATADIR%%/translations/lximage-qt_gl.qm
+%%DATADIR%%/translations/lximage-qt_he.qm
+%%DATADIR%%/translations/lximage-qt_hr.qm
+%%DATADIR%%/translations/lximage-qt_hu.qm
+%%DATADIR%%/translations/lximage-qt_id.qm
+%%DATADIR%%/translations/lximage-qt_is.qm
+%%DATADIR%%/translations/lximage-qt_it.qm
+%%DATADIR%%/translations/lximage-qt_ja.qm
+%%DATADIR%%/translations/lximage-qt_lt.qm
+%%DATADIR%%/translations/lximage-qt_nb_NO.qm
+%%DATADIR%%/translations/lximage-qt_nl.qm
+%%DATADIR%%/translations/lximage-qt_pa.qm
+%%DATADIR%%/translations/lximage-qt_pl.qm
+%%DATADIR%%/translations/lximage-qt_pt.qm
+%%DATADIR%%/translations/lximage-qt_pt_BR.qm
+%%DATADIR%%/translations/lximage-qt_ru.qm
+%%DATADIR%%/translations/lximage-qt_sv.qm
+%%DATADIR%%/translations/lximage-qt_tr.qm
+%%DATADIR%%/translations/lximage-qt_uk.qm
+%%DATADIR%%/translations/lximage-qt_zh_CN.qm
+%%DATADIR%%/translations/lximage-qt_zh_TW.qm
Modified: head/security/lxqt-openssh-askpass/Makefile
==============================================================================
--- head/security/lxqt-openssh-askpass/Makefile Thu Mar 28 17:33:54 2019 (r497046)
+++ head/security/lxqt-openssh-askpass/Makefile Thu Mar 28 17:59:33 2019 (r497047)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= lxqt-openssh-askpass
-PORTVERSION= 0.13.0
-PORTREVISION= 1
+PORTVERSION= 0.14.0
CATEGORIES= security
MASTER_SITES= LXQT
@@ -18,7 +17,5 @@ USE_QT= buildtools_build qmake_build core dbus gui lin
svg widgets x11extras xml
USE_KDE= windowsystem
USE_LXQT= buildtools lxqt
-
-PLIST_FILES= bin/lxqt-openssh-askpass
.include <bsd.port.mk>
Modified: head/security/lxqt-openssh-askpass/distinfo
==============================================================================
--- head/security/lxqt-openssh-askpass/distinfo Thu Mar 28 17:33:54 2019 (r497046)
+++ head/security/lxqt-openssh-askpass/distinfo Thu Mar 28 17:59:33 2019 (r497047)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527328596
-SHA256 (lxqt/lxqt-openssh-askpass-0.13.0.tar.xz) = f33e5f168729b974a4b9408e67c9b63f424bcff850bcbdc2d94f22e59f384250
-SIZE (lxqt/lxqt-openssh-askpass-0.13.0.tar.xz) = 14336
+TIMESTAMP = 1548967880
+SHA256 (lxqt/lxqt-openssh-askpass-0.14.0.tar.xz) = 8a45df98e0fcc3738fb656f3014a5067259add630e73b71793c2af1965f9f20d
+SIZE (lxqt/lxqt-openssh-askpass-0.14.0.tar.xz) = 16812
Added: head/security/lxqt-openssh-askpass/pkg-plist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/lxqt-openssh-askpass/pkg-plist Thu Mar 28 17:59:33 2019 (r497047)
@@ -0,0 +1,26 @@
+bin/lxqt-openssh-askpass
+man/man1/lxqt-openssh-askpass.1.gz
+%%LXQT_TRANSLATIONS%%/lxqt-openssh-askpass/lxqt-openssh-askpass_ar.qm
+%%LXQT_TRANSLATIONS%%/lxqt-openssh-askpass/lxqt-openssh-askpass_ca.qm
+%%LXQT_TRANSLATIONS%%/lxqt-openssh-askpass/lxqt-openssh-askpass_cs.qm
+%%LXQT_TRANSLATIONS%%/lxqt-openssh-askpass/lxqt-openssh-askpass_cy.qm
+%%LXQT_TRANSLATIONS%%/lxqt-openssh-askpass/lxqt-openssh-askpass_da.qm
+%%LXQT_TRANSLATIONS%%/lxqt-openssh-askpass/lxqt-openssh-askpass_de.qm
+%%LXQT_TRANSLATIONS%%/lxqt-openssh-askpass/lxqt-openssh-askpass_el.qm
+%%LXQT_TRANSLATIONS%%/lxqt-openssh-askpass/lxqt-openssh-askpass_es.qm
+%%LXQT_TRANSLATIONS%%/lxqt-openssh-askpass/lxqt-openssh-askpass_fr.qm
+%%LXQT_TRANSLATIONS%%/lxqt-openssh-askpass/lxqt-openssh-askpass_gl.qm
+%%LXQT_TRANSLATIONS%%/lxqt-openssh-askpass/lxqt-openssh-askpass_he.qm
+%%LXQT_TRANSLATIONS%%/lxqt-openssh-askpass/lxqt-openssh-askpass_hu.qm
+%%LXQT_TRANSLATIONS%%/lxqt-openssh-askpass/lxqt-openssh-askpass_id.qm
+%%LXQT_TRANSLATIONS%%/lxqt-openssh-askpass/lxqt-openssh-askpass_it.qm
+%%LXQT_TRANSLATIONS%%/lxqt-openssh-askpass/lxqt-openssh-askpass_ja.qm
+%%LXQT_TRANSLATIONS%%/lxqt-openssh-askpass/lxqt-openssh-askpass_lt.qm
+%%LXQT_TRANSLATIONS%%/lxqt-openssh-askpass/lxqt-openssh-askpass_nb_NO.qm
+%%LXQT_TRANSLATIONS%%/lxqt-openssh-askpass/lxqt-openssh-askpass_nl.qm
+%%LXQT_TRANSLATIONS%%/lxqt-openssh-askpass/lxqt-openssh-askpass_pl.qm
+%%LXQT_TRANSLATIONS%%/lxqt-openssh-askpass/lxqt-openssh-askpass_pt.qm
+%%LXQT_TRANSLATIONS%%/lxqt-openssh-askpass/lxqt-openssh-askpass_ru.qm
+%%LXQT_TRANSLATIONS%%/lxqt-openssh-askpass/lxqt-openssh-askpass_tr.qm
+%%LXQT_TRANSLATIONS%%/lxqt-openssh-askpass/lxqt-openssh-askpass_uk.qm
+%%LXQT_TRANSLATIONS%%/lxqt-openssh-askpass/lxqt-openssh-askpass_zh_CN.qm
Modified: head/security/lxqt-sudo/Makefile
==============================================================================
--- head/security/lxqt-sudo/Makefile Thu Mar 28 17:33:54 2019 (r497046)
+++ head/security/lxqt-sudo/Makefile Thu Mar 28 17:59:33 2019 (r497047)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= lxqt-sudo
-PORTVERSION= 0.13.0
-PORTREVISION= 2
+PORTVERSION= 0.14.0
CATEGORIES= security
MASTER_SITES= LXQT
@@ -14,7 +13,7 @@ LICENSE= LGPL21+
RUN_DEPENDS= sudo:security/sudo
-USES= cmake compiler:c++11-lib gettext kde:5 lxqt qt:5 \
+USES= cmake compiler:c++14-lang gettext kde:5 lxqt qt:5 \
pkgconfig tar:xz
USE_QT= buildtools_build qmake_build core dbus gui svg widgets \
x11extras xml
Modified: head/security/lxqt-sudo/distinfo
==============================================================================
--- head/security/lxqt-sudo/distinfo Thu Mar 28 17:33:54 2019 (r497046)
+++ head/security/lxqt-sudo/distinfo Thu Mar 28 17:59:33 2019 (r497047)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527328596
-SHA256 (lxqt/lxqt-sudo-0.13.0.tar.xz) = 8e05adf4926eead9fa3015be54a76f67ebf3f7c40e1dea0bcafbcf4c38e548c8
-SIZE (lxqt/lxqt-sudo-0.13.0.tar.xz) = 16208
+TIMESTAMP = 1548968509
+SHA256 (lxqt/lxqt-sudo-0.14.0.tar.xz) = a322e169a5b6c5decbabe837fad428ac9013d9173723f6e0525a62b11bd1a123
+SIZE (lxqt/lxqt-sudo-0.14.0.tar.xz) = 27684
Modified: head/security/lxqt-sudo/files/patch-sudo.cpp
==============================================================================
--- head/security/lxqt-sudo/files/patch-sudo.cpp Thu Mar 28 17:33:54 2019 (r497046)
+++ head/security/lxqt-sudo/files/patch-sudo.cpp Thu Mar 28 17:59:33 2019 (r497047)
@@ -1,9 +1,9 @@
---- sudo.cpp.orig 2018-05-21 19:10:17 UTC
+--- sudo.cpp.orig 2019-01-25 23:40:04 UTC
+++ sudo.cpp
-@@ -36,7 +36,13 @@
- #include <QSocketNotifier>
- #include <QDebug>
+@@ -38,7 +38,13 @@
#include <QThread>
+ #include <QProcessEnvironment>
+ #include <QTimer>
+#if defined(__linux__)
#include <pty.h>
+#elif defined(__FreeBSD__)
@@ -14,7 +14,7 @@
#include <unistd.h>
#include <memory>
#include <csignal>
-@@ -52,6 +58,9 @@ namespace
+@@ -56,6 +62,9 @@ namespace
const QString su_prog{QStringLiteral(LXQTSUDO_SU)};
const QString sudo_prog{QStringLiteral(LXQTSUDO_SUDO)};
@@ -24,37 +24,83 @@
const QString pwd_prompt_end{QStringLiteral(": ")};
const QChar nl{QLatin1Char('\n')};
-@@ -179,6 +188,10 @@ void Sudo::child()
- if (BACK_SU == mBackend)
- {
- program = su_prog.toStdString();
-+#ifdef __FreeBSD__
-+ *(param_arg++) = "-m";
-+ *(param_arg++) = "root";
+@@ -240,27 +249,39 @@ QString Sudo::backendName (backend_t backEnd)
+ void Sudo::child()
+ {
+ int params_cnt = 3 //1. su/sudo & "shell command" & last nullptr
++#ifndef __FreeBSD__
+ + (BACK_SU == mBackend ? 1 : 3); //-c for su | -E /bin/sh -c for sudo
++#else
++ + (BACK_SU == mBackend ? 3 : 3);
+#endif
- *(param_arg++) = "-c"; //run command
+ std::unique_ptr<char const *[]> params{new char const *[params_cnt]};
+ const char ** param_arg = params.get() + 1;
+
+ std::string program = backendName().toLocal8Bit().data();
++ if (BACK_SU == mBackend)
++ {
++ *(param_arg++) = "-m";
++ *(param_arg++) = "root";
++ *(param_arg++) = "-c";
++ }
+ if (BACK_SUDO == mBackend)
+ {
++
+ *(param_arg++) = "-E"; //preserve environment
+ *(param_arg++) = "/bin/sh";
++ *(param_arg++) = "-c"; //run command
+ }
+- *(param_arg++) = "-c"; //run command
+
+ params[0] = program.c_str();
+-
+ // Note: we force the su/sudo to communicate with us in the simplest
+ // locale and then set the locale back for the command
+- char const * const env_lc_all = getenv("LC_ALL");
++
+ std::string command;
++#ifndef __FreeBSD__
++ char const * const env_lc_all = getenv("LC_ALL");
+ if (env_lc_all == nullptr)
+ {
+- command = "unset LC_ALL; ";
++ command = "unset LC_ALL;";
} else
{
-@@ -200,7 +213,6 @@ void Sudo::child()
+ // Note: we need to check if someone is not trying to inject commands
+@@ -276,6 +297,9 @@ void Sudo::child()
+ }
+ command += "exec ";
+ command += squashedArgs().toLocal8Bit().data();
++#else
++ command = squashedArgs().toLocal8Bit().data();
++#endif
+ *(param_arg++) = command.c_str();
+ *param_arg = nullptr;
+@@ -283,12 +307,11 @@ void Sudo::child()
+ setenv("LC_ALL", "C", 1);
+
+ env_workarounds();
+-
setsid(); //session leader
execvp(params[0], const_cast<char **>(params.get()));
-
//exec never returns in case of success
QTextStream{stderr, QIODevice::WriteOnly} << tr("%1: Failed to exec '%2': %3\n").arg(app_master).arg(params[0]).arg(strerror(errno));
++
exit(1);
-@@ -277,8 +289,13 @@ int Sudo::parent()
- lxqtApp->quit();
+ }
+
+@@ -354,7 +377,11 @@ int Sudo::parent()
+ }
} else
{
-- if (line.endsWith(pwd_prompt_end))
+#ifdef __FreeBSD__
+ if( line.endsWith(pwd_prompt_end_c_locale) || line.endsWith(pwd_prompt_end))
+#else
-+ if(line.endsWith(pwd_prompt_end))
+ if (line.endsWith(pwd_prompt_end))
+#endif
{
-+
//if now echo is turned off, su/sudo requests password
struct termios tios;
- //loop to be sure we don't miss the flag (we can afford such small delay in "normal" output processing)
Modified: head/security/lxqt-sudo/pkg-plist
==============================================================================
--- head/security/lxqt-sudo/pkg-plist Thu Mar 28 17:33:54 2019 (r497046)
+++ head/security/lxqt-sudo/pkg-plist Thu Mar 28 17:59:33 2019 (r497047)
@@ -4,3 +4,30 @@ bin/lxsudo
man/man1/lxqt-sudo.1.gz
man/man1/lxsu.1.gz
man/man1/lxsudo.1.gz
+%%LXQT_TRANSLATIONS%%/lxqt-sudo/lxqt-sudo_ar.qm
+%%LXQT_TRANSLATIONS%%/lxqt-sudo/lxqt-sudo_ca.qm
+%%LXQT_TRANSLATIONS%%/lxqt-sudo/lxqt-sudo_cs.qm
+%%LXQT_TRANSLATIONS%%/lxqt-sudo/lxqt-sudo_cy.qm
+%%LXQT_TRANSLATIONS%%/lxqt-sudo/lxqt-sudo_da.qm
+%%LXQT_TRANSLATIONS%%/lxqt-sudo/lxqt-sudo_de.qm
+%%LXQT_TRANSLATIONS%%/lxqt-sudo/lxqt-sudo_el.qm
+%%LXQT_TRANSLATIONS%%/lxqt-sudo/lxqt-sudo_es.qm
+%%LXQT_TRANSLATIONS%%/lxqt-sudo/lxqt-sudo_fi.qm
+%%LXQT_TRANSLATIONS%%/lxqt-sudo/lxqt-sudo_fr.qm
+%%LXQT_TRANSLATIONS%%/lxqt-sudo/lxqt-sudo_gl.qm
+%%LXQT_TRANSLATIONS%%/lxqt-sudo/lxqt-sudo_he.qm
+%%LXQT_TRANSLATIONS%%/lxqt-sudo/lxqt-sudo_hu.qm
+%%LXQT_TRANSLATIONS%%/lxqt-sudo/lxqt-sudo_id.qm
+%%LXQT_TRANSLATIONS%%/lxqt-sudo/lxqt-sudo_it.qm
+%%LXQT_TRANSLATIONS%%/lxqt-sudo/lxqt-sudo_ja.qm
+%%LXQT_TRANSLATIONS%%/lxqt-sudo/lxqt-sudo_lt.qm
+%%LXQT_TRANSLATIONS%%/lxqt-sudo/lxqt-sudo_nb_NO.qm
+%%LXQT_TRANSLATIONS%%/lxqt-sudo/lxqt-sudo_nl.qm
+%%LXQT_TRANSLATIONS%%/lxqt-sudo/lxqt-sudo_pl.qm
+%%LXQT_TRANSLATIONS%%/lxqt-sudo/lxqt-sudo_pt.qm
+%%LXQT_TRANSLATIONS%%/lxqt-sudo/lxqt-sudo_ru.qm
+%%LXQT_TRANSLATIONS%%/lxqt-sudo/lxqt-sudo_sk.qm
+%%LXQT_TRANSLATIONS%%/lxqt-sudo/lxqt-sudo_tr.qm
+%%LXQT_TRANSLATIONS%%/lxqt-sudo/lxqt-sudo_uk.qm
+%%LXQT_TRANSLATIONS%%/lxqt-sudo/lxqt-sudo_zh_CN.qm
+%%LXQT_TRANSLATIONS%%/lxqt-sudo/lxqt-sudo_zh_TW.qm
Modified: head/sysutils/libsysstat/Makefile
==============================================================================
--- head/sysutils/libsysstat/Makefile Thu Mar 28 17:33:54 2019 (r497046)
+++ head/sysutils/libsysstat/Makefile Thu Mar 28 17:59:33 2019 (r497047)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= libsysstat
-PORTVERSION= 0.4.1
-PORTREVISION= 2
+PORTVERSION= 0.4.2
CATEGORIES= sysutils
MASTER_SITES= LXQT/${PORTNAME}
@@ -15,6 +14,7 @@ LICENSE= LGPL21
USES= cmake compiler:c++11-lang lxqt pkgconfig tar:xz qt:5
USE_QT= qmake_build buildtools_build core
USE_LXQT= buildtools
+USE_LDCONFIG= yes
post-extract:
@${CP} ${FILESDIR}/config.h.in ${WRKSRC};
Modified: head/sysutils/libsysstat/distinfo
==============================================================================
--- head/sysutils/libsysstat/distinfo Thu Mar 28 17:33:54 2019 (r497046)
+++ head/sysutils/libsysstat/distinfo Thu Mar 28 17:59:33 2019 (r497047)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1532774948
-SHA256 (lxqt/libsysstat-0.4.1.tar.xz) = c376e5c3a650d56873f2bd757292282f6b6b5af7ecc6d24c7a4df7b8c646ff59
-SIZE (lxqt/libsysstat-0.4.1.tar.xz) = 17304
+TIMESTAMP = 1548874003
+SHA256 (lxqt/libsysstat-0.4.2.tar.xz) = fca482b60fab63bd1eddb594631c76c1373a3b1fcdba19129d49653813e1e967
+SIZE (lxqt/libsysstat-0.4.2.tar.xz) = 17508
Modified: head/sysutils/libsysstat/files/patch-CMakeLists.txt
==============================================================================
--- head/sysutils/libsysstat/files/patch-CMakeLists.txt Thu Mar 28 17:33:54 2019 (r497046)
+++ head/sysutils/libsysstat/files/patch-CMakeLists.txt Thu Mar 28 17:59:33 2019 (r497047)
@@ -1,26 +1,25 @@
---- CMakeLists.txt.orig 2018-05-21 17:16:59 UTC
+--- CMakeLists.txt.orig 2019-01-24 21:43:32 UTC
+++ CMakeLists.txt
-@@ -24,6 +24,16 @@ include(LXQtCreatePkgConfigFile)
+@@ -27,7 +27,14 @@ include(LXQtPreventInSourceBuilds)
+ include(LXQtCreatePkgConfigFile)
include(LXQtCreatePortableHeaders)
include(LXQtCompilerSettings NO_POLICY_SCOPE)
-
+include(CheckIncludeFiles)
+include(CheckLibraryExists)
-+
+check_include_files("sys/socket.h;net/if.h;net/if_mib.h;net/if_types.h" HAVE_IF_H)
+check_library_exists(kvm kvm_getswapinfo "kvm.h" HAVE_KVM_H)
+check_library_exists(c sysctlbyname "sys/sysctl.h" HAVE_SYSCTL_H)
-+
+
+configure_file(config.h.in config.h)
+add_definitions("-DHAVE_CONFIG_H=1")
-+
set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
-@@ -81,7 +91,11 @@ add_library(${SYSSTAT_LIBRARY_NAME}
+@@ -79,8 +86,11 @@ add_library(${SYSSTAT_LIBRARY_NAME}
+ ${SYSSTAT_SRCS}
${SYSSTAT_QM_FILES}
)
-
+-
-target_link_libraries(${SYSSTAT_LIBRARY_NAME} Qt5::Core)
+if(HAVE_SYSCTL_H AND HAVE_KVM_H)
+ target_link_libraries(${SYSSTAT_LIBRARY_NAME} c kvm Qt5::Core)
Modified: head/sysutils/libsysstat/files/patch-cpustat.cpp
==============================================================================
--- head/sysutils/libsysstat/files/patch-cpustat.cpp Thu Mar 28 17:33:54 2019 (r497046)
+++ head/sysutils/libsysstat/files/patch-cpustat.cpp Thu Mar 28 17:59:33 2019 (r497047)
@@ -1,10 +1,8 @@
---- cpustat.cpp.orig 2018-05-21 17:16:59 UTC
+--- cpustat.cpp.orig 2019-01-24 21:43:32 UTC
+++ cpustat.cpp
-@@ -25,13 +25,64 @@
-
-
+@@ -27,11 +27,62 @@
#include <unistd.h>
--
+
#include "cpustat.h"
+#ifdef HAVE_SYSCTL_H
+extern "C"
@@ -18,7 +16,6 @@
+ #include <sys/sysctl.h>
+}
+#endif
-+
#include "cpustat_p.h"
@@ -27,7 +24,7 @@
+char *GetFirstFragment(char *string, const char *delim)
+{
+ char *token = NULL;
-+
+
+ token = strsep(&string, delim);
+ if (token != NULL)
+ {
@@ -60,13 +57,13 @@
+ return 0;
+ else
+ return freq;
-
++
+}
+#endif
CpuStatPrivate::CpuStatPrivate(CpuStat *parent)
: BaseStatPrivate(parent)
, mMonitoring(CpuStat::LoadAndFrequency)
-@@ -39,7 +90,11 @@ CpuStatPrivate::CpuStatPrivate(CpuStat *
+@@ -39,7 +90,11 @@ CpuStatPrivate::CpuStatPrivate(CpuStat *parent)
mSource = defaultSource();
connect(mTimer, SIGNAL(timeout()), SLOT(timeout()));
@@ -79,57 +76,57 @@
mUserHz = sysconf(_SC_CLK_TCK);
updateSources();
-@@ -47,6 +102,49 @@ CpuStatPrivate::CpuStatPrivate(CpuStat *
+@@ -47,6 +102,49 @@ CpuStatPrivate::CpuStatPrivate(CpuStat *parent)
void CpuStatPrivate::addSource(const QString &source)
{
+#ifdef HAVE_SYSCTL_H
-+ char buf[1024];
-+ char *tokens, *t;
-+ ulong min = 0, max = 0;
-+ size_t len = sizeof(buf);
++ char buf[1024];
++ char *tokens, *t;
++ ulong min = 0, max = 0;
++ size_t len = sizeof(buf);
+
-+ /* The string returned by the dev.cpu.0.freq_levels sysctl
-+ * is a space separated list of MHz/milliwatts.
-+ */
-+ if (sysctlbyname("dev.cpu.0.freq_levels", buf, &len, NULL, 0) < 0)
-+ return;
++ /* The string returned by the dev.cpu.0.freq_levels sysctl
++ * is a space separated list of MHz/milliwatts.
++ */
++ if (sysctlbyname("dev.cpu.0.freq_levels", buf, &len, NULL, 0) < 0)
++ return;
+
-+ t = strndup(buf, len);
-+ if (t == NULL)
-+ {
-+ free(t);
-+ return;
-+ }
-+
-+ while ((tokens = strsep(&t, " ")) != NULL)
-+ {
-+ char *freq;
-+ ulong res;
-+
-+ freq = GetFirstFragment(tokens, "/");
-+ if (freq != NULL)
-+ {
-+ res = strtoul(freq, &freq, 10);
-+ if (res > max)
++ t = strndup(buf, len);
++ if (t == NULL)
+ {
-+ max = res;
++ free(t);
++ return;
+ }
-+ else
++
++ while ((tokens = strsep(&t, " ")) != NULL)
+ {
-+ if ((min == 0) || (res < min))
-+ min = res;
++ char *freq;
++ ulong res;
++
++ freq = GetFirstFragment(tokens, "/");
++ if (freq != NULL)
++ {
++ res = strtoul(freq, &freq, 10);
++ if (res > max)
++ {
++ max = res;
++ }
++ else
++ {
++ if ((min == 0) || (res < min))
++ min = res;
++ }
++ }
+ }
-+ }
-+ }
+
-+ free(t);
-+ mBounds[source] = qMakePair(min, max);
-+#else
++ free(t);
++ mBounds[source] = qMakePair(min, max);
++ #else
bool ok;
- uint min = readAllFile(qPrintable(QString("/sys/devices/system/cpu/%1/cpufreq/scaling_min_freq").arg(source))).toUInt(&ok);
-@@ -56,12 +154,27 @@ void CpuStatPrivate::addSource(const QSt
+ uint min = readAllFile(qPrintable(QString::fromLatin1("/sys/devices/system/cpu/%1/cpufreq/scaling_min_freq").arg(source))).toUInt(&ok);
+@@ -56,12 +154,27 @@ void CpuStatPrivate::addSource(const QString &source)
if (ok)
mBounds[source] = qMakePair(min, max);
}
@@ -142,23 +139,23 @@
+#ifdef HAVE_SYSCTL_H
+ mBounds.clear();
+ int cpu;
-+
+
+ cpu = GetCpu();
-+ mSources.append("cpu"); // Linux has cpu in /proc/stat
++ mSources.append(QStringLiteral("cpu")); // Linux has cpu in /proc/stat
+ for (int i =0;i<cpu;i++)
+ {
-+ mSources.append(QString("cpu%1").arg(i));
++ mSources.append(QString::fromLatin1("cpu%1").arg(i));
+
+
-
-+ addSource(QString("cpu%1").arg(i));
++
++ addSource(QString::fromLatin1("cpu%1").arg(i));
+ }
+#else
- const QStringList rows = readAllFile("/proc/stat").split(QChar('\n'), QString::SkipEmptyParts);
+ const QStringList rows = readAllFile("/proc/stat").split(QLatin1Char('\n'), QString::SkipEmptyParts);
for (const QString &row : rows)
{
@@ -99,6 +212,7 @@ void CpuStatPrivate::updateSources()
- addSource(QString("cpu%1").arg(number));
+ addSource(QString::fromLatin1("cpu%1").arg(number));
}
}
+#endif
@@ -170,86 +167,86 @@
void CpuStatPrivate::timeout()
{
+#ifdef HAVE_SYSCTL_H
-+ if ( (mMonitoring == CpuStat::LoadOnly)
-+ || (mMonitoring == CpuStat::LoadAndFrequency) )
-+ {
-+ int cpuNumber=0;
-+ long *cp_times=0;
-+ if(mSource!="cpu") {
-+ size_t cp_size = sizeof(long) * CPUSTATES * GetCpu();
-+ cp_times = (long *)malloc(cp_size);
-+ cpuNumber = mSource.midRef(3).toInt();
-+ if (sysctl(mib0,2, cp_times, &cp_size, NULL, 0) < 0)
-+ free(cp_times);
-+ } else {
-+ size_t cp_size = sizeof(long)*CPUSTATES;
-+ cp_times = (long *)malloc(cp_size);
-+ if(sysctl(mib1,2,cp_times,&cp_size,NULL,0) < 0)
-+ free(cp_times);
-+ }
-+ Values current;
-+ current.user = static_cast<ulong>(cp_times[CP_USER+cpuNumber*CPUSTATES]);
-+ current.nice = static_cast<ulong>(cp_times[CP_NICE+cpuNumber*CPUSTATES]);
-+ current.system = static_cast<ulong>(cp_times[CP_SYS+cpuNumber*CPUSTATES]);
-+ current.idle = static_cast<ulong>(cp_times[CP_IDLE+cpuNumber*CPUSTATES]);
-+ current.other = static_cast<ulong>(cp_times[CP_INTR+cpuNumber*CPUSTATES]);
-+ current.total = current.user + current.nice + current.system+current.idle+current.other;
++ if ( (mMonitoring == CpuStat::LoadOnly)
++ || (mMonitoring == CpuStat::LoadAndFrequency) )
++ {
++ int cpuNumber=0;
++ long *cp_times=0;
++ if(mSource!=QLatin1String("cpu")) {
++ size_t cp_size = sizeof(long) * CPUSTATES * GetCpu();
++ cp_times = (long *)malloc(cp_size);
++ cpuNumber = mSource.midRef(3).toInt();
++ if (sysctl(mib0,2, cp_times, &cp_size, NULL, 0) < 0)
++ free(cp_times);
++ } else {
++ size_t cp_size = sizeof(long)*CPUSTATES;
++ cp_times = (long *)malloc(cp_size);
++ if(sysctl(mib1,2,cp_times,&cp_size,NULL,0) < 0)
++ free(cp_times);
++ }
++ Values current;
++ current.user = static_cast<ulong>(cp_times[CP_USER+cpuNumber*CPUSTATES]);
++ current.nice = static_cast<ulong>(cp_times[CP_NICE+cpuNumber*CPUSTATES]);
++ current.system = static_cast<ulong>(cp_times[CP_SYS+cpuNumber*CPUSTATES]);
++ current.idle = static_cast<ulong>(cp_times[CP_IDLE+cpuNumber*CPUSTATES]);
++ current.other = static_cast<ulong>(cp_times[CP_INTR+cpuNumber*CPUSTATES]);
++ current.total = current.user + current.nice + current.system+current.idle+current.other;
+
-+ float sumDelta = static_cast<float>(current.total - mPrevious.total);
++ float sumDelta = static_cast<float>(current.total - mPrevious.total);
+
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list