Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] poppler: update to 22.03.0
@ 2022-03-26  1:37 oreo639
  2022-03-26  1:39 ` [PR PATCH] [Updated] " oreo639
                   ` (63 more replies)
  0 siblings, 64 replies; 65+ messages in thread
From: oreo639 @ 2022-03-26  1:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1215 bytes --]

There is a new pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages poppler
https://github.com/void-linux/void-packages/pull/36351

poppler: update to 22.03.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36351.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-poppler-36351.patch --]
[-- Type: text/x-diff, Size: 10312 bytes --]

From cb12aa83acb54e6d90a6ab141ea122e3969d7b6b Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 18:28:08 -0700
Subject: [PATCH 1/8] poppler: update to 22.03.0

---
 common/shlibs                            |  2 +-
 srcpkgs/poppler/patches/fix-cflags.patch | 21 ---------------------
 srcpkgs/poppler/template                 |  7 ++++---
 3 files changed, 5 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/poppler/patches/fix-cflags.patch

diff --git a/common/shlibs b/common/shlibs
index 7d323593a120..5fd53def3e64 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -346,7 +346,7 @@ libMagickCore-6.Q16.so.7 libmagick6-6.9.11.61_1
 libMagickWand-6.Q16.so.7 libmagick6-6.9.11.61_1
 libMagick++-6.Q16.so.9 libmagick6-6.9.12.1_1
 libltdl.so.7 libltdl-2.2.6_1
-libpoppler.so.111 libpoppler-21.07.0_1
+libpoppler.so.119 libpoppler-22.03.0_1
 libpoppler-glib.so.8 poppler-glib-0.18.2_1
 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1
diff --git a/srcpkgs/poppler/patches/fix-cflags.patch b/srcpkgs/poppler/patches/fix-cflags.patch
deleted file mode 100644
index f1a408d03cce..000000000000
--- a/srcpkgs/poppler/patches/fix-cflags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
-index fe1182d..6013bd2 100644
---- a/cmake/modules/PopplerMacros.cmake
-+++ b/cmake/modules/PopplerMacros.cmake
-@@ -104,14 +104,14 @@ if(CMAKE_COMPILER_IS_GNUCXX)
-   set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
- 
-   set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
--  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE")
-+  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE ${_save_cxxflags}")
-   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
-   set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
-   set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")
-   set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline ${_save_cxxflags}")
-   set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
-   set(_save_cflags "${CMAKE_C_FLAGS}")
--  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE")
-+  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}")
-   set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
-   set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
-   set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}")
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index 0aa4edf20b57..eb0fdf3a622f 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -3,13 +3,14 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5".
 #
 pkgname=poppler
-version=21.07.0
+version=22.03.0
 revision=1
 build_style=cmake
 build_helper="gir"
 configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON
  -DENABLE_GLIB=ON -DENABLE_GOBJECT_INTROSPECTION=$(vopt_if gir ON OFF)
- -DENABLE_QT5=OFF -DENABLE_UTILS=ON -DENABLE_BOOST=$(vopt_if boost ON OFF)"
+ -DENABLE_QT5=OFF -DENABLE_UTILS=ON -DENABLE_BOOST=$(vopt_if boost ON OFF)
+ -DCMAKE_BUILD_TYPE=RELEASE"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libpng-devel libglib-devel cairo-devel tiff-devel lcms2-devel
 libcurl-devel libopenjpeg2-devel $(vopt_if boost boost-devel)"
@@ -18,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 distfiles="${homepage}/${pkgname}-${version}.tar.xz"
-checksum=e26ab29f68065de4d6562f0a3e2b5435a83ca92be573b99a1c81998fa286a4d4
+checksum=728c78ba94d75a55f6b6355d4fbdaa6f49934d9616be58e5e679a9cfd0980e1e
 
 build_options="gir boost"
 build_options_default="gir boost"

From 12bc0a5f814f9c950e4b4ce83a86d32b1983c205 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 18:29:02 -0700
Subject: [PATCH 2/8] poppler-qt5: update to 22.03.0

---
 srcpkgs/poppler-qt5/patches  | 1 -
 srcpkgs/poppler-qt5/template | 7 ++++---
 2 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 120000 srcpkgs/poppler-qt5/patches

diff --git a/srcpkgs/poppler-qt5/patches b/srcpkgs/poppler-qt5/patches
deleted file mode 120000
index 636e4ac2cbd9..000000000000
--- a/srcpkgs/poppler-qt5/patches
+++ /dev/null
@@ -1 +0,0 @@
-../poppler/patches
\ No newline at end of file
diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template
index 2a15f56128c1..000e3387b5bc 100644
--- a/srcpkgs/poppler-qt5/template
+++ b/srcpkgs/poppler-qt5/template
@@ -4,12 +4,13 @@
 # IT IS SPLIT TO AVOID A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5.
 #
 pkgname=poppler-qt5
-version=21.07.0
+version=22.03.0
 revision=1
 wrksrc="poppler-${version}"
 build_style=cmake
 configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF
- -DENABLE_QT5=ON -DENABLE_UTILS=OFF -DENABLE_CPP=OFF -DENABLE_BOOST=OFF"
+ -DENABLE_QT5=ON -DENABLE_UTILS=OFF -DENABLE_CPP=OFF -DENABLE_BOOST=OFF
+ -DCMAKE_BUILD_TYPE=RELEASE"
 hostmakedepends="pkg-config qt5-devel"
 makedepends="libpng-devel tiff-devel lcms2-devel libcurl-devel
  fontconfig-devel cairo-devel libopenjpeg2-devel qt5-devel"
@@ -18,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 distfiles="${homepage}/poppler-${version}.tar.xz"
-checksum=e26ab29f68065de4d6562f0a3e2b5435a83ca92be573b99a1c81998fa286a4d4
+checksum=728c78ba94d75a55f6b6355d4fbdaa6f49934d9616be58e5e679a9cfd0980e1e
 # fails to find a bunch of files
 make_check=no
 

From 71babf949ed99b901397e967049e2dca7144c512 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 18:29:32 -0700
Subject: [PATCH 3/8] poppler-data: update to 0.4.11

---
 srcpkgs/poppler-data/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/poppler-data/template b/srcpkgs/poppler-data/template
index 48dba2497fb6..469d8cde88b2 100644
--- a/srcpkgs/poppler-data/template
+++ b/srcpkgs/poppler-data/template
@@ -1,6 +1,6 @@
 # Template file for 'poppler-data'
 pkgname=poppler-data
-version=0.4.10
+version=0.4.11
 revision=1
 short_desc="Encoding data for the poppler PDF rendering library"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e9a0f75155905173bb867efad1cabb8f0437585b Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 18:33:32 -0700
Subject: [PATCH 4/8] calligra: rebuild against libpoppler 22.03.0

---
 srcpkgs/calligra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 89d0b1648e9e..7c1411bf3da6 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=6
+revision=7
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From d1d5e030bc350ef4d02212e8e69d6a288f9d6e07 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 18:34:07 -0700
Subject: [PATCH 5/8] inkscape: rebuild against libpoppler 22.03.0

---
 srcpkgs/inkscape/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 45f48ccda0dc..4d902e663f73 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
 # Template file for 'inkscape'
 pkgname=inkscape
 version=1.1.1
-revision=3
+revision=4
 wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
 build_style=cmake
 # builds executables then runs checks

From 4ce3e43c2df8b348d1c7665eaeb403d3c3f88e67 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 18:34:43 -0700
Subject: [PATCH 6/8] ipe: rebuild against libpoppler 22.03.0

---
 srcpkgs/ipe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index fbd500a3dc94..62fcfe950504 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,7 +1,7 @@
 # Template file for 'ipe'
 pkgname=ipe
 version=7.2.24
-revision=5
+revision=6
 _tools_commit=v7.2.20.1
 hostmakedepends="pkg-config doxygen qt5-qmake qt5-tools qt5-host-tools"
 makedepends="cairo-devel gsl-devel libcurl-devel libjpeg-turbo-devel

From 9172dfbbacda75176b7f61f41eb915c119cbaa36 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 18:35:30 -0700
Subject: [PATCH 7/8] kitinerary: rebuild against libpoppler 22.03.0

---
 srcpkgs/kitinerary/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template
index aa5ad07fe219..5c36e829f7ae 100644
--- a/srcpkgs/kitinerary/template
+++ b/srcpkgs/kitinerary/template
@@ -1,7 +1,7 @@
 # Template file for 'kitinerary'
 pkgname=kitinerary
 version=21.12.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake qt5-tools-devel"
 makedepends="kcalendarcore-devel kcontacts-devel kdeclarative-devel kmime-devel

From 6242e59fe8ae8bdb65a7b2d2bac9405a4b7bd21b Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 18:36:24 -0700
Subject: [PATCH 8/8] scribus: rebuild against libpoppler 22.03.0

---
 srcpkgs/scribus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 0ec908f7ef50..791cdea712c5 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"

^ permalink raw reply	[flat|nested] 65+ messages in thread

end of thread, other threads:[~2022-07-06  8:50 UTC | newest]

Thread overview: 65+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-26  1:37 [PR PATCH] poppler: update to 22.03.0 oreo639
2022-03-26  1:39 ` [PR PATCH] [Updated] " oreo639
2022-03-26  3:40 ` oreo639
2022-03-26  3:41 ` oreo639
2022-03-26  3:42 ` [PR PATCH] [Updated] " oreo639
2022-03-26  3:42 ` oreo639
2022-03-26  4:03 ` [PR PATCH] [Updated] " oreo639
2022-03-26  5:21 ` oreo639
2022-03-26  5:48 ` oreo639
2022-03-26  6:21 ` oreo639
2022-03-26 17:54 ` oreo639
2022-03-26 17:59 ` oreo639
2022-03-26 19:03 ` oreo639
2022-03-26 19:30 ` oreo639
2022-03-26 19:30 ` oreo639
2022-04-17  8:12 ` oreo639
2022-04-17  8:14 ` oreo639
2022-04-17  8:35 ` [PR PATCH] [Updated] " oreo639
2022-04-17  8:52 ` [PR PATCH] [Updated] poppler: update to 22.04.0 oreo639
2022-04-17  9:29 ` oreo639
2022-04-17  9:31 ` oreo639
2022-04-17  9:35 ` oreo639
2022-04-17 10:22 ` oreo639
2022-04-17 10:45 ` oreo639
2022-04-17 10:46 ` oreo639
2022-04-17 10:47 ` oreo639
2022-04-17 10:55 ` oreo639
2022-04-17 23:07 ` [PR PATCH] [Updated] " oreo639
2022-04-18 23:47 ` oreo639
2022-05-01  2:03 ` oreo639
2022-05-01  2:05 ` oreo639
2022-05-12  4:19 ` oreo639
2022-05-16 21:43 ` oreo639
2022-06-11 23:10 ` oreo639
2022-06-17  0:05 ` [PR PATCH] [Updated] poppler: update to 22.06.0 oreo639
2022-06-17  0:51 ` oreo639
2022-06-17  1:40 ` classabbyamp
2022-06-17  4:53 ` oreo639
2022-06-18 23:59 ` oreo639
2022-06-19  0:02 ` oreo639
2022-06-19  0:02 ` oreo639
2022-06-19  0:04 ` oreo639
2022-06-19  0:05 ` [PR PATCH] [Updated] " oreo639
2022-06-19  0:06 ` oreo639
2022-06-19  0:06 ` oreo639
2022-06-19  0:10 ` oreo639
2022-06-19  0:11 ` oreo639
2022-06-19  0:37 ` oreo639
2022-07-05 10:47 ` paper42
2022-07-05 18:26 ` oreo639
2022-07-05 18:29 ` oreo639
2022-07-05 18:30 ` oreo639
2022-07-05 18:31 ` oreo639
2022-07-05 18:42 ` oreo639
2022-07-05 18:47 ` oreo639
2022-07-05 19:38 ` oreo639
2022-07-05 23:12 ` [PR PATCH] [Updated] " oreo639
2022-07-05 23:13 ` oreo639
2022-07-05 23:26 ` oreo639
2022-07-05 23:38 ` oreo639
2022-07-05 23:58 ` [PR PATCH] [Updated] poppler: update to 22.07.0 oreo639
2022-07-06  7:39 ` oreo639
2022-07-06  7:39 ` oreo639
2022-07-06  7:40 ` oreo639
2022-07-06  8:50 ` [PR PATCH] [Merged]: " paper42

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).