[chromium-freeworld/f34] (4 commits) ...Add patch for old freetype
by Leigh Scott
Summary of changes:
ddd3ec6... Enable aarch64 build (*)
5bba3e7... aarch64 fix (*)
d636048... Reduce cores to 6 to increase RAM per task for aarch64 buil (*)
869c695... Add patch for old freetype (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 8 months
[chromium-freeworld] Add patch for old freetype
by Leigh Scott
commit 869c6950922357b87b78daf41417dd103b5905c4
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Sep 4 13:29:37 2021 +0100
Add patch for old freetype
chromium-93-old-freetype.patch | 52 ++++++++++++++++++++++++++++++++++++++++++
chromium-freeworld.spec | 1 +
2 files changed, 53 insertions(+)
---
diff --git a/chromium-93-old-freetype.patch b/chromium-93-old-freetype.patch
new file mode 100644
index 0000000..0c0e95e
--- /dev/null
+++ b/chromium-93-old-freetype.patch
@@ -0,0 +1,52 @@
+diff -up chromium-93.0.4577.63/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp.freetype-2.11 chromium-93.0.4577.63/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp
+--- chromium-93.0.4577.63/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp.freetype-2.11 2021-09-02 08:49:18.996863417 -0400
++++ chromium-93.0.4577.63/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp 2021-09-02 08:56:07.716626801 -0400
+@@ -712,7 +712,11 @@ void colrv1_draw_paint(SkCanvas* canvas,
+ canvas->drawPaint(colrPaint);
+ break;
+ }
++#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
+ case FT_COLR_PAINTFORMAT_TRANSFORM:
++#else
++ case FT_COLR_PAINTFORMAT_TRANSFORMED:
++#endif
+ case FT_COLR_PAINTFORMAT_TRANSLATE:
+ case FT_COLR_PAINTFORMAT_SCALE:
+ case FT_COLR_PAINTFORMAT_ROTATE:
+@@ -760,10 +764,17 @@ void colrv1_transform(SkCanvas* canvas,
+ SkMatrix transform;
+
+ switch (colrv1_paint.format) {
++#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
+ case FT_COLR_PAINTFORMAT_TRANSFORM: {
+ transform = ToSkMatrix(colrv1_paint.u.transform.affine);
+ break;
+ }
++#else
++ case FT_COLR_PAINTFORMAT_TRANSFORMED: {
++ transform = ToSkMatrix(colrv1_paint.u.transformed.affine);
++ break;
++ }
++#endif
+ case FT_COLR_PAINTFORMAT_TRANSLATE: {
+ transform = SkMatrix::Translate(
+ SkFixedToScalar(colrv1_paint.u.translate.dx),
+@@ -889,11 +900,18 @@ bool colrv1_traverse_paint(SkCanvas* can
+ traverse_result = colrv1_start_glyph(canvas, palette, face, paint.u.colr_glyph.glyphID,
+ FT_COLOR_NO_ROOT_TRANSFORM);
+ break;
++#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
+ case FT_COLR_PAINTFORMAT_TRANSFORM:
+ colrv1_transform(canvas, face, paint);
+ traverse_result = colrv1_traverse_paint(canvas, palette, face,
+ paint.u.transform.paint, visited_set);
+ break;
++#else
++ case FT_COLR_PAINTFORMAT_TRANSFORMED:
++ colrv1_transform(canvas, face, paint);
++ traverse_result = colrv1_traverse_paint(canvas, palette, face,
++ paint.u.transformed.paint, visited_set);
++#endif
+ case FT_COLR_PAINTFORMAT_TRANSLATE:
+ colrv1_transform(canvas, face, paint);
+ traverse_result = colrv1_traverse_paint(canvas, palette, face,
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 34c74fd..35f1dfb 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -170,6 +170,7 @@ Patch302: chromium-py3-fixes.patch
Patch303: chromium-java-only-allowed-in-android-builds.patch
Patch304: chromium-update-highway-0.12.2.patch
Patch305: chromium-aarch64-cxxflags-addition.patch
+Patch306: chromium-93-old-freetype.patch
Patch1303: chromium-rawhide-gcc-std-max-fix.patch
# RPM Fusion patches [free/chromium-freeworld]:
2 years, 8 months
[chromium-freeworld] Reduce cores to 6 to increase RAM per task for aarch64 build
by Leigh Scott
commit d636048bf0a174666c0ed9fd9a1d74790d659ab0
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Sep 3 21:55:38 2021 +0100
Reduce cores to 6 to increase RAM per task for aarch64 build
chromium-freeworld.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index b5842cd..34c74fd 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -3,6 +3,9 @@
%global freeworld 1
%global menu_name Chromium (Freeworld)
%global xdg_subdir chromium
+%ifarch aarch64
+%global _smp_build_ncpus 6
+%endif
#This can be any folder on out
%global target out/Release
### Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
2 years, 8 months
[telegram-desktop/f33] (7 commits) ...Update to version 3.0.1
by Alexey Gorgurov
Summary of changes:
38c8d08... Updated to version 2.8.8. (*)
3437880... fix (*)
7bfcec8... fix (*)
4c5ebc6... Add all X11 build requires (*)
45923d6... Add Buildrequires webkitgtk4-devel and enable gtk integrati (*)
83b8cb9... Disable gtk integration (*)
c48f9af... Update to version 3.0.1 (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 8 months
[telegram-desktop] Update to version 3.0.1
by Alexey Gorgurov
commit c48f9afdbc6a4eca3d426e9516cc1c8d375c13a3
Author: Alexey Gorgurov <alexfails(a)fedoraproject.org>
Date: Fri Sep 3 22:59:45 2021 +0300
Update to version 3.0.1
.gitignore | 1 +
sources | 2 +-
telegram-desktop.spec | 39 +++++++++++++++++++++++++--------------
webview_extern_c.patch | 25 -------------------------
4 files changed, 27 insertions(+), 40 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4ec3326..6b9783c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -163,3 +163,4 @@
/tdesktop-2.6.1-full.tar.gz
/tdesktop-2.7.1-full.tar.gz
/tdesktop-2.8.8-full.tar.gz
+/tdesktop-3.0.1-full.tar.gz
diff --git a/sources b/sources
index 4212494..ebbfbc6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tdesktop-2.8.8-full.tar.gz) = 8742a2eec3dcace197e9ec2b8fc8e4294c9427402a81920624802e4a86bb1ac92b79eaee1e13cc543ba2d7e79ef353a0d7ba025191ab343de1683ebf0ec37ea0
+SHA512 (tdesktop-3.0.1-full.tar.gz) = 6bff6be5f2c0c7a17df61dccc5a3216dcbb95a1c6d3176442c530e2c1b525e6d15079b230d40751f20684da2a1067d4518a9a1ab90d49d1a7338d3e05239d447
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index ef3f801..7f73ea7 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -6,6 +6,7 @@
%bcond_with libtgvoip
%bcond_with rlottie
%bcond_with wayland
+%bcond_with webkit
%bcond_without x11
# Telegram Desktop's constants...
@@ -18,8 +19,8 @@
%endif
Name: telegram-desktop
-Version: 2.8.8
-Release: 3%{?dist}
+Version: 3.0.1
+Release: 1%{?dist}
# Application and 3rd-party modules licensing:
# * Telegram Desktop - GPLv3+ with OpenSSL exception -- main tarball;
@@ -29,7 +30,6 @@ License: GPLv3+ and LGPLv2+ and LGPLv3
URL: https://github.com/telegramdesktop/%{appname}
Summary: Telegram Desktop official messaging app
Source0: %{url}/releases/download/v%{version}/%{appname}-%{version}-full.tar.gz
-Patch0: webview_extern_c.patch
# Telegram Desktop require more than 8 GB of RAM on linking stage.
# Disabling all low-memory architectures.
@@ -41,12 +41,14 @@ BuildRequires: cmake(Qt5Core)
BuildRequires: cmake(Qt5DBus)
BuildRequires: cmake(Qt5Gui)
BuildRequires: cmake(Qt5Network)
+BuildRequires: cmake(Qt5Svg)
BuildRequires: cmake(Qt5Widgets)
BuildRequires: cmake(Qt5XkbCommonSupport)
BuildRequires: cmake(dbusmenu-qt5)
BuildRequires: cmake(range-v3)
BuildRequires: cmake(tg_owt)
BuildRequires: cmake(tl-expected)
+
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(glibmm-2.4)
@@ -64,7 +66,7 @@ BuildRequires: pkgconfig(libswscale)
BuildRequires: pkgconfig(libxxhash)
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(opus)
-BuildRequires: pkgconfig(webkit2gtk-4.0)
+BuildRequires: pkgconfig(rnnoise)
BuildRequires: cmake
BuildRequires: desktop-file-utils
@@ -90,13 +92,16 @@ BuildRequires: pkgconfig(gtk+-3.0)
Requires: gtk3%{?_isa}
%endif
+%if %{with webkit}
+BuildRequires: pkgconfig(webkit2gtk-4.0)
+Requires: webkit2gtk3%{?_isa}
+%endif
+
%if %{with libtgvoip}
BuildRequires: pkgconfig(tgvoip) >= 2.4.4
%else
BuildRequires: pkgconfig(alsa)
-BuildRequires: pkgconfig(libpipewire-0.3)
BuildRequires: pkgconfig(libpulse)
-BuildRequires: pkgconfig(rnnoise)
Provides: bundled(libtgvoip) = 2.4.4
%endif
@@ -118,13 +123,6 @@ BuildRequires: pkgconfig(xcb)
BuildRequires: pkgconfig(xcb-keysyms)
BuildRequires: pkgconfig(xcb-record)
BuildRequires: pkgconfig(xcb-screensaver)
-BuildRequires: pkgconfig(xcomposite)
-BuildRequires: pkgconfig(xdamage)
-BuildRequires: pkgconfig(xext)
-BuildRequires: pkgconfig(xfixes)
-BuildRequires: pkgconfig(xrender)
-BuildRequires: pkgconfig(xrandr)
-BuildRequires: pkgconfig(xtst)
%endif
# Telegram Desktop require exact version of Qt due to Qt private API usage.
@@ -158,7 +156,7 @@ business messaging needs.
%autosetup -n %{appname}-%{version}-full -p1
# Unbundling libraries...
-rm -rf Telegram/ThirdParty/{Catch,GSL,QR,SPMediaKeyTap,expected,fcitx-qt5,fcitx5-qt,hime,hunspell,libdbusmenu-qt,lz4,materialdecoration,minizip,nimf,qt5ct,range-v3,xxHash}
+rm -rf Telegram/ThirdParty/{Catch,GSL,QR,SPMediaKeyTap,expected,fcitx-qt5,fcitx5-qt,jemalloc,hime,hunspell,libdbusmenu-qt,lz4,materialdecoration,minizip,nimf,qt5ct,range-v3,xxHash}
# Unbundling rlottie if build against packaged version...
%if %{with rlottie}
@@ -170,6 +168,11 @@ rm -rf Telegram/ThirdParty/rlottie
rm -rf Telegram/ThirdParty/libtgvoip
%endif
+# Patching QR-Code...
+%if 0%{?fedora} && 0%{?fedora} >= 35
+sed -e 's/QrCode\.hpp/qrcodegen\.hpp/g' -i {cmake/external/qr_code_generator/CMakeLists.txt,Telegram/lib_qr/qr/qr_generate.cpp}
+%endif
+
%build
# Building Telegram Desktop using cmake...
%cmake -G Ninja \
@@ -199,6 +202,11 @@ rm -rf Telegram/ThirdParty/libtgvoip
%else
-DDESKTOP_APP_DISABLE_GTK_INTEGRATION:BOOL=ON \
%endif
+%if %{with webkit}
+ -DDESKTOP_APP_DISABLE_WEBKITGTK:BOOL=OFF \
+%else
+ -DDESKTOP_APP_DISABLE_WEBKITGTK:BOOL=ON \
+%endif
%if %{with wayland}
-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION:BOOL=OFF \
%else
@@ -231,6 +239,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{launcher}.desktop
%{_metainfodir}/%{launcher}.appdata.xml
%changelog
+* Thu Sep 02 2021 Alexey Gorgurov <alexfails(a)fedoraproject.org> - 3.0.1-1
+- Updated to version 3.0.1.
+
* Wed Jul 28 2021 Leigh Scott <leigh123linux(a)gmail.com> - 2.8.8-3
- Disable gtk integration
2 years, 8 months