Notification time stamped 2022-11-30 13:40:17 UTC
From bf0067c3c565838e59920da0f12fc3ba33ce03d7 Mon Sep 17 00:00:00 2001
From: Petr Písař <ppisar(a)redhat.com>
Date: Nov 30 2022 13:39:17 +0000
Subject: 1.67 bump
---
diff --git a/.gitignore b/.gitignore
index 8eb7b29..e18c550 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
/Prima-1.64.tar.gz
/Prima-1.65.tar.gz
/Prima-1.66.tar.gz
+/Prima-1.67.tar.gz
diff --git a/Prima-1.66-RT-144080-coredump-fix.patch
b/Prima-1.66-RT-144080-coredump-fix.patch
deleted file mode 100644
index 9dc0eec..0000000
--- a/Prima-1.66-RT-144080-coredump-fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 705131eeba48cfddb56aafcd52dca474cdbc64c8 Mon Sep 17 00:00:00 2001
-From: Dmitry Karasik <dmitry.karasik(a)teliacompany.com>
-Date: Tue, 23 Aug 2022 19:34:15 +0200
-Subject: [PATCH] RT#144080: coredump fix
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Petr Písař: Ported to 1.66.
-
-Signed-off-by: Petr Písař <ppisar(a)redhat.com>
----
- unix/menu.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/unix/menu.c b/unix/menu.c
-index 58e8dfe..ad58b38 100644
---- a/unix/menu.c
-+++ b/unix/menu.c
-@@ -2427,7 +2427,6 @@ apc_menu_item_begin_paint( Handle self, PEvent event)
-
- YY-> type.drawable = 1;
- YY-> type.widget = 1;
-- YY-> flags.paint = 1;
- YY-> flags.layered = pe->layered;
- #ifdef HAVE_X11_EXTENSIONS_XRENDER_H
- YY-> argb_picture = M(pe->self)->w->argb_picture;
-@@ -2437,6 +2436,7 @@ apc_menu_item_begin_paint( Handle self, PEvent event)
- YY-> visual = pe->layered ? &guts. argb_visual : &guts. visual;
- YY-> colormap = pe->layered ? guts. argbColormap : guts. defaultColormap;
- prima_prepare_drawable_for_painting(event-> gen.H, false );
-+ YY-> flags.paint = 1;
- XCHECKPOINT;
-
- return true;
---
-2.37.2
-
diff --git a/Prima-1.67-properly-detect-xrandr-version.patch
b/Prima-1.67-properly-detect-xrandr-version.patch
new file mode 100644
index 0000000..e1cfea5
--- /dev/null
+++ b/Prima-1.67-properly-detect-xrandr-version.patch
@@ -0,0 +1,64 @@
+From e7cca318b1e8357939929c562a10d2c9590a6301 Mon Sep 17 00:00:00 2001
+From: Dmitry Karasik <dmitry(a)karasik.eu.org>
+Date: Tue, 29 Nov 2022 13:55:31 +0100
+Subject: [PATCH] properly detect xrandr version
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Písař <ppisar(a)redhat.com>
+---
+ Makefile.PL | 16 +++++++++++++++-
+ unix/app.c | 2 +-
+ 2 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index 699f6b83..8ae255cd 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -1721,6 +1721,19 @@ sub setup_x11_extension
+ }
+ }
+
++sub setup_xrandr
++{
++ setup_x11_extension('xrandr');
++ return unless ( $MODVERSIONS{xrandr} // '') =~ m/^(\d+)\.(\d+)/;
++ return unless $1 * 100 + $2 >= 1.5;
++ $DEFINES{HAVE_XRANDR_1_5} = 1;
++}
++
++sub setup_xcomposite
++{
++ setup_x11_extension('xcomposite');
++}
++
+ sub setup_xlibs
+ {
+ have_header( "X11/extensions/shape.h", "X11/X.h",
"X11/Xlib.h", "X11/Xutil.h");
+@@ -1738,7 +1751,8 @@ NO_HARFBUZZ
+ $cmd_options{WITH_ICONV} = 0 unless $cmd_options{WITH_XFT}; # iconv is used for xft
only
+ setup_iconv() if $cmd_options{WITH_ICONV};
+ setup_gtk() if $cmd_options{WITH_GTK2} || $cmd_options{WITH_GTK3};
+- setup_x11_extension($_) for qw(xrandr xcomposite);
++ setup_xrandr();
++ setup_xcomposite();
+
+ if ( $use_pkgconfig ) {
+ $DEFINES{HAVE_X11_XCURSOR_XCURSOR_H} = 1 if pkgconfig('xcursor');
+diff --git a/unix/app.c b/unix/app.c
+index d7ac812d..e97a92d7 100644
+--- a/unix/app.c
++++ b/unix/app.c
+@@ -1012,7 +1012,7 @@ apc_application_get_size( Handle self)
+ Box *
+ apc_application_get_monitor_rects( Handle self, int * nrects)
+ {
+-#if defined(HAVE_X11_EXTENSIONS_XRANDR_H) && (RANDR_MAJOR > 1 || (RANDR_MAJOR
== 1 && RANDR_MINOR > 3))
++#if defined(HAVE_X11_EXTENSIONS_XRANDR_H) && defined(HAVE_XRANDR_1_5)
+ XRRMonitorInfo *m;
+ Box * ret = NULL;
+ int n;
+--
+2.38.1
+
diff --git a/perl-Prima.spec b/perl-Prima.spec
index 2a11510..fceb1ef 100644
--- a/perl-Prima.spec
+++ b/perl-Prima.spec
@@ -33,16 +33,17 @@
Name: perl-Prima
-Version: 1.66
-Release: 2%{?dist}
+Version: 1.67
+Release: 1%{?dist}
Summary: Perl graphic toolkit
# Copying: BSD-2-Clause text
# examples/tiger.eps: AGPL-3.0-or-later (bundled from GhostScript? CPAN RT#122271)
-# img/codec_jpeg.c: EXIF parser is based on io-jpeg.c from gdk-pixbuf
-# (LGPL-2.0-or-later)
+# img/codec_jpeg.c: LGPL-2.0-or-later (EXIF parser is based on io-jpeg.c
+# from gdk-pixbuf)
# img/codec_X11.c: MIT-open-group
-# img/imgscale.c: Resizing filters are based on magick/resize.c from
-# ImageMagick (ImageMagick)
+# img/imgscale.c: ImageMagick (resizing filters are based on magick/resize.c
+# from ImageMagick)
+# img/region.c: MIT-open-group AND HPND
# include/unix/queue.h: BSD-4-Clause
# LICENSE: BSD-2-Clause text and (AGPL-3.0-or-later notice for
examples/tiger.eps file)
# pod/Prima/Widget/pack.pod: TCL
@@ -51,12 +52,11 @@ Summary: Perl graphic toolkit
# Prima.pm: "under the BSD License"
# Prima/PS/Unicode.pm: BSD-3-Clause
# unix/render.c: HPND-sell-variant
-License: BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND MIT-open-group AND
HPND-sell-variant AND TCL AND ImageMagick AND LGPL-2.0-or-later AND AGPL-3.0-or-later
+License: BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND MIT-open-group AND
HPND AND HPND-sell-variant AND TCL AND ImageMagick AND LGPL-2.0-or-later AND
AGPL-3.0-or-later
URL:
https://metacpan.org/dist/Prima
Source0:
https://cpan.metacpan.org/authors/id/K/KA/KARASIK/Prima-%{version}.tar.gz
-# Fix a crash when activating a menu, bug #2119963, CPAN RT#144080,
-# in upstream after 1.66.
-Patch0: Prima-1.66-RT-144080-coredump-fix.patch
+# Correct XRandr detection, in upstream after 1.67
+Patch0: Prima-1.67-properly-detect-xrandr-version.patch
BuildRequires: findutils
BuildRequires: giflib-devel
BuildRequires: gcc
@@ -121,7 +121,7 @@ BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xft)
%endif
BuildRequires: pkgconfig(xpm)
-BuildRequires: pkgconfig(xrandr)
+BuildRequires: pkgconfig(xrandr) >= 1.5
BuildRequires: pkgconfig(xrender)
# Run-time:
BuildRequires: perl(base)
@@ -228,13 +228,14 @@ perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 \
CYGWIN_WINAPI=0 \
DEBUG=0 \
VERBOSE=1 \
+ WITH_COCOA=0 \
WITH_FRIBIDI=%{with perl_Prima_enables_fribidi} \
WITH_GTK2=%{use_gtk2} \
WITH_GTK3=%{use_gtk3} \
WITH_HARFBUZZ=%{with perl_Prima_enables_harfbuzz} \
WITH_ICONV=1 \
- WITH_OPENMP=1 \
WITH_LIBTHAI=%{with perl_Prima_enables_libthai} \
+ WITH_OPENMP=1 \
WITH_XFT=%{with perl_Prima_enables_xft}
%{make_build}
@@ -281,15 +282,23 @@ unset DISPLAY XDG_SESSION_TYPE
%license Copying LICENSE AGPLv3
# "examples" directory is installed into perl_vendorarch
%doc Changes README.md
-%{_bindir}/*
-%{perl_vendorarch}/auto/*
+%{_bindir}/podview
+%{_bindir}/prima-*
+%{_bindir}/VB
+%{perl_vendorarch}/auto/Prima
%{perl_vendorarch}/prima-gencls.pod
-%{perl_vendorarch}/Prima*
+%{perl_vendorarch}/Prima.pm
+%{perl_vendorarch}/Prima
%exclude %{perl_vendorarch}/Prima/Stress.*
%exclude %{perl_vendorarch}/Prima/sys/Test.*
%{perl_vendorarch}/vb-large.png
-%{_mandir}/man1/*
-%{_mandir}/man3/*
+%{_mandir}/man1/podview.*
+%{_mandir}/man1/prima-*.*
+%{_mandir}/man1/VB.*
+%{_mandir}/man3/pod::Prima::*
+%{_mandir}/man3/pod::prima-gencls.*
+%{_mandir}/man3/Prima.*
+%{_mandir}/man3/Prima::*
%exclude %{_mandir}/man3/Prima::Stress.*
%exclude %{_mandir}/man3/Prima::sys::Test.*
@@ -303,6 +312,9 @@ unset DISPLAY XDG_SESSION_TYPE
%{_libexecdir}/%{name}
%changelog
+* Wed Nov 30 2022 Petr Pisar <ppisar(a)redhat.com> - 1.67-1
+- 1.67 bump
+
* Wed Sep 21 2022 Petr Pisar <ppisar(a)redhat.com> - 1.66-2
- perl-Prima-Test package to require the same version of perl-Prima
diff --git a/sources b/sources
index f2587db..f399c92 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Prima-1.66.tar.gz) =
6720d2c40ed84111ef041d2b492faa135027975b29c0d2cc4de43461e6bd77f933c8bcf1bc982fec19ccf952621d8b23c3e032627ac3dde19fa516d3ed85c9e9
+SHA512 (Prima-1.67.tar.gz) =
21a6400535426e23c9c83d88f2614403e28d0982e1395420744ed2a20ef19b768942ef55925b69452b81c9bba756f2d00591e8a15446659806dfebfc2ad2089e
https://src.fedoraproject.org/rpms/perl-Prima/c/bf0067c3c565838e59920da0f...