public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Marek Kasik <mkasik@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/gambas3] rawhide: Rebuild for poppler 26.08.0
Date: Thu, 06 Aug 2026 15:22:52 GMT [thread overview]
Message-ID: <178602977225.1.8741726548995486988.rpms-gambas3-75aa09dd9e3d@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/gambas3
Branch : rawhide
Commit : 75aa09dd9e3d2a6314bdf82aa4a3bd9fa1ce05f9
Author : Marek Kasik <mkasik@redhat.com>
Date : 2026-08-06T17:22:22+02:00
Stats : +161/-2 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/gambas3/c/75aa09dd9e3d2a6314bdf82aa4a3bd9fa1ce05f9?branch=rawhide
Log:
Rebuild for poppler 26.08.0
Restrict openssl-devel-engine dependency to Fedoras <= 44
---
diff --git a/gambas3-3.21.6-poppler-26.04.0.patch b/gambas3-3.21.6-poppler-26.04.0.patch
new file mode 100644
index 0000000..e34b59d
--- /dev/null
+++ b/gambas3-3.21.6-poppler-26.04.0.patch
@@ -0,0 +1,104 @@
+From da53f388442e79379990a9aaae5d2c8bd04bad5d Mon Sep 17 00:00:00 2001
+From: Benoît Minisini <benoit.minisini@gambas-basic.org>
+Date: Sat, 18 Apr 2026 14:23:03 +0200
+Subject: Make 'gb.pdf' compile with poppler 26.04.
+
+[GB.PDF]
+* BUG: Make 'gb.pdf' compile with poppler 26.04.
+
+diff --git a/gb.pdf/src/CPdfDocument.cpp b/gb.pdf/src/CPdfDocument.cpp
+index 0881664e0..e04ad6255 100644
+--- a/gb.pdf/src/CPdfDocument.cpp
++++ b/gb.pdf/src/CPdfDocument.cpp
+@@ -160,26 +160,43 @@ static void aux_return_string_info(void *_object, const char *key)
+ {
+ Object obj;
+ Object dst;
+- const_GooString *goo_value;
+ Dict *info_dict;
+ char *tmpstr;
+
+- #if CHECK_VERSION(005800)
++#if CHECK_VERSION(005800)
+ obj = THIS->doc->getDocInfo ();
+- #else
++#else
+ THIS->doc->getDocInfo (&obj);
+- #endif
+- if (!obj.isDict()) { GB.ReturnNewZeroString(""); return; }
++#endif
++ if (!obj.isDict())
++ {
++ GB.ReturnNewZeroString("");
++#if ! CHECK_VERSION(005800)
++ obj.free();
++#endif
++ return;
++ }
+
+- info_dict=obj.getDict();
+- #if CHECK_VERSION(005800)
++ info_dict = obj.getDict();
++
++#if CHECK_VERSION(005800)
+ dst = info_dict->lookup ((char *)key);
+- #else
++#else
+ info_dict->lookup ((char *)key, &dst);
+- #endif
+- if (!dst.isString ()) { GB.ReturnNewZeroString(""); }
+- else {
+- goo_value = dst.getString();
++#endif
++
++ if (!dst.isString ())
++ {
++ GB.ReturnNewZeroString("");
++ }
++ else
++ {
++#if CHECK_VERSION(260400)
++ GooString goo_str(dst.getString());
++ const_GooString *goo_value = &goo_str;
++#else
++ const_GooString *goo_value = dst.getString();
++#endif
+
+ #if CHECK_VERSION(240500)
+ if (hasUnicodeByteOrderMark(goo_value->toStr()))
+@@ -193,10 +210,11 @@ static void aux_return_string_info(void *_object, const char *key)
+ else
+ GB.ReturnNewString(goo_value->getCString(),goo_value->getLength());
+ }
+- #if ! CHECK_VERSION(005800)
++
++#if ! CHECK_VERSION(005800)
+ dst.free();
+ obj.free();
+- #endif
++#endif
+ }
+
+ static void aux_return_date_info(void *_object, const char *key)
+@@ -206,7 +224,6 @@ static void aux_return_date_info(void *_object, const char *key)
+ GB_DATE ret;
+ Object obj;
+ Object dst;
+- const_GooString *goo;
+ Dict *info_dict;
+ char *datestr=NULL,*tofree=NULL;
+ int nnum;
+@@ -228,7 +245,12 @@ static void aux_return_date_info(void *_object, const char *key)
+ #endif
+ if (dst.isString ())
+ {
+- goo = dst.getString();
++#if CHECK_VERSION(260400)
++ GooString goo_str(dst.getString());
++ const_GooString *goo = &goo_str;
++#else
++ const_GooString *goo = dst.getString();
++#endif
+ #if CHECK_VERSION(240500)
+ if (hasUnicodeByteOrderMark(goo->toStr()))
+ #else
diff --git a/gambas3-3.21.6-poppler-26.06.0.patch b/gambas3-3.21.6-poppler-26.06.0.patch
new file mode 100644
index 0000000..aed4fc7
--- /dev/null
+++ b/gambas3-3.21.6-poppler-26.06.0.patch
@@ -0,0 +1,23 @@
+From 1c3a3718278aeebd47293dc608f34c51b49fcb5a Mon Sep 17 00:00:00 2001
+From: Benoît Minisini <benoit.minisini@gambas-basic.org>
+Date: Fri, 10 Jul 2026 02:30:20 +0200
+Subject: Support for poppler 26.06.
+
+[GB.PDF]
+* BUG: Support for poppler 26.06.
+
+diff --git a/gb.pdf/src/CPdfDocument.cpp b/gb.pdf/src/CPdfDocument.cpp
+index e04ad6255..d6534e23f 100644
+--- a/gb.pdf/src/CPdfDocument.cpp
++++ b/gb.pdf/src/CPdfDocument.cpp
+@@ -60,6 +60,10 @@
+ #define getLength size
+ #endif
+
++#if CHECK_VERSION(260600)
++#include <Annot.h>
++#endif
++
+ /***************************************************************************/
+
+ static CPDFRECT *create_rect(void)
diff --git a/gambas3-3.21.6-poppler-version.patch b/gambas3-3.21.6-poppler-version.patch
new file mode 100644
index 0000000..04e35f0
--- /dev/null
+++ b/gambas3-3.21.6-poppler-version.patch
@@ -0,0 +1,21 @@
+From 4ed17b4a8cbbeb9b096e3e75acf73adccdb3e169 Mon Sep 17 00:00:00 2001
+From: Benoît Minisini <benoit.minisini@gambas-basic.org>
+Date: Fri, 3 Apr 2026 02:18:31 +0200
+Subject: Fix poppler version detection.
+
+[GB.PDF]
+* BUG: Fix poppler version detection.
+
+diff --git a/gb.pdf/configure.ac b/gb.pdf/configure.ac
+index 469371b5a..30b87ffd9 100644
+--- a/gb.pdf/configure.ac
++++ b/gb.pdf/configure.ac
+@@ -16,7 +16,7 @@ GB_COMPONENT_PKG_CONFIG(
+ if test "$have_poppler" = "yes"; then
+
+ AC_MSG_CHECKING([for poppler version])
+- gb_poppler_version=$($PKG_CONFIG --modversion poppler | (IFS='.' read a b c && printf "0x%02d%02d%02d" $a $b $c))
++ gb_poppler_version=$($PKG_CONFIG --modversion poppler | (IFS='.' read a b c && printf "0x%02d%02d%02d" $(expr $a + 0) $(expr $b + 0) $(expr $c + 0)))
+ AC_DEFINE_UNQUOTED(GB_POPPLER_VERSION, $gb_poppler_version, [Poppler version])
+ AC_MSG_RESULT([$gb_poppler_version])
+
diff --git a/gambas3.spec b/gambas3.spec
index ef415bc..339c136 100644
--- a/gambas3.spec
+++ b/gambas3.spec
@@ -30,7 +30,7 @@
Name: gambas3
Summary: IDE based on a basic interpreter with object extensions
Version: 3.21.6
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPL-1.0-or-later
URL: http://gambas.sourceforge.net/
Source0: https://gitlab.com/gambas/gambas/-/archive/%{version}/gambas-%{version}.tar.bz2
@@ -74,7 +74,7 @@ BuildRequires: poppler-cpp-devel
# We need this since linux/videodev.h is dead
BuildRequires: libv4l-devel
BuildRequires: openssl-devel, gmp-devel, glew-devel
-%if 0%{?fedora} >= 41
+%if 0%{?fedora} >= 41 && 0%{?fedora} <= 44
BuildRequires: openssl-devel-engine
%endif
BuildRequires: gstreamer1-plugins-base-devel gstreamer1-devel
@@ -101,6 +101,10 @@ Patch5: %{name}-3.14.1-gst1.patch
# If we're using C++20 then we can't override toupper/tolower, it is not allowed.
Patch6: gambas3-3.19.4-c++20-do-not-try-to-override-std-functions.patch
+Patch7: gambas3-3.21.6-poppler-version.patch
+Patch8: gambas3-3.21.6-poppler-26.04.0.patch
+Patch9: gambas3-3.21.6-poppler-26.06.0.patch
+
%description
Gambas3 is a free development environment based on a Basic interpreter
with object extensions, like Visual Basic (but it is NOT a clone !).
@@ -1209,6 +1213,9 @@ Requires: %{name}-gb-xml = %{version}-%{release}
%patch -P 2 -p1 -b .noliconv
%patch -P 5 -p1 -b .gst1
%patch -P 6 -p1 -b .c++20
+%patch -P 7 -p1 -b .poppler-version
+%patch -P 8 -p1 -b .poppler-26.04.0
+%patch -P 9 -p1 -b .poppler-26.06.0
for i in `find . |grep acinclude.m4`; do
sed -i 's|$AM_CFLAGS -O3|$AM_CFLAGS|g' $i
sed -i 's|$AM_CXXFLAGS -Os -fno-omit-frame-pointer|$AM_CXXFLAGS|g' $i
@@ -2045,6 +2052,10 @@ install -m 0644 -p main/mime/application-x-gambas3.xml %{buildroot}%{_datadir}/m
%{_datadir}/%{name}/info/gb.xml.xslt.*
%changelog
+* Thu Aug 6 2026 Marek Kasik <mkasik@redhat.com> - 3.21.6-3
+- Rebuild for poppler 26.08.0
+- Restrict openssl-devel-engine dependency to Fedoras <= 44
+
* Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.21.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
reply other threads:[~2026-08-06 15:22 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178602977225.1.8741726548995486988.rpms-gambas3-75aa09dd9e3d@fedoraproject.org \
--to=mkasik@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox