Attachment 127765 Details for Bug 171617 – xdg-menu.diff

[patch] xdg-menu.diff

xdg-menu.diff (text/x-patch), 5.65 KB, created by nemysis on 2013-02-15 11:13:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: nemysis

Created: 2013-02-15 11:13:52 UTC

Size: 5.65 KB

patch

obsolete

>===> Generating patch
>===> Viewing diff with more
>diff -ruN --exclude=CVS /usr/ports/misc/xdg-menu/Makefile ./Makefile
>--- /usr/ports/misc/xdg-menu/Makefile	2013-01-14 17:56:49.000000000 +0100
>+++ ./Makefile	2013-02-15 12:07:05.000000000 +0100
>@@ -7,28 +7,36 @@
> 
> PORTNAME=	xdg-menu
> PORTVERSION=	1.5
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	misc
>-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
>-DISTNAME=	XDG-Menu-${DISTVERSION}
>-EXTRACT_SUFX=	.tgz
>+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
>+		SF/nemysisfreebsdp/:icons
>+DISTFILES=	XDG-Menu-${DISTVERSION}.tgz \
>+		${PORTNAME}.png:icons
>+DIST_SUBDIR=	python
>+EXTRACT_ONLY=	XDG-Menu-${DISTVERSION}.tgz
> 
> MAINTAINER=	nemysis@gmx.ch
>-COMMENT=	A ROX panel applet that displays an applications menu button
>+COMMENT=	ROX panel applet that displays an applications menu button
> 
> LICENSE=	GPLv2
> 
> RUN_DEPENDS=	${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer \
>-		${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg \
>-		${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
>+		${PYTHON_PKGNAMEPREFIX}xdg>=0:${PORTSDIR}/devel/py-xdg \
>+		${PYTHON_PKGNAMEPREFIX}dbus>=0:${PORTSDIR}/devel/py-dbus
> 
> WRKSRC=		${WRKDIR}/XDG-Menu
> DATADIR=	${PREFIX}/apps/XDG-Menu
> 
>-FETCH_ARGS?=	-Fpr
> USE_PYTHON=	yes
>-ALL_TARGET=
>-NO_BUILD=	yes
>+USE_GNOME=	desktopfileutils
>+INSTALLS_ICONS=	yes
>+
>+PORTDOCS=	*
>+
>+DESKTOP_ENTRIES="XDG-Menu" "${COMMENT}" \
>+		"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
>+		"${PORTNAME}" "Application;System;" false
> 
> OPTIONS_DEFINE=	ROX
> ROX_DESC=	Enable ROX panel applet support
>@@ -37,8 +45,10 @@
> 
> .include <bsd.port.options.mk>
> 
>-.if !${PORT_OPTIONS:MROX}
> post-patch:
>+	@${REINPLACE_CMD} -i '' 's|/usr/lib|../../lib|' ${WRKSRC}/findrox.py
>+
>+.if ! ${PORT_OPTIONS:MROX}
> 	@${REINPLACE_CMD} -i '' '/if not rox.confirm/,/sys.exit/s/^/#/' ${WRKSRC}/AppRun
> 	@${ECHO_MSG}
> 	@${ECHO_MSG} "You have not enabled ROX panel applet support"
>@@ -46,12 +56,25 @@
> 	@${FIND} ${WRKSRC} -name "*.bak" -delete
> .endif
> 
>+do-build:
>+	@${PYTHON_CMD} -m compileall ${WRKSRC}
>+	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
>+
> do-install:
>-# Scripts
> 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
> 
>-# Executable and Data
> 	${MKDIR} ${DATADIR}
>-	@cd ${WRKSRC} && ${FIND} . | ${CPIO} -pdmu ${DATADIR}
>+	@(cd ${WRKSRC} && ${CP} -r Messages .DirIcon AppInfo.xml AppRun AppletRun \
>+		Options.xml Messages python *.py *.pyc *.pyo ${DATADIR})
>+
>+	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${PREFIX}/share/pixmaps/
>+
>+.if ${PORT_OPTIONS:MDOCS}
>+	${MKDIR} ${DOCSDIR}
>+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/Help/|} ${DOCSDIR}
>+.endif
>+
>+post-install:
>+	@-update-desktop-database
> 
> .include <bsd.port.mk>
>diff -ruN --exclude=CVS /usr/ports/misc/xdg-menu/distinfo ./distinfo
>--- /usr/ports/misc/xdg-menu/distinfo	2013-01-14 17:56:49.000000000 +0100
>+++ ./distinfo	2012-12-24 12:47:16.000000000 +0100
>@@ -1,2 +1,4 @@
>-SHA256 (XDG-Menu-1.5.tgz) = 5cd62f3421032c4b619b80fde7e7cdc3230409489762e5c05ffd82d7c9c28478
>-SIZE (XDG-Menu-1.5.tgz) = 32377
>+SHA256 (python/XDG-Menu-1.5.tgz) = 5cd62f3421032c4b619b80fde7e7cdc3230409489762e5c05ffd82d7c9c28478
>+SIZE (python/XDG-Menu-1.5.tgz) = 32377
>+SHA256 (python/xdg-menu.png) = f6f3be4272ca446c3bdf7895556c879ab7a4eceaf2a985dabaf1ad2126a3a2e4
>+SIZE (python/xdg-menu.png) = 5974
>diff -ruN --exclude=CVS /usr/ports/misc/xdg-menu/files/xdg-menu.in ./files/xdg-menu.in
>--- /usr/ports/misc/xdg-menu/files/xdg-menu.in	2013-01-14 17:56:49.000000000 +0100
>+++ ./files/xdg-menu.in	2012-12-24 13:24:27.000000000 +0100
>@@ -1,7 +1,7 @@
> #!/bin/sh
> #
> # $FreeBSD: head/misc/xdg-menu/files/xdg-menu.in 302986 2012-08-23 09:12:26Z scheidell $
>+#
> 
>-echo "XDG-Menu: Starting up..."
> cd "%%DATADIR%%"
>-./AppRun
>+exec ./AppRun
>diff -ruN --exclude=CVS /usr/ports/misc/xdg-menu/pkg-plist ./pkg-plist
>--- /usr/ports/misc/xdg-menu/pkg-plist	2013-01-14 17:56:49.000000000 +0100
>+++ ./pkg-plist	2013-02-15 12:01:21.000000000 +0100
>@@ -2,34 +2,49 @@
> apps/XDG-Menu/AppInfo.xml
> apps/XDG-Menu/AppRun
> apps/XDG-Menu/AppletRun
>-apps/XDG-Menu/Help/COPYING
>-apps/XDG-Menu/Help/ChangeLog
>-apps/XDG-Menu/Help/README
>-apps/XDG-Menu/Help/README.ru
>-apps/XDG-Menu/Help/TODO
>-apps/XDG-Menu/Makefile
> apps/XDG-Menu/Messages/XDG-Menu.pot
> apps/XDG-Menu/Messages/it.gmo
> apps/XDG-Menu/Messages/it.po
> apps/XDG-Menu/Messages/opts2po.py
>+apps/XDG-Menu/Messages/opts2po.pyc
>+apps/XDG-Menu/Messages/opts2po.pyo
> apps/XDG-Menu/Messages/ru.gmo
> apps/XDG-Menu/Messages/ru.po
> apps/XDG-Menu/Messages/uk.gmo
> apps/XDG-Menu/Messages/uk.po
> apps/XDG-Menu/Options.xml
> apps/XDG-Menu/findrox.py
>+apps/XDG-Menu/findrox.pyc
>+apps/XDG-Menu/findrox.pyo
> apps/XDG-Menu/python/config.py
>+apps/XDG-Menu/python/config.pyc
>+apps/XDG-Menu/python/config.pyo
> apps/XDG-Menu/python/ctxmenu.py
>+apps/XDG-Menu/python/ctxmenu.pyc
>+apps/XDG-Menu/python/ctxmenu.pyo
> apps/XDG-Menu/python/dndsource.py
>+apps/XDG-Menu/python/dndsource.pyc
>+apps/XDG-Menu/python/dndsource.pyo
> apps/XDG-Menu/python/i18n.py
>+apps/XDG-Menu/python/i18n.pyc
>+apps/XDG-Menu/python/i18n.pyo
> apps/XDG-Menu/python/imagemenu.py
>+apps/XDG-Menu/python/imagemenu.pyc
>+apps/XDG-Menu/python/imagemenu.pyo
> apps/XDG-Menu/python/main.py
>+apps/XDG-Menu/python/main.pyc
>+apps/XDG-Menu/python/main.pyo
> apps/XDG-Menu/python/roxmenu.py
>+apps/XDG-Menu/python/roxmenu.pyc
>+apps/XDG-Menu/python/roxmenu.pyo
> apps/XDG-Menu/python/xdgmenu.py
>+apps/XDG-Menu/python/xdgmenu.pyc
>+apps/XDG-Menu/python/xdgmenu.pyo
> bin/xdg-menu
>-@dirrmtry share/applications
>+share/pixmaps/xdg-menu.png
> @dirrm apps/XDG-Menu/python
> @dirrm apps/XDG-Menu/Messages
>-@dirrm apps/XDG-Menu/Help
> @dirrm apps/XDG-Menu
> @dirrmtry apps
>+@exec %%LOCALBASE%%/bin/update-desktop-database -q || /usr/bin/true
>+@unexec %%LOCALBASE%%/bin/update-desktop-database -q || /usr/bin/true
>===> Done

Actions: View | Diff

Attachments on bug 171617: 127762 | 127763 | 127764 | 127765