From 0f940a7460182187195b6300ae9bc0c822a11724 Mon Sep 17 00:00:00 2001 From: NunoSempere Date: Tue, 12 Mar 2024 14:13:47 -0300 Subject: webkit upgrade: remove deprecated opts and change variable names. References for the removed opts: https://webkitgtk.org/reference/webkit2gtk/stable/property.WebContext.local-storage-directory.html?q= https://webkitgtk.org/reference/webkit2gtk/stable/property.WebsiteDataManager.disk-cache-directory.html https://webkitgtk.org/reference/webkit2gtk/stable/property.WebsiteDataManager.indexeddb-directory.html https://webkitgtk.org/reference/webkit2gtk/stable/property.WebsiteDataManager.service-worker-registrations-directory.html https://webkitgtk.org/reference/webkit2gtk/stable/property.WebsiteDataManager.itp-directory.html https://webkitgtk.org/reference/webkit2gtk/stable/property.WebsiteDataManager.hsts-cache-directory.html --- config.h | 8 +------- makefile | 1 + rose | Bin 43176 -> 39008 bytes rose.c | 4 ++-- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/config.h b/config.h index 7280bc3..531b6c2 100644 --- a/config.h +++ b/config.h @@ -41,13 +41,7 @@ To remove plugins completely; "default-charset", "utf-8" /* CACHE */ #define CACHE_DIR "/home/nuno/.cache/rose" -#define CACHE \ - "base-cache-directory", CACHE_DIR, "base-data-directory", CACHE_DIR, \ - "disk-cache-directory", CACHE_DIR, "dom-cache-directory", CACHE_DIR, \ - "hsts-cache-directory", CACHE_DIR, "indexeddb-directory", CACHE_DIR, \ - "itp-directory", CACHE_DIR, "local-storage-directory", CACHE_DIR, \ - "offline-application-cache-directory", CACHE_DIR, \ - "service-worker-registrations-directory", CACHE_DIR +#define DATA_MANAGER_OPTS "base-cache-directory", CACHE_DIR, "base-data-directory", CACHE_DIR, // GTK #define GTK_SETTINGS_CONFIG_H "gtk-application-prefer-dark-theme", false, "gtk-enable-animations", false diff --git a/makefile b/makefile index 14ff906..011b630 100644 --- a/makefile +++ b/makefile @@ -75,6 +75,7 @@ install: rose mkdir -p /usr/share/themes/rose cp style.css /usr/share/themes/rose/ cp rose-mklink /usr/bin + sudo mkdir -p /usr/bin/rose-browser sudo cp rose /usr/bin/rose-browser/twitter # custom twitter tweaks uninstall: diff --git a/rose b/rose index fa55a9a..f20a0c1 100755 Binary files a/rose and b/rose differ diff --git a/rose.c b/rose.c index 4433f26..a26e155 100644 --- a/rose.c +++ b/rose.c @@ -157,12 +157,12 @@ WebKitWebView* create_new_webview() // See: for some common user agents } web_context = webkit_web_context_new_with_website_data_manager( - webkit_website_data_manager_new(CACHE, NULL)); + webkit_website_data_manager_new(DATA_MANAGER_OPTS, NULL)); contentmanager = webkit_user_content_manager_new(); cookiemanager = webkit_web_context_get_cookie_manager(web_context); webkit_cookie_manager_set_persistent_storage( - cookiemanager, CACHE_DIR "/cookies.sqlite", + cookiemanager, DATA_DIR "/cookies.sqlite", WEBKIT_COOKIE_PERSISTENT_STORAGE_SQLITE); webkit_cookie_manager_set_accept_policy(cookiemanager, -- cgit v1.2.3