Merge branch 'master' of github.com:pisilinux/main
This commit is contained in:
@@ -24,6 +24,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="5">
|
||||
<Date>2020-01-16</Date>
|
||||
<Version>0.17</Version>
|
||||
<Comment>Rebuild</Comment>
|
||||
<Name>Pisi Linux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="4">
|
||||
<Date>2018-07-30</Date>
|
||||
<Version>0.17</Version>
|
||||
|
||||
@@ -12,12 +12,12 @@
|
||||
<IsA>library</IsA>
|
||||
<Summary>Command line utilities to work with desktop menu entries</Summary>
|
||||
<Description>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.</Description>
|
||||
<Archive sha1sum="10e9df65fdf2b896ce4d5f16616ea0df7c01d8f8" type="tarxz">http://freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.23.tar.xz</Archive>
|
||||
<Archive sha1sum="581f14e3c09a96197196b67cf2039a9a377c42b0" type="tarxz">http://freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.24.tar.xz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>glib2-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<Patch>mimeutils.patch</Patch>
|
||||
<!-- <Patch>mimeutils.patch</Patch> -->
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
@@ -30,6 +30,7 @@
|
||||
<Path fileType="executable">/usr/bin</Path>
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
<Path fileType="man">/usr/share/man/man1/</Path>
|
||||
<Path fileType="data">/usr/share/emacs/site-lisp/desktop-entry-mode.el</Path>
|
||||
</Files>
|
||||
<Provides>
|
||||
<COMAR script="pakhandler.py">System.PackageHandler</COMAR>
|
||||
@@ -37,6 +38,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="6">
|
||||
<Date>2020-01-16</Date>
|
||||
<Version>0.24</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="5">
|
||||
<Date>2018-07-27</Date>
|
||||
<Version>0.23</Version>
|
||||
|
||||
@@ -57,6 +57,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="8">
|
||||
<Date>2020-01-16</Date>
|
||||
<Version>1.15</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Kamil Atlı</Name>
|
||||
<Email>suvari@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="7">
|
||||
<Date>2019-11-06</Date>
|
||||
<Version>1.15</Version>
|
||||
@@ -107,4 +114,4 @@
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
</PISI>
|
||||
|
||||
@@ -54,6 +54,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="5">
|
||||
<Date>2020-01-16</Date>
|
||||
<Version>1.1.5</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Pisi Linux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="4">
|
||||
<Date>2018-07-31</Date>
|
||||
<Version>1.1.5</Version>
|
||||
|
||||
@@ -104,6 +104,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="6">
|
||||
<Date>2020-01-16</Date>
|
||||
<Version>0.4.15</Version>
|
||||
<Comment>Rebuild</Comment>
|
||||
<Name>Mustafa Cinasl</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="5">
|
||||
<Date>2019-04-16</Date>
|
||||
<Version>0.4.15</Version>
|
||||
|
||||
@@ -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",
|
||||
]
|
||||
}
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
From f7c177d35242311ea7a2cf49a0980c61664f27ba Mon Sep 17 00:00:00 2001
|
||||
From: Jose Dapena Paz <jose.dapena@lge.com>
|
||||
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)::<lambda(const gfx::Font::Weight&, const 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<class _ForwardIterator, class _Tp> _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 <asvitkine@chromium.org>
|
||||
Reviewed-by: Alexei Svitkine <asvitkine@chromium.org>
|
||||
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 <algorithm>
|
||||
+
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
#include "build/build_config.h"
|
||||
#include "ui/gfx/platform_font.h"
|
||||
@@ -0,0 +1,36 @@
|
||||
From 97eb905ba262382bc3583078761c68f4452aea71 Mon Sep 17 00:00:00 2001
|
||||
From: Jose Dapena Paz <jose.dapena@lge.com>
|
||||
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 <vector> 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<base::FilePath> GetLaunchFilesFromCommandLine(
|
||||
^~~~~~
|
||||
|
||||
Bug: 819294
|
||||
Change-Id: I02ec3a2914a8fbe3aa0041017a0228f4b0ca1ec9
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879289
|
||||
Reviewed-by: Alexey Baskakov <loyso@chromium.org>
|
||||
Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
|
||||
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 <string>
|
||||
+#include <vector>
|
||||
|
||||
#include "base/macros.h"
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
<IsA>app:gui</IsA>
|
||||
<Summary>A WebKit powered web browser</Summary>
|
||||
<Description>Chromium-browser is an open-source web browser, powered by WebKit.</Description>
|
||||
<Archive type="tarxz" sha1sum="b8c177c27ba90a7dcdf5e59d78512c75d63b1746">http://gsdview.appspot.com/chromium-browser-official/chromium-78.0.3904.70.tar.xz</Archive>
|
||||
<Archive type="tarxz" sha1sum="4dff5f8f552f27050a41df9de02df90bb02dfc32">http://gsdview.appspot.com/chromium-browser-official/chromium-79.0.3945.117.tar.xz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>alsa-lib-devel</Dependency>
|
||||
<Dependency>at-spi2-atk-devel</Dependency>
|
||||
@@ -95,12 +95,12 @@
|
||||
<Patches>
|
||||
<Patch level="0">chromium-skia-harmony.patch</Patch>
|
||||
<Patch level="1">chromium-widevine.patch</Patch>
|
||||
<Patch level="1">add-missing-include-for-unique_ptr.patch</Patch>
|
||||
<Patch level="1">dns_util-make-DohUpgradeEntry-non-const.patch</Patch>
|
||||
<Patch level="1">fix-shutdown-crash-in-ProfileManager.patch</Patch>
|
||||
<Patch level="1">include-algorithm-to-use-std-lower_bound.patch</Patch>
|
||||
<Patch level="1">launch_manager.h-uses-std-vector.patch</Patch>
|
||||
<Patch level="1">fix-spammy-unique-font-matching-log.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>chromium-browser</Name>
|
||||
<RuntimeDependencies>
|
||||
@@ -117,8 +117,6 @@
|
||||
<!--Dependency>gtk2</Dependency-->
|
||||
<Dependency>gtk3</Dependency>
|
||||
<!--Dependency>libevent</Dependency-->
|
||||
<!--Dependency>libjpeg-turbo</Dependency-->
|
||||
<!--Dependency>libopus</Dependency-->
|
||||
<Dependency>libXcomposite</Dependency>
|
||||
<Dependency>libXcursor</Dependency>
|
||||
<Dependency>libXdamage</Dependency>
|
||||
@@ -149,15 +147,11 @@
|
||||
<Dependency>libX11</Dependency>
|
||||
<Dependency>libgcc</Dependency>
|
||||
<!--Dependency>libpng</Dependency-->
|
||||
<!--Dependency>snappy</Dependency-->
|
||||
<!--Dependency>freetype</Dependency-->
|
||||
<Dependency>harfbuzz</Dependency>
|
||||
<Dependency>re2</Dependency>
|
||||
<Dependency>ffmpeg</Dependency>
|
||||
<Dependency>freetype</Dependency>
|
||||
<Dependency>libopus</Dependency>
|
||||
<Dependency>snappy</Dependency>
|
||||
<Dependency>webp</Dependency>
|
||||
<Dependency>freetype</Dependency>
|
||||
<Dependency>libdrm</Dependency>
|
||||
<Dependency>libjpeg-turbo</Dependency>
|
||||
@@ -180,7 +174,14 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="17">
|
||||
<Update release="18">
|
||||
<Date>2020-01-12</Date>
|
||||
<Version>79.0.3945.117</Version>
|
||||
<Comment>Version Bump.</Comment>
|
||||
<Name>Idris Kalp</Name>
|
||||
<Email>idriskalp@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="17">
|
||||
<Date>2019-09-25</Date>
|
||||
<Version>78.0.3904.70</Version>
|
||||
<Comment>Version Bump.</Comment>
|
||||
@@ -307,4 +308,4 @@
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
</PISI>
|
||||
@@ -38,6 +38,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="7">
|
||||
<Date>2020-01-15</Date>
|
||||
<Version>4.4.2_201502041700</Version>
|
||||
<Comment>Rebuild</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="6">
|
||||
<Date>2019-09-22</Date>
|
||||
<Version>4.4.2_201502041700</Version>
|
||||
|
||||
@@ -30,6 +30,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="5">
|
||||
<Date>2020-01-16</Date>
|
||||
<Version>0.98</Version>
|
||||
<Comment>Rebuild New T.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="4">
|
||||
<Date>2018-08-16</Date>
|
||||
<Version>0.98</Version>
|
||||
|
||||
@@ -45,6 +45,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="5">
|
||||
<Date>2020-01-15</Date>
|
||||
<Version>1.6.2</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="4">
|
||||
<Date>2019-09-22</Date>
|
||||
<Version>1.6.2</Version>
|
||||
|
||||
@@ -302,6 +302,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="9">
|
||||
<Date>2020-01-15</Date>
|
||||
<Version>7u_231.2.6.19</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Pisi Linux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="8">
|
||||
<Date>2019-09-22</Date>
|
||||
<Version>7u_231.2.6.19</Version>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<IsA>app:gui</IsA>
|
||||
<Summary>NPAPI-SDK is a bundle of Netscape Plugin Application Programming Interface headers by Mozilla.</Summary>
|
||||
<Description>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.</Description>
|
||||
<Archive sha1sum="5aac3c76ea59aa2ac8113e2f742af51f4ae0c60c" type="tarbz2">https://bitbucket.org/mgorny/npapi-sdk/downloads/npapi-sdk-0.27.2.tar.bz2</Archive>
|
||||
<Archive sha1sum="5aac3c76ea59aa2ac8113e2f742af51f4ae0c60c" type="tarbz2">https://ftp.osuosl.org/pub/blfs/conglomeration/npapi-sdk/npapi-sdk-0.27.2.tar.bz2</Archive>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
@@ -35,6 +35,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2020-01-16</Date>
|
||||
<Version>0.27.2</Version>
|
||||
<Comment>Rebuild New T.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2018-08-16</Date>
|
||||
<Version>0.27.2</Version>
|
||||
|
||||
@@ -40,6 +40,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="7">
|
||||
<Date>2020-01-15</Date>
|
||||
<Version>1.7.7.2</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="6">
|
||||
<Date>2019-09-22</Date>
|
||||
<Version>1.7.7.2</Version>
|
||||
|
||||
@@ -29,6 +29,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="5">
|
||||
<Date>2020-01-16</Date>
|
||||
<Version>3.0</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Pisi Linux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="4">
|
||||
<Date>2018-07-31</Date>
|
||||
<Version>3.0</Version>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<IsA>app:console</IsA>
|
||||
<Summary>library that handles input devices for display servers and other applications that need to directly deal with input devices.</Summary>
|
||||
<Description>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.</Description>
|
||||
<Archive sha1sum="fe3d33ec7d180df43987b23212d4bf1f69690580" type="tarxz">https://www.freedesktop.org/software/libinput/libinput-1.14.2.tar.xz</Archive>
|
||||
<Archive sha1sum="7a85cce2c2786751772f95911d996a472a1f53bf" type="tarxz">https://www.freedesktop.org/software/libinput/libinput-1.14.901.tar.xz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>meson</Dependency>
|
||||
<Dependency>gtk3-devel</Dependency>
|
||||
@@ -23,6 +23,7 @@
|
||||
<Dependency>eudev-devel</Dependency>
|
||||
<Dependency>libmtdev-devel</Dependency>
|
||||
<Dependency>libwacom-devel</Dependency>
|
||||
<Dependency>libXtst-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
</Source>
|
||||
|
||||
@@ -63,6 +64,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="14">
|
||||
<Date>2020-01-16</Date>
|
||||
<Version>1.14.901</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="13">
|
||||
<Date>2019-10-18</Date>
|
||||
<Version>1.14.2</Version>
|
||||
|
||||
@@ -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 <libio.h>', '')
|
||||
|
||||
shelltools.system("find ./ -name \*.sh -print0 | xargs -0 chmod +x")
|
||||
for d in ("btyacc", "editline", "icu"):
|
||||
shelltools.unlinkDir("extern/%s" % d)
|
||||
|
||||
@@ -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");
|
||||
@@ -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 <libio.h>
|
||||
-#endif
|
||||
-
|
||||
#ifdef HAVE_TIMES
|
||||
#include <sys/types.h>
|
||||
#include <sys/times.h>
|
||||
|
||||
@@ -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 <libio.h>
|
||||
#endif
|
||||
|
||||
@@ -34,6 +34,8 @@
|
||||
<!--Patch level="1">Provide-sized-global-delete-operators-when-compiled.patch</Patch>
|
||||
<Patch level="1">Make-the-generated-code-compatible-with-gcc-6-in-C-1.patch</Patch>
|
||||
<Patch level="1">Firebird-gcc-icu.patch</Patch-->
|
||||
<Patch>006-musl-glibc.patch</Patch>
|
||||
<Patch>007-libio.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
@@ -107,6 +109,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="6">
|
||||
<Date>2020-01-16</Date>
|
||||
<Version>2.5.7.27050</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Pisi Linux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="5">
|
||||
<Date>2018-07-31</Date>
|
||||
<Version>2.5.7.27050</Version>
|
||||
|
||||
Reference in New Issue
Block a user