haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-03-19 01:46:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: fix build (#7456)

Browse Source 
Co-authored-by: OscarL <oscar.lesta@gmail.com>

Co-authored-by: OscarL <oscar.lesta@gmail.com>
This commit is contained in:
Máximo Castañeda
2022-11-24 07:29:20 +01:00
committed by GitHub
parent 64331a19fe
commit b410bcb0b4
2 changed files with 55 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
haiku-apps/calendar/calendar-0.1.recipe
View File

@@ -15,29 +15,31 @@ HOMEPAGE="https://github.com/HaikuArchives/Calendar"
COPYRIGHT="2017 Akshay Agarwal
2017-2021 HaikuArchives Team"
LICENSE="MIT"
REVISION="2"
REVISION="3"
SOURCE_URI="$HOMEPAGE/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="c3d42cbd4554dda4e65cd5d8bb234ccfa2659cf5405046049d8528d3f86165ee"
SOURCE_DIR="Calendar-$portVersion"
PATCHES="calendar-$portVersion.patchset"
ARCHITECTURES="all"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
calendar = $portVersion
calendar$secondaryArchSuffix = $portVersion
app:Calendar = $portVersion
"
REQUIRES="
haiku
lib:libsqlite3
haiku$secondaryArchSuffix
lib:libsqlite3$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku_devel
devel:libsqlite3
haiku${secondaryArchSuffix}_devel
devel:libsqlite3$secondaryArchSuffix
"
BUILD_PREREQUIRES="
makefile_engine
cmd:g++
cmd:g++$secondaryArchSuffix
cmd:make
"

45
haiku-apps/calendar/patches/calendar-0.1.patchset Normal file
View File

@@ -0,0 +1,45 @@
From 5d0936ff668936d72298ca026b7d57efb50c6e7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= <antiswen@yahoo.es>
Date: Sun, 20 Nov 2022 17:16:49 +0100
Subject: Fix build after change in BBitmap API
diff --git a/src/utils/ResourceLoader.cpp b/src/utils/ResourceLoader.cpp
index 1fa2741..82992d4 100644
--- a/src/utils/ResourceLoader.cpp
+++ b/src/utils/ResourceLoader.cpp
@@ -27,7 +27,7 @@ BBitmap* LoadVectorIcon(const char* name, int32 iconSize, int32 cropSize)
&& BIconUtils::GetVectorIcon((uint8*)data, length, temp)
== B_OK
&& dest->ImportBits(temp, BPoint(0, 0), BPoint(0, 0),
- cropSize, cropSize) == B_OK) {
+ BSize(cropSize, cropSize)) == B_OK) {
delete temp;
return dest;
}
--
2.37.3
From 9ef934db4a108a0135b450fbec406e21887acdd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= <antiswen@yahoo.es>
Date: Sun, 20 Nov 2022 17:17:45 +0100
Subject: Change libraries order
diff --git a/Makefile b/Makefile
index 385162b..ccc67ce 100644
--- a/Makefile
+++ b/Makefile
@@ -89,7 +89,7 @@ RSRCS = \
# - if your library does not follow the standard library naming scheme,
# you need to specify the path to the library and it's name.
# (e.g. for mylib.a, specify "mylib.a" or "path/mylib.a")
-LIBS = be tracker shared localestub sqlite3 bnetapi network netservices $(STDCPPLIBS)
+LIBS = be netservices shared tracker localestub sqlite3 bnetapi network $(STDCPPLIBS)
# Specify additional paths to directories following the standard libXXX.so
# or libXXX.a naming scheme. You can specify full paths or paths relative
--
2.37.3