Skip to Content.
Sympa Menu

sm-discuss - Re: [SM-Discuss] devel-merge-kde4+plasma5+kde5 branch

sm-discuss AT lists.ibiblio.org

Subject: Public SourceMage Discussion List

List archive

Chronological Thread  
  • From: Thomas Orgis <thomas-forum AT orgis.org>
  • To: sm-discuss AT lists.ibiblio.org
  • Subject: Re: [SM-Discuss] devel-merge-kde4+plasma5+kde5 branch
  • Date: Fri, 1 May 2015 16:33:07 +0200

Am Thu, 30 Apr 2015 13:28:53 +0200
schrieb Treeve Jelbert <treeve AT scarlet.be>:

> you may have noticed that I have pushed a new branch, which contains
> all the latest kde4/kde5/plasma/qt5 updates

I also noticed you introducing quite some changes to master grimoire
along that, too.

First: Yay for finally pushing current kde4 and 5 stuff!

But also, please don't break my qt5_builds:

Preparing qtwebkit
Hash checking source file qtwebkit-opensource-src-5.4.1.tar.xz...
Algorithm used: sha512
Allowing new hash sha512
Checking spell level WORKS_FOR_ME
Spell level is a new allowed level
Hash verification succeeded
Unpacking source file qtwebkit-opensource-src-5.4.1.tar.xz for spell qtwebkit.
patching file Source/WTF/wtf/unicode/icu/UnicodeIcu.h
patching file
Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
Building qtwebkit
Building in dir: /usr/src/qtwebkit-opensource-src-5.4.1
qtwebkit 5.4.1

Cannot find directory:
Cannot read /usr/src/qtwebkit-opensource-src-5.4.1/unetbootin.pro: No such
file or directory
Error processing project file: /unetbootin.pro
! Problem Detected !
BUILD failed!


Apart from the question why I got /unetbootin.pro lying around (no
idea, it's an old install that grows things), I suspect that this
change has something to do with this:

diff --git a/FUNCTIONS b/FUNCTIONS
index 5a9d3c5..0fc1d49 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -3,16 +3,22 @@
. $GRIMOIRE/config_query_multi.function

QT5DIR=$INSTALL_ROOT/opt/qt5
+
qt5_build() {
- export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
- cd $SOURCE_DIRECTORY &&
- QMAKEPATH="$QT5DIR/bin"
-# in some cases, we set a symlink to python in the source directory
- PATH="$QMAKEPATH:$SOURCE_DIRECTORY:$PATH"
- qmake PREFIX=$QT5DIR $OPTS *.pro &&
+ cd $SOURCE_DIRECTORY &&
+ PATH="$QT5DIR/bin:$PATH"
+ qmake PREFIX=$QT5DIR LIBDIR=$QT5DIR/lib \
+ $OPTS $SRC/*.pro &&
make
}


What's $SRC? I bet it's mostly "" …


> All my testing has used libpng-1.16.x, which really should be merged to
> master soon.

1.6.x, right? I also wonder what's about this dubious upgrade path. At
some point, I guess we just have to ship it. I don't see how the
brokeness of the grimoire could increase significantly.


Alrighty then,

Thomas

Attachment: pgpF8aniVXIrF.pgp
Description: Digitale Signatur von OpenPGP




Archive powered by MHonArc 2.6.24.

Top of Page