From ad6fe502638a596a3172c2078b13ceaf5ef3ae3b Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Wed, 22 Jan 2014 09:30:59 +0000 Subject: [PATCH] rebuild build files --- NEWS.html | 7 ++++++- config.status | 7 +++---- configure | 2 +- po/Makefile | 6 +++--- po/Makefile.in | 6 +++--- src/Makefile.in | 2 +- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/NEWS.html b/NEWS.html index e19f715..c0d9981 100644 --- a/NEWS.html +++ b/NEWS.html @@ -372,6 +372,11 @@ popup menu to filter columns of the table of tasks. allow to change the directory containing the notes.

+
  • +

    +fixed compilation with gtk+ 3.10 (ignore deprecation of GtkAction). +

    +
    • @@ -517,7 +522,7 @@ Initial release.
    diff --git a/config.status b/config.status index 25fe1fd..6c4b8ff 100755 --- a/config.status +++ b/config.status @@ -438,7 +438,7 @@ Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -ac_pwd='/home/jporsini/work.local/wpitchoune/svnpub/ptask/trunk' +ac_pwd='/home/jporsini/work/wpitchoune/svnpub/ptask/trunk' srcdir='.' INSTALL='/usr/bin/install -c' MKDIR_P='/bin/mkdir -p' @@ -689,8 +689,7 @@ S["JSON_CFLAGS"]="-I/usr/include/json-c " S["GTK_LIBS"]="-lgtk-3 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lglib-2.0 " S["GTK_CFLAGS"]="-pthread -I/usr/include/gtk-3.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/i"\ "nclude/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/harfbuzz -I/usr/inclu"\ -"de/freetype2 -I/usr/include/pixman-1 -I/usr/include/libpng12 -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -D"\ -"GSEAL_ENABLE " +"de/freetype2 -I/usr/include/pixman-1 -I/usr/include/libpng12 -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGSEAL_ENABLE " S["XEXT_LIBS"]="-lXext " S["XEXT_CFLAGS"]=" " S["X11_LIBS"]="-lX11 " @@ -758,7 +757,7 @@ S["mkdir_p"]="/bin/mkdir -p" S["MKDIR_P"]="/bin/mkdir -p" S["INSTALL_STRIP_PROGRAM"]="$(install_sh) -c -s" S["STRIP"]="" -S["install_sh"]="${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/ptask/trunk/install-sh" +S["install_sh"]="${SHELL} /home/jporsini/work/wpitchoune/svnpub/ptask/trunk/install-sh" S["MAKEINFO"]="makeinfo" S["AUTOHEADER"]="autoheader" S["AUTOMAKE"]="automake-1.13" diff --git a/configure b/configure index 6524127..18886a1 100755 --- a/configure +++ b/configure @@ -6846,7 +6846,7 @@ fi GTK_CFLAGS+=" -DGTK_DISABLE_SINGLE_INCLUDES " # ensure that no gtk deprecated symbols are used GTK_CFLAGS+=" -DGDK_DISABLE_DEPRECATED " -GTK_CFLAGS+=" -DGTK_DISABLE_DEPRECATED " +# GTK_CFLAGS+=" -DGTK_DISABLE_DEPRECATED " # ensure use of accessors GTK_CFLAGS+=" -DGSEAL_ENABLE " diff --git a/po/Makefile b/po/Makefile index 79402fd..430bf0b 100644 --- a/po/Makefile +++ b/po/Makefile @@ -34,12 +34,12 @@ INSTALL_DATA = ${INSTALL} -m 644 # We use $(mkdir_p). # In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as # "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, -# ${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/ptask/trunk/install-sh does not start with $(SHELL), so we add it. +# ${SHELL} /home/jporsini/work/wpitchoune/svnpub/ptask/trunk/install-sh does not start with $(SHELL), so we add it. # In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake # versions, $(mkinstalldirs) and $(install_sh) are unused. -mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/ptask/trunk/install-sh -d -install_sh = $(SHELL) ${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/ptask/trunk/install-sh +mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune/svnpub/ptask/trunk/install-sh -d +install_sh = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune/svnpub/ptask/trunk/install-sh MKDIR_P = /bin/mkdir -p mkdir_p = /bin/mkdir -p diff --git a/po/Makefile.in b/po/Makefile.in index 00e247f..9db3564 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -34,12 +34,12 @@ INSTALL_DATA = ${INSTALL} -m 644 # We use $(mkdir_p). # In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as # "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, -# ${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/ptask/trunk/install-sh does not start with $(SHELL), so we add it. +# ${SHELL} /home/jporsini/work/wpitchoune/svnpub/ptask/trunk/install-sh does not start with $(SHELL), so we add it. # In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake # versions, $(mkinstalldirs) and $(install_sh) are unused. -mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/ptask/trunk/install-sh -d -install_sh = $(SHELL) ${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/ptask/trunk/install-sh +mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune/svnpub/ptask/trunk/install-sh -d +install_sh = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune/svnpub/ptask/trunk/install-sh MKDIR_P = /bin/mkdir -p mkdir_p = /bin/mkdir -p diff --git a/src/Makefile.in b/src/Makefile.in index b93cf56..dcfd4a7 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -359,7 +359,7 @@ SUBDIRS = glade # -export-dynamic is need for defining handlers in the glade file. AM_LDFLAGS = -Wl,--as-needed -export-dynamic -AM_CPPFLAGS = -Wall -Werror $(GTK_CFLAGS) $(JSON_CFLAGS) +AM_CPPFLAGS = -Wall $(GTK_CFLAGS) $(JSON_CFLAGS) ptask_SOURCES = list.c list.h \ log.c log.h \ main.c \ -- 2.7.4