Attachment #159170 for bug #201835

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

Lines 18-25 Link Here

(-)www/qupzilla-qt4/Makefile (-1 / +3 lines)
18		18
19	USES= desktop-file-utils execinfo pkgconfig qmake tar:xz	19	USES= desktop-file-utils execinfo pkgconfig qmake tar:xz
20	USE_QT4= corelib gui network script sql webkit xml \	20	USE_QT4= corelib gui network script sql webkit xml \
21	linguist_build moc_build rcc_build uic_build \	21	linguisttools_build moc_build rcc_build uic_build \
22	imageformats_run sql-sqlite3_run	22	imageformats_run sql-sqlite3_run
		23	USE_XORG= x11
		24	USE_OPENSSL= yes
23	CONFIGURE_ENV= QUPZILLA_PREFIX=${PREFIX}/	25	CONFIGURE_ENV= QUPZILLA_PREFIX=${PREFIX}/
24	USE_LDCONFIG= yes	26	USE_LDCONFIG= yes
25	INSTALLS_ICONS= yes	27	INSTALLS_ICONS= yes

Lines 1-5 Link Here

(-)www/qupzilla-qt4/files/patch-src__lib__3rdparty__processinfo.h (-4 / +4 lines)
1	--- src/lib/3rdparty/processinfo.h.orig 2014-09-26 12:35:35.000000000 +0400	1	--- src/lib/3rdparty/processinfo.h.orig 2015-01-26 14:26:15 UTC
2	+++ src/lib/3rdparty/processinfo.h 2014-09-26 23:04:10.000000000 +0400	2	+++ src/lib/3rdparty/processinfo.h
3	@@ -18,16 +18,12 @@	3	@@ -18,16 +18,12 @@
4	#ifndef PROCESSINFO_H	4	#ifndef PROCESSINFO_H
5	#define PROCESSINFO_H	5	#define PROCESSINFO_H
Lines 6-12 Link Here
6		6
7	-#include <QtGlobal>	7	-#include <QtGlobal>
8	+#include "qzcommon.h"	8	+#include "qzcommon.h"
9		9
10	#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)	10	#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
11	#include <sys/types.h>	11	#include <sys/types.h>
12	#endif	12	#endif
Lines 17-20 Link Here
17	-	17	-
18	/*	18	/*
19	* Code used from http://ubuntuforums.org/showpost.php?p=6593782&postcount=5	19	* Code used from http://ubuntuforums.org/showpost.php?p=6593782&postcount=5
20	* written by user WitchCraft	20	* written by user WitchCraft

Lines 20-25 Link Here

(-)www/qupzilla-qt5/Makefile (+2 lines)
20	USE_QT5= core concurrent gui network script webkit xml \	20	USE_QT5= core concurrent gui network script webkit xml \
21	buildtools_build linguisttools_build \	21	buildtools_build linguisttools_build \
22	imageformats_run sql-sqlite3_run	22	imageformats_run sql-sqlite3_run
		23	USE_XORG= x11
		24	USE_OPENSSL= yes
23	CONFIGURE_ENV= QUPZILLA_PREFIX=${PREFIX}/	25	CONFIGURE_ENV= QUPZILLA_PREFIX=${PREFIX}/
24	USE_LDCONFIG= yes	26	USE_LDCONFIG= yes
25	INSTALLS_ICONS= yes	27	INSTALLS_ICONS= yes

Lines 1-5 Link Here

(-)www/qupzilla-qt5/files/patch-src__lib__3rdparty__processinfo.h (-4 / +4 lines)
1	--- src/lib/3rdparty/processinfo.h.orig 2014-09-26 12:35:35.000000000 +0400	1	--- src/lib/3rdparty/processinfo.h.orig 2015-01-26 14:26:15 UTC
2	+++ src/lib/3rdparty/processinfo.h 2014-09-26 23:04:10.000000000 +0400	2	+++ src/lib/3rdparty/processinfo.h
3	@@ -18,16 +18,12 @@	3	@@ -18,16 +18,12 @@
4	#ifndef PROCESSINFO_H	4	#ifndef PROCESSINFO_H
5	#define PROCESSINFO_H	5	#define PROCESSINFO_H
Lines 6-12 Link Here
6		6
7	-#include <QtGlobal>	7	-#include <QtGlobal>
8	+#include "qzcommon.h"	8	+#include "qzcommon.h"
9		9
10	#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)	10	#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
11	#include <sys/types.h>	11	#include <sys/types.h>
12	#endif	12	#endif
Lines 17-20 Link Here
17	-	17	-
18	/*	18	/*
19	* Code used from http://ubuntuforums.org/showpost.php?p=6593782&postcount=5	19	* Code used from http://ubuntuforums.org/showpost.php?p=6593782&postcount=5
20	* written by user WitchCraft	20	* written by user WitchCraft

Return to bug 201835