5 files changed, 75 insertions, 39 deletions

diff --git a/x11-themes/Kvantum/Makefile b/x11-themes/Kvantum/Makefile
index c6648737e77a..31ea5847a0dd 100644
--- a/x11-themes/Kvantum/Makefile
+++ b/x11-themes/Kvantum/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=	Kvantum
 DISTVERSIONPREFIX=	V
-DISTVERSION=	0.10.9
-PORTREVISION=	1
+DISTVERSION=	0.10.10
 CATEGORIES=	x11-themes
 PKGNAMESUFFIX=	-qt5
 
@@ -14,19 +13,16 @@ LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		compiler:c++11-lang kde:5 qmake qt:5
-USE_XORG=	x11 xext
-USE_LDCONFIG=	yes
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	tsujan
+
+USE_LDCONFIG=	yes
 USE_KDE=	windowsystem
 USE_QT=		core gui svg widgets x11extras buildtools_build \
 		linguisttools_build
+USE_XORG=	x11 xext
 
 WRKSRC_SUBDIR=	${PORTNAME}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|/kde4/|/|g' ${WRKSRC}/style/style.pro
-	@${REINPLACE_CMD} -e 's|/kde4/|/|g' -e 's|--no-preserve=mode||g' \
-		${WRKSRC}/themes/themes.pro
-
 .include <bsd.port.mk>
diff --git a/x11-themes/Kvantum/distinfo b/x11-themes/Kvantum/distinfo
index 769702b9c27d..a40ba24d3ede 100644
--- a/x11-themes/Kvantum/distinfo
+++ b/x11-themes/Kvantum/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549636771
-SHA256 (tsujan-Kvantum-V0.10.9_GH0.tar.gz) = e588c2e7acbc00b2ccf197dc34e09a3bc4c1f5d4574f26b929ad372177183041
-SIZE (tsujan-Kvantum-V0.10.9_GH0.tar.gz) = 2314969
+TIMESTAMP = 1553182671
+SHA256 (tsujan-Kvantum-V0.10.10_GH0.tar.gz) = e21fb70ff3260d83b317d0902a0468a7446d840b632d043ee860597501529a09
+SIZE (tsujan-Kvantum-V0.10.10_GH0.tar.gz) = 2350551
diff --git a/x11-themes/Kvantum/files/patch-style_style.pro b/x11-themes/Kvantum/files/patch-style_style.pro
new file mode 100644
index 000000000000..5851e484401c
--- /dev/null
+++ b/x11-themes/Kvantum/files/patch-style_style.pro
@@ -0,0 +1,10 @@
+--- style/style.pro.orig	2019-03-19 23:11:41 UTC
++++ style/style.pro
+@@ -62,7 +62,6 @@ unix {
+   isEmpty(PREFIX) {
+     PREFIX = /usr
+   }
+-  COLORSDIR =$$PREFIX/share/kde4/apps/color-schemes
+   KF5COLORSDIR =$$PREFIX/share/color-schemes
+   DATADIR =$$PREFIX/share
+ 
diff --git a/x11-themes/Kvantum/files/patch-themes_themes.pro b/x11-themes/Kvantum/files/patch-themes_themes.pro
new file mode 100644
index 000000000000..3094a2ff5f04
--- /dev/null
+++ b/x11-themes/Kvantum/files/patch-themes_themes.pro
@@ -0,0 +1,18 @@
+--- themes/themes.pro.orig	2019-03-19 23:10:32 UTC
++++ themes/themes.pro
+@@ -6,7 +6,6 @@ unix {
+     PREFIX = /usr
+   }
+   KVDIR = $$PREFIX/share/Kvantum
+-  COLORSDIR = $$PREFIX/share/kde4/apps/color-schemes
+   KF5COLORSDIR = $$PREFIX/share/color-schemes
+   OBDIR = $$PREFIX/share/themes
+ 
+@@ -14,7 +13,6 @@ unix {
+   QMAKE_INSTALL_DIR = cp -f -R --no-preserve=mode
+   kv.path = $$KVDIR
+   kv.files += ./kvthemes/*
+-  colors.path = $$COLORSDIR
+   colors.files += ./colors/*.colors
+   kf5colors.path = $$KF5COLORSDIR
+   kf5colors.files += ./colors/*.colors
diff --git a/x11-themes/Kvantum/pkg-plist b/x11-themes/Kvantum/pkg-plist
index 161a39abab5e..8287bcb1a7f6 100644
--- a/x11-themes/Kvantum/pkg-plist
+++ b/x11-themes/Kvantum/pkg-plist
@@ -64,33 +64,6 @@ bin/kvantumpreview
 %%DATADIR%%/KvantumAlt/KvantumAlt.kvconfig
 %%DATADIR%%/KvantumAlt/KvantumAlt.svg
 share/applications/kvantummanager.desktop
-share/apps/color-schemes/KvAdapta.colors
-share/apps/color-schemes/KvAdaptaDark.colors
-share/apps/color-schemes/KvAmbiance.colors
-share/apps/color-schemes/KvAmbience.colors
-share/apps/color-schemes/KvArc.colors
-share/apps/color-schemes/KvArcDark.colors
-share/apps/color-schemes/KvBeige.colors
-share/apps/color-schemes/KvBrown.colors
-share/apps/color-schemes/KvCurves.colors
-share/apps/color-schemes/KvCurvesLight.colors
-share/apps/color-schemes/KvCyan.colors
-share/apps/color-schemes/KvDarkRed.colors
-share/apps/color-schemes/KvFlat.colors
-share/apps/color-schemes/KvFlatLight.colors
-share/apps/color-schemes/KvFlatRed.colors
-share/apps/color-schemes/KvGnome.colors
-share/apps/color-schemes/KvGnomeDark.colors
-share/apps/color-schemes/KvGray.colors
-share/apps/color-schemes/KvMojave.colors
-share/apps/color-schemes/KvMojaveLight.colors
-share/apps/color-schemes/KvOxygen.colors
-share/apps/color-schemes/KvRoughGlass.colors
-share/apps/color-schemes/KvSimplicity.colors
-share/apps/color-schemes/KvSimplicityDark.colors
-share/apps/color-schemes/KvSimplicityTurquoise.colors
-share/apps/color-schemes/KvYaru.colors
-share/apps/color-schemes/KvantumAlt.colors
 share/color-schemes/KvAdapta.colors
 share/color-schemes/KvAdaptaDark.colors
 share/color-schemes/KvAmbiance.colors
@@ -107,7 +80,9 @@ share/color-schemes/KvFlat.colors
 share/color-schemes/KvFlatLight.colors
 share/color-schemes/KvFlatRed.colors
 share/color-schemes/KvGnome.colors
+share/color-schemes/KvGnomeAlt.colors
 share/color-schemes/KvGnomeDark.colors
+share/color-schemes/KvGnomish.colors
 share/color-schemes/KvGray.colors
 share/color-schemes/KvMojave.colors
 share/color-schemes/KvMojaveLight.colors
@@ -125,7 +100,9 @@ share/kvantummanager/translations/kvantummanager_de.qm
 share/kvantummanager/translations/kvantummanager_eo.qm
 share/kvantummanager/translations/kvantummanager_es.qm
 share/kvantummanager/translations/kvantummanager_et.qm
+share/kvantummanager/translations/kvantummanager_fr.qm
 share/kvantummanager/translations/kvantummanager_id.qm
+share/kvantummanager/translations/kvantummanager_it.qm
 share/kvantummanager/translations/kvantummanager_lt.qm
 share/kvantummanager/translations/kvantummanager_nl.qm
 share/kvantummanager/translations/kvantummanager_pl.qm
@@ -134,6 +111,7 @@ share/kvantumpreview/translations/kvantumpreview_cy.qm
 share/kvantumpreview/translations/kvantumpreview_de.qm
 share/kvantumpreview/translations/kvantumpreview_eo.qm
 share/kvantumpreview/translations/kvantumpreview_es.qm
+share/kvantumpreview/translations/kvantumpreview_fr.qm
 share/kvantumpreview/translations/kvantumpreview_lt.qm
 share/kvantumpreview/translations/kvantumpreview_nl.qm
 share/kvantumpreview/translations/kvantumpreview_pt_BR.qm
@@ -341,6 +319,23 @@ share/themes/KvGnome/openbox-3/shade.xbm
 share/themes/KvGnome/openbox-3/shade_hover.xbm
 share/themes/KvGnome/openbox-3/shade_pressed.xbm
 share/themes/KvGnome/openbox-3/themerc
+share/themes/KvGnomeAlt/openbox-3/close.xbm
+share/themes/KvGnomeAlt/openbox-3/close_hover.xbm
+share/themes/KvGnomeAlt/openbox-3/close_pressed.xbm
+share/themes/KvGnomeAlt/openbox-3/desk.xbm
+share/themes/KvGnomeAlt/openbox-3/desk_hover.xbm
+share/themes/KvGnomeAlt/openbox-3/desk_toggled.xbm
+share/themes/KvGnomeAlt/openbox-3/iconify.xbm
+share/themes/KvGnomeAlt/openbox-3/iconify_hover.xbm
+share/themes/KvGnomeAlt/openbox-3/iconify_pressed.xbm
+share/themes/KvGnomeAlt/openbox-3/max.xbm
+share/themes/KvGnomeAlt/openbox-3/max_hover.xbm
+share/themes/KvGnomeAlt/openbox-3/max_pressed.xbm
+share/themes/KvGnomeAlt/openbox-3/max_toggled.xbm
+share/themes/KvGnomeAlt/openbox-3/shade.xbm
+share/themes/KvGnomeAlt/openbox-3/shade_hover.xbm
+share/themes/KvGnomeAlt/openbox-3/shade_pressed.xbm
+share/themes/KvGnomeAlt/openbox-3/themerc
 share/themes/KvGnomeDark/openbox-3/close.xbm
 share/themes/KvGnomeDark/openbox-3/close_hover.xbm
 share/themes/KvGnomeDark/openbox-3/close_pressed.xbm
@@ -358,6 +353,23 @@ share/themes/KvGnomeDark/openbox-3/shade.xbm
 share/themes/KvGnomeDark/openbox-3/shade_hover.xbm
 share/themes/KvGnomeDark/openbox-3/shade_pressed.xbm
 share/themes/KvGnomeDark/openbox-3/themerc
+share/themes/KvGnomish/openbox-3/close.xbm
+share/themes/KvGnomish/openbox-3/close_hover.xbm
+share/themes/KvGnomish/openbox-3/close_pressed.xbm
+share/themes/KvGnomish/openbox-3/desk.xbm
+share/themes/KvGnomish/openbox-3/desk_hover.xbm
+share/themes/KvGnomish/openbox-3/desk_toggled.xbm
+share/themes/KvGnomish/openbox-3/iconify.xbm
+share/themes/KvGnomish/openbox-3/iconify_hover.xbm
+share/themes/KvGnomish/openbox-3/iconify_pressed.xbm
+share/themes/KvGnomish/openbox-3/max.xbm
+share/themes/KvGnomish/openbox-3/max_hover.xbm
+share/themes/KvGnomish/openbox-3/max_pressed.xbm
+share/themes/KvGnomish/openbox-3/max_toggled.xbm
+share/themes/KvGnomish/openbox-3/shade.xbm
+share/themes/KvGnomish/openbox-3/shade_hover.xbm
+share/themes/KvGnomish/openbox-3/shade_pressed.xbm
+share/themes/KvGnomish/openbox-3/themerc
 share/themes/KvGray/openbox-3/close.xbm
 share/themes/KvGray/openbox-3/close_hover.xbm
 share/themes/KvGray/openbox-3/close_pressed.xbm