mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 11:40:06 +02:00
confclerk: bump version
Patch has been merged so we can drop it.
This commit is contained in:
@@ -15,8 +15,7 @@ COPYRIGHT="2010 Ixonos Plc.
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="6bd10722d12971dc30c633a9884af788bfb1468fcb6d5dca12b886880b339c86"
|
||||
PATCHES="confclerk-$portVersion.patchset"
|
||||
CHECKSUM_SHA256="2f2b46f7856c03a74c02ea5d9e2bf82d6c14490f44c3f89f9900564f4d23b150"
|
||||
#TODO: add icon
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 x86_64"
|
||||
@@ -1,57 +0,0 @@
|
||||
From 578771947bcb024e3e1e499bf4a0e89b821869d5 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
|
||||
Date: Tue, 10 Aug 2021 16:20:25 +0200
|
||||
Subject: [PATCH 1/2] Fallback to uname -o for systems without /etc/issue
|
||||
|
||||
This includes Haiku.
|
||||
|
||||
Not necessary to build but it removes an error message.
|
||||
---
|
||||
src/global.pri | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/global.pri b/src/global.pri
|
||||
index 4deccb0..bebbbb4 100644
|
||||
--- a/src/global.pri
|
||||
+++ b/src/global.pri
|
||||
@@ -9,7 +9,7 @@ DEFINES += VERSION=\\\"$$VERSION\\\"
|
||||
|
||||
# Define 'MAEMO' specific CONFIG/DEFINE
|
||||
# To handle 'MAEMO' specific soruces/code
|
||||
-DISTRO = $$system(cat /etc/issue)
|
||||
+DISTRO = $$system(cat /etc/issue 2>/dev/null || uname -o)
|
||||
contains( DISTRO, [Mm]aemo ) {
|
||||
# for 'MAEMO' specific source code parts
|
||||
DEFINES += MAEMO
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
||||
From daef302a835b76fba77d3381fe0d6e3234a6dcd2 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
|
||||
Date: Tue, 10 Aug 2021 16:54:35 +0200
|
||||
Subject: [PATCH 2/2] Allow overriding PREFIX
|
||||
|
||||
Haiku requires a different install path.
|
||||
---
|
||||
src/app/app.pro | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/app/app.pro b/src/app/app.pro
|
||||
index 37f4f48..b268734 100644
|
||||
--- a/src/app/app.pro
|
||||
+++ b/src/app/app.pro
|
||||
@@ -32,7 +32,9 @@ RESOURCES += ../icons.qrc \
|
||||
../../data/data.qrc
|
||||
|
||||
# instalation related
|
||||
-PREFIX = /usr/bin
|
||||
+!defined(PREFIX, var) {
|
||||
+ PREFIX = /usr/bin
|
||||
+}
|
||||
INSTALLS = target
|
||||
target.path = $$PREFIX
|
||||
|
||||
--
|
||||
2.30.2
|
||||
|
||||
Reference in New Issue
Block a user