Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (47e6a8eae287bd2e069649fd531abb08c271ae62)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (47e6a8eae287bd2e069649fd531abb08c271ae62)
  • Date: Thu, 17 Dec 2015 09:22:23 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

ChangeLog | 4 ++++
graphics-libs/poppler/BUILD | 8 ++++++--
graphics-libs/poppler/DEPENDS | 7 ++++++-
graphics-libs/poppler/DETAILS | 8 ++++----
graphics-libs/poppler/HISTORY | 4 ++++
graphics-libs/poppler/PRE_SUB_DEPENDS | 1 +
graphics-libs/poppler/REPAIR^all^PRE_SUB_DEPENDS | 1 +
graphics-libs/poppler/SUB_DEPENDS | 3 +++
kde5-games/kiriki/CONFIGURE | 1 +
kde5-games/kiriki/DEPENDS | 10 ++++++++++
kde5-games/kiriki/DETAILS | 16 ++++++++++++++++
kde5-games/kiriki/HISTORY | 3 +++
12 files changed, 59 insertions(+), 7 deletions(-)

New commits:
commit 47e6a8eae287bd2e069649fd531abb08c271ae62
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

poppler: => 0.39.0

commit e0efce94e1d77a144acb172a9f76c2e7dfbc6cbf
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kiriki-15.12.0

commit f05d9c67e3143471e97a16ae1b492bd6d04c2b0c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

ktuberling-15.12.

diff --git a/ChangeLog b/ChangeLog
index 0988bd3..055e4f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
+2015-12-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * kde5-games/kiriki: added
+
2015-12-16 Treeve Jelbert <treeve AT sourcemage.org>
* kde4-graphics/kamera: added
* kde5-graphics/kamera: added
* kde5-games/knavalbattle: added
+ * kde5-games/ktuberling: added

2015-12-10 Treeve Jelbert <treeve AT sourcemage.org>
* audio-libs/opus: new spell, highly versatile audio codec
diff --git a/graphics-libs/poppler/BUILD b/graphics-libs/poppler/BUILD
index 12ff40d..8c23020 100755
--- a/graphics-libs/poppler/BUILD
+++ b/graphics-libs/poppler/BUILD
@@ -4,8 +4,12 @@ OPTS="$POPPLER_OPTS $OPTS" &&
LDFLAGS="-lm $LDFLAGS" &&

if is_depends_enabled $SPELL qt4; then
- export PATH="$INSTALL_ROOT/opt/qt4/bin:$PATH" &&
- export PKG_CONFIG_PATH="$INSTALL_ROOT/opt/qt4/lib/pkgconfig/"
+ export PATH="$QT4DIR/bin:$PATH" &&
+ export PKG_CONFIG_PATH="$QT4DIR/lib/pkgconfig/"
+fi &&
+if is_depends_enabled $SPELL qtbase; then
+ export PATH="$QT5DIR/bin:$PATH" &&
+ export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig/"
fi &&

default_build
diff --git a/graphics-libs/poppler/DEPENDS b/graphics-libs/poppler/DEPENDS
index 68ba5e0..4b0a5a1 100755
--- a/graphics-libs/poppler/DEPENDS
+++ b/graphics-libs/poppler/DEPENDS
@@ -22,7 +22,7 @@ optional_depends lcms2 \
"for color management" &&

optional_depends openjpeg \
- "--enable-libopenjpeg=openjpeg1" \
+ "--enable-libopenjpeg=auto" \
"--enable-libopenjpeg=none" \
"for jpeg2000 support" &&

@@ -56,6 +56,11 @@ optional_depends gobject-introspection \
"for introspection support" &&


+optional_depends qtbase \
+ "--enable-poppler-qt5" \
+ "--disable-poppler-qt5" \
+ "for QT5 wrapper" &&
+
optional_depends -sub "TOOLS" qt4 \
"--enable-poppler-qt4" \
"--disable-poppler-qt4" \
diff --git a/graphics-libs/poppler/DETAILS b/graphics-libs/poppler/DETAILS
index f577984..ee1f2c8 100755
--- a/graphics-libs/poppler/DETAILS
+++ b/graphics-libs/poppler/DETAILS
@@ -9,11 +9,11 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_IGNORE=volatile
else
if [[ $POPPLER_BRANCH == devel ]]; then
- VERSION=0.38.0
-
SOURCE_HASH=sha512:1b8643c0f58eb1e1c3d98266c38d311c66458168188146af72c99c9f374882bdc616aa3febd8833538b286652c21a567e6240aa590111bcebcba5ee845e6bad9
+ VERSION=0.39.0
+
SOURCE_HASH=sha512:046a80d5cbbdf1dda57ebcd09a77eb80239a85b0d8250d89174e5a69ce171000c4ab624f6c00b599b30d4ed2559976c8e527b3ed65f04c6d3f582c3e2b75e522
else
- VERSION=0.38.0
-
SOURCE_HASH=sha512:1b8643c0f58eb1e1c3d98266c38d311c66458168188146af72c99c9f374882bdc616aa3febd8833538b286652c21a567e6240aa590111bcebcba5ee845e6bad9
+ VERSION=0.39.0
+
SOURCE_HASH=sha512:046a80d5cbbdf1dda57ebcd09a77eb80239a85b0d8250d89174e5a69ce171000c4ab624f6c00b599b30d4ed2559976c8e527b3ed65f04c6d3f582c3e2b75e522
fi
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index 78e6412..514197e 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,7 @@
+2015-12-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.39.0
+ * DEPENDS *SUB_DEPENDS: qt5 support
+
2015-12-05 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 0.38.0

diff --git a/graphics-libs/poppler/PRE_SUB_DEPENDS
b/graphics-libs/poppler/PRE_SUB_DEPENDS
index 1bc9663..fd55dd9 100755
--- a/graphics-libs/poppler/PRE_SUB_DEPENDS
+++ b/graphics-libs/poppler/PRE_SUB_DEPENDS
@@ -1,5 +1,6 @@
case $THIS_SUB_DEPENDS in
QT4) is_depends_enabled $SPELL qt4 && return 0;;
+ QT5) is_depends_enabled $SPELL qtbase && return 0;;
XPDF_HEADERS) list_find "$POPPLER_OPTS" "--enable-xpdf-headers" && return
0;;
*) echo "Eek, unknown subdependency requested!"; return 1;;
esac
diff --git a/graphics-libs/poppler/REPAIR^all^PRE_SUB_DEPENDS
b/graphics-libs/poppler/REPAIR^all^PRE_SUB_DEPENDS
index 1bc9663..fd55dd9 100755
--- a/graphics-libs/poppler/REPAIR^all^PRE_SUB_DEPENDS
+++ b/graphics-libs/poppler/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,5 +1,6 @@
case $THIS_SUB_DEPENDS in
QT4) is_depends_enabled $SPELL qt4 && return 0;;
+ QT5) is_depends_enabled $SPELL qtbase && return 0;;
XPDF_HEADERS) list_find "$POPPLER_OPTS" "--enable-xpdf-headers" && return
0;;
*) echo "Eek, unknown subdependency requested!"; return 1;;
esac
diff --git a/graphics-libs/poppler/SUB_DEPENDS
b/graphics-libs/poppler/SUB_DEPENDS
index aed2400..c2fa551 100755
--- a/graphics-libs/poppler/SUB_DEPENDS
+++ b/graphics-libs/poppler/SUB_DEPENDS
@@ -2,6 +2,9 @@ case $THIS_SUB_DEPENDS in
QT4) echo "QT4 support requested, forcing qt4 dependency." &&
depends -sub TOOLS qt4 '--enable-poppler-qt4'
;;
+ QT5) echo "QT5 support requested, forcing qtbase dependency." &&
+ depends qtbase '--enable-poppler-qt5'
+ ;;
XPDF_HEADERS) echo "XPDF_HEADERS requested, forcing --enable-xpdf-headers"
&&
list_add POPPLER_OPTS --enable-xpdf-headers &&
list_remove POPPLER_OPTS --disable-xpdf-headers
diff --git a/kde5-games/kiriki/CONFIGURE b/kde5-games/kiriki/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/kde5-games/kiriki/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/kde5-games/kiriki/DEPENDS b/kde5-games/kiriki/DEPENDS
new file mode 100755
index 0000000..ae0f167
--- /dev/null
+++ b/kde5-games/kiriki/DEPENDS
@@ -0,0 +1,10 @@
+source $GRIMOIRE/KDE5_DEPENDS &&
+depends kconfig &&
+depends kconfigwidgets &&
+depends kcoreaddons &&
+depends kdbusaddons &&
+depends kdoctools &&
+depends ki18n &&
+depends kiconthemes &&
+depends kxmlgui &&
+depends libkdegames5
diff --git a/kde5-games/kiriki/DETAILS b/kde5-games/kiriki/DETAILS
new file mode 100755
index 0000000..88b92c7
--- /dev/null
+++ b/kde5-games/kiriki/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=kiriki
+ VERSION=15.12.0
+
SOURCE_HASH=sha512:51077dd2a3be972f0f6450fa32d7a41f9133efb949a98a406f8b13ab13bee98f62a41012cfb03553801c0457ff606d378b256827319bd2fa0947e024a283f274
+ SOURCE=$SPELL-$VERSION.tar.xz
+
SOURCE_URL=http://download.kde.org/stable/applications/${VERSION}/src/$SOURCE
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=https://projects.kde.org/projects/kiriki
+ ENTERED=20151217
+# SECURITY_PATCH=1
+ LICENSE[0]=GPL
+ KEYWORDS="kde5 games"
+ SHORT="Yahtzee-like Dice Game"
+cat << EOF
+Kiriki - Yahtzee-like Dice Game
+
+EOF
diff --git a/kde5-games/kiriki/HISTORY b/kde5-games/kiriki/HISTORY
new file mode 100644
index 0000000..d71d315
--- /dev/null
+++ b/kde5-games/kiriki/HISTORY
@@ -0,0 +1,3 @@
+2015-12-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 15.12.0
+ * spell created



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (47e6a8eae287bd2e069649fd531abb08c271ae62), Treeve Jelbert, 12/17/2015

Archive powered by MHonArc 2.6.24.

Top of Page