Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update 2 modules #55

Merged
merged 4 commits into from
May 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion desktop-app-patches
Submodule desktop-app-patches updated 44 files
+16 −0 macos_meson_arm64.txt
+16 −0 macos_meson_x86_64.txt
+15 −23 qtbase_5.15.13/0003-fix-windows-font-fallback.patch
+13 −0 qtbase_5.15.13/0030-fix-focus-in-hidden-window.patch
+15 −0 qtbase_5.15.13/0031-fix-only-emoji-line.patch
+0 −34 qtbase_6.2.7/0027-respect-short-time-format-on-windows.patch
+0 −23 qtbase_6.2.7/0028-dont-set-ansi-text-to-clipboard-on-windows.patch
+0 −0 qtbase_6.2.8/0001-disable-slow-debug-code.patch
+0 −0 qtbase_6.2.8/0002-spellcheck-underline-from-chrome.patch
+0 −0 qtbase_6.2.8/0003-improve-apostrophe-processing.patch
+0 −0 qtbase_6.2.8/0004-fix-shortcuts-on-macos.patch
+0 −0 qtbase_6.2.8/0005-allow-creating-floating-panels-macos.patch
+0 −0 qtbase_6.2.8/0006-fix-file-dialog-on-windows.patch
+0 −0 qtbase_6.2.8/0007-fix-launching-mail-program-on-windows.patch
+0 −0 qtbase_6.2.8/0008-save-dirtyopaquechildren.patch
+0 −0 qtbase_6.2.8/0009-count-scrollbar-sizehint-only-when-needed.patch
+0 −0 qtbase_6.2.8/0010-catch-cocoa-dock-menu.patch
+0 −0 qtbase_6.2.8/0011-fix-open-macos-window-ghost-focused-after-popup.patch
+0 −0 qtbase_6.2.8/0012-fix-race-in-windows-timers.patch
+0 −0 qtbase_6.2.8/0013-reset-current-context-on-error.patch
+0 −0 qtbase_6.2.8/0014-reset-opengl-widget-on-context-loss.patch
+0 −0 qtbase_6.2.8/0015-enable-macos-10-13.patch
+0 −0 qtbase_6.2.8/0016-posix_memalign-for-10-13.patch
+0 −0 qtbase_6.2.8/0017-optional-value-10-13.patch
+0 −0 qtbase_6.2.8/0018-fix-frameless-translucent-macos.patch
+0 −0 qtbase_6.2.8/0019-fix-imes-on-macos.patch
+0 −0 qtbase_6.2.8/0020-fix-search-in-finder-macos.patch
+0 −0 qtbase_6.2.8/0021-macos-backport-key-event-fix.patch
+0 −0 qtbase_6.2.8/0022-macos-backport-im-fix.patch
+0 −0 qtbase_6.2.8/0023-no-jpeg-chroma-subsampling.patch
+0 −0 qtbase_6.2.8/0024-convert-qimage-to-srgb.patch
+0 −0 qtbase_6.2.8/0025-lcms2.patch
+0 −0 qtbase_6.2.8/0026-no-quality-loss-when-scaling-images.patch
+0 −0 qtbase_6.2.8/0027-translucent-captioned-window-on-windows.patch
+0 −0 qtbase_6.2.8/0028-allow-bordered-translucent-macos.patch
+0 −0 qtbase_6.2.8/0029-disable-momery-resource-on-macos.patch
+0 −0 qtbase_6.2.8/0030-keep-build-macos-10-13.patch
+0 −0 qtbase_6.2.8/0031-backport-qt-6.3-dock-menu-windows-list.patch
+13 −0 qtbase_6.2.8/0032-fix-focus-in-hidden-window.patch
+15 −0 qtbase_6.2.8/0033-fix-only-emoji-line.patch
+76 −41 qtbase_6.7.0/0026-fix-backing-store-rhi-unneeded-copy.patch
+13 −0 qtbase_6.7.0/0030-fix-focus-in-hidden-window.patch
+15 −0 qtbase_6.7.0/0031-fix-only-emoji-line.patch
+26 −0 qtwayland_6.7.0/0008-owning-rhi-backing-store.patch
64 changes: 12 additions & 52 deletions io.github.kukuruzka165.materialgram.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,49 +74,29 @@ modules:
cleanup:
- '*'

- name: xcursorgen
sources:
- type: archive
url: https://xorg.freedesktop.org/archive/individual/app/xcursorgen-1.0.8.tar.gz
sha256: b8bb2756918343b8bc15a4ce875e9efb6c4e7777adba088280e53dd09753b6ac
x-checker-data:
type: anitya
project-id: 21210
url-template: https://xorg.freedesktop.org/archive/individual/app/xcursorgen-$version.tar.gz
cleanup:
- '*'

- name: dmz-cursor-theme
buildsystem: simple
build-commands:
- (cd DMZ-Black/pngs ; ./make.sh)
- install -d "$FLATPAK_DEST/share/icons/default/cursors"
- cp -a DMZ-Black/xcursors/* "$FLATPAK_DEST/share/icons/default/cursors"
- install -Dm644 DMZ-Black/index.theme "$FLATPAK_DEST/share/icons/default/index.theme"
sources:
- type: archive
url: http://ftp.de.debian.org/debian/pool/main/d/dmz-cursor-theme/dmz-cursor-theme_0.4.5.tar.xz
sha256: b719a64ed9c51905743105e5a50b15492695929ab2d6fca2cea760d52ccd1f5c
x-checker-data:
type: anitya
project-id: 15904
url-template: http://ftp.de.debian.org/debian/pool/main/d/dmz-cursor-theme/dmz-cursor-theme_$version.tar.xz

- name: jinja2
buildsystem: simple
build-commands:
- pip3 install --exists-action=i --no-index --find-links="file://${PWD}" --prefix=${FLATPAK_DEST}
flit-core --no-build-isolation
- pip3 install --exists-action=i --no-index --find-links="file://${PWD}" --prefix=${FLATPAK_DEST}
"Jinja2" --no-build-isolation
sources:
- type: file
url: https://files.pythonhosted.org/packages/c4/e6/c1ac50fe3eebb38a155155711e6e864e254ce4b6e17fe2429b4c4d5b9e80/flit_core-3.9.0.tar.gz
sha256: 72ad266176c4a3fcfab5f2930d76896059851240570ce9a98733b658cb786eba
x-checker-data:
type: pypi
name: flit-core
- type: file
url: https://files.pythonhosted.org/packages/87/5b/aae44c6655f3801e81aa3eef09dbbf012431987ba564d7231722f68df02d/MarkupSafe-2.1.5.tar.gz
sha256: d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b
x-checker-data:
type: pypi
name: MarkupSafe
- type: file
url: https://files.pythonhosted.org/packages/b2/5e/3a21abf3cd467d7876045335e681d276ac32492febe6d98ad89562d1a7e1/Jinja2-3.1.3.tar.gz
sha256: ac8bd6544d4bb2c9792bf3a159e80bba8fda7f07e81bc3aed565432d5925ba90
url: https://files.pythonhosted.org/packages/ed/55/39036716d19cab0747a5020fc7e907f362fbf48c984b14e62127f7e68e5d/jinja2-3.1.4.tar.gz
sha256: 4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369
x-checker-data:
type: pypi
name: Jinja2
Expand Down Expand Up @@ -166,25 +146,6 @@ modules:
stable-only: true
url-template: https://boostorg.jfrog.io/artifactory/main/release/$version/source/boost_${major}_${minor}_${patch}.tar.bz2

- name: fmt
buildsystem: cmake-ninja
builddir: true
config-opts:
- -DCMAKE_BUILD_TYPE=None
- -DFMT_DOC=OFF
- -DFMT_TEST=OFF
sources:
- type: archive
url: https://github.com/fmtlib/fmt/releases/download/10.2.1/fmt-10.2.1.zip
sha256: 312151a2d13c8327f5c9c586ac6cf7cddc1658e8f53edae0ec56509c8fa516c9
x-checker-data:
type: json
url: https://api.github.com/repos/fmtlib/fmt/releases/latest
tag-query: .tag_name
timestamp-query: .published_at
version-query: $tag
url-query: '"https://github.com/fmtlib/fmt/releases/download/\($tag)/fmt-\($version).zip"'

- name: protobuf
buildsystem: cmake-ninja
builddir: true
Expand Down Expand Up @@ -315,8 +276,8 @@ modules:
version-query: $tag | sub("^[vV]"; "")
url-query: '"https://github.com/libjxl/libjxl/archive/\($tag)/libjxl-\($version).tar.gz"'
- type: archive
url: https://github.com/libjpeg-turbo/libjpeg-turbo/archive/3.0.2/libjpeg-turbo-3.0.2.tar.gz
sha256: 29f2197345aafe1dcaadc8b055e4cbec9f35aad2a318d61ea081f835af2eebe9
url: https://github.com/libjpeg-turbo/libjpeg-turbo/archive/3.0.3/libjpeg-turbo-3.0.3.tar.gz
sha256: a649205a90e39a548863a3614a9576a3fb4465f8e8e66d54999f127957c25b21
strip-components: 0
x-checker-data:
type: json
Expand Down Expand Up @@ -398,7 +359,6 @@ modules:
builddir: true
config-opts:
- -DCMAKE_BUILD_TYPE=None
- -DINPUT_egl_extension_platform_wayland=no
sources:
- type: archive
url: https://download.qt.io/archive/qt/6.7/6.7.0/submodules/qtwayland-everywhere-src-6.7.0.tar.xz
Expand Down
4 changes: 3 additions & 1 deletion qtbase.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
"desktop-app-patches/qtbase_6.7.0/0026-fix-backing-store-rhi-unneeded-copy.patch",
"desktop-app-patches/qtbase_6.7.0/0027-fix-backing-store-opengl-subimage-unneeded-copy.patch",
"desktop-app-patches/qtbase_6.7.0/0028-portal-proxy-resolver.patch",
"desktop-app-patches/qtbase_6.7.0/0029-fix-crash-opengl-drivers.patch"
"desktop-app-patches/qtbase_6.7.0/0029-fix-crash-opengl-drivers.patch",
"desktop-app-patches/qtbase_6.7.0/0030-fix-focus-in-hidden-window.patch",
"desktop-app-patches/qtbase_6.7.0/0031-fix-only-emoji-line.patch"
]
}
3 changes: 2 additions & 1 deletion qtwayland.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"desktop-app-patches/qtwayland_6.7.0/0004-fix-gtk4-embedding.patch",
"desktop-app-patches/qtwayland_6.7.0/0005-QWaylandShmBackingStore-Preserve-buffer-contents-bet.patch",
"desktop-app-patches/qtwayland_6.7.0/0006-avoid-needlessly-initiailizing-opengl.patch",
"desktop-app-patches/qtwayland_6.7.0/0007-fix-media-viewer-on-gnome.patch"
"desktop-app-patches/qtwayland_6.7.0/0007-fix-media-viewer-on-gnome.patch",
"desktop-app-patches/qtwayland_6.7.0/0008-owning-rhi-backing-store.patch"
]
}
Loading