Attachment 118626 Details for Bug 160898 – deluge-unbreak-nox11.diff.txt

deluge-unbreak-nox11.diff.txt

deluge-unbreak-nox11.diff.txt (text/plain), 2.12 KB, created by R.Mahmatkhanov on 2011-09-24 19:07:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: R.Mahmatkhanov

Created: 2011-09-24 19:07:00 UTC

Size: 2.12 KB

patch

obsolete

>diff --git a/Makefile b/Makefile
>index 7170a35..a1875d0 100644
>--- a/Makefile
>+++ b/Makefile
>@@ -86,8 +86,11 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83:${PORTSDIR}/devel/py-dbus \
> 		${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:${PORTSDIR}/devel/py-notify \
> 		xdg-utils>=1.0.2:${PORTSDIR}/devel/xdg-utils
> 
>+PLIST_SUB+=	PYGTK=""
> USE_GNOME+=	desktopfileutils librsvg2 pygtk2
> INSTALLS_ICONS=	yes
>+.else
>+PLIST_SUB+=	PYGTK="@comment "
> .endif
> 
> post-patch:
>@@ -114,11 +117,6 @@ post-install:
> 	${INSTALL_DATA} ${WRKSRC}/deluge/data/icons/hicolor/${size}x${size}/apps/deluge.png \
> 		${PREFIX}/share/icons/hicolor/${size}x${size}/apps
> .endfor
>-	if [ ! -d ${PREFIX}/share/applications ]; then \
>-		${MKDIR} ${PREFIX}/share/applications ; \
>-	fi
>-	${INSTALL_DATA} ${WRKSRC}/deluge/data/share/applications/deluge.desktop \
>-	${PREFIX}/share/applications
> 	if [ ! -d ${PREFIX}/share/pixmaps ]; then \
> 	${MKDIR} ${PREFIX}/share/pixmaps ; \
> 	fi
>@@ -127,6 +125,11 @@ post-install:
> 		${PREFIX}/share/pixmaps
> .endfor
> .if !defined(WITHOUT_PYGTK)
>+	if [ ! -d ${PREFIX}/share/applications ]; then \
>+		${MKDIR} ${PREFIX}/share/applications ; \
>+	fi
>+	${INSTALL_DATA} ${WRKSRC}/deluge/data/share/applications/deluge.desktop \
>+		${PREFIX}/share/applications
> 	@-update-desktop-database
> .endif
> .if !defined(NOPORTDOCS)
>diff --git a/pkg-plist b/pkg-plist
>index 4572888..e345905 100644
>--- a/pkg-plist
>+++ b/pkg-plist
>@@ -1394,7 +1394,7 @@ bin/deluged
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/ui/web/web.py
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/ui/web/web.pyc
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/ui/web/web.pyo
>-share/applications/deluge.desktop
>+%%PYGTK%%share/applications/deluge.desktop
> share/icons/hicolor/128x128/apps/deluge.png
> share/icons/hicolor/16x16/apps/deluge.png
> share/icons/hicolor/192x192/apps/deluge.png
>@@ -1410,7 +1410,6 @@ share/icons/hicolor/96x96/apps/deluge.png
> share/icons/hicolor/scalable/apps/deluge.svg
> share/pixmaps/deluge.png
> share/pixmaps/deluge.xpm
>-@dirrmtry share/pixmaps
> @dirrmtry share/icons/hicolor/scalable/apps
> @dirrmtry share/icons/hicolor/scalable
> @dirrmtry share/icons/hicolor/96x96/apps

Actions: View

Attachments on bug 160898: 118625 | 118626