Date: Thursday, April 27, 2017 @ 06:23:43 Author: ttoepper Revision: 225915
archrelease: copy trunk to community-i686, community-x86_64 Added: etherape/repos/community-i686/PKGBUILD (from rev 225914, etherape/trunk/PKGBUILD) etherape/repos/community-i686/drop-libgnomeui.patch (from rev 225914, etherape/trunk/drop-libgnomeui.patch) etherape/repos/community-x86_64/PKGBUILD (from rev 225914, etherape/trunk/PKGBUILD) etherape/repos/community-x86_64/drop-libgnomeui.patch (from rev 225914, etherape/trunk/drop-libgnomeui.patch) Deleted: etherape/repos/community-i686/PKGBUILD etherape/repos/community-i686/drop-libgnomeui.patch etherape/repos/community-x86_64/PKGBUILD etherape/repos/community-x86_64/drop-libgnomeui.patch ----------------------------------------+ /PKGBUILD | 82 ++++++++ /drop-libgnomeui.patch | 314 +++++++++++++++++++++++++++++++ community-i686/PKGBUILD | 40 --- community-i686/drop-libgnomeui.patch | 169 ---------------- community-x86_64/PKGBUILD | 40 --- community-x86_64/drop-libgnomeui.patch | 169 ---------------- 6 files changed, 396 insertions(+), 418 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2017-04-27 06:23:36 UTC (rev 225914) +++ community-i686/PKGBUILD 2017-04-27 06:23:43 UTC (rev 225915) @@ -1,40 +0,0 @@ -# $Id$ -# Maintainer: Thorsten Töpper <atsutane...@freethoughts.de> -# Contributor: kevin <ke...@archlinux.org> -# Contributor: Damir Perisa <damir.per...@bluewin.ch> - -pkgname=etherape -pkgver=0.9.14 -pkgrel=2 -pkgdesc='A graphical network monitor for various OSI layers and protocols' -arch=('i686' 'x86_64') -url="http://etherape.sourceforge.net/" -license=('GPL2') -depends=('libgnomecanvas' 'libpcap' 'popt') -makedepends=('rarian' 'gnome-doc-utils') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz - drop-libgnomeui.patch) -sha1sums=('d28ad8be9c571c204272391316ff261bdb4f1ec3' - 'SKIP') - -prepare() { - cd ${srcdir}/${pkgname}-${pkgver} - - # Remove libgnomeui dependency - patch -Np1 -i ../drop-libgnomeui.patch - - autoreconf -fi -} - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install -} Copied: etherape/repos/community-i686/PKGBUILD (from rev 225914, etherape/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2017-04-27 06:23:43 UTC (rev 225915) @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: Thorsten Töpper <atsutane...@freethoughts.de> +# Contributor: kevin <ke...@archlinux.org> +# Contributor: Damir Perisa <damir.per...@bluewin.ch> + +pkgname=etherape +pkgver=0.9.15 +pkgrel=1 +pkgdesc='A graphical network monitor for various OSI layers and protocols' +arch=('i686' 'x86_64') +url="http://etherape.sourceforge.net/" +license=('GPL2') +depends=('libgnomecanvas' 'libpcap' 'popt') +makedepends=('rarian' 'gnome-doc-utils') +source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'drop-libgnomeui.patch') +sha1sums=('9e97875b76a1543bf7145632dd3e018987ea1c96' + 'SKIP') + +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + + # Remove libgnomeui dependency + patch -Np1 -i ../drop-libgnomeui.patch + + autoreconf -fi +} + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install +} + Deleted: community-i686/drop-libgnomeui.patch =================================================================== --- community-i686/drop-libgnomeui.patch 2017-04-27 06:23:36 UTC (rev 225914) +++ community-i686/drop-libgnomeui.patch 2017-04-27 06:23:43 UTC (rev 225915) @@ -1,169 +0,0 @@ -diff -Naur etherape-0.9.14.orig/configure.in etherape-0.9.14/configure.in ---- etherape-0.9.14.orig/configure.in 2015-09-20 10:28:27.000000000 +0200 -+++ etherape-0.9.14/configure.in 2017-01-21 00:46:38.419035434 +0100 -@@ -25,7 +25,7 @@ - #AC_PROG_INTLTOOL(0.27) - - # Checks for libraries. --PKG_CHECK_MODULES(ETHERAPE, glib-2.0 libglade-2.0 libgnomeui-2.0) -+PKG_CHECK_MODULES(ETHERAPE, glib-2.0 libglade-2.0 libgnomecanvas-2.0 popt) - AC_SUBST(ETHERAPE_CFLAGS) - AC_SUBST(ETHERAPE_LIBS) - -diff -Naur etherape-0.9.14.orig/src/callbacks.c etherape-0.9.14/src/callbacks.c ---- etherape-0.9.14.orig/src/callbacks.c 2015-07-26 18:01:30.000000000 +0200 -+++ etherape-0.9.14/src/callbacks.c 2017-01-21 00:32:56.115504072 +0100 -@@ -21,7 +21,8 @@ - #include <config.h> - #endif - --#include <gnome.h> -+#include <gtk/gtk.h> -+#include <libgnomecanvas/libgnomecanvas.h> - #include "appdata.h" - #include "callbacks.h" - #include "diagram.h" -diff -Naur etherape-0.9.14.orig/src/capture.c etherape-0.9.14/src/capture.c ---- etherape-0.9.14.orig/src/capture.c 2015-09-18 23:47:48.000000000 +0200 -+++ etherape-0.9.14/src/capture.c 2017-01-21 01:19:23.827260356 +0100 -@@ -22,7 +22,8 @@ - #include <config.h> - #endif - --#include <gnome.h> -+#include <gtk/gtk.h> -+#include <libgnomecanvas/libgnomecanvas.h> - #include <ctype.h> - #include <netinet/in.h> - #include <pcap.h> -diff -Naur etherape-0.9.14.orig/src/diagram.c etherape-0.9.14/src/diagram.c ---- etherape-0.9.14.orig/src/diagram.c 2016-01-25 21:19:16.000000000 +0100 -+++ etherape-0.9.14/src/diagram.c 2017-01-21 00:33:11.775939150 +0100 -@@ -23,7 +23,8 @@ - - #include <arpa/inet.h> - --#include <gnome.h> -+#include <gtk/gtk.h> -+#include <libgnomecanvas/libgnomecanvas.h> - #include <regex.h> - - #include "appdata.h" -diff -Naur etherape-0.9.14.orig/src/main.c etherape-0.9.14/src/main.c ---- etherape-0.9.14.orig/src/main.c 2016-02-06 08:39:57.000000000 +0100 -+++ etherape-0.9.14/src/main.c 2017-01-21 01:13:33.093843675 +0100 -@@ -26,8 +26,9 @@ - #endif - #include <netinet/in.h> - #include <signal.h> --#include <gnome.h> --#include <libgnomeui/gnome-client.h> -+#include <popt.h> -+#include <glib/gi18n.h> -+#include <gtk/gtk.h> - #include "appdata.h" - #include "ip-cache.h" - #include "main.h" -@@ -53,11 +54,6 @@ - **************************************************************************/ - static void free_static_data(void); - static void set_debug_level (void); --static void session_die (GnomeClient * client, gpointer client_data); --static gint save_session (GnomeClient * client, gint phase, -- GnomeSaveStyle save_style, gint is_shutdown, -- GnomeInteractStyle interact_style, gint is_fast, -- gpointer client_data); - static void log_handler (gchar * log_domain, GLogLevelFlags mask, - const gchar * message, gpointer user_data); - -@@ -74,7 +70,6 @@ - main (int argc, char *argv[]) - { - GtkWidget *widget; -- GnomeClient *client; - gchar *mode_string = NULL; - gchar *cl_filter = NULL; - gchar *cl_interface = NULL; -@@ -143,9 +138,7 @@ - #else - version = g_strdup(VERSION); - #endif -- gnome_program_init ("EtherApe", version, -- LIBGNOMEUI_MODULE, argc, argv, -- GNOME_PARAM_POPT_TABLE, optionsTable, GNOME_PARAM_NONE); -+ gtk_init (&argc, &argv); - g_free(version); - - appdata_init(&appdata); -@@ -330,12 +323,6 @@ - /* Sets controls to the values of variables and connects signals */ - init_diagram (appdata.xml); - -- /* Session handling */ -- client = gnome_master_client (); -- g_signal_connect (G_OBJECT (client), "save_yourself", -- GTK_SIGNAL_FUNC (save_session), argv[0]); -- g_signal_connect (G_OBJECT (client), "die", -- GTK_SIGNAL_FUNC (session_die), NULL); - gtk_widget_show (appdata.app1); - - install_handlers(); -@@ -413,46 +400,6 @@ - g_log_default_handler("EtherApe", mask, message, user_data); - } - --/* the gnome session manager may call this function */ --static void --session_die (GnomeClient * client, gpointer client_data) --{ -- g_message ("in die"); -- gtk_main_quit (); --} /* session_die */ -- --/* the gnome session manager may call this function */ --static gboolean --save_session (GnomeClient * client, gint phase, GnomeSaveStyle save_style, -- gboolean is_shutdown, GnomeInteractStyle interact_style, -- gboolean is_fast, gpointer client_data) --{ -- gchar **argv; -- guint argc; -- -- /* allocate 0-filled, so it will be NULL-terminated */ -- argv = g_malloc0 (sizeof (gchar *) * 4); -- g_assert(argv); -- -- argc = 1; -- -- argv[0] = client_data; -- -- g_message ("In save_session"); --#if 0 -- if (message) -- { -- argv[1] = "--message"; -- argv[2] = message; -- argc = 3; -- } --#endif -- -- gnome_client_set_clone_command (client, argc, argv); -- gnome_client_set_restart_command (client, argc, argv); -- return TRUE; --} /* save_session */ -- - - /*************************************************************************** - * -diff -Naur etherape-0.9.14.orig/src/Makefile.am etherape-0.9.14/src/Makefile.am ---- etherape-0.9.14.orig/src/Makefile.am 2015-06-06 08:57:12.000000000 +0200 -+++ etherape-0.9.14/src/Makefile.am 2017-01-21 01:10:35.818770100 +0100 -@@ -47,7 +47,7 @@ - datastructs.c datastructs.h \ - ui_utils.c ui_utils.h - --etherape_LDADD = $(ETHERAPE_LIBS) $(PCAP_LIBS) -+etherape_LDADD = $(ETHERAPE_LIBS) $(PCAP_LIBS) -lpthread - etherape_LDFLAGS = - - .indent: $(etherape_SOURCES) $(etherape_INCLUDES) Copied: etherape/repos/community-i686/drop-libgnomeui.patch (from rev 225914, etherape/trunk/drop-libgnomeui.patch) =================================================================== --- community-i686/drop-libgnomeui.patch (rev 0) +++ community-i686/drop-libgnomeui.patch 2017-04-27 06:23:43 UTC (rev 225915) @@ -0,0 +1,157 @@ +diff -Naur etherape-0.9.15.orig/configure.ac etherape-0.9.15/configure.ac +--- etherape-0.9.15.orig/configure.ac 2017-04-27 05:53:49.226303987 +0000 ++++ etherape-0.9.15/configure.ac 2017-04-27 06:02:09.328964318 +0000 +@@ -26,7 +26,7 @@ + #AC_PROG_INTLTOOL(0.27) + + # Checks for libraries. +-PKG_CHECK_MODULES(ETHERAPE, glib-2.0 libglade-2.0 libgnomeui-2.0) ++PKG_CHECK_MODULES(ETHERAPE, glib-2.0 libglade-2.0 libgnomecanvas-2.0 popt) + AC_SUBST(ETHERAPE_CFLAGS) + AC_SUBST(ETHERAPE_LDFLAGS) + AC_SUBST(ETHERAPE_LIBS) +diff -Naur etherape-0.9.15.orig/src/callbacks.c etherape-0.9.15/src/callbacks.c +--- etherape-0.9.15.orig/src/callbacks.c 2017-04-27 05:53:49.236303974 +0000 ++++ etherape-0.9.15/src/callbacks.c 2017-04-27 05:56:33.176083792 +0000 +@@ -21,7 +21,8 @@ + #include <config.h> + #endif + +-#include <gnome.h> ++#include <gtk/gtk.h> ++#include <libgnomecanvas/libgnomecanvas.h> + #include "appdata.h" + #include "callbacks.h" + #include "diagram.h" +diff -Naur etherape-0.9.15.orig/src/diagram.c etherape-0.9.15/src/diagram.c +--- etherape-0.9.15.orig/src/diagram.c 2017-04-27 05:53:49.226303987 +0000 ++++ etherape-0.9.15/src/diagram.c 2017-04-27 05:58:19.665940538 +0000 +@@ -21,7 +21,8 @@ + #include <config.h> + #endif + +-#include <gnome.h> ++#include <gtk/gtk.h> ++#include <libgnomecanvas/libgnomecanvas.h> + + #include "appdata.h" + #include "diagram.h" +diff -Naur etherape-0.9.15.orig/src/main.c etherape-0.9.15/src/main.c +--- etherape-0.9.15.orig/src/main.c 2017-04-27 05:53:49.236303974 +0000 ++++ etherape-0.9.15/src/main.c 2017-04-27 06:17:23.701057857 +0000 +@@ -28,8 +28,10 @@ + #include <netinet/in.h> + #include <signal.h> + #include <glib.h> +-#include <gnome.h> +-#include <libgnomeui/gnome-client.h> ++#include <popt.h> ++#include <glib/gi18n.h> ++#include <gtk/gtk.h> ++#include <libgnomecanvas/libgnomecanvas.h> + #include "appdata.h" + #include "names/ip-cache.h" + #include "main.h" +@@ -60,11 +62,6 @@ + **************************************************************************/ + static void free_static_data(void); + static void set_debug_level (void); +-static void session_die (GnomeClient * client, gpointer client_data); +-static gint save_session (GnomeClient * client, gint phase, +- GnomeSaveStyle save_style, gint is_shutdown, +- GnomeInteractStyle interact_style, gint is_fast, +- gpointer client_data); + static void log_handler (gchar * log_domain, GLogLevelFlags mask, + const gchar * message, gpointer user_data); + static GPtrArray *parse_position_file(const gchar *path); +@@ -81,7 +78,6 @@ + int main (int argc, char *argv[]) + { + GtkWidget *widget; +- GnomeClient *client; + gchar *mode_string = NULL; + gchar *cl_filter = NULL; + gchar *cl_interface = NULL; +@@ -188,9 +184,7 @@ + #else + version = g_strdup(VERSION); + #endif +- gnome_program_init ("EtherApe", version, +- LIBGNOMEUI_MODULE, argc, argv, +- GNOME_PARAM_POPT_TABLE, optionsTable, GNOME_PARAM_NONE); ++ gtk_init (&argc, &argv); + g_free(version); + + set_debug_level(); +@@ -311,12 +305,6 @@ + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widget), FALSE); + } + +- /* Session handling */ +- client = gnome_master_client (); +- g_signal_connect (G_OBJECT (client), "save_yourself", +- GTK_SIGNAL_FUNC (save_session), argv[0]); +- g_signal_connect (G_OBJECT (client), "die", +- GTK_SIGNAL_FUNC (session_die), NULL); + gtk_widget_show (appdata.app1); + + install_handlers(); +@@ -496,46 +484,6 @@ + g_log_default_handler("EtherApe", mask, message, user_data); + } + +-/* the gnome session manager may call this function */ +-static void +-session_die (GnomeClient * client, gpointer client_data) +-{ +- g_message ("in die"); +- gtk_main_quit (); +-} /* session_die */ +- +-/* the gnome session manager may call this function */ +-static gboolean +-save_session (GnomeClient * client, gint phase, GnomeSaveStyle save_style, +- gboolean is_shutdown, GnomeInteractStyle interact_style, +- gboolean is_fast, gpointer client_data) +-{ +- gchar **argv; +- guint argc; +- +- /* allocate 0-filled, so it will be NULL-terminated */ +- argv = g_malloc0 (sizeof (gchar *) * 4); +- g_assert(argv); +- +- argc = 1; +- +- argv[0] = client_data; +- +- g_message ("In save_session"); +-#if 0 +- if (message) +- { +- argv[1] = "--message"; +- argv[2] = message; +- argc = 3; +- } +-#endif +- +- gnome_client_set_clone_command (client, argc, argv); +- gnome_client_set_restart_command (client, argc, argv); +- return TRUE; +-} /* save_session */ +- + + /*************************************************************************** + * +diff -Naur etherape-0.9.15.orig/src/Makefile.am etherape-0.9.15/src/Makefile.am +--- etherape-0.9.15.orig/src/Makefile.am 2017-04-27 05:53:49.236303974 +0000 ++++ etherape-0.9.15/src/Makefile.am 2017-04-27 06:04:43.992088744 +0000 +@@ -65,7 +65,7 @@ + etherape_SOURCES += names/thread_resolve.c names/thread_resolve.h + endif + +-etherape_LDADD = $(ETHERAPE_LIBS) $(PCAP_LIBS) ++etherape_LDADD = $(ETHERAPE_LIBS) $(PCAP_LIBS) -lpthread + etherape_LDFLAGS = $(ETHERAPE_LDFLAGS) + + .indent: $(etherape_SOURCES) $(etherape_INCLUDES) Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2017-04-27 06:23:36 UTC (rev 225914) +++ community-x86_64/PKGBUILD 2017-04-27 06:23:43 UTC (rev 225915) @@ -1,40 +0,0 @@ -# $Id$ -# Maintainer: Thorsten Töpper <atsutane...@freethoughts.de> -# Contributor: kevin <ke...@archlinux.org> -# Contributor: Damir Perisa <damir.per...@bluewin.ch> - -pkgname=etherape -pkgver=0.9.14 -pkgrel=2 -pkgdesc='A graphical network monitor for various OSI layers and protocols' -arch=('i686' 'x86_64') -url="http://etherape.sourceforge.net/" -license=('GPL2') -depends=('libgnomecanvas' 'libpcap' 'popt') -makedepends=('rarian' 'gnome-doc-utils') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz - drop-libgnomeui.patch) -sha1sums=('d28ad8be9c571c204272391316ff261bdb4f1ec3' - 'SKIP') - -prepare() { - cd ${srcdir}/${pkgname}-${pkgver} - - # Remove libgnomeui dependency - patch -Np1 -i ../drop-libgnomeui.patch - - autoreconf -fi -} - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install -} Copied: etherape/repos/community-x86_64/PKGBUILD (from rev 225914, etherape/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2017-04-27 06:23:43 UTC (rev 225915) @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: Thorsten Töpper <atsutane...@freethoughts.de> +# Contributor: kevin <ke...@archlinux.org> +# Contributor: Damir Perisa <damir.per...@bluewin.ch> + +pkgname=etherape +pkgver=0.9.15 +pkgrel=1 +pkgdesc='A graphical network monitor for various OSI layers and protocols' +arch=('i686' 'x86_64') +url="http://etherape.sourceforge.net/" +license=('GPL2') +depends=('libgnomecanvas' 'libpcap' 'popt') +makedepends=('rarian' 'gnome-doc-utils') +source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'drop-libgnomeui.patch') +sha1sums=('9e97875b76a1543bf7145632dd3e018987ea1c96' + 'SKIP') + +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + + # Remove libgnomeui dependency + patch -Np1 -i ../drop-libgnomeui.patch + + autoreconf -fi +} + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install +} + Deleted: community-x86_64/drop-libgnomeui.patch =================================================================== --- community-x86_64/drop-libgnomeui.patch 2017-04-27 06:23:36 UTC (rev 225914) +++ community-x86_64/drop-libgnomeui.patch 2017-04-27 06:23:43 UTC (rev 225915) @@ -1,169 +0,0 @@ -diff -Naur etherape-0.9.14.orig/configure.in etherape-0.9.14/configure.in ---- etherape-0.9.14.orig/configure.in 2015-09-20 10:28:27.000000000 +0200 -+++ etherape-0.9.14/configure.in 2017-01-21 00:46:38.419035434 +0100 -@@ -25,7 +25,7 @@ - #AC_PROG_INTLTOOL(0.27) - - # Checks for libraries. --PKG_CHECK_MODULES(ETHERAPE, glib-2.0 libglade-2.0 libgnomeui-2.0) -+PKG_CHECK_MODULES(ETHERAPE, glib-2.0 libglade-2.0 libgnomecanvas-2.0 popt) - AC_SUBST(ETHERAPE_CFLAGS) - AC_SUBST(ETHERAPE_LIBS) - -diff -Naur etherape-0.9.14.orig/src/callbacks.c etherape-0.9.14/src/callbacks.c ---- etherape-0.9.14.orig/src/callbacks.c 2015-07-26 18:01:30.000000000 +0200 -+++ etherape-0.9.14/src/callbacks.c 2017-01-21 00:32:56.115504072 +0100 -@@ -21,7 +21,8 @@ - #include <config.h> - #endif - --#include <gnome.h> -+#include <gtk/gtk.h> -+#include <libgnomecanvas/libgnomecanvas.h> - #include "appdata.h" - #include "callbacks.h" - #include "diagram.h" -diff -Naur etherape-0.9.14.orig/src/capture.c etherape-0.9.14/src/capture.c ---- etherape-0.9.14.orig/src/capture.c 2015-09-18 23:47:48.000000000 +0200 -+++ etherape-0.9.14/src/capture.c 2017-01-21 01:19:23.827260356 +0100 -@@ -22,7 +22,8 @@ - #include <config.h> - #endif - --#include <gnome.h> -+#include <gtk/gtk.h> -+#include <libgnomecanvas/libgnomecanvas.h> - #include <ctype.h> - #include <netinet/in.h> - #include <pcap.h> -diff -Naur etherape-0.9.14.orig/src/diagram.c etherape-0.9.14/src/diagram.c ---- etherape-0.9.14.orig/src/diagram.c 2016-01-25 21:19:16.000000000 +0100 -+++ etherape-0.9.14/src/diagram.c 2017-01-21 00:33:11.775939150 +0100 -@@ -23,7 +23,8 @@ - - #include <arpa/inet.h> - --#include <gnome.h> -+#include <gtk/gtk.h> -+#include <libgnomecanvas/libgnomecanvas.h> - #include <regex.h> - - #include "appdata.h" -diff -Naur etherape-0.9.14.orig/src/main.c etherape-0.9.14/src/main.c ---- etherape-0.9.14.orig/src/main.c 2016-02-06 08:39:57.000000000 +0100 -+++ etherape-0.9.14/src/main.c 2017-01-21 01:13:33.093843675 +0100 -@@ -26,8 +26,9 @@ - #endif - #include <netinet/in.h> - #include <signal.h> --#include <gnome.h> --#include <libgnomeui/gnome-client.h> -+#include <popt.h> -+#include <glib/gi18n.h> -+#include <gtk/gtk.h> - #include "appdata.h" - #include "ip-cache.h" - #include "main.h" -@@ -53,11 +54,6 @@ - **************************************************************************/ - static void free_static_data(void); - static void set_debug_level (void); --static void session_die (GnomeClient * client, gpointer client_data); --static gint save_session (GnomeClient * client, gint phase, -- GnomeSaveStyle save_style, gint is_shutdown, -- GnomeInteractStyle interact_style, gint is_fast, -- gpointer client_data); - static void log_handler (gchar * log_domain, GLogLevelFlags mask, - const gchar * message, gpointer user_data); - -@@ -74,7 +70,6 @@ - main (int argc, char *argv[]) - { - GtkWidget *widget; -- GnomeClient *client; - gchar *mode_string = NULL; - gchar *cl_filter = NULL; - gchar *cl_interface = NULL; -@@ -143,9 +138,7 @@ - #else - version = g_strdup(VERSION); - #endif -- gnome_program_init ("EtherApe", version, -- LIBGNOMEUI_MODULE, argc, argv, -- GNOME_PARAM_POPT_TABLE, optionsTable, GNOME_PARAM_NONE); -+ gtk_init (&argc, &argv); - g_free(version); - - appdata_init(&appdata); -@@ -330,12 +323,6 @@ - /* Sets controls to the values of variables and connects signals */ - init_diagram (appdata.xml); - -- /* Session handling */ -- client = gnome_master_client (); -- g_signal_connect (G_OBJECT (client), "save_yourself", -- GTK_SIGNAL_FUNC (save_session), argv[0]); -- g_signal_connect (G_OBJECT (client), "die", -- GTK_SIGNAL_FUNC (session_die), NULL); - gtk_widget_show (appdata.app1); - - install_handlers(); -@@ -413,46 +400,6 @@ - g_log_default_handler("EtherApe", mask, message, user_data); - } - --/* the gnome session manager may call this function */ --static void --session_die (GnomeClient * client, gpointer client_data) --{ -- g_message ("in die"); -- gtk_main_quit (); --} /* session_die */ -- --/* the gnome session manager may call this function */ --static gboolean --save_session (GnomeClient * client, gint phase, GnomeSaveStyle save_style, -- gboolean is_shutdown, GnomeInteractStyle interact_style, -- gboolean is_fast, gpointer client_data) --{ -- gchar **argv; -- guint argc; -- -- /* allocate 0-filled, so it will be NULL-terminated */ -- argv = g_malloc0 (sizeof (gchar *) * 4); -- g_assert(argv); -- -- argc = 1; -- -- argv[0] = client_data; -- -- g_message ("In save_session"); --#if 0 -- if (message) -- { -- argv[1] = "--message"; -- argv[2] = message; -- argc = 3; -- } --#endif -- -- gnome_client_set_clone_command (client, argc, argv); -- gnome_client_set_restart_command (client, argc, argv); -- return TRUE; --} /* save_session */ -- - - /*************************************************************************** - * -diff -Naur etherape-0.9.14.orig/src/Makefile.am etherape-0.9.14/src/Makefile.am ---- etherape-0.9.14.orig/src/Makefile.am 2015-06-06 08:57:12.000000000 +0200 -+++ etherape-0.9.14/src/Makefile.am 2017-01-21 01:10:35.818770100 +0100 -@@ -47,7 +47,7 @@ - datastructs.c datastructs.h \ - ui_utils.c ui_utils.h - --etherape_LDADD = $(ETHERAPE_LIBS) $(PCAP_LIBS) -+etherape_LDADD = $(ETHERAPE_LIBS) $(PCAP_LIBS) -lpthread - etherape_LDFLAGS = - - .indent: $(etherape_SOURCES) $(etherape_INCLUDES) Copied: etherape/repos/community-x86_64/drop-libgnomeui.patch (from rev 225914, etherape/trunk/drop-libgnomeui.patch) =================================================================== --- community-x86_64/drop-libgnomeui.patch (rev 0) +++ community-x86_64/drop-libgnomeui.patch 2017-04-27 06:23:43 UTC (rev 225915) @@ -0,0 +1,157 @@ +diff -Naur etherape-0.9.15.orig/configure.ac etherape-0.9.15/configure.ac +--- etherape-0.9.15.orig/configure.ac 2017-04-27 05:53:49.226303987 +0000 ++++ etherape-0.9.15/configure.ac 2017-04-27 06:02:09.328964318 +0000 +@@ -26,7 +26,7 @@ + #AC_PROG_INTLTOOL(0.27) + + # Checks for libraries. +-PKG_CHECK_MODULES(ETHERAPE, glib-2.0 libglade-2.0 libgnomeui-2.0) ++PKG_CHECK_MODULES(ETHERAPE, glib-2.0 libglade-2.0 libgnomecanvas-2.0 popt) + AC_SUBST(ETHERAPE_CFLAGS) + AC_SUBST(ETHERAPE_LDFLAGS) + AC_SUBST(ETHERAPE_LIBS) +diff -Naur etherape-0.9.15.orig/src/callbacks.c etherape-0.9.15/src/callbacks.c +--- etherape-0.9.15.orig/src/callbacks.c 2017-04-27 05:53:49.236303974 +0000 ++++ etherape-0.9.15/src/callbacks.c 2017-04-27 05:56:33.176083792 +0000 +@@ -21,7 +21,8 @@ + #include <config.h> + #endif + +-#include <gnome.h> ++#include <gtk/gtk.h> ++#include <libgnomecanvas/libgnomecanvas.h> + #include "appdata.h" + #include "callbacks.h" + #include "diagram.h" +diff -Naur etherape-0.9.15.orig/src/diagram.c etherape-0.9.15/src/diagram.c +--- etherape-0.9.15.orig/src/diagram.c 2017-04-27 05:53:49.226303987 +0000 ++++ etherape-0.9.15/src/diagram.c 2017-04-27 05:58:19.665940538 +0000 +@@ -21,7 +21,8 @@ + #include <config.h> + #endif + +-#include <gnome.h> ++#include <gtk/gtk.h> ++#include <libgnomecanvas/libgnomecanvas.h> + + #include "appdata.h" + #include "diagram.h" +diff -Naur etherape-0.9.15.orig/src/main.c etherape-0.9.15/src/main.c +--- etherape-0.9.15.orig/src/main.c 2017-04-27 05:53:49.236303974 +0000 ++++ etherape-0.9.15/src/main.c 2017-04-27 06:17:23.701057857 +0000 +@@ -28,8 +28,10 @@ + #include <netinet/in.h> + #include <signal.h> + #include <glib.h> +-#include <gnome.h> +-#include <libgnomeui/gnome-client.h> ++#include <popt.h> ++#include <glib/gi18n.h> ++#include <gtk/gtk.h> ++#include <libgnomecanvas/libgnomecanvas.h> + #include "appdata.h" + #include "names/ip-cache.h" + #include "main.h" +@@ -60,11 +62,6 @@ + **************************************************************************/ + static void free_static_data(void); + static void set_debug_level (void); +-static void session_die (GnomeClient * client, gpointer client_data); +-static gint save_session (GnomeClient * client, gint phase, +- GnomeSaveStyle save_style, gint is_shutdown, +- GnomeInteractStyle interact_style, gint is_fast, +- gpointer client_data); + static void log_handler (gchar * log_domain, GLogLevelFlags mask, + const gchar * message, gpointer user_data); + static GPtrArray *parse_position_file(const gchar *path); +@@ -81,7 +78,6 @@ + int main (int argc, char *argv[]) + { + GtkWidget *widget; +- GnomeClient *client; + gchar *mode_string = NULL; + gchar *cl_filter = NULL; + gchar *cl_interface = NULL; +@@ -188,9 +184,7 @@ + #else + version = g_strdup(VERSION); + #endif +- gnome_program_init ("EtherApe", version, +- LIBGNOMEUI_MODULE, argc, argv, +- GNOME_PARAM_POPT_TABLE, optionsTable, GNOME_PARAM_NONE); ++ gtk_init (&argc, &argv); + g_free(version); + + set_debug_level(); +@@ -311,12 +305,6 @@ + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widget), FALSE); + } + +- /* Session handling */ +- client = gnome_master_client (); +- g_signal_connect (G_OBJECT (client), "save_yourself", +- GTK_SIGNAL_FUNC (save_session), argv[0]); +- g_signal_connect (G_OBJECT (client), "die", +- GTK_SIGNAL_FUNC (session_die), NULL); + gtk_widget_show (appdata.app1); + + install_handlers(); +@@ -496,46 +484,6 @@ + g_log_default_handler("EtherApe", mask, message, user_data); + } + +-/* the gnome session manager may call this function */ +-static void +-session_die (GnomeClient * client, gpointer client_data) +-{ +- g_message ("in die"); +- gtk_main_quit (); +-} /* session_die */ +- +-/* the gnome session manager may call this function */ +-static gboolean +-save_session (GnomeClient * client, gint phase, GnomeSaveStyle save_style, +- gboolean is_shutdown, GnomeInteractStyle interact_style, +- gboolean is_fast, gpointer client_data) +-{ +- gchar **argv; +- guint argc; +- +- /* allocate 0-filled, so it will be NULL-terminated */ +- argv = g_malloc0 (sizeof (gchar *) * 4); +- g_assert(argv); +- +- argc = 1; +- +- argv[0] = client_data; +- +- g_message ("In save_session"); +-#if 0 +- if (message) +- { +- argv[1] = "--message"; +- argv[2] = message; +- argc = 3; +- } +-#endif +- +- gnome_client_set_clone_command (client, argc, argv); +- gnome_client_set_restart_command (client, argc, argv); +- return TRUE; +-} /* save_session */ +- + + /*************************************************************************** + * +diff -Naur etherape-0.9.15.orig/src/Makefile.am etherape-0.9.15/src/Makefile.am +--- etherape-0.9.15.orig/src/Makefile.am 2017-04-27 05:53:49.236303974 +0000 ++++ etherape-0.9.15/src/Makefile.am 2017-04-27 06:04:43.992088744 +0000 +@@ -65,7 +65,7 @@ + etherape_SOURCES += names/thread_resolve.c names/thread_resolve.h + endif + +-etherape_LDADD = $(ETHERAPE_LIBS) $(PCAP_LIBS) ++etherape_LDADD = $(ETHERAPE_LIBS) $(PCAP_LIBS) -lpthread + etherape_LDFLAGS = $(ETHERAPE_LDFLAGS) + + .indent: $(etherape_SOURCES) $(etherape_INCLUDES)