diff --git a/programming/library/gypsy/files/g_type_init_deprecation.patch b/programming/library/gypsy/files/g_type_init_deprecation.patch index 80511f176c..fbe4716ae1 100644 --- a/programming/library/gypsy/files/g_type_init_deprecation.patch +++ b/programming/library/gypsy/files/g_type_init_deprecation.patch @@ -1,85 +1,63 @@ -diff -ru gypsy-0.9.orig/docs/gypsy-tutorial.html gypsy-0.9/docs/gypsy-tutorial.html ---- gypsy-0.9.orig/docs/gypsy-tutorial.html 2011-08-09 13:20:15.000000000 +0200 -+++ gypsy-0.9/docs/gypsy-tutorial.html 2013-04-30 10:28:42.599711724 +0200 -@@ -97,10 +97,11 @@ - GError *error = NULL; - char *path; +--- gypsy-0.9/src/main.c.orig 2013-05-19 18:06:00.511498667 +0100 ++++ gypsy-0.9/src/main.c 2013-05-19 18:06:44.789974863 +0100 +@@ -188,7 +188,9 @@ -+ #if !GLIB_CHECK_VERSION(2,35,0) - /* Libgypsy uses GObject, so the type system needs - to be started up before any Gypsy calls */ - g_type_init (); -- -+ #endif - /* Retrieve the default control */ - control = gypsy_control_get_default (); - -diff -ru gypsy-0.9.orig/examples/list-known-gps-devices.c gypsy-0.9/examples/list-known-gps-devices.c ---- gypsy-0.9.orig/examples/list-known-gps-devices.c 2011-10-17 18:32:37.000000000 +0200 -+++ gypsy-0.9/examples/list-known-gps-devices.c 2013-04-30 10:26:59.824754298 +0200 -@@ -21,8 +21,9 @@ + umask (022); + ++#if (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 35) + g_type_init (); ++#endif + + mainloop = g_main_loop_new (NULL, FALSE); + +--- gypsy-0.9/examples/list-known-gps-devices.c.orig 2013-05-19 18:20:12.719833223 +0100 ++++ gypsy-0.9/examples/list-known-gps-devices.c 2013-05-19 18:21:04.714404534 +0100 +@@ -21,7 +21,9 @@ GPtrArray *known_devices; int i; -+#if !GLIB_CHECK_VERSION(2,35,0) ++#if (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 35) g_type_init (); -- +#endif + discovery = gypsy_discovery_new (); known_devices = gypsy_discovery_list_devices (discovery, &error); - -diff -ru gypsy-0.9.orig/examples/simple-gps-dbus.c gypsy-0.9/examples/simple-gps-dbus.c ---- gypsy-0.9.orig/examples/simple-gps-dbus.c 2011-08-09 13:20:15.000000000 +0200 -+++ gypsy-0.9/examples/simple-gps-dbus.c 2013-04-30 10:26:20.862069029 +0200 +--- gypsy-0.9/examples/simple-gps-dbus.c.orig 2013-05-19 18:21:21.712591296 +0100 ++++ gypsy-0.9/examples/simple-gps-dbus.c 2013-05-19 18:22:36.394411761 +0100 @@ -122,7 +122,9 @@ DBusError error; GMainLoop *mainloop; -+#if !GLIB_CHECK_VERSION(2,35,0) - g_type_init (); +- g_type_init (); ++#if (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 35) ++ g_type_init (); +#endif conn = get_connection (); dbus_error_init (&error); -diff -ru gypsy-0.9.orig/examples/simple-gps-gypsy.c gypsy-0.9/examples/simple-gps-gypsy.c ---- gypsy-0.9.orig/examples/simple-gps-gypsy.c 2011-08-09 13:20:15.000000000 +0200 -+++ gypsy-0.9/examples/simple-gps-gypsy.c 2013-04-30 10:26:43.778354525 +0200 -@@ -68,8 +68,9 @@ +--- gypsy-0.9/examples/simple-gps-gypsy.c.orig 2013-05-19 18:21:29.829680477 +0100 ++++ gypsy-0.9/examples/simple-gps-gypsy.c 2013-05-19 18:22:57.716645989 +0100 +@@ -68,7 +68,9 @@ return 0; } -+#if !GLIB_CHECK_VERSION(2,35,0) - g_type_init (); -- +- g_type_init (); ++#if (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 35) ++ g_type_init (); +#endif + control = gypsy_control_get_default (); path = gypsy_control_create (control, argv[1], &error); - if (path == NULL) { -diff -ru gypsy-0.9.orig/examples/simple-gps-satellites.c gypsy-0.9/examples/simple-gps-satellites.c ---- gypsy-0.9.orig/examples/simple-gps-satellites.c 2011-08-09 13:20:15.000000000 +0200 -+++ gypsy-0.9/examples/simple-gps-satellites.c 2013-04-30 10:27:21.314396881 +0200 -@@ -43,8 +43,9 @@ +--- gypsy-0.9/examples/simple-gps-satellites.c.orig 2013-05-19 18:21:38.097771316 +0100 ++++ gypsy-0.9/examples/simple-gps-satellites.c 2013-05-19 18:23:09.356773853 +0100 +@@ -43,7 +43,9 @@ return 0; } -+#if !GLIB_CHECK_VERSION(2,35,0) - g_type_init (); -- +- g_type_init (); ++#if (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 35) ++ g_type_init (); +#endif + control = gypsy_control_get_default (); path = gypsy_control_create (control, argv[1], &error); - if (path == NULL) { -diff -ru gypsy-0.9.orig/src/main.c gypsy-0.9/src/main.c ---- gypsy-0.9.orig/src/main.c 2011-10-13 17:44:12.000000000 +0200 -+++ gypsy-0.9/src/main.c 2013-04-30 10:27:42.194049621 +0200 -@@ -188,8 +188,9 @@ - - umask (022); - -+#if !GLIB_CHECK_VERSION(2,35,0) - g_type_init (); -- -+#endif - mainloop = g_main_loop_new (NULL, FALSE); - - conn = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); diff --git a/programming/library/gypsy/files/gypsy-0.9-format.patch b/programming/library/gypsy/files/gypsy-0.9-format.patch new file mode 100644 index 0000000000..3e2628ee62 --- /dev/null +++ b/programming/library/gypsy/files/gypsy-0.9-format.patch @@ -0,0 +1,87 @@ +diff -up gypsy-0.9/src/gypsy-client.c.format gypsy-0.9/src/gypsy-client.c +--- gypsy-0.9/src/gypsy-client.c.format 2011-12-06 13:59:36.000000000 +0100 ++++ gypsy-0.9/src/gypsy-client.c 2017-10-02 23:54:53.450486922 +0200 +@@ -401,7 +401,7 @@ garmin_init (GIOChannel *channel) + + if (status != G_IO_STATUS_NORMAL) { + GYPSY_NOTE (CLIENT, "GARMIN: Error writing \"Private Set Mode\" packet:\n%s", g_strerror (errno)); +- g_set_error (&error, GYPSY_ERROR, errno, g_strerror (errno)); ++ g_set_error (&error, GYPSY_ERROR, errno, "%s", g_strerror (errno)); + return FALSE; + } + +@@ -428,7 +428,7 @@ garmin_init (GIOChannel *channel) + + if (status != G_IO_STATUS_NORMAL) { + GYPSY_NOTE (CLIENT, "GARMIN: Error writing \"Start PVT Transfer\" packet:\n%s", g_strerror (errno)); +- g_set_error (&error, GYPSY_ERROR, errno, g_strerror (errno)); ++ g_set_error (&error, GYPSY_ERROR, errno, "%s", g_strerror (errno)); + return FALSE; + } + +@@ -593,7 +593,7 @@ gypsy_client_start (GypsyClient *client, + + if (priv->fd == -1) { + g_warning ("Error opening device %s: %s", priv->device_path, g_strerror (errno)); +- g_set_error (error, GYPSY_ERROR, errno, g_strerror (errno)); ++ g_set_error (error, GYPSY_ERROR, errno, "%s", g_strerror (errno)); + return FALSE; + } + +@@ -602,7 +602,7 @@ gypsy_client_start (GypsyClient *client, + + if (tcgetattr (priv->fd, &term) < 0) { + g_warning ("Error getting term: %s", g_strerror (errno)); +- g_set_error (error, GYPSY_ERROR, errno, g_strerror (errno)); ++ g_set_error (error, GYPSY_ERROR, "%s", errno, g_strerror (errno)); + return FALSE; + } + +@@ -612,7 +612,7 @@ gypsy_client_start (GypsyClient *client, + + if (tcsetattr (priv->fd, TCSAFLUSH, &term) < 0) { + g_warning ("Error setting term: %s", g_strerror (errno)); +- g_set_error (error, GYPSY_ERROR, errno, g_strerror (errno)); ++ g_set_error (error, GYPSY_ERROR, errno, "%s", g_strerror (errno)); + return FALSE; + } + } +@@ -653,7 +653,7 @@ gypsy_client_start (GypsyClient *client, + + if (status != G_IO_STATUS_NORMAL) { + g_warning ("Error setting flags: %s", g_strerror (errno)); +- g_set_error (error, GYPSY_ERROR, errno, g_strerror (errno)); ++ g_set_error (error, GYPSY_ERROR, errno, "%s", g_strerror (errno)); + return FALSE; + } + +@@ -662,7 +662,7 @@ gypsy_client_start (GypsyClient *client, + + if (status != G_IO_STATUS_NORMAL) { + g_warning ("Error setting encoding: %s", g_strerror (errno)); +- g_set_error (error, GYPSY_ERROR, errno, g_strerror (errno)); ++ g_set_error (error, GYPSY_ERROR, errno, "%s", g_strerror (errno)); + return FALSE; + } + +@@ -692,7 +692,7 @@ gypsy_client_start (GypsyClient *client, + } + + g_warning ("Error connecting: %s", g_strerror (errno)); +- g_set_error (error, GYPSY_ERROR, errno, g_strerror (errno)); ++ g_set_error (error, GYPSY_ERROR, errno, "%s", g_strerror (errno)); + + g_source_remove (priv->error_id); + priv->error_id = 0; +diff -up gypsy-0.9/src/main.c.format gypsy-0.9/src/main.c +--- gypsy-0.9/src/main.c.format 2017-10-02 23:50:18.273403357 +0200 ++++ gypsy-0.9/src/main.c 2017-10-02 23:55:37.686178566 +0200 +@@ -156,7 +156,7 @@ main (int argc, + #if GLIB_CHECK_VERSION(2, 14, 0) + char *help; + help = g_option_context_get_help (context, TRUE, NULL); +- g_print (help); ++ g_print ("%s", help); + g_free (help); + #else + g_printerr ("Cannot parse arguments: %s\n", error->message); diff --git a/programming/library/gypsy/files/gypsy-0.9-gcc7.patch b/programming/library/gypsy/files/gypsy-0.9-gcc7.patch new file mode 100644 index 0000000000..dc3ef3960a --- /dev/null +++ b/programming/library/gypsy/files/gypsy-0.9-gcc7.patch @@ -0,0 +1,11 @@ +--- gypsy-0.9/configure.ac.gcc7 2017-10-02 23:40:24.118530168 +0200 ++++ gypsy-0.9/configure.ac 2017-10-02 23:48:34.002128724 +0200 +@@ -58,7 +58,7 @@ + AS_AC_EXPAND(LIBEXECDIR, $libexecdir) + AS_AC_EXPAND(DAEMON_USER, $with_user) + +-CFLAGS="$CFLAGS -g -Wall -Wno-format" ++CFLAGS="$CFLAGS -g -Wall" + + GTK_DOC_CHECK([1.6]) + # TODO: add --with-xsltproc argument to override PATH diff --git a/programming/library/gypsy/files/gypsy-0.9-mga-no-werror.patch b/programming/library/gypsy/files/gypsy-0.9-mga-no-werror.patch new file mode 100644 index 0000000000..90746017f9 --- /dev/null +++ b/programming/library/gypsy/files/gypsy-0.9-mga-no-werror.patch @@ -0,0 +1,13 @@ +Index: gypsy-0.9/configure.ac +=================================================================== +--- gypsy-0.9/configure.ac ++++ gypsy-0.9/configure.ac 2016-01-07 01:12:43.372398664 +0000 +@@ -58,7 +58,7 @@ + AS_AC_EXPAND(LIBEXECDIR, $libexecdir) + AS_AC_EXPAND(DAEMON_USER, $with_user) + +-CFLAGS="$CFLAGS -g -Wall -Werror -Wno-format" ++CFLAGS="$CFLAGS -g -Wall -Wno-format" + + GTK_DOC_CHECK([1.6]) + # TODO: add --with-xsltproc argument to override PATH diff --git a/programming/library/gypsy/pspec.xml b/programming/library/gypsy/pspec.xml index ab6042225b..b2139d11b7 100644 --- a/programming/library/gypsy/pspec.xml +++ b/programming/library/gypsy/pspec.xml @@ -26,6 +26,9 @@ g_type_init_deprecation.patch + gypsy-0.9-format.patch + gypsy-0.9-mga-no-werror.patch + gypsy-0.9-gcc7.patch