* [PR PATCH] Poppler 21.05.0/
@ 2021-05-11 3:00 ericonr
2021-05-11 3:17 ` [PR PATCH] [Updated] " ericonr
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: ericonr @ 2021-05-11 3:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1578 bytes --]
There is a new pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages poppler
https://github.com/void-linux/void-packages/pull/30789
Poppler 21.05.0/
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/30789.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-poppler-30789.patch --]
[-- Type: text/x-diff, Size: 12160 bytes --]
From 1c48455ac55f3d3b327253a3b898e1f3e2a87b1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 22:55:23 -0300
Subject: [PATCH 1/7] poppler: update to 21.05.0.
---
common/shlibs | 2 +-
srcpkgs/{libpoppler102 => libpoppler110} | 0
srcpkgs/poppler/patches/fix-cflags.patch | 14 +++++++-------
srcpkgs/poppler/template | 13 ++++++-------
4 files changed, 14 insertions(+), 15 deletions(-)
rename srcpkgs/{libpoppler102 => libpoppler110} (100%)
diff --git a/common/shlibs b/common/shlibs
index 2afcbb9a6dea..addf8b600813 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -340,7 +340,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.102 libpoppler102-20.09.0_1
+libpoppler.so.110 libpoppler110-21.05.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/libpoppler102 b/srcpkgs/libpoppler110
similarity index 100%
rename from srcpkgs/libpoppler102
rename to srcpkgs/libpoppler110
diff --git a/srcpkgs/poppler/patches/fix-cflags.patch b/srcpkgs/poppler/patches/fix-cflags.patch
index 9e62b11010ba..f1a408d03cce 100644
--- a/srcpkgs/poppler/patches/fix-cflags.patch
+++ b/srcpkgs/poppler/patches/fix-cflags.patch
@@ -1,13 +1,13 @@
-Index: cmake/modules/PopplerMacros.cmake
-===================================================================
---- cmake/modules/PopplerMacros.cmake.orig
-+++ cmake/modules/PopplerMacros.cmake
-@@ -123,14 +123,14 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+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 -D_DEFAULT_SOURCE")
-+ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}")
+- 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}")
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index 1aebd7f7e177..72a961b24615 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -3,8 +3,8 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5".
#
pkgname=poppler
-version=20.09.0
-revision=3
+version=21.05.0
+revision=1
build_style=cmake
build_helper="gir"
configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON
@@ -18,13 +18,14 @@ 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=4ed6eb5ddc4c37f2435c9d78ff9c7c4036455aea3507d1ce8400070aab745363
+checksum=dafd537b680fad1215bc40fc53d1f38e8449d7c185bc60d5a89e1d26c90dbd8c
+patch_args=-Np1
# Package build options
build_options="gir"
build_options_default="gir"
-libpoppler102_package() {
+libpoppler110_package() {
depends="poppler-data"
short_desc+=" - poppler runtime library"
pkg_install() {
@@ -50,7 +51,7 @@ poppler-cpp_package() {
}
poppler-devel_package() {
- depends="libglib-devel libpoppler102>=${version}_${revision}"
+ depends="libglib-devel libpoppler110>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove "usr/include/poppler/*.h"
@@ -59,7 +60,6 @@ poppler-devel_package() {
vmove usr/include/poppler/goo
vmove usr/lib/libpoppler.so
vmove usr/lib/pkgconfig/poppler.pc
- vmove usr/lib/pkgconfig/poppler-splash.pc
}
}
@@ -72,7 +72,6 @@ poppler-glib-devel_package() {
if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
fi
- vmove usr/lib/pkgconfig/poppler-cairo.pc
vmove usr/lib/pkgconfig/poppler-glib.pc
}
}
From 857c41201cc621d97917b1d5a035bb60ff636b5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:31:30 -0300
Subject: [PATCH 2/7] poppler-qt5: update to 21.05.0.
---
srcpkgs/poppler-qt5/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template
index c2ec35dbbad3..bed0c2a83bdc 100644
--- a/srcpkgs/poppler-qt5/template
+++ b/srcpkgs/poppler-qt5/template
@@ -4,8 +4,8 @@
# IT IS SPLIT TO AVOID A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5.
#
pkgname=poppler-qt5
-version=20.09.0
-revision=2
+version=21.05.0
+revision=1
wrksrc="poppler-${version}"
build_style=cmake
configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF
@@ -18,7 +18,8 @@ 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=4ed6eb5ddc4c37f2435c9d78ff9c7c4036455aea3507d1ce8400070aab745363
+checksum=dafd537b680fad1215bc40fc53d1f38e8449d7c185bc60d5a89e1d26c90dbd8c
+patch_args=-Np1
if [ "$CROSS_BUILD" ]; then
configure_args+=" -DTHREADS_PTHREAD_ARG=2"
From fc1be4edccbe297c6facfabbb3a0fc957a52ec46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:25 -0300
Subject: [PATCH 3/7] calligra: revbump for libpoppler110-21.05.0.
---
srcpkgs/calligra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 9782b528067b..6c34e0438ab8 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=3
+revision=4
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From e83e1938fa09eea0142d5afe47e4c383c76e901a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:27 -0300
Subject: [PATCH 4/7] inkscape: revbump for libpoppler110-21.05.0.
And import patch to build with glibc >= 2.67.3.
---
srcpkgs/inkscape/patches/glib-extern-C.patch | 65 ++++++++++++++++++++
srcpkgs/inkscape/template | 3 +-
2 files changed, 67 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/inkscape/patches/glib-extern-C.patch
diff --git a/srcpkgs/inkscape/patches/glib-extern-C.patch b/srcpkgs/inkscape/patches/glib-extern-C.patch
new file mode 100644
index 000000000000..b959bcd76fdc
--- /dev/null
+++ b/srcpkgs/inkscape/patches/glib-extern-C.patch
@@ -0,0 +1,65 @@
+From eb24388f1730918edd9565d9e5d09340ec0b3b08 Mon Sep 17 00:00:00 2001
+From: Harald van Dijk <harald@gigawatt.nl>
+Date: Wed, 17 Feb 2021 09:13:49 +0000
+Subject: [PATCH] Fix build with glib 2.67.3.
+
+As of glib 2.67.3, <glib.h> can no longer be included in extern "C"
+blocks. It was indirectly included by both "types.h" and "color.h".
+"types.h" already does not need to be wrapped in an extern "C" block,
+"color.h" does but can be modified not to, so with that changed they can
+be moved out.
+---
+ src/3rdparty/autotrace/autotrace.h | 6 +++---
+ src/3rdparty/autotrace/color.h | 7 +++++++
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/src/3rdparty/autotrace/autotrace.h b/src/3rdparty/autotrace/autotrace.h
+index 2ce6f272a9..e56be9a74c 100644
+--- a/src/3rdparty/autotrace/autotrace.h
++++ b/src/3rdparty/autotrace/autotrace.h
+@@ -23,6 +23,9 @@
+
+ #include <stdio.h>
+
++#include "types.h"
++#include "color.h"
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif /* __cplusplus */
+@@ -35,9 +38,6 @@ extern "C" {
+ * Typedefs
+ * ===================================================================== */
+
+-#include "types.h"
+-#include "color.h"
+-
+ /* Third degree is the highest we deal with. */
+ enum _at_polynomial_degree {
+ AT_LINEARTYPE = 1,
+diff --git a/src/3rdparty/autotrace/color.h b/src/3rdparty/autotrace/color.h
+index e50ab30ae0..88651db9f7 100644
+--- a/src/3rdparty/autotrace/color.h
++++ b/src/3rdparty/autotrace/color.h
+@@ -24,6 +24,10 @@
+ #include <glib.h>
+ #include <glib-object.h>
+
++#ifdef __cplusplus
++extern "C" {
++#endif /* __cplusplus */
++
+ typedef struct _at_color at_color;
+ struct _at_color {
+ guint8 r;
+@@ -43,4 +47,7 @@ void at_color_free(at_color * color);
+ GType at_color_get_type(void);
+ #define AT_TYPE_COLOR (at_color_get_type ())
+
++#ifdef __cplusplus
++}
++#endif /* __cplusplus */
+ #endif /* not AT_COLOR_H */
+--
+GitLab
+
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 364f229dba30..6339519c22f9 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.0.2
-revision=2
+revision=3
wrksrc="inkscape-${version}_2021-01-15_e86c870879"
build_style=cmake
# builds executables then runs checks
@@ -23,6 +23,7 @@ homepage="http://inkscape.org/"
distfiles="https://inkscape.org/gallery/item/23820/inkscape-${version}.tar.xz"
checksum=da3e230511a08cbf21e86710d161458594fea87867e9157b67ed01a04ea2798a
python_version=3
+patch_args=-Np1
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From a8d417b965f0702a588e4307c6df5eb71dda9e26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:27 -0300
Subject: [PATCH 5/7] ipe: revbump for libpoppler110-21.05.0.
---
srcpkgs/ipe/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index f322cdbfaca1..1917a94ebf4e 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,7 +1,7 @@
# Template file for 'ipe'
pkgname=ipe
version=7.2.24
-revision=1
+revision=2
_tools_commit=v7.2.20.1
hostmakedepends="pkg-config qt5-qmake qt5-tools qt5-host-tools"
makedepends="cairo-devel gsl-devel libcurl-devel libjpeg-turbo-devel
From 053069ea916abbd3905c91f078ded9a2a6765144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:28 -0300
Subject: [PATCH 6/7] scribus: revbump for libpoppler110-21.05.0.
---
srcpkgs/scribus/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 868ec55590fa..83a4765a6576 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
# Template file for 'scribus'
pkgname=scribus
version=1.5.6.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr"
hostmakedepends="pkg-config qt5-qmake qt5-host-tools python3"
From dfb07d2adf401d1b8edb518e422dd10f36a2a6ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:28 -0300
Subject: [PATCH 7/7] texlive: revbump for libpoppler110-21.05.0.
---
srcpkgs/texlive/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 72481d85bcbf..b9a19c12a347 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
# Template file for 'texlive'
pkgname=texlive
version=20200406
-revision=7
+revision=8
wrksrc="texlive-${version}-source"
build_wrksrc="build"
build_style=gnu-configure
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] Poppler 21.05.0/
2021-05-11 3:00 [PR PATCH] Poppler 21.05.0/ ericonr
@ 2021-05-11 3:17 ` ericonr
2021-05-11 23:00 ` ericonr
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2021-05-11 3:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1583 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages poppler
https://github.com/void-linux/void-packages/pull/30789
Poppler 21.05.0/
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/30789.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-poppler-30789.patch --]
[-- Type: text/x-diff, Size: 12212 bytes --]
From 1c48455ac55f3d3b327253a3b898e1f3e2a87b1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 22:55:23 -0300
Subject: [PATCH 1/7] poppler: update to 21.05.0.
---
common/shlibs | 2 +-
srcpkgs/{libpoppler102 => libpoppler110} | 0
srcpkgs/poppler/patches/fix-cflags.patch | 14 +++++++-------
srcpkgs/poppler/template | 13 ++++++-------
4 files changed, 14 insertions(+), 15 deletions(-)
rename srcpkgs/{libpoppler102 => libpoppler110} (100%)
diff --git a/common/shlibs b/common/shlibs
index 2afcbb9a6dea..addf8b600813 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -340,7 +340,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.102 libpoppler102-20.09.0_1
+libpoppler.so.110 libpoppler110-21.05.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/libpoppler102 b/srcpkgs/libpoppler110
similarity index 100%
rename from srcpkgs/libpoppler102
rename to srcpkgs/libpoppler110
diff --git a/srcpkgs/poppler/patches/fix-cflags.patch b/srcpkgs/poppler/patches/fix-cflags.patch
index 9e62b11010ba..f1a408d03cce 100644
--- a/srcpkgs/poppler/patches/fix-cflags.patch
+++ b/srcpkgs/poppler/patches/fix-cflags.patch
@@ -1,13 +1,13 @@
-Index: cmake/modules/PopplerMacros.cmake
-===================================================================
---- cmake/modules/PopplerMacros.cmake.orig
-+++ cmake/modules/PopplerMacros.cmake
-@@ -123,14 +123,14 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+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 -D_DEFAULT_SOURCE")
-+ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}")
+- 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}")
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index 1aebd7f7e177..72a961b24615 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -3,8 +3,8 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5".
#
pkgname=poppler
-version=20.09.0
-revision=3
+version=21.05.0
+revision=1
build_style=cmake
build_helper="gir"
configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON
@@ -18,13 +18,14 @@ 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=4ed6eb5ddc4c37f2435c9d78ff9c7c4036455aea3507d1ce8400070aab745363
+checksum=dafd537b680fad1215bc40fc53d1f38e8449d7c185bc60d5a89e1d26c90dbd8c
+patch_args=-Np1
# Package build options
build_options="gir"
build_options_default="gir"
-libpoppler102_package() {
+libpoppler110_package() {
depends="poppler-data"
short_desc+=" - poppler runtime library"
pkg_install() {
@@ -50,7 +51,7 @@ poppler-cpp_package() {
}
poppler-devel_package() {
- depends="libglib-devel libpoppler102>=${version}_${revision}"
+ depends="libglib-devel libpoppler110>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove "usr/include/poppler/*.h"
@@ -59,7 +60,6 @@ poppler-devel_package() {
vmove usr/include/poppler/goo
vmove usr/lib/libpoppler.so
vmove usr/lib/pkgconfig/poppler.pc
- vmove usr/lib/pkgconfig/poppler-splash.pc
}
}
@@ -72,7 +72,6 @@ poppler-glib-devel_package() {
if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
fi
- vmove usr/lib/pkgconfig/poppler-cairo.pc
vmove usr/lib/pkgconfig/poppler-glib.pc
}
}
From e1cc832c8e00b787f7428df6c206ab0fb1af4e0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:31:30 -0300
Subject: [PATCH 2/7] poppler-qt5: update to 21.05.0.
---
srcpkgs/poppler-qt5/template | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template
index c2ec35dbbad3..4fb165ecc22b 100644
--- a/srcpkgs/poppler-qt5/template
+++ b/srcpkgs/poppler-qt5/template
@@ -4,8 +4,8 @@
# IT IS SPLIT TO AVOID A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5.
#
pkgname=poppler-qt5
-version=20.09.0
-revision=2
+version=21.05.0
+revision=1
wrksrc="poppler-${version}"
build_style=cmake
configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF
@@ -18,7 +18,10 @@ 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=4ed6eb5ddc4c37f2435c9d78ff9c7c4036455aea3507d1ce8400070aab745363
+checksum=dafd537b680fad1215bc40fc53d1f38e8449d7c185bc60d5a89e1d26c90dbd8c
+# fails to find a bunch of files
+make_check=no
+patch_args=-Np1
if [ "$CROSS_BUILD" ]; then
configure_args+=" -DTHREADS_PTHREAD_ARG=2"
From 1c3e16c7fa08346d9c56a33b5820fd15cb09fa31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:25 -0300
Subject: [PATCH 3/7] calligra: revbump for libpoppler110-21.05.0.
---
srcpkgs/calligra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 9782b528067b..6c34e0438ab8 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=3
+revision=4
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From 14dd4a02737480aa652c1f87b5081c8b8e6f0980 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:27 -0300
Subject: [PATCH 4/7] inkscape: revbump for libpoppler110-21.05.0.
And import patch to build with glibc >= 2.67.3.
---
srcpkgs/inkscape/patches/glib-extern-C.patch | 65 ++++++++++++++++++++
srcpkgs/inkscape/template | 3 +-
2 files changed, 67 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/inkscape/patches/glib-extern-C.patch
diff --git a/srcpkgs/inkscape/patches/glib-extern-C.patch b/srcpkgs/inkscape/patches/glib-extern-C.patch
new file mode 100644
index 000000000000..b959bcd76fdc
--- /dev/null
+++ b/srcpkgs/inkscape/patches/glib-extern-C.patch
@@ -0,0 +1,65 @@
+From eb24388f1730918edd9565d9e5d09340ec0b3b08 Mon Sep 17 00:00:00 2001
+From: Harald van Dijk <harald@gigawatt.nl>
+Date: Wed, 17 Feb 2021 09:13:49 +0000
+Subject: [PATCH] Fix build with glib 2.67.3.
+
+As of glib 2.67.3, <glib.h> can no longer be included in extern "C"
+blocks. It was indirectly included by both "types.h" and "color.h".
+"types.h" already does not need to be wrapped in an extern "C" block,
+"color.h" does but can be modified not to, so with that changed they can
+be moved out.
+---
+ src/3rdparty/autotrace/autotrace.h | 6 +++---
+ src/3rdparty/autotrace/color.h | 7 +++++++
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/src/3rdparty/autotrace/autotrace.h b/src/3rdparty/autotrace/autotrace.h
+index 2ce6f272a9..e56be9a74c 100644
+--- a/src/3rdparty/autotrace/autotrace.h
++++ b/src/3rdparty/autotrace/autotrace.h
+@@ -23,6 +23,9 @@
+
+ #include <stdio.h>
+
++#include "types.h"
++#include "color.h"
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif /* __cplusplus */
+@@ -35,9 +38,6 @@ extern "C" {
+ * Typedefs
+ * ===================================================================== */
+
+-#include "types.h"
+-#include "color.h"
+-
+ /* Third degree is the highest we deal with. */
+ enum _at_polynomial_degree {
+ AT_LINEARTYPE = 1,
+diff --git a/src/3rdparty/autotrace/color.h b/src/3rdparty/autotrace/color.h
+index e50ab30ae0..88651db9f7 100644
+--- a/src/3rdparty/autotrace/color.h
++++ b/src/3rdparty/autotrace/color.h
+@@ -24,6 +24,10 @@
+ #include <glib.h>
+ #include <glib-object.h>
+
++#ifdef __cplusplus
++extern "C" {
++#endif /* __cplusplus */
++
+ typedef struct _at_color at_color;
+ struct _at_color {
+ guint8 r;
+@@ -43,4 +47,7 @@ void at_color_free(at_color * color);
+ GType at_color_get_type(void);
+ #define AT_TYPE_COLOR (at_color_get_type ())
+
++#ifdef __cplusplus
++}
++#endif /* __cplusplus */
+ #endif /* not AT_COLOR_H */
+--
+GitLab
+
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 364f229dba30..6339519c22f9 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.0.2
-revision=2
+revision=3
wrksrc="inkscape-${version}_2021-01-15_e86c870879"
build_style=cmake
# builds executables then runs checks
@@ -23,6 +23,7 @@ homepage="http://inkscape.org/"
distfiles="https://inkscape.org/gallery/item/23820/inkscape-${version}.tar.xz"
checksum=da3e230511a08cbf21e86710d161458594fea87867e9157b67ed01a04ea2798a
python_version=3
+patch_args=-Np1
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 59aaa6097b9dc312e2e3f5a9d59ecb1ddbe11f13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:27 -0300
Subject: [PATCH 5/7] ipe: revbump for libpoppler110-21.05.0.
---
srcpkgs/ipe/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index f322cdbfaca1..1917a94ebf4e 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,7 +1,7 @@
# Template file for 'ipe'
pkgname=ipe
version=7.2.24
-revision=1
+revision=2
_tools_commit=v7.2.20.1
hostmakedepends="pkg-config qt5-qmake qt5-tools qt5-host-tools"
makedepends="cairo-devel gsl-devel libcurl-devel libjpeg-turbo-devel
From 2a29c0d32ceed7fa8b68146693c9f0faba8c9283 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:28 -0300
Subject: [PATCH 6/7] scribus: revbump for libpoppler110-21.05.0.
---
srcpkgs/scribus/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 868ec55590fa..83a4765a6576 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
# Template file for 'scribus'
pkgname=scribus
version=1.5.6.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr"
hostmakedepends="pkg-config qt5-qmake qt5-host-tools python3"
From 28066fe2ef80d354ffa104d5d10fef814b2e456c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:28 -0300
Subject: [PATCH 7/7] texlive: revbump for libpoppler110-21.05.0.
---
srcpkgs/texlive/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 72481d85bcbf..b9a19c12a347 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
# Template file for 'texlive'
pkgname=texlive
version=20200406
-revision=7
+revision=8
wrksrc="texlive-${version}-source"
build_wrksrc="build"
build_style=gnu-configure
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] Poppler 21.05.0/
2021-05-11 3:00 [PR PATCH] Poppler 21.05.0/ ericonr
2021-05-11 3:17 ` [PR PATCH] [Updated] " ericonr
@ 2021-05-11 23:00 ` ericonr
2021-05-11 23:02 ` ericonr
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2021-05-11 23:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1583 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages poppler
https://github.com/void-linux/void-packages/pull/30789
Poppler 21.05.0/
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/30789.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-poppler-30789.patch --]
[-- Type: text/x-diff, Size: 14139 bytes --]
From 283bd09cb7542f4a6b114c18ad9accfc3dce9286 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 22:55:23 -0300
Subject: [PATCH 1/7] poppler: update to 21.05.0.
---
common/shlibs | 2 +-
srcpkgs/{libpoppler102 => libpoppler110} | 0
srcpkgs/poppler/patches/fix-cflags.patch | 14 +++++++-------
srcpkgs/poppler/template | 13 ++++++-------
4 files changed, 14 insertions(+), 15 deletions(-)
rename srcpkgs/{libpoppler102 => libpoppler110} (100%)
diff --git a/common/shlibs b/common/shlibs
index b12756eb9130..421d9f677e80 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -340,7 +340,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.102 libpoppler102-20.09.0_1
+libpoppler.so.110 libpoppler110-21.05.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/libpoppler102 b/srcpkgs/libpoppler110
similarity index 100%
rename from srcpkgs/libpoppler102
rename to srcpkgs/libpoppler110
diff --git a/srcpkgs/poppler/patches/fix-cflags.patch b/srcpkgs/poppler/patches/fix-cflags.patch
index 9e62b11010ba..f1a408d03cce 100644
--- a/srcpkgs/poppler/patches/fix-cflags.patch
+++ b/srcpkgs/poppler/patches/fix-cflags.patch
@@ -1,13 +1,13 @@
-Index: cmake/modules/PopplerMacros.cmake
-===================================================================
---- cmake/modules/PopplerMacros.cmake.orig
-+++ cmake/modules/PopplerMacros.cmake
-@@ -123,14 +123,14 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+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 -D_DEFAULT_SOURCE")
-+ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}")
+- 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}")
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index 1aebd7f7e177..72a961b24615 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -3,8 +3,8 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5".
#
pkgname=poppler
-version=20.09.0
-revision=3
+version=21.05.0
+revision=1
build_style=cmake
build_helper="gir"
configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON
@@ -18,13 +18,14 @@ 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=4ed6eb5ddc4c37f2435c9d78ff9c7c4036455aea3507d1ce8400070aab745363
+checksum=dafd537b680fad1215bc40fc53d1f38e8449d7c185bc60d5a89e1d26c90dbd8c
+patch_args=-Np1
# Package build options
build_options="gir"
build_options_default="gir"
-libpoppler102_package() {
+libpoppler110_package() {
depends="poppler-data"
short_desc+=" - poppler runtime library"
pkg_install() {
@@ -50,7 +51,7 @@ poppler-cpp_package() {
}
poppler-devel_package() {
- depends="libglib-devel libpoppler102>=${version}_${revision}"
+ depends="libglib-devel libpoppler110>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove "usr/include/poppler/*.h"
@@ -59,7 +60,6 @@ poppler-devel_package() {
vmove usr/include/poppler/goo
vmove usr/lib/libpoppler.so
vmove usr/lib/pkgconfig/poppler.pc
- vmove usr/lib/pkgconfig/poppler-splash.pc
}
}
@@ -72,7 +72,6 @@ poppler-glib-devel_package() {
if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
fi
- vmove usr/lib/pkgconfig/poppler-cairo.pc
vmove usr/lib/pkgconfig/poppler-glib.pc
}
}
From b4eb28c6031ae24ff02df902deeb50b226b439df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:31:30 -0300
Subject: [PATCH 2/7] poppler-qt5: update to 21.05.0.
---
srcpkgs/poppler-qt5/template | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template
index c2ec35dbbad3..4fb165ecc22b 100644
--- a/srcpkgs/poppler-qt5/template
+++ b/srcpkgs/poppler-qt5/template
@@ -4,8 +4,8 @@
# IT IS SPLIT TO AVOID A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5.
#
pkgname=poppler-qt5
-version=20.09.0
-revision=2
+version=21.05.0
+revision=1
wrksrc="poppler-${version}"
build_style=cmake
configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF
@@ -18,7 +18,10 @@ 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=4ed6eb5ddc4c37f2435c9d78ff9c7c4036455aea3507d1ce8400070aab745363
+checksum=dafd537b680fad1215bc40fc53d1f38e8449d7c185bc60d5a89e1d26c90dbd8c
+# fails to find a bunch of files
+make_check=no
+patch_args=-Np1
if [ "$CROSS_BUILD" ]; then
configure_args+=" -DTHREADS_PTHREAD_ARG=2"
From 4d36155232392e7e15d4954cc6d8d93dbed7346a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:25 -0300
Subject: [PATCH 3/7] calligra: revbump for libpoppler110-21.05.0.
---
srcpkgs/calligra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 9782b528067b..6c34e0438ab8 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=3
+revision=4
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From f44d6e1be4dd7011ee07a799de60d584ef3bdfd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:27 -0300
Subject: [PATCH 4/7] inkscape: revbump for libpoppler110-21.05.0.
And import patch to build with glibc >= 2.67.3.
---
srcpkgs/inkscape/patches/glib-extern-C.patch | 65 ++++++++++++++++++++
srcpkgs/inkscape/template | 3 +-
2 files changed, 67 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/inkscape/patches/glib-extern-C.patch
diff --git a/srcpkgs/inkscape/patches/glib-extern-C.patch b/srcpkgs/inkscape/patches/glib-extern-C.patch
new file mode 100644
index 000000000000..b959bcd76fdc
--- /dev/null
+++ b/srcpkgs/inkscape/patches/glib-extern-C.patch
@@ -0,0 +1,65 @@
+From eb24388f1730918edd9565d9e5d09340ec0b3b08 Mon Sep 17 00:00:00 2001
+From: Harald van Dijk <harald@gigawatt.nl>
+Date: Wed, 17 Feb 2021 09:13:49 +0000
+Subject: [PATCH] Fix build with glib 2.67.3.
+
+As of glib 2.67.3, <glib.h> can no longer be included in extern "C"
+blocks. It was indirectly included by both "types.h" and "color.h".
+"types.h" already does not need to be wrapped in an extern "C" block,
+"color.h" does but can be modified not to, so with that changed they can
+be moved out.
+---
+ src/3rdparty/autotrace/autotrace.h | 6 +++---
+ src/3rdparty/autotrace/color.h | 7 +++++++
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/src/3rdparty/autotrace/autotrace.h b/src/3rdparty/autotrace/autotrace.h
+index 2ce6f272a9..e56be9a74c 100644
+--- a/src/3rdparty/autotrace/autotrace.h
++++ b/src/3rdparty/autotrace/autotrace.h
+@@ -23,6 +23,9 @@
+
+ #include <stdio.h>
+
++#include "types.h"
++#include "color.h"
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif /* __cplusplus */
+@@ -35,9 +38,6 @@ extern "C" {
+ * Typedefs
+ * ===================================================================== */
+
+-#include "types.h"
+-#include "color.h"
+-
+ /* Third degree is the highest we deal with. */
+ enum _at_polynomial_degree {
+ AT_LINEARTYPE = 1,
+diff --git a/src/3rdparty/autotrace/color.h b/src/3rdparty/autotrace/color.h
+index e50ab30ae0..88651db9f7 100644
+--- a/src/3rdparty/autotrace/color.h
++++ b/src/3rdparty/autotrace/color.h
+@@ -24,6 +24,10 @@
+ #include <glib.h>
+ #include <glib-object.h>
+
++#ifdef __cplusplus
++extern "C" {
++#endif /* __cplusplus */
++
+ typedef struct _at_color at_color;
+ struct _at_color {
+ guint8 r;
+@@ -43,4 +47,7 @@ void at_color_free(at_color * color);
+ GType at_color_get_type(void);
+ #define AT_TYPE_COLOR (at_color_get_type ())
+
++#ifdef __cplusplus
++}
++#endif /* __cplusplus */
+ #endif /* not AT_COLOR_H */
+--
+GitLab
+
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 364f229dba30..6339519c22f9 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.0.2
-revision=2
+revision=3
wrksrc="inkscape-${version}_2021-01-15_e86c870879"
build_style=cmake
# builds executables then runs checks
@@ -23,6 +23,7 @@ homepage="http://inkscape.org/"
distfiles="https://inkscape.org/gallery/item/23820/inkscape-${version}.tar.xz"
checksum=da3e230511a08cbf21e86710d161458594fea87867e9157b67ed01a04ea2798a
python_version=3
+patch_args=-Np1
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 198d6d05c9d6f177893aee7cde9f61dbf99ea0c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:27 -0300
Subject: [PATCH 5/7] ipe: revbump for libpoppler110-21.05.0.
---
srcpkgs/ipe/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index f322cdbfaca1..1917a94ebf4e 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,7 +1,7 @@
# Template file for 'ipe'
pkgname=ipe
version=7.2.24
-revision=1
+revision=2
_tools_commit=v7.2.20.1
hostmakedepends="pkg-config qt5-qmake qt5-tools qt5-host-tools"
makedepends="cairo-devel gsl-devel libcurl-devel libjpeg-turbo-devel
From 6fcac12197fcadb903e538d770f02f74e4dcdf15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:28 -0300
Subject: [PATCH 6/7] scribus: update to 1.5.7.
Also remove outdated post_install (was a no-op).
---
srcpkgs/scribus/patches/cmake-build-type-none.patch | 9 ++++-----
srcpkgs/scribus/template | 10 +++-------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/scribus/patches/cmake-build-type-none.patch b/srcpkgs/scribus/patches/cmake-build-type-none.patch
index 670c83cc48f5..a27b4c757811 100644
--- a/srcpkgs/scribus/patches/cmake-build-type-none.patch
+++ b/srcpkgs/scribus/patches/cmake-build-type-none.patch
@@ -2,7 +2,7 @@ Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -35,11 +35,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+@@ -75,11 +75,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
#RPATH setup - more below too
@@ -14,10 +14,10 @@ Index: CMakeLists.txt
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
set(CMAKE_SKIP_BUILD_RPATH TRUE)
-@@ -309,16 +304,6 @@ include (CMakeLists_Directories.cmake)
+@@ -330,15 +325,6 @@ include (CMakeLists_Directories.cmake)
+
#Convert our simpler command line option to the CMake style
#None, Debug, Release, .. or custom ones
- # set(WANT_DEBUG ON)
-if(WANT_DEBUG)
- set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Set Debug Build Type" FORCE)
-endif()
@@ -27,7 +27,6 @@ Index: CMakeLists.txt
-if(NOT WANT_DEBUG AND NOT WANT_RELEASEWITHDEBUG)
- set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Set Release Build Type" FORCE)
-endif()
--
- #Based on our build type, setup our build options
+
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 868ec55590fa..9c7b0bfaa8fa 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
# Template file for 'scribus'
pkgname=scribus
-version=1.5.6.1
-revision=1
+version=1.5.7
+revision=2
build_style=cmake
configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr"
hostmakedepends="pkg-config qt5-qmake qt5-host-tools python3"
@@ -14,9 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://scribus.net"
distfiles="$SOURCEFORGE_SITE/scribus/scribus-devel/${version}/scribus-${version}.tar.xz"
-checksum=d4257695539cfa40dead8abdaf04c51e34d4d74bcad5a2c934d08e6e9d43b7ab
+checksum=318316b2cfc7a76191d3e0d3f8c2265147daea0570162028e243c292d826f8ce
python_version=3
-
-post_install() {
- rm -rf ${DESTDIR}/usr/include
-}
From d2780bb686966e66f539bcdd009661598c28eb71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:28 -0300
Subject: [PATCH 7/7] texlive: revbump for libpoppler110-21.05.0.
---
srcpkgs/texlive/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 72481d85bcbf..b9a19c12a347 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
# Template file for 'texlive'
pkgname=texlive
version=20200406
-revision=7
+revision=8
wrksrc="texlive-${version}-source"
build_wrksrc="build"
build_style=gnu-configure
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Poppler 21.05.0/
2021-05-11 3:00 [PR PATCH] Poppler 21.05.0/ ericonr
2021-05-11 3:17 ` [PR PATCH] [Updated] " ericonr
2021-05-11 23:00 ` ericonr
@ 2021-05-11 23:02 ` ericonr
2021-05-11 23:05 ` [PR PATCH] [Updated] " ericonr
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2021-05-11 23:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 173 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/30789#issuecomment-839262617
Comment:
@Gottox I had to update scribus.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] Poppler 21.05.0/
2021-05-11 3:00 [PR PATCH] Poppler 21.05.0/ ericonr
` (2 preceding siblings ...)
2021-05-11 23:02 ` ericonr
@ 2021-05-11 23:05 ` ericonr
2021-05-12 1:39 ` ericonr
2021-05-12 3:02 ` [PR PATCH] [Merged]: " ericonr
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2021-05-11 23:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1583 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages poppler
https://github.com/void-linux/void-packages/pull/30789
Poppler 21.05.0/
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/30789.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-poppler-30789.patch --]
[-- Type: text/x-diff, Size: 14138 bytes --]
From 283bd09cb7542f4a6b114c18ad9accfc3dce9286 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 22:55:23 -0300
Subject: [PATCH 1/7] poppler: update to 21.05.0.
---
common/shlibs | 2 +-
srcpkgs/{libpoppler102 => libpoppler110} | 0
srcpkgs/poppler/patches/fix-cflags.patch | 14 +++++++-------
srcpkgs/poppler/template | 13 ++++++-------
4 files changed, 14 insertions(+), 15 deletions(-)
rename srcpkgs/{libpoppler102 => libpoppler110} (100%)
diff --git a/common/shlibs b/common/shlibs
index b12756eb9130..421d9f677e80 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -340,7 +340,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.102 libpoppler102-20.09.0_1
+libpoppler.so.110 libpoppler110-21.05.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/libpoppler102 b/srcpkgs/libpoppler110
similarity index 100%
rename from srcpkgs/libpoppler102
rename to srcpkgs/libpoppler110
diff --git a/srcpkgs/poppler/patches/fix-cflags.patch b/srcpkgs/poppler/patches/fix-cflags.patch
index 9e62b11010ba..f1a408d03cce 100644
--- a/srcpkgs/poppler/patches/fix-cflags.patch
+++ b/srcpkgs/poppler/patches/fix-cflags.patch
@@ -1,13 +1,13 @@
-Index: cmake/modules/PopplerMacros.cmake
-===================================================================
---- cmake/modules/PopplerMacros.cmake.orig
-+++ cmake/modules/PopplerMacros.cmake
-@@ -123,14 +123,14 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+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 -D_DEFAULT_SOURCE")
-+ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}")
+- 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}")
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index 1aebd7f7e177..72a961b24615 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -3,8 +3,8 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5".
#
pkgname=poppler
-version=20.09.0
-revision=3
+version=21.05.0
+revision=1
build_style=cmake
build_helper="gir"
configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON
@@ -18,13 +18,14 @@ 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=4ed6eb5ddc4c37f2435c9d78ff9c7c4036455aea3507d1ce8400070aab745363
+checksum=dafd537b680fad1215bc40fc53d1f38e8449d7c185bc60d5a89e1d26c90dbd8c
+patch_args=-Np1
# Package build options
build_options="gir"
build_options_default="gir"
-libpoppler102_package() {
+libpoppler110_package() {
depends="poppler-data"
short_desc+=" - poppler runtime library"
pkg_install() {
@@ -50,7 +51,7 @@ poppler-cpp_package() {
}
poppler-devel_package() {
- depends="libglib-devel libpoppler102>=${version}_${revision}"
+ depends="libglib-devel libpoppler110>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove "usr/include/poppler/*.h"
@@ -59,7 +60,6 @@ poppler-devel_package() {
vmove usr/include/poppler/goo
vmove usr/lib/libpoppler.so
vmove usr/lib/pkgconfig/poppler.pc
- vmove usr/lib/pkgconfig/poppler-splash.pc
}
}
@@ -72,7 +72,6 @@ poppler-glib-devel_package() {
if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
fi
- vmove usr/lib/pkgconfig/poppler-cairo.pc
vmove usr/lib/pkgconfig/poppler-glib.pc
}
}
From b4eb28c6031ae24ff02df902deeb50b226b439df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:31:30 -0300
Subject: [PATCH 2/7] poppler-qt5: update to 21.05.0.
---
srcpkgs/poppler-qt5/template | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template
index c2ec35dbbad3..4fb165ecc22b 100644
--- a/srcpkgs/poppler-qt5/template
+++ b/srcpkgs/poppler-qt5/template
@@ -4,8 +4,8 @@
# IT IS SPLIT TO AVOID A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5.
#
pkgname=poppler-qt5
-version=20.09.0
-revision=2
+version=21.05.0
+revision=1
wrksrc="poppler-${version}"
build_style=cmake
configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF
@@ -18,7 +18,10 @@ 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=4ed6eb5ddc4c37f2435c9d78ff9c7c4036455aea3507d1ce8400070aab745363
+checksum=dafd537b680fad1215bc40fc53d1f38e8449d7c185bc60d5a89e1d26c90dbd8c
+# fails to find a bunch of files
+make_check=no
+patch_args=-Np1
if [ "$CROSS_BUILD" ]; then
configure_args+=" -DTHREADS_PTHREAD_ARG=2"
From 4d36155232392e7e15d4954cc6d8d93dbed7346a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:25 -0300
Subject: [PATCH 3/7] calligra: revbump for libpoppler110-21.05.0.
---
srcpkgs/calligra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 9782b528067b..6c34e0438ab8 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=3
+revision=4
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From 0e0614847048b8202ca131d172e0f013b91a4353 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:27 -0300
Subject: [PATCH 4/7] inkscape: revbump for libpoppler110-21.05.0.
And import patch to build with glib >= 2.67.3.
---
srcpkgs/inkscape/patches/glib-extern-C.patch | 65 ++++++++++++++++++++
srcpkgs/inkscape/template | 3 +-
2 files changed, 67 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/inkscape/patches/glib-extern-C.patch
diff --git a/srcpkgs/inkscape/patches/glib-extern-C.patch b/srcpkgs/inkscape/patches/glib-extern-C.patch
new file mode 100644
index 000000000000..b959bcd76fdc
--- /dev/null
+++ b/srcpkgs/inkscape/patches/glib-extern-C.patch
@@ -0,0 +1,65 @@
+From eb24388f1730918edd9565d9e5d09340ec0b3b08 Mon Sep 17 00:00:00 2001
+From: Harald van Dijk <harald@gigawatt.nl>
+Date: Wed, 17 Feb 2021 09:13:49 +0000
+Subject: [PATCH] Fix build with glib 2.67.3.
+
+As of glib 2.67.3, <glib.h> can no longer be included in extern "C"
+blocks. It was indirectly included by both "types.h" and "color.h".
+"types.h" already does not need to be wrapped in an extern "C" block,
+"color.h" does but can be modified not to, so with that changed they can
+be moved out.
+---
+ src/3rdparty/autotrace/autotrace.h | 6 +++---
+ src/3rdparty/autotrace/color.h | 7 +++++++
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/src/3rdparty/autotrace/autotrace.h b/src/3rdparty/autotrace/autotrace.h
+index 2ce6f272a9..e56be9a74c 100644
+--- a/src/3rdparty/autotrace/autotrace.h
++++ b/src/3rdparty/autotrace/autotrace.h
+@@ -23,6 +23,9 @@
+
+ #include <stdio.h>
+
++#include "types.h"
++#include "color.h"
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif /* __cplusplus */
+@@ -35,9 +38,6 @@ extern "C" {
+ * Typedefs
+ * ===================================================================== */
+
+-#include "types.h"
+-#include "color.h"
+-
+ /* Third degree is the highest we deal with. */
+ enum _at_polynomial_degree {
+ AT_LINEARTYPE = 1,
+diff --git a/src/3rdparty/autotrace/color.h b/src/3rdparty/autotrace/color.h
+index e50ab30ae0..88651db9f7 100644
+--- a/src/3rdparty/autotrace/color.h
++++ b/src/3rdparty/autotrace/color.h
+@@ -24,6 +24,10 @@
+ #include <glib.h>
+ #include <glib-object.h>
+
++#ifdef __cplusplus
++extern "C" {
++#endif /* __cplusplus */
++
+ typedef struct _at_color at_color;
+ struct _at_color {
+ guint8 r;
+@@ -43,4 +47,7 @@ void at_color_free(at_color * color);
+ GType at_color_get_type(void);
+ #define AT_TYPE_COLOR (at_color_get_type ())
+
++#ifdef __cplusplus
++}
++#endif /* __cplusplus */
+ #endif /* not AT_COLOR_H */
+--
+GitLab
+
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 364f229dba30..6339519c22f9 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.0.2
-revision=2
+revision=3
wrksrc="inkscape-${version}_2021-01-15_e86c870879"
build_style=cmake
# builds executables then runs checks
@@ -23,6 +23,7 @@ homepage="http://inkscape.org/"
distfiles="https://inkscape.org/gallery/item/23820/inkscape-${version}.tar.xz"
checksum=da3e230511a08cbf21e86710d161458594fea87867e9157b67ed01a04ea2798a
python_version=3
+patch_args=-Np1
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 8f74c428b6c71fb82a03f094c60630b1643ca411 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:27 -0300
Subject: [PATCH 5/7] ipe: revbump for libpoppler110-21.05.0.
---
srcpkgs/ipe/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index f322cdbfaca1..1917a94ebf4e 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,7 +1,7 @@
# Template file for 'ipe'
pkgname=ipe
version=7.2.24
-revision=1
+revision=2
_tools_commit=v7.2.20.1
hostmakedepends="pkg-config qt5-qmake qt5-tools qt5-host-tools"
makedepends="cairo-devel gsl-devel libcurl-devel libjpeg-turbo-devel
From 33046bceeec6e2d11c8b409ca23cf038fe1fa592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:28 -0300
Subject: [PATCH 6/7] scribus: update to 1.5.7.
Also remove outdated post_install (was a no-op).
---
srcpkgs/scribus/patches/cmake-build-type-none.patch | 9 ++++-----
srcpkgs/scribus/template | 10 +++-------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/scribus/patches/cmake-build-type-none.patch b/srcpkgs/scribus/patches/cmake-build-type-none.patch
index 670c83cc48f5..a27b4c757811 100644
--- a/srcpkgs/scribus/patches/cmake-build-type-none.patch
+++ b/srcpkgs/scribus/patches/cmake-build-type-none.patch
@@ -2,7 +2,7 @@ Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -35,11 +35,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+@@ -75,11 +75,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
#RPATH setup - more below too
@@ -14,10 +14,10 @@ Index: CMakeLists.txt
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
set(CMAKE_SKIP_BUILD_RPATH TRUE)
-@@ -309,16 +304,6 @@ include (CMakeLists_Directories.cmake)
+@@ -330,15 +325,6 @@ include (CMakeLists_Directories.cmake)
+
#Convert our simpler command line option to the CMake style
#None, Debug, Release, .. or custom ones
- # set(WANT_DEBUG ON)
-if(WANT_DEBUG)
- set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Set Debug Build Type" FORCE)
-endif()
@@ -27,7 +27,6 @@ Index: CMakeLists.txt
-if(NOT WANT_DEBUG AND NOT WANT_RELEASEWITHDEBUG)
- set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Set Release Build Type" FORCE)
-endif()
--
- #Based on our build type, setup our build options
+
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 868ec55590fa..9c7b0bfaa8fa 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
# Template file for 'scribus'
pkgname=scribus
-version=1.5.6.1
-revision=1
+version=1.5.7
+revision=2
build_style=cmake
configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr"
hostmakedepends="pkg-config qt5-qmake qt5-host-tools python3"
@@ -14,9 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://scribus.net"
distfiles="$SOURCEFORGE_SITE/scribus/scribus-devel/${version}/scribus-${version}.tar.xz"
-checksum=d4257695539cfa40dead8abdaf04c51e34d4d74bcad5a2c934d08e6e9d43b7ab
+checksum=318316b2cfc7a76191d3e0d3f8c2265147daea0570162028e243c292d826f8ce
python_version=3
-
-post_install() {
- rm -rf ${DESTDIR}/usr/include
-}
From fd8b6f7195b44dd3e4edc25e65b8bcb49dea6a51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:28 -0300
Subject: [PATCH 7/7] texlive: revbump for libpoppler110-21.05.0.
---
srcpkgs/texlive/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 72481d85bcbf..b9a19c12a347 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
# Template file for 'texlive'
pkgname=texlive
version=20200406
-revision=7
+revision=8
wrksrc="texlive-${version}-source"
build_wrksrc="build"
build_style=gnu-configure
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] Poppler 21.05.0/
2021-05-11 3:00 [PR PATCH] Poppler 21.05.0/ ericonr
` (3 preceding siblings ...)
2021-05-11 23:05 ` [PR PATCH] [Updated] " ericonr
@ 2021-05-12 1:39 ` ericonr
2021-05-12 3:02 ` [PR PATCH] [Merged]: " ericonr
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2021-05-12 1:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1583 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages poppler
https://github.com/void-linux/void-packages/pull/30789
Poppler 21.05.0/
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/30789.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-poppler-30789.patch --]
[-- Type: text/x-diff, Size: 14138 bytes --]
From fef850a4e718f5a950fbacbe2cb68834743ee580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 22:55:23 -0300
Subject: [PATCH 1/7] poppler: update to 21.05.0.
---
common/shlibs | 2 +-
srcpkgs/{libpoppler102 => libpoppler110} | 0
srcpkgs/poppler/patches/fix-cflags.patch | 14 +++++++-------
srcpkgs/poppler/template | 13 ++++++-------
4 files changed, 14 insertions(+), 15 deletions(-)
rename srcpkgs/{libpoppler102 => libpoppler110} (100%)
diff --git a/common/shlibs b/common/shlibs
index b12756eb9130..421d9f677e80 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -340,7 +340,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.102 libpoppler102-20.09.0_1
+libpoppler.so.110 libpoppler110-21.05.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/libpoppler102 b/srcpkgs/libpoppler110
similarity index 100%
rename from srcpkgs/libpoppler102
rename to srcpkgs/libpoppler110
diff --git a/srcpkgs/poppler/patches/fix-cflags.patch b/srcpkgs/poppler/patches/fix-cflags.patch
index 9e62b11010ba..f1a408d03cce 100644
--- a/srcpkgs/poppler/patches/fix-cflags.patch
+++ b/srcpkgs/poppler/patches/fix-cflags.patch
@@ -1,13 +1,13 @@
-Index: cmake/modules/PopplerMacros.cmake
-===================================================================
---- cmake/modules/PopplerMacros.cmake.orig
-+++ cmake/modules/PopplerMacros.cmake
-@@ -123,14 +123,14 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+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 -D_DEFAULT_SOURCE")
-+ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}")
+- 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}")
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index 1aebd7f7e177..72a961b24615 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -3,8 +3,8 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5".
#
pkgname=poppler
-version=20.09.0
-revision=3
+version=21.05.0
+revision=1
build_style=cmake
build_helper="gir"
configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON
@@ -18,13 +18,14 @@ 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=4ed6eb5ddc4c37f2435c9d78ff9c7c4036455aea3507d1ce8400070aab745363
+checksum=dafd537b680fad1215bc40fc53d1f38e8449d7c185bc60d5a89e1d26c90dbd8c
+patch_args=-Np1
# Package build options
build_options="gir"
build_options_default="gir"
-libpoppler102_package() {
+libpoppler110_package() {
depends="poppler-data"
short_desc+=" - poppler runtime library"
pkg_install() {
@@ -50,7 +51,7 @@ poppler-cpp_package() {
}
poppler-devel_package() {
- depends="libglib-devel libpoppler102>=${version}_${revision}"
+ depends="libglib-devel libpoppler110>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove "usr/include/poppler/*.h"
@@ -59,7 +60,6 @@ poppler-devel_package() {
vmove usr/include/poppler/goo
vmove usr/lib/libpoppler.so
vmove usr/lib/pkgconfig/poppler.pc
- vmove usr/lib/pkgconfig/poppler-splash.pc
}
}
@@ -72,7 +72,6 @@ poppler-glib-devel_package() {
if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
fi
- vmove usr/lib/pkgconfig/poppler-cairo.pc
vmove usr/lib/pkgconfig/poppler-glib.pc
}
}
From 3b77fae7fb6619217fafb9c796eaa26a896b3b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:31:30 -0300
Subject: [PATCH 2/7] poppler-qt5: update to 21.05.0.
---
srcpkgs/poppler-qt5/template | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template
index c2ec35dbbad3..4fb165ecc22b 100644
--- a/srcpkgs/poppler-qt5/template
+++ b/srcpkgs/poppler-qt5/template
@@ -4,8 +4,8 @@
# IT IS SPLIT TO AVOID A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5.
#
pkgname=poppler-qt5
-version=20.09.0
-revision=2
+version=21.05.0
+revision=1
wrksrc="poppler-${version}"
build_style=cmake
configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF
@@ -18,7 +18,10 @@ 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=4ed6eb5ddc4c37f2435c9d78ff9c7c4036455aea3507d1ce8400070aab745363
+checksum=dafd537b680fad1215bc40fc53d1f38e8449d7c185bc60d5a89e1d26c90dbd8c
+# fails to find a bunch of files
+make_check=no
+patch_args=-Np1
if [ "$CROSS_BUILD" ]; then
configure_args+=" -DTHREADS_PTHREAD_ARG=2"
From 57634b84eb5ef0732b04842da1f4a3f405cc510b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:25 -0300
Subject: [PATCH 3/7] calligra: revbump for libpoppler110-21.05.0.
---
srcpkgs/calligra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 9782b528067b..6c34e0438ab8 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=3
+revision=4
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From 2b5636d0c09e82bc476b178df049431325f12538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:27 -0300
Subject: [PATCH 4/7] inkscape: revbump for libpoppler110-21.05.0.
And import patch to build with glib >= 2.67.3.
---
srcpkgs/inkscape/patches/glib-extern-C.patch | 65 ++++++++++++++++++++
srcpkgs/inkscape/template | 3 +-
2 files changed, 67 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/inkscape/patches/glib-extern-C.patch
diff --git a/srcpkgs/inkscape/patches/glib-extern-C.patch b/srcpkgs/inkscape/patches/glib-extern-C.patch
new file mode 100644
index 000000000000..b959bcd76fdc
--- /dev/null
+++ b/srcpkgs/inkscape/patches/glib-extern-C.patch
@@ -0,0 +1,65 @@
+From eb24388f1730918edd9565d9e5d09340ec0b3b08 Mon Sep 17 00:00:00 2001
+From: Harald van Dijk <harald@gigawatt.nl>
+Date: Wed, 17 Feb 2021 09:13:49 +0000
+Subject: [PATCH] Fix build with glib 2.67.3.
+
+As of glib 2.67.3, <glib.h> can no longer be included in extern "C"
+blocks. It was indirectly included by both "types.h" and "color.h".
+"types.h" already does not need to be wrapped in an extern "C" block,
+"color.h" does but can be modified not to, so with that changed they can
+be moved out.
+---
+ src/3rdparty/autotrace/autotrace.h | 6 +++---
+ src/3rdparty/autotrace/color.h | 7 +++++++
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/src/3rdparty/autotrace/autotrace.h b/src/3rdparty/autotrace/autotrace.h
+index 2ce6f272a9..e56be9a74c 100644
+--- a/src/3rdparty/autotrace/autotrace.h
++++ b/src/3rdparty/autotrace/autotrace.h
+@@ -23,6 +23,9 @@
+
+ #include <stdio.h>
+
++#include "types.h"
++#include "color.h"
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif /* __cplusplus */
+@@ -35,9 +38,6 @@ extern "C" {
+ * Typedefs
+ * ===================================================================== */
+
+-#include "types.h"
+-#include "color.h"
+-
+ /* Third degree is the highest we deal with. */
+ enum _at_polynomial_degree {
+ AT_LINEARTYPE = 1,
+diff --git a/src/3rdparty/autotrace/color.h b/src/3rdparty/autotrace/color.h
+index e50ab30ae0..88651db9f7 100644
+--- a/src/3rdparty/autotrace/color.h
++++ b/src/3rdparty/autotrace/color.h
+@@ -24,6 +24,10 @@
+ #include <glib.h>
+ #include <glib-object.h>
+
++#ifdef __cplusplus
++extern "C" {
++#endif /* __cplusplus */
++
+ typedef struct _at_color at_color;
+ struct _at_color {
+ guint8 r;
+@@ -43,4 +47,7 @@ void at_color_free(at_color * color);
+ GType at_color_get_type(void);
+ #define AT_TYPE_COLOR (at_color_get_type ())
+
++#ifdef __cplusplus
++}
++#endif /* __cplusplus */
+ #endif /* not AT_COLOR_H */
+--
+GitLab
+
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 364f229dba30..6339519c22f9 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.0.2
-revision=2
+revision=3
wrksrc="inkscape-${version}_2021-01-15_e86c870879"
build_style=cmake
# builds executables then runs checks
@@ -23,6 +23,7 @@ homepage="http://inkscape.org/"
distfiles="https://inkscape.org/gallery/item/23820/inkscape-${version}.tar.xz"
checksum=da3e230511a08cbf21e86710d161458594fea87867e9157b67ed01a04ea2798a
python_version=3
+patch_args=-Np1
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From c3bd429b058755fce1ef73fc4b8043d65bbb4c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:27 -0300
Subject: [PATCH 5/7] ipe: revbump for libpoppler110-21.05.0.
---
srcpkgs/ipe/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index f322cdbfaca1..1917a94ebf4e 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,7 +1,7 @@
# Template file for 'ipe'
pkgname=ipe
version=7.2.24
-revision=1
+revision=2
_tools_commit=v7.2.20.1
hostmakedepends="pkg-config qt5-qmake qt5-tools qt5-host-tools"
makedepends="cairo-devel gsl-devel libcurl-devel libjpeg-turbo-devel
From 2e265d6f65e459816efb60d1277dbcde4b974ed6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:28 -0300
Subject: [PATCH 6/7] scribus: update to 1.5.7.
Also remove outdated post_install (was a no-op).
---
srcpkgs/scribus/patches/cmake-build-type-none.patch | 9 ++++-----
srcpkgs/scribus/template | 10 +++-------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/scribus/patches/cmake-build-type-none.patch b/srcpkgs/scribus/patches/cmake-build-type-none.patch
index 670c83cc48f5..a27b4c757811 100644
--- a/srcpkgs/scribus/patches/cmake-build-type-none.patch
+++ b/srcpkgs/scribus/patches/cmake-build-type-none.patch
@@ -2,7 +2,7 @@ Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -35,11 +35,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+@@ -75,11 +75,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
#RPATH setup - more below too
@@ -14,10 +14,10 @@ Index: CMakeLists.txt
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
set(CMAKE_SKIP_BUILD_RPATH TRUE)
-@@ -309,16 +304,6 @@ include (CMakeLists_Directories.cmake)
+@@ -330,15 +325,6 @@ include (CMakeLists_Directories.cmake)
+
#Convert our simpler command line option to the CMake style
#None, Debug, Release, .. or custom ones
- # set(WANT_DEBUG ON)
-if(WANT_DEBUG)
- set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Set Debug Build Type" FORCE)
-endif()
@@ -27,7 +27,6 @@ Index: CMakeLists.txt
-if(NOT WANT_DEBUG AND NOT WANT_RELEASEWITHDEBUG)
- set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Set Release Build Type" FORCE)
-endif()
--
- #Based on our build type, setup our build options
+
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 868ec55590fa..9c7b0bfaa8fa 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
# Template file for 'scribus'
pkgname=scribus
-version=1.5.6.1
-revision=1
+version=1.5.7
+revision=2
build_style=cmake
configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr"
hostmakedepends="pkg-config qt5-qmake qt5-host-tools python3"
@@ -14,9 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://scribus.net"
distfiles="$SOURCEFORGE_SITE/scribus/scribus-devel/${version}/scribus-${version}.tar.xz"
-checksum=d4257695539cfa40dead8abdaf04c51e34d4d74bcad5a2c934d08e6e9d43b7ab
+checksum=318316b2cfc7a76191d3e0d3f8c2265147daea0570162028e243c292d826f8ce
python_version=3
-
-post_install() {
- rm -rf ${DESTDIR}/usr/include
-}
From 13da4a6b057672a42c8bc84761f2eb5924a0a252 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:28 -0300
Subject: [PATCH 7/7] texlive: revbump for libpoppler110-21.05.0.
---
srcpkgs/texlive/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 72481d85bcbf..b9a19c12a347 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
# Template file for 'texlive'
pkgname=texlive
version=20200406
-revision=7
+revision=8
wrksrc="texlive-${version}-source"
build_wrksrc="build"
build_style=gnu-configure
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Merged]: Poppler 21.05.0/
2021-05-11 3:00 [PR PATCH] Poppler 21.05.0/ ericonr
` (4 preceding siblings ...)
2021-05-12 1:39 ` ericonr
@ 2021-05-12 3:02 ` ericonr
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2021-05-12 3:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1427 bytes --]
There's a merged pull request on the void-packages repository
Poppler 21.05.0/
https://github.com/void-linux/void-packages/pull/30789
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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
-->
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-05-12 3:03 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-11 3:00 [PR PATCH] Poppler 21.05.0/ ericonr
2021-05-11 3:17 ` [PR PATCH] [Updated] " ericonr
2021-05-11 23:00 ` ericonr
2021-05-11 23:02 ` ericonr
2021-05-11 23:05 ` [PR PATCH] [Updated] " ericonr
2021-05-12 1:39 ` ericonr
2021-05-12 3:02 ` [PR PATCH] [Merged]: " ericonr
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).