From: Jean-Philippe Orsini Date: Mon, 2 Apr 2012 07:28:48 +0000 (+0000) Subject: gtk3 minimal version X-Git-Tag: v0.8.0.5~455 X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=commitdiff_plain;h=fcfe3c6975bfc047988b6219c0d1fec41ef26db4 gtk3 minimal version --- diff --git a/README b/README index 474b831..3f69daf 100644 --- a/README +++ b/README @@ -8,7 +8,7 @@ It can monitor: * the temperature of the motherboard and CPU sensors (using lm-sensors). * the temperature of the NVidia GPUs (using XNVCtrl). - * the temperature of the Hard Disk Drives (using hddtemp). + * the temperature of the Hard Disk Drives (using hddtemp or libatasmart). * the rotation speed of the fans (using lm-sensors). * the temperature of a remote computer. * the cpu load. @@ -61,7 +61,7 @@ Debian kfreebsd --------------- Compilation requires the following packages: -gcc libgtk2.0-dev libsensors4-dev libgconf2-dev help2man +gcc libgtk3.0-dev libsensors4-dev libgconf2-dev help2man libcurl4-openssl-dev libjson0-dev libmicrohttpd-dev libgtop2-dev libatasmart-dev @@ -88,18 +88,6 @@ sudo apt-get update sudo apt-get install psensor sudo apt-get install psensor-server -Centos 6 --------- - -psensor can be compiled on Centos 6.0, by installing the following -packages: -gcc gtk2-devel GConf2-devel help2man gettext-devel libnotify-deval -lm_sensors-devel libgtop2-devel - -As microhttpd and json-c libraries are not available in the standard centos -repository, psensor-server cannot be compiled and the remote -monitoring feature of psensor will not be available. - ATI/AMD GPU Support ------------------- @@ -129,7 +117,7 @@ Psensor compilation requires: * make/gcc * lm-sensors * library sensors4 - * library gtk2 (>= 2.18) + * library gtk3 * library gconf2 * help2man * library libnotify (optional) diff --git a/config.h.in b/config.h.in index 8c1b8f7..965f4fa 100644 --- a/config.h.in +++ b/config.h.in @@ -43,9 +43,6 @@ /* Define to 1 if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY -/* Use GTK3 */ -#undef HAVE_GTK3 - /* Use GTOP */ #undef HAVE_GTOP diff --git a/configure b/configure index 0081f0b..5f46684 100755 --- a/configure +++ b/configure @@ -649,8 +649,6 @@ ATASMART_LIBS ATASMART_CFLAGS GCONF_LIBS GCONF_CFLAGS -GTK_FALSE -GTK_TRUE GTK_LIBS GTK_CFLAGS XEXT_LIBS @@ -7312,8 +7310,7 @@ fi -# Checks GTK -GTK_LIBS= +# Checks GTK+ 3.0 pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5 @@ -7373,95 +7370,7 @@ fi # Put the nasty error message in config.log where it belongs echo "$GTK_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"GTK+ 3 not present\"" >&5 -$as_echo "$as_me: WARNING: \"GTK+ 3 not present\"" >&2;} -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"GTK+ 3 not present\"" >&5 -$as_echo "$as_me: WARNING: \"GTK+ 3 not present\"" >&2;} -else - GTK_CFLAGS=$pkg_cv_GTK_CFLAGS - GTK_LIBS=$pkg_cv_GTK_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define HAVE_GTK3 1" >>confdefs.h - -fi - if test -n "$GTK_LIBS"; then - GTK_TRUE= - GTK_FALSE='#' -else - GTK_TRUE='#' - GTK_FALSE= -fi - -GTK_CFLAGS+=-DGTK_DISABLE_SINGLE_INCLUDES - - - -if test "$GTK_LIBS" == ""; then - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5 -$as_echo_n "checking for GTK... " >&6; } - -if test -n "$GTK_CFLAGS"; then - pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.18\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.18") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.18" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$GTK_LIBS"; then - pkg_cv_GTK_LIBS="$GTK_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.18\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.18") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.18" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.18" 2>&1` - else - GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= 2.18" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$GTK_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements (gtk+-2.0 >= 2.18) were not met: + as_fn_error $? "Package requirements (gtk+-3.0) were not met: $GTK_PKG_ERRORS @@ -7493,18 +7402,16 @@ else $as_echo "yes" >&6; } fi - if test -n "$GTK_LIBS"; then - GTK_TRUE= - GTK_FALSE='#' -else - GTK_TRUE='#' - GTK_FALSE= -fi +# ensure that only allowed headers are included +GTK_CFLAGS+=" -DGTK_DISABLE_SINGLE_INCLUDES " +# ensure that no gtk deprecated symbols are used +GTK_CFLAGS+=" -DGDK_DISABLE_DEPRECATED " +GTK_CFLAGS+=" -DGTK_DISABLE_DEPRECATED " +# ensure use of accessors +GTK_CFLAGS+=" -DGSEAL_ENABLE " -fi - # Check GCONF pkg_failed=no @@ -8825,14 +8732,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${GTK_TRUE}" && test -z "${GTK_FALSE}"; then - as_fn_error $? "conditional \"GTK\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${GTK_TRUE}" && test -z "${GTK_FALSE}"; then - as_fn_error $? "conditional \"GTK\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${ATASMART_TRUE}" && test -z "${ATASMART_FALSE}"; then as_fn_error $? "conditional \"ATASMART\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/configure.ac b/configure.ac index cf4a175..c101840 100644 --- a/configure.ac +++ b/configure.ac @@ -52,24 +52,18 @@ PKG_CHECK_MODULES(XEXT, xext) AC_SUBST(XEXT_CFLAGS) AC_SUBST(XEXT_LIBS) -# Checks GTK -GTK_LIBS= -PKG_CHECK_MODULES(GTK, - gtk+-3.0, - [AC_DEFINE([HAVE_GTK3],[1],[Use GTK3])], - [AC_MSG_WARN("GTK+ 3 not present")]) -AM_CONDITIONAL(GTK, test -n "$GTK_LIBS") -GTK_CFLAGS+=-DGTK_DISABLE_SINGLE_INCLUDES +# Checks GTK+ 3.0 +PKG_CHECK_MODULES(GTK, gtk+-3.0) +# ensure that only allowed headers are included +GTK_CFLAGS+=" -DGTK_DISABLE_SINGLE_INCLUDES " +# ensure that no gtk deprecated symbols are used +GTK_CFLAGS+=" -DGDK_DISABLE_DEPRECATED " +GTK_CFLAGS+=" -DGTK_DISABLE_DEPRECATED " +# ensure use of accessors +GTK_CFLAGS+=" -DGSEAL_ENABLE " AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) -if test "$GTK_LIBS" == ""; then - PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.18) - AM_CONDITIONAL(GTK, test -n "$GTK_LIBS") - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) -fi - # Check GCONF PKG_CHECK_MODULES(GCONF, gconf-2.0) AC_SUBST(GCONF_CFLAGS) diff --git a/po/fr.po b/po/fr.po index 56f1cd0..fe7e271 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.6.0.9\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2011-12-14 02:51+0100\n" +"POT-Creation-Date: 2012-04-02 09:21+0200\n" "PO-Revision-Date: 2011-02-07 21:18+0100\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Oriya\n" @@ -65,31 +65,37 @@ msgid "" msgstr "" " -u, --url=URL l'URL de psensor-server, example: http://hostname:3131" -#: src/main.c:105 +#: src/main.c:102 +msgid "" +" --use-libatasmart use atasmart library for disk monitoring instead of " +"hddtemp daemon" +msgstr "" + +#: src/main.c:107 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:110 src/server/server.c:103 +#: src/main.c:112 src/server/server.c:103 #, c-format msgid "Report bugs to: %s\n" msgstr "Signaler les bugs à: %s\n" -#: src/main.c:112 src/server/server.c:105 +#: src/main.c:114 src/server/server.c:105 #, c-format msgid "%s home page: <%s>\n" msgstr "%s page d'acceuil: <%s>\n" -#: src/main.c:412 +#: src/main.c:434 #, fuzzy msgid "Enables debug mode." msgstr "Activée" -#: src/main.c:421 src/server/server.c:353 +#: src/main.c:443 src/server/server.c:353 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Essayez `%s --help' pour plus d'informations.\n" -#: src/main.c:448 +#: src/main.c:478 #, c-format msgid "ERROR: Not compiled with remote sensor support.\n" msgstr "" @@ -105,7 +111,7 @@ msgstr "" #: src/ui.c:83 msgid "" -"Copyright(c) 2010-2011\n" +"Copyright(c) 2010-2012\n" "jeanfi@gmail.com" msgstr "" @@ -310,22 +316,22 @@ msgstr "WWW repertoire: %s\n" msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d\n" -#: src/lib/amd.c:159 +#: src/lib/amd.c:151 #, c-format msgid "ERROR: ADL library not found!\n" msgstr "" -#: src/lib/amd.c:184 +#: src/lib/amd.c:176 #, c-format msgid "ERROR: ADL's API is missing!\n" msgstr "" -#: src/lib/amd.c:193 +#: src/lib/amd.c:185 #, fuzzy, c-format msgid "ERROR: ADL Initialization Error!\n" msgstr "ERREUR: échec de l'initialisation nvidia\n" -#: src/lib/amd.c:201 +#: src/lib/amd.c:193 #, fuzzy, c-format msgid "ERROR: Cannot get the number of adapters!\n" msgstr "" @@ -387,15 +393,15 @@ msgstr "ERREUR: create_sensor, mauvais type de fonctionnalité\n" msgid "ERROR: lm-sensors initialization failure: %s\n" msgstr "ERREUR: échec de l'initialisation de lm-sensors: %s\n" -#: src/lib/psensor.c:430 +#: src/lib/psensor.c:443 msgid "C" msgstr "" -#: src/lib/psensor.c:433 +#: src/lib/psensor.c:446 msgid "RPM" msgstr "" -#: src/lib/psensor.c:436 +#: src/lib/psensor.c:449 msgid "%" msgstr "" diff --git a/po/psensor.pot b/po/psensor.pot index 3d137b9..d50aee6 100644 --- a/po/psensor.pot +++ b/po/psensor.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2011-12-14 02:51+0100\n" +"POT-Creation-Date: 2012-04-02 09:21+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -54,30 +54,36 @@ msgid "" "hostname:3131" msgstr "" -#: src/main.c:105 +#: src/main.c:102 +msgid "" +" --use-libatasmart use atasmart library for disk monitoring instead of " +"hddtemp daemon" +msgstr "" + +#: src/main.c:107 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:110 src/server/server.c:103 +#: src/main.c:112 src/server/server.c:103 #, c-format msgid "Report bugs to: %s\n" msgstr "" -#: src/main.c:112 src/server/server.c:105 +#: src/main.c:114 src/server/server.c:105 #, c-format msgid "%s home page: <%s>\n" msgstr "" -#: src/main.c:412 +#: src/main.c:434 msgid "Enables debug mode." msgstr "" -#: src/main.c:421 src/server/server.c:353 +#: src/main.c:443 src/server/server.c:353 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/main.c:448 +#: src/main.c:478 #, c-format msgid "ERROR: Not compiled with remote sensor support.\n" msgstr "" @@ -88,7 +94,7 @@ msgstr "" #: src/ui.c:83 msgid "" -"Copyright(c) 2010-2011\n" +"Copyright(c) 2010-2012\n" "jeanfi@gmail.com" msgstr "" @@ -273,22 +279,22 @@ msgstr "" msgid "URL: http://localhost:%d" msgstr "" -#: src/lib/amd.c:159 +#: src/lib/amd.c:151 #, c-format msgid "ERROR: ADL library not found!\n" msgstr "" -#: src/lib/amd.c:184 +#: src/lib/amd.c:176 #, c-format msgid "ERROR: ADL's API is missing!\n" msgstr "" -#: src/lib/amd.c:193 +#: src/lib/amd.c:185 #, c-format msgid "ERROR: ADL Initialization Error!\n" msgstr "" -#: src/lib/amd.c:201 +#: src/lib/amd.c:193 #, c-format msgid "ERROR: Cannot get the number of adapters!\n" msgstr "" @@ -348,15 +354,15 @@ msgstr "" msgid "ERROR: lm-sensors initialization failure: %s\n" msgstr "" -#: src/lib/psensor.c:430 +#: src/lib/psensor.c:443 msgid "C" msgstr "" -#: src/lib/psensor.c:433 +#: src/lib/psensor.c:446 msgid "RPM" msgstr "" -#: src/lib/psensor.c:436 +#: src/lib/psensor.c:449 msgid "%" msgstr "" diff --git a/po/tr.po b/po/tr.po index a339455..e777d99 100644 --- a/po/tr.po +++ b/po/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2011-12-14 02:51+0100\n" +"POT-Creation-Date: 2012-04-02 09:21+0200\n" "PO-Revision-Date: 2011-04-10 13:11+0000\n" "Last-Translator: zeugma \n" "Language-Team: Turkish \n" @@ -55,30 +55,36 @@ msgid "" "hostname:3131" msgstr "" -#: src/main.c:105 +#: src/main.c:102 +msgid "" +" --use-libatasmart use atasmart library for disk monitoring instead of " +"hddtemp daemon" +msgstr "" + +#: src/main.c:107 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:110 src/server/server.c:103 +#: src/main.c:112 src/server/server.c:103 #, c-format msgid "Report bugs to: %s\n" msgstr "Hataları rapor et:%s\n" -#: src/main.c:112 src/server/server.c:105 +#: src/main.c:114 src/server/server.c:105 #, c-format msgid "%s home page: <%s>\n" msgstr "%s ana sayfa: <%s>\n" -#: src/main.c:412 +#: src/main.c:434 msgid "Enables debug mode." msgstr "" -#: src/main.c:421 src/server/server.c:353 +#: src/main.c:443 src/server/server.c:353 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Daha fazla bilgi için `%s --help' yazın.\n" -#: src/main.c:448 +#: src/main.c:478 #, c-format msgid "ERROR: Not compiled with remote sensor support.\n" msgstr "" @@ -89,7 +95,7 @@ msgstr "" #: src/ui.c:83 msgid "" -"Copyright(c) 2010-2011\n" +"Copyright(c) 2010-2012\n" "jeanfi@gmail.com" msgstr "" @@ -278,22 +284,22 @@ msgstr "" msgid "URL: http://localhost:%d" msgstr "" -#: src/lib/amd.c:159 +#: src/lib/amd.c:151 #, c-format msgid "ERROR: ADL library not found!\n" msgstr "" -#: src/lib/amd.c:184 +#: src/lib/amd.c:176 #, c-format msgid "ERROR: ADL's API is missing!\n" msgstr "" -#: src/lib/amd.c:193 +#: src/lib/amd.c:185 #, c-format msgid "ERROR: ADL Initialization Error!\n" msgstr "" -#: src/lib/amd.c:201 +#: src/lib/amd.c:193 #, c-format msgid "ERROR: Cannot get the number of adapters!\n" msgstr "" @@ -353,15 +359,15 @@ msgstr "" msgid "ERROR: lm-sensors initialization failure: %s\n" msgstr "" -#: src/lib/psensor.c:430 +#: src/lib/psensor.c:443 msgid "C" msgstr "" -#: src/lib/psensor.c:433 +#: src/lib/psensor.c:446 msgid "RPM" msgstr "" -#: src/lib/psensor.c:436 +#: src/lib/psensor.c:449 msgid "%" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 415b4ae..4d00454 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.6.0.10\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2011-12-14 02:51+0100\n" +"POT-Creation-Date: 2012-04-02 09:21+0200\n" "PO-Revision-Date: 2011-06-06 08:57+0000\n" "Last-Translator: royclark \n" "Language-Team: Chinese (simplified)\n" @@ -57,30 +57,36 @@ msgid "" "hostname:3131" msgstr " -u, --url=URL psensor服务器的 URL ，比如：http://hostname:3131" -#: src/main.c:105 +#: src/main.c:102 +msgid "" +" --use-libatasmart use atasmart library for disk monitoring instead of " +"hddtemp daemon" +msgstr "" + +#: src/main.c:107 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:110 src/server/server.c:103 +#: src/main.c:112 src/server/server.c:103 #, c-format msgid "Report bugs to: %s\n" msgstr "" -#: src/main.c:112 src/server/server.c:105 +#: src/main.c:114 src/server/server.c:105 #, c-format msgid "%s home page: <%s>\n" msgstr "" -#: src/main.c:412 +#: src/main.c:434 msgid "Enables debug mode." msgstr "" -#: src/main.c:421 src/server/server.c:353 +#: src/main.c:443 src/server/server.c:353 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/main.c:448 +#: src/main.c:478 #, c-format msgid "ERROR: Not compiled with remote sensor support.\n" msgstr "" @@ -92,7 +98,7 @@ msgstr "psensor 是一个 GTK 程序，用来监视硬件传感器，包括温 #: src/ui.c:83 msgid "" -"Copyright(c) 2010-2011\n" +"Copyright(c) 2010-2012\n" "jeanfi@gmail.com" msgstr "" @@ -280,22 +286,22 @@ msgstr "" msgid "URL: http://localhost:%d" msgstr "" -#: src/lib/amd.c:159 +#: src/lib/amd.c:151 #, c-format msgid "ERROR: ADL library not found!\n" msgstr "" -#: src/lib/amd.c:184 +#: src/lib/amd.c:176 #, c-format msgid "ERROR: ADL's API is missing!\n" msgstr "" -#: src/lib/amd.c:193 +#: src/lib/amd.c:185 #, c-format msgid "ERROR: ADL Initialization Error!\n" msgstr "" -#: src/lib/amd.c:201 +#: src/lib/amd.c:193 #, c-format msgid "ERROR: Cannot get the number of adapters!\n" msgstr "" @@ -355,15 +361,15 @@ msgstr "" msgid "ERROR: lm-sensors initialization failure: %s\n" msgstr "" -#: src/lib/psensor.c:430 +#: src/lib/psensor.c:443 msgid "C" msgstr "" -#: src/lib/psensor.c:433 +#: src/lib/psensor.c:446 msgid "RPM" msgstr "" -#: src/lib/psensor.c:436 +#: src/lib/psensor.c:449 msgid "%" msgstr "" diff --git a/src/glade/psensor-pref.glade b/src/glade/psensor-pref.glade index 5526765..7f9f591 100644 --- a/src/glade/psensor-pref.glade +++ b/src/glade/psensor-pref.glade @@ -1,6 +1,6 @@ - + False 5 diff --git a/src/glade/sensor-edit.glade b/src/glade/sensor-edit.glade index 8b098b7..6a2545c 100644 --- a/src/glade/sensor-edit.glade +++ b/src/glade/sensor-edit.glade @@ -1,6 +1,6 @@ - + False