Patch for tdegraphics for poppler 21.11

master
Ray-V 3 years ago
parent 805a799dc9
commit 5adaf90ee6

@ -48,6 +48,43 @@ echo $'
+</includes>
' | patch -N -p0 || true
## Patch for poppler 21.11, tdegraphics issue #36/37
[[ $TDEVERSION == 14.0.11 ]] && {
echo $'
--- config.h.cmake
+++ config.h.cmake
@@ -3,2 +3,3 @@
// poppler-tqt
+#cmakedefine HAVE_POPPLER_2111
#cmakedefine HAVE_POPPLER_2108
--- tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
+++ tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
@@ -26,3 +26,3 @@
-foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 0.86 21.08 )
+foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 0.86 21.08 21.11 )
string( REPLACE "." "" _poppler_str "${_poppler_ver}" )
--- tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp
+++ tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp
@@ -175,3 +175,7 @@
+# if defined(HAVE_POPPLER_2111)
+ std::unique_ptr<TextWordList> word_list = output_dev->makeWordList();
+# else
TextWordList *word_list = output_dev->makeWordList();
+# endif
@@ -195,3 +199,5 @@
+# if !defined(HAVE_POPPLER_2111)
delete word_list;
+# endif
delete output_dev;
' | patch -p0
}
listdocs_fn
chown_fn

@ -26,8 +26,10 @@ If you're curious about what this might involve, [take a look at a sample build
---
***Other command line options*** that can be used to set some build parameters:
* TDE_MIRROR= - override the trinitydesktop.org geoIP redirector to use https - example, *https://trinitydesktop.mirrorservice.org/trinity*. URLs @ https://www.trinitydesktop.org/mirrorstatus.php
* TDE_MIRROR= - override the trinitydesktop.org geoIP redirector to use https - example, *https://trinitydesktop.mirrorservice.org/trinity*.
URLs for this and other locations are @ https://www.trinitydesktop.org/mirrorstatus.php
* BUILD= - sets the package build identifier, overriding the SlackBuild default of 1
* GCC_VIS=0 - override setting gcc visibility if it has been set ON in tdelibs
---
@ -49,7 +51,6 @@ Other scripts:
get-source.sh - a chunk of common code for the SlackBuilds
- used for getting the sources, setting FLAGS,
creating build directories, ...
```
There is an override in the Misc SlackBuilds for non-trinity source archive URLs. Non-trinity builds have been included where a TDE package requires a dependency that is not in Slackware, or where it's an alternative to a TDE package.
@ -62,11 +63,13 @@ Deps/tqtinterface
Deps/arts
Deps/dbus-tqt
Deps/dbus-1-tqt
Deps/tqca-tls
Deps/tqca
Deps/libart-lgpl
Core/tdelibs
Core/tdebase
```
The newly introduced cmake-trinity package for R14.0.11+ is downloaded with the first archive, usually tqt3.
---
***Internationalization***

Loading…
Cancel
Save