From eb9d945a333c683160101db2dc14848dc77c66c7 Mon Sep 17 00:00:00 2001 From: suvari Date: Mon, 13 Jan 2020 11:15:54 +0300 Subject: [PATCH 1/6] chromium-browser: version bump to 79.0.3945.117 --- .../files/chromium-widevine.patch | 33 +++++-------- ...ude-algorithm-to-use-std-lower_bound.patch | 49 +++++++++++++++++++ .../launch_manager.h-uses-std-vector.patch | 36 ++++++++++++++ network/web/chromium-browser/pspec.xml | 25 +++++----- 4 files changed, 110 insertions(+), 33 deletions(-) create mode 100644 network/web/chromium-browser/files/include-algorithm-to-use-std-lower_bound.patch create mode 100644 network/web/chromium-browser/files/launch_manager.h-uses-std-vector.patch diff --git a/network/web/chromium-browser/files/chromium-widevine.patch b/network/web/chromium-browser/files/chromium-widevine.patch index 1a1a3f228b..32f0ae2fb5 100644 --- a/network/web/chromium-browser/files/chromium-widevine.patch +++ b/network/web/chromium-browser/files/chromium-widevine.patch @@ -1,22 +1,13 @@ -diff -upr chromium-71.0.3578.80.orig/chrome/common/chrome_content_client.cc chromium-71.0.3578.80/chrome/common/chrome_content_client.cc ---- chromium-71.0.3578.80.orig/chrome/common/chrome_content_client.cc 2018-12-03 20:16:43.000000000 +0000 -+++ chromium-71.0.3578.80/chrome/common/chrome_content_client.cc 2018-12-04 21:34:28.658206942 +0000 -@@ -99,7 +99,7 @@ - // Registers Widevine CDM if Widevine is enabled, the Widevine CDM is - // bundled and not a component. When the Widevine CDM is a component, it is - // registered in widevine_cdm_component_installer.cc. --#if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) -+#if BUILDFLAG(ENABLE_WIDEVINE) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) - #define REGISTER_BUNDLED_WIDEVINE_CDM - #include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck - // TODO(crbug.com/663554): Needed for WIDEVINE_CDM_VERSION_STRING. Support -diff -upr chromium-71.0.3578.80.orig/third_party/widevine/cdm/widevine_cdm_version.h chromium-71.0.3578.80/third_party/widevine/cdm/widevine_cdm_version.h ---- chromium-71.0.3578.80.orig/third_party/widevine/cdm/widevine_cdm_version.h 2018-12-03 20:18:01.000000000 +0000 -+++ chromium-71.0.3578.80/third_party/widevine/cdm/widevine_cdm_version.h 2018-12-04 21:37:45.635374949 +0000 -@@ -12,4 +12,6 @@ - // - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available - // as a string, e.g., "1.0.123.456"). +diff --git a/third_party/widevine/cdm/BUILD.gn b/third_party/widevine/cdm/BUILD.gn +index ed0e2f5208b..5b431a030d5 100644 +--- a/third_party/widevine/cdm/BUILD.gn ++++ b/third_party/widevine/cdm/BUILD.gn +@@ -14,7 +14,7 @@ buildflag_header("buildflags") { -+#define WIDEVINE_CDM_VERSION_STRING "unknown" -+ - #endif // WIDEVINE_CDM_VERSION_H_ + flags = [ + "ENABLE_WIDEVINE=$enable_widevine", +- "BUNDLE_WIDEVINE_CDM=$bundle_widevine_cdm", ++ "BUNDLE_WIDEVINE_CDM=true", + "ENABLE_WIDEVINE_CDM_COMPONENT=$enable_widevine_cdm_component", + ] + } diff --git a/network/web/chromium-browser/files/include-algorithm-to-use-std-lower_bound.patch b/network/web/chromium-browser/files/include-algorithm-to-use-std-lower_bound.patch new file mode 100644 index 0000000000..dc376321ff --- /dev/null +++ b/network/web/chromium-browser/files/include-algorithm-to-use-std-lower_bound.patch @@ -0,0 +1,49 @@ +From f7c177d35242311ea7a2cf49a0980c61664f27ba Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz +Date: Fri, 25 Oct 2019 15:07:09 +0000 +Subject: [PATCH] IWYU: include algorithm to use std::lower_bound in + ui/gfx/font.cc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fix GCC build because of missing include: +../../ui/gfx/font.cc: In function ‘gfx::Font::Weight gfx::FontWeightFromInt(int)’: +../../ui/gfx/font.cc:114:8: error: no matching function for call to ‘lower_bound(const gfx::Font::Weight*, const gfx::Font::Weight*, int&, gfx::FontWeightFromInt(int)::)’ + }); + ^ +In file included from /usr/include/c++/8/bits/char_traits.h:39, + from /usr/include/c++/8/string:40, + from ../../ui/gfx/font.h:8, + from ../../ui/gfx/font.cc:5: +/usr/include/c++/8/bits/stl_algobase.h:984:5: note: candidate: ‘template _ForwardIterator std::lower_bound(_ForwardIterator, _ForwardIterator, const _Tp&)’ + lower_bound(_ForwardIterator __first, _ForwardIterator __last, + ^~~~~~~~~~~ +/usr/include/c++/8/bits/stl_algobase.h:984:5: note: template argument deduction/substitution failed: +../../ui/gfx/font.cc:114:8: note: candidate expects 3 arguments, 4 provided + }); + ^ + +Bug: 819294 +Change-Id: Ic59dcf3a06bdd54d1d426c08a61624873a0ff30c +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879909 +Commit-Queue: Alexei Svitkine +Reviewed-by: Alexei Svitkine +Cr-Commit-Position: refs/heads/master@{#709472} +--- + ui/gfx/font.cc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/ui/gfx/font.cc b/ui/gfx/font.cc +index 21367fd7297..92b159e13d1 100644 +--- a/ui/gfx/font.cc ++++ b/ui/gfx/font.cc +@@ -4,6 +4,8 @@ + + #include "ui/gfx/font.h" + ++#include ++ + #include "base/strings/utf_string_conversions.h" + #include "build/build_config.h" + #include "ui/gfx/platform_font.h" diff --git a/network/web/chromium-browser/files/launch_manager.h-uses-std-vector.patch b/network/web/chromium-browser/files/launch_manager.h-uses-std-vector.patch new file mode 100644 index 0000000000..72abe9b9ce --- /dev/null +++ b/network/web/chromium-browser/files/launch_manager.h-uses-std-vector.patch @@ -0,0 +1,36 @@ +From 97eb905ba262382bc3583078761c68f4452aea71 Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz +Date: Fri, 25 Oct 2019 09:27:53 +0000 +Subject: [PATCH] IWYU: launch_manager.h uses std::vector +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add #include for using std::vector. This fixes GCC build. + +./../chrome/browser/apps/launch_service/launch_manager.h:46:15: error: ‘vector’ in namespace ‘std’ does not name a template type + static std::vector GetLaunchFilesFromCommandLine( + ^~~~~~ + +Bug: 819294 +Change-Id: I02ec3a2914a8fbe3aa0041017a0228f4b0ca1ec9 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879289 +Reviewed-by: Alexey Baskakov +Commit-Queue: José Dapena Paz +Cr-Commit-Position: refs/heads/master@{#709411} +--- + chrome/browser/apps/launch_service/launch_manager.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/chrome/browser/apps/launch_service/launch_manager.h b/chrome/browser/apps/launch_service/launch_manager.h +index 00aeb9d9c2a..76570ead0f9 100644 +--- a/chrome/browser/apps/launch_service/launch_manager.h ++++ b/chrome/browser/apps/launch_service/launch_manager.h +@@ -6,6 +6,7 @@ + #define CHROME_BROWSER_APPS_LAUNCH_SERVICE_LAUNCH_MANAGER_H_ + + #include ++#include + + #include "base/macros.h" + diff --git a/network/web/chromium-browser/pspec.xml b/network/web/chromium-browser/pspec.xml index 5e1bf9a1b4..5795f44fd1 100644 --- a/network/web/chromium-browser/pspec.xml +++ b/network/web/chromium-browser/pspec.xml @@ -13,7 +13,7 @@ app:gui A WebKit powered web browser Chromium-browser is an open-source web browser, powered by WebKit. - http://gsdview.appspot.com/chromium-browser-official/chromium-78.0.3904.70.tar.xz + http://gsdview.appspot.com/chromium-browser-official/chromium-79.0.3945.117.tar.xz alsa-lib-devel at-spi2-atk-devel @@ -95,12 +95,12 @@ chromium-skia-harmony.patch chromium-widevine.patch - add-missing-include-for-unique_ptr.patch - dns_util-make-DohUpgradeEntry-non-const.patch - fix-shutdown-crash-in-ProfileManager.patch + include-algorithm-to-use-std-lower_bound.patch + launch_manager.h-uses-std-vector.patch fix-spammy-unique-font-matching-log.patch + chromium-browser @@ -117,8 +117,6 @@ gtk3 - - libXcomposite libXcursor libXdamage @@ -149,15 +147,11 @@ libX11 libgcc - - harfbuzz re2 ffmpeg - freetype libopus snappy - webp freetype libdrm libjpeg-turbo @@ -180,7 +174,14 @@ - + + 2020-01-12 + 79.0.3945.117 + Version Bump. + Idris Kalp + idriskalp@gmail.com + + 2019-09-25 78.0.3904.70 Version Bump. @@ -307,4 +308,4 @@ admin@pisilinux.org - + \ No newline at end of file From 65c5f5cc3170dbb39e14e21b44820d4ef0a06438 Mon Sep 17 00:00:00 2001 From: Rmys Date: Wed, 15 Jan 2020 23:43:08 +0300 Subject: [PATCH 2/6] java --- programming/language/java/eclipse-ecj/pspec.xml | 7 +++++++ programming/language/java/fastjar/pspec.xml | 7 +++++++ programming/language/java/icedtea-web-java7/pspec.xml | 7 +++++++ programming/language/java/java7-openjdk/pspec.xml | 7 +++++++ programming/language/java/npapi-sdk/pspec.xml | 7 +++++++ programming/language/java/rhino/pspec.xml | 7 +++++++ 6 files changed, 42 insertions(+) diff --git a/programming/language/java/eclipse-ecj/pspec.xml b/programming/language/java/eclipse-ecj/pspec.xml index 63583e2faf..812437e697 100644 --- a/programming/language/java/eclipse-ecj/pspec.xml +++ b/programming/language/java/eclipse-ecj/pspec.xml @@ -38,6 +38,13 @@ + + 2020-01-15 + 4.4.2_201502041700 + Rebuild + Mustafa Cinasal + muscnsl@gmail.com + 2019-09-22 4.4.2_201502041700 diff --git a/programming/language/java/fastjar/pspec.xml b/programming/language/java/fastjar/pspec.xml index 8f45ba7744..50e9aa35a3 100644 --- a/programming/language/java/fastjar/pspec.xml +++ b/programming/language/java/fastjar/pspec.xml @@ -30,6 +30,13 @@ + + 2020-01-16 + 0.98 + Rebuild New T. + Mustafa Cinasal + muscnsl@gmail.com + 2018-08-16 0.98 diff --git a/programming/language/java/icedtea-web-java7/pspec.xml b/programming/language/java/icedtea-web-java7/pspec.xml index bbea9a3d65..84e34b52dc 100644 --- a/programming/language/java/icedtea-web-java7/pspec.xml +++ b/programming/language/java/icedtea-web-java7/pspec.xml @@ -45,6 +45,13 @@ + + 2020-01-15 + 1.6.2 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2019-09-22 1.6.2 diff --git a/programming/language/java/java7-openjdk/pspec.xml b/programming/language/java/java7-openjdk/pspec.xml index 793b4e4f5b..c286cec3fa 100755 --- a/programming/language/java/java7-openjdk/pspec.xml +++ b/programming/language/java/java7-openjdk/pspec.xml @@ -302,6 +302,13 @@ + + 2020-01-15 + 7u_231.2.6.19 + Rebuild. + Pisi Linux Community + admin@pisilinux.org + 2019-09-22 7u_231.2.6.19 diff --git a/programming/language/java/npapi-sdk/pspec.xml b/programming/language/java/npapi-sdk/pspec.xml index 194ec10261..5989f4dcbc 100644 --- a/programming/language/java/npapi-sdk/pspec.xml +++ b/programming/language/java/npapi-sdk/pspec.xml @@ -35,6 +35,13 @@ + + 2020-01-16 + 0.27.2 + Rebuild New T. + Mustafa Cinasal + muscnsl@gmail.com + 2018-08-16 0.27.2 diff --git a/programming/language/java/rhino/pspec.xml b/programming/language/java/rhino/pspec.xml index 8ef34b1406..265a2f4419 100644 --- a/programming/language/java/rhino/pspec.xml +++ b/programming/language/java/rhino/pspec.xml @@ -40,6 +40,13 @@ + + 2020-01-15 + 1.7.7.2 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2019-09-22 1.7.7.2 From 24e44e62543e2f28c2a236f0b9ea5d9dada8e1c1 Mon Sep 17 00:00:00 2001 From: Rmys Date: Wed, 15 Jan 2020 23:52:14 +0300 Subject: [PATCH 3/6] npapi-sdk --- programming/language/java/npapi-sdk/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programming/language/java/npapi-sdk/pspec.xml b/programming/language/java/npapi-sdk/pspec.xml index 5989f4dcbc..fae44bc7bf 100644 --- a/programming/language/java/npapi-sdk/pspec.xml +++ b/programming/language/java/npapi-sdk/pspec.xml @@ -12,7 +12,7 @@ app:gui NPAPI-SDK is a bundle of Netscape Plugin Application Programming Interface headers by Mozilla. NPAPI-SDK is a bundle of Netscape Plugin Application Programming Interface headers by Mozilla. This package provides a clear way to install those headers and depend on them. - https://bitbucket.org/mgorny/npapi-sdk/downloads/npapi-sdk-0.27.2.tar.bz2 + https://github.com/mgorny/npapi-sdk/archive/npapi-sdk-0.27.2.tar.gz From 904da11f640c5bd908880b847cf60ece3d7aa7e9 Mon Sep 17 00:00:00 2001 From: Rmys Date: Thu, 16 Jan 2020 00:02:20 +0300 Subject: [PATCH 4/6] npapi-sdk --- programming/language/java/npapi-sdk/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programming/language/java/npapi-sdk/pspec.xml b/programming/language/java/npapi-sdk/pspec.xml index fae44bc7bf..a0e5a3b033 100644 --- a/programming/language/java/npapi-sdk/pspec.xml +++ b/programming/language/java/npapi-sdk/pspec.xml @@ -12,7 +12,7 @@ app:gui NPAPI-SDK is a bundle of Netscape Plugin Application Programming Interface headers by Mozilla. NPAPI-SDK is a bundle of Netscape Plugin Application Programming Interface headers by Mozilla. This package provides a clear way to install those headers and depend on them. - https://github.com/mgorny/npapi-sdk/archive/npapi-sdk-0.27.2.tar.gz + https://ftp.osuosl.org/pub/blfs/conglomeration/npapi-sdk/npapi-sdk-0.27.2.tar.bz2 From ac280dff264f876972bca8619f9b0f839d93938b Mon Sep 17 00:00:00 2001 From: Rmys Date: Thu, 16 Jan 2020 19:24:46 +0300 Subject: [PATCH 5/6] qt5 build deb --- desktop/lookandfeel/icon-theme-hicolor/pspec.xml | 7 +++++++ desktop/misc/desktop-file-utils/pspec.xml | 12 ++++++++++-- desktop/misc/shared-mime-info/pspec.xml | 9 ++++++++- hardware/misc/libmtdev/pspec.xml | 7 +++++++ network/misc/libproxy/pspec.xml | 7 +++++++ programming/misc/btyacc/pspec.xml | 7 +++++++ programming/misc/libinput/pspec.xml | 10 +++++++++- server/database/firebird/pspec.xml | 7 +++++++ 8 files changed, 62 insertions(+), 4 deletions(-) diff --git a/desktop/lookandfeel/icon-theme-hicolor/pspec.xml b/desktop/lookandfeel/icon-theme-hicolor/pspec.xml index e475431223..efc773818c 100644 --- a/desktop/lookandfeel/icon-theme-hicolor/pspec.xml +++ b/desktop/lookandfeel/icon-theme-hicolor/pspec.xml @@ -24,6 +24,13 @@ + + 2020-01-16 + 0.17 + Rebuild + Pisi Linux Community + admin@pisilinux.org + 2018-07-30 0.17 diff --git a/desktop/misc/desktop-file-utils/pspec.xml b/desktop/misc/desktop-file-utils/pspec.xml index c64fc4a2a5..efb8df2fee 100644 --- a/desktop/misc/desktop-file-utils/pspec.xml +++ b/desktop/misc/desktop-file-utils/pspec.xml @@ -12,12 +12,12 @@ library Command line utilities to work with desktop menu entries desktop files are used to describe an application for inclusion in GNOME or KDE menus. This package contains desktop-file-validate which checks whether a .desktop file complies with the specification and desktop-file-install which installs a desktop file to the standard directory, optionally fixing it up in the process. - http://freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.23.tar.xz + http://freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.24.tar.xz glib2-devel - mimeutils.patch + @@ -30,6 +30,7 @@ /usr/bin /usr/share/doc /usr/share/man/man1/ + /usr/share/emacs/site-lisp/desktop-entry-mode.el System.PackageHandler @@ -37,6 +38,13 @@ + + 2020-01-16 + 0.24 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2018-07-27 0.23 diff --git a/desktop/misc/shared-mime-info/pspec.xml b/desktop/misc/shared-mime-info/pspec.xml index a65e4ef7e4..e2e76cdb4d 100644 --- a/desktop/misc/shared-mime-info/pspec.xml +++ b/desktop/misc/shared-mime-info/pspec.xml @@ -57,6 +57,13 @@ + + 2020-01-16 + 1.15 + Version bump. + Kamil Atlı + suvari@pisilinux.org + 2019-11-06 1.15 @@ -107,4 +114,4 @@ ertugrulerata@gmail.com - \ No newline at end of file + diff --git a/hardware/misc/libmtdev/pspec.xml b/hardware/misc/libmtdev/pspec.xml index 4bf9f8b9d2..1873913f7a 100644 --- a/hardware/misc/libmtdev/pspec.xml +++ b/hardware/misc/libmtdev/pspec.xml @@ -54,6 +54,13 @@ + + 2020-01-16 + 1.1.5 + Rebuild. + Pisi Linux Community + admin@pisilinux.org + 2018-07-31 1.1.5 diff --git a/network/misc/libproxy/pspec.xml b/network/misc/libproxy/pspec.xml index 48992d0d79..4c74b597e7 100644 --- a/network/misc/libproxy/pspec.xml +++ b/network/misc/libproxy/pspec.xml @@ -104,6 +104,13 @@ + + 2020-01-16 + 0.4.15 + Rebuild + Mustafa Cinasl + muscnsl@gmail.com + 2019-04-16 0.4.15 diff --git a/programming/misc/btyacc/pspec.xml b/programming/misc/btyacc/pspec.xml index 8635cf7bd1..68a6649196 100644 --- a/programming/misc/btyacc/pspec.xml +++ b/programming/misc/btyacc/pspec.xml @@ -29,6 +29,13 @@ + + 2020-01-16 + 3.0 + Rebuild. + Pisi Linux Community + admin@pisilinux.org + 2018-07-31 3.0 diff --git a/programming/misc/libinput/pspec.xml b/programming/misc/libinput/pspec.xml index 7374191867..f277acf5c6 100644 --- a/programming/misc/libinput/pspec.xml +++ b/programming/misc/libinput/pspec.xml @@ -12,7 +12,7 @@ app:console library that handles input devices for display servers and other applications that need to directly deal with input devices. It provides device detection, device handling, input device event processing and abstraction so minimize the amount of custom input code the user of libinput need to provide the common set of functionality that users expect. - https://www.freedesktop.org/software/libinput/libinput-1.14.2.tar.xz + https://www.freedesktop.org/software/libinput/libinput-1.14.901.tar.xz meson gtk3-devel @@ -23,6 +23,7 @@ eudev-devel libmtdev-devel libwacom-devel + libXtst-devel @@ -63,6 +64,13 @@ + + 2020-01-16 + 1.14.901 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2019-10-18 1.14.2 diff --git a/server/database/firebird/pspec.xml b/server/database/firebird/pspec.xml index 276651c3e8..b327b0a1f4 100644 --- a/server/database/firebird/pspec.xml +++ b/server/database/firebird/pspec.xml @@ -107,6 +107,13 @@ + + 2020-01-16 + 2.5.7.27050 + Rebuild. + Pisi Linux Community + admin@pisilinux.org + 2018-07-31 2.5.7.27050 From efdf279b99a9975bc47a157884d5ea17a3477e84 Mon Sep 17 00:00:00 2001 From: Rmys Date: Thu, 16 Jan 2020 21:28:41 +0300 Subject: [PATCH 6/6] qt5 build deb --- server/database/firebird/actions.py | 3 +++ .../database/firebird/files/006-musl-glibc.patch | 11 +++++++++++ server/database/firebird/files/007-libio.patch | 14 ++++++++++++++ .../database/firebird/files/007-musl-libio.patch | 11 +++++++++++ server/database/firebird/pspec.xml | 2 ++ 5 files changed, 41 insertions(+) create mode 100644 server/database/firebird/files/006-musl-glibc.patch create mode 100644 server/database/firebird/files/007-libio.patch create mode 100644 server/database/firebird/files/007-musl-libio.patch diff --git a/server/database/firebird/actions.py b/server/database/firebird/actions.py index 80692960a4..b04538a95e 100644 --- a/server/database/firebird/actions.py +++ b/server/database/firebird/actions.py @@ -20,6 +20,9 @@ def setup(): pisitools.dosed("src/msgs/history2.sql", 'isql\s', 'fbsql ') pisitools.dosed("src/msgs/messages2.sql", 'isql\s', 'fbsql ') pisitools.dosed("src/msgs/messages2.sql", 'ISQL\s', 'FBSQL ') + + #pisitools.dosed("src/jrd/perf.h", '#include ', '') + shelltools.system("find ./ -name \*.sh -print0 | xargs -0 chmod +x") for d in ("btyacc", "editline", "icu"): shelltools.unlinkDir("extern/%s" % d) diff --git a/server/database/firebird/files/006-musl-glibc.patch b/server/database/firebird/files/006-musl-glibc.patch new file mode 100644 index 0000000000..68b451d16e --- /dev/null +++ b/server/database/firebird/files/006-musl-glibc.patch @@ -0,0 +1,11 @@ +--- src/common/classes/rwlock.h 2015-03-27 14:47:01.000000000 +0100 ++++ src/common/classes/rwlock.h 2016-02-24 15:11:46.043602883 +0100 +@@ -191,7 +191,7 @@ + + void init() + { +-#if defined(LINUX) && !defined(USE_VALGRIND) ++#if defined(LINUX) && defined(__GLIBC__) && !defined(USE_VALGRIND) + pthread_rwlockattr_t attr; + if (pthread_rwlockattr_init(&attr)) + system_call_failed::raise("pthread_rwlockattr_init"); diff --git a/server/database/firebird/files/007-libio.patch b/server/database/firebird/files/007-libio.patch new file mode 100644 index 0000000000..af8bd0efc2 --- /dev/null +++ b/server/database/firebird/files/007-libio.patch @@ -0,0 +1,14 @@ +--- src/jrd/perf.h 2018-01-05 ++++ src/jrd/perf.h 2018-08-20 +@@ -31,10 +31,6 @@ + #ifndef JRD_PERF_H + #define JRD_PERF_H + +-#ifdef LINUX +-#include +-#endif +- + #ifdef HAVE_TIMES + #include + #include + diff --git a/server/database/firebird/files/007-musl-libio.patch b/server/database/firebird/files/007-musl-libio.patch new file mode 100644 index 0000000000..cb74e9b5c8 --- /dev/null +++ b/server/database/firebird/files/007-musl-libio.patch @@ -0,0 +1,11 @@ +--- src/jrd/perf.h 2015-03-27 14:46:58.000000000 +0100 ++++ src/jrd/perf.h 2016-02-24 15:38:06.674716837 +0100 +@@ -31,7 +31,7 @@ + #ifndef JRD_PERF_H + #define JRD_PERF_H + +-#ifdef LINUX ++#if defined(LINUX) && defined(__GLIBC__) + #include + #endif + diff --git a/server/database/firebird/pspec.xml b/server/database/firebird/pspec.xml index b327b0a1f4..28a907ba3d 100644 --- a/server/database/firebird/pspec.xml +++ b/server/database/firebird/pspec.xml @@ -34,6 +34,8 @@ + 006-musl-glibc.patch + 007-libio.patch