From adc9a0f4fb74ea38fc3d34a4df026bdefffec570 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Jan 17 2020 11:33:50 +0000 Subject: Rebuild for poppler-0.84.0 --- diff --git a/gambas3-3.14.2-poppler-0.83.0.patch b/gambas3-3.14.2-poppler-0.83.0.patch new file mode 100644 index 0000000..5e7f3f3 --- /dev/null +++ b/gambas3-3.14.2-poppler-0.83.0.patch @@ -0,0 +1,29 @@ +--- gambas-3.14.2/gb.pdf/configure.ac ++++ gambas-3.14.2/gb.pdf/configure.ac +@@ -39,6 +39,8 @@ if test "$have_poppler" = "yes"; then + AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_72, $((1-$?)), Poppler version >= 0.72) + pkg-config --atleast-version=0.76.0 poppler + AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_76, $((1-$?)), Poppler version >= 0.76) ++ pkg-config --atleast-version=0.83.0 poppler ++ AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_83, $((1-$?)), Poppler version >= 0.83) + fi + + AC_OUTPUT( \ +--- gambas-3.14.2/gb.pdf/src/main.cpp ++++ gambas-3.14.2/gb.pdf/src/main.cpp +@@ -55,11 +55,15 @@ int EXPORT GB_INIT(void) + { + if (!globalParams) + { ++#if POPPLER_VERSION_0_83 ++ globalParams = std::unique_ptr(new GlobalParams()); ++#else + #if POPPLER_VERSION_0_6 + globalParams = new GlobalParams(); + #else + globalParams = new GlobalParams("/etc/xpdfrc"); + #endif ++#endif + + #if POPPLER_VERSION_0_5 + #else diff --git a/gambas3.spec b/gambas3.spec index e88c18a..fa00865 100644 --- a/gambas3.spec +++ b/gambas3.spec @@ -4,7 +4,7 @@ Name: gambas3 Summary: IDE based on a basic interpreter with object extensions Version: 3.14.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL+ URL: http://gambas.sourceforge.net/ Source0: https://gitlab.com/gambas/gambas/-/archive/%{version}/gambas-%{version}.tar.bz2 @@ -40,6 +40,7 @@ Patch1: %{name}-3.12.2-nolintl.patch Patch2: %{name}-3.12.2-noliconv.patch Patch4: %{name}-3.13.0-poppler-0.73.0.patch Patch5: %{name}-3.14.1-gst1.patch +Patch6: %{name}-3.14.2-poppler-0.83.0.patch %description Gambas3 is a free development environment based on a Basic interpreter @@ -872,6 +873,7 @@ Requires: %{name}-gb-xml = %{version}-%{release} %patch2 -p1 -b .noliconv %patch4 -p1 -b .poppler_0.73.0 %patch5 -p1 -b .gst1 +%patch6 -p1 -b .poppler_0.83.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 @@ -1508,6 +1510,9 @@ install -m 0644 -p main/mime/application-x-gambas3.xml %{buildroot}%{_datadir}/m %{_datadir}/%{name}/info/gb.xml.xslt.* %changelog +* Fri Jan 17 2020 Marek Kasik - 3.14.2-2 +- Rebuild for poppler-0.84.0 + * Tue Dec 3 2019 Tom Callaway - 3.14.2-1 - update to 3.14.2