From bdcf4480adc6b21c32666878119ea86c5a9a1512 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 10:59:58 +0000 Subject: [PATCH 01/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- utox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/utox.spec b/utox.spec index 5bb851f..2208c51 100644 --- a/utox.spec +++ b/utox.spec @@ -1,6 +1,6 @@ Name: utox Version: 0.17.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The lightweight Tox client License: MIT or GPLv3+ @@ -74,6 +74,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 0.17.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 0.17.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 4f17481e8950f31a92901a8f1fe2da2157a80fa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 5 Feb 2019 15:05:00 +0100 Subject: [PATCH 02/34] rebuilt (libvpx) --- utox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/utox.spec b/utox.spec index 2208c51..a98a1c0 100644 --- a/utox.spec +++ b/utox.spec @@ -1,6 +1,6 @@ Name: utox Version: 0.17.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The lightweight Tox client License: MIT or GPLv3+ @@ -74,6 +74,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog +* Tue Feb 05 2019 Björn Esser - 0.17.0-5 +- rebuilt (libvpx) + * Sun Feb 03 2019 Fedora Release Engineering - 0.17.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 84292d9978a06cf6beae564b7003095360e06201 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:42:16 +0000 Subject: [PATCH 03/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- utox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/utox.spec b/utox.spec index a98a1c0..93ab75b 100644 --- a/utox.spec +++ b/utox.spec @@ -1,6 +1,6 @@ Name: utox Version: 0.17.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: The lightweight Tox client License: MIT or GPLv3+ @@ -74,6 +74,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 0.17.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Feb 05 2019 Björn Esser - 0.17.0-5 - rebuilt (libvpx) From 01d4d065c73b59411a7cf4c8db45ff4d7e813366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Wed, 25 Sep 2019 17:14:00 +0200 Subject: [PATCH 04/34] Release 0.17.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- .gitignore | 1 + sources | 4 ++-- utox.spec | 15 ++++++--------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 9f59be0..d25dd7b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /utox-0.16.1.tar.gz /third-party.tar.gz /utox-0.17.0.tar.gz +/utox-0.17.1.tar.gz diff --git a/sources b/sources index 781db76..cf9200e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (third-party.tar.gz) = 8aa9b95eff430627124fc5ec93747bfb2d28fd78c04d66290b70b25c4d48a39b828ca045c3c0302ea49d8186101ab7636ccb2f1db0d64f33bb3b18dd6df86ddb -SHA512 (utox-0.17.0.tar.gz) = c22e622e8dbe4d434f3e750ef78869c9ad7ad18162cd938d8006778cc5e788d2852bd4a06f3d498e62733845bec42bc5ac174bb20cb4a7b91954f97d6277ed8c +SHA512 (third-party.tar.gz) = bf1410cb1f33e6b384435d64997483c0eced2ad516f0e36ae8a8fbf96de59edbded1028a9b541f217b3492ce5c825d7e46148e92cd43ebc5414bc8e042fbfea4 +SHA512 (utox-0.17.1.tar.gz) = e906dd5cb40057ac56199548f687db0e2f07c4d71037dc1b0928cea934be2a4a5735b3d47976c4b4bda4c0029ced34ac865f40c289c5dc41b7a0737bd3297f59 diff --git a/utox.spec b/utox.spec index 93ab75b..9e51313 100644 --- a/utox.spec +++ b/utox.spec @@ -1,9 +1,9 @@ Name: utox -Version: 0.17.0 -Release: 6%{?dist} +Version: 0.17.1 +Release: 1%{?dist} Summary: The lightweight Tox client -License: MIT or GPLv3+ +License: MIT or GPLv3+ URL: https://github.com/uTox/uTox/ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Source1: %{name}.appdata.xml @@ -36,19 +36,16 @@ Requires: hicolor-icon-theme %description %summary - %prep %autosetup -n uTox-%{version} %autosetup -N -T -D -a 2 -n uTox-%{version} - %build mkdir build cd build %cmake .. %make_build - %install pushd build %make_install @@ -56,13 +53,11 @@ popd install -Dp -m 644 %{SOURCE1} %{buildroot}/%{_datadir}/metainfo/%{name}.appdata.xml rm -rf %{buildroot}/%{_datadir}/icons/hicolor/14x14 - %check ctest -V %{?_smp_mflags} desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}.appdata.xml - %files %license LICENSE %doc README.md CHANGELOG.md @@ -72,8 +67,10 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %{_datadir}/icons/hicolor/*/apps/%{name}* %{_mandir}/man1/%{name}.1* - %changelog +* Wed Sep 25 16:55:23 CEST 2019 Robert-André Mauchin - 0.17.1-1 +- Release 0.17.1 + * Sat Jul 27 2019 Fedora Release Engineering - 0.17.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From f44396730e2e971cd18601f277eec160644dbe6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Thu, 23 Jan 2020 19:10:08 +0100 Subject: [PATCH 05/34] Fix compatibility with GCC 10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- 0001-Mark-global-variable-as-extern.patch | 1042 +++++++++++++++++++++ utox.spec | 9 +- 2 files changed, 1049 insertions(+), 2 deletions(-) create mode 100644 0001-Mark-global-variable-as-extern.patch diff --git a/0001-Mark-global-variable-as-extern.patch b/0001-Mark-global-variable-as-extern.patch new file mode 100644 index 0000000..0687b2e --- /dev/null +++ b/0001-Mark-global-variable-as-extern.patch @@ -0,0 +1,1042 @@ +From 5538d4335447a613913a92f3525492022526c061 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= +Date: Thu, 23 Jan 2020 17:38:21 +0100 +Subject: [PATCH] Mark global variable as extern +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +GCC now defaults to -fno-common. As a result, global variable accesses +are more efficient on various targets. In C, global variables with +multiple tentative definitions now result in linker errors. + +Fix #1412 + +Signed-off-by: Robert-André Mauchin +--- + CMakeLists.txt | 1 + + src/av/CMakeLists.txt | 1 + + src/av/globals.c | 6 + + src/av/video.h | 2 +- + src/friend.h | 2 +- + src/globals.c | 271 ++++++++++++++++++++++++++++++++++++++++ + src/messages.h | 2 +- + src/self.h | 2 +- + src/theme.h | 162 ++++++++++++------------ + src/theme_tables.h | 152 +--------------------- + src/tox.h | 10 +- + src/ui.h | 10 +- + src/ui/CMakeLists.txt | 1 + + src/ui/draw.h | 2 +- + src/ui/globals.c | 6 + + src/xlib/CMakeLists.txt | 1 + + src/xlib/freetype.h | 10 +- + src/xlib/globals.c | 57 +++++++++ + src/xlib/main.h | 28 ++--- + src/xlib/window.h | 22 ++-- + 20 files changed, 473 insertions(+), 275 deletions(-) + create mode 100644 src/av/globals.c + create mode 100644 src/globals.c + create mode 100644 src/ui/globals.c + create mode 100644 src/xlib/globals.c + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ac154ce9..bf537ea0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -348,6 +348,7 @@ add_executable(utox ${GUI_TYPE} + src/filesys.c + src/flist.c + src/friend.c ++ src/globals.c + src/groups.c + src/inline_video.c + src/logging.c +diff --git a/src/av/CMakeLists.txt b/src/av/CMakeLists.txt +index ce49a97a..386d941a 100644 +--- a/src/av/CMakeLists.txt ++++ b/src/av/CMakeLists.txt +@@ -3,6 +3,7 @@ project(utoxAV LANGUAGES C) + add_library(utoxAV STATIC + utox_av.c + audio.c ++ globals.c + video.c + filter_audio.c + ) +diff --git a/src/av/globals.c b/src/av/globals.c +new file mode 100644 +index 00000000..6972af93 +--- /dev/null ++++ b/src/av/globals.c +@@ -0,0 +1,6 @@ ++#include "video.h" ++ ++/* Globals */ ++ ++/* video.h */ ++uint16_t video_width, video_height, max_video_width, max_video_height; +diff --git a/src/av/video.h b/src/av/video.h +index 2c2df541..c193caee 100644 +--- a/src/av/video.h ++++ b/src/av/video.h +@@ -5,7 +5,7 @@ + #include + #include + +-uint16_t video_width, video_height, max_video_width, max_video_height; ++extern uint16_t video_width, video_height, max_video_width, max_video_height; + + extern bool utox_video_thread_init; + +diff --git a/src/friend.h b/src/friend.h +index d77276f9..823a555e 100644 +--- a/src/friend.h ++++ b/src/friend.h +@@ -112,7 +112,7 @@ typedef struct utox_friend_request { + } FREQUEST; + + // add friend page +-uint8_t addfriend_status; ++extern uint8_t addfriend_status; + + #define UTOX_FRIEND_NAME(f) ((f->alias) ? f->alias : f->name) + #define UTOX_FRIEND_NAME_LENGTH(f) ((f->alias) ? f->alias_length : f->name_length) +diff --git a/src/globals.c b/src/globals.c +new file mode 100644 +index 00000000..4395c1ef +--- /dev/null ++++ b/src/globals.c +@@ -0,0 +1,271 @@ ++#include "friend.h" ++#include "messages.h" ++#include "self.h" ++#include "theme.h" ++#include "theme_tables.h" ++#include "tox.h" ++#include "ui.h" ++ ++/* Globals */ ++ ++/* friend.h */ ++uint8_t addfriend_status; ++ ++/* messages.h */ ++pthread_mutex_t messages_lock; ++ ++/* self.h */ ++struct utox_self self; ++ ++/* theme.h */ ++uint32_t COLOR_BKGRND_MAIN; ++uint32_t COLOR_BKGRND_ALT; ++uint32_t COLOR_BKGRND_AUX; ++uint32_t COLOR_BKGRND_MENU; ++uint32_t COLOR_BKGRND_MENU_HOVER; ++uint32_t COLOR_BKGRND_MENU_ACTIVE; ++uint32_t COLOR_BKGRND_LIST; ++uint32_t COLOR_BKGRND_LIST_HOVER; ++ ++uint32_t COLOR_MAIN_TEXT; ++uint32_t COLOR_MAIN_TEXT_CHAT; ++uint32_t COLOR_MAIN_TEXT_SUBTEXT; ++uint32_t COLOR_MAIN_TEXT_ACTION; ++uint32_t COLOR_MAIN_TEXT_QUOTE; ++uint32_t COLOR_MAIN_TEXT_RED; ++uint32_t COLOR_MAIN_TEXT_URL; ++uint32_t COLOR_MAIN_TEXT_HINT; ++ ++uint32_t COLOR_MSG_USER; ++uint32_t COLOR_MSG_USER_PEND; ++uint32_t COLOR_MSG_USER_ERROR; ++uint32_t COLOR_MSG_CONTACT; ++ ++uint32_t COLOR_MENU_TEXT; ++uint32_t COLOR_MENU_TEXT_SUBTEXT; ++uint32_t COLOR_MENU_TEXT_ACTIVE; ++ ++uint32_t COLOR_LIST_TEXT; ++uint32_t COLOR_LIST_TEXT_SUBTEXT; ++ ++uint32_t COLOR_AUX_EDGE_NORMAL; ++uint32_t COLOR_AUX_EDGE_HOVER; ++uint32_t COLOR_AUX_EDGE_ACTIVE; ++uint32_t COLOR_AUX_TEXT; ++uint32_t COLOR_AUX_ACTIVEOPTION_BKGRND; ++uint32_t COLOR_AUX_ACTIVEOPTION_TEXT; ++ ++uint32_t COLOR_GROUP_SELF; ++uint32_t COLOR_GROUP_PEER; ++uint32_t COLOR_GROUP_AUDIO; ++uint32_t COLOR_GROUP_MUTED; ++ ++uint32_t COLOR_SELECTION_BACKGROUND; ++uint32_t COLOR_SELECTION_TEXT; ++ ++uint32_t COLOR_EDGE_NORMAL; ++uint32_t COLOR_EDGE_ACTIVE; ++uint32_t COLOR_EDGE_HOVER; ++ ++uint32_t COLOR_ACTIVEOPTION_BKGRND; ++uint32_t COLOR_ACTIVEOPTION_TEXT; ++ ++uint32_t COLOR_STATUS_ONLINE; ++uint32_t COLOR_STATUS_AWAY; ++ ++uint32_t COLOR_STATUS_BUSY; ++uint32_t COLOR_BTN_SUCCESS_BKGRND; ++uint32_t COLOR_BTN_SUCCESS_TEXT; ++uint32_t COLOR_BTN_SUCCESS_BKGRND_HOVER; ++uint32_t COLOR_BTN_SUCCESS_TEXT_HOVER; ++ ++uint32_t COLOR_BTN_WARNING_BKGRND; ++uint32_t COLOR_BTN_WARNING_TEXT; ++uint32_t COLOR_BTN_WARNING_BKGRND_HOVER; ++uint32_t COLOR_BTN_WARNING_TEXT_HOVER; ++ ++uint32_t COLOR_BTN_DANGER_BACKGROUND; ++uint32_t COLOR_BTN_DANGER_TEXT; ++uint32_t COLOR_BTN_DANGER_BKGRND_HOVER; ++uint32_t COLOR_BTN_DANGER_TEXT_HOVER; ++ ++uint32_t COLOR_BTN_DISABLED_BKGRND; ++uint32_t COLOR_BTN_DISABLED_TEXT; ++uint32_t COLOR_BTN_DISABLED_BKGRND_HOVER; ++uint32_t COLOR_BTN_DISABLED_TRANSFER; ++ ++uint32_t COLOR_BTN_INPROGRESS_BKGRND; ++uint32_t COLOR_BTN_INPROGRESS_TEXT; ++uint32_t COLOR_BTN_DISABLED_FORGRND; ++uint32_t COLOR_BTN_INPROGRESS_FORGRND; ++ ++uint32_t status_color[4]; ++ ++/* theme_tables.h */ ++const char *COLOUR_NAME_TABLE[] = { "MAIN_BACKGROUND", ++ "ALT_BACKGROUND", ++ "MAIN_TEXT", ++ "MAIN_CHATTEXT", ++ "MAIN_SUBTEXT", ++ "MAIN_ACTIONTEXT", ++ "MAIN_QUOTETEXT", ++ "MAIN_REDTEXT", ++ "MAIN_URLTEXT", ++ "MAIN_HINTTEXT", ++ ++ "MENU_BACKGROUND", ++ "MENU_TEXT", ++ "MENU_SUBTEXT", ++ "MENU_BKGRND_HOVER", ++ "MENU_ACTIVE_BACKGROUND", ++ "MENU_ACTIVE_TEXT", ++ ++ "MSG_USER", ++ "MSG_USER_PEND", ++ "MSG_USER_ERROR", ++ "MSG_CONTACT", ++ ++ "LIST_BACKGROUND", ++ "LIST_BKGRND_HOVER", ++ "LIST_TEXT", ++ "LIST_SUBTEXT", ++ ++ "GROUP_SELF", ++ "GROUP_PEER", ++ "GROUP_AUDIO", ++ "GROUP_MUTED", ++ ++ "SELECTION_BACKGROUND", ++ "SELECTION_TEXT", ++ ++ "EDGE_NORMAL", ++ "EDGE_HOVER", ++ "EDGE_ACTIVE", ++ "ACTIVEOPTION_BACKGROUND", ++ "ACTIVEOPTION_TEXT", ++ ++ "AUX_BACKGROUND", ++ "AUX_EDGE_NORMAL", ++ "AUX_EDGE_HOVER", ++ "AUX_EDGE_ACTIVE", ++ "AUX_TEXT", ++ "AUX_ACTIVEOPTION_BACKGROUND", ++ "AUX_ACTIVEOPTION_TEXT", ++ ++ "STATUS_ONLINE", ++ "STATUS_AWAY", ++ "STATUS_BUSY", ++ ++ "BUTTON_SUCCESS_BACKGROUND", ++ "BUTTON_SUCCESS_TEXT", ++ "BUTTON_SUCCESS_BKGRND_HOVER", ++ "BUTTON_SUCCESS_TEXT_HOVER", ++ "BUTTON_WARNING_BACKGROUND", ++ "BUTTON_WARNING_TEXT", ++ "BUTTON_WARNING_BKGRND_HOVER", ++ "BUTTON_WARNING_TEXT_HOVER", ++ "BUTTON_DANGER_BACKGROUND", ++ "BUTTON_DANGER_TEXT", ++ "BUTTON_DANGER_BKGRND_HOVER", ++ "BUTTON_DANGER_TEXT_HOVER", ++ "BUTTON_DISABLED_BACKGROUND", ++ "TRANSFER_PROGRESS_OVERLAY_PAUSED", ++ "BUTTON_DISABLED_TEXT", ++ "BUTTON_DISABLED_TRANSFER", ++ "BUTTON_INPROGRESS_BACKGROUND", ++ "TRANSFER_PROGRESS_OVERLAY_ACTIVE", ++ "BUTTON_INPROGRESS_TEXT", ++ NULL }; ++uint32_t *COLOUR_POINTER_TABLE[] = { &COLOR_BKGRND_MAIN, ++ &COLOR_BKGRND_ALT, ++ &COLOR_MAIN_TEXT, ++ &COLOR_MAIN_TEXT_CHAT, ++ &COLOR_MAIN_TEXT_SUBTEXT, ++ &COLOR_MAIN_TEXT_ACTION, ++ &COLOR_MAIN_TEXT_QUOTE, ++ &COLOR_MAIN_TEXT_RED, ++ &COLOR_MAIN_TEXT_URL, ++ &COLOR_MAIN_TEXT_HINT, ++ ++ &COLOR_BKGRND_MENU, ++ &COLOR_MENU_TEXT, ++ &COLOR_MENU_TEXT_SUBTEXT, ++ &COLOR_BKGRND_MENU_HOVER, ++ &COLOR_BKGRND_MENU_ACTIVE, ++ &COLOR_MENU_TEXT_ACTIVE, ++ ++ &COLOR_MSG_USER, ++ &COLOR_MSG_USER_PEND, ++ &COLOR_MSG_USER_ERROR, ++ &COLOR_MSG_CONTACT, ++ ++ &COLOR_BKGRND_LIST, ++ &COLOR_BKGRND_LIST_HOVER, ++ &COLOR_LIST_TEXT, ++ &COLOR_LIST_TEXT_SUBTEXT, ++ ++ &COLOR_GROUP_SELF, ++ &COLOR_GROUP_PEER, ++ &COLOR_GROUP_AUDIO, ++ &COLOR_GROUP_MUTED, ++ ++ &COLOR_SELECTION_BACKGROUND, ++ &COLOR_SELECTION_TEXT, ++ ++ &COLOR_EDGE_NORMAL, ++ &COLOR_EDGE_HOVER, ++ &COLOR_EDGE_ACTIVE, ++ &COLOR_ACTIVEOPTION_BKGRND, ++ &COLOR_ACTIVEOPTION_TEXT, ++ ++ &COLOR_BKGRND_AUX, ++ &COLOR_AUX_EDGE_NORMAL, ++ &COLOR_AUX_EDGE_HOVER, ++ &COLOR_AUX_EDGE_ACTIVE, ++ &COLOR_AUX_TEXT, ++ &COLOR_AUX_ACTIVEOPTION_BKGRND, ++ &COLOR_AUX_ACTIVEOPTION_TEXT, ++ ++ &COLOR_STATUS_ONLINE, ++ &COLOR_STATUS_AWAY, ++ &COLOR_STATUS_BUSY, ++ ++ &COLOR_BTN_SUCCESS_BKGRND, ++ &COLOR_BTN_SUCCESS_TEXT, ++ &COLOR_BTN_SUCCESS_BKGRND_HOVER, ++ &COLOR_BTN_SUCCESS_TEXT_HOVER, ++ &COLOR_BTN_WARNING_BKGRND, ++ &COLOR_BTN_WARNING_TEXT, ++ &COLOR_BTN_WARNING_BKGRND_HOVER, ++ &COLOR_BTN_WARNING_TEXT_HOVER, ++ &COLOR_BTN_DANGER_BACKGROUND, ++ &COLOR_BTN_DANGER_TEXT, ++ &COLOR_BTN_DANGER_BKGRND_HOVER, ++ &COLOR_BTN_DANGER_TEXT_HOVER, ++ &COLOR_BTN_DISABLED_BKGRND, ++ &COLOR_BTN_DISABLED_FORGRND, ++ &COLOR_BTN_DISABLED_TEXT, ++ &COLOR_BTN_DISABLED_TRANSFER, ++ &COLOR_BTN_INPROGRESS_BKGRND, ++ &COLOR_BTN_INPROGRESS_FORGRND, ++ &COLOR_BTN_INPROGRESS_TEXT, ++ NULL }; ++ ++/* tox.h */ ++UTOX_TOX_THREAD_INIT tox_thread_init; ++ ++TOX_MSG tox_msg, audio_msg, toxav_msg; ++volatile bool tox_thread_msg, audio_thread_msg, video_thread_msg; ++ ++bool tox_connected; ++char proxy_address[256]; /* Magic Number inside toxcore */ ++ ++/* ui.h */ ++struct utox_mouse mouse; ++ ++uint8_t cursor; ++bool mdown; ++ ++char search_data[1024]; // TODO this is NOT where this belongs ++ ++double ui_scale; +diff --git a/src/messages.h b/src/messages.h +index b5b5a2aa..cc60e9cc 100644 +--- a/src/messages.h ++++ b/src/messages.h +@@ -7,7 +7,7 @@ + #include + #include + +-pthread_mutex_t messages_lock; ++extern pthread_mutex_t messages_lock; + + typedef struct native_image NATIVE_IMAGE; + +diff --git a/src/self.h b/src/self.h +index 9f8757c0..c931e514 100644 +--- a/src/self.h ++++ b/src/self.h +@@ -7,7 +7,7 @@ + typedef struct avatar AVATAR; + + #define TOX_ADDRESS_STR_SIZE TOX_ADDRESS_SIZE * 2 +-struct utox_self { ++extern struct utox_self { + uint8_t status; + char name[TOX_MAX_NAME_LENGTH]; + char statusmsg[TOX_MAX_STATUS_MESSAGE_LENGTH]; +diff --git a/src/theme.h b/src/theme.h +index 50332700..e1d9a59f 100644 +--- a/src/theme.h ++++ b/src/theme.h +@@ -16,90 +16,90 @@ typedef enum { + } THEME; + + /* Colors for drawing the backgrounds */ +-uint32_t COLOR_BKGRND_MAIN; +-uint32_t COLOR_BKGRND_ALT; +-uint32_t COLOR_BKGRND_AUX; +-uint32_t COLOR_BKGRND_MENU; +-uint32_t COLOR_BKGRND_MENU_HOVER; +-uint32_t COLOR_BKGRND_MENU_ACTIVE; +-uint32_t COLOR_BKGRND_LIST; +-uint32_t COLOR_BKGRND_LIST_HOVER; +- +-uint32_t COLOR_MAIN_TEXT; +-uint32_t COLOR_MAIN_TEXT_CHAT; +-uint32_t COLOR_MAIN_TEXT_SUBTEXT; +-uint32_t COLOR_MAIN_TEXT_ACTION; +-uint32_t COLOR_MAIN_TEXT_QUOTE; +-uint32_t COLOR_MAIN_TEXT_RED; +-uint32_t COLOR_MAIN_TEXT_URL; +-uint32_t COLOR_MAIN_TEXT_HINT; +- +-uint32_t COLOR_MSG_USER; +-uint32_t COLOR_MSG_USER_PEND; +-uint32_t COLOR_MSG_USER_ERROR; +-uint32_t COLOR_MSG_CONTACT; +- +-uint32_t COLOR_MENU_TEXT; +-uint32_t COLOR_MENU_TEXT_SUBTEXT; +-uint32_t COLOR_MENU_TEXT_ACTIVE; +- +-uint32_t COLOR_LIST_TEXT; +-uint32_t COLOR_LIST_TEXT_SUBTEXT; +- +-uint32_t COLOR_AUX_EDGE_NORMAL; +-uint32_t COLOR_AUX_EDGE_HOVER; +-uint32_t COLOR_AUX_EDGE_ACTIVE; +-uint32_t COLOR_AUX_TEXT; +-uint32_t COLOR_AUX_ACTIVEOPTION_BKGRND; +-uint32_t COLOR_AUX_ACTIVEOPTION_TEXT; +- +-uint32_t COLOR_GROUP_SELF; +-uint32_t COLOR_GROUP_PEER; +-uint32_t COLOR_GROUP_AUDIO; +-uint32_t COLOR_GROUP_MUTED; +- +-uint32_t COLOR_SELECTION_BACKGROUND; +-uint32_t COLOR_SELECTION_TEXT; +- +-uint32_t COLOR_EDGE_NORMAL; +-uint32_t COLOR_EDGE_ACTIVE; +-uint32_t COLOR_EDGE_HOVER; +- +-uint32_t COLOR_ACTIVEOPTION_BKGRND; +-uint32_t COLOR_ACTIVEOPTION_TEXT; +- +-uint32_t COLOR_STATUS_ONLINE; +-uint32_t COLOR_STATUS_AWAY; +- +-uint32_t COLOR_STATUS_BUSY; +-uint32_t COLOR_BTN_SUCCESS_BKGRND; +-uint32_t COLOR_BTN_SUCCESS_TEXT; +-uint32_t COLOR_BTN_SUCCESS_BKGRND_HOVER; +-uint32_t COLOR_BTN_SUCCESS_TEXT_HOVER; +- +-uint32_t COLOR_BTN_WARNING_BKGRND; +-uint32_t COLOR_BTN_WARNING_TEXT; +-uint32_t COLOR_BTN_WARNING_BKGRND_HOVER; +-uint32_t COLOR_BTN_WARNING_TEXT_HOVER; +- +-uint32_t COLOR_BTN_DANGER_BACKGROUND; +-uint32_t COLOR_BTN_DANGER_TEXT; +-uint32_t COLOR_BTN_DANGER_BKGRND_HOVER; +-uint32_t COLOR_BTN_DANGER_TEXT_HOVER; +- +-uint32_t COLOR_BTN_DISABLED_BKGRND; +-uint32_t COLOR_BTN_DISABLED_TEXT; +-uint32_t COLOR_BTN_DISABLED_BKGRND_HOVER; +-uint32_t COLOR_BTN_DISABLED_TRANSFER; +- +-uint32_t COLOR_BTN_INPROGRESS_BKGRND; +-uint32_t COLOR_BTN_INPROGRESS_TEXT; +-uint32_t COLOR_BTN_DISABLED_FORGRND; +-uint32_t COLOR_BTN_INPROGRESS_FORGRND; ++extern uint32_t COLOR_BKGRND_MAIN; ++extern uint32_t COLOR_BKGRND_ALT; ++extern uint32_t COLOR_BKGRND_AUX; ++extern uint32_t COLOR_BKGRND_MENU; ++extern uint32_t COLOR_BKGRND_MENU_HOVER; ++extern uint32_t COLOR_BKGRND_MENU_ACTIVE; ++extern uint32_t COLOR_BKGRND_LIST; ++extern uint32_t COLOR_BKGRND_LIST_HOVER; ++ ++extern uint32_t COLOR_MAIN_TEXT; ++extern uint32_t COLOR_MAIN_TEXT_CHAT; ++extern uint32_t COLOR_MAIN_TEXT_SUBTEXT; ++extern uint32_t COLOR_MAIN_TEXT_ACTION; ++extern uint32_t COLOR_MAIN_TEXT_QUOTE; ++extern uint32_t COLOR_MAIN_TEXT_RED; ++extern uint32_t COLOR_MAIN_TEXT_URL; ++extern uint32_t COLOR_MAIN_TEXT_HINT; ++ ++extern uint32_t COLOR_MSG_USER; ++extern uint32_t COLOR_MSG_USER_PEND; ++extern uint32_t COLOR_MSG_USER_ERROR; ++extern uint32_t COLOR_MSG_CONTACT; ++ ++extern uint32_t COLOR_MENU_TEXT; ++extern uint32_t COLOR_MENU_TEXT_SUBTEXT; ++extern uint32_t COLOR_MENU_TEXT_ACTIVE; ++ ++extern uint32_t COLOR_LIST_TEXT; ++extern uint32_t COLOR_LIST_TEXT_SUBTEXT; ++ ++extern uint32_t COLOR_AUX_EDGE_NORMAL; ++extern uint32_t COLOR_AUX_EDGE_HOVER; ++extern uint32_t COLOR_AUX_EDGE_ACTIVE; ++extern uint32_t COLOR_AUX_TEXT; ++extern uint32_t COLOR_AUX_ACTIVEOPTION_BKGRND; ++extern uint32_t COLOR_AUX_ACTIVEOPTION_TEXT; ++ ++extern uint32_t COLOR_GROUP_SELF; ++extern uint32_t COLOR_GROUP_PEER; ++extern uint32_t COLOR_GROUP_AUDIO; ++extern uint32_t COLOR_GROUP_MUTED; ++ ++extern uint32_t COLOR_SELECTION_BACKGROUND; ++extern uint32_t COLOR_SELECTION_TEXT; ++ ++extern uint32_t COLOR_EDGE_NORMAL; ++extern uint32_t COLOR_EDGE_ACTIVE; ++extern uint32_t COLOR_EDGE_HOVER; ++ ++extern uint32_t COLOR_ACTIVEOPTION_BKGRND; ++extern uint32_t COLOR_ACTIVEOPTION_TEXT; ++ ++extern uint32_t COLOR_STATUS_ONLINE; ++extern uint32_t COLOR_STATUS_AWAY; ++ ++extern uint32_t COLOR_STATUS_BUSY; ++extern uint32_t COLOR_BTN_SUCCESS_BKGRND; ++extern uint32_t COLOR_BTN_SUCCESS_TEXT; ++extern uint32_t COLOR_BTN_SUCCESS_BKGRND_HOVER; ++extern uint32_t COLOR_BTN_SUCCESS_TEXT_HOVER; ++ ++extern uint32_t COLOR_BTN_WARNING_BKGRND; ++extern uint32_t COLOR_BTN_WARNING_TEXT; ++extern uint32_t COLOR_BTN_WARNING_BKGRND_HOVER; ++extern uint32_t COLOR_BTN_WARNING_TEXT_HOVER; ++ ++extern uint32_t COLOR_BTN_DANGER_BACKGROUND; ++extern uint32_t COLOR_BTN_DANGER_TEXT; ++extern uint32_t COLOR_BTN_DANGER_BKGRND_HOVER; ++extern uint32_t COLOR_BTN_DANGER_TEXT_HOVER; ++ ++extern uint32_t COLOR_BTN_DISABLED_BKGRND; ++extern uint32_t COLOR_BTN_DISABLED_TEXT; ++extern uint32_t COLOR_BTN_DISABLED_BKGRND_HOVER; ++extern uint32_t COLOR_BTN_DISABLED_TRANSFER; ++ ++extern uint32_t COLOR_BTN_INPROGRESS_BKGRND; ++extern uint32_t COLOR_BTN_INPROGRESS_TEXT; ++extern uint32_t COLOR_BTN_DISABLED_FORGRND; ++extern uint32_t COLOR_BTN_INPROGRESS_FORGRND; + + void theme_load(const THEME loadtheme); + +-uint32_t status_color[4]; ++extern uint32_t status_color[4]; + + extern const char *COLOUR_NAME_TABLE[]; + extern uint32_t *COLOUR_POINTER_TABLE[]; +diff --git a/src/theme_tables.h b/src/theme_tables.h +index b46bf607..54d82e0e 100644 +--- a/src/theme_tables.h ++++ b/src/theme_tables.h +@@ -3,153 +3,7 @@ + + #include "theme.h" + +-const char *COLOUR_NAME_TABLE[] = { "MAIN_BACKGROUND", +- "ALT_BACKGROUND", +- "MAIN_TEXT", +- "MAIN_CHATTEXT", +- "MAIN_SUBTEXT", +- "MAIN_ACTIONTEXT", +- "MAIN_QUOTETEXT", +- "MAIN_REDTEXT", +- "MAIN_URLTEXT", +- "MAIN_HINTTEXT", ++extern const char *COLOUR_NAME_TABLE[]; ++extern uint32_t *COLOUR_POINTER_TABLE[]; + +- "MENU_BACKGROUND", +- "MENU_TEXT", +- "MENU_SUBTEXT", +- "MENU_BKGRND_HOVER", +- "MENU_ACTIVE_BACKGROUND", +- "MENU_ACTIVE_TEXT", +- +- "MSG_USER", +- "MSG_USER_PEND", +- "MSG_USER_ERROR", +- "MSG_CONTACT", +- +- "LIST_BACKGROUND", +- "LIST_BKGRND_HOVER", +- "LIST_TEXT", +- "LIST_SUBTEXT", +- +- "GROUP_SELF", +- "GROUP_PEER", +- "GROUP_AUDIO", +- "GROUP_MUTED", +- +- "SELECTION_BACKGROUND", +- "SELECTION_TEXT", +- +- "EDGE_NORMAL", +- "EDGE_HOVER", +- "EDGE_ACTIVE", +- "ACTIVEOPTION_BACKGROUND", +- "ACTIVEOPTION_TEXT", +- +- "AUX_BACKGROUND", +- "AUX_EDGE_NORMAL", +- "AUX_EDGE_HOVER", +- "AUX_EDGE_ACTIVE", +- "AUX_TEXT", +- "AUX_ACTIVEOPTION_BACKGROUND", +- "AUX_ACTIVEOPTION_TEXT", +- +- "STATUS_ONLINE", +- "STATUS_AWAY", +- "STATUS_BUSY", +- +- "BUTTON_SUCCESS_BACKGROUND", +- "BUTTON_SUCCESS_TEXT", +- "BUTTON_SUCCESS_BKGRND_HOVER", +- "BUTTON_SUCCESS_TEXT_HOVER", +- "BUTTON_WARNING_BACKGROUND", +- "BUTTON_WARNING_TEXT", +- "BUTTON_WARNING_BKGRND_HOVER", +- "BUTTON_WARNING_TEXT_HOVER", +- "BUTTON_DANGER_BACKGROUND", +- "BUTTON_DANGER_TEXT", +- "BUTTON_DANGER_BKGRND_HOVER", +- "BUTTON_DANGER_TEXT_HOVER", +- "BUTTON_DISABLED_BACKGROUND", +- "TRANSFER_PROGRESS_OVERLAY_PAUSED", +- "BUTTON_DISABLED_TEXT", +- "BUTTON_DISABLED_TRANSFER", +- "BUTTON_INPROGRESS_BACKGROUND", +- "TRANSFER_PROGRESS_OVERLAY_ACTIVE", +- "BUTTON_INPROGRESS_TEXT", +- NULL }; +-uint32_t *COLOUR_POINTER_TABLE[] = { &COLOR_BKGRND_MAIN, +- &COLOR_BKGRND_ALT, +- &COLOR_MAIN_TEXT, +- &COLOR_MAIN_TEXT_CHAT, +- &COLOR_MAIN_TEXT_SUBTEXT, +- &COLOR_MAIN_TEXT_ACTION, +- &COLOR_MAIN_TEXT_QUOTE, +- &COLOR_MAIN_TEXT_RED, +- &COLOR_MAIN_TEXT_URL, +- &COLOR_MAIN_TEXT_HINT, +- +- &COLOR_BKGRND_MENU, +- &COLOR_MENU_TEXT, +- &COLOR_MENU_TEXT_SUBTEXT, +- &COLOR_BKGRND_MENU_HOVER, +- &COLOR_BKGRND_MENU_ACTIVE, +- &COLOR_MENU_TEXT_ACTIVE, +- +- &COLOR_MSG_USER, +- &COLOR_MSG_USER_PEND, +- &COLOR_MSG_USER_ERROR, +- &COLOR_MSG_CONTACT, +- +- &COLOR_BKGRND_LIST, +- &COLOR_BKGRND_LIST_HOVER, +- &COLOR_LIST_TEXT, +- &COLOR_LIST_TEXT_SUBTEXT, +- +- &COLOR_GROUP_SELF, +- &COLOR_GROUP_PEER, +- &COLOR_GROUP_AUDIO, +- &COLOR_GROUP_MUTED, +- +- &COLOR_SELECTION_BACKGROUND, +- &COLOR_SELECTION_TEXT, +- +- &COLOR_EDGE_NORMAL, +- &COLOR_EDGE_HOVER, +- &COLOR_EDGE_ACTIVE, +- &COLOR_ACTIVEOPTION_BKGRND, +- &COLOR_ACTIVEOPTION_TEXT, +- +- &COLOR_BKGRND_AUX, +- &COLOR_AUX_EDGE_NORMAL, +- &COLOR_AUX_EDGE_HOVER, +- &COLOR_AUX_EDGE_ACTIVE, +- &COLOR_AUX_TEXT, +- &COLOR_AUX_ACTIVEOPTION_BKGRND, +- &COLOR_AUX_ACTIVEOPTION_TEXT, +- +- &COLOR_STATUS_ONLINE, +- &COLOR_STATUS_AWAY, +- &COLOR_STATUS_BUSY, +- +- &COLOR_BTN_SUCCESS_BKGRND, +- &COLOR_BTN_SUCCESS_TEXT, +- &COLOR_BTN_SUCCESS_BKGRND_HOVER, +- &COLOR_BTN_SUCCESS_TEXT_HOVER, +- &COLOR_BTN_WARNING_BKGRND, +- &COLOR_BTN_WARNING_TEXT, +- &COLOR_BTN_WARNING_BKGRND_HOVER, +- &COLOR_BTN_WARNING_TEXT_HOVER, +- &COLOR_BTN_DANGER_BACKGROUND, +- &COLOR_BTN_DANGER_TEXT, +- &COLOR_BTN_DANGER_BKGRND_HOVER, +- &COLOR_BTN_DANGER_TEXT_HOVER, +- &COLOR_BTN_DISABLED_BKGRND, +- &COLOR_BTN_DISABLED_FORGRND, +- &COLOR_BTN_DISABLED_TEXT, +- &COLOR_BTN_DISABLED_TRANSFER, +- &COLOR_BTN_INPROGRESS_BKGRND, +- &COLOR_BTN_INPROGRESS_FORGRND, +- &COLOR_BTN_INPROGRESS_TEXT, +- NULL }; +- +-#endif +\ No newline at end of file ++#endif +diff --git a/src/tox.h b/src/tox.h +index 6a86f9c1..dd97a068 100644 +--- a/src/tox.h ++++ b/src/tox.h +@@ -117,14 +117,14 @@ typedef enum { + UTOX_TOX_THREAD_INIT_ERROR = 2, + } UTOX_TOX_THREAD_INIT; + +-UTOX_TOX_THREAD_INIT tox_thread_init; ++extern UTOX_TOX_THREAD_INIT tox_thread_init; + + /* Inter-thread communication vars. */ +-TOX_MSG tox_msg, audio_msg, toxav_msg; +-volatile bool tox_thread_msg, audio_thread_msg, video_thread_msg; ++extern TOX_MSG tox_msg, audio_msg, toxav_msg; ++extern volatile bool tox_thread_msg, audio_thread_msg, video_thread_msg; + +-bool tox_connected; +-char proxy_address[256]; /* Magic Number inside toxcore */ ++extern bool tox_connected; ++extern char proxy_address[256]; /* Magic Number inside toxcore */ + + void tox_after_load(Tox *tox); + +diff --git a/src/ui.h b/src/ui.h +index 09c4708a..d8ec3ab0 100644 +--- a/src/ui.h ++++ b/src/ui.h +@@ -49,12 +49,12 @@ enum { + CURSOR_ZOOM_OUT, + }; + +-struct utox_mouse { ++extern struct utox_mouse { + int x, y; + } mouse; + +-uint8_t cursor; +-bool mdown; ++extern uint8_t cursor; ++extern bool mdown; + + enum { + FONT_TEXT, +@@ -109,9 +109,9 @@ bool panel_mwheel(PANEL *p, int x, int y, int width, int height, double d, bool + bool panel_mup(PANEL *p); + bool panel_mleave(PANEL *p); + +-char search_data[1024]; // TODO this is NOT where this belongs ++extern char search_data[1024]; // TODO this is NOT where this belongs + +-double ui_scale; ++extern double ui_scale; + + #define SCALE(x) ((int)(((double)x) * (ui_scale / 10.0))) + #define SCALE_DIV(x) (((int)(((double)x) * (ui_scale / 10.0))) ?: 1) +diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt +index 26a448f6..35490732 100644 +--- a/src/ui/CMakeLists.txt ++++ b/src/ui/CMakeLists.txt +@@ -9,6 +9,7 @@ add_library(utoxUI STATIC + dropdown.h + edit.c + edit.h ++ globals.c + scrollable.c + scrollable.h + svg.c +diff --git a/src/ui/draw.h b/src/ui/draw.h +index fb762404..869f86ac 100644 +--- a/src/ui/draw.h ++++ b/src/ui/draw.h +@@ -3,7 +3,7 @@ + + #include + +-int font_small_lineheight, font_msg_lineheight; ++extern int font_small_lineheight, font_msg_lineheight; + + void drawtext(int x, int y, const char *str, uint16_t length); + +diff --git a/src/ui/globals.c b/src/ui/globals.c +new file mode 100644 +index 00000000..3cf021d3 +--- /dev/null ++++ b/src/ui/globals.c +@@ -0,0 +1,6 @@ ++#include "draw.h" ++ ++/* Globals */ ++ ++/* draw.h */ ++int font_small_lineheight, font_msg_lineheight; +diff --git a/src/xlib/CMakeLists.txt b/src/xlib/CMakeLists.txt +index 2cf3ece3..0145a489 100644 +--- a/src/xlib/CMakeLists.txt ++++ b/src/xlib/CMakeLists.txt +@@ -31,6 +31,7 @@ add_library(utoxNATIVE STATIC + filesys.c + freetype.c + freetype.h ++ globals.c + gtk.c + keysym2ucs.h + main.c +diff --git a/src/xlib/freetype.h b/src/xlib/freetype.h +index fbc0f7d7..e0182c7b 100644 +--- a/src/xlib/freetype.h ++++ b/src/xlib/freetype.h +@@ -31,12 +31,12 @@ typedef struct { + GLYPH * glyphs[128]; + } FONT; + +-FT_Library ftlib; +-FONT font[16], *sfont; +-FcCharSet *charset; +-FcFontSet *fs; ++extern FT_Library ftlib; ++extern FONT font[16], *sfont; ++extern FcCharSet *charset; ++extern FcFontSet *fs; + +-bool ft_vert, ft_swap_blue_red; ++extern bool ft_vert, ft_swap_blue_red; + + Picture loadglyphpic(uint8_t *data, int width, int height, int pitch, bool no_subpixel, bool vertical, + bool swap_blue_red); +diff --git a/src/xlib/globals.c b/src/xlib/globals.c +new file mode 100644 +index 00000000..578a3f1d +--- /dev/null ++++ b/src/xlib/globals.c +@@ -0,0 +1,57 @@ ++#include "freetype.h" ++#include "main.h" ++#include "window.h" ++ ++/* Globals */ ++ ++/* freetype.h */ ++FT_Library ftlib; ++FONT font[16], *sfont; ++FcCharSet *charset; ++FcFontSet *fs; ++ ++bool ft_vert, ft_swap_blue_red; ++ ++/* main.h */ ++Atom wm_protocols, wm_delete_window; ++ ++Atom XA_CLIPBOARD, XA_NET_NAME, XA_UTF8_STRING, targets, XA_INCR; ++Atom XdndAware, XdndEnter, XdndLeave, XdndPosition, XdndStatus, XdndDrop, XdndSelection, XdndDATA, XdndActionCopy; ++Atom XA_URI_LIST, XA_PNG_IMG; ++Atom XRedraw; ++ ++Picture bitmap[BM_ENDMARKER]; ++Cursor cursors[8]; ++ ++uint8_t pointergrab; ++ ++bool _redraw; ++ ++XImage *screen_image; ++ ++void *libgtk; ++ ++struct utox_clipboard clipboard; ++ ++struct utox_primary primary; ++ ++struct utox_pastebuf pastebuf; ++ ++ ++/* window.h */ ++Display *display; ++Screen *default_screen; ++int def_screen_num; ++Window root_window; ++Visual *default_visual; ++ ++UTOX_WINDOW *curr; ++ ++int default_depth; ++ ++struct native_window main_window; ++ ++struct native_window popup_window; ++struct native_window scr_grab_window; ++ ++struct native_window tray_pop; +diff --git a/src/xlib/main.h b/src/xlib/main.h +index f3573544..70f7e74d 100644 +--- a/src/xlib/main.h ++++ b/src/xlib/main.h +@@ -33,39 +33,39 @@ struct native_image { + XID alpha; + }; + +-Atom wm_protocols, wm_delete_window; ++extern Atom wm_protocols, wm_delete_window; + +-Atom XA_CLIPBOARD, XA_NET_NAME, XA_UTF8_STRING, targets, XA_INCR; +-Atom XdndAware, XdndEnter, XdndLeave, XdndPosition, XdndStatus, XdndDrop, XdndSelection, XdndDATA, XdndActionCopy; +-Atom XA_URI_LIST, XA_PNG_IMG; +-Atom XRedraw; ++extern Atom XA_CLIPBOARD, XA_NET_NAME, XA_UTF8_STRING, targets, XA_INCR; ++extern Atom XdndAware, XdndEnter, XdndLeave, XdndPosition, XdndStatus, XdndDrop, XdndSelection, XdndDATA, XdndActionCopy; ++extern Atom XA_URI_LIST, XA_PNG_IMG; ++extern Atom XRedraw; + +-Picture bitmap[BM_ENDMARKER]; +-Cursor cursors[8]; ++extern Picture bitmap[BM_ENDMARKER]; ++extern Cursor cursors[8]; + + /* Screen grab vars */ +-uint8_t pointergrab; ++extern uint8_t pointergrab; + +-bool _redraw; ++extern bool _redraw; + +-XImage *screen_image; ++extern XImage *screen_image; + + extern int utox_v4l_fd; + + /* dynamiclly load libgtk */ +-void *libgtk; ++extern void *libgtk; + +-struct { ++extern struct utox_clipboard { + int len; + char data[UINT16_MAX]; // TODO: De-hardcode this value. + } clipboard; + +-struct { ++extern struct utox_primary { + int len; + char data[UINT16_MAX]; // TODO: De-hardcode this value. + } primary; + +-struct { ++extern struct utox_pastebuf { + int len, left; + Atom type; + char *data; +diff --git a/src/xlib/window.h b/src/xlib/window.h +index 6ae73353..fcd4b60f 100644 +--- a/src/xlib/window.h ++++ b/src/xlib/window.h +@@ -16,17 +16,17 @@ + #include + #include + +-Display *display; +-Screen *default_screen; +-int def_screen_num; +-Window root_window; +-Visual *default_visual; ++extern Display *display; ++extern Screen *default_screen; ++extern int def_screen_num; ++extern Window root_window; ++extern Visual *default_visual; + + + // TODO move +-UTOX_WINDOW *curr; ++extern UTOX_WINDOW *curr; + +-int default_depth; ++extern int default_depth; + + struct native_window { + struct utox_window _; // Global struct shared across all platforms +@@ -45,12 +45,12 @@ struct native_window { + + }; + +-struct native_window main_window; ++extern struct native_window main_window; + +-struct native_window popup_window; +-struct native_window scr_grab_window; ++extern struct native_window popup_window; ++extern struct native_window scr_grab_window; + +-struct native_window tray_pop; ++extern struct native_window tray_pop; + + void window_set_focus(UTOX_WINDOW *win); + +-- +2.24.1 + diff --git a/utox.spec b/utox.spec index 9e51313..bb1952a 100644 --- a/utox.spec +++ b/utox.spec @@ -1,6 +1,6 @@ Name: utox Version: 0.17.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The lightweight Tox client License: MIT or GPLv3+ @@ -13,6 +13,8 @@ Source1: %{name}.appdata.xml # git submodule init ; git submodule update # tar -zcvf third-party.tar.gz third-party/ Source2: third-party.tar.gz +# https://github.com/uTox/uTox/issues/1412 +Patch0: 0001-Mark-global-variable-as-extern.patch BuildRequires: gcc-c++ BuildRequires: cmake @@ -37,7 +39,7 @@ Requires: hicolor-icon-theme %summary %prep -%autosetup -n uTox-%{version} +%autosetup -p 1 -n uTox-%{version} %autosetup -N -T -D -a 2 -n uTox-%{version} %build @@ -68,6 +70,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %{_mandir}/man1/%{name}.1* %changelog +* Thu Jan 23 01:58:44 CET 2020 Robert-André Mauchin - 0.17.1-2 +- Fix compatibility with GCC 10 + * Wed Sep 25 16:55:23 CEST 2019 Robert-André Mauchin - 0.17.1-1 - Release 0.17.1 From c544ec5984d122bb17264f0fb65c39d0330adec6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 02:50:28 +0000 Subject: [PATCH 06/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- utox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/utox.spec b/utox.spec index bb1952a..7111014 100644 --- a/utox.spec +++ b/utox.spec @@ -1,6 +1,6 @@ Name: utox Version: 0.17.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The lightweight Tox client License: MIT or GPLv3+ @@ -70,6 +70,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %{_mandir}/man1/%{name}.1* %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 0.17.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jan 23 01:58:44 CET 2020 Robert-André Mauchin - 0.17.1-2 - Fix compatibility with GCC 10 From ffb6aa1b2c77b0a9f829d4ea6aef7b2eecd97a17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Fri, 19 Jun 2020 17:28:01 +0200 Subject: [PATCH 07/34] Update to 0.17.2 (#1823346) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- .gitignore | 1 + 0001-Mark-global-variable-as-extern.patch | 1042 --------------------- sources | 4 +- utox.spec | 11 +- 4 files changed, 9 insertions(+), 1049 deletions(-) delete mode 100644 0001-Mark-global-variable-as-extern.patch diff --git a/.gitignore b/.gitignore index d25dd7b..446670f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /third-party.tar.gz /utox-0.17.0.tar.gz /utox-0.17.1.tar.gz +/utox-0.17.2.tar.gz diff --git a/0001-Mark-global-variable-as-extern.patch b/0001-Mark-global-variable-as-extern.patch deleted file mode 100644 index 0687b2e..0000000 --- a/0001-Mark-global-variable-as-extern.patch +++ /dev/null @@ -1,1042 +0,0 @@ -From 5538d4335447a613913a92f3525492022526c061 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= -Date: Thu, 23 Jan 2020 17:38:21 +0100 -Subject: [PATCH] Mark global variable as extern -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -GCC now defaults to -fno-common. As a result, global variable accesses -are more efficient on various targets. In C, global variables with -multiple tentative definitions now result in linker errors. - -Fix #1412 - -Signed-off-by: Robert-André Mauchin ---- - CMakeLists.txt | 1 + - src/av/CMakeLists.txt | 1 + - src/av/globals.c | 6 + - src/av/video.h | 2 +- - src/friend.h | 2 +- - src/globals.c | 271 ++++++++++++++++++++++++++++++++++++++++ - src/messages.h | 2 +- - src/self.h | 2 +- - src/theme.h | 162 ++++++++++++------------ - src/theme_tables.h | 152 +--------------------- - src/tox.h | 10 +- - src/ui.h | 10 +- - src/ui/CMakeLists.txt | 1 + - src/ui/draw.h | 2 +- - src/ui/globals.c | 6 + - src/xlib/CMakeLists.txt | 1 + - src/xlib/freetype.h | 10 +- - src/xlib/globals.c | 57 +++++++++ - src/xlib/main.h | 28 ++--- - src/xlib/window.h | 22 ++-- - 20 files changed, 473 insertions(+), 275 deletions(-) - create mode 100644 src/av/globals.c - create mode 100644 src/globals.c - create mode 100644 src/ui/globals.c - create mode 100644 src/xlib/globals.c - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ac154ce9..bf537ea0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -348,6 +348,7 @@ add_executable(utox ${GUI_TYPE} - src/filesys.c - src/flist.c - src/friend.c -+ src/globals.c - src/groups.c - src/inline_video.c - src/logging.c -diff --git a/src/av/CMakeLists.txt b/src/av/CMakeLists.txt -index ce49a97a..386d941a 100644 ---- a/src/av/CMakeLists.txt -+++ b/src/av/CMakeLists.txt -@@ -3,6 +3,7 @@ project(utoxAV LANGUAGES C) - add_library(utoxAV STATIC - utox_av.c - audio.c -+ globals.c - video.c - filter_audio.c - ) -diff --git a/src/av/globals.c b/src/av/globals.c -new file mode 100644 -index 00000000..6972af93 ---- /dev/null -+++ b/src/av/globals.c -@@ -0,0 +1,6 @@ -+#include "video.h" -+ -+/* Globals */ -+ -+/* video.h */ -+uint16_t video_width, video_height, max_video_width, max_video_height; -diff --git a/src/av/video.h b/src/av/video.h -index 2c2df541..c193caee 100644 ---- a/src/av/video.h -+++ b/src/av/video.h -@@ -5,7 +5,7 @@ - #include - #include - --uint16_t video_width, video_height, max_video_width, max_video_height; -+extern uint16_t video_width, video_height, max_video_width, max_video_height; - - extern bool utox_video_thread_init; - -diff --git a/src/friend.h b/src/friend.h -index d77276f9..823a555e 100644 ---- a/src/friend.h -+++ b/src/friend.h -@@ -112,7 +112,7 @@ typedef struct utox_friend_request { - } FREQUEST; - - // add friend page --uint8_t addfriend_status; -+extern uint8_t addfriend_status; - - #define UTOX_FRIEND_NAME(f) ((f->alias) ? f->alias : f->name) - #define UTOX_FRIEND_NAME_LENGTH(f) ((f->alias) ? f->alias_length : f->name_length) -diff --git a/src/globals.c b/src/globals.c -new file mode 100644 -index 00000000..4395c1ef ---- /dev/null -+++ b/src/globals.c -@@ -0,0 +1,271 @@ -+#include "friend.h" -+#include "messages.h" -+#include "self.h" -+#include "theme.h" -+#include "theme_tables.h" -+#include "tox.h" -+#include "ui.h" -+ -+/* Globals */ -+ -+/* friend.h */ -+uint8_t addfriend_status; -+ -+/* messages.h */ -+pthread_mutex_t messages_lock; -+ -+/* self.h */ -+struct utox_self self; -+ -+/* theme.h */ -+uint32_t COLOR_BKGRND_MAIN; -+uint32_t COLOR_BKGRND_ALT; -+uint32_t COLOR_BKGRND_AUX; -+uint32_t COLOR_BKGRND_MENU; -+uint32_t COLOR_BKGRND_MENU_HOVER; -+uint32_t COLOR_BKGRND_MENU_ACTIVE; -+uint32_t COLOR_BKGRND_LIST; -+uint32_t COLOR_BKGRND_LIST_HOVER; -+ -+uint32_t COLOR_MAIN_TEXT; -+uint32_t COLOR_MAIN_TEXT_CHAT; -+uint32_t COLOR_MAIN_TEXT_SUBTEXT; -+uint32_t COLOR_MAIN_TEXT_ACTION; -+uint32_t COLOR_MAIN_TEXT_QUOTE; -+uint32_t COLOR_MAIN_TEXT_RED; -+uint32_t COLOR_MAIN_TEXT_URL; -+uint32_t COLOR_MAIN_TEXT_HINT; -+ -+uint32_t COLOR_MSG_USER; -+uint32_t COLOR_MSG_USER_PEND; -+uint32_t COLOR_MSG_USER_ERROR; -+uint32_t COLOR_MSG_CONTACT; -+ -+uint32_t COLOR_MENU_TEXT; -+uint32_t COLOR_MENU_TEXT_SUBTEXT; -+uint32_t COLOR_MENU_TEXT_ACTIVE; -+ -+uint32_t COLOR_LIST_TEXT; -+uint32_t COLOR_LIST_TEXT_SUBTEXT; -+ -+uint32_t COLOR_AUX_EDGE_NORMAL; -+uint32_t COLOR_AUX_EDGE_HOVER; -+uint32_t COLOR_AUX_EDGE_ACTIVE; -+uint32_t COLOR_AUX_TEXT; -+uint32_t COLOR_AUX_ACTIVEOPTION_BKGRND; -+uint32_t COLOR_AUX_ACTIVEOPTION_TEXT; -+ -+uint32_t COLOR_GROUP_SELF; -+uint32_t COLOR_GROUP_PEER; -+uint32_t COLOR_GROUP_AUDIO; -+uint32_t COLOR_GROUP_MUTED; -+ -+uint32_t COLOR_SELECTION_BACKGROUND; -+uint32_t COLOR_SELECTION_TEXT; -+ -+uint32_t COLOR_EDGE_NORMAL; -+uint32_t COLOR_EDGE_ACTIVE; -+uint32_t COLOR_EDGE_HOVER; -+ -+uint32_t COLOR_ACTIVEOPTION_BKGRND; -+uint32_t COLOR_ACTIVEOPTION_TEXT; -+ -+uint32_t COLOR_STATUS_ONLINE; -+uint32_t COLOR_STATUS_AWAY; -+ -+uint32_t COLOR_STATUS_BUSY; -+uint32_t COLOR_BTN_SUCCESS_BKGRND; -+uint32_t COLOR_BTN_SUCCESS_TEXT; -+uint32_t COLOR_BTN_SUCCESS_BKGRND_HOVER; -+uint32_t COLOR_BTN_SUCCESS_TEXT_HOVER; -+ -+uint32_t COLOR_BTN_WARNING_BKGRND; -+uint32_t COLOR_BTN_WARNING_TEXT; -+uint32_t COLOR_BTN_WARNING_BKGRND_HOVER; -+uint32_t COLOR_BTN_WARNING_TEXT_HOVER; -+ -+uint32_t COLOR_BTN_DANGER_BACKGROUND; -+uint32_t COLOR_BTN_DANGER_TEXT; -+uint32_t COLOR_BTN_DANGER_BKGRND_HOVER; -+uint32_t COLOR_BTN_DANGER_TEXT_HOVER; -+ -+uint32_t COLOR_BTN_DISABLED_BKGRND; -+uint32_t COLOR_BTN_DISABLED_TEXT; -+uint32_t COLOR_BTN_DISABLED_BKGRND_HOVER; -+uint32_t COLOR_BTN_DISABLED_TRANSFER; -+ -+uint32_t COLOR_BTN_INPROGRESS_BKGRND; -+uint32_t COLOR_BTN_INPROGRESS_TEXT; -+uint32_t COLOR_BTN_DISABLED_FORGRND; -+uint32_t COLOR_BTN_INPROGRESS_FORGRND; -+ -+uint32_t status_color[4]; -+ -+/* theme_tables.h */ -+const char *COLOUR_NAME_TABLE[] = { "MAIN_BACKGROUND", -+ "ALT_BACKGROUND", -+ "MAIN_TEXT", -+ "MAIN_CHATTEXT", -+ "MAIN_SUBTEXT", -+ "MAIN_ACTIONTEXT", -+ "MAIN_QUOTETEXT", -+ "MAIN_REDTEXT", -+ "MAIN_URLTEXT", -+ "MAIN_HINTTEXT", -+ -+ "MENU_BACKGROUND", -+ "MENU_TEXT", -+ "MENU_SUBTEXT", -+ "MENU_BKGRND_HOVER", -+ "MENU_ACTIVE_BACKGROUND", -+ "MENU_ACTIVE_TEXT", -+ -+ "MSG_USER", -+ "MSG_USER_PEND", -+ "MSG_USER_ERROR", -+ "MSG_CONTACT", -+ -+ "LIST_BACKGROUND", -+ "LIST_BKGRND_HOVER", -+ "LIST_TEXT", -+ "LIST_SUBTEXT", -+ -+ "GROUP_SELF", -+ "GROUP_PEER", -+ "GROUP_AUDIO", -+ "GROUP_MUTED", -+ -+ "SELECTION_BACKGROUND", -+ "SELECTION_TEXT", -+ -+ "EDGE_NORMAL", -+ "EDGE_HOVER", -+ "EDGE_ACTIVE", -+ "ACTIVEOPTION_BACKGROUND", -+ "ACTIVEOPTION_TEXT", -+ -+ "AUX_BACKGROUND", -+ "AUX_EDGE_NORMAL", -+ "AUX_EDGE_HOVER", -+ "AUX_EDGE_ACTIVE", -+ "AUX_TEXT", -+ "AUX_ACTIVEOPTION_BACKGROUND", -+ "AUX_ACTIVEOPTION_TEXT", -+ -+ "STATUS_ONLINE", -+ "STATUS_AWAY", -+ "STATUS_BUSY", -+ -+ "BUTTON_SUCCESS_BACKGROUND", -+ "BUTTON_SUCCESS_TEXT", -+ "BUTTON_SUCCESS_BKGRND_HOVER", -+ "BUTTON_SUCCESS_TEXT_HOVER", -+ "BUTTON_WARNING_BACKGROUND", -+ "BUTTON_WARNING_TEXT", -+ "BUTTON_WARNING_BKGRND_HOVER", -+ "BUTTON_WARNING_TEXT_HOVER", -+ "BUTTON_DANGER_BACKGROUND", -+ "BUTTON_DANGER_TEXT", -+ "BUTTON_DANGER_BKGRND_HOVER", -+ "BUTTON_DANGER_TEXT_HOVER", -+ "BUTTON_DISABLED_BACKGROUND", -+ "TRANSFER_PROGRESS_OVERLAY_PAUSED", -+ "BUTTON_DISABLED_TEXT", -+ "BUTTON_DISABLED_TRANSFER", -+ "BUTTON_INPROGRESS_BACKGROUND", -+ "TRANSFER_PROGRESS_OVERLAY_ACTIVE", -+ "BUTTON_INPROGRESS_TEXT", -+ NULL }; -+uint32_t *COLOUR_POINTER_TABLE[] = { &COLOR_BKGRND_MAIN, -+ &COLOR_BKGRND_ALT, -+ &COLOR_MAIN_TEXT, -+ &COLOR_MAIN_TEXT_CHAT, -+ &COLOR_MAIN_TEXT_SUBTEXT, -+ &COLOR_MAIN_TEXT_ACTION, -+ &COLOR_MAIN_TEXT_QUOTE, -+ &COLOR_MAIN_TEXT_RED, -+ &COLOR_MAIN_TEXT_URL, -+ &COLOR_MAIN_TEXT_HINT, -+ -+ &COLOR_BKGRND_MENU, -+ &COLOR_MENU_TEXT, -+ &COLOR_MENU_TEXT_SUBTEXT, -+ &COLOR_BKGRND_MENU_HOVER, -+ &COLOR_BKGRND_MENU_ACTIVE, -+ &COLOR_MENU_TEXT_ACTIVE, -+ -+ &COLOR_MSG_USER, -+ &COLOR_MSG_USER_PEND, -+ &COLOR_MSG_USER_ERROR, -+ &COLOR_MSG_CONTACT, -+ -+ &COLOR_BKGRND_LIST, -+ &COLOR_BKGRND_LIST_HOVER, -+ &COLOR_LIST_TEXT, -+ &COLOR_LIST_TEXT_SUBTEXT, -+ -+ &COLOR_GROUP_SELF, -+ &COLOR_GROUP_PEER, -+ &COLOR_GROUP_AUDIO, -+ &COLOR_GROUP_MUTED, -+ -+ &COLOR_SELECTION_BACKGROUND, -+ &COLOR_SELECTION_TEXT, -+ -+ &COLOR_EDGE_NORMAL, -+ &COLOR_EDGE_HOVER, -+ &COLOR_EDGE_ACTIVE, -+ &COLOR_ACTIVEOPTION_BKGRND, -+ &COLOR_ACTIVEOPTION_TEXT, -+ -+ &COLOR_BKGRND_AUX, -+ &COLOR_AUX_EDGE_NORMAL, -+ &COLOR_AUX_EDGE_HOVER, -+ &COLOR_AUX_EDGE_ACTIVE, -+ &COLOR_AUX_TEXT, -+ &COLOR_AUX_ACTIVEOPTION_BKGRND, -+ &COLOR_AUX_ACTIVEOPTION_TEXT, -+ -+ &COLOR_STATUS_ONLINE, -+ &COLOR_STATUS_AWAY, -+ &COLOR_STATUS_BUSY, -+ -+ &COLOR_BTN_SUCCESS_BKGRND, -+ &COLOR_BTN_SUCCESS_TEXT, -+ &COLOR_BTN_SUCCESS_BKGRND_HOVER, -+ &COLOR_BTN_SUCCESS_TEXT_HOVER, -+ &COLOR_BTN_WARNING_BKGRND, -+ &COLOR_BTN_WARNING_TEXT, -+ &COLOR_BTN_WARNING_BKGRND_HOVER, -+ &COLOR_BTN_WARNING_TEXT_HOVER, -+ &COLOR_BTN_DANGER_BACKGROUND, -+ &COLOR_BTN_DANGER_TEXT, -+ &COLOR_BTN_DANGER_BKGRND_HOVER, -+ &COLOR_BTN_DANGER_TEXT_HOVER, -+ &COLOR_BTN_DISABLED_BKGRND, -+ &COLOR_BTN_DISABLED_FORGRND, -+ &COLOR_BTN_DISABLED_TEXT, -+ &COLOR_BTN_DISABLED_TRANSFER, -+ &COLOR_BTN_INPROGRESS_BKGRND, -+ &COLOR_BTN_INPROGRESS_FORGRND, -+ &COLOR_BTN_INPROGRESS_TEXT, -+ NULL }; -+ -+/* tox.h */ -+UTOX_TOX_THREAD_INIT tox_thread_init; -+ -+TOX_MSG tox_msg, audio_msg, toxav_msg; -+volatile bool tox_thread_msg, audio_thread_msg, video_thread_msg; -+ -+bool tox_connected; -+char proxy_address[256]; /* Magic Number inside toxcore */ -+ -+/* ui.h */ -+struct utox_mouse mouse; -+ -+uint8_t cursor; -+bool mdown; -+ -+char search_data[1024]; // TODO this is NOT where this belongs -+ -+double ui_scale; -diff --git a/src/messages.h b/src/messages.h -index b5b5a2aa..cc60e9cc 100644 ---- a/src/messages.h -+++ b/src/messages.h -@@ -7,7 +7,7 @@ - #include - #include - --pthread_mutex_t messages_lock; -+extern pthread_mutex_t messages_lock; - - typedef struct native_image NATIVE_IMAGE; - -diff --git a/src/self.h b/src/self.h -index 9f8757c0..c931e514 100644 ---- a/src/self.h -+++ b/src/self.h -@@ -7,7 +7,7 @@ - typedef struct avatar AVATAR; - - #define TOX_ADDRESS_STR_SIZE TOX_ADDRESS_SIZE * 2 --struct utox_self { -+extern struct utox_self { - uint8_t status; - char name[TOX_MAX_NAME_LENGTH]; - char statusmsg[TOX_MAX_STATUS_MESSAGE_LENGTH]; -diff --git a/src/theme.h b/src/theme.h -index 50332700..e1d9a59f 100644 ---- a/src/theme.h -+++ b/src/theme.h -@@ -16,90 +16,90 @@ typedef enum { - } THEME; - - /* Colors for drawing the backgrounds */ --uint32_t COLOR_BKGRND_MAIN; --uint32_t COLOR_BKGRND_ALT; --uint32_t COLOR_BKGRND_AUX; --uint32_t COLOR_BKGRND_MENU; --uint32_t COLOR_BKGRND_MENU_HOVER; --uint32_t COLOR_BKGRND_MENU_ACTIVE; --uint32_t COLOR_BKGRND_LIST; --uint32_t COLOR_BKGRND_LIST_HOVER; -- --uint32_t COLOR_MAIN_TEXT; --uint32_t COLOR_MAIN_TEXT_CHAT; --uint32_t COLOR_MAIN_TEXT_SUBTEXT; --uint32_t COLOR_MAIN_TEXT_ACTION; --uint32_t COLOR_MAIN_TEXT_QUOTE; --uint32_t COLOR_MAIN_TEXT_RED; --uint32_t COLOR_MAIN_TEXT_URL; --uint32_t COLOR_MAIN_TEXT_HINT; -- --uint32_t COLOR_MSG_USER; --uint32_t COLOR_MSG_USER_PEND; --uint32_t COLOR_MSG_USER_ERROR; --uint32_t COLOR_MSG_CONTACT; -- --uint32_t COLOR_MENU_TEXT; --uint32_t COLOR_MENU_TEXT_SUBTEXT; --uint32_t COLOR_MENU_TEXT_ACTIVE; -- --uint32_t COLOR_LIST_TEXT; --uint32_t COLOR_LIST_TEXT_SUBTEXT; -- --uint32_t COLOR_AUX_EDGE_NORMAL; --uint32_t COLOR_AUX_EDGE_HOVER; --uint32_t COLOR_AUX_EDGE_ACTIVE; --uint32_t COLOR_AUX_TEXT; --uint32_t COLOR_AUX_ACTIVEOPTION_BKGRND; --uint32_t COLOR_AUX_ACTIVEOPTION_TEXT; -- --uint32_t COLOR_GROUP_SELF; --uint32_t COLOR_GROUP_PEER; --uint32_t COLOR_GROUP_AUDIO; --uint32_t COLOR_GROUP_MUTED; -- --uint32_t COLOR_SELECTION_BACKGROUND; --uint32_t COLOR_SELECTION_TEXT; -- --uint32_t COLOR_EDGE_NORMAL; --uint32_t COLOR_EDGE_ACTIVE; --uint32_t COLOR_EDGE_HOVER; -- --uint32_t COLOR_ACTIVEOPTION_BKGRND; --uint32_t COLOR_ACTIVEOPTION_TEXT; -- --uint32_t COLOR_STATUS_ONLINE; --uint32_t COLOR_STATUS_AWAY; -- --uint32_t COLOR_STATUS_BUSY; --uint32_t COLOR_BTN_SUCCESS_BKGRND; --uint32_t COLOR_BTN_SUCCESS_TEXT; --uint32_t COLOR_BTN_SUCCESS_BKGRND_HOVER; --uint32_t COLOR_BTN_SUCCESS_TEXT_HOVER; -- --uint32_t COLOR_BTN_WARNING_BKGRND; --uint32_t COLOR_BTN_WARNING_TEXT; --uint32_t COLOR_BTN_WARNING_BKGRND_HOVER; --uint32_t COLOR_BTN_WARNING_TEXT_HOVER; -- --uint32_t COLOR_BTN_DANGER_BACKGROUND; --uint32_t COLOR_BTN_DANGER_TEXT; --uint32_t COLOR_BTN_DANGER_BKGRND_HOVER; --uint32_t COLOR_BTN_DANGER_TEXT_HOVER; -- --uint32_t COLOR_BTN_DISABLED_BKGRND; --uint32_t COLOR_BTN_DISABLED_TEXT; --uint32_t COLOR_BTN_DISABLED_BKGRND_HOVER; --uint32_t COLOR_BTN_DISABLED_TRANSFER; -- --uint32_t COLOR_BTN_INPROGRESS_BKGRND; --uint32_t COLOR_BTN_INPROGRESS_TEXT; --uint32_t COLOR_BTN_DISABLED_FORGRND; --uint32_t COLOR_BTN_INPROGRESS_FORGRND; -+extern uint32_t COLOR_BKGRND_MAIN; -+extern uint32_t COLOR_BKGRND_ALT; -+extern uint32_t COLOR_BKGRND_AUX; -+extern uint32_t COLOR_BKGRND_MENU; -+extern uint32_t COLOR_BKGRND_MENU_HOVER; -+extern uint32_t COLOR_BKGRND_MENU_ACTIVE; -+extern uint32_t COLOR_BKGRND_LIST; -+extern uint32_t COLOR_BKGRND_LIST_HOVER; -+ -+extern uint32_t COLOR_MAIN_TEXT; -+extern uint32_t COLOR_MAIN_TEXT_CHAT; -+extern uint32_t COLOR_MAIN_TEXT_SUBTEXT; -+extern uint32_t COLOR_MAIN_TEXT_ACTION; -+extern uint32_t COLOR_MAIN_TEXT_QUOTE; -+extern uint32_t COLOR_MAIN_TEXT_RED; -+extern uint32_t COLOR_MAIN_TEXT_URL; -+extern uint32_t COLOR_MAIN_TEXT_HINT; -+ -+extern uint32_t COLOR_MSG_USER; -+extern uint32_t COLOR_MSG_USER_PEND; -+extern uint32_t COLOR_MSG_USER_ERROR; -+extern uint32_t COLOR_MSG_CONTACT; -+ -+extern uint32_t COLOR_MENU_TEXT; -+extern uint32_t COLOR_MENU_TEXT_SUBTEXT; -+extern uint32_t COLOR_MENU_TEXT_ACTIVE; -+ -+extern uint32_t COLOR_LIST_TEXT; -+extern uint32_t COLOR_LIST_TEXT_SUBTEXT; -+ -+extern uint32_t COLOR_AUX_EDGE_NORMAL; -+extern uint32_t COLOR_AUX_EDGE_HOVER; -+extern uint32_t COLOR_AUX_EDGE_ACTIVE; -+extern uint32_t COLOR_AUX_TEXT; -+extern uint32_t COLOR_AUX_ACTIVEOPTION_BKGRND; -+extern uint32_t COLOR_AUX_ACTIVEOPTION_TEXT; -+ -+extern uint32_t COLOR_GROUP_SELF; -+extern uint32_t COLOR_GROUP_PEER; -+extern uint32_t COLOR_GROUP_AUDIO; -+extern uint32_t COLOR_GROUP_MUTED; -+ -+extern uint32_t COLOR_SELECTION_BACKGROUND; -+extern uint32_t COLOR_SELECTION_TEXT; -+ -+extern uint32_t COLOR_EDGE_NORMAL; -+extern uint32_t COLOR_EDGE_ACTIVE; -+extern uint32_t COLOR_EDGE_HOVER; -+ -+extern uint32_t COLOR_ACTIVEOPTION_BKGRND; -+extern uint32_t COLOR_ACTIVEOPTION_TEXT; -+ -+extern uint32_t COLOR_STATUS_ONLINE; -+extern uint32_t COLOR_STATUS_AWAY; -+ -+extern uint32_t COLOR_STATUS_BUSY; -+extern uint32_t COLOR_BTN_SUCCESS_BKGRND; -+extern uint32_t COLOR_BTN_SUCCESS_TEXT; -+extern uint32_t COLOR_BTN_SUCCESS_BKGRND_HOVER; -+extern uint32_t COLOR_BTN_SUCCESS_TEXT_HOVER; -+ -+extern uint32_t COLOR_BTN_WARNING_BKGRND; -+extern uint32_t COLOR_BTN_WARNING_TEXT; -+extern uint32_t COLOR_BTN_WARNING_BKGRND_HOVER; -+extern uint32_t COLOR_BTN_WARNING_TEXT_HOVER; -+ -+extern uint32_t COLOR_BTN_DANGER_BACKGROUND; -+extern uint32_t COLOR_BTN_DANGER_TEXT; -+extern uint32_t COLOR_BTN_DANGER_BKGRND_HOVER; -+extern uint32_t COLOR_BTN_DANGER_TEXT_HOVER; -+ -+extern uint32_t COLOR_BTN_DISABLED_BKGRND; -+extern uint32_t COLOR_BTN_DISABLED_TEXT; -+extern uint32_t COLOR_BTN_DISABLED_BKGRND_HOVER; -+extern uint32_t COLOR_BTN_DISABLED_TRANSFER; -+ -+extern uint32_t COLOR_BTN_INPROGRESS_BKGRND; -+extern uint32_t COLOR_BTN_INPROGRESS_TEXT; -+extern uint32_t COLOR_BTN_DISABLED_FORGRND; -+extern uint32_t COLOR_BTN_INPROGRESS_FORGRND; - - void theme_load(const THEME loadtheme); - --uint32_t status_color[4]; -+extern uint32_t status_color[4]; - - extern const char *COLOUR_NAME_TABLE[]; - extern uint32_t *COLOUR_POINTER_TABLE[]; -diff --git a/src/theme_tables.h b/src/theme_tables.h -index b46bf607..54d82e0e 100644 ---- a/src/theme_tables.h -+++ b/src/theme_tables.h -@@ -3,153 +3,7 @@ - - #include "theme.h" - --const char *COLOUR_NAME_TABLE[] = { "MAIN_BACKGROUND", -- "ALT_BACKGROUND", -- "MAIN_TEXT", -- "MAIN_CHATTEXT", -- "MAIN_SUBTEXT", -- "MAIN_ACTIONTEXT", -- "MAIN_QUOTETEXT", -- "MAIN_REDTEXT", -- "MAIN_URLTEXT", -- "MAIN_HINTTEXT", -+extern const char *COLOUR_NAME_TABLE[]; -+extern uint32_t *COLOUR_POINTER_TABLE[]; - -- "MENU_BACKGROUND", -- "MENU_TEXT", -- "MENU_SUBTEXT", -- "MENU_BKGRND_HOVER", -- "MENU_ACTIVE_BACKGROUND", -- "MENU_ACTIVE_TEXT", -- -- "MSG_USER", -- "MSG_USER_PEND", -- "MSG_USER_ERROR", -- "MSG_CONTACT", -- -- "LIST_BACKGROUND", -- "LIST_BKGRND_HOVER", -- "LIST_TEXT", -- "LIST_SUBTEXT", -- -- "GROUP_SELF", -- "GROUP_PEER", -- "GROUP_AUDIO", -- "GROUP_MUTED", -- -- "SELECTION_BACKGROUND", -- "SELECTION_TEXT", -- -- "EDGE_NORMAL", -- "EDGE_HOVER", -- "EDGE_ACTIVE", -- "ACTIVEOPTION_BACKGROUND", -- "ACTIVEOPTION_TEXT", -- -- "AUX_BACKGROUND", -- "AUX_EDGE_NORMAL", -- "AUX_EDGE_HOVER", -- "AUX_EDGE_ACTIVE", -- "AUX_TEXT", -- "AUX_ACTIVEOPTION_BACKGROUND", -- "AUX_ACTIVEOPTION_TEXT", -- -- "STATUS_ONLINE", -- "STATUS_AWAY", -- "STATUS_BUSY", -- -- "BUTTON_SUCCESS_BACKGROUND", -- "BUTTON_SUCCESS_TEXT", -- "BUTTON_SUCCESS_BKGRND_HOVER", -- "BUTTON_SUCCESS_TEXT_HOVER", -- "BUTTON_WARNING_BACKGROUND", -- "BUTTON_WARNING_TEXT", -- "BUTTON_WARNING_BKGRND_HOVER", -- "BUTTON_WARNING_TEXT_HOVER", -- "BUTTON_DANGER_BACKGROUND", -- "BUTTON_DANGER_TEXT", -- "BUTTON_DANGER_BKGRND_HOVER", -- "BUTTON_DANGER_TEXT_HOVER", -- "BUTTON_DISABLED_BACKGROUND", -- "TRANSFER_PROGRESS_OVERLAY_PAUSED", -- "BUTTON_DISABLED_TEXT", -- "BUTTON_DISABLED_TRANSFER", -- "BUTTON_INPROGRESS_BACKGROUND", -- "TRANSFER_PROGRESS_OVERLAY_ACTIVE", -- "BUTTON_INPROGRESS_TEXT", -- NULL }; --uint32_t *COLOUR_POINTER_TABLE[] = { &COLOR_BKGRND_MAIN, -- &COLOR_BKGRND_ALT, -- &COLOR_MAIN_TEXT, -- &COLOR_MAIN_TEXT_CHAT, -- &COLOR_MAIN_TEXT_SUBTEXT, -- &COLOR_MAIN_TEXT_ACTION, -- &COLOR_MAIN_TEXT_QUOTE, -- &COLOR_MAIN_TEXT_RED, -- &COLOR_MAIN_TEXT_URL, -- &COLOR_MAIN_TEXT_HINT, -- -- &COLOR_BKGRND_MENU, -- &COLOR_MENU_TEXT, -- &COLOR_MENU_TEXT_SUBTEXT, -- &COLOR_BKGRND_MENU_HOVER, -- &COLOR_BKGRND_MENU_ACTIVE, -- &COLOR_MENU_TEXT_ACTIVE, -- -- &COLOR_MSG_USER, -- &COLOR_MSG_USER_PEND, -- &COLOR_MSG_USER_ERROR, -- &COLOR_MSG_CONTACT, -- -- &COLOR_BKGRND_LIST, -- &COLOR_BKGRND_LIST_HOVER, -- &COLOR_LIST_TEXT, -- &COLOR_LIST_TEXT_SUBTEXT, -- -- &COLOR_GROUP_SELF, -- &COLOR_GROUP_PEER, -- &COLOR_GROUP_AUDIO, -- &COLOR_GROUP_MUTED, -- -- &COLOR_SELECTION_BACKGROUND, -- &COLOR_SELECTION_TEXT, -- -- &COLOR_EDGE_NORMAL, -- &COLOR_EDGE_HOVER, -- &COLOR_EDGE_ACTIVE, -- &COLOR_ACTIVEOPTION_BKGRND, -- &COLOR_ACTIVEOPTION_TEXT, -- -- &COLOR_BKGRND_AUX, -- &COLOR_AUX_EDGE_NORMAL, -- &COLOR_AUX_EDGE_HOVER, -- &COLOR_AUX_EDGE_ACTIVE, -- &COLOR_AUX_TEXT, -- &COLOR_AUX_ACTIVEOPTION_BKGRND, -- &COLOR_AUX_ACTIVEOPTION_TEXT, -- -- &COLOR_STATUS_ONLINE, -- &COLOR_STATUS_AWAY, -- &COLOR_STATUS_BUSY, -- -- &COLOR_BTN_SUCCESS_BKGRND, -- &COLOR_BTN_SUCCESS_TEXT, -- &COLOR_BTN_SUCCESS_BKGRND_HOVER, -- &COLOR_BTN_SUCCESS_TEXT_HOVER, -- &COLOR_BTN_WARNING_BKGRND, -- &COLOR_BTN_WARNING_TEXT, -- &COLOR_BTN_WARNING_BKGRND_HOVER, -- &COLOR_BTN_WARNING_TEXT_HOVER, -- &COLOR_BTN_DANGER_BACKGROUND, -- &COLOR_BTN_DANGER_TEXT, -- &COLOR_BTN_DANGER_BKGRND_HOVER, -- &COLOR_BTN_DANGER_TEXT_HOVER, -- &COLOR_BTN_DISABLED_BKGRND, -- &COLOR_BTN_DISABLED_FORGRND, -- &COLOR_BTN_DISABLED_TEXT, -- &COLOR_BTN_DISABLED_TRANSFER, -- &COLOR_BTN_INPROGRESS_BKGRND, -- &COLOR_BTN_INPROGRESS_FORGRND, -- &COLOR_BTN_INPROGRESS_TEXT, -- NULL }; -- --#endif -\ No newline at end of file -+#endif -diff --git a/src/tox.h b/src/tox.h -index 6a86f9c1..dd97a068 100644 ---- a/src/tox.h -+++ b/src/tox.h -@@ -117,14 +117,14 @@ typedef enum { - UTOX_TOX_THREAD_INIT_ERROR = 2, - } UTOX_TOX_THREAD_INIT; - --UTOX_TOX_THREAD_INIT tox_thread_init; -+extern UTOX_TOX_THREAD_INIT tox_thread_init; - - /* Inter-thread communication vars. */ --TOX_MSG tox_msg, audio_msg, toxav_msg; --volatile bool tox_thread_msg, audio_thread_msg, video_thread_msg; -+extern TOX_MSG tox_msg, audio_msg, toxav_msg; -+extern volatile bool tox_thread_msg, audio_thread_msg, video_thread_msg; - --bool tox_connected; --char proxy_address[256]; /* Magic Number inside toxcore */ -+extern bool tox_connected; -+extern char proxy_address[256]; /* Magic Number inside toxcore */ - - void tox_after_load(Tox *tox); - -diff --git a/src/ui.h b/src/ui.h -index 09c4708a..d8ec3ab0 100644 ---- a/src/ui.h -+++ b/src/ui.h -@@ -49,12 +49,12 @@ enum { - CURSOR_ZOOM_OUT, - }; - --struct utox_mouse { -+extern struct utox_mouse { - int x, y; - } mouse; - --uint8_t cursor; --bool mdown; -+extern uint8_t cursor; -+extern bool mdown; - - enum { - FONT_TEXT, -@@ -109,9 +109,9 @@ bool panel_mwheel(PANEL *p, int x, int y, int width, int height, double d, bool - bool panel_mup(PANEL *p); - bool panel_mleave(PANEL *p); - --char search_data[1024]; // TODO this is NOT where this belongs -+extern char search_data[1024]; // TODO this is NOT where this belongs - --double ui_scale; -+extern double ui_scale; - - #define SCALE(x) ((int)(((double)x) * (ui_scale / 10.0))) - #define SCALE_DIV(x) (((int)(((double)x) * (ui_scale / 10.0))) ?: 1) -diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt -index 26a448f6..35490732 100644 ---- a/src/ui/CMakeLists.txt -+++ b/src/ui/CMakeLists.txt -@@ -9,6 +9,7 @@ add_library(utoxUI STATIC - dropdown.h - edit.c - edit.h -+ globals.c - scrollable.c - scrollable.h - svg.c -diff --git a/src/ui/draw.h b/src/ui/draw.h -index fb762404..869f86ac 100644 ---- a/src/ui/draw.h -+++ b/src/ui/draw.h -@@ -3,7 +3,7 @@ - - #include - --int font_small_lineheight, font_msg_lineheight; -+extern int font_small_lineheight, font_msg_lineheight; - - void drawtext(int x, int y, const char *str, uint16_t length); - -diff --git a/src/ui/globals.c b/src/ui/globals.c -new file mode 100644 -index 00000000..3cf021d3 ---- /dev/null -+++ b/src/ui/globals.c -@@ -0,0 +1,6 @@ -+#include "draw.h" -+ -+/* Globals */ -+ -+/* draw.h */ -+int font_small_lineheight, font_msg_lineheight; -diff --git a/src/xlib/CMakeLists.txt b/src/xlib/CMakeLists.txt -index 2cf3ece3..0145a489 100644 ---- a/src/xlib/CMakeLists.txt -+++ b/src/xlib/CMakeLists.txt -@@ -31,6 +31,7 @@ add_library(utoxNATIVE STATIC - filesys.c - freetype.c - freetype.h -+ globals.c - gtk.c - keysym2ucs.h - main.c -diff --git a/src/xlib/freetype.h b/src/xlib/freetype.h -index fbc0f7d7..e0182c7b 100644 ---- a/src/xlib/freetype.h -+++ b/src/xlib/freetype.h -@@ -31,12 +31,12 @@ typedef struct { - GLYPH * glyphs[128]; - } FONT; - --FT_Library ftlib; --FONT font[16], *sfont; --FcCharSet *charset; --FcFontSet *fs; -+extern FT_Library ftlib; -+extern FONT font[16], *sfont; -+extern FcCharSet *charset; -+extern FcFontSet *fs; - --bool ft_vert, ft_swap_blue_red; -+extern bool ft_vert, ft_swap_blue_red; - - Picture loadglyphpic(uint8_t *data, int width, int height, int pitch, bool no_subpixel, bool vertical, - bool swap_blue_red); -diff --git a/src/xlib/globals.c b/src/xlib/globals.c -new file mode 100644 -index 00000000..578a3f1d ---- /dev/null -+++ b/src/xlib/globals.c -@@ -0,0 +1,57 @@ -+#include "freetype.h" -+#include "main.h" -+#include "window.h" -+ -+/* Globals */ -+ -+/* freetype.h */ -+FT_Library ftlib; -+FONT font[16], *sfont; -+FcCharSet *charset; -+FcFontSet *fs; -+ -+bool ft_vert, ft_swap_blue_red; -+ -+/* main.h */ -+Atom wm_protocols, wm_delete_window; -+ -+Atom XA_CLIPBOARD, XA_NET_NAME, XA_UTF8_STRING, targets, XA_INCR; -+Atom XdndAware, XdndEnter, XdndLeave, XdndPosition, XdndStatus, XdndDrop, XdndSelection, XdndDATA, XdndActionCopy; -+Atom XA_URI_LIST, XA_PNG_IMG; -+Atom XRedraw; -+ -+Picture bitmap[BM_ENDMARKER]; -+Cursor cursors[8]; -+ -+uint8_t pointergrab; -+ -+bool _redraw; -+ -+XImage *screen_image; -+ -+void *libgtk; -+ -+struct utox_clipboard clipboard; -+ -+struct utox_primary primary; -+ -+struct utox_pastebuf pastebuf; -+ -+ -+/* window.h */ -+Display *display; -+Screen *default_screen; -+int def_screen_num; -+Window root_window; -+Visual *default_visual; -+ -+UTOX_WINDOW *curr; -+ -+int default_depth; -+ -+struct native_window main_window; -+ -+struct native_window popup_window; -+struct native_window scr_grab_window; -+ -+struct native_window tray_pop; -diff --git a/src/xlib/main.h b/src/xlib/main.h -index f3573544..70f7e74d 100644 ---- a/src/xlib/main.h -+++ b/src/xlib/main.h -@@ -33,39 +33,39 @@ struct native_image { - XID alpha; - }; - --Atom wm_protocols, wm_delete_window; -+extern Atom wm_protocols, wm_delete_window; - --Atom XA_CLIPBOARD, XA_NET_NAME, XA_UTF8_STRING, targets, XA_INCR; --Atom XdndAware, XdndEnter, XdndLeave, XdndPosition, XdndStatus, XdndDrop, XdndSelection, XdndDATA, XdndActionCopy; --Atom XA_URI_LIST, XA_PNG_IMG; --Atom XRedraw; -+extern Atom XA_CLIPBOARD, XA_NET_NAME, XA_UTF8_STRING, targets, XA_INCR; -+extern Atom XdndAware, XdndEnter, XdndLeave, XdndPosition, XdndStatus, XdndDrop, XdndSelection, XdndDATA, XdndActionCopy; -+extern Atom XA_URI_LIST, XA_PNG_IMG; -+extern Atom XRedraw; - --Picture bitmap[BM_ENDMARKER]; --Cursor cursors[8]; -+extern Picture bitmap[BM_ENDMARKER]; -+extern Cursor cursors[8]; - - /* Screen grab vars */ --uint8_t pointergrab; -+extern uint8_t pointergrab; - --bool _redraw; -+extern bool _redraw; - --XImage *screen_image; -+extern XImage *screen_image; - - extern int utox_v4l_fd; - - /* dynamiclly load libgtk */ --void *libgtk; -+extern void *libgtk; - --struct { -+extern struct utox_clipboard { - int len; - char data[UINT16_MAX]; // TODO: De-hardcode this value. - } clipboard; - --struct { -+extern struct utox_primary { - int len; - char data[UINT16_MAX]; // TODO: De-hardcode this value. - } primary; - --struct { -+extern struct utox_pastebuf { - int len, left; - Atom type; - char *data; -diff --git a/src/xlib/window.h b/src/xlib/window.h -index 6ae73353..fcd4b60f 100644 ---- a/src/xlib/window.h -+++ b/src/xlib/window.h -@@ -16,17 +16,17 @@ - #include - #include - --Display *display; --Screen *default_screen; --int def_screen_num; --Window root_window; --Visual *default_visual; -+extern Display *display; -+extern Screen *default_screen; -+extern int def_screen_num; -+extern Window root_window; -+extern Visual *default_visual; - - - // TODO move --UTOX_WINDOW *curr; -+extern UTOX_WINDOW *curr; - --int default_depth; -+extern int default_depth; - - struct native_window { - struct utox_window _; // Global struct shared across all platforms -@@ -45,12 +45,12 @@ struct native_window { - - }; - --struct native_window main_window; -+extern struct native_window main_window; - --struct native_window popup_window; --struct native_window scr_grab_window; -+extern struct native_window popup_window; -+extern struct native_window scr_grab_window; - --struct native_window tray_pop; -+extern struct native_window tray_pop; - - void window_set_focus(UTOX_WINDOW *win); - --- -2.24.1 - diff --git a/sources b/sources index cf9200e..56ca11d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (third-party.tar.gz) = bf1410cb1f33e6b384435d64997483c0eced2ad516f0e36ae8a8fbf96de59edbded1028a9b541f217b3492ce5c825d7e46148e92cd43ebc5414bc8e042fbfea4 -SHA512 (utox-0.17.1.tar.gz) = e906dd5cb40057ac56199548f687db0e2f07c4d71037dc1b0928cea934be2a4a5735b3d47976c4b4bda4c0029ced34ac865f40c289c5dc41b7a0737bd3297f59 +SHA512 (third-party.tar.gz) = fc0c0e825e58775044497b6ae95ae1c97973a10fc88e08795b565c0f99d2c31a3395a9cc9780c636efb54f48db5d8673a1fe40250db886e98b192f73597b4bc7 +SHA512 (utox-0.17.2.tar.gz) = 948b99ac94da57dc5a0cb2262530490eca1e8d8f6db35ca24c6f2d3478eac9f63e3527bd93422b8eae50b9ed766f39fd5a0458b203d96bc0c84bd1b408363a92 diff --git a/utox.spec b/utox.spec index 7111014..a5aeaf8 100644 --- a/utox.spec +++ b/utox.spec @@ -1,6 +1,6 @@ Name: utox -Version: 0.17.1 -Release: 3%{?dist} +Version: 0.17.2 +Release: 1%{?dist} Summary: The lightweight Tox client License: MIT or GPLv3+ @@ -9,12 +9,10 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Source1: %{name}.appdata.xml # git clone https://github.com/uTox/uTox # cd uTox -# git checkout v0.17.0 +# git checkout v0.17.2 # git submodule init ; git submodule update # tar -zcvf third-party.tar.gz third-party/ Source2: third-party.tar.gz -# https://github.com/uTox/uTox/issues/1412 -Patch0: 0001-Mark-global-variable-as-extern.patch BuildRequires: gcc-c++ BuildRequires: cmake @@ -70,6 +68,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %{_mandir}/man1/%{name}.1* %changelog +* Fri Jun 19 12:40:14 CEST 2020 Robert-André Mauchin - 0.17.2-1 +- Update to 0.17.2 (#1823346) + * Fri Jan 31 2020 Fedora Release Engineering - 0.17.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 195f0b6091d06d8557c3a9694cdfd1d9bb2269eb Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Wed, 8 Jul 2020 11:41:57 +0200 Subject: [PATCH 08/34] Improve compatibility with new CMake macro Signed-off-by: Igor Raits --- utox.spec | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/utox.spec b/utox.spec index a5aeaf8..a433178 100644 --- a/utox.spec +++ b/utox.spec @@ -1,3 +1,5 @@ +%undefine __cmake_in_source_build + Name: utox Version: 0.17.2 Release: 1%{?dist} @@ -41,20 +43,16 @@ Requires: hicolor-icon-theme %autosetup -N -T -D -a 2 -n uTox-%{version} %build -mkdir build -cd build -%cmake .. -%make_build +%cmake +%cmake_build %install -pushd build -%make_install -popd +%cmake_install install -Dp -m 644 %{SOURCE1} %{buildroot}/%{_datadir}/metainfo/%{name}.appdata.xml rm -rf %{buildroot}/%{_datadir}/icons/hicolor/14x14 %check -ctest -V %{?_smp_mflags} +%ctest desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}.appdata.xml From dc887ebea3a95e794e50766b7ade6a5249d623bf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:28:42 +0000 Subject: [PATCH 09/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- utox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/utox.spec b/utox.spec index a433178..18acb05 100644 --- a/utox.spec +++ b/utox.spec @@ -2,7 +2,7 @@ Name: utox Version: 0.17.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The lightweight Tox client License: MIT or GPLv3+ @@ -66,6 +66,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %{_mandir}/man1/%{name}.1* %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.17.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jun 19 12:40:14 CEST 2020 Robert-André Mauchin - 0.17.2-1 - Update to 0.17.2 (#1823346) From 3573592a2fc801e560b647b03360d56e13ac1171 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 09:34:13 +0000 Subject: [PATCH 10/34] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- utox.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/utox.spec b/utox.spec index 18acb05..f907fdd 100644 --- a/utox.spec +++ b/utox.spec @@ -2,7 +2,7 @@ Name: utox Version: 0.17.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The lightweight Tox client License: MIT or GPLv3+ @@ -66,6 +66,10 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %{_mandir}/man1/%{name}.1* %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 0.17.2-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 0.17.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 144e63fcda2b16e6cabb9cfe999bf4eec702b227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Mon, 24 Aug 2020 16:33:42 +0200 Subject: [PATCH 11/34] Disable tests on arm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- utox.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utox.spec b/utox.spec index f907fdd..b5f3dbf 100644 --- a/utox.spec +++ b/utox.spec @@ -52,7 +52,10 @@ install -Dp -m 644 %{SOURCE1} %{buildroot}/%{_datadir}/metainfo/%{name}.appdata. rm -rf %{buildroot}/%{_datadir}/icons/hicolor/14x14 %check +# Test "chrono" fails on armv7l +%ifnarch %{arm} %ctest +%endif desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}.appdata.xml From ab020072acb07c4226fd8117692868bf3d37be1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sat, 5 Dec 2020 21:58:38 +0100 Subject: [PATCH 12/34] Update to 0.18.0 Cldse: rhbz#1902363 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- .gitignore | 2 ++ sources | 4 ++-- utox.spec | 14 +++++++++----- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 446670f..462e0e8 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ /utox-0.17.0.tar.gz /utox-0.17.1.tar.gz /utox-0.17.2.tar.gz +/third_party.tar.gz +/utox-0.18.0.tar.gz diff --git a/sources b/sources index 56ca11d..e4b3387 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (third-party.tar.gz) = fc0c0e825e58775044497b6ae95ae1c97973a10fc88e08795b565c0f99d2c31a3395a9cc9780c636efb54f48db5d8673a1fe40250db886e98b192f73597b4bc7 -SHA512 (utox-0.17.2.tar.gz) = 948b99ac94da57dc5a0cb2262530490eca1e8d8f6db35ca24c6f2d3478eac9f63e3527bd93422b8eae50b9ed766f39fd5a0458b203d96bc0c84bd1b408363a92 +SHA512 (third_party.tar.gz) = a502a1f761f312f6e159b2f7cd3805bbba75e80a61170ba107d6612d8ebaf8956ed0e7f04fb68fc4fd95f2c0f75426b0380b03c4efef34c02e40a65a16b152f4 +SHA512 (utox-0.18.0.tar.gz) = 67771dc304d8ea5a64adc47243351a9deb2e704318401f29e3be72bd4cb659b70b62ba13d3599b2341ff441ce7eced538b08fb794c9aa95d1d178c47052d1566 diff --git a/utox.spec b/utox.spec index b5f3dbf..e9995e6 100644 --- a/utox.spec +++ b/utox.spec @@ -1,8 +1,8 @@ %undefine __cmake_in_source_build Name: utox -Version: 0.17.2 -Release: 3%{?dist} +Version: 0.18.0 +Release: 1%{?dist} Summary: The lightweight Tox client License: MIT or GPLv3+ @@ -11,10 +11,10 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Source1: %{name}.appdata.xml # git clone https://github.com/uTox/uTox # cd uTox -# git checkout v0.17.2 +# git checkout v0.18.0 # git submodule init ; git submodule update -# tar -zcvf third-party.tar.gz third-party/ -Source2: third-party.tar.gz +# tar -zcvf third_party.tar.gz third_party/ +Source2: third_party.tar.gz BuildRequires: gcc-c++ BuildRequires: cmake @@ -69,6 +69,10 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %{_mandir}/man1/%{name}.1* %changelog +* Sat Dec 05 21:10:24 CET 2020 Robert-André Mauchin - 0.18.0-1 +- Update to 0.18.0 +- Cldse: rhbz#1902363 + * Sat Aug 01 2020 Fedora Release Engineering - 0.17.2-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From b73dd085578dd5fe41f42a3e9482a906f71ea138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sat, 5 Dec 2020 23:19:02 +0100 Subject: [PATCH 13/34] Fix typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- utox.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utox.spec b/utox.spec index e9995e6..d4a1697 100644 --- a/utox.spec +++ b/utox.spec @@ -71,7 +71,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog * Sat Dec 05 21:10:24 CET 2020 Robert-André Mauchin - 0.18.0-1 - Update to 0.18.0 -- Cldse: rhbz#1902363 +- Close: rhbz#1902363 * Sat Aug 01 2020 Fedora Release Engineering - 0.17.2-3 - Second attempt - Rebuilt for From dddd1d7379593aa3660f2370b3cce0f5c78c0d21 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 22:50:31 +0000 Subject: [PATCH 14/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- utox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/utox.spec b/utox.spec index d4a1697..922bacc 100644 --- a/utox.spec +++ b/utox.spec @@ -2,7 +2,7 @@ Name: utox Version: 0.18.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The lightweight Tox client License: MIT or GPLv3+ @@ -69,6 +69,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %{_mandir}/man1/%{name}.1* %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 0.18.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Dec 05 21:10:24 CET 2020 Robert-André Mauchin - 0.18.0-1 - Update to 0.18.0 - Close: rhbz#1902363 From e6ce3d041f6b28869d264302d76fe4d7d9f792e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Mon, 24 May 2021 17:54:31 +0200 Subject: [PATCH 15/34] Update to 0.18.1 Close: rhbz#1919592 --- .gitignore | 1 + sources | 4 ++-- utox.spec | 12 +++++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 462e0e8..5abb25d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /utox-0.17.2.tar.gz /third_party.tar.gz /utox-0.18.0.tar.gz +/utox-0.18.1.tar.gz diff --git a/sources b/sources index e4b3387..76a9a75 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (third_party.tar.gz) = a502a1f761f312f6e159b2f7cd3805bbba75e80a61170ba107d6612d8ebaf8956ed0e7f04fb68fc4fd95f2c0f75426b0380b03c4efef34c02e40a65a16b152f4 -SHA512 (utox-0.18.0.tar.gz) = 67771dc304d8ea5a64adc47243351a9deb2e704318401f29e3be72bd4cb659b70b62ba13d3599b2341ff441ce7eced538b08fb794c9aa95d1d178c47052d1566 +SHA512 (third_party.tar.gz) = 087f20cc7e10cfc354868e9392e8f017a87f947589bbed32e425710ae0fd5ae7b0e49c0397c0c72bce463d9198f35ab0e5fdd84db4989dfbcdfd388a6fe56e07 +SHA512 (utox-0.18.1.tar.gz) = 80dc8fb68313e54d9ca9992a40e96125bfa0ddf41a3029016a5e50668dc5ded6622d893658a88e31a325d24ec19e8305b995ba98432150ab5c065086959e3b3a diff --git a/utox.spec b/utox.spec index 922bacc..25d87e4 100644 --- a/utox.spec +++ b/utox.spec @@ -1,8 +1,6 @@ -%undefine __cmake_in_source_build - Name: utox -Version: 0.18.0 -Release: 2%{?dist} +Version: 0.18.1 +Release: 1%{?dist} Summary: The lightweight Tox client License: MIT or GPLv3+ @@ -11,7 +9,7 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Source1: %{name}.appdata.xml # git clone https://github.com/uTox/uTox # cd uTox -# git checkout v0.18.0 +# git checkout v0.18.1 # git submodule init ; git submodule update # tar -zcvf third_party.tar.gz third_party/ Source2: third_party.tar.gz @@ -69,6 +67,10 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %{_mandir}/man1/%{name}.1* %changelog +* Mon May 24 17:47:48 CEST 2021 Robert-André Mauchin - 0.18.1-1 +- Update to 0.18.1 +- Close: rhbz#1919592 + * Wed Jan 27 2021 Fedora Release Engineering - 0.18.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From f2074717d1d05c9822a87f5ecc496806a198e4f0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:14:08 +0000 Subject: [PATCH 16/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- utox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/utox.spec b/utox.spec index 25d87e4..a21c5f5 100644 --- a/utox.spec +++ b/utox.spec @@ -1,6 +1,6 @@ Name: utox Version: 0.18.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The lightweight Tox client License: MIT or GPLv3+ @@ -67,6 +67,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %{_mandir}/man1/%{name}.1* %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.18.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon May 24 17:47:48 CEST 2021 Robert-André Mauchin - 0.18.1-1 - Update to 0.18.1 - Close: rhbz#1919592 From 53d1ca24fbc531170e85fbd2a0f2598dbc8f7a9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sun, 1 Aug 2021 09:11:44 +0200 Subject: [PATCH 17/34] Convert to rpmautospec --- changelog | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++ utox.spec | 78 ++----------------------------------------------------- 2 files changed, 77 insertions(+), 76 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..cce3760 --- /dev/null +++ b/changelog @@ -0,0 +1,75 @@ +* Fri Jul 23 2021 Fedora Release Engineering - 0.18.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 24 17:47:48 CEST 2021 Robert-André Mauchin - 0.18.1-1 +- Update to 0.18.1 +- Close: rhbz#1919592 + +* Wed Jan 27 2021 Fedora Release Engineering - 0.18.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sat Dec 05 21:10:24 CET 2020 Robert-André Mauchin - 0.18.0-1 +- Update to 0.18.0 +- Close: rhbz#1902363 + +* Sat Aug 01 2020 Fedora Release Engineering - 0.17.2-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.17.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jun 19 12:40:14 CEST 2020 Robert-André Mauchin - 0.17.2-1 +- Update to 0.17.2 (#1823346) + +* Fri Jan 31 2020 Fedora Release Engineering - 0.17.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jan 23 01:58:44 CET 2020 Robert-André Mauchin - 0.17.1-2 +- Fix compatibility with GCC 10 + +* Wed Sep 25 16:55:23 CEST 2019 Robert-André Mauchin - 0.17.1-1 +- Release 0.17.1 + +* Sat Jul 27 2019 Fedora Release Engineering - 0.17.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Feb 05 2019 Björn Esser - 0.17.0-5 +- rebuilt (libvpx) + +* Sun Feb 03 2019 Fedora Release Engineering - 0.17.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 0.17.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 26 2018 Robert-André Mauchin - 0.17.0-2 +- Rebuilt for toxcore soname bump + +* Thu Apr 19 2018 Robert-André Mauchin - 0.17.0-1 +- Upstream release 0.17.0 + +* Fri Feb 09 2018 Fedora Release Engineering - 0.16.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Jan 28 2018 Robert-André Mauchin 0.16.1-5 +- actually rebuild for new libvpx + +* Fri Jan 26 2018 Tom Callaway - 0.16.1-4 +- rebuild for new libvpx + +* Thu Jan 18 2018 Igor Gnatenko - 0.16.1-3 +- Remove obsolete scriptlets + +* Tue Oct 31 2017 Robert-André Mauchin 0.16.1-2 +- Clean-up the SPEC + +* Thu Oct 12 2017 Robert-André Mauchin 0.16.1-1 +- New upstream release 0.16.1 + +* Fri Aug 18 2017 Robert-André Mauchin 0.15.0-2 +- Added appdata.xml +- Fixed Requires dependencies + +* Sat Jul 29 2017 Robert-André Mauchin 0.15.0-1 +- First RPM release diff --git a/utox.spec b/utox.spec index a21c5f5..da76f4c 100644 --- a/utox.spec +++ b/utox.spec @@ -1,6 +1,6 @@ Name: utox Version: 0.18.1 -Release: 2%{?dist} +Release: %autorelease Summary: The lightweight Tox client License: MIT or GPLv3+ @@ -67,78 +67,4 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %{_mandir}/man1/%{name}.1* %changelog -* Fri Jul 23 2021 Fedora Release Engineering - 0.18.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 24 17:47:48 CEST 2021 Robert-André Mauchin - 0.18.1-1 -- Update to 0.18.1 -- Close: rhbz#1919592 - -* Wed Jan 27 2021 Fedora Release Engineering - 0.18.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sat Dec 05 21:10:24 CET 2020 Robert-André Mauchin - 0.18.0-1 -- Update to 0.18.0 -- Close: rhbz#1902363 - -* Sat Aug 01 2020 Fedora Release Engineering - 0.17.2-3 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 0.17.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jun 19 12:40:14 CEST 2020 Robert-André Mauchin - 0.17.2-1 -- Update to 0.17.2 (#1823346) - -* Fri Jan 31 2020 Fedora Release Engineering - 0.17.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jan 23 01:58:44 CET 2020 Robert-André Mauchin - 0.17.1-2 -- Fix compatibility with GCC 10 - -* Wed Sep 25 16:55:23 CEST 2019 Robert-André Mauchin - 0.17.1-1 -- Release 0.17.1 - -* Sat Jul 27 2019 Fedora Release Engineering - 0.17.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Feb 05 2019 Björn Esser - 0.17.0-5 -- rebuilt (libvpx) - -* Sun Feb 03 2019 Fedora Release Engineering - 0.17.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 0.17.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 26 2018 Robert-André Mauchin - 0.17.0-2 -- Rebuilt for toxcore soname bump - -* Thu Apr 19 2018 Robert-André Mauchin - 0.17.0-1 -- Upstream release 0.17.0 - -* Fri Feb 09 2018 Fedora Release Engineering - 0.16.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Jan 28 2018 Robert-André Mauchin 0.16.1-5 -- actually rebuild for new libvpx - -* Fri Jan 26 2018 Tom Callaway - 0.16.1-4 -- rebuild for new libvpx - -* Thu Jan 18 2018 Igor Gnatenko - 0.16.1-3 -- Remove obsolete scriptlets - -* Tue Oct 31 2017 Robert-André Mauchin 0.16.1-2 -- Clean-up the SPEC - -* Thu Oct 12 2017 Robert-André Mauchin 0.16.1-1 -- New upstream release 0.16.1 - -* Fri Aug 18 2017 Robert-André Mauchin 0.15.0-2 -- Added appdata.xml -- Fixed Requires dependencies - -* Sat Jul 29 2017 Robert-André Mauchin 0.15.0-1 -- First RPM release +%autochangelog From 5eb08e5a9b064085cbd9462077378d11d7c06abd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sun, 1 Aug 2021 09:12:14 +0200 Subject: [PATCH 18/34] Fix FTBFS Close: rhbz#1988063 --- utox.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/utox.spec b/utox.spec index da76f4c..8db1d61 100644 --- a/utox.spec +++ b/utox.spec @@ -14,6 +14,9 @@ Source1: %{name}.appdata.xml # tar -zcvf third_party.tar.gz third_party/ Source2: third_party.tar.gz +# https://github.com/uTox/uTox/issues/1541 +# ExcludeArch: s390x + BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: desktop-file-utils @@ -41,7 +44,8 @@ Requires: hicolor-icon-theme %autosetup -N -T -D -a 2 -n uTox-%{version} %build -%cmake +# We use CMAKE_BUILD_TYPE="Release" to turn ASAN off +%cmake -DCMAKE_BUILD_TYPE="Release" %cmake_build %install From ae8c16ee842b4ec32284067594e977ee30753fc5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:43:11 +0000 Subject: [PATCH 19/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 35aaf48866ba5c9ad51b5e0135b6f7a19e28a57e Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Thu, 27 Jan 2022 16:41:51 -0500 Subject: [PATCH 20/34] rebuild for libvpx --- changelog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changelog b/changelog index cce3760..4e74d4f 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,6 @@ +* Thu Jan 27 2022 Tom Callaway - 0.18.1-6 +- rebuild for libvpx + * Fri Jul 23 2021 Fedora Release Engineering - 0.18.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From b426322958faf537b273583d73a23ae3a1b24634 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:36:11 +0000 Subject: [PATCH 21/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 200961455201f3f737a254edf95956b32ca1d914 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:01:52 +0000 Subject: [PATCH 22/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 7da83efa4d08282961cdea19e7e800a72a266ff7 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 15 Feb 2023 18:01:17 -0500 Subject: [PATCH 23/34] rebuild for libvpx --- changelog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changelog b/changelog index 4e74d4f..97fb09f 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,6 @@ +* Wed Feb 15 2023 Tom Callaway - 0.18.1-9 +- rebuild for libvpx + * Thu Jan 27 2022 Tom Callaway - 0.18.1-6 - rebuild for libvpx From a8be9a3569c13c1c1f8884b1961cb154a4e97af2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:20:11 +0000 Subject: [PATCH 24/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 8f381b001b354e5d918659bfc839a29b9b5dc399 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:22:08 +0000 Subject: [PATCH 25/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 4899760195cdb031639d57d9bbc3a970553bbf74 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 8 Feb 2024 00:04:51 +0000 Subject: [PATCH 26/34] Rebuild for libvpx 1.14.x From eaa0c5dfb1ebe171836819cde95c9ca965039a44 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:28:54 +0000 Subject: [PATCH 27/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b0b00dc86642b4ee063340ba38257a15eec83c11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 22:36:09 +0200 Subject: [PATCH 28/34] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- utox.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utox.spec b/utox.spec index 8db1d61..a4f1058 100644 --- a/utox.spec +++ b/utox.spec @@ -3,7 +3,8 @@ Version: 0.18.1 Release: %autorelease Summary: The lightweight Tox client -License: MIT or GPLv3+ +# Automatically converted from old format: MIT or GPLv3+ - review is highly recommended. +License: LicenseRef-Callaway-MIT OR GPL-3.0-or-later URL: https://github.com/uTox/uTox/ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Source1: %{name}.appdata.xml From a94d1070c176d11be7dac5284e6cb7b87be03cb1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:00:28 +0000 Subject: [PATCH 29/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 48646e528b975952c93f0ac30db39e8bb36dba12 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:54:43 +0000 Subject: [PATCH 30/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a0574eef1d5fbdc011d358f3704dabae03cd1779 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:43:54 +0000 Subject: [PATCH 31/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From fe43dd3275a850aeecb1a709e6ddb0336a537df0 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 19 Mar 2026 22:28:48 +0100 Subject: [PATCH 32/34] Rebuilt for libvpx-1.6.0 From fccdd2f9b1aab2eec5d220c585bbff0caea989e5 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 19 Mar 2026 23:05:30 +0100 Subject: [PATCH 33/34] Fix build --- utox.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utox.spec b/utox.spec index a4f1058..2ea6753 100644 --- a/utox.spec +++ b/utox.spec @@ -46,7 +46,7 @@ Requires: hicolor-icon-theme %build # We use CMAKE_BUILD_TYPE="Release" to turn ASAN off -%cmake -DCMAKE_BUILD_TYPE="Release" +%cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_BUILD_TYPE="Release" %cmake_build %install From affdb1f362473af9f3c793a767dd214d3294ad7f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:18:35 +0000 Subject: [PATCH 34/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild