haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

KTechLab: bump git revision

Browse Source
This commit is contained in:
Gerasim Troeglazov
2020-04-20 21:18:39 +10:00
parent 13eeb140eb
commit c28fc3ced0
2 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sci-electronics/ktechlab/ktechlab-0.50.0~git.recipe
View File

@@ -4,12 +4,12 @@ It supports circuit simulation,
program development for microcontrollers and
simulating the programmed microcontroller together with its application circuit."
HOMEPAGE="https://userbase.kde.org/KTechlab"
COPYRIGHT="2003-2019, The KTechLab developers"
COPYRIGHT="2003-2020, The KTechLab developers"
LICENSE="GNU GPL v2"
REVISION="3"
srcGitRev="d509608302052ddf75d09dab4e18dd9d48facbfa"
REVISION="4"
srcGitRev="ddf3379f1b2b4d32539f9a65a1fe62b7dce5fdad"
SOURCE_URI="https://github.com/KDE/ktechlab/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="03ffe2999d6dc85e0e88c4ce60179ca259b8e9b64b0568f6e19fd774fbea4309"
CHECKSUM_SHA256="1a73f253b8c6980b4918f1d119f6b568e044c343b5b4bc3f2f902d093c853e5d"
SOURCE_DIR="ktechlab-$srcGitRev"
PATCHES="ktechlab-$portVersion.patchset"
ADDITIONAL_FILES="
@@ -78,7 +78,7 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
extra_cmake_modules$secondaryArchSuffix >= 5.55
extra_cmake_modules$secondaryArchSuffix >= 5.65
devel:libkdeinit5_kded5$secondaryArchSuffix
devel:libkdeinit5_klauncher$secondaryArchSuffix
devel:libKF5Archive$secondaryArchSuffix
@@ -119,7 +119,7 @@ BUILD_REQUIRES="
devel:libKF5WidgetsAddons$secondaryArchSuffix
devel:libKF5WindowSystem$secondaryArchSuffix
devel:libKF5XmlGui$secondaryArchSuffix
devel:libQt5Core$secondaryArchSuffix >= 5.13
devel:libQt5Core$secondaryArchSuffix >= 5.14
"
BUILD_PREREQUIRES="
cmd:cmake

56
sci-electronics/ktechlab/patches/ktechlab-0.50.0~git.patchset
View File

@@ -1,23 +1,23 @@
From 91397ed3ae0efebfd2b8006cd3effef57f2c4e92 Mon Sep 17 00:00:00 2001
From 3acf13a651b48c38872e9dced5482e5eb3df2840 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 15 Aug 2019 20:00:02 +1000
Subject: Fix build for Haiku
Date: Mon, 20 Apr 2020 20:53:54 +1000
Subject: Fix for Haiku
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 693c09f..6b5bf0f 100644
index 437f58f..77346ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,7 +55,7 @@ find_package(KF5 REQUIRED COMPONENTS
@@ -50,7 +50,7 @@ find_package(KF5 REQUIRED COMPONENTS
# include(MacroPushRequiredVars) -> include(CMakePushCheckState)
# macro_push_required_vars() -> cmake_push_check_state()
# macro_pop_required_vars() -> cmake_pop_check_state()
-find_package(GPSim REQUIRED)
+find_package(GPSim)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
@@ -72,7 +72,7 @@ add_definitions(-fPIC)
add_definitions(-Wno-deprecated-declarations) # TODO too much spam for now
add_definitions(-fPIC)
@@ -60,7 +60,7 @@ add_definitions(-fPIC)
if (KTECHLAB_DEVELOPER_BUILD)
# for debugging with GCC 5
add_definitions( -fno-omit-frame-pointer )
@@ -26,38 +26,39 @@ index 693c09f..6b5bf0f 100644
#set(SANITIZE_FLAGS " -fsanitize=undefined -fno-omit-frame-pointer ") # undefined
#set(SANITIZE_FLAGS "") # disabled
@@ -147,7 +147,7 @@ add_subdirectory( src )
@@ -124,7 +124,7 @@ add_subdirectory( src )
add_subdirectory( examples )
add_subdirectory( icons )
add_subdirectory( icons-kde3 )
-add_subdirectory( doc )
+#add_subdirectory( doc )
add_subdirectory(tests)
if(BUILD_TESTING)
add_subdirectory(tests)
diff --git a/microbe/CMakeLists.txt b/microbe/CMakeLists.txt
index 82dce56..8530915 100644
index eadfe5c..b8ab80d 100644
--- a/microbe/CMakeLists.txt
+++ b/microbe/CMakeLists.txt
@@ -19,7 +19,6 @@ add_executable(microbe ${microbe_SRCS})
target_link_libraries(microbe
KF5::KDELibs4Support
@@ -18,8 +18,6 @@ target_link_libraries(microbe
KF5::CoreAddons
KF5::I18n
- Qt5::Core
-
- pthread)
+ Qt5::Core)
install(TARGETS microbe ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/src/electronics/port.cpp b/src/electronics/port.cpp
index cc3d3b5..5bd7fa6 100644
index 6d93938..a2a6463 100644
--- a/src/electronics/port.cpp
+++ b/src/electronics/port.cpp
@@ -22,7 +22,7 @@
#include <sys/ioctl.h>
#include <unistd.h>
-#ifndef DARWIN
+#if !defined(DARWIN) && !defined(__HAIKU__)
-#if !defined(DARWIN) && !defined(__FreeBSD__)
+#if !defined(DARWIN) && !defined(__FreeBSD__) && !defined(__HAIKU__)
#include <linux/ppdev.h>
#endif
@@ -65,29 +66,32 @@ index cc3d3b5..5bd7fa6 100644
QStringList Port::ports( unsigned probeResult )
{
-#ifndef DARWIN
+#if !defined(DARWIN) && !defined(__HAIKU__)
-#if !defined(DARWIN) && !defined(__FreeBSD__)
+#if !defined(DARWIN) && !defined(__FreeBSD__) && !defined(__HAIKU__)
return SerialPort::ports(probeResult) + ParallelPort::ports(probeResult);
#else
return SerialPort::ports(probeResult);
@@ -120,7 +120,7 @@ bool SerialPort::pinState( Pin pin )
@@ -120,7 +120,11 @@ bool SerialPort::pinState( Pin pin )
break;
case RD:
- mask = TIOCM_SR;
+#ifdef __HAIKU__
+ mask = TIOCM_DSR;
+#else
mask = TIOCM_SR;
+#endif
break;
case CTS:
@@ -264,7 +264,7 @@ const int INPUT_MODE_BIT = 1 << 21; // Controls if the data pins are input or ou
@@ -264,7 +268,7 @@ const int INPUT_MODE_BIT = 1 << 21; // Controls if the data pins are input or ou
// No code using these values will be reached on Darwin, this is just to
// keep the preprocessor happy.
-#ifdef DARWIN
+#if defined(DARWIN) || defined(__HAIKU__)
-#if defined(DARWIN) || defined(__FreeBSD__)
+#if defined(DARWIN) || defined(__FreeBSD__) || defined(__HAIKU__)
#define PPRDATA 0xFACADE
#define PPRCONTROL 0xC001D00D
#define PPWDATA 0xC0EDBABE
--
2.21.0
2.26.0