- Update to 0.4

- Remove unneeded patch

5 files changed, 9 insertions, 38 deletions

diff --git a/x11-themes/adwaita-common/Makefile b/x11-themes/adwaita-common/Makefile
index 2d1f7f438f6..c931065b49b 100644
--- a/x11-themes/adwaita-common/Makefile
+++ b/x11-themes/adwaita-common/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	adwaita
-PORTVERSION=	0.3
+PORTVERSION=	0.4
 CATEGORIES=	x11-themes
 PKGNAMESUFFIX=	-common
 
diff --git a/x11-themes/adwaita-common/distinfo b/x11-themes/adwaita-common/distinfo
index 4948fe55021..433099e728b 100644
--- a/x11-themes/adwaita-common/distinfo
+++ b/x11-themes/adwaita-common/distinfo
@@ -1,2 +1,2 @@
-SHA256 (MartinBriza-adwaita-qt-0.3_GH0.tar.gz) = 92f1a2c7afe5badb98bf63a907516ae9c48ddb0d1bfa6904116d1b6b999cf384
-SIZE (MartinBriza-adwaita-qt-0.3_GH0.tar.gz) = 869322
+SHA256 (MartinBriza-adwaita-qt-0.4_GH0.tar.gz) = 48ccf17088afb77e98fe409f4dc6fdccd035bbdbcb51f0c2f0da00ef204daba0
+SIZE (MartinBriza-adwaita-qt-0.4_GH0.tar.gz) = 871126
diff --git a/x11-themes/adwaita-qt4/Makefile b/x11-themes/adwaita-qt4/Makefile
index bdfa17225ca..9f6fff762c4 100644
--- a/x11-themes/adwaita-qt4/Makefile
+++ b/x11-themes/adwaita-qt4/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	adwaita
-PORTVERSION=	0.3
+PORTVERSION=	0.4
 CATEGORIES=	x11-themes
 PKGNAMESUFFIX=	-qt4
 
@@ -12,7 +12,7 @@ COMMENT=	Adwaita theme for Qt5 applications
 LICENSE=	GPLv2 LGPL20
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	adwaita-common>=0.3:x11-themes/adwaita-common
+RUN_DEPENDS=	adwaita-common>=0.4:x11-themes/adwaita-common
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MartinBriza
@@ -22,11 +22,9 @@ DISTINFO_FILE=	${.CURDIR}/../adwaita-common/distinfo
 EXTRA_PATCHES=	${.CURDIR}/../adwaita-qt5/files/patch-CMakeLists.txt
 PLIST_FILES=	%%QT_PLUGINDIR%%/styles/adwaita.so
 
-USES=	cmake:outsource compiler:c++11-lib pkgconfig
+USES=	cmake:outsource compiler:c++11-lib localbase pkgconfig
 USE_QT4=	moc_build rcc_build uic_build qmake_build corelib gui
 
-CXXFLAGS+=	-I${LOCALBASE}/include
-
 CMAKE_ARGS+=	-DBUILD_EXAMPLE:BOOL=OFF \
 	-DUSE_QT4:BOOL=ON
 
diff --git a/x11-themes/adwaita-qt5/Makefile b/x11-themes/adwaita-qt5/Makefile
index 41d4b9ec2b7..3d084440596 100644
--- a/x11-themes/adwaita-qt5/Makefile
+++ b/x11-themes/adwaita-qt5/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	adwaita
-PORTVERSION=	0.3
+PORTVERSION=	0.4
 CATEGORIES=	x11-themes
 PKGNAMESUFFIX=	-qt5
 
@@ -12,7 +12,7 @@ COMMENT=	Adwaita theme for Qt5 applications
 LICENSE=	GPLv2 LGPL20
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	adwaita-common>=0.3:x11-themes/adwaita-common
+RUN_DEPENDS=	adwaita-common>=0.4:x11-themes/adwaita-common
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MartinBriza
@@ -21,11 +21,9 @@ GH_PROJECT=	adwaita-qt
 DISTINFO_FILE=	${.CURDIR}/../adwaita-common/distinfo
 PLIST_FILES=	%%QT_PLUGINDIR%%/styles/adwaita.so
 
-USES=	cmake:outsource compiler:c++11-lib pkgconfig
+USES=	cmake:outsource compiler:c++11-lib localbase pkgconfig
 USE_QT5=	buildtools_build qmake_build core gui widgets
 
-CXXFLAGS+=	-I${LOCALBASE}/include
-
 CMAKE_ARGS+=	-DBUILD_EXAMPLE:BOOL=OFF
 
 .include <bsd.port.mk>
diff --git a/x11-themes/adwaita-qt5/files/patch-src_style_adwaita.cpp b/x11-themes/adwaita-qt5/files/patch-src_style_adwaita.cpp
deleted file mode 100644
index 4d8a483badc..00000000000
--- a/x11-themes/adwaita-qt5/files/patch-src_style_adwaita.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/style/adwaita.cpp.orig	2015-07-20 11:19:10 UTC
-+++ src/style/adwaita.cpp
-@@ -1,6 +1,6 @@
- /*
-  * Adwaita Qt Theme
-- * Copyright (C) 2014 Martin Bříza <mbriza@redhat.com>
-+ * Copyright (C) 2014 Martin Bríza <mbriza@redhat.com>
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -19,10 +19,10 @@
-  */
- 
- #include <QtGui>
--#include <QtGui/QPainter>
--#include <QtGui/QTransform>
--#include <QtGui/QRgb>
--#include <QtGui/QSizePolicy>
-+#include <QPainter>
-+#include <QTransform>
-+#include <QRgb>
-+#include <QSizePolicy>
- 
- #include "adwaita.h"
- #include "config.h"