From 70d8539119324a19d90f3b606e914bed1573facb Mon Sep 17 00:00:00 2001 From: "Arfonzo J. Coward" Date: Thu, 5 Dec 2013 08:30:36 +0000 Subject: [PATCH] - 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. --- ...1.4.x.patchset => qupzilla-1.4.x.patchset} | 25 ++++++++++++++++++- www-client/qupzilla/qupzilla-1.4.x.recipe | 7 +++--- 2 files changed, 27 insertions(+), 5 deletions(-) rename www-client/qupzilla/patches/{qupzilla_x86-1.4.x.patchset => qupzilla-1.4.x.patchset} (78%) diff --git a/www-client/qupzilla/patches/qupzilla_x86-1.4.x.patchset b/www-client/qupzilla/patches/qupzilla-1.4.x.patchset similarity index 78% rename from www-client/qupzilla/patches/qupzilla_x86-1.4.x.patchset rename to www-client/qupzilla/patches/qupzilla-1.4.x.patchset index 16a2d9922..9b9b2c806 100644 --- a/www-client/qupzilla/patches/qupzilla_x86-1.4.x.patchset +++ b/www-client/qupzilla/patches/qupzilla-1.4.x.patchset @@ -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" Date: Thu, 5 Dec 2013 00:04:04 +0000 Subject: QupZilla sources and build definitions modified for Haiku. @@ -94,3 +94,26 @@ index e6a56ea..e4ac880 100644 -- 1.8.3.4 + +From 002f7d5e1da83f0e0db8129ae05ebf805abec4fe Mon Sep 17 00:00:00 2001 +From: "Arfonzo J. Coward" +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 + diff --git a/www-client/qupzilla/qupzilla-1.4.x.recipe b/www-client/qupzilla/qupzilla-1.4.x.recipe index 132b7338f..bd64d69b3 100644 --- a/www-client/qupzilla/qupzilla-1.4.x.recipe +++ b/www-client/qupzilla/qupzilla-1.4.x.recipe @@ -12,8 +12,7 @@ DESCRIPTION=" " HOMEPAGE="http://www.qupzilla.com" -SRC_URI="git://github.com/QupZilla/qupzilla.git" -SOURCE_DIR="qupzilla" +SRC_URI="git://github.com/QupZilla/qupzilla.git#4f3aba95ff4194c9b756d196f54d50ff30161f46" REVISION="1" LICENSE="GNU GPL v3" @@ -50,12 +49,12 @@ BUILD_REQUIRES=" " PATCHES=" - qupzilla_x86-1.4.x.patchset + qupzilla-1.4.x.patchset " BUILD() { - qmake + qmake QUPZILLA_PREFIX=${appsDir}/QupZilla make $jobArgs }