Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: haikuports/haikuports
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1a181e802731
Choose a base ref
...
head repository: haikuports/haikuports
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 086d89934d15
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Aug 10, 2021

  1. Add recipe for ConfClerk

    Conference scheduling app
    mmuman committed Aug 10, 2021
    Copy the full SHA
    086d899 View commit details
Showing with 121 additions and 0 deletions.
  1. +64 −0 app-office/confclerk/confclerk-0.7.0.recipe
  2. +57 −0 app-office/confclerk/patches/confclerk-0.7.0.patchset
64 changes: 64 additions & 0 deletions app-office/confclerk/confclerk-0.7.0.recipe
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
SUMMARY="Offline conference schedules viewer"
DESCRIPTION="ConfClerk is an application written in ​Qt, which makes \
conference schedules available offline. \
It displays the conference schedule from various views, supports \
searches on various items (speaker, speech topic, location, etc.) \
and enables you to select favorite events and create your own schedule.
At the moment ConfClerk is able to import schedules in XML format \
created by the ​PentaBarf conference management system (or ​frab) \
used by ​FOSDEM, ​DebConf, ​Grazer Linuxtage, the ​CCC congresses, \
​FrOSCon, and others."
HOMEPAGE="https://www.toastfreeware.priv.at/confclerk/"
COPYRIGHT="2010 Ixonos Plc.
2011-2021 Philipp Spitzer, gregor herrmann, Stefan Strahl"
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"
#TODO: add icon

ARCHITECTURES="!x86_gcc2 x86_64"
SECONDARY_ARCHITECTURES="x86"

commandSuffix=$secondaryArchSuffix
commandBinDir=$binDir
if [ "$targetArchitecture" = x86_gcc2 ]; then
commandSuffix=
commandBinDir=$prefix/bin
fi

PROVIDES="
confclerk${secondaryArchSuffix} = $portVersion
cmd:confclerk$commandSuffix = $portVersion
"
REQUIRES="
haiku${secondaryArchSuffix}
lib:libQt5Core$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
"

BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libQt5Core$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:qmake${secondaryArchSuffix}
cmd:g++${secondaryArchSuffix}
cmd:make
cmd:pod2man
"

BUILD()
{
qmake "PREFIX=$commandBinDir"
make $jobArgs
}

INSTALL()
{
make install

addAppDeskbarSymlink $commandBinDir/confclerk "ConfClerk"
}
57 changes: 57 additions & 0 deletions app-office/confclerk/patches/confclerk-0.7.0.patchset
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
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