ayae/extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
main
extra/kickshaw/fix-build.patch
Astound f8a70886f0 initial import
2025-06-22 20:39:04 -05:00

294 lines
16 KiB
Diff
Raw Permalink Blame History

--- a/source/Makefile 2024-02-22 22:44:06.000000000 +0100
+++ b/source/Makefile 2024-03-01 13:56:57.877429926 +0100
@@ -18,103 +18,104 @@
rm -f .*resource*.o *.o *.bak *~ kickshaw
install:
- mkdir -p /usr/share/locale
- cp -R resources/txts/translations/af /usr/share/locale/
- cp -R resources/txts/translations/az /usr/share/locale/
- cp -R resources/txts/translations/bg /usr/share/locale/
- cp -R resources/txts/translations/bn /usr/share/locale/
- cp -R resources/txts/translations/ca /usr/share/locale/
- cp -R resources/txts/translations/cs /usr/share/locale/
- cp -R resources/txts/translations/cy /usr/share/locale/
- cp -R resources/txts/translations/da /usr/share/locale/
- cp -R resources/txts/translations/de /usr/share/locale/
- cp -R resources/txts/translations/el /usr/share/locale/
- cp -R resources/txts/translations/es /usr/share/locale/
- cp -R resources/txts/translations/et /usr/share/locale/
- cp -R resources/txts/translations/eu /usr/share/locale/
- cp -R resources/txts/translations/fi /usr/share/locale/
- cp -R resources/txts/translations/fo /usr/share/locale/
- cp -R resources/txts/translations/fr /usr/share/locale/
- cp -R resources/txts/translations/fy /usr/share/locale/
- cp -R resources/txts/translations/gl /usr/share/locale/
- cp -R resources/txts/translations/hi /usr/share/locale/
- cp -R resources/txts/translations/hr /usr/share/locale/
- cp -R resources/txts/translations/hu /usr/share/locale/
- cp -R resources/txts/translations/hy /usr/share/locale/
- cp -R resources/txts/translations/id /usr/share/locale/
- cp -R resources/txts/translations/is /usr/share/locale/
- cp -R resources/txts/translations/it /usr/share/locale/
- cp -R resources/txts/translations/ja /usr/share/locale/
- cp -R resources/txts/translations/ka /usr/share/locale/
- cp -R resources/txts/translations/ko /usr/share/locale/
- cp -R resources/txts/translations/lt /usr/share/locale/
- cp -R resources/txts/translations/lv /usr/share/locale/
- cp -R resources/txts/translations/mt /usr/share/locale/
- cp -R resources/txts/translations/nb /usr/share/locale/
- cp -R resources/txts/translations/nl /usr/share/locale/
- cp -R resources/txts/translations/pl /usr/share/locale/
- cp -R resources/txts/translations/pt /usr/share/locale/
- cp -R resources/txts/translations/ro /usr/share/locale/
- cp -R resources/txts/translations/ru /usr/share/locale/
- cp -R resources/txts/translations/sk /usr/share/locale/
- cp -R resources/txts/translations/sl /usr/share/locale/
- cp -R resources/txts/translations/sq /usr/share/locale/
- cp -R resources/txts/translations/sv /usr/share/locale/
- cp -R resources/txts/translations/th /usr/share/locale/
- cp -R resources/txts/translations/tr /usr/share/locale/
- cp -R resources/txts/translations/vi /usr/share/locale/
- cp -R resources/txts/translations/zh_CN /usr/share/locale/
- cp -R resources/txts/translations/zh_HK /usr/share/locale/
- cp -R resources/txts/translations/zh_TW /usr/share/locale/
- cp kickshaw $(PREFIX)/bin
+ mkdir -p ${PREFIX}/bin
+ mkdir -p ${PREFIX}/share/locale
+ cp -R resources/txts/translations/af ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/az ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/bg ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/bn ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/ca ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/cs ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/cy ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/da ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/de ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/el ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/es ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/et ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/eu ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/fi ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/fo ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/fr ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/fy ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/gl ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/hi ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/hr ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/hu ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/hy ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/id ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/is ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/it ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/ja ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/ka ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/ko ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/lt ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/lv ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/mt ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/nb ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/nl ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/pl ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/pt ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/ro ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/ru ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/sk ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/sl ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/sq ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/sv ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/th ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/tr ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/vi ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/zh_CN ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/zh_HK ${PREFIX}/share/locale/
+ cp -R resources/txts/translations/zh_TW ${PREFIX}/share/locale/
+ cp kickshaw $(PREFIX)/bin/
uninstall:
rm $(PREFIX)/bin/kickshaw
- rm /usr/share/locale/af/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/az/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/bg/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/bn/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/ca/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/cs/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/cy/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/da/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/de/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/el/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/es/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/et/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/eu/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/fi/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/fo/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/fr/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/fy/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/gl/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/hi/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/hr/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/hu/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/hy/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/id/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/is/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/it/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/ja/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/ka/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/ko/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/lt/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/lv/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/mt/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/nb/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/nl/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/pl/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/pt/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/ro/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/ru/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/sk/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/sl/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/sq/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/sv/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/th/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/tr/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/vi/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/zh_CN/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/zh_HK/LC_MESSAGES/kickshaw.mo
- rm /usr/share/locale/zh_TW/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/af/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/az/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/bg/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/bn/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/ca/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/cs/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/cy/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/da/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/de/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/el/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/es/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/et/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/eu/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/fi/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/fo/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/fr/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/fy/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/gl/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/hi/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/hr/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/hu/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/hy/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/id/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/is/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/it/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/ja/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/ka/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/ko/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/lt/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/lv/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/mt/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/nb/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/nl/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/pl/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/pt/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/ro/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/ru/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/sk/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/sl/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/sq/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/sv/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/th/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/tr/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/vi/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/zh_CN/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/zh_HK/LC_MESSAGES/kickshaw.mo
+ rm ${PREFIX}/share/locale/zh_TW/LC_MESSAGES/kickshaw.mo
@echo "For every user who has started Kickshaw a settings file .kickshawrc was created inside the respective home directory. It is not removed automatically, so it has to be removed manually."
--- a/source/kickshaw.c 2024-02-22 22:44:06.000000000 +0100
+++ b/source/kickshaw.c 2024-03-01 14:02:21.874904052 +0100
@@ -2547,78 +2547,6 @@
void get_latest_version_str_from_server_callback (GObject *source_object, GAsyncResult *result, G_GNUC_UNUSED gpointer user_data)
{
- g_autoptr(GError) error = NULL;
-
- g_socket_client_connect_to_uri_finish (G_SOCKET_CLIENT (source_object), result, &error);
-
- if (!error) {
- g_autoptr(GFile) latest = g_file_new_for_uri ("http://download.savannah.gnu.org/releases/obladi/latest");
- g_autofree gchar *latest_local_str = g_strdup_printf ("%s/latest", ks.tmp_path);
- g_autoptr(GFile) latest_local = g_file_new_for_path (latest_local_str);
-
- g_autoptr(GError) error = NULL;
-
- if (G_LIKELY (g_file_copy (latest, latest_local, G_FILE_COPY_ALL_METADATA, NULL, NULL, NULL, &error))) {
- g_autoptr(GFileInputStream) latest_local_input_stream = NULL;
-
- if (G_LIKELY ((latest_local_input_stream = g_file_read (latest_local, NULL, &error)))) {
- g_autoptr(GDataInputStream) latest_local_data_input_stream = g_data_input_stream_new (G_INPUT_STREAM (latest_local_input_stream));
- g_autofree gchar *latest_local_check_version;
-
- if (G_UNLIKELY (!(latest_local_check_version = g_data_input_stream_read_line (latest_local_data_input_stream,
- NULL, NULL, &error)))) {
- g_autofree gchar *err_msg = g_strdup_printf (_("<b>Could not obtain the version from the version check file</b> "
- "<tt>latest</tt> <b>located inside the tmp folder</b> "
- "<tt>%s</tt> <b>!\n"
- "Error:</b> %s"), ks.tmp_path, error->message);
-
- show_errmsg (err_msg);
- }
-
- if (G_UNLIKELY (!(g_file_delete (latest_local, NULL, &error)))) {
- g_autofree gchar *err_msg = g_strdup_printf (_("<b>Could not remove version check file</b> <tt>latest</tt> "
- "<b>from tmp folder</b> <tt>%s</tt> <b>!</b>"), ks.tmp_path);
-
- show_errmsg (err_msg);
- }
-
-#if __GLIBC__
- if (strverscmp (latest_local_check_version, KICKSHAW_VERSION) > 0) {
-#else
- if (strverscmp_nonglibc (latest_local_check_version, KICKSHAW_VERSION) > 0) {
-#endif
- FREE_AND_REASSIGN (ks.version_info, g_strdup_printf (_("%s\nNewer version %s is available."), KICKSHAW_VERSION, latest_local_check_version));
- }
- else {
- FREE_AND_REASSIGN (ks.version_info, g_strdup_printf (_("%s\nThis is the latest version."), KICKSHAW_VERSION));
- }
- }
- else {
- g_autofree gchar *err_msg = g_strdup_printf (_("<b>Could not open version check file</b> "
- "<tt>latest</tt> <b>inside</b> <tt>%s</tt> <b>!\n"
- "Error:</b> %s"), ks.tmp_path, error->message);
-
- show_errmsg (err_msg);
- }
- }
- /*
- Ignore if the version check file hasn't been found.
- The file might have been renamed on the server or the whole version check functionality have been rewritten
- in the meantime. In this case, the version check is likely to work again with a newer version of Kickshaw.
- */
- else if (!(g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))) {
- g_autofree gchar *err_msg = g_strdup_printf (_("<b>Could not copy version check file</b> "
- "<tt>latest</tt> <b>to</b> <tt>%s</tt> <b>!\n"
- "Error:</b> %s"), ks.tmp_path, error->message);
-
- show_errmsg (err_msg);
- }
- }
- else { // No internet connection or download server is down
- FREE_AND_REASSIGN (ks.version_info, g_strdup_printf ("%s\n%s", KICKSHAW_VERSION, _("Check for newer version requires internet connection.")));
- }
-
- ks.stopped_trying_to_connect_to_server = TRUE;
}
/*
@@ -2633,8 +2561,6 @@
ks.version_info = g_strdup (KICKSHAW_VERSION);
- g_socket_client_connect_to_uri_async (socket_client, "http://download.savannah.gnu.org", 80, NULL, (GAsyncReadyCallback) get_latest_version_str_from_server_callback, NULL);
-
g_autoptr(GResource) resources = resources_get_resource ();
g_resources_register (resources);
Reference in New Issue View Git Blame Copy Permalink