diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-06-02 21:45:28 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-06-02 21:45:28 +0100 |
commit | 2018227e9344edb9da15fc6a4a8298086cc2aa77 (patch) | |
tree | c18e1c09e605e94e2a1e93345ad25746cc9e14b9 /app-doc/zeal/files | |
parent | 6f8038813c460b4f0572d5ef595cdfa94af3a94d (diff) |
gentoo resync : 02.06.2019
Diffstat (limited to 'app-doc/zeal/files')
-rw-r--r-- | app-doc/zeal/files/0001-libs-enforce-static-linking-of-internal-libs.patch | 81 | ||||
-rw-r--r-- | app-doc/zeal/files/0002-settings-disable-checking-for-updates-by-default.patch | 26 |
2 files changed, 107 insertions, 0 deletions
diff --git a/app-doc/zeal/files/0001-libs-enforce-static-linking-of-internal-libs.patch b/app-doc/zeal/files/0001-libs-enforce-static-linking-of-internal-libs.patch new file mode 100644 index 000000000000..137959b7ca28 --- /dev/null +++ b/app-doc/zeal/files/0001-libs-enforce-static-linking-of-internal-libs.patch @@ -0,0 +1,81 @@ +From b08ff87378dab3e6255864d2749e17b71210e7bd Mon Sep 17 00:00:00 2001 +From: Henning Schild <henning@hennsch.de> +Date: Sat, 9 Mar 2019 16:35:52 +0100 +Subject: [PATCH] libs: enforce static linking of internal libs + +Since the application binary is the only file installed and the libs are +not used by anyone else, make sure they are always static. Otherwise +cmake can make them shared and those shared libs will be missing after +install. + +Signed-off-by: Henning Schild <henning@hennsch.de> +--- + src/libs/core/CMakeLists.txt | 2 +- + src/libs/registry/CMakeLists.txt | 2 +- + src/libs/ui/CMakeLists.txt | 2 +- + src/libs/ui/qxtglobalshortcut/CMakeLists.txt | 2 +- + src/libs/util/CMakeLists.txt | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/libs/core/CMakeLists.txt b/src/libs/core/CMakeLists.txt +index cd212bb..3bd7371 100644 +--- a/src/libs/core/CMakeLists.txt ++++ b/src/libs/core/CMakeLists.txt +@@ -1,4 +1,4 @@ +-add_library(Core ++add_library(Core STATIC + application.cpp + applicationsingleton.cpp + extractor.cpp +diff --git a/src/libs/registry/CMakeLists.txt b/src/libs/registry/CMakeLists.txt +index 3372711..977919d 100644 +--- a/src/libs/registry/CMakeLists.txt ++++ b/src/libs/registry/CMakeLists.txt +@@ -1,4 +1,4 @@ +-add_library(Registry ++add_library(Registry STATIC + cancellationtoken.h + docset.cpp + docsetmetadata.cpp +diff --git a/src/libs/ui/CMakeLists.txt b/src/libs/ui/CMakeLists.txt +index 1fe12ef..27a4877 100644 +--- a/src/libs/ui/CMakeLists.txt ++++ b/src/libs/ui/CMakeLists.txt +@@ -16,7 +16,7 @@ set(Ui_FORMS + settingsdialog.ui + ) + +-add_library(Ui ++add_library(Ui STATIC + aboutdialog.cpp + docsetlistitemdelegate.cpp + docsetsdialog.cpp +diff --git a/src/libs/ui/qxtglobalshortcut/CMakeLists.txt b/src/libs/ui/qxtglobalshortcut/CMakeLists.txt +index 8b1b0ef..1776839 100644 +--- a/src/libs/ui/qxtglobalshortcut/CMakeLists.txt ++++ b/src/libs/ui/qxtglobalshortcut/CMakeLists.txt +@@ -19,7 +19,7 @@ elseif(WIN32) + ) + endif() + +-add_library(QxtGlobalShortcut ${QxtGlobalShortcut_SOURCES}) ++add_library(QxtGlobalShortcut STATIC ${QxtGlobalShortcut_SOURCES}) + + find_package(Qt5Gui REQUIRED) + target_link_libraries(QxtGlobalShortcut Qt5::Gui) +diff --git a/src/libs/util/CMakeLists.txt b/src/libs/util/CMakeLists.txt +index d4ab871..ad0e9ec 100644 +--- a/src/libs/util/CMakeLists.txt ++++ b/src/libs/util/CMakeLists.txt +@@ -1,7 +1,7 @@ + # Nothing to moc here, so avoid empty build units. + set(CMAKE_AUTOMOC OFF) + +-add_library(Util ++add_library(Util STATIC + plist.cpp + sqlitedatabase.cpp + version.cpp +-- +2.19.2 + diff --git a/app-doc/zeal/files/0002-settings-disable-checking-for-updates-by-default.patch b/app-doc/zeal/files/0002-settings-disable-checking-for-updates-by-default.patch new file mode 100644 index 000000000000..977412c47339 --- /dev/null +++ b/app-doc/zeal/files/0002-settings-disable-checking-for-updates-by-default.patch @@ -0,0 +1,26 @@ +From 3d499c8391e36b7fb1780815d04e533f26333145 Mon Sep 17 00:00:00 2001 +From: Henning Schild <henning@hennsch.de> +Date: Sat, 9 Mar 2019 10:29:54 +0100 +Subject: [PATCH 2/2] settings: disable checking for updates by default + +Signed-off-by: Henning Schild <henning@hennsch.de> +--- + src/libs/core/settings.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libs/core/settings.cpp b/src/libs/core/settings.cpp +index 8922bc4..549ddff 100644 +--- a/src/libs/core/settings.cpp ++++ b/src/libs/core/settings.cpp +@@ -72,7 +72,7 @@ void Settings::load() + + // TODO: Put everything in groups + startMinimized = settings->value(QStringLiteral("start_minimized"), false).toBool(); +- checkForUpdate = settings->value(QStringLiteral("check_for_update"), true).toBool(); ++ checkForUpdate = settings->value(QStringLiteral("check_for_update"), false).toBool(); + + showSystrayIcon = settings->value(QStringLiteral("show_systray_icon"), true).toBool(); + minimizeToSystray = settings->value(QStringLiteral("minimize_to_systray"), false).toBool(); +-- +2.19.2 + |