Attachment #135225 for bug #180032

View | Details | Raw Unified | Return to bug 180032
Collapse All | Expand All




# $FreeBSD$
# $FreeBSD: head/deskutils/cairo-dock/Makefile 316407 2013-04-24 07:35:40Z ak $

PORTNAME=	cairo-dock
DISTVERSION=	3.2.1
PORTREVISION=	2
CATEGORIES=	deskutils
MASTER_SITES=	https://launchpadlibrarian.net/137290048/ \
		http://pazzle.otdux.com.ua/

MAINTAINER=	fidaj@ukr.net
COMMENT=	Cairo-Dock is a light and eye-candy dock

LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo \
		curl:${PORTSDIR}/ftp/curl \
		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
		gtkglext-x11-1:${PORTSDIR}/x11-toolkits/gtkglext
RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash

WRKSRC=		${WRKDIR}/${PORTNAME}-3.2.1

GNU_CONFIGURE=	yes
USE_GNOME=	gnomehack glib20 gtk20 librsvg2 libxml2
USE_PKGCONFIG=	yes
USE_LDCONFIG=	yes
USE_XORG=	xrender xtst
USES=		cmake gettext
MAKE_JOBS_SAFE=	yes
USE_GCC=	4.6+
CMAKE_ARGS+=    -Dinstall-pc-path:STRING="${LOCALBASE}/libdata/pkgconfig"

MAN1=		cairo-dock.1
MANCOMPRESSED=	yes

post-patch:
	@${FIND} ${WRKSRC} -type f -name "*" | ${XARGS} ${REINPLACE_CMD} -i.orig -e \
	    's|/usr/share/pixmaps/|${LOCALBASE}/share/pixmaps/|g; \
	     s|/usr/bin/cairo-dock|${LOCALBASE}/bin/cairo-dock|g; \
	     s|/bin/bash|${LOCALBASE}/bin/bash|g; \
	     s|/usr/bin/*lay|${LOCALBASE}/bin/*lay|g; \
	     s|/usr/share/applications|${LOCALBASE}/share/applications|g; \
	     s|/usr/share/icons|${LOCALBASE}/share/icons|g'


.include <bsd.port.mk>

Lines 1-2 Link Here

(-)b/cairo-dock/distinfo (-2 / +2 lines)
1	SHA256 (cairo-dock-2.3.0~3.tar.gz) = 58de5a0bc75a83242bb6552f416b1db3bdb63f9de6f571aca362a7419b8b1db8	1	SHA256 (cairo-dock-3.2.1.tar.gz) = 441e407f92138dc604c796b0455777b765e298ecb8f3120104f521d0e0b34543
2	SIZE (cairo-dock-2.3.0~3.tar.gz) = 2478330	2	SIZE (cairo-dock-3.2.1.tar.gz) = 2593954




--- ./CMakeLists.txt.orig	2013-04-05 00:40:07.000000000 +0300
+++ ./CMakeLists.txt	2013-05-04 16:34:01.000000000 +0300
@@ -69,7 +69,7 @@
 set (exec_prefix ${prefix})
 set (datadir "${prefix}/${CMAKE_INSTALL_DATAROOTDIR}")  # (...)/share
 set (pkgdatadir "${datadir}/${CMAKE_PROJECT_NAME}")  # (...)/cairo-dock
-set (mandir "${prefix}/${CMAKE_INSTALL_MANDIR}")  # (...)/man
+set (mandir "${prefix}/man")  # (...)/man
 
 if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND (force-lib64 OR "${FORCE_LIB64}" STREQUAL "yes"))  # 64bits and force install in lib64
 	set (libdir "${prefix}/lib64")
@@ -90,7 +90,8 @@
 
 ########### dependencies ###############
 
-set (packages_required "glib-2.0 gthread-2.0 cairo librsvg-2.0 dbus-1 dbus-glib-1 libxml-2.0 xrender gl glu libcurl")  # for the .pc and to have details
+set (packages_required "glib-2.0 cairo librsvg-2.0 dbus-1 dbus-glib-1 libxml-2.0 xrender gl glu libcurl")  # for the .pc and to have details
+find_library (GTHREAD "gthread-2.0")
 STRING (REGEX REPLACE " " ";" packages_required_semicolon ${packages_required})  # replace blank space by semicolon => to have more details if a package is missing
 pkg_check_modules ("PACKAGE" REQUIRED "${packages_required_semicolon}")
 
@@ -143,9 +144,9 @@
 endif()
 
 check_include_files ("dlfcn.h" HAVE_DLFCN_H)
-check_library_exists (dl dlopen "" HAVE_LIBDL)
+check_library_exists (c dlopen "" HAVE_LIBDL)
 if (HAVE_LIBDL)  # dlopen might be in libc directly as in FreeBSD
-	set (LIBDL_LIBRARIES "dl")
+	set (LIBDL_LIBRARIES "c")
 endif()
 if (NOT HAVE_DLFCN_H)
 	message(FATAL_ERROR "Cairo-Dock requires dlfcn.h")




--- data/cairo-dock.orig	2012-03-10 14:08:41.784016085 +0200
+++ data/cairo-dock	2012-03-10 14:09:03.014030514 +0200
@@ -2,12 +2,12 @@
 	section="Applications/System" \
 	hints="dock" \
 	title="Cairo-Dock (no OpenGL)" \
-	icon="/usr/share/pixmaps/cairo-dock.svg" \
-	command="/usr/bin/cairo-dock -c"
+	icon="/usr/local/share/pixmaps/cairo-dock.svg" \
+	command="/usr/local/bin/cairo-dock -c"
 
 ?package(cairo-dock):needs="X11" \
 	section="Applications/System" \
 	hints="dock" \
 	title="GLX-Dock (Cairo-Dock with OpenGL)" \
-	icon="/usr/share/pixmaps/cairo-dock.svg" \
-	command="/usr/bin/cairo-dock -o"
+	icon="/usr/local/share/pixmaps/cairo-dock.svg" \
+	command="/usr/local/bin/cairo-dock -o"




--- src/gldit/cairo-dock-applet-facility.c.orig	2012-04-08 11:31:10.000000000 +0300
+++ src/gldit/cairo-dock-applet-facility.c	2012-04-08 11:32:21.000000000 +0300
@@ -350,13 +350,13 @@
 	
 	GError *erreur = NULL;
 	gchar *cSoundCommand = NULL;
-	if (g_file_test ("/usr/bin/paplay", G_FILE_TEST_EXISTS))
+	if (g_file_test ("/usr/local/bin/paplay", G_FILE_TEST_EXISTS))
 		cSoundCommand = g_strdup_printf("paplay --client-name=cairo-dock \"%s\"", cSoundPath);
 
 	else if (g_file_test ("/usr/bin/aplay", G_FILE_TEST_EXISTS))
 		cSoundCommand = g_strdup_printf("aplay \"%s\"", cSoundPath);
 
-	else if (g_file_test ("/usr/bin/play", G_FILE_TEST_EXISTS))
+	else if (g_file_test ("/usr/local/bin/play", G_FILE_TEST_EXISTS))
 		cSoundCommand = g_strdup_printf("play \"%s\"", cSoundPath);
 	
 	




--- src/gldit/cairo-dock-class-manager.c.orig	2012-03-10 14:05:52.663999155 +0200
+++ src/gldit/cairo-dock-class-manager.c	2012-03-10 14:06:17.963989866 +0200
@@ -1189,13 +1189,13 @@
 {
 	gboolean bFound = TRUE;
 	GString *sDesktopFilePath = g_string_new ("");
-	g_string_printf (sDesktopFilePath, "/usr/share/applications/%s.desktop", cClass);
+	g_string_printf (sDesktopFilePath, "/usr/local/share/applications/%s.desktop", cClass);
 	if (! g_file_test (sDesktopFilePath->str, G_FILE_TEST_EXISTS))
 	{
-		g_string_printf (sDesktopFilePath, "/usr/share/applications/xfce4/%s.desktop", cClass);
+		g_string_printf (sDesktopFilePath, "/usr/local/share/applications/xfce4/%s.desktop", cClass);
 		if (! g_file_test (sDesktopFilePath->str, G_FILE_TEST_EXISTS))
 		{
-			g_string_printf (sDesktopFilePath, "/usr/share/applications/kde4/%s.desktop", cClass);
+			g_string_printf (sDesktopFilePath, "/usr/local/share/applications/kde4/%s.desktop", cClass);
 			if (! g_file_test (sDesktopFilePath->str, G_FILE_TEST_EXISTS))
 			{
 				bFound = FALSE;

Removed Link Here

(-)a/cairo-dock.old/files/patch-cairo-dock-config.c (-11 lines)
1	--- ./src/gldit/cairo-dock-config.c.orig 2010-10-02 01:41:55.000000000 +0300
2	+++ ./src/gldit/cairo-dock-config.c 2010-12-11 02:06:06.000000000 +0200
3	@@ -27,8 +27,6 @@
4
5	#include "../config.h"
6	#ifdef HAVE_LIBCRYPT
7	-/* libC crypt */
8	-#include <crypt.h>
9
10	static char DES_crypt_key[64] =
11	{

Removed Link Here

(-)a/cairo-dock.old/files/patch-cairo-dock-gui-factory.c (-11 lines)
1	--- src/gldit/cairo-dock-gui-factory.c.orig 2011-06-19 02:27:14.000000000 +0300
2	+++ src/gldit/cairo-dock-gui-factory.c 2012-03-10 14:01:45.373972001 +0200
3	@@ -2429,7 +2429,7 @@
4	gchar *cUserPath = g_strdup_printf ("%s/.icons", g_getenv ("HOME"));
5	const gchar *path[3];
6	path[0] = (const gchar *)cUserPath;
7	- path[1] = "/usr/share/icons";
8	+ path[1] = "/usr/local/share/icons";
9	path[2] = NULL;
10
11	GHashTable *pHashTable = _cairo_dock_build_icon_themes_list (path);




--- src/cairo-dock-menu.c.orig	2012-03-10 14:07:34.504001097 +0200
+++ src/cairo-dock-menu.c	2012-03-10 14:07:43.434017412 +0200
@@ -293,7 +293,7 @@
 			return ;
 		}
 	}
-	gchar *cCommand = g_strdup_printf ("cp '/usr/share/applications/cairo-dock%s.desktop' '%s'", (g_bForceCairo ? "-cairo" : ""), cCairoAutoStartDirPath);
+	gchar *cCommand = g_strdup_printf ("cp '/usr/local/share/applications/cairo-dock%s.desktop' '%s'", (g_bForceCairo ? "-cairo" : ""), cCairoAutoStartDirPath);
 	int r = system (cCommand);
 	g_free (cCommand);
 	g_free (cCairoAutoStartDirPath);
@@ -861,11 +861,11 @@
 	
 	// on trouve le .desktop du programme.
 	cd_debug ("%s (%s)\n", __func__, icon->cClass);
-	gchar *cDesktopFilePath = g_strdup_printf ("/usr/share/applications/%s.desktop", icon->cClass);
+	gchar *cDesktopFilePath = g_strdup_printf ("/usr/local/share/applications/%s.desktop", icon->cClass);
 	if (! g_file_test (cDesktopFilePath, G_FILE_TEST_EXISTS))  // on n'a pas trouve la, on cherche chez KDE.
 	{
 		g_free (cDesktopFilePath);
-		cDesktopFilePath = g_strdup_printf ("/usr/share/applications/kde4/%s.desktop", icon->cClass);
+		cDesktopFilePath = g_strdup_printf ("/usr/local/share/applications/kde4/%s.desktop", icon->cClass);
 		if (! g_file_test (cDesktopFilePath, G_FILE_TEST_EXISTS))  // toujours rien, on utilise locate.
 		{
 			g_free (cDesktopFilePath);




--- cairo-dock-package-theme.orig	2011-06-19 02:27:14.000000000 +0300
+++ cairo-dock-package-theme	2012-03-10 13:56:42.504012481 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/bin/bash
 
 # Packager for Cairo-Dock
 #
@@ -125,7 +125,7 @@
 	if test "x${theme}" != "x"; then
 		#\__________ On cherche si ce theme est un theme officiel ou non.
 		echo "un theme est present ($theme)"
-		wget "$THEME_SERVER/$3/list.conf" -O "liste.tmp" -t 3 -T 30
+		fetch -o "liste.tmp" -T 30 "$THEME_SERVER/$3/list.conf"
 		if test -f "liste.tmp" ; then
 			grep "^\[${theme}\]" "liste.tmp"
 			if test "$?" != "0" -a  "$theme" != "Classic" -a "$theme" != "default"; then  # pas un theme officiel

Added Link Here

(-)b/cairo-dock/files/patch-cairo-dock-package-theme.sh (+11 lines)
1	--- ./data/scripts/cairo-dock-package-theme.sh.orig 2013-03-23 17:55:12.000000000 +0200
2	+++ ./data/scripts/cairo-dock-package-theme.sh 2013-06-27 18:03:18.000000000 +0300
3	@@ -125,7 +125,7 @@
4	if test "x${theme}" != "x"; then
5	#\__________ On cherche si ce theme est un theme officiel ou non.
6	echo "un theme est present ($theme)"
7	- wget "$THEME_SERVER/$3/list.conf" -O "liste.tmp" -t 3 -T 30
8	+ fetch -o "liste.tmp" -T 30 "$THEME_SERVER/$3/list.conf"
9	if test -f "liste.tmp" ; then
10	grep "^\[${theme}\]" "liste.tmp"
11	if test "$?" != "0" -a "$theme" != "Classic" -a "$theme" != "default"; then # pas un theme officiel

Removed Link Here

(-)a/cairo-dock.old/files/patch-cairo-dock_theme-creator.sh (-8 lines)
1	--- cairo-dock_theme-creator.sh.orig 2012-03-10 13:56:15.674011880 +0200
2	+++ cairo-dock_theme-creator.sh 2012-03-10 13:56:23.814030235 +0200
3	@@ -1,4 +1,4 @@
4	-#!/bin/bash
5	+#!/usr/local/bin/bash
6
7	# Theme creator for Cairo-Dock
8	#

Removed Link Here

(-)a/cairo-dock.old/files/patch-src__gldit__cairo-dock-keybinder.h (-10 lines)
1	--- src/gldit/cairo-dock-keybinder.h.orig 2013-03-09 17:10:41.000000000 +0900
2	+++ src/gldit/cairo-dock-keybinder.h 2013-03-09 17:11:12.000000000 +0900
3	@@ -31,7 +31,7 @@
4	#ifndef __CD_KEY_BINDER_H__
5	#define __CD_KEY_BINDER_H__
6
7	-#include <glib/gtypes.h>
8	+#include <glib.h>
9	#include "cairo-dock-struct.h"
10	#include "cairo-dock-manager.h"

Added Link Here

(-)b/cairo-dock/files/patch-src_gldit_gldi-config.h.in (+11 lines)
1	--- ./src/gldit/gldi-config.h.in.orig 2013-05-04 16:23:45.000000000 +0300
2	+++ ./src/gldit/gldi-config.h.in 2013-05-04 16:23:57.000000000 +0300
3	@@ -12,7 +12,7 @@
4	#cmakedefine HAVE_LIBCRYPT @HAVE_LIBCRYPT@
5
6	/* Define to 1 if you have the `dl' library (-ldl). */
7	-#cmakedefine HAVE_LIBDL @HAVE_LIBDL@
8	+//#cmakedefine HAVE_LIBDL @HAVE_LIBDL@
9
10	/* Define to 1 if you have the <dlfcn.h> header file. */
11	#cmakedefine HAVE_DLFCN_H @HAVE_DLFCN_H@




bin/cairo-dock
bin/cairo-dock-package-theme
bin/launch-cairo-dock-with-delay
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
include/cairo-dock/gldit/cairo-dock-applet-manager.h
include/cairo-dock/gldit/cairo-dock-applet-multi-instance.h
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-manager.h
include/cairo-dock/gldit/cairo-dock-config.h
include/cairo-dock/gldit/cairo-dock-container.h
include/cairo-dock/gldit/cairo-dock-core.h
include/cairo-dock/gldit/cairo-dock-data-renderer-manager.h
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-dialog-factory.h
include/cairo-dock/gldit/cairo-dock-dialog-manager.h
include/cairo-dock/gldit/cairo-dock-dock-facility.h
include/cairo-dock/gldit/cairo-dock-dock-factory.h
include/cairo-dock/gldit/cairo-dock-dock-manager.h
include/cairo-dock/gldit/cairo-dock-draw-opengl.h
include/cairo-dock/gldit/cairo-dock-draw.h
include/cairo-dock/gldit/cairo-dock-file-manager.h
include/cairo-dock/gldit/cairo-dock-flying-container.h
include/cairo-dock/gldit/cairo-dock-global-variables.h
include/cairo-dock/gldit/cairo-dock-gui-factory.h
include/cairo-dock/gldit/cairo-dock-gui-manager.h
include/cairo-dock/gldit/cairo-dock-icon-facility.h
include/cairo-dock/gldit/cairo-dock-icon-factory.h
include/cairo-dock/gldit/cairo-dock-icon-manager.h
include/cairo-dock/gldit/cairo-dock-image-buffer.h
include/cairo-dock/gldit/cairo-dock-indicator-manager.h
include/cairo-dock/gldit/cairo-dock-keybinder.h
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-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
include/cairo-dock/gldit/cairo-dock-opengl.h
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-struct.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/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-separator-factory.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/libgldi.so
lib/libgldi.so.3
lib/libgldi.so.3.2.1
lib/cairo-dock/libcd-Help.so
libdata/pkgconfig/cairo-dock.pc
libdata/pkgconfig/gldi.pc
share/applications/cairo-dock-cairo.desktop
share/applications/cairo-dock.desktop
%%DATADIR%%/ChangeLog.txt
%%DATADIR%%/box-back.png
%%DATADIR%%/box-front.png
%%DATADIR%%/cairo-dock-animated.xpm
%%DATADIR%%/cairo-dock-cancel.svg
%%DATADIR%%/cairo-dock-logo.png
%%DATADIR%%/cairo-dock-ok.svg
%%DATADIR%%/cairo-dock-simple.conf
%%DATADIR%%/cairo-dock.conf
%%DATADIR%%/cairo-dock.svg
%%DATADIR%%/container.desktop
%%DATADIR%%/default-class-indicator.svg
%%DATADIR%%/default-icon-appli.svg
%%DATADIR%%/default-icon.svg
%%DATADIR%%/default-indicator.png
%%DATADIR%%/depth-rotate-desklet.svg
%%DATADIR%%/explosion/explosion.png
%%DATADIR%%/gauges/Battery/background.svg
%%DATADIR%%/gauges/Battery/battery0.svg
%%DATADIR%%/gauges/Battery/battery1.svg
%%DATADIR%%/gauges/Battery/battery2.svg
%%DATADIR%%/gauges/Battery/battery3.svg
%%DATADIR%%/gauges/Battery/battery4.svg
%%DATADIR%%/gauges/Battery/battery5.svg
%%DATADIR%%/gauges/Battery/battery6.svg
%%DATADIR%%/gauges/Battery/battery7.svg
%%DATADIR%%/gauges/Battery/foreground.svg
%%DATADIR%%/gauges/Battery/readme
%%DATADIR%%/gauges/Battery/theme.xml
%%DATADIR%%/gauges/Turbo-night-fuel/background.svg
%%DATADIR%%/gauges/Turbo-night-fuel/foreground.svg
%%DATADIR%%/gauges/Turbo-night-fuel/needle.svg
%%DATADIR%%/gauges/Turbo-night-fuel/readme
%%DATADIR%%/gauges/Turbo-night-fuel/theme.xml
%%DATADIR%%/icons/balloons.png
%%DATADIR%%/icons/box-back.png
%%DATADIR%%/icons/box-front.png
%%DATADIR%%/icons/cairo-dock-animated.xpm
%%DATADIR%%/icons/cairo-dock-cancel.svg
%%DATADIR%%/icons/cairo-dock-ok.svg
%%DATADIR%%/icons/default-class-indicator.svg
%%DATADIR%%/icons/default-icon-appli.svg
%%DATADIR%%/icons/default-icon.svg
%%DATADIR%%/icons/default-indicator.png
%%DATADIR%%/icons/depth-rotate-desklet.svg
%%DATADIR%%/icons/icon-accessories.svg
%%DATADIR%%/icons/icon-all.svg
%%DATADIR%%/icons/icon-appearance.svg
%%DATADIR%%/icons/icon-background.svg
%%DATADIR%%/icons/icon-behavior.svg
%%DATADIR%%/icons/icon-bubble.png
%%DATADIR%%/icons/icon-buttons.png
%%DATADIR%%/icons/icon-close.svg
%%DATADIR%%/icons/icon-connection.svg
%%DATADIR%%/icons/icon-controler.svg
%%DATADIR%%/icons/icon-desklets.png
%%DATADIR%%/icons/icon-desktop.svg
%%DATADIR%%/icons/icon-dialogs.svg
%%DATADIR%%/icons/icon-extensions.svg
%%DATADIR%%/icons/icon-files.svg
%%DATADIR%%/icons/icon-frame.png
%%DATADIR%%/icons/icon-fun.svg
%%DATADIR%%/icons/icon-gradation.png
%%DATADIR%%/icons/icon-hidden-dock.svg
%%DATADIR%%/icons/icon-icons.svg
%%DATADIR%%/icons/icon-indicators.svg
%%DATADIR%%/icons/icon-internet.svg
%%DATADIR%%/icons/icon-labels.svg
%%DATADIR%%/icons/icon-lock-icons.svg
%%DATADIR%%/icons/icon-lower.svg
%%DATADIR%%/icons/icon-maximize.svg
%%DATADIR%%/icons/icon-minimize.svg
%%DATADIR%%/icons/icon-mouse.svg
%%DATADIR%%/icons/icon-movment.png
%%DATADIR%%/icons/icon-plug-ins.svg
%%DATADIR%%/icons/icon-position.svg
%%DATADIR%%/icons/icon-restore.svg
%%DATADIR%%/icons/icon-subdock.png
%%DATADIR%%/icons/icon-system.svg
%%DATADIR%%/icons/icon-taskbar.png
%%DATADIR%%/icons/icon-views.svg
%%DATADIR%%/icons/icon-visibility.svg
%%DATADIR%%/icons/icon-wave.png
%%DATADIR%%/icons/no-input-desklet.png
%%DATADIR%%/icons/retach-desklet.svg
%%DATADIR%%/icons/rotate-desklet.svg
%%DATADIR%%/icons/theme-distant.svg
%%DATADIR%%/icons/theme-local.svg
%%DATADIR%%/icons/theme-new.svg
%%DATADIR%%/icons/theme-updated.svg
%%DATADIR%%/icons/theme-user.svg
%%DATADIR%%/images/cairo-dock-logo.png
%%DATADIR%%/images/help-preview.jpg
%%DATADIR%%/images/preview-default.png
%%DATADIR%%/launcher.desktop
%%DATADIR%%/main-dock.conf
%%DATADIR%%/no-input-desklet.png
%%DATADIR%%/preview-default.png
%%DATADIR%%/readme-default-view
%%DATADIR%%/scripts/cairo-dock-package-theme.sh
%%DATADIR%%/scripts/help_scripts.sh
%%DATADIR%%/scripts/initial-setup.sh
%%DATADIR%%/separator.desktop
%%DATADIR%%/themes.conf
%%DATADIR%%/themes/Default-Panel/_MainDock_-2.conf
%%DATADIR%%/themes/Default-Panel/cairo-dock.conf
%%DATADIR%%/themes/Default-Panel/images/active.png
%%DATADIR%%/themes/Default-Panel/images/bg.svg
%%DATADIR%%/themes/Default-Panel/images/indicator.png
%%DATADIR%%/themes/Default-Panel/launchers/01container.desktop
%%DATADIR%%/themes/Default-Panel/launchers/01firefox.desktop
%%DATADIR%%/themes/Default-Panel/launchers/01gcalctool.desktop
%%DATADIR%%/themes/Default-Panel/launchers/01libreoffice-calc.desktop
%%DATADIR%%/themes/Default-Panel/launchers/01libreoffice-impress.desktop
%%DATADIR%%/themes/Default-Panel/launchers/01libreoffice-writer.desktop
%%DATADIR%%/themes/Default-Panel/launchers/01pidgin.desktop
%%DATADIR%%/themes/Default-Panel/launchers/01separator.desktop
%%DATADIR%%/themes/Default-Panel/launchers/01thunderbird.desktop
%%DATADIR%%/themes/Default-Panel/launchers/01ubuntu-software-center.desktop
%%DATADIR%%/themes/Default-Panel/launchers/02separator.desktop
%%DATADIR%%/themes/Default-Panel/launchers/03separator.desktop
%%DATADIR%%/themes/Default-Panel/launchers/04separator.desktop
%%DATADIR%%/themes/Default-Panel/plug-ins/AlsaMixer/AlsaMixer.conf
%%DATADIR%%/themes/Default-Panel/plug-ins/Animated-icons/Animated-icons.conf
%%DATADIR%%/themes/Default-Panel/plug-ins/Calendar/Calendar.conf
%%DATADIR%%/themes/Default-Panel/plug-ins/Clipper/Clipper.conf
%%DATADIR%%/themes/Default-Panel/plug-ins/GMenu/GMenu.conf
%%DATADIR%%/themes/Default-Panel/plug-ins/Help/Help.conf
%%DATADIR%%/themes/Default-Panel/plug-ins/Indicator-Generic/Indicator-Generic.conf
%%DATADIR%%/themes/Default-Panel/plug-ins/Messaging-Menu/Messaging-Menu.conf
%%DATADIR%%/themes/Default-Panel/plug-ins/Recent-Events/Recent-Events.conf
%%DATADIR%%/themes/Default-Panel/plug-ins/Status-Notifier/Status-Notifier.conf
%%DATADIR%%/themes/Default-Panel/plug-ins/clock/clock.conf
%%DATADIR%%/themes/Default-Panel/plug-ins/dialog-rendering/dialog-rendering.conf
%%DATADIR%%/themes/Default-Panel/plug-ins/dnd2share/dnd2share.conf
%%DATADIR%%/themes/Default-Panel/plug-ins/drop_indicator/drop_indicator.conf
%%DATADIR%%/themes/Default-Panel/plug-ins/icon-effect/icon-effect.conf
%%DATADIR%%/themes/Default-Panel/plug-ins/illusion/illusion.conf
%%DATADIR%%/themes/Default-Panel/plug-ins/logout/logout.conf
%%DATADIR%%/themes/Default-Panel/plug-ins/musicPlayer/musicPlayer.conf
%%DATADIR%%/themes/Default-Panel/plug-ins/netspeed/netspeed.conf
%%DATADIR%%/themes/Default-Panel/plug-ins/powermanager/powermanager.conf
%%DATADIR%%/themes/Default-Panel/plug-ins/quick-browser/quick-browser.conf
%%DATADIR%%/themes/Default-Panel/plug-ins/rendering/rendering.conf
%%DATADIR%%/themes/Default-Panel/plug-ins/shortcuts/shortcuts.conf
%%DATADIR%%/themes/Default-Panel/plug-ins/showDesktop/showDesktop.conf
%%DATADIR%%/themes/Default-Panel/plug-ins/switcher/switcher.conf
%%DATADIR%%/themes/Default-Panel/preview
%%DATADIR%%/themes/Default-Panel/readme
%%DATADIR%%/themes/Default-Single/cairo-dock.conf
%%DATADIR%%/themes/Default-Single/images/active.png
%%DATADIR%%/themes/Default-Single/images/bg.svg
%%DATADIR%%/themes/Default-Single/images/indicator.png
%%DATADIR%%/themes/Default-Single/launchers/01firefox.desktop
%%DATADIR%%/themes/Default-Single/launchers/01gcalctool.desktop
%%DATADIR%%/themes/Default-Single/launchers/01gimp.desktop
%%DATADIR%%/themes/Default-Single/launchers/01gnome-terminal.desktop
%%DATADIR%%/themes/Default-Single/launchers/01ooo-writer.desktop
%%DATADIR%%/themes/Default-Single/launchers/01pidgin.desktop
%%DATADIR%%/themes/Default-Single/launchers/01separator.desktop
%%DATADIR%%/themes/Default-Single/launchers/01thunderbird.desktop
%%DATADIR%%/themes/Default-Single/launchers/01ubuntu-software-center.desktop
%%DATADIR%%/themes/Default-Single/launchers/02separator.desktop
%%DATADIR%%/themes/Default-Single/launchers/03separator.desktop
%%DATADIR%%/themes/Default-Single/plug-ins/Animated-icons/Animated-icons.conf
%%DATADIR%%/themes/Default-Single/plug-ins/Clipper/Clipper.conf
%%DATADIR%%/themes/Default-Single/plug-ins/Dbus/Dbus.conf
%%DATADIR%%/themes/Default-Single/plug-ins/GMenu/GMenu.conf
%%DATADIR%%/themes/Default-Single/plug-ins/Recent-Events/Recent-Events.conf
%%DATADIR%%/themes/Default-Single/plug-ins/dialog-rendering/dialog-rendering.conf
%%DATADIR%%/themes/Default-Single/plug-ins/dnd2share/dnd2share.conf
%%DATADIR%%/themes/Default-Single/plug-ins/icon-effect/icon-effect.conf
%%DATADIR%%/themes/Default-Single/plug-ins/illusion/illusion.conf
%%DATADIR%%/themes/Default-Single/plug-ins/logout/logout.conf
%%DATADIR%%/themes/Default-Single/plug-ins/musicPlayer/musicPlayer.conf
%%DATADIR%%/themes/Default-Single/plug-ins/quick-browser/quick-browser.conf
%%DATADIR%%/themes/Default-Single/plug-ins/rendering/rendering.conf
%%DATADIR%%/themes/Default-Single/plug-ins/shortcuts/shortcuts.conf
%%DATADIR%%/themes/Default-Single/plug-ins/showDesktop/showDesktop.conf
%%DATADIR%%/themes/Default-Single/plug-ins/stack/stack.conf
%%DATADIR%%/themes/Default-Single/plug-ins/switcher/switcher.conf
%%DATADIR%%/themes/Default-Single/preview
%%DATADIR%%/themes/Default-Single/readme
share/locale/ar/LC_MESSAGES/cairo-dock.mo
share/locale/be/LC_MESSAGES/cairo-dock.mo
share/locale/bg/LC_MESSAGES/cairo-dock.mo
share/locale/bn/LC_MESSAGES/cairo-dock.mo
share/locale/ca/LC_MESSAGES/cairo-dock.mo
share/locale/cs/LC_MESSAGES/cairo-dock.mo
share/locale/cy/LC_MESSAGES/cairo-dock.mo
share/locale/de/LC_MESSAGES/cairo-dock.mo
share/locale/el/LC_MESSAGES/cairo-dock.mo
share/locale/en/LC_MESSAGES/cairo-dock.mo
share/locale/eo/LC_MESSAGES/cairo-dock.mo
share/locale/es/LC_MESSAGES/cairo-dock.mo
share/locale/et/LC_MESSAGES/cairo-dock.mo
share/locale/eu/LC_MESSAGES/cairo-dock.mo

share/locale/fo/LC_MESSAGES/cairo-dock.mo
share/locale/fr/LC_MESSAGES/cairo-dock.mo
share/locale/gl/LC_MESSAGES/cairo-dock.mo
share/locale/he/LC_MESSAGES/cairo-dock.mo
share/locale/hu/LC_MESSAGES/cairo-dock.mo
share/locale/id/LC_MESSAGES/cairo-dock.mo
share/locale/it/LC_MESSAGES/cairo-dock.mo
share/locale/ja/LC_MESSAGES/cairo-dock.mo
share/locale/ko/LC_MESSAGES/cairo-dock.mo
share/locale/lt/LC_MESSAGES/cairo-dock.mo
share/locale/nb/LC_MESSAGES/cairo-dock.mo
share/locale/nl/LC_MESSAGES/cairo-dock.mo
share/locale/nn/LC_MESSAGES/cairo-dock.mo
share/locale/oc/LC_MESSAGES/cairo-dock.mo
share/locale/pl/LC_MESSAGES/cairo-dock.mo
share/locale/pt/LC_MESSAGES/cairo-dock.mo

share/locale/sk/LC_MESSAGES/cairo-dock.mo
share/locale/sl/LC_MESSAGES/cairo-dock.mo
share/locale/sr/LC_MESSAGES/cairo-dock.mo
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/vi/LC_MESSAGES/cairo-dock.mo
share/locale/zh_CN/LC_MESSAGES/cairo-dock.mo
share/locale/zh_TW/LC_MESSAGES/cairo-dock.mo
share/cairo-dock/plug-ins/Help/Help.conf
share/cairo-dock/plug-ins/Help/icon.svg
share/pixmaps/cairo-dock.svg
@dirrm share/locale/oc/LC_MESSAGES
@dirrm share/locale/oc
@dirrm share/locale/fo/LC_MESSAGES
@dirrm share/locale/fo
@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/switcher
@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/stack
@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/showDesktop
@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/shortcuts
@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/rendering
@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/quick-browser
@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/musicPlayer
@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/logout
@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/illusion
@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/icon-effect
@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/dnd2share
@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/dialog-rendering
@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/Recent-Events
@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/GMenu
@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/Dbus
@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/Clipper
@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/Animated-icons
@dirrm %%DATADIR%%/themes/Default-Single/plug-ins
@dirrm %%DATADIR%%/themes/Default-Single/launchers
@dirrm %%DATADIR%%/themes/Default-Single/images
@dirrm %%DATADIR%%/themes/Default-Single
@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/switcher
@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/showDesktop
@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/shortcuts
@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/rendering
@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/quick-browser
@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/powermanager
@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/netspeed
@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/musicPlayer
@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/logout
@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/illusion
@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/icon-effect
@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/drop_indicator
@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/dnd2share
@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/dialog-rendering
@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/clock
@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/Status-Notifier
@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/Recent-Events
@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/Messaging-Menu
@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/GMenu
@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/Help
@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/Indicator-Generic
@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/Clipper
@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/Calendar
@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/Animated-icons
@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/AlsaMixer
@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins
@dirrm %%DATADIR%%/themes/Default-Panel/launchers
@dirrm %%DATADIR%%/themes/Default-Panel/images
@dirrm %%DATADIR%%/themes/Default-Panel
@dirrm %%DATADIR%%/themes
@dirrm %%DATADIR%%/scripts
@dirrm %%DATADIR%%/images
@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%/gauges/Turbo-night-fuel
@dirrm %%DATADIR%%/gauges/Battery
@dirrm %%DATADIR%%/gauges
@dirrm %%DATADIR%%/explosion
@dirrm %%DATADIR%%
@dirrm share/applications
@dirrm share/cairo-dock/plug-ins/Help
@dirrm share/cairo-dock/plug-ins
@dirrm include/cairo-dock/implementations
@dirrm include/cairo-dock/icon-factory
@dirrm include/cairo-dock/gldit
@dirrm include/cairo-dock
@dirrm lib/cairo-dock

Return to bug 180032

Lines 1-33 Link Here

(-)b/cairo-dock/Makefile (-11 / +21 lines)
1	# Created by: Ivan Klymenko <fidaj@ukr.net>	1	# $FreeBSD$
2	# $FreeBSD: head/deskutils/cairo-dock/Makefile 316407 2013-04-24 07:35:40Z ak $
3		2
4	PORTNAME= cairo-dock	3	PORTNAME= cairo-dock
5	DISTVERSION= 2.3.0~3	4	DISTVERSION= 3.2.1
6	PORTREVISION= 2
7	CATEGORIES= deskutils	5	CATEGORIES= deskutils
8	MASTER_SITES= http://launchpadlibrarian.net/73753213/	6	MASTER_SITES= https://launchpadlibrarian.net/137290048/ \
		7	http://pazzle.otdux.com.ua/
9		8
10	MAINTAINER= fidaj@ukr.net	9	MAINTAINER= fidaj@ukr.net
11	COMMENT= Cairo-Dock is a light and eye-candy dock	10	COMMENT= Cairo-Dock is a light and eye-candy dock
12		11
13	LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \	12	LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \
14	curl.6:${PORTSDIR}/ftp/curl \	13	curl:${PORTSDIR}/ftp/curl \
15	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \	14	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
16	gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext	15	gtkglext-x11-1:${PORTSDIR}/x11-toolkits/gtkglext
17	RUN_DEPENDS= bash:${PORTSDIR}/shells/bash	16	RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
18		17
		18	WRKSRC= ${WRKDIR}/${PORTNAME}-3.2.1
		19
19	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
20	USE_GNOME= gnomehack pkgconfig glib20 gtk20 librsvg2 libxml2	21	USE_GNOME= gnomehack glib20 gtk20 librsvg2 libxml2
		22	USE_PKGCONFIG= yes
21	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
22	USE_XORG= xrender xtst	24	USE_XORG= xrender xtst
23	USES= cmake gettext	25	USES= cmake gettext
24	MAKE_JOBS_SAFE= yes	26	MAKE_JOBS_SAFE= yes
		27	USE_GCC= 4.6+
		28	CMAKE_ARGS+= -Dinstall-pc-path:STRING="${LOCALBASE}/libdata/pkgconfig"
25		29
26	MAN1= cairo-dock.1	30	MAN1= cairo-dock.1
27	MANCOMPRESSED= yes	31	MANCOMPRESSED= yes
28		32
29	post-patch:	33	post-patch:
30	@${REINPLACE_CMD} -e 's\|libdir}/pkgconfig\|prefix}/libdata/pkgconfig\| ; s\|datadir}/man\|prefix}/man\|' \	34	@${FIND} ${WRKSRC} -type f -name "*" \| ${XARGS} ${REINPLACE_CMD} -i.orig -e \
31	${WRKSRC}/CMakeLists.txt ${WRKSRC}/src/gldit/CMakeLists.txt	35	's\|/usr/share/pixmaps/\|${LOCALBASE}/share/pixmaps/\|g; \
		36	s\|/usr/bin/cairo-dock\|${LOCALBASE}/bin/cairo-dock\|g; \
		37	s\|/bin/bash\|${LOCALBASE}/bin/bash\|g; \
		38	s\|/usr/bin/lay\|${LOCALBASE}/bin/lay\|g; \
		39	s\|/usr/share/applications\|${LOCALBASE}/share/applications\|g; \
		40	s\|/usr/share/icons\|${LOCALBASE}/share/icons\|g'
		41
32		42
33	.include <bsd.port.mk>	43	.include <bsd.port.mk>

Added Link Here

(-)b/cairo-dock/files/patch-CMakeLists.txt (+33 lines)
1	--- ./CMakeLists.txt.orig 2013-04-05 00:40:07.000000000 +0300
2	+++ ./CMakeLists.txt 2013-05-04 16:34:01.000000000 +0300
3	@@ -69,7 +69,7 @@
4	set (exec_prefix ${prefix})
5	set (datadir "${prefix}/${CMAKE_INSTALL_DATAROOTDIR}") # (...)/share
6	set (pkgdatadir "${datadir}/${CMAKE_PROJECT_NAME}") # (...)/cairo-dock
7	-set (mandir "${prefix}/${CMAKE_INSTALL_MANDIR}") # (...)/man
8	+set (mandir "${prefix}/man") # (...)/man
9
10	if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND (force-lib64 OR "${FORCE_LIB64}" STREQUAL "yes")) # 64bits and force install in lib64
11	set (libdir "${prefix}/lib64")
12	@@ -90,7 +90,8 @@
13
14	########### dependencies ###############
15
16	-set (packages_required "glib-2.0 gthread-2.0 cairo librsvg-2.0 dbus-1 dbus-glib-1 libxml-2.0 xrender gl glu libcurl") # for the .pc and to have details
17	+set (packages_required "glib-2.0 cairo librsvg-2.0 dbus-1 dbus-glib-1 libxml-2.0 xrender gl glu libcurl") # for the .pc and to have details
18	+find_library (GTHREAD "gthread-2.0")
19	STRING (REGEX REPLACE " " ";" packages_required_semicolon ${packages_required}) # replace blank space by semicolon => to have more details if a package is missing
20	pkg_check_modules ("PACKAGE" REQUIRED "${packages_required_semicolon}")
21
22	@@ -143,9 +144,9 @@
23	endif()
24
25	check_include_files ("dlfcn.h" HAVE_DLFCN_H)
26	-check_library_exists (dl dlopen "" HAVE_LIBDL)
27	+check_library_exists (c dlopen "" HAVE_LIBDL)
28	if (HAVE_LIBDL) # dlopen might be in libc directly as in FreeBSD
29	- set (LIBDL_LIBRARIES "dl")
30	+ set (LIBDL_LIBRARIES "c")
31	endif()
32	if (NOT HAVE_DLFCN_H)
33	message(FATAL_ERROR "Cairo-Dock requires dlfcn.h")

Removed Link Here

(-)a/cairo-dock.old/files/patch-cairo-dock (-19 lines)
1	--- data/cairo-dock.orig 2012-03-10 14:08:41.784016085 +0200
2	+++ data/cairo-dock 2012-03-10 14:09:03.014030514 +0200
3	@@ -2,12 +2,12 @@
4	section="Applications/System" \
5	hints="dock" \
6	title="Cairo-Dock (no OpenGL)" \
7	- icon="/usr/share/pixmaps/cairo-dock.svg" \
8	- command="/usr/bin/cairo-dock -c"
9	+ icon="/usr/local/share/pixmaps/cairo-dock.svg" \
10	+ command="/usr/local/bin/cairo-dock -c"
11
12	?package(cairo-dock):needs="X11" \
13	section="Applications/System" \
14	hints="dock" \
15	title="GLX-Dock (Cairo-Dock with OpenGL)" \
16	- icon="/usr/share/pixmaps/cairo-dock.svg" \
17	- command="/usr/bin/cairo-dock -o"
18	+ icon="/usr/local/share/pixmaps/cairo-dock.svg" \
19	+ command="/usr/local/bin/cairo-dock -o"

Removed Link Here

(-)a/cairo-dock.old/files/patch-cairo-dock-applet-facility.c (-18 lines)
1	--- src/gldit/cairo-dock-applet-facility.c.orig 2012-04-08 11:31:10.000000000 +0300
2	+++ src/gldit/cairo-dock-applet-facility.c 2012-04-08 11:32:21.000000000 +0300
3	@@ -350,13 +350,13 @@
4
5	GError *erreur = NULL;
6	gchar *cSoundCommand = NULL;
7	- if (g_file_test ("/usr/bin/paplay", G_FILE_TEST_EXISTS))
8	+ if (g_file_test ("/usr/local/bin/paplay", G_FILE_TEST_EXISTS))
9	cSoundCommand = g_strdup_printf("paplay --client-name=cairo-dock \"%s\"", cSoundPath);
10
11	else if (g_file_test ("/usr/bin/aplay", G_FILE_TEST_EXISTS))
12	cSoundCommand = g_strdup_printf("aplay \"%s\"", cSoundPath);
13
14	- else if (g_file_test ("/usr/bin/play", G_FILE_TEST_EXISTS))
15	+ else if (g_file_test ("/usr/local/bin/play", G_FILE_TEST_EXISTS))
16	cSoundCommand = g_strdup_printf("play \"%s\"", cSoundPath);
17
18

Removed Link Here

(-)a/cairo-dock.old/files/patch-cairo-dock-class-manager.c (-19 lines)
1	--- src/gldit/cairo-dock-class-manager.c.orig 2012-03-10 14:05:52.663999155 +0200
2	+++ src/gldit/cairo-dock-class-manager.c 2012-03-10 14:06:17.963989866 +0200
3	@@ -1189,13 +1189,13 @@
4	{
5	gboolean bFound = TRUE;
6	GString *sDesktopFilePath = g_string_new ("");
7	- g_string_printf (sDesktopFilePath, "/usr/share/applications/%s.desktop", cClass);
8	+ g_string_printf (sDesktopFilePath, "/usr/local/share/applications/%s.desktop", cClass);
9	if (! g_file_test (sDesktopFilePath->str, G_FILE_TEST_EXISTS))
10	{
11	- g_string_printf (sDesktopFilePath, "/usr/share/applications/xfce4/%s.desktop", cClass);
12	+ g_string_printf (sDesktopFilePath, "/usr/local/share/applications/xfce4/%s.desktop", cClass);
13	if (! g_file_test (sDesktopFilePath->str, G_FILE_TEST_EXISTS))
14	{
15	- g_string_printf (sDesktopFilePath, "/usr/share/applications/kde4/%s.desktop", cClass);
16	+ g_string_printf (sDesktopFilePath, "/usr/local/share/applications/kde4/%s.desktop", cClass);
17	if (! g_file_test (sDesktopFilePath->str, G_FILE_TEST_EXISTS))
18	{
19	bFound = FALSE;

Removed Link Here

(-)a/cairo-dock.old/files/patch-cairo-dock-menu.c (-25 lines)
1	--- src/cairo-dock-menu.c.orig 2012-03-10 14:07:34.504001097 +0200
2	+++ src/cairo-dock-menu.c 2012-03-10 14:07:43.434017412 +0200
3	@@ -293,7 +293,7 @@
4	return ;
5	}
6	}
7	- gchar *cCommand = g_strdup_printf ("cp '/usr/share/applications/cairo-dock%s.desktop' '%s'", (g_bForceCairo ? "-cairo" : ""), cCairoAutoStartDirPath);
8	+ gchar *cCommand = g_strdup_printf ("cp '/usr/local/share/applications/cairo-dock%s.desktop' '%s'", (g_bForceCairo ? "-cairo" : ""), cCairoAutoStartDirPath);
9	int r = system (cCommand);
10	g_free (cCommand);
11	g_free (cCairoAutoStartDirPath);
12	@@ -861,11 +861,11 @@
13
14	// on trouve le .desktop du programme.
15	cd_debug ("%s (%s)\n", __func__, icon->cClass);
16	- gchar *cDesktopFilePath = g_strdup_printf ("/usr/share/applications/%s.desktop", icon->cClass);
17	+ gchar *cDesktopFilePath = g_strdup_printf ("/usr/local/share/applications/%s.desktop", icon->cClass);
18	if (! g_file_test (cDesktopFilePath, G_FILE_TEST_EXISTS)) // on n'a pas trouve la, on cherche chez KDE.
19	{
20	g_free (cDesktopFilePath);
21	- cDesktopFilePath = g_strdup_printf ("/usr/share/applications/kde4/%s.desktop", icon->cClass);
22	+ cDesktopFilePath = g_strdup_printf ("/usr/local/share/applications/kde4/%s.desktop", icon->cClass);
23	if (! g_file_test (cDesktopFilePath, G_FILE_TEST_EXISTS)) // toujours rien, on utilise locate.
24	{
25	g_free (cDesktopFilePath);

Removed Link Here

(-)a/cairo-dock.old/files/patch-cairo-dock-package-theme (-17 lines)
1	--- cairo-dock-package-theme.orig 2011-06-19 02:27:14.000000000 +0300
2	+++ cairo-dock-package-theme 2012-03-10 13:56:42.504012481 +0200
3	@@ -1,4 +1,4 @@
4	-#!/bin/bash
5	+#!/usr/local/bin/bash
6
7	# Packager for Cairo-Dock
8	#
9	@@ -125,7 +125,7 @@
10	if test "x${theme}" != "x"; then
11	#\__________ On cherche si ce theme est un theme officiel ou non.
12	echo "un theme est present ($theme)"
13	- wget "$THEME_SERVER/$3/list.conf" -O "liste.tmp" -t 3 -T 30
14	+ fetch -o "liste.tmp" -T 30 "$THEME_SERVER/$3/list.conf"
15	if test -f "liste.tmp" ; then
16	grep "^\[${theme}\]" "liste.tmp"
17	if test "$?" != "0" -a "$theme" != "Classic" -a "$theme" != "default"; then # pas un theme officiel

Lines 1-65 Link Here

(-)b/cairo-dock/pkg-plist (-197 / +277 lines)
1	bin/cairo-dock	1	bin/cairo-dock
2	bin/cairo-dock-package-theme
3	bin/launch-cairo-dock-with-delay
4	include/cairo-dock/cairo-dock.h	2	include/cairo-dock/cairo-dock.h
5	include/cairo-dock/cairo-dock/cairo-dock-X-manager.h	3	include/cairo-dock/gldit/cairo-dock-X-manager.h
6	include/cairo-dock/cairo-dock/cairo-dock-X-utilities.h	4	include/cairo-dock/gldit/cairo-dock-X-utilities.h
7	include/cairo-dock/cairo-dock/cairo-dock-animations.h	5	include/cairo-dock/gldit/cairo-dock-animations.h
8	include/cairo-dock/cairo-dock/cairo-dock-applet-canvas.h	6	include/cairo-dock/gldit/cairo-dock-applet-canvas.h
9	include/cairo-dock/cairo-dock/cairo-dock-applet-facility.h	7	include/cairo-dock/gldit/cairo-dock-applet-facility.h
10	include/cairo-dock/cairo-dock/cairo-dock-applet-manager.h	8	include/cairo-dock/gldit/cairo-dock-applet-manager.h
11	include/cairo-dock/cairo-dock/cairo-dock-applet-multi-instance.h	9	include/cairo-dock/gldit/cairo-dock-applet-multi-instance.h
12	include/cairo-dock/cairo-dock/cairo-dock-applet-single-instance.h	10	include/cairo-dock/gldit/cairo-dock-applet-single-instance.h
13	include/cairo-dock/cairo-dock/cairo-dock-application-facility.h	11	include/cairo-dock/gldit/cairo-dock-application-facility.h
14	include/cairo-dock/cairo-dock/cairo-dock-applications-manager.h	12	include/cairo-dock/gldit/cairo-dock-applications-manager.h
15	include/cairo-dock/cairo-dock/cairo-dock-backends-manager.h	13	include/cairo-dock/gldit/cairo-dock-backends-manager.h
16	include/cairo-dock/cairo-dock/cairo-dock-callbacks.h	14	include/cairo-dock/gldit/cairo-dock-callbacks.h
17	include/cairo-dock/cairo-dock/cairo-dock-class-manager.h	15	include/cairo-dock/gldit/cairo-dock-class-manager.h
18	include/cairo-dock/cairo-dock/cairo-dock-config.h	16	include/cairo-dock/gldit/cairo-dock-config.h
19	include/cairo-dock/cairo-dock/cairo-dock-container.h	17	include/cairo-dock/gldit/cairo-dock-container.h
20	include/cairo-dock/cairo-dock/cairo-dock-core.h	18	include/cairo-dock/gldit/cairo-dock-core.h
21	include/cairo-dock/cairo-dock/cairo-dock-data-renderer.h	19	include/cairo-dock/gldit/cairo-dock-data-renderer-manager.h
22	include/cairo-dock/cairo-dock/cairo-dock-data-renderer-manager.h	20	include/cairo-dock/gldit/cairo-dock-data-renderer.h
23	include/cairo-dock/cairo-dock/cairo-dock-dbus.h	21	include/cairo-dock/gldit/cairo-dock-dbus.h
24	include/cairo-dock/cairo-dock/cairo-dock-desklet-factory.h	22	include/cairo-dock/gldit/cairo-dock-desklet-factory.h
25	include/cairo-dock/cairo-dock/cairo-dock-desklet-manager.h	23	include/cairo-dock/gldit/cairo-dock-desklet-manager.h
26	include/cairo-dock/cairo-dock/cairo-dock-dialog-factory.h	24	include/cairo-dock/gldit/cairo-dock-dialog-factory.h
27	include/cairo-dock/cairo-dock/cairo-dock-dialog-manager.h	25	include/cairo-dock/gldit/cairo-dock-dialog-manager.h
28	include/cairo-dock/cairo-dock/cairo-dock-dock-facility.h	26	include/cairo-dock/gldit/cairo-dock-dock-facility.h
29	include/cairo-dock/cairo-dock/cairo-dock-dock-factory.h	27	include/cairo-dock/gldit/cairo-dock-dock-factory.h
30	include/cairo-dock/cairo-dock/cairo-dock-dock-manager.h	28	include/cairo-dock/gldit/cairo-dock-dock-manager.h
31	include/cairo-dock/cairo-dock/cairo-dock-draw-opengl.h	29	include/cairo-dock/gldit/cairo-dock-draw-opengl.h
32	include/cairo-dock/cairo-dock/cairo-dock-draw.h	30	include/cairo-dock/gldit/cairo-dock-draw.h
33	include/cairo-dock/cairo-dock/cairo-dock-emblem.h	31	include/cairo-dock/gldit/cairo-dock-file-manager.h
34	include/cairo-dock/cairo-dock/cairo-dock-file-manager.h	32	include/cairo-dock/gldit/cairo-dock-flying-container.h
35	include/cairo-dock/cairo-dock/cairo-dock-flying-container.h	33	include/cairo-dock/gldit/cairo-dock-global-variables.h
36	include/cairo-dock/cairo-dock/cairo-dock-global-variables.h	34	include/cairo-dock/gldit/cairo-dock-gui-factory.h
37	include/cairo-dock/cairo-dock/cairo-dock-gui-factory.h	35	include/cairo-dock/gldit/cairo-dock-gui-manager.h
38	include/cairo-dock/cairo-dock/cairo-dock-gui-manager.h	36	include/cairo-dock/gldit/cairo-dock-icon-facility.h