mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-08 21:00:05 +02:00
gcompris, bump version (#10462)
This commit is contained in:
@@ -17,10 +17,9 @@ COPYRIGHT="2014-2016 Bruno Coudoin
|
||||
LICENSE="GNU GPL v3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://download.kde.org/stable/gcompris/qt/src/gcompris-qt-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="c1c4ea9caec44affa3587af96ac79d964439ad957d895e0f2d2f32424bee0eb6"
|
||||
CHECKSUM_SHA256="3f3d1c3b205f89ec4a1d4b075e6d7c670d852aeedbeef56ec32e15bb875a0685"
|
||||
SOURCE_DIR="gcompris-qt-$portVersion"
|
||||
ADDITIONAL_FILES="gcompris.rdef.in"
|
||||
PATCHES="gcompris-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
@@ -1,58 +0,0 @@
|
||||
From 3468d34e371be38db50839fe2bb64b1950e5d264 Mon Sep 17 00:00:00 2001
|
||||
From: Begasus <begasus@gmail.com>
|
||||
Date: Fri, 24 Nov 2023 11:23:02 +0100
|
||||
Subject: Set data path
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 7be8358..c1c00ec 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -178,6 +178,8 @@ set(GRAPHICAL_RENDERER "auto" CACHE STRING "Policy for choosing the renderer bac
|
||||
if(CMAKE_HOST_APPLE)
|
||||
set(_bundle_bin gcompris-qt.app/Contents/MacOS)
|
||||
set(_data_dest_dir bin/${_bundle_bin}/../Resources)
|
||||
+elseif(HAIKU)
|
||||
+ set(_data_dest_dir data/Qt5/${GCOMPRIS_EXECUTABLE_NAME})
|
||||
else()
|
||||
set(_data_dest_dir share/${GCOMPRIS_EXECUTABLE_NAME})
|
||||
endif()
|
||||
diff --git a/cmake/rcc.cmake b/cmake/rcc.cmake
|
||||
index 79be819..a94f4e7 100644
|
||||
--- a/cmake/rcc.cmake
|
||||
+++ b/cmake/rcc.cmake
|
||||
@@ -50,6 +50,8 @@ function(GCOMPRIS_ADD_RCC resource_path)
|
||||
|
||||
if(CMAKE_HOST_APPLE)
|
||||
install(FILES ${CREATED_RCC} DESTINATION ${GCOMPRIS_EXECUTABLE_NAME}.app/Contents/MacOS/rcc)
|
||||
+ elseif(HAIKU)
|
||||
+ install(FILES ${CREATED_RCC} DESTINATION ${_data_dest_dir}/rcc)
|
||||
else()
|
||||
install(FILES ${CREATED_RCC} DESTINATION share/${GCOMPRIS_EXECUTABLE_NAME}/rcc)
|
||||
endif()
|
||||
--
|
||||
2.43.2
|
||||
|
||||
|
||||
From 0ea576f9c29a140804a7fbe081bf415405d0d7ab Mon Sep 17 00:00:00 2001
|
||||
From: Begasus <begasus@gmail.com>
|
||||
Date: Fri, 24 Nov 2023 11:35:04 +0100
|
||||
Subject: Disable fullscreen on first launch
|
||||
|
||||
|
||||
diff --git a/src/core/main.cpp b/src/core/main.cpp
|
||||
index 0731992..ce75afe 100644
|
||||
--- a/src/core/main.cpp
|
||||
+++ b/src/core/main.cpp
|
||||
@@ -233,7 +233,7 @@ int main(int argc, char *argv[])
|
||||
ApplicationInfo::getInstance()->checkPermissions();
|
||||
|
||||
// Disable default fullscreen launch on Mac as it's a bit broken, window is behind desktop bars
|
||||
-#if defined(Q_OS_MAC)
|
||||
+#if defined(Q_OS_MAC) || defined(Q_OS_HAIKU)
|
||||
bool isFullscreen = false;
|
||||
#else
|
||||
// for other platforms, fullscreen is the default value
|
||||
--
|
||||
2.43.2
|
||||
|
||||
Reference in New Issue
Block a user