diff options
Diffstat (limited to 'gnu/packages/patches')
10 files changed, 157 insertions, 431 deletions
diff --git a/gnu/packages/patches/amule-crypto-6.patch b/gnu/packages/patches/amule-crypto-6.patch deleted file mode 100644 index 21a86ab0fa..0000000000 --- a/gnu/packages/patches/amule-crypto-6.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d1d1368c7909ffd8423730afaa811ce7b6a3a8aa Mon Sep 17 00:00:00 2001 -From: Tommy Jerry Mairo <tommy.mairo@gmail.com> -Date: Sun, 4 Feb 2018 12:42:00 -0800 -Subject: [PATCH 1/2] Bugfix: API mismatch with crypto++ 6.0.0 - ---- - src/ClientCreditsList.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ClientCreditsList.cpp b/src/ClientCreditsList.cpp -index 3bea9fe2d..a7ae1e34c 100644 ---- a/src/ClientCreditsList.cpp -+++ b/src/ClientCreditsList.cpp -@@ -312,7 +312,7 @@ void CClientCreditsList::InitalizeCrypting() - // calculate and store public key - CryptoPP::RSASSA_PKCS1v15_SHA_Verifier pubkey(*static_cast<CryptoPP::RSASSA_PKCS1v15_SHA_Signer *>(m_pSignkey)); - CryptoPP::ArraySink asink(m_abyMyPublicKey, 80); -- pubkey.DEREncode(asink); -+ pubkey.AccessMaterial().Save(asink); - m_nMyPublicKeyLen = asink.TotalPutLength(); - asink.MessageEnd(); - } catch (const CryptoPP::Exception& e) { - -From 88ba0ac952b78382445f2fff73c6792c0474dc62 Mon Sep 17 00:00:00 2001 -From: Tommy Jerry Mairo <tommy.mairo@gmail.com> -Date: Wed, 21 Mar 2018 11:56:28 -0700 -Subject: [PATCH 2/2] Update: Change AccessMaterial to GetMaterial - ---- - src/ClientCreditsList.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ClientCreditsList.cpp b/src/ClientCreditsList.cpp -index a7ae1e34c..69e881fd8 100644 ---- a/src/ClientCreditsList.cpp -+++ b/src/ClientCreditsList.cpp -@@ -312,7 +312,7 @@ void CClientCreditsList::InitalizeCrypting() - // calculate and store public key - CryptoPP::RSASSA_PKCS1v15_SHA_Verifier pubkey(*static_cast<CryptoPP::RSASSA_PKCS1v15_SHA_Signer *>(m_pSignkey)); - CryptoPP::ArraySink asink(m_abyMyPublicKey, 80); -- pubkey.AccessMaterial().Save(asink); -+ pubkey.GetMaterial().Save(asink); - m_nMyPublicKeyLen = asink.TotalPutLength(); - asink.MessageEnd(); - } catch (const CryptoPP::Exception& e) { diff --git a/gnu/packages/patches/emacs-geiser-autoload-activate-implementation.patch b/gnu/packages/patches/emacs-geiser-autoload-activate-implementation.patch deleted file mode 100644 index 47d513b3a3..0000000000 --- a/gnu/packages/patches/emacs-geiser-autoload-activate-implementation.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 9fd3174cead8bfa17a8413bffa38362853d71a02 Mon Sep 17 00:00:00 2001 -From: jao <jao@gnu.org> -Date: Mon, 5 Apr 2021 23:06:56 +0100 -Subject: [PATCH] autoload geiser activate implementation - ---- - elisp/geiser.el | 3 +++ - readme.org | 4 ++-- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/elisp/geiser.el b/elisp/geiser.el -index 887b8da..96c1dd6 100644 ---- a/elisp/geiser.el -+++ b/elisp/geiser.el -@@ -104,6 +104,9 @@ - ;;;###autoload - (autoload 'geiser-mode--maybe-activate "geiser-mode") - -+;;;###autoload -+(autoload 'geiser-activate-implementation "geiser-impl") -+ - ;;;###autoload - (mapc (lambda (group) - (custom-add-load group (symbol-name group)) --- -GitLab diff --git a/gnu/packages/patches/emacs-geiser-guile-auto-activate.patch b/gnu/packages/patches/emacs-geiser-guile-auto-activate.patch deleted file mode 100644 index 44837f90df..0000000000 --- a/gnu/packages/patches/emacs-geiser-guile-auto-activate.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 93ef7101fdfcc7eac6f465b4b9788c384a323c14 Mon Sep 17 00:00:00 2001 -From: jao <jao@gnu.org> -Date: Mon, 5 Apr 2021 20:17:50 +0100 -Subject: [PATCH] fix: auto-activate guile implementation - ---- - geiser-guile.el | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/geiser-guile.el b/geiser-guile.el -index 340442b..deeb76f 100644 ---- a/geiser-guile.el -+++ b/geiser-guile.el -@@ -25,6 +25,7 @@ - (require 'geiser-syntax) - (require 'geiser-custom) - (require 'geiser-repl) -+(require 'geiser-impl) - (require 'geiser-base) - (require 'geiser-eval) - (require 'geiser-edit) -@@ -474,6 +475,9 @@ it spawn a server thread." - - (geiser-impl--add-to-alist 'regexp "\\.scm$" 'guile t) - -+;;;###autoload -+(geiser-activate-implementation 'guile) -+ - ;;;###autoload - (autoload 'run-guile "geiser-guile" "Start a Geiser Guile REPL." t) - --- -GitLab - diff --git a/gnu/packages/patches/freebayes-devendor-deps.patch b/gnu/packages/patches/freebayes-devendor-deps.patch deleted file mode 100644 index 9886de11fb..0000000000 --- a/gnu/packages/patches/freebayes-devendor-deps.patch +++ /dev/null @@ -1,152 +0,0 @@ -This patch is original to Guix, ongoing work to upstream bits as possible. - -From 9acc56db5e7469f5976be38b52ba4993de98ee38 Mon Sep 17 00:00:00 2001 -From: Efraim Flashner <efraim@flashner.co.il> -Date: Sun, 17 Jan 2021 13:27:17 +0200 -Subject: [PATCH] devendor-dependants - ---- - meson.build | 84 +++++++++++++++++++++++++++++++++++++++++------------ - 1 file changed, 66 insertions(+), 18 deletions(-) - -diff --git a/meson.build b/meson.build -index f6bf242..bded4af 100644 ---- a/meson.build -+++ b/meson.build -@@ -9,8 +9,13 @@ project('freebayes', ['cpp', 'c'], - - zlib_dep = dependency('zlib') - lzma_dep = dependency('liblzma') -+simde_dep = dependency('simde') - bzip2_dep = dependency('bz2lib', required: false) - htslib_dep = dependency('htslib', required : false) -+tabixpp_dep = dependency('tabixpp', required : false) -+fastahack_dep = dependency('fastahack', required : false) -+smithwaterman_dep = dependency('smithwaterman', required : false) -+vcflib_dep = dependency('vcflib', required: false) - thread_dep = dependency('threads') - - if htslib_dep.found() -@@ -59,6 +64,56 @@ else - ] - endif - -+if tabixpp_dep.found() -+ tabixpp_includes = '' -+ tabixpp_src = [] -+else -+ tabixpp_includes = [ -+ 'vcflib/tabixpp', -+ ] -+ tabixpp_src = [ -+ 'vcflib/tabixpp/tabix.cpp', -+ ] -+endif -+ -+if vcflib_dep.found() -+ vcflib_includes = '' -+ vcflib_src = [] -+else -+ vcflib_includes = [ -+ 'vcflib/src', -+ 'vcflib/multichoose', -+ 'vcflib/filevercmp', -+ ] -+ vcflib_src = [ -+ 'vcflib/src/Variant.cpp', -+ ] -+endif -+ -+if fastahack_dep.found() -+ fastahack_src = [] -+else -+ fastahack_src = [ -+ 'vcflib/fastahack/Fasta.cpp', -+ 'vcflib/src/split.cpp', -+ ] -+endif -+ -+if smithwaterman_dep.found() -+ smithwaterman_includes = '' -+ smithwaterman_src = [] -+else -+ smithwaterman_includes = [ -+ 'vcflib/smithwaterman', -+ ] -+ smithwaterman_src = [ -+ 'vcflib/smithwaterman/SmithWatermanGotoh.cpp', -+ 'vcflib/smithwaterman/disorder.cpp', -+ 'vcflib/smithwaterman/Repeats.cpp', -+ 'vcflib/smithwaterman/LeftAlign.cpp', -+ 'vcflib/smithwaterman/IndelAllele.cpp', -+ ] -+endif - - - # -@@ -105,23 +160,18 @@ seqlib_src = [ - ] - - vcflib_src = [ -- 'vcflib/tabixpp/tabix.cpp', -- 'vcflib/src/Variant.cpp', -- 'vcflib/smithwaterman/SmithWatermanGotoh.cpp', -- 'vcflib/smithwaterman/disorder.cpp', -- 'vcflib/smithwaterman/Repeats.cpp', -- 'vcflib/smithwaterman/LeftAlign.cpp', -- 'vcflib/smithwaterman/IndelAllele.cpp', -+ vcflib_src, -+ tabixpp_src, -+ smithwaterman_src, - ] - - bamleftalign_src = [ - 'src/bamleftalign.cpp', - 'src/IndelAllele.cpp', - 'contrib/SeqLib/src/BamWriter.cpp', -- 'vcflib/fastahack/Fasta.cpp', -- 'vcflib/smithwaterman/LeftAlign.cpp', -- 'vcflib/smithwaterman/IndelAllele.cpp', -- 'vcflib/src/split.cpp', -+ fastahack_src, -+ smithwaterman_src, -+ vcflib_src, - 'src/LeftAlign.cpp', - ] - -@@ -134,11 +184,9 @@ incdir = include_directories( - 'ttmath', - 'contrib', - 'contrib/SeqLib', -- 'vcflib/src', -- 'vcflib/tabixpp', -- 'vcflib/smithwaterman', -- 'vcflib/multichoose', -- 'vcflib/filevercmp') -+ tabixpp_includes, -+ smithwaterman_includes, -+ vcflib_includes) - - c_args = ['-fpermissive','-w'] - cpp_args = ['-fpermissive','-w','-Wc++14-compat'] -@@ -152,7 +200,7 @@ executable('freebayes', - include_directories : incdir, - cpp_args : cpp_args, - c_args : c_args, -- dependencies: [zlib_dep, lzma_dep, htslib_dep, thread_dep], -+ dependencies: [zlib_dep, lzma_dep, simde_dep, htslib_dep, tabixpp_dep, smithwaterman_dep, vcflib_dep, thread_dep], - install: true - ) - -@@ -165,7 +213,7 @@ executable('bamleftalign', - include_directories : incdir, - cpp_args : cpp_args, - c_args : c_args, -- dependencies: [zlib_dep, lzma_dep, htslib_dep, thread_dep], -+ dependencies: [zlib_dep, lzma_dep, simde_dep, htslib_dep, tabixpp_dep, fastahack_dep, smithwaterman_dep, vcflib_dep, thread_dep], - install: true - ) - --- -2.30.0 - diff --git a/gnu/packages/patches/lksctp-tools-1.0.18-fix-header-file-name.patch b/gnu/packages/patches/lksctp-tools-1.0.18-fix-header-file-name.patch deleted file mode 100644 index 1ebe6c803d..0000000000 --- a/gnu/packages/patches/lksctp-tools-1.0.18-fix-header-file-name.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 378560050a8f93786c590cc99a55461666205b61 Mon Sep 17 00:00:00 2001 -From: Xin Long <lucien.xin@gmail.com> -Date: Fri, 24 Aug 2018 01:13:32 +0800 -Subject: [PATCH] build: fix netinet/sctp.h not to be installed - -After libcnetinet_HEADERS was set to sctp.h.in, netinet/sctp.h can -no longer be installed into ${includedir}. - -Since "AC_CONFIG_HEADERS([src/include/netinet/sctp.h])" is already -added into configure.ac, there's no need to generate sctp.h by -automake. - -So we simply set libcnetinet_HEADERS back to sctp.h. - -Fixes: 9607dd85e70a ("netinet/sctp.h: dynamically build based on system setup") -Signed-off-by: Xin Long <lucien.xin@gmail.com> -Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> ---- - src/include/netinet/Makefile.am | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/include/netinet/Makefile.am b/src/include/netinet/Makefile.am -index ca0aac2..965db8c 100644 ---- a/src/include/netinet/Makefile.am -+++ b/src/include/netinet/Makefile.am -@@ -11,5 +11,4 @@ libcnetinetdir = $(includedir)/netinet - # API. - include_HEADERS = - --libcnetinet_HEADERS = sctp.h.in --BUILT_SOURCES = sctp.h -+libcnetinet_HEADERS = sctp.h diff --git a/gnu/packages/patches/minimap2-aarch64-support.patch b/gnu/packages/patches/minimap2-aarch64-support.patch deleted file mode 100644 index 95db8579d6..0000000000 --- a/gnu/packages/patches/minimap2-aarch64-support.patch +++ /dev/null @@ -1,52 +0,0 @@ -This patch should be removed with the next release. There is WIP upstream -support for proper support of more architectures, including aarch64 and powerpc64le. - -diff --git a/Makefile b/Makefile -index ed341f6..94dbd85 100644 ---- a/Makefile -+++ b/Makefile -@@ -6,20 +6,18 @@ PROG= minimap2 - PROG_EXTRA= sdust minimap2-lite - LIBS= -lm -lz -lpthread - --ifeq ($(arm_neon),) # if arm_neon is not defined --ifeq ($(sse2only),) # if sse2only is not defined -- OBJS+=ksw2_extz2_sse41.o ksw2_extd2_sse41.o ksw2_exts2_sse41.o ksw2_extz2_sse2.o ksw2_extd2_sse2.o ksw2_exts2_sse2.o ksw2_dispatch.o --else # if sse2only is defined -- OBJS+=ksw2_extz2_sse.o ksw2_extd2_sse.o ksw2_exts2_sse.o --endif --else # if arm_neon is defined -+ifneq ($(arm_neon),) # if arm_neon is defined - OBJS+=ksw2_extz2_neon.o ksw2_extd2_neon.o ksw2_exts2_neon.o -- INCLUDES+=-Isse2neon --ifeq ($(aarch64),) #if aarch64 is not defined - CFLAGS+=-D_FILE_OFFSET_BITS=64 -mfpu=neon -fsigned-char --else #if aarch64 is defined -+ INCLUDES+=-Isse2neon -+else ifneq ($(aarch64),) #if aarch64 is defined -+ OBJS+=ksw2_extz2_neon.o ksw2_extd2_neon.o ksw2_exts2_neon.o - CFLAGS+=-D_FILE_OFFSET_BITS=64 -fsigned-char --endif -+ INCLUDES+=-Isse2neon -+else ifneq ($(sse2only),) # if sse2only is defined -+ OBJS+=ksw2_extz2_sse.o ksw2_extd2_sse.o ksw2_exts2_sse.o -+else # none of the above -+ OBJS+=ksw2_extz2_sse41.o ksw2_extd2_sse41.o ksw2_exts2_sse41.o ksw2_extz2_sse2.o ksw2_extd2_sse2.o ksw2_exts2_sse2.o ksw2_dispatch.o - endif - - .PHONY:all extra clean depend -@@ -46,9 +44,12 @@ sdust:sdust.c kalloc.o kalloc.h kdq.h kvec.h kseq.h ketopt.h sdust.h - - # SSE-specific targets on x86/x86_64 - --ifeq ($(arm_neon),) # if arm_neon is defined, compile this target with the default setting (i.e. no -msse2) -+ifneq ($(arm_neon),) # if arm_neon is defined, compile this target with the default setting (i.e. no -msse2) -+ksw2_ll_sse.o:ksw2_ll_sse.c ksw2.h kalloc.h -+else ifneq ($(aarch64),) - ksw2_ll_sse.o:ksw2_ll_sse.c ksw2.h kalloc.h -- $(CC) -c $(CFLAGS) -msse2 $(CPPFLAGS) $(INCLUDES) $< -o $@ -+else -+ $(CC) -c $(CFLAGS) -msse2 $(CPPFLAGS) $(INCLUDES) $< -o $@ - endif - - ksw2_extz2_sse41.o:ksw2_extz2_sse.c ksw2.h kalloc.h diff --git a/gnu/packages/patches/mosaicatcher-unbundle-htslib.patch b/gnu/packages/patches/mosaicatcher-unbundle-htslib.patch new file mode 100644 index 0000000000..262895ddcf --- /dev/null +++ b/gnu/packages/patches/mosaicatcher-unbundle-htslib.patch @@ -0,0 +1,49 @@ +--- a/src/CMakeLists.txt 2021-05-28 13:07:25.655107983 +0200 ++++ b/src/CMakeLists.txt 2021-05-28 13:09:55.764025497 +0200 +@@ -21,24 +21,6 @@ + + + +-### Link HTSlib +- +-ExternalProject_Add(htslib +- PREFIX ${CMAKE_BINARY_DIR}/htslib +- GIT_REPOSITORY "https://github.com/samtools/htslib.git" +- GIT_TAG "1.3.1" +- UPDATE_COMMAND "" +- BUILD_IN_SOURCE 1 +- CONFIGURE_COMMAND "" +- BUILD_COMMAND make +- INSTALL_COMMAND make install prefix=${CMAKE_BINARY_DIR}/htslib +- LOG_DOWNLOAD 1 +-) +-link_directories (${CMAKE_BINARY_DIR}/htslib/lib) +-include_directories (${CMAKE_BINARY_DIR}/htslib/include) +- +- +- + ### Set version + + # Get the current working branch +@@ -64,13 +46,6 @@ + + # 2. Boost version from find_package (Boost_VERSION) + +-# 3. Get HTSlib version from git +-execute_process( +- COMMAND git describe --always +- WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/htslib +- OUTPUT_VARIABLE HTSLIB_VERSION +- OUTPUT_STRIP_TRAILING_WHITESPACE +-) + set(HTSLIB_VERSION "1.3.1 ${HTSLIB_VERSION}") + + # 4. write version.hpp file +@@ -105,7 +80,6 @@ + add_executable (mosaic main.cpp ${HEADER_FILES}) + target_link_libraries (mosaic LINK_PUBLIC ${Boost_LIBRARIES}) + target_link_libraries (mosaic LINK_PUBLIC hts) +-add_dependencies (mosaic htslib) + + + ### Doxygen API documentation diff --git a/gnu/packages/patches/nsis-source-date-epoch.patch b/gnu/packages/patches/nsis-source-date-epoch.patch new file mode 100644 index 0000000000..744c2a8011 --- /dev/null +++ b/gnu/packages/patches/nsis-source-date-epoch.patch @@ -0,0 +1,23 @@ +Honour SOURCE_DATE_EPOCH for VERSION default + +Merged upstream as cd3f1024a37a332f1d4fa96a817ca80dfa2a478c, but not yet in a +release. GitHub PR: https://github.com/kichik/nsis/pull/13 + +Python snippet from: https://reproducible-builds.org/docs/source-date-epoch/#python + + +diff --git a/SConstruct b/SConstruct +index e8252c9..41786f2 100755 +--- a/SConstruct ++++ b/SConstruct +@@ -95,8 +95,8 @@ default_doctype = 'html' + if defenv.WhereIs('hhc', os.environ['PATH']): + default_doctype = 'chm' + +-from time import strftime, gmtime +-cvs_version = strftime('%d-%b-%Y.cvs', gmtime()) ++import time ++cvs_version = time.strftime('%d-%b-%Y.cvs', time.gmtime(int(os.environ.get('SOURCE_DATE_EPOCH', time.time())))) + + opts = Variables() + diff --git a/gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch b/gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch index 760ab97568..155ba35efd 100644 --- a/gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch +++ b/gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch @@ -1,28 +1,32 @@ -From 0c57874ebb5982154da127ae338f9190b1581804 Mon Sep 17 00:00:00 2001 +From 942730ce7148cd54a30d4a606ce71a2654c8a2e0 Mon Sep 17 00:00:00 2001 From: Leo Prikler <leo.prikler@student.tugraz.at> -Date: Fri, 26 Jun 2020 18:20:04 +0200 -Subject: [PATCH] ppsspp: disable upgrade and gold +Date: Sat, 5 Jun 2021 22:47:00 -0400 +Subject: [PATCH] ppsspp: Remove upgrade code and gold support. +Original patch from Leo Prikler. +Rebased on master (commit 69fa20744958aef8da9ca052ba7675fdc1636e46) by +Maxim Cournoyer. --- Core/Config.cpp | 11 ------ Core/Config.h | 2 -- Qt/QtMain.cpp | 6 ---- SDL/SDLMain.cpp | 6 ---- UI/DevScreens.cpp | 3 -- - UI/GameSettingsScreen.cpp | 1 - + UI/GameSettingsScreen.cpp | 2 -- UI/MainScreen.cpp | 70 +------------------------------------ UI/MiscScreens.cpp | 31 ++-------------- UWP/PPSSPP_UWPMain.cpp | 6 ---- Windows/MainWindowMenu.cpp | 2 +- Windows/main.cpp | 6 ---- android/jni/app-android.cpp | 6 ---- - 12 files changed, 5 insertions(+), 145 deletions(-) + ios/main.mm | 6 ---- + 13 files changed, 5 insertions(+), 152 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp -index 1c53e8e57..2fa74a6b8 100644 +index 74be99d75..b14aa22c7 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp -@@ -439,7 +439,6 @@ static ConfigSetting generalSettings[] = { +@@ -467,7 +467,6 @@ static ConfigSetting generalSettings[] = { ConfigSetting("IgnoreBadMemAccess", &g_Config.bIgnoreBadMemAccess, true, true), ConfigSetting("CurrentDirectory", &g_Config.currentDirectory, ""), ConfigSetting("ShowDebuggerOnLoad", &g_Config.bShowDebuggerOnLoad, false), @@ -30,7 +34,7 @@ index 1c53e8e57..2fa74a6b8 100644 ConfigSetting("Language", &g_Config.sLanguageIni, &DefaultLangRegion), ConfigSetting("ForceLagSync2", &g_Config.bForceLagSync, false, true, true), ConfigSetting("DiscordPresence", &g_Config.bDiscordPresence, true, true, false), // Or maybe it makes sense to have it per-game? Race conditions abound... -@@ -1293,16 +1292,6 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) { +@@ -1323,16 +1322,6 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) { upgradeMessage = ""; } @@ -40,7 +44,7 @@ index 1c53e8e57..2fa74a6b8 100644 - // upgrade number in the ini. - if (iRunCount % 10 == 0 && bCheckForNewVersion) { - std::shared_ptr<http::Download> dl = g_DownloadManager.StartDownloadWithCallback( -- "http://www.ppsspp.org/version.json", "", &DownloadCompletedCallback); +- "http://www.ppsspp.org/version.json", Path(), &DownloadCompletedCallback); - dl->SetHidden(true); - } - @@ -48,10 +52,10 @@ index 1c53e8e57..2fa74a6b8 100644 bSaveSettings = true; diff --git a/Core/Config.h b/Core/Config.h -index 13bce8a36..70d6c8aaf 100644 +index 79323eefc..d47bec0c7 100644 --- a/Core/Config.h +++ b/Core/Config.h -@@ -101,7 +101,6 @@ struct Config { +@@ -103,7 +103,6 @@ struct Config { bool bFastMemory; int iCpuCore; @@ -59,16 +63,16 @@ index 13bce8a36..70d6c8aaf 100644 bool bForceLagSync; bool bFuncReplacements; bool bHideSlowWarnings; -@@ -540,4 +539,3 @@ std::string CreateRandMAC(); +@@ -542,4 +541,3 @@ std::string CreateRandMAC(); // TODO: Find a better place for this. extern http::Downloader g_DownloadManager; extern Config g_Config; - diff --git a/Qt/QtMain.cpp b/Qt/QtMain.cpp -index 5be0cefa0..b11cb1c64 100644 +index b642f7442..a880d7c94 100644 --- a/Qt/QtMain.cpp +++ b/Qt/QtMain.cpp -@@ -218,12 +218,6 @@ bool System_GetPropertyBool(SystemProperty prop) { +@@ -219,12 +219,6 @@ bool System_GetPropertyBool(SystemProperty prop) { case SYSPROP_HAS_FILE_BROWSER: case SYSPROP_HAS_FOLDER_BROWSER: return true; @@ -78,14 +82,14 @@ index 5be0cefa0..b11cb1c64 100644 -#else - return false; -#endif + case SYSPROP_CAN_JIT: + return true; default: - return false; - } diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp -index 98b56fe91..6af0fcb1a 100644 +index f0f74f979..f963f36e9 100644 --- a/SDL/SDLMain.cpp +++ b/SDL/SDLMain.cpp -@@ -380,12 +380,6 @@ bool System_GetPropertyBool(SystemProperty prop) { +@@ -381,12 +381,6 @@ bool System_GetPropertyBool(SystemProperty prop) { switch (prop) { case SYSPROP_HAS_BACK_BUTTON: return true; @@ -95,14 +99,14 @@ index 98b56fe91..6af0fcb1a 100644 -#else - return false; -#endif + case SYSPROP_CAN_JIT: + return true; default: - return false; - } diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp -index 8daac5bc8..c0c09ce79 100644 +index 29baf2f2e..926692363 100644 --- a/UI/DevScreens.cpp +++ b/UI/DevScreens.cpp -@@ -605,9 +605,6 @@ void SystemInfoScreen::CreateViews() { +@@ -635,9 +635,6 @@ void SystemInfoScreen::CreateViews() { #ifdef _M_SSE buildConfig->Add(new InfoItem("_M_SSE", StringFromFormat("0x%x", _M_SSE))); #endif @@ -113,35 +117,36 @@ index 8daac5bc8..c0c09ce79 100644 ViewGroup *cpuExtensionsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT)); cpuExtensionsScroll->SetTag("DevSystemInfoCPUExt"); diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp -index 2f1e157ee..38c586b06 100644 +index 393e33cd9..d07d00d45 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp -@@ -914,7 +914,6 @@ void GameSettingsScreen::CreateViews() { +@@ -922,8 +922,6 @@ void GameSettingsScreen::CreateViews() { } } #endif - systemSettings->Add(new CheckBox(&g_Config.bCheckForNewVersion, sy->T("VersionCheck", "Check for new versions of PPSSPP"))); - const std::string bgPng = GetSysDirectory(DIRECTORY_SYSTEM) + "background.png"; - const std::string bgJpg = GetSysDirectory(DIRECTORY_SYSTEM) + "background.jpg"; - if (File::Exists(bgPng) || File::Exists(bgJpg)) { +- + systemSettings->Add(new Choice(sy->T("Restore Default Settings")))->OnClick.Handle(this, &GameSettingsScreen::OnRestoreDefaultSettings); + systemSettings->Add(new CheckBox(&g_Config.bEnableStateUndo, sy->T("Savestate slot backups"))); + static const char *autoLoadSaveStateChoices[] = { "Off", "Oldest Save", "Newest Save", "Slot 1", "Slot 2", "Slot 3", "Slot 4", "Slot 5" }; diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp -index ca870ab8f..84cde88ac 100644 +index f88509276..51b21b640 100644 --- a/UI/MainScreen.cpp +++ b/UI/MainScreen.cpp -@@ -1064,11 +1064,7 @@ void MainScreen::CreateViews() { +@@ -1080,11 +1080,7 @@ void MainScreen::CreateViews() { sprintf(versionString, "%s", PPSSPP_GIT_VERSION); rightColumnItems->SetSpacing(0.0f); AnchorLayout *logos = new AnchorLayout(new AnchorLayoutParams(FILL_PARENT, 60.0f, false)); - if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { -- logos->Add(new ImageView(ImageID("I_ICONGOLD"), IS_DEFAULT, new AnchorLayoutParams(64, 64, 0, 0, NONE, NONE, false))); +- logos->Add(new ImageView(ImageID("I_ICONGOLD"), "", IS_DEFAULT, new AnchorLayoutParams(64, 64, 0, 0, NONE, NONE, false))); - } else { -- logos->Add(new ImageView(ImageID("I_ICON"), IS_DEFAULT, new AnchorLayoutParams(64, 64, 0, 0, NONE, NONE, false))); +- logos->Add(new ImageView(ImageID("I_ICON"), "", IS_DEFAULT, new AnchorLayoutParams(64, 64, 0, 0, NONE, NONE, false))); - } -+ logos->Add(new ImageView(ImageID("I_ICON"), IS_DEFAULT, new AnchorLayoutParams(64, 64, 0, 0, NONE, NONE, false))); - logos->Add(new ImageView(ImageID("I_LOGO"), IS_DEFAULT, new AnchorLayoutParams(180, 64, 64, -5.0f, NONE, NONE, false))); ++ logos->Add(new ImageView(ImageID("I_ICON"), "", IS_DEFAULT, new AnchorLayoutParams(64, 64, 0, 0, NONE, NONE, false))); + logos->Add(new ImageView(ImageID("I_LOGO"), "PPSSPP", IS_DEFAULT, new AnchorLayoutParams(180, 64, 64, -5.0f, NONE, NONE, false))); #if !defined(MOBILE_DEVICE) -@@ -1089,11 +1085,6 @@ void MainScreen::CreateViews() { +@@ -1107,11 +1103,6 @@ void MainScreen::CreateViews() { rightColumnItems->Add(new Choice(mm->T("Game Settings", "Settings")))->OnClick.Handle(this, &MainScreen::OnGameSettings); rightColumnItems->Add(new Choice(mm->T("Credits")))->OnClick.Handle(this, &MainScreen::OnCredits); rightColumnItems->Add(new Choice(mm->T("www.ppsspp.org")))->OnClick.Handle(this, &MainScreen::OnPPSSPPOrg); @@ -153,7 +158,7 @@ index ca870ab8f..84cde88ac 100644 #if !PPSSPP_PLATFORM(UWP) // Having an exit button is against UWP guidelines. -@@ -1118,32 +1109,6 @@ void MainScreen::CreateViews() { +@@ -1136,32 +1127,6 @@ void MainScreen::CreateViews() { } else if (tabHolder_->GetVisibility() != V_GONE) { root_->SetDefaultFocusView(tabHolder_); } @@ -186,7 +191,7 @@ index ca870ab8f..84cde88ac 100644 } UI::EventReturn MainScreen::OnAllowStorage(UI::EventParams &e) { -@@ -1151,30 +1116,6 @@ UI::EventReturn MainScreen::OnAllowStorage(UI::EventParams &e) { +@@ -1169,30 +1134,6 @@ UI::EventReturn MainScreen::OnAllowStorage(UI::EventParams &e) { return UI::EVENT_DONE; } @@ -217,7 +222,7 @@ index ca870ab8f..84cde88ac 100644 void MainScreen::sendMessage(const char *message, const char *value) { // Always call the base class method first to handle the most common messages. UIScreenWithBackground::sendMessage(message, value); -@@ -1390,15 +1331,6 @@ UI::EventReturn MainScreen::OnCredits(UI::EventParams &e) { +@@ -1396,15 +1337,6 @@ UI::EventReturn MainScreen::OnCredits(UI::EventParams &e) { return UI::EVENT_DONE; } @@ -234,10 +239,10 @@ index ca870ab8f..84cde88ac 100644 LaunchBrowser("https://www.ppsspp.org"); return UI::EVENT_DONE; diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp -index a7284654b..2413d6c89 100644 +index 901a5fb09..9d067aee6 100644 --- a/UI/MiscScreens.cpp +++ b/UI/MiscScreens.cpp -@@ -539,11 +539,7 @@ void LogoScreen::render() { +@@ -661,11 +661,7 @@ void LogoScreen::render() { char temp[256]; // Manually formatting UTF-8 is fun. \xXX doesn't work everywhere. snprintf(temp, sizeof(temp), "%s Henrik Rydg%c%crd", cr->T("created", "Created by"), 0xC3, 0xA5); @@ -248,9 +253,9 @@ index a7284654b..2413d6c89 100644 - } + dc.Draw()->DrawImage(ImageID("I_ICON"), bounds.centerX() - 120, bounds.centerY() - 30, 1.2f, textColor, ALIGN_CENTER); dc.Draw()->DrawImage(ImageID("I_LOGO"), bounds.centerX() + 40, bounds.centerY() - 30, 1.5f, textColor, ALIGN_CENTER); - //dc.Draw()->DrawTextShadow(UBUNTU48, "PPSSPP", xres / 2, yres / 2 - 30, textColor, ALIGN_CENTER); + //dc.Draw()->DrawTextShadow(UBUNTU48, "PPSSPP", bounds.w / 2, bounds.h / 2 - 30, textColor, ALIGN_CENTER); dc.SetFontScale(1.0f, 1.0f); -@@ -579,10 +575,6 @@ void CreditsScreen::CreateViews() { +@@ -701,10 +697,6 @@ void CreditsScreen::CreateViews() { // Really need to redo this whole layout with some linear layouts... int rightYOffset = 0; @@ -261,14 +266,14 @@ index a7284654b..2413d6c89 100644 root_->Add(new Button(cr->T("PPSSPP Forums"), new AnchorLayoutParams(260, 64, 10, NONE, NONE, 158, false)))->OnClick.Handle(this, &CreditsScreen::OnForums); root_->Add(new Button(cr->T("Discord"), new AnchorLayoutParams(260, 64, 10, NONE, NONE, 232, false)))->OnClick.Handle(this, &CreditsScreen::OnDiscord); root_->Add(new Button("www.ppsspp.org", new AnchorLayoutParams(260, 64, 10, NONE, NONE, 10, false)))->OnClick.Handle(this, &CreditsScreen::OnPPSSPPOrg); -@@ -591,20 +583,7 @@ void CreditsScreen::CreateViews() { +@@ -713,20 +705,7 @@ void CreditsScreen::CreateViews() { #if PPSSPP_PLATFORM(ANDROID) || PPSSPP_PLATFORM(IOS) root_->Add(new Button(cr->T("Share PPSSPP"), new AnchorLayoutParams(260, 64, NONE, NONE, 10, rightYOffset + 158, false)))->OnClick.Handle(this, &CreditsScreen::OnShare); #endif - if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { -- root_->Add(new ImageView(ImageID("I_ICONGOLD"), IS_DEFAULT, new AnchorLayoutParams(100, 64, 10, 10, NONE, NONE, false))); +- root_->Add(new ImageView(ImageID("I_ICONGOLD"), "", IS_DEFAULT, new AnchorLayoutParams(100, 64, 10, 10, NONE, NONE, false))); - } else { -- root_->Add(new ImageView(ImageID("I_ICON"), IS_DEFAULT, new AnchorLayoutParams(100, 64, 10, 10, NONE, NONE, false))); +- root_->Add(new ImageView(ImageID("I_ICON"), "", IS_DEFAULT, new AnchorLayoutParams(100, 64, 10, 10, NONE, NONE, false))); - } -} - @@ -279,11 +284,11 @@ index a7284654b..2413d6c89 100644 - LaunchBrowser("https://central.ppsspp.org/buygold"); -#endif - return UI::EVENT_DONE; -+ root_->Add(new ImageView(ImageID("I_ICON"), IS_DEFAULT, new AnchorLayoutParams(100, 64, 10, 10, NONE, NONE, false))); ++ root_->Add(new ImageView(ImageID("I_ICON"), "", IS_DEFAULT, new AnchorLayoutParams(100, 64, 10, 10, NONE, NONE, false))); } UI::EventReturn CreditsScreen::OnTwitter(UI::EventParams &e) { -@@ -794,11 +773,7 @@ void CreditsScreen::render() { +@@ -916,11 +895,7 @@ void CreditsScreen::render() { // TODO: This is kinda ugly, done on every frame... char temp[256]; @@ -297,10 +302,10 @@ index a7284654b..2413d6c89 100644 UIContext &dc = *screenManager()->getUIContext(); diff --git a/UWP/PPSSPP_UWPMain.cpp b/UWP/PPSSPP_UWPMain.cpp -index 0ba7fac4b..d1b687c47 100644 +index 29afda806..b7028fc0c 100644 --- a/UWP/PPSSPP_UWPMain.cpp +++ b/UWP/PPSSPP_UWPMain.cpp -@@ -433,12 +433,6 @@ bool System_GetPropertyBool(SystemProperty prop) { +@@ -426,12 +426,6 @@ bool System_GetPropertyBool(SystemProperty prop) { return false; case SYSPROP_HAS_BACK_BUTTON: return true; @@ -310,14 +315,14 @@ index 0ba7fac4b..d1b687c47 100644 -#else - return false; -#endif + case SYSPROP_CAN_JIT: + return true; default: - return false; - } diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp -index 979a60ecb..a57927544 100644 +index c0d790e06..e8de4f956 100644 --- a/Windows/MainWindowMenu.cpp +++ b/Windows/MainWindowMenu.cpp -@@ -1393,7 +1393,7 @@ namespace MainWindow { +@@ -1395,7 +1395,7 @@ namespace MainWindow { { W32Util::CenterWindow(hDlg); HWND versionBox = GetDlgItem(hDlg, IDC_VERSION); @@ -327,10 +332,10 @@ index 979a60ecb..a57927544 100644 SetWindowText(versionBox, ConvertUTF8ToWString(windowText).c_str()); } diff --git a/Windows/main.cpp b/Windows/main.cpp -index 4d948cfe5..e609cc1e0 100644 +index ecfe18fa4..3261151d2 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp -@@ -301,12 +301,6 @@ bool System_GetPropertyBool(SystemProperty prop) { +@@ -304,12 +304,6 @@ bool System_GetPropertyBool(SystemProperty prop) { return true; case SYSPROP_HAS_BACK_BUTTON: return true; @@ -340,26 +345,43 @@ index 4d948cfe5..e609cc1e0 100644 -#else - return false; -#endif + case SYSPROP_CAN_JIT: + return true; default: - return false; - } diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp -index 10fdf97e5..736b1fa66 100644 +index 2fad16224..8ed6dd9cd 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp -@@ -437,12 +437,6 @@ bool System_GetPropertyBool(SystemProperty prop) { +@@ -490,12 +490,6 @@ bool System_GetPropertyBool(SystemProperty prop) { case SYSPROP_HAS_FOLDER_BROWSER: // Uses OPEN_DOCUMENT_TREE to let you select a folder. - return androidVersion >= 21; + return androidVersion >= 21; // when ACTION_OPEN_DOCUMENT_TREE was added - case SYSPROP_APP_GOLD: -#ifdef GOLD - return true; -#else - return false; -#endif - default: - return false; - } + case SYSPROP_CAN_JIT: + return true; + case SYSPROP_ANDROID_SCOPED_STORAGE: +diff --git a/ios/main.mm b/ios/main.mm +index e53b7c7ab..fe69647ed 100644 +--- a/ios/main.mm ++++ b/ios/main.mm +@@ -148,12 +148,6 @@ bool System_GetPropertyBool(SystemProperty prop) { + switch (prop) { + case SYSPROP_HAS_BACK_BUTTON: + return false; +- case SYSPROP_APP_GOLD: +-#ifdef GOLD +- return true; +-#else +- return false; +-#endif + case SYSPROP_CAN_JIT: + return g_jitAvailable; + -- -2.30.1 +2.31.1 diff --git a/gnu/packages/patches/wgetpaste-update-bpaste.patch b/gnu/packages/patches/wgetpaste-update-bpaste.patch deleted file mode 100644 index f92a0c17ed..0000000000 --- a/gnu/packages/patches/wgetpaste-update-bpaste.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Tobias Geerinckx-Rice <me@tobias.gr> -Date: Tue, 01 Sep 2020 04:23:25 +0200 -Subject: [PATCH] Update bpaste URL & regular expressions. - -diff -Naur wgetpaste-2.30/wgetpaste wgetpaste-2.30a/wgetpaste ---- wgetpaste-2.30/wgetpaste 2020-07-31 23:56:05.000000000 +0200 -+++ wgetpaste-2.30a/wgetpaste 2020-09-01 04:22:37.499898403 +0200 -@@ -16,7 +16,7 @@ - SERVICES="codepad bpaste dpaste gists snippets" - # bpaste - ENGINE_bpaste=pinnwand --URL_bpaste="https://bpaste.net/" -+URL_bpaste="https://bpa.st/" - DEFAULT_EXPIRATION_bpaste="1week" - DEFAULT_LANGUAGE_bpaste="text" - # codepad -@@ -194,8 +194,8 @@ - xml+velocity xml xquery xslt xtend yaml" - EXPIRATIONS_pinnwand="1day 1week 1month never" - POST_pinnwand="submit=Paste! % % lexer expiry % code" --REGEX_LOC_pinnwand="\(/show/[^ ]*\).*$|https://bpaste.net\1" --REGEX_RAW_pinnwand='s|^\(https\?://[^/]*/\)show\(/[^ ]*/\?\)$|\1raw\2|' -+REGEX_LOC_pinnwand="\(/[^ ]*\).*$|https://bpa.st\1" -+REGEX_RAW_pinnwand='s|^\(https\?://[^/]*\)\(/[^ ]*/\?\)$|\1/raw\2|' - - ### errors - die() { |