@pheem49/mint 1.8.1 → 1.9.0
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.
- package/Cargo.lock +3 -3
- package/Cargo.toml +1 -1
- package/README.md +0 -17
- package/Release_Note.md +137 -58
- package/bin/mint +0 -0
- package/crates/mint-cli/src/agent.rs +150 -45
- package/crates/mint-cli/src/image.rs +8 -8
- package/crates/mint-cli/src/main.rs +929 -412
- package/crates/mint-cli/src/onboard.rs +108 -108
- package/crates/mint-cli/src/setup.rs +143 -143
- package/crates/mint-core/src/agent_loop.rs +1 -0
- package/crates/mint-core/src/api_server.rs +108 -52
- package/crates/mint-core/src/browser.rs +56 -1
- package/crates/mint-core/src/channels.rs +1 -0
- package/crates/mint-core/src/chat.rs +126 -8
- package/crates/mint-core/src/code_tools.rs +18 -20
- package/crates/mint-core/src/config.rs +245 -17
- package/crates/mint-core/src/image_gen.rs +5 -5
- package/crates/mint-core/src/lib.rs +16 -2
- package/crates/mint-core/src/memory.rs +6 -1
- package/crates/mint-core/src/orchestration.rs +260 -72
- package/crates/mint-core/src/pictures.rs +3 -4
- package/crates/mint-core/src/semantic.rs +1 -1
- package/crates/mint-core/src/shell.rs +1 -1
- package/crates/mint-core/src/skills.rs +46 -19
- package/crates/mint-core/src/tts.rs +3 -1
- package/flatpak/com.pheem49.mint.desktop +9 -0
- package/flatpak/com.pheem49.mint.metainfo.xml +35 -0
- package/flatpak/com.pheem49.mint.yaml +52 -0
- package/package.json +1 -1
- package/shared-modules/.github/workflows/ci.yml +120 -0
- package/shared-modules/.github/workflows/update.yaml +28 -0
- package/shared-modules/CODEOWNERS +23 -0
- package/shared-modules/README.md +79 -0
- package/shared-modules/SDL/README.md +3 -0
- package/shared-modules/SDL/SDL-1.2.15.json +51 -0
- package/shared-modules/SDL/SDL_Pango-0.1.2-API-adds.patch +118 -0
- package/shared-modules/SDL/SDL_image-1.2.12.json +25 -0
- package/shared-modules/SDL/SDL_mixer-1.2.12.json +27 -0
- package/shared-modules/SDL/SDL_net-1.2.8.json +19 -0
- package/shared-modules/SDL/SDL_pango-0.1.2.json +26 -0
- package/shared-modules/SDL/SDL_ttf-2.0.11.json +28 -0
- package/shared-modules/SDL/libsdl-1.2.15-strict-prototypes.patch +316 -0
- package/shared-modules/SDL/sdl-check-for-SDL_VIDEO_X11_BACKINGSTORE.patch +24 -0
- package/shared-modules/SDL/sdl-libx11-build.patch +59 -0
- package/shared-modules/SDL/sdl-sysloadso-buffer-length.patch +27 -0
- package/shared-modules/SDL/sdl12-compat.json +22 -0
- package/shared-modules/SDL2/SDL2_image.json +27 -0
- package/shared-modules/SDL2/SDL2_ttf.json +29 -0
- package/shared-modules/cld2/CMakeLists.txt +157 -0
- package/shared-modules/cld2/cld2.json +24 -0
- package/shared-modules/clutter/clutter.json +72 -0
- package/shared-modules/dbus-glib/dbus-glib.json +29 -0
- package/shared-modules/glew/glew.json +36 -0
- package/shared-modules/glu/glu-9.json +12 -0
- package/shared-modules/gtk2/arc-gtk2-theme-Replace-Inkscape-dependency-with-rsvg-convert.patch +180 -0
- package/shared-modules/gtk2/gtk2-common-themes.json +360 -0
- package/shared-modules/gtk2/gtk2-fix-crash-in-show-uri.patch +30 -0
- package/shared-modules/gtk2/gtk2-gcc14.patch +281 -0
- package/shared-modules/gtk2/gtk2-gcc15.patch +250 -0
- package/shared-modules/gtk2/gtk2-murrine-c99.patch +34 -0
- package/shared-modules/gtk2/gtk2-use-adwaita-theme.patch +80 -0
- package/shared-modules/gtk2/gtk2.json +120 -0
- package/shared-modules/gtk2/ibus-gcc15.patch +13 -0
- package/shared-modules/gtk2/murrine-engine-fix-crash.patch +12 -0
- package/shared-modules/gtk2/readme.md +10 -0
- package/shared-modules/intltool/intltool-0.51.json +20 -0
- package/shared-modules/intltool/intltool-perl5.26-regex-fixes.patch +59 -0
- package/shared-modules/lame/0001-Build-xmm_quantize_sub.c-with-msse.patch +34 -0
- package/shared-modules/lame/0002-Include-GTK-1-autoconf-directives-in-build-system.patch +222 -0
- package/shared-modules/lame/0003-Patch-out-remaining-ansi2knr.patch +70 -0
- package/shared-modules/lame/0004-initscr-is-not-used-anywhere-in-lame-sourcetree.patch +41 -0
- package/shared-modules/lame/0005-Update-autoconf.patch +81 -0
- package/shared-modules/lame/lame-3.99.5.json +32 -0
- package/shared-modules/libappindicator/libappindicator-gtk2-12.10.json +140 -0
- package/shared-modules/libappindicator/libappindicator-gtk3-12.10.json +140 -0
- package/shared-modules/libappindicator/libappindicator-gtk3-introspection-12.10.json +140 -0
- package/shared-modules/libappindicator/patches/0001-libappindicator-ftbfs.patch +20 -0
- package/shared-modules/libappindicator/patches/0002-libappindicator-no-python.patch +888 -0
- package/shared-modules/libappindicator/patches/0003-libappindicator-fix-crash-from-incorrect-signal-emission.patch +74 -0
- package/shared-modules/libappindicator/patches/0004-libappindicator-fix-crash-iterating-icon-themes.patch +11 -0
- package/shared-modules/libayatana-appindicator/0001-Fix-HAVE_VALGRIND-AM_CONDITIONAL.patch +51 -0
- package/shared-modules/libayatana-appindicator/0001-Make-introspection-configurable.patch +44 -0
- package/shared-modules/libayatana-appindicator/libayatana-appindicator-gtk3.json +121 -0
- package/shared-modules/libcanberra/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch +123 -0
- package/shared-modules/libcanberra/libcanberra.json +44 -0
- package/shared-modules/libmad/libmad.json +19 -0
- package/shared-modules/libsecret/libsecret.json +23 -0
- package/shared-modules/libsoup/libsoup-2.4.json +14 -0
- package/shared-modules/libusb/libusb.json +27 -0
- package/shared-modules/linux-audio/dssi.json +31 -0
- package/shared-modules/linux-audio/fftw3f-static.json +44 -0
- package/shared-modules/linux-audio/fftw3f.json +42 -0
- package/shared-modules/linux-audio/fluidsynth2-static.json +36 -0
- package/shared-modules/linux-audio/fluidsynth2.json +25 -0
- package/shared-modules/linux-audio/ladspa.json +26 -0
- package/shared-modules/linux-audio/lash.json +35 -0
- package/shared-modules/linux-audio/libinstpatch.json +16 -0
- package/shared-modules/linux-audio/liblo-static.json +22 -0
- package/shared-modules/linux-audio/liblo.json +17 -0
- package/shared-modules/linux-audio/lilv-static.json +94 -0
- package/shared-modules/linux-audio/lilv.json +89 -0
- package/shared-modules/linux-audio/lrdf.json +57 -0
- package/shared-modules/linux-audio/lv2.json +20 -0
- package/shared-modules/linux-audio/patches/lash/0001-configure-remove-aclocal-m4.patch +29 -0
- package/shared-modules/linux-audio/patches/lash/0002-Fix-build-with-recent-gcc.patch +73 -0
- package/shared-modules/linux-audio/patches/lash/0003-Fix-linking.patch +136 -0
- package/shared-modules/linux-audio/patches/raptor-libxml.patch +31 -0
- package/shared-modules/linux-audio/patches/stk-install.sh +54 -0
- package/shared-modules/linux-audio/stk.json +28 -0
- package/shared-modules/lua5.1/0004-Fix-stack-overflow-in-vararg-functions.patch +21 -0
- package/shared-modules/lua5.1/lua-5.1.5-so.patch +43 -0
- package/shared-modules/lua5.1/lua-5.1.5.json +42 -0
- package/shared-modules/lua5.3/lua-5.3.5.json +41 -0
- package/shared-modules/lua5.3/lua.pc.in +8 -0
- package/shared-modules/lua5.3/luaconf.patch +47 -0
- package/shared-modules/lua5.3/makefile-add-liblua.so-rule.patch +47 -0
- package/shared-modules/lua5.4/lua-5.4.json +41 -0
- package/shared-modules/lua5.4/lua.pc.in +8 -0
- package/shared-modules/lua5.4/luaconf.patch +34 -0
- package/shared-modules/lua5.4/makefile-add-liblua.so-rule.patch +42 -0
- package/shared-modules/luajit/luajit.json +30 -0
- package/shared-modules/lzo/lzo.json +27 -0
- package/shared-modules/mac/mac.json +18 -0
- package/shared-modules/physfs/physfs.json +26 -0
- package/shared-modules/pygame/audiofile-gcc6.patch +21 -0
- package/shared-modules/pygame/cython-fixes.patch +34 -0
- package/shared-modules/pygame/fluidsynth-no-rawmidi.patch +69 -0
- package/shared-modules/pygame/glib.patch +25 -0
- package/shared-modules/pygame/pygame1-python2.json +157 -0
- package/shared-modules/pygtk/pygtk-c99.patch +15 -0
- package/shared-modules/pygtk/pygtk.json +117 -0
- package/shared-modules/pygtk/pygtk.patch +39 -0
- package/shared-modules/python2.7/python-2.7.json +48 -0
- package/shared-modules/smpeg/smpeg-0.4.5.json +50 -0
- package/shared-modules/smpeg/smpeg-am-prog-as.patch +12 -0
- package/shared-modules/smpeg/smpeg-export-mpegaudio-class.patch +17 -0
- package/shared-modules/smpeg/smpeg-gcc6.patch +40 -0
- package/shared-modules/smpeg/smpeg-no-gtk.patch +37 -0
- package/shared-modules/squashfs-tools/squashfs-tools.json +25 -0
- package/shared-modules/update-checker.sh +50 -0
- package/shared-modules/vorbisgain/0001-temp_files.patch +75 -0
- package/shared-modules/vorbisgain/0002-errno.patch +33 -0
- package/shared-modules/vorbisgain/0003-manpage.patch +248 -0
- package/shared-modules/vorbisgain/0004-vorbisgain_mtime.patch +183 -0
- package/shared-modules/vorbisgain/0005-double_fclose.patch +21 -0
- package/shared-modules/vorbisgain/0006-manpage_hyphens.patch +56 -0
- package/shared-modules/vorbisgain/0007-recursively_spelling.patch +14 -0
- package/shared-modules/vorbisgain/0008-manpage_recursion_mistake.patch +23 -0
- package/shared-modules/vorbisgain/0009-hardening.patch +13 -0
- package/shared-modules/vorbisgain/0010-fclose.patch +13 -0
- package/shared-modules/vorbisgain/README.md +23 -0
- package/shared-modules/vorbisgain/vorbisgain_0.37-2.json +29 -0
- package/src/renderer/shared/agentProgress.ts +145 -0
- package/src/renderer/shared/calculator.ts +52 -0
- package/src/renderer/shared/components/AgentActivityDrawer.tsx +72 -0
- package/src/renderer/shared/components/AgentActivityTable.tsx +85 -0
- package/src/renderer/shared/components/ApprovalCard.tsx +93 -0
- package/src/renderer/shared/components/ChatCodeBlock.tsx +75 -0
- package/src/renderer/shared/components/ThinkingBlock.tsx +101 -0
- package/src/renderer/shared/constants/models.ts +91 -0
- package/src/renderer/shared/platform.ts +82 -0
- package/src/renderer/shared/types.ts +140 -0
- package/src/renderer/shared/utils/agentActivity.ts +187 -0
- package/src/renderer/shared/utils/approval.ts +1 -0
- package/src/renderer/shared/utils/approval.tsx +64 -0
- package/src/renderer/shared/utils/fileIcons.ts +135 -0
- package/src/renderer/shared/utils/markdown.tsx +347 -0
- package/src/renderer/shared/utils/providers.ts +36 -0
- package/src/renderer/shared/utils/speech.ts +216 -0
- package/src/renderer/shared/utils/ui.ts +147 -0
- package/src/renderer/src/agentProgress.ts +11 -39
- package/src/renderer/src/calculator.ts +3 -46
- package/src/renderer/src/components/ChatPanel.tsx +219 -1308
- package/src/renderer/src/components/MintDashboard.tsx +67 -170
- package/src/renderer/src/components/PicturesLibrary.tsx +32 -8
- package/src/renderer/src/components/Settings/AgentsTab.tsx +381 -0
- package/src/renderer/src/components/Settings/AutomationTab.tsx +0 -22
- package/src/renderer/src/components/Settings/GeneralTab.tsx +256 -2
- package/src/renderer/src/components/SettingsWindow.tsx +120 -3
- package/src/renderer/src/components/WorkspacePanel.tsx +7 -125
- package/src/renderer/src/css/styles.css +100 -0
- package/src/renderer/src/tauri.ts +128 -143
- package/src/renderer/src-web/agentProgress.ts +11 -39
- package/src/renderer/src-web/calculator.ts +3 -46
- package/src/renderer/src-web/components/ChatPanel.tsx +219 -1306
- package/src/renderer/src-web/components/MintDashboard.tsx +42 -170
- package/src/renderer/src-web/components/PicturesLibrary.tsx +23 -29
- package/src/renderer/src-web/components/Settings/AgentsTab.tsx +381 -0
- package/src/renderer/src-web/components/Settings/AutomationTab.tsx +0 -22
- package/src/renderer/src-web/components/Settings/GeneralTab.tsx +254 -3
- package/src/renderer/src-web/components/SettingsWindow.tsx +127 -3
- package/src/renderer/src-web/css/styles.css +100 -0
- package/src/renderer/src-web/tauri.ts +180 -102
- package/src-tauri/src/desktop.rs +18 -16
- package/src-tauri/src/discord_rpc.rs +1 -1
- package/src-tauri/src/lib.rs +168 -40
- package/src-tauri/src/webhooks.rs +1 -0
- package/src-tauri/src/workflows.rs +1 -0
- package/src-tauri/tauri.conf.json +1 -1
|
@@ -0,0 +1,250 @@
|
|
|
1
|
+
diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c
|
|
2
|
+
index 6addff3b13..49a7a77d6d 100644
|
|
3
|
+
--- a/gtk/gtkitemfactory.c
|
|
4
|
+
+++ b/gtk/gtkitemfactory.c
|
|
5
|
+
@@ -1184,7 +1184,7 @@ gtk_item_factory_create_menu_entries (guint n_entries,
|
|
6
|
+
|
|
7
|
+
entry.path = path;
|
|
8
|
+
entry.accelerator = entries[i].accelerator;
|
|
9
|
+
- entry.callback = entries[i].callback;
|
|
10
|
+
+ entry.callback = (GtkItemFactoryCallback) entries[i].callback;
|
|
11
|
+
entry.callback_action = 0;
|
|
12
|
+
if (g_pattern_match_string (pspec_separator, path))
|
|
13
|
+
entry.item_type = "<Separator>";
|
|
14
|
+
diff --git a/tests/testgtk.c b/tests/testgtk.c
|
|
15
|
+
index b7ea442827..8205596e33 100644
|
|
16
|
+
--- a/tests/testgtk.c
|
|
17
|
+
+++ b/tests/testgtk.c
|
|
18
|
+
@@ -4235,41 +4235,41 @@ dump_accels (gpointer callback_data,
|
|
19
|
+
static GtkItemFactoryEntry menu_items[] =
|
|
20
|
+
{
|
|
21
|
+
{ "/_File", NULL, NULL, 0, "<Branch>" },
|
|
22
|
+
- { "/File/tearoff1", NULL, gtk_ifactory_cb, 0, "<Tearoff>" },
|
|
23
|
+
- { "/File/_New", NULL, gtk_ifactory_cb, 0, "<StockItem>", GTK_STOCK_NEW },
|
|
24
|
+
- { "/File/_Open", NULL, gtk_ifactory_cb, 0, "<StockItem>", GTK_STOCK_OPEN },
|
|
25
|
+
- { "/File/_Save", NULL, gtk_ifactory_cb, 0, "<StockItem>", GTK_STOCK_SAVE },
|
|
26
|
+
- { "/File/Save _As...", "<control>A", gtk_ifactory_cb, 0, "<StockItem>", GTK_STOCK_SAVE },
|
|
27
|
+
- { "/File/_Dump \"_Accels\"", NULL, dump_accels, 0 },
|
|
28
|
+
+ { "/File/tearoff1", NULL, G_CALLBACK (gtk_ifactory_cb), 0, "<Tearoff>" },
|
|
29
|
+
+ { "/File/_New", NULL, G_CALLBACK (gtk_ifactory_cb), 0, "<StockItem>", GTK_STOCK_NEW },
|
|
30
|
+
+ { "/File/_Open", NULL, G_CALLBACK (gtk_ifactory_cb), 0, "<StockItem>", GTK_STOCK_OPEN },
|
|
31
|
+
+ { "/File/_Save", NULL, G_CALLBACK (gtk_ifactory_cb), 0, "<StockItem>", GTK_STOCK_SAVE },
|
|
32
|
+
+ { "/File/Save _As...", "<control>A", G_CALLBACK (gtk_ifactory_cb), 0, "<StockItem>", GTK_STOCK_SAVE },
|
|
33
|
+
+ { "/File/_Dump \"_Accels\"", NULL, G_CALLBACK (dump_accels), 0 },
|
|
34
|
+
{ "/File/\\/Test__Escaping/And\\/\n\tWei\\\\rdly",
|
|
35
|
+
- NULL, gtk_ifactory_cb, 0 },
|
|
36
|
+
- { "/File/sep1", NULL, gtk_ifactory_cb, 0, "<Separator>" },
|
|
37
|
+
- { "/File/_Quit", NULL, gtk_ifactory_cb, 0, "<StockItem>", GTK_STOCK_QUIT },
|
|
38
|
+
+ NULL, G_CALLBACK (gtk_ifactory_cb), 0 },
|
|
39
|
+
+ { "/File/sep1", NULL, G_CALLBACK (gtk_ifactory_cb), 0, "<Separator>" },
|
|
40
|
+
+ { "/File/_Quit", NULL, G_CALLBACK (gtk_ifactory_cb), 0, "<StockItem>", GTK_STOCK_QUIT },
|
|
41
|
+
|
|
42
|
+
{ "/_Preferences", NULL, 0, 0, "<Branch>" },
|
|
43
|
+
{ "/_Preferences/_Color", NULL, 0, 0, "<Branch>" },
|
|
44
|
+
- { "/_Preferences/Color/_Red", NULL, gtk_ifactory_cb, 0, "<RadioItem>" },
|
|
45
|
+
- { "/_Preferences/Color/_Green", NULL, gtk_ifactory_cb, 0, "/Preferences/Color/Red" },
|
|
46
|
+
- { "/_Preferences/Color/_Blue", NULL, gtk_ifactory_cb, 0, "/Preferences/Color/Red" },
|
|
47
|
+
+ { "/_Preferences/Color/_Red", NULL, G_CALLBACK (gtk_ifactory_cb), 0, "<RadioItem>" },
|
|
48
|
+
+ { "/_Preferences/Color/_Green", NULL, G_CALLBACK (gtk_ifactory_cb), 0, "/Preferences/Color/Red" },
|
|
49
|
+
+ { "/_Preferences/Color/_Blue", NULL, G_CALLBACK (gtk_ifactory_cb), 0, "/Preferences/Color/Red" },
|
|
50
|
+
{ "/_Preferences/_Shape", NULL, 0, 0, "<Branch>" },
|
|
51
|
+
- { "/_Preferences/Shape/_Square", NULL, gtk_ifactory_cb, 0, "<RadioItem>" },
|
|
52
|
+
- { "/_Preferences/Shape/_Rectangle", NULL, gtk_ifactory_cb, 0, "/Preferences/Shape/Square" },
|
|
53
|
+
- { "/_Preferences/Shape/_Oval", NULL, gtk_ifactory_cb, 0, "/Preferences/Shape/Rectangle" },
|
|
54
|
+
- { "/_Preferences/Shape/_Rectangle", NULL, gtk_ifactory_cb, 0, "/Preferences/Shape/Square" },
|
|
55
|
+
- { "/_Preferences/Shape/_Oval", NULL, gtk_ifactory_cb, 0, "/Preferences/Shape/Rectangle" },
|
|
56
|
+
- { "/_Preferences/Shape/_Image", NULL, gtk_ifactory_cb, 0, "<ImageItem>", apple },
|
|
57
|
+
- { "/_Preferences/Coffee", NULL, gtk_ifactory_cb, 0, "<CheckItem>" },
|
|
58
|
+
- { "/_Preferences/Toast", NULL, gtk_ifactory_cb, 0, "<CheckItem>" },
|
|
59
|
+
- { "/_Preferences/Marshmallow Froot Loops", NULL, gtk_ifactory_cb, 0, "<CheckItem>" },
|
|
60
|
+
+ { "/_Preferences/Shape/_Square", NULL, G_CALLBACK (gtk_ifactory_cb), 0, "<RadioItem>" },
|
|
61
|
+
+ { "/_Preferences/Shape/_Rectangle", NULL, G_CALLBACK (gtk_ifactory_cb), 0, "/Preferences/Shape/Square" },
|
|
62
|
+
+ { "/_Preferences/Shape/_Oval", NULL, G_CALLBACK (gtk_ifactory_cb), 0, "/Preferences/Shape/Rectangle" },
|
|
63
|
+
+ { "/_Preferences/Shape/_Rectangle", NULL, G_CALLBACK (gtk_ifactory_cb), 0, "/Preferences/Shape/Square" },
|
|
64
|
+
+ { "/_Preferences/Shape/_Oval", NULL, G_CALLBACK (gtk_ifactory_cb), 0, "/Preferences/Shape/Rectangle" },
|
|
65
|
+
+ { "/_Preferences/Shape/_Image", NULL, G_CALLBACK (gtk_ifactory_cb), 0, "<ImageItem>", apple },
|
|
66
|
+
+ { "/_Preferences/Coffee", NULL, G_CALLBACK (gtk_ifactory_cb), 0, "<CheckItem>" },
|
|
67
|
+
+ { "/_Preferences/Toast", NULL, G_CALLBACK (gtk_ifactory_cb), 0, "<CheckItem>" },
|
|
68
|
+
+ { "/_Preferences/Marshmallow Froot Loops", NULL, G_CALLBACK (gtk_ifactory_cb), 0, "<CheckItem>" },
|
|
69
|
+
|
|
70
|
+
/* For testing deletion of menus */
|
|
71
|
+
{ "/_Preferences/Should_NotAppear", NULL, 0, 0, "<Branch>" },
|
|
72
|
+
- { "/Preferences/ShouldNotAppear/SubItem1", NULL, gtk_ifactory_cb, 0 },
|
|
73
|
+
- { "/Preferences/ShouldNotAppear/SubItem2", NULL, gtk_ifactory_cb, 0 },
|
|
74
|
+
+ { "/Preferences/ShouldNotAppear/SubItem1", NULL, G_CALLBACK (gtk_ifactory_cb), 0 },
|
|
75
|
+
+ { "/Preferences/ShouldNotAppear/SubItem2", NULL, G_CALLBACK (gtk_ifactory_cb), 0 },
|
|
76
|
+
|
|
77
|
+
{ "/_Help", NULL, 0, 0, "<LastBranch>" },
|
|
78
|
+
- { "/Help/_Help", NULL, gtk_ifactory_cb, 0, "<StockItem>", GTK_STOCK_HELP},
|
|
79
|
+
- { "/Help/_About", NULL, gtk_ifactory_cb, 0 },
|
|
80
|
+
+ { "/Help/_Help", NULL, G_CALLBACK (gtk_ifactory_cb), 0, "<StockItem>", GTK_STOCK_HELP},
|
|
81
|
+
+ { "/Help/_About", NULL, G_CALLBACK (gtk_ifactory_cb), 0 },
|
|
82
|
+
};
|
|
83
|
+
|
|
84
|
+
|
|
85
|
+
diff --git a/tests/testsocket.c b/tests/testsocket.c
|
|
86
|
+
index 6801e09762..80144d3382 100644
|
|
87
|
+
--- a/tests/testsocket.c
|
|
88
|
+
+++ b/tests/testsocket.c
|
|
89
|
+
@@ -65,7 +65,7 @@ quit_cb (gpointer callback_data,
|
|
90
|
+
static GtkItemFactoryEntry menu_items[] =
|
|
91
|
+
{
|
|
92
|
+
{ "/_File", NULL, NULL, 0, "<Branch>" },
|
|
93
|
+
- { "/File/_Quit", "<control>Q", quit_cb, 0 },
|
|
94
|
+
+ { "/File/_Quit", "<control>Q", G_CALLBACK (quit_cb), 0 },
|
|
95
|
+
};
|
|
96
|
+
|
|
97
|
+
static void
|
|
98
|
+
diff --git a/tests/testsocket_common.c b/tests/testsocket_common.c
|
|
99
|
+
index 1a4fece2a0..0af105e549 100644
|
|
100
|
+
--- a/tests/testsocket_common.c
|
|
101
|
+
+++ b/tests/testsocket_common.c
|
|
102
|
+
@@ -62,13 +62,13 @@ print_hello (GtkWidget *w,
|
|
103
|
+
|
|
104
|
+
static GtkItemFactoryEntry menu_items[] = {
|
|
105
|
+
{ "/_File", NULL, NULL, 0, "<Branch>" },
|
|
106
|
+
- { "/File/_New", "<control>N", print_hello, ACTION_FILE_NEW, "<Item>" },
|
|
107
|
+
- { "/File/_Open", "<control>O", print_hello, ACTION_FILE_OPEN, "<Item>" },
|
|
108
|
+
+ { "/File/_New", "<control>N", G_CALLBACK (print_hello), ACTION_FILE_NEW, "<Item>" },
|
|
109
|
+
+ { "/File/_Open", "<control>O", G_CALLBACK (print_hello), ACTION_FILE_OPEN, "<Item>" },
|
|
110
|
+
{ "/File/sep1", NULL, NULL, 0, "<Separator>" },
|
|
111
|
+
- { "/File/Quit", "<control>Q", gtk_main_quit, 0, "<Item>" },
|
|
112
|
+
- { "/O_K", "<control>K",print_hello, ACTION_OK, "<Item>" },
|
|
113
|
+
+ { "/File/Quit", "<control>Q", G_CALLBACK (gtk_main_quit), 0, "<Item>" },
|
|
114
|
+
+ { "/O_K", "<control>K",G_CALLBACK (print_hello), ACTION_OK, "<Item>" },
|
|
115
|
+
{ "/_Help", NULL, NULL, 0, "<LastBranch>" },
|
|
116
|
+
- { "/_Help/About", NULL, print_hello, ACTION_HELP_ABOUT, "<Item>" },
|
|
117
|
+
+ { "/_Help/About", NULL, G_CALLBACK (print_hello), ACTION_HELP_ABOUT, "<Item>" },
|
|
118
|
+
};
|
|
119
|
+
|
|
120
|
+
static void
|
|
121
|
+
diff --git a/tests/testtext.c b/tests/testtext.c
|
|
122
|
+
index b9678bfc99..5d15bc254d 100644
|
|
123
|
+
--- a/tests/testtext.c
|
|
124
|
+
+++ b/tests/testtext.c
|
|
125
|
+
@@ -1946,69 +1946,68 @@ view_init_menus (View *view)
|
|
126
|
+
gtk_menu_item_activate (GTK_MENU_ITEM (menu_item));
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
-static GtkItemFactoryEntry menu_items[] =
|
|
130
|
+
-{
|
|
131
|
+
- { "/_File", NULL, NULL, 0, "<Branch>" },
|
|
132
|
+
- { "/File/_New", "<control>N", do_new, 0, NULL },
|
|
133
|
+
- { "/File/New _View", NULL, do_new_view, 0, NULL },
|
|
134
|
+
- { "/File/_Open", "<control>O", do_open, 0, NULL },
|
|
135
|
+
- { "/File/_Save", "<control>S", do_save, 0, NULL },
|
|
136
|
+
- { "/File/Save _As...", NULL, do_save_as, 0, NULL },
|
|
137
|
+
- { "/File/sep1", NULL, NULL, 0, "<Separator>" },
|
|
138
|
+
- { "/File/_Close", "<control>W" , do_close, 0, NULL },
|
|
139
|
+
- { "/File/E_xit", "<control>Q" , do_exit, 0, NULL },
|
|
140
|
+
+static GtkItemFactoryEntry menu_items[] = {
|
|
141
|
+
+ { "/_File", NULL, NULL, 0, "<Branch>" },
|
|
142
|
+
+ { "/File/_New", "<control>N", G_CALLBACK (do_new), 0, NULL },
|
|
143
|
+
+ { "/File/New _View", NULL, G_CALLBACK (do_new_view), 0, NULL },
|
|
144
|
+
+ { "/File/_Open", "<control>O", G_CALLBACK (do_open), 0, NULL },
|
|
145
|
+
+ { "/File/_Save", "<control>S", G_CALLBACK (do_save), 0, NULL },
|
|
146
|
+
+ { "/File/Save _As...", NULL, G_CALLBACK (do_save_as), 0, NULL },
|
|
147
|
+
+ { "/File/sep1", NULL, NULL, 0, "<Separator>" },
|
|
148
|
+
+ { "/File/_Close", "<control>W", G_CALLBACK (do_close), 0, NULL },
|
|
149
|
+
+ { "/File/E_xit", "<control>Q", G_CALLBACK (do_exit), 0, NULL },
|
|
150
|
+
|
|
151
|
+
{ "/_Edit", NULL, 0, 0, "<Branch>" },
|
|
152
|
+
- { "/Edit/Copy", NULL, do_copy, 0, NULL },
|
|
153
|
+
+ { "/Edit/Copy", NULL, G_CALLBACK (do_copy), 0, NULL },
|
|
154
|
+
{ "/Edit/sep1", NULL, NULL, 0, "<Separator>" },
|
|
155
|
+
- { "/Edit/Find...", NULL, do_search, 0, NULL },
|
|
156
|
+
- { "/Edit/Select All", "<control>A", do_select_all, 0, NULL },
|
|
157
|
+
+ { "/Edit/Find...", NULL, G_CALLBACK (do_search), 0, NULL },
|
|
158
|
+
+ { "/Edit/Select All", "<control>A", G_CALLBACK (do_select_all), 0, NULL },
|
|
159
|
+
|
|
160
|
+
- { "/_Settings", NULL, NULL, 0, "<Branch>" },
|
|
161
|
+
- { "/Settings/Wrap _Off", NULL, do_wrap_changed, GTK_WRAP_NONE, "<RadioItem>" },
|
|
162
|
+
- { "/Settings/Wrap _Words", NULL, do_wrap_changed, GTK_WRAP_WORD, "/Settings/Wrap Off" },
|
|
163
|
+
- { "/Settings/Wrap _Chars", NULL, do_wrap_changed, GTK_WRAP_CHAR, "/Settings/Wrap Off" },
|
|
164
|
+
- { "/Settings/sep1", NULL, NULL, 0, "<Separator>" },
|
|
165
|
+
- { "/Settings/Editable", NULL, do_editable_changed, TRUE, "<RadioItem>" },
|
|
166
|
+
- { "/Settings/Not editable", NULL, do_editable_changed, FALSE, "/Settings/Editable" },
|
|
167
|
+
- { "/Settings/sep1", NULL, NULL, 0, "<Separator>" },
|
|
168
|
+
+ { "/_Settings", NULL, NULL, 0, "<Branch>" },
|
|
169
|
+
+ { "/Settings/Wrap _Off", NULL, G_CALLBACK (do_wrap_changed), GTK_WRAP_NONE, "<RadioItem>" },
|
|
170
|
+
+ { "/Settings/Wrap _Words", NULL, G_CALLBACK (do_wrap_changed), GTK_WRAP_WORD, "/Settings/Wrap Off" },
|
|
171
|
+
+ { "/Settings/Wrap _Chars", NULL, G_CALLBACK (do_wrap_changed), GTK_WRAP_CHAR, "/Settings/Wrap Off" },
|
|
172
|
+
+ { "/Settings/sep1", NULL, NULL, 0, "<Separator>" },
|
|
173
|
+
+ { "/Settings/Editable", NULL, G_CALLBACK (do_editable_changed), TRUE, "<RadioItem>" },
|
|
174
|
+
+ { "/Settings/Not editable", NULL, G_CALLBACK (do_editable_changed), FALSE, "/Settings/Editable" },
|
|
175
|
+
+ { "/Settings/sep1", NULL, NULL, 0, "<Separator>" },
|
|
176
|
+
|
|
177
|
+
- { "/Settings/Cursor normal", NULL, do_cursor_visible_changed, 1, "<RadioItem>" },
|
|
178
|
+
- { "/Settings/Cursor not visible", NULL, do_cursor_visible_changed, 0, "/Settings/Cursor normal" },
|
|
179
|
+
- { "/Settings/Cursor colored", NULL, do_cursor_visible_changed, 2, "/Settings/Cursor normal" },
|
|
180
|
+
- { "/Settings/sep1", NULL, NULL, 0, "<Separator>" },
|
|
181
|
+
-
|
|
182
|
+
- { "/Settings/Left-to-Right", NULL, do_direction_changed, GTK_TEXT_DIR_LTR, "<RadioItem>" },
|
|
183
|
+
- { "/Settings/Right-to-Left", NULL, do_direction_changed, GTK_TEXT_DIR_RTL, "/Settings/Left-to-Right" },
|
|
184
|
+
+ { "/Settings/Cursor normal", NULL, G_CALLBACK (do_cursor_visible_changed), 1, "<RadioItem>" },
|
|
185
|
+
+ { "/Settings/Cursor not visible", NULL, G_CALLBACK (do_cursor_visible_changed), 0, "/Settings/Cursor normal" },
|
|
186
|
+
+ { "/Settings/Cursor colored", NULL, G_CALLBACK (do_cursor_visible_changed), 2, "/Settings/Cursor normal" },
|
|
187
|
+
+ { "/Settings/sep1", NULL, NULL, 0, "<Separator>" },
|
|
188
|
+
|
|
189
|
+
- { "/Settings/sep1", NULL, NULL, 0, "<Separator>" },
|
|
190
|
+
- { "/Settings/Sane spacing", NULL, do_spacing_changed, FALSE, "<RadioItem>" },
|
|
191
|
+
- { "/Settings/Funky spacing", NULL, do_spacing_changed, TRUE, "/Settings/Sane spacing" },
|
|
192
|
+
- { "/Settings/sep1", NULL, NULL, 0, "<Separator>" },
|
|
193
|
+
- { "/Settings/Don't cycle color tags", NULL, do_color_cycle_changed, FALSE, "<RadioItem>" },
|
|
194
|
+
- { "/Settings/Cycle colors", NULL, do_color_cycle_changed, TRUE, "/Settings/Don't cycle color tags" },
|
|
195
|
+
- { "/_Attributes", NULL, NULL, 0, "<Branch>" },
|
|
196
|
+
- { "/Attributes/Editable", NULL, do_apply_editable, TRUE, NULL },
|
|
197
|
+
- { "/Attributes/Not editable", NULL, do_apply_editable, FALSE, NULL },
|
|
198
|
+
- { "/Attributes/Invisible", NULL, do_apply_invisible, FALSE, NULL },
|
|
199
|
+
- { "/Attributes/Visible", NULL, do_apply_invisible, TRUE, NULL },
|
|
200
|
+
- { "/Attributes/Rise", NULL, do_apply_rise, FALSE, NULL },
|
|
201
|
+
- { "/Attributes/Large", NULL, do_apply_large, FALSE, NULL },
|
|
202
|
+
- { "/Attributes/Indent", NULL, do_apply_indent, FALSE, NULL },
|
|
203
|
+
- { "/Attributes/Margins", NULL, do_apply_margin, FALSE, NULL },
|
|
204
|
+
- { "/Attributes/Custom tabs", NULL, do_apply_tabs, FALSE, NULL },
|
|
205
|
+
- { "/Attributes/Default tabs", NULL, do_apply_tabs, TRUE, NULL },
|
|
206
|
+
- { "/Attributes/Color cycles", NULL, do_apply_colors, TRUE, NULL },
|
|
207
|
+
- { "/Attributes/No colors", NULL, do_apply_colors, FALSE, NULL },
|
|
208
|
+
- { "/Attributes/Remove all tags", NULL, do_remove_tags, 0, NULL },
|
|
209
|
+
- { "/Attributes/Properties", NULL, do_properties, 0, NULL },
|
|
210
|
+
- { "/Attributes/Rich Text copy & drag", NULL, do_rich_text, 0, NULL },
|
|
211
|
+
- { "/Attributes/Rich Text paste & drop", NULL, do_rich_text, 1, NULL },
|
|
212
|
+
- { "/_Test", NULL, NULL, 0, "<Branch>" },
|
|
213
|
+
- { "/Test/_Example", NULL, do_example, 0, NULL },
|
|
214
|
+
- { "/Test/_Insert and scroll", NULL, do_insert_and_scroll, 0, NULL },
|
|
215
|
+
- { "/Test/_Add fixed children", NULL, do_add_children, 0, NULL },
|
|
216
|
+
- { "/Test/A_dd focusable children", NULL, do_add_focus_children, 0, NULL },
|
|
217
|
+
+ { "/Settings/Left-to-Right", NULL, G_CALLBACK (do_direction_changed), GTK_TEXT_DIR_LTR, "<RadioItem>" },
|
|
218
|
+
+ { "/Settings/Right-to-Left", NULL, G_CALLBACK (do_direction_changed), GTK_TEXT_DIR_RTL, "/Settings/Left-to-Right" },
|
|
219
|
+
+
|
|
220
|
+
+ { "/Settings/sep1", NULL, NULL, 0, "<Separator>" },
|
|
221
|
+
+ { "/Settings/Sane spacing", NULL, G_CALLBACK (do_spacing_changed), FALSE, "<RadioItem>" },
|
|
222
|
+
+ { "/Settings/Funky spacing", NULL, G_CALLBACK (do_spacing_changed), TRUE, "/Settings/Sane spacing" },
|
|
223
|
+
+ { "/Settings/sep1", NULL, NULL, 0, "<Separator>" },
|
|
224
|
+
+ { "/Settings/Don't cycle color tags", NULL, G_CALLBACK (do_color_cycle_changed), FALSE, "<RadioItem>" },
|
|
225
|
+
+ { "/Settings/Cycle colors", NULL, G_CALLBACK (do_color_cycle_changed), TRUE, "/Settings/Don't cycle color tags" },
|
|
226
|
+
+ { "/_Attributes", NULL, NULL, 0, "<Branch>" },
|
|
227
|
+
+ { "/Attributes/Editable", NULL, G_CALLBACK (do_apply_editable), TRUE, NULL },
|
|
228
|
+
+ { "/Attributes/Not editable", NULL, G_CALLBACK (do_apply_editable), FALSE, NULL },
|
|
229
|
+
+ { "/Attributes/Invisible", NULL, G_CALLBACK (do_apply_invisible), FALSE, NULL },
|
|
230
|
+
+ { "/Attributes/Visible", NULL, G_CALLBACK (do_apply_invisible), TRUE, NULL },
|
|
231
|
+
+ { "/Attributes/Rise", NULL, G_CALLBACK (do_apply_rise), FALSE, NULL },
|
|
232
|
+
+ { "/Attributes/Large", NULL, G_CALLBACK (do_apply_large), FALSE, NULL },
|
|
233
|
+
+ { "/Attributes/Indent", NULL, G_CALLBACK (do_apply_indent), FALSE, NULL },
|
|
234
|
+
+ { "/Attributes/Margins", NULL, G_CALLBACK (do_apply_margin), FALSE, NULL },
|
|
235
|
+
+ { "/Attributes/Custom tabs", NULL, G_CALLBACK (do_apply_tabs), FALSE, NULL },
|
|
236
|
+
+ { "/Attributes/Default tabs", NULL, G_CALLBACK (do_apply_tabs), TRUE, NULL },
|
|
237
|
+
+ { "/Attributes/Color cycles", NULL, G_CALLBACK (do_apply_colors), TRUE, NULL },
|
|
238
|
+
+ { "/Attributes/No colors", NULL, G_CALLBACK (do_apply_colors), FALSE, NULL },
|
|
239
|
+
+ { "/Attributes/Remove all tags", NULL, G_CALLBACK (do_remove_tags), 0, NULL },
|
|
240
|
+
+ { "/Attributes/Properties", NULL, G_CALLBACK (do_properties), 0, NULL },
|
|
241
|
+
+ { "/Attributes/Rich Text copy & drag", NULL, G_CALLBACK (do_rich_text), 0, NULL },
|
|
242
|
+
+ { "/Attributes/Rich Text paste & drop", NULL, G_CALLBACK (do_rich_text), 1, NULL },
|
|
243
|
+
+ { "/_Test", NULL, NULL, 0, "<Branch>" },
|
|
244
|
+
+ { "/Test/_Example", NULL, G_CALLBACK (do_example), 0, NULL },
|
|
245
|
+
+ { "/Test/_Insert and scroll", NULL, G_CALLBACK (do_insert_and_scroll), 0, NULL },
|
|
246
|
+
+ { "/Test/_Add fixed children", NULL, G_CALLBACK (do_add_children), 0, NULL },
|
|
247
|
+
+ { "/Test/A_dd focusable children", NULL, G_CALLBACK (do_add_focus_children), 0, NULL },
|
|
248
|
+
};
|
|
249
|
+
|
|
250
|
+
static gboolean
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
diff -ur murrine-0.98.2.orig/src/murrine_rc_style.h murrine-0.98.2/src/murrine_rc_style.h
|
|
2
|
+
--- murrine-0.98.2.orig/src/murrine_rc_style.h 2012-01-17 18:46:01.000000000 +0100
|
|
3
|
+
+++ murrine-0.98.2/src/murrine_rc_style.h 2022-12-14 21:33:03.242067429 +0100
|
|
4
|
+
@@ -154,5 +154,6 @@
|
|
5
|
+
};
|
|
6
|
+
|
|
7
|
+
GType murrine_rc_style_get_type (void);
|
|
8
|
+
+void murrine_rc_style_register_types (GTypeModule *module);
|
|
9
|
+
|
|
10
|
+
#endif /* MURRINE_RC_STYLE_H */
|
|
11
|
+
diff -ur murrine-0.98.2.orig/src/murrine_style.h murrine-0.98.2/src/murrine_style.h
|
|
12
|
+
--- murrine-0.98.2.orig/src/murrine_style.h 2012-01-17 18:46:01.000000000 +0100
|
|
13
|
+
+++ murrine-0.98.2/src/murrine_style.h 2022-12-14 21:33:41.604671684 +0100
|
|
14
|
+
@@ -102,5 +102,6 @@
|
|
15
|
+
};
|
|
16
|
+
|
|
17
|
+
GType murrine_style_get_type (void);
|
|
18
|
+
+void murrine_style_register_types (GTypeModule *module);
|
|
19
|
+
|
|
20
|
+
#endif /* MURRINE_STYLE_H */
|
|
21
|
+
diff -ur murrine-0.98.2.orig/src/support.h murrine-0.98.2/src/support.h
|
|
22
|
+
--- murrine-0.98.2.orig/src/support.h 2012-01-17 18:46:01.000000000 +0100
|
|
23
|
+
+++ murrine-0.98.2/src/support.h 2022-12-14 21:27:27.288533100 +0100
|
|
24
|
+
@@ -118,6 +118,10 @@
|
|
25
|
+
|
|
26
|
+
#define MRN_WIDGET_HAS_DEFAULT(object) ((object) && MRN_IS_WIDGET(object) && GTK_WIDGET_HAS_DEFAULT(object))
|
|
27
|
+
|
|
28
|
+
+gboolean murrine_object_is_a (const GObject * object, const gchar * type_name);
|
|
29
|
+
+gboolean murrine_widget_is_ltr (GtkWidget *widget);
|
|
30
|
+
+
|
|
31
|
+
+
|
|
32
|
+
G_GNUC_INTERNAL GtkTextDirection murrine_get_direction (GtkWidget *widget);
|
|
33
|
+
G_GNUC_INTERNAL GtkWidget *murrine_special_get_ancestor (GtkWidget *widget, GType widget_type);
|
|
34
|
+
G_GNUC_INTERNAL GdkColor* murrine_get_parent_bgcolor (GtkWidget *widget);
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
|
|
2
|
+
index 186a8f5cb2..f5c39b5afe 100644
|
|
3
|
+
--- a/gdk/x11/gdkevents-x11.c
|
|
4
|
+
+++ b/gdk/x11/gdkevents-x11.c
|
|
5
|
+
@@ -3000,6 +3000,50 @@ check_transform (const gchar *xsettings_name,
|
|
6
|
+
return TRUE;
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
+static gchar *
|
|
10
|
+
+gtk_rc_get_theme_dir (void)
|
|
11
|
+
+{
|
|
12
|
+
+ const gchar *var;
|
|
13
|
+
+ gchar *path;
|
|
14
|
+
+
|
|
15
|
+
+ var = g_getenv ("GTK_DATA_PREFIX");
|
|
16
|
+
+
|
|
17
|
+
+ if (var)
|
|
18
|
+
+ path = g_build_filename (var, "share", "themes", NULL);
|
|
19
|
+
+ else
|
|
20
|
+
+ path = g_build_filename ("/app", "share", "themes", NULL);
|
|
21
|
+
+
|
|
22
|
+
+ return path;
|
|
23
|
+
+}
|
|
24
|
+
+
|
|
25
|
+
+static gboolean
|
|
26
|
+
+theme_name_valid (XSettingsSetting *setting)
|
|
27
|
+
+{
|
|
28
|
+
+ gboolean res = FALSE;
|
|
29
|
+
+
|
|
30
|
+
+ if (setting->type == XSETTINGS_TYPE_STRING)
|
|
31
|
+
+ {
|
|
32
|
+
+ char *theme_name = setting->data.v_string;
|
|
33
|
+
+ gchar *theme_dir = gtk_rc_get_theme_dir ();
|
|
34
|
+
+ gchar *path = g_build_filename (theme_dir, theme_name, "gtk-2.0", "gtkrc", NULL);
|
|
35
|
+
+
|
|
36
|
+
+ if (g_file_test (path, G_FILE_TEST_EXISTS))
|
|
37
|
+
+ res = TRUE;
|
|
38
|
+
+ else if (g_str_has_suffix (theme_name, "-Dark") ||
|
|
39
|
+
+ g_str_has_suffix (theme_name, "-dark"))
|
|
40
|
+
+ {
|
|
41
|
+
+ setting->data.v_string = g_strdup ("Adwaita-dark");
|
|
42
|
+
+ g_free (theme_name);
|
|
43
|
+
+ res = TRUE;
|
|
44
|
+
+ }
|
|
45
|
+
+
|
|
46
|
+
+ g_free (theme_dir);
|
|
47
|
+
+ g_free (path);
|
|
48
|
+
+ }
|
|
49
|
+
+
|
|
50
|
+
+ return res;
|
|
51
|
+
+}
|
|
52
|
+
+
|
|
53
|
+
/**
|
|
54
|
+
* gdk_screen_get_setting:
|
|
55
|
+
* @screen: the #GdkScreen where the setting is located
|
|
56
|
+
@@ -3050,6 +3094,11 @@ gdk_screen_get_setting (GdkScreen *screen,
|
|
57
|
+
if (result != XSETTINGS_SUCCESS)
|
|
58
|
+
goto out;
|
|
59
|
+
|
|
60
|
+
+ if (strcmp (name, "gtk-theme-name") == 0 &&
|
|
61
|
+
+ (setting->type != XSETTINGS_TYPE_STRING ||
|
|
62
|
+
+ !theme_name_valid (setting)))
|
|
63
|
+
+ goto out;
|
|
64
|
+
+
|
|
65
|
+
switch (setting->type)
|
|
66
|
+
{
|
|
67
|
+
case XSETTINGS_TYPE_INT:
|
|
68
|
+
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
|
|
69
|
+
index 3fbbf00548..5c0a4b33d2 100644
|
|
70
|
+
--- a/gtk/gtksettings.c
|
|
71
|
+
+++ b/gtk/gtksettings.c
|
|
72
|
+
@@ -312,7 +312,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
|
|
73
|
+
#ifdef G_OS_WIN32
|
|
74
|
+
"MS-Windows",
|
|
75
|
+
#else
|
|
76
|
+
- "Raleigh",
|
|
77
|
+
+ "Adwaita",
|
|
78
|
+
#endif
|
|
79
|
+
GTK_PARAM_READWRITE),
|
|
80
|
+
NULL);
|
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "gnome-themes-extra",
|
|
3
|
+
"rm-configure": true,
|
|
4
|
+
"config-opts": [
|
|
5
|
+
"--disable-dependency-tracking",
|
|
6
|
+
"--disable-gtk3-engine"
|
|
7
|
+
],
|
|
8
|
+
"cleanup": [
|
|
9
|
+
"/share/themes/Adwaita/gtk-3.0",
|
|
10
|
+
"/share/themes/Adwaita-dark/gtk-3.0",
|
|
11
|
+
"/share/themes/HighContrast/gtk-3.0",
|
|
12
|
+
"*.la"
|
|
13
|
+
],
|
|
14
|
+
"sources": [
|
|
15
|
+
{
|
|
16
|
+
"type": "archive",
|
|
17
|
+
"url": "https://download.gnome.org/sources/gnome-themes-extra/3.28/gnome-themes-extra-3.28.tar.xz",
|
|
18
|
+
"sha256": "7c4ba0bff001f06d8983cfc105adaac42df1d1267a2591798a780bac557a5819"
|
|
19
|
+
},
|
|
20
|
+
{
|
|
21
|
+
"type": "shell",
|
|
22
|
+
"//": "We want to avoid generating icons as its 99% of the build time and gnome runtime has it",
|
|
23
|
+
"commands": [
|
|
24
|
+
"sed -i 's/icons//' themes/HighContrast/Makefile.am"
|
|
25
|
+
]
|
|
26
|
+
},
|
|
27
|
+
{
|
|
28
|
+
"type": "script",
|
|
29
|
+
"commands": [
|
|
30
|
+
"autoreconf -fsi"
|
|
31
|
+
]
|
|
32
|
+
}
|
|
33
|
+
],
|
|
34
|
+
"modules": [
|
|
35
|
+
"../intltool/intltool-0.51.json",
|
|
36
|
+
{
|
|
37
|
+
"name": "gtk2",
|
|
38
|
+
"cleanup": [
|
|
39
|
+
"/bin",
|
|
40
|
+
"/share/gtk-2.0",
|
|
41
|
+
"/share/aclocal",
|
|
42
|
+
"/share/gtk-doc",
|
|
43
|
+
"/lib/pkgconfig",
|
|
44
|
+
"/lib/gtk-2.0/include",
|
|
45
|
+
"/include",
|
|
46
|
+
"*.la"
|
|
47
|
+
],
|
|
48
|
+
"x-cpe": {
|
|
49
|
+
"product": "gtk+"
|
|
50
|
+
},
|
|
51
|
+
"config-opts": [
|
|
52
|
+
"--disable-dependency-tracking",
|
|
53
|
+
"--disable-gtk-doc-html",
|
|
54
|
+
"--disable-introspection",
|
|
55
|
+
"--with-xinput=xfree"
|
|
56
|
+
],
|
|
57
|
+
"sources": [
|
|
58
|
+
{
|
|
59
|
+
"type": "archive",
|
|
60
|
+
"url": "https://download.gnome.org/sources/gtk+/2.24/gtk+-2.24.33.tar.xz",
|
|
61
|
+
"sha256": "ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da"
|
|
62
|
+
},
|
|
63
|
+
{
|
|
64
|
+
"type": "patch",
|
|
65
|
+
"path": "gtk2-use-adwaita-theme.patch"
|
|
66
|
+
},
|
|
67
|
+
{
|
|
68
|
+
"type": "patch",
|
|
69
|
+
"paths": [
|
|
70
|
+
"gtk2-fix-crash-in-show-uri.patch",
|
|
71
|
+
"gtk2-gcc14.patch",
|
|
72
|
+
"gtk2-gcc15.patch"
|
|
73
|
+
]
|
|
74
|
+
}
|
|
75
|
+
]
|
|
76
|
+
},
|
|
77
|
+
{
|
|
78
|
+
"name": "ibus-gtk2",
|
|
79
|
+
"config-opts": [
|
|
80
|
+
"--disable-xim",
|
|
81
|
+
"--disable-dconf",
|
|
82
|
+
"--disable-gconf",
|
|
83
|
+
"--disable-memconf",
|
|
84
|
+
"--disable-schemas-compile",
|
|
85
|
+
"--disable-schemas-install",
|
|
86
|
+
"--disable-gtk3",
|
|
87
|
+
"--disable-setup",
|
|
88
|
+
"--disable-ui",
|
|
89
|
+
"--disable-engine",
|
|
90
|
+
"--disable-python-library",
|
|
91
|
+
"--disable-libnotify",
|
|
92
|
+
"--disable-emoji-dict",
|
|
93
|
+
"--disable-appindicator",
|
|
94
|
+
"--disable-glibtest",
|
|
95
|
+
"--disable-tests",
|
|
96
|
+
"--disable-unicode-dict",
|
|
97
|
+
"--disable-introspection",
|
|
98
|
+
"--disable-python2"
|
|
99
|
+
],
|
|
100
|
+
"make-install-args": [
|
|
101
|
+
"-C", "client/gtk2"
|
|
102
|
+
],
|
|
103
|
+
"post-install": [
|
|
104
|
+
"gtk-query-immodules-2.0 > immodules.cache",
|
|
105
|
+
"install immodules.cache -t $(pkg-config --variable=libdir gtk+-2.0)/gtk-2.0/2.10.0/"
|
|
106
|
+
],
|
|
107
|
+
"sources": [
|
|
108
|
+
{
|
|
109
|
+
"type": "archive",
|
|
110
|
+
"url": "https://github.com/ibus/ibus/releases/download/1.5.23/ibus-1.5.23.tar.gz",
|
|
111
|
+
"sha256": "b7e8d5bdb7d71a5ba4ee43cdf374675f77121a71c1679c9b9e7e02875bd0e150"
|
|
112
|
+
},
|
|
113
|
+
{
|
|
114
|
+
"type": "patch",
|
|
115
|
+
"path": "ibus-gcc15.patch"
|
|
116
|
+
}
|
|
117
|
+
]
|
|
118
|
+
}
|
|
119
|
+
]
|
|
120
|
+
}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
|
|
2
|
+
index 43bd5283..8896207e 100644
|
|
3
|
+
--- a/src/ibusenginesimple.c
|
|
4
|
+
+++ b/src/ibusenginesimple.c
|
|
5
|
+
@@ -542,7 +542,7 @@ check_emoji_table (IBusEngineSimple *simple,
|
|
6
|
+
g_object_ref_sink (priv->lookup_table);
|
|
7
|
+
}
|
|
8
|
+
if (emoji_dict == NULL)
|
|
9
|
+
- emoji_dict = priv->emoji_dict = load_emoji_dict (simple);
|
|
10
|
+
+ emoji_dict = priv->emoji_dict = load_emoji_dict ();
|
|
11
|
+
|
|
12
|
+
if (emoji_dict == NULL || emoji_dict->dict == NULL)
|
|
13
|
+
return FALSE;
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
Index: gtk2-engines-murrine-0.98.2/src/murrine_style.c
|
|
2
|
+
===================================================================
|
|
3
|
+
--- gtk2-engines-murrine-0.98.2.orig/src/murrine_style.c
|
|
4
|
+
+++ gtk2-engines-murrine-0.98.2/src/murrine_style.c
|
|
5
|
+
@@ -2171,6 +2171,7 @@ murrine_style_draw_layout (GtkStyle
|
|
6
|
+
cairo_t *cr;
|
|
7
|
+
cr = murrine_begin_paint (window, area);
|
|
8
|
+
cairo_translate (cr, x+xos, y+yos);
|
|
9
|
+
+ pango_cairo_update_layout (cr, layout);
|
|
10
|
+
pango_cairo_layout_path (cr, layout);
|
|
11
|
+
murrine_set_color_rgba (cr, &temp, 0.5);
|
|
12
|
+
cairo_stroke (cr);
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
This directory contains two manifests:
|
|
2
|
+
|
|
3
|
+
- `gtk2.json`
|
|
4
|
+
|
|
5
|
+
This contains a build of GTK2, the ibus input module, and the Adwaita and HighContrast themes.
|
|
6
|
+
|
|
7
|
+
- `gtk2-common-themes.json`
|
|
8
|
+
|
|
9
|
+
This contains a collection of commonly used GTK2 themes that users might have. This is optional as it does build a few things.
|
|
10
|
+
Without the matching theme the build of GTK2 here will always default to Adwaita.
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "intltool",
|
|
3
|
+
"cleanup": [ "*" ],
|
|
4
|
+
"sources": [
|
|
5
|
+
{
|
|
6
|
+
"type": "archive",
|
|
7
|
+
"url": "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz",
|
|
8
|
+
"mirror-urls": [
|
|
9
|
+
"https://sources.suse.com/SUSE:SLE-15-SP7:Update:BCI/000product/ca527df4d03bf96a67854a8ed2f0c64b/INCLUDED/SUSE:SLE-15-SP6:GA::intltool::45f77273c3f2ef792fa697b444183beb/intltool-0.51.0.tar.gz",
|
|
10
|
+
"https://mirror-hk.koddos.net/lfs/lfs-packages/12.0/intltool-0.51.0.tar.gz",
|
|
11
|
+
"https://gstreamer.freedesktop.org/src/mirror/intltool-0.51.0.tar.gz"
|
|
12
|
+
],
|
|
13
|
+
"sha256": "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd"
|
|
14
|
+
},
|
|
15
|
+
{
|
|
16
|
+
"type": "patch",
|
|
17
|
+
"path": "intltool-perl5.26-regex-fixes.patch"
|
|
18
|
+
}
|
|
19
|
+
]
|
|
20
|
+
}
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
Description: Escape "{", to prevent complaints from perl 5.22 and 5.26
|
|
2
|
+
Author: Roderich Schupp <roderich.schupp@gmail.com>
|
|
3
|
+
Author: gregor herrmann <gregoa@debian.org>
|
|
4
|
+
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788705
|
|
5
|
+
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=826471
|
|
6
|
+
Bug-Upstream: https://bugs.launchpad.net/intltool/+bug/1490906
|
|
7
|
+
|
|
8
|
+
Index: intltool-0.51.0/intltool-update.in
|
|
9
|
+
===================================================================
|
|
10
|
+
--- intltool-0.51.0.orig/intltool-update.in 2017-07-23 17:24:35.113169465 +0200
|
|
11
|
+
+++ intltool-0.51.0/intltool-update.in 2017-07-23 17:24:35.109169052 +0200
|
|
12
|
+
@@ -1062,13 +1062,13 @@
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
|
|
17
|
+
+ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
|
|
18
|
+
{
|
|
19
|
+
my $rest = $3;
|
|
20
|
+
my $untouched = $1;
|
|
21
|
+
my $sub = "";
|
|
22
|
+
# Ignore recursive definitions of variables
|
|
23
|
+
- $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/;
|
|
24
|
+
+ $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\$\{?$2}?/;
|
|
25
|
+
|
|
26
|
+
return SubstituteVariable ("$untouched$sub$rest");
|
|
27
|
+
}
|
|
28
|
+
@@ -1190,10 +1190,10 @@
|
|
29
|
+
$name =~ s/\(+$//g;
|
|
30
|
+
$version =~ s/\(+$//g;
|
|
31
|
+
|
|
32
|
+
- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
|
|
33
|
+
- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
|
|
34
|
+
- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
|
|
35
|
+
- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
|
|
36
|
+
+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
|
|
37
|
+
+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
|
|
38
|
+
+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
|
|
39
|
+
+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
|
|
43
|
+
@@ -1219,11 +1219,11 @@
|
|
44
|
+
$version =~ s/\(+$//g;
|
|
45
|
+
$bugurl =~ s/\(+$//g if (defined $bugurl);
|
|
46
|
+
|
|
47
|
+
- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
|
|
48
|
+
- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
|
|
49
|
+
- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
|
|
50
|
+
- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
|
|
51
|
+
- $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
|
|
52
|
+
+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
|
|
53
|
+
+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
|
|
54
|
+
+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
|
|
55
|
+
+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
|
|
56
|
+
+ $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
# \s makes this not work, why?
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
From bba34e509c2e144000becdc89e18bf6e34fe5517 Mon Sep 17 00:00:00 2001
|
|
2
|
+
From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= <hub@figuiere.net>
|
|
3
|
+
Date: Tue, 18 Nov 2025 20:33:54 -0500
|
|
4
|
+
Subject: [PATCH 1/5] Build xmm_quantize_sub.c with -msse
|
|
5
|
+
MIME-Version: 1.0
|
|
6
|
+
Content-Type: text/plain; charset=UTF-8
|
|
7
|
+
Content-Transfer-Encoding: 8bit
|
|
8
|
+
|
|
9
|
+
From: Sebastian Ramacher <sramacher@debian.org>
|
|
10
|
+
Bug: http://sourceforge.net/p/lame/bugs/443/
|
|
11
|
+
Bug-Debian: https://bugs.debian.org/760047
|
|
12
|
+
Forwarded: http://sourceforge.net/p/lame/bugs/443/
|
|
13
|
+
Last-Update: 2014-08-31
|
|
14
|
+
|
|
15
|
+
Signed-off-by: Hubert Figuière <hub@figuiere.net>
|
|
16
|
+
---
|
|
17
|
+
libmp3lame/vector/Makefile.am | 1 +
|
|
18
|
+
1 file changed, 1 insertion(+)
|
|
19
|
+
|
|
20
|
+
diff --git a/libmp3lame/vector/Makefile.am b/libmp3lame/vector/Makefile.am
|
|
21
|
+
index ac595b1..6b05380 100644
|
|
22
|
+
--- a/libmp3lame/vector/Makefile.am
|
|
23
|
+
+++ b/libmp3lame/vector/Makefile.am
|
|
24
|
+
@@ -20,6 +20,7 @@ xmm_sources = xmm_quantize_sub.c
|
|
25
|
+
|
|
26
|
+
if WITH_XMM
|
|
27
|
+
liblamevectorroutines_la_SOURCES = $(xmm_sources)
|
|
28
|
+
+liblamevectorroutines_la_CFLAGS = -msse
|
|
29
|
+
endif
|
|
30
|
+
|
|
31
|
+
noinst_HEADERS = lame_intrin.h
|
|
32
|
+
--
|
|
33
|
+
2.51.0
|
|
34
|
+
|