mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
7cbc043a41
* Add files via upload * Update ldmicroqt-2.3.2.recipe name fix * fix some suggestion from PR, don't use -fPIE --------- Co-authored-by: Begasus <begasus@gmail.com>
98 lines
2.5 KiB
Plaintext
98 lines
2.5 KiB
Plaintext
From 0d5aa654507e5bfb068b14c31bd82f08c8303fa2 Mon Sep 17 00:00:00 2001
|
|
From: mazbrili <mazbrili@yahoo.com>
|
|
Date: Sat, 13 Nov 2021 12:42:43 +0000
|
|
Subject: update from 3deyes work
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 58910f1..c2859b4 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -39,6 +39,7 @@ IF(UNIX)
|
|
execute_process(COMMAND lsb_release -cs
|
|
OUTPUT_VARIABLE RELEASE_CODENAME
|
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
+IF (NOT HAIKU)
|
|
STRING(TOLOWER ${RELEASE_CODENAME} RELEASE_LOWER)
|
|
message("-- os_version_suffix:${RELEASE_CODENAME}")
|
|
if(${RELEASE_LOWER} MATCHES "trusty")
|
|
@@ -48,6 +49,7 @@ IF(UNIX)
|
|
MESSAGE("Add flag to compile for Ubuntu 16 and above")
|
|
add_definitions(-D__UBUNTU_16_)
|
|
endif()
|
|
+ENDIF ()
|
|
use_cxx14()
|
|
|
|
# set_property(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_SOURCE_DIR}/build/")
|
|
diff --git a/lib/linuxUI/linuxLD.h b/lib/linuxUI/linuxLD.h
|
|
index 1254387..5e78b77 100644
|
|
--- a/lib/linuxUI/linuxLD.h
|
|
+++ b/lib/linuxUI/linuxLD.h
|
|
@@ -88,8 +88,10 @@ typedef unsigned int UINT_PTR;
|
|
|
|
typedef UINT_PTR WPARAM;
|
|
|
|
-#if defined(__UNIX64)
|
|
- typedef __int64_t LONG_PTR;
|
|
+#if defined(__UNIX64) && !defined(__HAIKU__)
|
|
+ typedef __int64_t LONG_PTR;
|
|
+#elif defined(__HAIKU__)
|
|
+ typedef int64_t LONG_PTR;
|
|
#else
|
|
typedef long LONG_PTR;
|
|
#endif
|
|
@@ -218,4 +220,4 @@ double GetTickCount(void);
|
|
|
|
size_t max(size_t A, size_t B);
|
|
|
|
-#endif
|
|
\ No newline at end of file
|
|
+#endif
|
|
diff --git a/lib/linuxUI/linuxUI.h b/lib/linuxUI/linuxUI.h
|
|
index 356dca6..2a801f1 100644
|
|
--- a/lib/linuxUI/linuxUI.h
|
|
+++ b/lib/linuxUI/linuxUI.h
|
|
@@ -30,7 +30,9 @@
|
|
// #include <QSize>
|
|
// #include "freezeLD.h"
|
|
// #include "linuxLD.h"
|
|
+#ifndef __HAIKU__
|
|
#include <linux/limits.h>
|
|
+#endif
|
|
#include <stdio.h>
|
|
#include <inttypes.h>
|
|
#include <string.h>
|
|
@@ -319,4 +321,4 @@ signals:
|
|
public slots:
|
|
};
|
|
|
|
-#endif
|
|
\ No newline at end of file
|
|
+#endif
|
|
--
|
|
2.37.3
|
|
|
|
|
|
From 83caa81645289ed2b32bc5af7cbe5a55025ff3ef Mon Sep 17 00:00:00 2001
|
|
From: Begasus <begasus@gmail.com>
|
|
Date: Wed, 12 Jul 2023 08:30:44 +0000
|
|
Subject: Do not enable -fPIE
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index c2859b4..ea62352 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -126,7 +126,7 @@ ENDIF ()
|
|
MESSAGE ( STATUS " Qt CXX FLAGS: " ${CMAKE_CXX_FLAGS} )
|
|
|
|
if (Qt5_POSITION_INDEPENDENT_CODE)
|
|
- SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
|
+ SET(CMAKE_POSITION_INDEPENDENT_CODE OFF)
|
|
endif()
|
|
|
|
add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/lib/linuxUI")
|
|
--
|
|
2.37.3
|
|
|