From f2aa4cd5009a2766674ae02d2cc4f5e4fddb4079 Mon Sep 17 00:00:00 2001 From: monsta Date: Tue, 13 Dec 2016 11:32:51 +0300 Subject: move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option --- libmateweather/mateweather-uninstalled.pc.in | 2 +- libmateweather/mateweather.pc.in | 2 +- libmateweather/test_locations.c | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) (limited to 'libmateweather') diff --git a/libmateweather/mateweather-uninstalled.pc.in b/libmateweather/mateweather-uninstalled.pc.in index daf8604..03e7461 100644 --- a/libmateweather/mateweather-uninstalled.pc.in +++ b/libmateweather/mateweather-uninstalled.pc.in @@ -7,7 +7,7 @@ includedir=@includedir@ Name: MateWeather Description: MateWeather shared library Version: @VERSION@ -Requires: glib-2.0 gobject-2.0 gdk-pixbuf-2.0 gtk+-@GTK_API_VERSION@ gio-2.0 +Requires: glib-2.0 gobject-2.0 gdk-pixbuf-2.0 gtk+-3.0 gio-2.0 Requires.private: libxml-2.0 libsoup-2.4 Libs: ${pc_top_builddir}/${pcfiledir}/libmateweather.la Cflags: -I${pc_top_builddir}/${pcfiledir}/.. diff --git a/libmateweather/mateweather.pc.in b/libmateweather/mateweather.pc.in index 785975a..a617c33 100644 --- a/libmateweather/mateweather.pc.in +++ b/libmateweather/mateweather.pc.in @@ -7,7 +7,7 @@ includedir=@includedir@ Name: MateWeather Description: MateWeather shared library Version: @VERSION@ -Requires: glib-2.0 gobject-2.0 gdk-pixbuf-2.0 gtk+-@GTK_API_VERSION@ gio-2.0 +Requires: glib-2.0 gobject-2.0 gdk-pixbuf-2.0 gtk+-3.0 gio-2.0 Requires.private: libxml-2.0 libsoup-2.4 Libs: -L${libdir} -lmateweather Libs.private: -lm diff --git a/libmateweather/test_locations.c b/libmateweather/test_locations.c index 7a11ad7..af1ad90 100644 --- a/libmateweather/test_locations.c +++ b/libmateweather/test_locations.c @@ -43,11 +43,7 @@ main (int argc, char **argv) g_signal_connect (window, "delete-event", G_CALLBACK (deleted), NULL); -#if GTK_CHECK_VERSION (3, 0, 0) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); -#else - vbox = gtk_vbox_new (FALSE, 8); -#endif gtk_container_add (GTK_CONTAINER (window), vbox); loc = mateweather_location_new_world (FALSE); -- cgit v1.2.1