parent
44b1ab9b6a
commit
92d56f7535
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672732016
|
||||
SHA256 (KDE/release-service/22.12.1/kmag-22.12.1.tar.xz) = 7319e48bdf559cfddbcbb6bc78e9dbc686304089e32fe550481ba2a5e4487827
|
||||
SIZE (KDE/release-service/22.12.1/kmag-22.12.1.tar.xz) = 724036
|
||||
TIMESTAMP = 1675180164
|
||||
SHA256 (KDE/release-service/22.12.2/kmag-22.12.2.tar.xz) = a61a1342994bc0ef9d5aee3b86bbca5acd453250651d9ec1b04293452a385985
|
||||
SIZE (KDE/release-service/22.12.2/kmag-22.12.2.tar.xz) = 724024
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672732017
|
||||
SHA256 (KDE/release-service/22.12.1/kmousetool-22.12.1.tar.xz) = 5cda02ba88b13606af082d7926f35199b1fdf167ca22e8fdbf8534fa0181f77c
|
||||
SIZE (KDE/release-service/22.12.1/kmousetool-22.12.1.tar.xz) = 129248
|
||||
TIMESTAMP = 1675180165
|
||||
SHA256 (KDE/release-service/22.12.2/kmousetool-22.12.2.tar.xz) = 229e4973a04f0bbc36bd83b39385e02e4c942196d93c7cbfe40925fa0710805e
|
||||
SIZE (KDE/release-service/22.12.2/kmousetool-22.12.2.tar.xz) = 129256
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672732018
|
||||
SHA256 (KDE/release-service/22.12.1/kmouth-22.12.1.tar.xz) = ad1a5ae2fa816c92b8e54e221d4c634845ddc41928a2cd9bc6f031ea4735783e
|
||||
SIZE (KDE/release-service/22.12.1/kmouth-22.12.1.tar.xz) = 2086960
|
||||
TIMESTAMP = 1675180166
|
||||
SHA256 (KDE/release-service/22.12.2/kmouth-22.12.2.tar.xz) = 7420721652a1e79ccfa9dd14777367773fa874b2d46cc6c0302d8194baa5a333
|
||||
SIZE (KDE/release-service/22.12.2/kmouth-22.12.2.tar.xz) = 2087748
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672932263
|
||||
SHA256 (KDE/release-service/22.12.1/ark-22.12.1.tar.xz) = 270c245b3be8fd373704a05889507a6b36ec6de760339b30766beede591b7e0c
|
||||
SIZE (KDE/release-service/22.12.1/ark-22.12.1.tar.xz) = 2873148
|
||||
TIMESTAMP = 1675180046
|
||||
SHA256 (KDE/release-service/22.12.2/ark-22.12.2.tar.xz) = 6befac3f99821274543433802a5e8185364d6e920c183b592dab9452ad0a50c3
|
||||
SIZE (KDE/release-service/22.12.2/ark-22.12.2.tar.xz) = 2874720
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672732003
|
||||
SHA256 (KDE/release-service/22.12.1/kosmindoormap-22.12.1.tar.xz) = 62b780cbc27a24c0e464bf8e6c272fbae4df68c426b6da4d94de68dfec8267b9
|
||||
SIZE (KDE/release-service/22.12.1/kosmindoormap-22.12.1.tar.xz) = 363444
|
||||
TIMESTAMP = 1675180151
|
||||
SHA256 (KDE/release-service/22.12.2/kosmindoormap-22.12.2.tar.xz) = d8ed1019966c691b9d9c66d45f19d327230889678f15e2f814466cf19d92c5da
|
||||
SIZE (KDE/release-service/22.12.2/kosmindoormap-22.12.2.tar.xz) = 363444
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672732002
|
||||
SHA256 (KDE/release-service/22.12.1/marble-22.12.1.tar.xz) = 5bf4c4e2ee81224682b5ebda3b33f2475f332cf8ef9b220590ff9e87d9771ac2
|
||||
SIZE (KDE/release-service/22.12.1/marble-22.12.1.tar.xz) = 53748000
|
||||
TIMESTAMP = 1675180150
|
||||
SHA256 (KDE/release-service/22.12.2/marble-22.12.2.tar.xz) = ed9a6aed3c5c5057cce25e28ac0e9eaf377d79d866375fa62a5ac072d4edda3a
|
||||
SIZE (KDE/release-service/22.12.2/marble-22.12.2.tar.xz) = 53753552
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731903
|
||||
SHA256 (KDE/release-service/22.12.1/audiocd-kio-22.12.1.tar.xz) = e5ab1889b547b9fb3fb140ea767a7db99258c91684a9886bd388bb3b2e99d154
|
||||
SIZE (KDE/release-service/22.12.1/audiocd-kio-22.12.1.tar.xz) = 560600
|
||||
TIMESTAMP = 1675180052
|
||||
SHA256 (KDE/release-service/22.12.2/audiocd-kio-22.12.2.tar.xz) = f25f03ddc3fe5a3743eb2f4c2f5535597f440be14bbe081940222b4bcd7c86fc
|
||||
SIZE (KDE/release-service/22.12.2/audiocd-kio-22.12.2.tar.xz) = 561192
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731899
|
||||
SHA256 (KDE/release-service/22.12.1/elisa-22.12.1.tar.xz) = ae64f04a5ccf936e9cba31d4c9b81688e9d4d98e9dcddc1e1ef1a57fc50e91fb
|
||||
SIZE (KDE/release-service/22.12.1/elisa-22.12.1.tar.xz) = 1796440
|
||||
TIMESTAMP = 1675180048
|
||||
SHA256 (KDE/release-service/22.12.2/elisa-22.12.2.tar.xz) = 59871e22a330ede2d28bc3b24a1b1b727c6c4b2d5f38b3750a4467c3cf3c7f26
|
||||
SIZE (KDE/release-service/22.12.2/elisa-22.12.2.tar.xz) = 1798524
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731904
|
||||
SHA256 (KDE/release-service/22.12.1/juk-22.12.1.tar.xz) = a17a0f88a49448a1408efa62b59a48ab493b5f393c9e7d57a2c9bfba68a0d418
|
||||
SIZE (KDE/release-service/22.12.1/juk-22.12.1.tar.xz) = 2074884
|
||||
TIMESTAMP = 1675180053
|
||||
SHA256 (KDE/release-service/22.12.2/juk-22.12.2.tar.xz) = 6e8521618282de7973b7ca4649b095d64aa0d0ae10b82dfad2943e9517f721c2
|
||||
SIZE (KDE/release-service/22.12.2/juk-22.12.2.tar.xz) = 2075308
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731902
|
||||
SHA256 (KDE/release-service/22.12.1/kmix-22.12.1.tar.xz) = a9de19037c2e1f6ed7206c163ede0e9d23b5158063af22abe7a21068f621d802
|
||||
SIZE (KDE/release-service/22.12.1/kmix-22.12.1.tar.xz) = 1194660
|
||||
TIMESTAMP = 1675180051
|
||||
SHA256 (KDE/release-service/22.12.2/kmix-22.12.2.tar.xz) = f5727ac6259c82e3803fa3850c1263460033926868b23f3c9ca451142a6f199c
|
||||
SIZE (KDE/release-service/22.12.2/kmix-22.12.2.tar.xz) = 1195092
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731898
|
||||
SHA256 (KDE/release-service/22.12.1/kwave-22.12.1.tar.xz) = e3fddf477a0b5d1736f0edf939a0204ca6c10c8b2cf922182aac1eee60f67433
|
||||
SIZE (KDE/release-service/22.12.1/kwave-22.12.1.tar.xz) = 6965616
|
||||
TIMESTAMP = 1675180047
|
||||
SHA256 (KDE/release-service/22.12.2/kwave-22.12.2.tar.xz) = 59386b7090ba1baca20317882d51a8fc5c77a88be34a0fd5c6e5fa63bb1ee23b
|
||||
SIZE (KDE/release-service/22.12.2/kwave-22.12.2.tar.xz) = 6965772
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731900
|
||||
SHA256 (KDE/release-service/22.12.1/libkcddb-22.12.1.tar.xz) = 0e28457c990a9a786ed012f35de35e053f9adef87fc13924e6beff4e2c16cd70
|
||||
SIZE (KDE/release-service/22.12.1/libkcddb-22.12.1.tar.xz) = 457980
|
||||
TIMESTAMP = 1675180049
|
||||
SHA256 (KDE/release-service/22.12.2/libkcddb-22.12.2.tar.xz) = 05a04700dd3d1df72b9c2e9a74cf5c0e57ef73e14744a0aefaed3abffcf104fc
|
||||
SIZE (KDE/release-service/22.12.2/libkcddb-22.12.2.tar.xz) = 458644
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731901
|
||||
SHA256 (KDE/release-service/22.12.1/libkcompactdisc-22.12.1.tar.xz) = 80346345851453c24fb8c0f240b37056ae264d027e5287827a2041efff2569d3
|
||||
SIZE (KDE/release-service/22.12.1/libkcompactdisc-22.12.1.tar.xz) = 98704
|
||||
TIMESTAMP = 1675180050
|
||||
SHA256 (KDE/release-service/22.12.2/libkcompactdisc-22.12.2.tar.xz) = c4b5b1ef01f2422f5f922ca11abe17eab983c8b61e0932766bd01edf3d5e3099
|
||||
SIZE (KDE/release-service/22.12.2/libkcompactdisc-22.12.2.tar.xz) = 98712
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
PORTNAME= spotipy
|
||||
DISTVERSION= 2.22.0
|
||||
DISTVERSION= 2.22.1
|
||||
CATEGORIES= audio python
|
||||
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
|
||||
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1671214324
|
||||
SHA256 (spotipy-dev-spotipy-2.22.0_GH0.tar.gz) = d5cc2672f249d339ba2054d4a0228a1670bc43fd9942f0e7c62fbe99e16f97e2
|
||||
SIZE (spotipy-dev-spotipy-2.22.0_GH0.tar.gz) = 109714
|
||||
TIMESTAMP = 1674727168
|
||||
SHA256 (spotipy-dev-spotipy-2.22.1_GH0.tar.gz) = f82ddd9d1a0da7d782cd70bc0fdc5943118958f6c93d8b9feedcff676ff2b419
|
||||
SIZE (spotipy-dev-spotipy-2.22.1_GH0.tar.gz) = 111228
|
||||
|
|
|
@ -1,11 +1,21 @@
|
|||
--- docs/conf.py.orig 2022-12-10 15:31:47 UTC
|
||||
--- docs/conf.py.orig 2023-01-23 19:00:55 UTC
|
||||
+++ docs/conf.py
|
||||
@@ -17,7 +17,7 @@ import sys, os
|
||||
@@ -11,7 +11,6 @@
|
||||
# All configuration values have a default; values that are commented out
|
||||
# serve to show the default.
|
||||
|
||||
-import spotipy
|
||||
import sys
|
||||
import os
|
||||
|
||||
@@ -19,8 +18,9 @@ import os
|
||||
# add these directories to sys.path here. If the directory is relative to the
|
||||
# documentation root, use os.path.abspath to make it absolute, like shown here.
|
||||
#sys.path.insert(0, os.path.abspath('.'))
|
||||
-sys.path.insert(0, os.path.abspath('.'))
|
||||
+sys.path.insert(0, os.path.abspath(os.path.join('..')))
|
||||
import spotipy
|
||||
|
||||
+import spotipy
|
||||
# -- General configuration -----------------------------------------------------
|
||||
|
||||
# If your documentation needs a minimal Sphinx version, state it here.
|
||||
|
|
|
@ -205,6 +205,7 @@
|
|||
SUBDIR += mysql-connector-java
|
||||
SUBDIR += mysql-connector-java51
|
||||
SUBDIR += mysql-connector-odbc
|
||||
SUBDIR += mysql-connector-odbc-80
|
||||
SUBDIR += mysql-q4m
|
||||
SUBDIR += mysql-udf
|
||||
SUBDIR += mysql2pgsql
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731906
|
||||
SHA256 (KDE/release-service/22.12.1/akonadi-22.12.1.tar.xz) = 6db090334990834878cb8fbdc8caedd6797fa0bb47c972c05e1acb028e8360cd
|
||||
SIZE (KDE/release-service/22.12.1/akonadi-22.12.1.tar.xz) = 1661708
|
||||
TIMESTAMP = 1675180056
|
||||
SHA256 (KDE/release-service/22.12.2/akonadi-22.12.2.tar.xz) = 416b9cba4287f26eae47392e06faf38a8b0f202fe493976a78887724ecfd98a5
|
||||
SIZE (KDE/release-service/22.12.2/akonadi-22.12.2.tar.xz) = 1661716
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
PORTNAME= geoserver
|
||||
PORTVERSION= 2.22.0
|
||||
PORTVERSION= 2.22.1
|
||||
CATEGORIES= databases geography java
|
||||
MASTER_SITES= SF/${PORTNAME}/GeoServer/${PORTVERSION}/extensions
|
||||
PKGNAMESUFFIX= -mysql-plugin
|
||||
|
@ -22,7 +22,7 @@ NO_BUILD= yes
|
|||
SUB_FILES= pkg-message
|
||||
|
||||
GSLIBDIR= geoserver/webapps/geoserver/WEB-INF/lib
|
||||
PLIST_FILES= ${GSLIBDIR}/gt-jdbc-mysql-28.0.jar \
|
||||
PLIST_FILES= ${GSLIBDIR}/gt-jdbc-mysql-28.1.jar \
|
||||
${GSLIBDIR}/mysql-connector-java-8.0.28.jar
|
||||
|
||||
do-install:
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1669558368
|
||||
SHA256 (geoserver-2.22.0-mysql-plugin.zip) = 923242f830cd02b9ef7639890ad8076f138b9c9c7979317015068070dca85513
|
||||
SIZE (geoserver-2.22.0-mysql-plugin.zip) = 2364726
|
||||
TIMESTAMP = 1675279415
|
||||
SHA256 (geoserver-2.22.1-mysql-plugin.zip) = 6b8862e7c484ebe9e05c1b052d787bee9bd02045ed00c88e474f31b59e6fb02e
|
||||
SIZE (geoserver-2.22.1-mysql-plugin.zip) = 2364727
|
||||
|
|
|
@ -1,64 +1,52 @@
|
|||
PORTNAME= mysql-connector-c++
|
||||
PORTVERSION= 1.1.13
|
||||
PORTREVISION= 3
|
||||
PORTVERSION= 8.0.32
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= MYSQL/Connector-C++
|
||||
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
|
||||
|
||||
MAINTAINER= bofh@FreeBSD.org
|
||||
COMMENT= MySQL database connector for C++
|
||||
WWW= https://dev.mysql.com/doc/relnotes/connector-cpp/en/index.html
|
||||
|
||||
LICENSE= GPLv2 # only
|
||||
LICENSE_FILE= ${WRKSRC}/LICENSE
|
||||
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
|
||||
|
||||
LIB_DEPENDS= libboost_regex.so:devel/boost-libs
|
||||
LIB_DEPENDS= libboost_regex.so:devel/boost-libs \
|
||||
liblz4.so:archivers/liblz4 \
|
||||
libprotobuf.so:devel/protobuf \
|
||||
libzstd.so:archivers/zstd
|
||||
|
||||
USES= cmake compiler:c++11-lang mysql ssl
|
||||
IGNORE_WITH_MYSQL= 80
|
||||
USES= cmake:noninja compiler:c++17-lang cpe gmake mysql ssl
|
||||
CPE_VENDOR= oracle
|
||||
USE_CXXSTD= c++17
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
CMAKE_ARGS= -DDOC_DESTINATION="${DOCSDIR}" -DCMAKE_ENABLE_C++11=ON
|
||||
CMAKE_ARGS= -DCMAKE_ENABLE_C++17=ON \
|
||||
-DWITH_LZ4=system \
|
||||
-DWITH_PROTOBUF=system \
|
||||
-DWITH_SYSTEM_LIBS=1 \
|
||||
-DWITH_ZLIB=system \
|
||||
-DWITH_ZSTD=system
|
||||
|
||||
PLIST_SUB= PORTVERSION=${PORTVERSION}
|
||||
|
||||
PORTDOCS= *
|
||||
|
||||
OPTIONS_DEFINE= DOCS
|
||||
OPTIONS_SUB= yes
|
||||
|
||||
DOCS_BUILD_DEPENDS= doxygen:devel/doxygen
|
||||
DOCS_CMAKE_ON= -DDOC_DESTINATION="${DOCSDIR}" \
|
||||
-DWITH_DOC=ON
|
||||
|
||||
post-install:
|
||||
@${RM} ${STAGEDIR}${PREFIX}/INFO_BIN
|
||||
@${RM} ${STAGEDIR}${PREFIX}/INFO_SRC
|
||||
|
||||
post-install-DOCS-on:
|
||||
@${RM} ${STAGEDIR}${DOCSDIR}/INSTALL \
|
||||
${STAGEDIR}${DOCSDIR}/COPYING
|
||||
|
||||
.if defined(MAINTAINER_MODE)
|
||||
CMAKE_ARGS+= -DMYSQLCPPCONN_TEST_NOT_IMPLEMENTED:BOOL=1 \
|
||||
-DMYSQLCPPCONN_BUILD_EXAMPLES:BOOL=1
|
||||
|
||||
do-test:
|
||||
# These tests assume that a database is running on localhost,
|
||||
# with user:root and pass:root
|
||||
(cd ${WRKDIR}/.build ; \
|
||||
test/CJUnitTestsPort/CJUnitTestsPort --verbose ; \
|
||||
test/driver_test --verbose ; \
|
||||
test/static_test --verbose ; \
|
||||
examples/connect --verbose ; \
|
||||
examples/connection_meta_schemaobj --verbose ; \
|
||||
examples/debug --verbose ; \
|
||||
examples/dynamic_load --verbose ; \
|
||||
examples/exceptions --verbose ; \
|
||||
examples/prepared_statement --verbose ; \
|
||||
examples/resultset --verbose ; \
|
||||
examples/resultset_binary --verbose ; \
|
||||
examples/resultset_meta --verbose ; \
|
||||
examples/resultset_types --verbose ; \
|
||||
examples/statement --verbose ; \
|
||||
test/unit/classes/art_resultset --verbose ; \
|
||||
test/unit/classes/connection --verbose ; \
|
||||
test/unit/classes/databasemetadata --verbose ; \
|
||||
test/unit/classes/parametermetadata --verbose ; \
|
||||
test/unit/classes/preparedstatement --verbose ; \
|
||||
test/unit/classes/resultset --verbose ; \
|
||||
test/unit/classes/resultsetmetadata --verbose ; \
|
||||
test/unit/classes/savepoint --verbose ; \
|
||||
test/unit/classes/statement )
|
||||
.endif
|
||||
${STAGEDIR}${DOCSDIR}/LICENSE.txt
|
||||
${MKDIR} ${STAGEDIR}${DOCSDIR}
|
||||
cd ${BUILD_WRKSRC}/doc && \
|
||||
${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1572299977
|
||||
SHA256 (mysql-connector-c++-1.1.13.tar.gz) = 332c87330ab167c17606b95d27af110c3f8f228658e8ba0d1f6e5f0a0acf3b41
|
||||
SIZE (mysql-connector-c++-1.1.13.tar.gz) = 519743
|
||||
TIMESTAMP = 1675349313
|
||||
SHA256 (mysql-connector-c++-8.0.32-src.tar.gz) = fbdb7f214427632f423e84ba7594be1f9205eac8128c6b1857203b2f5455cef3
|
||||
SIZE (mysql-connector-c++-8.0.32-src.tar.gz) = 4202413
|
||||
|
|
|
@ -1,10 +0,0 @@
|
|||
--- CMakeLists.txt.orig 2016-01-12 18:42:38 UTC
|
||||
+++ CMakeLists.txt
|
||||
@@ -316,7 +316,6 @@ ELSE(WIN32)
|
||||
SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
|
||||
ENDIF(WIN32)
|
||||
|
||||
-SET(DOC_DESTINATION ".")
|
||||
IF(RPM_LAYOUT)
|
||||
SET(DOC_DESTINATION "share/doc/${CPACK_PACKAGE_NAME}-${MYSQLCPPCONN_VERSION}")
|
||||
ENDIF()
|
|
@ -1,23 +1,33 @@
|
|||
include/cppconn/build_config.h
|
||||
include/cppconn/config.h
|
||||
include/cppconn/connection.h
|
||||
include/cppconn/datatype.h
|
||||
include/cppconn/driver.h
|
||||
include/cppconn/exception.h
|
||||
include/cppconn/metadata.h
|
||||
include/cppconn/parameter_metadata.h
|
||||
include/cppconn/prepared_statement.h
|
||||
include/cppconn/resultset.h
|
||||
include/cppconn/resultset_metadata.h
|
||||
include/cppconn/statement.h
|
||||
include/cppconn/sqlstring.h
|
||||
include/cppconn/variant.h
|
||||
include/cppconn/version_info.h
|
||||
include/cppconn/warning.h
|
||||
include/mysql_connection.h
|
||||
include/mysql_driver.h
|
||||
include/mysql_error.h
|
||||
lib/libmysqlcppconn-static.a
|
||||
lib/libmysqlcppconn.so
|
||||
lib/libmysqlcppconn.so.7
|
||||
lib/libmysqlcppconn.so.7.%%PORTVERSION%%
|
||||
include/mysqlx/common.h
|
||||
include/mysqlx/common/api.h
|
||||
include/mysqlx/common/error.h
|
||||
include/mysqlx/common/op_if.h
|
||||
include/mysqlx/common/settings.h
|
||||
include/mysqlx/common/util.h
|
||||
include/mysqlx/common/value.h
|
||||
include/mysqlx/common_constants.h
|
||||
include/mysqlx/devapi/collations.h
|
||||
include/mysqlx/devapi/collection_crud.h
|
||||
include/mysqlx/devapi/common.h
|
||||
include/mysqlx/devapi/crud.h
|
||||
include/mysqlx/devapi/detail/crud.h
|
||||
include/mysqlx/devapi/detail/error.h
|
||||
include/mysqlx/devapi/detail/result.h
|
||||
include/mysqlx/devapi/detail/row.h
|
||||
include/mysqlx/devapi/detail/session.h
|
||||
include/mysqlx/devapi/detail/settings.h
|
||||
include/mysqlx/devapi/document.h
|
||||
include/mysqlx/devapi/error.h
|
||||
include/mysqlx/devapi/executable.h
|
||||
include/mysqlx/devapi/mysql_charsets.h
|
||||
include/mysqlx/devapi/mysql_collations.h
|
||||
include/mysqlx/devapi/result.h
|
||||
include/mysqlx/devapi/row.h
|
||||
include/mysqlx/devapi/settings.h
|
||||
include/mysqlx/devapi/table_crud.h
|
||||
include/mysqlx/version_info.h
|
||||
include/mysqlx/xapi.h
|
||||
include/mysqlx/xdevapi.h
|
||||
lib/libmysqlcppconn8.so
|
||||
lib/libmysqlcppconn8.so.2
|
||||
lib/libmysqlcppconn8.so.2.%%PORTVERSION%%
|
||||
|
|
|
@ -12,18 +12,18 @@ WWW= https://dev.mysql.com/downloads/c-api/
|
|||
LICENSE= GPLv2
|
||||
LICENSE_FILE= ${WRKSRC}/COPYING
|
||||
|
||||
DEPRECATED= C Connector is included in mysql packages since 5.6
|
||||
EXPIRATION_DATE= 2023-03-31
|
||||
|
||||
USES= cmake compiler:features mysql ssl
|
||||
CMAKE_ARGS+= -DOPENSSL_INCLUDE_DIR="${OPENSSLINC}"
|
||||
USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}
|
||||
|
||||
CMAKE_ARGS+= -DOPENSSL_INCLUDE_DIR="${OPENSSLINC}"
|
||||
|
||||
PLIST_SUB+= PORTVERSION=${PORTVERSION}
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if ${ARCH} == "i386" && ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42
|
||||
CFLAGS+= -march=i586
|
||||
.endif
|
||||
|
||||
.if (${OPSYS} == FreeBSD && ${SSL_DEFAULT} == base) || ${SSL_DEFAULT} == openssl
|
||||
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-vio_viosslfactories.c \
|
||||
${FILESDIR}/extra-patch-mysys__ssl_my__aes__openssl.cc
|
||||
|
|
|
@ -0,0 +1,39 @@
|
|||
PORTNAME= mysql-connector-odbc
|
||||
PORTVERSION= 8.0.32
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= MYSQL/Connector-ODBC/8.0
|
||||
PKGNAMESUFFIX= -${DRIVER_MANAGER}-mysql${MYSQL_VER}
|
||||
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
|
||||
|
||||
MAINTAINER= bofh@FreeBSD.org
|
||||
COMMENT= ODBC driver for MySQL${MYSQL_VER} / ${DRIVER_MANAGER}
|
||||
WWW= https://www.mysql.com/
|
||||
|
||||
LICENSE= GPLv2
|
||||
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
|
||||
|
||||
LIB_DEPENDS= libodbc.so:databases/unixODBC \
|
||||
libunwind.so:devel/libunwind \
|
||||
libzstd.so:archivers/zstd
|
||||
|
||||
USES= cmake compiler:c++11-lang localbase:ldflags mysql:80 ssl
|
||||
IGNORE_WITH_MYSQL= 56 57 101m 102m 103m 57p 57w
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
CMAKE_ARGS= -DWITH_UNIXODBC=1 -DDISABLE_GUI=1
|
||||
|
||||
DRIVER_MANAGER= unixodbc
|
||||
|
||||
PLIST_FILES= bin/myodbc-installer \
|
||||
lib/libmyodbc8a.so \
|
||||
lib/libmyodbc8w.so \
|
||||
test/dltest
|
||||
PORTDOCS= *
|
||||
|
||||
OPTIONS_DEFINE= DOCS
|
||||
|
||||
post-install:
|
||||
@${RM} ${STAGEDIR}${PREFIX}/INFO_BIN
|
||||
@${RM} ${STAGEDIR}${PREFIX}/INFO_SRC
|
||||
|
||||
.include <bsd.port.mk>
|
|
@ -0,0 +1,3 @@
|
|||
TIMESTAMP = 1675358550
|
||||
SHA256 (mysql-connector-odbc-8.0.32-src.tar.gz) = 068f275afccc69e2ea5ea0d59ea0ecf0380710f9a9f6158e4751f07d5eec84a2
|
||||
SIZE (mysql-connector-odbc-8.0.32-src.tar.gz) = 3845574
|
|
@ -0,0 +1,234 @@
|
|||
--- CMakeLists.txt.orig 2022-12-10 21:58:26 UTC
|
||||
+++ CMakeLists.txt
|
||||
@@ -458,7 +458,7 @@ IF(WIN32)
|
||||
|
||||
if (FIX_WARNINGS)
|
||||
|
||||
- # TODO: Increase warning level and once all warnings are cleared, enable
|
||||
+ # TODO: Increase warning level and once all warnings are cleared, enable
|
||||
# higher warning level in MAINTAINER_MODE. We start with no warnings on
|
||||
# level /W1
|
||||
|
||||
@@ -478,7 +478,7 @@ ELSE(WIN32)
|
||||
if(FIX_WARNINGS)
|
||||
|
||||
# TODO: Fix the compile warnings generated without `-w`. Once done,
|
||||
- # remove this option in MAINTAINER_MODE so that we see when new
|
||||
+ # remove this option in MAINTAINER_MODE so that we see when new
|
||||
# warnings appear. Then proceed to `-w extra`.
|
||||
|
||||
add_compile_options(-Werror)
|
||||
@@ -486,7 +486,7 @@ ELSE(WIN32)
|
||||
else()
|
||||
|
||||
add_compile_options( -w )
|
||||
-
|
||||
+
|
||||
endif()
|
||||
|
||||
ENDIF(WIN32)
|
||||
@@ -517,7 +517,6 @@ ADD_SUBDIRECTORY(installer)
|
||||
|
||||
ADD_SUBDIRECTORY(dltest)
|
||||
ADD_SUBDIRECTORY(installer)
|
||||
-ADD_SUBDIRECTORY(test)
|
||||
|
||||
# For dynamic linking use the built-in sys and strings
|
||||
IF(NOT MYSQLCLIENT_STATIC_LINKING)
|
||||
@@ -591,10 +590,10 @@ INCLUDE(cmake/info_bin.cmake)
|
||||
#------------ Installation ---------------------------
|
||||
INCLUDE(cmake/info_bin.cmake)
|
||||
|
||||
-INSTALL(FILES LICENSE.txt DESTINATION .)
|
||||
+INSTALL(FILES LICENSE.txt DESTINATION ./share/doc/mysql-connector-odbc/)
|
||||
|
||||
if(EXISTS "${CMAKE_SOURCE_DIR}/README.txt")
|
||||
- INSTALL(FILES README.txt DESTINATION .)
|
||||
+ INSTALL(FILES README.txt DESTINATION ./share/doc/mysql-connector-odbc/)
|
||||
else()
|
||||
INSTALL(FILES README.md DESTINATION .)
|
||||
INSTALL(FILES CONTRIBUTING.md DESTINATION .)
|
||||
@@ -658,7 +657,7 @@ ELSE(WIN32)
|
||||
|
||||
ELSE(WIN32)
|
||||
|
||||
- INSTALL(FILES ChangeLog DESTINATION .)
|
||||
+ INSTALL(FILES ChangeLog DESTINATION ./share/doc/mysql-connector-odbc/)
|
||||
|
||||
ENDIF(WIN32)
|
||||
|
||||
@@ -666,16 +665,16 @@ ENDIF(WIN32)
|
||||
# Bundle 3rd party dependencies if needed
|
||||
# =======================================
|
||||
|
||||
-# If build is configured with BUNDEL_DEPENDENCIES enabled then client-side
|
||||
-# plugins, their dependencies and other dependencies of the client library that
|
||||
-# are found at the client library installation location are copied to the
|
||||
+# If build is configured with BUNDEL_DEPENDENCIES enabled then client-side
|
||||
+# plugins, their dependencies and other dependencies of the client library that
|
||||
+# are found at the client library installation location are copied to the
|
||||
# location where ODBC driver is installed.
|
||||
#
|
||||
-# The lists of known plugins and 3rd party libraries are specified below. Only
|
||||
-# the specified plugins and libraries will be bundled. Also plugins and
|
||||
-# libraries that can be found with the server but which should be ignored are
|
||||
-# specified below. When building in MAINTAINER_MODE cmake will report error if
|
||||
-# it finds a plugin or 3rd party librariy which is not listed here. When that
|
||||
+# The lists of known plugins and 3rd party libraries are specified below. Only
|
||||
+# the specified plugins and libraries will be bundled. Also plugins and
|
||||
+# libraries that can be found with the server but which should be ignored are
|
||||
+# specified below. When building in MAINTAINER_MODE cmake will report error if
|
||||
+# it finds a plugin or 3rd party librariy which is not listed here. When that
|
||||
# happens the lists should be updated.
|
||||
#
|
||||
# TODO: Move these checks to cmake/FindMySQL.cmake ?
|
||||
@@ -697,20 +696,20 @@ endif()
|
||||
# Plugin dependencies.
|
||||
#
|
||||
# Warning: If one library name is a prefix of the other, the longer name
|
||||
-# should be listed first, otherwise the logic detecting missing dependencies
|
||||
+# should be listed first, otherwise the logic detecting missing dependencies
|
||||
# will break... For example: `krb5support` must go before `krb5`
|
||||
|
||||
set(AUTH_DEPS_fido fido2)
|
||||
|
||||
if(WIN32)
|
||||
- set(AUTH_DEPS_kerberos
|
||||
+ set(AUTH_DEPS_kerberos
|
||||
comerr gssapi k5sprt krbcc xpprof krb5
|
||||
)
|
||||
else()
|
||||
set(AUTH_DEPS_kerberos gssapi_krb5 k5crypto krb5support krb5 com_err)
|
||||
endif()
|
||||
|
||||
-# Note: On Solaris and macOS all dependencies of ldap_sasl plugin are assumed
|
||||
+# Note: On Solaris and macOS all dependencies of ldap_sasl plugin are assumed
|
||||
# to be part of the OS.
|
||||
|
||||
if(NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "SunOS")
|
||||
@@ -730,7 +729,7 @@ set(BUNDLED_LIBS
|
||||
libssl libcrypto ssleay libeay
|
||||
)
|
||||
|
||||
-# List plugins and other libraries that can be found bundled with the server
|
||||
+# List plugins and other libraries that can be found bundled with the server
|
||||
# but which are not relevant on client-side and can be safely ignored.
|
||||
|
||||
set(IGNORED_PLUGINS qa_auth_client)
|
||||
@@ -797,11 +796,11 @@ endfunction(bundle_lib)
|
||||
|
||||
|
||||
# Bundle libraries listed in a list variable ${to_bundle}.
|
||||
-# Libraries that were found and bundled are removed from ${to_bundle} list.
|
||||
-# Other libraries found but not listed in ${to_bundle} are returned
|
||||
+# Libraries that were found and bundled are removed from ${to_bundle} list.
|
||||
+# Other libraries found but not listed in ${to_bundle} are returned
|
||||
# in ${ignored} variable.
|
||||
-# If additional arguments are given, they are used as glob expressions to find
|
||||
-# the libraries to be bundled, otherwise 3rd parties bundled in with the server
|
||||
+# If additional arguments are given, they are used as glob expressions to find
|
||||
+# the libraries to be bundled, otherwise 3rd parties bundled in with the server
|
||||
# are searched in ${MYSQL_LIB_DIR} locations.
|
||||
|
||||
macro(bundle_libs to_bundle ignored)
|
||||
@@ -811,12 +810,12 @@ macro(bundle_libs to_bundle ignored)
|
||||
if(ARGN)
|
||||
|
||||
file(GLOB _bundled ${ARGN})
|
||||
-
|
||||
+
|
||||
else()
|
||||
|
||||
file(GLOB _bundled
|
||||
"${MYSQL_LIB_DIR}/*${CMAKE_SHARED_LIBRARY_SUFFIX}*"
|
||||
- "${MYSQL_LIB_DIR}/private/*${CMAKE_SHARED_LIBRARY_SUFFIX}*"
|
||||
+ "${MYSQL_LIB_DIR}/private/*${CMAKE_SHARED_LIBRARY_SUFFIX}*"
|
||||
)
|
||||
|
||||
# On windows, libs are in bin directory
|
||||
@@ -865,9 +864,9 @@ endmacro(bundle_libs)
|
||||
endmacro(bundle_libs)
|
||||
|
||||
|
||||
-# Bundle plugins listed in PLUGINS list. Each bundled plugin P is removed from
|
||||
-# the list and its dependedencies listed in DEPS_${P} are also bundled. Client
|
||||
-# side plugins found with the server and not listed in PLUGINS are returned
|
||||
+# Bundle plugins listed in PLUGINS list. Each bundled plugin P is removed from
|
||||
+# the list and its dependedencies listed in DEPS_${P} are also bundled. Client
|
||||
+# side plugins found with the server and not listed in PLUGINS are returned
|
||||
# in ${ignored} list.
|
||||
|
||||
macro(bundle_plugins ignored)
|
||||
@@ -888,7 +887,7 @@ macro(bundle_plugins ignored)
|
||||
|
||||
#message("== looking at client-side plugin: ${lib_name}")
|
||||
|
||||
- # Match plugin name against names in PLUGINS list and in case of match
|
||||
+ # Match plugin name against names in PLUGINS list and in case of match
|
||||
# remove that name from the list
|
||||
|
||||
unset(plugin)
|
||||
@@ -926,7 +925,7 @@ macro(bundle_plugins ignored)
|
||||
set(sasl_bundled 1)
|
||||
endif()
|
||||
|
||||
- # On Windows the MIT Kerberos library uses ccapiserver.exe application
|
||||
+ # On Windows the MIT Kerberos library uses ccapiserver.exe application
|
||||
# in some scenarios - we need to bundle it as well.
|
||||
|
||||
if(WIN32 AND "${DEPS_${plugin}}" MATCHES "krb5")
|
||||
@@ -1000,7 +999,7 @@ if(BUNDLE_DEPENDENCIES)
|
||||
endforeach()
|
||||
|
||||
# Bundle the plugins and their dependencies.
|
||||
-
|
||||
+
|
||||
unset(ingored)
|
||||
bundle_plugins(ignored)
|
||||
|
||||
@@ -1012,7 +1011,7 @@ if(BUNDLE_DEPENDENCIES)
|
||||
|
||||
foreach(plugin ${IGNORED_PLUGINS})
|
||||
|
||||
- # Note: Old cmake (seen with 3.13.4) generates this error on
|
||||
+ # Note: Old cmake (seen with 3.13.4) generates this error on
|
||||
# list(FILTER...) if the list is empty:
|
||||
# "list sub-command FILTER requires list to be present"
|
||||
|
||||
@@ -1037,8 +1036,8 @@ if(BUNDLE_DEPENDENCIES)
|
||||
|
||||
message(STATUS "Looking for bundled client lib dependencies")
|
||||
|
||||
- # Bundle additional libraries listed in BUNDLED_LIBS
|
||||
- # For OpenSSL libs, first look in the location of the library that
|
||||
+ # Bundle additional libraries listed in BUNDLED_LIBS
|
||||
+ # For OpenSSL libs, first look in the location of the library that
|
||||
# is actually being used in the build.
|
||||
|
||||
#message("== BUNDLED_LIBS: ${BUNDLED_LIBS}")
|
||||
@@ -1052,12 +1051,12 @@ if(BUNDLE_DEPENDENCIES)
|
||||
unset(extra_libs)
|
||||
bundle_libs(BUNDLED_LIBS extra_libs)
|
||||
|
||||
- # In MAINTAINER_MODE check whether all 3rd party libs found but not bundled
|
||||
+ # In MAINTAINER_MODE check whether all 3rd party libs found but not bundled
|
||||
# are listed in IGNORED_LIBS
|
||||
|
||||
if(MAINTAINER_MODE)
|
||||
|
||||
- # Extend ignore list with libraries that are dependencies of known plugins
|
||||
+ # Extend ignore list with libraries that are dependencies of known plugins
|
||||
# and are not listed in BUNDLED_LIBS. Otherwise we would get false errors
|
||||
# below.
|
||||
|
||||
@@ -1065,8 +1064,8 @@ if(BUNDLE_DEPENDENCIES)
|
||||
list(APPEND IGNORED_LIBS ${DEPS_${plugin}})
|
||||
endforeach()
|
||||
|
||||
- # Remove from ${extra_libs} the libraries that we know we should ignore.
|
||||
- # Also the openssl libs that might end up in ${extra_libs} bacause of two
|
||||
+ # Remove from ${extra_libs} the libraries that we know we should ignore.
|
||||
+ # Also the openssl libs that might end up in ${extra_libs} bacause of two
|
||||
# stage search logic above.
|
||||
|
||||
#message("== extra_libs: ${extra_libs}")
|
|
@ -0,0 +1,11 @@
|
|||
--- driver/dll.cc.orig 2022-12-10 21:58:26 UTC
|
||||
+++ driver/dll.cc
|
||||
@@ -145,7 +145,7 @@ void myodbc_end()
|
||||
This eliminates the delay when mysys_end() is called and other threads
|
||||
have been initialized but not ended.
|
||||
*/
|
||||
- my_thread_end_wait_time= 0;
|
||||
+ static uint my_thread_end_wait_time= 0;
|
||||
#endif
|
||||
|
||||
mysql_library_end();
|
|
@ -0,0 +1,24 @@
|
|||
--- include/mysql-8.0/my_sys.h.orig 2022-12-10 21:58:26 UTC
|
||||
+++ include/mysql-8.0/my_sys.h
|
||||
@@ -34,8 +34,12 @@
|
||||
#include "my_config.h"
|
||||
|
||||
#ifdef HAVE_ALLOCA_H
|
||||
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
|
||||
+#include <stdlib.h>
|
||||
+#else
|
||||
#include <alloca.h>
|
||||
#endif
|
||||
+#endif
|
||||
#include <limits.h>
|
||||
#ifdef _WIN32
|
||||
#include <malloc.h>
|
||||
@@ -322,6 +326,8 @@ typedef int (*IO_CACHE_CALLBACK)(IO_CACHE *);
|
||||
|
||||
struct IO_CACHE;
|
||||
typedef int (*IO_CACHE_CALLBACK)(IO_CACHE *);
|
||||
+
|
||||
+typedef unsigned long ulong;
|
||||
|
||||
struct IO_CACHE_SHARE {
|
||||
mysql_mutex_t mutex; /* To sync on reads into buffer. */
|
|
@ -0,0 +1 @@
|
|||
MySQL Connector ODBC is an ODBC driver for interfacing to MySQL databases.
|
|
@ -1,6 +1,5 @@
|
|||
PORTNAME= mysql-connector-odbc
|
||||
PORTVERSION= 5.3.13
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 5.3.14
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= MYSQL/Connector-ODBC/5.3
|
||||
PKGNAMESUFFIX= -${DRIVER_MANAGER}-mysql${MYSQL_VER}
|
||||
|
@ -13,25 +12,26 @@ WWW= https://www.mysql.com/
|
|||
LICENSE= GPLv2
|
||||
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
|
||||
|
||||
DEPRECATED= Requires EOLd mysql version
|
||||
EXPIRATION_DATE= 2023-12-31
|
||||
|
||||
LIB_DEPENDS= libodbc.so:databases/unixODBC
|
||||
|
||||
USES= cmake compiler:c++11-lang mysql
|
||||
IGNORE_WITH_MYSQL= 80
|
||||
|
||||
CMAKE_ARGS= -DWITH_UNIXODBC=1 -DDISABLE_GUI=1
|
||||
USES= cmake compiler:c++11-lang localbase:ldflags mysql ssl
|
||||
IGNORE_WITH_MYSQL= 101m 102m 103m 57p 57w 80
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
MAKE_JOBS_UNSAFE=yes
|
||||
CMAKE_ARGS= -DDISABLE_GUI=1 \
|
||||
-DWITH_UNIXODBC=1
|
||||
|
||||
LDFLAGS+= -L${LOCALBASE}/lib
|
||||
MAKE_JOBS_UNSAFE= yes
|
||||
|
||||
DRIVER_MANAGER= unixodbc
|
||||
|
||||
PORTDOCS= *
|
||||
|
||||
PLIST_FILES= bin/myodbc-installer \
|
||||
lib/libmyodbc5a.so \
|
||||
lib/libmyodbc5w.so
|
||||
PORTDOCS= *
|
||||
|
||||
OPTIONS_DEFINE= DOCS
|
||||
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1560498109
|
||||
SHA256 (mysql-connector-odbc-5.3.13-src.tar.gz) = 6127639a503e80cff71e211d7534801a074e781624974807a279c7f6e6f0353a
|
||||
SIZE (mysql-connector-odbc-5.3.13-src.tar.gz) = 3009032
|
||||
TIMESTAMP = 1675364196
|
||||
SHA256 (mysql-connector-odbc-5.3.14-src.tar.gz) = 302d068ef0d8e1e9ada6e42e48c149151d4b722f9317efb106f801e483e74a7f
|
||||
SIZE (mysql-connector-odbc-5.3.14-src.tar.gz) = 3010166
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731995
|
||||
SHA256 (KDE/release-service/22.12.1/akonadi-calendar-tools-22.12.1.tar.xz) = 0af31ba321952fcbe367e44ed33ad89370de9145fdd65ccdfd05a0d5740c9390
|
||||
SIZE (KDE/release-service/22.12.1/akonadi-calendar-tools-22.12.1.tar.xz) = 254144
|
||||
TIMESTAMP = 1675180143
|
||||
SHA256 (KDE/release-service/22.12.2/akonadi-calendar-tools-22.12.2.tar.xz) = bac50f6c552ec6456231e5e380ecc077214967df605a88bed600b6f60438e08a
|
||||
SIZE (KDE/release-service/22.12.2/akonadi-calendar-tools-22.12.2.tar.xz) = 254176
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731976
|
||||
SHA256 (KDE/release-service/22.12.1/akonadi-import-wizard-22.12.1.tar.xz) = 5635c3e318ae5edb0728080c6b4e600c7f9851b086ac03a256c5892da0d597c2
|
||||
SIZE (KDE/release-service/22.12.1/akonadi-import-wizard-22.12.1.tar.xz) = 514500
|
||||
TIMESTAMP = 1675180125
|
||||
SHA256 (KDE/release-service/22.12.2/akonadi-import-wizard-22.12.2.tar.xz) = 00174fc93f94fe7f526b4dac15809fc1491ca74b067f458add410c1ca47f2ac6
|
||||
SIZE (KDE/release-service/22.12.2/akonadi-import-wizard-22.12.2.tar.xz) = 514452
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731990
|
||||
SHA256 (KDE/release-service/22.12.1/akonadiconsole-22.12.1.tar.xz) = f46d3710ffbf07e3d693530ea47d7ae5b6dbacb7e9658b3be3901c8f876ef5c9
|
||||
SIZE (KDE/release-service/22.12.1/akonadiconsole-22.12.1.tar.xz) = 200304
|
||||
TIMESTAMP = 1675180138
|
||||
SHA256 (KDE/release-service/22.12.2/akonadiconsole-22.12.2.tar.xz) = 0891351c88e93afe4a0ac8b4c1b371d0e7856b71d6a19fdc7f68c2f4497d1d95
|
||||
SIZE (KDE/release-service/22.12.2/akonadiconsole-22.12.2.tar.xz) = 200316
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731994
|
||||
SHA256 (KDE/release-service/22.12.1/akregator-22.12.1.tar.xz) = 07838ddf9586824108fd9f2ee1b9aceba03874ba360c3635e48a1fc41816d591
|
||||
SIZE (KDE/release-service/22.12.1/akregator-22.12.1.tar.xz) = 2323388
|
||||
TIMESTAMP = 1675180142
|
||||
SHA256 (KDE/release-service/22.12.2/akregator-22.12.2.tar.xz) = 3ad11d40f4a8a56f9a169865e15c817681a8755121396ac8f57edcb31ccb4293
|
||||
SIZE (KDE/release-service/22.12.2/akregator-22.12.2.tar.xz) = 2323416
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672732001
|
||||
SHA256 (KDE/release-service/22.12.1/grantlee-editor-22.12.1.tar.xz) = c7f097f63025c12e0884846ee4fba49c4eeb853d27747784fb9b350d2a9f4787
|
||||
SIZE (KDE/release-service/22.12.1/grantlee-editor-22.12.1.tar.xz) = 117612
|
||||
TIMESTAMP = 1675180149
|
||||
SHA256 (KDE/release-service/22.12.2/grantlee-editor-22.12.2.tar.xz) = 01f6fb6e7667dd104586afb1f859f3efe78787762c9e947b160856f7958d3e3a
|
||||
SIZE (KDE/release-service/22.12.2/grantlee-editor-22.12.2.tar.xz) = 117688
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731992
|
||||
SHA256 (KDE/release-service/22.12.1/grantleetheme-22.12.1.tar.xz) = 17c66f07dd23beee5d4325b730330a1b1bd2fb9edcc0ad09b29c99d7954ca0f7
|
||||
SIZE (KDE/release-service/22.12.1/grantleetheme-22.12.1.tar.xz) = 62400
|
||||
TIMESTAMP = 1675180140
|
||||
SHA256 (KDE/release-service/22.12.2/grantleetheme-22.12.2.tar.xz) = 512c27d79b9d88ee16068169ac217ed3f93dbc0fa01c5fd8a3502e478473ac14
|
||||
SIZE (KDE/release-service/22.12.2/grantleetheme-22.12.2.tar.xz) = 62408
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731977
|
||||
SHA256 (KDE/release-service/22.12.1/itinerary-22.12.1.tar.xz) = 760425313c9874992986e8f6c21e289b3933fa48e08bd742f21b28eea575baba
|
||||
SIZE (KDE/release-service/22.12.1/itinerary-22.12.1.tar.xz) = 577744
|
||||
TIMESTAMP = 1675180126
|
||||
SHA256 (KDE/release-service/22.12.2/itinerary-22.12.2.tar.xz) = e11df6059a4121e9949371dfbf8744a4a3d401f67ec6ed6ad54e7cdef838b58f
|
||||
SIZE (KDE/release-service/22.12.2/itinerary-22.12.2.tar.xz) = 579800
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731993
|
||||
SHA256 (KDE/release-service/22.12.1/kaddressbook-22.12.1.tar.xz) = 5924efee6c6ff71127a4d9bd2e004f2e60035c6c89f374b9c2e10e83cdca1980
|
||||
SIZE (KDE/release-service/22.12.1/kaddressbook-22.12.1.tar.xz) = 3457476
|
||||
TIMESTAMP = 1675180141
|
||||
SHA256 (KDE/release-service/22.12.2/kaddressbook-22.12.2.tar.xz) = 0bd3ec47cb9d9597ca83202920ca698bcbe68a58d67d25a32269360225749def
|
||||
SIZE (KDE/release-service/22.12.2/kaddressbook-22.12.2.tar.xz) = 3458440
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731997
|
||||
SHA256 (KDE/release-service/22.12.1/kalarm-22.12.1.tar.xz) = 31a985ece31e646ce20d3f70cc9c14605b4bc4ae5b3487fdfce09efb64500086
|
||||
SIZE (KDE/release-service/22.12.1/kalarm-22.12.1.tar.xz) = 2576304
|
||||
TIMESTAMP = 1675180145
|
||||
SHA256 (KDE/release-service/22.12.2/kalarm-22.12.2.tar.xz) = e9b2280fb6aacdc08df870e53d46a58de4d6627e34baccfbb847802009ed4a99
|
||||
SIZE (KDE/release-service/22.12.2/kalarm-22.12.2.tar.xz) = 2579024
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731981
|
||||
SHA256 (KDE/release-service/22.12.1/kalendar-22.12.1.tar.xz) = 5c894bcdda1b5ab0271667d19208693d901974f62ff0cdf60e25815bd41599e4
|
||||
SIZE (KDE/release-service/22.12.1/kalendar-22.12.1.tar.xz) = 800704
|
||||
TIMESTAMP = 1675180129
|
||||
SHA256 (KDE/release-service/22.12.2/kalendar-22.12.2.tar.xz) = becdd6d5276bba00defbb34a4b3a82c53beae6bde324569c92009ecd08ed938f
|
||||
SIZE (KDE/release-service/22.12.2/kalendar-22.12.2.tar.xz) = 802132
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731989
|
||||
SHA256 (KDE/release-service/22.12.1/kcharselect-22.12.1.tar.xz) = 9e3895d5fd5fbe4614c4d8249ece1319129743b046d1c114534bcb8d3cd7b030
|
||||
SIZE (KDE/release-service/22.12.1/kcharselect-22.12.1.tar.xz) = 381312
|
||||
TIMESTAMP = 1675180137
|
||||
SHA256 (KDE/release-service/22.12.2/kcharselect-22.12.2.tar.xz) = 773c49ff9b34aeb980a241178196b61317d270af6812d3e526b1b3abbe1712fe
|
||||
SIZE (KDE/release-service/22.12.2/kcharselect-22.12.2.tar.xz) = 381304
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731983
|
||||
SHA256 (KDE/release-service/22.12.1/kdeconnect-kde-22.12.1.tar.xz) = a7ba7ab0a132dbc3bbc81559551e90e6b0274ae3a722e4778063a9c556c4df9f
|
||||
SIZE (KDE/release-service/22.12.1/kdeconnect-kde-22.12.1.tar.xz) = 637716
|
||||
TIMESTAMP = 1675180131
|
||||
SHA256 (KDE/release-service/22.12.2/kdeconnect-kde-22.12.2.tar.xz) = 073d3ee98630822c62f29faefc326653c2ad972c99c1cab0c03f6639885f0026
|
||||
SIZE (KDE/release-service/22.12.2/kdeconnect-kde-22.12.2.tar.xz) = 638356
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731991
|
||||
SHA256 (KDE/release-service/22.12.1/kdepim-addons-22.12.1.tar.xz) = 1315ecc4339f01c39e9c9fe249d53844faf88896b45952d70c0a518f8445baff
|
||||
SIZE (KDE/release-service/22.12.1/kdepim-addons-22.12.1.tar.xz) = 2663620
|
||||
TIMESTAMP = 1675180139
|
||||
SHA256 (KDE/release-service/22.12.2/kdepim-addons-22.12.2.tar.xz) = 7510cd979e83209c32cb23c319298963c573ce68d4bfc80ebce1ce0cd63a3715
|
||||
SIZE (KDE/release-service/22.12.2/kdepim-addons-22.12.2.tar.xz) = 2665648
|
||||
|
|
|
@ -438,6 +438,7 @@ share/locale/et/LC_MESSAGES/pimeventsplugin.mo
|
|||
share/locale/et/LC_MESSAGES/sieveeditor_plugins.mo
|
||||
share/locale/et/LC_MESSAGES/webengineurlinterceptor.mo
|
||||
share/locale/eu/LC_MESSAGES/kaddressbook_importexportplugins.mo
|
||||
share/locale/eu/LC_MESSAGES/kaddressbook_plugins.mo
|
||||
share/locale/eu/LC_MESSAGES/kmail_editorgrammar_plugins.mo
|
||||
share/locale/eu/LC_MESSAGES/kmail_plugins.mo
|
||||
share/locale/eu/LC_MESSAGES/korganizer_plugins.mo
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731986
|
||||
SHA256 (KDE/release-service/22.12.1/kdepim-runtime-22.12.1.tar.xz) = 5ae010d5393a03ababe12081af4c7878bb854886af06a61a7715504b8bbbf06d
|
||||
SIZE (KDE/release-service/22.12.1/kdepim-runtime-22.12.1.tar.xz) = 1855400
|
||||
TIMESTAMP = 1675180134
|
||||
SHA256 (KDE/release-service/22.12.2/kdepim-runtime-22.12.2.tar.xz) = ed5f9594b3f88b24842ff65155fe71438267d618467113ed4ebc0006bce1469a
|
||||
SIZE (KDE/release-service/22.12.2/kdepim-runtime-22.12.2.tar.xz) = 1855756
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731980
|
||||
SHA256 (KDE/release-service/22.12.1/keditbookmarks-22.12.1.tar.xz) = 212f5a0e420a32c4ccd7d9c3c30323e80680b9cd69bcee3d57ee48064daa4c36
|
||||
SIZE (KDE/release-service/22.12.1/keditbookmarks-22.12.1.tar.xz) = 236480
|
||||
TIMESTAMP = 1675180128
|
||||
SHA256 (KDE/release-service/22.12.2/keditbookmarks-22.12.2.tar.xz) = ddd4419973a8fe0755d1e60c22e8fe4b7fa45b70cc9532f071e86485e332ec31
|
||||
SIZE (KDE/release-service/22.12.2/keditbookmarks-22.12.2.tar.xz) = 236508
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731988
|
||||
SHA256 (KDE/release-service/22.12.1/kfind-22.12.1.tar.xz) = 8a3af986212c116ca4d47b6d6f4c8af3654effd3615286eac0a61de9364e28d2
|
||||
SIZE (KDE/release-service/22.12.1/kfind-22.12.1.tar.xz) = 340328
|
||||
TIMESTAMP = 1675180136
|
||||
SHA256 (KDE/release-service/22.12.2/kfind-22.12.2.tar.xz) = 445f7440e3e2070c13a63731cd9bde6baef6c666ac7317b2fe3ecbddb37f0b5c
|
||||
SIZE (KDE/release-service/22.12.2/kfind-22.12.2.tar.xz) = 340292
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731985
|
||||
SHA256 (KDE/release-service/22.12.1/kmail-account-wizard-22.12.1.tar.xz) = 68349ddcf5b493f57632b6e4abfa6224ed1d2ac24781f45c194aba643eac9c59
|
||||
SIZE (KDE/release-service/22.12.1/kmail-account-wizard-22.12.1.tar.xz) = 184248
|
||||
TIMESTAMP = 1675180133
|
||||
SHA256 (KDE/release-service/22.12.2/kmail-account-wizard-22.12.2.tar.xz) = b2cb9651fd8994539980085b191a1db19cb3b056332f888128bd29daacbabed1
|
||||
SIZE (KDE/release-service/22.12.2/kmail-account-wizard-22.12.2.tar.xz) = 184252
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731978
|
||||
SHA256 (KDE/release-service/22.12.1/kmail-22.12.1.tar.xz) = 11fe749108e6be60a755f5050c977b87121a48e98271de85cf6778a2bbd70f0b
|
||||
SIZE (KDE/release-service/22.12.1/kmail-22.12.1.tar.xz) = 7655784
|
||||
TIMESTAMP = 1675180127
|
||||
SHA256 (KDE/release-service/22.12.2/kmail-22.12.2.tar.xz) = 0b3a137333f3f7f0ad90f6434eedb8307e9cf4b90d886c04b5b5cf7544344532
|
||||
SIZE (KDE/release-service/22.12.2/kmail-22.12.2.tar.xz) = 7657504
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731998
|
||||
SHA256 (KDE/release-service/22.12.1/knotes-22.12.1.tar.xz) = 95f53488ed0bfe2f255957ec31b88cfb863f665c90075331a93d42e882040fa0
|
||||
SIZE (KDE/release-service/22.12.1/knotes-22.12.1.tar.xz) = 375140
|
||||
TIMESTAMP = 1675180146
|
||||
SHA256 (KDE/release-service/22.12.2/knotes-22.12.2.tar.xz) = fc591251f0589b9923575a98abb307fa4ad442cea0a65d87a6b9321fc8f86a1c
|
||||
SIZE (KDE/release-service/22.12.2/knotes-22.12.2.tar.xz) = 375276
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731987
|
||||
SHA256 (KDE/release-service/22.12.1/kontact-22.12.1.tar.xz) = 932472e884962f4d622e27b748771f53b891d981c7df541ddb5233f2581f24d5
|
||||
SIZE (KDE/release-service/22.12.1/kontact-22.12.1.tar.xz) = 871168
|
||||
TIMESTAMP = 1675180135
|
||||
SHA256 (KDE/release-service/22.12.2/kontact-22.12.2.tar.xz) = 8ea43e48ddd633155177730381ca86ca30773e537b95a9a8311c3b2f42fb8786
|
||||
SIZE (KDE/release-service/22.12.2/kontact-22.12.2.tar.xz) = 871472
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731996
|
||||
SHA256 (KDE/release-service/22.12.1/korganizer-22.12.1.tar.xz) = f05be7f118eb25142b94c630149bcdc32e49fab9f72c8f682d2af3db1750f885
|
||||
SIZE (KDE/release-service/22.12.1/korganizer-22.12.1.tar.xz) = 2572108
|
||||
TIMESTAMP = 1675180144
|
||||
SHA256 (KDE/release-service/22.12.2/korganizer-22.12.2.tar.xz) = cdd72e9f1cedaa94cfe8d2537cf0c1af7c7c399ce9455d4ea71ed4bc2fa7773f
|
||||
SIZE (KDE/release-service/22.12.2/korganizer-22.12.2.tar.xz) = 2574372
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731982
|
||||
SHA256 (KDE/release-service/22.12.1/kruler-22.12.1.tar.xz) = e1095c64d09658249df955b1337746e54bd953eab6fdb079e4894d7c6128b7a2
|
||||
SIZE (KDE/release-service/22.12.1/kruler-22.12.1.tar.xz) = 285812
|
||||
TIMESTAMP = 1675180130
|
||||
SHA256 (KDE/release-service/22.12.2/kruler-22.12.2.tar.xz) = 0e9295afbd479c22abe10406cd8af1b476244d30cdc82f8d5875ad732d8c575f
|
||||
SIZE (KDE/release-service/22.12.2/kruler-22.12.2.tar.xz) = 285808
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731979
|
||||
SHA256 (KDE/release-service/22.12.1/libkdepim-22.12.1.tar.xz) = 744599254c9c7b466075060edacaf17f160e13de447aec00977c3ffec24cdbd8
|
||||
SIZE (KDE/release-service/22.12.1/libkdepim-22.12.1.tar.xz) = 286260
|
||||
TIMESTAMP = 1675180128
|
||||
SHA256 (KDE/release-service/22.12.2/libkdepim-22.12.2.tar.xz) = f070927cbbcfcdec6559cf3f92ea2c5611cff3ca2880bd3c7423e2f48dcf6bb0
|
||||
SIZE (KDE/release-service/22.12.2/libkdepim-22.12.2.tar.xz) = 286040
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731999
|
||||
SHA256 (KDE/release-service/22.12.1/mbox-importer-22.12.1.tar.xz) = d93299677a485e54bc6d6aea8d2d65a4643a5b0f985540b3d8172653e732c4f3
|
||||
SIZE (KDE/release-service/22.12.1/mbox-importer-22.12.1.tar.xz) = 29824
|
||||
TIMESTAMP = 1675180147
|
||||
SHA256 (KDE/release-service/22.12.2/mbox-importer-22.12.2.tar.xz) = 8610b097bf553d13074356d6d223fa40086f7a551ca958721652802a93668c02
|
||||
SIZE (KDE/release-service/22.12.2/mbox-importer-22.12.2.tar.xz) = 29836
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731984
|
||||
SHA256 (KDE/release-service/22.12.1/pim-data-exporter-22.12.1.tar.xz) = 4635dd0b88a23f55a44eff94b9aa5194ecdde661adc6abd9bdf0318d4df332b2
|
||||
SIZE (KDE/release-service/22.12.1/pim-data-exporter-22.12.1.tar.xz) = 423844
|
||||
TIMESTAMP = 1675180132
|
||||
SHA256 (KDE/release-service/22.12.2/pim-data-exporter-22.12.2.tar.xz) = 035be871f0a5ee950606a62abed5dc047457b7d9c51d66ed5e0e3ad6f25e1d87
|
||||
SIZE (KDE/release-service/22.12.2/pim-data-exporter-22.12.2.tar.xz) = 426112
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731975
|
||||
SHA256 (KDE/release-service/22.12.1/pim-sieve-editor-22.12.1.tar.xz) = 846686ad3db14541e055dad50e8ac56e944cb33b3b934aaf2b27e4fea0daa1db
|
||||
SIZE (KDE/release-service/22.12.1/pim-sieve-editor-22.12.1.tar.xz) = 462664
|
||||
TIMESTAMP = 1675180124
|
||||
SHA256 (KDE/release-service/22.12.2/pim-sieve-editor-22.12.2.tar.xz) = 5012e2c2e75e413102351b08d067735885af5ce81f5b19f3df61f3516ed65034
|
||||
SIZE (KDE/release-service/22.12.2/pim-sieve-editor-22.12.2.tar.xz) = 464352
|
||||
|
|
|
@ -15,6 +15,7 @@ share/locale/de/LC_MESSAGES/sieveeditor.mo
|
|||
share/locale/en_GB/LC_MESSAGES/sieveeditor.mo
|
||||
share/locale/es/LC_MESSAGES/sieveeditor.mo
|
||||
share/locale/et/LC_MESSAGES/sieveeditor.mo
|
||||
share/locale/eu/LC_MESSAGES/sieveeditor.mo
|
||||
share/locale/fi/LC_MESSAGES/sieveeditor.mo
|
||||
share/locale/fr/LC_MESSAGES/sieveeditor.mo
|
||||
share/locale/gl/LC_MESSAGES/sieveeditor.mo
|
||||
|
|
|
@ -17,8 +17,7 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \
|
|||
libuuid.so:misc/e2fsprogs-libuuid
|
||||
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR}
|
||||
|
||||
USES= gmake gnome libtool:build localbase shebangfix python:3.6+ sqlite
|
||||
USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 pango
|
||||
USES= gmake libtool:build localbase shebangfix python:3.6+ sqlite
|
||||
|
||||
SHEBANG_FILES= apps/dbus/presage_dbus_python_demo \
|
||||
apps/dbus/presage_dbus_python_demo.in \
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# Support of GTK+ is checked at compile time and themes directories too.
|
||||
|
||||
PORTNAME= xfce4-notifyd
|
||||
PORTVERSION= 0.7.2
|
||||
PORTVERSION= 0.7.3
|
||||
CATEGORIES= deskutils xfce
|
||||
MASTER_SITES= XFCE/apps
|
||||
DIST_SUBDIR= xfce4
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1674378516
|
||||
SHA256 (xfce4/xfce4-notifyd-0.7.2.tar.bz2) = d841ea11bd69b6dab15c7e6dca62abb2ee22d885ca5e60afb76ea17e628bed7b
|
||||
SIZE (xfce4/xfce4-notifyd-0.7.2.tar.bz2) = 576257
|
||||
TIMESTAMP = 1675324066
|
||||
SHA256 (xfce4/xfce4-notifyd-0.7.3.tar.bz2) = 50d9605d537c2136a9b5b8537be158ef723cf8c61514254014a571c704e9e943
|
||||
SIZE (xfce4/xfce4-notifyd-0.7.3.tar.bz2) = 587185
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672732000
|
||||
SHA256 (KDE/release-service/22.12.1/zanshin-22.12.1.tar.xz) = 3c0143bf85c1ae5ea1e1545ee72b9c634ac98198683e2b18d18e947c0aab5a00
|
||||
SIZE (KDE/release-service/22.12.1/zanshin-22.12.1.tar.xz) = 354180
|
||||
TIMESTAMP = 1675180148
|
||||
SHA256 (KDE/release-service/22.12.2/zanshin-22.12.2.tar.xz) = c2f289f7dd1307a4d64f781c6122caaa8ff7ed05c18331bc64bb7060fc3aaea1
|
||||
SIZE (KDE/release-service/22.12.2/zanshin-22.12.2.tar.xz) = 354284
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731872
|
||||
SHA256 (KDE/release-service/22.12.1/cervisia-22.12.1.tar.xz) = b3abb81538873982a726c7ec7b8e50085c4c4d13fb2a0028bdff4ac49e845a6c
|
||||
SIZE (KDE/release-service/22.12.1/cervisia-22.12.1.tar.xz) = 1943652
|
||||
TIMESTAMP = 1675180021
|
||||
SHA256 (KDE/release-service/22.12.2/cervisia-22.12.2.tar.xz) = cfedbbf441059454acf2e4b962ca4af8ce2f4a6103f8a153f9c4e99a88368136
|
||||
SIZE (KDE/release-service/22.12.2/cervisia-22.12.2.tar.xz) = 1944108
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1672731866
|
||||
SHA256 (KDE/release-service/22.12.1/dolphin-plugins-22.12.1.tar.xz) = 7247ed67465436203211268be70308f787cad9e404e6ff2d5abd68919c04720d
|
||||
SIZE (KDE/release-service/22.12.1/dolphin-plugins-22.12.1.tar.xz) = 268820
|
||||
TIMESTAMP = 1675180015
|
||||
SHA256 (KDE/release-service/22.12.2/dolphin-plugins-22.12.2.tar.xz) = c12f34825458478f557414ba8db21577d0e8201d0de572f52f6b0a9c4f9f52f8
|
||||
SIZE (KDE/release-service/22.12.2/dolphin-plugins-22.12.2.tar.xz) = 271696
|
||||
|
|
|
@ -2,10 +2,12 @@ PORTNAME= electron
|
|||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= ${ELECTRON_VER:S/-beta./.b/}
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/:chromium \
|
||||
MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v21.4.0/:chromium \
|
||||
https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \
|
||||
https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts
|
||||
PKGNAMESUFFIX= ${ELECTRON_VER_MAJOR}
|
||||
DISTFILES= chromium-${CHROMIUM_VER}${EXTRACT_SUFX}:chromium \
|
||||
${CHROMIUM_NODE_MODULES_HASH}:chromium_node \
|
||||
${CHROMIUM_TEST_FONTS_HASH}:chromium_testfonts \
|
||||
electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX}:prefetch
|
||||
DIST_SUBDIR= ${PORTNAME}
|
||||
|
@ -137,7 +139,9 @@ SNDIO_VARS= GN_ARGS+=use_sndio=true
|
|||
SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false
|
||||
|
||||
# See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
|
||||
CHROMIUM_VER= 106.0.5249.119
|
||||
CHROMIUM_VER= 106.0.5249.199
|
||||
# See ${WRKSRC}/third_party/node/node_modules.tar.gz.sha1 for CHROMIUM_NODE_MODULES_HASH
|
||||
CHROMIUM_NODE_MODULES_HASH= 80c023f0deb4d0ff28b42c4848257d26b7207725
|
||||
# See ${WRKSRC}/third_party/test_fonts/test_fonts.tar.gz.sha1 for CHROMIUM_TEST_FONTS_HASH
|
||||
CHROMIUM_TEST_FONTS_HASH= 336e775eec536b2d785cc80eff6ac39051931286
|
||||
# See ${WRKSRC}/electron/DEPS for NODE_VER
|
||||
|
@ -151,14 +155,13 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76
|
|||
# See ${WRKSRC}/electron/DEPS for MANTLE_VER
|
||||
MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948
|
||||
|
||||
YARN_TIMESTAMP= 1661146515
|
||||
YARN_TIMESTAMP= 1675227603
|
||||
|
||||
GN_ARGS+= clang_use_chrome_plugins=false \
|
||||
enable_hangout_services_extension=true \
|
||||
enable_js_type_check=false \
|
||||
enable_nacl=false \
|
||||
enable_remoting=false \
|
||||
enable_wmax_tokens=false \
|
||||
fatal_linker_warnings=false \
|
||||
icu_use_data_file=false \
|
||||
is_clang=true \
|
||||
|
@ -245,6 +248,7 @@ post-extract:
|
|||
${WRKSRC}/third_party/squirrel.mac/vendor/ReactiveObjC
|
||||
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_mantle}-${MANTLE_VER} \
|
||||
${WRKSRC}/third_party/squirrel.mac/vendor/Mantle
|
||||
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/node_modules ${WRKSRC}/third_party/node
|
||||
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/test_fonts ${WRKSRC}/third_party/test_fonts
|
||||
# Install node modules for electron
|
||||
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/yarn-offline-cache ${WRKDIR}
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
ELECTRON_VER= 21.2.0
|
||||
ELECTRON_VER= 21.4.0
|
||||
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}
|
||||
|
|
|
@ -1,12 +1,14 @@
|
|||
TIMESTAMP = 1670151730
|
||||
SHA256 (electron/chromium-106.0.5249.119.tar.xz) = 0f091b4950e120d5c3e23ab391bacfdb6ce8eb8d0acab55e9dae1a8c247dd192
|
||||
SIZE (electron/chromium-106.0.5249.119.tar.xz) = 1611067204
|
||||
TIMESTAMP = 1675231973
|
||||
SHA256 (electron/chromium-106.0.5249.199.tar.xz) = 2f39a6b570f2abb41e9c642cb054144796d1ab0096be6b44d3c59e20252c9318
|
||||
SIZE (electron/chromium-106.0.5249.199.tar.xz) = 1458418844
|
||||
SHA256 (electron/80c023f0deb4d0ff28b42c4848257d26b7207725) = 57c83bdd82a021d319eb520c3743e962056b7d184077192aa565cf8aef5ba54d
|
||||
SIZE (electron/80c023f0deb4d0ff28b42c4848257d26b7207725) = 12142959
|
||||
SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
|
||||
SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734
|
||||
SHA256 (electron/electron-yarn-cache-21.2.0.tar.xz) = f9d0417abf6221ad3e39698f5213d4deb6b9750c0e5dcf72a8405eff630b536e
|
||||
SIZE (electron/electron-yarn-cache-21.2.0.tar.xz) = 38029868
|
||||
SHA256 (electron/electron-electron-v21.2.0_GH0.tar.gz) = dc840125f94b851191593eea9031949978ab69b628506b094b3ffa33d679f413
|
||||
SIZE (electron/electron-electron-v21.2.0_GH0.tar.gz) = 10492135
|
||||
SHA256 (electron/electron-yarn-cache-21.4.0.tar.xz) = f28b9136e809001a2600314da6692d7476e0d98b150a8e8b7710f6fd6005f801
|
||||
SIZE (electron/electron-yarn-cache-21.4.0.tar.xz) = 39022492
|
||||
SHA256 (electron/electron-electron-v21.4.0_GH0.tar.gz) = 720137a5eec575111ea7eec45c39f0a15e1584eca653dd3f4a5df24470a44fa3
|
||||
SIZE (electron/electron-electron-v21.4.0_GH0.tar.gz) = 10558451
|
||||
SHA256 (electron/nodejs-node-v16.16.0_GH0.tar.gz) = e86cb6b24c38f7fbdbfe7722ed3207b041d923e38dbeedf20fe9baa59c29e907
|
||||
SIZE (electron/nodejs-node-v16.16.0_GH0.tar.gz) = 89632384
|
||||
SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39
|
||||
|
|
|
@ -1,13 +1,14 @@
|
|||
{
|
||||
"name": "electron",
|
||||
"version": "21.2.0",
|
||||
"version": "0.0.0-development",
|
||||
"repository": "https://github.com/electron/electron",
|
||||
"description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
|
||||
"devDependencies": {
|
||||
"@azure/storage-blob": "^12.9.0",
|
||||
"@electron/docs-parser": "^0.12.4",
|
||||
"@electron/typescript-definitions": "^8.9.5",
|
||||
"@octokit/auth-app": "^2.10.0",
|
||||
"@electron/asar": "^3.2.1",
|
||||
"@electron/docs-parser": "^1.0.0",
|
||||
"@electron/github-app-auth": "^1.5.0",
|
||||
"@electron/typescript-definitions": "^8.10.0",
|
||||
"@octokit/rest": "^18.0.3",
|
||||
"@primer/octicons": "^10.0.0",
|
||||
"@types/basic-auth": "^1.1.3",
|
||||
|
@ -31,7 +32,6 @@
|
|||
"@types/webpack-env": "^1.16.3",
|
||||
"@typescript-eslint/eslint-plugin": "^4.4.1",
|
||||
"@typescript-eslint/parser": "^4.4.1",
|
||||
"asar": "^3.1.0",
|
||||
"aws-sdk": "^2.814.0",
|
||||
"check-for-leaks": "^1.2.1",
|
||||
"colors": "1.4.0",
|
||||
|
@ -89,7 +89,7 @@
|
|||
"lint:docs-relative-links": "python3 ./script/check-relative-doc-links.py",
|
||||
"lint:markdownlint": "markdownlint \"*.md\" \"docs/**/*.md\"",
|
||||
"lint:js-in-markdown": "standard-markdown docs",
|
||||
"create-api-json": "electron-docs-parser --dir=./",
|
||||
"create-api-json": "node script/create-api-json.js",
|
||||
"create-typescript-definitions": "npm run create-api-json && electron-typescript-definitions --api=electron-api.json && node spec/ts-smoke/runner.js",
|
||||
"gn-typescript-definitions": "npm run create-typescript-definitions && shx cp electron.d.ts",
|
||||
"pre-flight": "pre-flight",
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- BUILD.gn.orig 2022-09-24 10:57:32 UTC
|
||||
--- BUILD.gn.orig 2023-02-01 13:31:45 UTC
|
||||
+++ BUILD.gn
|
||||
@@ -53,7 +53,7 @@ declare_args() {
|
||||
root_extra_deps = []
|
||||
|
@ -51,7 +51,7 @@
|
|||
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
|
||||
}
|
||||
|
||||
@@ -1202,7 +1210,7 @@ if (!is_ios) {
|
||||
@@ -1205,7 +1213,7 @@ if (!is_ios) {
|
||||
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
|
||||
}
|
||||
|
||||
|
@ -60,7 +60,7 @@
|
|||
data_deps +=
|
||||
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
|
||||
}
|
||||
@@ -1211,7 +1219,7 @@ if (!is_ios) {
|
||||
@@ -1214,7 +1222,7 @@ if (!is_ios) {
|
||||
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
|
||||
}
|
||||
|
||||
|
@ -69,7 +69,7 @@
|
|||
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
|
||||
}
|
||||
|
||||
@@ -1654,7 +1662,7 @@ group("chromium_builder_perf") {
|
||||
@@ -1657,7 +1665,7 @@ group("chromium_builder_perf") {
|
||||
data_deps += [ "//chrome/test:performance_browser_tests" ]
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/allocator/partition_allocator/partition_root.cc.orig 2022-09-24 10:57:32 UTC
|
||||
--- base/allocator/partition_allocator/partition_root.cc.orig 2023-02-01 05:17:57 UTC
|
||||
+++ base/allocator/partition_allocator/partition_root.cc
|
||||
@@ -33,7 +33,7 @@
|
||||
#include "wow64apiset.h"
|
||||
|
@ -23,7 +23,7 @@
|
|||
(PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) /
|
||||
MaxPurgeableSlotSize();
|
||||
-#elif BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
|
||||
+#elif BUILDFLAG(IS_APPLE) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64))
|
||||
+#elif BUILDFLAG(IS_APPLE) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) && defined(ARCH_CPU_ARM64))
|
||||
// It's better for slot_usage to be stack-allocated and fixed-size, which
|
||||
// demands that its size be constexpr. On IS_APPLE and Linux on arm64,
|
||||
// PartitionPageSize() is always SystemPageSize() << 2, so regardless of
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- build/config/BUILDCONFIG.gn.orig 2022-04-21 18:48:31 UTC
|
||||
--- build/config/BUILDCONFIG.gn.orig 2023-02-01 13:31:45 UTC
|
||||
+++ build/config/BUILDCONFIG.gn
|
||||
@@ -136,7 +136,8 @@ declare_args() {
|
||||
@@ -139,7 +139,8 @@ declare_args() {
|
||||
is_official_build = false
|
||||
|
||||
# Set to true when compiling with the Clang compiler.
|
||||
|
@ -10,7 +10,7 @@
|
|||
(current_cpu != "s390x" && current_cpu != "s390" &&
|
||||
current_cpu != "ppc64" && current_cpu != "ppc" &&
|
||||
current_cpu != "mips" && current_cpu != "mips64" &&
|
||||
@@ -220,6 +221,10 @@ if (host_toolchain == "") {
|
||||
@@ -223,6 +224,10 @@ if (host_toolchain == "") {
|
||||
host_toolchain = "//build/toolchain/aix:$host_cpu"
|
||||
} else if (host_os == "zos") {
|
||||
host_toolchain = "//build/toolchain/zos:$host_cpu"
|
||||
|
@ -21,7 +21,7 @@
|
|||
} else {
|
||||
assert(false, "Unsupported host_os: $host_os")
|
||||
}
|
||||
@@ -264,6 +269,8 @@ if (target_os == "android") {
|
||||
@@ -267,6 +272,8 @@ if (target_os == "android") {
|
||||
_default_toolchain = "//build/toolchain/aix:$target_cpu"
|
||||
} else if (target_os == "zos") {
|
||||
_default_toolchain = "//build/toolchain/zos:$target_cpu"
|
||||
|
@ -30,7 +30,7 @@
|
|||
} else {
|
||||
assert(false, "Unsupported target_os: $target_os")
|
||||
}
|
||||
@@ -298,7 +305,11 @@ is_android = current_os == "android"
|
||||
@@ -301,7 +308,11 @@ is_android = current_os == "android"
|
||||
is_chromeos = current_os == "chromeos"
|
||||
is_fuchsia = current_os == "fuchsia"
|
||||
is_ios = current_os == "ios"
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- build/config/compiler/pgo/pgo.gni.orig 2022-12-03 09:23:06.609476000 +0100
|
||||
+++ build/config/compiler/pgo/pgo.gni 2022-12-03 09:23:28.402670000 +0100
|
||||
--- build/config/compiler/pgo/pgo.gni.orig 2023-02-01 05:17:58 UTC
|
||||
+++ build/config/compiler/pgo/pgo.gni
|
||||
@@ -24,7 +24,7 @@ declare_args() {
|
||||
# to chromecast and determine whether chromeos_is_browser_only is
|
||||
# obsolete.
|
||||
|
|
|
@ -1,14 +1,5 @@
|
|||
--- chrome/browser/process_singleton_posix.cc.orig 2022-08-31 12:19:35 UTC
|
||||
--- chrome/browser/process_singleton_posix.cc.orig 2023-02-01 13:31:45 UTC
|
||||
+++ chrome/browser/process_singleton_posix.cc
|
||||
@@ -99,7 +99,7 @@
|
||||
#include "ui/base/l10n/l10n_util.h"
|
||||
|
||||
#if 0
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
#include "chrome/browser/ui/process_singleton_dialog_linux.h"
|
||||
#endif
|
||||
#endif
|
||||
@@ -357,7 +357,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
|
||||
if (g_disable_prompt)
|
||||
return g_user_opted_unlock_in_use_profile;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/test/BUILD.gn.orig 2022-09-24 10:57:32 UTC
|
||||
--- chrome/test/BUILD.gn.orig 2023-02-01 13:31:45 UTC
|
||||
+++ chrome/test/BUILD.gn
|
||||
@@ -9861,7 +9861,7 @@ test("chrome_app_unittests") {
|
||||
@@ -9868,7 +9868,7 @@ test("chrome_app_unittests") {
|
||||
"//components/heap_profiling/in_process",
|
||||
"//components/safe_browsing:buildflags",
|
||||
]
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- components/viz/host/host_display_client.cc.orig 2022-02-28 16:54:41 UTC
|
||||
--- components/viz/host/host_display_client.cc.orig 2023-02-01 13:31:45 UTC
|
||||
+++ components/viz/host/host_display_client.cc
|
||||
@@ -61,7 +61,7 @@ void HostDisplayClient::CreateLayeredWindowUpdater(
|
||||
@@ -65,7 +65,7 @@ void HostDisplayClient::CreateLayeredWindowUpdater(
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- components/viz/host/host_display_client.h.orig 2022-02-28 16:54:41 UTC
|
||||
--- components/viz/host/host_display_client.h.orig 2023-02-01 13:31:45 UTC
|
||||
+++ components/viz/host/host_display_client.h
|
||||
@@ -48,7 +48,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom
|
||||
@@ -47,7 +47,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- components/viz/host/renderer_settings_creation.cc.orig 2022-02-28 16:54:41 UTC
|
||||
--- components/viz/host/renderer_settings_creation.cc.orig 2023-02-01 13:31:45 UTC
|
||||
+++ components/viz/host/renderer_settings_creation.cc
|
||||
@@ -52,7 +52,7 @@ RendererSettings CreateRendererSettings() {
|
||||
@@ -55,7 +55,7 @@ RendererSettings CreateRendererSettings() {
|
||||
renderer_settings.partial_swap_enabled =
|
||||
!command_line->HasSwitch(switches::kUIDisablePartialSwap);
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2022-09-24 10:57:32 UTC
|
||||
--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2023-02-01 13:31:45 UTC
|
||||
+++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
|
||||
@@ -97,7 +97,7 @@ RootCompositorFrameSinkImpl::Create(
|
||||
@@ -98,7 +98,7 @@ RootCompositorFrameSinkImpl::Create(
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
|
@ -9,7 +9,7 @@
|
|||
// For X11, we need notify client about swap completion after resizing, so the
|
||||
// client can use it for synchronize with X11 WM.
|
||||
output_surface->SetNeedsSwapSizeNotifications(true);
|
||||
@@ -576,7 +576,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
|
||||
@@ -577,7 +577,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
|
||||
display_client_->DidCompleteSwapWithSize(pixel_size);
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- content/app/content_main_runner_impl.cc.orig 2022-09-24 10:57:32 UTC
|
||||
--- content/app/content_main_runner_impl.cc.orig 2023-02-01 13:31:45 UTC
|
||||
+++ content/app/content_main_runner_impl.cc
|
||||
@@ -130,13 +130,13 @@
|
||||
@@ -132,13 +132,13 @@
|
||||
#include "base/posix/global_descriptors.h"
|
||||
#include "content/public/common/content_descriptors.h"
|
||||
|
||||
|
@ -16,7 +16,7 @@
|
|||
#include "base/native_library.h"
|
||||
#include "base/rand_util.h"
|
||||
#include "content/public/common/zygote/sandbox_support_linux.h"
|
||||
@@ -175,6 +175,10 @@
|
||||
@@ -177,6 +177,10 @@
|
||||
#include "media/base/media_switches.h"
|
||||
#endif
|
||||
|
||||
|
@ -27,7 +27,7 @@
|
|||
#if BUILDFLAG(IS_ANDROID)
|
||||
#include "base/system/sys_info.h"
|
||||
#include "content/browser/android/battery_metrics.h"
|
||||
@@ -360,7 +364,7 @@ void InitializeZygoteSandboxForBrowserProcess(
|
||||
@@ -365,7 +369,7 @@ void InitializeZygoteSandboxForBrowserProcess(
|
||||
}
|
||||
#endif // BUILDFLAG(USE_ZYGOTE_HANDLE)
|
||||
|
||||
|
@ -36,7 +36,7 @@
|
|||
|
||||
#if BUILDFLAG(ENABLE_PPAPI)
|
||||
// Loads the (native) libraries but does not initialize them (i.e., does not
|
||||
@@ -396,7 +400,7 @@ void PreloadLibraryCdms() {
|
||||
@@ -401,7 +405,7 @@ void PreloadLibraryCdms() {
|
||||
}
|
||||
#endif // BUILDFLAG(ENABLE_LIBRARY_CDMS)
|
||||
|
||||
|
@ -45,7 +45,7 @@
|
|||
void PreSandboxInit() {
|
||||
// Pre-acquire resources needed by BoringSSL. See
|
||||
// https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md
|
||||
@@ -412,6 +416,11 @@ void PreSandboxInit() {
|
||||
@@ -417,6 +421,11 @@ void PreSandboxInit() {
|
||||
#endif
|
||||
InitializeWebRtcModule();
|
||||
|
||||
|
@ -57,7 +57,7 @@
|
|||
// Set the android SkFontMgr for blink. We need to ensure this is done
|
||||
// before the sandbox is initialized to allow the font manager to access
|
||||
// font configuration files on disk.
|
||||
@@ -594,7 +603,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate*
|
||||
@@ -599,7 +608,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate*
|
||||
delegate->ZygoteStarting(&zygote_fork_delegates);
|
||||
media::InitializeMediaLibrary();
|
||||
|
||||
|
@ -66,7 +66,7 @@
|
|||
PreSandboxInit();
|
||||
#endif
|
||||
|
||||
@@ -785,11 +794,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
|
||||
@@ -790,11 +799,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
|
||||
kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor);
|
||||
#endif // !BUILDFLAG(IS_ANDROID)
|
||||
|
||||
|
@ -80,7 +80,7 @@
|
|||
|
||||
#endif // !BUILDFLAG(IS_WIN)
|
||||
|
||||
@@ -972,6 +980,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
|
||||
@@ -977,6 +985,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@ -97,7 +97,7 @@
|
|||
delegate_->SandboxInitialized(process_type);
|
||||
|
||||
#if BUILDFLAG(USE_ZYGOTE_HANDLE)
|
||||
@@ -1031,7 +1049,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
|
||||
@@ -1036,7 +1054,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
|
||||
mojo::core::InitFeatures();
|
||||
}
|
||||
|
||||
|
@ -106,7 +106,7 @@
|
|||
// If dynamic Mojo Core is being used, ensure that it's loaded very early in
|
||||
// the child/zygote process, before any sandbox is initialized. The library
|
||||
// is not fully initialized with IPC support until a ChildProcess is later
|
||||
@@ -1064,6 +1082,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
|
||||
@@ -1069,6 +1087,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
|
||||
content_main_params_.reset();
|
||||
|
||||
RegisterMainThreadFactories();
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- content/browser/child_process_launcher_helper_linux.cc.orig 2022-12-02 18:29:21.024493000 +0100
|
||||
+++ content/browser/child_process_launcher_helper_linux.cc 2022-12-03 09:43:25.213559000 +0100
|
||||
--- content/browser/child_process_launcher_helper_linux.cc.orig 2023-02-01 13:31:45 UTC
|
||||
+++ content/browser/child_process_launcher_helper_linux.cc
|
||||
@@ -20,7 +20,9 @@
|
||||
#include "content/public/common/result_codes.h"
|
||||
#include "content/public/common/sandboxed_process_launcher_delegate.h"
|
||||
|
@ -14,7 +14,7 @@
|
|||
options->fds_to_remap = files_to_register.GetMappingWithIDAdjustment(
|
||||
base::GlobalDescriptors::kBaseDescriptor);
|
||||
|
||||
+# if !BUILDFLAG(IS_BSD)
|
||||
+#if !BUILDFLAG(IS_BSD)
|
||||
if (GetProcessType() == switches::kRendererProcess) {
|
||||
const int sandbox_fd = SandboxHostLinux::GetInstance()->GetChildSocket();
|
||||
options->fds_to_remap.push_back(std::make_pair(sandbox_fd, GetSandboxFD()));
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- content/browser/gpu/gpu_process_host.cc.orig 2022-07-22 17:30:31 UTC
|
||||
--- content/browser/gpu/gpu_process_host.cc.orig 2023-02-01 13:31:45 UTC
|
||||
+++ content/browser/gpu/gpu_process_host.cc
|
||||
@@ -101,7 +101,7 @@
|
||||
#include "ui/ozone/public/ozone_switches.h"
|
||||
|
@ -9,7 +9,7 @@
|
|||
#include "ui/gfx/switches.h"
|
||||
#endif
|
||||
|
||||
@@ -253,6 +253,7 @@ static const char* const kSwitchNames[] = {
|
||||
@@ -254,6 +254,7 @@ static const char* const kSwitchNames[] = {
|
||||
switches::kEnableBackgroundThreadPool,
|
||||
switches::kEnableGpuRasterization,
|
||||
switches::kEnableLogging,
|
||||
|
@ -17,7 +17,7 @@
|
|||
switches::kEnableDeJelly,
|
||||
switches::kDeJellyScreenWidth,
|
||||
switches::kDoubleBufferCompositing,
|
||||
@@ -286,7 +287,7 @@ static const char* const kSwitchNames[] = {
|
||||
@@ -287,7 +288,7 @@ static const char* const kSwitchNames[] = {
|
||||
switches::kOzoneDumpFile,
|
||||
switches::kDisableBufferBWCompression,
|
||||
#endif
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- content/browser/media/media_keys_listener_manager_impl.cc.orig 2022-04-21 18:48:31 UTC
|
||||
--- content/browser/media/media_keys_listener_manager_impl.cc.orig 2023-02-01 13:31:45 UTC
|
||||
+++ content/browser/media/media_keys_listener_manager_impl.cc
|
||||
@@ -233,7 +233,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe
|
||||
@@ -237,7 +237,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe
|
||||
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
|
||||
// complete.
|
||||
#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- content/browser/renderer_host/render_process_host_impl.cc.orig 2022-09-24 10:57:32 UTC
|
||||
--- content/browser/renderer_host/render_process_host_impl.cc.orig 2023-02-01 13:31:45 UTC
|
||||
+++ content/browser/renderer_host/render_process_host_impl.cc
|
||||
@@ -211,7 +211,7 @@
|
||||
@@ -212,7 +212,7 @@
|
||||
#include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h"
|
||||
#endif
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
|||
#include <sys/resource.h>
|
||||
|
||||
#include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck
|
||||
@@ -1135,7 +1135,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
|
||||
@@ -1136,7 +1136,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
|
||||
// to indicate failure and std::numeric_limits<size_t>::max() to indicate
|
||||
// unlimited.
|
||||
size_t GetPlatformProcessLimit() {
|
||||
|
@ -18,7 +18,7 @@
|
|||
struct rlimit limit;
|
||||
if (getrlimit(RLIMIT_NPROC, &limit) != 0)
|
||||
return kUnknownPlatformProcessLimit;
|
||||
@@ -1222,7 +1222,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
|
||||
@@ -1223,7 +1223,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -27,7 +27,7 @@
|
|||
if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
|
||||
ConnectToFontService(std::move(font_receiver));
|
||||
return;
|
||||
@@ -2114,7 +2114,7 @@ void RenderProcessHostImpl::CreateWebSocketConnector(
|
||||
@@ -2122,7 +2122,7 @@ void RenderProcessHostImpl::CreateWebSocketConnector(
|
||||
std::move(receiver));
|
||||
}
|
||||
|
||||
|
@ -36,7 +36,7 @@
|
|||
void RenderProcessHostImpl::CreateStableVideoDecoder(
|
||||
mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) {
|
||||
if (!stable_video_decoder_factory_remote_.is_bound()) {
|
||||
@@ -3243,6 +3243,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
|
||||
@@ -3252,6 +3252,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
|
||||
switches::kDisableSpeechAPI,
|
||||
switches::kDisableThreadedCompositing,
|
||||
switches::kDisableTouchDragDrop,
|
||||
|
@ -44,7 +44,7 @@
|
|||
switches::kDisableV8IdleTasks,
|
||||
switches::kDisableVideoCaptureUseGpuMemoryBuffer,
|
||||
switches::kDisableWebGLImageChromium,
|
||||
@@ -4716,7 +4717,7 @@ void RenderProcessHostImpl::ResetIPC() {
|
||||
@@ -4725,7 +4726,7 @@ void RenderProcessHostImpl::ResetIPC() {
|
||||
coordinator_connector_receiver_.reset();
|
||||
tracing_registration_.reset();
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- content/browser/web_contents/web_contents_view_aura.cc.orig 2022-09-24 10:57:32 UTC
|
||||
--- content/browser/web_contents/web_contents_view_aura.cc.orig 2023-02-01 13:31:45 UTC
|
||||
+++ content/browser/web_contents/web_contents_view_aura.cc
|
||||
@@ -176,7 +176,7 @@ class WebDragSourceAura : public content::WebContentsO
|
||||
raw_ptr<aura::Window> window_;
|
||||
|
@ -18,7 +18,7 @@
|
|||
// We set the file contents before the URL because the URL also sets file
|
||||
// contents (to a .URL shortcut). We want to prefer file content data over
|
||||
// a shortcut so we add it first.
|
||||
@@ -1360,7 +1360,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent*
|
||||
@@ -1358,7 +1358,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent*
|
||||
// Linux window managers like to handle raise-on-click themselves. If we
|
||||
// raise-on-click manually, this may override user settings that prevent
|
||||
// focus-stealing.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- content/gpu/gpu_main.cc.orig 2022-09-24 10:57:32 UTC
|
||||
--- content/gpu/gpu_main.cc.orig 2023-02-01 13:31:45 UTC
|
||||
+++ content/gpu/gpu_main.cc
|
||||
@@ -86,7 +86,7 @@
|
||||
#include "sandbox/win/src/sandbox.h"
|
||||
|
@ -27,7 +27,7 @@
|
|||
return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs);
|
||||
#elif BUILDFLAG(IS_WIN)
|
||||
return StartSandboxWindows(sandbox_info_);
|
||||
@@ -266,7 +266,7 @@ int GpuMain(MainFunctionParams parameters) {
|
||||
@@ -270,7 +270,7 @@ int GpuMain(MainFunctionParams parameters) {
|
||||
std::make_unique<base::SingleThreadTaskExecutor>(
|
||||
gpu_preferences.message_pump_type);
|
||||
}
|
||||
|
@ -36,7 +36,7 @@
|
|||
#error "Unsupported Linux platform."
|
||||
#elif BUILDFLAG(IS_MAC)
|
||||
// Cross-process CoreAnimation requires a CFRunLoop to function at all, and
|
||||
@@ -401,7 +401,7 @@ int GpuMain(MainFunctionParams parameters) {
|
||||
@@ -404,7 +404,7 @@ int GpuMain(MainFunctionParams parameters) {
|
||||
|
||||
namespace {
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- content/renderer/render_process_impl.cc.orig 2022-07-22 17:30:31 UTC
|
||||
--- content/renderer/render_process_impl.cc.orig 2023-02-01 13:31:45 UTC
|
||||
+++ content/renderer/render_process_impl.cc
|
||||
@@ -46,7 +46,7 @@
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
|
@ -18,9 +18,9 @@
|
|||
SetV8FlagIfFeature(features::kWebAssemblyCodeProtectionPku,
|
||||
"--wasm-memory-protection-keys");
|
||||
SetV8FlagIfNotFeature(features::kWebAssemblyCodeProtectionPku,
|
||||
@@ -224,7 +224,7 @@ RenderProcessImpl::RenderProcessImpl()
|
||||
|
||||
v8::V8::SetFlagsFromString("--freeze-flags-after-init");
|
||||
@@ -225,7 +225,7 @@ RenderProcessImpl::RenderProcessImpl()
|
||||
// Freezing flags after init conflicts with node in the renderer.
|
||||
v8::V8::SetFlagsFromString("--no-freeze-flags-after-init");
|
||||
|
||||
-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64)
|
||||
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- content/renderer/renderer_blink_platform_impl.h.orig 2022-09-24 10:57:32 UTC
|
||||
--- content/renderer/renderer_blink_platform_impl.h.orig 2023-02-01 13:31:45 UTC
|
||||
+++ content/renderer/renderer_blink_platform_impl.h
|
||||
@@ -29,7 +29,7 @@
|
||||
#include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
|
||||
|
@ -18,7 +18,7 @@
|
|||
void SetThreadType(base::PlatformThreadId thread_id,
|
||||
base::ThreadType) override;
|
||||
#endif
|
||||
@@ -235,7 +235,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
|
||||
@@ -238,7 +238,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
|
||||
void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info,
|
||||
const gpu::GPUInfo& gpu_info) const;
|
||||
|
||||
|
@ -27,7 +27,7 @@
|
|||
std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
|
||||
#endif
|
||||
|
||||
@@ -255,7 +255,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
|
||||
@@ -258,7 +258,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
|
||||
mutable base::WaitableEvent io_thread_id_ready_event_;
|
||||
base::PlatformThreadId io_thread_id_ = base::kInvalidThreadId;
|
||||
|
||||
|
|
|
@ -1,6 +1,15 @@
|
|||
--- electron/BUILD.gn.orig 2022-08-03 15:31:32 UTC
|
||||
--- electron/BUILD.gn.orig 2023-01-24 08:00:52 UTC
|
||||
+++ electron/BUILD.gn
|
||||
@@ -457,7 +457,7 @@ source_set("electron_lib") {
|
||||
@@ -111,8 +111,6 @@ electron_version = exec_script("script/print-version.p
|
||||
[],
|
||||
"trim string",
|
||||
[
|
||||
- ".git/packed-refs",
|
||||
- ".git/HEAD",
|
||||
"script/lib/get-version.js",
|
||||
])
|
||||
|
||||
@@ -493,7 +491,7 @@ source_set("electron_lib") {
|
||||
defines += [ "GDK_DISABLE_DEPRECATION_WARNINGS" ]
|
||||
}
|
||||
|
||||
|
@ -9,7 +18,7 @@
|
|||
deps += [
|
||||
"//components/crash/core/app",
|
||||
"//components/crash/core/browser",
|
||||
@@ -499,6 +499,10 @@ source_set("electron_lib") {
|
||||
@@ -535,6 +533,10 @@ source_set("electron_lib") {
|
||||
]
|
||||
}
|
||||
|
||||
|
@ -20,7 +29,7 @@
|
|||
if (is_mac) {
|
||||
deps += [
|
||||
"//components/remote_cocoa/app_shim",
|
||||
@@ -555,6 +559,12 @@ source_set("electron_lib") {
|
||||
@@ -591,6 +593,12 @@ source_set("electron_lib") {
|
||||
cflags_objcc = [ "-fobjc-weak" ]
|
||||
}
|
||||
}
|
||||
|
@ -33,16 +42,16 @@
|
|||
if (is_linux) {
|
||||
libs = [ "xshmfence" ]
|
||||
deps += [
|
||||
@@ -1185,7 +1195,7 @@ if (is_mac) {
|
||||
":electron_app_manifest",
|
||||
@@ -1237,7 +1245,7 @@ if (is_mac) {
|
||||
":electron_lib",
|
||||
":electron_win32_resources",
|
||||
":packed_resources",
|
||||
- "//components/crash/core/app",
|
||||
+ # "//components/crash/core/app",
|
||||
"//content:sandbox_helper_win",
|
||||
"//electron/buildflags",
|
||||
"//ui/strings",
|
||||
@@ -1211,7 +1221,7 @@ if (is_mac) {
|
||||
@@ -1263,7 +1271,7 @@ if (is_mac) {
|
||||
public_deps = [ "//tools/v8_context_snapshot:v8_context_snapshot" ]
|
||||
}
|
||||
|
||||
|
@ -51,7 +60,7 @@
|
|||
data_deps += [ "//components/crash/core/app:chrome_crashpad_handler" ]
|
||||
}
|
||||
|
||||
@@ -1279,7 +1289,7 @@ if (is_mac) {
|
||||
@@ -1330,7 +1338,7 @@ if (is_mac) {
|
||||
configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
|
||||
}
|
||||
|
||||
|
@ -60,8 +69,8 @@
|
|||
deps += [ "//sandbox/linux:chrome_sandbox" ]
|
||||
}
|
||||
}
|
||||
@@ -1411,7 +1421,7 @@ dist_zip("electron_dist_zip") {
|
||||
":electron_version",
|
||||
@@ -1457,7 +1465,7 @@ dist_zip("electron_dist_zip") {
|
||||
":electron_version_file",
|
||||
":licenses",
|
||||
]
|
||||
- if (is_linux) {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- electron/filenames.gni.orig 2022-08-03 15:31:32 UTC
|
||||
--- electron/filenames.gni.orig 2023-01-24 08:00:52 UTC
|
||||
+++ electron/filenames.gni
|
||||
@@ -245,8 +245,8 @@ filenames = {
|
||||
@@ -246,8 +246,8 @@ filenames = {
|
||||
"shell/app/command_line_args.h",
|
||||
"shell/app/electron_content_client.cc",
|
||||
"shell/app/electron_content_client.h",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- electron/lib/common/api/clipboard.ts.orig 2021-12-03 01:46:05 UTC
|
||||
--- electron/lib/common/api/clipboard.ts.orig 2023-01-24 08:00:52 UTC
|
||||
+++ electron/lib/common/api/clipboard.ts
|
||||
@@ -11,7 +11,7 @@ if (process.type === 'renderer') {
|
||||
@@ -12,7 +12,7 @@ if (process.type === 'renderer') {
|
||||
return (...args: any[]) => ipcRendererUtils.invokeSync(IPC_MESSAGES.BROWSER_CLIPBOARD_SYNC, method, ...args);
|
||||
};
|
||||
|
||||
|
|
|
@ -0,0 +1,17 @@
|
|||
--- electron/script/lib/get-version.js.orig 2023-01-24 08:00:52 UTC
|
||||
+++ electron/script/lib/get-version.js
|
||||
@@ -11,12 +11,10 @@ module.exports.getElectronVersion = () => {
|
||||
// The only difference in the "git describe" technique is that technically a commit can "change" it's version
|
||||
// number if a tag is created / removed retroactively. i.e. the first time a commit is pushed it will be 1.2.3
|
||||
// and after the tag is made rebuilding the same commit will result in it being 1.2.4
|
||||
- const output = spawnSync('git', ['describe', '--tags', '--abbrev=0'], {
|
||||
- cwd: path.resolve(__dirname, '..', '..')
|
||||
- });
|
||||
+ const output = spawnSync('basename', [path.resolve(__dirname, '..', '..', '..', '..')]);
|
||||
if (output.status !== 0) {
|
||||
console.error(output.stderr);
|
||||
throw new Error('Failed to get current electron version');
|
||||
}
|
||||
- return output.stdout.toString().trim().replace(/^v/g, '');
|
||||
+ return output.stdout.toString().trim().replace(/^electron-/g, '');
|
||||
};
|
|
@ -1,6 +1,6 @@
|
|||
--- electron/script/lib/utils.js.orig 2021-10-11 17:12:26 UTC
|
||||
--- electron/script/lib/utils.js.orig 2023-01-24 08:00:52 UTC
|
||||
+++ electron/script/lib/utils.js
|
||||
@@ -21,7 +21,7 @@ function getElectronExec () {
|
||||
@@ -22,7 +22,7 @@ function getElectronExec () {
|
||||
return `out/${OUT_DIR}/Electron.app/Contents/MacOS/Electron`;
|
||||
case 'win32':
|
||||
return `out/${OUT_DIR}/electron.exe`;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- electron/shell/app/electron_main_delegate.cc.orig 2022-08-03 15:31:32 UTC
|
||||
--- electron/shell/app/electron_main_delegate.cc.orig 2023-01-24 08:00:52 UTC
|
||||
+++ electron/shell/app/electron_main_delegate.cc
|
||||
@@ -53,14 +53,17 @@
|
||||
@@ -55,14 +55,17 @@
|
||||
#include "chrome/child/v8_crashpad_support_win.h"
|
||||
#endif
|
||||
|
||||
|
@ -20,7 +20,7 @@
|
|||
#include "components/crash/core/app/crash_switches.h" // nogncheck
|
||||
#include "components/crash/core/app/crashpad.h" // nogncheck
|
||||
#include "components/crash/core/common/crash_key.h"
|
||||
@@ -157,7 +160,7 @@ bool ElectronPathProvider(int key, base::FilePath* res
|
||||
@@ -159,7 +162,7 @@ bool ElectronPathProvider(int key, base::FilePath* res
|
||||
create_dir = true;
|
||||
break;
|
||||
}
|
||||
|
@ -29,7 +29,7 @@
|
|||
case DIR_APP_DATA: {
|
||||
auto env = base::Environment::Create();
|
||||
cur = base::nix::GetXDGDirectory(
|
||||
@@ -291,7 +294,7 @@ bool ElectronMainDelegate::BasicStartupComplete(int* e
|
||||
@@ -293,7 +296,7 @@ absl::optional<int> ElectronMainDelegate::BasicStartup
|
||||
base::win::PinUser32();
|
||||
#endif
|
||||
|
||||
|
@ -38,7 +38,7 @@
|
|||
// Check for --no-sandbox parameter when running as root.
|
||||
if (getuid() == 0 && IsSandboxEnabled(command_line))
|
||||
LOG(FATAL) << "Running as root without --"
|
||||
@@ -346,7 +349,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
|
||||
@@ -345,7 +348,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
|
||||
process_type == ::switches::kZygoteProcess);
|
||||
#endif
|
||||
|
||||
|
@ -47,7 +47,7 @@
|
|||
crash_reporter::InitializeCrashKeys();
|
||||
#endif
|
||||
|
||||
@@ -385,7 +388,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
|
||||
@@ -384,7 +387,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- electron/shell/browser/api/electron_api_app.cc.orig 2022-12-02 17:32:32.785444000 +0100
|
||||
+++ electron/shell/browser/api/electron_api_app.cc 2022-12-02 17:33:42.233196000 +0100
|
||||
@@ -706,7 +706,7 @@ void App::OnFinishLaunching(base::Value::Dict launch_i
|
||||
--- electron/shell/browser/api/electron_api_app.cc.orig 2023-01-24 08:00:52 UTC
|
||||
+++ electron/shell/browser/api/electron_api_app.cc
|
||||
@@ -707,7 +707,7 @@ void App::OnWillFinishLaunching() {
|
||||
}
|
||||
|
||||
void App::OnFinishLaunching(base::Value::Dict launch_info) {
|
||||
|
@ -9,7 +9,7 @@
|
|||
// Set the application name for audio streams shown in external
|
||||
// applications. Only affects pulseaudio currently.
|
||||
media::AudioManager::SetGlobalAppName(Browser::Get()->GetName());
|
||||
@@ -1029,7 +1029,7 @@ void App::SetDesktopName(const std::string& desktop_na
|
||||
@@ -1030,7 +1030,7 @@ void App::SetPath(gin_helper::ErrorThrower thrower,
|
||||
}
|
||||
|
||||
void App::SetDesktopName(const std::string& desktop_name) {
|
||||
|
@ -18,7 +18,7 @@
|
|||
auto env = base::Environment::Create();
|
||||
env->SetVar("CHROME_DESKTOP", desktop_name);
|
||||
#endif
|
||||
@@ -1413,7 +1413,7 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics
|
||||
@@ -1414,7 +1414,7 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics
|
||||
pid_dict.Set("name", process_metric.second->name);
|
||||
}
|
||||
|
||||
|
@ -27,7 +27,7 @@
|
|||
auto memory_info = process_metric.second->GetMemoryInfo();
|
||||
|
||||
gin_helper::Dictionary memory_dict = gin::Dictionary::CreateEmpty(isolate);
|
||||
@@ -1720,7 +1720,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
|
||||
@@ -1721,7 +1721,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
|
||||
.SetMethod(
|
||||
"removeAsDefaultProtocolClient",
|
||||
base::BindRepeating(&Browser::RemoveAsDefaultProtocolClient, browser))
|
||||
|
@ -36,7 +36,7 @@
|
|||
.SetMethod(
|
||||
"getApplicationInfoForProtocol",
|
||||
base::BindRepeating(&Browser::GetApplicationInfoForProtocol, browser))
|
||||
@@ -1778,7 +1778,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
|
||||
@@ -1779,7 +1779,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
|
||||
.SetMethod("getJumpListSettings", &App::GetJumpListSettings)
|
||||
.SetMethod("setJumpList", &App::SetJumpList)
|
||||
#endif
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- electron/shell/browser/api/electron_api_base_window.cc.orig 2022-08-03 15:31:32 UTC
|
||||
--- electron/shell/browser/api/electron_api_base_window.cc.orig 2023-01-24 08:00:52 UTC
|
||||
+++ electron/shell/browser/api/electron_api_base_window.cc
|
||||
@@ -1057,7 +1057,7 @@ void BaseWindow::SetIconImpl(v8::Isolate* isolate,
|
||||
@@ -1055,7 +1055,7 @@ void BaseWindow::SetIconImpl(v8::Isolate* isolate,
|
||||
static_cast<NativeWindowViews*>(window_.get())
|
||||
->SetIcon(native_image->GetHICON(GetSystemMetrics(SM_CXSMICON)),
|
||||
native_image->GetHICON(GetSystemMetrics(SM_CXICON)));
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- electron/shell/browser/api/electron_api_crash_reporter.cc.orig 2022-05-25 15:32:14 UTC
|
||||
--- electron/shell/browser/api/electron_api_crash_reporter.cc.orig 2023-01-24 08:00:52 UTC
|
||||
+++ electron/shell/browser/api/electron_api_crash_reporter.cc
|
||||
@@ -30,7 +30,7 @@
|
||||
#include "shell/common/gin_helper/dictionary.h"
|
||||
|
@ -9,16 +9,16 @@
|
|||
#include "components/crash/core/app/crashpad.h" // nogncheck
|
||||
#include "components/crash/core/browser/crash_upload_list_crashpad.h" // nogncheck
|
||||
#include "components/crash/core/common/crash_key.h"
|
||||
@@ -70,7 +70,7 @@ namespace api {
|
||||
@@ -66,7 +66,7 @@ bool g_crash_reporter_initialized = false;
|
||||
|
||||
namespace crash_reporter {
|
||||
namespace electron::api::crash_reporter {
|
||||
|
||||
-#if defined(MAS_BUILD)
|
||||
+#if defined(MAS_BUILD) || BUILDFLAG(IS_BSD)
|
||||
namespace {
|
||||
|
||||
void NoOp() {}
|
||||
@@ -137,7 +137,7 @@ void Start(const std::string& submit_url,
|
||||
@@ -133,7 +133,7 @@ void Start(const std::string& submit_url,
|
||||
const std::map<std::string, std::string>& extra,
|
||||
bool is_node_process) {
|
||||
TRACE_EVENT0("electron", "crash_reporter::Start");
|
||||
|
@ -27,7 +27,7 @@
|
|||
if (g_crash_reporter_initialized)
|
||||
return;
|
||||
g_crash_reporter_initialized = true;
|
||||
@@ -204,7 +204,7 @@ void Start(const std::string& submit_url,
|
||||
@@ -196,7 +196,7 @@ void Start(const std::string& submit_url,
|
||||
|
||||
namespace {
|
||||
|
||||
|
@ -36,7 +36,7 @@
|
|||
void GetUploadedReports(
|
||||
v8::Isolate* isolate,
|
||||
base::OnceCallback<void(v8::Local<v8::Value>)> callback) {
|
||||
@@ -261,13 +261,13 @@ v8::Local<v8::Value> GetUploadedReports(v8::Isolate* i
|
||||
@@ -253,13 +253,13 @@ v8::Local<v8::Value> GetUploadedReports(v8::Isolate* i
|
||||
#endif
|
||||
|
||||
void SetUploadToServer(bool upload) {
|
||||
|
@ -52,7 +52,7 @@
|
|||
return false;
|
||||
#else
|
||||
return ElectronCrashReporterClient::Get()->GetCollectStatsConsent();
|
||||
@@ -276,7 +276,7 @@ bool GetUploadToServer() {
|
||||
@@ -268,7 +268,7 @@ bool GetUploadToServer() {
|
||||
|
||||
v8::Local<v8::Value> GetParameters(v8::Isolate* isolate) {
|
||||
std::map<std::string, std::string> keys;
|
||||
|
@ -61,7 +61,7 @@
|
|||
electron::crash_keys::GetCrashKeys(&keys);
|
||||
#endif
|
||||
return gin::ConvertToV8(isolate, keys);
|
||||
@@ -288,7 +288,7 @@ void Initialize(v8::Local<v8::Object> exports,
|
||||
@@ -280,7 +280,7 @@ void Initialize(v8::Local<v8::Object> exports,
|
||||
void* priv) {
|
||||
gin_helper::Dictionary dict(context->GetIsolate(), exports);
|
||||
dict.SetMethod("start", &electron::api::crash_reporter::Start);
|
||||
|
|
|
@ -0,0 +1,29 @@
|
|||
--- electron/shell/browser/api/electron_api_desktop_capturer.cc.orig 2023-01-24 08:00:52 UTC
|
||||
+++ electron/shell/browser/api/electron_api_desktop_capturer.cc
|
||||
@@ -36,7 +36,7 @@
|
||||
#include "third_party/webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.h"
|
||||
#include "third_party/webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h"
|
||||
#include "ui/display/win/display_info.h"
|
||||
-#elif BUILDFLAG(IS_LINUX)
|
||||
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
#if defined(USE_OZONE_PLATFORM_X11)
|
||||
#include "base/logging.h"
|
||||
#include "ui/base/x/x11_display_util.h"
|
||||
@@ -48,7 +48,7 @@
|
||||
#endif // defined(USE_OZONE_PLATFORM_X11)
|
||||
#endif // BUILDFLAG(IS_WIN)
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
// Private function in ui/base/x/x11_display_util.cc
|
||||
std::map<x11::RandR::Output, int> GetMonitors(int version,
|
||||
x11::RandR* randr,
|
||||
@@ -292,7 +292,7 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaLi
|
||||
for (auto& source : screen_sources) {
|
||||
source.display_id = base::NumberToString(source.media_list_source.id.id);
|
||||
}
|
||||
-#elif BUILDFLAG(IS_LINUX)
|
||||
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
#if defined(USE_OZONE_PLATFORM_X11)
|
||||
// On Linux, with X11, the source id is the numeric value of the
|
||||
// display name atom and the display id is either the EDID or the
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue