From: Andrea Zagli Date: Fri, 26 Jul 2013 08:12:35 +0000 (+0200) Subject: Changes to compile with gtk3 and libgda5. X-Git-Tag: 0.5.0^0 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=c1a9e66ea011933975271ce84fbbd9897bb48d0a;p=reptool%2Flibreptool Changes to compile with gtk3 and libgda5. --- diff --git a/configure.ac b/configure.ac index 2a04c6b..34981e2 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([libreptool], [0.2.2], [azagli@libero.it]) +AC_INIT([libreptool], [0.5.0], [azagli@libero.it]) AC_CONFIG_SRCDIR([src/rptprint.c]) AC_CONFIG_HEADER([config.h]) @@ -36,9 +36,9 @@ dnl ****************************** AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) # Checks for libraries. -PKG_CHECK_MODULES([REPTOOL], [gtk+-2.0 >= 2.10.0 +PKG_CHECK_MODULES([REPTOOL], [gtk+-3.0 >= 3.0.0 libxml-2.0 >= 2.6.0 - libgda-4.0 >= 4.0.0]) + libgda-5.0 >= 5.0.0]) AC_SUBST(REPTOOL_CFLAGS) AC_SUBST(REPTOOL_LIBS) diff --git a/libreptool.pc.in b/libreptool.pc.in index 258e83c..4874064 100644 --- a/libreptool.pc.in +++ b/libreptool.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: @PACKAGE_NAME@ Description: Library to manage RepTool files Version: @PACKAGE_VERSION@ -Requires: glib-2.0 gobject-2.0 libxml-2.0 libgda-4.0 +Requires: gtk+-3.0 libxml-2.0 libgda-5.0 Libs: -L${libdir} -lreptool Cflags: -I${includedir} diff --git a/src/rptcommon.h b/src/rptcommon.h index 5fd8609..a422be8 100644 --- a/src/rptcommon.h +++ b/src/rptcommon.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 Andrea Zagli + * Copyright (C) 2007-2013 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,7 @@ #define __RPT_COMMON_H__ #include -#include +#include #include #include diff --git a/tests/creation.c b/tests/creation.c index 7f05ab1..a4bc4f4 100644 --- a/tests/creation.c +++ b/tests/creation.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 Andrea Zagli + * Copyright (C) 2007-2013 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,8 +36,6 @@ main (int argc, char **argv) RptStroke stroke; RptColor *color; - g_type_init (); - rptr = rpt_report_new (); if (rptr != NULL) diff --git a/tests/gtktreeview.c b/tests/gtktreeview.c index 76dc3b6..357b889 100644 --- a/tests/gtktreeview.c +++ b/tests/gtktreeview.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Andrea Zagli + * Copyright (C) 2011-2013 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -119,7 +119,7 @@ main (int argc, char **argv) g_signal_connect (w, "delete-event", G_CALLBACK (on_w_delete_event), NULL); g_signal_connect (w, "destroy", gtk_main_quit, NULL); - GtkWidget *box = gtk_vbox_new (FALSE, 5); + GtkWidget *box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); gtk_container_add (GTK_CONTAINER (w), box); diff --git a/tests/liststore.c b/tests/liststore.c index 27458dc..3db3a1e 100644 --- a/tests/liststore.c +++ b/tests/liststore.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Andrea Zagli + * Copyright (C) 2011-2013 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -58,8 +58,6 @@ main (int argc, char **argv) GtkTreeIter iter; GHashTable *columns_names; - g_type_init (); - rptr = rpt_report_new_from_file (argv[1]); model = gtk_list_store_new (2, diff --git a/tests/rptprint.c b/tests/rptprint.c index 8b56093..43f1e71 100644 --- a/tests/rptprint.c +++ b/tests/rptprint.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 Andrea Zagli + * Copyright (C) 2006-2013 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -38,8 +38,6 @@ main (int argc, char **argv) RptPrint *rptp; - g_type_init (); - context = g_option_context_new ("- test rptprint"); g_option_context_add_main_entries (context, entries, NULL); diff --git a/tests/rptreport.c b/tests/rptreport.c index 364df77..a929e3e 100644 --- a/tests/rptreport.c +++ b/tests/rptreport.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 Andrea Zagli + * Copyright (C) 2007-2013 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -79,8 +79,6 @@ main (int argc, char **argv) GtkPrintSettings *settings; - g_type_init (); - context = g_option_context_new ("- test rptprint"); g_option_context_add_main_entries (context, entries, NULL);