mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
Umbrello: fix start
This commit is contained in:
@@ -1,14 +1,14 @@
|
||||
From d34c741419c7c7074b134b3f1eea4fb59f4328ab Mon Sep 17 00:00:00 2001
|
||||
From 91a5bfbac4944346ed7bcf34295e928932a62257 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sat, 17 Aug 2019 17:12:45 +1000
|
||||
Subject: Fix build for Haiku
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 158bbfe..c366c1c 100644
|
||||
index 4ee5f56..7adfd9c 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -135,7 +135,7 @@ if(NOT BUILD_KF5)
|
||||
@@ -159,7 +159,7 @@ if(NOT BUILD_KF5)
|
||||
macro_display_feature_log()
|
||||
KDE4_NO_ENABLE_FINAL(umbrello)
|
||||
else()
|
||||
@@ -17,7 +17,7 @@ index 158bbfe..c366c1c 100644
|
||||
|
||||
ki18n_install(po)
|
||||
kdoctools_install(po)
|
||||
@@ -237,7 +237,7 @@ endif()
|
||||
@@ -299,7 +299,7 @@ endif()
|
||||
|
||||
if(LIBXSLT_FOUND AND LIBXML2_FOUND)
|
||||
add_subdirectory(umbrello)
|
||||
@@ -27,10 +27,10 @@ index 158bbfe..c366c1c 100644
|
||||
endif(LIBXSLT_FOUND AND LIBXML2_FOUND)
|
||||
|
||||
--
|
||||
2.21.0
|
||||
2.30.0
|
||||
|
||||
|
||||
From 98a67ecc7385a547321217d9777ca6355675946f Mon Sep 17 00:00:00 2001
|
||||
From c5ef86e5048fe6538c0582e302bb5a54ce85ef0b Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sat, 17 Aug 2019 18:31:45 +1000
|
||||
Subject: Fix transparency for Bird's eye widget
|
||||
@@ -50,5 +50,28 @@ index f4bcfab..9bcbf52 100644
|
||||
setFocusPolicy(Qt::StrongFocus); // enable key press event
|
||||
|
||||
--
|
||||
2.21.0
|
||||
2.30.0
|
||||
|
||||
|
||||
From ffcb81359e56fa90d9ca5a4c58283a02dfd6ff5c Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Fri, 8 Jan 2021 20:58:39 +1000
|
||||
Subject: Use QApplication instead KApplication
|
||||
|
||||
|
||||
diff --git a/umbrello/main.cpp b/umbrello/main.cpp
|
||||
index 29f494d..118dfa1 100644
|
||||
--- a/umbrello/main.cpp
|
||||
+++ b/umbrello/main.cpp
|
||||
@@ -165,7 +165,7 @@ int main(int argc, char *argv[])
|
||||
options.add(optionString, i18n("set active language"));
|
||||
}
|
||||
KCmdLineArgs::addCmdLineOptions(options); // Add our own options.
|
||||
- KApplication app;
|
||||
+ QApplication app(argc, argv);
|
||||
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
|
||||
#if QT_VERSION > 0x050000
|
||||
KCrash::initialize();
|
||||
--
|
||||
2.30.0
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ standard format to document or design the structure of your programs."
|
||||
HOMEPAGE="https://umbrello.kde.org"
|
||||
COPYRIGHT="2010-2020 KDE Organisation"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="1"
|
||||
REVISION="2"
|
||||
SOURCE_URI="https://github.com/KDE/umbrello/archive/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="261b2f62f177f6670d03cae6261d58efa19530cfc28dc1335a19e8b648549bcd"
|
||||
SOURCE_DIR="umbrello-$portVersion"
|
||||
|
||||
Reference in New Issue
Block a user