diff options
| author | pav <pav@FreeBSD.org> | 2011-01-27 16:32:02 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2011-01-27 16:32:02 +0800 |
| commit | 7d11c86c5d96dc4ed5c0f132d021a0000d4c590c (patch) | |
| tree | 9fbf525b8680d3bd429e29d110833629c4f49303 /deskutils | |
| parent | dce2ec7810fdff5859ff9699fbda132dd4710d38 (diff) | |
| download | freebsd-ports-graphics-7d11c86c5d96dc4ed5c0f132d021a0000d4c590c.tar.gz freebsd-ports-graphics-7d11c86c5d96dc4ed5c0f132d021a0000d4c590c.tar.zst freebsd-ports-graphics-7d11c86c5d96dc4ed5c0f132d021a0000d4c590c.zip | |
- Update to 2.2.0-4
PR: ports/153784, ports/153785
Submitted by: Ivan Klymenko <fidaj@ukr.net> (maintainer)
Feature safe: yes
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/cairo-dock-plugins/Makefile | 66 | ||||
| -rw-r--r-- | deskutils/cairo-dock-plugins/distinfo | 5 | ||||
| -rw-r--r-- | deskutils/cairo-dock-plugins/files/patch-CMakeLists.txt | 70 | ||||
| -rw-r--r-- | deskutils/cairo-dock-plugins/files/patch-Makefile.am | 618 | ||||
| -rw-r--r-- | deskutils/cairo-dock-plugins/files/patch-Makefile.in | 659 | ||||
| -rw-r--r-- | deskutils/cairo-dock-plugins/files/patch-shortcuts | 86 | ||||
| -rw-r--r-- | deskutils/cairo-dock-plugins/files/patch-tomboy-dbus | 10 | ||||
| -rw-r--r-- | deskutils/cairo-dock-plugins/pkg-plist | 814 | ||||
| -rw-r--r-- | deskutils/cairo-dock/Makefile | 18 | ||||
| -rw-r--r-- | deskutils/cairo-dock/distinfo | 5 | ||||
| -rw-r--r-- | deskutils/cairo-dock/files/patch-Makefile.am | 11 | ||||
| -rw-r--r-- | deskutils/cairo-dock/files/patch-Makefile.in | 11 | ||||
| -rw-r--r-- | deskutils/cairo-dock/files/patch-cairo-dock-config.c | 11 | ||||
| -rw-r--r-- | deskutils/cairo-dock/files/patch-configure | 13 | ||||
| -rw-r--r-- | deskutils/cairo-dock/files/patch-fetch | 32 | ||||
| -rw-r--r-- | deskutils/cairo-dock/pkg-plist | 228 |
16 files changed, 693 insertions, 1964 deletions
diff --git a/deskutils/cairo-dock-plugins/Makefile b/deskutils/cairo-dock-plugins/Makefile index 131a6bfcc3c..051aae6caaf 100644 --- a/deskutils/cairo-dock-plugins/Makefile +++ b/deskutils/cairo-dock-plugins/Makefile @@ -6,18 +6,16 @@ # PORTNAME= cairo-dock-plugins -DISTVERSION= 2.1.3-9 +DISTVERSION= 2.2.0-4 CATEGORIES= deskutils -MASTER_SITES= http://launchpadlibrarian.net/44930752/ +MASTER_SITES= http://launchpadlibrarian.net/56955156/ MAINTAINER= fidaj@ukr.net COMMENT= Cairo-Dock-Plugins for Cairo-Dock -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/cairo-dock.pc:${PORTSDIR}/deskutils/cairo-dock -RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/cairo-dock.pc:${PORTSDIR}/deskutils/cairo-dock \ - wget:${PORTSDIR}/ftp/wget - -LIB_DEPENDS= etpan:${PORTSDIR}/mail/libetpan +RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget +LIB_DEPENDS= etpan:${PORTSDIR}/mail/libetpan \ + gldi.2:${PORTSDIR}/deskutils/cairo-dock DATADIR= ${PREFIX}/share/cairo-dock @@ -28,65 +26,73 @@ USE_GNOME= gnomehack pkgconfig glib20 gtk20 librsvg2 libxml2 USE_LDCONFIG= yes USE_XORG= xrender USE_DOS2UNIX= YES +USE_CMAKE= yes +USE_GCC= 4.5+ MAKE_JOBS_SAFE= YES -OPTIONS+= GMENU "Common Applications menu" On \ +OPTIONS= GMENU "Common Applications menu" On \ KEYBOARD_INDICATOR "Control the keyboard layout" Off \ TERMINAL "Add a terminal to your dock" On \ WEBLETS "To show an interactive web page" On \ - XFCE_INTEGRATION "For XFCE environnement" Off + XFCE_INTEGRATION "For XFCE environnement" Off \ + ALSA_MIXER "For ALSA compatibility utils" Off .include <bsd.port.options.mk> -CONFIGURE_ARGS+= --disable-alsa-mixer \ - --disable-old-gnome-integration -CONFIGURE_ENV+= CCFLAGS="-I${LOCALBASE}/include/cairo" - .if defined(WITH_GMENU) -LIB_DEPENDS+= gnome-menu:${PORTSDIR}/x11/gnome-menus -CONFIGURE_ARGS+= --enable-gmenu +LIB_DEPENDS+= gnome-menu.2:${PORTSDIR}/x11/gnome-menus +CMAKE_ARGS+= -Denable_gmenu:STRING=yes PLIST_SUB+= GMENU="" .else -CONFIGURE_ARGS+= --disable-gmenu +CMAKE_ARGS+= -Denable_gmenu:STRING=no PLIST_SUB+= GMENU="@comment " .endif .if defined(WITH_KEYBOARD_INDICATOR) -LIB_DEPENDS+= exif:${PORTSDIR}/graphics/libexif \ - xklavier:${PORTSDIR}/x11/libxklavier -CONFIGURE_ARGS+= --enable-keyboard-indicator +LIB_DEPENDS+= exif.12:${PORTSDIR}/graphics/libexif \ + xklavier.12:${PORTSDIR}/x11/libxklavier +CMAKE_ARGS+= -Denable_keyboard_indicator:STRING=yes PLIST_SUB+= KEYBOARD_INDICATOR="" .else -CONFIGURE_ARGS+= --disable-keyboard-indicator +CMAKE_ARGS+= -Denable_keyboard_indicator:STRING=no PLIST_SUB+= KEYBOARD_INDICATOR="@comment " .endif .if defined(WITH_TERMINAL) -LIB_DEPENDS+= vte:${PORTSDIR}/x11-toolkits/vte -CONFIGURE_ARGS+= --enable-terminal +LIB_DEPENDS+= vte.9:${PORTSDIR}/x11-toolkits/vte +CMAKE_ARGS+= -Denable_terminal:STRING=yes PLIST_SUB+= TERMINAL="" .else -CONFIGURE_ARGS+= --disable-terminal +CMAKE_ARGS+= -Denable_terminal:STRING=no PLIST_SUB+= TERMINAL="@comment " .endif .if defined(WITH_WEBLETS) -LIB_DEPENDS+= webkit-1.0:${PORTSDIR}/www/webkit-gtk2 -CONFIGURE_ARGS+= --enable-weblets +LIB_DEPENDS+= webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 +CMAKE_ARGS+= -Denable_weblets:STRING=yes PLIST_SUB+= WEBLETS="" .else -CONFIGURE_ARGS+= --disable-weblets +CMAKE_ARGS+= -Denable_weblets:STRING=no PLIST_SUB+= WEBLETS="@comment " .endif .if defined(WITH_XFCE_INTEGRATION) -LIB_DEPENDS+= thunar-vfs-1:${PORTSDIR}/x11-fm/thunar \ - exif:${PORTSDIR}/graphics/libexif -CONFIGURE_ARGS+= --enable-xfce-integration +LIB_DEPENDS+= thunar-vfs-1.5:${PORTSDIR}/x11-fm/thunar \ + exif.12:${PORTSDIR}/graphics/libexif +CMAKE_ARGS+= -Denable_xfce_integration:STRING=yes PLIST_SUB+= XFCE_INTEGRATION="" .else -CONFIGURE_ARGS+= --disable-xfce-integration +CMAKE_ARGS+= -Denable_xfce_integration:STRING=no PLIST_SUB+= XFCE_INTEGRATION="@comment " .endif +.if defined(WITH_ALSA_MIXER) +LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib +CMAKE_ARGS+= -Denable_alsa_mixer:STRING=yes +PLIST_SUB+= ALSA_MIXER="" +.else +CMAKE_ARGS+= -Denable_alsa_mixer:STRING=no +PLIST_SUB+= ALSA_MIXER="@comment " +.endif + .include <bsd.port.mk> diff --git a/deskutils/cairo-dock-plugins/distinfo b/deskutils/cairo-dock-plugins/distinfo index 7bf597a8320..d8ec9046832 100644 --- a/deskutils/cairo-dock-plugins/distinfo +++ b/deskutils/cairo-dock-plugins/distinfo @@ -1,3 +1,2 @@ -MD5 (cairo-dock-plugins-2.1.3-9.tar.gz) = 80dd8c3870c6e1e80a0acfbfc8430c8c -SHA256 (cairo-dock-plugins-2.1.3-9.tar.gz) = 3f0ea85dbeef7fe817439ed77a4bd19a435f6e1ed7207688f0d699e77a801b7a -SIZE (cairo-dock-plugins-2.1.3-9.tar.gz) = 6003152 +SHA256 (cairo-dock-plugins-2.2.0-4.tar.gz) = e8905dc6f397c89b53b6e6a15489bf4d78e19427bd95e01f7c1b3df21a564ce2 +SIZE (cairo-dock-plugins-2.2.0-4.tar.gz) = 5533523 diff --git a/deskutils/cairo-dock-plugins/files/patch-CMakeLists.txt b/deskutils/cairo-dock-plugins/files/patch-CMakeLists.txt new file mode 100644 index 00000000000..736b8ac4f85 --- /dev/null +++ b/deskutils/cairo-dock-plugins/files/patch-CMakeLists.txt @@ -0,0 +1,70 @@ +--- CMakeLists.txt.orig 2011-01-07 23:03:06.000000000 +0200 ++++ CMakeLists.txt 2011-01-07 23:42:55.000000000 +0200 +@@ -121,19 +121,6 @@ + configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Clipper/data/Clipper.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Clipper/data/Clipper.conf) + add_subdirectory (Clipper) + +-############# CLOCK ################# +-pkg_check_modules ("LIBICAL_PACKAGE" "libical") +-if ("${LIBICAL_PACKAGE_FOUND}" STREQUAL "") +- message (STATUS "Could not find libical; Clock plugin won't be built with iCal support.") +-endif() +-set (GETTEXT_CLOCK ${GETTEXT_PLUGINS}) +-set (VERSION_CLOCK "2.1.1") +-set (PACKAGE_CLOCK "cd-clock") +-set (clockuserdirname "clock") +-set (clockdatadir "${pluginsdatadir}/clock") +-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/clock/data/clock.conf.in ${CMAKE_CURRENT_BINARY_DIR}/clock/data/clock.conf) +-add_subdirectory (clock) +- + ############# COMPIZ_ICON ################# + set (GETTEXT_COMPIZ_ICON ${GETTEXT_PLUGINS}) + set (VERSION_COMPIZ_ICON "1.1.5") +@@ -299,6 +286,7 @@ + endif() + + ############# KEYBOARD_INDICATOR ################# ++if (NOT "${enable_keyboard_indicator}" STREQUAL "no") + pkg_check_modules (KEYBOARD_INDICATOR_PACKAGE libxklavier) + if ("${KEYBOARD_INDICATOR_PACKAGE_FOUND}" STREQUAL "") + message (STATUS "Could not find libxklavier; Cairo-Dock won't be built with keyboard-indicator applet.") +@@ -310,6 +298,7 @@ + configure_file (${CMAKE_CURRENT_SOURCE_DIR}/keyboard-indicator/data/keyboard-indicator.conf.in ${CMAKE_CURRENT_BINARY_DIR}/keyboard-indicator/data/keyboard-indicator.conf) + add_subdirectory ("keyboard-indicator") + endif() ++endif() + + ############# LOGOUT ################# + set (GETTEXT_LOGOUT ${GETTEXT_PLUGINS}) +@@ -546,6 +535,7 @@ + add_subdirectory (systray) + + ############# TERMINAL ################# ++if (NOT "${enable_terminal}" STREQUAL "no") + pkg_check_modules (TERMINAL_PACKAGE vte) + if ("${TERMINAL_PACKAGE_FOUND}" STREQUAL "") + message (STATUS "Could not find libvte; Cairo-Dock won't be built with terminal applet.") +@@ -557,6 +547,7 @@ + configure_file (${CMAKE_CURRENT_SOURCE_DIR}/terminal/data/terminal.conf.in ${CMAKE_CURRENT_BINARY_DIR}/terminal/data/terminal.conf) + add_subdirectory (terminal) + endif() ++endif() + + ############# TOMBOY ################# + set (GETTEXT_TOMBOY ${GETTEXT_PLUGINS}) +@@ -585,6 +576,7 @@ + add_subdirectory (weather) + + ############# WEBLETS ################# ++if (NOT "${enable_weblets}" STREQUAL "no") + pkg_check_modules (WEBKIT webkit-1.0) + if (NOT "${enable_weblets}" STREQUAL "no") + if ("${WEBKIT_FOUND}" STREQUAL "") +@@ -598,6 +590,7 @@ + add_subdirectory ("weblets") + endif() + endif() ++endif() + + ############# WIFI ################# + set (GETTEXT_WIFI ${GETTEXT_PLUGINS}) diff --git a/deskutils/cairo-dock-plugins/files/patch-Makefile.am b/deskutils/cairo-dock-plugins/files/patch-Makefile.am deleted file mode 100644 index 36531ec92e5..00000000000 --- a/deskutils/cairo-dock-plugins/files/patch-Makefile.am +++ /dev/null @@ -1,618 +0,0 @@ ---- Animated-icons/src/Makefile.am.orig 2010-05-05 22:44:57.000000000 +0300 -+++ Animated-icons/src/Makefile.am 2010-05-05 22:47:52.000000000 +0300 -@@ -49,9 +49,7 @@ - -DMY_APPLET_ICON_FILE=\""icon.svg"\"\ - -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_Animated_icons_la_LIBADD = \ ---- Cairo-Penguin/src/Makefile.am.orig 2010-05-05 22:45:01.000000000 +0300 -+++ Cairo-Penguin/src/Makefile.am 2010-05-05 22:48:06.000000000 +0300 -@@ -35,9 +35,7 @@ - -DCD_APPLET_MULTI_INSTANCE=\"1\"\ - -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_Cairo_Penguin_la_LIBADD = \ ---- Clipper/src/Makefile.am.orig 2010-05-05 22:45:04.000000000 +0300 -+++ Clipper/src/Makefile.am 2010-05-05 22:48:19.000000000 +0300 -@@ -31,9 +31,7 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.svg"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_Clipper_la_LIBADD = \ ---- Dbus/src/Makefile.am.orig 2010-05-05 22:45:07.000000000 +0300 -+++ Dbus/src/Makefile.am 2010-05-05 22:48:34.000000000 +0300 -@@ -40,9 +40,7 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.svg"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_Dbus_la_LIBADD = \ ---- GMenu/src/Makefile.am.orig 2010-05-05 22:45:11.000000000 +0300 -+++ GMenu/src/Makefile.am 2010-05-05 22:48:48.000000000 +0300 -@@ -46,9 +46,7 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.svg"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_GMenu_la_LIBADD = \ ---- Network-Monitor/src/Makefile.am.orig 2010-05-05 22:45:14.000000000 +0300 -+++ Network-Monitor/src/Makefile.am 2010-05-05 22:49:00.000000000 +0300 -@@ -40,9 +40,7 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_Network_Monitor_la_LIBADD = \ ---- RSSreader/src/Makefile.am.orig 2010-05-05 22:45:18.000000000 +0300 -+++ RSSreader/src/Makefile.am 2010-05-05 22:49:12.000000000 +0300 -@@ -33,9 +33,7 @@ - -DMY_APPLET_ICON_FILE=\""icon.svg"\"\ - -DCD_APPLET_MULTI_INSTANCE=\"1\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_RSSreader_la_LIBADD = \ ---- Scooby-Do/src/Makefile.am.orig 2010-05-05 22:45:21.000000000 +0300 -+++ Scooby-Do/src/Makefile.am 2010-05-05 22:49:30.000000000 +0300 -@@ -51,9 +51,7 @@ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_Scooby_Do_la_LIBADD = \ ---- System-Monitor/src/Makefile.am.orig 2010-05-05 22:45:24.000000000 +0300 -+++ System-Monitor/src/Makefile.am 2010-05-05 22:49:47.000000000 +0300 -@@ -39,9 +39,7 @@ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -DCD_APPLET_MULTI_INSTANCE=\"1\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_System_Monitor_la_LIBADD = \ ---- Toons/src/Makefile.am.orig 2010-05-05 22:45:29.000000000 +0300 -+++ Toons/src/Makefile.am 2010-05-05 22:49:59.000000000 +0300 -@@ -35,9 +35,7 @@ - -DCD_APPLET_MULTI_INSTANCE=\"1\"\ - -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_Toons_la_LIBADD = \ ---- Xgamma/src/Makefile.am.orig 2010-05-05 22:45:32.000000000 +0300 -+++ Xgamma/src/Makefile.am 2010-05-05 22:50:14.000000000 +0300 -@@ -32,9 +32,7 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_Xgamma_la_LIBADD = \ ---- alsaMixer/src/Makefile.am.orig 2010-05-05 22:45:35.000000000 +0300 -+++ alsaMixer/src/Makefile.am 2010-05-05 22:50:26.000000000 +0300 -@@ -34,9 +34,7 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_AlsaMixer_la_LIBADD = \ ---- clock/src/Makefile.am.orig 2010-05-05 22:45:38.000000000 +0300 -+++ clock/src/Makefile.am 2010-05-05 22:50:41.000000000 +0300 -@@ -37,9 +37,7 @@ - -DCD_APPLET_MULTI_INSTANCE=\"1\"\ - -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -std=c99\ -- -Wall\ -- -O3 --# -g -ggdb -W -Wall -+ -Wall - - - libcd_clock_la_LIBADD = \ ---- compiz-icon/src/Makefile.am.orig 2010-05-05 22:45:41.000000000 +0300 -+++ compiz-icon/src/Makefile.am 2010-05-05 22:50:56.000000000 +0300 -@@ -33,9 +33,7 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_compiz_icon_la_LIBADD = \ ---- desklet-rendering/src/Makefile.am.orig 2010-05-05 22:45:44.000000000 +0300 -+++ desklet-rendering/src/Makefile.am 2010-05-05 22:51:09.000000000 +0300 -@@ -43,10 +43,7 @@ - -DMY_APPLET_ICON_FILE=\""icon.svg"\"\ - -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -Wno-unused-parameter --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_desklet_rendering_la_LIBADD = \ ---- dialog-rendering/src/Makefile.am.orig 2010-05-05 22:45:47.000000000 +0300 -+++ dialog-rendering/src/Makefile.am 2010-05-05 22:51:23.000000000 +0300 -@@ -39,9 +39,7 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.svg"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_dialog_rendering_la_LIBADD = \ ---- dnd2share/src/Makefile.am.orig 2010-05-05 22:45:53.000000000 +0300 -+++ dnd2share/src/Makefile.am 2010-05-05 22:51:35.000000000 +0300 -@@ -46,9 +46,7 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_dnd2share_la_LIBADD = \ ---- dock-rendering/src/Makefile.am.orig 2010-05-05 22:45:55.000000000 +0300 -+++ dock-rendering/src/Makefile.am 2010-05-05 22:51:47.000000000 +0300 -@@ -43,10 +43,7 @@ - -DMY_APPLET_ICON_FILE=\""icon.svg"\"\ - -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -Wno-unused-parameter --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_rendering_la_LIBADD = \ ---- drop-indicator/src/Makefile.am.orig 2010-05-05 22:45:58.000000000 +0300 -+++ drop-indicator/src/Makefile.am 2010-05-05 22:52:04.000000000 +0300 -@@ -32,11 +32,9 @@ - -DMY_APPLET_DEFAULT_DROP_INDICATOR_NAME=\""default-drop-indicator.svg"\"\ - -DMY_APPLET_DEFAULT_HOVER_INDICATOR_NAME=\""default-hover-indicator.svg"\"\ - -DMY_APPLET_MASK_INDICATOR_NAME=\""texture-bilinear-gradation.png"\"\ -- -DGL_GLEXT_PROTOTYPES=\""1"\"\ -+ -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_drop_indicator_la_LIBADD = \ ---- dustbin/src/Makefile.am.orig 2010-05-05 22:46:00.000000000 +0300 -+++ dustbin/src/Makefile.am 2010-05-05 22:52:21.000000000 +0300 -@@ -31,9 +31,7 @@ - -DMY_APPLET_GETTEXT_DOMAIN=\""$(GETTEXT_DUSTBIN)"\"\ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ -- -std=c99\ -- -O3 --# -g -ggdb -W -Wall -+ -std=c99 - - - libcd_dustbin_la_LIBADD = \ ---- gnome-integration/src/Makefile.am.orig 2010-05-05 22:46:03.000000000 +0300 -+++ gnome-integration/src/Makefile.am 2010-05-05 22:52:34.000000000 +0300 -@@ -29,9 +29,7 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_gnome_integration_la_LIBADD = \ ---- gnome-integration-old/src/Makefile.am.orig 2010-05-05 22:46:06.000000000 +0300 -+++ gnome-integration-old/src/Makefile.am 2010-05-05 22:56:05.000000000 +0300 -@@ -29,9 +29,7 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.svg"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_gnome_integration_old_la_LIBADD = \ ---- icon-effect/src/Makefile.am.orig 2010-05-05 22:46:09.000000000 +0300 -+++ icon-effect/src/Makefile.am 2010-05-05 22:56:29.000000000 +0300 -@@ -41,11 +41,9 @@ - -DMY_APPLET_GETTEXT_DOMAIN=\""$(GETTEXT_ICON_EFFECTS)"\"\ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ -- -DGL_GLEXT_PROTOTYPES=\""1"\"\ -+ -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_icon_effect_la_LIBADD = \ ---- illusion/src/Makefile.am.orig 2010-05-05 22:46:12.000000000 +0300 -+++ illusion/src/Makefile.am 2010-05-05 22:57:15.000000000 +0300 -@@ -42,9 +42,7 @@ - -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -DMY_APPLET_ICON_FILE=\""icon.svg"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_illusion_la_LIBADD = \ ---- kde-integration/src/Makefile.am.orig 2010-05-05 22:46:15.000000000 +0300 -+++ kde-integration/src/Makefile.am 2010-05-05 23:00:39.000000000 +0300 -@@ -29,9 +29,7 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_kde_integration_la_LIBADD = \ ---- keyboard-indicator/src/Makefile.am.orig 2010-05-05 22:46:18.000000000 +0300 -+++ keyboard-indicator/src/Makefile.am 2010-05-05 23:01:19.000000000 +0300 -@@ -34,9 +34,7 @@ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_keyboard_indicator_la_LIBADD = \ ---- logout/src/Makefile.am.orig 2010-05-05 22:46:21.000000000 +0300 -+++ logout/src/Makefile.am 2010-05-05 23:01:32.000000000 +0300 -@@ -28,9 +28,7 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.svg"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_logout_la_LIBADD = \ ---- mail/src/Makefile.am.orig 2010-05-05 22:46:25.000000000 +0300 -+++ mail/src/Makefile.am 2010-05-05 23:01:53.000000000 +0300 -@@ -36,10 +36,7 @@ - -DCD_APPLET_MULTI_INSTANCE=\"1\"\ - -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -g -ggdb -W --# -fgnu89-inline\ --# -O3 -+ -Werror-implicit-function-declaration - - - libcd_mail_la_LIBADD = \ ---- motion-blur/src/Makefile.am.orig 2010-05-05 22:46:28.000000000 +0300 -+++ motion-blur/src/Makefile.am 2010-05-05 23:02:08.000000000 +0300 -@@ -29,9 +29,7 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_motion_blur_la_LIBADD = \ ---- musicPlayer/src/Makefile.am.orig 2010-05-05 22:46:31.000000000 +0300 -+++ musicPlayer/src/Makefile.am 2010-05-05 23:02:23.000000000 +0300 -@@ -65,9 +65,7 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_musicPlayer_la_LIBADD = \ ---- netspeed/src/Makefile.am.orig 2010-05-05 22:46:34.000000000 +0300 -+++ netspeed/src/Makefile.am 2010-05-05 23:02:41.000000000 +0300 -@@ -32,9 +32,7 @@ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -DCD_APPLET_MULTI_INSTANCE=\"1\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_netspeed_la_LIBADD = \ ---- powermanager/src/Makefile.am.orig 2010-05-05 22:46:38.000000000 +0300 -+++ powermanager/src/Makefile.am 2010-05-05 23:03:01.000000000 +0300 -@@ -32,9 +32,7 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - libcd_powermanager_la_LIBADD = \ - $(PACKAGE_LIBS) -lm ---- quick-browser/src/Makefile.am.orig 2010-05-05 22:46:41.000000000 +0300 -+++ quick-browser/src/Makefile.am 2010-05-05 23:03:34.000000000 +0300 -@@ -32,9 +32,7 @@ - -DMY_APPLET_ICON_FILE=\""icon.svg"\"\ - -DCD_APPLET_MULTI_INSTANCE=\"1\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_quick_browser_la_LIBADD = \ ---- shortcuts/src/Makefile.am.orig 2010-05-05 22:46:44.000000000 +0300 -+++ shortcuts/src/Makefile.am 2010-05-05 23:04:56.000000000 +0300 -@@ -35,9 +35,7 @@ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -DCD_APPLET_MULTI_INSTANCE=\"1\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_shortcuts_la_LIBADD = \ ---- show-mouse/src/Makefile.am.orig 2010-05-05 22:46:47.000000000 +0300 -+++ show-mouse/src/Makefile.am 2010-05-05 23:05:13.000000000 +0300 -@@ -29,11 +29,9 @@ - -DMY_APPLET_GETTEXT_DOMAIN=\""$(GETTEXT_SHOW_MOUSE)"\"\ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ -- -DGL_GLEXT_PROTOTYPES=\""1"\"\ -+ -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_show_mouse_la_LIBADD = \ ---- showDesktop/src/Makefile.am.orig 2010-05-05 22:46:49.000000000 +0300 -+++ showDesktop/src/Makefile.am 2010-05-05 23:05:30.000000000 +0300 -@@ -35,9 +35,7 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_showDesktop_la_LIBADD = \ ---- slider/src/Makefile.am.orig 2010-05-05 22:46:52.000000000 +0300 -+++ slider/src/Makefile.am 2010-05-05 23:05:47.000000000 +0300 -@@ -41,9 +41,7 @@ - -DCD_APPLET_MULTI_INSTANCE=\"1\"\ - -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -Werror-implicit-function-declaration\ -- -std=c99\ -- -O3 --# -g -ggdb -W -Wall -+ -std=c99 - - - libcd_slider_la_LIBADD = \ ---- stack/src/Makefile.am.orig 2010-05-05 22:46:54.000000000 +0300 -+++ stack/src/Makefile.am 2010-05-05 23:05:59.000000000 +0300 -@@ -36,9 +36,7 @@ - -DCD_STACK_DEFAULT_URL_ICON=\""url-icon.svg"\"\ - -DCD_APPLET_MULTI_INSTANCE=\"1\"\ - -Werror-implicit-function-declaration\ -- -std=c99\ -- -O3 --# -g -ggdb -W -Wall -+ -std=c99 - - - libcd_stack_la_LIBADD = \ ---- switcher/src/Makefile.am.orig 2010-05-05 22:46:57.000000000 +0300 -+++ switcher/src/Makefile.am 2010-05-05 23:06:49.000000000 +0300 -@@ -35,9 +35,7 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""workspaces.svg"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_switcher_la_LIBADD = \ ---- systray/src/Makefile.am.orig 2010-05-05 22:47:00.000000000 +0300 -+++ systray/src/Makefile.am 2010-05-05 23:07:44.000000000 +0300 -@@ -31,12 +31,10 @@ - -DMY_APPLET_USER_DATA_DIR=\""systray"\"\ - -DMY_APPLET_VERSION=\""$(VERSION_SYSTRAY)"\"\ - -DMY_APPLET_GETTEXT_DOMAIN=\""$(GETTEXT_SYSTRAY)"\"\ -- -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ -+ -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -W -Werror -+ -Werror-implicit-function-declaration - - libcd_systray_la_LIBADD = \ - $(PACKAGE_LIBS) -lm ---- terminal/src/Makefile.am.orig 2010-05-05 22:47:12.000000000 +0300 -+++ terminal/src/Makefile.am 2010-05-05 23:08:39.000000000 +0300 -@@ -33,9 +33,7 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -W -Werror -+ -Werror-implicit-function-declaration - - - libcd_terminal_la_LIBADD = \ ---- tomboy/src/Makefile.am.orig 2010-05-05 22:47:15.000000000 +0300 -+++ tomboy/src/Makefile.am 2010-05-05 23:08:52.000000000 +0300 -@@ -32,10 +32,7 @@ - -DMY_APPLET_GETTEXT_DOMAIN=\""$(GETTEXT_TOMBOY)"\"\ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ -- -std=c99\ -- -O3 --# -g -ggdb -W -Wall --#-Werror-implicit-function-declaration -+ -std=c99 - - - libcd_tomboy_la_LIBADD = \ ---- weather/src/Makefile.am.orig 2010-05-05 22:47:17.000000000 +0300 -+++ weather/src/Makefile.am 2010-05-05 23:09:05.000000000 +0300 -@@ -33,9 +33,7 @@ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -DCD_APPLET_MULTI_INSTANCE=\"1\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_weather_la_LIBADD = \ ---- weblets/src/Makefile.am.orig 2010-05-05 22:47:22.000000000 +0300 -+++ weblets/src/Makefile.am 2010-05-05 23:09:27.000000000 +0300 -@@ -29,11 +29,9 @@ - -DMY_APPLET_GETTEXT_DOMAIN=\""$(GETTEXT_WEBLETS)"\"\ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ -- -DCD_APPLET_MULTI_INSTANCE=1 -+ -DCD_APPLET_MULTI_INSTANCE=1\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - libcd_weblets_la_LIBADD = \ - $(PACKAGE_LIBS) $(WEBKIT_LIBS) -lm ---- wifi/src/Makefile.am.orig 2010-05-05 22:47:25.000000000 +0300 -+++ wifi/src/Makefile.am 2010-05-05 23:09:41.000000000 +0300 -@@ -33,9 +33,7 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_wifi_la_LIBADD = \ ---- xfce-integration/src/Makefile.am.orig 2010-05-05 22:47:28.000000000 +0300 -+++ xfce-integration/src/Makefile.am 2010-05-05 23:09:54.000000000 +0300 -@@ -29,9 +29,7 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 --# -g -ggdb -W -Wall -+ -Werror-implicit-function-declaration - - - libcd_xfce_integration_la_LIBADD = \ diff --git a/deskutils/cairo-dock-plugins/files/patch-Makefile.in b/deskutils/cairo-dock-plugins/files/patch-Makefile.in deleted file mode 100644 index 4a88474755b..00000000000 --- a/deskutils/cairo-dock-plugins/files/patch-Makefile.in +++ /dev/null @@ -1,659 +0,0 @@ ---- Animated-icons/src/Makefile.in.orig 2010-05-05 22:44:57.000000000 +0300 -+++ Animated-icons/src/Makefile.in 2010-05-05 22:47:58.000000000 +0300 -@@ -507,10 +507,8 @@ - -DMY_APPLET_ICON_FILE=\""icon.svg"\"\ - -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_Animated_icons_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- Cairo-Penguin/src/Makefile.in.orig 2010-05-05 22:45:01.000000000 +0300 -+++ Cairo-Penguin/src/Makefile.in 2010-05-05 22:48:12.000000000 +0300 -@@ -485,10 +485,8 @@ - -DCD_APPLET_MULTI_INSTANCE=\"1\"\ - -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_Cairo_Penguin_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- Clipper/src/Makefile.in.orig 2010-05-05 22:45:04.000000000 +0300 -+++ Clipper/src/Makefile.in 2010-05-05 22:48:26.000000000 +0300 -@@ -478,10 +478,8 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.svg"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_Clipper_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- Dbus/src/Makefile.in.orig 2010-05-05 22:45:07.000000000 +0300 -+++ Dbus/src/Makefile.in 2010-05-05 22:48:42.000000000 +0300 -@@ -489,10 +489,8 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.svg"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_Dbus_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- GMenu/src/Makefile.in.orig 2010-05-05 22:45:11.000000000 +0300 -+++ GMenu/src/Makefile.in 2010-05-05 22:48:53.000000000 +0300 -@@ -494,10 +494,8 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.svg"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_GMenu_la_LIBADD = \ - $(PACKAGE_LIBS) -lm\ - $(GMENU_GIO_LIBS)\ ---- Network-Monitor/src/Makefile.in.orig 2010-05-05 22:45:14.000000000 +0300 -+++ Network-Monitor/src/Makefile.in 2010-05-05 22:49:05.000000000 +0300 -@@ -495,10 +495,8 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_Network_Monitor_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- RSSreader/src/Makefile.in.orig 2010-05-05 22:45:18.000000000 +0300 -+++ RSSreader/src/Makefile.in 2010-05-05 22:49:17.000000000 +0300 -@@ -482,10 +482,8 @@ - -DMY_APPLET_ICON_FILE=\""icon.svg"\"\ - -DCD_APPLET_MULTI_INSTANCE=\"1\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_RSSreader_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- Scooby-Do/src/Makefile.in.orig 2010-05-05 22:45:21.000000000 +0300 -+++ Scooby-Do/src/Makefile.in 2010-05-05 22:49:36.000000000 +0300 -@@ -509,10 +509,8 @@ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_Scooby_Do_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- System-Monitor/src/Makefile.in.orig 2010-05-05 22:45:24.000000000 +0300 -+++ System-Monitor/src/Makefile.in 2010-05-05 22:49:52.000000000 +0300 -@@ -493,10 +493,8 @@ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -DCD_APPLET_MULTI_INSTANCE=\"1\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_System_Monitor_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- Toons/src/Makefile.in.orig 2010-05-05 22:45:29.000000000 +0300 -+++ Toons/src/Makefile.in 2010-05-05 22:50:05.000000000 +0300 -@@ -482,10 +482,8 @@ - -DCD_APPLET_MULTI_INSTANCE=\"1\"\ - -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_Toons_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- Xgamma/src/Makefile.in.orig 2010-05-05 22:45:32.000000000 +0300 -+++ Xgamma/src/Makefile.in 2010-05-05 22:50:19.000000000 +0300 -@@ -480,10 +480,8 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_Xgamma_la_LIBADD = \ - $(PACKAGE_LIBS) -lm \ - $(XGAMMA_PACKAGE_LIBS) ---- alsaMixer/src/Makefile.in.orig 2010-05-05 22:45:35.000000000 +0300 -+++ alsaMixer/src/Makefile.in 2010-05-05 22:50:31.000000000 +0300 -@@ -484,10 +484,8 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_AlsaMixer_la_LIBADD = \ - $(PACKAGE_LIBS)\ - $(ALSA_MIXER_PACKAGE_LIBS)\ ---- clock/src/Makefile.in.orig 2010-05-05 22:45:38.000000000 +0300 -+++ clock/src/Makefile.in 2010-05-05 22:50:49.000000000 +0300 -@@ -485,10 +485,8 @@ - -DCD_APPLET_MULTI_INSTANCE=\"1\"\ - -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -std=c99\ -- -Wall\ -- -O3 -+ -Wall - --# -g -ggdb -W -Wall - libcd_clock_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- compiz-icon/src/Makefile.in.orig 2010-05-05 22:45:41.000000000 +0300 -+++ compiz-icon/src/Makefile.in 2010-05-05 22:51:02.000000000 +0300 -@@ -482,10 +482,8 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_compiz_icon_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- desklet-rendering/src/Makefile.in.orig 2010-05-05 22:45:44.000000000 +0300 -+++ desklet-rendering/src/Makefile.in 2010-05-05 22:51:17.000000000 +0300 -@@ -499,11 +499,8 @@ - -DMY_APPLET_ICON_FILE=\""icon.svg"\"\ - -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -Wno-unused-parameter --# -g -ggdb -W -Wall - libcd_desklet_rendering_la_LIBADD = \ - $(glitz_libs) \ - $(PACKAGE_LIBS) -lm ---- dialog-rendering/src/Makefile.in.orig 2010-05-05 22:45:47.000000000 +0300 -+++ dialog-rendering/src/Makefile.in 2010-05-05 22:51:28.000000000 +0300 -@@ -493,10 +493,8 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.svg"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_dialog_rendering_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- dnd2share/src/Makefile.in.orig 2010-05-05 22:45:53.000000000 +0300 -+++ dnd2share/src/Makefile.in 2010-05-05 22:51:40.000000000 +0300 -@@ -502,10 +502,8 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_dnd2share_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- dock-rendering/src/Makefile.in.orig 2010-05-05 22:45:55.000000000 +0300 -+++ dock-rendering/src/Makefile.in 2010-05-05 22:51:52.000000000 +0300 -@@ -497,11 +497,8 @@ - -DMY_APPLET_ICON_FILE=\""icon.svg"\"\ - -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -Wno-unused-parameter --# -g -ggdb -W -Wall - libcd_rendering_la_LIBADD = \ - $(glitz_libs) \ - $(PACKAGE_LIBS) -lm ---- drop-indicator/src/Makefile.in.orig 2010-05-05 22:45:58.000000000 +0300 -+++ drop-indicator/src/Makefile.in 2010-05-05 22:52:15.000000000 +0300 -@@ -481,12 +481,10 @@ - -DMY_APPLET_DEFAULT_DROP_INDICATOR_NAME=\""default-drop-indicator.svg"\"\ - -DMY_APPLET_DEFAULT_HOVER_INDICATOR_NAME=\""default-hover-indicator.svg"\"\ - -DMY_APPLET_MASK_INDICATOR_NAME=\""texture-bilinear-gradation.png"\"\ -- -DGL_GLEXT_PROTOTYPES=\""1"\"\ -+ -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_drop_indicator_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- dustbin/src/Makefile.in.orig 2010-05-05 22:46:00.000000000 +0300 -+++ dustbin/src/Makefile.in 2010-05-05 22:52:26.000000000 +0300 -@@ -479,10 +479,8 @@ - -DMY_APPLET_GETTEXT_DOMAIN=\""$(GETTEXT_DUSTBIN)"\"\ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ -- -std=c99\ -- -O3 -+ -std=c99 - --# -g -ggdb -W -Wall - libcd_dustbin_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- gnome-integration/src/Makefile.in.orig 2010-05-05 22:46:03.000000000 +0300 -+++ gnome-integration/src/Makefile.in 2010-05-05 22:52:40.000000000 +0300 -@@ -479,10 +479,8 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_gnome_integration_la_LIBADD = \ - $(PACKAGE_LIBS)\ - $(GNOME_INTEGRATION_LIBS)\ ---- gnome-integration-old/src/Makefile.in.orig 2010-05-05 22:46:06.000000000 +0300 -+++ gnome-integration-old/src/Makefile.in 2010-05-05 22:56:16.000000000 +0300 -@@ -479,10 +479,8 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.svg"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_gnome_integration_old_la_LIBADD = \ - $(PACKAGE_LIBS)\ - $(OLD_GNOME_INTEGRATION_LIBS)\ ---- icon-effect/src/Makefile.in.orig 2010-05-05 22:46:09.000000000 +0300 -+++ icon-effect/src/Makefile.in 2010-05-05 22:56:42.000000000 +0300 -@@ -494,12 +494,10 @@ - -DMY_APPLET_GETTEXT_DOMAIN=\""$(GETTEXT_ICON_EFFECTS)"\"\ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ -- -DGL_GLEXT_PROTOTYPES=\""1"\"\ -+ -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_icon_effect_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- illusion/src/Makefile.in.orig 2010-05-05 22:46:12.000000000 +0300 -+++ illusion/src/Makefile.in 2010-05-05 22:57:24.000000000 +0300 -@@ -496,10 +496,8 @@ - -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -DMY_APPLET_ICON_FILE=\""icon.svg"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_illusion_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- kde-integration/src/Makefile.in.orig 2010-05-05 22:46:15.000000000 +0300 -+++ kde-integration/src/Makefile.in 2010-05-05 23:00:45.000000000 +0300 -@@ -479,10 +479,8 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_kde_integration_la_LIBADD = \ - $(PACKAGE_LIBS)\ - $(KDE_INTEGRATION_LIBS)\ ---- keyboard-indicator/src/Makefile.in.orig 2010-05-05 22:46:18.000000000 +0300 -+++ keyboard-indicator/src/Makefile.in 2010-05-05 23:01:25.000000000 +0300 -@@ -486,10 +486,8 @@ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_keyboard_indicator_la_LIBADD = \ - $(PACKAGE_LIBS) -lm\ - $(KEYBOARD_INDICATOR_PACKAGE_LIBS) ---- logout/src/Makefile.in.orig 2010-05-05 22:46:21.000000000 +0300 -+++ logout/src/Makefile.in 2010-05-05 23:01:38.000000000 +0300 -@@ -475,10 +475,8 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.svg"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_logout_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- mail/src/Makefile.in.orig 2010-05-05 22:46:25.000000000 +0300 -+++ mail/src/Makefile.in 2010-05-05 23:02:01.000000000 +0300 -@@ -485,11 +485,8 @@ - -DCD_APPLET_MULTI_INSTANCE=\"1\"\ - -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -g -ggdb -W -+ -Werror-implicit-function-declaration - --# -fgnu89-inline\ --# -O3 - libcd_mail_la_LIBADD = \ - $(PACKAGE_LIBS) -lm \ - $(MAIL_PACKAGE_LIBS) ---- motion-blur/src/Makefile.in.orig 2010-05-05 22:46:28.000000000 +0300 -+++ motion-blur/src/Makefile.in 2010-05-05 23:02:14.000000000 +0300 -@@ -476,10 +476,8 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_motion_blur_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- musicPlayer/src/Makefile.in.orig 2010-05-05 22:46:31.000000000 +0300 -+++ musicPlayer/src/Makefile.in 2010-05-05 23:02:31.000000000 +0300 -@@ -530,10 +530,8 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_musicPlayer_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- netspeed/src/Makefile.in.orig 2010-05-05 22:46:34.000000000 +0300 -+++ netspeed/src/Makefile.in 2010-05-05 23:02:46.000000000 +0300 -@@ -480,10 +480,8 @@ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -DCD_APPLET_MULTI_INSTANCE=\"1\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_netspeed_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- powermanager/src/Makefile.in.orig 2010-05-05 22:46:38.000000000 +0300 -+++ powermanager/src/Makefile.in 2010-05-05 23:03:06.000000000 +0300 -@@ -483,10 +483,8 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_powermanager_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- quick-browser/src/Makefile.in.orig 2010-05-05 22:46:41.000000000 +0300 -+++ quick-browser/src/Makefile.in 2010-05-05 23:04:49.000000000 +0300 -@@ -481,10 +481,8 @@ - -DMY_APPLET_ICON_FILE=\""icon.svg"\"\ - -DCD_APPLET_MULTI_INSTANCE=\"1\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_quick_browser_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- shortcuts/src/Makefile.in.orig 2010-05-05 22:46:44.000000000 +0300 -+++ shortcuts/src/Makefile.in 2010-05-05 23:05:02.000000000 +0300 -@@ -486,10 +486,8 @@ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -DCD_APPLET_MULTI_INSTANCE=\"1\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_shortcuts_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- show-mouse/src/Makefile.in.orig 2010-05-05 22:46:47.000000000 +0300 -+++ show-mouse/src/Makefile.in 2010-05-05 23:05:22.000000000 +0300 -@@ -476,12 +476,10 @@ - -DMY_APPLET_GETTEXT_DOMAIN=\""$(GETTEXT_SHOW_MOUSE)"\"\ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ -- -DGL_GLEXT_PROTOTYPES=\""1"\"\ -+ -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_show_mouse_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- showDesktop/src/Makefile.in.orig 2010-05-05 22:46:49.000000000 +0300 -+++ showDesktop/src/Makefile.in 2010-05-05 23:05:38.000000000 +0300 -@@ -480,10 +480,8 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_showDesktop_la_LIBADD = \ - $(PACKAGE_LIBS) -lm\ - $(SHOW_DESKTOP_XRANDR_LIBS) ---- slider/src/Makefile.in.orig 2010-05-05 22:46:52.000000000 +0300 -+++ slider/src/Makefile.in 2010-05-05 23:05:53.000000000 +0300 -@@ -487,10 +487,8 @@ - -DCD_APPLET_MULTI_INSTANCE=\"1\"\ - -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -Werror-implicit-function-declaration\ -- -std=c99\ -- -O3 -+ -std=c99 - --# -g -ggdb -W -Wall - libcd_slider_la_LIBADD = \ - $(EXIF_LIBS) \ - $(PACKAGE_LIBS) -lm ---- stack/src/Makefile.in.orig 2010-05-05 22:46:54.000000000 +0300 -+++ stack/src/Makefile.in 2010-05-05 23:06:41.000000000 +0300 -@@ -484,10 +484,8 @@ - -DCD_STACK_DEFAULT_URL_ICON=\""url-icon.svg"\"\ - -DCD_APPLET_MULTI_INSTANCE=\"1\"\ - -Werror-implicit-function-declaration\ -- -std=c99\ -- -O3 -+ -std=c99 - --# -g -ggdb -W -Wall - libcd_stack_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- switcher/src/Makefile.in.orig 2010-05-05 22:46:57.000000000 +0300 -+++ switcher/src/Makefile.in 2010-05-05 23:07:14.000000000 +0300 -@@ -485,10 +485,8 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""workspaces.svg"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_switcher_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- systray/src/Makefile.in.orig 2010-05-05 22:47:00.000000000 +0300 -+++ systray/src/Makefile.in 2010-05-05 23:08:05.000000000 +0300 -@@ -481,13 +481,11 @@ - -DMY_APPLET_USER_DATA_DIR=\""systray"\"\ - -DMY_APPLET_VERSION=\""$(VERSION_SYSTRAY)"\"\ - -DMY_APPLET_GETTEXT_DOMAIN=\""$(GETTEXT_SYSTRAY)"\"\ -- -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ -+ -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall -W -Werror - libcd_systray_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- terminal/src/Makefile.in.orig 2010-05-05 22:47:12.000000000 +0300 -+++ terminal/src/Makefile.in 2010-05-05 23:08:45.000000000 +0300 -@@ -484,10 +484,8 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall -W -Werror - libcd_terminal_la_LIBADD = \ - $(PACKAGE_LIBS) -lm \ - $(TERMINAL_PACKAGE_LIBS) ---- tomboy/src/Makefile.in.orig 2010-05-05 22:47:15.000000000 +0300 -+++ tomboy/src/Makefile.in 2010-05-05 23:08:59.000000000 +0300 -@@ -480,11 +480,8 @@ - -DMY_APPLET_GETTEXT_DOMAIN=\""$(GETTEXT_TOMBOY)"\"\ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ -- -std=c99\ -- -O3 -+ -std=c99 - --# -g -ggdb -W -Wall --#-Werror-implicit-function-declaration - libcd_tomboy_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- weather/src/Makefile.in.orig 2010-05-05 22:47:17.000000000 +0300 -+++ weather/src/Makefile.in 2010-05-05 23:09:11.000000000 +0300 -@@ -482,10 +482,8 @@ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -DCD_APPLET_MULTI_INSTANCE=\"1\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_weather_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- weblets/src/Makefile.in.orig 2010-05-05 22:47:22.000000000 +0300 -+++ weblets/src/Makefile.in 2010-05-05 23:09:34.000000000 +0300 -@@ -823,8 +823,7 @@ - - #dnl Process this file with automake to produce Makefile.in - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. ---- wifi/src/Makefile.in.orig 2010-05-05 22:47:25.000000000 +0300 -+++ wifi/src/Makefile.in 2010-05-05 23:09:47.000000000 +0300 -@@ -480,10 +480,8 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_wifi_la_LIBADD = \ - $(PACKAGE_LIBS) -lm - ---- xfce-integration/src/Makefile.in.orig 2010-05-05 22:47:28.000000000 +0300 -+++ xfce-integration/src/Makefile.in 2010-05-05 23:09:59.000000000 +0300 -@@ -479,10 +479,8 @@ - -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\ - -DMY_APPLET_ICON_FILE=\""icon.png"\"\ - -std=c99\ -- -Werror-implicit-function-declaration\ -- -O3 -+ -Werror-implicit-function-declaration - --# -g -ggdb -W -Wall - libcd_xfce_integration_la_LIBADD = \ - $(PACKAGE_LIBS)\ - $(XFCE_INTEGRATION_LIBS)\ diff --git a/deskutils/cairo-dock-plugins/files/patch-shortcuts b/deskutils/cairo-dock-plugins/files/patch-shortcuts index 5cb08f67ccb..29df920ea1e 100644 --- a/deskutils/cairo-dock-plugins/files/patch-shortcuts +++ b/deskutils/cairo-dock-plugins/files/patch-shortcuts @@ -1,5 +1,5 @@ ---- shortcuts/src/applet-disk-usage.c 2009-09-27 19:14:51.000000000 +0300 -+++ shortcuts/src/applet-disk-usage.c 2010-02-03 22:25:09.000000000 +0200 +--- shortcuts/src/applet-disk-usage.c.orig 2010-12-11 02:13:37.000000000 +0200 ++++ shortcuts/src/applet-disk-usage.c 2010-12-11 02:21:43.000000000 +0200 @@ -18,10 +18,18 @@ */ @@ -18,67 +18,61 @@ +#include <mntent.h> +#include <sys/statfs.h> +#endif + #include <math.h> #include <cairo-dock.h> - -@@ -178,18 +186,50 @@ - void cd_shortcuts_get_fs_info (const gchar *cDiskURI, GString *sInfo) +@@ -160,12 +168,44 @@ + static void _cd_shortcuts_get_fs_info (const gchar *cDiskURI, GString *sInfo) { const gchar *cMountPath = (strncmp (cDiskURI, "file://", 7) == 0 ? cDiskURI + 7 : cDiskURI); +- struct mntent *me; +- FILE *mtab = setmntent ("/etc/mtab", "r"); +#if defined(__FreeBSD__) -+ struct statfs *me; -+// FILE *mtab; ++ struct statfs *me; ++// FILE *mtab; +#else - struct mntent *me; - FILE *mtab = setmntent ("/etc/mtab", "r"); ++ struct mntent *me; ++ FILE *mtab = setmntent ("/etc/mtab", "r"); +#endif char *search_path; int match; char *slash; +#if defined(__FreeBSD__) -+ int i; -+ int count = getfsstat(me, NULL, MNT_WAIT); -+// int count = getfsstat(me, NULL, MNT_NOWAIT); -+ if (count>0) -+ { -+ for (i=0; i<count; i++) -+ { -+ if (me->f_mntonname && strcmp (me->f_mntonname, cMountPath) == 0) -+ { -+ g_string_append_printf (sInfo, "Mount point : %s\nFile system : %s\nDevice : %s\nMount options : %s", -+ me->f_mntonname, -+ me->f_mntfromname, -+ me->f_fstypename, -+ me->f_charspare); -+// if (me->mnt_freq != 0) -+// g_string_append_printf (sInfo, "\nBackup frequency : %d days", me->mnt_freq); -+ break ; -+ } -+ } -+ } -+ else -+ { -+ cd_warning ("error getfsstat..."); -+ return ; -+ } ++ int i; ++ int count = getfsstat(me, NULL, MNT_WAIT); ++// int count = getfsstat(me, NULL, MNT_NOWAIT); ++ if (count>0) ++ { ++ for (i=0; i<count; i++) ++ { ++ if (me->f_mntonname && strcmp (me->f_mntonname, cMountPath) == 0) ++ { ++ g_string_append_printf (sInfo, "Mount point : %s\nFile system : %s\nDevice : %s\nMount options : %s", ++ me->f_mntonname, ++ me->f_mntfromname, ++ me->f_fstypename, ++ me->f_charspare); ++// if (me->mnt_freq != 0) ++// g_string_append_printf (sInfo, "\nBackup frequency : %d days", me->mnt_freq); ++ break ; ++ } ++ } ++ } ++ else ++ { ++ cd_warning ("error getfsstat..."); ++ return ; ++ } +#else if (mtab == NULL) { cd_warning ("couldn't open /etc/mtab"); - return ; - } -- -+ - gchar *cFsInfo = NULL; - while ((me = getmntent (mtab)) != NULL) - { -@@ -205,6 +245,7 @@ - break ; - } +@@ -189,6 +229,7 @@ } -- -+ + endmntent (mtab); +#endif } + + gchar *cd_shortcuts_get_disk_info (const gchar *cDiskURI, const gchar *cDiskName) diff --git a/deskutils/cairo-dock-plugins/files/patch-tomboy-dbus b/deskutils/cairo-dock-plugins/files/patch-tomboy-dbus index ba5623c1841..1892abab36e 100644 --- a/deskutils/cairo-dock-plugins/files/patch-tomboy-dbus +++ b/deskutils/cairo-dock-plugins/files/patch-tomboy-dbus @@ -1,11 +1,11 @@ ---- tomboy/src/tomboy-dbus.c 2010-02-13 06:00:04.000000000 -0500 -+++ tomboy/src/tomboy-dbus.c 2010-06-29 12:29:00.000000000 -0400 -@@ -28,7 +28,7 @@ +--- tomboy/src/tomboy-dbus.c.orig 2010-12-11 02:12:22.000000000 +0200 ++++ tomboy/src/tomboy-dbus.c 2010-12-11 02:12:30.000000000 +0200 +@@ -30,7 +30,7 @@ static DBusGProxy *dbus_proxy_tomboy = NULL; -extern struct tm *localtime_r (time_t *timer, struct tm *tp); +//extern struct tm *localtime_r (time_t *timer, struct tm *tp); - - + #define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) + #define g_marshal_value_peek_object(v) g_value_get_object (v) diff --git a/deskutils/cairo-dock-plugins/pkg-plist b/deskutils/cairo-dock-plugins/pkg-plist index 3e47bfa8479..a43fd2f6424 100644 --- a/deskutils/cairo-dock-plugins/pkg-plist +++ b/deskutils/cairo-dock-plugins/pkg-plist @@ -1,86 +1,45 @@ -lib/cairo-dock/libcd-Animated-icons.la +%%ALSA_MIXER%%lib/cairo-dock/libcd-AlsaMixer.so lib/cairo-dock/libcd-Animated-icons.so -lib/cairo-dock/libcd-Cairo-Penguin.la lib/cairo-dock/libcd-Cairo-Penguin.so -lib/cairo-dock/libcd-Clipper.la lib/cairo-dock/libcd-Clipper.so -lib/cairo-dock/libcd-Dbus.la lib/cairo-dock/libcd-Dbus.so -%%GMENU%%lib/cairo-dock/libcd-GMenu.la +lib/cairo-dock/libcd-Folders.so +lib/cairo-dock/libcd-rssreader.so +lib/cairo-dock/libcd-system-monitor.so %%GMENU%%lib/cairo-dock/libcd-GMenu.so -lib/cairo-dock/libcd-System-Monitor.la -lib/cairo-dock/libcd-System-Monitor.so -lib/cairo-dock/libcd-Toons.la lib/cairo-dock/libcd-Toons.so -lib/cairo-dock/libcd-Xgamma.la lib/cairo-dock/libcd-Xgamma.so -lib/cairo-dock/libcd-clock.la -lib/cairo-dock/libcd-clock.so -lib/cairo-dock/libcd-compiz-icon.la lib/cairo-dock/libcd-compiz-icon.so -lib/cairo-dock/libcd-desklet-rendering.la lib/cairo-dock/libcd-desklet-rendering.so -lib/cairo-dock/libcd-dialog-rendering.la lib/cairo-dock/libcd-dialog-rendering.so -lib/cairo-dock/libcd-dnd2share.la lib/cairo-dock/libcd-dnd2share.so -lib/cairo-dock/libcd-drop_indicator.la lib/cairo-dock/libcd-drop_indicator.so -lib/cairo-dock/libcd-dustbin.la lib/cairo-dock/libcd-dustbin.so -lib/cairo-dock/libcd-icon-effect.la lib/cairo-dock/libcd-icon-effect.so -lib/cairo-dock/libcd-illusion.la lib/cairo-dock/libcd-illusion.so -lib/cairo-dock/libcd_kde-integration.la lib/cairo-dock/libcd_kde-integration.so -%%KEYBOARD_INDICATOR%%lib/cairo-dock/libcd-keyboard-indicator.la %%KEYBOARD_INDICATOR%%lib/cairo-dock/libcd-keyboard-indicator.so -lib/cairo-dock/libcd-logout.la lib/cairo-dock/libcd-logout.so -lib/cairo-dock/libcd-mail.la lib/cairo-dock/libcd-mail.so -lib/cairo-dock/libcd-motion_blur.la lib/cairo-dock/libcd-motion_blur.so -lib/cairo-dock/libcd-musicPlayer.la lib/cairo-dock/libcd-musicPlayer.so -lib/cairo-dock/libcd-netspeed.la lib/cairo-dock/libcd-netspeed.so -lib/cairo-dock/libcd-powermanager.la lib/cairo-dock/libcd-powermanager.so -lib/cairo-dock/libcd-quick-browser.la lib/cairo-dock/libcd-quick-browser.so -lib/cairo-dock/libcd-rendering.la lib/cairo-dock/libcd-rendering.so -lib/cairo-dock/libcd-RSSreader.la -lib/cairo-dock/libcd-RSSreader.so -lib/cairo-dock/libcd-shortcuts.la lib/cairo-dock/libcd-shortcuts.so -lib/cairo-dock/libcd-showDesktop.la lib/cairo-dock/libcd-showDesktop.so -lib/cairo-dock/libcd-show_mouse.la lib/cairo-dock/libcd-show_mouse.so -lib/cairo-dock/libcd-slider.la lib/cairo-dock/libcd-slider.so -lib/cairo-dock/libcd-stack.la lib/cairo-dock/libcd-stack.so -lib/cairo-dock/libcd-switcher.la lib/cairo-dock/libcd-switcher.so -lib/cairo-dock/libcd-systray.la lib/cairo-dock/libcd-systray.so -%%TERMINAL%%lib/cairo-dock/libcd-terminal.la %%TERMINAL%%lib/cairo-dock/libcd-terminal.so -lib/cairo-dock/libcd-tomboy.la lib/cairo-dock/libcd-tomboy.so -lib/cairo-dock/libcd-weather.la lib/cairo-dock/libcd-weather.so -%%WEBLETS%%lib/cairo-dock/libcd-weblets.la %%WEBLETS%%lib/cairo-dock/libcd-weblets.so -lib/cairo-dock/libcd-wifi.la lib/cairo-dock/libcd-wifi.so -lib/cairo-dock/libcd_gnome-integration.la lib/cairo-dock/libcd_gnome-integration.so -%%XFCE_INTEGRATION%%lib/cairo-dock/libcd_xfce-integration.la %%XFCE_INTEGRATION%%lib/cairo-dock/libcd_xfce-integration.so share/locale/fr/LC_MESSAGES/cairo-dock-plugins.mo share/locale/it/LC_MESSAGES/cairo-dock-plugins.mo @@ -98,392 +57,381 @@ share/locale/es/LC_MESSAGES/cairo-dock-plugins.mo share/locale/hu/LC_MESSAGES/cairo-dock-plugins.mo share/locale/uk/LC_MESSAGES/cairo-dock-plugins.mo share/locale/zh_TW/LC_MESSAGES/cairo-dock-plugins.mo -%%DATADIR%%/plug-ins/Animated-icons/Animated-icons.conf -%%DATADIR%%/plug-ins/Animated-icons/preview.jpg -%%DATADIR%%/plug-ins/Animated-icons/icon.svg -%%DATADIR%%/plug-ins/Animated-icons/texture-chrome.png -%%DATADIR%%/plug-ins/Animated-icons/icon-rotation.png -%%DATADIR%%/plug-ins/Animated-icons/spot.png -%%DATADIR%%/plug-ins/Animated-icons/halo.png -%%DATADIR%%/plug-ins/Animated-icons/ray.png -%%DATADIR%%/plug-ins/Animated-icons/icon-wave.png -%%DATADIR%%/plug-ins/Cairo-Penguin/Cairo-Penguin.conf -%%DATADIR%%/plug-ins/Cairo-Penguin/icon.png -%%DATADIR%%/plug-ins/Cairo-Penguin/preview.jpg -%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/theme.conf -%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/readme -%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/basher.png -%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/blocker.png -%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/boarder.png -%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/bomber.png -%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/bridger.png -%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/climber.xpm -%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/digger.png -%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/drownfall.png -%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/drownwalk.png -%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/exit.png -%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/faller.png -%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/floater.png -%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/miner.png -%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/reader.xpm -%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/slider.png -%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/superman.png -%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/tumble.png -%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/waiter.png -%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/walker.png -%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/sitter.png -%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/xmas-walker.png -%%DATADIR%%/plug-ins/Clipper/Clipper.conf -%%DATADIR%%/plug-ins/Clipper/icon.svg -%%DATADIR%%/plug-ins/Clipper/preview.jpg -%%DATADIR%%/plug-ins/Clipper/Clipper-actions-gnome.conf -%%DATADIR%%/plug-ins/Clipper/Clipper-actions-xfce.conf -%%DATADIR%%/plug-ins/Clipper/Clipper-actions-kde.conf -%%DATADIR%%/plug-ins/clock/clock.conf -%%DATADIR%%/plug-ins/clock/preview.jpg -%%DATADIR%%/plug-ins/clock/dates.svg -%%DATADIR%%/plug-ins/clock/icon.png -%%DATADIR%%/plug-ins/clock/icon-alarm.png -%%DATADIR%%/plug-ins/clock/themes/default/readme -%%DATADIR%%/plug-ins/clock/themes/default/clock-drop-shadow.svg -%%DATADIR%%/plug-ins/clock/themes/default/clock-face-shadow.svg -%%DATADIR%%/plug-ins/clock/themes/default/clock-face.svg -%%DATADIR%%/plug-ins/clock/themes/default/clock-frame.svg -%%DATADIR%%/plug-ins/clock/themes/default/clock-glass.svg -%%DATADIR%%/plug-ins/clock/themes/default/clock-hour-hand-shadow.svg -%%DATADIR%%/plug-ins/clock/themes/default/clock-hour-hand.svg -%%DATADIR%%/plug-ins/clock/themes/default/clock-marks.svg -%%DATADIR%%/plug-ins/clock/themes/default/clock-minute-hand-shadow.svg -%%DATADIR%%/plug-ins/clock/themes/default/clock-minute-hand.svg -%%DATADIR%%/plug-ins/clock/themes/default/clock-second-hand-shadow.svg -%%DATADIR%%/plug-ins/clock/themes/default/clock-second-hand.svg -%%DATADIR%%/plug-ins/clock/themes/default/theme.conf -%%DATADIR%%/plug-ins/clock/digital/default/config -%%DATADIR%%/plug-ins/clock/digital/default/frame_0.svg -%%DATADIR%%/plug-ins/clock/digital/default/frame_1.svg -%%DATADIR%%/plug-ins/clock/digital/default/frame_2.svg -%%DATADIR%%/plug-ins/clock/digital/default/frame_3.svg -%%DATADIR%%/plug-ins/compiz-icon/compiz -%%DATADIR%%/plug-ins/compiz-icon/compiz-kill -%%DATADIR%%/plug-ins/compiz-icon/compiz-icon.conf -%%DATADIR%%/plug-ins/compiz-icon/default.svg -%%DATADIR%%/plug-ins/compiz-icon/broken.svg -%%DATADIR%%/plug-ins/compiz-icon/other.svg -%%DATADIR%%/plug-ins/compiz-icon/0.svg -%%DATADIR%%/plug-ins/compiz-icon/1.svg -%%DATADIR%%/plug-ins/compiz-icon/2.svg -%%DATADIR%%/plug-ins/compiz-icon/3.svg -%%DATADIR%%/plug-ins/compiz-icon/4.svg -%%DATADIR%%/plug-ins/compiz-icon/icon.png -%%DATADIR%%/plug-ins/compiz-icon/preview.jpg -%%DATADIR%%/plug-ins/Dbus/Dbus.conf -%%DATADIR%%/plug-ins/Dbus/icon.svg -%%DATADIR%%/plug-ins/desklet-rendering/icon.svg -%%DATADIR%%/plug-ins/desklet-rendering/branche1.svg -%%DATADIR%%/plug-ins/desklet-rendering/branche2.svg -%%DATADIR%%/plug-ins/desklet-rendering/scotch.svg -%%DATADIR%%/plug-ins/desklet-rendering/scotch+frame.svg -%%DATADIR%%/plug-ins/desklet-rendering/frame.svg -%%DATADIR%%/plug-ins/desklet-rendering/reflect.svg -%%DATADIR%%/plug-ins/desklet-rendering/cd_box_cover.svg -%%DATADIR%%/plug-ins/desklet-rendering/cd_box.svg -%%DATADIR%%/plug-ins/desklet-rendering/starcraft2.png -%%DATADIR%%/plug-ins/desklet-rendering/dark-bg.png -%%DATADIR%%/plug-ins/desklet-rendering/clear-bg.svg -%%DATADIR%%/plug-ins/desklet-rendering/board.png -%%DATADIR%%/plug-ins/dialog-rendering/dialog-rendering.conf -%%DATADIR%%/plug-ins/dialog-rendering/icon.svg -%%DATADIR%%/plug-ins/dnd2share/upload2free.sh -%%DATADIR%%/plug-ins/dnd2share/dnd2share.conf -%%DATADIR%%/plug-ins/dnd2share/readme -%%DATADIR%%/plug-ins/dnd2share/icon.png -%%DATADIR%%/plug-ins/dnd2share/preview.jpg -%%GMENU%%%%DATADIR%%/plug-ins/GMenu/GMenu.conf -%%GMENU%%%%DATADIR%%/plug-ins/GMenu/icon-recent.png -%%GMENU%%%%DATADIR%%/plug-ins/GMenu/icon.svg -%%GMENU%%%%DATADIR%%/plug-ins/GMenu/preview.jpg -%%DATADIR%%/plug-ins/drop-indicator/drop_indicator.conf -%%DATADIR%%/plug-ins/drop-indicator/icon.svg -%%DATADIR%%/plug-ins/drop-indicator/preview.jpg -%%DATADIR%%/plug-ins/drop-indicator/default-drop-indicator.svg -%%DATADIR%%/plug-ins/drop-indicator/default-hover-indicator.svg -%%DATADIR%%/plug-ins/dustbin/dustbin.conf -%%DATADIR%%/plug-ins/dustbin/preview.jpg -%%DATADIR%%/plug-ins/dustbin/icon.png -%%DATADIR%%/plug-ins/dustbin/themes/default/trashcan_full.svg -%%DATADIR%%/plug-ins/dustbin/themes/default/trashcan_empty.svg -%%DATADIR%%/plug-ins/gnome-integration/icon.png -%%DATADIR%%/plug-ins/icon-effect/icon-effect.conf -%%DATADIR%%/plug-ins/icon-effect/icon.png -%%DATADIR%%/plug-ins/icon-effect/icon-firework.png -%%DATADIR%%/plug-ins/icon-effect/preview.jpg -%%DATADIR%%/plug-ins/icon-effect/star.png -%%DATADIR%%/plug-ins/icon-effect/snow.png -%%DATADIR%%/plug-ins/icon-effect/rain.png -%%DATADIR%%/plug-ins/icon-effect/icon-fire.svg -%%DATADIR%%/plug-ins/icon-effect/icon-storm.png -%%DATADIR%%/plug-ins/illusion/illusion.conf -%%DATADIR%%/plug-ins/illusion/icon.svg -%%DATADIR%%/plug-ins/illusion/preview.jpg -%%DATADIR%%/plug-ins/illusion/icon-black-hole.svg -%%DATADIR%%/plug-ins/illusion/icon-break.svg -%%DATADIR%%/plug-ins/illusion/icon-evaporate.svg -%%DATADIR%%/plug-ins/illusion/icon-explode.svg -%%DATADIR%%/plug-ins/illusion/icon-fade-out.svg -%%DATADIR%%/plug-ins/kde-integration/icon.png -%%KEYBOARD_INDICATOR%%%%DATADIR%%/plug-ins/keyboard-indicator/keyboard-indicator.conf -%%KEYBOARD_INDICATOR%%%%DATADIR%%/plug-ins/keyboard-indicator/icon.png -%%KEYBOARD_INDICATOR%%%%DATADIR%%/plug-ins/keyboard-indicator/preview.jpg -%%DATADIR%%/plug-ins/logout/logout.conf -%%DATADIR%%/plug-ins/logout/icon.svg -%%DATADIR%%/plug-ins/logout/icon-scheduling.png -%%DATADIR%%/plug-ins/mail/preview.jpg -%%DATADIR%%/plug-ins/mail/cd_mail_icon.png -%%DATADIR%%/plug-ins/mail/cd_mail_newmail.svg -%%DATADIR%%/plug-ins/mail/cd_mail_nomail.svg -%%DATADIR%%/plug-ins/mail/mail.conf -%%DATADIR%%/plug-ins/mail/themes/Default/has_mail.svg -%%DATADIR%%/plug-ins/mail/themes/Default/new_mail_sound.wav -%%DATADIR%%/plug-ins/mail/themes/Default/no_mail.svg -%%DATADIR%%/plug-ins/motion-blur/motion_blur.conf -%%DATADIR%%/plug-ins/motion-blur/icon.png -%%DATADIR%%/plug-ins/musicPlayer/musicPlayer.conf -%%DATADIR%%/plug-ins/musicPlayer/broken.svg -%%DATADIR%%/plug-ins/musicPlayer/pause.svg -%%DATADIR%%/plug-ins/musicPlayer/play.svg -%%DATADIR%%/plug-ins/musicPlayer/preview.jpg -%%DATADIR%%/plug-ins/musicPlayer/stop.svg -%%DATADIR%%/plug-ins/musicPlayer/default.svg -%%DATADIR%%/plug-ins/musicPlayer/broken.jpg -%%DATADIR%%/plug-ins/musicPlayer/pause.jpg -%%DATADIR%%/plug-ins/musicPlayer/play.jpg -%%DATADIR%%/plug-ins/musicPlayer/stop.jpg -%%DATADIR%%/plug-ins/musicPlayer/default.jpg -%%DATADIR%%/plug-ins/musicPlayer/0.svg -%%DATADIR%%/plug-ins/musicPlayer/1.svg -%%DATADIR%%/plug-ins/musicPlayer/2.svg -%%DATADIR%%/plug-ins/musicPlayer/3.svg -%%DATADIR%%/plug-ins/musicPlayer/icon.png -%%DATADIR%%/plug-ins/musicPlayer/themes/cd_box_simple/readme -%%DATADIR%%/plug-ins/musicPlayer/themes/cd_box_simple/preview -%%DATADIR%%/plug-ins/musicPlayer/themes/cd_box_simple/frame.svg -%%DATADIR%%/plug-ins/musicPlayer/themes/cd_box_simple/reflect.svg -%%DATADIR%%/plug-ins/musicPlayer/themes/cd_box_simple/theme.conf -%%DATADIR%%/plug-ins/netspeed/netspeed.conf -%%DATADIR%%/plug-ins/netspeed/default.png -%%DATADIR%%/plug-ins/netspeed/icon.png -%%DATADIR%%/plug-ins/netspeed/preview.jpg -%%DATADIR%%/plug-ins/netspeed/ok.png -%%DATADIR%%/plug-ins/netspeed/unknown.png -%%DATADIR%%/plug-ins/netspeed/bad.png -%%DATADIR%%/plug-ins/netspeed/netspeed -%%DATADIR%%/plug-ins/powermanager/sector.svg -%%DATADIR%%/plug-ins/powermanager/default-battery.svg -%%DATADIR%%/plug-ins/powermanager/default-charge.svg -%%DATADIR%%/plug-ins/powermanager/powermanager.conf -%%DATADIR%%/plug-ins/powermanager/icon.png -%%DATADIR%%/plug-ins/powermanager/charge.svg -%%DATADIR%%/plug-ins/powermanager/preview.jpg -%%DATADIR%%/plug-ins/quick_browser/quick-browser.conf -%%DATADIR%%/plug-ins/quick_browser/icon.svg -%%DATADIR%%/plug-ins/quick_browser/preview.jpg -%%DATADIR%%/plug-ins/rendering/rendering.conf -%%DATADIR%%/plug-ins/rendering/icon.svg -%%DATADIR%%/plug-ins/rendering/preview-caroussel.jpg -%%DATADIR%%/plug-ins/rendering/preview-parabolic.jpg -%%DATADIR%%/plug-ins/rendering/preview-3D-plane.jpg -%%DATADIR%%/plug-ins/rendering/preview-rainbow.jpg -%%DATADIR%%/plug-ins/rendering/preview-diapo.jpg -%%DATADIR%%/plug-ins/rendering/preview-diapo-simple.jpg -%%DATADIR%%/plug-ins/rendering/preview-curve.jpg -%%DATADIR%%/plug-ins/rendering/readme-3D-plane-view -%%DATADIR%%/plug-ins/rendering/readme-caroussel-view -%%DATADIR%%/plug-ins/rendering/readme-curve-view -%%DATADIR%%/plug-ins/rendering/readme-diapo-simple-view -%%DATADIR%%/plug-ins/rendering/readme-diapo-view -%%DATADIR%%/plug-ins/rendering/readme-parabolic-view -%%DATADIR%%/plug-ins/rendering/readme-rainbow-view -%%DATADIR%%/plug-ins/RSSreader/icon.svg -%%DATADIR%%/plug-ins/RSSreader/preview.jpg -%%DATADIR%%/plug-ins/RSSreader/RSSreader.conf -%%DATADIR%%/plug-ins/shortcuts/shortcuts.conf -%%DATADIR%%/plug-ins/shortcuts/icon.png -%%DATADIR%%/plug-ins/shortcuts/preview.jpg -%%DATADIR%%/plug-ins/showDesktop/showDesktop.conf -%%DATADIR%%/plug-ins/showDesktop/icon.png -%%DATADIR%%/plug-ins/showDesktop/icon-active.png -%%DATADIR%%/plug-ins/show_mouse/show_mouse.conf -%%DATADIR%%/plug-ins/show_mouse/icon.png -%%DATADIR%%/plug-ins/show_mouse/preview.jpg -%%DATADIR%%/plug-ins/slider/slider.conf -%%DATADIR%%/plug-ins/slider/icon.png -%%DATADIR%%/plug-ins/slider/preview.jpg -%%DATADIR%%/plug-ins/stack/stack.conf -%%DATADIR%%/plug-ins/stack/icon.png -%%DATADIR%%/plug-ins/stack/preview.jpg -%%DATADIR%%/plug-ins/stack/text-icon.svg -%%DATADIR%%/plug-ins/stack/url-icon.svg -%%DATADIR%%/plug-ins/switcher/broken.svg -%%DATADIR%%/plug-ins/switcher/default.svg -%%DATADIR%%/plug-ins/switcher/preview.jpg -%%DATADIR%%/plug-ins/switcher/workspaces.svg -%%DATADIR%%/plug-ins/switcher/switcher.conf -%%DATADIR%%/plug-ins/System-monitor/nvidia-config -%%DATADIR%%/plug-ins/System-monitor/System-Monitor.conf -%%DATADIR%%/plug-ins/System-monitor/icon.png -%%DATADIR%%/plug-ins/System-monitor/preview.jpg -%%DATADIR%%/plug-ins/System-monitor/button-cpu.png -%%DATADIR%%/plug-ins/System-monitor/button-ram.png -%%DATADIR%%/plug-ins/systray/systray.conf -%%DATADIR%%/plug-ins/systray/icon.png -%%DATADIR%%/plug-ins/systray/preview.jpg -%%TERMINAL%%%%DATADIR%%/plug-ins/terminal/icon.png -%%TERMINAL%%%%DATADIR%%/plug-ins/terminal/preview.jpg -%%TERMINAL%%%%DATADIR%%/plug-ins/terminal/terminal.conf -%%DATADIR%%/plug-ins/tomboy/default.svg -%%DATADIR%%/plug-ins/tomboy/close.svg -%%DATADIR%%/plug-ins/tomboy/broken.svg -%%DATADIR%%/plug-ins/tomboy/note.svg -%%DATADIR%%/plug-ins/tomboy/tomboy.conf -%%DATADIR%%/plug-ins/tomboy/icon.png -%%DATADIR%%/plug-ins/tomboy/preview.jpg -%%DATADIR%%/plug-ins/Toons/Toons.conf -%%DATADIR%%/plug-ins/Toons/icon.png -%%DATADIR%%/plug-ins/Toons/preview.jpg -%%DATADIR%%/plug-ins/Toons/themes/Classic/theme.conf -%%DATADIR%%/plug-ins/Toons/themes/Classic/readme -%%DATADIR%%/plug-ins/Toons/themes/Classic/toon.svg -%%DATADIR%%/plug-ins/Toons/themes/Classic/pupil.svg -%%DATADIR%%/plug-ins/Toons/themes/Classic/eyelid.svg -%%DATADIR%%/plug-ins/weather/weather.conf -%%DATADIR%%/plug-ins/weather/broken.png -%%DATADIR%%/plug-ins/weather/icon.png -%%DATADIR%%/plug-ins/weather/preview.jpg -%%DATADIR%%/plug-ins/weather/themes/Classic/0.png -%%DATADIR%%/plug-ins/weather/themes/Classic/1.png -%%DATADIR%%/plug-ins/weather/themes/Classic/2.png -%%DATADIR%%/plug-ins/weather/themes/Classic/3.png -%%DATADIR%%/plug-ins/weather/themes/Classic/4.png -%%DATADIR%%/plug-ins/weather/themes/Classic/5.png -%%DATADIR%%/plug-ins/weather/themes/Classic/6.png -%%DATADIR%%/plug-ins/weather/themes/Classic/7.png -%%DATADIR%%/plug-ins/weather/themes/Classic/8.png -%%DATADIR%%/plug-ins/weather/themes/Classic/9.png -%%DATADIR%%/plug-ins/weather/themes/Classic/10.png -%%DATADIR%%/plug-ins/weather/themes/Classic/11.png -%%DATADIR%%/plug-ins/weather/themes/Classic/12.png -%%DATADIR%%/plug-ins/weather/themes/Classic/13.png -%%DATADIR%%/plug-ins/weather/themes/Classic/14.png -%%DATADIR%%/plug-ins/weather/themes/Classic/15.png -%%DATADIR%%/plug-ins/weather/themes/Classic/16.png -%%DATADIR%%/plug-ins/weather/themes/Classic/17.png -%%DATADIR%%/plug-ins/weather/themes/Classic/18.png -%%DATADIR%%/plug-ins/weather/themes/Classic/19.png -%%DATADIR%%/plug-ins/weather/themes/Classic/20.png -%%DATADIR%%/plug-ins/weather/themes/Classic/21.png -%%DATADIR%%/plug-ins/weather/themes/Classic/22.png -%%DATADIR%%/plug-ins/weather/themes/Classic/23.png -%%DATADIR%%/plug-ins/weather/themes/Classic/24.png -%%DATADIR%%/plug-ins/weather/themes/Classic/25.png -%%DATADIR%%/plug-ins/weather/themes/Classic/26.png -%%DATADIR%%/plug-ins/weather/themes/Classic/27.png -%%DATADIR%%/plug-ins/weather/themes/Classic/28.png -%%DATADIR%%/plug-ins/weather/themes/Classic/29.png -%%DATADIR%%/plug-ins/weather/themes/Classic/30.png -%%DATADIR%%/plug-ins/weather/themes/Classic/31.png -%%DATADIR%%/plug-ins/weather/themes/Classic/32.png -%%DATADIR%%/plug-ins/weather/themes/Classic/33.png -%%DATADIR%%/plug-ins/weather/themes/Classic/34.png -%%DATADIR%%/plug-ins/weather/themes/Classic/35.png -%%DATADIR%%/plug-ins/weather/themes/Classic/36.png -%%DATADIR%%/plug-ins/weather/themes/Classic/37.png -%%DATADIR%%/plug-ins/weather/themes/Classic/38.png -%%DATADIR%%/plug-ins/weather/themes/Classic/39.png -%%DATADIR%%/plug-ins/weather/themes/Classic/40.png -%%DATADIR%%/plug-ins/weather/themes/Classic/41.png -%%DATADIR%%/plug-ins/weather/themes/Classic/42.png -%%DATADIR%%/plug-ins/weather/themes/Classic/43.png -%%DATADIR%%/plug-ins/weather/themes/Classic/44.png -%%DATADIR%%/plug-ins/weather/themes/Classic/45.png -%%DATADIR%%/plug-ins/weather/themes/Classic/46.png -%%DATADIR%%/plug-ins/weather/themes/Classic/47.png -%%DATADIR%%/plug-ins/weather/themes/Classic/na.png -%%DATADIR%%/plug-ins/weather/themes/Classic/preview -%%DATADIR%%/plug-ins/weather/themes/Classic/readme -%%WEBLETS%%%%DATADIR%%/plug-ins/weblets/icon.png -%%WEBLETS%%%%DATADIR%%/plug-ins/weblets/preview.jpg -%%WEBLETS%%%%DATADIR%%/plug-ins/weblets/weblets.conf -%%DATADIR%%/plug-ins/wifi/wifi -%%DATADIR%%/plug-ins/wifi/wifi.conf -%%DATADIR%%/plug-ins/wifi/link-0.svg -%%DATADIR%%/plug-ins/wifi/link-1.svg -%%DATADIR%%/plug-ins/wifi/link-2.svg -%%DATADIR%%/plug-ins/wifi/link-3.svg -%%DATADIR%%/plug-ins/wifi/link-4.svg -%%DATADIR%%/plug-ins/wifi/link-5.svg -%%DATADIR%%/plug-ins/wifi/icon.png -%%DATADIR%%/plug-ins/wifi/preview.jpg -%%XFCE_INTEGRATION%%%%DATADIR%%/plug-ins/xfce-integration/icon.png -%%DATADIR%%/plug-ins/Xgamma/Xgamma.conf -%%DATADIR%%/plug-ins/Xgamma/icon.png -%%DATADIR%%/plug-ins/Xgamma/preview.jpg -@dirrm %%DATADIR%%/plug-ins/Animated-icons -@dirrm %%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic -@dirrm %%DATADIR%%/plug-ins/Cairo-Penguin/themes -@dirrm %%DATADIR%%/plug-ins/Cairo-Penguin -@dirrm %%DATADIR%%/plug-ins/Clipper -@dirrm %%DATADIR%%/plug-ins/Dbus -%%GMENU%%@dirrm %%DATADIR%%/plug-ins/GMenu -@dirrm %%DATADIR%%/plug-ins/System-monitor -@dirrm %%DATADIR%%/plug-ins/Toons/themes/Classic -@dirrm %%DATADIR%%/plug-ins/Toons/themes -@dirrm %%DATADIR%%/plug-ins/Toons -@dirrm %%DATADIR%%/plug-ins/Xgamma -@dirrm %%DATADIR%%/plug-ins/clock/digital/default -@dirrm %%DATADIR%%/plug-ins/clock/digital -@dirrm %%DATADIR%%/plug-ins/clock/themes/default -@dirrm %%DATADIR%%/plug-ins/clock/themes -@dirrm %%DATADIR%%/plug-ins/clock -@dirrm %%DATADIR%%/plug-ins/compiz-icon -@dirrm %%DATADIR%%/plug-ins/desklet-rendering -@dirrm %%DATADIR%%/plug-ins/dialog-rendering -@dirrm %%DATADIR%%/plug-ins/dnd2share -@dirrm %%DATADIR%%/plug-ins/drop-indicator -@dirrm %%DATADIR%%/plug-ins/dustbin/themes/default -@dirrm %%DATADIR%%/plug-ins/dustbin/themes -@dirrm %%DATADIR%%/plug-ins/dustbin -@dirrm %%DATADIR%%/plug-ins/gnome-integration -@dirrm %%DATADIR%%/plug-ins/icon-effect -@dirrm %%DATADIR%%/plug-ins/illusion -@dirrm %%DATADIR%%/plug-ins/kde-integration -%%KEYBOARD_INDICATOR%%@dirrm %%DATADIR%%/plug-ins/keyboard-indicator -@dirrm %%DATADIR%%/plug-ins/logout -@dirrm %%DATADIR%%/plug-ins/mail/themes/Default -@dirrm %%DATADIR%%/plug-ins/mail/themes -@dirrm %%DATADIR%%/plug-ins/mail -@dirrm %%DATADIR%%/plug-ins/motion-blur -@dirrm %%DATADIR%%/plug-ins/musicPlayer/themes/cd_box_simple -@dirrm %%DATADIR%%/plug-ins/musicPlayer/themes -@dirrm %%DATADIR%%/plug-ins/musicPlayer -@dirrm %%DATADIR%%/plug-ins/netspeed -@dirrm %%DATADIR%%/plug-ins/powermanager -@dirrm %%DATADIR%%/plug-ins/quick_browser -@dirrm %%DATADIR%%/plug-ins/RSSreader -@dirrm %%DATADIR%%/plug-ins/rendering -@dirrm %%DATADIR%%/plug-ins/shortcuts -@dirrm %%DATADIR%%/plug-ins/showDesktop -@dirrm %%DATADIR%%/plug-ins/show_mouse -@dirrm %%DATADIR%%/plug-ins/slider -@dirrm %%DATADIR%%/plug-ins/stack -@dirrm %%DATADIR%%/plug-ins/switcher -@dirrm %%DATADIR%%/plug-ins/systray -%%TERMINAL%%@dirrm %%DATADIR%%/plug-ins/terminal -@dirrm %%DATADIR%%/plug-ins/tomboy -@dirrm %%DATADIR%%/plug-ins/weather/themes/Classic -@dirrm %%DATADIR%%/plug-ins/weather/themes -@dirrm %%DATADIR%%/plug-ins/weather -%%WEBLETS%%@dirrm %%DATADIR%%/plug-ins/weblets -@dirrm %%DATADIR%%/plug-ins/wifi -%%XFCE_INTEGRATION%%@dirrm %%DATADIR%%/plug-ins/xfce-integration -@dirrm %%DATADIR%%/plug-ins +share/locale/ar/LC_MESSAGES/cairo-dock-plugins.mo +share/locale/et/LC_MESSAGES/cairo-dock-plugins.mo +share/locale/sk/LC_MESSAGES/cairo-dock-plugins.mo +share/locale/sr/LC_MESSAGES/cairo-dock-plugins.mo +share/locale/tr/LC_MESSAGES/cairo-dock-plugins.mo +share/cairo-dock/plug-ins/dnd2share/icon.svg +share/cairo-dock/plug-ins/rendering/preview-panel.jpg +share/cairo-dock/plug-ins/rendering/readme-panel-view +share/cairo-dock/plug-ins/Folders/Folders.conf +share/cairo-dock/plug-ins/Folders/preview.jpg +share/cairo-dock/plug-ins/Folders/icon.svg +share/cairo-dock/plug-ins/logout/icon-lock.png +%%XFCE_INTEGRATION%%share/cairo-dock/plug-ins/xfce-integration/icon.png +%%ALSA_MIXER%%share/cairo-dock/plug-ins/AlsaMixer/AlsaMixer.conf +%%ALSA_MIXER%%share/cairo-dock/plug-ins/AlsaMixer/broken.svg +%%ALSA_MIXER%%share/cairo-dock/plug-ins/AlsaMixer/default.svg +%%ALSA_MIXER%%share/cairo-dock/plug-ins/AlsaMixer/emblem-mute.svg +%%ALSA_MIXER%%share/cairo-dock/plug-ins/AlsaMixer/icon.png +%%ALSA_MIXER%%share/cairo-dock/plug-ins/AlsaMixer/mute.svg +%%ALSA_MIXER%%share/cairo-dock/plug-ins/AlsaMixer/preview.jpg +share/cairo-dock/plug-ins/Animated-icons/Animated-icons.conf +share/cairo-dock/plug-ins/Animated-icons/preview.jpg +share/cairo-dock/plug-ins/Animated-icons/icon.svg +share/cairo-dock/plug-ins/Animated-icons/texture-chrome.png +share/cairo-dock/plug-ins/Animated-icons/icon-rotation.png +share/cairo-dock/plug-ins/Animated-icons/spot.png +share/cairo-dock/plug-ins/Animated-icons/halo.png +share/cairo-dock/plug-ins/Animated-icons/ray.png +share/cairo-dock/plug-ins/Animated-icons/icon-wave.png +share/cairo-dock/plug-ins/Cairo-Penguin/Cairo-Penguin.conf +share/cairo-dock/plug-ins/Cairo-Penguin/icon.png +share/cairo-dock/plug-ins/Cairo-Penguin/preview.jpg +share/cairo-dock/plug-ins/Cairo-Penguin/themes/Classic/theme.conf +share/cairo-dock/plug-ins/Cairo-Penguin/themes/Classic/readme +share/cairo-dock/plug-ins/Cairo-Penguin/themes/Classic/basher.png +share/cairo-dock/plug-ins/Cairo-Penguin/themes/Classic/blocker.png +share/cairo-dock/plug-ins/Cairo-Penguin/themes/Classic/boarder.png +share/cairo-dock/plug-ins/Cairo-Penguin/themes/Classic/bomber.png +share/cairo-dock/plug-ins/Cairo-Penguin/themes/Classic/bridger.png +share/cairo-dock/plug-ins/Cairo-Penguin/themes/Classic/climber.xpm +share/cairo-dock/plug-ins/Cairo-Penguin/themes/Classic/digger.png +share/cairo-dock/plug-ins/Cairo-Penguin/themes/Classic/drownfall.png +share/cairo-dock/plug-ins/Cairo-Penguin/themes/Classic/drownwalk.png +share/cairo-dock/plug-ins/Cairo-Penguin/themes/Classic/exit.png +share/cairo-dock/plug-ins/Cairo-Penguin/themes/Classic/faller.png +share/cairo-dock/plug-ins/Cairo-Penguin/themes/Classic/floater.png +share/cairo-dock/plug-ins/Cairo-Penguin/themes/Classic/miner.png +share/cairo-dock/plug-ins/Cairo-Penguin/themes/Classic/reader.xpm +share/cairo-dock/plug-ins/Cairo-Penguin/themes/Classic/slider.png +share/cairo-dock/plug-ins/Cairo-Penguin/themes/Classic/superman.png +share/cairo-dock/plug-ins/Cairo-Penguin/themes/Classic/tumble.png +share/cairo-dock/plug-ins/Cairo-Penguin/themes/Classic/waiter.png +share/cairo-dock/plug-ins/Cairo-Penguin/themes/Classic/walker.png +share/cairo-dock/plug-ins/Cairo-Penguin/themes/Classic/sitter.png +share/cairo-dock/plug-ins/Cairo-Penguin/themes/Classic/xmas-walker.png +share/cairo-dock/plug-ins/Clipper/Clipper.conf +share/cairo-dock/plug-ins/Clipper/icon.svg +share/cairo-dock/plug-ins/Clipper/preview.jpg +share/cairo-dock/plug-ins/Clipper/Clipper-actions-gnome.conf +share/cairo-dock/plug-ins/Clipper/Clipper-actions-xfce.conf +share/cairo-dock/plug-ins/Clipper/Clipper-actions-kde.conf +share/cairo-dock/plug-ins/compiz-icon/compiz +share/cairo-dock/plug-ins/compiz-icon/compiz-kill +share/cairo-dock/plug-ins/compiz-icon/compiz-icon.conf +share/cairo-dock/plug-ins/compiz-icon/default.svg +share/cairo-dock/plug-ins/compiz-icon/broken.svg +share/cairo-dock/plug-ins/compiz-icon/other.svg +share/cairo-dock/plug-ins/compiz-icon/0.svg +share/cairo-dock/plug-ins/compiz-icon/1.svg +share/cairo-dock/plug-ins/compiz-icon/2.svg +share/cairo-dock/plug-ins/compiz-icon/3.svg +share/cairo-dock/plug-ins/compiz-icon/4.svg +share/cairo-dock/plug-ins/compiz-icon/icon.png +share/cairo-dock/plug-ins/compiz-icon/preview.jpg +share/cairo-dock/plug-ins/Dbus/Dbus.conf +share/cairo-dock/plug-ins/Dbus/icon.svg +share/cairo-dock/plug-ins/desklet-rendering/icon.svg +share/cairo-dock/plug-ins/desklet-rendering/branche1.svg +share/cairo-dock/plug-ins/desklet-rendering/branche2.svg +share/cairo-dock/plug-ins/desklet-rendering/scotch.svg +share/cairo-dock/plug-ins/desklet-rendering/scotch+frame.svg +share/cairo-dock/plug-ins/desklet-rendering/frame.svg +share/cairo-dock/plug-ins/desklet-rendering/reflect.svg +share/cairo-dock/plug-ins/desklet-rendering/cd_box_cover.svg +share/cairo-dock/plug-ins/desklet-rendering/cd_box.svg +share/cairo-dock/plug-ins/desklet-rendering/starcraft2.png +share/cairo-dock/plug-ins/desklet-rendering/dark-bg.png +share/cairo-dock/plug-ins/desklet-rendering/clear-bg.svg +share/cairo-dock/plug-ins/desklet-rendering/board.png +share/cairo-dock/plug-ins/dialog-rendering/dialog-rendering.conf +share/cairo-dock/plug-ins/dialog-rendering/icon.svg +share/cairo-dock/plug-ins/dnd2share/upload2free.sh +share/cairo-dock/plug-ins/dnd2share/dnd2share.conf +share/cairo-dock/plug-ins/dnd2share/readme +share/cairo-dock/plug-ins/dnd2share/preview.jpg +%%GMENU%%share/cairo-dock/plug-ins/GMenu/GMenu.conf +%%GMENU%%share/cairo-dock/plug-ins/GMenu/icon-recent.png +%%GMENU%%share/cairo-dock/plug-ins/GMenu/icon.svg +%%GMENU%%share/cairo-dock/plug-ins/GMenu/preview.jpg +share/cairo-dock/plug-ins/drop-indicator/drop_indicator.conf +share/cairo-dock/plug-ins/drop-indicator/icon.svg +share/cairo-dock/plug-ins/drop-indicator/preview.jpg +share/cairo-dock/plug-ins/drop-indicator/default-drop-indicator.svg +share/cairo-dock/plug-ins/drop-indicator/default-hover-indicator.svg +share/cairo-dock/plug-ins/dustbin/dustbin.conf +share/cairo-dock/plug-ins/dustbin/preview.jpg +share/cairo-dock/plug-ins/dustbin/icon.png +share/cairo-dock/plug-ins/dustbin/themes/default/trashcan_full.svg +share/cairo-dock/plug-ins/dustbin/themes/default/trashcan_empty.svg +share/cairo-dock/plug-ins/gnome-integration/icon.png +share/cairo-dock/plug-ins/icon-effect/icon-effect.conf +share/cairo-dock/plug-ins/icon-effect/icon.png +share/cairo-dock/plug-ins/icon-effect/icon-firework.png +share/cairo-dock/plug-ins/icon-effect/preview.jpg +share/cairo-dock/plug-ins/icon-effect/star.png +share/cairo-dock/plug-ins/icon-effect/snow.png +share/cairo-dock/plug-ins/icon-effect/rain.png +share/cairo-dock/plug-ins/icon-effect/icon-fire.svg +share/cairo-dock/plug-ins/icon-effect/icon-storm.png +share/cairo-dock/plug-ins/illusion/illusion.conf +share/cairo-dock/plug-ins/illusion/icon.svg +share/cairo-dock/plug-ins/illusion/preview.jpg +share/cairo-dock/plug-ins/illusion/icon-black-hole.svg +share/cairo-dock/plug-ins/illusion/icon-break.svg +share/cairo-dock/plug-ins/illusion/icon-evaporate.svg +share/cairo-dock/plug-ins/illusion/icon-explode.svg +share/cairo-dock/plug-ins/illusion/icon-fade-out.svg +share/cairo-dock/plug-ins/kde-integration/icon.png +%%KEYBOARD_INDICATOR%%share/cairo-dock/plug-ins/keyboard-indicator/keyboard-indicator.conf +%%KEYBOARD_INDICATOR%%share/cairo-dock/plug-ins/keyboard-indicator/icon.png +%%KEYBOARD_INDICATOR%%share/cairo-dock/plug-ins/keyboard-indicator/preview.jpg +share/cairo-dock/plug-ins/logout/logout.conf +share/cairo-dock/plug-ins/logout/icon.svg +share/cairo-dock/plug-ins/logout/icon-scheduling.png +share/cairo-dock/plug-ins/mail/preview.jpg +share/cairo-dock/plug-ins/mail/cd_mail_icon.png +share/cairo-dock/plug-ins/mail/cd_mail_newmail.svg +share/cairo-dock/plug-ins/mail/cd_mail_nomail.svg +share/cairo-dock/plug-ins/mail/mail.conf +share/cairo-dock/plug-ins/mail/themes/Default/has_mail.svg +share/cairo-dock/plug-ins/mail/themes/Default/new_mail_sound.wav +share/cairo-dock/plug-ins/mail/themes/Default/no_mail.svg +share/cairo-dock/plug-ins/motion-blur/motion_blur.conf +share/cairo-dock/plug-ins/motion-blur/icon.png +share/cairo-dock/plug-ins/musicPlayer/musicPlayer.conf +share/cairo-dock/plug-ins/musicPlayer/broken.svg +share/cairo-dock/plug-ins/musicPlayer/pause.svg +share/cairo-dock/plug-ins/musicPlayer/play.svg +share/cairo-dock/plug-ins/musicPlayer/preview.jpg +share/cairo-dock/plug-ins/musicPlayer/stop.svg +share/cairo-dock/plug-ins/musicPlayer/default.svg +share/cairo-dock/plug-ins/musicPlayer/broken.jpg +share/cairo-dock/plug-ins/musicPlayer/pause.jpg +share/cairo-dock/plug-ins/musicPlayer/play.jpg +share/cairo-dock/plug-ins/musicPlayer/stop.jpg +share/cairo-dock/plug-ins/musicPlayer/default.jpg +share/cairo-dock/plug-ins/musicPlayer/0.svg +share/cairo-dock/plug-ins/musicPlayer/1.svg +share/cairo-dock/plug-ins/musicPlayer/2.svg +share/cairo-dock/plug-ins/musicPlayer/3.svg +share/cairo-dock/plug-ins/musicPlayer/icon.png +share/cairo-dock/plug-ins/musicPlayer/themes/cd_box_simple/readme +share/cairo-dock/plug-ins/musicPlayer/themes/cd_box_simple/preview +share/cairo-dock/plug-ins/musicPlayer/themes/cd_box_simple/frame.svg +share/cairo-dock/plug-ins/musicPlayer/themes/cd_box_simple/reflect.svg +share/cairo-dock/plug-ins/musicPlayer/themes/cd_box_simple/theme.conf +share/cairo-dock/plug-ins/netspeed/netspeed.conf +share/cairo-dock/plug-ins/netspeed/default.png +share/cairo-dock/plug-ins/netspeed/icon.png +share/cairo-dock/plug-ins/netspeed/preview.jpg +share/cairo-dock/plug-ins/netspeed/ok.png +share/cairo-dock/plug-ins/netspeed/unknown.png +share/cairo-dock/plug-ins/netspeed/bad.png +share/cairo-dock/plug-ins/netspeed/netspeed +share/cairo-dock/plug-ins/powermanager/sector.svg +share/cairo-dock/plug-ins/powermanager/default-battery.svg +share/cairo-dock/plug-ins/powermanager/default-charge.svg +share/cairo-dock/plug-ins/powermanager/powermanager.conf +share/cairo-dock/plug-ins/powermanager/icon.png +share/cairo-dock/plug-ins/powermanager/charge.svg +share/cairo-dock/plug-ins/powermanager/preview.jpg +share/cairo-dock/plug-ins/quick_browser/quick-browser.conf +share/cairo-dock/plug-ins/quick_browser/icon.svg +share/cairo-dock/plug-ins/quick_browser/preview.jpg +share/cairo-dock/plug-ins/rendering/rendering.conf +share/cairo-dock/plug-ins/rendering/icon.svg +share/cairo-dock/plug-ins/rendering/preview-caroussel.jpg +share/cairo-dock/plug-ins/rendering/preview-parabolic.jpg +share/cairo-dock/plug-ins/rendering/preview-3D-plane.jpg +share/cairo-dock/plug-ins/rendering/preview-rainbow.jpg +share/cairo-dock/plug-ins/rendering/preview-diapo-simple.jpg +share/cairo-dock/plug-ins/rendering/preview-curve.jpg +share/cairo-dock/plug-ins/rendering/readme-3D-plane-view +share/cairo-dock/plug-ins/rendering/readme-caroussel-view +share/cairo-dock/plug-ins/rendering/readme-curve-view +share/cairo-dock/plug-ins/rendering/readme-diapo-simple-view +share/cairo-dock/plug-ins/rendering/readme-parabolic-view +share/cairo-dock/plug-ins/rendering/readme-rainbow-view +share/cairo-dock/plug-ins/RSSreader/icon.svg +share/cairo-dock/plug-ins/RSSreader/preview.jpg +share/cairo-dock/plug-ins/RSSreader/RSSreader.conf +share/cairo-dock/plug-ins/shortcuts/shortcuts.conf +share/cairo-dock/plug-ins/shortcuts/icon.png +share/cairo-dock/plug-ins/shortcuts/preview.jpg +share/cairo-dock/plug-ins/showDesktop/showDesktop.conf +share/cairo-dock/plug-ins/showDesktop/icon.png +share/cairo-dock/plug-ins/showDesktop/icon-active.png +share/cairo-dock/plug-ins/show_mouse/show_mouse.conf +share/cairo-dock/plug-ins/show_mouse/icon.png +share/cairo-dock/plug-ins/show_mouse/preview.jpg +share/cairo-dock/plug-ins/slider/slider.conf +share/cairo-dock/plug-ins/slider/icon.png +share/cairo-dock/plug-ins/slider/preview.jpg +share/cairo-dock/plug-ins/stack/stack.conf +share/cairo-dock/plug-ins/stack/icon.png +share/cairo-dock/plug-ins/stack/preview.jpg +share/cairo-dock/plug-ins/stack/text-icon.svg +share/cairo-dock/plug-ins/stack/url-icon.svg +share/cairo-dock/plug-ins/switcher/broken.svg +share/cairo-dock/plug-ins/switcher/default.svg +share/cairo-dock/plug-ins/switcher/preview.jpg +share/cairo-dock/plug-ins/switcher/workspaces.svg +share/cairo-dock/plug-ins/switcher/switcher.conf +share/cairo-dock/plug-ins/System-monitor/nvidia-config +share/cairo-dock/plug-ins/System-monitor/System-Monitor.conf +share/cairo-dock/plug-ins/System-monitor/icon.png +share/cairo-dock/plug-ins/System-monitor/preview.jpg +share/cairo-dock/plug-ins/System-monitor/button-cpu.png +share/cairo-dock/plug-ins/System-monitor/button-ram.png +share/cairo-dock/plug-ins/systray/systray.conf +share/cairo-dock/plug-ins/systray/icon.png +share/cairo-dock/plug-ins/systray/preview.jpg +%%TERMINAL%%share/cairo-dock/plug-ins/terminal/icon.png +%%TERMINAL%%share/cairo-dock/plug-ins/terminal/preview.jpg +%%TERMINAL%%share/cairo-dock/plug-ins/terminal/terminal.conf +share/cairo-dock/plug-ins/tomboy/default.svg +share/cairo-dock/plug-ins/tomboy/close.svg +share/cairo-dock/plug-ins/tomboy/broken.svg +share/cairo-dock/plug-ins/tomboy/note.svg +share/cairo-dock/plug-ins/tomboy/tomboy.conf +share/cairo-dock/plug-ins/tomboy/icon.png +share/cairo-dock/plug-ins/tomboy/preview.jpg +share/cairo-dock/plug-ins/Toons/Toons.conf +share/cairo-dock/plug-ins/Toons/icon.png +share/cairo-dock/plug-ins/Toons/preview.jpg +share/cairo-dock/plug-ins/Toons/themes/Classic/theme.conf +share/cairo-dock/plug-ins/Toons/themes/Classic/readme +share/cairo-dock/plug-ins/Toons/themes/Classic/toon.svg +share/cairo-dock/plug-ins/Toons/themes/Classic/pupil.svg +share/cairo-dock/plug-ins/Toons/themes/Classic/eyelid.svg +share/cairo-dock/plug-ins/weather/weather.conf +share/cairo-dock/plug-ins/weather/broken.png +share/cairo-dock/plug-ins/weather/icon.png +share/cairo-dock/plug-ins/weather/preview.jpg +share/cairo-dock/plug-ins/weather/themes/Classic/0.png +share/cairo-dock/plug-ins/weather/themes/Classic/1.png +share/cairo-dock/plug-ins/weather/themes/Classic/2.png +share/cairo-dock/plug-ins/weather/themes/Classic/3.png +share/cairo-dock/plug-ins/weather/themes/Classic/4.png +share/cairo-dock/plug-ins/weather/themes/Classic/5.png +share/cairo-dock/plug-ins/weather/themes/Classic/6.png +share/cairo-dock/plug-ins/weather/themes/Classic/7.png +share/cairo-dock/plug-ins/weather/themes/Classic/8.png +share/cairo-dock/plug-ins/weather/themes/Classic/9.png +share/cairo-dock/plug-ins/weather/themes/Classic/10.png +share/cairo-dock/plug-ins/weather/themes/Classic/11.png +share/cairo-dock/plug-ins/weather/themes/Classic/12.png +share/cairo-dock/plug-ins/weather/themes/Classic/13.png +share/cairo-dock/plug-ins/weather/themes/Classic/14.png +share/cairo-dock/plug-ins/weather/themes/Classic/15.png +share/cairo-dock/plug-ins/weather/themes/Classic/16.png +share/cairo-dock/plug-ins/weather/themes/Classic/17.png +share/cairo-dock/plug-ins/weather/themes/Classic/18.png +share/cairo-dock/plug-ins/weather/themes/Classic/19.png +share/cairo-dock/plug-ins/weather/themes/Classic/20.png +share/cairo-dock/plug-ins/weather/themes/Classic/21.png +share/cairo-dock/plug-ins/weather/themes/Classic/22.png +share/cairo-dock/plug-ins/weather/themes/Classic/23.png +share/cairo-dock/plug-ins/weather/themes/Classic/24.png +share/cairo-dock/plug-ins/weather/themes/Classic/25.png +share/cairo-dock/plug-ins/weather/themes/Classic/26.png +share/cairo-dock/plug-ins/weather/themes/Classic/27.png +share/cairo-dock/plug-ins/weather/themes/Classic/28.png +share/cairo-dock/plug-ins/weather/themes/Classic/29.png +share/cairo-dock/plug-ins/weather/themes/Classic/30.png +share/cairo-dock/plug-ins/weather/themes/Classic/31.png +share/cairo-dock/plug-ins/weather/themes/Classic/32.png +share/cairo-dock/plug-ins/weather/themes/Classic/33.png +share/cairo-dock/plug-ins/weather/themes/Classic/34.png +share/cairo-dock/plug-ins/weather/themes/Classic/35.png +share/cairo-dock/plug-ins/weather/themes/Classic/36.png +share/cairo-dock/plug-ins/weather/themes/Classic/37.png +share/cairo-dock/plug-ins/weather/themes/Classic/38.png +share/cairo-dock/plug-ins/weather/themes/Classic/39.png +share/cairo-dock/plug-ins/weather/themes/Classic/40.png +share/cairo-dock/plug-ins/weather/themes/Classic/41.png +share/cairo-dock/plug-ins/weather/themes/Classic/42.png +share/cairo-dock/plug-ins/weather/themes/Classic/43.png +share/cairo-dock/plug-ins/weather/themes/Classic/44.png +share/cairo-dock/plug-ins/weather/themes/Classic/45.png +share/cairo-dock/plug-ins/weather/themes/Classic/46.png +share/cairo-dock/plug-ins/weather/themes/Classic/47.png +share/cairo-dock/plug-ins/weather/themes/Classic/na.png +share/cairo-dock/plug-ins/weather/themes/Classic/preview +share/cairo-dock/plug-ins/weather/themes/Classic/readme +%%WEBLETS%%share/cairo-dock/plug-ins/weblets/icon.png +%%WEBLETS%%share/cairo-dock/plug-ins/weblets/preview.jpg +%%WEBLETS%%share/cairo-dock/plug-ins/weblets/weblets.conf +share/cairo-dock/plug-ins/wifi/wifi +share/cairo-dock/plug-ins/wifi/wifi.conf +share/cairo-dock/plug-ins/wifi/link-0.svg +share/cairo-dock/plug-ins/wifi/link-1.svg +share/cairo-dock/plug-ins/wifi/link-2.svg +share/cairo-dock/plug-ins/wifi/link-3.svg +share/cairo-dock/plug-ins/wifi/link-4.svg +share/cairo-dock/plug-ins/wifi/link-5.svg +share/cairo-dock/plug-ins/wifi/icon.png +share/cairo-dock/plug-ins/wifi/preview.jpg +share/cairo-dock/plug-ins/Xgamma/Xgamma.conf +share/cairo-dock/plug-ins/Xgamma/icon.png +share/cairo-dock/plug-ins/Xgamma/preview.jpg +%%ALSA_MIXER%%@dirrm share/cairo-dock/plug-ins/AlsaMixer +@dirrm share/cairo-dock/plug-ins/Animated-icons +@dirrm share/cairo-dock/plug-ins/Cairo-Penguin/themes/Classic +@dirrm share/cairo-dock/plug-ins/Cairo-Penguin/themes +@dirrm share/cairo-dock/plug-ins/Cairo-Penguin +@dirrm share/cairo-dock/plug-ins/Clipper +@dirrm share/cairo-dock/plug-ins/Dbus +@dirrm share/cairo-dock/plug-ins/Folders +%%GMENU%%@dirrm share/cairo-dock/plug-ins/GMenu +@dirrm share/cairo-dock/plug-ins/System-monitor +@dirrm share/cairo-dock/plug-ins/Toons/themes/Classic +@dirrm share/cairo-dock/plug-ins/Toons/themes +@dirrm share/cairo-dock/plug-ins/Toons +@dirrm share/cairo-dock/plug-ins/Xgamma +@dirrm share/cairo-dock/plug-ins/compiz-icon +@dirrm share/cairo-dock/plug-ins/desklet-rendering +@dirrm share/cairo-dock/plug-ins/dialog-rendering +@dirrm share/cairo-dock/plug-ins/dnd2share +@dirrm share/cairo-dock/plug-ins/drop-indicator +@dirrm share/cairo-dock/plug-ins/dustbin/themes/default +@dirrm share/cairo-dock/plug-ins/dustbin/themes +@dirrm share/cairo-dock/plug-ins/dustbin +@dirrm share/cairo-dock/plug-ins/gnome-integration +@dirrm share/cairo-dock/plug-ins/icon-effect +@dirrm share/cairo-dock/plug-ins/illusion +@dirrm share/cairo-dock/plug-ins/kde-integration +%%KEYBOARD_INDICATOR%%@dirrm share/cairo-dock/plug-ins/keyboard-indicator +@dirrm share/cairo-dock/plug-ins/logout +@dirrm share/cairo-dock/plug-ins/mail/themes/Default +@dirrm share/cairo-dock/plug-ins/mail/themes +@dirrm share/cairo-dock/plug-ins/mail +@dirrm share/cairo-dock/plug-ins/motion-blur +@dirrm share/cairo-dock/plug-ins/musicPlayer/themes/cd_box_simple +@dirrm share/cairo-dock/plug-ins/musicPlayer/themes +@dirrm share/cairo-dock/plug-ins/musicPlayer +@dirrm share/cairo-dock/plug-ins/netspeed +@dirrm share/cairo-dock/plug-ins/powermanager +@dirrm share/cairo-dock/plug-ins/quick_browser +@dirrm share/cairo-dock/plug-ins/RSSreader +@dirrm share/cairo-dock/plug-ins/rendering +@dirrm share/cairo-dock/plug-ins/shortcuts +@dirrm share/cairo-dock/plug-ins/showDesktop +@dirrm share/cairo-dock/plug-ins/show_mouse +@dirrm share/cairo-dock/plug-ins/slider +@dirrm share/cairo-dock/plug-ins/stack +@dirrm share/cairo-dock/plug-ins/switcher +@dirrm share/cairo-dock/plug-ins/systray +%%TERMINAL%%@dirrm share/cairo-dock/plug-ins/terminal +@dirrm share/cairo-dock/plug-ins/tomboy +@dirrm share/cairo-dock/plug-ins/weather/themes/Classic +@dirrm share/cairo-dock/plug-ins/weather/themes +@dirrm share/cairo-dock/plug-ins/weather +%%WEBLETS%%@dirrm share/cairo-dock/plug-ins/weblets +@dirrm share/cairo-dock/plug-ins/wifi +%%XFCE_INTEGRATION%%@dirrm share/cairo-dock/plug-ins/xfce-integration +@dirrm share/cairo-dock/plug-ins @dirrm lib/cairo-dock diff --git a/deskutils/cairo-dock/Makefile b/deskutils/cairo-dock/Makefile index c49edd22676..89411e22395 100644 --- a/deskutils/cairo-dock/Makefile +++ b/deskutils/cairo-dock/Makefile @@ -6,14 +6,15 @@ # PORTNAME= cairo-dock -DISTVERSION= 2.1.3-9 +DISTVERSION= 2.2.0-4 CATEGORIES= deskutils -MASTER_SITES= http://launchpadlibrarian.net/44930527/ +MASTER_SITES= http://launchpadlibrarian.net/56954298/ MAINTAINER= fidaj@ukr.net COMMENT= Cairo-Dock is a light and eye-candy dock -LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \ +LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \ + curl.6:${PORTSDIR}/ftp/curl \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext @@ -22,14 +23,17 @@ USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnomehack pkgconfig glib20 gtk20 librsvg2 libxml2 USE_LDCONFIG= yes -USE_XORG= xrender +USE_XORG= xrender xtst +USE_CMAKE= yes MAKE_JOBS_SAFE= yes +MAN1= cairo-dock.1 + post-patch: - ${REINPLACE_CMD} -e 's,curl,fetch,g' ${WRKSRC}/po/*.po \ - ${WRKSRC}/data/help.conf + @${REINPLACE_CMD} -e 's|libdir}/pkgconfig|prefix}/libdata/pkgconfig| ; s|datadir}/man|prefix}/man|' \ + ${WRKSRC}/CMakeLists.txt ${WRKSRC}/src/gldit/CMakeLists.txt ${REINPLACE_CMD} -e 's,/usr,${PREFIX},g' \ - ${WRKSRC}/src/cairo-dock-gui-factory.c + ${WRKSRC}/src/gldit/cairo-dock-gui-factory.c .include <bsd.port.pre.mk> diff --git a/deskutils/cairo-dock/distinfo b/deskutils/cairo-dock/distinfo index 7d5f3381273..cc01bfb1b91 100644 --- a/deskutils/cairo-dock/distinfo +++ b/deskutils/cairo-dock/distinfo @@ -1,3 +1,2 @@ -MD5 (cairo-dock-2.1.3-9.tar.gz) = f4b7f78770696b36efaa346df0bfa7d2 -SHA256 (cairo-dock-2.1.3-9.tar.gz) = 0629ffc55a5c075daa74908627ad5a69315c3af22051458ec9489ed64d382ae5 -SIZE (cairo-dock-2.1.3-9.tar.gz) = 2480328 +SHA256 (cairo-dock-2.2.0-4.tar.gz) = dc2de939e8fe8bb2b020d7c12c106114f321a104ea41d3538fbc1fce2fadff95 +SIZE (cairo-dock-2.2.0-4.tar.gz) = 2335519 diff --git a/deskutils/cairo-dock/files/patch-Makefile.am b/deskutils/cairo-dock/files/patch-Makefile.am deleted file mode 100644 index 715162000fa..00000000000 --- a/deskutils/cairo-dock/files/patch-Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.am.orig 2010-05-05 18:34:05.000000000 +0300 -+++ src/Makefile.am 2010-05-05 18:34:23.000000000 +0300 -@@ -46,8 +46,6 @@ - -DCAIRO_DOCK_THEMES_DIR=\""$(CAIRO_DOCK_THEMES_DIR)"\"\ - -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -std=c99\ -- -O3\ -- -g -ggdb\ - -Wstrict-prototypes -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration - #-Wunreachable-code -Wno-unused-parameter -Wall - diff --git a/deskutils/cairo-dock/files/patch-Makefile.in b/deskutils/cairo-dock/files/patch-Makefile.in deleted file mode 100644 index 56ff353cec8..00000000000 --- a/deskutils/cairo-dock/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.in.orig 2010-05-05 18:34:41.000000000 +0300 -+++ src/Makefile.in 2010-05-05 18:34:46.000000000 +0300 -@@ -378,8 +378,6 @@ - -DCAIRO_DOCK_THEMES_DIR=\""$(CAIRO_DOCK_THEMES_DIR)"\"\ - -DGL_GLEXT_PROTOTYPES=\""1"\"\ - -std=c99\ -- -O3\ -- -g -ggdb\ - -Wstrict-prototypes -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration - - #-Wunreachable-code -Wno-unused-parameter -Wall diff --git a/deskutils/cairo-dock/files/patch-cairo-dock-config.c b/deskutils/cairo-dock/files/patch-cairo-dock-config.c new file mode 100644 index 00000000000..39c94d7bfd8 --- /dev/null +++ b/deskutils/cairo-dock/files/patch-cairo-dock-config.c @@ -0,0 +1,11 @@ +--- ./src/gldit/cairo-dock-config.c.orig 2010-10-02 01:41:55.000000000 +0300 ++++ ./src/gldit/cairo-dock-config.c 2010-12-11 02:06:06.000000000 +0200 +@@ -27,8 +27,6 @@ + + #include "../config.h" + #ifdef HAVE_LIBCRYPT +-/* libC crypt */ +-#include <crypt.h> + + static char DES_crypt_key[64] = + { diff --git a/deskutils/cairo-dock/files/patch-configure b/deskutils/cairo-dock/files/patch-configure deleted file mode 100644 index 280ae877ecd..00000000000 --- a/deskutils/cairo-dock/files/patch-configure +++ /dev/null @@ -1,13 +0,0 @@ ---- configure.orig 2010-05-05 18:36:30.000000000 +0300 -+++ configure 2010-05-05 18:36:48.000000000 +0300 -@@ -13091,8 +13091,8 @@ - fi - - if test "$LIBCRYPT_LIBS" != "" ; then -- HAVE_LIBCRYPT_TRUE= -- HAVE_LIBCRYPT_FALSE='#' -+ HAVE_LIBCRYPT_TRUE='#' -+ HAVE_LIBCRYPT_FALSE= - else - HAVE_LIBCRYPT_TRUE='#' - HAVE_LIBCRYPT_FALSE= diff --git a/deskutils/cairo-dock/files/patch-fetch b/deskutils/cairo-dock/files/patch-fetch index a2c10bc5070..87023089500 100644 --- a/deskutils/cairo-dock/files/patch-fetch +++ b/deskutils/cairo-dock/files/patch-fetch @@ -1,33 +1,11 @@ ---- cairo-dock-package-theme 2010-02-13 11:55:45.000000000 +0100 -+++ cairo-dock-package-theme 2010-06-28 18:48:36.000000000 +0200 -@@ -1,3 +1,3 @@ --#!/bin/bash -+#!/bin/sh - - # Packager for Cairo-Dock -@@ -126,5 +126,5 @@ +--- cairo-dock-package-theme.orig 2010-12-11 01:37:14.000000000 +0200 ++++ cairo-dock-package-theme 2010-12-11 01:37:33.000000000 +0200 +@@ -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" ---- src/cairo-dock-themes-manager.c 2010-04-03 14:32:50.000000000 +0200 -+++ src/cairo-dock-themes-manager.c 2010-06-28 18:47:19.000000000 +0200 -@@ -143,8 +143,16 @@ - //\_______________ On lance le download. - //gchar *cCommand = g_strdup_printf ("%s wget \"%s/%s/%s\" -O \"%s\" -t %d -T %d%s", (iShowActivity == 2 ? "$TERM -e '" : ""), cServerAdress, cDistantFilePath, cDistantFileName, cTmpFilePath, CAIRO_DOCK_DL_NB_RETRY, CAIRO_DOCK_DL_TIMEOUT, (iShowActivity == 2 ? "'" : "")); -+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFlyBSD__) -+ gchar *cCommand = g_strdup_printf ("/usr/bin/fetch -qo \"%s\" -T %d \"%s/%s/%s\"", -+ cTmpFilePath, -+ cServerAdress, cDistantFilePath, cDistantFileName, -+ mySystem.iConnectionTimeout); -+ cd_debug ("download with 'MaxTime' and 'NbRetries' parameters ignored with fetch(1)"); -+#else - gchar *cCommand = g_strdup_printf ("curl -s \"%s/%s/%s\" --output \"%s\" --connect-timeout %d --max-time %d --retry %d", - cServerAdress, cDistantFilePath, cDistantFileName, - cTmpFilePath, - mySystem.iConnectionTimeout, mySystem.iConnectiontMaxTime, mySystem.iConnectiontNbRetries); -+#endif - cd_debug ("download with '%s'", cCommand); - int r = system (cCommand); + if test "$?" != "0" -a "$theme" != "Classic" -a "$theme" != "default"; then # pas un theme officiel diff --git a/deskutils/cairo-dock/pkg-plist b/deskutils/cairo-dock/pkg-plist index 96a20ec4e7d..cf535a93b78 100644 --- a/deskutils/cairo-dock/pkg-plist +++ b/deskutils/cairo-dock/pkg-plist @@ -1,27 +1,28 @@ bin/cairo-dock bin/cairo-dock-package-theme -bin/launch-cairo-dock-after-compiz +bin/launch-cairo-dock-with-delay include/cairo-dock/cairo-dock.h +include/cairo-dock/cairo-dock/cairo-dock-X-manager.h include/cairo-dock/cairo-dock/cairo-dock-X-utilities.h include/cairo-dock/cairo-dock/cairo-dock-animations.h include/cairo-dock/cairo-dock/cairo-dock-applet-canvas.h include/cairo-dock/cairo-dock/cairo-dock-applet-facility.h -include/cairo-dock/cairo-dock/cairo-dock-applet-factory.h +include/cairo-dock/cairo-dock/cairo-dock-applet-manager.h include/cairo-dock/cairo-dock/cairo-dock-applet-multi-instance.h include/cairo-dock/cairo-dock/cairo-dock-applet-single-instance.h -include/cairo-dock/cairo-dock/cairo-dock-application-factory.h include/cairo-dock/cairo-dock/cairo-dock-application-facility.h include/cairo-dock/cairo-dock/cairo-dock-applications-manager.h +include/cairo-dock/cairo-dock/cairo-dock-backends-manager.h include/cairo-dock/cairo-dock/cairo-dock-callbacks.h include/cairo-dock/cairo-dock/cairo-dock-class-manager.h include/cairo-dock/cairo-dock/cairo-dock-config.h include/cairo-dock/cairo-dock/cairo-dock-container.h include/cairo-dock/cairo-dock/cairo-dock-data-renderer.h include/cairo-dock/cairo-dock/cairo-dock-dbus.h -include/cairo-dock/cairo-dock/cairo-dock-default-view.h -include/cairo-dock/cairo-dock/cairo-dock-desklet.h -include/cairo-dock/cairo-dock/cairo-dock-desktop-file-factory.h -include/cairo-dock/cairo-dock/cairo-dock-dialogs.h +include/cairo-dock/cairo-dock/cairo-dock-desklet-factory.h +include/cairo-dock/cairo-dock/cairo-dock-desklet-manager.h +include/cairo-dock/cairo-dock/cairo-dock-dialog-factory.h +include/cairo-dock/cairo-dock/cairo-dock-dialog-manager.h include/cairo-dock/cairo-dock/cairo-dock-dock-facility.h include/cairo-dock/cairo-dock/cairo-dock-dock-factory.h include/cairo-dock/cairo-dock/cairo-dock-dock-manager.h @@ -30,18 +31,16 @@ include/cairo-dock/cairo-dock/cairo-dock-draw.h include/cairo-dock/cairo-dock/cairo-dock-emblem.h include/cairo-dock/cairo-dock/cairo-dock-file-manager.h include/cairo-dock/cairo-dock/cairo-dock-flying-container.h -include/cairo-dock/cairo-dock/cairo-dock-gauge.h include/cairo-dock/cairo-dock/cairo-dock-global-variables.h -include/cairo-dock/cairo-dock/cairo-dock-graph.h include/cairo-dock/cairo-dock/cairo-dock-gui-factory.h -include/cairo-dock/cairo-dock/cairo-dock-gui-launcher.h include/cairo-dock/cairo-dock/cairo-dock-gui-manager.h +include/cairo-dock/cairo-dock/cairo-dock-icon-loader.h include/cairo-dock/cairo-dock/cairo-dock-icons.h +include/cairo-dock/cairo-dock/cairo-dock-indicator-manager.h include/cairo-dock/cairo-dock/cairo-dock-internal-accessibility.h include/cairo-dock/cairo-dock/cairo-dock-internal-background.h include/cairo-dock/cairo-dock/cairo-dock-internal-desklets.h include/cairo-dock/cairo-dock/cairo-dock-internal-dialogs.h -include/cairo-dock/cairo-dock/cairo-dock-internal-hidden-dock.h include/cairo-dock/cairo-dock/cairo-dock-internal-icons.h include/cairo-dock/cairo-dock/cairo-dock-internal-indicators.h include/cairo-dock/cairo-dock/cairo-dock-internal-labels.h @@ -51,66 +50,52 @@ include/cairo-dock/cairo-dock/cairo-dock-internal-taskbar.h include/cairo-dock/cairo-dock/cairo-dock-internal-views.h include/cairo-dock/cairo-dock/cairo-dock-keybinder.h include/cairo-dock/cairo-dock/cairo-dock-keyfile-utilities.h -include/cairo-dock/cairo-dock/cairo-dock-launcher-factory.h +include/cairo-dock/cairo-dock/cairo-dock-launcher-manager.h include/cairo-dock/cairo-dock/cairo-dock-load.h include/cairo-dock/cairo-dock/cairo-dock-log.h -include/cairo-dock/cairo-dock/cairo-dock-menu.h include/cairo-dock/cairo-dock/cairo-dock-modules.h include/cairo-dock/cairo-dock/cairo-dock-notifications.h +include/cairo-dock/cairo-dock/cairo-dock-opengl-font.h +include/cairo-dock/cairo-dock/cairo-dock-opengl-path.h include/cairo-dock/cairo-dock/cairo-dock-opengl.h +include/cairo-dock/cairo-dock/cairo-dock-packages.h include/cairo-dock/cairo-dock/cairo-dock-particle-system.h -include/cairo-dock/cairo-dock/cairo-dock-renderer-manager.h -include/cairo-dock/cairo-dock/cairo-dock-separator-factory.h +include/cairo-dock/cairo-dock/cairo-dock-separator-manager.h include/cairo-dock/cairo-dock/cairo-dock-struct.h include/cairo-dock/cairo-dock/cairo-dock-surface-factory.h include/cairo-dock/cairo-dock/cairo-dock-task.h include/cairo-dock/cairo-dock/cairo-dock-themes-manager.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/implementations/cairo-dock-gauge.h +include/cairo-dock/implementations/cairo-dock-graph.h +lib/libgldi.so +lib/libgldi.so.2 +lib/libgldi.so.2.2.0-4 libdata/pkgconfig/cairo-dock.pc -share/locale/de/LC_MESSAGES/cairo-dock.mo -share/locale/el/LC_MESSAGES/cairo-dock.mo -share/locale/es/LC_MESSAGES/cairo-dock.mo -share/locale/fr/LC_MESSAGES/cairo-dock.mo -share/locale/it/LC_MESSAGES/cairo-dock.mo -share/locale/ja/LC_MESSAGES/cairo-dock.mo -share/locale/nl/LC_MESSAGES/cairo-dock.mo -share/locale/pt/LC_MESSAGES/cairo-dock.mo -share/locale/pt_BR/LC_MESSAGES/cairo-dock.mo -share/locale/ru/LC_MESSAGES/cairo-dock.mo -share/locale/sv/LC_MESSAGES/cairo-dock.mo -share/locale/zh_CN/LC_MESSAGES/cairo-dock.mo -share/locale/be/LC_MESSAGES/cairo-dock.mo -share/locale/cs/LC_MESSAGES/cairo-dock.mo -share/locale/en/LC_MESSAGES/cairo-dock.mo -share/locale/eu/LC_MESSAGES/cairo-dock.mo -share/locale/hu/LC_MESSAGES/cairo-dock.mo -share/locale/uk/LC_MESSAGES/cairo-dock.mo -share/locale/zh_TW/LC_MESSAGES/cairo-dock.mo +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.conf +%%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%%/emblems/broken.svg -%%DATADIR%%/emblems/charge.svg -%%DATADIR%%/emblems/drop.svg -%%DATADIR%%/emblems/error.svg -%%DATADIR%%/emblems/locked.svg -%%DATADIR%%/emblems/pause.svg -%%DATADIR%%/emblems/play.svg -%%DATADIR%%/emblems/stop.svg -%%DATADIR%%/emblems/warning.svg %%DATADIR%%/explosion/explosion.png -%%DATADIR%%/file.conf %%DATADIR%%/gauges/Battery/background.svg %%DATADIR%%/gauges/Battery/battery0.svg %%DATADIR%%/gauges/Battery/battery1.svg @@ -130,97 +115,144 @@ share/applications/cairo-dock.desktop %%DATADIR%%/gauges/Turbo-night-fuel/theme.xml %%DATADIR%%/hand.svg %%DATADIR%%/help.conf +%%DATADIR%%/help_scripts.sh +%%DATADIR%%/icon-accessories.svg +%%DATADIR%%/icon-all.svg +%%DATADIR%%/icon-appearance.svg %%DATADIR%%/icon-background.svg +%%DATADIR%%/icon-behavior.svg %%DATADIR%%/icon-bubble.png %%DATADIR%%/icon-buttons.png +%%DATADIR%%/icon-close.png +%%DATADIR%%/icon-connection.svg +%%DATADIR%%/icon-controler.svg %%DATADIR%%/icon-desklets.png +%%DATADIR%%/icon-desktop.svg %%DATADIR%%/icon-dialogs.svg +%%DATADIR%%/icon-extensions.svg +%%DATADIR%%/icon-files.svg %%DATADIR%%/icon-frame.png +%%DATADIR%%/icon-fun.svg %%DATADIR%%/icon-gradation.png -%%DATADIR%%/icon-hidden-dock.png -%%DATADIR%%/icon-indicators.png -%%DATADIR%%/icon-labels.png +%%DATADIR%%/icon-help.svg +%%DATADIR%%/icon-hidden-dock.svg +%%DATADIR%%/icon-icons.svg +%%DATADIR%%/icon-indicators.svg +%%DATADIR%%/icon-internet.svg +%%DATADIR%%/icon-labels.svg %%DATADIR%%/icon-lock-icons.svg -%%DATADIR%%/icon-mouse.png +%%DATADIR%%/icon-maximize.png +%%DATADIR%%/icon-minimize.png +%%DATADIR%%/icon-mouse.svg %%DATADIR%%/icon-movment.png -%%DATADIR%%/icon-position.png +%%DATADIR%%/icon-plug-ins.svg +%%DATADIR%%/icon-position.svg +%%DATADIR%%/icon-restore.png %%DATADIR%%/icon-subdock.png -%%DATADIR%%/icon-system.png +%%DATADIR%%/icon-system.svg %%DATADIR%%/icon-taskbar.png +%%DATADIR%%/icon-views.svg +%%DATADIR%%/icon-visibility.svg %%DATADIR%%/icon-wave.png -%%DATADIR%%/cairo-dock-simple.conf -%%DATADIR%%/icon-close.png -%%DATADIR%%/icon-help.png -%%DATADIR%%/icon-plug-ins.png -%%DATADIR%%/icon-accessories.png -%%DATADIR%%/icon-connection.svg -%%DATADIR%%/icon-icons.png -%%DATADIR%%/icon-restore.png -%%DATADIR%%/icon-appearance.svg -%%DATADIR%%/icon-controler.png -%%DATADIR%%/icon-maximize.png -%%DATADIR%%/icon-views.png -%%DATADIR%%/icon-behavior.svg -%%DATADIR%%/icon-desktop.svg -%%DATADIR%%/icon-minimize.png -%%DATADIR%%/icon-visibility.png -%%DATADIR%%/launcher.conf +%%DATADIR%%/launcher.desktop %%DATADIR%%/main-dock.conf +%%DATADIR%%/no-input-desklet.png %%DATADIR%%/preview-default.png %%DATADIR%%/readme-default-view %%DATADIR%%/retach-desklet.svg %%DATADIR%%/rotate-desklet.svg -%%DATADIR%%/separator.conf +%%DATADIR%%/separator.desktop %%DATADIR%%/themes.conf %%DATADIR%%/themes/_default_/active.png -%%DATADIR%%/themes/_default_/bg.png -%%DATADIR%%/themes/_default_/cairo-dock-cancel.svg -%%DATADIR%%/themes/_default_/cairo-dock-ok.svg +%%DATADIR%%/themes/_default_/bg.svg %%DATADIR%%/themes/_default_/cairo-dock.conf -%%DATADIR%%/themes/_default_/icons/logout.png -%%DATADIR%%/themes/_default_/icons/firefox.svg %%DATADIR%%/themes/_default_/indicator.png +%%DATADIR%%/themes/_default_/launchers/01container.desktop +%%DATADIR%%/themes/_default_/launchers/01empathy.desktop +%%DATADIR%%/themes/_default_/launchers/01f-spot.desktop %%DATADIR%%/themes/_default_/launchers/01firefox.desktop +%%DATADIR%%/themes/_default_/launchers/01gcalctool.desktop %%DATADIR%%/themes/_default_/launchers/01gimp.desktop %%DATADIR%%/themes/_default_/launchers/01gnome-terminal.desktop -%%DATADIR%%/themes/_default_/launchers/01thunderbird.desktop +%%DATADIR%%/themes/_default_/launchers/01inkscape.desktop %%DATADIR%%/themes/_default_/plug-ins/Animated-icons/Animated-icons.conf +%%DATADIR%%/themes/_default_/plug-ins/Clipper/Clipper.conf +%%DATADIR%%/themes/_default_/plug-ins/Dbus/Dbus.conf %%DATADIR%%/themes/_default_/plug-ins/GMenu/GMenu.conf -%%DATADIR%%/themes/_default_/plug-ins/clock/clock.conf %%DATADIR%%/themes/_default_/plug-ins/dialog-rendering/dialog-rendering.conf -%%DATADIR%%/themes/_default_/plug-ins/dustbin/dustbin.conf +%%DATADIR%%/themes/_default_/plug-ins/dnd2share/dnd2share.conf %%DATADIR%%/themes/_default_/plug-ins/icon-effect/icon-effect.conf %%DATADIR%%/themes/_default_/plug-ins/illusion/illusion.conf %%DATADIR%%/themes/_default_/plug-ins/logout/logout.conf +%%DATADIR%%/themes/_default_/plug-ins/musicPlayer/musicPlayer.conf +%%DATADIR%%/themes/_default_/plug-ins/quick-browser/quick-browser.conf %%DATADIR%%/themes/_default_/plug-ins/rendering/rendering.conf %%DATADIR%%/themes/_default_/plug-ins/shortcuts/shortcuts.conf %%DATADIR%%/themes/_default_/plug-ins/showDesktop/showDesktop.conf +%%DATADIR%%/themes/_default_/plug-ins/stack/stack.conf %%DATADIR%%/themes/_default_/plug-ins/switcher/switcher.conf -%%DATADIR%%/themes/_default_/separator.png +share/locale/ar/LC_MESSAGES/cairo-dock.mo +share/locale/be/LC_MESSAGES/cairo-dock.mo +share/locale/ca/LC_MESSAGES/cairo-dock.mo +share/locale/cs/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/es/LC_MESSAGES/cairo-dock.mo +share/locale/et/LC_MESSAGES/cairo-dock.mo +share/locale/eu/LC_MESSAGES/cairo-dock.mo +share/locale/fi/LC_MESSAGES/cairo-dock.mo +share/locale/fo/LC_MESSAGES/cairo-dock.mo +share/locale/fr/LC_MESSAGES/cairo-dock.mo +share/locale/hu/LC_MESSAGES/cairo-dock.mo +share/locale/it/LC_MESSAGES/cairo-dock.mo +share/locale/ja/LC_MESSAGES/cairo-dock.mo +share/locale/nb/LC_MESSAGES/cairo-dock.mo +share/locale/nl/LC_MESSAGES/cairo-dock.mo +share/locale/oc/LC_MESSAGES/cairo-dock.mo +share/locale/pt/LC_MESSAGES/cairo-dock.mo +share/locale/pt_BR/LC_MESSAGES/cairo-dock.mo +share/locale/ru/LC_MESSAGES/cairo-dock.mo +share/locale/sk/LC_MESSAGES/cairo-dock.mo +share/locale/sr/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/pixmaps/cairo-dock.svg -@dirrm include/cairo-dock/cairo-dock -@dirrm include/cairo-dock -@dirrm %%DATADIR%%/emblems -@dirrm %%DATADIR%%/explosion -@dirrm %%DATADIR%%/gauges/Battery -@dirrm %%DATADIR%%/gauges/Turbo-night-fuel -@dirrm %%DATADIR%%/gauges -@dirrm %%DATADIR%%/themes/_default_/icons -@dirrm %%DATADIR%%/themes/_default_/launchers -@dirrm %%DATADIR%%/themes/_default_/plug-ins/Animated-icons -@dirrm %%DATADIR%%/themes/_default_/plug-ins/GMenu -@dirrm %%DATADIR%%/themes/_default_/plug-ins/clock -@dirrm %%DATADIR%%/themes/_default_/plug-ins/dialog-rendering -@dirrm %%DATADIR%%/themes/_default_/plug-ins/dustbin -@dirrm %%DATADIR%%/themes/_default_/plug-ins/icon-effect -@dirrm %%DATADIR%%/themes/_default_/plug-ins/illusion -@dirrm %%DATADIR%%/themes/_default_/plug-ins/logout -@dirrm %%DATADIR%%/themes/_default_/plug-ins/rendering -@dirrm %%DATADIR%%/themes/_default_/plug-ins/shortcuts -@dirrm %%DATADIR%%/themes/_default_/plug-ins/showDesktop @dirrm %%DATADIR%%/themes/_default_/plug-ins/switcher +@dirrm %%DATADIR%%/themes/_default_/plug-ins/stack +@dirrm %%DATADIR%%/themes/_default_/plug-ins/showDesktop +@dirrm %%DATADIR%%/themes/_default_/plug-ins/shortcuts +@dirrm %%DATADIR%%/themes/_default_/plug-ins/rendering +@dirrm %%DATADIR%%/themes/_default_/plug-ins/quick-browser +@dirrm %%DATADIR%%/themes/_default_/plug-ins/musicPlayer +@dirrm %%DATADIR%%/themes/_default_/plug-ins/logout +@dirrm %%DATADIR%%/themes/_default_/plug-ins/illusion +@dirrm %%DATADIR%%/themes/_default_/plug-ins/icon-effect +@dirrm %%DATADIR%%/themes/_default_/plug-ins/dnd2share +@dirrm %%DATADIR%%/themes/_default_/plug-ins/dialog-rendering +@dirrm %%DATADIR%%/themes/_default_/plug-ins/GMenu +@dirrm %%DATADIR%%/themes/_default_/plug-ins/Dbus +@dirrm %%DATADIR%%/themes/_default_/plug-ins/Clipper +@dirrm %%DATADIR%%/themes/_default_/plug-ins/Animated-icons @dirrm %%DATADIR%%/themes/_default_/plug-ins +@dirrm %%DATADIR%%/themes/_default_/launchers @dirrm %%DATADIR%%/themes/_default_ @dirrm %%DATADIR%%/themes +@dirrm %%DATADIR%%/gauges/Turbo-night-fuel +@dirrm %%DATADIR%%/gauges/Battery +@dirrm %%DATADIR%%/gauges +@dirrm %%DATADIR%%/explosion @dirrm %%DATADIR%% @dirrmtry share/applications +@dirrmtry share/locale/fo/LC_MESSAGES +@dirrmtry share/locale/fo +@dirrmtry share/man/man1 +@dirrmtry share/man +@dirrm include/cairo-dock/implementations +@dirrm include/cairo-dock/icon-factory +@dirrm include/cairo-dock/cairo-dock +@dirrm include/cairo-dock |