Attachment 149797 Details for Bug 194669 – Correct Patch

[patch] Correct Patch

linux-sublime-3.0.65.diff (text/plain), 5.26 KB, created by miguelmclara on 2014-11-24 21:54:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: miguelmclara

Created: 2014-11-24 21:54:11 UTC

Size: 5.26 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 373362)
>+++ Makefile	(working copy)
>@@ -11,41 +11,39 @@
> MAINTAINER=	miguelmclara@gmail.com
> COMMENT=	Sublime Text is a sophisticated text editor for code, markup and prose
> 
>-USES=	tar:bzip2
>-INSTALLS_ICONS=	yes
>-WRKSRC=	${WRKDIR}/sublime_text_3
>+USES=		tar:bzip2 desktop-file-utils
>+INSTALLS_ICONS= yes
>+WRKSRC=		${WRKDIR}/sublime_text_3
> 
> CONFLICTS=	linux-sublime-[0-24-9]*
> 
> NO_BUILD=
>-STRIP=	# don't strip linux binaries.
> SUB_FILES=	sublime
> 
> USE_LINUX=	yes
>-USE_LINUX_APPS=	xorglibs
>+USE_LINUX_APPS=	xorglibs gtk2
> 
> post-patch:
> 	${BRANDELF} -t Linux ${WRKSRC}/sublime_text
> 	${BRANDELF} -t Linux ${WRKSRC}/plugin_host
>-	${RM} -rf ${WRKSRC}/lib
> 
> do-install:
>-	@${MKDIR} ${STAGEDIR}${DATADIR}
>-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps/
>-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/
>-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/
>-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/
>-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/
>+	@${MKDIR} ${STAGEDIR}${DATADIR} \
>+		${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps/ \
>+		${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/ \
>+		${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/ \
>+		${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/ \
>+		${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/
> 
>-	@${INSTALL_DATA} ${WRKSRC}/Icon/16x16/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps/
>-	@${INSTALL_DATA} ${WRKSRC}/Icon/32x32/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/
>-	@${INSTALL_DATA} ${WRKSRC}/Icon/48x48/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/
>-	@${INSTALL_DATA} ${WRKSRC}/Icon/128x128/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/
>-	@${INSTALL_DATA} ${WRKSRC}/Icon/256x256/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/
>-	@${RM} -rf ${WRKSRC}/Icon/
>-	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
>-	@${CHMOD} +x ${STAGEDIR}${DATADIR}/sublime_text
>-	@${CHMOD} +x ${STAGEDIR}${DATADIR}/plugin_host
>-	@${INSTALL} ${WRKDIR}/sublime ${STAGEDIR}${PREFIX}/bin/sublime
>+	${INSTALL_DATA} ${WRKSRC}/Icon/16x16/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps/
>+	${INSTALL_DATA} ${WRKSRC}/Icon/32x32/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/
>+	${INSTALL_DATA} ${WRKSRC}/Icon/48x48/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/
>+	${INSTALL_DATA} ${WRKSRC}/Icon/128x128/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/
>+	${INSTALL_DATA} ${WRKSRC}/Icon/256x256/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/
>+	${INSTALL_DATA} ${WRKSRC}/sublime_text.desktop ${STAGEDIR}${PREFIX}/share/applications/
>+	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
>+	${CHMOD} +x ${STAGEDIR}${DATADIR}/sublime_text
>+	${CHMOD} +x ${STAGEDIR}${DATADIR}/plugin_host
>+	${INSTALL} ${WRKDIR}/sublime ${STAGEDIR}${PREFIX}/bin/sublime
> 
> .include <bsd.port.mk>
>Index: files/patch-sublime_text.desktop
>===================================================================
>--- files/patch-sublime_text.desktop	(revision 0)
>+++ files/patch-sublime_text.desktop	(working copy)
>@@ -0,0 +1,21 @@
>+--- sublime_text.desktop.orig	2014-08-27
>++++ sublime_text.desktop
>+@@ -5,5 +5,5 @@
>+ GenericName=Text Editor
>+ Comment=Sophisticated text editor for code, markup and prose
>+-Exec=/opt/sublime_text/sublime_text %F
>++Exec=sublime %F
>+ Terminal=false
>+ MimeType=text/plain;
>+@@ -13,11 +13,2 @@
>+ Actions=Window;Document;
>+ 
>+-[Desktop Action Window]
>+-Name=New Window
>+-Exec=/opt/sublime_text/sublime_text -n
>+-OnlyShowIn=Unity;
>+-
>+-[Desktop Action Document]
>+-Name=New File
>+-Exec=/opt/sublime_text/sublime_text --command new_file
>+-OnlyShowIn=Unity;
>
>Property changes on: files/patch-sublime_text.desktop
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: files/sublime.in
>===================================================================
>--- files/sublime.in	(revision 373362)
>+++ files/sublime.in	(working copy)
>@@ -1,2 +1,2 @@
> #!/compat/linux/bin/sh
>-%%DATADIR%%/sublime_text
>+%%DATADIR%%/sublime_text $*
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 373362)
>+++ pkg-plist	(working copy)
>@@ -1,9 +1,15 @@
> bin/sublime
>+share/applications/sublime_text.desktop
> share/icons/hicolor/128x128/apps/sublime-text.png
> share/icons/hicolor/16x16/apps/sublime-text.png
> share/icons/hicolor/256x256/apps/sublime-text.png
> share/icons/hicolor/32x32/apps/sublime-text.png
> share/icons/hicolor/48x48/apps/sublime-text.png
>+%%DATADIR%%/Icon/128x128/sublime-text.png
>+%%DATADIR%%/Icon/16x16/sublime-text.png
>+%%DATADIR%%/Icon/256x256/sublime-text.png
>+%%DATADIR%%/Icon/32x32/sublime-text.png
>+%%DATADIR%%/Icon/48x48/sublime-text.png
> %%DATADIR%%/Packages/ASP.sublime-package
> %%DATADIR%%/Packages/ActionScript.sublime-package
> %%DATADIR%%/Packages/AppleScript.sublime-package

Actions: View | Diff

Attachments on bug 194669: 148743 | 148945 | 149095 | 149785 | 149789 | 149794 | 149795 | 149796 | 149797 | 149800