Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (0d02c6d12a4b8c10eb605b236a4970452fab4d9b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (0d02c6d12a4b8c10eb605b236a4970452fab4d9b)
  • Date: Fri, 21 Jun 2024 22:38:48 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

crypto/gpgme/BUILD | 1 +
crypto/gpgme/HISTORY | 3 +++
graphics-libs/poppler/DEPENDS | 18 ++++++++++++------
graphics-libs/poppler/DETAILS | 5 +----
graphics-libs/poppler/HISTORY | 4 ++++
graphics-libs/poppler/PREPARE | 2 +-
6 files changed, 22 insertions(+), 11 deletions(-)

New commits:
commit 0d02c6d12a4b8c10eb605b236a4970452fab4d9b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

poppler: Add version check for gpgme

commit 301757d5602a52cdc88f1bb6fa860f8c490dca69
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gpgme: Fix build against musl

commit a7e14d752bdd7ea3c5b7bbdc99f06807dd726a28
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

poppler: Remove devel brancch

commit 576c0b00e3302341cdf4a0304806f1c9dd022768
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

poppler: Add Watch line

diff --git a/crypto/gpgme/BUILD b/crypto/gpgme/BUILD
index 177b09d..f72e6be 100755
--- a/crypto/gpgme/BUILD
+++ b/crypto/gpgme/BUILD
@@ -1,3 +1,4 @@
+CFLAGS+=' -D_LARGEFILE64_SOURCE' &&
OPTS+=" --disable-gpg-test" &&
export QT6DIR=$INSTALL_ROOT/opt/qt6 &&
GPG_LANG=no
diff --git a/crypto/gpgme/HISTORY b/crypto/gpgme/HISTORY
index 439ddbb..ee60c5f 100644
--- a/crypto/gpgme/HISTORY
+++ b/crypto/gpgme/HISTORY
@@ -1,3 +1,6 @@
+2024-06-21 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: fixed build against musl
+
2023-12-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.23.2
* PREPARE: add 1.23 branch
diff --git a/graphics-libs/poppler/DEPENDS b/graphics-libs/poppler/DEPENDS
index 1c763c3..785d71a 100755
--- a/graphics-libs/poppler/DEPENDS
+++ b/graphics-libs/poppler/DEPENDS
@@ -1,9 +1,12 @@
-source $GRIMOIRE/CMAKE_DEPENDS &&
-depends libxml2 &&
-depends freetype2 &&
-depends fontconfig &&
-depends poppler-data &&
-depends zlib &&
+. "$GRIMOIRE"/VDEPENDS &&
+. "$GRIMOIRE"/CMAKE_DEPENDS &&
+vdepends <<! &&
+ libxml2
+ freetype2
+ fontconfig
+ poppler-data
+ zlib
+!
optional_depends boost -DENABLE_BOOST={ON,OFF} 'for Splash support' &&
optional_depends curl -DENABLE_LIBCURL={ON,OFF} 'HTTP support' &&
optional_depends glib2 '' '' 'GLib support' &&
@@ -17,6 +20,9 @@ optional_depends openjpeg \
-DENABLE_LIBOPENJPEG={openjpeg2,none} "for JPX (JPEG 2000) streams" &&
optional_depends tiff '' '' 'for TIFF support' &&
optional_depends gpgme '' '' 'signature handling' &&
+if is_depends_enabled "$SPELL" gpgme; then
+ vdepends <<< 'gpgme >= 1.19'
+fi &&
optional_depends gtk+3 -DBUILD_GTK_TESTS={ON,OFF} "GTK tests" &&
optional_depends qtbase -DENABLE_QT5={ON,OFF} "Qt5 support" &&
optional_depends qt6base -DENABLE_QT6={ON,OFF} "Qt6 support" &&
diff --git a/graphics-libs/poppler/DETAILS b/graphics-libs/poppler/DETAILS
index 10553f9..bc20de8 100755
--- a/graphics-libs/poppler/DETAILS
+++ b/graphics-libs/poppler/DETAILS
@@ -1,3 +1,4 @@
+# Watch: https://poppler.freedesktop.org/
. "$GRIMOIRE/FUNCTIONS"
source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=poppler
@@ -9,11 +10,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_URL[0]=git://git.freedesktop.org/git/poppler/poppler:poppler-git
SOURCE_IGNORE=volatile
else
- if [[ $POPPLER_BRANCH == devel ]]; then
VERSION=24.06.0
- else
- VERSION=24.06.0
-fi
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=https://poppler.freedesktop.org/$SOURCE
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index 325feb3..dffe950 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,7 @@
+2024-06-21 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PREPARE: removed devel branch
+ * DEPENDS: added version check for gpgme
+
2024-06-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 24.06.0

diff --git a/graphics-libs/poppler/PREPARE b/graphics-libs/poppler/PREPARE
index 40600f7..98d27e4 100755
--- a/graphics-libs/poppler/PREPARE
+++ b/graphics-libs/poppler/PREPARE
@@ -1,2 +1,2 @@
. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch stable devel scm
+prepare_select_branch stable scm


  • [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (0d02c6d12a4b8c10eb605b236a4970452fab4d9b), Ismael Luceno, 06/21/2024

Archive powered by MHonArc 2.6.24.

Top of Page