mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-04 22:18:55 +02:00
- Renamed patch set to remove '_x86' from filename.
- Modified recipe to use prefix of $appsDir at qmake rather than hardcoded path in defines.pri. - Use commit hashtag to reference a specific version from git repo.
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
From 8cd9ec3eb620f08d9ea0de439b80f45d2e9a8cdc Mon Sep 17 00:00:00 2001
|
From 49c386fa4bd03dfe7e102c1d0635743d966b75b7 Mon Sep 17 00:00:00 2001
|
||||||
From: "Arfonzo J. Coward" <art@poorcoding.com>
|
From: "Arfonzo J. Coward" <art@poorcoding.com>
|
||||||
Date: Thu, 5 Dec 2013 00:04:04 +0000
|
Date: Thu, 5 Dec 2013 00:04:04 +0000
|
||||||
Subject: QupZilla sources and build definitions modified for Haiku.
|
Subject: QupZilla sources and build definitions modified for Haiku.
|
||||||
@@ -94,3 +94,26 @@ index e6a56ea..e4ac880 100644
|
|||||||
--
|
--
|
||||||
1.8.3.4
|
1.8.3.4
|
||||||
|
|
||||||
|
|
||||||
|
From 002f7d5e1da83f0e0db8129ae05ebf805abec4fe Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Arfonzo J. Coward" <art@poorcoding.com>
|
||||||
|
Date: Thu, 5 Dec 2013 08:00:47 +0000
|
||||||
|
Subject: Remove QUPZILLA_PREFIX definition. We set thisbuild time instead.
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/defines.pri b/src/defines.pri
|
||||||
|
index 7c33ba5..96093af 100644
|
||||||
|
--- a/src/defines.pri
|
||||||
|
+++ b/src/defines.pri
|
||||||
|
@@ -19,8 +19,6 @@ win32-msvc* {
|
||||||
|
LIBS += User32.lib Ole32.lib Shell32.lib ShlWapi.lib Gdi32.lib ComCtl32.lib
|
||||||
|
}
|
||||||
|
|
||||||
|
-#DEFINES *= QUPZILLA_PREFIX="`finddir B_USER_APPS_DIRECTORY`/QupZilla/"
|
||||||
|
-DEFINES *= QUPZILLA_PREFIX="/boot/home/config/apps/QupZilla/"
|
||||||
|
DEFINES *= DISABLE_DBUS
|
||||||
|
DEFINES *= NO_SYSTEM_DATAPATH
|
||||||
|
DEFINES *= NO_X11
|
||||||
|
--
|
||||||
|
1.8.3.4
|
||||||
|
|
||||||
@@ -12,8 +12,7 @@ DESCRIPTION="
|
|||||||
"
|
"
|
||||||
HOMEPAGE="http://www.qupzilla.com"
|
HOMEPAGE="http://www.qupzilla.com"
|
||||||
|
|
||||||
SRC_URI="git://github.com/QupZilla/qupzilla.git"
|
SRC_URI="git://github.com/QupZilla/qupzilla.git#4f3aba95ff4194c9b756d196f54d50ff30161f46"
|
||||||
SOURCE_DIR="qupzilla"
|
|
||||||
|
|
||||||
REVISION="1"
|
REVISION="1"
|
||||||
LICENSE="GNU GPL v3"
|
LICENSE="GNU GPL v3"
|
||||||
@@ -50,12 +49,12 @@ BUILD_REQUIRES="
|
|||||||
"
|
"
|
||||||
|
|
||||||
PATCHES="
|
PATCHES="
|
||||||
qupzilla_x86-1.4.x.patchset
|
qupzilla-1.4.x.patchset
|
||||||
"
|
"
|
||||||
|
|
||||||
BUILD()
|
BUILD()
|
||||||
{
|
{
|
||||||
qmake
|
qmake QUPZILLA_PREFIX=${appsDir}/QupZilla
|
||||||
make $jobArgs
|
make $jobArgs
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user