Update cairo-dock to version 3.4.1

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Update cairo-dock to version 3.4.1
From: Pierre Pronchery <khorben%defora.org@localhost>
Date: Fri, 27 Apr 2018 06:51:27 +0000
Module Name:	pkgsrc-wip
Committed By:	Pierre Pronchery <khorben%defora.org@localhost>
Pushed By:	khorben
Date:		Fri Apr 27 08:51:27 2018 +0200
Changeset:	d35dfef9af521c07703c38475b9010a45be8f075

Modified Files:
	cairo-dock/Makefile
	cairo-dock/PLIST
	cairo-dock/distinfo
	cairo-dock/patches/patch-src_gldit_cairo-dock-config.c
Added Files:
	cairo-dock/patches/patch-src_gldit_cairo-dock-file-manager.c
Removed Files:
	cairo-dock/patches/patch-data_man_CMakeLists.txt

Log Message:
Update cairo-dock to version 3.4.1

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d35dfef9af521c07703c38475b9010a45be8f075

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cairo-dock/Makefile                                | 12 ++++----
 cairo-dock/PLIST                                   | 32 ++++++++++++----------
 cairo-dock/distinfo                                | 13 +++++----
 cairo-dock/patches/patch-data_man_CMakeLists.txt   | 15 ----------
 .../patches/patch-src_gldit_cairo-dock-config.c    |  6 ++--
 .../patch-src_gldit_cairo-dock-file-manager.c      | 30 ++++++++++++++++++++
 6 files changed, 65 insertions(+), 43 deletions(-)

diffs:
diff --git a/cairo-dock/Makefile b/cairo-dock/Makefile
index b9b33ddfc0..b82aec141c 100644
--- a/cairo-dock/Makefile
+++ b/cairo-dock/Makefile
@@ -1,8 +1,9 @@
 # $NetBSD: Makefile,v 1.2 2015/07/13 09:06:07 thomasklausner Exp $
 
-DISTNAME=	cairo-dock-3.2.1
+DISTNAME=	cairo-dock-3.4.1
 CATEGORIES=	x11
-MASTER_SITES=	https://launchpad.net/cairo-dock-core/3.2/3.2.1/+download/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=Cairo-Dock/}
+GITHUB_PROJECT=	cairo-dock-core
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.glx-dock.org/
@@ -14,18 +15,19 @@ USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake pkg-config
 CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR:PATH=${PKGMANDIR}
 
+WRKSRC=		${WRKDIR}/cairo-dock-core-3.4.1
+
 PKGCONFIG_OVERRIDE=	src/gldit/gldi.pc.in cairo-dock.pc.in
 REPLACE_SH+=		data/scripts/initial-setup.sh
 REPLACE_SH+=		data/scripts/cairo-dock-package-theme.sh
 REPLACE_SH+=		data/scripts/help_scripts.sh
 
-.include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/gtkglext/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../www/curl/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
diff --git a/cairo-dock/PLIST b/cairo-dock/PLIST
index 2467fd6e3b..e8c7aa17dd 100644
--- a/cairo-dock/PLIST
+++ b/cairo-dock/PLIST
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2013/07/15 20:14:21 thomasklausner Exp $
+@comment $NetBSD$
 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
@@ -12,7 +10,7 @@ include/cairo-dock/gldit/cairo-dock-applet-single-instance.h
 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
@@ -22,6 +20,7 @@ include/cairo-dock/gldit/cairo-dock-data-renderer.h
 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
@@ -44,9 +43,9 @@ include/cairo-dock/gldit/cairo-dock-keyfile-utilities.h
 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
@@ -55,24 +54,25 @@ include/cairo-dock/gldit/cairo-dock-overlay.h
 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.${PKGVERSION}
 lib/libgldi.so.3
-lib/pkgconfig/cairo-dock.pc
+lib/libgldi.so.${PKGVERSION}
 lib/pkgconfig/gldi.pc
 man/man1/cairo-dock.1
 share/applications/cairo-dock-cairo.desktop
@@ -109,9 +109,10 @@ share/cairo-dock/icons/icon-buttons.png
 share/cairo-dock/icons/icon-close.svg
 share/cairo-dock/icons/icon-connection.svg
 share/cairo-dock/icons/icon-controler.svg
-share/cairo-dock/icons/icon-desklets.png
+share/cairo-dock/icons/icon-desklets.svg
 share/cairo-dock/icons/icon-desktop.svg
 share/cairo-dock/icons/icon-dialogs.svg
+share/cairo-dock/icons/icon-docks.svg
 share/cairo-dock/icons/icon-extensions.svg
 share/cairo-dock/icons/icon-files.svg
 share/cairo-dock/icons/icon-frame.png
@@ -131,6 +132,8 @@ share/cairo-dock/icons/icon-movment.png
 share/cairo-dock/icons/icon-plug-ins.svg
 share/cairo-dock/icons/icon-position.svg
 share/cairo-dock/icons/icon-restore.svg
+share/cairo-dock/icons/icon-shortkeys.svg
+share/cairo-dock/icons/icon-style.svg
 share/cairo-dock/icons/icon-subdock.png
 share/cairo-dock/icons/icon-system.svg
 share/cairo-dock/icons/icon-taskbar.png
@@ -278,6 +281,7 @@ share/locale/sr@latin/LC_MESSAGES/cairo-dock.mo
 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
diff --git a/cairo-dock/distinfo b/cairo-dock/distinfo
index 12fcdad812..3b2e19e1ce 100644
--- a/cairo-dock/distinfo
+++ b/cairo-dock/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1 2013/07/15 20:14:21 thomasklausner Exp $
+$NetBSD$
 
-SHA1 (cairo-dock-3.2.1.tar.gz) = 54b380cbcb5d7b3ad876c3f0dd0352da95ad4bc9
-RMD160 (cairo-dock-3.2.1.tar.gz) = 68ce8b915d01617b961604863fcedad04fdb0bb7
-Size (cairo-dock-3.2.1.tar.gz) = 2593954 bytes
-SHA1 (patch-data_man_CMakeLists.txt) = a9ab94177f0db5fbe5d0e2e4b2fd4f8f9e74c226
-SHA1 (patch-src_gldit_cairo-dock-config.c) = 160a8f419a381477f8b8c76135463e7bc887c4a9
+SHA1 (cairo-dock-3.4.1.tar.gz) = 033d44511b51620e709080cd21ae9fc3acae139d
+RMD160 (cairo-dock-3.4.1.tar.gz) = c65fa8eb5e1fdd1c846c42f3fd11112b2388e14f
+SHA512 (cairo-dock-3.4.1.tar.gz) = 265026eabfee72f11bef02ae72c965ede230c141af7fd9568278e30ef39f36fa00718cb6f7f7484d92579fe075de9c37772d96f09b079b903f83df89d5207e9d
+Size (cairo-dock-3.4.1.tar.gz) = 2895151 bytes
+SHA1 (patch-src_gldit_cairo-dock-config.c) = c98b658bf734b050db159e93f1f065e23d352b73
+SHA1 (patch-src_gldit_cairo-dock-file-manager.c) = 4a8213481930fba573e6bfb00b8cdb5ed294fd55
diff --git a/cairo-dock/patches/patch-data_man_CMakeLists.txt b/cairo-dock/patches/patch-data_man_CMakeLists.txt
deleted file mode 100644
index d428077652..0000000000
--- a/cairo-dock/patches/patch-data_man_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-data_man_CMakeLists.txt,v 1.1 2013/07/15 20:14:21 thomasklausner Exp $
-
-Do not install man pages gzipped.
-
---- data/man/CMakeLists.txt.orig	2013-03-23 15:55:12.000000000 +0000
-+++ data/man/CMakeLists.txt
-@@ -17,6 +17,6 @@ foreach(man ${cairo_dock_man_src})
- endforeach(man)
- 
- # Installation of the manuals
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cairo-dock_en.1.gz
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cairo-dock_en.1
-         DESTINATION "${mandir}/man1"
--        PERMISSIONS OWNER_READ GROUP_READ WORLD_READ RENAME cairo-dock.1.gz)
-+        PERMISSIONS OWNER_READ GROUP_READ WORLD_READ RENAME cairo-dock.1)
diff --git a/cairo-dock/patches/patch-src_gldit_cairo-dock-config.c b/cairo-dock/patches/patch-src_gldit_cairo-dock-config.c
index 43b653c237..a211b304a5 100644
--- a/cairo-dock/patches/patch-src_gldit_cairo-dock-config.c
+++ b/cairo-dock/patches/patch-src_gldit_cairo-dock-config.c
@@ -1,15 +1,15 @@
 $NetBSD: patch-src_gldit_cairo-dock-config.c,v 1.1 2013/07/15 20:14:22 thomasklausner Exp $
 
-No crypt.h on NetBSD either.
+No crypt.h on NetBSD or OpenBSD either.
 
---- src/gldit/cairo-dock-config.c.orig	2013-03-23 15:55:12.000000000 +0000
+--- src/gldit/cairo-dock-config.c.orig	2015-02-19 15:03:40.000000000 +0000
 +++ src/gldit/cairo-dock-config.c
 @@ -28,7 +28,7 @@
  #include "gldi-config.h"
  
  #ifdef HAVE_LIBCRYPT
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
  #include <unistd.h>  // on BSD, there is no crypt.h
  #else
  #include <crypt.h>
diff --git a/cairo-dock/patches/patch-src_gldit_cairo-dock-file-manager.c b/cairo-dock/patches/patch-src_gldit_cairo-dock-file-manager.c
new file mode 100644
index 0000000000..559fc3f8d7
--- /dev/null
+++ b/cairo-dock/patches/patch-src_gldit_cairo-dock-file-manager.c
@@ -0,0 +1,30 @@
+$NetBSD$
+
+--- src/gldit/cairo-dock-file-manager.c.orig	2015-02-19 15:03:40.000000000 +0000
++++ src/gldit/cairo-dock-file-manager.c
+@@ -21,7 +21,9 @@
+ #include <string.h>      // memset
+ #include <sys/stat.h>    // stat
+ #include <fcntl.h>  // open
+-#include <sys/sendfile.h>  // sendfile
++#if defined(__FreeBSD__) || defined(__linux__)
++# include <sys/sendfile.h>  // sendfile
++#endif
+ #include <errno.h>  // errno
+ 
+ #include "gldi-config.h"
+@@ -503,10 +505,12 @@ gboolean cairo_dock_copy_file (const gch
+ 	{
+ 		// perform in-kernel transfer (zero copy to user space)
+ 		int size;
+-		#ifdef __FreeBSD__
++		#if defined(__FreeBSD__)
+ 		size = sendfile (src_fd, dest_fd, 0, stat.st_size, NULL, NULL, 0);
+-		#else  // Linux >= 2.6.33 for being able to have a regular file as the output socket
++		#elif defined(__linux__)  // Linux >= 2.6.33 for being able to have a regular file as the output socket
+ 		size = sendfile (dest_fd, src_fd, NULL, stat.st_size);  // note the inversion between both calls ^_^;
++		#else
++		size = -1;
+ 		#endif
+ 		if (size < 0)  // error, fallback to a read-write method
+ 		{
Prev by Date: retroarch-assets: Update to 1.7.2
Next by Date: open-axiom: add LICENSE
Previous by Thread: retroarch-assets: Update to 1.7.2
Next by Thread: open-axiom: add LICENSE
Indexes:
Home | Main Index | Thread Index | Old Index