From: Jan Palus Date: Thu, 27 Dec 2018 15:23:47 +0000 (+0100) Subject: up to 0.9.4 X-Git-Tag: auto/th/ddcutil-0.9.4-1 X-Git-Url: https://git.pld-linux.org/?p=packages%2Fddcutil.git;a=commitdiff_plain;h=refs%2Ftags%2Fauto%2Fth%2Fddcutil-0.9.4-1 up to 0.9.4 - x32 patch no longer needed --- diff --git a/ddcutil-x32.patch b/ddcutil-x32.patch deleted file mode 100644 index 85f5862..0000000 --- a/ddcutil-x32.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e98181066b5a6986c9bfc65759077e28d0defebe Mon Sep 17 00:00:00 2001 -From: Jan Palus -Date: Tue, 27 Nov 2018 13:26:30 +0100 -Subject: [PATCH] ddc_dumpload.c: portable format string for time_t (fixes - build on x32) - -Signed-off-by: Jan Palus ---- - configure.ac | 5 +++++ - src/ddc/ddc_dumpload.c | 2 +- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 082e85fc..c9911f87 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -127,6 +127,11 @@ dnl warning: warning: compiling 'base/common.c' in subdir requires 'AM_PROG_CC_C - - dnl needed for OBS - AC_PROG_CC_STDC -+AC_PROG_CC_C99 -+ -+if test "x$ac_cv_prog_cc_c99" = xno; then -+ AC_MSG_ERROR([Building ddcutil requires C99 enabled compiler]) -+fi - - dnl AC_PROG_LIBTOOL, AM_PROG_LIBTOOL are deprecated names for older versions of LT_INIT - dnl adds support for --enable/disable -static/shared, -with/without-pic configure flags -diff --git a/src/ddc/ddc_dumpload.c b/src/ddc/ddc_dumpload.c -index 71043629..d3a0336c 100644 ---- a/src/ddc/ddc_dumpload.c -+++ b/src/ddc/ddc_dumpload.c -@@ -628,7 +628,7 @@ collect_machine_readable_timestamp(time_t time_millis, GPtrArray* vals) { - snprintf(buf, bufsz, "TIMESTAMP_TEXT %s", timestamp_buf ); - g_ptr_array_add(vals, strdup(buf)); - -- snprintf(buf, bufsz, "TIMESTAMP_MILLIS %ld", time_millis); -+ snprintf(buf, bufsz, "TIMESTAMP_MILLIS %jd", (intmax_t) time_millis); - g_ptr_array_add(vals, strdup(buf)); - } - --- -2.19.2 - diff --git a/ddcutil.spec b/ddcutil.spec index 8f715f7..522b390 100644 --- a/ddcutil.spec +++ b/ddcutil.spec @@ -1,12 +1,11 @@ Summary: Query and change Linux monitor settings using DDC/CI and USB Name: ddcutil -Version: 0.9.3 -Release: 2 +Version: 0.9.4 +Release: 1 License: GPL v2+ Group: X11/Applications Source0: https://github.com/rockowitz/ddcutil/archive/v%{version}.tar.gz -# Source0-md5: d676ec9ca9f6488fa5888bb39175f2d5 -Patch0: %{name}-x32.patch +# Source0-md5: 126bb0242916ced11d131e1ec94ad8a0 URL: http://www.ddcutil.com/ BuildRequires: autoconf >= 2.69 BuildRequires: automake >= 1:1.11 @@ -45,7 +44,6 @@ ddcutil header files. %prep %setup -q -%patch0 -p1 %build %{__libtoolize}