Attachment #187423 for bug #223211

View | Details | Raw Unified | Return to bug 223211
Collapse All | Expand All

Lines 2-9 Link Here

(-)Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libqtxdg	4	PORTNAME= libqtxdg
5	PORTVERSION= 2.0.0	5	PORTVERSION= 3.1.0
6	PORTREVISION= 3
7	CATEGORIES= devel	6	CATEGORIES= devel
8	MASTER_SITES= LXQT/${PORTNAME}	7	MASTER_SITES= LXQT/${PORTNAME}
9		8

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1474119308	1	TIMESTAMP = 1508752041
2	SHA256 (lxqt/libqtxdg-2.0.0.tar.xz) = 8c89ebaa3c0ee946f9048828e064c1c510c5639779a7688ed0b240307645dbcb	2	SHA256 (lxqt/libqtxdg-3.1.0.tar.xz) = 0ee1a4684b782e34950c55dc06df1b4ef2dc3d9b3562a512de004191c18a2e08
3	SIZE (lxqt/libqtxdg-2.0.0.tar.xz) = 62404	3	SIZE (lxqt/libqtxdg-3.1.0.tar.xz) = 66680




--- qtxdg/xdgdirs.cpp.orig	2016-09-17 12:06:08 UTC
+++ qtxdg/xdgdirs.cpp
@@ -178,9 +178,11 @@ bool XdgDirs::setUserDir(XdgDirs::UserDi
     if (dir < XdgDirs::Desktop || dir > XdgDirs::Videos)
         return false;
 
+    const QString home = QFile::decodeName(qgetenv("HOME"));
     if (!(value.startsWith(QLatin1String("$HOME"))
                            || value.startsWith(QLatin1String("~/"))
-                           || value.startsWith(QFile::decodeName(qgetenv("HOME")))))
+                           || value.startsWith(home)
+                           || value.startsWith(QDir(home).canonicalPath())))
         return false;
 
     QString folderName = userDirectoryString[dir];
yes
native
text/plain

Lines 1-3 Link Here

(-)pkg-descr (-1 / +1 lines)
1	libqtxdg is an Qt implementation of freedesktop.org xdg specifications.	1	libqtxdg is an Qt implementation of freedesktop.org xdg specifications.
2		2
3	WWW: http://lxqt.org/	3	WWW: https://github.com/lxde/libqtxdg




include/qt5xdgiconloader/%%VERSION%%/private/xdgiconloader/xdgiconloader_p.h
include/qt5xdgiconloader/xdgiconloader_export.h
lib/libQt5Xdg.so
lib/libQt5Xdg.so.3
lib/libQt5Xdg.so.%%VERSION%%
lib/libQt5XdgIconLoader.so
lib/libQt5XdgIconLoader.so.3
lib/libQt5XdgIconLoader.so.%%VERSION%%
%%QT_PLUGINDIR%%/iconengines/libQt5XdgIconPlugin.so
libdata/pkgconfig/Qt5Xdg.pc
libdata/pkgconfig/Qt5XdgIconLoader.pc
share/cmake/qt5xdg/qt5xdg-config-version.cmake

Return to bug 223211

Lines 1-15 Link Here

(-)files/patch-qtxdg_xdgdirs.cpp (-18 lines)
1	--- qtxdg/xdgdirs.cpp.orig 2016-09-17 12:06:08 UTC
2	+++ qtxdg/xdgdirs.cpp
3	@@ -178,9 +178,11 @@ bool XdgDirs::setUserDir(XdgDirs::UserDi
4	if (dir < XdgDirs::Desktop \|\| dir > XdgDirs::Videos)
5	return false;
6
7	+ const QString home = QFile::decodeName(qgetenv("HOME"));
8	if (!(value.startsWith(QLatin1String("$HOME"))
9	\|\| value.startsWith(QLatin1String("~/"))
10	- \|\| value.startsWith(QFile::decodeName(qgetenv("HOME")))))
11	+ \|\| value.startsWith(home)
12	+ \|\| value.startsWith(QDir(home).canonicalPath())))
13	return false;
14
15	QString folderName = userDirectoryString[dir];
16	yes
17	native
18	text/plain

Lines 20-30 Link Here

(-)pkg-plist (-2 / +3 lines)
20	include/qt5xdgiconloader/%%VERSION%%/private/xdgiconloader/xdgiconloader_p.h	20	include/qt5xdgiconloader/%%VERSION%%/private/xdgiconloader/xdgiconloader_p.h
21	include/qt5xdgiconloader/xdgiconloader_export.h	21	include/qt5xdgiconloader/xdgiconloader_export.h
22	lib/libQt5Xdg.so	22	lib/libQt5Xdg.so
23	lib/libQt5Xdg.so.2	23	lib/libQt5Xdg.so.3
24	lib/libQt5Xdg.so.%%VERSION%%	24	lib/libQt5Xdg.so.%%VERSION%%
25	lib/libQt5XdgIconLoader.so	25	lib/libQt5XdgIconLoader.so
26	lib/libQt5XdgIconLoader.so.2	26	lib/libQt5XdgIconLoader.so.3
27	lib/libQt5XdgIconLoader.so.%%VERSION%%	27	lib/libQt5XdgIconLoader.so.%%VERSION%%
		28	%%QT_PLUGINDIR%%/iconengines/libQt5XdgIconPlugin.so
28	libdata/pkgconfig/Qt5Xdg.pc	29	libdata/pkgconfig/Qt5Xdg.pc
29	libdata/pkgconfig/Qt5XdgIconLoader.pc	30	libdata/pkgconfig/Qt5XdgIconLoader.pc
30	share/cmake/qt5xdg/qt5xdg-config-version.cmake	31	share/cmake/qt5xdg/qt5xdg-config-version.cmake