[med-svn] [Git][med-team/gwyddion][master] 6 commits: Rebase fix_AM_CPPFLAGS.patch to gwyddion 3.12
Andreas Tille (@tille)
gitlab at salsa.debian.org
Wed Oct 28 21:20:01 GMT 2026
Andreas Tille pushed to branch master at Debian Med / gwyddion
Commits:
57e73bc0 by Andreas Tille at 2026-10-28T22:07:16+01:00
Rebase fix_AM_CPPFLAGS.patch to gwyddion 3.12
- - - - -
fcb22cf7 by Andreas Tille at 2026-10-28T22:07:33+01:00
Drop removed pygwy README from gwyddion.docs
- - - - -
ee4b000e by Andreas Tille at 2026-10-28T22:07:41+01:00
Do not install unusable Python GI bindings
- - - - -
acf25349 by Andreas Tille at 2026-10-28T22:07:50+01:00
Add autopkgtest exercising the Gwyddion libraries
- - - - -
7c800d10 by Andreas Tille at 2026-10-28T22:07:56+01:00
Enable OpenGL support explicitly via libepoxy-dev (Closes: #1122272)
- - - - -
fc27c469 by Andreas Tille at 2026-10-28T22:16:04+01:00
Upload to unstable
- - - - -
9 changed files:
- + debian/README.test
- debian/changelog
- debian/control
- debian/gwyddion.docs
- + debian/not-installed
- debian/patches/fix_AM_CPPFLAGS.patch
- + debian/tests/control
- + debian/tests/gwy-smoke-test.c
- + debian/tests/run-unit-test
Changes:
=====================================
debian/README.test
=====================================
@@ -0,0 +1,13 @@
+Notes on how this package can be tested.
+────────────────────────────────────────
+
+This package can be tested by executing
+
+ sh run-unit-test
+
+in order to confirm its integrity.
+
+The test compiles a small program against the installed Gwyddion headers
+and libraries and checks that field construction and statistics,
+serialization/deserialization round-trips and the dictionary container
+work. The very same script is used by the autopkgtest.
=====================================
debian/changelog
=====================================
@@ -1,9 +1,15 @@
-gwyddion (3.12-1) UNRELEASED; urgency=medium
+gwyddion (3.12-1) unstable; urgency=medium
- * Packaging update (routine-update)
* New upstream version
-
- -- Andreas Tille <tille at debian.org> Wed, 28 Oct 2026 13:48:50 +0100
+ * Drop modules/pygwy/README.pygwy from gwyddion.docs, pygwy was removed
+ in upstream 3.12
+ * Do not install the new Python 3 GI bindings, they are not usable
+ without the introspection typelibs which are not built
+ * Add autopkgtest exercising the Gwyddion libraries
+ * Build with explicit OpenGL support via libepoxy-dev so the 3D widgets
+ are actually enabled (Closes: #1122272)
+
+ -- Andreas Tille <tille at debian.org> Wed, 28 Oct 2026 22:08:36 +0100
gwyddion (3.11-1) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -26,6 +26,7 @@ Build-Depends:
libwebp-dev,
libxml2-dev,
libzip-dev,
+ libepoxy-dev,
pkgconf,
zlib1g-dev,
Vcs-Browser: https://salsa.debian.org/med-team/gwyddion
=====================================
debian/gwyddion.docs
=====================================
@@ -1 +0,0 @@
-modules/pygwy/README.pygwy
=====================================
debian/not-installed
=====================================
@@ -0,0 +1,4 @@
+usr/lib/python3.*/site-packages/gwyddion/*
+usr/lib/python3.*/site-packages/gwyddion/__pycache__/*
+usr/lib/python3.*/site-packages/gi/overrides/Gwyddion.py
+usr/lib/python3.*/site-packages/gi/overrides/__pycache__/*
=====================================
debian/patches/fix_AM_CPPFLAGS.patch
=====================================
@@ -1,5 +1,6 @@
Author: Andreas Tille <tille at debian.org>
-Last-Update: 2026-07-02
+Last-Update: 2026-10-28
+Assisted-By: deepseek-v4-flash 0731
Description: Make sure preview.h will be found
FIXME: This patch is incomplete. The build works due to
export DEB_CPPFLAGS_MAINT_PREPEND = -I$(CURDIR)/modules
@@ -18,12 +19,12 @@ FIXME: This patch is incomplete. The build works due to
--- a/modules/image/Makefile.am
+++ b/modules/image/Makefile.am
-@@ -169,7 +169,7 @@ else
- module_libadd = @LIBM@
+@@ -172,7 +172,7 @@ else
+ module_libadd = @EPOXY_LIBS@ @LIBM@
endif
-AM_CPPFLAGS = -I$(top_srcdir) -DG_LOG_DOMAIN=\"Gwy-Module\"
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/modules -DG_LOG_DOMAIN=\"Gwy-Module\"
- AM_CFLAGS = @GTK_CFLAGS@ @COMMON_CFLAGS@ @OPENMP_CFLAGS@
+ AM_CFLAGS = @GTK_CFLAGS@ @EPOXY_CFLAGS@ @COMMON_CFLAGS@ @OPENMP_CFLAGS@
AM_LDFLAGS = -avoid-version -module $(no_undefined) $(module_libadd) @OPENMP_CFLAGS@
=====================================
debian/tests/control
=====================================
@@ -0,0 +1,3 @@
+Tests: run-unit-test
+Depends: build-essential, pkgconf, libglib2.0-dev, libgwyddion-dev, @
+Restrictions: allow-stderr
=====================================
debian/tests/gwy-smoke-test.c
=====================================
@@ -0,0 +1,125 @@
+#include <glib.h>
+#include <gio/gio.h>
+#include <libgwyddion/version.h>
+#include <libgwyddion/field.h>
+#include <libgwyddion/stats.h>
+#include <libgwyddion/dict.h>
+#include <libgwyddion/serializable.h>
+#include <libgwyddion/serialize.h>
+#include <libgwyddion/deserialize.h>
+
+static guint failures;
+
+#define CHECK(cond) G_STMT_START { \
+ if (G_LIKELY(cond)) { \
+ g_print("ok: %s\n", #cond); \
+ } else { \
+ g_printerr("FAILED: %s (line %d)\n", #cond, __LINE__); \
+ failures++; \
+ } \
+} G_STMT_END
+
+static void
+test_version(void)
+{
+ const gchar *ver = gwy_version_string();
+ CHECK(ver != NULL);
+ CHECK(*ver != '\0');
+ g_print("Gwyddion version: %s\n", ver);
+}
+
+static void
+test_field(void)
+{
+ GwyField *field = gwy_field_new(32, 24, 1.6, 7.5, TRUE);
+ CHECK(GWY_IS_FIELD(field));
+ CHECK(gwy_field_get_xres(field) == 32);
+ CHECK(gwy_field_get_yres(field) == 24);
+
+ gwy_field_fill(field, 2.5);
+ CHECK(gwy_field_get_val(field, 0, 0) == 2.5);
+ CHECK(gwy_field_max(field) == 2.5);
+ CHECK(gwy_field_min(field) == 2.5);
+ CHECK(gwy_field_mean(field) == 2.5);
+
+ gwy_field_set_val(field, 10, 10, 3.25);
+ CHECK(gwy_field_get_val(field, 10, 10) == 3.25);
+ CHECK(gwy_field_max(field) == 3.25);
+ CHECK(gwy_field_min(field) == 2.5);
+
+ g_object_unref(field);
+}
+
+static void
+test_serialization(void)
+{
+ GwyField *field = gwy_field_new(16, 16, 3.0, 3.0, TRUE);
+ gwy_field_fill(field, 1.0);
+ gwy_field_set_val(field, 5, 5, 42.5);
+
+ GError *error = NULL;
+ GOutputStream *stream = g_memory_output_stream_new_resizable();
+ CHECK(gwy_serialize_gio(GWY_SERIALIZABLE(field), stream, &error));
+ if (error) {
+ g_printerr("serialize error: %s\n", error->message);
+ g_clear_error(&error);
+ }
+
+ GMemoryOutputStream *mem = G_MEMORY_OUTPUT_STREAM(stream);
+ gsize len = g_memory_output_stream_get_data_size(mem);
+ gpointer data = g_memory_output_stream_get_data(mem);
+
+ GwyErrorList *error_list = NULL;
+ gsize consumed = 0;
+ GObject *obj = gwy_deserialize_memory(data, len, &consumed, &error_list);
+ CHECK(GWY_IS_FIELD(obj));
+ CHECK(error_list == NULL);
+ CHECK(consumed == len);
+
+ if (GWY_IS_FIELD(obj)) {
+ GwyField *roundtrip = GWY_FIELD(obj);
+ CHECK(gwy_field_get_xres(roundtrip) == 16);
+ CHECK(gwy_field_get_yres(roundtrip) == 16);
+ CHECK(gwy_field_get_val(roundtrip, 5, 5) == 42.5);
+ CHECK(gwy_field_get_val(roundtrip, 0, 0) == 1.0);
+ g_object_unref(roundtrip);
+ }
+
+ g_object_unref(stream);
+ g_object_unref(field);
+}
+
+static void
+test_dict(void)
+{
+ GwyDict *dict = gwy_dict_new();
+ CHECK(GWY_IS_DICT(dict));
+
+ gwy_dict_set_boolean_by_name(dict, "/test/bool", TRUE);
+ CHECK(gwy_dict_get_boolean_by_name(dict, "/test/bool") == TRUE);
+ CHECK(gwy_dict_contains(dict, g_quark_from_string("/test/bool")));
+
+ gwy_dict_set_int32_by_name(dict, "/test/int", -42);
+ CHECK(gwy_dict_get_int32_by_name(dict, "/test/int") == -42);
+
+ gwy_dict_set_double_by_name(dict, "/test/dbl", 3.14159);
+ CHECK(gwy_dict_get_double_by_name(dict, "/test/dbl") == 3.14159);
+
+ g_object_unref(dict);
+}
+
+int
+main(void)
+{
+ test_version();
+ test_field();
+ test_serialization();
+ test_dict();
+
+ if (failures) {
+ g_printerr("%u check(s) FAILED\n", failures);
+ return 1;
+ }
+ g_print("All checks passed\n");
+ return 0;
+}
=====================================
debian/tests/run-unit-test
=====================================
@@ -0,0 +1,24 @@
+#!/bin/sh -e
+
+# Smoke test for the Gwyddion libraries.
+#
+# Compile a small test program against the installed libgwyddion3 headers
+# and libraries and run it. The program exercises field construction and
+# statistics, serialization/deserialization round-trips and the dictionary
+# container.
+
+testdir=$(mktemp -d /tmp/gwy-test.XXXXXX)
+trap 'rm -rf "$testdir"' 0 INT QUIT ABRT PIPE TERM
+
+CC="${CC:-cc}"
+if ! command -v "$CC" >/dev/null 2>&1; then
+ echo "SKIP: no C compiler ($CC) available" >&2
+ exit 77
+fi
+
+srcdir=$(dirname "$0")
+$CC -o "$testdir/gwy-smoke-test" \
+ "$srcdir/gwy-smoke-test.c" \
+ $(pkg-config --cflags --libs libgwyddion3)
+
+"$testdir/gwy-smoke-test"
View it on GitLab: https://salsa.debian.org/med-team/gwyddion/-/compare/630b1c327746e7cdfea4e41d62ae050efb78bd34...fc27c469c29cdb37967f7d35ca33fbbca721a95a
--
View it on GitLab: https://salsa.debian.org/med-team/gwyddion/-/compare/630b1c327746e7cdfea4e41d62ae050efb78bd34...fc27c469c29cdb37967f7d35ca33fbbca721a95a
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20261028/2623569f/attachment-0001.htm>
More information about the debian-med-commit
mailing list