From d04180cf2457a7aadcf0d0b88a9b13c9a9820254 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Mon, 27 Oct 2014 22:23:40 +0100 Subject: [PATCH] Imported Upstream version 1.1.3 --- NEWS | 6 ++++++ configure | 25 +++++++++++++------------ configure.ac | 7 ++++--- src/Makefile.am | 2 +- src/Makefile.in | 2 +- src/psensor.1 | 2 +- src/server/psensor-server.1 | 2 +- 7 files changed, 27 insertions(+), 19 deletions(-) diff --git a/NEWS b/NEWS index b918701..5154de6 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,12 @@ Psensor NEWS ============ +v1.1.3 +------ + +* Fixed compilation issue with gtk+3.14 due to deprecation + of GtkStatusIcon. (Closes: #763257). + v1.1.2 ------ diff --git a/configure b/configure index 98bd186..c7ef949 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for psensor 1.1.2. +# Generated by GNU Autoconf 2.69 for psensor 1.1.3. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='psensor' PACKAGE_TARNAME='psensor' -PACKAGE_VERSION='1.1.2' -PACKAGE_STRING='psensor 1.1.2' +PACKAGE_VERSION='1.1.3' +PACKAGE_STRING='psensor 1.1.3' PACKAGE_BUGREPORT='jeanfi@gmail.com' PACKAGE_URL='http://wpitchoune.net/psensor' @@ -1404,7 +1404,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures psensor 1.1.2 to adapt to many kinds of systems. +\`configure' configures psensor 1.1.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1478,7 +1478,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of psensor 1.1.2:";; + short | recursive ) echo "Configuration of psensor 1.1.3:";; esac cat <<\_ACEOF @@ -1628,7 +1628,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -psensor configure 1.1.2 +psensor configure 1.1.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1930,7 +1930,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by psensor $as_me 1.1.2, which was +It was created by psensor $as_me 1.1.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2795,7 +2795,7 @@ fi # Define the identity of the package. PACKAGE='psensor' - VERSION='1.1.2' + VERSION='1.1.3' cat >>confdefs.h <<_ACEOF @@ -7404,9 +7404,10 @@ fi # ensure that only allowed headers are included GTK_CFLAGS+=" -DGTK_DISABLE_SINGLE_INCLUDES " -# ensure that no gtk deprecated symbols are used +# ensure that no gtk/dk deprecated symbols are used GTK_CFLAGS+=" -DGDK_DISABLE_DEPRECATED " -GTK_CFLAGS+=" -DGTK_DISABLE_DEPRECATED " +# do not enable flag because GtkStatusIcon is deprecated +#GTK_CFLAGS+=" -DGTK_DISABLE_DEPRECATED " # ensure use of accessors GTK_CFLAGS+=" -DGSEAL_ENABLE " @@ -9364,7 +9365,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by psensor $as_me 1.1.2, which was +This file was extended by psensor $as_me 1.1.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9431,7 +9432,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -psensor config.status 1.1.2 +psensor config.status 1.1.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index e13331b..23395b7 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([psensor], [1.1.2],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor]) +AC_INIT([psensor], [1.1.3],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor]) AM_INIT_AUTOMAKE([-Wall gnu]) @@ -66,9 +66,10 @@ PKG_CHECK_MODULES(GTK, AM_CONDITIONAL(GTK, test -n "$GTK_LIBS") # ensure that only allowed headers are included GTK_CFLAGS+=" -DGTK_DISABLE_SINGLE_INCLUDES " -# ensure that no gtk deprecated symbols are used +# ensure that no gtk/dk deprecated symbols are used GTK_CFLAGS+=" -DGDK_DISABLE_DEPRECATED " -GTK_CFLAGS+=" -DGTK_DISABLE_DEPRECATED " +# do not enable flag because GtkStatusIcon is deprecated +#GTK_CFLAGS+=" -DGTK_DISABLE_DEPRECATED " # ensure use of accessors GTK_CFLAGS+=" -DGSEAL_ENABLE " AC_SUBST(GTK_CFLAGS) diff --git a/src/Makefile.am b/src/Makefile.am index 3ddb1e7..7611095 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,7 +9,7 @@ SUBDIRS += server endif endif -AM_CPPFLAGS =-Wall -Werror \ +AM_CPPFLAGS =-Wall \ -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\"\ -DDATADIR=\""$(datadir)"\"\ -DPSENSOR_DESKTOP_FILE=\""psensor.desktop"\"\ diff --git a/src/Makefile.in b/src/Makefile.in index 40b3dcd..8d5c7ba 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -424,7 +424,7 @@ SUBDIRS = lib glade $(am__append_1) # -export-dynamic is need for defining handlers in the glade file. AM_LDFLAGS = -Wl,--as-needed -export-dynamic -AM_CPPFLAGS = -Wall -Werror -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\" \ +AM_CPPFLAGS = -Wall -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\" \ -DDATADIR=\""$(datadir)"\" \ -DPSENSOR_DESKTOP_FILE=\""psensor.desktop"\" \ -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/unity \ diff --git a/src/psensor.1 b/src/psensor.1 index 8a7687a..5ccddc2 100644 --- a/src/psensor.1 +++ b/src/psensor.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.44.1. -.TH PSENSOR "1" "September 2014" "psensor 1.1.2" "User Commands" +.TH PSENSOR "1" "September 2014" "psensor 1.1.3" "User Commands" .SH NAME psensor \- Temperature monitoring application .SH SYNOPSIS diff --git a/src/server/psensor-server.1 b/src/server/psensor-server.1 index 806c4f4..2c2acde 100644 --- a/src/server/psensor-server.1 +++ b/src/server/psensor-server.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.44.1. -.TH PSENSOR-SERVER "1" "September 2014" "psensor-server 1.1.2" "User Commands" +.TH PSENSOR-SERVER "1" "September 2014" "psensor-server 1.1.3" "User Commands" .SH NAME psensor-server \- Temperature and system monitoring Web server .SH SYNOPSIS -- 2.7.4