Stefan Dirsch
11a0716ba5
- gcc10.patch
* fixed build against gcc10, which uses -fno-common by default
(patch picked from https://bugs.gentoo.org/707184)
OBS-URL: https://build.opensuse.org/request/show/812854
OBS-URL: https://build.opensuse.org/package/show/hardware/ddccontrol?expand=0&rev=9
71 lines
2.1 KiB
Diff
71 lines
2.1 KiB
Diff
Index: ddccontrol-0.4.2+20140105+git9d89d8c/src/gddccontrol/notebook.h
|
|
===================================================================
|
|
--- ddccontrol-0.4.2+20140105+git9d89d8c.orig/src/gddccontrol/notebook.h
|
|
+++ ddccontrol-0.4.2+20140105+git9d89d8c/src/gddccontrol/notebook.h
|
|
@@ -43,12 +43,12 @@
|
|
#endif
|
|
|
|
/* globals */
|
|
-struct monitor* mon;
|
|
+extern struct monitor* mon;
|
|
|
|
-GtkWidget* main_app_window;
|
|
+extern GtkWidget* main_app_window;
|
|
|
|
-GtkWidget* monitor_manager;
|
|
-GtkWidget* profile_manager;
|
|
+extern GtkWidget* monitor_manager;
|
|
+extern GtkWidget* profile_manager;
|
|
|
|
/* notebook.c */
|
|
|
|
@@ -91,13 +91,13 @@ void set_message_ok(char* message, int w
|
|
|
|
GtkWidget *stock_label_button(const gchar * stockid, const gchar *label_text, const gchar *tool_tip);
|
|
|
|
-GtkWidget* profile_manager_button;
|
|
-GtkWidget* saveprofile_button;
|
|
-GtkWidget* cancelprofile_button;
|
|
-GtkWidget* refresh_controls_button;
|
|
+extern GtkWidget* profile_manager_button;
|
|
+extern GtkWidget* saveprofile_button;
|
|
+extern GtkWidget* cancelprofile_button;
|
|
+extern GtkWidget* refresh_controls_button;
|
|
|
|
/* Multimonitor support */
|
|
-int current_monitor; /* current monitor */
|
|
-int num_monitor; /* total number of monitors */
|
|
+extern int current_monitor; /* current monitor */
|
|
+extern int num_monitor; /* total number of monitors */
|
|
|
|
#endif //NOTEBOOK_H
|
|
Index: ddccontrol-0.4.2+20140105+git9d89d8c/src/gddccontrol/main.c
|
|
===================================================================
|
|
--- ddccontrol-0.4.2+20140105+git9d89d8c.orig/src/gddccontrol/main.c
|
|
+++ ddccontrol-0.4.2+20140105+git9d89d8c/src/gddccontrol/main.c
|
|
@@ -28,6 +28,24 @@
|
|
|
|
#include "notebook.h"
|
|
|
|
+/* Globals previously in notebook.h */
|
|
+
|
|
+struct monitor* mon;
|
|
+GtkWidget* main_app_window;
|
|
+GtkWidget* monitor_manager;
|
|
+GtkWidget* profile_manager;
|
|
+GtkWidget* profile_manager_button;
|
|
+GtkWidget* saveprofile_button;
|
|
+GtkWidget* cancelprofile_button;
|
|
+GtkWidget* refresh_controls_button;
|
|
+
|
|
+/* Multimonitor support */
|
|
+int current_monitor; /* current monitor */
|
|
+int num_monitor; /* total number of monitors */
|
|
+
|
|
+/* End Globals moved for -fno-common/gcc10 fix */
|
|
+
|
|
+
|
|
GtkWidget* table;
|
|
|
|
GtkWidget *combo_box;
|