Attachment 146639 Details for Bug 193232 – deskutils/cairo-dock update to 3.3.2

[patch] deskutils/cairo-dock update to 3.3.2

patch-cairo-dock.txt (text/plain), 15.03 KB, created by Ivan Klymenko on 2014-09-01 19:59:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Klymenko

Created: 2014-09-01 19:59:50 UTC

Size: 15.03 KB

patch

obsolete

>diff --git a/cairo-dock.orig/Makefile b/cairo-dock/Makefile
>index fae5a56..e4aae3f 100644
>--- a/cairo-dock.orig/Makefile
>+++ b/cairo-dock/Makefile
>@@ -1,11 +1,9 @@
> # $FreeBSD: head/deskutils/cairo-dock/Makefile 351411 2014-04-16 18:28:47Z zeising $
> 
> PORTNAME=	cairo-dock
>-DISTVERSION=	3.2.1
>-PORTREVISION=	4
>+DISTVERSION=	3.3.2
> CATEGORIES=	deskutils
>-MASTER_SITES=	https://launchpadlibrarian.net/137290048/ \
>-		http://pazzle.otdux.com.ua/
>+MASTER_SITES=	https://launchpadlibrarian.net/155312298/
> 
> MAINTAINER=	fidaj@ukr.net
> COMMENT=	Cairo-Dock is a light and eye-candy dock
>@@ -17,7 +15,7 @@ LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
> RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
> 		sox:${PORTSDIR}/audio/sox
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}-3.2.1
>+WRKSRC=		${WRKDIR}/${PORTNAME}-3.3.2
> 
> GNU_CONFIGURE=	yes
> USE_GNOME=	glib20 gtk20 librsvg2 libxml2
>@@ -39,4 +37,7 @@ post-patch:
> 	     s|/usr/share/icons|${LOCALBASE}/share/icons|g; \
> 	     s|%%LOCALBASE%%|${LOCALBASE}|g;'
> 
>+post-install:
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgldi.so.3.3.2
>+
> .include <bsd.port.mk>
>diff --git a/cairo-dock.orig/distinfo b/cairo-dock/distinfo
>index a5314e7..534327b 100644
>--- a/cairo-dock.orig/distinfo
>+++ b/cairo-dock/distinfo
>@@ -1,2 +1,2 @@
>-SHA256 (cairo-dock-3.2.1.tar.gz) = 441e407f92138dc604c796b0455777b765e298ecb8f3120104f521d0e0b34543
>-SIZE (cairo-dock-3.2.1.tar.gz) = 2593954
>+SHA256 (cairo-dock-3.3.2.tar.gz) = a2d3854771d7ef5b262593b37aed216ece7eeacfc3e2a08deb4a797f175f6af8
>+SIZE (cairo-dock-3.3.2.tar.gz) = 2592341
>diff --git a/cairo-dock.orig/files/patch-CMakeLists.txt b/cairo-dock/files/patch-CMakeLists.txt
>index b2addfa..dfa3923 100644
>--- a/cairo-dock.orig/files/patch-CMakeLists.txt
>+++ b/cairo-dock/files/patch-CMakeLists.txt
>@@ -1,5 +1,5 @@
>---- ./CMakeLists.txt.orig	2013-04-05 00:40:07.000000000 +0300
>-+++ ./CMakeLists.txt	2013-05-04 16:34:01.000000000 +0300
>+--- ./CMakeLists.txt.orig	2013-10-29 12:13:48.000000000 +0200
>++++ ./CMakeLists.txt	2014-08-31 15:30:57.000000000 +0300
> @@ -69,7 +69,7 @@
>  set (exec_prefix ${prefix})
>  set (datadir "${prefix}/${CMAKE_INSTALL_DATAROOTDIR}")  # (...)/share
>@@ -9,17 +9,17 @@
>  
>  if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND (force-lib64 OR "${FORCE_LIB64}" STREQUAL "yes"))  # 64bits and force install in lib64
>  	set (libdir "${prefix}/lib64")
>-@@ -90,7 +90,8 @@
>- 
>+@@ -91,7 +91,8 @@
>  ########### dependencies ###############
>  
>--set (packages_required "glib-2.0 gthread-2.0 cairo librsvg-2.0 dbus-1 dbus-glib-1 libxml-2.0 xrender gl glu libcurl")  # for the .pc and to have details
>+ # check for mendatory dependencies
>+-set (packages_required "glib-2.0 gthread-2.0 cairo librsvg-2.0 dbus-1 dbus-glib-1 libxml-2.0 gl glu libcurl")  # for the .pc and to have details
> +set (packages_required "glib-2.0 cairo librsvg-2.0 dbus-1 dbus-glib-1 libxml-2.0 xrender gl glu libcurl")  # for the .pc and to have details
> +find_library (GTHREAD "gthread-2.0")
>  STRING (REGEX REPLACE " " ";" packages_required_semicolon ${packages_required})  # replace blank space by semicolon => to have more details if a package is missing
>  pkg_check_modules ("PACKAGE" REQUIRED "${packages_required_semicolon}")
>  
>-@@ -143,9 +144,9 @@
>+@@ -161,9 +162,9 @@
>  endif()
>  
>  check_include_files ("dlfcn.h" HAVE_DLFCN_H)
>diff --git a/cairo-dock.orig/files/patch-cairo-dock-package-theme.sh b/cairo-dock/files/patch-cairo-dock-package-theme.sh
>index 0661ca5..9ce704d 100644
>--- a/cairo-dock.orig/files/patch-cairo-dock-package-theme.sh
>+++ b/cairo-dock/files/patch-cairo-dock-package-theme.sh
>@@ -1,11 +1,11 @@
>---- ./data/scripts/cairo-dock-package-theme.sh.orig	2013-03-23 17:55:12.000000000 +0200
>-+++ ./data/scripts/cairo-dock-package-theme.sh	2013-06-27 18:03:18.000000000 +0300
>-@@ -125,7 +125,7 @@
>+--- ./data/scripts/cairo-dock-package-theme.sh.orig	2013-10-03 14:05:12.000000000 +0300
>++++ ./data/scripts/cairo-dock-package-theme.sh	2014-08-31 15:34:20.000000000 +0300
>+@@ -139,7 +139,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
>+ 		#\__________ We check if this is an official theme or not.
>+ 		echo "a theme is available ($theme)"
>+-		wget "$THEME_SERVER/$3/list.conf" -O "list.tmp" -t 3 -T 30
> +		fetch -o "liste.tmp" -T 30 "$THEME_SERVER/$3/list.conf"
>- 		if test -f "liste.tmp" ; then
>- 			grep "^\[${theme}\]" "liste.tmp"
>- 			if test "$?" != "0" -a  "$theme" != "Classic" -a "$theme" != "default"; then  # pas un theme officiel
>+ 		if test -f "list.tmp" ; then
>+ 			grep "^\[${theme}\]" "list.tmp"
>+ 			if test "$?" != "0" -a  "$theme" != "Classic" -a "$theme" != "default"; then  # not an official theme
>diff --git a/cairo-dock.orig/pkg-plist b/cairo-dock/pkg-plist
>index bc563af..541d719 100644
>--- a/cairo-dock.orig/pkg-plist
>+++ b/cairo-dock/pkg-plist
>@@ -1,7 +1,5 @@
> bin/cairo-dock
> include/cairo-dock/cairo-dock.h
>-include/cairo-dock/gldit/cairo-dock-X-manager.h
>-include/cairo-dock/gldit/cairo-dock-X-utilities.h
> include/cairo-dock/gldit/cairo-dock-animations.h
> include/cairo-dock/gldit/cairo-dock-applet-canvas.h
> include/cairo-dock/gldit/cairo-dock-applet-facility.h
>@@ -11,7 +9,7 @@ include/cairo-dock/gldit/cairo-dock-applet-single-instance.h
> include/cairo-dock/gldit/cairo-dock-application-facility.h
> include/cairo-dock/gldit/cairo-dock-applications-manager.h
> include/cairo-dock/gldit/cairo-dock-backends-manager.h
>-include/cairo-dock/gldit/cairo-dock-callbacks.h
>+include/cairo-dock/gldit/cairo-dock-class-icon-manager.h
> include/cairo-dock/gldit/cairo-dock-class-manager.h
> include/cairo-dock/gldit/cairo-dock-config.h
> include/cairo-dock/gldit/cairo-dock-container.h
>@@ -21,6 +19,7 @@ include/cairo-dock/gldit/cairo-dock-data-renderer.h
> include/cairo-dock/gldit/cairo-dock-dbus.h
> include/cairo-dock/gldit/cairo-dock-desklet-factory.h
> include/cairo-dock/gldit/cairo-dock-desklet-manager.h
>+include/cairo-dock/gldit/cairo-dock-desktop-manager.h
> include/cairo-dock/gldit/cairo-dock-dialog-factory.h
> include/cairo-dock/gldit/cairo-dock-dialog-manager.h
> include/cairo-dock/gldit/cairo-dock-dock-facility.h
>@@ -43,9 +42,9 @@ include/cairo-dock/gldit/cairo-dock-keyfile-utilities.h
> include/cairo-dock/gldit/cairo-dock-launcher-manager.h
> include/cairo-dock/gldit/cairo-dock-log.h
> include/cairo-dock/gldit/cairo-dock-manager.h
>-include/cairo-dock/gldit/cairo-dock-module-factory.h
>+include/cairo-dock/gldit/cairo-dock-menu.h
>+include/cairo-dock/gldit/cairo-dock-module-instance-manager.h
> include/cairo-dock/gldit/cairo-dock-module-manager.h
>-include/cairo-dock/gldit/cairo-dock-notifications.h
> include/cairo-dock/gldit/cairo-dock-object.h
> include/cairo-dock/gldit/cairo-dock-opengl-font.h
> include/cairo-dock/gldit/cairo-dock-opengl-path.h
>@@ -54,24 +53,22 @@ include/cairo-dock/gldit/cairo-dock-overlay.h
> include/cairo-dock/gldit/cairo-dock-packages.h
> include/cairo-dock/gldit/cairo-dock-particle-system.h
> include/cairo-dock/gldit/cairo-dock-separator-manager.h
>+include/cairo-dock/gldit/cairo-dock-stack-icon-manager.h
> include/cairo-dock/gldit/cairo-dock-struct.h
> include/cairo-dock/gldit/cairo-dock-surface-factory.h
> include/cairo-dock/gldit/cairo-dock-task.h
> include/cairo-dock/gldit/cairo-dock-themes-manager.h
>+include/cairo-dock/gldit/cairo-dock-user-icon-manager.h
>+include/cairo-dock/gldit/cairo-dock-utils.h
>+include/cairo-dock/gldit/cairo-dock-windows-manager.h
> include/cairo-dock/gldit/gldi-config.h
>-include/cairo-dock/icon-factory/cairo-dock-applet-factory.h
>-include/cairo-dock/icon-factory/cairo-dock-application-factory.h
>-include/cairo-dock/icon-factory/cairo-dock-desktop-file-factory.h
>-include/cairo-dock/icon-factory/cairo-dock-launcher-factory.h
>-include/cairo-dock/icon-factory/cairo-dock-separator-factory.h
> include/cairo-dock/implementations/cairo-dock-gauge.h
> include/cairo-dock/implementations/cairo-dock-graph.h
> include/cairo-dock/implementations/cairo-dock-progressbar.h
> lib/cairo-dock/libcd-Help.so
> lib/libgldi.so
> lib/libgldi.so.3
>-lib/libgldi.so.3.2.1
>-libdata/pkgconfig/cairo-dock.pc
>+lib/libgldi.so.3.3.2
> libdata/pkgconfig/gldi.pc
> man/man1/cairo-dock.1.gz
> share/applications/cairo-dock-cairo.desktop
>@@ -281,68 +278,67 @@ 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/gldit
>-@dirrm include/cairo-dock/icon-factory
>-@dirrm include/cairo-dock/implementations
>-@dirrm include/cairo-dock
>-@dirrm lib/cairo-dock
>-@dirrm %%DATADIR%%/explosion
>-@dirrm %%DATADIR%%/gauges/Turbo-night-fuel
>-@dirrm %%DATADIR%%/gauges
>-@dirrm %%DATADIR%%/icons
>-@dirrm %%DATADIR%%/images
>-@dirrm %%DATADIR%%/plug-ins/Help
>-@dirrm %%DATADIR%%/plug-ins
>-@dirrm %%DATADIR%%/scripts
>-@dirrm %%DATADIR%%/themes/Default-Panel/images
>-@dirrm %%DATADIR%%/themes/Default-Panel/launchers
>-@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/AlsaMixer
>-@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/Animated-icons
>-@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/Calendar
>-@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/Clipper
>-@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/GMenu
>-@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/Help
>-@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/Indicator-Generic
>-@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/Messaging-Menu
>-@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/Recent-Events
>-@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/Status-Notifier
>-@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/clock
>-@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/dialog-rendering
>-@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/dnd2share
>-@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/drop_indicator
>-@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/icon-effect
>-@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/illusion
>-@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/logout
>-@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/musicPlayer
>-@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/netspeed
>-@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/powermanager
>-@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/quick-browser
>-@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/rendering
>-@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/shortcuts
>-@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/showDesktop
>-@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins/switcher
>-@dirrm %%DATADIR%%/themes/Default-Panel/plug-ins
>-@dirrm %%DATADIR%%/themes/Default-Panel
>-@dirrm %%DATADIR%%/themes/Default-Single/images
>-@dirrm %%DATADIR%%/themes/Default-Single/launchers
>-@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/Animated-icons
>-@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/Clipper
>-@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/Dbus
>-@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/GMenu
>-@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/Recent-Events
>-@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/dialog-rendering
>-@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/dnd2share
>-@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/icon-effect
>-@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/illusion
>-@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/logout
>-@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/musicPlayer
>-@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/quick-browser
>-@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/rendering
>-@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/shortcuts
>-@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/showDesktop
>-@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/stack
>-@dirrm %%DATADIR%%/themes/Default-Single/plug-ins/switcher
>-@dirrm %%DATADIR%%/themes/Default-Single/plug-ins
>-@dirrm %%DATADIR%%/themes/Default-Single
>-@dirrm %%DATADIR%%/themes
>-@dirrm %%DATADIR%%
>+@dirrmtry include/cairo-dock/gldit
>+@dirrmtry include/cairo-dock/implementations
>+@dirrmtry include/cairo-dock
>+@dirrmtry lib/cairo-dock
>+@dirrmtry %%DATADIR%%/explosion
>+@dirrmtry %%DATADIR%%/gauges/Turbo-night-fuel
>+@dirrmtry %%DATADIR%%/gauges
>+@dirrmtry %%DATADIR%%/icons
>+@dirrmtry %%DATADIR%%/images
>+@dirrmtry %%DATADIR%%/plug-ins/Help
>+@dirrmtry %%DATADIR%%/plug-ins
>+@dirrmtry %%DATADIR%%/scripts
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/images
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/launchers
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/plug-ins/AlsaMixer
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/plug-ins/Animated-icons
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/plug-ins/Calendar
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/plug-ins/Clipper
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/plug-ins/GMenu
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/plug-ins/Help
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/plug-ins/Indicator-Generic
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/plug-ins/Messaging-Menu
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/plug-ins/Recent-Events
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/plug-ins/Status-Notifier
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/plug-ins/clock
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/plug-ins/dialog-rendering
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/plug-ins/dnd2share
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/plug-ins/drop_indicator
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/plug-ins/icon-effect
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/plug-ins/illusion
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/plug-ins/logout
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/plug-ins/musicPlayer
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/plug-ins/netspeed
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/plug-ins/powermanager
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/plug-ins/quick-browser
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/plug-ins/rendering
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/plug-ins/shortcuts
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/plug-ins/showDesktop
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/plug-ins/switcher
>+@dirrmtry %%DATADIR%%/themes/Default-Panel/plug-ins
>+@dirrmtry %%DATADIR%%/themes/Default-Panel
>+@dirrmtry %%DATADIR%%/themes/Default-Single/images
>+@dirrmtry %%DATADIR%%/themes/Default-Single/launchers
>+@dirrmtry %%DATADIR%%/themes/Default-Single/plug-ins/Animated-icons
>+@dirrmtry %%DATADIR%%/themes/Default-Single/plug-ins/Clipper
>+@dirrmtry %%DATADIR%%/themes/Default-Single/plug-ins/Dbus
>+@dirrmtry %%DATADIR%%/themes/Default-Single/plug-ins/GMenu
>+@dirrmtry %%DATADIR%%/themes/Default-Single/plug-ins/Recent-Events
>+@dirrmtry %%DATADIR%%/themes/Default-Single/plug-ins/dialog-rendering
>+@dirrmtry %%DATADIR%%/themes/Default-Single/plug-ins/dnd2share
>+@dirrmtry %%DATADIR%%/themes/Default-Single/plug-ins/icon-effect
>+@dirrmtry %%DATADIR%%/themes/Default-Single/plug-ins/illusion
>+@dirrmtry %%DATADIR%%/themes/Default-Single/plug-ins/logout
>+@dirrmtry %%DATADIR%%/themes/Default-Single/plug-ins/musicPlayer
>+@dirrmtry %%DATADIR%%/themes/Default-Single/plug-ins/quick-browser
>+@dirrmtry %%DATADIR%%/themes/Default-Single/plug-ins/rendering
>+@dirrmtry %%DATADIR%%/themes/Default-Single/plug-ins/shortcuts
>+@dirrmtry %%DATADIR%%/themes/Default-Single/plug-ins/showDesktop
>+@dirrmtry %%DATADIR%%/themes/Default-Single/plug-ins/stack
>+@dirrmtry %%DATADIR%%/themes/Default-Single/plug-ins/switcher
>+@dirrmtry %%DATADIR%%/themes/Default-Single/plug-ins
>+@dirrmtry %%DATADIR%%/themes/Default-Single
>+@dirrmtry %%DATADIR%%/themes
>+@dirrmtry %%DATADIR%%

Actions: View | Diff

Attachments on bug 193232: 146639 | 147491 | 149934 | 150289 | 150976