@pheem49/mint 1.8.0 → 1.8.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (200) hide show
  1. package/.github/workflows/release.yml +1 -1
  2. package/Cargo.lock +34 -3
  3. package/Cargo.toml +2 -2
  4. package/README.md +20 -6
  5. package/Release_Note.md +129 -0
  6. package/assets/Mint_CLI.png +0 -0
  7. package/bin/mint +0 -0
  8. package/crates/mint-cli/Cargo.toml +1 -0
  9. package/crates/mint-cli/src/agent.rs +242 -54
  10. package/crates/mint-cli/src/main.rs +397 -74
  11. package/crates/mint-core/src/agent_loop.rs +1 -0
  12. package/crates/mint-core/src/api_server.rs +64 -2
  13. package/crates/mint-core/src/browser.rs +456 -0
  14. package/crates/mint-core/src/channels.rs +1 -0
  15. package/crates/mint-core/src/chat.rs +3 -0
  16. package/crates/mint-core/src/config.rs +130 -1
  17. package/crates/mint-core/src/lib.rs +19 -0
  18. package/crates/mint-core/src/orchestration.rs +317 -12
  19. package/crates/mint-core/src/skills.rs +113 -4
  20. package/crates/mint-core/src/tts.rs +3 -1
  21. package/crates/mint-core/src/workflows.rs +1 -22
  22. package/flatpak/com.pheem49.mint.desktop +9 -0
  23. package/flatpak/com.pheem49.mint.metainfo.xml +35 -0
  24. package/flatpak/com.pheem49.mint.yaml +52 -0
  25. package/package.json +1 -1
  26. package/shared-modules/.github/workflows/ci.yml +120 -0
  27. package/shared-modules/.github/workflows/update.yaml +28 -0
  28. package/shared-modules/CODEOWNERS +23 -0
  29. package/shared-modules/README.md +79 -0
  30. package/shared-modules/SDL/README.md +3 -0
  31. package/shared-modules/SDL/SDL-1.2.15.json +51 -0
  32. package/shared-modules/SDL/SDL_Pango-0.1.2-API-adds.patch +118 -0
  33. package/shared-modules/SDL/SDL_image-1.2.12.json +25 -0
  34. package/shared-modules/SDL/SDL_mixer-1.2.12.json +27 -0
  35. package/shared-modules/SDL/SDL_net-1.2.8.json +19 -0
  36. package/shared-modules/SDL/SDL_pango-0.1.2.json +26 -0
  37. package/shared-modules/SDL/SDL_ttf-2.0.11.json +28 -0
  38. package/shared-modules/SDL/libsdl-1.2.15-strict-prototypes.patch +316 -0
  39. package/shared-modules/SDL/sdl-check-for-SDL_VIDEO_X11_BACKINGSTORE.patch +24 -0
  40. package/shared-modules/SDL/sdl-libx11-build.patch +59 -0
  41. package/shared-modules/SDL/sdl-sysloadso-buffer-length.patch +27 -0
  42. package/shared-modules/SDL/sdl12-compat.json +22 -0
  43. package/shared-modules/SDL2/SDL2_image.json +27 -0
  44. package/shared-modules/SDL2/SDL2_ttf.json +29 -0
  45. package/shared-modules/cld2/CMakeLists.txt +157 -0
  46. package/shared-modules/cld2/cld2.json +24 -0
  47. package/shared-modules/clutter/clutter.json +72 -0
  48. package/shared-modules/dbus-glib/dbus-glib.json +29 -0
  49. package/shared-modules/glew/glew.json +36 -0
  50. package/shared-modules/glu/glu-9.json +12 -0
  51. package/shared-modules/gtk2/arc-gtk2-theme-Replace-Inkscape-dependency-with-rsvg-convert.patch +180 -0
  52. package/shared-modules/gtk2/gtk2-common-themes.json +360 -0
  53. package/shared-modules/gtk2/gtk2-fix-crash-in-show-uri.patch +30 -0
  54. package/shared-modules/gtk2/gtk2-gcc14.patch +281 -0
  55. package/shared-modules/gtk2/gtk2-gcc15.patch +250 -0
  56. package/shared-modules/gtk2/gtk2-murrine-c99.patch +34 -0
  57. package/shared-modules/gtk2/gtk2-use-adwaita-theme.patch +80 -0
  58. package/shared-modules/gtk2/gtk2.json +120 -0
  59. package/shared-modules/gtk2/ibus-gcc15.patch +13 -0
  60. package/shared-modules/gtk2/murrine-engine-fix-crash.patch +12 -0
  61. package/shared-modules/gtk2/readme.md +10 -0
  62. package/shared-modules/intltool/intltool-0.51.json +20 -0
  63. package/shared-modules/intltool/intltool-perl5.26-regex-fixes.patch +59 -0
  64. package/shared-modules/lame/0001-Build-xmm_quantize_sub.c-with-msse.patch +34 -0
  65. package/shared-modules/lame/0002-Include-GTK-1-autoconf-directives-in-build-system.patch +222 -0
  66. package/shared-modules/lame/0003-Patch-out-remaining-ansi2knr.patch +70 -0
  67. package/shared-modules/lame/0004-initscr-is-not-used-anywhere-in-lame-sourcetree.patch +41 -0
  68. package/shared-modules/lame/0005-Update-autoconf.patch +81 -0
  69. package/shared-modules/lame/lame-3.99.5.json +32 -0
  70. package/shared-modules/libappindicator/libappindicator-gtk2-12.10.json +140 -0
  71. package/shared-modules/libappindicator/libappindicator-gtk3-12.10.json +140 -0
  72. package/shared-modules/libappindicator/libappindicator-gtk3-introspection-12.10.json +140 -0
  73. package/shared-modules/libappindicator/patches/0001-libappindicator-ftbfs.patch +20 -0
  74. package/shared-modules/libappindicator/patches/0002-libappindicator-no-python.patch +888 -0
  75. package/shared-modules/libappindicator/patches/0003-libappindicator-fix-crash-from-incorrect-signal-emission.patch +74 -0
  76. package/shared-modules/libappindicator/patches/0004-libappindicator-fix-crash-iterating-icon-themes.patch +11 -0
  77. package/shared-modules/libayatana-appindicator/0001-Fix-HAVE_VALGRIND-AM_CONDITIONAL.patch +51 -0
  78. package/shared-modules/libayatana-appindicator/0001-Make-introspection-configurable.patch +44 -0
  79. package/shared-modules/libayatana-appindicator/libayatana-appindicator-gtk3.json +121 -0
  80. package/shared-modules/libcanberra/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch +123 -0
  81. package/shared-modules/libcanberra/libcanberra.json +44 -0
  82. package/shared-modules/libmad/libmad.json +19 -0
  83. package/shared-modules/libsecret/libsecret.json +23 -0
  84. package/shared-modules/libsoup/libsoup-2.4.json +14 -0
  85. package/shared-modules/libusb/libusb.json +27 -0
  86. package/shared-modules/linux-audio/dssi.json +31 -0
  87. package/shared-modules/linux-audio/fftw3f-static.json +44 -0
  88. package/shared-modules/linux-audio/fftw3f.json +42 -0
  89. package/shared-modules/linux-audio/fluidsynth2-static.json +30 -0
  90. package/shared-modules/linux-audio/fluidsynth2.json +19 -0
  91. package/shared-modules/linux-audio/ladspa.json +26 -0
  92. package/shared-modules/linux-audio/lash.json +35 -0
  93. package/shared-modules/linux-audio/libinstpatch.json +16 -0
  94. package/shared-modules/linux-audio/liblo-static.json +22 -0
  95. package/shared-modules/linux-audio/liblo.json +17 -0
  96. package/shared-modules/linux-audio/lilv-static.json +94 -0
  97. package/shared-modules/linux-audio/lilv.json +82 -0
  98. package/shared-modules/linux-audio/lrdf.json +57 -0
  99. package/shared-modules/linux-audio/lv2.json +21 -0
  100. package/shared-modules/linux-audio/patches/lash/0001-configure-remove-aclocal-m4.patch +29 -0
  101. package/shared-modules/linux-audio/patches/lash/0002-Fix-build-with-recent-gcc.patch +73 -0
  102. package/shared-modules/linux-audio/patches/lash/0003-Fix-linking.patch +136 -0
  103. package/shared-modules/linux-audio/patches/raptor-libxml.patch +31 -0
  104. package/shared-modules/linux-audio/patches/stk-install.sh +54 -0
  105. package/shared-modules/linux-audio/stk.json +28 -0
  106. package/shared-modules/lua5.1/0004-Fix-stack-overflow-in-vararg-functions.patch +21 -0
  107. package/shared-modules/lua5.1/lua-5.1.5-so.patch +43 -0
  108. package/shared-modules/lua5.1/lua-5.1.5.json +42 -0
  109. package/shared-modules/lua5.3/lua-5.3.5.json +41 -0
  110. package/shared-modules/lua5.3/lua.pc.in +8 -0
  111. package/shared-modules/lua5.3/luaconf.patch +47 -0
  112. package/shared-modules/lua5.3/makefile-add-liblua.so-rule.patch +47 -0
  113. package/shared-modules/lua5.4/lua-5.4.json +41 -0
  114. package/shared-modules/lua5.4/lua.pc.in +8 -0
  115. package/shared-modules/lua5.4/luaconf.patch +34 -0
  116. package/shared-modules/lua5.4/makefile-add-liblua.so-rule.patch +42 -0
  117. package/shared-modules/luajit/luajit.json +30 -0
  118. package/shared-modules/lzo/lzo.json +27 -0
  119. package/shared-modules/mac/mac.json +18 -0
  120. package/shared-modules/physfs/physfs.json +26 -0
  121. package/shared-modules/pygame/audiofile-gcc6.patch +21 -0
  122. package/shared-modules/pygame/cython-fixes.patch +34 -0
  123. package/shared-modules/pygame/fluidsynth-no-rawmidi.patch +69 -0
  124. package/shared-modules/pygame/glib.patch +25 -0
  125. package/shared-modules/pygame/pygame1-python2.json +157 -0
  126. package/shared-modules/pygtk/pygtk-c99.patch +15 -0
  127. package/shared-modules/pygtk/pygtk.json +117 -0
  128. package/shared-modules/pygtk/pygtk.patch +39 -0
  129. package/shared-modules/python2.7/python-2.7.json +48 -0
  130. package/shared-modules/smpeg/smpeg-0.4.5.json +50 -0
  131. package/shared-modules/smpeg/smpeg-am-prog-as.patch +12 -0
  132. package/shared-modules/smpeg/smpeg-export-mpegaudio-class.patch +17 -0
  133. package/shared-modules/smpeg/smpeg-gcc6.patch +40 -0
  134. package/shared-modules/smpeg/smpeg-no-gtk.patch +37 -0
  135. package/shared-modules/squashfs-tools/squashfs-tools.json +25 -0
  136. package/shared-modules/update-checker.sh +50 -0
  137. package/shared-modules/vorbisgain/0001-temp_files.patch +75 -0
  138. package/shared-modules/vorbisgain/0002-errno.patch +33 -0
  139. package/shared-modules/vorbisgain/0003-manpage.patch +248 -0
  140. package/shared-modules/vorbisgain/0004-vorbisgain_mtime.patch +183 -0
  141. package/shared-modules/vorbisgain/0005-double_fclose.patch +21 -0
  142. package/shared-modules/vorbisgain/0006-manpage_hyphens.patch +56 -0
  143. package/shared-modules/vorbisgain/0007-recursively_spelling.patch +14 -0
  144. package/shared-modules/vorbisgain/0008-manpage_recursion_mistake.patch +23 -0
  145. package/shared-modules/vorbisgain/0009-hardening.patch +13 -0
  146. package/shared-modules/vorbisgain/0010-fclose.patch +13 -0
  147. package/shared-modules/vorbisgain/README.md +23 -0
  148. package/shared-modules/vorbisgain/vorbisgain_0.37-2.json +29 -0
  149. package/src/renderer/shared/agentProgress.ts +145 -0
  150. package/src/renderer/shared/calculator.ts +52 -0
  151. package/src/renderer/shared/components/AgentActivityDrawer.tsx +72 -0
  152. package/src/renderer/shared/components/AgentActivityTable.tsx +66 -0
  153. package/src/renderer/shared/components/ApprovalCard.tsx +93 -0
  154. package/src/renderer/shared/components/ChatCodeBlock.tsx +75 -0
  155. package/src/renderer/shared/components/ThinkingBlock.tsx +101 -0
  156. package/src/renderer/shared/constants/models.ts +91 -0
  157. package/src/renderer/shared/platform.ts +82 -0
  158. package/src/renderer/shared/types.ts +140 -0
  159. package/src/renderer/shared/utils/agentActivity.ts +187 -0
  160. package/src/renderer/shared/utils/approval.ts +1 -0
  161. package/src/renderer/shared/utils/approval.tsx +64 -0
  162. package/src/renderer/shared/utils/markdown.tsx +347 -0
  163. package/src/renderer/shared/utils/providers.ts +36 -0
  164. package/src/renderer/shared/utils/speech.ts +216 -0
  165. package/src/renderer/shared/utils/ui.ts +147 -0
  166. package/src/renderer/src/agentProgress.ts +11 -39
  167. package/src/renderer/src/calculator.ts +3 -46
  168. package/src/renderer/src/components/ChatPanel.tsx +230 -1202
  169. package/src/renderer/src/components/ImageStudioPanel.tsx +11 -1
  170. package/src/renderer/src/components/MintDashboard.tsx +63 -171
  171. package/src/renderer/src/components/PicturesLibrary.tsx +32 -8
  172. package/src/renderer/src/components/Settings/AgentsTab.tsx +362 -0
  173. package/src/renderer/src/components/Settings/AutomationTab.tsx +0 -22
  174. package/src/renderer/src/components/Settings/PluginsTab.tsx +221 -41
  175. package/src/renderer/src/components/SettingsWindow.tsx +54 -12
  176. package/src/renderer/src/components/WorkspacePanel.tsx +66 -9
  177. package/src/renderer/src/css/image-studio.css +6 -0
  178. package/src/renderer/src/css/styles.css +148 -11
  179. package/src/renderer/src/index.css +12 -1
  180. package/src/renderer/src/tauri.ts +169 -143
  181. package/src/renderer/src-web/agentProgress.ts +11 -39
  182. package/src/renderer/src-web/calculator.ts +3 -46
  183. package/src/renderer/src-web/components/ChatPanel.tsx +223 -1199
  184. package/src/renderer/src-web/components/ImageStudioPanel.tsx +11 -1
  185. package/src/renderer/src-web/components/MintDashboard.tsx +31 -172
  186. package/src/renderer/src-web/components/PicturesLibrary.tsx +23 -29
  187. package/src/renderer/src-web/components/Settings/AgentsTab.tsx +362 -0
  188. package/src/renderer/src-web/components/Settings/AutomationTab.tsx +0 -22
  189. package/src/renderer/src-web/components/Settings/PluginsTab.tsx +221 -41
  190. package/src/renderer/src-web/components/SettingsWindow.tsx +54 -12
  191. package/src/renderer/src-web/css/image-studio.css +6 -0
  192. package/src/renderer/src-web/css/styles.css +184 -12
  193. package/src/renderer/src-web/index.css +12 -1
  194. package/src/renderer/src-web/tauri.ts +204 -104
  195. package/src-tauri/src/browser.rs +1 -141
  196. package/src-tauri/src/headless.rs +3 -2
  197. package/src-tauri/src/lib.rs +254 -59
  198. package/src-tauri/src/webhooks.rs +1 -0
  199. package/src-tauri/src/workflows.rs +57 -4
  200. package/src-tauri/tauri.conf.json +1 -1
@@ -0,0 +1,72 @@
1
+ {
2
+ "name": "clutter-gtk",
3
+ "cleanup": [
4
+ "/share/gtk-doc"
5
+ ],
6
+ "sources": [
7
+ {
8
+ "type": "archive",
9
+ "url": "https://download.gnome.org/sources/clutter-gtk/1.8/clutter-gtk-1.8.4.tar.xz",
10
+ "sha256": "521493ec038973c77edcb8bc5eac23eed41645117894aaee7300b2487cb42b06"
11
+ }
12
+ ],
13
+ "modules": [
14
+ {
15
+ "name": "cogl",
16
+ "build-options": {
17
+ "cflags": "-std=gnu18"
18
+ },
19
+ "config-opts": [
20
+ "--disable-cogl-gst",
21
+ "--disable-gtk-doc",
22
+ "--enable-xlib-egl-platform",
23
+ "--enable-wayland-egl-platform"
24
+ ],
25
+ "cleanup": [
26
+ "/share/gtk-doc",
27
+ "/share/cogl/examples-data"
28
+ ],
29
+ "sources": [
30
+ {
31
+ "type": "archive",
32
+ "url": "https://download.gnome.org/sources/cogl/1.22/cogl-1.22.8.tar.xz",
33
+ "sha256": "a805b2b019184710ff53d0496f9f0ce6dcca420c141a0f4f6fcc02131581d759"
34
+ }
35
+ ]
36
+ },
37
+ {
38
+ "name": "clutter",
39
+ "config-opts": [
40
+ "--disable-gtk-doc",
41
+ "--enable-egl-backend",
42
+ "--enable-wayland-backend"
43
+ ],
44
+ "cleanup": [
45
+ "/share/gtk-doc"
46
+ ],
47
+ "sources": [
48
+ {
49
+ "type": "archive",
50
+ "url": "https://download.gnome.org/sources/clutter/1.26/clutter-1.26.4.tar.xz",
51
+ "sha256": "8b48fac159843f556d0a6be3dbfc6b083fc6d9c58a20a49a6b4919ab4263c4e6"
52
+ }
53
+ ]
54
+ },
55
+ {
56
+ "name": "clutter-gst",
57
+ "config-opts": [
58
+ "--disable-gtk-doc"
59
+ ],
60
+ "cleanup": [
61
+ "/share/gtk-doc"
62
+ ],
63
+ "sources": [
64
+ {
65
+ "type": "archive",
66
+ "url": "https://download.gnome.org/sources/clutter-gst/3.0/clutter-gst-3.0.27.tar.xz",
67
+ "sha256": "fe69bd6c659d24ab30da3f091eb91cd1970026d431179b0724f13791e8ad9f9d"
68
+ }
69
+ ]
70
+ }
71
+ ]
72
+ }
@@ -0,0 +1,29 @@
1
+ {
2
+ "name": "dbus-glib",
3
+ "cleanup": [
4
+ "*.la",
5
+ "/bin",
6
+ "/etc",
7
+ "/include",
8
+ "/lib/pkgconfig",
9
+ "/libexec",
10
+ "/share/gtk-doc",
11
+ "/share/man"
12
+ ],
13
+ "config-opts": [
14
+ "--disable-static",
15
+ "--disable-gtk-doc"
16
+ ],
17
+ "sources": [
18
+ {
19
+ "type": "archive",
20
+ "url": "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.114.tar.gz",
21
+ "sha256": "c09c5c085b2a0e391b8ee7d783a1d63fe444e96717cc1814d61b5e8fc2827a7c",
22
+ "x-checker-data": {
23
+ "type": "anitya",
24
+ "project-id": 1979,
25
+ "url-template": "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-$version.tar.gz"
26
+ }
27
+ }
28
+ ]
29
+ }
@@ -0,0 +1,36 @@
1
+ {
2
+ "name": "glew",
3
+ "no-autogen": true,
4
+ "make-args": [
5
+ "GLEW_PREFIX=${FLATPAK_DEST}",
6
+ "GLEW_DEST=${FLATPAK_DEST}",
7
+ "LIBDIR=${FLATPAK_DEST}/lib",
8
+ "CFLAGS.EXTRA:=${CFLAGS} -fPIC",
9
+ "LDFLAGS.EXTRA=${LDFLAGS}"
10
+ ],
11
+ "make-install-args": [
12
+ "GLEW_PREFIX=${FLATPAK_DEST}",
13
+ "GLEW_DEST=${FLATPAK_DEST}",
14
+ "LIBDIR=${FLATPAK_DEST}/lib",
15
+ "CFLAGS.EXTRA:=${CFLAGS} -fPIC",
16
+ "LDFLAGS.EXTRA=${LDFLAGS}"
17
+ ],
18
+ "sources": [
19
+ {
20
+ "type": "archive",
21
+ "url": "https://github.com/nigels-com/glew/releases/download/glew-2.3.1/glew-2.3.1.tgz",
22
+ "sha256": "b64790f94b926acd7e8f84c5d6000a86cb43967bd1e688b03089079799c9e889",
23
+ "x-checker-data": {
24
+ "type": "anitya",
25
+ "project-id": 7878,
26
+ "stable-only": true,
27
+ "url-template": "https://github.com/nigels-com/glew/releases/download/glew-$version/glew-$version.tgz"
28
+ }
29
+ }
30
+ ],
31
+ "cleanup": [
32
+ "/include",
33
+ "/lib/pkgconfig",
34
+ "/lib/*.a"
35
+ ]
36
+ }
@@ -0,0 +1,12 @@
1
+ {
2
+ "name": "glu",
3
+ "buildsystem": "meson",
4
+ "sources": [
5
+ {
6
+ "type": "archive",
7
+ "url": "https://archive.mesa3d.org/glu/glu-9.0.3.tar.xz",
8
+ "sha256": "bd43fe12f374b1192eb15fe20e45ff456b9bc26ab57f0eee919f96ca0f8a330f"
9
+ }
10
+ ],
11
+ "cleanup": [ "/include", "/lib/*.a", "/lib/*.la", "/lib/pkgconfig" ]
12
+ }
@@ -0,0 +1,180 @@
1
+ From d5e0034183564df5fec8e4dde1705116c7b38021 Mon Sep 17 00:00:00 2001
2
+ From: Patrick Griffis <tingping@tingping.se>
3
+ Date: Sat, 16 May 2020 18:00:36 -0700
4
+ Subject: [PATCH] Replace Inkscape dependency with rsvg-convert
5
+
6
+ rsvg-convert is a *much* smaller dependency that all systems with
7
+ a functioning GTK installation should have easy access to.
8
+ ---
9
+ common/gtk-2.0/Makefile.am | 6 +-----
10
+ common/gtk-2.0/render-asset.sh | 16 ++++++++--------
11
+ common/gtk-3.0/common.am | 12 ++----------
12
+ common/xfwm4/Makefile.am | 6 +-----
13
+ common/xfwm4/render-asset.sh | 16 ++++++++--------
14
+ configure.ac | 8 ++------
15
+ 6 files changed, 22 insertions(+), 42 deletions(-)
16
+
17
+ diff --git a/common/gtk-2.0/Makefile.am b/common/gtk-2.0/Makefile.am
18
+ index 010823a..873013a 100644
19
+ --- a/common/gtk-2.0/Makefile.am
20
+ +++ b/common/gtk-2.0/Makefile.am
21
+ @@ -35,11 +35,7 @@ $(light): $(srcdir)/light/assets.svg | light/assets
22
+ $(dark): $(srcdir)/dark/assets.svg | dark/assets
23
+
24
+ $(light) $(dark):
25
+ -if INKSCAPE_1_0_OR_NEWER
26
+ - $(INKSCAPE) --export-id-only --export-filename="$@" --export-id="$(basename $(notdir $@))" --export-dpi=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
27
+ -else !INKSCAPE_1_0_OR_NEWER
28
+ - $(INKSCAPE) --export-id-only --export-png="$@" --export-id="$(basename $(notdir $@))" --export-dpi=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
29
+ -endif
30
+ + $(RSVG_CONVERT) --format=png --output="$@" --export-id="$(basename $(notdir $@))" --dpi-x=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) --dpi-y=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
31
+ $(OPTIPNG) -o7 --quiet "$@"
32
+
33
+ menubar-toolbar/%-dark.png: dark/assets/%.png | menubar-toolbar
34
+ diff --git a/common/gtk-2.0/render-asset.sh b/common/gtk-2.0/render-asset.sh
35
+ index 6685414..f6198af 100755
36
+ --- a/common/gtk-2.0/render-asset.sh
37
+ +++ b/common/gtk-2.0/render-asset.sh
38
+ @@ -1,7 +1,7 @@
39
+ #!/bin/bash
40
+ set -ueo pipefail
41
+
42
+ -INKSCAPE="$(which inkscape)"
43
+ +RSVG_CONVERT="$(which rsvg-convert)"
44
+ OPTIPNG="$(which optipng)"
45
+
46
+ ASSETS_DIR="$1"
47
+ @@ -14,9 +14,9 @@ if [[ -f "${result_file}" ]] ; then
48
+ echo "${result_file} already exists."
49
+ else
50
+ echo "Rendering '${result_file}'"
51
+ - "$INKSCAPE" --export-id="$i" \
52
+ - --export-id-only \
53
+ - --export-png="${result_file}" "$SRC_FILE" >/dev/null \
54
+ + "$RSVG_CONVERT" --export-id="$i" \
55
+ + --format=png
56
+ + --output="${result_file}" "$SRC_FILE" >/dev/null \
57
+ && "$OPTIPNG" -o7 --quiet "${result_file}"
58
+ fi
59
+
60
+ @@ -26,10 +26,10 @@ if [[ "$OPTION_GTK2_HIDPI" == "true" ]]; then
61
+ echo "${result_file_hidpi} already exists."
62
+ else
63
+ echo "Rendering '${result_file_hidpi}'"
64
+ - "$INKSCAPE" --export-id="$i" \
65
+ - --export-id-only \
66
+ - --export-dpi=192 \
67
+ - --export-png="${result_file_hidpi}" "$SRC_FILE" >/dev/null \
68
+ + "$RSVG_CONVERT" --export-id="$i" \
69
+ + --dpi-x=192 --dpi-y=192 \
70
+ + --format=png
71
+ + --output="${result_file_hidpi}" "$SRC_FILE" >/dev/null \
72
+ && "$OPTIPNG" -o7 --quiet "${result_file_hidpi}"
73
+ fi
74
+ fi
75
+ diff --git a/common/gtk-3.0/common.am b/common/gtk-3.0/common.am
76
+ index a93d01d..9e4b102 100644
77
+ --- a/common/gtk-3.0/common.am
78
+ +++ b/common/gtk-3.0/common.am
79
+ @@ -14,19 +14,11 @@ clean:
80
+ rm -rf assets/ light/ dark/ darker/ lighter/
81
+
82
+ $(normal): $(srcdir)/assets.svg | assets
83
+ -if INKSCAPE_1_0_OR_NEWER
84
+ - $(INKSCAPE) --export-id-only --export-filename="$@" --export-id="$(basename $(notdir $@))" --export-dpi=96 "$<" >/dev/null
85
+ -else !INKSCAPE_1_0_OR_NEWER
86
+ - $(INKSCAPE) --export-id-only --export-png="$@" --export-id="$(basename $(notdir $@))" --export-dpi=96 "$<" >/dev/null
87
+ -endif
88
+ + $(RSVG_CONVERT) --format=png --output="$@" --export-id="$(basename $(notdir $@))" --dpi-y=96 --dpi-x=96 "$<" >/dev/null
89
+ $(OPTIPNG) -o7 --quiet "$@"
90
+
91
+ $(hidpi): $(srcdir)/assets.svg | assets
92
+ -if INKSCAPE_1_0_OR_NEWER
93
+ - $(INKSCAPE) --export-id-only --export-filename="$@" --export-id="$(patsubst %@2,%,$(basename $(notdir $@)))" --export-dpi=192 "$<" >/dev/null
94
+ -else !INKSCAPE_1_0_OR_NEWER
95
+ - $(INKSCAPE) --export-id-only --export-png="$@" --export-id="$(patsubst %@2,%,$(basename $(notdir $@)))" --export-dpi=192 "$<" >/dev/null
96
+ -endif
97
+ + $(RSVG_CONVERT) --format=png --output="$@" --export-id="$(patsubst %@2,%,$(basename $(notdir $@)))" --dpi-y=192 --dpi-x=192 "$<" >/dev/null
98
+ $(OPTIPNG) -o7 --quiet "$@"
99
+
100
+ .PHONY: normal hidpi clean
101
+ diff --git a/common/xfwm4/Makefile.am b/common/xfwm4/Makefile.am
102
+ index e5fbdc5..1f21183 100644
103
+ --- a/common/xfwm4/Makefile.am
104
+ +++ b/common/xfwm4/Makefile.am
105
+ @@ -17,11 +17,7 @@ $(light): $(srcdir)/light/assets.svg | light/assets
106
+ $(dark): $(srcdir)/dark/assets.svg | dark/assets
107
+
108
+ $(light) $(dark):
109
+ -if INKSCAPE_1_0_OR_NEWER
110
+ - $(INKSCAPE) --export-id-only --export-filename="$@" --export-id="$(basename $(notdir $@))" --export-dpi=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
111
+ -else !INKSCAPE_1_0_OR_NEWER
112
+ - $(INKSCAPE) --export-id-only --export-png="$@" --export-id="$(basename $(notdir $@))" --export-dpi=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
113
+ -endif
114
+ + $(RSVG_CONVERT) --format=png --output="$@" --export-id="$(basename $(notdir $@))" --dpi-y=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) --dpi-x=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
115
+ $(OPTIPNG) -o7 --quiet "$@"
116
+
117
+ .PHONY: light dark clean
118
+ diff --git a/common/xfwm4/render-asset.sh b/common/xfwm4/render-asset.sh
119
+ index 6685414..f6198af 100755
120
+ --- a/common/xfwm4/render-asset.sh
121
+ +++ b/common/xfwm4/render-asset.sh
122
+ @@ -1,7 +1,7 @@
123
+ #!/bin/bash
124
+ set -ueo pipefail
125
+
126
+ -INKSCAPE="$(which inkscape)"
127
+ +RSVG_CONVERT="$(which rsvg-convert)"
128
+ OPTIPNG="$(which optipng)"
129
+
130
+ ASSETS_DIR="$1"
131
+ @@ -14,9 +14,9 @@ if [[ -f "${result_file}" ]] ; then
132
+ echo "${result_file} already exists."
133
+ else
134
+ echo "Rendering '${result_file}'"
135
+ - "$INKSCAPE" --export-id="$i" \
136
+ - --export-id-only \
137
+ - --export-png="${result_file}" "$SRC_FILE" >/dev/null \
138
+ + "$RSVG_CONVERT" --export-id="$i" \
139
+ + --format=png
140
+ + --output="${result_file}" "$SRC_FILE" >/dev/null \
141
+ && "$OPTIPNG" -o7 --quiet "${result_file}"
142
+ fi
143
+
144
+ @@ -26,10 +26,10 @@ if [[ "$OPTION_GTK2_HIDPI" == "true" ]]; then
145
+ echo "${result_file_hidpi} already exists."
146
+ else
147
+ echo "Rendering '${result_file_hidpi}'"
148
+ - "$INKSCAPE" --export-id="$i" \
149
+ - --export-id-only \
150
+ - --export-dpi=192 \
151
+ - --export-png="${result_file_hidpi}" "$SRC_FILE" >/dev/null \
152
+ + "$RSVG_CONVERT" --export-id="$i" \
153
+ + --dpi-x=192 --dpi-y=192 \
154
+ + --format=png
155
+ + --output="${result_file_hidpi}" "$SRC_FILE" >/dev/null \
156
+ && "$OPTIPNG" -o7 --quiet "${result_file_hidpi}"
157
+ fi
158
+ fi
159
+ diff --git a/configure.ac b/configure.ac
160
+ index f0725f1..1a52cc7 100644
161
+ --- a/configure.ac
162
+ +++ b/configure.ac
163
+ @@ -48,12 +48,8 @@ AM_CONDITIONAL([GNOME_SHELL_3_32_OR_NEWER], [test "0$GNOME_SHELL_VERSMNR" -ge 31
164
+ AS_IF([test "x$ENABLE_CINNAMON" != xno], [ARC_CINNAMON])
165
+
166
+ AS_IF([test "x$ENABLE_GTK2" != xno -o "x$ENABLE_GTK3" != xno -o "x$ENABLE_XFWM" != xno], [
167
+ - AC_PATH_PROG([INKSCAPE], [inkscape])
168
+ - AS_IF([test "x$ac_cv_path_INKSCAPE" = x], [AC_MSG_ERROR([inkscape not found])])
169
+ - AS_IF([test "x$ac_cv_path_INKSCAPE" != x],
170
+ - [INKSCAPE_VERSMJR=`inkscape --version 2> /dev/null | cut -d' ' -f2 | cut -d'.' -f1`]
171
+ - AM_CONDITIONAL([INKSCAPE_1_0_OR_NEWER], [test "x$INKSCAPE_VERSMJR" = x1])
172
+ - )
173
+ + AC_PATH_PROG([RSVG_CONVERT], [rsvg-convert])
174
+ + AS_IF([test "x$ac_cv_path_RSVG_CONVERT" = x], [AC_MSG_ERROR([rsvg-convert not found])])
175
+ AC_PATH_PROG([OPTIPNG], [optipng])
176
+ AS_IF([test "x$ac_cv_path_OPTIPNG" = x], [AC_MSG_ERROR([optipng not found])])
177
+ ])
178
+ --
179
+ 2.26.0
180
+