openSUSE Commits
Threads by month
- ----- 2024 -----
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
August 2024
- 2 participants
- 1399 discussions
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libxpp for openSUSE:Factory checked in at 2024-08-13 13:23:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libxpp (Old)
and /work/SRC/openSUSE:Factory/.libxpp.new.7232 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libxpp"
Tue Aug 13 13:23:50 2024 rev:6 rq:1193376 version:0.3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/libxpp/libxpp.changes 2024-03-14 17:47:06.969954462 +0100
+++ /work/SRC/openSUSE:Factory/.libxpp.new.7232/libxpp.changes 2024-08-13 13:24:18.220895454 +0200
@@ -1,0 +2,11 @@
+Mon Aug 12 09:07:26 UTC 2024 - Matthias Gerstner <matthias.gerstner(a)suse.com>
+
+- update to version 0.3.1:
+ * replace Git tarball by upstream release tarball
+ * use proper SONAME (libxpp-0_2_0 wasn't the SONAME, now it is libxpp-3)
+ * minor changes in the code:
+ - consistently marm move ctors and operators as noexcept
+ - improvements in the build system
+ - use new libcosmos dependency
+
+-------------------------------------------------------------------
Old:
----
_service
_servicedata
libxpp-0.2.0+git84fb050.tar.xz
New:
----
libxpp-v0.3.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libxpp.spec ++++++
--- /var/tmp/diff_new_pack.ZifOi4/_old 2024-08-13 13:24:20.753000955 +0200
+++ /var/tmp/diff_new_pack.ZifOi4/_new 2024-08-13 13:24:20.753000955 +0200
@@ -16,16 +16,16 @@
#
-%define commit 84fb050
+%define version 0.3.1
Name: libxpp
-Version: 0.2
+Version: %{version}
Release: 0
Summary: An object oriented C++ wrapper for parts of the X11 API
License: MIT
Group: Development/Libraries/C and C++
URL: https://github.com/gerstner-hub/libxpp
-Source0: libxpp-0.2.0+git%{commit}.tar.xz
+Source0: libxpp-v0.3.1.tar.xz
BuildRequires: gcc-c++
BuildRequires: libX11-devel
@@ -38,16 +38,17 @@
parts of the X11 API. It is intended for low level programming against the X
server on Linux systems.
-%package -n libxpp-0_2_0
+%package -n libxpp-3
Summary: An object oriented C++ wrapper for parts of the X11 API
Group: System/Libraries
-#this is the initial version of the library that is packaged, these are
-#unnecessary at the moment
-#Provides: %{name} = %{version}
-#Obsoletes: %{name} < %{version}
+Provides: %{name} = %{version}
+Obsoletes: %{name} < %{version}
+# renamed from broken package name that didn't follow SONAME
+Provides: libxpp-0_2_0 = %{version}
+Obsoletes: libxpp-0_2_0 < %{version}
-%description -n libxpp-0_2_0
-A library providing an object oriented C++ API wrapper for 37 parts of the X11
+%description -n libxpp-3
+A library providing an object oriented C++ API wrapper for parts of the X11
API.
The runtime library files for libxpp.
@@ -56,16 +57,16 @@
Summary: A library providing a modern C++ API for the Linux operating system
Group: Development/Libraries/C and C++
Requires: libstdc++-devel
-Requires: libxpp-0_2_0 = %{version}
+Requires: libxpp-3 = %{version}
%description devel
-A library providing an object oriented C++ API wrapper for 37 parts of the X11
+A library providing an object oriented C++ API wrapper for parts of the X11
API.
Header and development files for libxpp.
%prep
-%setup -q -n libxpp-0.2.0+git%{commit}
+%setup -q -n %{name}-v%{version}
%build
scons libtype=shared use-system-pkgs=1
@@ -77,9 +78,9 @@
#%%check
#scons run_tests
-%ldconfig_scriptlets -n libxpp-0_2_0
+%ldconfig_scriptlets -n libxpp-3
-%files -n libxpp-0_2_0
+%files -n libxpp-3
%license LICENSE
%doc README.md
%{_libdir}/libxpp.so.*
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package intel-vaapi-driver for openSUSE:Factory checked in at 2024-08-13 13:23:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/intel-vaapi-driver (Old)
and /work/SRC/openSUSE:Factory/.intel-vaapi-driver.new.7232 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "intel-vaapi-driver"
Tue Aug 13 13:23:49 2024 rev:17 rq:1193367 version:2.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/intel-vaapi-driver/intel-vaapi-driver.changes 2021-10-04 18:40:53.774148289 +0200
+++ /work/SRC/openSUSE:Factory/.intel-vaapi-driver.new.7232/intel-vaapi-driver.changes 2024-08-13 13:24:16.760834621 +0200
@@ -1,0 +2,5 @@
+Fri Aug 9 17:11:09 UTC 2024 - Muhammad Akbar Yanuar Mantari <mantarimay(a)pm.me>
+
+- add 566.patch: fixed VAAPI Wayland on libva v2.22.0
+
+-------------------------------------------------------------------
New:
----
566.patch
BETA DEBUG BEGIN:
New:
- add 566.patch: fixed VAAPI Wayland on libva v2.22.0
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ intel-vaapi-driver.spec ++++++
--- /var/tmp/diff_new_pack.3QFO5f/_old 2024-08-13 13:24:17.236854455 +0200
+++ /var/tmp/diff_new_pack.3QFO5f/_new 2024-08-13 13:24:17.236854455 +0200
@@ -1,7 +1,7 @@
#
# spec file for package intel-vaapi-driver
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,7 @@
Source0: %{name}-%{version}.tar.bz2
Source1: %{name}-%{version}.tar.bz2.sha1sum
Source2: baselibs.conf
+Patch0: https://patch-diff.githubusercontent.com/raw/intel/%{name}/pull/566.patch
BuildRequires: meson
BuildRequires: pkgconfig
BuildRequires: pkgconfig(egl)
++++++ 566.patch ++++++
From 4206d0e15363d188f30f2f3dbcc212fef206fc1d Mon Sep 17 00:00:00 2001
From: Simon Ser <contact(a)emersion.fr>
Date: Mon, 11 Mar 2024 23:48:17 +0100
Subject: [PATCH] Make wl_drm optional
Don't error out when vtable->wl_interface is NULL.
Fetching wl_drm_interface from libEGL used to work but doesn't
anymore: it's now a private symbol (wayland-scanner private-code).
---
src/i965_output_wayland.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/i965_output_wayland.c b/src/i965_output_wayland.c
index a6120b7b2..a002cae5b 100644
--- a/src/i965_output_wayland.c
+++ b/src/i965_output_wayland.c
@@ -154,7 +154,7 @@ registry_handle_global(
struct va_wl_output * const wl_output = i965->wl_output;
struct wl_vtable * const wl_vtable = &wl_output->vtable;
- if (strcmp(interface, "wl_drm") == 0) {
+ if (strcmp(interface, "wl_drm") == 0 && wl_vtable->drm_interface) {
wl_output->wl_drm_name = name;
wl_output->wl_drm = registry_bind(wl_vtable, wl_output->wl_registry,
name, wl_vtable->drm_interface,
@@ -472,6 +472,7 @@ i965_output_wayland_init(VADriverContextP ctx)
wl_vtable = &i965->wl_output->vtable;
+ /* drm_interface is optional */
if (vtable->wl_interface)
wl_vtable->drm_interface = vtable->wl_interface;
else {
@@ -483,9 +484,8 @@ i965_output_wayland_init(VADriverContextP ctx)
}
dso_handle = i965->wl_output->libegl_handle;
- if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable),
- libegl_symbols))
- goto error;
+ dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable),
+ libegl_symbols);
}
i965->wl_output->libwl_client_handle = dso_open(LIBWAYLAND_CLIENT_NAME);
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package muffin for openSUSE:Factory checked in at 2024-08-13 13:23:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/muffin (Old)
and /work/SRC/openSUSE:Factory/.muffin.new.7232 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "muffin"
Tue Aug 13 13:23:48 2024 rev:32 rq:1193351 version:6.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/muffin/muffin.changes 2024-05-14 13:40:52.272077559 +0200
+++ /work/SRC/openSUSE:Factory/.muffin.new.7232/muffin.changes 2024-08-13 13:24:13.912715953 +0200
@@ -1,0 +2,18 @@
+Sun Aug 11 05:02:00 UTC 2024 - sb56637 <mxoo28j7(a)duck.com>
+
+- update to 6.2.0:
+ * packaging: Forbid compilation if the symbols file is outdated
+ * packaging: Update symbols file
+ * Fix compile issue
+ * meta-input-settings-x11.c: Don't warn about receiving more values than expected from libinput.
+ * Fix segfault during Alt-Tab when window focus mode is either 'Sloppy' or 'Mouse'
+ * meta-crtc-xrandr.c: use nearest neighbor filter for integer randr scales
+ * meta-monitor-manager-xrandr.c: DeleteMonitor before SetMonitor
+ * meta-monitor-manager-xrandr.c: fix crtc disabling
+ * meta-monitor-manager-xrandr.c: fix screen size
+ * meta-monitor-manager-xrandr.c: screen size fixes
+
+- update to 6.0.1:
+ * meta-compositor-x11.c: Don't disable fractional scaling when unredirecting a fullscreen window
+
+-------------------------------------------------------------------
Old:
----
muffin-6.0.1.tar.gz
New:
----
muffin-6.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ muffin.spec ++++++
--- /var/tmp/diff_new_pack.DEjsDs/_old 2024-08-13 13:24:15.668789121 +0200
+++ /var/tmp/diff_new_pack.DEjsDs/_new 2024-08-13 13:24:15.668789121 +0200
@@ -21,7 +21,7 @@
%define typelib typelib-1_0-Muffin-0_0
%define _lto_cflags %{nil}
Name: muffin
-Version: 6.0.1
+Version: 6.2.0
Release: 0
Summary: Cinnamon Desktop default window manager
License: GPL-2.0-or-later AND MIT
++++++ muffin-6.0.1.tar.gz -> muffin-6.2.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-6.0.1/clutter/clutter/clutter-mutter.h new/muffin-6.2.0/clutter/clutter/clutter-mutter.h
--- old/muffin-6.0.1/clutter/clutter/clutter-mutter.h 2023-12-28 12:53:15.000000000 +0100
+++ new/muffin-6.2.0/clutter/clutter/clutter-mutter.h 2024-06-11 18:06:46.000000000 +0200
@@ -78,6 +78,11 @@
CLUTTER_EXPORT
gboolean clutter_actor_has_damage (ClutterActor *actor);
+CLUTTER_EXPORT
+void clutter_stage_get_device_coords (ClutterStage *stage,
+ ClutterInputDevice *device,
+ ClutterEventSequence *sequence,
+ graphene_point_t *coords);
#undef __CLUTTER_H_INSIDE__
#endif /* __CLUTTER_MUTTER_H__ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-6.0.1/clutter/clutter/clutter-stage.c new/muffin-6.2.0/clutter/clutter/clutter-stage.c
--- old/muffin-6.0.1/clutter/clutter/clutter-stage.c 2023-12-28 12:53:15.000000000 +0100
+++ new/muffin-6.2.0/clutter/clutter/clutter-stage.c 2024-06-11 18:06:46.000000000 +0200
@@ -99,6 +99,15 @@
graphene_point_t vertex[4];
} PickClipRecord;
+typedef struct _PointerDeviceEntry
+{
+ ClutterStage *stage;
+ ClutterInputDevice *device;
+ ClutterEventSequence *sequence;
+ graphene_point_t coords;
+ ClutterActor *current_actor;
+} PointerDeviceEntry;
+
struct _ClutterStagePrivate
{
/* the stage implementation */
@@ -147,6 +156,9 @@
gboolean needs_update;
+ GHashTable *pointer_devices;
+ GHashTable *touch_sequences;
+
guint redraw_pending : 1;
guint is_cursor_visible : 1;
guint throttle_motion_events : 1;
@@ -195,6 +207,7 @@
static void clutter_stage_maybe_finish_queue_redraws (ClutterStage *stage);
static void free_queue_redraw_entry (ClutterStageQueueRedrawEntry *entry);
+static void free_pointer_device_entry (PointerDeviceEntry *entry);
static void capture_view_into (ClutterStage *stage,
gboolean paint,
ClutterStageView *view,
@@ -2010,6 +2023,9 @@
g_queue_foreach (priv->event_queue, (GFunc) clutter_event_free, NULL);
g_queue_free (priv->event_queue);
+ g_hash_table_destroy (priv->pointer_devices);
+ g_hash_table_destroy (priv->touch_sequences);
+
g_free (priv->title);
g_array_free (priv->paint_volume_stack, TRUE);
@@ -2387,6 +2403,13 @@
priv->sync_delay = -1;
priv->motion_events_enabled = TRUE;
+ priv->pointer_devices =
+ g_hash_table_new_full (NULL, NULL,
+ NULL, (GDestroyNotify) free_pointer_device_entry);
+ priv->touch_sequences =
+ g_hash_table_new_full (NULL, NULL,
+ NULL, (GDestroyNotify) free_pointer_device_entry);
+
clutter_actor_set_background_color (CLUTTER_ACTOR (self),
&default_stage_color);
@@ -4796,3 +4819,69 @@
*view_scale = scale;
return TRUE;
}
+
+static void
+on_device_actor_reactive_changed (ClutterActor *actor,
+ GParamSpec *pspec,
+ PointerDeviceEntry *entry)
+{
+}
+
+static void
+on_device_actor_destroyed (ClutterActor *actor,
+ PointerDeviceEntry *entry)
+{
+ /* Simply unset the current_actor pointer here, there's no need to
+ * unset has_pointer or to disconnect any signals because the actor
+ * is gone anyway.
+ * Also, as soon as the next repaint happens, a repick should be triggered
+ * and the PointerDeviceEntry will get updated again, so no need to
+ * trigger a repick here.
+ */
+ entry->current_actor = NULL;
+}
+
+
+static void
+free_pointer_device_entry (PointerDeviceEntry *entry)
+{
+ if (entry->current_actor)
+ {
+ ClutterActor *actor = entry->current_actor;
+
+ g_signal_handlers_disconnect_by_func (actor,
+ G_CALLBACK (on_device_actor_reactive_changed),
+ entry);
+ g_signal_handlers_disconnect_by_func (actor,
+ G_CALLBACK (on_device_actor_destroyed),
+ entry);
+
+ _clutter_actor_set_has_pointer (actor, FALSE);
+ }
+
+ g_free (entry);
+}
+
+/**
+ * clutter_stage_get_device_coords: (skip):
+ */
+void
+clutter_stage_get_device_coords (ClutterStage *stage,
+ ClutterInputDevice *device,
+ ClutterEventSequence *sequence,
+ graphene_point_t *coords)
+{
+ ClutterStagePrivate *priv = stage->priv;
+ PointerDeviceEntry *entry = NULL;
+
+ g_return_if_fail (CLUTTER_IS_STAGE (stage));
+ g_return_if_fail (device != NULL);
+
+ if (sequence != NULL)
+ entry = g_hash_table_lookup (priv->touch_sequences, sequence);
+ else
+ entry = g_hash_table_lookup (priv->pointer_devices, device);
+
+ if (entry && coords)
+ *coords = entry->coords;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-6.0.1/debian/changelog new/muffin-6.2.0/debian/changelog
--- old/muffin-6.0.1/debian/changelog 2023-12-28 12:53:15.000000000 +0100
+++ new/muffin-6.2.0/debian/changelog 2024-06-11 18:06:46.000000000 +0200
@@ -1,3 +1,30 @@
+muffin (6.2.0) wilma; urgency=medium
+
+ [ Clement Lefebvre ]
+ * packaging: Forbid compilation if the symbols file is outdated
+ * packaging: Update symbols file
+
+ [ Leigh Scott ]
+ * Fix compile issue (#683)
+ * build: Use Xwayland pkg-config if available (#682)
+
+ [ Michael Webster ]
+ * meta-input-settings-x11.c: Don't warn about receiving more values than expected from libinput.
+
+ [ Rick Calixte ]
+ * Fix segfault during Alt-Tab when window focus mode is either 'Sloppy' or 'Mouse' (gdb backtrace attached) (#680)
+
+ [ jknockel ]
+ * meta-crtc-xrandr.c: use nearest neighbor filter for integer randr scales (#692)
+ * meta-monitor-manager-xrandr.c: DeleteMonitor before SetMonitor (#693)
+
+ [ Jeffrey Knockel ]
+ * meta-monitor-manager-xrandr.c: fix crtc disabling
+ * meta-monitor-manager-xrandr.c: fix screen size
+ * meta-monitor-manager-xrandr.c: screen size fixes
+
+ -- Clement Lefebvre <root(a)linuxmint.com> Tue, 11 Jun 2024 17:06:29 +0100
+
muffin (6.0.1) virginia; urgency=medium
[ Michael Webster ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-6.0.1/debian/libmuffin0.symbols new/muffin-6.2.0/debian/libmuffin0.symbols
--- old/muffin-6.0.1/debian/libmuffin0.symbols 2023-12-28 12:53:15.000000000 +0100
+++ new/muffin-6.2.0/debian/libmuffin0.symbols 2024-06-11 18:06:46.000000000 +0200
@@ -371,6 +371,7 @@
clutter_animation_set_mode@Base 5.3.0
clutter_animation_set_object@Base 5.3.0
clutter_animation_set_timeline@Base 5.3.0
+ clutter_backend_egl_native_get_type@Base 6.0.0
clutter_backend_get_cogl_context@Base 5.3.0
clutter_backend_get_default_seat@Base 5.3.0
clutter_backend_get_font_options@Base 5.3.0
@@ -565,6 +566,7 @@
clutter_effect_get_type@Base 5.3.0
clutter_effect_paint_flags_get_type@Base 5.3.0
clutter_effect_queue_repaint@Base 5.3.0
+ clutter_egl_get_egl_display@Base 6.0.0
clutter_event_add_filter@Base 5.3.0
clutter_event_copy@Base 5.3.0
clutter_event_flags_get_type@Base 5.3.0
@@ -1113,6 +1115,7 @@
clutter_stage_get_capture_final_size@Base 5.3.0
clutter_stage_get_color@Base 5.3.0
clutter_stage_get_default@Base 5.3.0
+ clutter_stage_get_device_coords@Base 6.0.1
clutter_stage_get_frame_counter@Base 5.3.0
clutter_stage_get_key_focus@Base 5.3.0
clutter_stage_get_minimum_size@Base 5.3.0
@@ -1390,6 +1393,7 @@
clutter_virtual_input_device_notify_touch_down@Base 5.3.0
clutter_virtual_input_device_notify_touch_motion@Base 5.3.0
clutter_virtual_input_device_notify_touch_up@Base 5.3.0
+ clutter_wayland_set_compositor_display@Base 6.0.0
clutter_x11_add_filter@Base 5.3.0
clutter_x11_filter_return_get_type@Base 5.3.0
clutter_x11_get_default_display@Base 5.3.0
@@ -1961,6 +1965,7 @@
cogl_texture_set_premultiplied@Base 5.3.0
cogl_texture_set_region@Base 5.3.0
cogl_texture_set_region_from_bitmap@Base 5.3.0
+ cogl_wayland_display_set_compositor_display@Base 6.0.0
cogl_x11_onscreen_get_window_xid@Base 5.3.0
cogl_xlib_renderer_add_filter@Base 5.3.0
cogl_xlib_renderer_get_display@Base 5.3.0
@@ -2010,6 +2015,7 @@
cogl_path_copy@Base 5.3.0
cogl_path_get_gtype@Base 5.3.0
libmuffin.so.0 libmuffin0 #MINVER#
+ meta_activate_session@Base 6.0.0
meta_add_clutter_debug_flags@Base 5.3.0
meta_add_verbose_topic@Base 5.3.0
meta_backend_add_gpu@Base 5.3.0
@@ -2131,6 +2137,7 @@
meta_display_get_monitor_scale@Base 5.3.0
meta_display_get_n_monitors@Base 5.3.0
meta_display_get_pad_action_label@Base 5.3.0
+ meta_display_get_pointer_window@Base 6.0.0
meta_display_get_primary_monitor@Base 5.3.0
meta_display_get_selection@Base 5.3.0
meta_display_get_size@Base 5.3.0
@@ -2147,6 +2154,7 @@
meta_display_list_windows@Base 5.3.0
meta_display_logical_index_to_xinerama_index@Base 5.3.0
meta_display_lookup_stack_id@Base 5.3.0
+ meta_display_push_tile@Base 6.0.0
meta_display_remove_keybinding@Base 5.3.0
meta_display_request_pad_osd@Base 5.3.0
meta_display_set_cursor@Base 5.3.0
@@ -2491,6 +2499,7 @@
meta_selection_type_get_type@Base 5.3.0
meta_selection_unset_owner@Base 5.3.0
meta_set_gnome_wm_keybindings@Base 5.3.0
+ meta_set_verbose@Base 6.0.0
meta_set_wm_name@Base 5.3.0
meta_settings_enable_experimental_feature@Base 5.3.0
meta_settings_get_font_dpi@Base 5.3.0
@@ -2558,6 +2567,11 @@
meta_verify_monitors_config@Base 5.3.0
meta_virtual_modifier_get_type@Base 5.3.0
meta_warning@Base 5.3.0
+ meta_wayland_actor_surface_get_actor@Base 6.0.0
+ meta_wayland_compositor_get_default@Base 6.0.0
+ meta_wayland_get_wayland_display_name@Base 6.0.0
+ meta_wayland_get_xwayland_display_name@Base 6.0.0
+ meta_wayland_override_display_name@Base 6.0.0
meta_window_activate@Base 5.3.0
meta_window_activate_with_workspace@Base 5.3.0
meta_window_actor_get_image@Base 5.3.0
@@ -2737,3 +2751,4 @@
meta_x11_error_trap_push@Base 5.3.0
meta_x11_init_gdk_display@Base 5.3.0
meta_xrandr_rotation_get_type@Base 5.3.0
+ meta_xwayland_override_display_number@Base 6.0.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-6.0.1/debian/rules new/muffin-6.2.0/debian/rules
--- old/muffin-6.0.1/debian/rules 2023-12-28 12:53:15.000000000 +0100
+++ new/muffin-6.2.0/debian/rules 2024-06-11 18:06:46.000000000 +0200
@@ -2,6 +2,7 @@
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,--as-needed
+export DPKG_GENSYMBOLS_CHECK_LEVEL = 2
%:
dh $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-6.0.1/meson.build new/muffin-6.2.0/meson.build
--- old/muffin-6.0.1/meson.build 2023-12-28 12:53:15.000000000 +0100
+++ new/muffin-6.2.0/meson.build 2024-06-11 18:06:46.000000000 +0200
@@ -1,8 +1,4 @@
-project('muffin', 'c',
- version: '6.0.1',
- meson_version: '>=0.56.0',
- license: 'GPLv2+'
-)
+project('muffin', 'c', version : '6.2.0', meson_version : '>=0.56.0', license : 'GPLv2+')
mutter_plugin_api_version = '3'
@@ -381,9 +377,15 @@
have_xwayland_initfd = false
if have_wayland
+ xwayland_dep = dependency('xwayland', required: false)
+
xwayland_path = get_option('xwayland_path')
if xwayland_path == ''
- xwayland_path = find_program('Xwayland').path()
+ if xwayland_dep.found()
+ xwayland_path = xwayland_dep.get_pkgconfig_variable('xwayland')
+ else
+ xwayland_path = find_program('Xwayland').full_path()
+ endif
endif
cdata.set_quoted('XWAYLAND_PATH', xwayland_path)
@@ -398,9 +400,15 @@
# For Xwayland -initfd usage
use_initfd = get_option('xwayland_initfd')
+ if xwayland_dep.found()
+ xwayland_supports_initfd = xwayland_dep.get_pkgconfig_variable('have_initfd') == 'true'
+ else
+ xwayland_options = run_command(xwayland_path, '-help')
+ xwayland_supports_initfd = xwayland_options.stderr().contains('-initfd')
+ endif
+
if use_initfd.auto()
- xwayland_options = run_command([xwayland_path, '-help'], check: true)
- have_xwayland_initfd = xwayland_options.stderr().contains('-initfd')
+ have_xwayland_initfd = xwayland_supports_initfd
else
have_xwayland_initfd = use_initfd.enabled()
endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-6.0.1/src/backends/x11/meta-crtc-xrandr.c new/muffin-6.2.0/src/backends/x11/meta-crtc-xrandr.c
--- old/muffin-6.0.1/src/backends/x11/meta-crtc-xrandr.c 2023-12-28 12:53:15.000000000 +0100
+++ new/muffin-6.2.0/src/backends/x11/meta-crtc-xrandr.c 2024-06-11 18:06:46.000000000 +0200
@@ -135,6 +135,7 @@
DOUBLE_TO_FIXED (0), DOUBLE_TO_FIXED (1), DOUBLE_TO_FIXED (0),
DOUBLE_TO_FIXED (0), DOUBLE_TO_FIXED (0), DOUBLE_TO_FIXED (1)
};
+ float integer_scale;
if (!(meta_monitor_manager_get_capabilities (monitor_manager) &
META_MONITOR_MANAGER_CAPABILITY_NATIVE_OUTPUT_SCALING))
@@ -145,9 +146,19 @@
if (fabsf (scale - 1.0f) > 0.001)
{
- scale_filter = FilterGood;
- transformation.matrix11 = DOUBLE_TO_FIXED (1.0 / scale);
- transformation.matrix22 = DOUBLE_TO_FIXED (1.0 / scale);
+ integer_scale = roundf (scale);
+ if (fabsf (scale - integer_scale) > 0.001)
+ {
+ scale_filter = FilterGood;
+ transformation.matrix11 = DOUBLE_TO_FIXED (1.0 / scale);
+ transformation.matrix22 = DOUBLE_TO_FIXED (1.0 / scale);
+ }
+ else /* if integer multiple then use nearest neighbor filter */
+ {
+ scale_filter = "nearest";
+ transformation.matrix11 = DOUBLE_TO_FIXED (1.0 / integer_scale);
+ transformation.matrix22 = DOUBLE_TO_FIXED (1.0 / integer_scale);
+ }
}
else
scale_filter = FilterFast;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-6.0.1/src/backends/x11/meta-input-settings-x11.c new/muffin-6.2.0/src/backends/x11/meta-input-settings-x11.c
--- old/muffin-6.0.1/src/backends/x11/meta-input-settings-x11.c 2023-12-28 12:53:15.000000000 +0100
+++ new/muffin-6.2.0/src/backends/x11/meta-input-settings-x11.c 2024-06-11 18:06:46.000000000 +0200
@@ -126,9 +126,6 @@
if (rc == Success && type_ret == type && format_ret == format && nitems_ret >= nitems)
{
- if (nitems_ret > nitems)
- g_warning ("Property '%s' for device '%s' returned %lu items, expected %lu",
- property, clutter_input_device_get_device_name (device), nitems_ret, nitems);
return data_ret;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-6.0.1/src/backends/x11/meta-monitor-manager-xrandr.c new/muffin-6.2.0/src/backends/x11/meta-monitor-manager-xrandr.c
--- old/muffin-6.0.1/src/backends/x11/meta-monitor-manager-xrandr.c 2023-12-28 12:53:15.000000000 +0100
+++ new/muffin-6.2.0/src/backends/x11/meta-monitor-manager-xrandr.c 2024-06-11 18:06:46.000000000 +0200
@@ -550,7 +550,7 @@
MetaX11ScaleMode scale_mode = meta_settings_get_x11_scale_mode (settings);
unsigned i, valid_crtcs;
GList *l;
- int width, height;
+ int width, height, scaled_width, scaled_height;
float max_scale;
float avg_screen_scale;
gboolean have_scaling;
@@ -563,6 +563,7 @@
/* Compute the new size of the screen (framebuffer) */
max_scale = get_maximum_crtc_info_scale (crtcs, n_crtcs);
width = 0; height = 0;
+ scaled_width = 0; scaled_height = 0;
avg_screen_scale = 0;
valid_crtcs = 0;
for (i = 0; i < n_crtcs; i++)
@@ -578,6 +579,13 @@
if (have_scaling && scale_mode == META_X11_SCALE_MODE_UI_DOWN)
scale = (ceilf (max_scale) / crtc_info->scale) * crtc_info->scale;
+ else
+ {
+ scaled_width = MAX (scaled_width, crtc_info->layout.origin.x +
+ crtc_info->layout.size.width * crtc_info->scale);
+ scaled_height = MAX (scaled_height, crtc_info->layout.origin.y +
+ crtc_info->layout.size.height * crtc_info->scale);
+ }
width = MAX (width, (int) roundf (crtc_info->layout.origin.x +
crtc_info->layout.size.width * scale));
@@ -609,7 +617,7 @@
y2 = (int) roundf (crtc_config->layout.origin.y +
crtc_config->layout.size.height);
- if (!crtc_info->mode || x2 > width || y2 > height)
+ if (!crtc_info->mode || width < scaled_width || height < scaled_height || x2 > width || y2 > height)
{
xrandr_set_crtc_config (manager_xrandr,
crtc,
@@ -661,7 +669,7 @@
if (!n_crtcs)
goto out;
- if (width > manager->screen_width || height > manager->screen_height)
+ if (width > 0 && height > 0)
{
meta_monitor_manager_xrandr_update_screen_size (manager_xrandr,
width, height,
@@ -783,13 +791,6 @@
output->is_primary = FALSE;
}
- if (width > 0 && height > 0)
- {
- meta_monitor_manager_xrandr_update_screen_size (manager_xrandr,
- width, height,
- avg_screen_scale);
- }
-
out:
XUngrabServer (manager_xrandr->xdisplay);
XFlush (manager_xrandr->xdisplay);
@@ -846,7 +847,7 @@
if (!crtc || !crtc->config)
continue;
- if (!have_scaling || scale_mode != META_X11_SCALE_MODE_UI_DOWN)
+ if (!have_scaling)
{
/* When scaling up we should not reduce the screen size, or X will
* fail miserably, while we must do it when scaling down, in order to
@@ -1082,6 +1083,8 @@
GList *outputs;
GList *l;
int i;
+ xcb_connection_t *xcb_conn;
+ xcb_void_cookie_t cookie;
if (!(meta_monitor_manager_get_capabilities (manager) &
META_MONITOR_MANAGER_CAPABILITY_TILING))
@@ -1117,6 +1120,11 @@
xrandr_monitor_info->outputs[i] = output->winsys_id;
}
+ xcb_conn = XGetXCBConnection (manager_xrandr->xdisplay);
+ cookie = xcb_randr_delete_monitor_checked (xcb_conn,
+ DefaultRootWindow (manager_xrandr->xdisplay),
+ name_atom);
+ free (xcb_request_check (xcb_conn, cookie)); /* ignore DeleteMonitor errors */
XRRSetMonitor (manager_xrandr->xdisplay,
DefaultRootWindow (manager_xrandr->xdisplay),
xrandr_monitor_info);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-6.0.1/src/core/prefs.c new/muffin-6.2.0/src/core/prefs.c
--- old/muffin-6.0.1/src/core/prefs.c 2023-12-28 12:53:15.000000000 +0100
+++ new/muffin-6.2.0/src/core/prefs.c 2024-06-11 18:06:46.000000000 +0200
@@ -2258,7 +2258,7 @@
}
else
{
- strokes = g_strdupv (bindings);
+ strokes = g_strdupv((gchar **)bindings);
}
queue_changed (META_PREF_KEYBINDINGS);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-6.0.1/src/wayland/meta-wayland-pointer.c new/muffin-6.2.0/src/wayland/meta-wayland-pointer.c
--- old/muffin-6.0.1/src/wayland/meta-wayland-pointer.c 2023-12-28 12:53:15.000000000 +0100
+++ new/muffin-6.2.0/src/wayland/meta-wayland-pointer.c 2024-06-11 18:06:46.000000000 +0200
@@ -618,10 +618,13 @@
ClutterActor *actor;
MetaWaylandSurface *surface;
- if (for_event)
- actor = clutter_event_get_source (for_event);
+ if (!for_event)
+ return;
+
+ if (clutter_event_type (for_event) == CLUTTER_LEAVE)
+ actor = clutter_event_get_related (for_event);
else
- actor = clutter_input_device_get_pointer_actor (pointer->device);
+ actor = clutter_event_get_source (for_event);
if (META_IS_SURFACE_ACTOR_WAYLAND (actor))
{
@@ -938,6 +941,7 @@
if (surface != NULL)
{
+ ClutterStage *stage = CLUTTER_STAGE (meta_backend_get_stage (backend));
struct wl_client *client = wl_resource_get_client (surface->resource);
graphene_point_t pos;
MetaWindow *focus_window;
@@ -949,7 +953,7 @@
G_CALLBACK (focus_surface_destroyed),
pointer);
- clutter_input_device_get_coords (pointer->device, NULL, &pos);
+ clutter_stage_get_device_coords (stage, pointer->device, NULL, &pos);
focus_window = meta_wayland_surface_get_window (pointer->focus_surface);
if (focus_window)
@@ -960,7 +964,7 @@
pointer->focus_client =
meta_wayland_pointer_get_pointer_client (pointer, client);
- if (pointer->focus_client)
+ if (pointer->focus_client && pointer->focus_surface)
{
pointer->focus_serial =
meta_wayland_input_device_next_serial (input_device);
@@ -1054,10 +1058,12 @@
wl_fixed_t *sx,
wl_fixed_t *sy)
{
+ MetaBackend *backend = meta_get_backend ();
+ ClutterStage *stage = CLUTTER_STAGE (meta_backend_get_stage (backend));
float xf = 0.0f, yf = 0.0f;
graphene_point_t pos;
- clutter_input_device_get_coords (pointer->device, NULL, &pos);
+ clutter_stage_get_device_coords (stage, pointer->device, NULL, &pos);
meta_wayland_surface_get_relative_coordinates (surface, pos.x, pos.y, &xf, &yf);
*sx = wl_fixed_from_double (xf);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-6.0.1/src/wayland/meta-wayland-surface.c new/muffin-6.2.0/src/wayland/meta-wayland-surface.c
--- old/muffin-6.0.1/src/wayland/meta-wayland-surface.c 2023-12-28 12:53:15.000000000 +0100
+++ new/muffin-6.2.0/src/wayland/meta-wayland-surface.c 2024-06-11 18:06:46.000000000 +0200
@@ -1566,12 +1566,15 @@
float *sx,
float *sy)
{
- MetaWaylandSurfaceRoleClass *surface_role_class =
- META_WAYLAND_SURFACE_ROLE_GET_CLASS (surface->role);
+ if (surface != NULL && surface->role)
+ {
+ MetaWaylandSurfaceRoleClass *surface_role_class =
+ META_WAYLAND_SURFACE_ROLE_GET_CLASS (surface->role);
- surface_role_class->get_relative_coordinates (surface->role,
- abs_x, abs_y,
- sx, sy);
+ surface_role_class->get_relative_coordinates (surface->role,
+ abs_x, abs_y,
+ sx, sy);
+ }
}
void
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ansible for openSUSE:Factory checked in at 2024-08-13 13:23:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ansible (Old)
and /work/SRC/openSUSE:Factory/.ansible.new.7232 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ansible"
Tue Aug 13 13:23:47 2024 rev:115 rq:1193333 version:10.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/ansible/ansible.changes 2024-06-19 16:40:44.362264302 +0200
+++ /work/SRC/openSUSE:Factory/.ansible.new.7232/ansible.changes 2024-08-13 13:24:12.388652453 +0200
@@ -1,0 +2,44 @@
+Wed Jul 17 05:42:54 UTC 2024 - Johannes Kastl <opensuse_buildservice(a)ojkastl.de>
+
+- update to 10.2.0:
+ Ansible 10.2.0 includes ansible-core 2.17.2 as well as a curated
+ set of Ansible collections that provide a vast number of modules
+ and plugins.
+ Collections which have opted-in to being a part of the Ansible 10
+ unified changelog will have an entry on this page:
+ https://github.com/ansible-community/ansible-build-data/blob/main/10/CHANGE…
+
+-------------------------------------------------------------------
+Sun Jul 14 15:45:28 UTC 2024 - Johannes Kastl <opensuse_buildservice(a)ojkastl.de>
+
+- update to 10.1.0:
+ Ansible 10.1.0 includes ansible-core 2.17.1 as well as a curated
+ set of Ansible collections that provide a vast number of modules
+ and plugins.
+ Collections which have opted-in to being a part of the Ansible 10
+ unified changelog will have an entry on this page:
+ https://github.com/ansible-community/ansible-build-data/blob/main/10/CHANGE…
+
+-------------------------------------------------------------------
+Sun Jul 14 15:44:02 UTC 2024 - Johannes Kastl <opensuse_buildservice(a)ojkastl.de>
+
+- update to 10.0.1:
+ Ansible 10.0.1 includes ansible-core 2.17.0 as well as a curated
+ set of Ansible collections that provide a vast number of modules
+ and plugins.
+ Collections which have opted-in to being a part of the Ansible 10
+ unified changelog will have an entry on this page:
+ https://github.com/ansible-community/ansible-build-data/blob/main/10/CHANGE…
+
+-------------------------------------------------------------------
+Sun Jul 14 15:38:48 UTC 2024 - Johannes Kastl <opensuse_buildservice(a)ojkastl.de>
+
+- update to 10.0.0:
+ Ansible 10.0.0 includes ansible-core 2.17.0 as well as a curated
+ set of Ansible collections that provide a vast number of modules
+ and plugins.
+ Collections which have opted-in to being a part of the Ansible 10
+ unified changelog will have an entry on this page:
+ https://github.com/ansible-community/ansible-build-data/blob/main/10/CHANGE…
+
+-------------------------------------------------------------------
Old:
----
ansible-9.7.0.tar.gz
New:
----
ansible-10.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ansible.spec ++++++
--- /var/tmp/diff_new_pack.h8WVmK/_old 2024-08-13 13:24:13.668705786 +0200
+++ /var/tmp/diff_new_pack.h8WVmK/_new 2024-08-13 13:24:13.672705953 +0200
@@ -38,7 +38,7 @@
%endif
Name: ansible
-Version: 9.7.0
+Version: 10.2.0
Release: 0
Summary: Radically simple IT automation
License: GPL-3.0+
@@ -54,11 +54,11 @@
BuildRequires: dos2unix
# SECTION test requirements
-BuildRequires: ansible-core >= 2.16.8
+BuildRequires: ansible-core >= 2.17.2
# /SECTION
Requires: %{ansible_python}-base >= 3.10
-Requires: ansible-core >= 2.16.8
+Requires: ansible-core >= 2.7.2
# Do not check any files in collections for requires
%global __requires_exclude_from ^%{ansible_python_sitelib}/.*$
@@ -94,7 +94,7 @@
%fdupes %{buildroot}/%{ansible_python_sitelib}/ansible_collections/
%files
-%doc CHANGELOG-v9.rst README.rst
+%doc CHANGELOG-v10.rst README.rst
%license COPYING
%{_bindir}/ansible-community
%{ansible_python_sitelib}/
++++++ ansible-9.7.0.tar.gz -> ansible-10.2.0.tar.gz ++++++
/work/SRC/openSUSE:Factory/ansible/ansible-9.7.0.tar.gz /work/SRC/openSUSE:Factory/.ansible.new.7232/ansible-10.2.0.tar.gz differ: char 5, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ansible-documentation for openSUSE:Factory checked in at 2024-08-13 13:23:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ansible-documentation (Old)
and /work/SRC/openSUSE:Factory/.ansible-documentation.new.7232 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ansible-documentation"
Tue Aug 13 13:23:45 2024 rev:14 rq:1193331 version:2.17.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/ansible-documentation/ansible-documentation.changes 2024-06-19 16:40:40.474125875 +0200
+++ /work/SRC/openSUSE:Factory/.ansible-documentation.new.7232/ansible-documentation.changes 2024-08-13 13:24:09.944550618 +0200
@@ -1,0 +2,82 @@
+Tue Jul 16 20:20:06 UTC 2024 - opensuse_buildservice(a)ojkastl.de
+
+- Update to version 2.17.2:
+ * restore anchor in communication guide (#1692) (#1694)
+ * collection_requirements: fix typo (#1684) (#1687)
+ * [WIP, needs vote before merging] collection_requirements.rst:
+ update (#1422) (#1664)
+ * ci: refresh dev dependencies (#1675) (#1680)
+ * ci: refresh dev dependencies (#1671)
+ * communication guide: overhaul (#1667) (#1668)
+ * docs/docsite/rst/dev_guide/developing_program_flow_modules.rst:
+ avoid using aliases (#1539) (#1660)
+ * Remove references to archived ansible/ansible-examples
+ repository (#1653) (#1656)
+ * Remove reference of scp_if_ssh option (#1346) (#1652)
+ * Integrate the `alls-green` action into the main GHA CI workflow
+ (#1639) (#1647)
+ * fix Ansible architecture docs (#1637) (#1646)
+ * fix Validate data against set criteria with Ansible doc (#1636)
+ (#1642)
+ * Revert "Add example /usr/bin/env python as Python interpreter
+ (#280)" (#1629) (#1631)
+ * Replace WG list with a pointer to the forum groups . (#1596)
+ (#1625)
+ * developing_collections_migrating.rst: update (#1605) (#1628)
+ * Update unit test document (#1597) (#1624)
+ * Update playbooks_loops.rst (#1617) (#1620)
+ * Add porting guide for 9.7.0. (#1609) (#1613)
+ * Add porting guide for Ansible 10.1.0. (#1610) (#1612)
+ * Fix typo in communication.rst (#1598) (#1608)
+
+-------------------------------------------------------------------
+Sun Jul 14 15:36:53 UTC 2024 - opensuse_buildservice(a)ojkastl.de
+
+- Update to version 2.17.1:
+ * Merge pull request #1585 from ansible/pip-compile/devel/dev
+ * clarify how to verify collection-level docs (#1589) (#1595)
+ * Fix up PowerShell and Windows support lifecycle (#1587) (#1588)
+ * cause people keep doing this (#1567) (#1584)
+ * Update uptime.py (#1524) (#1581)
+ * Update playbooks_loops.rst (#1569) (#1578)
+ * Merge pull request #1568 from samccann/bullhorn-edit
+ * Merge pull request #1566 from samccann/intersphinx
+ * Update the Ansible 10 porting guide. (#1570)
+ * Merge pull request #1562 from M15terHyde/patch-1
+ * Merge pull request #1523 from
+ oraNod/issue-1491/porting-guide-217
+ * Update release table for Ansible 10 and 9 (#1543) (#1558)
+ * update conf.py for Ansible 10 (#1544) (#1559)
+ * Update playbooks_blocks.rst (#1546) (#1554)
+ * Add Ansible community 10.0.0 porting guide (#1555) (#1556)
+ * update to version 10 (#1551)
+ * Merge pull request #1527 from ansible/pip-compile/devel/dev
+ * Python collection requirements: restructure (#1459) (#1542)
+ * Merge pull request #1529 from
+ Andersson007/update_overview_links
+ * Merge pull request #1530 from oraNod/fix-spelling
+ * release_and_maintenance: mark 8.x unmaintained as 8.7.0
+ released (#1522) (#1526)
+ * mark 2.14 EOL in the release table (#1502) (#1521)
+ * update backport instructions for 2.17 (#1504) (#1518)
+ * Merge pull request #1321 from vojtam/feature/#357
+ * Update collection_checklist.md links to point to new location
+ (#1505) (#1506)
+ * Move Ansible package collection removal process to
+ docs.ansible.com (#1492) (#1508)
+ * Add Ansible community 10.0.0b1 porting guide (#1494)
+ * Add Ansible community 9.6.0 porting guide (#1493)
+ * Merge pull request #1477 from ansible/pip-compile/devel/dev
+ * update version switcher to suppor 2.17 (#1464) (#1486)
+ * collection_requirements: update community topic links (#1421)
+ (#1484)
+
+-------------------------------------------------------------------
+Sun Jul 14 15:24:51 UTC 2024 - opensuse_buildservice(a)ojkastl.de
+
+- Update to version 2.17.0:
+ major update to 2.17.0, no changelog.
+ Full list of commits/changes see
+ https://github.com/ansible/ansible-documentation/compare/v2.16.8...v2.17.0
+
+-------------------------------------------------------------------
Old:
----
ansible-documentation-2.16.8.obscpio
New:
----
ansible-documentation-2.17.2.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ansible-documentation.spec ++++++
--- /var/tmp/diff_new_pack.zQKW8D/_old 2024-08-13 13:24:10.612578452 +0200
+++ /var/tmp/diff_new_pack.zQKW8D/_new 2024-08-13 13:24:10.612578452 +0200
@@ -17,7 +17,7 @@
Name: ansible-documentation
-Version: 2.16.8
+Version: 2.17.2
Release: 0
Summary: Ansible community documentation and example files
License: GPL-3.0-only
++++++ _service ++++++
--- /var/tmp/diff_new_pack.zQKW8D/_old 2024-08-13 13:24:10.648579952 +0200
+++ /var/tmp/diff_new_pack.zQKW8D/_new 2024-08-13 13:24:10.652580119 +0200
@@ -3,7 +3,7 @@
<param name="url">https://github.com/ansible/ansible-documentation</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v2.16.8</param>
+ <param name="revision">v2.17.2</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.zQKW8D/_old 2024-08-13 13:24:10.672580952 +0200
+++ /var/tmp/diff_new_pack.zQKW8D/_new 2024-08-13 13:24:10.676581119 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/ansible/ansible-documentation</param>
- <param name="changesrevision">81042e685a389051d87422d97ce6a4addacdbdae</param></service></servicedata>
+ <param name="changesrevision">8c60f0b042a1b4da0946305190323ba2d6d8b517</param></service></servicedata>
(No newline at EOF)
++++++ ansible-documentation-2.16.8.obscpio -> ansible-documentation-2.17.2.obscpio ++++++
/work/SRC/openSUSE:Factory/ansible-documentation/ansible-documentation-2.16.8.obscpio /work/SRC/openSUSE:Factory/.ansible-documentation.new.7232/ansible-documentation-2.17.2.obscpio differ: char 49, line 1
++++++ ansible-documentation.obsinfo ++++++
--- /var/tmp/diff_new_pack.zQKW8D/_old 2024-08-13 13:24:10.716582785 +0200
+++ /var/tmp/diff_new_pack.zQKW8D/_new 2024-08-13 13:24:10.720582953 +0200
@@ -1,5 +1,5 @@
name: ansible-documentation
-version: 2.16.8
-mtime: 1718615279
-commit: 81042e685a389051d87422d97ce6a4addacdbdae
+version: 2.17.2
+mtime: 1721062177
+commit: 8c60f0b042a1b4da0946305190323ba2d6d8b517
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ansible-core for openSUSE:Factory checked in at 2024-08-13 13:23:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ansible-core (Old)
and /work/SRC/openSUSE:Factory/.ansible-core.new.7232 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ansible-core"
Tue Aug 13 13:23:45 2024 rev:30 rq:1193330 version:2.17.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/ansible-core/ansible-core.changes 2024-06-19 16:40:36.745993145 +0200
+++ /work/SRC/openSUSE:Factory/.ansible-core.new.7232/ansible-core.changes 2024-08-13 13:24:06.752417618 +0200
@@ -1,0 +2,586 @@
+Tue Jul 16 05:47:40 UTC 2024 - Johannes Kastl <opensuse_buildservice(a)ojkastl.de>
+
+- update to 2.17.2:
+ https://github.com/ansible/ansible/blob/v2.17.2/changelogs/CHANGELOG-v2.17.…
+ * Bugfixes
+ - Fix a traceback when an environment variable contains certain
+ special characters (#83498)
+ - dnf - reverted incomplete fix from 2.17.2rc1 (#83504)
+ - dnf, dnf5 - fix for installing a set of packages by
+ specifying them using a wildcard character (#83373)
+ - linear strategy now provides a properly templated task name
+ to the v2_runner_on_started callback event.
+ - package_facts - ignore warnings sent by apk on stderr
+ (#83501).
+ - replace - Updated before/after example (#83390).
+ - templating hostvars under native jinja will not cause
+ serialization errors anymore.
+
+-------------------------------------------------------------------
+Sun Jul 14 16:01:58 UTC 2024 - Johannes Kastl <opensuse_buildservice(a)ojkastl.de>
+
+- update to 2.17.1:
+ https://github.com/ansible/ansible/blob/v2.17.1/changelogs/CHANGELOG-v2.17.…
+ * Minor Changes
+ - ansible-test - Update pypi-test-container to version 3.1.0.
+ * Bugfixes
+ - Fix rapid memory usage growth when notifying handlers using
+ the listen keyword (#83392)
+ - Fix the task attribute resolved_action to show the FQCN
+ instead of None when action or local_action is used in the
+ playbook.
+ - Fix using module_defaults with local_action/action (#81905).
+ - fixed unit test test_borken_cowsay to address mock not been
+ properly applied when existing unix system already have
+ cowsay installed.
+ - powershell - Implement more robust deletion mechanism for C#
+ code compilation temporary files. This should avoid scenarios
+ where the underlying temporary directory may be temporarily
+ locked by antivirus tools or other IO problems. A failure to
+ delete one of these temporary directories will result in a
+ warning rather than an outright failure.
+ - shell plugin - properly quote all needed components of shell
+ commands (#82535)
+
+-------------------------------------------------------------------
+Sun Jul 14 15:27:58 UTC 2024 - Johannes Kastl <opensuse_buildservice(a)ojkastl.de>
+
+- update to 2.17.0:
+ https://github.com/ansible/ansible/blob/v2.17.0/changelogs/CHANGELOG-v2.17.…
+ * Major Changes
+ - urls.py - Removed support for Python 2
+ * Minor Changes
+ - Add dump and passno mount information to facts component
+ (#80478)
+ - Added MIRACLE LINUX 9.2 in RedHat OS Family.
+ - Interpreter Discovery - Remove hardcoded references to
+ specific python interpreters to use for certain distro
+ versions, and modify logic for python3 to become the default.
+ - Use Python's built-in functools.update_wrapper instead an
+ inline copy from Python 3.7.
+ - User can now set ansible.log to record higher verbosity than
+ what is specified for display via new configuration item
+ LOG_VERBOSITY.
+ - DEFAULT_PRIVATE_ROLE_VARS is now overridden by explicit
+ setting of public for include_roles and import_roles.
+ - ansible-galaxy role|collection init - accept --extra-vars to
+ supplement/override the variables ansible-galaxy injects for
+ templating .j2 files in the skeleton.
+ - import_role action now also gets a public option that
+ controls variable exports, default depending on
+ DEFAULT_PRIVATE_ROLE_VARS (if using defaults equates to
+ public=True).
+ - added configuration item TARGET_LOG_INFO that allows the
+ user/author to add an information string to the log output on
+ targets.
+ - ansible-doc - treat double newlines in documentation strings
+ as paragraph breaks. This is useful to create multi-paragraph
+ notes in module/plugin documentation (#82465).
+ - ansible-doc output has been revamped to make it more visually
+ pleasing when going to a terminal, also more concise, use -v
+ to show extra information.
+ - ansible-galaxy - Started normalizing build directory with a
+ trailing separator when building collections, internally.
+ (#81619).
+ - ansible-galaxy dependency resolution messages have changed
+ the unexplained 'virtual' collection for the specific type
+ ('scm', 'dir', etc) that is more user friendly
+ - ansible-test - Add Alpine 3.19 container.
+ - ansible-test - Add Alpine 3.19 to remotes.
+ - ansible-test - Add Fedora 39 container.
+ - ansible-test - Add Fedora 39 remote.
+ - ansible-test - Add a work-around for permission denied errors
+ when using pytest >= 8 on multi-user systems with an
+ installed version of ansible-test.
+ - ansible-test - Add support for RHEL 9.3 remotes.
+ - ansible-test - Added a macOS 14.3 remote VM.
+ - ansible-test - Bump the nios-test-container from version
+ 2.0.0 to version 3.0.0.
+ - ansible-test - Containers and remotes managed by ansible-test
+ will have their Python EXTERNALLY-MANAGED marker (PEP668)
+ removed. This provides backwards compatibility for existing
+ tests running in newer environments which mark their Python
+ as externally managed. A future version of ansible-test may
+ change this behavior, requiring tests to be adapted to such
+ environments.
+ - ansible-test - Make Python 3.12 the default version used in
+ the base and default containers.
+ - ansible-test - Remove Alpine 3(.18) container.
+ - ansible-test - Remove Alpine 3.18 from remotes.
+ - ansible-test - Remove Fedora 38 remote support.
+ - ansible-test - Remove Fedora 38 test container.
+ - ansible-test - Remove rhel/9.2 test remote
+ - ansible-test - Remove the FreeBSD 13.2 remote.
+ - ansible-test - Removed fallback to virtualenv when -m venv is
+ non-functional.
+ - ansible-test - Removed test remotes: macos/13.2
+ - ansible-test - Removed the no-basestring sanity test. The
+ test is no longer necessary now that Python 3 is required.
+ - ansible-test - Removed the no-dict-iteritems,
+ no-dict-iterkeys and no-dict-itervalues sanity tests. The
+ tests are no longer necessary since Python 3 is required.
+ - ansible-test - Removed the no-main-display sanity test. The
+ unwanted pattern is unlikely to occur, since the test has
+ existed since Ansible 2.8.
+ - ansible-test - Removed the no-unicode-literals sanity test.
+ The test is unnecessary now that Python 3 is required and the
+ unicode_literals feature has no effect.
+ - ansible-test - Special handling for installation of
+ cryptography has been removed, as it is no longer necessary.
+ - ansible-test - The shellcheck sanity test no longer disables
+ the SC2164 check. In most cases, seeing this error means the
+ script is missing set -e.
+ - ansible-test - The unidiomatic-typecheck rule has been
+ enabled in the pylint sanity test.
+ - ansible-test - The unidiomatic-typecheck rule has been
+ removed from the validate-modules sanity test.
+ - ansible-test - Update the base and default containers to use
+ Ubuntu 22.04 for the base image. This also updates PowerShell
+ to version 7.4.0 with .NET 8.0.0 and ShellCheck to version
+ 0.8.0.
+ - ansible-test - Updated the CloudStack test container to
+ version 1.7.0.
+ - ansible-test - Updated the distro test containers to version
+ 6.3.0 to include coverage 7.3.2 for Python 3.8+. The alpine3
+ container is now based on 3.18 instead of 3.17 and includes
+ Python 3.11 instead of Python 3.10.
+ - ansible-test - Updated the distro test containers to version
+ 7.1.0.
+ - ansible-test - When ansible-test installs requirements, it
+ now instructs pip to allow installs on externally managed
+ environments as defined by PEP 668. This only occurs in
+ ephemeral environments managed by ansible-test, such as
+ containers, or when the --requirements option is used.
+ - ansible-test - When invoking sleep in containers during
+ container setup, the env command is used to avoid invoking
+ the shell builtin, if present.
+ - ansible-test - document block name now included in error
+ message for YAML parsing errors (#82353).
+ - ansible-test - sanity test allows EXAMPLES to be
+ multi-document YAML (#82353).
+ - ansible-test now has FreeBSD 13.3 and 14.0 support
+ - ansible.builtin.user - Remove user not found warning (#80267)
+ - apt_repository.py - use api.launchpad.net endpoint instead of
+ launchpad.net/api
+ - async tasks can now also support check mode at the same time.
+ - async_status now supports check mode.
+ - constructed inventory plugin - Adding a note that only
+ group_vars of explicit groups are loaded (#82580).
+ - csvfile - add a keycol parameter to specify in which column
+ to search.
+ - dnf - add the best option
+ - dnf5 - add the best option
+ - filter plugin - Add the count and mandatory_count parameters
+ in the regex_replace filter
+ - find - add a encoding parameter to specify which encoding of
+ the files to be searched.
+ - git module - gpg_allowlist name was added in 2.17 and we will
+ eventually deprecate the gpg_whitelist alias.
+ - import_role - allow subdirectories with `_from` options for
+ parity with include_role (#82584).
+ - module argument spec - Allow module authors to include
+ arbitrary additional context in the argument spec, by making
+ use of a new top level key called context. This key should be
+ a dict type. This allows for users to customize what they
+ place in the argument spec, without having to ignore sanity
+ tests that validate the schema.
+ - modules - Add the ability for an action plugin to call
+ self._execute_module(*, ignore_unknown_opts=True) to execute
+ a module with options that may not be supported for the
+ version being called. This tells the module basic wrapper to
+ ignore validating the options provided match the arg spec.
+ - package action now has a configuration that overrides the
+ detected package manager, it is still overridden itself by
+ the use option.
+ - py3compat - Remove ansible.utils.py3compat as it is no longer
+ necessary
+ - removed the unused argument create_new_password from
+ CLI.build_vault_ids (#82066).
+ - urls - Add support for TLS 1.3 post handshake certificate
+ authentication - #81782
+ - urls - reduce complexity of Request.open
+ - user - accept yescrypt hash as user password
+ - validate-modules tests now correctly handles choices in
+ dictionary format.
+ * Breaking Changes / Porting Guide
+ - assert - Nested templating may result in an inability for the
+ conditional to be evaluated. See the porting guide for more
+ information.
+ * Deprecated Features
+ - Old style vars plugins which use the entrypoints
+ get_host_vars or get_group_vars are deprecated. The plugin
+ should be updated to inherit from BaseVarsPlugin and define a
+ get_vars method as the entrypoint.
+ - The 'required' parameter in
+ 'ansible.module_utils.common.process.get_bin_path' API is
+ deprecated (#82464).
+ - module_utils - importing the following convenience helpers
+ from ansible.module_utils.basic has been deprecated:
+ get_exception, literal_eval, _literal_eval, datetime, signal,
+ types, chain, repeat, PY2, PY3, b, binary_type,
+ integer_types, iteritems, string_types, test_type, map and
+ shlex_quote.
+ - ansible-doc - role entrypoint attributes are deprecated and
+ eventually will no longer be shown in ansible-doc from
+ ansible-core 2.20 on (#82639, #82678).
+ - paramiko connection plugin, configuration items in the global
+ scope are being deprecated and will be removed in favor or
+ the existing same options in the plugin itself. Users should
+ not need to change anything (how to configure them are the
+ same) but plugin authors using the global constants should
+ move to using the plugin's get_option().
+ * Removed Features (previously deprecated)
+ - Remove deprecated APIs from ansible-docs (#81716).
+ - Remove deprecated JINJA2_NATIVE_WARNING environment variable
+ (#81714)
+ - Remove deprecated scp_if_ssh from ssh connection plugin
+ (#81715).
+ - Remove deprecated crypt support from ansible.utils.encrypt
+ (#81717)
+ - Removed Python 2.7 and Python 3.6 as a supported remote
+ version. Python 3.7+ is now required for target execution.
+ - With the removal of Python 2 support, the yum module and yum
+ action plugin are removed and redirected to dnf.
+ * Security Fixes
+ - ANSIBLE_NO_LOG - Address issue where ANSIBLE_NO_LOG was
+ ignored (CVE-2024-0690)
+ - ansible-galaxy - Prevent roles from using symlinks to
+ overwrite files outside of the installation directory
+ (CVE-2023-5115)
+ - templating - Address issues where internal templating can
+ cause unsafe variables to lose their unsafe designation
+ (CVE-2023-5764)
+ * Bugfixes
+ - Add a version ceiling constraint for pypsrp to avoid
+ potential breaking changes in the 1.0.0 release.
+ - All core lookups now use set_option(s) even when doing their
+ own custom parsing. This ensures that the options are always
+ the proper type.
+ - Allow for searching handler subdir for included task via
+ include_role (#81722)
+ - AnsibleModule.atomic_move - fix preserving extended ACLs of
+ the destination when it exists (#72929).
+ - Cache host_group_vars after instantiating it once and limit
+ the amount of repetitive work it needs to do every time it
+ runs.
+ - Call PluginLoader.all() once for vars plugins, and load vars
+ plugins that run automatically or are enabled specifically by
+ name subsequently.
+ - Consolidate systemd detection logic into one place (#80975).
+ - Consolidated the list of internal static vars, centralized
+ them as constant and completed from some missing entries.
+ - Do not print undefined error message twice (#78703).
+ - Enable file cache for vaulted files during vars lookup to fix
+ a strong performance penalty in huge and complex playbboks.
+ - Fix NEVRA parsing of package names that include digit(s) in
+ them (#76463, #81018)
+ - Fix force_handlers not working with any_errors_fatal (#36308)
+ - Fix run_once being incorrectly interpreted on handlers
+ (#81666)
+ - Fix an issue when setting a plugin name from an unsafe source
+ resulted in ValueError: unmarshallable object (#82708)
+ - Fix check for missing _sub_plugin attribute in older
+ connection plugins (#82954)
+ - Fix condition for unquoting configuration strings from ini
+ files (#82387).
+ - Fix for when any_errors_fatal was ignored if error occurred
+ in a block with always (#31543)
+ - Fix handlers not being executed in lockstep using the linear
+ strategy in some cases (#82307)
+ - Fix handling missing urls in
+ ansible.module_utils.urls.fetch_file for Python 3.
+ - Fix issue where an include_tasks handler in a role was not
+ able to locate a file in tasks/ when tasks_from was used as a
+ role entry point and main.yml was not present (#82241)
+ - Fix issues when tasks withing nested blocks wouldn't run when
+ force_handlers is set (#81533)
+ - Fix loading vars_plugins in roles (#82239).
++++ 289 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/ansible-core/ansible-core.changes
++++ and /work/SRC/openSUSE:Factory/.ansible-core.new.7232/ansible-core.changes
Old:
----
ansible_core-2.16.8.tar.gz
ansible_core-2.16.8.tar.gz.sha256
New:
----
ansible_core-2.17.2.tar.gz
ansible_core-2.17.2.tar.gz.sha256
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ansible-core.spec ++++++
--- /var/tmp/diff_new_pack.htMYGw/_old 2024-08-13 13:24:08.108474118 +0200
+++ /var/tmp/diff_new_pack.htMYGw/_new 2024-08-13 13:24:08.108474118 +0200
@@ -38,7 +38,7 @@
%endif
Name: ansible-core
-Version: 2.16.8
+Version: 2.17.2
Release: 0
Summary: Radically simple IT automation
License: GPL-3.0-or-later
@@ -51,10 +51,10 @@
Conflicts: ansible < 3
Conflicts: ansible-base
-# https://github.com/ansible/ansible/blob/stable-2.16/setup.cfg#L40
+# https://github.com/ansible/ansible/blob/stable-2.17/setup.cfg#L40
BuildRequires: %{ansible_python}-base >= 3.10
BuildRequires: %{ansible_python}-setuptools
-# https://github.com/ansible/ansible/blob/stable-2.16/requirements.txt
+# https://github.com/ansible/ansible/blob/stable-2.17/requirements.txt
BuildRequires: %{ansible_python}-Jinja2 >= 3.0.0
BuildRequires: %{ansible_python}-PyYAML >= 5.1
BuildRequires: %{ansible_python}-cryptography
@@ -185,7 +185,7 @@
#python3 bin/ansible-test units -v --python %%{python3_version}
%files
-%doc changelogs/CHANGELOG-v2.16.rst changelogs/changelog.yaml
+%doc changelogs/CHANGELOG-v2.17.rst changelogs/changelog.yaml
%license COPYING licenses/Apache-License.txt licenses/MIT-license.txt licenses/PSF-license.txt licenses/simplified_bsd.txt
%{_bindir}/ansible
%{_bindir}/ansible-config
++++++ ansible_core-2.16.8.tar.gz -> ansible_core-2.17.2.tar.gz ++++++
++++ 53207 lines of diff (skipped)
++++++ ansible_core-2.16.8.tar.gz.sha256 -> ansible_core-2.17.2.tar.gz.sha256 ++++++
--- /work/SRC/openSUSE:Factory/ansible-core/ansible_core-2.16.8.tar.gz.sha256 2024-06-19 16:40:36.901998699 +0200
+++ /work/SRC/openSUSE:Factory/.ansible-core.new.7232/ansible_core-2.17.2.tar.gz.sha256 2024-08-13 13:24:06.812420118 +0200
@@ -1 +1 @@
-59e4aa40ed5acdb4ef9bbf3d058918fff93f66a149373d8159c8a29604410bda ansible_core-2.16.8.tar.gz
+3dfa15249069ea0d001257902c968ddf9bb71d965769b8802bce85187556c5d8 ansible_core-2.17.2.tar.gz
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package zathura-plugin-cb for openSUSE:Factory checked in at 2024-08-13 13:23:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zathura-plugin-cb (Old)
and /work/SRC/openSUSE:Factory/.zathura-plugin-cb.new.7232 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zathura-plugin-cb"
Tue Aug 13 13:23:43 2024 rev:7 rq:1193343 version:0.1.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/zathura-plugin-cb/zathura-plugin-cb.changes 2022-09-20 19:23:45.894505232 +0200
+++ /work/SRC/openSUSE:Factory/.zathura-plugin-cb.new.7232/zathura-plugin-cb.changes 2024-08-13 13:24:04.952342617 +0200
@@ -1,0 +2,7 @@
+Sun Aug 11 09:58:36 UTC 2024 - Jakob Lorenz <onlyjak0b(a)mailbox.org>
+
+- Update to 0.1.11
+ * Fix ordering of filenames
+ * Various bug fixes and improvements
+
+-------------------------------------------------------------------
Old:
----
zathura-cb-0.1.10.tar.xz
New:
----
zathura-cb-0.1.11.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zathura-plugin-cb.spec ++++++
--- /var/tmp/diff_new_pack.Gypw1H/_old 2024-08-13 13:24:05.456363618 +0200
+++ /var/tmp/diff_new_pack.Gypw1H/_new 2024-08-13 13:24:05.456363618 +0200
@@ -1,7 +1,7 @@
#
# spec file for package zathura-plugin-cb
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,18 +18,18 @@
%define realname zathura-cb
Name: zathura-plugin-cb
-Version: 0.1.10
+Version: 0.1.11
Release: 0
Summary: Comic book support for zathura
License: Zlib
Group: Productivity/Office/Other
URL: http://pwmt.org/projects/zathura/plugins/zathura-cb/
Source: https://pwmt.org/projects/zathura-cb/download/%{realname}-%{version}.tar.xz
-BuildRequires: meson > 0.43
+BuildRequires: meson >= 0.61
BuildRequires: pkgconfig
BuildRequires: pkgconfig(girara-gtk3)
BuildRequires: pkgconfig(libarchive)
-BuildRequires: pkgconfig(zathura)
+BuildRequires: pkgconfig(zathura) >= 0.3.8
Requires: zathura
Provides: zathura-cb-plugin
@@ -41,7 +41,7 @@
%build
export CFLAGS="%{optflags}"
-%meson
+%meson -Dtests=disabled
%meson_build
%install
++++++ zathura-cb-0.1.10.tar.xz -> zathura-cb-0.1.11.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-cb-0.1.10/.clang-format new/zathura-cb-0.1.11/.clang-format
--- old/zathura-cb-0.1.10/.clang-format 1970-01-01 01:00:00.000000000 +0100
+++ new/zathura-cb-0.1.11/.clang-format 2024-08-04 10:28:38.000000000 +0200
@@ -0,0 +1,15 @@
+---
+Language: Cpp
+BasedOnStyle: LLVM
+AlignConsecutiveAssignments: true
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: false
+AlwaysBreakTemplateDeclarations: true
+BreakBeforeBraces: Attach
+ConstructorInitializerIndentWidth: 2
+NamespaceIndentation: All
+PointerAlignment: Left
+TabWidth: 2
+ColumnLimit: 120
+SortIncludes: false
+...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-cb-0.1.10/README.md new/zathura-cb-0.1.11/README.md
--- old/zathura-cb-0.1.10/README.md 2022-05-07 18:47:47.000000000 +0200
+++ new/zathura-cb-0.1.11/README.md 2024-08-04 10:28:38.000000000 +0200
@@ -27,4 +27,4 @@
Bugs
----
-Please report bugs at http://git.pwmt.org/pwmt/zathura-cb.
+Please report bugs at https://github.com/pwmt/zathura-cb.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-cb-0.1.10/data/meson.build new/zathura-cb-0.1.11/data/meson.build
--- old/zathura-cb-0.1.10/data/meson.build 2022-05-07 18:47:47.000000000 +0200
+++ new/zathura-cb-0.1.11/data/meson.build 2024-08-04 10:28:38.000000000 +0200
@@ -1,2 +1,18 @@
install_data('org.pwmt.zathura-cb.metainfo.xml', install_dir: metainfodir)
install_data('org.pwmt.zathura-cb.desktop', install_dir: desktopdir)
+
+desktop_file_validate = find_program('desktop-file-validate', required: get_option('tests'), native: true)
+if desktop_file_validate.found()
+ test('validate-desktop',
+ desktop_file_validate,
+ args: [join_paths(meson.current_source_dir(), 'org.pwmt.zathura-cb.desktop')]
+ )
+endif
+
+appstream_util = find_program('appstream-util', required: get_option('tests'), native: true)
+if appstream_util.found()
+ test('validate-appdata',
+ appstream_util,
+ args: ['validate-relax', '--nonet', join_paths(meson.current_source_dir(), 'org.pwmt.zathura-cb.metainfo.xml')]
+ )
+endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-cb-0.1.10/data/org.pwmt.zathura-cb.desktop new/zathura-cb-0.1.11/data/org.pwmt.zathura-cb.desktop
--- old/zathura-cb-0.1.10/data/org.pwmt.zathura-cb.desktop 2022-05-07 18:47:47.000000000 +0200
+++ new/zathura-cb-0.1.11/data/org.pwmt.zathura-cb.desktop 2024-08-04 10:28:38.000000000 +0200
@@ -4,6 +4,7 @@
Name=Zathura
Comment=A minimalistic document viewer
Exec=zathura %U
+Icon=org.pwmt.zathura
Terminal=false
NoDisplay=true
Categories=Office;Viewer;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-cb-0.1.10/meson.build new/zathura-cb-0.1.11/meson.build
--- old/zathura-cb-0.1.10/meson.build 2022-05-07 18:47:47.000000000 +0200
+++ new/zathura-cb-0.1.11/meson.build 2024-08-04 10:28:38.000000000 +0200
@@ -1,7 +1,7 @@
project('zathura-cb', 'c',
- version: '0.1.10',
- meson_version: '>=0.43',
- default_options: 'c_std=c11'
+ version: '0.1.11',
+ meson_version: '>=0.61',
+ default_options: ['c_std=c17', 'warning_level=3']
)
version = meson.project_version()
@@ -23,7 +23,7 @@
build_dependencies = [zathura, girara, glib, cairo, libarchive]
if get_option('plugindir') == ''
- plugindir = zathura.get_pkgconfig_variable('plugindir')
+ plugindir = zathura.get_variable(pkgconfig: 'plugindir')
else
plugindir = get_option('plugindir')
endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-cb-0.1.10/meson_options.txt new/zathura-cb-0.1.11/meson_options.txt
--- old/zathura-cb-0.1.10/meson_options.txt 2022-05-07 18:47:47.000000000 +0200
+++ new/zathura-cb-0.1.11/meson_options.txt 2024-08-04 10:28:38.000000000 +0200
@@ -3,3 +3,8 @@
value: '',
description: 'Install to a different location than Zathura\'s plugin directory'
)
+option('tests',
+ type: 'feature',
+ value: 'auto',
+ description: 'run tests'
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-cb-0.1.10/zathura-cb/document.c new/zathura-cb-0.1.11/zathura-cb/document.c
--- old/zathura-cb-0.1.10/zathura-cb/document.c 2022-05-07 18:47:47.000000000 +0200
+++ new/zathura-cb-0.1.11/zathura-cb/document.c 2024-08-04 10:28:38.000000000 +0200
@@ -20,9 +20,7 @@
static void cb_document_page_meta_free(cb_document_page_meta_t* meta);
static bool read_dir(cb_document_t* cb_document, const char* directory, girara_list_t* supported_extensions);
-zathura_error_t
-cb_document_open(zathura_document_t* document)
-{
+zathura_error_t cb_document_open(zathura_document_t* document) {
if (document == NULL) {
return ZATHURA_ERROR_INVALID_ARGUMENTS;
}
@@ -38,9 +36,9 @@
}
GSList* formats = gdk_pixbuf_get_formats();
- for (GSList* list = formats; list != NULL; list = list->next) {
- GdkPixbufFormat* format = (GdkPixbufFormat*) list->data;
- char** extensions = gdk_pixbuf_format_get_extensions(format);
+ for (GSList* list = formats; list != NULL; list = list->next) {
+ GdkPixbufFormat* format = (GdkPixbufFormat*)list->data;
+ char** extensions = gdk_pixbuf_format_get_extensions(format);
for (unsigned int i = 0; extensions[i] != NULL; i++) {
girara_list_append(supported_extensions, g_strdup(extensions[i]));
@@ -51,8 +49,8 @@
g_slist_free(formats);
/* create list of supported files (pages) */
- cb_document->pages = girara_sorted_list_new2((girara_compare_function_t)
- compare_pages, (girara_free_function_t) cb_document_page_meta_free);
+ cb_document->pages = girara_sorted_list_new2((girara_compare_function_t)compare_pages,
+ (girara_free_function_t)cb_document_page_meta_free);
if (cb_document->pages == NULL) {
goto error_free;
}
@@ -84,9 +82,7 @@
return ZATHURA_ERROR_UNKNOWN;
}
-zathura_error_t
-cb_document_free(zathura_document_t* UNUSED(document), void* data)
-{
+zathura_error_t cb_document_free(zathura_document_t* UNUSED(document), void* data) {
cb_document_t* cb_document = data;
if (cb_document == NULL) {
return ZATHURA_ERROR_INVALID_ARGUMENTS;
@@ -102,9 +98,7 @@
return ZATHURA_ERROR_OK;
}
-static void
-cb_document_page_meta_free(cb_document_page_meta_t* meta)
-{
+static void cb_document_page_meta_free(cb_document_page_meta_t* meta) {
if (meta == NULL) {
return;
}
@@ -115,20 +109,16 @@
g_free(meta);
}
-static void
-get_pixbuf_size(GdkPixbufLoader* loader, int width, int height, gpointer data)
-{
+static void get_pixbuf_size(GdkPixbufLoader* loader, int width, int height, gpointer data) {
cb_document_page_meta_t* meta = (cb_document_page_meta_t*)data;
- meta->width = width;
+ meta->width = width;
meta->height = height;
gdk_pixbuf_loader_set_size(loader, 0, 0);
}
-static bool
-read_archive(cb_document_t* cb_document, const char* archive, girara_list_t* supported_extensions)
-{
+static bool read_archive(cb_document_t* cb_document, const char* archive, girara_list_t* supported_extensions) {
struct archive* a = archive_read_new();
if (a == NULL) {
return false;
@@ -136,13 +126,13 @@
archive_read_support_filter_all(a);
archive_read_support_format_all(a);
- int r = archive_read_open_filename(a, archive, (size_t) LIBARCHIVE_BUFFER_SIZE);
+ int r = archive_read_open_filename(a, archive, (size_t)LIBARCHIVE_BUFFER_SIZE);
if (r != ARCHIVE_OK) {
archive_read_free(a);
return false;
}
- struct archive_entry *entry = NULL;
+ struct archive_entry* entry = NULL;
while ((r = archive_read_next_header(a, &entry)) != ARCHIVE_EOF) {
if (r < ARCHIVE_WARN) {
// let's ignore warnings ... they are non-fatal errors
@@ -157,22 +147,23 @@
}
const char* path = archive_entry_pathname(entry);
- char* extension = get_extension(path);
+ char* extension = get_extension(path);
if (extension == NULL) {
continue;
}
- GIRARA_LIST_FOREACH(supported_extensions, char*, iter, ext)
+ for (size_t index = 0; index < girara_list_size(supported_extensions); ++index) {
+ const char* ext = girara_list_nth(supported_extensions, index);
if (g_strcmp0(extension, ext) == 0) {
cb_document_page_meta_t* meta = g_malloc0(sizeof(cb_document_page_meta_t));
- meta->file = g_strdup(path);
+ meta->file = g_strdup(path);
GdkPixbufLoader* loader = gdk_pixbuf_loader_new();
g_signal_connect(loader, "size-prepared", G_CALLBACK(get_pixbuf_size), meta);
- size_t size = 0;
- const void* buf = NULL;
+ size_t size = 0;
+ const void* buf = NULL;
__LA_INT64_T offset = 0;
while ((r = archive_read_data_block(a, &buf, &size, &offset)) != ARCHIVE_EOF) {
if (r < ARCHIVE_WARN) {
@@ -203,7 +194,7 @@
break;
}
- GIRARA_LIST_FOREACH_END(supported_extensions, char*, iter, ext);
+ }
g_free(extension);
}
@@ -213,26 +204,25 @@
return true;
}
-static bool
-read_dir(cb_document_t* cb_document, const char* directory, girara_list_t* supported_extensions)
-{
- GDir* dir = g_dir_open(directory, 0, NULL);
+static bool read_dir(cb_document_t* cb_document, const char* directory, girara_list_t* supported_extensions) {
+ GDir* dir = g_dir_open(directory, 0, NULL);
const char* entrypath = NULL;
while ((entrypath = g_dir_read_name(dir))) {
- char* fullpath = g_strdup_printf("%s/%s", directory, entrypath);
+ char* fullpath = g_strdup_printf("%s/%s", directory, entrypath);
char* extension = get_extension(fullpath);
if (extension == NULL) {
- continue;
+ continue;
}
- GIRARA_LIST_FOREACH(supported_extensions, char*, iter, ext)
+ for (size_t index = 0; index < girara_list_size(supported_extensions); ++index) {
+ const char* ext = girara_list_nth(supported_extensions, index);
if (g_strcmp0(ext, extension) == 0) {
cb_document_page_meta_t* meta = g_malloc(sizeof(cb_document_page_meta_t));
- meta->file = g_strdup(fullpath);
+ meta->file = g_strdup(fullpath);
g_free(fullpath);
GdkPixbuf* data = gdk_pixbuf_new_from_file(meta->file, NULL);
- meta->width = gdk_pixbuf_get_width(data);
- meta->height = gdk_pixbuf_get_height(data);
+ meta->width = gdk_pixbuf_get_width(data);
+ meta->height = gdk_pixbuf_get_height(data);
if (meta->width > 0 && meta->height > 0) {
girara_list_append(cb_document->pages, meta);
@@ -242,7 +232,7 @@
break;
}
- GIRARA_LIST_FOREACH_END(supported_extensions, char*, iter, ext);
+ }
g_free(extension);
}
@@ -250,15 +240,11 @@
return true;
}
-static int
-compare_pages(const cb_document_page_meta_t* page1, const cb_document_page_meta_t* page2)
-{
+static int compare_pages(const cb_document_page_meta_t* page1, const cb_document_page_meta_t* page2) {
return compare_path(page1->file, page2->file);
}
-static char*
-get_extension(const char* path)
-{
+static char* get_extension(const char* path) {
if (path == NULL) {
return NULL;
}
@@ -270,4 +256,3 @@
return g_ascii_strdown(res + 1, -1);
}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-cb-0.1.10/zathura-cb/index.c new/zathura-cb-0.1.11/zathura-cb/index.c
--- old/zathura-cb-0.1.10/zathura-cb/index.c 2022-05-07 18:47:47.000000000 +0200
+++ new/zathura-cb-0.1.11/zathura-cb/index.c 2024-08-04 10:28:38.000000000 +0200
@@ -4,10 +4,7 @@
#include "internal.h"
#include <glib.h>
-girara_tree_node_t*
-cb_document_index_generate(zathura_document_t* document,
- void* data, zathura_error_t* error)
-{
+girara_tree_node_t* cb_document_index_generate(zathura_document_t* document, void* data, zathura_error_t* error) {
cb_document_t* cb_document = data;
if (document == NULL || cb_document == NULL) {
if (error != NULL) {
@@ -17,25 +14,20 @@
}
girara_tree_node_t* root = girara_node_new(zathura_index_element_new("ROOT"));
- unsigned int page_number = 0;
- GIRARA_LIST_FOREACH(cb_document->pages, cb_document_page_meta_t*, iter, page)
- {
- gchar* markup = g_markup_escape_text(page->file, -1);
+ for (unsigned int page_number = 0; page_number < girara_list_size(cb_document->pages); ++page_number) {
+ cb_document_page_meta_t* page = girara_list_nth(cb_document->pages, page_number);
+ gchar* markup = g_markup_escape_text(page->file, -1);
zathura_index_element_t* index_element = zathura_index_element_new(markup);
g_free(markup);
if (index_element != NULL) {
- zathura_rectangle_t rect = { 0, 0, 0, 0 };
- zathura_link_target_t target = { ZATHURA_LINK_DESTINATION_XYZ, NULL,
- page_number, -1, -1, -1, -1, 0 };
+ zathura_rectangle_t rect = {0, 0, 0, 0};
+ zathura_link_target_t target = {ZATHURA_LINK_DESTINATION_XYZ, NULL, page_number, -1, -1, -1, -1, 0};
- index_element->link = zathura_link_new(ZATHURA_LINK_GOTO_DEST, rect,
- target);
+ index_element->link = zathura_link_new(ZATHURA_LINK_GOTO_DEST, rect, target);
girara_node_append_data(root, index_element);
}
- ++page_number;
}
- GIRARA_LIST_FOREACH_END(cb_document->pages, cb_document_page_meta_t*, iter, page);
return root;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-cb-0.1.10/zathura-cb/internal.h new/zathura-cb-0.1.11/zathura-cb/internal.h
--- old/zathura-cb-0.1.10/zathura-cb/internal.h 2022-05-07 18:47:47.000000000 +0200
+++ new/zathura-cb-0.1.11/zathura-cb/internal.h 2024-08-04 10:28:38.000000000 +0200
@@ -3,7 +3,7 @@
#ifndef INTERNAL_H
#define INTERNAL_H
-#define LIBARCHIVE_BUFFER_SIZE 8192
+#define LIBARCHIVE_BUFFER_SIZE 8192
struct cb_document_s {
girara_list_t* pages; /**< List of metadata structs */
@@ -17,7 +17,7 @@
*/
typedef struct cb_document_page_meta_s {
char* file; /**< Image file */
- int width; /**< Image width */
+ int width; /**< Image width */
int height; /**< Image height */
} cb_document_page_meta_t;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-cb-0.1.10/zathura-cb/page.c new/zathura-cb-0.1.11/zathura-cb/page.c
--- old/zathura-cb-0.1.10/zathura-cb/page.c 2022-05-07 18:47:47.000000000 +0200
+++ new/zathura-cb-0.1.11/zathura-cb/page.c 2024-08-04 10:28:38.000000000 +0200
@@ -6,9 +6,7 @@
#include "plugin.h"
#include "internal.h"
-zathura_error_t
-cb_page_init(zathura_page_t* page)
-{
+zathura_error_t cb_page_init(zathura_page_t* page) {
if (page == NULL) {
return ZATHURA_ERROR_INVALID_ARGUMENTS;
}
@@ -38,9 +36,7 @@
return ZATHURA_ERROR_OK;
}
-zathura_error_t
-cb_page_clear(zathura_page_t* UNUSED(page), void* data)
-{
+zathura_error_t cb_page_clear(zathura_page_t* UNUSED(page), void* data) {
cb_page_t* cb_page = data;
if (cb_page == NULL) {
return ZATHURA_ERROR_OK;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-cb-0.1.10/zathura-cb/plugin.c new/zathura-cb-0.1.11/zathura-cb/plugin.c
--- old/zathura-cb-0.1.10/zathura-cb/plugin.c 2022-05-07 18:47:47.000000000 +0200
+++ new/zathura-cb-0.1.11/zathura-cb/plugin.c 2024-08-04 10:28:38.000000000 +0200
@@ -2,26 +2,23 @@
#include "plugin.h"
-ZATHURA_PLUGIN_REGISTER_WITH_FUNCTIONS(
- "cb",
- VERSION_MAJOR, VERSION_MINOR, VERSION_REV,
- ZATHURA_PLUGIN_FUNCTIONS({
- .document_open = cb_document_open,
- .document_free = cb_document_free,
- .document_index_generate = cb_document_index_generate,
- .page_init = cb_page_init,
- .page_clear = cb_page_clear,
- .page_render_cairo = cb_page_render_cairo
- }),
- ZATHURA_PLUGIN_MIMETYPES({
- "application/x-cbr",
- "application/x-rar",
- "application/x-cbz",
- "application/zip",
- "application/x-cb7",
- "application/x-7z-compressed",
- "application/x-cbt",
- "application/x-tar",
- "inode/directory"
- })
-)
+ZATHURA_PLUGIN_REGISTER_WITH_FUNCTIONS("cb", VERSION_MAJOR, VERSION_MINOR, VERSION_REV,
+ ZATHURA_PLUGIN_FUNCTIONS({
+ .document_open = cb_document_open,
+ .document_free = cb_document_free,
+ .document_index_generate = cb_document_index_generate,
+ .page_init = cb_page_init,
+ .page_clear = cb_page_clear,
+ .page_render_cairo = cb_page_render_cairo,
+ }),
+ ZATHURA_PLUGIN_MIMETYPES({
+ "application/x-cbr",
+ "application/x-rar",
+ "application/x-cbz",
+ "application/zip",
+ "application/x-cb7",
+ "application/x-7z-compressed",
+ "application/x-cbt",
+ "application/x-tar",
+ "inode/directory",
+ }))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-cb-0.1.10/zathura-cb/plugin.h new/zathura-cb-0.1.11/zathura-cb/plugin.h
--- old/zathura-cb-0.1.10/zathura-cb/plugin.h 2022-05-07 18:47:47.000000000 +0200
+++ new/zathura-cb-0.1.11/zathura-cb/plugin.h 2024-08-04 10:28:38.000000000 +0200
@@ -39,8 +39,8 @@
* @return Tree node object or NULL if an error occurred (e.g.: the document has
* no index)
*/
-GIRARA_HIDDEN girara_tree_node_t* cb_document_index_generate(zathura_document_t* document,
- void* cb_document, zathura_error_t* error);
+GIRARA_HIDDEN girara_tree_node_t* cb_document_index_generate(zathura_document_t* document, void* cb_document,
+ zathura_error_t* error);
/**
* Initializes a page
@@ -68,7 +68,6 @@
* @param printing Render for printing
* @return ZATHURA_ERROR_OK if no error occurred
*/
-GIRARA_HIDDEN zathura_error_t cb_page_render_cairo(zathura_page_t* page, void* cb_page,
- cairo_t* cairo, bool printing);
+GIRARA_HIDDEN zathura_error_t cb_page_render_cairo(zathura_page_t* page, void* cb_page, cairo_t* cairo, bool printing);
#endif // CB_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-cb-0.1.10/zathura-cb/render.c new/zathura-cb-0.1.11/zathura-cb/render.c
--- old/zathura-cb-0.1.10/zathura-cb/render.c 2022-05-07 18:47:47.000000000 +0200
+++ new/zathura-cb-0.1.11/zathura-cb/render.c 2024-08-04 10:28:38.000000000 +0200
@@ -12,10 +12,7 @@
static GdkPixbuf* load_pixbuf_from_archive(const char* archive, const char* file);
-zathura_error_t
-cb_page_render_cairo(zathura_page_t* page, void* data,
- cairo_t* cairo, bool UNUSED(printing))
-{
+zathura_error_t cb_page_render_cairo(zathura_page_t* page, void* data, cairo_t* cairo, bool UNUSED(printing)) {
cb_page_t* cb_page = data;
if (page == NULL || cb_page == NULL || cairo == NULL) {
return ZATHURA_ERROR_INVALID_ARGUMENTS;
@@ -38,9 +35,7 @@
return ZATHURA_ERROR_OK;
}
-static GdkPixbuf*
-load_pixbuf_from_archive(const char* archive, const char* file)
-{
+static GdkPixbuf* load_pixbuf_from_archive(const char* archive, const char* file) {
if (archive == NULL || file == NULL) {
return NULL;
}
@@ -81,8 +76,8 @@
}
GMemoryInputStream* mis = G_MEMORY_INPUT_STREAM(is);
- size_t size = 0;
- const void* buf = NULL;
+ size_t size = 0;
+ const void* buf = NULL;
__LA_INT64_T offset = 0;
while ((r = archive_read_data_block(a, &buf, &size, &offset)) != ARCHIVE_EOF) {
if (r < ARCHIVE_WARN) {
@@ -127,4 +122,3 @@
}
return NULL;
}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-cb-0.1.10/zathura-cb/utils.c new/zathura-cb-0.1.11/zathura-cb/utils.c
--- old/zathura-cb-0.1.10/zathura-cb/utils.c 2022-05-07 18:47:47.000000000 +0200
+++ new/zathura-cb-0.1.11/zathura-cb/utils.c 2024-08-04 10:28:38.000000000 +0200
@@ -1,18 +1,21 @@
/* SPDX-License-Identifier: Zlib */
#include <glib.h>
-#include <dirent.h>
#include "utils.h"
-int
-compare_path(const char* str1, const char* str2)
-{
+int compare_path(const char* str1, const char* str2) {
char* ustr1 = g_utf8_casefold(str1, -1);
char* ustr2 = g_utf8_casefold(str2, -1);
- int result = g_utf8_collate(ustr1, ustr2);
- g_free(ustr1);
+
+ char* ustr3 = g_utf8_collate_key_for_filename(ustr1, -1);
+ char* ustr4 = g_utf8_collate_key_for_filename(ustr2, -1);
g_free(ustr2);
+ g_free(ustr1);
+
+ int result = g_strcmp0(ustr3, ustr4);
+ g_free(ustr4);
+ g_free(ustr3);
return result;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-cb-0.1.10/zathura-cb/utils.h new/zathura-cb-0.1.11/zathura-cb/utils.h
--- old/zathura-cb-0.1.10/zathura-cb/utils.h 2022-05-07 18:47:47.000000000 +0200
+++ new/zathura-cb-0.1.11/zathura-cb/utils.h 2024-08-04 10:28:38.000000000 +0200
@@ -11,7 +11,7 @@
* @param str1 First path
* @param str2 Second path
*
- * @return
+ * @return
*/
GIRARA_HIDDEN int compare_path(const char* str1, const char* str2);
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package zathura-plugin-djvu for openSUSE:Factory checked in at 2024-08-13 13:23:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zathura-plugin-djvu (Old)
and /work/SRC/openSUSE:Factory/.zathura-plugin-djvu.new.7232 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zathura-plugin-djvu"
Tue Aug 13 13:23:42 2024 rev:7 rq:1193342 version:0.2.10
Changes:
--------
--- /work/SRC/openSUSE:Factory/zathura-plugin-djvu/zathura-plugin-djvu.changes 2020-02-11 22:25:21.907566250 +0100
+++ /work/SRC/openSUSE:Factory/.zathura-plugin-djvu.new.7232/zathura-plugin-djvu.changes 2024-08-13 13:24:03.960301284 +0200
@@ -1,0 +2,6 @@
+Sun Aug 11 10:13:04 UTC 2024 - Jakob Lorenz <onlyjak0b(a)mailbox.org>
+
+- Update to 0.2.10
+ * Implement basic selection rectangle
+
+-------------------------------------------------------------------
Old:
----
zathura-djvu-0.2.9.tar.xz
New:
----
zathura-djvu-0.2.10.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zathura-plugin-djvu.spec ++++++
--- /var/tmp/diff_new_pack.8XOPrk/_old 2024-08-13 13:24:04.760334617 +0200
+++ /var/tmp/diff_new_pack.8XOPrk/_new 2024-08-13 13:24:04.764334784 +0200
@@ -1,7 +1,7 @@
#
# spec file for package zathura-plugin-djvu
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,17 +18,17 @@
%define realname zathura-djvu
Name: zathura-plugin-djvu
-Version: 0.2.9
+Version: 0.2.10
Release: 0
Summary: DjVu support for zathura using the djvulibre library
License: Zlib
URL: https://pwmt.org/projects/zathura-djvu/
Source: https://pwmt.org/projects/zathura-djvu/download/%{realname}-%{version}.tar.…
-BuildRequires: meson >= 0.43
+BuildRequires: meson >= 0.61
BuildRequires: pkgconfig
BuildRequires: pkgconfig(ddjvuapi)
BuildRequires: pkgconfig(girara-gtk3)
-BuildRequires: pkgconfig(zathura)
+BuildRequires: pkgconfig(zathura) >= 0.3.8
Requires: zathura
Provides: zathura-djvu-plugin
@@ -39,7 +39,7 @@
%setup -q -n %{realname}-%{version}
%build
-%meson
+%meson -Dtests=disabled
%meson_build
%install
++++++ zathura-djvu-0.2.9.tar.xz -> zathura-djvu-0.2.10.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-djvu-0.2.9/.clang-format new/zathura-djvu-0.2.10/.clang-format
--- old/zathura-djvu-0.2.9/.clang-format 1970-01-01 01:00:00.000000000 +0100
+++ new/zathura-djvu-0.2.10/.clang-format 2024-08-04 10:33:34.000000000 +0200
@@ -0,0 +1,15 @@
+---
+Language: Cpp
+BasedOnStyle: LLVM
+AlignConsecutiveAssignments: true
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: false
+AlwaysBreakTemplateDeclarations: true
+BreakBeforeBraces: Attach
+ConstructorInitializerIndentWidth: 2
+NamespaceIndentation: All
+PointerAlignment: Left
+TabWidth: 2
+ColumnLimit: 120
+SortIncludes: false
+...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-djvu-0.2.9/.gitignore new/zathura-djvu-0.2.10/.gitignore
--- old/zathura-djvu-0.2.9/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/zathura-djvu-0.2.10/.gitignore 2024-08-04 10:33:34.000000000 +0200
@@ -0,0 +1,5 @@
+*.o
+*~
+djvu.so
+*swp
+build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-djvu-0.2.9/LICENSE new/zathura-djvu-0.2.10/LICENSE
--- old/zathura-djvu-0.2.9/LICENSE 2020-01-06 11:00:18.000000000 +0100
+++ new/zathura-djvu-0.2.10/LICENSE 2024-08-04 10:33:34.000000000 +0200
@@ -1,4 +1,4 @@
-Copyright (c) 2010-2017 pwmt.org
+Copyright (c) 2010-2020 pwmt.org
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-djvu-0.2.9/data/meson.build new/zathura-djvu-0.2.10/data/meson.build
--- old/zathura-djvu-0.2.9/data/meson.build 2020-01-06 11:00:18.000000000 +0100
+++ new/zathura-djvu-0.2.10/data/meson.build 2024-08-04 10:33:34.000000000 +0200
@@ -1,2 +1,18 @@
install_data('org.pwmt.zathura-djvu.metainfo.xml', install_dir: metainfodir)
install_data('org.pwmt.zathura-djvu.desktop', install_dir: desktopdir)
+
+desktop_file_validate = find_program('desktop-file-validate', required: get_option('tests'), native: true)
+if desktop_file_validate.found()
+ test('validate-desktop',
+ desktop_file_validate,
+ args: [join_paths(meson.current_source_dir(), 'org.pwmt.zathura-djvu.desktop')]
+ )
+endif
+
+appstream_util = find_program('appstream-util', required: get_option('tests'), native: true)
+if appstream_util.found()
+ test('validate-appdata',
+ appstream_util,
+ args: ['validate-relax', '--nonet', join_paths(meson.current_source_dir(), 'org.pwmt.zathura-djvu.metainfo.xml')]
+ )
+endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-djvu-0.2.9/data/org.pwmt.zathura-djvu.desktop new/zathura-djvu-0.2.10/data/org.pwmt.zathura-djvu.desktop
--- old/zathura-djvu-0.2.9/data/org.pwmt.zathura-djvu.desktop 2020-01-06 11:00:18.000000000 +0100
+++ new/zathura-djvu-0.2.10/data/org.pwmt.zathura-djvu.desktop 2024-08-04 10:33:34.000000000 +0200
@@ -4,6 +4,7 @@
Name=Zathura
Comment=A minimalistic document viewer
Exec=zathura %U
+Icon=org.pwmt.zathura
Terminal=false
NoDisplay=true
Categories=Office;Viewer;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-djvu-0.2.9/meson.build new/zathura-djvu-0.2.10/meson.build
--- old/zathura-djvu-0.2.9/meson.build 2020-01-06 11:00:18.000000000 +0100
+++ new/zathura-djvu-0.2.10/meson.build 2024-08-04 10:33:34.000000000 +0200
@@ -1,7 +1,7 @@
project('zathura-djvu', 'c',
- version: '0.2.9',
- meson_version: '>=0.43',
- default_options: 'c_std=c11'
+ version: '0.2.10',
+ meson_version: '>=0.61',
+ default_options: ['c_std=c17', 'warning_level=3']
)
version = meson.project_version()
@@ -23,7 +23,7 @@
build_dependencies = [zathura, girara, glib, cairo, djvu]
if get_option('plugindir') == ''
- plugindir = zathura.get_pkgconfig_variable('plugindir')
+ plugindir = zathura.get_variable(pkgconfig: 'plugindir')
else
plugindir = get_option('plugindir')
endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-djvu-0.2.9/meson_options.txt new/zathura-djvu-0.2.10/meson_options.txt
--- old/zathura-djvu-0.2.9/meson_options.txt 2020-01-06 11:00:18.000000000 +0100
+++ new/zathura-djvu-0.2.10/meson_options.txt 2024-08-04 10:33:34.000000000 +0200
@@ -3,3 +3,8 @@
value: '',
description: 'Install to a different location than Zathura\'s plugin directory'
)
+option('tests',
+ type: 'feature',
+ value: 'auto',
+ description: 'run tests'
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-djvu-0.2.9/zathura-djvu/djvu.c new/zathura-djvu-0.2.10/zathura-djvu/djvu.c
--- old/zathura-djvu-0.2.9/zathura-djvu/djvu.c 2020-01-06 11:00:18.000000000 +0100
+++ new/zathura-djvu-0.2.10/zathura-djvu/djvu.c 2024-08-04 10:33:34.000000000 +0200
@@ -13,36 +13,31 @@
/* forward declarations */
static const char* get_extension(const char* path);
-static void build_index(djvu_document_t *djvu_document, miniexp_t expression, girara_tree_node_t* root);
+static void build_index(djvu_document_t* djvu_document, miniexp_t expression, girara_tree_node_t* root);
static bool exp_to_str(miniexp_t expression, const char** string);
static bool exp_to_int(miniexp_t expression, int* integer);
static bool exp_to_rect(miniexp_t expression, zathura_rectangle_t* rect);
-ZATHURA_PLUGIN_REGISTER_WITH_FUNCTIONS(
- "djvu",
- VERSION_MAJOR, VERSION_MINOR, VERSION_REV,
- ZATHURA_PLUGIN_FUNCTIONS({
- .document_open = djvu_document_open,
- .document_free = djvu_document_free,
- .document_index_generate = djvu_document_index_generate,
- .document_save_as = djvu_document_save_as,
- .page_init = djvu_page_init,
- .page_clear = djvu_page_clear,
- .page_search_text = djvu_page_search_text,
- .page_get_text = djvu_page_get_text,
- .page_links_get = djvu_page_links_get,
- .page_render = djvu_page_render,
- .page_render_cairo = djvu_page_render_cairo
- }),
- ZATHURA_PLUGIN_MIMETYPES({
- "image/vnd.djvu",
- "image/vnd.djvu+multipage"
- })
-)
-
-zathura_error_t
-djvu_document_open(zathura_document_t* document)
-{
+ZATHURA_PLUGIN_REGISTER_WITH_FUNCTIONS("djvu", VERSION_MAJOR, VERSION_MINOR, VERSION_REV,
+ ZATHURA_PLUGIN_FUNCTIONS({
+ .document_open = djvu_document_open,
+ .document_free = djvu_document_free,
+ .document_index_generate = djvu_document_index_generate,
+ .document_save_as = djvu_document_save_as,
+ .page_init = djvu_page_init,
+ .page_clear = djvu_page_clear,
+ .page_search_text = djvu_page_search_text,
+ .page_get_text = djvu_page_get_text,
+ .page_get_selection = djvu_page_get_selection,
+ .page_links_get = djvu_page_links_get,
+ .page_render_cairo = djvu_page_render_cairo,
+ }),
+ ZATHURA_PLUGIN_MIMETYPES({
+ "image/vnd.djvu",
+ "image/vnd.djvu+multipage",
+ }))
+
+zathura_error_t djvu_document_open(zathura_document_t* document) {
zathura_error_t error = ZATHURA_ERROR_OK;
if (document == NULL) {
@@ -57,9 +52,14 @@
}
/* setup format */
- static unsigned int masks[4] = {0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000};
- djvu_document->format = ddjvu_format_create(DDJVU_FORMAT_RGBMASK32, 4, masks);
+ unsigned int masks[4] = {
+ 0x00FF0000,
+ 0x0000FF00,
+ 0x000000FF,
+ 0xFF000000,
+ };
+ djvu_document->format = ddjvu_format_create(DDJVU_FORMAT_RGBMASK32, 4, masks);
if (djvu_document->format == NULL) {
error = ZATHURA_ERROR_UNKNOWN;
goto error_free;
@@ -77,11 +77,7 @@
/* setup document */
djvu_document->document =
- ddjvu_document_create_by_filename(
- djvu_document->context,
- zathura_document_get_path(document),
- FALSE
- );
+ ddjvu_document_create_by_filename(djvu_document->context, zathura_document_get_path(document), FALSE);
if (djvu_document->document == NULL) {
error = ZATHURA_ERROR_UNKNOWN;
@@ -92,8 +88,7 @@
ddjvu_message_t* msg;
ddjvu_message_wait(djvu_document->context);
- while ((msg = ddjvu_message_peek(djvu_document->context)) &&
- (msg->m_any.tag != DDJVU_DOCINFO)) {
+ while ((msg = ddjvu_message_peek(djvu_document->context)) && (msg->m_any.tag != DDJVU_DOCINFO)) {
if (msg->m_any.tag == DDJVU_ERROR) {
error = ZATHURA_ERROR_UNKNOWN;
goto error_free;
@@ -110,8 +105,7 @@
}
zathura_document_set_data(document, djvu_document);
- zathura_document_set_number_of_pages(document,
- ddjvu_document_get_pagenum(djvu_document->document));
+ zathura_document_set_number_of_pages(document, ddjvu_document_get_pagenum(djvu_document->document));
return error;
@@ -132,9 +126,7 @@
return error;
}
-zathura_error_t
-djvu_document_free(zathura_document_t* document, void* data)
-{
+zathura_error_t djvu_document_free(zathura_document_t* document, void* data) {
djvu_document_t* djvu_document = data;
if (document == NULL) {
return ZATHURA_ERROR_INVALID_ARGUMENTS;
@@ -150,9 +142,7 @@
return ZATHURA_ERROR_OK;
}
-girara_tree_node_t*
-djvu_document_index_generate(zathura_document_t* document, void* data, zathura_error_t* error)
-{
+girara_tree_node_t* djvu_document_index_generate(zathura_document_t* document, void* data, zathura_error_t* error) {
djvu_document_t* djvu_document = data;
if (document == NULL || djvu_document == NULL) {
if (error != NULL) {
@@ -162,8 +152,7 @@
}
miniexp_t outline = miniexp_dummy;
- while ((outline = ddjvu_document_get_outline(djvu_document->document)) ==
- miniexp_dummy) {
+ while ((outline = ddjvu_document_get_outline(djvu_document->document)) == miniexp_dummy) {
handle_messages(djvu_document, true);
}
@@ -184,9 +173,7 @@
return root;
}
-zathura_error_t
-djvu_document_save_as(zathura_document_t* document, void* data, const char* path)
-{
+zathura_error_t djvu_document_save_as(zathura_document_t* document, void* data, const char* path) {
djvu_document_t* djvu_document = data;
if (document == NULL || djvu_document == NULL || path == NULL) {
return ZATHURA_ERROR_INVALID_ARGUMENTS;
@@ -206,7 +193,7 @@
job = ddjvu_document_save(djvu_document->document, fp, 0, NULL);
}
while (ddjvu_job_done(job) != true) {
- handle_messages(djvu_document, true);
+ handle_messages(djvu_document, true);
}
fclose(fp);
@@ -214,9 +201,7 @@
return ZATHURA_ERROR_OK;
}
-zathura_error_t
-djvu_page_init(zathura_page_t* page)
-{
+zathura_error_t djvu_page_init(zathura_page_t* page) {
if (page == NULL) {
return ZATHURA_ERROR_INVALID_ARGUMENTS;
}
@@ -228,8 +213,7 @@
ddjvu_pageinfo_t page_info;
unsigned int index = zathura_page_get_index(page);
- while ((status = ddjvu_document_get_pageinfo(djvu_document->document, index,
- &page_info)) < DDJVU_JOB_OK) {
+ while ((status = ddjvu_document_get_pageinfo(djvu_document->document, index, &page_info)) < DDJVU_JOB_OK) {
handle_messages(djvu_document, true);
}
@@ -238,15 +222,13 @@
return ZATHURA_ERROR_UNKNOWN;
}
- zathura_page_set_width(page, ZATHURA_DJVU_SCALE * page_info.width);
+ zathura_page_set_width(page, ZATHURA_DJVU_SCALE * page_info.width);
zathura_page_set_height(page, ZATHURA_DJVU_SCALE * page_info.height);
return ZATHURA_ERROR_OK;
}
-zathura_error_t
-djvu_page_clear(zathura_page_t* page, void* UNUSED(data))
-{
+zathura_error_t djvu_page_clear(zathura_page_t* page, void* UNUSED(data)) {
if (page == NULL) {
return ZATHURA_ERROR_INVALID_ARGUMENTS;
}
@@ -254,9 +236,8 @@
return ZATHURA_ERROR_OK;
}
-girara_list_t*
-djvu_page_search_text(zathura_page_t* page, void* UNUSED(data), const char* text, zathura_error_t* error)
-{
+girara_list_t* djvu_page_search_text(zathura_page_t* page, void* UNUSED(data), const char* text,
+ zathura_error_t* error) {
if (page == NULL || text == NULL || strlen(text) == 0) {
if (error != NULL) {
*error = ZATHURA_ERROR_INVALID_ARGUMENTS;
@@ -300,10 +281,8 @@
return NULL;
}
-char*
-djvu_page_get_text(zathura_page_t* page, void* UNUSED(data), zathura_rectangle_t
- rectangle, zathura_error_t* error)
-{
+char* djvu_page_get_text(zathura_page_t* page, void* UNUSED(data), zathura_rectangle_t rectangle,
+ zathura_error_t* error) {
if (page == NULL) {
if (error != NULL) {
*error = ZATHURA_ERROR_INVALID_ARGUMENTS;
@@ -323,37 +302,37 @@
goto error_ret;
}
- double tmp = 0;
+ double tmp = 0;
double page_height = zathura_page_get_height(page);
double page_width = zathura_page_get_width(page);
switch (zathura_document_get_rotation(document)) {
- case 90:
- tmp = rectangle.x1;
- rectangle.x1 = rectangle.y1;
- rectangle.y1 = tmp;
- tmp = rectangle.x2;
- rectangle.x2 = rectangle.y2;
- rectangle.y2 = tmp;
- break;
- case 180:
- tmp = rectangle.x1;
- rectangle.x1 = (page_width - rectangle.x2);
- rectangle.x2 = (page_width - tmp);
- break;
- case 270:
- tmp = rectangle.y2;
- rectangle.y2 = (page_height - rectangle.x1);
- rectangle.x1 = (page_width - tmp);
- tmp = rectangle.y1;
- rectangle.y1 = (page_height - rectangle.x2);
- rectangle.x2 = (page_width - tmp);
- break;
- default:
- tmp = rectangle.y1;
- rectangle.y1 = (page_height - rectangle.y2);
- rectangle.y2 = (page_height - tmp);
- break;
+ case 90:
+ tmp = rectangle.x1;
+ rectangle.x1 = rectangle.y1;
+ rectangle.y1 = tmp;
+ tmp = rectangle.x2;
+ rectangle.x2 = rectangle.y2;
+ rectangle.y2 = tmp;
+ break;
+ case 180:
+ tmp = rectangle.x1;
+ rectangle.x1 = (page_width - rectangle.x2);
+ rectangle.x2 = (page_width - tmp);
+ break;
+ case 270:
+ tmp = rectangle.y2;
+ rectangle.y2 = (page_height - rectangle.x1);
+ rectangle.x1 = (page_width - tmp);
+ tmp = rectangle.y1;
+ rectangle.y1 = (page_height - rectangle.x2);
+ rectangle.x2 = (page_width - tmp);
+ break;
+ default:
+ tmp = rectangle.y1;
+ rectangle.y1 = (page_height - rectangle.y2);
+ rectangle.y2 = (page_height - tmp);
+ break;
}
/* adjust to scale */
@@ -377,9 +356,30 @@
return NULL;
}
-girara_list_t*
-djvu_page_links_get(zathura_page_t* page, void* UNUSED(data), zathura_error_t* error)
-{
+girara_list_t* djvu_page_get_selection(zathura_page_t* UNUSED(page), void* UNUSED(data), zathura_rectangle_t rectangle,
+ zathura_error_t* error) {
+ girara_list_t* list = girara_list_new2(g_free);
+ if (list == NULL) {
+ if (error != NULL) {
+ *error = ZATHURA_ERROR_OUT_OF_MEMORY;
+ }
+ goto error_free;
+ }
+
+ zathura_rectangle_t* rect = g_malloc0(sizeof(zathura_rectangle_t));
+ *rect = rectangle;
+ girara_list_append(list, rect);
+
+ return list;
+
+error_free:
+ if (list != NULL) {
+ girara_list_free(list);
+ }
+ return NULL;
+}
+
+girara_list_t* djvu_page_links_get(zathura_page_t* page, void* UNUSED(data), zathura_error_t* error) {
if (page == NULL) {
if (error != NULL) {
*error = ZATHURA_ERROR_INVALID_ARGUMENTS;
@@ -392,7 +392,7 @@
goto error_ret;
}
- girara_list_t* list = girara_list_new2((girara_free_function_t) zathura_link_free);
+ girara_list_t* list = girara_list_new2((girara_free_function_t)zathura_link_free);
if (list == NULL) {
if (error != NULL) {
*error = ZATHURA_ERROR_OUT_OF_MEMORY;
@@ -403,8 +403,8 @@
djvu_document_t* djvu_document = zathura_document_get_data(document);
miniexp_t annotations = miniexp_nil;
- while ((annotations = ddjvu_document_get_pageanno(djvu_document->document,
- zathura_page_get_index(page))) == miniexp_dummy) {
+ while ((annotations = ddjvu_document_get_pageanno(djvu_document->document, zathura_page_get_index(page))) ==
+ miniexp_dummy) {
handle_messages(djvu_document, true);
}
@@ -439,32 +439,33 @@
/* extract link area */
inner = miniexp_cdr(inner);
- zathura_rectangle_t rect = { 0, 0, 0, 0 };
+ zathura_rectangle_t rect = {0, 0, 0, 0};
if (exp_to_rect(miniexp_car(inner), &rect) == false) {
continue;
}
/* update rect */
unsigned int page_height = zathura_page_get_height(page) / ZATHURA_DJVU_SCALE;
- rect.x1 = rect.x1 * ZATHURA_DJVU_SCALE;
- rect.x2 = rect.x2 * ZATHURA_DJVU_SCALE;
- double tmp = rect.y1;
- rect.y1 = (page_height - rect.y2) * ZATHURA_DJVU_SCALE;
- rect.y2 = (page_height - tmp) * ZATHURA_DJVU_SCALE;
+ rect.x1 = rect.x1 * ZATHURA_DJVU_SCALE;
+ rect.x2 = rect.x2 * ZATHURA_DJVU_SCALE;
+ double tmp = rect.y1;
+ rect.y1 = (page_height - rect.y2) * ZATHURA_DJVU_SCALE;
+ rect.y2 = (page_height - tmp) * ZATHURA_DJVU_SCALE;
/* create zathura link */
- zathura_link_type_t type = ZATHURA_LINK_INVALID;
- zathura_link_target_t target = { ZATHURA_LINK_DESTINATION_UNKNOWN, NULL, 0, -1, -1, -1, -1, 0 };;
+ zathura_link_type_t type = ZATHURA_LINK_INVALID;
+ zathura_link_target_t target = {ZATHURA_LINK_DESTINATION_UNKNOWN, NULL, 0, -1, -1, -1, -1, 0};
+ ;
/* goto page */
if (target_string[0] == '#' && target_string[1] == 'p') {
- type = ZATHURA_LINK_GOTO_DEST;
+ type = ZATHURA_LINK_GOTO_DEST;
target.page_number = atoi(target_string + 2) - 1;
- /* url or other? */
+ /* url or other? */
} else if (strstr(target_string, "//") != NULL) {
- type = ZATHURA_LINK_URI;
- target.value = (char*) target_string;
- /* TODO: Parse all different links */
+ type = ZATHURA_LINK_URI;
+ target.value = (char*)target_string;
+ /* TODO: Parse all different links */
} else {
continue;
}
@@ -488,10 +489,8 @@
return NULL;
}
-zathura_error_t
-djvu_page_render_cairo(zathura_page_t* page, void* UNUSED(data), cairo_t* cairo,
- bool GIRARA_UNUSED(printing))
-{
+zathura_error_t djvu_page_render_cairo(zathura_page_t* page, void* UNUSED(data), cairo_t* cairo,
+ bool GIRARA_UNUSED(printing)) {
if (page == NULL || cairo == NULL) {
return ZATHURA_ERROR_INVALID_ARGUMENTS;
}
@@ -515,20 +514,19 @@
cairo_surface_t* surface = cairo_get_target(cairo);
- if (surface == NULL ||
- cairo_surface_status(surface) != CAIRO_STATUS_SUCCESS ||
+ if (surface == NULL || cairo_surface_status(surface) != CAIRO_STATUS_SUCCESS ||
cairo_surface_get_type(surface) != CAIRO_SURFACE_TYPE_IMAGE) {
ddjvu_page_release(djvu_page);
return ZATHURA_ERROR_UNKNOWN;
}
unsigned int page_width = cairo_image_surface_get_width(surface);
- unsigned int page_height = cairo_image_surface_get_height(surface);;
+ unsigned int page_height = cairo_image_surface_get_height(surface);
- ddjvu_rect_t rrect = { 0, 0, page_width, page_height };
- ddjvu_rect_t prect = { 0, 0, page_width, page_height };
+ ddjvu_rect_t rrect = {0, 0, page_width, page_height};
+ ddjvu_rect_t prect = {0, 0, page_width, page_height};
- char* surface_data = (char*) cairo_image_surface_get_data(surface);
+ char* surface_data = (char*)cairo_image_surface_get_data(surface);
if (surface_data == NULL) {
ddjvu_page_release(djvu_page);
@@ -536,91 +534,15 @@
}
/* render page */
- ddjvu_page_render(djvu_page, DDJVU_RENDER_COLOR, &prect, &rrect,
- djvu_document->format, cairo_image_surface_get_stride(surface), surface_data);
+ ddjvu_page_render(djvu_page, DDJVU_RENDER_COLOR, &prect, &rrect, djvu_document->format,
+ cairo_image_surface_get_stride(surface), surface_data);
ddjvu_page_release(djvu_page);
return ZATHURA_ERROR_OK;
}
-zathura_image_buffer_t*
-djvu_page_render(zathura_page_t* page, void* UNUSED(data), zathura_error_t* error)
-{
- if (page == NULL) {
- if (error != NULL) {
- *error = ZATHURA_ERROR_INVALID_ARGUMENTS;
- }
- return NULL;
- }
-
- zathura_document_t* document = zathura_page_get_document(page);
- if (document == NULL) {
- return NULL;
- }
-
- /* calculate sizes */
- unsigned int page_width = zathura_document_get_scale(document) * zathura_page_get_width(page);
- unsigned int page_height = zathura_document_get_scale(document) * zathura_page_get_height(page);
-
- if (page_width == 0 || page_height == 0) {
- if (error != NULL) {
- *error = ZATHURA_ERROR_UNKNOWN;
- }
- goto error_out;
- }
-
- /* init ddjvu render data */
- djvu_document_t* djvu_document = zathura_document_get_data(document);
- ddjvu_page_t* djvu_page = ddjvu_page_create_by_pageno(
- djvu_document->document, zathura_page_get_index(page));
-
- if (djvu_page == NULL) {
- if (error != NULL) {
- *error = ZATHURA_ERROR_UNKNOWN;
- }
- goto error_out;
- }
-
- while (!ddjvu_page_decoding_done(djvu_page)) {
- handle_messages(djvu_document, true);
- }
-
- ddjvu_rect_t rrect = { 0, 0, page_width, page_height };
- ddjvu_rect_t prect = { 0, 0, page_width, page_height };
-
- zathura_image_buffer_t* image_buffer =
- zathura_image_buffer_create(page_width, page_height);
-
- if (image_buffer == NULL) {
- if (error != NULL) {
- *error = ZATHURA_ERROR_OUT_OF_MEMORY;
- }
- goto error_free;
- }
-
- /* set rotation */
- ddjvu_page_set_rotation(djvu_page, DDJVU_ROTATE_0);
-
- /* render page */
- ddjvu_page_render(djvu_page, DDJVU_RENDER_COLOR, &prect, &rrect,
- djvu_document->format, 3 * page_width, (char*) image_buffer->data);
-
- return image_buffer;
-
-error_free:
-
- ddjvu_page_release(djvu_page);
- zathura_image_buffer_free(image_buffer);
-
-error_out:
-
- return NULL;
-}
-
-static const char*
-get_extension(const char* path)
-{
+static const char* get_extension(const char* path) {
if (path == NULL) {
return NULL;
}
@@ -641,9 +563,7 @@
return path + i + 1;
}
-void
-handle_messages(djvu_document_t* document, bool wait)
-{
+void handle_messages(djvu_document_t* document, bool wait) {
if (document == NULL || document->context == NULL) {
return;
}
@@ -660,24 +580,19 @@
}
}
-static void
-build_index(djvu_document_t *djvu_document, miniexp_t expression, girara_tree_node_t* root)
-{
+static void build_index(djvu_document_t* djvu_document, miniexp_t expression, girara_tree_node_t* root) {
if (expression == miniexp_nil || root == NULL) {
return;
}
- int fileno = ddjvu_document_get_filenum(djvu_document->document);
+ int fileno = ddjvu_document_get_filenum(djvu_document->document);
int curfile = 0;
while (miniexp_consp(expression) != 0) {
miniexp_t inner = miniexp_car(expression);
- if (miniexp_consp(inner)
- && miniexp_consp(miniexp_cdr(inner))
- && miniexp_stringp(miniexp_car(inner))
- && miniexp_stringp(miniexp_car(inner))
- ) {
+ if (miniexp_consp(inner) && miniexp_consp(miniexp_cdr(inner)) && miniexp_stringp(miniexp_car(inner)) &&
+ miniexp_stringp(miniexp_car(inner))) {
const char* name = miniexp_to_str(miniexp_car(inner));
const char* link = miniexp_to_str(miniexp_cadr(inner));
@@ -687,13 +602,13 @@
continue;
}
- zathura_link_type_t type = ZATHURA_LINK_GOTO_DEST;
- zathura_rectangle_t rect = { 0 };
- zathura_link_target_t target = { 0 };
- target.destination_type = ZATHURA_LINK_DESTINATION_XYZ;
+ zathura_link_type_t type = ZATHURA_LINK_GOTO_DEST;
+ zathura_rectangle_t rect = {0};
+ zathura_link_target_t target = {0};
+ target.destination_type = ZATHURA_LINK_DESTINATION_XYZ;
/* Check if link+1 contains a number */
- bool number = true;
+ bool number = true;
const size_t linklen = strlen(link);
for (unsigned int k = 1; k < linklen; k++) {
if (!isdigit(link[k])) {
@@ -709,17 +624,17 @@
/* otherwise assume it is an id for a page */
ddjvu_fileinfo_t info;
int f, i;
- for (i=0; i < fileno; i++) {
+ for (i = 0; i < fileno; i++) {
f = (curfile + i) % fileno;
ddjvu_document_get_fileinfo(djvu_document->document, f, &info);
- if (info.id != NULL && !strcmp(link+1, info.id)) {
+ if (info.id != NULL && !strcmp(link + 1, info.id)) {
break;
}
}
/* got a page */
if (i < fileno && info.pageno >= 0) {
- curfile = (f+1) % fileno;
+ curfile = (f + 1) % fileno;
target.page_number = info.pageno;
} else {
/* give up */
@@ -749,9 +664,7 @@
}
}
-static bool
-exp_to_str(miniexp_t expression, const char** string)
-{
+static bool exp_to_str(miniexp_t expression, const char** string) {
if (string == NULL) {
return false;
}
@@ -764,9 +677,7 @@
return false;
}
-static bool
-exp_to_int(miniexp_t expression, int* integer)
-{
+static bool exp_to_int(miniexp_t expression, int* integer) {
if (integer == NULL) {
return false;
}
@@ -779,12 +690,9 @@
return false;
}
-static bool
-exp_to_rect(miniexp_t expression, zathura_rectangle_t* rect)
-{
- if ((miniexp_car(expression) == miniexp_symbol("rect")
- || miniexp_car(expression) == miniexp_symbol("oval"))
- && miniexp_length(expression) == 5) {
+static bool exp_to_rect(miniexp_t expression, zathura_rectangle_t* rect) {
+ if ((miniexp_car(expression) == miniexp_symbol("rect") || miniexp_car(expression) == miniexp_symbol("oval")) &&
+ miniexp_length(expression) == 5) {
int min_x = 0;
int min_y = 0;
int width = 0;
@@ -811,8 +719,7 @@
rect->x2 = min_x + width;
rect->y1 = min_y;
rect->y2 = min_y + height;
- } else if (miniexp_car(expression) == miniexp_symbol("poly")
- && miniexp_length(expression) >= 5) {
+ } else if (miniexp_car(expression) == miniexp_symbol("poly") && miniexp_length(expression) >= 5) {
int min_x = 0;
int min_y = 0;
int max_x = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-djvu-0.2.9/zathura-djvu/djvu.h new/zathura-djvu-0.2.10/zathura-djvu/djvu.h
--- old/zathura-djvu-0.2.9/zathura-djvu/djvu.h 2020-01-06 11:00:18.000000000 +0100
+++ new/zathura-djvu-0.2.10/zathura-djvu/djvu.h 2024-08-04 10:33:34.000000000 +0200
@@ -11,11 +11,10 @@
/**
* DjVu document
*/
-typedef struct djvu_document_s
-{
- ddjvu_context_t* context; /**< Document context */
+typedef struct djvu_document_s {
+ ddjvu_context_t* context; /**< Document context */
ddjvu_document_t* document; /**< Document */
- ddjvu_format_t* format; /**< Format */
+ ddjvu_format_t* format; /**< Format */
} djvu_document_t;
/**
@@ -45,8 +44,8 @@
* @return Tree node object or NULL if an error occurred (e.g.: the document has
* no index)
*/
-GIRARA_HIDDEN girara_tree_node_t* djvu_document_index_generate(zathura_document_t* document,
- void* djvu_document, zathura_error_t* error);
+GIRARA_HIDDEN girara_tree_node_t* djvu_document_index_generate(zathura_document_t* document, void* djvu_document,
+ zathura_error_t* error);
/**
* Saves the document to the given path
@@ -56,7 +55,8 @@
* @return ZATHURA_ERROR_OK when no error occurred, otherwise see
* zathura_error_t
*/
-GIRARA_HIDDEN zathura_error_t djvu_document_save_as(zathura_document_t* document, void* djvu_document, const char* path);
+GIRARA_HIDDEN zathura_error_t djvu_document_save_as(zathura_document_t* document, void* djvu_document,
+ const char* path);
/**
* Initializes the page
@@ -85,7 +85,8 @@
* error occurred
* @return List of search results or NULL if an error occurred
*/
-GIRARA_HIDDEN girara_list_t* djvu_page_search_text(zathura_page_t* page, void* data, const char* text, zathura_error_t* error);
+GIRARA_HIDDEN girara_list_t* djvu_page_search_text(zathura_page_t* page, void* data, const char* text,
+ zathura_error_t* error);
/**
* Get text for selection
@@ -96,7 +97,11 @@
* occurred
* @return The selected text (needs to be deallocated with g_free)
*/
-GIRARA_HIDDEN char* djvu_page_get_text(zathura_page_t* page, void* data, zathura_rectangle_t rectangle, zathura_error_t* error);
+GIRARA_HIDDEN char* djvu_page_get_text(zathura_page_t* page, void* data, zathura_rectangle_t rectangle,
+ zathura_error_t* error);
+
+GIRARA_HIDDEN girara_list_t* djvu_page_get_selection(zathura_page_t* page, void* data, zathura_rectangle_t rectangle,
+ zathura_error_t* error);
/**
* Returns list of links
@@ -106,19 +111,7 @@
* @param error Error code
* @return List of links or NULL if an error occurred
*/
-GIRARA_HIDDEN girara_list_t* djvu_page_links_get(zathura_page_t* page, void* data,
- zathura_error_t* error);
-
-/**
- * Renders a page and returns a allocated image buffer which has to be freed
- * with zathura_image_buffer_free
- *
- * @param page Page
- * @param error Set to an error value (see zathura_error_t) if an
- * error occurred
- * @return Image buffer or NULL if an error occurred
- */
-GIRARA_HIDDEN zathura_image_buffer_t* djvu_page_render(zathura_page_t* page, void* data, zathura_error_t* error);
+GIRARA_HIDDEN girara_list_t* djvu_page_links_get(zathura_page_t* page, void* data, zathura_error_t* error);
/**
* Renders a page onto a cairo object
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-djvu-0.2.9/zathura-djvu/page-text.c new/zathura-djvu-0.2.10/zathura-djvu/page-text.c
--- old/zathura-djvu-0.2.9/zathura-djvu/page-text.c 2020-01-06 11:00:18.000000000 +0100
+++ new/zathura-djvu-0.2.10/zathura-djvu/page-text.c 2024-08-04 10:33:34.000000000 +0200
@@ -13,28 +13,20 @@
*/
typedef struct text_position_s {
unsigned int position; /**< Index */
- miniexp_t exp; /**< Correspondending expression */
+ miniexp_t exp; /**< Correspondending expression */
} text_position_t;
/* forward declaration */
-static void djvu_page_text_content_append(djvu_page_text_t* page_text,
- miniexp_t exp);
-static miniexp_t text_position_get_exp(djvu_page_text_t* page_text,
- unsigned int index);
-static bool djvu_page_text_build_rectangle(djvu_page_text_t* page_text,
- miniexp_t exp, miniexp_t start, miniexp_t end);
-static bool djvu_page_text_build_rectangle_process(djvu_page_text_t* page_text,
- miniexp_t exp, miniexp_t start, miniexp_t end);
-static void djvu_page_text_limit(djvu_page_text_t* page_text, miniexp_t exp,
- zathura_rectangle_t* rectangle);
-static void djvu_page_text_limit_process(djvu_page_text_t* page_text,
- miniexp_t exp, zathura_rectangle_t* rectangle);
-static bool djvu_page_text_select_content(djvu_page_text_t* page_text,
- miniexp_t exp, int delimiter);
-
-djvu_page_text_t*
-djvu_page_text_new(djvu_document_t* document, zathura_page_t* page)
-{
+static void djvu_page_text_content_append(djvu_page_text_t* page_text, miniexp_t exp);
+static miniexp_t text_position_get_exp(djvu_page_text_t* page_text, unsigned int index);
+static bool djvu_page_text_build_rectangle(djvu_page_text_t* page_text, miniexp_t exp, miniexp_t start, miniexp_t end);
+static bool djvu_page_text_build_rectangle_process(djvu_page_text_t* page_text, miniexp_t exp, miniexp_t start,
+ miniexp_t end);
+static void djvu_page_text_limit(djvu_page_text_t* page_text, miniexp_t exp, zathura_rectangle_t* rectangle);
+static void djvu_page_text_limit_process(djvu_page_text_t* page_text, miniexp_t exp, zathura_rectangle_t* rectangle);
+static bool djvu_page_text_select_content(djvu_page_text_t* page_text, miniexp_t exp, int delimiter);
+
+djvu_page_text_t* djvu_page_text_new(djvu_document_t* document, zathura_page_t* page) {
if (document == NULL || document->document == NULL || page == NULL) {
goto error_ret;
}
@@ -52,8 +44,7 @@
/* read page text */
while ((page_text->text_information =
- ddjvu_document_get_pagetext(document->document, zathura_page_get_index(page), "char"))
- == miniexp_dummy) {
+ ddjvu_document_get_pagetext(document->document, zathura_page_get_index(page), "char")) == miniexp_dummy) {
handle_messages(document, true);
}
@@ -74,16 +65,13 @@
return NULL;
}
-void
-djvu_page_text_free(djvu_page_text_t* page_text)
-{
+void djvu_page_text_free(djvu_page_text_t* page_text) {
if (page_text == NULL) {
return;
}
if (page_text->text_information != miniexp_nil && page_text->document != NULL) {
- ddjvu_miniexp_release(page_text->document->document,
- page_text->text_information);
+ ddjvu_miniexp_release(page_text->document->document, page_text->text_information);
}
if (page_text->content != NULL) {
@@ -101,9 +89,7 @@
free(page_text);
}
-girara_list_t*
-djvu_page_text_search(djvu_page_text_t* page_text, const char* text)
-{
+girara_list_t* djvu_page_text_search(djvu_page_text_t* page_text, const char* text) {
if (page_text == NULL || text == NULL) {
goto error_ret;
}
@@ -120,16 +106,14 @@
}
/* create result list */
- girara_list_t* results = girara_list_new2(
- (girara_free_function_t) free);
+ girara_list_t* results = girara_list_new2((girara_free_function_t)free);
if (results == NULL) {
goto error_ret;
}
/* create list */
- page_text->text_positions = girara_list_new2(
- (girara_free_function_t) free);
+ page_text->text_positions = girara_list_new2((girara_free_function_t)free);
if (page_text->text_positions == NULL) {
goto error_free;
@@ -144,7 +128,7 @@
/* search through content */
int search_length = strlen(text);
- char* tmp = page_text->content;
+ char* tmp = page_text->content;
while ((tmp = strcasestr(tmp, text)) != NULL) {
int start_pointer = tmp - page_text->content;
@@ -159,8 +143,7 @@
page_text->rectangle = NULL;
}
- djvu_page_text_build_rectangle(page_text, page_text->text_information,
- start, end);
+ djvu_page_text_build_rectangle(page_text, page_text->text_information, start, end);
if (page_text->rectangle == NULL) {
tmp += search_length;
@@ -174,7 +157,7 @@
page_text->rectangle->y2 = ZATHURA_DJVU_SCALE * page_text->rectangle->y2;
/* invert */
- int y1 = zathura_page_get_height(page_text->page) - page_text->rectangle->y1;
+ int y1 = zathura_page_get_height(page_text->page) - page_text->rectangle->y1;
page_text->rectangle->y1 = zathura_page_get_height(page_text->page) - page_text->rectangle->y2;
page_text->rectangle->y2 = y1;
@@ -217,9 +200,7 @@
return NULL;
}
-static void
-djvu_page_text_content_append(djvu_page_text_t* page_text, miniexp_t exp)
-{
+static void djvu_page_text_content_append(djvu_page_text_t* page_text, miniexp_t exp) {
if (page_text == NULL || exp == miniexp_nil) {
return;
}
@@ -241,15 +222,14 @@
continue;
}
- position->position = (page_text->content != NULL) ?
- strlen(page_text->content) : 0;
- position->exp = exp;
+ position->position = (page_text->content != NULL) ? strlen(page_text->content) : 0;
+ position->exp = exp;
girara_list_append(page_text->text_positions, position);
}
/* append text */
- char* text = (char*) miniexp_to_str(data);
+ char* text = (char*)miniexp_to_str(data);
if (page_text->content == NULL) {
page_text->content = g_strdup(text);
@@ -258,7 +238,7 @@
g_free(page_text->content);
page_text->content = tmp;
}
- /* not a string, recursive call */
+ /* not a string, recursive call */
} else {
djvu_page_text_content_append(page_text, data);
}
@@ -268,9 +248,7 @@
}
}
-static miniexp_t
-text_position_get_exp(djvu_page_text_t* page_text, unsigned int index)
-{
+static miniexp_t text_position_get_exp(djvu_page_text_t* page_text, unsigned int index) {
if (page_text == NULL || page_text->text_positions == NULL) {
goto error_ret;
}
@@ -312,10 +290,8 @@
return miniexp_nil;
}
-static bool
-djvu_page_text_build_rectangle_process(djvu_page_text_t* page_text, miniexp_t exp,
- miniexp_t start, miniexp_t end)
-{
+static bool djvu_page_text_build_rectangle_process(djvu_page_text_t* page_text, miniexp_t exp, miniexp_t start,
+ miniexp_t end) {
if (page_text == NULL) {
goto error_ret;
}
@@ -365,10 +341,7 @@
return false;
}
-static bool
-djvu_page_text_build_rectangle(djvu_page_text_t* page_text, miniexp_t exp,
- miniexp_t start, miniexp_t end)
-{
+static bool djvu_page_text_build_rectangle(djvu_page_text_t* page_text, miniexp_t exp, miniexp_t start, miniexp_t end) {
if (page_text == NULL) {
goto error_ret;
}
@@ -382,8 +355,7 @@
miniexp_t data = miniexp_car(inner);
if (miniexp_stringp(data) != 0) {
- if (djvu_page_text_build_rectangle_process(page_text,
- exp, start, end) == false) {
+ if (djvu_page_text_build_rectangle_process(page_text, exp, start, end) == false) {
goto error_ret;
}
} else {
@@ -402,9 +374,7 @@
return false;
}
-char*
-djvu_page_text_select(djvu_page_text_t* page_text, zathura_rectangle_t rectangle)
-{
+char* djvu_page_text_select(djvu_page_text_t* page_text, zathura_rectangle_t rectangle) {
if (page_text == NULL) {
return NULL;
}
@@ -415,18 +385,15 @@
return (page_text->content != NULL) ? g_strdup(page_text->content) : NULL;
}
-static void
-djvu_page_text_limit_process(djvu_page_text_t* page_text, miniexp_t exp,
- zathura_rectangle_t* rectangle)
-{
+static void djvu_page_text_limit_process(djvu_page_text_t* page_text, miniexp_t exp, zathura_rectangle_t* rectangle) {
zathura_rectangle_t current_rectangle;
current_rectangle.x1 = miniexp_to_int(miniexp_nth(1, exp));
current_rectangle.y1 = miniexp_to_int(miniexp_nth(2, exp));
current_rectangle.x2 = miniexp_to_int(miniexp_nth(3, exp));
current_rectangle.y2 = miniexp_to_int(miniexp_nth(4, exp));
- if (current_rectangle.x2 >= rectangle->x1 && current_rectangle.y1 <= rectangle->y2
- && current_rectangle.x1 <= rectangle->x2 && current_rectangle.y2 >= rectangle->y1) {
+ if (current_rectangle.x2 >= rectangle->x1 && current_rectangle.y1 <= rectangle->y2 &&
+ current_rectangle.x1 <= rectangle->x2 && current_rectangle.y2 >= rectangle->y1) {
if (page_text->begin == miniexp_nil) {
page_text->begin = exp;
}
@@ -435,10 +402,7 @@
}
}
-static void
-djvu_page_text_limit(djvu_page_text_t* page_text, miniexp_t exp,
- zathura_rectangle_t* rectangle)
-{
+static void djvu_page_text_limit(djvu_page_text_t* page_text, miniexp_t exp, zathura_rectangle_t* rectangle) {
if (page_text == NULL || rectangle == NULL) {
return;
}
@@ -459,12 +423,9 @@
inner = miniexp_cdr(inner);
}
-
}
-static bool
-djvu_page_text_select_content(djvu_page_text_t* page_text, miniexp_t exp, int delimiter)
-{
+static bool djvu_page_text_select_content(djvu_page_text_t* page_text, miniexp_t exp, int delimiter) {
if (page_text == NULL) {
return false;
}
@@ -483,15 +444,13 @@
if (miniexp_stringp(data) != 0) {
if (page_text->content != NULL || exp == page_text->begin) {
- char* token_content = (char*) miniexp_to_str(miniexp_nth(5, exp));
+ char* token_content = (char*)miniexp_to_str(miniexp_nth(5, exp));
if (page_text->content != NULL) {
- char* content = g_strjoin(
- (delimiter & 2) ? "\n" : (delimiter & 1) ? " " : NULL,
- page_text->content,
- token_content,
- NULL
- );
+ char* content = g_strjoin((delimiter & 2) ? "\n"
+ : (delimiter & 1) ? " "
+ : NULL,
+ page_text->content, token_content, NULL);
g_free(page_text->content);
page_text->content = content;
} else {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-djvu-0.2.9/zathura-djvu/page-text.h new/zathura-djvu-0.2.10/zathura-djvu/page-text.h
--- old/zathura-djvu-0.2.9/zathura-djvu/page-text.h 2020-01-06 11:00:18.000000000 +0100
+++ new/zathura-djvu-0.2.10/zathura-djvu/page-text.h 2024-08-04 10:33:34.000000000 +0200
@@ -15,15 +15,15 @@
*/
typedef struct djvu_page_text_s {
miniexp_t text_information; /**< Text by ddjvu_document_get_pagetext */
- char* content; /**< Actual content */
+ char* content; /**< Actual content */
- miniexp_t begin; /**< Begin index */
- miniexp_t end; /**< End index */
- girara_list_t* text_positions; /**< Position/Expression duple */
+ miniexp_t begin; /**< Begin index */
+ miniexp_t end; /**< End index */
+ girara_list_t* text_positions; /**< Position/Expression duple */
zathura_rectangle_t* rectangle; /**< Rectangle */
djvu_document_t* document; /**< Correspondening document */
- zathura_page_t* page; /**< Correspondening page */
+ zathura_page_t* page; /**< Correspondening page */
} djvu_page_text_t;
/**
@@ -33,8 +33,7 @@
* @param page_number The number of the page
* @return The page object or NULL if an error occurred
*/
-GIRARA_HIDDEN djvu_page_text_t* djvu_page_text_new(djvu_document_t* document,
- zathura_page_t* page);
+GIRARA_HIDDEN djvu_page_text_t* djvu_page_text_new(djvu_document_t* document, zathura_page_t* page);
/**
* Frees a djvu page object
@@ -50,8 +49,7 @@
* @param text The text to search
* @return List of results or NULL if an error occurred
*/
-GIRARA_HIDDEN girara_list_t* djvu_page_text_search(djvu_page_text_t* page_text,
- const char* text);
+GIRARA_HIDDEN girara_list_t* djvu_page_text_search(djvu_page_text_t* page_text, const char* text);
/**
* Returns the text on the page under the given rectangle
@@ -60,7 +58,6 @@
* @param rectangle The area of where the text should be copied
* @return Copy of the text or NULL if an error occurred or if the area is empty
*/
-GIRARA_HIDDEN char* djvu_page_text_select(djvu_page_text_t* page_text,
- zathura_rectangle_t rectangle);
+GIRARA_HIDDEN char* djvu_page_text_select(djvu_page_text_t* page_text, zathura_rectangle_t rectangle);
#endif // DJVU_PAGE_H
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package lapce for openSUSE:Factory checked in at 2024-08-13 13:23:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lapce (Old)
and /work/SRC/openSUSE:Factory/.lapce.new.7232 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lapce"
Tue Aug 13 13:23:38 2024 rev:21 rq:1193305 version:0.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/lapce/lapce.changes 2024-06-27 16:04:00.740176416 +0200
+++ /work/SRC/openSUSE:Factory/.lapce.new.7232/lapce.changes 2024-08-13 13:23:58.448071616 +0200
@@ -1,0 +2,141 @@
+Fri Aug 09 18:01:57 UTC 2024 - pirateclip(a)protonmail.com
+
+- They also removed the all-languages feature from lapce-app
+
+- Update to version 0.4.1:
+ * Implement feature "Run in Terminal" (#3419)
+ * Avoid overflow. (#3420)
+ * just language configurations
+ * add markup syntax color for markdown
+ * relase 0.4.1
+ * Update CHANGELOG.md
+ * panel order default fix
+ * after reset highlight configs
+ * clippy fix
+ * editor gutter refactor
+ * Implement the drag-and-drop to open file feature. (#3415)
+ * bump floem
+ * Add error message display for plugins and LSP server. (#3414)
+ * Add proxy and retry count to all HTTPS GET requests. (#3413)
+ * show call hierarchy and jump to location (#3403)
+ * load_available_volts: 1. Add proxy and retry count. (#3401)
+ * Optimize "Reveal in File Tree". (#3404)
+ * Optimize double click Terminal. (#3405)
+ * tree sitter nightly version detection change
+ * update deps, fix msrv and clippy lints
+ * fix: upgrade locale_config to non-panic version (#3395)
+ * fix crash
+ * add more languages, cleanup code (#3396)
+ * show code lens (#3387)
+ * 1. editor: Right-click add command "Show Call Hierarchy" (#3389)
+ * support to click hint (#3388)
+ * Improve editor tab header (#3322)
+ * support rust-analyzer's notification "experimental/serverStatus". (#3381)
+ * show file status for scratch documents
+ * fix git commit char length in version
+ * Fix head's path (#3380)
+ * update version matching
+ * fix lapce-proxy build (#3379)
+ * fix terminal on mac keeps fires PTY_READ_WRITE_TOKEN
+ * Avoid receiving the terminal disconnection event before the terminal has finished reading, which leads to incorrect display. (#3355)
+ * update wgpu
+ * editor: Right-click add command "Select in File Explorer" (#3375)
+ * get code lens and store in doc (#3370)
+ * fix release.yml publish
+ * fix proxy download for nightly, fix linux updater
+ * fix: dont use git2 for linux, since it fails when cross-compiling
+ * fix: update wgpu{,-hal} to mitigate issues on Windows
+ * terminal: double-click to maximize bottom (#3376)
+ * Terminal ctrl + click to jump: Support path contains '-' and toml file (#3367)
+ * ci: disable aarch64 proxy
+ * Terminal: right-click to add "clear all" function (#3368)
+ * add open grammars/queries directory command
+ * fix grammars fetching, log errors for queries, add zstd
+ * update dependencies (#3366)
+ * re-implement grammar/queries update system (#3341)
+ * fix terminal key handling
+ * 1. terminal: The default number of jump columns is 0 (#3358)
+ * terminal: added support for Alt+ some character input (#3357)
+ * 1. add right-click function for the tab of editor (#3346)
+ * Terminal file jump: change the judgment point to Ctrl + left mouse click. (#3342)
+ * chore(deps): bump open from 5.1.2 to 5.1.4
+ * chore(deps): bump tar from 0.4.40 to 0.4.41
+ * chore(deps): bump flate2 from 1.0.28 to 1.0.30
+ * chore(deps): bump git2 from 0.18.2 to 0.19.0
+ * chore(deps): bump unicode-width from 0.1.12 to 0.1.13
+ * chore(deps): bump regex from 1.10.4 to 1.10.5
+ * format imports
+ * update time
+ * update tree-sitter
+ * handle keypress properly when failing back to windowtab
+ * update linux dockerfile
+ * load tree sitter quries from folder
+ * Fix lanaguage from path
+ * code action lightbulb position fix
+ * fix environment loading, add windows support, add show env command (#3326)
+ * fix progress view overflow (#3324)
+ * fix file language detection from path
+ * fix panel picker drag
+ * fix file explorer
+ * remove println
+ * bump floem to fix clear_focus
+ * Make editor tab separator height configurable (#3313)
+ * disable selection on editor tabs (#3309)
+ * Remove containers (#3312)
+ * bump floem to fix emoji in tinyskia renderer
+ * stop pointerdown event propogation for keyboard shortcut picker
+ * Add debug names, trim extra containers (#3310)
+ * fix CI paths
+ * paint cursor caret after indent guide
+ * reorder editor cursor painting order
+ * implement gotodefinition on cmd/ctrl+click
+ * use macos-14, use xcode 15.4, retain artefacts for 3 days
+ * switch to macos-12
+ * ci: run only on code changes
+ * use macos-13 for release
+ * fix: separate binary and package in dockerfile
+ * remove coverage
+ * clean-up ci jobs, fix codecov
+ * switch to upstream for import-codesign-certs action
+ * use macos-14 for release (#3303)
+ * update structdesc, format code
+ * save scale configuration
+ * fix error_modal import
+ * fix status to align with viewport gutter line count
+ * fix scoping for error_modal
+ * use logical key for numpad key location
+ * log issues when not running with -w, return with exitcode 1, cleanup tracing
+ * derive std::fmt::Debug for most structures
+ * update floem
+ * cargo-deny: init (#3295)
+ * format code
+ * vendor dejavu fonts
+ * remove unused dependencies (#3296)
+ * format code
+ * fixup! upgrade softbuffer, wayland-*
+ * upgrade softbuffer, wayland-*
+ * upgrade tempfile
+ * upgrade include_dir
+ * remove patch version lock for ripgrep crates
+ * update grep-regex
+ * update grep-searcher
+ * update fontconfig-parser
+ * update blocking
+ * update hyper, tokio, etc.; remove duplicate socket2
+ * add placeholder for ssh input
+ * upgrade stretto and wg
+ * ignore newline in extension search, add placeholder
+ * upgrade pulldown-cmark to 0.11
+ * update lsp-types patch comment
+ * decode percent-encoded URLs, move path_from_url to own module
+ * fix formatting
+ * fix parsing URLs for LSPs that send it URL encoded
+ * fix: update schannel
+ * chore(deps): bump serde_json from 1.0.107 to 1.0.117
+ * chore(deps): bump parking_lot from 0.12.1 to 0.12.3
+ * chore(deps): bump libc from 0.2.153 to 0.2.155
+ * chore(deps): bump thiserror from 1.0.58 to 1.0.61
+ * chore(deps): bump chrono from 0.4.34 to 0.4.38
+ * fix launching default terminal profile when showing panel
+
+-------------------------------------------------------------------
Old:
----
lapce-0.4.0.tar.zst
New:
----
lapce-0.4.1.tar.zst
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lapce.spec ++++++
--- /var/tmp/diff_new_pack.uxNOcD/_old 2024-08-13 13:24:00.524158116 +0200
+++ /var/tmp/diff_new_pack.uxNOcD/_new 2024-08-13 13:24:00.524158116 +0200
@@ -16,8 +16,22 @@
#
+%if 0%{?suse_version} && 0%{?suse_version} < 1550
+%global force_gcc_version 13
+%endif
+
+%if 0%{?suse_version} > 1600
+%bcond_without mold
+%else
+%bcond_with mold
+%endif
+
+%if %{with mold}
+%global build_rustflags "-C" "linker=clang" "-C" "link-arg='-fuse-ld=/usr/bin/mold -Wl,-z,relro,-z,now'" "-C" "debuginfo=2" "-C" "incremental=false" "-C" "strip=none"
+%endif
+
Name: lapce
-Version: 0.4.0
+Version: 0.4.1
Release: 0
Summary: Lightning-fast and Powerful Code Editor written in Rust
URL: https://github.com/lapce/lapce
@@ -64,20 +78,14 @@
%autosetup -a1
%build
+%if 0%{?force_gcc_version}
+export CC="gcc-%{?force_gcc_version}"
+export CXX="g++-%{?force_gcc_version}"
+%endif
# We disable default feature as they include auto-update.
# For reference:
# https://github.com/lapce/lapce/blob/0ded46c988d72b563bd78b29cc11107d4e2248b…
-%if 0%{?suse_version} <= 1600
-export CC=gcc-13
-export CXX=g++-13
-%{cargo_build} --no-default-features -p lapce-app --features all-languages
-%else
-unset LIBSSH2_SYS_USE_PKG_CONFIG
-export RUSTFLAGS="-C linker=clang -C link-arg=-fuse-ld=/usr/bin/mold -C debuginfo=2 -C incremental=false -C strip=none"
-export CARGO_AUDITABLE=auditable
-export CARGO_FEATURE_VENDORED=1
-cargo build --no-default-features -p lapce-app --features all-languages --offline --release
-%endif
+%{cargo_build} --no-default-features -p lapce-app
%install
install -Dm 0755 %{_builddir}/%{name}-%{version}/target/release/%{name} %{buildroot}%{_bindir}/%{name}
++++++ _service ++++++
--- /var/tmp/diff_new_pack.uxNOcD/_old 2024-08-13 13:24:00.564159784 +0200
+++ /var/tmp/diff_new_pack.uxNOcD/_new 2024-08-13 13:24:00.568159950 +0200
@@ -4,7 +4,7 @@
<param name="url">https://github.com/lapce/lapce</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="scm">git</param>
- <param name="match-tag">v0.4.0</param>
+ <param name="match-tag">v0.4.1</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="changesgenerate">enable</param>
</service>
@@ -18,6 +18,5 @@
<param name="srcdir">lapce</param>
<param name="update">false</param>
</service>
- <service name="cargo_audit" mode="manual" />
</services>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.uxNOcD/_old 2024-08-13 13:24:00.588160784 +0200
+++ /var/tmp/diff_new_pack.uxNOcD/_new 2024-08-13 13:24:00.592160950 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/lapce/lapce</param>
- <param name="changesrevision">6a64a5331ed7f4e4d94f43f21e0336269f70353d</param></service></servicedata>
+ <param name="changesrevision">08222a7d6f16466135aa57d89f1d0c590efe0a3b</param></service></servicedata>
(No newline at EOF)
++++++ lapce-0.4.0.tar.zst -> lapce-0.4.1.tar.zst ++++++
++++ 21202 lines of diff (skipped)
++++++ vendor.tar.zst ++++++
/work/SRC/openSUSE:Factory/lapce/vendor.tar.zst /work/SRC/openSUSE:Factory/.lapce.new.7232/vendor.tar.zst differ: char 7, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package bowtie2 for openSUSE:Factory checked in at 2024-08-13 13:23:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bowtie2 (Old)
and /work/SRC/openSUSE:Factory/.bowtie2.new.7232 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bowtie2"
Tue Aug 13 13:23:32 2024 rev:13 rq:1193246 version:2.5.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/bowtie2/bowtie2.changes 2024-02-26 19:47:36.558720742 +0100
+++ /work/SRC/openSUSE:Factory/.bowtie2.new.7232/bowtie2.changes 2024-08-13 13:23:49.635704447 +0200
@@ -1,0 +2,18 @@
+Wed Aug 7 06:09:40 UTC 2024 - Atri Bhattacharya <badshah400(a)gmail.com>
+
+- Update to version 2.5.4:
+ * Added --sam-opt-config command line option for toggling SAM
+ Opt flags.
+ * Fixed an issue causing bowtie2’s memory usage to increase over
+ time when aligning BAM files.
+ * Changed bowtie2 to continue flushing output in the event of a
+ partial write.
+ * Changed the behavior of bowtie2-build to throw an exception if
+ it is unable to write the BWT (.1.bt2, .1.rev.bt2). In prior
+ versions bowtie2-build, would silently ignore the error which
+ has led some to report the absence of the BWT files in a
+ “completed” index build.
+ * Reverted the changes made in v2.5.0 that sometimes caused
+ unique concordant alignments to be overcounted.
+
+-------------------------------------------------------------------
Old:
----
bowtie2-2.5.3.tar.gz
New:
----
bowtie2-2.5.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bowtie2.spec ++++++
--- /var/tmp/diff_new_pack.O3G33y/_old 2024-08-13 13:23:50.735750281 +0200
+++ /var/tmp/diff_new_pack.O3G33y/_new 2024-08-13 13:23:50.739750448 +0200
@@ -20,7 +20,7 @@
%ifarch aarch64
%endif
Name: bowtie2
-Version: 2.5.3
+Version: 2.5.4
Release: 0
Summary: Fast and memory-efficient short read aligner
License: GPL-3.0-only
++++++ bowtie2-2.5.3.tar.gz -> bowtie2-2.5.4.tar.gz ++++++
/work/SRC/openSUSE:Factory/bowtie2/bowtie2-2.5.3.tar.gz /work/SRC/openSUSE:Factory/.bowtie2.new.7232/bowtie2-2.5.4.tar.gz differ: char 13, line 1
1
0