Attachment 146204 Details for Bug 192954 – shar file port net-im/uTox 'USES=desktop-file-utils' fix

shar file port net-im/uTox 'USES=desktop-file-utils' fix

uTox.shar (text/plain), 11.22 KB, created by Ivan Klymenko on 2014-08-24 09:17:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Klymenko

Created: 2014-08-24 09:17:29 UTC

Size: 11.22 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	uTox
>#	uTox/pkg-plist
>#	uTox/Makefile
>#	uTox/distinfo
>#	uTox/pkg-descr
>#	uTox/files
>#	uTox/files/patch-Makefile
>#	uTox/files/nu-patch-xlib_main.c
>#
>echo c - uTox
>mkdir -p uTox > /dev/null 2>&1
>echo x - uTox/pkg-plist
>sed 's/^X//' >uTox/pkg-plist << 'd7bf2771bcc99dde7ebb3d30c66e29d2'
>X@owner root
>X@group wheel
>Xbin/utox
>Xshare/icons/hicolor/14x14/apps/utox.png
>Xshare/icons/hicolor/16x16/apps/utox.png
>Xshare/icons/hicolor/22x22/apps/utox.png
>Xshare/icons/hicolor/24x24/apps/utox.png
>Xshare/icons/hicolor/32x32/apps/utox.png
>Xshare/icons/hicolor/36x36/apps/utox.png
>Xshare/icons/hicolor/48x48/apps/utox.png
>Xshare/icons/hicolor/64x64/apps/utox.png
>Xshare/icons/hicolor/72x72/apps/utox.png
>Xshare/icons/hicolor/96x96/apps/utox.png
>Xshare/icons/hicolor/128x128/apps/utox.png
>Xshare/icons/hicolor/192x192/apps/utox.png
>Xshare/icons/hicolor/256x256/apps/utox.png
>Xshare/icons/hicolor/512x512/apps/utox.png
>Xshare/icons/hicolor/scalable/apps/utox.svg
>Xshare/applications/utox.desktop
>X@cwd /usr/local
>X@dirrmtry share/icons/hicolor/14x14/apps
>X@dirrmtry share/icons/hicolor/16x16/apps
>X@dirrmtry share/icons/hicolor/22x22/apps
>X@dirrmtry share/icons/hicolor/24x24/apps
>X@dirrmtry share/icons/hicolor/32x32/apps
>X@dirrmtry share/icons/hicolor/36x36/apps
>X@dirrmtry share/icons/hicolor/48x48/apps
>X@dirrmtry share/icons/hicolor/64x64/apps
>X@dirrmtry share/icons/hicolor/72x72/apps
>X@dirrmtry share/icons/hicolor/96x96/apps
>X@dirrmtry share/icons/hicolor/128x128/apps
>X@dirrmtry share/icons/hicolor/192x192/apps
>X@dirrmtry share/icons/hicolor/256x256/apps
>X@dirrmtry share/icons/hicolor/512x512/apps
>X@dirrmtry share/icons/hicolor/scalable/apps
>X@dirrmtry share/icons/hicolor/14x14
>X@dirrmtry share/icons/hicolor/16x16
>X@dirrmtry share/icons/hicolor/22x22
>X@dirrmtry share/icons/hicolor/24x24
>X@dirrmtry share/icons/hicolor/32x32
>X@dirrmtry share/icons/hicolor/36x36
>X@dirrmtry share/icons/hicolor/48x48
>X@dirrmtry share/icons/hicolor/64x64
>X@dirrmtry share/icons/hicolor/72x72
>X@dirrmtry share/icons/hicolor/96x96
>X@dirrmtry share/icons/hicolor/128x128
>X@dirrmtry share/icons/hicolor/192x192
>X@dirrmtry share/icons/hicolor/256x256
>X@dirrmtry share/icons/hicolor/512x512
>X@dirrmtry share/icons/hicolor/scalable
>X@dirrmtry share/icons/hicolor
>X@dirrmtry share/icons
>d7bf2771bcc99dde7ebb3d30c66e29d2
>echo x - uTox/Makefile
>sed 's/^X//' >uTox/Makefile << 'eae7d0853670060764bce60c23bfef4b'
>X# $FreeBSD: head/net-im/tox/Makefile 361088 2014-07-07 13:54:23Z tijl $
>X
>XPORTNAME=	uTox
>XPORTVERSION=	0.1.3
>XCATEGORIES=	net-im net-p2p
>X
>XMAINTAINER=	fidaj@ukr.net
>XCOMMENT=	Lightweight Tox client
>X
>XLICENSE=	GPLv3
>XLICENSE_FILE=	${WRKSRC}/LICENSE
>X
>XBUILD_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:${PORTSDIR}/net-im/tox \
>X		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
>XLIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
>X		libXft.so:${PORTSDIR}/x11-fonts/libXft
>X
>XUSE_GITHUB=	yes
>XGH_ACCOUNT=	notsecure
>XGH_PROJECT=	${PORTNAME}
>XGH_TAGNAME=	${GH_COMMIT}
>XGH_COMMIT=	c943d2e
>X
>XUSES=		desktop-file-utils gmake pkgconfig
>X
>XINSTALL_TARGET=	install
>X
>Xpost-patch:
>X	@${ECHO_CMD} "Path=~/.config/tox" >> ${WRKSRC}/utox.desktop
>X
>Xdo-install:
>X	@${SETENV} ${MAKE_ENV} DESTDIR=${STAGEDIR} PREFIX=${PREFIX} \
>X	${GMAKE} -C ${WRKSRC} ${INSTALL_TARGET}
>X
>X.include <bsd.port.mk>
>eae7d0853670060764bce60c23bfef4b
>echo x - uTox/distinfo
>sed 's/^X//' >uTox/distinfo << 'f025ab568ff47bb4ad9df64ad504ae7e'
>XSHA256 (uTox-0.1.3.tar.gz) = 039f5f5c40100fbc0a0332c8d915ba513a1d438df53c8f6e147cd7aecccf3f31
>XSIZE (uTox-0.1.3.tar.gz) = 621271
>f025ab568ff47bb4ad9df64ad504ae7e
>echo x - uTox/pkg-descr
>sed 's/^X//' >uTox/pkg-descr << '60f4bfa3809182a1501170b46bea2cef'
>XLightweight Tox (https://github.com/irungentoo/ProjectTox-Core) client.
>X
>XWWW: http://utox.org/
>60f4bfa3809182a1501170b46bea2cef
>echo c - uTox/files
>mkdir -p uTox/files > /dev/null 2>&1
>echo x - uTox/files/patch-Makefile
>sed 's/^X//' >uTox/files/patch-Makefile << '4c0adfc740ba97e08461809b8347d0be'
>X--- Makefile.orig	2014-08-21 21:59:42.000000000 +0300
>X+++ Makefile	2014-08-22 15:30:26.000000000 +0300
>X@@ -3,7 +3,7 @@
>X CFLAGS += -g -pthread -std=gnu99
>X LDFLAGS += $(shell pkg-config --libs freetype2 x11 openal)
>X LDFLAGS += $(shell pkg-config --libs dbus-1)
>X-LDFLAGS += -lX11 -lXft -lXrender -ltoxcore -ltoxav -ltoxdns -lopenal -pthread -lresolv -ldl -lm -lfontconfig -lv4lconvert -lvpx -lXext
>X+LDFLAGS += -lX11 -lXft -lXrender -ltoxcore -ltoxav -ltoxdns -lopenal -pthread -lm -lfontconfig -lv4lconvert -lvpx -lXext
>X 
>X DESTDIR?=	# empty
>X PREFIX?=	/usr/local
>X@@ -17,27 +17,43 @@
>X 	$(CC) $(CFLAGS) -o utox $(OBJ) $(LDFLAGS)
>X 
>X install: utox
>X-#	mkdir -pv $(DESTDIR)$(PREFIX)/bin
>X-	install -D -m 0755 utox $(DESTDIR)$(PREFIX)/bin/utox
>X+	mkdir -p $(DESTDIR)$(PREFIX)/bin
>X+	install -m 0755 utox $(DESTDIR)$(PREFIX)/bin/utox
>X 
>X-	install -D -m 644 icons/utox-14x14.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/14x14/apps/utox.png
>X-	install -D -m 644 icons/utox-16x16.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/utox.png
>X-	install -D -m 644 icons/utox-22x22.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps/utox.png
>X-	install -D -m 644 icons/utox-24x24.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/utox.png
>X-	install -D -m 644 icons/utox-32x32.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/utox.png
>X-	install -D -m 644 icons/utox-36x36.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/36x36/apps/utox.png
>X-	install -D -m 644 icons/utox-48x48.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/utox.png
>X-	install -D -m 644 icons/utox-64x64.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/64x64/apps/utox.png
>X-	install -D -m 644 icons/utox-72x72.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/72x72/apps/utox.png
>X-	install -D -m 644 icons/utox-96x96.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/96x96/apps/utox.png
>X-	install -D -m 644 icons/utox-128x128.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/utox.png
>X-	install -D -m 644 icons/utox-192x192.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/192x192/apps/utox.png
>X-	install -D -m 644 icons/utox-256x256.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/utox.png
>X-	install -D -m 644 icons/utox-512x512.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/512x512/apps/utox.png
>X-
>X-	install -D -m 644 icons/utox.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/utox.svg
>X-	
>X-	install -D -m 644 utox.desktop $(DESTDIR)$(PREFIX)/share/applications/utox.desktop
>X+	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/14x14/apps
>X+	install -m 644 icons/utox-14x14.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/14x14/apps/utox.png
>X+	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps
>X+	install -m 644 icons/utox-16x16.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/utox.png
>X+	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps
>X+	install -m 644 icons/utox-22x22.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps/utox.png
>X+	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps
>X+	install -m 644 icons/utox-24x24.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/utox.png
>X+	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps
>X+	install -m 644 icons/utox-32x32.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/utox.png
>X+	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/36x36/apps
>X+	install -m 644 icons/utox-36x36.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/36x36/apps/utox.png
>X+	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps
>X+	install -m 644 icons/utox-48x48.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/utox.png
>X+	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/64x64/apps
>X+	install -m 644 icons/utox-64x64.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/64x64/apps/utox.png
>X+	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/72x72/apps
>X+	install -m 644 icons/utox-72x72.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/72x72/apps/utox.png
>X+	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/96x96/apps
>X+	install -m 644 icons/utox-96x96.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/96x96/apps/utox.png
>X+	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps
>X+	install -m 644 icons/utox-128x128.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/utox.png
>X+	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/192x192/apps
>X+	install -m 644 icons/utox-192x192.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/192x192/apps/utox.png
>X+	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps
>X+	install -m 644 icons/utox-256x256.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/utox.png
>X+	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/512x512/apps
>X+	install -m 644 icons/utox-512x512.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/512x512/apps/utox.png
>X+
>X+	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps
>X+	install -m 644 icons/utox.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/utox.svg
>X+
>X+	mkdir -p $(DESTDIR)$(PREFIX)/share/applications
>X+	install -m 644 utox.desktop $(DESTDIR)$(PREFIX)/share/applications/utox.desktop
>X 
>X main.o: xlib/main.c xlib/keysym2ucs.c
>X 
>4c0adfc740ba97e08461809b8347d0be
>echo x - uTox/files/nu-patch-xlib_main.c
>sed 's/^X//' >uTox/files/nu-patch-xlib_main.c << '457b59cb4c0a1e66b91834a7a462d655'
>X--- xlib/main.c.orig	2014-08-18 03:53:35.000000000 +0300
>X+++ xlib/main.c	2014-08-18 14:36:18.000000000 +0300
>X@@ -656,10 +656,12 @@
>X {
>X     char *home = getenv("HOME");
>X     char path[256];
>X+    char path_save[256];
>X     sprintf(path, "%.230s/.config/tox/data", home);
>X+    sprintf(path_save, "%.230s/.config/uTox/tox_save", home);
>X 
>X     void *data;
>X-    if((data = file_raw("tox_save", len))) {
>X+    if((data = file_raw(path_save, len))) {
>X         return data;
>X     }
>X 
>X@@ -670,10 +672,15 @@
>X {
>X     char *home = getenv("HOME");
>X     char path[256];
>X+    char path_save[256];
>X     int l = sprintf(path, "%.230s/.config/tox/data", home);
>X     path[l - 5] = 0;
>X     mkdir(path, 0700);
>X     path[l - 5] = '/';
>X+    l = sprintf(path_save, "%.230s/.config/uTox/tox_save", home);
>X+    path_save[l - 9] = 0;
>X+    mkdir(path_save, 0700);
>X+    path_save[l - 9] = '/';
>X 
>X     FILE *file;
>X     /*file = fopen(path, "wb");
>X@@ -682,7 +689,7 @@
>X         fclose(file);
>X     }*/
>X 
>X-    file = fopen("tox_save", "wb");
>X+    file = fopen(path_save, "wb");
>X     if(file) {
>X         fwrite(data, len, 1, file);
>X         fclose(file);
>X@@ -759,7 +766,11 @@
>X 
>X static UTOX_SAVE* loadconfig(void)
>X {
>X-    UTOX_SAVE *r = file_text("utox_save");
>X+    char *home = getenv("HOME");
>X+    char path_save[256];
>X+    sprintf(path_save, "%.230s/.config/uTox/utox_save", home);
>X+
>X+    UTOX_SAVE *r = file_text(path_save);
>X     if(r) {
>X         if(r->version == 1) {
>X             return r;
>X@@ -1040,7 +1051,12 @@
>X         .proxy_port = options.proxy_port,
>X     };
>X 
>X-    FILE *file = fopen("utox_save", "wb");
>X+    char *home = getenv("HOME");
>X+    char path_save[256];
>X+    sprintf(path_save, "%.230s/.config/uTox/utox_save", home);
>X+
>X+
>X+    FILE *file = fopen(path_save, "wb");
>X     if(file) {
>X         fwrite(&d, sizeof(d), 1, file);
>X         fwrite(options.proxy_address, strlen(options.proxy_address), 1, file);
>457b59cb4c0a1e66b91834a7a462d655
>exit
>

Actions: View

Attachments on bug 192954: 146202 | 146204 | 146205 | 146206 | 146225 | 146400 | 146404 | 146440