Update to 0.4

4 files changed, 147 insertions, 25 deletions

diff --git a/x11-toolkits/granite/Makefile b/x11-toolkits/granite/Makefile
index 082583b09fe6..18ec819fb06a 100644
--- a/x11-toolkits/granite/Makefile
+++ b/x11-toolkits/granite/Makefile
@@ -3,10 +3,10 @@
 #
 
 PORTNAME=	granite
-PORTVERSION=	0.3.1
+PORTVERSION=	0.4
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	https://launchpadlibrarian.net/215905441/ \
-	https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/
+MASTER_SITES=	https://launchpadlibrarian.net/264917936/ \
+	https://launchpad.net/${PORTNAME}/${PORTVERSION}/loki-alpha1/+download/
 
 MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	Extensions of GTK+3 toolkit
@@ -19,10 +19,13 @@ LIB_DEPENDS=	libgee-0.8.so:devel/libgee
 RUN_DEPENDS=	contractor:sysutils/contractor
 
 USES=	cmake gettext pkgconfig tar:xz
-USE_GNOME=	glib20 gtk30 introspection:build
+USE_GNOME=	glib20 gtk30 cairo introspection:build
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-Wno-return-type
 
+post-patch:
+	${REINPLACE_CMD} -e 's|FFREE_|FREE_|' ${WRKSRC}/CMakeLists.txt
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/granite/distinfo b/x11-toolkits/granite/distinfo
index 680461200663..d8246518a9f0 100644
--- a/x11-toolkits/granite/distinfo
+++ b/x11-toolkits/granite/distinfo
@@ -1,2 +1,3 @@
-SHA256 (granite-0.3.1.tar.xz) = 8ec1d61f9aba75f1b3a745e721288b0dfb34cb11d1307be80cef7b0571c2dec6
-SIZE (granite-0.3.1.tar.xz) = 277640
+TIMESTAMP = 1465846882
+SHA256 (granite-0.4.tar.xz) = 73066f393d4c0aa637046e6fa0d6130a2612f277b9e493366f2f99267d85c5d9
+SIZE (granite-0.4.tar.xz) = 289832
diff --git a/x11-toolkits/granite/files/patch-CMakeLists.txt b/x11-toolkits/granite/files/patch-CMakeLists.txt
deleted file mode 100644
index cef4a896aeb2..000000000000
--- a/x11-toolkits/granite/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
---- CMakeLists.txt.orig	2015-08-30 10:13:06 UTC
-+++ CMakeLists.txt
-@@ -66,7 +66,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux"
- elseif (${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
-     set (VALAC_OPTIONS ${VALAC_OPTIONS} --define=DRAGON_FLY)
- elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
--    set (VALAC_OPTIONS ${VALAC_OPTIONS} --define=FFREE_BSD)
-+    set (VALAC_OPTIONS ${VALAC_OPTIONS} --define=FREE_BSD)
- elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
-     set (VALAC_OPTIONS ${VALAC_OPTIONS} --define=NET_BSD)
- elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-@@ -74,7 +74,5 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Op
- endif ()
- 
- add_subdirectory (lib)
--add_subdirectory (demo)
--add_subdirectory (doc)
- add_subdirectory (po)
- add_subdirectory (icons)
diff --git a/x11-toolkits/granite/pkg-plist b/x11-toolkits/granite/pkg-plist
index 50ff8ef230dd..2a0c7b2211c4 100644
--- a/x11-toolkits/granite/pkg-plist
+++ b/x11-toolkits/granite/pkg-plist
@@ -1,3 +1,4 @@
+bin/granite-demo
 include/granite/granite.h
 include/granite/widgets-utils.h
 lib/girepository-1.0/Granite-1.0.typelib
@@ -5,6 +6,7 @@ lib/libgranite.so
 lib/libgranite.so.3
 lib/libgranite.so.3.0.1
 libdata/pkgconfig/granite.pc
+share/applications/granite-demo.desktop
 share/gir-1.0/Granite-1.0.gir
 share/icons/hicolor/16x16/actions/appointment.svg
 share/icons/hicolor/16x16/actions/open-menu.svg
@@ -14,16 +16,44 @@ share/icons/hicolor/24x24/actions/open-menu.svg
 share/icons/hicolor/32x32/actions/open-menu.svg
 share/icons/hicolor/48x48/actions/open-menu.svg
 share/icons/hicolor/scalable/actions/open-menu-symbolic.svg
+share/locale/aa/LC_MESSAGES/granite.mo
+share/locale/ab/LC_MESSAGES/granite.mo
+share/locale/ae/LC_MESSAGES/granite.mo
 share/locale/af/LC_MESSAGES/granite.mo
+share/locale/ak/LC_MESSAGES/granite.mo
 share/locale/am/LC_MESSAGES/granite.mo
+share/locale/an/LC_MESSAGES/granite.mo
 share/locale/ar/LC_MESSAGES/granite.mo
+share/locale/as/LC_MESSAGES/granite.mo
+share/locale/ast/LC_MESSAGES/granite.mo
+share/locale/av/LC_MESSAGES/granite.mo
+share/locale/ay/LC_MESSAGES/granite.mo
+share/locale/az/LC_MESSAGES/granite.mo
+share/locale/ba/LC_MESSAGES/granite.mo
 share/locale/be/LC_MESSAGES/granite.mo
 share/locale/bg/LC_MESSAGES/granite.mo
+share/locale/bh/LC_MESSAGES/granite.mo
+share/locale/bi/LC_MESSAGES/granite.mo
+share/locale/bm/LC_MESSAGES/granite.mo
+share/locale/bn/LC_MESSAGES/granite.mo
+share/locale/bo/LC_MESSAGES/granite.mo
+share/locale/br/LC_MESSAGES/granite.mo
 share/locale/bs/LC_MESSAGES/granite.mo
 share/locale/ca/LC_MESSAGES/granite.mo
+share/locale/ce/LC_MESSAGES/granite.mo
+share/locale/ch/LC_MESSAGES/granite.mo
+share/locale/ckb/LC_MESSAGES/granite.mo
+share/locale/co/LC_MESSAGES/granite.mo
+share/locale/cr/LC_MESSAGES/granite.mo
 share/locale/cs/LC_MESSAGES/granite.mo
+share/locale/cu/LC_MESSAGES/granite.mo
+share/locale/cv/LC_MESSAGES/granite.mo
+share/locale/cy/LC_MESSAGES/granite.mo
 share/locale/da/LC_MESSAGES/granite.mo
 share/locale/de/LC_MESSAGES/granite.mo
+share/locale/dv/LC_MESSAGES/granite.mo
+share/locale/dz/LC_MESSAGES/granite.mo
+share/locale/ee/LC_MESSAGES/granite.mo
 share/locale/el/LC_MESSAGES/granite.mo
 share/locale/en_AU/LC_MESSAGES/granite.mo
 share/locale/en_CA/LC_MESSAGES/granite.mo
@@ -33,47 +63,154 @@ share/locale/es/LC_MESSAGES/granite.mo
 share/locale/et/LC_MESSAGES/granite.mo
 share/locale/eu/LC_MESSAGES/granite.mo
 share/locale/fa/LC_MESSAGES/granite.mo
+share/locale/ff/LC_MESSAGES/granite.mo
 share/locale/fi/LC_MESSAGES/granite.mo
+share/locale/fj/LC_MESSAGES/granite.mo
+share/locale/fo/LC_MESSAGES/granite.mo
 share/locale/fr/LC_MESSAGES/granite.mo
 share/locale/fr_CA/LC_MESSAGES/granite.mo
 share/locale/fy/LC_MESSAGES/granite.mo
+share/locale/ga/LC_MESSAGES/granite.mo
+share/locale/gd/LC_MESSAGES/granite.mo
 share/locale/gl/LC_MESSAGES/granite.mo
+share/locale/gn/LC_MESSAGES/granite.mo
+share/locale/gu/LC_MESSAGES/granite.mo
+share/locale/gv/LC_MESSAGES/granite.mo
+share/locale/ha/LC_MESSAGES/granite.mo
 share/locale/he/LC_MESSAGES/granite.mo
 share/locale/hi/LC_MESSAGES/granite.mo
+share/locale/ho/LC_MESSAGES/granite.mo
 share/locale/hr/LC_MESSAGES/granite.mo
+share/locale/ht/LC_MESSAGES/granite.mo
 share/locale/hu/LC_MESSAGES/granite.mo
 share/locale/hy/LC_MESSAGES/granite.mo
+share/locale/hz/LC_MESSAGES/granite.mo
+share/locale/ia/LC_MESSAGES/granite.mo
 share/locale/id/LC_MESSAGES/granite.mo
+share/locale/ie/LC_MESSAGES/granite.mo
+share/locale/ig/LC_MESSAGES/granite.mo
+share/locale/ii/LC_MESSAGES/granite.mo
+share/locale/ik/LC_MESSAGES/granite.mo
+share/locale/io/LC_MESSAGES/granite.mo
+share/locale/is/LC_MESSAGES/granite.mo
 share/locale/it/LC_MESSAGES/granite.mo
+share/locale/iu/LC_MESSAGES/granite.mo
 share/locale/ja/LC_MESSAGES/granite.mo
+share/locale/jv/LC_MESSAGES/granite.mo
+share/locale/ka/LC_MESSAGES/granite.mo
+share/locale/kg/LC_MESSAGES/granite.mo
+share/locale/ki/LC_MESSAGES/granite.mo
+share/locale/kj/LC_MESSAGES/granite.mo
+share/locale/kk/LC_MESSAGES/granite.mo
+share/locale/kl/LC_MESSAGES/granite.mo
+share/locale/km/LC_MESSAGES/granite.mo
+share/locale/kn/LC_MESSAGES/granite.mo
 share/locale/ko/LC_MESSAGES/granite.mo
+share/locale/kr/LC_MESSAGES/granite.mo
+share/locale/ks/LC_MESSAGES/granite.mo
+share/locale/ku/LC_MESSAGES/granite.mo
+share/locale/kv/LC_MESSAGES/granite.mo
+share/locale/kw/LC_MESSAGES/granite.mo
+share/locale/ky/LC_MESSAGES/granite.mo
+share/locale/la/LC_MESSAGES/granite.mo
 share/locale/lb/LC_MESSAGES/granite.mo
+share/locale/lg/LC_MESSAGES/granite.mo
+share/locale/li/LC_MESSAGES/granite.mo
+share/locale/ln/LC_MESSAGES/granite.mo
+share/locale/lo/LC_MESSAGES/granite.mo
 share/locale/lt/LC_MESSAGES/granite.mo
+share/locale/lu/LC_MESSAGES/granite.mo
 share/locale/lv/LC_MESSAGES/granite.mo
+share/locale/mg/LC_MESSAGES/granite.mo
+share/locale/mh/LC_MESSAGES/granite.mo
+share/locale/mi/LC_MESSAGES/granite.mo
+share/locale/mk/LC_MESSAGES/granite.mo
+share/locale/ml/LC_MESSAGES/granite.mo
+share/locale/mn/LC_MESSAGES/granite.mo
+share/locale/mo/LC_MESSAGES/granite.mo
+share/locale/mr/LC_MESSAGES/granite.mo
 share/locale/ms/LC_MESSAGES/granite.mo
+share/locale/mt/LC_MESSAGES/granite.mo
 share/locale/my/LC_MESSAGES/granite.mo
+share/locale/na/LC_MESSAGES/granite.mo
 share/locale/nb/LC_MESSAGES/granite.mo
+share/locale/nd/LC_MESSAGES/granite.mo
+share/locale/ne/LC_MESSAGES/granite.mo
+share/locale/ng/LC_MESSAGES/granite.mo
 share/locale/nl/LC_MESSAGES/granite.mo
 share/locale/nn/LC_MESSAGES/granite.mo
+share/locale/no/LC_MESSAGES/granite.mo
+share/locale/nr/LC_MESSAGES/granite.mo
+share/locale/nv/LC_MESSAGES/granite.mo
+share/locale/ny/LC_MESSAGES/granite.mo
+share/locale/oc/LC_MESSAGES/granite.mo
+share/locale/oj/LC_MESSAGES/granite.mo
+share/locale/om/LC_MESSAGES/granite.mo
+share/locale/or/LC_MESSAGES/granite.mo
+share/locale/os/LC_MESSAGES/granite.mo
+share/locale/pa/LC_MESSAGES/granite.mo
+share/locale/pi/LC_MESSAGES/granite.mo
 share/locale/pl/LC_MESSAGES/granite.mo
+share/locale/ps/LC_MESSAGES/granite.mo
 share/locale/pt/LC_MESSAGES/granite.mo
 share/locale/pt_BR/LC_MESSAGES/granite.mo
+share/locale/qu/LC_MESSAGES/granite.mo
+share/locale/rm/LC_MESSAGES/granite.mo
+share/locale/rn/LC_MESSAGES/granite.mo
 share/locale/ro/LC_MESSAGES/granite.mo
 share/locale/ru/LC_MESSAGES/granite.mo
 share/locale/rue/LC_MESSAGES/granite.mo
+share/locale/rw/LC_MESSAGES/granite.mo
+share/locale/sa/LC_MESSAGES/granite.mo
+share/locale/sc/LC_MESSAGES/granite.mo
+share/locale/sd/LC_MESSAGES/granite.mo
+share/locale/se/LC_MESSAGES/granite.mo
+share/locale/sg/LC_MESSAGES/granite.mo
+share/locale/si/LC_MESSAGES/granite.mo
 share/locale/sk/LC_MESSAGES/granite.mo
 share/locale/sl/LC_MESSAGES/granite.mo
+share/locale/sm/LC_MESSAGES/granite.mo
 share/locale/sma/LC_MESSAGES/granite.mo
+share/locale/sn/LC_MESSAGES/granite.mo
+share/locale/so/LC_MESSAGES/granite.mo
 share/locale/sq/LC_MESSAGES/granite.mo
 share/locale/sr/LC_MESSAGES/granite.mo
+share/locale/ss/LC_MESSAGES/granite.mo
+share/locale/st/LC_MESSAGES/granite.mo
+share/locale/su/LC_MESSAGES/granite.mo
 share/locale/sv/LC_MESSAGES/granite.mo
+share/locale/sw/LC_MESSAGES/granite.mo
 share/locale/ta/LC_MESSAGES/granite.mo
 share/locale/te/LC_MESSAGES/granite.mo
+share/locale/tg/LC_MESSAGES/granite.mo
+share/locale/th/LC_MESSAGES/granite.mo
+share/locale/ti/LC_MESSAGES/granite.mo
+share/locale/tk/LC_MESSAGES/granite.mo
+share/locale/tl/LC_MESSAGES/granite.mo
+share/locale/tn/LC_MESSAGES/granite.mo
+share/locale/to/LC_MESSAGES/granite.mo
 share/locale/tr/LC_MESSAGES/granite.mo
+share/locale/ts/LC_MESSAGES/granite.mo
+share/locale/tt/LC_MESSAGES/granite.mo
+share/locale/tw/LC_MESSAGES/granite.mo
+share/locale/ty/LC_MESSAGES/granite.mo
 share/locale/ug/LC_MESSAGES/granite.mo
 share/locale/uk/LC_MESSAGES/granite.mo
+share/locale/ur/LC_MESSAGES/granite.mo
+share/locale/uz/LC_MESSAGES/granite.mo
+share/locale/ve/LC_MESSAGES/granite.mo
 share/locale/vi/LC_MESSAGES/granite.mo
+share/locale/vo/LC_MESSAGES/granite.mo
+share/locale/wa/LC_MESSAGES/granite.mo
+share/locale/wo/LC_MESSAGES/granite.mo
+share/locale/xh/LC_MESSAGES/granite.mo
+share/locale/yi/LC_MESSAGES/granite.mo
+share/locale/yo/LC_MESSAGES/granite.mo
+share/locale/za/LC_MESSAGES/granite.mo
+share/locale/zh/LC_MESSAGES/granite.mo
 share/locale/zh_CN/LC_MESSAGES/granite.mo
+share/locale/zh_HK/LC_MESSAGES/granite.mo
 share/locale/zh_TW/LC_MESSAGES/granite.mo
+share/locale/zu/LC_MESSAGES/granite.mo
 share/vala/vapi/granite.deps
 share/vala/vapi/granite.vapi