From 5a01e9a8f4c4c902ea340f050b759f26ac76edc6 Mon Sep 17 00:00:00 2001 From: hannes Date: Nov 22 2022 20:35:58 +0000 Subject: patch removal --- diff --git a/texstudio-use-system-hunspell-instead-of-bundled-one.patch b/texstudio-use-system-hunspell-instead-of-bundled-one.patch deleted file mode 100644 index 1303148..0000000 --- a/texstudio-use-system-hunspell-instead-of-bundled-one.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0d1ffbf44bcf61c6dad8cda9a003d9e605df081a Mon Sep 17 00:00:00 2001 -From: hannes -Date: Sat, 19 Nov 2022 11:27:02 +0100 -Subject: [PATCH] hunspell - ---- - texstudio.pro | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/texstudio.pro b/texstudio.pro -index bc81e52..e6cc5cf 100644 ---- a/texstudio.pro -+++ b/texstudio.pro -@@ -348,7 +348,7 @@ unix { - utilities - } - isEmpty(USE_SYSTEM_HUNSPELL){ -- include(src/hunspell/hunspell.pri) -+ include(hunspell.pri) - }else{ - message(System hunspell) - CONFIG += link_pkgconfig -@@ -442,3 +442,9 @@ exists(./.git) { - *-g++:equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 13) { - QMAKE_CXXFLAGS += -Wno-deprecated-copy - } -+# enable use of pkgconfig -+unix { -+ CONFIG += link_pkgconfig -+# use system hunspell -+ PKGCONFIG += hunspell -+} --- -2.38.1 diff --git a/texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch b/texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch deleted file mode 100644 index 5e2d2a5..0000000 --- a/texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 67ef0d913ce3e830ba8c7ae6cba70869da7b048a Mon Sep 17 00:00:00 2001 -From: hannes -Date: Fri, 14 Jan 2022 01:20:28 +0100 -Subject: [PATCH] qtsingle - ---- - texstudio.pro | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/texstudio.pro b/texstudio.pro -index 05831aa..9c56c74 100644 ---- a/texstudio.pro -+++ b/texstudio.pro -@@ -105,7 +105,11 @@ versionGreaterOrEqual($$QT_VERSION, "6.0.0") { - } - } - --include(src/qtsingleapplication/qtsingleapplication.pri) -+isEmpty(USE_SYSTEM_QTSINGLEAPPLICATION){ -+ include(qtsingleapplication/qtsingleapplication.pri) -+} else { -+ CONFIG += qtsingleapplication -+} - - # ############################## - # precompile_header: PRECOMPILED_HEADER = mostQtHeaders.h --- -2.34.1 diff --git a/texstudio-wtf_flags.patch b/texstudio-wtf_flags.patch deleted file mode 100644 index 3d6ea6b..0000000 --- a/texstudio-wtf_flags.patch +++ /dev/null @@ -1,31 +0,0 @@ -From fe2a4f3166a22e002bbf7fb80802bbf96111340a Mon Sep 17 00:00:00 2001 -From: hannes -Date: Fri, 14 Jan 2022 01:24:46 +0100 -Subject: [PATCH 2/2] wtf - ---- - texstudio.pro | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/texstudio.pro b/texstudio.pro -index 9c56c74..9a0a6bc 100644 ---- a/texstudio.pro -+++ b/texstudio.pro -@@ -443,12 +443,12 @@ exists(./.git) { - } - - !win32-msvc*: { -- QMAKE_CXXFLAGS_DEBUG -= -O -O1 -O2 -O3 -- QMAKE_CXXFLAGS_DEBUG += -Wall -Wextra -Wmissing-include-dirs -Wunknown-pragmas -Wundef -Wpointer-arith -Winline -O0 -Wno-deprecated-declarations -+# QMAKE_CXXFLAGS_DEBUG -= -O -O1 -O2 -O3 -+# QMAKE_CXXFLAGS_DEBUG += -Wall -Wextra -Wmissing-include-dirs -Wunknown-pragmas -Wundef -Wpointer-arith -Winline -O0 -Wno-deprecated-declarations - - QMAKE_CXXFLAGS += -fno-omit-frame-pointer - win32: QMAKE_CXXFLAGS += -fpermissive -- !win32:!haiku: QMAKE_LFLAGS += -rdynamic # option not supported by mingw and haiku -+# !win32:!haiku: QMAKE_LFLAGS += -rdynamic # option not supported by mingw and haiku - } else { - DEFINES += _CRT_SECURE_NO_WARNINGS - } --- -2.34.1