diff options
| author | Timothée Floure <timothee.floure@fnux.ch> | 2018-06-26 12:03:09 +0200 |
|---|---|---|
| committer | Timothée Floure <timothee.floure@fnux.ch> | 2018-06-26 12:03:09 +0200 |
| commit | f97327fdfe2cf9b2eeae30be16f69cc17ceef235 (patch) | |
| tree | bd41a532936d82b73908b5984e68c64227f5127f | |
| parent | e23ac1b371abb7cb691c7267010247daf05b83ed (diff) | |
| download | rpm-gcolor3-f97327fdfe2cf9b2eeae30be16f69cc17ceef235.tar.gz rpm-gcolor3-f97327fdfe2cf9b2eeae30be16f69cc17ceef235.tar.xz rpm-gcolor3-f97327fdfe2cf9b2eeae30be16f69cc17ceef235.zip | |
Fix compilation for F28+
| -rw-r--r-- | gcolor3-2.2-cast_error.patch | 23 | ||||
| -rw-r--r-- | gcolor3.spec | 5 |
2 files changed, 28 insertions, 0 deletions
diff --git a/gcolor3-2.2-cast_error.patch b/gcolor3-2.2-cast_error.patch new file mode 100644 index 0000000..d87d5a5 --- /dev/null +++ b/gcolor3-2.2-cast_error.patch @@ -0,0 +1,23 @@ +--- src/gcolor3-application.c.orig 2018-06-26 11:46:38.380289447 +0200 ++++ src/gcolor3-application.c 2018-06-26 11:46:41.815303811 +0200 +@@ -36,6 +36,11 @@ + + G_DEFINE_TYPE_WITH_PRIVATE (Gcolor3Application, gcolor3_application, GTK_TYPE_APPLICATION); + ++static void destroy(GtkWidget *widget, __attribute__((unused)) gpointer user_data) ++{ ++ gtk_widget_destroy(widget); ++} ++ + static void + gcolor3_application_action_about (UNUSED GSimpleAction *action, + UNUSED GVariant *parameter, +@@ -77,7 +82,7 @@ + + windows = gtk_application_get_windows (GTK_APPLICATION (user_data)); + +- g_list_foreach (windows, (GFunc) gtk_widget_destroy, NULL); ++ g_list_foreach (windows, (GFunc) destroy, NULL); + } + + static GActionEntry app_entries[] = { diff --git a/gcolor3.spec b/gcolor3.spec index c7d696b..8150f82 100644 --- a/gcolor3.spec +++ b/gcolor3.spec @@ -8,6 +8,7 @@ URL: https://github.com/Unia/gcolor3 Source0: https://github.com/Hjdskes/gcolor3/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Patch0: gcolor3-2.2-appdata_url.patch +Patch1: gcolor3-2.2-cast_error.patch BuildRequires: gnome-common,gtk3-devel >= 3.12.0,intltool,desktop-file-utils,gettext,libappstream-glib %description @@ -20,6 +21,7 @@ Gcolor2). %prep %setup -q %patch0 +%patch1 NOCONFIGURE=1 ./autogen.sh %build @@ -53,6 +55,9 @@ fi %{_datadir}/icons/hicolor/scalable/apps/gcolor3.svg %changelog +* Tue Jun 26 2018 Timothée Floure <fnux@fedoraproject.org> - 2.2-5 + - Fix compilation for F28+ (patch1) + * Sun Sep 03 2017 Timothée Floure <timothee.floure@fnux.ch> - 2.2-4 - Update license field from GPLv2 to GPLv2+ - Use the --nonet flag in gcolor3.appdata.xml's validation |