Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 28 Dec 2014 11:03:20 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r375698 - in head/deskutils/cairo-dock: . files
Message-ID:  <201412281103.sBSB3Kdx089344@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Sun Dec 28 11:03:19 2014
New Revision: 375698
URL: https://svnweb.freebsd.org/changeset/ports/375698
QAT: https://qat.redports.org/buildarchive/r375698/

Log:
  - Update to version 3.4.0
  - Now hosted on github, new homepage
  - Add LICENSE
  
  PR:		193232
  Submitted by:	maintainer

Added:
  head/deskutils/cairo-dock/files/patch-cairo-dock-file-manager.c   (contents, props changed)
Deleted:
  head/deskutils/cairo-dock/files/patch-CMakeLists.txt
  head/deskutils/cairo-dock/files/patch-cairo-dock-applet-facility.c
  head/deskutils/cairo-dock/files/patch-cairo-dock-package-theme.sh
  head/deskutils/cairo-dock/files/patch-src_gldit_gldi-config.h.in
Modified:
  head/deskutils/cairo-dock/Makefile
  head/deskutils/cairo-dock/distinfo
  head/deskutils/cairo-dock/pkg-descr
  head/deskutils/cairo-dock/pkg-plist

Modified: head/deskutils/cairo-dock/Makefile
==============================================================================
--- head/deskutils/cairo-dock/Makefile	Sun Dec 28 05:09:22 2014	(r375697)
+++ head/deskutils/cairo-dock/Makefile	Sun Dec 28 11:03:19 2014	(r375698)
@@ -1,15 +1,16 @@
 # $FreeBSD$
 
 PORTNAME=	cairo-dock
-DISTVERSION=	3.2.1
-PORTREVISION=	5
+PORTVERSION=	3.4.0
 CATEGORIES=	deskutils
-MASTER_SITES=	https://launchpadlibrarian.net/137290048/ \
-		http://pazzle.otdux.com.ua/
+DISTNAME=	${PORTNAME}-core-${PORTVERSION}.git20141115
 
 MAINTAINER=	fidaj@ukr.net
 COMMENT=	Cairo-Dock is a light and eye-candy dock
 
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
 		libcurl.so:${PORTSDIR}/ftp/curl \
 		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
@@ -17,16 +18,23 @@ LIB_DEPENDS=	libcairo.so:${PORTSDIR}/gra
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		sox:${PORTSDIR}/audio/sox
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-3.2.1
+USE_GITHUB=	yes
+GH_ACCOUNT=	Cairo-Dock
+GH_PROJECT=	${PORTNAME}-core
+GH_COMMIT=	18df440
+GH_TAGNAME=	18df440
+
+WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-${PORTNAME}-core-${GH_COMMIT}
 
 GNU_CONFIGURE=	yes
-USE_GNOME=	glib20 gtk20 librsvg2 libxml2
+USE_GNOME=	glib20 gtk30 librsvg2 libxml2
 USE_LDCONFIG=	yes
 USE_XORG=	xrender xtst
 USES=		cmake gettext pathfix pkgconfig
 LDFLAGS+=	-L${LOCALBASE}/lib
 CMAKE_ARGS+=	-Dinstall-pc-path:STRING="${LOCALBASE}/libdata/pkgconfig"
 CMAKE_ARGS+=	-DROOT_PREFIX:PATH=${STAGEDIR}
+CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR:PATH=man
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f -name "*" | ${XARGS} ${REINPLACE_CMD} -e \
@@ -37,4 +45,7 @@ post-patch:
 	     s|/usr/share/icons|${LOCALBASE}/share/icons|g; \
 	     s|%%LOCALBASE%%|${LOCALBASE}|g;'
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgldi.so.3.4.0
+
 .include <bsd.port.mk>

Modified: head/deskutils/cairo-dock/distinfo
==============================================================================
--- head/deskutils/cairo-dock/distinfo	Sun Dec 28 05:09:22 2014	(r375697)
+++ head/deskutils/cairo-dock/distinfo	Sun Dec 28 11:03:19 2014	(r375698)
@@ -1,2 +1,2 @@
-SHA256 (cairo-dock-3.2.1.tar.gz) = 441e407f92138dc604c796b0455777b765e298ecb8f3120104f521d0e0b34543
-SIZE (cairo-dock-3.2.1.tar.gz) = 2593954
+SHA256 (cairo-dock-core-3.4.0.git20141115.tar.gz) = 68185ce5f25b8621c7ce1f252ce2710eb9239d9204ab9329d14ff0671f05b675
+SIZE (cairo-dock-core-3.4.0.git20141115.tar.gz) = 2895775

Added: head/deskutils/cairo-dock/files/patch-cairo-dock-file-manager.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/deskutils/cairo-dock/files/patch-cairo-dock-file-manager.c	Sun Dec 28 11:03:19 2014	(r375698)
@@ -0,0 +1,14 @@
+--- src/gldit/cairo-dock-file-manager.c.orig	2014-11-22 18:39:10.000000000 +0200
++++ src/gldit/cairo-dock-file-manager.c	2014-11-22 18:41:30.000000000 +0200
+@@ -21,7 +21,11 @@
+ #include <string.h>      // memset
+ #include <sys/stat.h>    // stat
+ #include <fcntl.h>  // open
++#ifndef __FreeBSD__
+ #include <sys/sendfile.h>  // sendfile
++#else
++#include <sys/socket.h>
++#endif
+ #include <errno.h>  // errno
+ 
+ #include "gldi-config.h"

Modified: head/deskutils/cairo-dock/pkg-descr
==============================================================================
--- head/deskutils/cairo-dock/pkg-descr	Sun Dec 28 05:09:22 2014	(r375697)
+++ head/deskutils/cairo-dock/pkg-descr	Sun Dec 28 11:03:19 2014	(r375698)
@@ -3,4 +3,4 @@ Cairo / OpenGL to render nice graphics (
 hardware acceleration. It's fully configurable and customizable and can be a
 taskbar too. You can easily plug applets into it or in a desklet mode.
 
-WWW: https://launchpad.net/cairo-dock
+WWW: http://www.glx-dock.org/

Modified: head/deskutils/cairo-dock/pkg-plist
==============================================================================
--- head/deskutils/cairo-dock/pkg-plist	Sun Dec 28 05:09:22 2014	(r375697)
+++ head/deskutils/cairo-dock/pkg-plist	Sun Dec 28 11:03:19 2014	(r375698)
@@ -1,7 +1,5 @@
 bin/cairo-dock
 include/cairo-dock/cairo-dock.h
-include/cairo-dock/gldit/cairo-dock-X-manager.h
-include/cairo-dock/gldit/cairo-dock-X-utilities.h
 include/cairo-dock/gldit/cairo-dock-animations.h
 include/cairo-dock/gldit/cairo-dock-applet-canvas.h
 include/cairo-dock/gldit/cairo-dock-applet-facility.h
@@ -11,7 +9,7 @@ include/cairo-dock/gldit/cairo-dock-appl
 include/cairo-dock/gldit/cairo-dock-application-facility.h
 include/cairo-dock/gldit/cairo-dock-applications-manager.h
 include/cairo-dock/gldit/cairo-dock-backends-manager.h
-include/cairo-dock/gldit/cairo-dock-callbacks.h
+include/cairo-dock/gldit/cairo-dock-class-icon-manager.h
 include/cairo-dock/gldit/cairo-dock-class-manager.h
 include/cairo-dock/gldit/cairo-dock-config.h
 include/cairo-dock/gldit/cairo-dock-container.h
@@ -21,6 +19,7 @@ include/cairo-dock/gldit/cairo-dock-data
 include/cairo-dock/gldit/cairo-dock-dbus.h
 include/cairo-dock/gldit/cairo-dock-desklet-factory.h
 include/cairo-dock/gldit/cairo-dock-desklet-manager.h
+include/cairo-dock/gldit/cairo-dock-desktop-manager.h
 include/cairo-dock/gldit/cairo-dock-dialog-factory.h
 include/cairo-dock/gldit/cairo-dock-dialog-manager.h
 include/cairo-dock/gldit/cairo-dock-dock-facility.h
@@ -43,9 +42,9 @@ include/cairo-dock/gldit/cairo-dock-keyf
 include/cairo-dock/gldit/cairo-dock-launcher-manager.h
 include/cairo-dock/gldit/cairo-dock-log.h
 include/cairo-dock/gldit/cairo-dock-manager.h
-include/cairo-dock/gldit/cairo-dock-module-factory.h
+include/cairo-dock/gldit/cairo-dock-menu.h
+include/cairo-dock/gldit/cairo-dock-module-instance-manager.h
 include/cairo-dock/gldit/cairo-dock-module-manager.h
-include/cairo-dock/gldit/cairo-dock-notifications.h
 include/cairo-dock/gldit/cairo-dock-object.h
 include/cairo-dock/gldit/cairo-dock-opengl-font.h
 include/cairo-dock/gldit/cairo-dock-opengl-path.h
@@ -54,24 +53,25 @@ include/cairo-dock/gldit/cairo-dock-over
 include/cairo-dock/gldit/cairo-dock-packages.h
 include/cairo-dock/gldit/cairo-dock-particle-system.h
 include/cairo-dock/gldit/cairo-dock-separator-manager.h
+include/cairo-dock/gldit/cairo-dock-stack-icon-manager.h
 include/cairo-dock/gldit/cairo-dock-struct.h
+include/cairo-dock/gldit/cairo-dock-style-facility.h
+include/cairo-dock/gldit/cairo-dock-style-manager.h
 include/cairo-dock/gldit/cairo-dock-surface-factory.h
 include/cairo-dock/gldit/cairo-dock-task.h
 include/cairo-dock/gldit/cairo-dock-themes-manager.h
+include/cairo-dock/gldit/cairo-dock-user-icon-manager.h
+include/cairo-dock/gldit/cairo-dock-utils.h
+include/cairo-dock/gldit/cairo-dock-windows-manager.h
 include/cairo-dock/gldit/gldi-config.h
-include/cairo-dock/icon-factory/cairo-dock-applet-factory.h
-include/cairo-dock/icon-factory/cairo-dock-application-factory.h
-include/cairo-dock/icon-factory/cairo-dock-desktop-file-factory.h
-include/cairo-dock/icon-factory/cairo-dock-launcher-factory.h
-include/cairo-dock/icon-factory/cairo-dock-separator-factory.h
+include/cairo-dock/gldit/gldi-icon-names.h
 include/cairo-dock/implementations/cairo-dock-gauge.h
 include/cairo-dock/implementations/cairo-dock-graph.h
 include/cairo-dock/implementations/cairo-dock-progressbar.h
 lib/cairo-dock/libcd-Help.so
 lib/libgldi.so
 lib/libgldi.so.3
-lib/libgldi.so.3.2.1
-libdata/pkgconfig/cairo-dock.pc
+lib/libgldi.so.3.4.0
 libdata/pkgconfig/gldi.pc
 man/man1/cairo-dock.1.gz
 share/applications/cairo-dock-cairo.desktop
@@ -108,9 +108,10 @@ share/applications/cairo-dock.desktop
 %%DATADIR%%/icons/icon-close.svg
 %%DATADIR%%/icons/icon-connection.svg
 %%DATADIR%%/icons/icon-controler.svg
-%%DATADIR%%/icons/icon-desklets.png
+%%DATADIR%%/icons/icon-desklets.svg
 %%DATADIR%%/icons/icon-desktop.svg
 %%DATADIR%%/icons/icon-dialogs.svg
+%%DATADIR%%/icons/icon-docks.svg
 %%DATADIR%%/icons/icon-extensions.svg
 %%DATADIR%%/icons/icon-files.svg
 %%DATADIR%%/icons/icon-frame.png
@@ -130,6 +131,8 @@ share/applications/cairo-dock.desktop
 %%DATADIR%%/icons/icon-plug-ins.svg
 %%DATADIR%%/icons/icon-position.svg
 %%DATADIR%%/icons/icon-restore.svg
+%%DATADIR%%/icons/icon-shortkeys.svg
+%%DATADIR%%/icons/icon-style.svg
 %%DATADIR%%/icons/icon-subdock.png
 %%DATADIR%%/icons/icon-system.svg
 %%DATADIR%%/icons/icon-taskbar.png
@@ -277,6 +280,7 @@ share/locale/sr@latin/LC_MESSAGES/cairo-
 share/locale/sv/LC_MESSAGES/cairo-dock.mo
 share/locale/tr/LC_MESSAGES/cairo-dock.mo
 share/locale/uk/LC_MESSAGES/cairo-dock.mo
+share/locale/uz/LC_MESSAGES/cairo-dock.mo
 share/locale/vi/LC_MESSAGES/cairo-dock.mo
 share/locale/zh_CN/LC_MESSAGES/cairo-dock.mo
 share/locale/zh_TW/LC_MESSAGES/cairo-dock.mo



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412281103.sBSB3Kdx089344>