Attachment 118654 Details for Bug 160946 – file.diff

[patch] file.diff

file.diff (text/plain), 8.84 KB, created by Olivier Duchateau on 2011-09-23 19:40:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Duchateau

Created: 2011-09-23 19:40:06 UTC

Size: 8.84 KB

patch

obsolete

>diff -urN /usr/ports/x11-wm/xfce4-wm/Makefile xfce4-wm/Makefile
>--- /usr/ports/x11-wm/xfce4-wm/Makefile	2011-08-11 21:20:17.000000000 +0200
>+++ xfce4-wm/Makefile	2011-09-23 19:28:41.000000000 +0200
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	xfce4-wm
>-PORTVERSION=	4.8.1
>+PORTVERSION=	4.8.2
> CATEGORIES=	x11-wm xfce
> MASTER_SITES=	${MASTER_SITE_XFCE}
> MASTER_SITE_SUBDIR=	src/xfce/xfwm4/${PORTVERSION:R}
>@@ -16,15 +16,24 @@
> MAINTAINER=	oliver@FreeBSD.org
> COMMENT=	XFce 4 window manager
> 
>-CONFIGURE_ARGS=	--enable-xinerama
>+DOCSDIR=	${PREFIX}/share/doc/xfwm4
>+
>+LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
>+	wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck
>+
>+CONFIGURE_ARGS=	--enable-xsync \
>+	--enable-render \
>+	--enable-randr \
>+	--disable-kde-systray
> GNU_CONFIGURE=	yes
> INSTALLS_ICONS=	yes
> USE_BZIP2=	yes
> USE_GETTEXT=	yes
> USE_GMAKE=	yes
>-USE_GNOME=	gtk20 intltool intlhack pkgconfig
>+USE_GNOME=	gnomehack gtk20 intltool intlhack pkgconfig desktopfileutils
> USE_LDCONFIG=	yes
>-USE_XFCE=	configenv libutil libgui panel xfconf
>+USE_XFCE=	configenv libmenu libutil xfconf
>+USE_XORG=	x11 sm xext xrandr xrender
> 
> OPTIONS=	COMPOSITE	"Support the experimental X11 Composite extension"	on \
> 		STARTUP 	"Enable startup notification support"			on \
>@@ -53,4 +62,7 @@
> 	@${REINPLACE_CMD} -e 's|$#define ShapeInput 2$;|\1|' \
> 		${WRKSRC}/src/frame.c
> 
>+post-install:
>+	@-update-desktop-database
>+
> .include <bsd.port.post.mk>
>diff -urN /usr/ports/x11-wm/xfce4-wm/distinfo xfce4-wm/distinfo
>--- /usr/ports/x11-wm/xfce4-wm/distinfo	2011-03-03 11:12:29.000000000 +0100
>+++ xfce4-wm/distinfo	2011-09-23 19:28:41.000000000 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (xfce4/xfwm4-4.8.1.tar.bz2) = 6a3cbf6c92a0cc3bcaf7cf2565c35beae6354768ec26b4d616a3c2544a8f8499
>-SIZE (xfce4/xfwm4-4.8.1.tar.bz2) = 1886443
>+SHA256 (xfce4/xfwm4-4.8.2.tar.bz2) = 6db2a6148d63d45699dbf6403fb227f8cbd529dcec7ee0827342940c442b0747
>+SIZE (xfce4/xfwm4-4.8.2.tar.bz2) = 1936231
>diff -urN /usr/ports/x11-wm/xfce4-wm/files/patch-doc_manual_images_Makefile.in xfce4-wm/files/patch-doc_manual_images_Makefile.in
>--- /usr/ports/x11-wm/xfce4-wm/files/patch-doc_manual_images_Makefile.in	1970-01-01 01:00:00.000000000 +0100
>+++ xfce4-wm/files/patch-doc_manual_images_Makefile.in	2011-09-23 19:28:41.000000000 +0200
>@@ -0,0 +1,18 @@
>+--- doc/manual/images/Makefile.in.orig	2011-09-23 19:17:31.000000000 +0200
>++++ doc/manual/images/Makefile.in	2011-09-23 19:18:01.000000000 +0200
>+@@ -319,7 +319,6 @@
>+ top_builddir = @top_builddir@
>+ top_srcdir = @top_srcdir@
>+ SUBDIRS = \
>+-	fr \
>+ 	it
>+ 
>+ imagesdir = $(docdir)/html/C/images
>+@@ -328,7 +327,6 @@
>+ 	workspace_margins.png \
>+ 	titlebar.png \
>+ 	misc_wm_prefs.png \
>+-	Makefile.am \
>+ 	keyboard_shortcuts.png \
>+ 	focus.png \
>+ 	decoration_style.png \
>diff -urN /usr/ports/x11-wm/xfce4-wm/files/patch-doc_manual_images_it_Makefile.in xfce4-wm/files/patch-doc_manual_images_it_Makefile.in
>--- /usr/ports/x11-wm/xfce4-wm/files/patch-doc_manual_images_it_Makefile.in	1970-01-01 01:00:00.000000000 +0100
>+++ xfce4-wm/files/patch-doc_manual_images_it_Makefile.in	2011-09-23 19:28:41.000000000 +0200
>@@ -0,0 +1,10 @@
>+--- doc/manual/images/it/Makefile.in.orig	2011-09-22 21:12:44.000000000 +0200
>++++ doc/manual/images/it/Makefile.in	2011-09-23 19:12:24.000000000 +0200
>+@@ -284,7 +284,6 @@
>+ 	workspace_margins.png \
>+ 	titlebar.png \
>+ 	misc_wm_prefs.png \
>+-	Makefile.am \
>+ 	keyboard_shortcuts.png \
>+ 	focus.png \
>+ 	decoration_style.png \
>diff -urN /usr/ports/x11-wm/xfce4-wm/pkg-plist xfce4-wm/pkg-plist
>--- /usr/ports/x11-wm/xfce4-wm/pkg-plist	2011-03-03 11:12:29.000000000 +0100
>+++ xfce4-wm/pkg-plist	2011-09-23 19:28:41.000000000 +0200
>@@ -6,46 +6,41 @@
> share/applications/xfce-wm-settings.desktop
> share/applications/xfce-wmtweaks-settings.desktop
> share/applications/xfce-workspaces-settings.desktop
>-share/doc/xfwm4/html/C/images/Makefile.am
>-share/doc/xfwm4/html/C/images/compose_shortcut.png
>-share/doc/xfwm4/html/C/images/decoration_style.png
>-share/doc/xfwm4/html/C/images/focus.png
>-share/doc/xfwm4/html/C/images/keyboard_shortcuts.png
>-share/doc/xfwm4/html/C/images/misc_wm_prefs.png
>-share/doc/xfwm4/html/C/images/titlebar.png
>-share/doc/xfwm4/html/C/images/workspace_margins.png
>-share/doc/xfwm4/html/C/images/xfwm_workspaces.png
>-share/doc/xfwm4/html/C/index.html
>-share/doc/xfwm4/html/da/images
>-share/doc/xfwm4/html/da/index.html
>-share/doc/xfwm4/html/el/images
>-share/doc/xfwm4/html/el/index.html
>-share/doc/xfwm4/html/fr/images/Makefile.am
>-share/doc/xfwm4/html/fr/images/compose_shortcut.png
>-share/doc/xfwm4/html/fr/images/decoration_style.png
>-share/doc/xfwm4/html/fr/images/focus.png
>-share/doc/xfwm4/html/fr/images/keyboard_shortcuts.png
>-share/doc/xfwm4/html/fr/images/misc_wm_prefs.png
>-share/doc/xfwm4/html/fr/images/titlebar.png
>-share/doc/xfwm4/html/fr/images/workspace_margins.png
>-share/doc/xfwm4/html/fr/images/xfwm_workspaces.png
>-share/doc/xfwm4/html/gl/images
>-share/doc/xfwm4/html/gl/index.html
>-share/doc/xfwm4/html/it/images/Makefile.am
>-share/doc/xfwm4/html/it/images/compose_shortcut.png
>-share/doc/xfwm4/html/it/images/decoration_style.png
>-share/doc/xfwm4/html/it/images/focus.png
>-share/doc/xfwm4/html/it/images/keyboard_shortcuts.png
>-share/doc/xfwm4/html/it/images/misc_wm_prefs.png
>-share/doc/xfwm4/html/it/images/titlebar.png
>-share/doc/xfwm4/html/it/images/workspace_margins.png
>-share/doc/xfwm4/html/it/images/xfwm_workspaces.png
>-share/doc/xfwm4/html/it/index.html
>-share/doc/xfwm4/html/sv/images
>-share/doc/xfwm4/html/sv/index.html
>-share/doc/xfwm4/html/ug/images
>-share/doc/xfwm4/html/ug/index.html
>-share/doc/xfwm4/html/xfwm4.css
>+%%DOCSDIR%%/html/C/images/compose_shortcut.png
>+%%DOCSDIR%%/html/C/images/decoration_style.png
>+%%DOCSDIR%%/html/C/images/focus.png
>+%%DOCSDIR%%/html/C/images/keyboard_shortcuts.png
>+%%DOCSDIR%%/html/C/images/misc_wm_prefs.png
>+%%DOCSDIR%%/html/C/images/titlebar.png
>+%%DOCSDIR%%/html/C/images/workspace_margins.png
>+%%DOCSDIR%%/html/C/images/xfwm_workspaces.png
>+%%DOCSDIR%%/html/C/index.html
>+%%DOCSDIR%%/html/da/images
>+%%DOCSDIR%%/html/da/index.html
>+%%DOCSDIR%%/html/el/images
>+%%DOCSDIR%%/html/el/index.html
>+%%DOCSDIR%%/html/gl/images
>+%%DOCSDIR%%/html/gl/index.html
>+%%DOCSDIR%%/html/it/images/compose_shortcut.png
>+%%DOCSDIR%%/html/it/images/decoration_style.png
>+%%DOCSDIR%%/html/it/images/focus.png
>+%%DOCSDIR%%/html/it/images/keyboard_shortcuts.png
>+%%DOCSDIR%%/html/it/images/misc_wm_prefs.png
>+%%DOCSDIR%%/html/it/images/titlebar.png
>+%%DOCSDIR%%/html/it/images/workspace_margins.png
>+%%DOCSDIR%%/html/it/images/xfwm_workspaces.png
>+%%DOCSDIR%%/html/it/index.html
>+%%DOCSDIR%%/html/ru/images
>+%%DOCSDIR%%/html/ru/index.html
>+%%DOCSDIR%%/html/sv/images
>+%%DOCSDIR%%/html/sv/index.html
>+%%DOCSDIR%%/html/tr/images
>+%%DOCSDIR%%/html/tr/index.html
>+%%DOCSDIR%%/html/ug/images
>+%%DOCSDIR%%/html/ug/index.html
>+%%DOCSDIR%%/html/zh_CN/images
>+%%DOCSDIR%%/html/zh_CN/index.html
>+%%DOCSDIR%%/html/xfwm4.css
> share/icons/hicolor/48x48/apps/wmtweaks.png
> share/icons/hicolor/48x48/apps/xfce4-workspaces.png
> share/icons/hicolor/48x48/apps/xfwm4.png
>@@ -105,6 +100,7 @@
> share/locale/sq/LC_MESSAGES/xfwm4.mo
> share/locale/sv/LC_MESSAGES/xfwm4.mo
> share/locale/ta/LC_MESSAGES/xfwm4.mo
>+share/locale/te/LC_MESSAGES/xfwm4.mo
> share/locale/tr/LC_MESSAGES/xfwm4.mo
> share/locale/ug/LC_MESSAGES/xfwm4.mo
> share/locale/uk/LC_MESSAGES/xfwm4.mo
>@@ -1496,13 +1492,15 @@
> @dirrm share/themes/Default
> @dirrm share/themes/Daloa/xfwm4
> @dirrm share/themes/Daloa
>-@dirrm share/themes
>+@dirrmtry share/themes
> @dirrmtry share/locale/ur_PK/LC_MESSAGES
> @dirrmtry share/locale/ur_PK
> @dirrmtry share/locale/ur/LC_MESSAGES
> @dirrmtry share/locale/ur
> @dirrmtry share/locale/ug/LC_MESSAGES
> @dirrmtry share/locale/ug
>+@dirrmtry share/locale/te/LC_MESSAGES
>+@dirrmtry share/locale/te
> @dirrmtry share/locale/si/LC_MESSAGES
> @dirrmtry share/locale/si
> @dirrmtry share/locale/mr/LC_MESSAGES
>@@ -1515,19 +1513,21 @@
> @dirrmtry share/locale/bn_IN
> @dirrmtry share/locale/ast/LC_MESSAGES
> @dirrmtry share/locale/ast
>-@dirrm share/doc/xfwm4/html/ug
>-@dirrm share/doc/xfwm4/html/sv
>-@dirrm share/doc/xfwm4/html/it/images
>-@dirrm share/doc/xfwm4/html/it
>-@dirrm share/doc/xfwm4/html/gl
>-@dirrm share/doc/xfwm4/html/el
>-@dirrm share/doc/xfwm4/html/fr/images
>-@dirrm share/doc/xfwm4/html/fr
>-@dirrm share/doc/xfwm4/html/da
>-@dirrm share/doc/xfwm4/html/C/images
>-@dirrm share/doc/xfwm4/html/C
>-@dirrm share/doc/xfwm4/html
>-@dirrm share/doc/xfwm4
>-@dirrmtry share/applications
>+@dirrm %%DOCSDIR%%/html/zh_CN
>+@dirrm %%DOCSDIR%%/html/ug
>+@dirrm %%DOCSDIR%%/html/tr
>+@dirrm %%DOCSDIR%%/html/sv
>+@dirrm %%DOCSDIR%%/html/ru
>+@dirrm %%DOCSDIR%%/html/it/images
>+@dirrm %%DOCSDIR%%/html/it
>+@dirrm %%DOCSDIR%%/html/gl
>+@dirrm %%DOCSDIR%%/html/el
>+@dirrm %%DOCSDIR%%/html/da
>+@dirrm %%DOCSDIR%%/html/C/images
>+@dirrm %%DOCSDIR%%/html/C
>+@dirrm %%DOCSDIR%%/html
>+@dirrm %%DOCSDIR%%
> @dirrm lib/xfce4/xfwm4
>-@dirrm lib/xfce4
>+@dirrmtry lib/xfce4
>+@exec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true
>+@unexec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true

Actions: View | Diff

Attachments on bug 160946: 118654